10105 files changed, 178394 insertions, 239293 deletions

diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
index 2abfe696fd..38c1cfe506 100644
--- a/.github/workflows/api.yml
+++ b/.github/workflows/api.yml
@@ -19,7 +19,7 @@ on:
 jobs:
   api_data:
     runs-on: ubuntu-latest
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     # protect against those who work in their fork on 'important' branches
     if: github.repository == 'qmk/qmk_firmware'
diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml
index 372dcb8dd7..b3bb83fa85 100644
--- a/.github/workflows/ci_builds.yml
+++ b/.github/workflows/ci_builds.yml
@@ -27,7 +27,7 @@ jobs:
       matrix:
         keymap: [default, via]
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index d98692e6d9..27bdcc562b 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -18,7 +18,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 841573cf30..923dfc1c1b 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   generate:
     runs-on: ubuntu-latest
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     # protect against those who develop with their fork on master
     if: github.repository == 'qmk/qmk_firmware'
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 78aaae8a0e..8ecdf82059 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -19,7 +19,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check
diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml
index 0a34245ac0..45c8b3daf6 100644
--- a/.github/workflows/format_push.yml
+++ b/.github/workflows/format_push.yml
@@ -13,7 +13,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6b4e266bde..91932b323a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -12,7 +12,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check
diff --git a/.github/workflows/regen.yml b/.github/workflows/regen.yml
index f301000d55..a2b4ef2b93 100644
--- a/.github/workflows/regen.yml
+++ b/.github/workflows/regen.yml
@@ -13,7 +13,7 @@ jobs:
   regen:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check
diff --git a/.github/workflows/regen_push.yml b/.github/workflows/regen_push.yml
index 2d77f6fdf2..7394925a0d 100644
--- a/.github/workflows/regen_push.yml
+++ b/.github/workflows/regen_push.yml
@@ -13,7 +13,7 @@ jobs:
   regen:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index 75ed84177b..fb538d4f84 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -23,7 +23,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.gitignore b/.gitignore
index 5fdf770d31..13ed296035 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,6 @@ quantum/version.h
 .idea/
 .project
 .settings/
-.vagrant/
 
 # ?
 .dep
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index e283c8f98a..0000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM qmkfm/qmk_cli
-
-VOLUME /qmk_firmware
-WORKDIR /qmk_firmware
-
-CMD qmk compile -kb all -km default
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index 717f4ec98b..0000000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure(2) do |config|
-  # define a name instead of just 'default'
-  config.vm.define "qmk_firmware"
-
-  # VMware/Virtualbox ( and also Hyperv/Parallels) 64 bit
-  config.vm.box = "generic/debian10"
-  
-  config.vm.synced_folder '.', '/vagrant'
-
-  # This section allows you to customize the Virtualbox VM
-  # settings, ie showing the GUI or upping the memory
-  # or cores if desired
-  config.vm.provider "virtualbox" do |vb|
-    # Hide the VirtualBox GUI when booting the machine
-    vb.gui = false
-    # Uncomment the below lines if you want to program
-    # your Teensy via the VM rather than your host OS
-    #vb.customize ['modifyvm', :id, '--usb', 'on']
-    #vb.customize ['usbfilter', 'add', '0',
-    #         '--target', :id,
-    #         '--name', 'teensy',
-    #         '--vendorid', '0x16c0',
-    #         '--productid','0x0478'
-    #        ]
-    # Customize the amount of memory on the VM:
-    vb.memory = "512"
-    # Uncomment the below lines if you have time sync
-    # issues with make and incremental builds
-    #vb.customize [ "guestproperty", "set", :id, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold", 1000 ]
-  end
-
-  # This section allows you to customize the VMware VM
-  # settings, ie showing the GUI or upping the memory
-  # or cores if desired
-  config.vm.provider "vmware_workstation" do |vmw|
-    # Hide the VMware GUI when booting the machine
-    vmw.gui = false
-
-    # Customize the amount of memory on the VM:
-    vmw.memory = "512"
-  end
-
-  config.vm.provider "vmware_fusion" do |vmf|
-    # Hide the vmfare GUI when booting the machine
-    vmf.gui = false
-
-    # Customize the amount of memory on the VM:
-    vmf.memory = "512"
-  end
-
-  # Docker provider pulls from hub.docker.com respecting docker.image if
-  # config.vm.box is nil. In this case, we adhoc build util/vagrant/Dockerfile.
-  # Note that this bind-mounts from the current dir to
-  # /vagrant in the guest, so unless your UID is 1000 to match vagrant in the
-  # image, you'll need to: chmod -R a+rw .
-  config.vm.provider "docker" do |docker, override|
-    override.vm.box = nil
-    docker.build_dir = "util/vagrant"
-    docker.has_ssh = true
-  end
-
-  # Unless we are running the docker container directly
-  #   1. run container detached on vm
-  #   2. attach on 'vagrant ssh'
-  ["virtualbox", "vmware_workstation", "vmware_fusion"].each do |type|
-    config.vm.provider type do |virt, override|
-      override.vm.provision "docker" do |d|
-        d.run "qmkfm/qmk_cli",
-          cmd: "tail -f /dev/null",
-          args: "--privileged -v /dev:/dev -v '/vagrant:/vagrant'"
-      end
-
-      override.vm.provision "shell", inline: <<-SHELL
-        echo 'docker restart qmkfm-qmk_cli && exec docker exec -it qmkfm-qmk_cli /bin/bash -l' >> ~vagrant/.bashrc
-      SHELL
-    end
-  end
-
-  config.vm.post_up_message = <<-EOT
-
-  Log into the environment using 'vagrant ssh'. QMK directory synchronized with
-  host is located at /vagrant
-  To compile the .hex files use make command inside this directory, e.g.
-     cd /vagrant
-     make <keyboard>:default
-
-  Examples:
-     make planck/rev4:default:dfu
-     make planck/rev4:default
-
-  EOT
-end
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index 5fd61a96ce..91c9541be5 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -446,6 +446,14 @@ $(eval $(call add_qmk_prefix_defs,MCU_FAMILY,MCU_FAMILY))
 $(eval $(call add_qmk_prefix_defs,MCU_SERIES,MCU_SERIES))
 $(eval $(call add_qmk_prefix_defs,BOARD,BOARD))
 
+# Control whether intermediate file listings are generated
+# e.g.:
+#    make handwired/onekey/blackpill_f411:default KEEP_INTERMEDIATES=yes
+#    cat .build/obj_handwired_onekey_blackpill_f411_default/quantum/quantum.i | sed -e 's@^#.*@@g' -e 's@^\s*//.*@@g' -e '/^\s*$/d' | clang-format
+ifeq ($(strip $(KEEP_INTERMEDIATES)), yes)
+    OPT_DEFS += -save-temps=obj
+endif
+
 # TODO: remove this bodge?
 PROJECT_DEFS := $(OPT_DEFS)
 PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 0880934e95..6a22c28b05 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -134,7 +134,7 @@ ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/mousekey.c
 endif
 
-VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 pmw3360 pmw3389 pimoroni_trackball custom
+VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 pmw3320 pmw3360 pmw3389 pimoroni_trackball custom
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     ifeq ($(filter $(POINTING_DEVICE_DRIVER),$(VALID_POINTING_DEVICE_DRIVER_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid POINTING_DEVICE_DRIVER,POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
@@ -574,7 +574,7 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
     endif
 endif
 
-VALID_WS2812_DRIVER_TYPES := bitbang pwm spi i2c vendor
+VALID_WS2812_DRIVER_TYPES := bitbang custom i2c pwm spi vendor
 
 WS2812_DRIVER ?= bitbang
 ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
@@ -584,15 +584,11 @@ ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
 
     OPT_DEFS += -DWS2812_DRIVER_$(strip $(shell echo $(WS2812_DRIVER) | tr '[:lower:]' '[:upper:]'))
 
-    ifeq ($(strip $(WS2812_DRIVER)), bitbang)
-        SRC += ws2812.c
-    else
-        SRC += ws2812_$(strip $(WS2812_DRIVER)).c
+    SRC += ws2812_$(strip $(WS2812_DRIVER)).c
 
-        ifeq ($(strip $(PLATFORM)), CHIBIOS)
-            ifeq ($(strip $(WS2812_DRIVER)), pwm)
-                OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
-            endif
+    ifeq ($(strip $(PLATFORM)), CHIBIOS)
+        ifeq ($(strip $(WS2812_DRIVER)), pwm)
+            OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
         endif
     endif
 
diff --git a/builddefs/converters.mk b/builddefs/converters.mk
index 17b1c3b6ee..a3548afd60 100644
--- a/builddefs/converters.mk
+++ b/builddefs/converters.mk
@@ -7,7 +7,12 @@ endif
 
 # TODO: opt in rather than assume everything uses a pro micro
 PIN_COMPATIBLE ?= promicro
+
+# Remove whitespace from any rule.mk provided vars
+#   - env cannot be overwritten but cannot have whitespace anyway
+CONVERT_TO:=$(strip $(CONVERT_TO))
 ifneq ($(CONVERT_TO),)
+
     # stash so we can overwrite env provided vars if needed
     ACTIVE_CONVERTER=$(CONVERT_TO)
 
@@ -23,13 +28,13 @@ ifneq ($(CONVERT_TO),)
     TARGET := $(TARGET)_$(CONVERT_TO)
 
     # Configure any defaults
-    OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]'))
-    OPT_DEFS += -DCONVERTER_TARGET=\"$(strip $(CONVERT_TO))\"
+    OPT_DEFS += -DCONVERT_TO_$(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]')
+    OPT_DEFS += -DCONVERTER_TARGET=\"$(CONVERT_TO)\"
     OPT_DEFS += -DCONVERTER_ENABLED
     VPATH += $(CONVERTER)
 
     # Configure for "alias" - worst case it produces an idential define
-    OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]'))
+    OPT_DEFS += -DCONVERT_TO_$(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]')
 
     # Finally run any converter specific logic
     include $(CONVERTER)/converter.mk
diff --git a/data/mappings/defaults.hjson b/data/mappings/defaults.hjson
index 93da6161d6..090cbe4be9 100644
--- a/data/mappings/defaults.hjson
+++ b/data/mappings/defaults.hjson
@@ -74,6 +74,11 @@
             "processor": "RP2040",
             "bootloader": "rp2040",
             "board": "QMK_PM2040"
+        },
+        "liatris": {
+            "processor": "RP2040",
+            "bootloader": "rp2040",
+            "board": "QMK_PM2040"
         }
     }
 }
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index 46108e6fe6..30b9b75330 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -10,6 +10,9 @@
     // deprecated: Default `false`. Set to `true` to turn on warning when a value exists
     // invalid: Default `false`. Set to `true` to generate errors when a value exists
     // replace_with: use with a key marked deprecated or invalid to designate a replacement
+    "APA102_DI_PIN": {"info_key": "apa102.data_pin"},
+    "APA102_CI_PIN": {"info_key": "apa102.clock_pin"},
+    "APA102_DEFAULT_BRIGHTNESS": {"info_key": "apa102.default_brightness", "value_type": "int"},
     "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"},
     "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
     "BREATHING_PERIOD": {"info_key": "backlight.breathing_period", "value_type": "int"},
@@ -25,6 +28,7 @@
     "BOOTMAGIC_LITE_COLUMN_RIGHT": {"info_key": "split.bootmagic.matrix.1", "value_type": "int"},
     "BOTH_SHIFTS_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.both_shifts_turns_on", "value_type": "bool"},
     "CAPS_WORD_IDLE_TIMEOUT": {"info_key": "caps_word.idle_timeout", "value_type": "int"},
+    "CAPS_WORD_INVERT_ON_SHIFT": {"info_key": "caps_word.invert_on_shift", "value_type": "bool"},
     "COMBO_COUNT": {"info_key": "combo.count", "value_type": "int"},
     "COMBO_TERM": {"info_key": "combo.term", "value_type": "int"},
     "DEBOUNCE": {"info_key": "debounce", "value_type": "int"},
@@ -69,7 +73,6 @@
     "PS2_DATA_PIN": {"info_key": "ps2.data_pin"},
     "RETRO_TAPPING": {"info_key": "tapping.retro", "value_type": "bool"},
     "RETRO_TAPPING_PER_KEY": {"info_key": "tapping.retro_per_key", "value_type": "bool"},
-    "RGB_DI_PIN": {"info_key": "rgblight.pin"},
     "RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"},
     "RGBLED_SPLIT": {"info_key": "rgblight.split_count", "value_type": "array.int"},
     "RGBLIGHT_LAYER_BLINK": {"info_key": "rgblight.layers.blink", "value_type": "bool"},
@@ -116,8 +119,12 @@
     "USB_MAX_POWER_CONSUMPTION": {"info_key": "usb.max_power", "value_type": "int"},
     "USB_POLLING_INTERVAL_MS": {"info_key": "usb.polling_interval", "value_type": "int"},
     "USB_SUSPEND_WAKEUP_DELAY": {"info_key": "usb.suspend_wakeup_delay", "value_type": "int"},
+    "WS2812_DI_PIN": {"info_key": "ws2812.pin"},
+    "WS2812_I2C_ADDRESS": {"info_key": "ws2812.i2c_address", "value_type": "hex"},
+    "WS2812_I2C_TIMEOUT": {"info_key": "ws2812.i2c_timeout", "value_type": "int"},
 
     // Items we want flagged in lint
+    "RGB_DI_PIN": {"info_key": "rgblight.pin", "invalid": true, "replace_with": "WS2812_DI_PIN or APA102_DI_PIN"},
     "NO_ACTION_MACRO": {"info_key": "_invalid.no_action_macro", "invalid": true},
     "NO_ACTION_FUNCTION": {"info_key": "_invalid.no_action_function", "invalid": true},
     "DESCRIPTION": {"info_key": "_invalid.usb_description", "invalid": true},
@@ -128,7 +135,7 @@
     "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
     "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "bool", "deprecated": true},
     "TAPPING_FORCE_HOLD_PER_KEY": {"info_key": "tapping.force_hold_per_key", "value_type": "bool", "deprecated": true},
-    "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "_deprecated.ignore_mod_tap_interrupt", "value_type": "bool", "deprecated": true},
+    "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "_invalid.ignore_mod_tap_interrupt", "value_type": "bool", "invalid": true},
     "IGNORE_MOD_TAP_INTERRUPT_PER_KEY": {"info_key": "_invalid.ignore_mod_tap_interrupt_per_key", "invalid": true}
 
     // USB params, need to mark as failure when specified in config.h, rather than deprecated
diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
index 7c3780504c..0b252175f3 100644
--- a/data/mappings/info_rules.hjson
+++ b/data/mappings/info_rules.hjson
@@ -17,6 +17,7 @@
     "BACKLIGHT_DRIVER": {"info_key": "backlight.driver"},
     "CAPS_WORD_ENABLE": {"info_key": "caps_word.enabled", "value_type": "bool"},
     "DEBOUNCE_TYPE": {"info_key": "build.debounce_type"},
+    "EEPROM_DRIVER": {"info_key": "eeprom.driver"},
     "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
     "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
     "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
@@ -38,6 +39,7 @@
     "PS2_ENABLE": {"info_key": "ps2.enabled", "value_type": "bool"},
     "PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"},
     "PS2_DRIVER": {"info_key": "ps2.driver"},
+    "WS2812_DRIVER": {"info_key": "ws2812.driver"},
 
     "PLATFORM_KEY": {"info_key": "platform_key", "to_json": false},
 
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 5fe31c4fb1..e26f38010a 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -248,6 +248,9 @@
     "idobo": {
         "target": "idobao/id75"
     },
+    "jacky_studio/piggy60": {
+        "target": "jacky_studio/piggy60/rev1"
+    },
     "jj40": {
         "target": "kprepublic/jj40"
     },
diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 94a94157c0..b9c64a55ec 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -71,6 +71,38 @@
         "type": "string",
         "pattern": "^[0-9a-z][0-9a-z_/]*$"
     },
+    "keycode": {
+        "type": "string",
+        "minLength": 2,
+        "maxLength": 50,
+        "pattern": "^[A-Z][A-Zs_0-9]*$"
+    },
+    "keycode_short": {
+        "type": "string",
+        "minLength": 2,
+        "maxLength": 7,
+        "pattern": "^[A-Z][A-Zs_0-9]*$"
+    },
+    "keycode_decl": {
+        "type": "object",
+        "required": [
+            "key"
+        ],
+        "properties": {
+            "key": {"$ref": "#/keycode"},
+            "label": {"$ref": "#/text_identifier"},
+            "aliases": {
+                "type": "array",
+                "minItems": 1,
+                "items": {"$ref": "#/keycode_short"}
+            }
+        }
+    },
+    "keycode_decl_array": {
+        "type": "array",
+        "minItems": 1
+        "items": {"$ref": "#/keycode_decl"}
+    },
     "mcu_pin_array": {
         "type": "array",
         "items": {"$ref": "#/mcu_pin"}
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 2afc1ed516..d608e8f796 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -35,7 +35,7 @@
         },
         "development_board": {
             "type": "string",
-            "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4", "helios"]
+            "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4", "helios", "liatris"]
         },
         "pin_compatible": {
             "type": "string",
@@ -96,6 +96,19 @@
                 "unknown"
             ]
         },
+        "apa102": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "data_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "clock_pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "default_brightness": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "maximum": 31
+                }
+            }
+        },
         "audio": {
             "type": "object",
             "additionalProperties": false,
@@ -214,7 +227,8 @@
                 "enabled": {"type": "boolean"},
                 "both_shifts_turns_on": {"type": "boolean"},
                 "double_tap_shift_turns_on": {"type": "boolean"},
-                "idle_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}
+                "idle_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "invert_on_shift": {"type": "boolean"}
             }
         },
         "combo": {
@@ -228,6 +242,11 @@
             "type": "array",
             "items": {"$ref": "qmk.definitions.v1#/filename"}
         },
+        "eeprom": {
+            "properties": {
+                "driver": {"type": "string"}
+            }
+        },
         "encoder": {
             "$ref": "#/definitions/encoder_config",
             "properties": {
@@ -246,6 +265,7 @@
                 "on_state": {"$ref": "qmk.definitions.v1#/bit"}
             }
         },
+        "keycodes": {"$ref": "qmk.definitions.v1#/keycode_decl_array"},
         "layout_aliases": {
             "type": "object",
             "additionalProperties": {"$ref": "qmk.definitions.v1#/layout_macro"}
@@ -472,7 +492,10 @@
                 },
                 "led_count": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
-                "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "pin": {
+                    "$ref": "qmk.definitions.v1#/mcu_pin",
+                    "$comment": "Deprecated: use ws2812.pin instead"
+                },
                 "rgbw": {"type": "boolean"},
                 "saturation_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "sleep": {"type": "boolean"},
@@ -686,6 +709,19 @@
                 "led": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                 "speaker": {"$ref": "qmk.definitions.v1#/mcu_pin"}
             }
+        },
+        "ws2812": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "driver": {
+                    "type": "string",
+                    "enum": ["bitbang", "custom", "i2c", "pwm", "spi", "vendor"]
+                },
+                "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "i2c_address": {"$ref": "qmk.definitions.v1#/hex_number_2d"},
+                "i2c_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}
+            }
         }
     }
 }
diff --git a/data/schemas/keycodes.jsonschema b/data/schemas/keycodes.jsonschema
index 77a8347b3b..df6ce95a83 100644
--- a/data/schemas/keycodes.jsonschema
+++ b/data/schemas/keycodes.jsonschema
@@ -8,11 +8,7 @@
             "type": "string",
             "minLength": 2,
             "maxLength": 50,
-            "pattern": "^[A-Zs_0-9]*$"
-        },
-        "hex_number_4d": {
-            "type": "string",
-            "pattern": "^0x[0-9A-F]{4}$"
+            "pattern": "^[A-Z][A-Zs_0-9]*$"
         }
     },
     "properties": {
@@ -34,10 +30,10 @@
         "keycodes": {
             "type": "object",
             "propertyNames": {
-                "$ref": "#/definitions/hex_number_4d"
+                "$ref": "qmk.definitions.v1#/hex_number_4d"
             },
             "additionalProperties": {
-                "type": "object",
+                "type": "object", // use 'qmk.definitions.v1#/keycode_decl' when problem keycodes are removed
                 "required": [
                     "key"
                 ],
diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema
index 73aa7c5c22..7233e896e9 100644
--- a/data/schemas/keymap.jsonschema
+++ b/data/schemas/keymap.jsonschema
@@ -67,6 +67,7 @@
                 }
             }
         },
+        "keycodes": {"$ref": "qmk.definitions.v1#/keycode_decl_array"},
         "config": {"$ref": "qmk.keyboard.v1"},
         "notes": {
             "type": "string"
diff --git a/docs/_summary.md b/docs/_summary.md
index 01808bd675..ce579cb071 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -41,7 +41,6 @@
     * [Keymap Overview](keymap.md)
     * Development Environments
       * [Docker Guide](getting_started_docker.md)
-      * [Vagrant Guide](getting_started_vagrant.md)
     * Flashing
       * [Flashing](flashing.md)
       * [Flashing ATmega32A (ps2avrgb)](flashing_bootloadhid.md)
diff --git a/docs/config_options.md b/docs/config_options.md
index 5bfb7c5d58..5ea71d993e 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -150,7 +150,7 @@ If you define these options you will enable the associated feature, which may in
 * `#define TAPPING_TERM_PER_KEY`
   * enables handling for per key `TAPPING_TERM` settings
 * `#define RETRO_TAPPING`
-  * tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
+  * tap anyway, even after `TAPPING_TERM`, if there was no other key interruption between press and release
   * See [Retro Tapping](tap_hold.md#retro-tapping) for details
 * `#define RETRO_TAPPING_PER_KEY`
   * enables handling for per key `RETRO_TAPPING` settings
@@ -161,9 +161,6 @@ If you define these options you will enable the associated feature, which may in
   * See [Permissive Hold](tap_hold.md#permissive-hold) for details
 * `#define PERMISSIVE_HOLD_PER_KEY`
   * enabled handling for per key `PERMISSIVE_HOLD` settings
-* `#define IGNORE_MOD_TAP_INTERRUPT`
-  * makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the `TAPPING_TERM` for both keys.
-  * See [Ignore Mod Tap Interrupt](tap_hold.md#ignore-mod-tap-interrupt) for details
 * `#define QUICK_TAP_TERM 100`
   * tap-then-hold timing to use a dual role key to repeat keycode
   * See [Quick Tap Term](tap_hold.md#quick-tap-term)
@@ -217,7 +214,7 @@ If you define these options you will enable the associated feature, which may in
 
 ## RGB Light Configuration
 
-* `#define RGB_DI_PIN D7`
+* `#define WS2812_DI_PIN D7`
   * pin the DI on the WS2812 is hooked-up to
 * `#define RGBLIGHT_LAYERS`
   * Lets you define [lighting layers](feature_rgblight.md?id=lighting-layers) that can be toggled on or off. Great for showing the current keyboard layer or caps lock state.
@@ -233,7 +230,7 @@ If you define these options you will enable the associated feature, which may in
 * `#define RGBLIGHT_SPLIT`
   * Needed if both halves of the board have RGB LEDs wired directly to the RGB output pin on the controllers instead of passing the output of the left half to the input of the right half
 * `#define RGBLED_SPLIT { 6, 6 }`
-  * number of LEDs connected that are directly wired to `RGB_DI_PIN` on each half of a split keyboard
+  * number of LEDs connected that are directly wired to the RGB pin on each half of a split keyboard
   * First value indicates number of LEDs for left half, second value is for the right half
   * When RGBLED_SPLIT is defined, RGBLIGHT_SPLIT is implicitly defined.
 * `#define RGBLIGHT_HUE_STEP 12`
diff --git a/docs/feature_caps_word.md b/docs/feature_caps_word.md
index c58d1a56e2..7f726b059d 100644
--- a/docs/feature_caps_word.md
+++ b/docs/feature_caps_word.md
@@ -90,6 +90,26 @@ by defining `IS_COMMAND()` in config.h:
 
 ## Customizing Caps Word :id=customizing-caps-word
 
+### Invert on shift :id=invert-on-shift
+
+By default, Caps Word turns off when Shift keys are pressed, considering them as
+word-breaking. Alternatively with the `CAPS_WORD_INVERT_ON_SHIFT` option,
+pressing the Shift key continues Caps Word and inverts the shift state. This
+is convenient for uncapitalizing one or a few letters within a word, for
+example with Caps Word on, typing "D, B, Shift+A, Shift+A, S" produces "DBaaS",
+or typing "P, D, F, Shift+S" produces "PDFs".
+
+Enable it by adding in config.h
+
+```c
+#define CAPS_WORD_INVERT_ON_SHIFT
+```
+
+This option works with regular Shift keys `KC_LSFT` and `KC_RSFT`, mod-tap Shift
+keys, and one-shot Shift keys. Note that while Caps Word is on, one-shot Shift
+keys behave like regular Shift keys, and have effect only while they are held.
+
+
 ### Idle timeout :id=idle-timeout
 
 Caps Word turns off automatically if no keys are pressed for
diff --git a/docs/feature_converters.md b/docs/feature_converters.md
index ec1f3915ee..b1abfa373a 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -20,11 +20,13 @@ Currently the following converters are available:
 | `promicro` | `rp2040_ce`       |
 | `promicro` | `elite_pi`        |
 | `promicro` | `helios`          |
+| `promicro` | `liatris`         |
 | `promicro` | `michi`           |
 | `elite_c`  | `stemcell`        |
 | `elite_c`  | `rp2040_ce`       |
 | `elite_c`  | `elite_pi`        |
 | `elite_c`  | `helios`          |
+| `elite_c`  | `liatris`         |
 
 See below for more in depth information on each converter.
 
@@ -87,6 +89,7 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co
 | [customMK Bonsai C4](https://shop.custommk.com/products/bonsai-c4-microcontroller-board) | `bonsai_c4`       |
 | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040)         | `elite_pi`        |
 | [0xCB Helios](https://keeb.supply/products/0xcb-helios)                                  | `helios`          |
+| [Liatris](https://splitkb.com/products/liatris)                                          | `liatris`         |
 | [Michi](https://github.com/ci-bus/michi-promicro-rp2040)                                 | `michi`           |
 
 Converter summary:
@@ -103,6 +106,7 @@ Converter summary:
 | `rp2040_ce`       | `-e CONVERT_TO=rp2040_ce`       | `CONVERT_TO=rp2040_ce`       | `#ifdef CONVERT_TO_RP2040_CE`       |
 | `elite_pi`        | `-e CONVERT_TO=elite_pi`        | `CONVERT_TO=elite_pi`        | `#ifdef CONVERT_TO_ELITE_PI`        |
 | `helios`          | `-e CONVERT_TO=helios`          | `CONVERT_TO=helios`          | `#ifdef CONVERT_TO_HELIOS`          |
+| `liatris`         | `-e CONVERT_TO=liatris`         | `CONVERT_TO=liatris`         | `#ifdef CONVERT_TO_LIATRIS`         |
 | `michi`           | `-e CONVERT_TO=michi`           | `CONVERT_TO=michi`           | `#ifdef CONVERT_TO_MICHI`           |
 
 ### Proton C :id=proton_c
@@ -167,7 +171,7 @@ The Bonsai C4 only has one on-board LED (B2), and by default, both the Pro Micro
 #define B0 PAL_LINE(GPIOA, 9)
 ```
 
-### RP2040 Community Edition - Elite-Pi and Helios :id=rp2040_ce
+### RP2040 Community Edition - Elite-Pi, Helios, and Liatris :id=rp2040_ce
 
 Feature set currently identical to [Adafruit KB2040](#kb2040).
 
@@ -184,6 +188,7 @@ If a board currently supported in QMK uses an [Elite-C](https://keeb.io/products
 | [STeMCell](https://github.com/megamind4089/STeMCell)                             | `stemcell`        |
 | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040) | `elite_pi`        |
 | [0xCB Helios](https://keeb.supply/products/0xcb-helios)                          | `helios`          |
+| [Liatris](https://splitkb.com/products/liatris)                                  | `liatris`         |
 
 Converter summary:
 
@@ -193,6 +198,7 @@ Converter summary:
 | `rp2040_ce`       | `-e CONVERT_TO=rp2040_ce`       | `CONVERT_TO=rp2040_ce`       | `#ifdef CONVERT_TO_RP2040_CE`       |
 | `elite_pi`        | `-e CONVERT_TO=elite_pi`        | `CONVERT_TO=elite_pi`        | `#ifdef CONVERT_TO_ELITE_PI`        |
 | `helios`          | `-e CONVERT_TO=helios`          | `CONVERT_TO=helios`          | `#ifdef CONVERT_TO_HELIOS`          |
+| `liatris`         | `-e CONVERT_TO=liatris`         | `CONVERT_TO=liatris`         | `#ifdef CONVERT_TO_LIATRIS`         |
 
 ### STeMCell :id=stemcell_elite
 
diff --git a/docs/feature_dynamic_macros.md b/docs/feature_dynamic_macros.md
index f5a6952b6b..8ab1bad61c 100644
--- a/docs/feature_dynamic_macros.md
+++ b/docs/feature_dynamic_macros.md
@@ -59,7 +59,7 @@ There are a number of hooks that you can use to add custom functionality and fee
 
 Note, that direction indicates which macro it is, with `1` being Macro 1, `-1` being Macro 2, and 0 being no macro. 
 
-* `dynamic_macro_record_start_user(void)` - Triggered when you start recording a macro.
+* `dynamic_macro_record_start_user(int8_t direction)` - Triggered when you start recording a macro.
 * `dynamic_macro_play_user(int8_t direction)` - Triggered when you play back a macro.
 * `dynamic_macro_record_key_user(int8_t direction, keyrecord_t *record)` - Triggered on each keypress while recording a macro.
 * `dynamic_macro_record_end_user(int8_t direction)` - Triggered when the macro recording is stopped. 
diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index 1c521a4eff..74857c265d 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -102,9 +102,9 @@ Using encoder mapping pumps events through the normal QMK keycode processing pip
 
 ## Callbacks
 
-When not using `ENCODER_MAP_ENABLE = yes`, the callback functions can be inserted into your `<keyboard>.c`:
+?> [**Default Behaviour**](https://github.com/qmk/qmk_firmware/blob/master/quantum/encoder.c#L79-#L98): all encoders installed will function as volume up (`KC_VOLU`) on clockwise rotation and volume down (`KC_VOLD`) on counter-clockwise rotation. If you do not wish to override this, no further configuration is necessary.
 
-?> Those who are adding new keyboard support where encoders are enabled at the keyboard level should include basic encoder functionality at the keyboard level (`<keyboard>.c`) using the `encoder_update_kb()` function, that way it works for QMK Configuator users and exists in general.
+If you would like the alter the default behaviour, and are not using `ENCODER_MAP_ENABLE = yes`, the callback functions can be inserted into your `<keyboard>.c`:
 
 ```c
 bool encoder_update_kb(uint8_t index, bool clockwise) {
@@ -113,9 +113,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     if (index == 0) { /* First encoder */
         if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
+            tap_code(KC_PGDN);
         } else {
-            tap_code_delay(KC_VOLD, 10);
+            tap_code(KC_PGUP);
         }
     } else if (index == 1) { /* Second encoder */
         if (clockwise) {
@@ -134,9 +134,9 @@ or `keymap.c`:
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* First encoder */
         if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
+            tap_code(KC_PGDN);
         } else {
-            tap_code_delay(KC_VOLD, 10);
+            tap_code(KC_PGUP);
         }
     } else if (index == 1) { /* Second encoder */
         if (clockwise) {
@@ -149,7 +149,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 ```
 
-!> If you return `true` in the keymap level `_user` function, it will allow the keyboard level encoder code to run on top of your own. Returning `false` will override the keyboard level function, if setup correctly. This is generally the safest option to avoid confusion.
+!> If you return `true` in the keymap level `_user` function, it will allow the keyboard/core level encoder code to run on top of your own. Returning `false` will override the keyboard level function, if setup correctly. This is generally the safest option to avoid confusion.
 
 ## Hardware
 
diff --git a/docs/feature_layers.md b/docs/feature_layers.md
index f8cb53eda4..8503603ffe 100644
--- a/docs/feature_layers.md
+++ b/docs/feature_layers.md
@@ -127,6 +127,54 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 }
 ```
 
+### Example: Keycode to cycle through layers
+
+This example shows how to implement a custom keycode to cycle through a range of layers.
+
+```c
+// Define the keycode, `QK_USER` avoids collisions with existing keycodes
+enum keycodes {
+  KC_CYCLE_LAYERS = QK_USER,
+};
+
+// 1st layer on the cycle
+#define LAYER_CYCLE_START 0
+// Last layer on the cycle
+#define LAYER_CYCLE_END   4
+
+// Add the behaviour of this new keycode
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case KC_CYCLE_LAYERS:
+      // Our logic will happen on presses, nothing is done on releases
+      if (!record->event.pressed) { 
+        // We've already handled the keycode (doing nothing), let QMK know so no further code is run unnecessarily
+        return false;
+      }
+
+      uint8_t current_layer = get_highest_layer(layer_state);
+
+      // Check if we are within the range, if not quit
+      if (curent_layer > LAYER_CYCLE_END || current_layer < LAYER_CYCLE_START) {
+        return false;
+      }
+
+      uint8_t next_layer = current_layer + 1;
+      if (next_layer > LAYER_CYCLE_END) {
+          next_layer = LAYER_CYCLE_START;
+      }
+      layer_move(next_layer);
+      return false;
+
+    // Process other keycodes normally
+    default:
+      return true;
+  }
+}
+
+// Place `KC_CYCLE_LAYERS` as a keycode in your keymap
+```
+
 Use the `IS_LAYER_ON_STATE(state, layer)` and `IS_LAYER_OFF_STATE(state, layer)` macros to check the status of a particular layer.
 
 Outside of `layer_state_set_*` functions, you can use the `IS_LAYER_ON(layer)` and `IS_LAYER_OFF(layer)` macros to check global layer state.
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 0089dc7024..c459ba4e9d 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -197,6 +197,24 @@ The Pimoroni Trackball module is a I2C based breakout board with an RGB enable t
 | `PIMORONI_TRACKBALL_DEBOUNCE_CYCLES` | (Optional) The number of scan cycles used for debouncing on the ball press.        | `20`    |
 | `PIMORONI_TRACKBALL_ERROR_COUNT`     | (Optional) Specifies the number of read/write errors until the sensor is disabled. | `10`    |
 
+### PMW3320 Sensor
+
+To use the PMW3320 sensor, add this to your `rules.mk`
+
+```make
+POINTING_DEVICE_DRIVER = pmw3320
+```
+
+The PMW3320 sensor uses a serial type protocol for communication, and requires an additional light source (it could work without one, but expect it to be out of service early).
+
+| Setting             | Description                                                         | Default                    |
+| ------------------- | ------------------------------------------------------------------- | -------------------------- |
+| `PMW3320_SCLK_PIN` | (Required) The pin connected to the clock pin of the sensor.        | `POINTING_DEVICE_SCLK_PIN` |
+| `PMW3320_SDIO_PIN` | (Required) The pin connected to the data pin of the sensor.         | `POINTING_DEVICE_SDIO_PIN` |
+| `PMW3320_CS_PIN`   | (Required) The pin connected to the cable select pin of the sensor. | `POINTING_DEVICE_CS_PIN`   |
+
+The CPI range is 500-3500, in increments of 250. Defaults to 1000 CPI.
+
 ### PMW 3360 and PMW 3389 Sensor
 
 This drivers supports both the PMW 3360 and PMW 3389 sensor as well as multiple sensors of the same type _per_ controller, so 2 can be attached at the same side for split keyboards (or unsplit keyboards).
@@ -713,7 +731,7 @@ _Note: The Cirque pinnacle track pad already implements a custom activation func
 When using a custom pointing device (overwriting `pointing_device_task`) the following code should be somewhere in the `pointing_device_task_*` stack:
 
 ```c
-void pointing_device_task(void) {
+bool pointing_device_task(void) {
     //...Custom pointing device task code
     
     // handle automatic mouse layer (needs report_mouse_t as input)
@@ -721,7 +739,7 @@ void pointing_device_task(void) {
     
     //...More custom pointing device task code
     
-    pointing_device_send();
+    return pointing_device_send();
 }
 ```
 
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 20ad4c7faf..96c1928abd 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -361,7 +361,7 @@ Configure the hardware via your `config.h`:
 
 ```c
 // The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN D7
+#define WS2812_DI_PIN D7
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 70
 ```
@@ -383,9 +383,9 @@ Configure the hardware via your `config.h`:
 
 ```c
 // The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN D7
+#define APA102_DI_PIN D7
 // The pin connected to the clock pin of the LEDs
-#define RGB_CI_PIN D6
+#define APA102_CI_PIN D6
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 70
 ```
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index 060efaf1b3..5131658ae1 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -33,12 +33,13 @@ RGBLIGHT_DRIVER = APA102
 
 At minimum you must define the data pin your LED strip is connected to, and the number of LEDs in the strip, in your `config.h`. For APA102 LEDs, you must also define the clock pin. If your keyboard has onboard RGB LEDs, and you are simply creating a keymap, you usually won't need to modify these.
 
-|Define         |Description                                                                                              |
-|---------------|---------------------------------------------------------------------------------------------------------|
-|`RGB_DI_PIN`   |The pin connected to the data pin of the LEDs                                                            |
-|`RGB_CI_PIN`   |The pin connected to the clock pin of the LEDs (APA102 only)                                             |
-|`RGBLED_NUM`   |The number of LEDs connected                                                                             |
-|`RGBLED_SPLIT` |(Optional) For split keyboards, the number of LEDs connected on each half directly wired to `RGB_DI_PIN` |
+|Define         |Description                                                              |
+|---------------|-------------------------------------------------------------------------|
+|`WS2812_DI_PIN`|The pin connected to the data pin of the LEDs (WS2812)                   |
+|`APA102_DI_PIN`|The pin connected to the data pin of the LEDs (APA102)                   |
+|`APA102_CI_PIN`|The pin connected to the clock pin of the LEDs (APA102)                  |
+|`RGBLED_NUM`   |The number of LEDs connected                                             |
+|`RGBLED_SPLIT` |(Optional) For split keyboards, the number of LEDs connected on each half|
 
 Then you should be able to use the keycodes below to change the RGB lighting to your liking.
 
diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md
index c095c8712f..1705ea9222 100644
--- a/docs/feature_split_keyboard.md
+++ b/docs/feature_split_keyboard.md
@@ -300,6 +300,12 @@ This enables transmitting the pointing device status to the master side of the s
 
 This enables triggering of haptic feedback on the slave side of the split keyboard. For DRV2605L this will send the mode, but for solenoids it is expected that the desired mode is already set up on the slave.
 
+```c
+#define SPLIT_ACTIVITY_ENABLE
+```
+
+This synchronizes the activity timestamps between sides of the split keyboard, allowing for activity timeouts to occur.
+
 ### Custom data sync between sides :id=custom-data-sync
 
 QMK's split transport allows for arbitrary data transactions at both the keyboard and user levels. This is modelled on a remote procedure call, with the master invoking a function on the slave side, with the ability to send data from master to slave, process it slave side, and send data back from slave to master.
diff --git a/docs/feature_stenography.md b/docs/feature_stenography.md
index 62d4dabf81..df4c9c6ad3 100644
--- a/docs/feature_stenography.md
+++ b/docs/feature_stenography.md
@@ -138,7 +138,7 @@ bool post_process_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t
 
 This function is called after a key has been processed, but before any decision about whether or not to send a chord. This is where to put hooks for things like, say, live displays of steno chords or keys.
 
-If `IS_PRESSED(record->event)` is false, and `n_pressed_keys` is 0 or 1, the chord will be sent shortly, but has not yet been sent. This relieves you of the need of keeping track of where a packet ends and another begins.
+If `record->event.pressed` is false, and `n_pressed_keys` is 0 or 1, the chord will be sent shortly, but has not yet been sent. This relieves you of the need of keeping track of where a packet ends and another begins.
 
 The `chord` argument contains the packet of the current chord as specified by the protocol in use. This is *NOT* simply a list of chorded steno keys of the form `[STN_E, STN_U, STN_BR, STN_GR]`. Refer to the appropriate protocol section of this document to learn more about the format of the packets in your steno protocol/mode of choice.
 
diff --git a/docs/feature_swap_hands.md b/docs/feature_swap_hands.md
index 4d0d554093..e9c1d4b7ba 100644
--- a/docs/feature_swap_hands.md
+++ b/docs/feature_swap_hands.md
@@ -47,6 +47,11 @@ const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = { 1, 0 };
 
 ### Functions :id=functions
 
-| Function             | Description                                 |
-|----------------------|---------------------------------------------|
-| `is_swap_hands_on()` | Returns true if Swap-Hands is currently on. |
+User callback functions to manipulate Swap-Hands:
+
+| Function              | Description                                 |
+|-----------------------|---------------------------------------------|
+| `swap_hands_on()`     | Turns Swap-Hands on.                        |
+| `swap_hands_off()`    | Turns Swap-Hands off.                       |
+| `swap_hands_toggle()` | Toggles Swap-Hands.                         |
+| `is_swap_hands_on()`  | Returns true if Swap-Hands is currently on. |
diff --git a/docs/getting_started_vagrant.md b/docs/getting_started_vagrant.md
deleted file mode 100644
index b5b5ce1539..0000000000
--- a/docs/getting_started_vagrant.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Vagrant Quick Start
-
-This project includes a `Vagrantfile` that will allow you to build a new firmware for your keyboard very easily without major changes to your primary operating system. This also ensures that when you clone the project and perform a build, you have the exact same environment as anyone else using the Vagrantfile to build. This makes it much easier for people to help you troubleshoot any issues you encounter.
-
-## Requirements
-
-Using the `Vagrantfile` in this repository requires you have [Vagrant](https://www.vagrantup.com/) as well as a supported provider installed:
-
-* [VirtualBox](https://www.virtualbox.org/) (Version at least 5.0.12)
-  * Sold as 'the most accessible platform to use Vagrant'
-* [VMware Workstation](https://www.vmware.com/products/workstation) and [Vagrant VMware plugin](https://www.vagrantup.com/vmware)
-  * The (paid) VMware plugin requires a licensed copy of VMware Workstation/Fusion
-* [Docker](https://www.docker.com/)
-
-Other than having Vagrant, a suitable provider installed and possibly a restart of your computer afterwards, you can simple run a 'vagrant up' anywhere inside the folder where you checked out this project and it will start an environment (either a virtual machine or container) that contains all the tools required to build this project. There is a post Vagrant startup hint that will get you off on the right foot, otherwise you can also reference the build documentation below.
-
-## Flashing the Firmware
-
-The "easy" way to flash the firmware is using a tool from your host OS:
-
-* [QMK Toolbox](https://github.com/qmk/qmk_toolbox) (recommended)
-* [Teensy Loader](https://www.pjrc.com/teensy/loader.html)
-
-If you want to program via the command line you can uncomment the ['modifyvm'] lines in the Vagrantfile to enable the USB passthrough into Linux and then program using the command line tools like dfu-util/dfu-programmer or you can install the Teensy CLI version.
-
-## Vagrantfile Overview
-The development environment is configured to run the QMK Docker image, `qmkfm/qmk_cli`. This not only ensures predictability between systems, it also mirrors the CI environment.
-
-## FAQ
-
-### Why am I seeing issues under Virtualbox?
-Certain versions of Virtualbox 5 appear to have an incompatibility with the Virtualbox extensions installed in the boxes in this Vagrantfile. If you encounter any issues with the /vagrant mount not succeeding, please upgrade your version of Virtualbox to at least 5.0.12. **Alternately, you can try running the following command:**
-
-```
-vagrant plugin install vagrant-vbguest
-```
-
-### How do I remove an existing environment?
-Finished with your environment? From anywhere inside the folder where you checked out this project, Execute:
-
-```
-vagrant destroy
-```
-
-### What if I want to use Docker directly?
-Want to benefit from the Vagrant workflow without a virtual machine? The Vagrantfile is configured to bypass running a virtual machine, and run the container directly. Execute the following when bringing up the environment to force the use of Docker:
-```
-vagrant up --provider=docker
-```
-
-### How do I access the virtual machine instead of the Docker container?
-Execute the following to bypass the `vagrant` user booting directly to the official qmk builder image:
-
-```
-vagrant ssh -c 'sudo -i'
-```
diff --git a/docs/ja/_summary.md b/docs/ja/_summary.md
index 8516a5eaaa..e49853bfd4 100644
--- a/docs/ja/_summary.md
+++ b/docs/ja/_summary.md
@@ -38,7 +38,6 @@
     * [キーマップ�概�](ja/keymap.md)
     * 開発環境
       * [Docker �ガイド](ja/getting_started_docker.md)
-      * [Vagrant �ガイド](ja/getting_started_vagrant.md)
     * 書�込�
       * [書�込�](ja/flashing.md)
       * [ATmega32A �書�込� (ps2avrgb)](ja/flashing_bootloadhid.md)
diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md
index 6135721a42..4f9f1f2770 100644
--- a/docs/ja/config_options.md
+++ b/docs/ja/config_options.md
@@ -159,9 +159,6 @@ QMK ã�§ã�®å…¨ã�¦ã�®åˆ©ç”¨å�¯èƒ½ã�ªè¨­å®šã�«ã�¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�Œã�‚ã‚Šã�¾ã�™ã€‚ã
   * 詳細� [Permissive Hold](ja/tap_hold.md#permissive-hold) を見�����
 * `#define PERMISSIVE_HOLD_PER_KEY`
   * キー��� `PERMISSIVE_HOLD` 設定�処�を有効����
-* `#define IGNORE_MOD_TAP_INTERRUPT`
-  * 両方�キー� `TAPPING_TERM` を�用�る����ホールド時�他�キー�変��るキーを使��ローリングコンボ (zx) を�る�����るよ�����
-  * 詳細� [Ignore Mod Tap Interrupt](ja/tap_hold.md#ignore-mod-tap-interrupt) を見�����
 * `#define TAPPING_FORCE_HOLD`
   * タップ�れ�直後��デュアルロールキーを修飾����使用��るよ�����
   * [Tapping Force Hold](ja/tap_hold.md#tapping-force-hold)を見�����
diff --git a/docs/ja/feature_dynamic_macros.md b/docs/ja/feature_dynamic_macros.md
index 3cff788007..fa1a1df931 100644
--- a/docs/ja/feature_dynamic_macros.md
+++ b/docs/ja/feature_dynamic_macros.md
@@ -64,7 +64,7 @@ QMK ã�¯ã��ã�®å ´ã�§ä½œã‚‰ã‚Œã�Ÿä¸€æ™‚çš„ã�ªãƒžã‚¯ãƒ­ã‚’サãƒ�ートã�—ã�¾ã�™ã€‚ã
 
 direction ���マクロ��る�を示����注�������。`1` �マクロ 1�`-1` �マクロ 2�0 �マクロ無���。
 
-* `dynamic_macro_record_start_user(void)` - マクロ�記録を開始�る時�起動�れ��。
+* `dynamic_macro_record_start_user(int8_t direction)` - マクロ�記録を開始�る時�起動�れ��。
 * `dynamic_macro_play_user(int8_t direction)` - マクロを�生�る時�起動�れ��。
 * `dynamic_macro_record_key_user(int8_t direction, keyrecord_t *record)` - マクロ�記録中��キー押下�起動�れ��。
 * `dynamic_macro_record_end_user(int8_t direction)` - マクロ�記録を�止��時�起動�れ��。
diff --git a/docs/ja/feature_stenography.md b/docs/ja/feature_stenography.md
index b280084ae3..9551221696 100644
--- a/docs/ja/feature_stenography.md
+++ b/docs/ja/feature_stenography.md
@@ -80,7 +80,7 @@ bool process_steno_user(uint16_t keycode, keyrecord_t *record) { return true; }
 bool post_process_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[6], int8_t pressed);
 ```
 
-��関数�キー�処��れ�後����コードを�信�る����を決�る��呼�出�れ��。`IS_PRESSED(record->event)` � false ��`pressed` � 0 ��� 1 �場���コード��も���信�れ�������信�れ�����ん。���速記コード�る��キー�ライブ表示���フックを�置�る場所��。
+��関数�キー�処��れ�後����コードを�信�る����を決�る��呼�出�れ��。`record->event.pressed` � false ��`pressed` � 0 ��� 1 �場���コード��も���信�れ�������信�れ�����ん。���速記コード�る��キー�ライブ表示���フックを�置�る場所��。
 
 
 ## キーコードリファレンス :id=keycode-reference
diff --git a/docs/ja/getting_started_vagrant.md b/docs/ja/getting_started_vagrant.md
deleted file mode 100644
index 0888b7f311..0000000000
--- a/docs/ja/getting_started_vagrant.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Vagrant クイックスタート
-
-<!---
-  original document: 0.12.43:docs/getting_started_vagrant.md
-  git diff 0.12.43 HEAD -- docs/getting_started_vagrant.md | cat
--->
-
-��プロジェクト��プライマリオペレーティングシステム�大��変更を加�る����キーボード�新��ファームウェアを�常�簡��構築�る�����る `Vagrantfile` を����。�れ������プロジェクトをクローン�ビルドを実行��時��ビルド���� Vagrantfile を使���る他�ユーザ�全���環境を����も�証���。�れ�より�人々����������題�解決をより簡��行�るよ���り��。
-
-## 必�事項
-
-��リ�ジトリ内� `Vagrantfile` を使����[Vagrant](https://www.vagrantup.com/) �よ�サ�ート�れるプロ�イダ�インストール�れ��る必���り��:
-
-* [VirtualBox](https://www.virtualbox.org/) (�ージョン 5.0.12 以�)
-   * 「Vagrant を使����最もアクセス�や��プラットフォーム�����れ����。
-* [VMware Workstation](https://www.vmware.com/products/workstation) �よ� [Vagrant VMware プラグイン](https://www.vagrantup.com/vmware)
-   * (有料) VMware プラグイン���ライセンス�れ� VMware Workstation/Fusion �コピー�必���。
-* [Docker](https://www.docker.com/)
-
-Vagrant 以外���切�プロ�イダ�インストール�れ���後���ら�コンピュータを�起動�る����プロジェクトを�ェックアウト��フォルダ内�任��場所� 'vagrant up' を�純�実行�る��������プロジェクトをビルド�る��必��全��ツール���れる環境(仮想マシン�る��コンテナ)�開始�れ��。Vagrant 起動時����始�る���ヒント�表示�れ�����れ以外��以下�ビルドドキュメントを�照�る��も����。
-
-## ファームウェア�書�込�
-
-ファームウェアを書�込む「簡���方法��ホスト OS �らツールを使�����:
-
-* [QMK Toolbox](https://github.com/qmk/qmk_toolbox) (推奨)
-* [Teensy ローダー](https://www.pjrc.com/teensy/loader.html)
-
-コマンドライン�プログラム���場���Vagranfile � ['modifyvm'] 行�コメントを解除�� Linux �� USB パススルーを有効���dfu-util/dfu-programmer �よ��コマンドラインツールを使��プログラム�る�������。�る�� Teensy CLI �ージョンをインストール�る�������。
-
-## Vagrantfile �概�
-開発環境� QMK Docker イメージ�`qmkfm/qmk_cli` を実行�るよ��設定�れ����。�れ�システム間�予測�能性��証�れる������CI 環境もミラー�れ��。
-
-## FAQ
-
-### Virtualbox ��題�発生�る�������？
-Virtualbox 5 �特定��ージョン��� Vagrantfile �ボックス�インストール�れ��る Virtualbox �拡張機能�互�性�無�よ���。/vagrant �マウント��題�発生��場���Virtualbox ��ージョンを少���も 5.0.12 �アップグレード������。**����以下�コマンドを実行���る�������:**
-
-```console
-vagrant plugin install vagrant-vbguest
-```
-
-### 既存�環境を削除�る�����れ������？
-����環境��作業�完了�����？��プロジェクトを�ェックアウト��フォルダ�中����ら�も�以下を実行������:
-
-```console
-vagrant destroy
-```
-
-### Docker を直接使���場��������？
-仮想マシン無�� Vagrant �ワークフローを活用������？Vagrantfile �仮想マシン�実行を�イパス��コンテナを直接実行�るよ��設定�れ����。Docker を強制的�使�よ��環境を立�上�る場���以下を実行������:
-```console
-vagrant up --provider=docker
-```
-
-### Docker コンテナ����仮想マシン�アクセス�る�����れ������？
-以下を実行���公�� QMK ビルダーイメージ�ら直接起動�る `vagrant` ユーザを�イパス�るよ�����:
-
-```console
-vagrant ssh -c 'sudo -i'
-```
diff --git a/docs/ja/tap_hold.md b/docs/ja/tap_hold.md
index ac64fe6ce3..00b80c8b22 100644
--- a/docs/ja/tap_hold.md
+++ b/docs/ja/tap_hold.md
@@ -63,8 +63,6 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
 
 通常��れら全�を `TAPPING_TERM` (デフォルト: 200ms) 内�行���ファームウェア�ホストシステム�よ�� `ax` ���登録�れ��。許容ホールドを有効��る��別�キー�タップ�れ�場��モッドタップキーを修飾キー�見��よ��処�を変更�� `X` (`SHIFT`+`x`)  �登録�れ��。
 
-?> `モッドタップ割り込��無視`を有効����る場���れ�より両方�動��変更�れ��。通常�キー���最��キー�最��放�れ�場���る��両方�キー�  `TAPPING_TERM` より長�ホールド�れ�場���修飾キー�追加�れ��。
-
 ��機能をより細��制御�る����以下を `config.h` �追加�る�������:
 
 ```c
@@ -84,32 +82,6 @@ bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
 }
 ```
 
-## モッドタップ割り込��無視
-
-��設定を有効��る����れを `config.h` �追加������:
-
-```c
-#define IGNORE_MOD_TAP_INTERRUPT
-```
-
-許容ホールド��様���れ�高速�タイピスト����ファームウェア�処�方法を変更���。モッドタップキーを押��他�キーを押��モッドタップキーを放��通常�キーを放���`TAPPING_TERM` 内�押�れ�場��も�通常�モッド�通常�キー�出力�れ��。�れ��ローリングコンボキーや�頻��使用�るキー(例���`RCTL_T(KC_QUOT)`)�モッドタップを使�高速�タイピスト��望�����場���り��。
-
-`モッドタップ割り込��無視`を設定�る���両方�キーを `TAPPING_TERM` �間ホールド�る��(��修飾キー�)ホールド機能を実行�る必���り��。
-
-例��:
-
-- `SFT_T(KC_A)` を押�
-- `KC_X` を押�
-- `SFT_T(KC_A)` を放�
-- `KC_X` を放�
-
-通常��れ�大文字� `X` (`SHIFT`+`x`)����モッド + キーを�信���。`モッドタップ割り込��無視` を有効��る��ホールドアクションを登録�る���両方�キーを `TAPPING_TERM` �間ホールド�る必���り��。��場��素早�タップ� `ax` を�信�����両方をホールド�る��大文字� `X`  (`SHIFT`+`x`) を出力���。
-
-
-?> __注�__: �れ�モディファイア���関係��レイヤー切り替�キー��関係���ん。
-
-?> `許容ホールド`を有効��る���れ�両方���よ��動作�る�を変更���。通常�キー���最��キー�最��放�れ�場���る��両方�キー�  `TAPPING_TERM` より長�ホールド�れ�場���修飾キー�追加�れ��。
-
 ## タッピング強制ホールド
 
 `タッピング強制ホールド` を有効��る���以下を `config.h` �追加���:
diff --git a/docs/mod_tap.md b/docs/mod_tap.md
index ca3a2752c7..8b953d76b4 100644
--- a/docs/mod_tap.md
+++ b/docs/mod_tap.md
@@ -111,8 +111,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 ```
 
-Enabling `IGNORE_MOD_TAP_INTERRUPT` is recommended when using Mod-Tap on alphanumeric keys to avoid hold function taking precendence when the next key is pressed quickly. See [Ignore Mod Tap Interrupt](tap_hold.md#ignore-mod-tap-interrupt) for more details.
-
 ### Changing both tap and hold
 
 This last example implements custom tap and hold function with `LT(0,KC_NO)` to create a single copy-on-tap, paste-on-hold key:
diff --git a/docs/newbs_building_firmware_workflow.md b/docs/newbs_building_firmware_workflow.md
index e6895252aa..51ce304901 100644
--- a/docs/newbs_building_firmware_workflow.md
+++ b/docs/newbs_building_firmware_workflow.md
@@ -95,7 +95,7 @@ on: [push, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
     strategy:
       fail-fast: false
       matrix:
diff --git a/docs/quantum_painter.md b/docs/quantum_painter.md
index ac37053c79..acb9d1d384 100644
--- a/docs/quantum_painter.md
+++ b/docs/quantum_painter.md
@@ -32,16 +32,18 @@ Supported devices:
 
 ## Quantum Painter Configuration :id=quantum-painter-config
 
-| Option                                   | Default | Purpose                                                                                                                                     |
-|------------------------------------------|---------|---------------------------------------------------------------------------------------------------------------------------------------------|
-| `QUANTUM_PAINTER_NUM_IMAGES`             | `8`     | The maximum number of images/animations that can be loaded at any one time.                                                                 |
-| `QUANTUM_PAINTER_NUM_FONTS`              | `4`     | The maximum number of fonts that can be loaded at any one time.                                                                             |
-| `QUANTUM_PAINTER_CONCURRENT_ANIMATIONS`  | `4`     | The maximum number of animations that can be executed at the same time.                                                                     |
-| `QUANTUM_PAINTER_LOAD_FONTS_TO_RAM`      | `FALSE` | Whether or not fonts should be loaded to RAM. Relevant for fonts stored in off-chip persistent storage, such as external flash.             |
-| `QUANTUM_PAINTER_PIXDATA_BUFFER_SIZE`    | `32`    | The limit of the amount of pixel data that can be transmitted in one transaction to the display. Higher values require more RAM on the MCU. |
-| `QUANTUM_PAINTER_SUPPORTS_256_PALETTE`   | `FALSE` | If 256-color palettes are supported. Requires significantly more RAM on the MCU.                                                            |
-| `QUANTUM_PAINTER_SUPPORTS_NATIVE_COLORS` | `FALSE` | If native color range is supported. Requires significantly more RAM on the MCU.                                                             |
-| `QUANTUM_PAINTER_DEBUG`                  | _unset_ | Prints out significant amounts of debugging information to CONSOLE output. Significant performance degradation, use only for debugging.     |
+| Option                                   | Default | Purpose                                                                                                                                                                                      |
+|------------------------------------------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `QUANTUM_PAINTER_DISPLAY_TIMEOUT`        | `30000` | This controls the amount of time (in milliseconds) that all displays will remain on after the last user input. If set to `0`, the display will remain on indefinitely.                       |
+| `QUANTUM_PAINTER_TASK_THROTTLE`          | `1`     | This controls the amount of time (in milliseconds) that the Quantum Painter internal task will wait between each execution. Affects animations, display timeout, and LVGL timing if enabled. |
+| `QUANTUM_PAINTER_NUM_IMAGES`             | `8`     | The maximum number of images/animations that can be loaded at any one time.                                                                                                                  |
+| `QUANTUM_PAINTER_NUM_FONTS`              | `4`     | The maximum number of fonts that can be loaded at any one time.                                                                                                                              |
+| `QUANTUM_PAINTER_CONCURRENT_ANIMATIONS`  | `4`     | The maximum number of animations that can be executed at the same time.                                                                                                                      |
+| `QUANTUM_PAINTER_LOAD_FONTS_TO_RAM`      | `FALSE` | Whether or not fonts should be loaded to RAM. Relevant for fonts stored in off-chip persistent storage, such as external flash.                                                              |
+| `QUANTUM_PAINTER_PIXDATA_BUFFER_SIZE`    | `32`    | The limit of the amount of pixel data that can be transmitted in one transaction to the display. Higher values require more RAM on the MCU.                                                  |
+| `QUANTUM_PAINTER_SUPPORTS_256_PALETTE`   | `FALSE` | If 256-color palettes are supported. Requires significantly more RAM on the MCU.                                                                                                             |
+| `QUANTUM_PAINTER_SUPPORTS_NATIVE_COLORS` | `FALSE` | If native color range is supported. Requires significantly more RAM on the MCU.                                                                                                              |
+| `QUANTUM_PAINTER_DEBUG`                  | _unset_ | Prints out significant amounts of debugging information to CONSOLE output. Significant performance degradation, use only for debugging.                                                      |
 
 Drivers have their own set of configurable options, and are described in their respective sections.
 
diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md
index 62db7f2471..ce9e43cdae 100644
--- a/docs/squeezing_avr.md
+++ b/docs/squeezing_avr.md
@@ -194,6 +194,7 @@ That said, there are a number of Pro Micro replacements with ARM controllers:
 * [Blok](https://boardsource.xyz/store/628b95b494dfa308a6581622)
 * [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040)
 * [0xCB Helios](https://keeb.supply/products/0xcb-helios) ([Open Source](https://github.com/0xCB-dev/0xCB-Helios), DIY/PCBA/Shop)
+* [Liatris](https://splitkb.com/products/liatris)
 * [Michi](https://github.com/ci-bus/michi-promicro-rp2040)
 
 There are other, non-Pro Micro compatible boards out there. The most popular being:
diff --git a/docs/tap_hold.md b/docs/tap_hold.md
index 348e2655eb..cdc1cfeca7 100644
--- a/docs/tap_hold.md
+++ b/docs/tap_hold.md
@@ -130,20 +130,18 @@ Note that until the tap-or-hold decision completes (which happens when either th
 
 To better illustrate the tap-or-hold decision modes, let us compare the expected output of each decision mode in a handful of tapping scenarios involving a mod-tap key (`LSFT_T(KC_A)`) and a regular key (`KC_B`) with the `TAPPING_TERM` set to 200ms.
 
-By default, mod-taps behave like `HOLD_ON_OTHER_KEY_PRESS`, while layer-taps behave like "Ignore Interrupt" out of the box. If you want "Ignore Interrupt"-like behaviour for mod-taps, you must enable `IGNORE_MOD_TAP_INTERRUPT`, or return `false` in the `get_hold_on_other_key_press` function for all mod-taps.
-
 Note: "`kc` held" in the "Physical key event" column means that the key wasn't physically released yet at this point in time.
 
 #### Distinct taps (AABB) :id=distinct-taps
 
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event |    Default     | `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
 |------|--------------------|----------------|-------------------|----------------------------|
 | 0    | `LSFT_T(KC_A)` down|                |                   |                            |
 | 199  | `LSFT_T(KC_A)` up  | a              | a                 |  a                         |
 | 210  | `KC_B`      down   | ab             | ab                |  ab                        |
 | 220  | `KC_B`      up     | ab             | ab                |  ab                        |
 
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event |    Default     | `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
 |------|--------------------|----------------|-------------------|----------------------------|
 | 0    | `LSFT_T(KC_A)` down|                |                   |                            |
 | 200  | `LSFT_T(KC_A)` held|<kbd>Shift</kbd>| <kbd>Shift</kbd>  | <kbd>Shift</kbd>           |
@@ -153,14 +151,14 @@ Note: "`kc` held" in the "Physical key event" column means that the key wasn't p
 
 #### Nested tap (ABBA) :id=nested-tap
 
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event |    Default     | `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
 |------|--------------------|----------------|-------------------|----------------------------|
 | 0    | `LSFT_T(KC_A)` down|                |                   |                            |
 | 110  | `KC_B` down        |                |                   | B                          |
 | 120  | `KC_B` up          |                | B                 | B                          |
 | 199  | `LSFT_T(KC_A)` up  | ab             | B                 | B                          |
 
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event |    Default     | `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
 |------|--------------------|----------------|-------------------|----------------------------|
 | 0    | `LSFT_T(KC_A)` down|                |                   |                            |
 | 110  | `KC_B` down        |                |                   | B                          |
@@ -168,7 +166,7 @@ Note: "`kc` held" in the "Physical key event" column means that the key wasn't p
 | 200  | `LSFT_T(KC_A)` held| B              | B                 | B                          |
 | 210  | `LSFT_T(KC_A)` up  | B              | B                 | B                          |
 
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event |    Default     | `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
 |------|--------------------|----------------|-------------------|----------------------------|
 | 0    | `LSFT_T(KC_A)` down|                |                   |                            |
 | 200  | `LSFT_T(KC_A)` held|<kbd>Shift</kbd>| <kbd>Shift</kbd>  | <kbd>Shift</kbd>           |
@@ -178,14 +176,14 @@ Note: "`kc` held" in the "Physical key event" column means that the key wasn't p
 
 #### Rolling keys (ABAB) :id=rolling-keys
 
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event |    Default     | `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
 |------|--------------------|----------------|-------------------|----------------------------|
 | 0    | `LSFT_T(KC_A)` down|                |                   |                            |
 | 110  | `KC_B` down        |                |                   | B                          |
 | 130  | `LSFT_T(KC_A)` up  | ab             | ab                | B                          |
 | 140  | `KC_B` up          | ab             | ab                | B                          |
 
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event |    Default     | `PERMISSIVE_HOLD` |  `HOLD_ON_OTHER_KEY_PRESS` |
 |------|--------------------|----------------|-------------------|----------------------------|
 | 0    | `LSFT_T(KC_A)` down|                |                   |                            |
 | 110  | `KC_B` down        |                |                   | B                          |
@@ -241,10 +239,8 @@ Example sequence 3 (Mod Tap):
   |       +--------------+    |        |
   +---------------------------|--------+
 ```
-Based on previous examples, you might have expected the output of the above sequence to be `KC_A` `KC_X`
-since `SFT_T(KC_A)` is NOT held longer than the `TAPPING_TERM`.
-However, the actual output would be capital `X` (`SHIFT` + `x`) due to reasons
-explained under [Ignore Mod Tap Interrupt](#ignore-mod-tap-interrupt).
+In the above sequence, `SFT_T(KC_A)` has been released before the end of its `TAPPING_TERM` and as such will be interpreted as `KC_A`,
+followed by any key event that happened after the initial press of `SFT_T(KC_A)`. In this instance, the output would be `KC_A` `KC_X`.
 
 ### Permissive Hold
 
@@ -379,73 +375,6 @@ bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
 }
 ```
 
-
-## Ignore Mod Tap Interrupt
-
-To enable this setting, add this to your `config.h`:
-
-```c
-#define IGNORE_MOD_TAP_INTERRUPT
-```
-
-?> This option affects only the Mod Tap keys; it does not affect other dual-role keys such as Layer Tap.
-
-By default, the tap-or-hold decision for Mod Tap keys strongly prefers the hold action.  If you press a Mod Tap key, then press another key while still holding the Mod Tap key down, the Mod Tap press will be handled as a modifier hold even if the Mod Tap key is then released within the tapping term, and irrespective of the order in which those keys are released.  Using options such as `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS` will not affect the functionality of Mod Tap keys in a major way (these options would still affect the delay until the common code for dual-role keys finishes its tap-or-hold decision, but then the special code for Mod Tap keys will override the result of that decision and choose the hold action if another key was pressed).  In fact, by default, the tap-or-hold decision for Mod Tap keys is done in the same way as if the `HOLD_ON_OTHER_KEY_PRESS` option was enabled, but without the decreased delay provided by `HOLD_ON_OTHER_KEY_PRESS`.
-
-If the `IGNORE_MOD_TAP_INTERRUPT` option is enabled, Mod Tap keys are no longer treated as a special case, and their behavior will match the behavior of other dual-role keys such as Layer Tap.  Then the behavior of Mod Tap keys can be further tuned using other options such as `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS`.
-
-An example of a sequence that will be affected by the `IGNORE_MOD_TAP_INTERRUPT` option (assuming that options like `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS` are not enabled):
-
-- `SFT_T(KC_A)` Down
-- `KC_X` Down
-- `SFT_T(KC_A)` Up
-- `KC_X` Up
-
-```
-                         TAPPING_TERM
-  +---------------------------|--------+
-  | +-------------+           |        |
-  | | SFT_T(KC_A) |           |        |
-  | +-------------+           |        |
-  |       +--------------+    |        |
-  |       | KC_X         |    |        |
-  |       +--------------+    |        |
-  +---------------------------|--------+
-```
-
-Normally, this would send a capital `X` (`SHIFT`+`x`), even if the sequence is performed faster than the `TAPPING_TERM`.  However, if the `IGNORE_MOD_TAP_INTERRUPT` option is enabled, the `SFT_T(KC_A)` key must be held longer than the `TAPPING_TERM` to register the hold action.  A quick tap will output `ax` in this case, while a hold will still output a capital `X` (`SHIFT`+`x`).
-
-However, if the `HOLD_ON_OTHER_KEY_PRESS` option is enabled in addition to `IGNORE_MOD_TAP_INTERRUPT`, the above sequence will again send a capital `X` (`SHIFT`+`x`) even if performed faster than the `TAPPING_TERM`.  The difference from the default configuration is that by default the host will receive the key events only after the `SFT_T(KC_A)` key is released, but with the `HOLD_ON_OTHER_KEY_PRESS` option, the host will start receiving key events when the `KC_X` key is pressed.
-
-For more granular control of this feature, you can add the following to your `config.h`:
-
-```c
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-```
-
-?> This option affects *all* dual-role keys.
-
-You can then add the following function to your keymap:
-
-```c
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case SFT_T(KC_SPC):
-            // Do not force the mod-tap key press to be handled as a modifier
-            // if any other key was pressed while the mod-tap key is held down.
-            return false;
-        default:
-            // Force the dual-role key press to be handled as a modifier if any
-            // other key was pressed while the mod-tap key is held down.
-            return true;
-    }
-}
-```
-
-Note that you must return `false` in `get_hold_on_other_key_press` in order to apply `IGNORE_MOD_TAP_INTERRUPT` for a certain mod-tap key.
-
-?> `IGNORE_MOD_TAP_INTERRUPT[_PER_KEY]` is being progressively phased out to align the (default) behavior and configuration of mod-taps with the rest of dual-role keys.
-
 ## Quick Tap Term
 
 When the user holds a key after tapping it, the tapping function is repeated by default, rather than activating the hold function. This allows keeping the ability to auto-repeat the tapping function of a dual-role key. `QUICK_TAP_TERM` enables fine tuning of that ability. If set to `0`, it will remove the auto-repeat ability and activate the hold function instead.
diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md
index 5942da28d1..f8cad20ce0 100644
--- a/docs/ws2812_driver.md
+++ b/docs/ws2812_driver.md
@@ -72,12 +72,12 @@ WS2812_DRIVER = i2c
 
 Configure the hardware via your config.h:
 ```c
-#define WS2812_ADDRESS 0xb0 // default: 0xb0
-#define WS2812_TIMEOUT 100 // default: 100
+#define WS2812_I2C_ADDRESS 0xB0 // default: 0xB0
+#define WS2812_I2C_TIMEOUT 100 // default: 100
 ```
 
 ### SPI
-Targeting STM32 boards where WS2812 support is offloaded to an SPI hardware device. The advantage is that the use of DMA offloads processing of the WS2812 protocol from the MCU. `RGB_DI_PIN` for this driver is the configured SPI MOSI pin. Due to the nature of repurposing SPI to drive the LEDs, the other SPI pins, MISO and SCK, **must** remain unused. To configure it, add this to your rules.mk:
+Targeting STM32 boards where WS2812 support is offloaded to an SPI hardware device. The advantage is that the use of DMA offloads processing of the WS2812 protocol from the MCU. `WS2812_DI_PIN` for this driver is the configured SPI MOSI pin. Due to the nature of repurposing SPI to drive the LEDs, the other SPI pins, MISO and SCK, **must** remain unused. To configure it, add this to your rules.mk:
 
 ```make
 WS2812_DRIVER = spi
@@ -183,7 +183,7 @@ This can be configured for bitbang, PWM and SPI.
 
 Note: This only applies to STM32 boards.
 
- To configure the `RGB_DI_PIN` to open drain configuration add this to your config.h file: 
+ To configure the `WS2812_DI_PIN` to open drain configuration add this to your config.h file: 
 ```c
 #define WS2812_EXTERNAL_PULLUP
 ```
diff --git a/docs/zh-cn/_summary.md b/docs/zh-cn/_summary.md
index 3baee6dc2e..b8c26ac275 100644
--- a/docs/zh-cn/_summary.md
+++ b/docs/zh-cn/_summary.md
@@ -42,7 +42,6 @@
     * [键映射总览](zh-cn/keymap.md)
     * 开�环境
       * [Docker指�](zh-cn/getting_started_docker.md)
-      * [Vagrant指�](zh-cn/getting_started_vagrant.md)
     * 刷写(Flashing)
       * [刷写](zh-cn/flashing.md)
       * [刷写ATmega32A (ps2avrgb)](zh-cn/flashing_bootloadhid.md)
@@ -188,5 +187,5 @@
     * [Midi辅助功能](zh-cn/internals/midi_util.md)
     * [��函数](zh-cn/internals/send_functions.md)
     * [Sysex工具](zh-cn/internals/sysex_tools.md)
-    
+
 <!--fromen:20211014-12:00(GMT+8) commit 04cf161aa01fd433b5dae69d9fd31569ed5dca59-->
diff --git a/docs/zh-cn/getting_started_vagrant.md b/docs/zh-cn/getting_started_vagrant.md
deleted file mode 100644
index 5e5de44552..0000000000
--- a/docs/zh-cn/getting_started_vagrant.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Vagrant快速上手指引
-
-<!---
-  original document: 0.15.12:docs/getting_started_vagrant.md
-  git diff 0.15.12 HEAD -- docs/getting_started_vagrant.md | cat
--->
-
-本工程包�一份 `Vagrantfile`，�以方便地在�更改你系统环境情况下完�新固件文件的构建工作。这�时也��了在你拉�该工程代��的编译环境与也使用Vagrantfile的其它人的一致。当你需�其他人�助你排查�到的问题时会方便很多。
-
-## 需求
-
-本工程中的 `Vagrantfile` 需�安装[Vagrant](https://www.vagrantup.com/)以��用的虚拟机�务：
-
-* [VirtualBox](https://www.virtualbox.org/) (5.0.12�以�版本)
-  * �点是'最适用于Vagrant的平�'
-* [VMware Workstation](https://www.vmware.com/products/workstation) � [Vagrant VMware�件](https://www.vagrantup.com/vmware)
-  * （付费购买的）VMware�件需�在�过正版授�的VMware Workstation/Fusion上�行
-* [Docker](https://www.docker.com/)
-
-安装了Vagrant之�，在安装�适的虚拟机�务��能需���机器。拉�本工程�在工程目录下执行 'vagrant up' 将�动一个包�了所有本工程所需工具的构建环境（虚拟机或是容器）。最�会有一个vagrant�动�示告知你一切正常就绪，�则你也�以�考一下下�的构建文档。
-
-## 刷写固件
-
-比较“简��的方案是在你的宿主系统上借助以下工具刷写固件：
-
-* [QMK工具箱](https://github.com/qmk/qmk_toolbox) (推�)
-* [Teensy Loader](https://www.pjrc.com/teensy/loader.html)
-
-如果你希望通过命令行进行编程工作，�以在Vagrantfile中�消掉['modifyvm']的注释以�许USB直通到Linux环境，既�以使用dfu-util/dfu-programmer之类的命令行工具进行编程工作，或是安装Teensy的命令行版本。
-
-## Vagrantfile概览
-开�环境被�置为�行QMK Docker镜� `qmkfm/qmk_cli`，�仅让�系统下的功能预期一致，也是我们CI环境的镜�。
-
-## FAQ
-
-### 为什么我的VirtualBox环境会有问题？
-VirtualBox 5的�些版本与工程中Vagrantfile中指定的VirtualBox扩展存在兼容问题。如果你�到了/vagrant挂载��功的问题，请�级VirtualBox至5.0.12或更高版本。**或者，�以�试执行如下命令：**
-
-```console
-vagrant plugin install vagrant-vbguest
-```
-
-### 如何移除一个现有环境？
-��需�这个环境了是�？在本工程目录下的任何�置，执行：
-
-```console
-vagrant destroy
-```
-
-### 如果我是想直接用Docker呢？
-想在�使用虚拟机技术的情况下也能使用Vagrant工作�？Vagrangfile已�置为�许绕过�行虚拟机，直接�行容器。通过如下方�执行命令�以强制使用Docker��动环境：
-```console
-vagrant up --provider=docker
-```
-
-### 如何访问虚拟机环境而�Docker容器？
-通过如下方法跳过 `vagrant` 的用户�始化过程以在QMK构建镜�中直接执行：
-
-```console
-vagrant ssh -c 'sudo -i'
-```
diff --git a/docs/zh-cn/mod_tap.md b/docs/zh-cn/mod_tap.md
index 5bf18a1527..9dc59bfb79 100644
--- a/docs/zh-cn/mod_tap.md
+++ b/docs/zh-cn/mod_tap.md
@@ -117,8 +117,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 ```
 
-在数字�字�键上使用Mod-Tap时推��用 `IGNORE_MOD_TAP_INTERRUPT`，以��在快速按下下一个键时��功能优先级。��[忽略Mod Tap中断](zh-cn/tap_hold.md#ignore-mod-tap-interrupt)。
-
 ### �时改�点击和按�功能
 
 最�一个例�通过 `LT(0,KC_NO)` 实现了点击�制，按�粘贴的功能：
diff --git a/drivers/lcd/hd44780.h b/drivers/lcd/hd44780.h
index 9e43339344..402217a547 100644
--- a/drivers/lcd/hd44780.h
+++ b/drivers/lcd/hd44780.h
@@ -21,9 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdbool.h>
 
 /**
- * \defgroup hd44780
+ * \file
  *
- * HD44780 Character LCD Driver
+ * \defgroup hd44780 HD44780 Character LCD Driver
  * \{
  */
 
diff --git a/drivers/led/apa102.c b/drivers/led/apa102.c
index f291948975..40fc68e4f1 100644
--- a/drivers/led/apa102.c
+++ b/drivers/led/apa102.c
@@ -27,7 +27,7 @@
 #        if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) || defined(GD32VF103)
 #            define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4))) // This calculates how many loops of 4 nops to run to delay 100 ns
 #        else
-#            error("APA102_NOPS configuration required")
+#            error APA102_NOPS configuration required
 #            define APA102_NOPS 0 // this just pleases the compile so the above error is easier to spot
 #        endif
 #    endif
@@ -43,14 +43,14 @@
         }                                       \
     } while (0)
 
-#define APA102_SEND_BIT(byte, bit)               \
-    do {                                         \
-        writePin(RGB_DI_PIN, (byte >> bit) & 1); \
-        io_wait;                                 \
-        writePinHigh(RGB_CI_PIN);                \
-        io_wait;                                 \
-        writePinLow(RGB_CI_PIN);                 \
-        io_wait;                                 \
+#define APA102_SEND_BIT(byte, bit)                  \
+    do {                                            \
+        writePin(APA102_DI_PIN, (byte >> bit) & 1); \
+        io_wait;                                    \
+        writePinHigh(APA102_CI_PIN);                \
+        io_wait;                                    \
+        writePinLow(APA102_CI_PIN);                 \
+        io_wait;                                    \
     } while (0)
 
 uint8_t apa102_led_brightness = APA102_DEFAULT_BRIGHTNESS;
@@ -77,11 +77,11 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) {
 }
 
 void static apa102_init(void) {
-    setPinOutput(RGB_DI_PIN);
-    setPinOutput(RGB_CI_PIN);
+    setPinOutput(APA102_DI_PIN);
+    setPinOutput(APA102_CI_PIN);
 
-    writePinLow(RGB_DI_PIN);
-    writePinLow(RGB_CI_PIN);
+    writePinLow(APA102_DI_PIN);
+    writePinLow(APA102_CI_PIN);
 }
 
 void apa102_set_brightness(uint8_t brightness) {
diff --git a/drivers/led/aw20216.c b/drivers/led/aw20216.c
index cbb0b60774..7895f1497b 100644
--- a/drivers/led/aw20216.c
+++ b/drivers/led/aw20216.c
@@ -1,4 +1,5 @@
 /* Copyright 2021 Jasper Chan
+ *           2023 Huckies <https://github.com/Huckies>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,6 +16,7 @@
  */
 
 #include "aw20216.h"
+#include "wait.h"
 #include "spi_master.h"
 
 /* The AW20216 appears to be somewhat similar to the IS31FL743, although quite
@@ -34,6 +36,8 @@
 
 #define AW_REG_CONFIGURATION 0x00 // PG0
 #define AW_REG_GLOBALCURRENT 0x01 // PG0
+#define AW_REG_RESET 0x2F         // PG0
+#define AW_REG_MIXFUNCTION 0x46   // PG0
 
 // Default value of AW_REG_CONFIGURATION
 // D7:D4 = 1011, SWSEL (SW1~SW12 active)
@@ -41,7 +45,10 @@
 // D2:D1 = 00, OSDE (open/short detection enable)
 // D0 = 0, CHIPEN (write 1 to enable LEDs when hardware enable pulled high)
 #define AW_CONFIG_DEFAULT 0b10110000
+#define AW_MIXCR_DEFAULT 0b00000000
+#define AW_RESET_CMD 0xAE
 #define AW_CHIPEN 1
+#define AW_LPEN (0x01 << 1)
 
 #define AW_PWM_REGISTER_COUNT 216
 
@@ -94,6 +101,10 @@ static inline bool AW20216_write_register(pin_t cs_pin, uint8_t page, uint8_t re
     return AW20216_write(cs_pin, page, reg, &value, 1);
 }
 
+void AW20216_soft_reset(pin_t cs_pin) {
+    AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_RESET, AW_RESET_CMD);
+}
+
 static void AW20216_init_scaling(pin_t cs_pin) {
     // Set constant current to the max, control brightness with PWM
     for (uint8_t i = 0; i < AW_PWM_REGISTER_COUNT; i++) {
@@ -111,15 +122,23 @@ static inline void AW20216_soft_enable(pin_t cs_pin) {
     AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_CONFIGURATION, AW_CONFIG_DEFAULT | AW_CHIPEN);
 }
 
+static inline void AW20216_auto_lowpower(pin_t cs_pin) {
+    AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_MIXFUNCTION, AW_MIXCR_DEFAULT | AW_LPEN);
+}
+
 void AW20216_init(pin_t cs_pin, pin_t en_pin) {
     setPinOutput(en_pin);
     writePinHigh(en_pin);
 
+    AW20216_soft_reset(cs_pin);
+    wait_ms(2);
+
     // Drivers should start with all scaling and PWM registers as off
     AW20216_init_current_limit(cs_pin);
     AW20216_init_scaling(cs_pin);
 
     AW20216_soft_enable(cs_pin);
+    AW20216_auto_lowpower(cs_pin);
 }
 
 void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
diff --git a/drivers/painter/comms/qp_comms_spi.c b/drivers/painter/comms/qp_comms_spi.c
index e644ba9f84..7534e844d8 100644
--- a/drivers/painter/comms/qp_comms_spi.c
+++ b/drivers/painter/comms/qp_comms_spi.c
@@ -10,8 +10,8 @@
 // Base SPI support
 
 bool qp_comms_spi_init(painter_device_t device) {
-    struct painter_driver_t *     driver       = (struct painter_driver_t *)device;
-    struct qp_comms_spi_config_t *comms_config = (struct qp_comms_spi_config_t *)driver->comms_config;
+    painter_driver_t *     driver       = (painter_driver_t *)device;
+    qp_comms_spi_config_t *comms_config = (qp_comms_spi_config_t *)driver->comms_config;
 
     // Initialize the SPI peripheral
     spi_init();
@@ -24,8 +24,8 @@ bool qp_comms_spi_init(painter_device_t device) {
 }
 
 bool qp_comms_spi_start(painter_device_t device) {
-    struct painter_driver_t *     driver       = (struct painter_driver_t *)device;
-    struct qp_comms_spi_config_t *comms_config = (struct qp_comms_spi_config_t *)driver->comms_config;
+    painter_driver_t *     driver       = (painter_driver_t *)device;
+    qp_comms_spi_config_t *comms_config = (qp_comms_spi_config_t *)driver->comms_config;
 
     return spi_start(comms_config->chip_select_pin, comms_config->lsb_first, comms_config->mode, comms_config->divisor);
 }
@@ -33,8 +33,10 @@ bool qp_comms_spi_start(painter_device_t device) {
 uint32_t qp_comms_spi_send_data(painter_device_t device, const void *data, uint32_t byte_count) {
     uint32_t       bytes_remaining = byte_count;
     const uint8_t *p               = (const uint8_t *)data;
+    const uint32_t max_msg_length  = 1024;
+
     while (bytes_remaining > 0) {
-        uint32_t bytes_this_loop = bytes_remaining < 1024 ? bytes_remaining : 1024;
+        uint32_t bytes_this_loop = QP_MIN(bytes_remaining, max_msg_length);
         spi_transmit(p, bytes_this_loop);
         p += bytes_this_loop;
         bytes_remaining -= bytes_this_loop;
@@ -44,13 +46,13 @@ uint32_t qp_comms_spi_send_data(painter_device_t device, const void *data, uint3
 }
 
 void qp_comms_spi_stop(painter_device_t device) {
-    struct painter_driver_t *     driver       = (struct painter_driver_t *)device;
-    struct qp_comms_spi_config_t *comms_config = (struct qp_comms_spi_config_t *)driver->comms_config;
+    painter_driver_t *     driver       = (painter_driver_t *)device;
+    qp_comms_spi_config_t *comms_config = (qp_comms_spi_config_t *)driver->comms_config;
     spi_stop();
     writePinHigh(comms_config->chip_select_pin);
 }
 
-const struct painter_comms_vtable_t spi_comms_vtable = {
+const painter_comms_vtable_t spi_comms_vtable = {
     .comms_init  = qp_comms_spi_init,
     .comms_start = qp_comms_spi_start,
     .comms_send  = qp_comms_spi_send_data,
@@ -67,8 +69,8 @@ bool qp_comms_spi_dc_reset_init(painter_device_t device) {
         return false;
     }
 
-    struct painter_driver_t *              driver       = (struct painter_driver_t *)device;
-    struct qp_comms_spi_dc_reset_config_t *comms_config = (struct qp_comms_spi_dc_reset_config_t *)driver->comms_config;
+    painter_driver_t *              driver       = (painter_driver_t *)device;
+    qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
 
     // Set up D/C as output low, if specified
     if (comms_config->dc_pin != NO_PIN) {
@@ -89,15 +91,15 @@ bool qp_comms_spi_dc_reset_init(painter_device_t device) {
 }
 
 uint32_t qp_comms_spi_dc_reset_send_data(painter_device_t device, const void *data, uint32_t byte_count) {
-    struct painter_driver_t *              driver       = (struct painter_driver_t *)device;
-    struct qp_comms_spi_dc_reset_config_t *comms_config = (struct qp_comms_spi_dc_reset_config_t *)driver->comms_config;
+    painter_driver_t *              driver       = (painter_driver_t *)device;
+    qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
     writePinHigh(comms_config->dc_pin);
     return qp_comms_spi_send_data(device, data, byte_count);
 }
 
 void qp_comms_spi_dc_reset_send_command(painter_device_t device, uint8_t cmd) {
-    struct painter_driver_t *              driver       = (struct painter_driver_t *)device;
-    struct qp_comms_spi_dc_reset_config_t *comms_config = (struct qp_comms_spi_dc_reset_config_t *)driver->comms_config;
+    painter_driver_t *              driver       = (painter_driver_t *)device;
+    qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
     writePinLow(comms_config->dc_pin);
     spi_write(cmd);
 }
@@ -118,7 +120,7 @@ void qp_comms_spi_dc_reset_bulk_command_sequence(painter_device_t device, const
     }
 }
 
-const struct painter_comms_with_command_vtable_t spi_comms_with_dc_vtable = {
+const painter_comms_with_command_vtable_t spi_comms_with_dc_vtable = {
     .base =
         {
             .comms_init  = qp_comms_spi_dc_reset_init,
diff --git a/drivers/painter/comms/qp_comms_spi.h b/drivers/painter/comms/qp_comms_spi.h
index 9989987327..b3da86d573 100644
--- a/drivers/painter/comms/qp_comms_spi.h
+++ b/drivers/painter/comms/qp_comms_spi.h
@@ -13,36 +13,36 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Base SPI support
 
-struct qp_comms_spi_config_t {
+typedef struct qp_comms_spi_config_t {
     pin_t    chip_select_pin;
     uint16_t divisor;
     bool     lsb_first;
     int8_t   mode;
-};
+} qp_comms_spi_config_t;
 
 bool     qp_comms_spi_init(painter_device_t device);
 bool     qp_comms_spi_start(painter_device_t device);
 uint32_t qp_comms_spi_send_data(painter_device_t device, const void* data, uint32_t byte_count);
 void     qp_comms_spi_stop(painter_device_t device);
 
-extern const struct painter_comms_vtable_t spi_comms_vtable;
+extern const painter_comms_vtable_t spi_comms_vtable;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // SPI with D/C and RST pins
 
 #    ifdef QUANTUM_PAINTER_SPI_DC_RESET_ENABLE
 
-struct qp_comms_spi_dc_reset_config_t {
-    struct qp_comms_spi_config_t spi_config;
-    pin_t                        dc_pin;
-    pin_t                        reset_pin;
-};
+typedef struct qp_comms_spi_dc_reset_config_t {
+    qp_comms_spi_config_t spi_config;
+    pin_t                 dc_pin;
+    pin_t                 reset_pin;
+} qp_comms_spi_dc_reset_config_t;
 
 void     qp_comms_spi_dc_reset_send_command(painter_device_t device, uint8_t cmd);
 uint32_t qp_comms_spi_dc_reset_send_data(painter_device_t device, const void* data, uint32_t byte_count);
 void     qp_comms_spi_dc_reset_bulk_command_sequence(painter_device_t device, const uint8_t* sequence, size_t sequence_len);
 
-extern const struct painter_comms_with_command_vtable_t spi_comms_with_dc_vtable;
+extern const painter_comms_with_command_vtable_t spi_comms_with_dc_vtable;
 
 #    endif // QUANTUM_PAINTER_SPI_DC_RESET_ENABLE
 
diff --git a/drivers/painter/gc9a01/qp_gc9a01.c b/drivers/painter/gc9a01/qp_gc9a01.c
index 5d079435c6..a2eb2cf57c 100644
--- a/drivers/painter/gc9a01/qp_gc9a01.c
+++ b/drivers/painter/gc9a01/qp_gc9a01.c
@@ -1,4 +1,5 @@
 // Copyright 2021 Paul Cotter (@gr1mr3aver)
+// Copyright 2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <wait.h>
@@ -93,7 +94,7 @@ __attribute__((weak)) bool qp_gc9a01_init(painter_device_t device, painter_rotat
 // Driver vtable
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const struct tft_panel_dc_reset_painter_driver_vtable_t gc9a01_driver_vtable = {
+const tft_panel_dc_reset_painter_driver_vtable_t gc9a01_driver_vtable = {
     .base =
         {
             .init            = qp_gc9a01_init,
@@ -124,8 +125,8 @@ painter_device_t qp_gc9a01_make_spi_device(uint16_t panel_width, uint16_t panel_
     for (uint32_t i = 0; i < GC9A01_NUM_DEVICES; ++i) {
         tft_panel_dc_reset_painter_device_t *driver = &gc9a01_drivers[i];
         if (!driver->base.driver_vtable) {
-            driver->base.driver_vtable         = (const struct painter_driver_vtable_t *)&gc9a01_driver_vtable;
-            driver->base.comms_vtable          = (const struct painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
+            driver->base.driver_vtable         = (const painter_driver_vtable_t *)&gc9a01_driver_vtable;
+            driver->base.comms_vtable          = (const painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
             driver->base.native_bits_per_pixel = 16; // RGB565
             driver->base.panel_width           = panel_width;
             driver->base.panel_height          = panel_height;
@@ -141,6 +142,12 @@ painter_device_t qp_gc9a01_make_spi_device(uint16_t panel_width, uint16_t panel_
             driver->spi_dc_reset_config.spi_config.mode            = spi_mode;
             driver->spi_dc_reset_config.dc_pin                     = dc_pin;
             driver->spi_dc_reset_config.reset_pin                  = reset_pin;
+
+            if (!qp_internal_register_device((painter_device_t)driver)) {
+                memset(driver, 0, sizeof(tft_panel_dc_reset_painter_device_t));
+                return NULL;
+            }
+
             return (painter_device_t)driver;
         }
     }
diff --git a/drivers/painter/generic/qp_rgb565_surface.c b/drivers/painter/generic/qp_rgb565_surface.c
index 474c86feec..9c283e0687 100644
--- a/drivers/painter/generic/qp_rgb565_surface.c
+++ b/drivers/painter/generic/qp_rgb565_surface.c
@@ -9,7 +9,7 @@
 
 // Device definition
 typedef struct rgb565_surface_painter_device_t {
-    struct painter_driver_t base; // must be first, so it can be cast to/from the painter_device_t* type
+    painter_driver_t base; // must be first, so it can be cast to/from the painter_device_t* type
 
     // The target buffer
     uint16_t *buffer;
@@ -95,7 +95,7 @@ static inline void stream_pixdata(rgb565_surface_painter_device_t *surface, cons
 // Driver vtable
 
 static bool qp_rgb565_surface_init(painter_device_t device, painter_rotation_t rotation) {
-    struct painter_driver_t *        driver  = (struct painter_driver_t *)device;
+    painter_driver_t *               driver  = (painter_driver_t *)device;
     rgb565_surface_painter_device_t *surface = (rgb565_surface_painter_device_t *)driver;
     memset(surface->buffer, 0, driver->panel_width * driver->panel_height * driver->native_bits_per_pixel / 8);
     return true;
@@ -107,13 +107,13 @@ static bool qp_rgb565_surface_power(painter_device_t device, bool power_on) {
 }
 
 static bool qp_rgb565_surface_clear(painter_device_t device) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     driver->driver_vtable->init(device, driver->rotation); // Re-init the surface
     return true;
 }
 
 static bool qp_rgb565_surface_flush(painter_device_t device) {
-    struct painter_driver_t *        driver  = (struct painter_driver_t *)device;
+    painter_driver_t *               driver  = (painter_driver_t *)device;
     rgb565_surface_painter_device_t *surface = (rgb565_surface_painter_device_t *)driver;
     surface->dirty_l = surface->dirty_t = UINT16_MAX;
     surface->dirty_r = surface->dirty_b = 0;
@@ -122,7 +122,7 @@ static bool qp_rgb565_surface_flush(painter_device_t device) {
 }
 
 static bool qp_rgb565_surface_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
-    struct painter_driver_t *        driver  = (struct painter_driver_t *)device;
+    painter_driver_t *               driver  = (painter_driver_t *)device;
     rgb565_surface_painter_device_t *surface = (rgb565_surface_painter_device_t *)driver;
 
     // Set the viewport locations
@@ -139,7 +139,7 @@ static bool qp_rgb565_surface_viewport(painter_device_t device, uint16_t left, u
 
 // Stream pixel data to the current write position in GRAM
 static bool qp_rgb565_surface_pixdata(painter_device_t device, const void *pixel_data, uint32_t native_pixel_count) {
-    struct painter_driver_t *        driver  = (struct painter_driver_t *)device;
+    painter_driver_t *               driver  = (painter_driver_t *)device;
     rgb565_surface_painter_device_t *surface = (rgb565_surface_painter_device_t *)driver;
     stream_pixdata(surface, (const uint16_t *)pixel_data, native_pixel_count);
     return true;
@@ -170,7 +170,7 @@ static bool qp_rgb565_surface_append_pixdata(painter_device_t device, uint8_t *t
     return true;
 }
 
-const struct painter_driver_vtable_t rgb565_surface_driver_vtable = {
+const painter_driver_vtable_t rgb565_surface_driver_vtable = {
     .init            = qp_rgb565_surface_init,
     .power           = qp_rgb565_surface_power,
     .clear           = qp_rgb565_surface_clear,
@@ -201,7 +201,7 @@ uint32_t qp_rgb565_surface_comms_send(painter_device_t device, const void *data,
     return byte_count;
 }
 
-struct painter_comms_vtable_t rgb565_surface_driver_comms_vtable = {
+painter_comms_vtable_t rgb565_surface_driver_comms_vtable = {
     // These are all effective no-op's because they're not actually needed.
     .comms_init  = qp_rgb565_surface_comms_init,
     .comms_start = qp_rgb565_surface_comms_start,
@@ -234,7 +234,7 @@ painter_device_t qp_rgb565_make_surface(uint16_t panel_width, uint16_t panel_hei
 // Drawing routine to copy out the dirty region and send it to another device
 
 bool qp_rgb565_surface_draw(painter_device_t surface, painter_device_t display, uint16_t x, uint16_t y) {
-    struct painter_driver_t *        surface_driver = (struct painter_driver_t *)surface;
+    painter_driver_t *               surface_driver = (painter_driver_t *)surface;
     rgb565_surface_painter_device_t *surface_handle = (rgb565_surface_painter_device_t *)surface_driver;
 
     // If we're not dirty... we're done.
diff --git a/drivers/painter/ili9xxx/qp_ili9163.c b/drivers/painter/ili9xxx/qp_ili9163.c
index af37686631..a75be57904 100644
--- a/drivers/painter/ili9xxx/qp_ili9163.c
+++ b/drivers/painter/ili9xxx/qp_ili9163.c
@@ -1,4 +1,4 @@
-// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2021-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "qp_internal.h"
@@ -58,7 +58,7 @@ __attribute__((weak)) bool qp_ili9163_init(painter_device_t device, painter_rota
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Driver vtable
 
-const struct tft_panel_dc_reset_painter_driver_vtable_t ili9163_driver_vtable = {
+const tft_panel_dc_reset_painter_driver_vtable_t ili9163_driver_vtable = {
     .base =
         {
             .init            = qp_ili9163_init,
@@ -93,8 +93,8 @@ painter_device_t qp_ili9163_make_spi_device(uint16_t panel_width, uint16_t panel
     for (uint32_t i = 0; i < ILI9163_NUM_DEVICES; ++i) {
         tft_panel_dc_reset_painter_device_t *driver = &ili9163_drivers[i];
         if (!driver->base.driver_vtable) {
-            driver->base.driver_vtable         = (const struct painter_driver_vtable_t *)&ili9163_driver_vtable;
-            driver->base.comms_vtable          = (const struct painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
+            driver->base.driver_vtable         = (const painter_driver_vtable_t *)&ili9163_driver_vtable;
+            driver->base.comms_vtable          = (const painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
             driver->base.panel_width           = panel_width;
             driver->base.panel_height          = panel_height;
             driver->base.rotation              = QP_ROTATION_0;
@@ -110,6 +110,12 @@ painter_device_t qp_ili9163_make_spi_device(uint16_t panel_width, uint16_t panel
             driver->spi_dc_reset_config.spi_config.mode            = spi_mode;
             driver->spi_dc_reset_config.dc_pin                     = dc_pin;
             driver->spi_dc_reset_config.reset_pin                  = reset_pin;
+
+            if (!qp_internal_register_device((painter_device_t)driver)) {
+                memset(driver, 0, sizeof(tft_panel_dc_reset_painter_device_t));
+                return NULL;
+            }
+
             return (painter_device_t)driver;
         }
     }
diff --git a/drivers/painter/ili9xxx/qp_ili9341.c b/drivers/painter/ili9xxx/qp_ili9341.c
index aca3809912..4130271f71 100644
--- a/drivers/painter/ili9xxx/qp_ili9341.c
+++ b/drivers/painter/ili9xxx/qp_ili9341.c
@@ -1,4 +1,4 @@
-// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2021-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "qp_internal.h"
@@ -65,7 +65,7 @@ __attribute__((weak)) bool qp_ili9341_init(painter_device_t device, painter_rota
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Driver vtable
 
-const struct tft_panel_dc_reset_painter_driver_vtable_t ili9341_driver_vtable = {
+const tft_panel_dc_reset_painter_driver_vtable_t ili9341_driver_vtable = {
     .base =
         {
             .init            = qp_ili9341_init,
@@ -100,8 +100,8 @@ painter_device_t qp_ili9341_make_spi_device(uint16_t panel_width, uint16_t panel
     for (uint32_t i = 0; i < ILI9341_NUM_DEVICES; ++i) {
         tft_panel_dc_reset_painter_device_t *driver = &ili9341_drivers[i];
         if (!driver->base.driver_vtable) {
-            driver->base.driver_vtable         = (const struct painter_driver_vtable_t *)&ili9341_driver_vtable;
-            driver->base.comms_vtable          = (const struct painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
+            driver->base.driver_vtable         = (const painter_driver_vtable_t *)&ili9341_driver_vtable;
+            driver->base.comms_vtable          = (const painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
             driver->base.native_bits_per_pixel = 16; // RGB565
             driver->base.panel_width           = panel_width;
             driver->base.panel_height          = panel_height;
@@ -117,6 +117,12 @@ painter_device_t qp_ili9341_make_spi_device(uint16_t panel_width, uint16_t panel
             driver->spi_dc_reset_config.spi_config.mode            = spi_mode;
             driver->spi_dc_reset_config.dc_pin                     = dc_pin;
             driver->spi_dc_reset_config.reset_pin                  = reset_pin;
+
+            if (!qp_internal_register_device((painter_device_t)driver)) {
+                memset(driver, 0, sizeof(tft_panel_dc_reset_painter_device_t));
+                return NULL;
+            }
+
             return (painter_device_t)driver;
         }
     }
diff --git a/drivers/painter/ili9xxx/qp_ili9488.c b/drivers/painter/ili9xxx/qp_ili9488.c
index e51f0e1d51..a8da52132e 100644
--- a/drivers/painter/ili9xxx/qp_ili9488.c
+++ b/drivers/painter/ili9xxx/qp_ili9488.c
@@ -1,4 +1,4 @@
-// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2021-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "qp_internal.h"
@@ -58,7 +58,7 @@ __attribute__((weak)) bool qp_ili9488_init(painter_device_t device, painter_rota
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Driver vtable
 
-const struct tft_panel_dc_reset_painter_driver_vtable_t ili9488_driver_vtable = {
+const tft_panel_dc_reset_painter_driver_vtable_t ili9488_driver_vtable = {
     .base =
         {
             .init            = qp_ili9488_init,
@@ -93,8 +93,8 @@ painter_device_t qp_ili9488_make_spi_device(uint16_t panel_width, uint16_t panel
     for (uint32_t i = 0; i < ILI9488_NUM_DEVICES; ++i) {
         tft_panel_dc_reset_painter_device_t *driver = &ili9488_drivers[i];
         if (!driver->base.driver_vtable) {
-            driver->base.driver_vtable         = (const struct painter_driver_vtable_t *)&ili9488_driver_vtable;
-            driver->base.comms_vtable          = (const struct painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
+            driver->base.driver_vtable         = (const painter_driver_vtable_t *)&ili9488_driver_vtable;
+            driver->base.comms_vtable          = (const painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
             driver->base.native_bits_per_pixel = 24; // RGB888
             driver->base.panel_width           = panel_width;
             driver->base.panel_height          = panel_height;
@@ -110,6 +110,12 @@ painter_device_t qp_ili9488_make_spi_device(uint16_t panel_width, uint16_t panel
             driver->spi_dc_reset_config.spi_config.mode            = spi_mode;
             driver->spi_dc_reset_config.dc_pin                     = dc_pin;
             driver->spi_dc_reset_config.reset_pin                  = reset_pin;
+
+            if (!qp_internal_register_device((painter_device_t)driver)) {
+                memset(driver, 0, sizeof(tft_panel_dc_reset_painter_device_t));
+                return NULL;
+            }
+
             return (painter_device_t)driver;
         }
     }
diff --git a/drivers/painter/ssd1351/qp_ssd1351.c b/drivers/painter/ssd1351/qp_ssd1351.c
index 548785a1bd..434b7f0327 100644
--- a/drivers/painter/ssd1351/qp_ssd1351.c
+++ b/drivers/painter/ssd1351/qp_ssd1351.c
@@ -1,4 +1,4 @@
-// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2021-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "qp_internal.h"
@@ -62,7 +62,7 @@ __attribute__((weak)) bool qp_ssd1351_init(painter_device_t device, painter_rota
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Driver vtable
 
-const struct tft_panel_dc_reset_painter_driver_vtable_t ssd1351_driver_vtable = {
+const tft_panel_dc_reset_painter_driver_vtable_t ssd1351_driver_vtable = {
     .base =
         {
             .init            = qp_ssd1351_init,
@@ -97,8 +97,8 @@ painter_device_t qp_ssd1351_make_spi_device(uint16_t panel_width, uint16_t panel
     for (uint32_t i = 0; i < SSD1351_NUM_DEVICES; ++i) {
         tft_panel_dc_reset_painter_device_t *driver = &ssd1351_drivers[i];
         if (!driver->base.driver_vtable) {
-            driver->base.driver_vtable         = (const struct painter_driver_vtable_t *)&ssd1351_driver_vtable;
-            driver->base.comms_vtable          = (const struct painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
+            driver->base.driver_vtable         = (const painter_driver_vtable_t *)&ssd1351_driver_vtable;
+            driver->base.comms_vtable          = (const painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
             driver->base.panel_width           = panel_width;
             driver->base.panel_height          = panel_height;
             driver->base.rotation              = QP_ROTATION_0;
@@ -114,6 +114,12 @@ painter_device_t qp_ssd1351_make_spi_device(uint16_t panel_width, uint16_t panel
             driver->spi_dc_reset_config.spi_config.mode            = spi_mode;
             driver->spi_dc_reset_config.dc_pin                     = dc_pin;
             driver->spi_dc_reset_config.reset_pin                  = reset_pin;
+
+            if (!qp_internal_register_device((painter_device_t)driver)) {
+                memset(driver, 0, sizeof(tft_panel_dc_reset_painter_device_t));
+                return NULL;
+            }
+
             return (painter_device_t)driver;
         }
     }
diff --git a/drivers/painter/st77xx/qp_st7735.c b/drivers/painter/st77xx/qp_st7735.c
index 7ee5a6b562..98baf400ab 100644
--- a/drivers/painter/st77xx/qp_st7735.c
+++ b/drivers/painter/st77xx/qp_st7735.c
@@ -1,5 +1,5 @@
 // Copyright 2021 Paul Cotter (@gr1mr3aver)
-// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2021-2023 Nick Brassel (@tzarc)
 // Copyright 2022 David Hoelscher (@customMK)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -25,7 +25,7 @@ tft_panel_dc_reset_painter_device_t st7735_drivers[ST7735_NUM_DEVICES] = {0};
 
 #ifndef ST7735_NO_AUTOMATIC_OFFSETS
 static inline void st7735_automatic_viewport_offsets(painter_device_t device, painter_rotation_t rotation) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
 
     // clang-format off
     const struct {
@@ -82,7 +82,7 @@ __attribute__((weak)) bool qp_st7735_init(painter_device_t device, painter_rotat
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Driver vtable
 
-const struct tft_panel_dc_reset_painter_driver_vtable_t st7735_driver_vtable = {
+const tft_panel_dc_reset_painter_driver_vtable_t st7735_driver_vtable = {
     .base =
         {
             .init            = qp_st7735_init,
@@ -117,8 +117,8 @@ painter_device_t qp_st7735_make_spi_device(uint16_t panel_width, uint16_t panel_
     for (uint32_t i = 0; i < ST7735_NUM_DEVICES; ++i) {
         tft_panel_dc_reset_painter_device_t *driver = &st7735_drivers[i];
         if (!driver->base.driver_vtable) {
-            driver->base.driver_vtable         = (const struct painter_driver_vtable_t *)&st7735_driver_vtable;
-            driver->base.comms_vtable          = (const struct painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
+            driver->base.driver_vtable         = (const painter_driver_vtable_t *)&st7735_driver_vtable;
+            driver->base.comms_vtable          = (const painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
             driver->base.panel_width           = panel_width;
             driver->base.panel_height          = panel_height;
             driver->base.rotation              = QP_ROTATION_0;
@@ -134,6 +134,12 @@ painter_device_t qp_st7735_make_spi_device(uint16_t panel_width, uint16_t panel_
             driver->spi_dc_reset_config.spi_config.mode            = spi_mode;
             driver->spi_dc_reset_config.dc_pin                     = dc_pin;
             driver->spi_dc_reset_config.reset_pin                  = reset_pin;
+
+            if (!qp_internal_register_device((painter_device_t)driver)) {
+                memset(driver, 0, sizeof(tft_panel_dc_reset_painter_device_t));
+                return NULL;
+            }
+
             return (painter_device_t)driver;
         }
     }
diff --git a/drivers/painter/st77xx/qp_st7789.c b/drivers/painter/st77xx/qp_st7789.c
index 9f474369d6..f9065f5178 100644
--- a/drivers/painter/st77xx/qp_st7789.c
+++ b/drivers/painter/st77xx/qp_st7789.c
@@ -1,5 +1,5 @@
 // Copyright 2021 Paul Cotter (@gr1mr3aver)
-// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2021-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "qp_internal.h"
@@ -24,7 +24,7 @@ tft_panel_dc_reset_painter_device_t st7789_drivers[ST7789_NUM_DEVICES] = {0};
 
 #ifndef ST7789_NO_AUTOMATIC_OFFSETS
 static inline void st7789_automatic_viewport_offsets(painter_device_t device, painter_rotation_t rotation) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
 
     // clang-format off
     const struct {
@@ -81,7 +81,7 @@ __attribute__((weak)) bool qp_st7789_init(painter_device_t device, painter_rotat
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Driver vtable
 
-const struct tft_panel_dc_reset_painter_driver_vtable_t st7789_driver_vtable = {
+const tft_panel_dc_reset_painter_driver_vtable_t st7789_driver_vtable = {
     .base =
         {
             .init            = qp_st7789_init,
@@ -116,8 +116,8 @@ painter_device_t qp_st7789_make_spi_device(uint16_t panel_width, uint16_t panel_
     for (uint32_t i = 0; i < ST7789_NUM_DEVICES; ++i) {
         tft_panel_dc_reset_painter_device_t *driver = &st7789_drivers[i];
         if (!driver->base.driver_vtable) {
-            driver->base.driver_vtable         = (const struct painter_driver_vtable_t *)&st7789_driver_vtable;
-            driver->base.comms_vtable          = (const struct painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
+            driver->base.driver_vtable         = (const painter_driver_vtable_t *)&st7789_driver_vtable;
+            driver->base.comms_vtable          = (const painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
             driver->base.panel_width           = panel_width;
             driver->base.panel_height          = panel_height;
             driver->base.rotation              = QP_ROTATION_0;
@@ -133,6 +133,12 @@ painter_device_t qp_st7789_make_spi_device(uint16_t panel_width, uint16_t panel_
             driver->spi_dc_reset_config.spi_config.mode            = spi_mode;
             driver->spi_dc_reset_config.dc_pin                     = dc_pin;
             driver->spi_dc_reset_config.reset_pin                  = reset_pin;
+
+            if (!qp_internal_register_device((painter_device_t)driver)) {
+                memset(driver, 0, sizeof(tft_panel_dc_reset_painter_device_t));
+                return NULL;
+            }
+
             return (painter_device_t)driver;
         }
     }
diff --git a/drivers/painter/tft_panel/qp_tft_panel.c b/drivers/painter/tft_panel/qp_tft_panel.c
index 4a24cf9953..16dba9d6a6 100644
--- a/drivers/painter/tft_panel/qp_tft_panel.c
+++ b/drivers/painter/tft_panel/qp_tft_panel.c
@@ -12,15 +12,15 @@
 
 // Power control
 bool qp_tft_panel_power(painter_device_t device, bool power_on) {
-    struct painter_driver_t *                          driver = (struct painter_driver_t *)device;
-    struct tft_panel_dc_reset_painter_driver_vtable_t *vtable = (struct tft_panel_dc_reset_painter_driver_vtable_t *)driver->driver_vtable;
+    painter_driver_t *                          driver = (painter_driver_t *)device;
+    tft_panel_dc_reset_painter_driver_vtable_t *vtable = (tft_panel_dc_reset_painter_driver_vtable_t *)driver->driver_vtable;
     qp_comms_command(device, power_on ? vtable->opcodes.display_on : vtable->opcodes.display_off);
     return true;
 }
 
 // Screen clear
 bool qp_tft_panel_clear(painter_device_t device) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     driver->driver_vtable->init(device, driver->rotation); // Re-init the LCD
     return true;
 }
@@ -33,8 +33,8 @@ bool qp_tft_panel_flush(painter_device_t device) {
 
 // Viewport to draw to
 bool qp_tft_panel_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
-    struct painter_driver_t *                          driver = (struct painter_driver_t *)device;
-    struct tft_panel_dc_reset_painter_driver_vtable_t *vtable = (struct tft_panel_dc_reset_painter_driver_vtable_t *)driver->driver_vtable;
+    painter_driver_t *                          driver = (painter_driver_t *)device;
+    tft_panel_dc_reset_painter_driver_vtable_t *vtable = (tft_panel_dc_reset_painter_driver_vtable_t *)driver->driver_vtable;
 
     // Fix up the drawing location if required
     left += driver->offset_x;
@@ -80,7 +80,7 @@ bool qp_tft_panel_viewport(painter_device_t device, uint16_t left, uint16_t top,
 
 // Stream pixel data to the current write position in GRAM
 bool qp_tft_panel_pixdata(painter_device_t device, const void *pixel_data, uint32_t native_pixel_count) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     qp_comms_send(device, pixel_data, native_pixel_count * driver->native_bits_per_pixel / 8);
     return true;
 }
diff --git a/drivers/painter/tft_panel/qp_tft_panel.h b/drivers/painter/tft_panel/qp_tft_panel.h
index 83b8dd5406..67168645b7 100644
--- a/drivers/painter/tft_panel/qp_tft_panel.h
+++ b/drivers/painter/tft_panel/qp_tft_panel.h
@@ -12,8 +12,8 @@
 // Common TFT panel implementation using D/C, and RST pins.
 
 // Driver vtable with extras
-struct tft_panel_dc_reset_painter_driver_vtable_t {
-    struct painter_driver_vtable_t base; // must be first, so it can be cast to/from the painter_driver_vtable_t* type
+typedef struct tft_panel_dc_reset_painter_driver_vtable_t {
+    painter_driver_vtable_t base; // must be first, so it can be cast to/from the painter_driver_vtable_t* type
 
     // Number of bytes for transmitting x/y coordinates
     uint8_t num_window_bytes;
@@ -29,16 +29,16 @@ struct tft_panel_dc_reset_painter_driver_vtable_t {
         uint8_t set_row_address;
         uint8_t enable_writes;
     } opcodes;
-};
+} tft_panel_dc_reset_painter_driver_vtable_t;
 
 // Device definition
 typedef struct tft_panel_dc_reset_painter_device_t {
-    struct painter_driver_t base; // must be first, so it can be cast to/from the painter_device_t* type
+    painter_driver_t base; // must be first, so it can be cast to/from the painter_device_t* type
 
     union {
 #ifdef QUANTUM_PAINTER_SPI_ENABLE
         // SPI-based configurables
-        struct qp_comms_spi_dc_reset_config_t spi_dc_reset_config;
+        qp_comms_spi_dc_reset_config_t spi_dc_reset_config;
 #endif // QUANTUM_PAINTER_SPI_ENABLE
 
         // TODO: I2C/parallel etc.
diff --git a/drivers/sensors/pmw3320.c b/drivers/sensors/pmw3320.c
new file mode 100644
index 0000000000..a4648ef425
--- /dev/null
+++ b/drivers/sensors/pmw3320.c
@@ -0,0 +1,192 @@
+/* Copyright 2021 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ * Copyright 2019 Hiroyuki Okada
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "pmw3320.h"
+#include "wait.h"
+#include "debug.h"
+#include "gpio.h"
+
+void pmw3320_init(void) {
+    // Initialize sensor serial pins.
+    setPinOutput(PMW3320_SCLK_PIN);
+    setPinOutput(PMW3320_SDIO_PIN);
+    setPinOutput(PMW3320_CS_PIN);
+
+    // reboot the sensor.
+    pmw3320_write_reg(REG_Power_Up_Reset, 0x5a);
+
+    // wait maximum time before sensor is ready.
+    // this ensures that the sensor is actually ready after reset.
+    wait_ms(55);
+
+    // read a burst from the sensor and then discard it.
+    // gets the sensor ready for write commands
+    // (for example, setting the dpi).
+    pmw3320_read_burst();
+
+    // Pretty sure that this shouldn't be in the driver.
+    // Probably device specific?
+    // Set rest mode to default
+    pmw3320_write_reg(REG_Rest_Mode_Status, 0x00);
+    // Set LED to be always on
+    pmw3320_write_reg(REG_Led_Control, 0x4);
+    // Disable rest mode
+    pmw3320_write_reg(REG_Performance, 0x80);
+}
+
+// Perform a synchronization with sensor.
+// Just as with the serial protocol, this is used by the slave to send a
+// synchronization signal to the master.
+void pmw3320_sync(void) {
+    writePinLow(PMW3320_CS_PIN);
+    wait_us(1);
+    writePinHigh(PMW3320_CS_PIN);
+}
+
+void pmw3320_cs_select(void) {
+    writePinLow(PMW3320_CS_PIN);
+}
+
+void pmw3320_cs_deselect(void) {
+    writePinHigh(PMW3320_CS_PIN);
+}
+
+uint8_t pmw3320_serial_read(void) {
+    setPinInput(PMW3320_SDIO_PIN);
+    uint8_t byte = 0;
+
+    for (uint8_t i = 0; i < 8; ++i) {
+        writePinLow(PMW3320_SCLK_PIN);
+        wait_us(1);
+
+        byte = (byte << 1) | readPin(PMW3320_SDIO_PIN);
+
+        writePinHigh(PMW3320_SCLK_PIN);
+        wait_us(1);
+    }
+
+    return byte;
+}
+
+void pmw3320_serial_write(uint8_t data) {
+    setPinOutput(PMW3320_SDIO_PIN);
+
+    for (int8_t b = 7; b >= 0; b--) {
+        writePinLow(PMW3320_SCLK_PIN);
+
+        if (data & (1 << b))
+            writePinHigh(PMW3320_SDIO_PIN);
+        else
+            writePinLow(PMW3320_SDIO_PIN);
+
+        wait_us(2);
+
+        writePinHigh(PMW3320_SCLK_PIN);
+    }
+
+    // This was taken from ADNS5050 driver.
+    // There's no any info in PMW3320 datasheet about this...
+    // tSWR. See page 15 of the ADNS5050 spec sheet.
+    // Technically, this is only necessary if the next operation is an SDIO
+    // read. This is not guaranteed to be the case, but we're being lazy.
+    wait_us(4);
+
+    // Note that tSWW is never necessary. All write operations require at
+    // least 32us, which exceeds tSWW, so there's never a need to wait for it.
+}
+
+// Read a byte of data from a register on the sensor.
+uint8_t pmw3320_read_reg(uint8_t reg_addr) {
+    pmw3320_cs_select();
+
+    pmw3320_serial_write(reg_addr);
+
+    uint8_t byte = pmw3320_serial_read();
+
+    // This was taken directly from ADNS5050 driver...
+    // tSRW & tSRR. See page 15 of the ADNS5050 spec sheet.
+    // Technically, this is only necessary if the next operation is an SDIO
+    // read or write. This is not guaranteed to be the case.
+    // Honestly, this wait could probably be removed.
+    wait_us(1);
+
+    pmw3320_cs_deselect();
+
+    return byte;
+}
+
+void pmw3320_write_reg(uint8_t reg_addr, uint8_t data) {
+    pmw3320_cs_select();
+    pmw3320_serial_write(0b10000000 | reg_addr);
+    pmw3320_serial_write(data);
+    pmw3320_cs_deselect();
+}
+
+report_pmw3320_t pmw3320_read_burst(void) {
+    pmw3320_cs_select();
+
+    report_pmw3320_t data;
+    data.dx = 0;
+    data.dy = 0;
+
+    pmw3320_serial_write(REG_Motion_Burst);
+
+    uint8_t x = pmw3320_serial_read();
+    uint8_t y = pmw3320_serial_read();
+
+    // Probably burst mode may include contents of delta_xy register,
+    // which contain HI parts of x/y deltas, but I had no luck finding it.
+    // Probably it's required to activate 12-bit mode to access this data.
+    // So we end burst mode early to not read unneeded information.
+    pmw3320_cs_deselect();
+
+    data.dx = convert_twoscomp(x);
+    data.dy = convert_twoscomp(y);
+
+    return data;
+}
+
+// Convert a two's complement byte from an unsigned data type into a signed
+// data type.
+int8_t convert_twoscomp(uint8_t data) {
+    if ((data & 0x80) == 0x80)
+        return -128 + (data & 0x7F);
+    else
+        return data;
+}
+
+uint16_t pmw3320_get_cpi(void) {
+    uint8_t cpival = pmw3320_read_reg(REG_Resolution);
+    // 0x1F is an inversion of 0x20 which is 0b100000
+    return (uint16_t)((cpival & 0x1F) * PMW3320_CPI_STEP);
+}
+
+void pmw3320_set_cpi(uint16_t cpi) {
+    uint8_t cpival = constrain((cpi / PMW3320_CPI_STEP) - 1U, 0, (PMW3320_CPI_MAX / PMW3320_CPI_STEP) - 1U);
+    // Fifth bit is probably a control bit.
+    // PMW3320 datasheet don't have any info on this, so this is a pure guess.
+    pmw3320_write_reg(REG_Resolution, 0x20 | cpival);
+}
+
+bool pmw3320_check_signature(void) {
+    uint8_t pid  = pmw3320_read_reg(REG_Product_ID);
+    uint8_t pid2 = pmw3320_read_reg(REG_Inverse_Product_ID);
+
+    return (pid == 0x3b && pid2 == 0xc4);
+}
diff --git a/drivers/sensors/pmw3320.h b/drivers/sensors/pmw3320.h
new file mode 100644
index 0000000000..a1fd546919
--- /dev/null
+++ b/drivers/sensors/pmw3320.h
@@ -0,0 +1,119 @@
+/* Copyright 2021 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ * Copyright 2019 Hiroyuki Okada
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
+
+// Definitions for the PMW3320 serial line.
+#ifndef PMW3320_SCLK_PIN
+#    ifdef POINTING_DEVICE_SCLK_PIN
+#        define PMW3320_SCLK_PIN POINTING_DEVICE_SCLK_PIN
+#    else
+#        error "No clock pin defined -- missing POINTING_DEVICE_SCLK_PIN or PMW3320_SCLK_PIN"
+#    endif
+#endif
+
+#ifndef PMW3320_SDIO_PIN
+#    ifdef POINTING_DEVICE_SDIO_PIN
+#        define PMW3320_SDIO_PIN POINTING_DEVICE_SDIO_PIN
+#    else
+#        error "No data pin defined -- missing POINTING_DEVICE_SDIO_PIN or PMW3320_SDIO_PIN"
+#    endif
+#endif
+
+#ifndef PMW3320_CS_PIN
+#    ifdef POINTING_DEVICE_CS_PIN
+#        define PMW3320_CS_PIN POINTING_DEVICE_CS_PIN
+#    else
+#        error "No chip select pin defined -- missing POINTING_DEVICE_CS_PIN or PMW3320_CS_PIN define"
+#    endif
+#endif
+
+typedef struct {
+    int8_t dx;
+    int8_t dy;
+} report_pmw3320_t;
+
+// A bunch of functions to implement the PMW3320-specific serial protocol.
+// Mostly taken from ADNS5050 driver.
+// Note that the "serial.h" driver is insufficient, because it does not
+// manually manipulate a serial clock signal.
+void             pmw3320_init(void);
+void             pmw3320_sync(void);
+uint8_t          pmw3320_serial_read(void);
+void             pmw3320_serial_write(uint8_t data);
+uint8_t          pmw3320_read_reg(uint8_t reg_addr);
+void             pmw3320_write_reg(uint8_t reg_addr, uint8_t data);
+report_pmw3320_t pmw3320_read_burst(void);
+void             pmw3320_set_cpi(uint16_t cpi);
+uint16_t         pmw3320_get_cpi(void);
+int8_t           convert_twoscomp(uint8_t data);
+bool             pmw3320_check_signature(void);
+
+#if !defined(PMW3320_CPI)
+#    define PMW3320_CPI 1000
+#endif
+
+#define PMW3320_CPI_STEP 250
+#define PMW3320_CPI_MIN 250
+#define PMW3320_CPI_MAX 3500
+
+// PMW3320 register addresses
+// clang-format off
+#define REG_Product_ID                 0x00
+#define REG_Revision_ID                0x01
+#define REG_Motion                     0x02
+#define REG_Delta_X                    0x03
+#define REG_Delta_Y                    0x04
+#define REG_SQUAL                      0x05
+#define REG_Shutter_Upper              0x06
+#define REG_Shutter_Lower              0x07
+#define REG_Maximum_Pixel              0x08
+#define REG_Pixel_Accum                0x09
+#define REG_Minimum_Pixel              0x0a
+#define REG_Pixel_Grab                 0x0b
+#define REG_Delta_XY                   0x0c
+#define REG_Resolution                 0x0d
+#define REG_Run_Downshift              0x0e
+#define REG_Rest1_Period               0x0f
+#define REG_Rest1_Downshift            0x10
+#define REG_Rest2_Preiod               0x11
+#define REG_Rest2_Downshift            0x12
+#define REG_Rest3_Period               0x13
+#define REG_Min_SQ_Run                 0x17
+#define REG_Axis_Control               0x1a
+#define REG_Performance                0x22
+#define REG_Low_Motion_Jitter          0x23
+#define REG_Shutter_Max_HI             0x36
+#define REG_Shutter_Max_LO             0x37
+#define REG_Frame_Rate                 0x39
+#define REG_Power_Up_Reset             0x3a
+#define REG_Shutdown                   0x3b
+#define REG_Inverse_Revision_ID        0x3f
+#define REG_Led_Control                0x40
+#define REG_Motion_Control             0x41
+#define REG_Burst_Read_First           0x42
+#define REG_Rest_Mode_Status           0x45
+#define REG_Inverse_Product_ID         0x4f
+#define REG_Motion_Burst               0x63
+// clang-format on
diff --git a/keyboards/0_sixty/0_sixty.c b/keyboards/0_sixty/0_sixty.c
deleted file mode 100644
index 40f1362d0c..0000000000
--- a/keyboards/0_sixty/0_sixty.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Vinam Arora <vinam@posteo.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "0_sixty.h"
diff --git a/keyboards/0_sixty/0_sixty.h b/keyboards/0_sixty/0_sixty.h
deleted file mode 100644
index 5152c246af..0000000000
--- a/keyboards/0_sixty/0_sixty.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2020 Vinam Arora <vinam@posteo.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b }  \
-}
-
-#define LAYOUT_1x2uL( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43,    k45,   k46, k47, k48, k49, k4a, k4b  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k45, k45, k46, k47, k48, k49, k4a, k4b }  \
-}
-
-#define LAYOUT_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44,    k46,   k47, k48, k49, k4a, k4b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k46, k46, k47, k48, k49, k4a, k4b }  \
-}
-
-#define LAYOUT_1x2uR( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45,   k46,    k48, k49, k4a, k4b  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k46, k46, k48, k49, k4a, k4b }  \
-}
-
-#define LAYOUT_2x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43,     k45,    k46,    k48, k49, k4a, k4b  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k45, k45, k46, k46, k48, k49, k4a, k4b }  \
-}
diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h
index 702fb3c609..6023c08795 100644
--- a/keyboards/0_sixty/config.h
+++ b/keyboards/0_sixty/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/0_sixty/info.json b/keyboards/0_sixty/info.json
index 154f7bd442..c6925b6c16 100644
--- a/keyboards/0_sixty/info.json
+++ b/keyboards/0_sixty/info.json
@@ -6,6 +6,11 @@
         "vid": "0x7654",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2"],
+        "rows": ["B1", "F7", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "features": {
         "extrakey": true,
         "console": true,
@@ -18,337 +23,337 @@
     "layouts": {
 	"LAYOUT_1x2uC": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4, "w": 2},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
 	},
 	"LAYOUT_2x2uC": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4, "w": 2},
-                {"x": 6, "y": 4, "w": 2},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"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, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 2},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         },
 	"LAYOUT_1x2uR": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4, "w": 2},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 2},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_1x2uL": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4, "w": 2},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"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, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/0_sixty/underglow/config.h b/keyboards/0_sixty/underglow/config.h
index 8cac030cd8..3a10ea61a0 100644
--- a/keyboards/0_sixty/underglow/config.h
+++ b/keyboards/0_sixty/underglow/config.h
@@ -18,7 +18,6 @@
 
 
 /* underglow */
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 24
 #define RGBLIGHT_LIMIT_VAL 185 // limit max I to 400mA 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/0_sixty/underglow/info.json b/keyboards/0_sixty/underglow/info.json
index 5cbbd86e61..cd4d959609 100644
--- a/keyboards/0_sixty/underglow/info.json
+++ b/keyboards/0_sixty/underglow/info.json
@@ -5,5 +5,8 @@
     },
     "features": {
         "rgblight": true
+    },
+    "ws2812": {
+        "pin": "B6"
     }
 }
diff --git a/keyboards/0xc7/61key/61key.c b/keyboards/0xc7/61key/61key.c
deleted file mode 100644
index 2db485796c..0000000000
--- a/keyboards/0xc7/61key/61key.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 0xC7
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "61key.h"
diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h
index 036f18fe6c..244a5f192d 100644
--- a/keyboards/0xc7/61key/config.h
+++ b/keyboards/0xc7/61key/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/0xc7/61key/info.json b/keyboards/0xc7/61key/info.json
index 76b525a99e..569a054daf 100644
--- a/keyboards/0xc7/61key/info.json
+++ b/keyboards/0xc7/61key/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6161",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index a247d1b367..9eaded2188 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAP_CODE_DELAY 10
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 4
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -44,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_DEFAULT_SAT 232
   #define RGBLIGHT_DEFAULT_VAR 255
   #define RGBLIGHT_DEFAULT_SPD 2
-#endif
 // clang-format on
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index d34d7166bf..ac7db0ec13 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -21,6 +21,9 @@
   "qmk_lufa_bootloader": {
     "led": "B0"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "qmk-dfu",
   "matrix_pins": {
diff --git a/keyboards/0xcb/splaytoraid/config.h b/keyboards/0xcb/splaytoraid/config.h
index 01eb276069..2f2eb82fee 100644
--- a/keyboards/0xcb/splaytoraid/config.h
+++ b/keyboards/0xcb/splaytoraid/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN D0
-
 #define RGB_MATRIX_LED_COUNT 18
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING
diff --git a/keyboards/0xcb/splaytoraid/info.json b/keyboards/0xcb/splaytoraid/info.json
index 7b8177df9f..f6a8061e1e 100644
--- a/keyboards/0xcb/splaytoraid/info.json
+++ b/keyboards/0xcb/splaytoraid/info.json
@@ -62,6 +62,9 @@
             { "flags": 4, "matrix": [0, 3], "x": 163, "y": 64 }
         ]
     },
+    "ws2812": {
+        "pin": "D0"
+    },
     "layouts": {
         "LAYOUT_36": {
             "layout": [
diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
index d955f36ab3..52e39aef65 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
+++ b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
@@ -5,9 +5,6 @@
 
 #define TAPPING_TERM 180
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
 
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
new file mode 100644
index 0000000000..9f0eb51118
--- /dev/null
+++ b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
@@ -0,0 +1,5 @@
+{
+    "ws2812": {
+        "driver": "vendor"
+    }
+}
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
index 4b30a1bae0..9617c1460e 100644
--- a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
+++ b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
@@ -1,2 +1 @@
-WS2812_DRIVER = vendor
 CONVERT_TO = rp2040_ce
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index f77002e8ab..10b1f88216 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -16,26 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-// clang-format off
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D5, D6, D7, B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, D4, C0, C1, C2, C3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
-// clang-format on
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json
index a18bd7b313..6f3b2d06f0 100644
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/info.json
@@ -8,6 +8,11 @@
     "pid": "0xA455",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B5", "D4", "C0", "C1", "C2", "C3"],
+    "rows": ["D5", "D6", "D7", "B0", "B1", "B2", "B3", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "D0", "pin_b": "D1"}
diff --git a/keyboards/0xcb/static/static.c b/keyboards/0xcb/static/static.c
deleted file mode 100644
index c6f5601f29..0000000000
--- a/keyboards/0xcb/static/static.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 0xCB - Conor Burns
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "static.h"
diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h
index cdb29e6bd1..b211d6f5f2 100644
--- a/keyboards/0xcb/tutelpad/config.h
+++ b/keyboards/0xcb/tutelpad/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN D3                   // LED data pin on controller
 #define RGBLED_NUM 4                    // Number of LEDs connected
 
 #define RGBLIGHT_HUE_STEP 10            // The number of steps to cycle through the hue by
diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json
index 646b4dc882..79fdf0af45 100644
--- a/keyboards/0xcb/tutelpad/info.json
+++ b/keyboards/0xcb/tutelpad/info.json
@@ -11,6 +11,9 @@
     "bootmagic": {
         "matrix": [1, 0]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {
diff --git a/keyboards/10bleoledhub/10bleoledhub.c b/keyboards/10bleoledhub/10bleoledhub.c
deleted file mode 100644
index 095d49d388..0000000000
--- a/keyboards/10bleoledhub/10bleoledhub.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 haierwangwei2005
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "10bleoledhub.h"
-
diff --git a/keyboards/10bleoledhub/10bleoledhub.h b/keyboards/10bleoledhub/10bleoledhub.h
deleted file mode 100644
index ad73017e12..0000000000
--- a/keyboards/10bleoledhub/10bleoledhub.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 haierwangwei2005
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, \
-    K10, K11, K12,  \
-    K20, K21, K22,  \
-    K30, K31, K32   \
-) { \
-    { K00,   KC_NO,   KC_NO }, \
-    { K10,   K11,   K12 }, \
-    { K20,   K21,   K22 }, \
-    { K30,   K31,   K32 }  \
-}
diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h
index 5943564661..ae376dfa53 100644
--- a/keyboards/10bleoledhub/config.h
+++ b/keyboards/10bleoledhub/config.h
@@ -16,14 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F5, F4, F6 }
-#define MATRIX_COL_PINS { D6, D7, B5 }
-
-#define DIODE_DIRECTION ROW2COL
-
 #define SSD1306OLED
-#define RGB_DI_PIN B7
 
 #define RGBLED_NUM 4
 
diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json
index dd106a74a5..9b536e0677 100644
--- a/keyboards/10bleoledhub/info.json
+++ b/keyboards/10bleoledhub/info.json
@@ -8,6 +8,14 @@
         "pid": "0x7C99",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B5"],
+        "rows": ["F0", "F5", "F4", "F6"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "C7", "pin_b": "F7"}
@@ -18,16 +26,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8},
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3}
             ]
         }
     }
diff --git a/keyboards/1k/config.h b/keyboards/1k/config.h
index 1e970661c0..afdc6d4baa 100644
--- a/keyboards/1k/config.h
+++ b/keyboards/1k/config.h
@@ -16,7 +16,6 @@
 #pragma once
 
 #define RGBLED_NUM 1
-#define RGB_DI_PIN B2
 
 // Save as much space as we can...
 #define LAYER_STATE_8BIT
diff --git a/keyboards/1k/info.json b/keyboards/1k/info.json
index 5168b69081..121cba7d16 100644
--- a/keyboards/1k/info.json
+++ b/keyboards/1k/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B2"
+  },
   "matrix_pins": {
     "direct": [
       ["B0"]
diff --git a/keyboards/1k/keymaps/default/rules.mk b/keyboards/1k/keymaps/default/rules.mk
index ff480ff890..3f8ac1d4bb 100644
--- a/keyboards/1k/keymaps/default/rules.mk
+++ b/keyboards/1k/keymaps/default/rules.mk
@@ -1,2 +1,2 @@
-SRC += ws2812.c
+WS2812_DRIVER_REQUIRED = yes
 SRC += color.c
diff --git a/keyboards/1k/keymaps/media/rules.mk b/keyboards/1k/keymaps/media/rules.mk
index 2368727640..76db8f131e 100644
--- a/keyboards/1k/keymaps/media/rules.mk
+++ b/keyboards/1k/keymaps/media/rules.mk
@@ -1,3 +1,3 @@
-SRC += ws2812.c
+WS2812_DRIVER_REQUIRED = yes
 SRC += color.c
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.c b/keyboards/1upkeyboards/1up60hse/1up60hse.c
deleted file mode 100644
index fa62f52e64..0000000000
--- a/keyboards/1upkeyboards/1up60hse/1up60hse.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "1up60hse.h"
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index b58eef1085..bc0d7f0c4b 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
-#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, E6, D1, D0, D2, D3, D5, D6, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json
index 07f35c7340..08b85923a3 100644
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/info.json
@@ -8,11 +8,19 @@
         "pid": "0x6873",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"],
+        "rows": ["B3", "B2", "B1", "B0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/1upkeyboards/1up60hte/1up60hte.c b/keyboards/1upkeyboards/1up60hte/1up60hte.c
deleted file mode 100644
index 460e42a0e5..0000000000
--- a/keyboards/1upkeyboards/1up60hte/1up60hte.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2019 Bubnick
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "1up60hte.h"
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index ff5f010cbe..aeda8afd33 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -18,22 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,4 +38,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json
index 98a9082989..c609336de0 100644
--- a/keyboards/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6874",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"],
+        "rows": ["B3", "B2", "B1", "B0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
@@ -15,6 +20,9 @@
         "caps_lock": "B6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/1upkeyboards/1up60rgb/1up60rgb.c b/keyboards/1upkeyboards/1up60rgb/1up60rgb.c
deleted file mode 100644
index 4ba631c797..0000000000
--- a/keyboards/1upkeyboards/1up60rgb/1up60rgb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "1up60rgb.h"
diff --git a/keyboards/1upkeyboards/1up60rgb/1up60rgb.h b/keyboards/1upkeyboards/1up60rgb/1up60rgb.h
deleted file mode 100644
index 5ee6c12bcf..0000000000
--- a/keyboards/1upkeyboards/1up60rgb/1up60rgb.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \
-    k40, k41,      k43,           k46,                k4A, k4B,      k4D, k4E \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
-}
-
-/* ANSI variant. No extra keys for ISO */
-#define LAYOUT_60_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \
-    k40, k41,      k43,           k46,                k4A, k4B,      k4D, k4E \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
-}
-
-/* ANSI-Tsangan variant, with split right shift key */
-#define LAYOUT_60_ansi_tsangan_split_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \
-    k40, k41,      k43,           k46,                     k4B,      k4D, k4E \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0D }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, XXX, k4D, k4E } \
-}
-
-/* ISO variant. Remove useless ANSI keys */
-#define LAYOUT_60_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \
-    k40, k41,      k43,           k46,                k4A, k4B,      k4D, k4E \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2D }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
-}
-
-/* HHKB Variant */
-#define LAYOUT_60_ansi_split_bs_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \
-    k40, k41,      k43,           k46,                k4A, k4B,      k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
-}
-
-/* ANSI Variant */
-#define LAYOUT_60_ansi_split_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \
-    k40, k41,      k43,           k46,                k4A, k4B,      k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0D }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
-}
-
-/* HHKB Variant */
-#define LAYOUT_60_hhkb( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \
-         k41,      k43,           k46,                     k4B,      k4D \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
-    { XXX, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, XXX, k4D, XXX } \
-}
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 806f23075f..8bbb646e40 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json
index 57a0143544..7eedd1cde1 100644
--- a/keyboards/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/info.json
@@ -8,77 +8,517 @@
     "pid": "0x7267",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+    "rows": ["D0", "D1", "D2", "D3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "levels": 5
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"],
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, 
-        {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, 
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, 
-        {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, 
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2},
+        {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+      ]
     },
 
     "LAYOUT_60_ansi": {
       "layout": [
-        {"x":0, "y":0, "label":"~"}, {"x":1, "y":0, "label":"!"}, {"x":2, "y":0, "label":"@"}, {"x":3, "y":0, "label":"#"}, {"x":4, "y":0, "label":"$"}, {"x":5, "y":0, "label":"%"}, {"x":6, "y":0, "label":"^"}, {"x":7, "y":0, "label":"&"}, {"x":8, "y":0, "label":"*"}, {"x":9, "y":0, "label":"("}, {"x":10, "y":0, "label":")"}, {"x":11, "y":0, "label":"_"}, {"x":12, "y":0, "label":"+"}, {"x":13, "y":0, "label":"Backspace", "w":2}, 
-        {"x":0, "y":1, "label":"Tab", "w":1.5}, {"x":1.5, "y":1, "label":"Q"}, {"x":2.5, "y":1, "label":"W"}, {"x":3.5, "y":1, "label":"E"}, {"x":4.5, "y":1, "label":"R"}, {"x":5.5, "y":1, "label":"T"}, {"x":6.5, "y":1, "label":"Y"}, {"x":7.5, "y":1, "label":"U"}, {"x":8.5, "y":1, "label":"I"}, {"x":9.5, "y":1, "label":"O"}, {"x":10.5, "y":1, "label":"P"}, {"x":11.5, "y":1, "label":"{"}, {"x":12.5, "y":1, "label":"}"}, {"x":13.5, "y":1, "label":"|", "w":1.5}, 
-        {"x":0, "y":2, "label":"Caps Lock", "w":1.75}, {"x":1.75, "y":2, "label":"A"}, {"x":2.75, "y":2, "label":"S"}, {"x":3.75, "y":2, "label":"D"}, {"x":4.75, "y":2, "label":"F"}, {"x":5.75, "y":2, "label":"G"}, {"x":6.75, "y":2, "label":"H"}, {"x":7.75, "y":2, "label":"J"}, {"x":8.75, "y":2, "label":"K"}, {"x":9.75, "y":2, "label":"L"}, {"x":10.75, "y":2, "label":":"}, {"x":11.75, "y":2, "label":"\""}, {"x":12.75, "y":2, "label":"Enter", "w":2.25}, 
-        {"x":0, "y":3, "label":"Shift", "w":2.25}, {"x":2.25, "y":3, "label":"Z"}, {"x":3.25, "y":3, "label":"X"}, {"x":4.25, "y":3, "label":"C"}, {"x":5.25, "y":3, "label":"V"}, {"x":6.25, "y":3, "label":"B"}, {"x":7.25, "y":3, "label":"N"}, {"x":8.25, "y":3, "label":"M"}, {"x":9.25, "y":3, "label":"<"}, {"x":10.25, "y":3, "label":">"}, {"x":11.25, "y":3, "label":"?"}, {"x":12.25, "y":3, "label":"Shift", "w":2.75}, 
-        {"x":0, "y":4, "label":"Ctrl", "w":1.25}, {"x":1.25, "y":4, "label":"Win", "w":1.25}, {"x":2.5, "y":4, "label":"Alt", "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "label":"Alt", "w":1.25}, {"x":11.25, "y":4, "label":"Win", "w":1.25}, {"x":12.5, "y":4, "label":"Menu", "w":1.25}, {"x":13.75, "y":4, "label":"Ctrl", "w":1.25}]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+      ]
     },
 
     "LAYOUT_60_iso": {
       "layout": [
-        {"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, 
-        {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, 
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, 
-        {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, 
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2},
+        {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+      ]
     },
 
     "LAYOUT_60_ansi_split_bs_rshift": {
       "layout": [
-        {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, 
-        {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, 
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 
-        {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, 
-        {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":6}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Win", "x":11.5, "y":4}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+        {"matrix": [4, 11], "x": 11.5, "y": 4},
+        {"matrix": [4, 13], "x": 12.5, "y": 4},
+        {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+      ]
     },
 
     "LAYOUT_60_ansi_split_rshift": {
       "layout": [
-        {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0, "w":2}, 
-        {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, 
-        {"label":"Esc", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 
-        {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, 
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Alt", "x":1.25, "y":4, "w": 1.25}, {"label":"Gui", "x":2.5, "y":4, "w":1.25}, {"label": "Space", "x":3.75, "y":4, "w":6.25}, {"label":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Gui", "x":11.25, "y":4, "w": 1.25}, {"label":"Alt", "x":12.5, "y":4, "w": 1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
       ]
     },
 
     "LAYOUT_60_ansi_tsangan_split_rshift": {
       "layout": [
-        {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label": "Bksp", "x":13, "y":0, "w":2}, 
-        {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, 
-        {"label":"Esc", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 
-        {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label": "Alt Gr", "x":14, "y":3}, 
-        {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":1.5, "y":4}, {"label":"GUI", "x":2.5, "y":4, "w":1.5}, {"label":"space", "x":4, "y":4, "w":7}, {"label":"Fn", "x":11, "y":4, "w":1.5}, {"label":"Alt", "x":12.5, "y":4}, {"label":"GUI", "x":13.5, "y":4, "w": 1.5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 12.5, "y": 4},
+        {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
       ]
     },
 
     "LAYOUT_60_hhkb": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, 
-        {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Delete", "x":13.5, "y":1, "w":1.5}, 
-        {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 
-        {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, 
-        {"label":"Os", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Os", "x":12.5, "y":4}]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 12.5, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
index 5d3841ae85..633bdfffee 100644
--- a/keyboards/1upkeyboards/pi40/config.h
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -10,9 +10,8 @@
 #define OLED_BRIGHTNESS 128
 #define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c"
 
-#define RGB_DI_PIN GP0
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS  
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #    define RGBLIGHT_LIMIT_VAL 150
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
index b3c64f7dd4..bd1e1bf065 100644
--- a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
@@ -13,6 +13,10 @@
     "dynamic_keymap": {
         "layer_count": 10
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "features": {
         "audio": false,
         "backlight": false,
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
index d476109f79..0de0926be1 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
@@ -13,6 +13,10 @@
     "dynamic_keymap": {
         "layer_count": 10
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "features": {
         "audio": false,
         "backlight": false,
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
index 9e01928554..5192e20aa5 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
@@ -13,6 +13,10 @@
     "dynamic_keymap": {
         "layer_count": 10
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "features": {
         "audio": false,
         "backlight": false,
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
index 75f06c3f2b..e858deae6a 100644
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@@ -1,5 +1,3 @@
-WS2812_DRIVER = vendor
-
 OLED_ENABLE     = yes
 OLED_DRIVER     = SSD1306
 
diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h
index 3ba6144e59..8940acb004 100644
--- a/keyboards/1upkeyboards/pi60/config.h
+++ b/keyboards/1upkeyboards/pi60/config.h
@@ -5,7 +5,6 @@
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
 
-#define RGB_DI_PIN GP17
 #define RGB_MATRIX_LED_COUNT 21
 //#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 //#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json
index d8a63123cf..3f3871cd73 100644
--- a/keyboards/1upkeyboards/pi60/info.json
+++ b/keyboards/1upkeyboards/pi60/info.json
@@ -24,6 +24,10 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "GP17",
+        "driver": "vendor"
+    },
     "matrix_pins": {
         "cols": ["GP5", "GP8", "GP11", "GP6", "GP7", "GP0", "GP26", "GP10", "GP9", "GP1", "GP18", "GP20", "GP21", "GP27", "GP28", "GP19"],
         "rows": ["GP12", "GP13", "GP16", "GP25", "GP29"]
@@ -74,74 +78,74 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                { "label": "Esc",    "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "1",      "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "label": "2",      "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "3",      "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "label": "4",      "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-                { "label": "5",      "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-                { "label": "6",      "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-                { "label": "7",      "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-                { "label": "8",      "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-                { "label": "9",      "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-                { "label": "0",      "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-                { "label": "-",      "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-                { "label": "=",      "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
-                { "label": "BS",     "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
-                { "label": "~",      "matrix": [0, 14], "w": 1, "x": 14, "y": 0 },
+                { "label": "Esc",    "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1",      "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2",      "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3",      "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4",      "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5",      "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6",      "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7",      "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8",      "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9",      "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0",      "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-",      "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=",      "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "BS",     "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "~",      "matrix": [0, 14], "x": 14, "y": 0 },
                 { "label": "Tab",    "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "Q",      "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-                { "label": "W",      "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-                { "label": "E",      "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-                { "label": "R",      "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-                { "label": "T",      "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-                { "label": "Y",      "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-                { "label": "U",      "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-                { "label": "I",      "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-                { "label": "O",      "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-                { "label": "P",      "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-                { "label": "[",      "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-                { "label": "]",      "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "Q",      "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W",      "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E",      "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R",      "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T",      "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y",      "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U",      "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I",      "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O",      "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P",      "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[",      "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]",      "matrix": [1, 12], "x": 12.5, "y": 1 },
                 { "label": "|",      "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
                 { "label": "Caps",   "matrix": [2, 15], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "A",      "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-                { "label": "S",      "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-                { "label": "D",      "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-                { "label": "F",      "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-                { "label": "G",      "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-                { "label": "H",      "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-                { "label": "J",      "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-                { "label": "K",      "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-                { "label": "L",      "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-                { "label": ";",      "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-                { "label": "'",      "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
-                { "label": "ISO'",   "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 },
+                { "label": "A",      "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S",      "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D",      "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F",      "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G",      "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H",      "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J",      "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K",      "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L",      "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";",      "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'",      "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "ISO'",   "matrix": [2, 12], "x": 12.75, "y": 2 },
                 { "label": "Enter",  "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 },
                 { "label": "LShift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "label": "ISO<>",  "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-                { "label": "Z",      "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-                { "label": "X",      "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-                { "label": "C",      "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-                { "label": "V",      "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-                { "label": "B",      "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-                { "label": "N",      "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-                { "label": "M",      "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
-                { "label": ",",      "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
-                { "label": ".",      "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "ISO<>",  "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z",      "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X",      "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C",      "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V",      "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B",      "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N",      "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M",      "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",",      "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".",      "matrix": [3, 10], "x": 10.25, "y": 3 },
                 { "label": "/",      "matrix": [3, 11], "w": 1.75, "x": 11.25, "y": 3 },
-                { "label": "RShift", "matrix": [3, 12], "w": 1, "x": 13, "y": 3 },
-                { "label": "FN",     "matrix": [3, 14], "w": 1, "x": 14, "y": 3 },
+                { "label": "RShift", "matrix": [3, 12], "x": 13, "y": 3 },
+                { "label": "FN",     "matrix": [3, 14], "x": 14, "y": 3 },
                 { "label": "LCtrl",  "matrix": [4, 15], "w": 1.25, "x": 0, "y": 4 },
                 { "label": "LGui",   "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
                 { "label": "LAlt",   "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
                 { "label": "LSpace", "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4 },
                 { "label": "CSpace", "matrix": [4, 6], "w": 1.25, "x": 6.5, "y": 4 },
                 { "label": "RSpace", "matrix": [4, 8], "w": 2.25, "x": 7.75, "y": 4 },
-                { "label": "RAlt",   "matrix": [4, 10], "w": 1, "x": 10, "y": 4 },
-                { "label": "FN",     "matrix": [4, 11], "w": 1, "x": 11, "y": 4 },
-                { "label": "Mid1U",  "matrix": [4, 12], "w": 1, "x": 12, "y": 4 },
-                { "label": "Menu",   "matrix": [4, 13], "w": 1, "x": 13, "y": 4 },
-                { "label": "RCtrl",  "matrix": [4, 14], "w": 1, "x": 14, "y": 4 }
+                { "label": "RAlt",   "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "FN",     "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "Mid1U",  "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "Menu",   "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "RCtrl",  "matrix": [4, 14], "x": 14, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/1upkeyboards/pi60/rules.mk b/keyboards/1upkeyboards/pi60/rules.mk
index 8e853e0af7..e69de29bb2 100644
--- a/keyboards/1upkeyboards/pi60/rules.mk
+++ b/keyboards/1upkeyboards/pi60/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h
index 1bfa848547..02100955e4 100644
--- a/keyboards/1upkeyboards/pi60_hse/config.h
+++ b/keyboards/1upkeyboards/pi60_hse/config.h
@@ -5,7 +5,6 @@
 
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
-#define RGB_DI_PIN GP15
 #define RGB_MATRIX_LED_COUNT 16
 #define RGBLED_NUM 16
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json
index 2fb271382f..c490e89f4b 100644
--- a/keyboards/1upkeyboards/pi60_hse/info.json
+++ b/keyboards/1upkeyboards/pi60_hse/info.json
@@ -23,6 +23,10 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "GP15",
+        "driver": "vendor"
+    },
     "matrix_pins": {
         "cols": ["GP9", "GP8", "GP6", "GP5", "GP14", "GP20", "GP13", "GP12", "GP11", "GP16", "GP17", "GP10", "GP19", "GP18"],
         "rows": ["GP4", "GP3", "GP2", "GP1", "GP0", "GP21"]
@@ -54,61 +58,61 @@
     "layouts": {
         "LAYOUT_60_ansi_split_bs_rshift": {
             "layout": [
-                { "label": "Esc",    "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "1",      "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "label": "2",      "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "3",      "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "label": "4",      "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-                { "label": "5",      "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-                { "label": "6",      "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-                { "label": "7",      "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-                { "label": "8",      "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-                { "label": "9",      "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-                { "label": "0",      "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-                { "label": "-",      "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-                { "label": "=",      "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
-                { "label": "BS",     "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
-                { "label": "~",      "matrix": [1, 13], "w": 1, "x": 14, "y": 0 },
+                { "label": "Esc",    "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1",      "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2",      "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3",      "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4",      "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5",      "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6",      "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7",      "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8",      "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9",      "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0",      "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-",      "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=",      "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "BS",     "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "~",      "matrix": [1, 13], "x": 14, "y": 0 },
                 { "label": "Tab",    "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "Q",      "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-                { "label": "W",      "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-                { "label": "E",      "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-                { "label": "R",      "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-                { "label": "T",      "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-                { "label": "Y",      "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-                { "label": "U",      "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-                { "label": "I",      "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-                { "label": "O",      "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-                { "label": "P",      "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-                { "label": "[",      "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-                { "label": "]",      "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "Q",      "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W",      "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E",      "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R",      "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T",      "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y",      "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U",      "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I",      "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O",      "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P",      "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[",      "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]",      "matrix": [1, 12], "x": 12.5, "y": 1 },
                 { "label": "|",      "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 1 },
                 { "label": "Caps",   "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "A",      "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-                { "label": "S",      "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-                { "label": "D",      "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-                { "label": "F",      "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-                { "label": "G",      "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-                { "label": "H",      "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-                { "label": "J",      "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-                { "label": "K",      "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-                { "label": "L",      "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-                { "label": ";",      "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-                { "label": "'",      "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "A",      "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S",      "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D",      "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F",      "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G",      "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H",      "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J",      "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K",      "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L",      "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";",      "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'",      "matrix": [2, 11], "x": 11.75, "y": 2 },
                 { "label": "Enter",  "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
                 { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label": "Z",      "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
-                { "label": "X",      "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
-                { "label": "C",      "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
-                { "label": "V",      "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
-                { "label": "B",      "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
-                { "label": "N",      "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
-                { "label": "M",      "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
-                { "label": ",",      "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
-                { "label": ".",      "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
-                { "label": "/",      "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Z",      "matrix": [3, 1], "x": 2.25, "y": 3 },
+                { "label": "X",      "matrix": [3, 2], "x": 3.25, "y": 3 },
+                { "label": "C",      "matrix": [3, 3], "x": 4.25, "y": 3 },
+                { "label": "V",      "matrix": [3, 4], "x": 5.25, "y": 3 },
+                { "label": "B",      "matrix": [3, 5], "x": 6.25, "y": 3 },
+                { "label": "N",      "matrix": [3, 6], "x": 7.25, "y": 3 },
+                { "label": "M",      "matrix": [3, 7], "x": 8.25, "y": 3 },
+                { "label": ",",      "matrix": [3, 8], "x": 9.25, "y": 3 },
+                { "label": ".",      "matrix": [3, 9], "x": 10.25, "y": 3 },
+                { "label": "/",      "matrix": [3, 10], "x": 11.25, "y": 3 },
                 { "label": "RShift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
-                { "label": "FN",     "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "label": "FN",     "matrix": [3, 13], "x": 14, "y": 3 },
                 { "label": "LCtrl",  "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
                 { "label": "LGui",   "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
                 { "label": "LAlt",   "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
diff --git a/keyboards/1upkeyboards/pi60_hse/rules.mk b/keyboards/1upkeyboards/pi60_hse/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/1upkeyboards/pi60_hse/rules.mk
+++ b/keyboards/1upkeyboards/pi60_hse/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h
index 7c05197ea2..b0747bd56d 100644
--- a/keyboards/1upkeyboards/pi60_rgb/config.h
+++ b/keyboards/1upkeyboards/pi60_rgb/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-
-#define RGB_DI_PIN GP19
 #define RGB_MATRIX_LED_COUNT 61
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json
index 22afdb58a0..29d31b5696 100644
--- a/keyboards/1upkeyboards/pi60_rgb/info.json
+++ b/keyboards/1upkeyboards/pi60_rgb/info.json
@@ -26,6 +26,10 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "GP19",
+        "driver": "vendor"
+    },
     "matrix_pins": {
         "cols": ["GP3", "GP4", "GP5", "GP20", "GP18", "GP13", "GP17", "GP16", "GP15", "GP12", "GP11", "GP14", "GP10", "GP9"],
         "rows": ["GP1", "GP2", "GP8", "GP6", "GP0", "GP21"]
@@ -102,58 +106,58 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                { "label": "Esc",    "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "1",      "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "label": "2",      "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "3",      "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "label": "4",      "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-                { "label": "5",      "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-                { "label": "6",      "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-                { "label": "7",      "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-                { "label": "8",      "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-                { "label": "9",      "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-                { "label": "0",      "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-                { "label": "-",      "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-                { "label": "=",      "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Esc",    "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1",      "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2",      "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3",      "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4",      "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5",      "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6",      "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7",      "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8",      "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9",      "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0",      "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-",      "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=",      "matrix": [0, 12], "x": 12, "y": 0 },
                 { "label": "BS",     "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
                 { "label": "Tab",    "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "Q",      "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-                { "label": "W",      "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-                { "label": "E",      "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-                { "label": "R",      "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-                { "label": "T",      "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-                { "label": "Y",      "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-                { "label": "U",      "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-                { "label": "I",      "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-                { "label": "O",      "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-                { "label": "P",      "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-                { "label": "[",      "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-                { "label": "]",      "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "Q",      "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W",      "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E",      "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R",      "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T",      "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y",      "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U",      "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I",      "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O",      "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P",      "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[",      "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]",      "matrix": [1, 12], "x": 12.5, "y": 1 },
                 { "label": "|",      "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
                 { "label": "Caps",   "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "A",      "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-                { "label": "S",      "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-                { "label": "D",      "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-                { "label": "F",      "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-                { "label": "G",      "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-                { "label": "H",      "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-                { "label": "J",      "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-                { "label": "K",      "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-                { "label": "L",      "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-                { "label": ";",      "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-                { "label": "'",      "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "A",      "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S",      "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D",      "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F",      "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G",      "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H",      "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J",      "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K",      "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L",      "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";",      "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'",      "matrix": [2, 11], "x": 11.75, "y": 2 },
                 { "label": "Enter",  "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
                 { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label": "Z",      "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
-                { "label": "X",      "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
-                { "label": "C",      "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
-                { "label": "V",      "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
-                { "label": "B",      "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
-                { "label": "N",      "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
-                { "label": "M",      "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
-                { "label": ",",      "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
-                { "label": ".",      "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
-                { "label": "/",      "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Z",      "matrix": [3, 1], "x": 2.25, "y": 3 },
+                { "label": "X",      "matrix": [3, 2], "x": 3.25, "y": 3 },
+                { "label": "C",      "matrix": [3, 3], "x": 4.25, "y": 3 },
+                { "label": "V",      "matrix": [3, 4], "x": 5.25, "y": 3 },
+                { "label": "B",      "matrix": [3, 5], "x": 6.25, "y": 3 },
+                { "label": "N",      "matrix": [3, 6], "x": 7.25, "y": 3 },
+                { "label": "M",      "matrix": [3, 7], "x": 8.25, "y": 3 },
+                { "label": ",",      "matrix": [3, 8], "x": 9.25, "y": 3 },
+                { "label": ".",      "matrix": [3, 9], "x": 10.25, "y": 3 },
+                { "label": "/",      "matrix": [3, 10], "x": 11.25, "y": 3 },
                 { "label": "RShift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
                 { "label": "LCtrl",  "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
                 { "label": "LGui",   "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
diff --git a/keyboards/1upkeyboards/pi60_rgb/rules.mk b/keyboards/1upkeyboards/pi60_rgb/rules.mk
index 8e853e0af7..e69de29bb2 100644
--- a/keyboards/1upkeyboards/pi60_rgb/rules.mk
+++ b/keyboards/1upkeyboards/pi60_rgb/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 7af70c5b75..44b20dd9d6 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { D1, D0, F4, F5 }
-#define MATRIX_COL_PINS \
-    { D4, C6, F6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16  // Add 12 if attaching the RGB LED ring
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #    ifdef RGBLIGHT_ENABLE
@@ -109,7 +88,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #    endif
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json
index d648c32f3e..923f536ac8 100644
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@@ -8,15 +8,63 @@
     "pid": "0x5516",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
+  "matrix_pins": {
+    "cols": ["D4", "C6", "F6", "F7"],
+    "rows": ["D1", "D0", "F4", "F5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_4x4", "numpad_4x4"],
   "layouts": {
     "LAYOUT_ortho_4x4": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3}
+      ]
     },
     "LAYOUT_numpad_4x4": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "y":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, "h": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+        {"matrix": [3, 2], "x": 2, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/1upkeyboards/super16/rules.mk b/keyboards/1upkeyboards/super16/rules.mk
index 373bf88ecf..b5532d03ff 100644
--- a/keyboards/1upkeyboards/super16/rules.mk
+++ b/keyboards/1upkeyboards/super16/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/1upkeyboards/super16/super16.c b/keyboards/1upkeyboards/super16/super16.c
index eebb72c717..a9946c7525 100644
--- a/keyboards/1upkeyboards/super16/super16.c
+++ b/keyboards/1upkeyboards/super16/super16.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "super16.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/1upkeyboards/super16/super16.h b/keyboards/1upkeyboards/super16/super16.h
deleted file mode 100644
index 0595af8dcd..0000000000
--- a/keyboards/1upkeyboards/super16/super16.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_4x4( \
-  K00, K01, K02, K03, \
-  K10, K11, K12, K13, \
-  K20, K21, K22, K23, \
-  K30, K31, K32, K33  \
-) { \
-  { K00, K01, K02, K03 }, \
-  { K10, K11, K12, K13 }, \
-  { K20, K21, K22, K23 }, \
-  { K30, K31, K32, K33 }  \
-}
-
-#define LAYOUT_numpad_4x4( \
-  K00, K01, K02, K03, \
-  K10, K11, K12,      \
-  K20, K21, K22, K23, \
-     K31,   K32      \
-) { \
-    { K00,   K01, K02, K03 }, \
-    { K10,   K11, K12, KC_NO }, \
-    { K20,   K21, K22, K23 }, \
-    { KC_NO, K31, K32, KC_NO }  \
-}
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 04f5fdd979..233c898454 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -19,30 +19,9 @@
 
 #define MOUSEKEY_MOVE_DELTA 25
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-//                         0   1   2   3
-#define MATRIX_ROW_PINS { D1, D2, D3, D4 }
-#define MATRIX_COL_PINS { D5, D6, C2, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B5
 #define RGB_MATRIX_LED_COUNT 20
-#ifdef RGB_DI_PIN
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGBLIGHT_LIMIT_VAL 255
-#endif
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
index 13e2c55fa5..39a8eefcc4 100644
--- a/keyboards/1upkeyboards/super16v2/info.json
+++ b/keyboards/1upkeyboards/super16v2/info.json
@@ -8,6 +8,17 @@
       "pid": "0x5517",
       "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "B5"
+    },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
+    "matrix_pins": {
+      "cols": ["D5", "D6", "C2", "D0"],
+      "rows": ["D1", "D2", "D3", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "B1", "pin_b": "B2"},
@@ -18,7 +29,27 @@
     "bootloader": "atmel-dfu",
     "layouts": {
       "LAYOUT_ortho_4x4": {
-        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":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": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3}
+        ]
       }
     }
   }
diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk
index 2653d876b5..a7f5baf807 100644
--- a/keyboards/1upkeyboards/super16v2/rules.mk
+++ b/keyboards/1upkeyboards/super16v2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/super16v2/super16v2.c b/keyboards/1upkeyboards/super16v2/super16v2.c
index ff7ce33c84..56e5fe7e7f 100644
--- a/keyboards/1upkeyboards/super16v2/super16v2.c
+++ b/keyboards/1upkeyboards/super16v2/super16v2.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "super16v2.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/1upkeyboards/super16v2/super16v2.h b/keyboards/1upkeyboards/super16v2/super16v2.h
deleted file mode 100644
index 58fd26ed8a..0000000000
--- a/keyboards/1upkeyboards/super16v2/super16v2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2022 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x4( \
-    k00, k01, k02, k03,  \
-      k10, k11, k12, k13,    \
-       k20, k21, k22, k23, \
-       k30, k31, k32, k33 \
-) { \
-    { k00, k01, k02, k03  }, \
-    { k10, k11, k12, k13 },  \
-    { k20, k21, k22, k23 },  \
-    { k30, k31, k32, k33 }  \
-}
diff --git a/keyboards/1upkeyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json
index 320c96bac8..178082212d 100644
--- a/keyboards/1upkeyboards/sweet16/info.json
+++ b/keyboards/1upkeyboards/sweet16/info.json
@@ -8,11 +8,48 @@
   },
   "layouts": {
       "LAYOUT_ortho_4x4": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":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": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1},
+            {"matrix": [1, 3], "x": 3, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1, "y": 2},
+            {"matrix": [2, 2], "x": 2, "y": 2},
+            {"matrix": [2, 3], "x": 3, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3},
+            {"matrix": [3, 3], "x": 3, "y": 3}
+          ]
       },
 
       "LAYOUT_numpad_4x4": {
-        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "y":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, "h": 2},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+          {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+          {"matrix": [3, 2], "x": 2, "y": 3}
+        ]
     }
   }
 }
diff --git a/keyboards/1upkeyboards/sweet16/sweet16.c b/keyboards/1upkeyboards/sweet16/sweet16.c
deleted file mode 100644
index 2f116c2a37..0000000000
--- a/keyboards/1upkeyboards/sweet16/sweet16.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "sweet16.h"
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/sweet16/sweet16.h b/keyboards/1upkeyboards/sweet16/sweet16.h
deleted file mode 100644
index 7320ccd9e0..0000000000
--- a/keyboards/1upkeyboards/sweet16/sweet16.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Any changes to the layout names and/or definitions must also be made to info.json
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }  \
-}
-
-#define LAYOUT_numpad_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K23, \
-       K31,   K32      \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23 }, \
-    { KC_NO, K31,   K32,   KC_NO }  \
-}
-
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
index 02e8564702..bed2edc0a6 100644
--- a/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #ifndef CONVERT_TO_PROTON_C
 #    define LED_NUM_LOCK_PIN B0 // RXLED
 #    define LED_CAPS_LOCK_PIN D5 // TXLED
@@ -15,8 +7,6 @@
 #endif
 
 /* Underglow options */
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -31,4 +21,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json
index d549338988..cb82e7fcfb 100644
--- a/keyboards/1upkeyboards/sweet16/v1/info.json
+++ b/keyboards/1upkeyboards/sweet16/v1/info.json
@@ -3,6 +3,14 @@
         "pid": "0x0161",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/1upkeyboards/sweet16/v1/v1.c b/keyboards/1upkeyboards/sweet16/v1/v1.c
deleted file mode 100644
index 0ff1041aac..0000000000
--- a/keyboards/1upkeyboards/sweet16/v1/v1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "v1.h"
diff --git a/keyboards/1upkeyboards/sweet16/v1/v1.h b/keyboards/1upkeyboards/sweet16/v1/v1.h
deleted file mode 100644
index 7320ccd9e0..0000000000
--- a/keyboards/1upkeyboards/sweet16/v1/v1.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Any changes to the layout names and/or definitions must also be made to info.json
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }  \
-}
-
-#define LAYOUT_numpad_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K23, \
-       K31,   K32      \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23 }, \
-    { KC_NO, K31,   K32,   KC_NO }  \
-}
-
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
index 9d62be3bb7..88687335de 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
@@ -18,7 +18,6 @@
 
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
-#define RGB_DI_PIN GP6
 #define RGB_MATRIX_LED_COUNT 20
 #define RGBLED_NUM 20
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
index 91fa580354..8be0d009e4 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
@@ -24,6 +24,10 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "GP6",
+        "driver": "vendor"
+    },
     "matrix_pins": {
         "cols": ["GP2",  "GP9", "GP8",  "GP7"],
         "rows": ["GP26", "GP1", "GP18", "GP5"]
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
index 2f8c72447e..f773468d8f 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
@@ -19,7 +19,6 @@
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
 
-#define RGB_DI_PIN D7
 #define RGB_MATRIX_LED_COUNT 20
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
index efdb94cd74..ec95d1b2c6 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
@@ -23,6 +23,9 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "D7"
+    },
     "matrix_pins": {
         "cols": ["F7", "D2", "B1", "C6"],
         "rows": ["D1", "B5", "B4", "E6"]
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index eb8bd97b59..3eebc9acf3 100644
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, C2, C4, C5, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 6
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -43,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json
index 18023c847e..3b2395a247 100644
--- a/keyboards/25keys/aleth42/rev0/info.json
+++ b/keyboards/25keys/aleth42/rev0/info.json
@@ -2,12 +2,20 @@
     "usb": {
         "device_version": "0.0.0"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2", "C4", "C5", "C6"],
+        "rows": ["B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "B7"},
             {"pin_a": "B5", "pin_b": "B4"}
         ]
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/25keys/aleth42/rev0/rev0.c b/keyboards/25keys/aleth42/rev0/rev0.c
deleted file mode 100644
index ce91e83804..0000000000
--- a/keyboards/25keys/aleth42/rev0/rev0.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 monksoffunk
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev0.h"
\ No newline at end of file
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
index e0799e65a1..f384f19147 100644
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ b/keyboards/25keys/aleth42/rev1/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B4, B0, B2, B1 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D6, D4, F7, F0, F1, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 8
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -43,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json
index 9d70daf01f..d3ed4d6cd0 100644
--- a/keyboards/25keys/aleth42/rev1/info.json
+++ b/keyboards/25keys/aleth42/rev1/info.json
@@ -2,12 +2,20 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0", "D6", "D4", "F7", "F0", "F1", "F4"],
+        "rows": ["B4", "B0", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B6"},
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "backlight": {
         "pin": "C6",
         "levels": 8,
diff --git a/keyboards/25keys/aleth42/rev1/rev1.c b/keyboards/25keys/aleth42/rev1/rev1.c
deleted file mode 100644
index 360cf8e7f1..0000000000
--- a/keyboards/25keys/aleth42/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 monksoffunk
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
\ No newline at end of file
diff --git a/keyboards/25keys/cassette42/common/oled_helper.c b/keyboards/25keys/cassette42/common/oled_helper.c
index 8800699a85..1c4148a7d9 100644
--- a/keyboards/25keys/cassette42/common/oled_helper.c
+++ b/keyboards/25keys/cassette42/common/oled_helper.c
@@ -1,7 +1,9 @@
+#include "oled_helper.h"
+#include "quantum.h"
+#include <stdio.h>
+#include <string.h>
+
 #ifdef OLED_ENABLE
-#    include QMK_KEYBOARD_H
-#    include <stdio.h>
-#    include <string.h>
 
 void render_logo(void) {
     static const char PROGMEM logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0};
diff --git a/keyboards/25keys/cassette42/common/oled_helper.h b/keyboards/25keys/cassette42/common/oled_helper.h
index daeb7bfa4d..d677c2a872 100644
--- a/keyboards/25keys/cassette42/common/oled_helper.h
+++ b/keyboards/25keys/cassette42/common/oled_helper.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #ifdef OLED_ENABLE
 
 void render_logo(void);
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
index 686eea8fc7..6cbe12bb12 100644
--- a/keyboards/25keys/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 5
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -35,6 +33,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 #define OLED_FONT_H "keyboards/25keys/cassette42/common/glcdfont.c"
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json
index f791a83e48..31042e9a5d 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@@ -14,6 +14,9 @@
             {"pin_a": "B3", "pin_b": "B1"}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {
@@ -24,12 +27,12 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0.5, "y":0.75, "matrix": [0, 4]},
-                {"x":2.5, "y":0.75, "matrix": [0, 5]},
-                {"x":0, "y":1.75, "matrix": [0, 0]},
-                {"x":1, "y":1.75, "matrix": [0, 1]},
-                {"x":2, "y":1.75, "matrix": [0, 2]},
-                {"x":3, "y":1.75, "matrix": [0, 3]}
+                {"x":0.5, "y":0, "matrix": [0, 4]},
+                {"x":2.5, "y":0, "matrix": [0, 5]},
+                {"x":0, "y":1, "matrix": [0, 0]},
+                {"x":1, "y":1, "matrix": [0, 1]},
+                {"x":2, "y":1, "matrix": [0, 2]},
+                {"x":3, "y":1, "matrix": [0, 3]}
             ]
         }
     }
diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json
index d667ca186c..1efe467be9 100644
--- a/keyboards/25keys/zinc/info.json
+++ b/keyboards/25keys/zinc/info.json
@@ -7,11 +7,9 @@
     "pid": "0xEA3B",
     "device_version": "0.0.1"
    },
+   "rgb_matrix": {
+     "driver": "WS2812"
+   },
   "processor": "atmega32u4",
-  "bootloader": "caterina",
-   "layouts": {
-    "LAYOUT": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
-    }
-  }
+  "bootloader": "caterina"
 }
diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
index 776f7f3138..e4b0d02f75 100644
--- a/keyboards/25keys/zinc/rev1/config.h
+++ b/keyboards/25keys/zinc/rev1/config.h
@@ -25,14 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MASTER_RIGHT
 //#define EE_HANDS
 
-#define MATRIX_ROW_PINS { F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { F4, D4, C6, D7, E6, B4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json
index fa41ed213f..46692f6e4d 100644
--- a/keyboards/25keys/zinc/rev1/info.json
+++ b/keyboards/25keys/zinc/rev1/info.json
@@ -1,6 +1,74 @@
 {
   "keyboard_name": "Zinc rev.1",
+  "matrix_pins": {
+    "cols": ["F4", "D4", "C6", "D7", "E6", "B4"],
+    "rows": ["F6", "F7", "B1", "B3"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12"
+  },
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 9, "y": 0},
+        {"matrix": [4, 1], "x": 10, "y": 0},
+        {"matrix": [4, 2], "x": 11, "y": 0},
+        {"matrix": [4, 3], "x": 12, "y": 0},
+        {"matrix": [4, 4], "x": 13, "y": 0},
+        {"matrix": [4, 5], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 9, "y": 1},
+        {"matrix": [5, 1], "x": 10, "y": 1},
+        {"matrix": [5, 2], "x": 11, "y": 1},
+        {"matrix": [5, 3], "x": 12, "y": 1},
+        {"matrix": [5, 4], "x": 13, "y": 1},
+        {"matrix": [5, 5], "x": 14, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 9, "y": 2},
+        {"matrix": [6, 1], "x": 10, "y": 2},
+        {"matrix": [6, 2], "x": 11, "y": 2},
+        {"matrix": [6, 3], "x": 12, "y": 2},
+        {"matrix": [6, 4], "x": 13, "y": 2},
+        {"matrix": [6, 5], "x": 14, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [7, 0], "x": 9, "y": 3},
+        {"matrix": [7, 1], "x": 10, "y": 3},
+        {"matrix": [7, 2], "x": 11, "y": 3},
+        {"matrix": [7, 3], "x": 12, "y": 3},
+        {"matrix": [7, 4], "x": 13, "y": 3},
+        {"matrix": [7, 5], "x": 14, "y": 3}
+      ]
+    }
   }
 }
diff --git a/keyboards/25keys/zinc/rev1/rev1.c b/keyboards/25keys/zinc/rev1/rev1.c
deleted file mode 100644
index 139919d5a6..0000000000
--- a/keyboards/25keys/zinc/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zinc.h"
diff --git a/keyboards/25keys/zinc/rev1/rev1.h b/keyboards/25keys/zinc/rev1/rev1.h
deleted file mode 100644
index 1bf2c565ae..0000000000
--- a/keyboards/25keys/zinc/rev1/rev1.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Standard Keymap
-// (TRRS jack on both halves are to the left side)
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-  L30, L31, L32, L33, L34, L35,           R30, R31, R32, R33, R34, R35  \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05}, \
-    { L10, L11, L12, L13, L14, L15}, \
-    { L20, L21, L22, L23, L24, L25}, \
-    { L30, L31, L32, L33, L34, L35}, \
-    { R00, R01, R02, R03, R04, R05 }, \
-    { R10, R11, R12, R13, R14, R15 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-  }
-
-#define LAYOUT_ortho_4x12 LAYOUT
diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
index 0a7e29a9a6..e4b0d02f75 100644
--- a/keyboards/25keys/zinc/reva/config.h
+++ b/keyboards/25keys/zinc/reva/config.h
@@ -25,14 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MASTER_RIGHT
 //#define EE_HANDS
 
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3}
-
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json
index ec98ea65a9..4db1d04910 100644
--- a/keyboards/25keys/zinc/reva/info.json
+++ b/keyboards/25keys/zinc/reva/info.json
@@ -1,6 +1,71 @@
 {
   "keyboard_name": "Zinc rev.A",
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 9, "y": 0},
+        {"matrix": [4, 1], "x": 10, "y": 0},
+        {"matrix": [4, 2], "x": 11, "y": 0},
+        {"matrix": [4, 3], "x": 12, "y": 0},
+        {"matrix": [4, 4], "x": 13, "y": 0},
+        {"matrix": [4, 5], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 9, "y": 1},
+        {"matrix": [5, 1], "x": 10, "y": 1},
+        {"matrix": [5, 2], "x": 11, "y": 1},
+        {"matrix": [5, 3], "x": 12, "y": 1},
+        {"matrix": [5, 4], "x": 13, "y": 1},
+        {"matrix": [5, 5], "x": 14, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 9, "y": 2},
+        {"matrix": [6, 1], "x": 10, "y": 2},
+        {"matrix": [6, 2], "x": 11, "y": 2},
+        {"matrix": [6, 3], "x": 12, "y": 2},
+        {"matrix": [6, 4], "x": 13, "y": 2},
+        {"matrix": [6, 5], "x": 14, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [7, 0], "x": 9, "y": 3},
+        {"matrix": [7, 1], "x": 10, "y": 3},
+        {"matrix": [7, 2], "x": 11, "y": 3},
+        {"matrix": [7, 3], "x": 12, "y": 3},
+        {"matrix": [7, 4], "x": 13, "y": 3},
+        {"matrix": [7, 5], "x": 14, "y": 3}
+      ]
+    }
   }
 }
diff --git a/keyboards/25keys/zinc/reva/reva.c b/keyboards/25keys/zinc/reva/reva.c
deleted file mode 100644
index 139919d5a6..0000000000
--- a/keyboards/25keys/zinc/reva/reva.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zinc.h"
diff --git a/keyboards/25keys/zinc/reva/reva.h b/keyboards/25keys/zinc/reva/reva.h
deleted file mode 100644
index 1bf2c565ae..0000000000
--- a/keyboards/25keys/zinc/reva/reva.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Standard Keymap
-// (TRRS jack on both halves are to the left side)
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-  L30, L31, L32, L33, L34, L35,           R30, R31, R32, R33, R34, R35  \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05}, \
-    { L10, L11, L12, L13, L14, L15}, \
-    { L20, L21, L22, L23, L24, L25}, \
-    { L30, L31, L32, L33, L34, L35}, \
-    { R00, R01, R02, R03, R04, R05 }, \
-    { R10, R11, R12, R13, R14, R15 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-  }
-
-#define LAYOUT_ortho_4x12 LAYOUT
diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk
index 21bd83b609..1e1d687ebb 100644
--- a/keyboards/25keys/zinc/rules.mk
+++ b/keyboards/25keys/zinc/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 
 DEFAULT_FOLDER = 25keys/zinc/rev1
 
diff --git a/keyboards/25keys/zinc/zinc.c b/keyboards/25keys/zinc/zinc.c
deleted file mode 100644
index 139919d5a6..0000000000
--- a/keyboards/25keys/zinc/zinc.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zinc.h"
diff --git a/keyboards/25keys/zinc/zinc.h b/keyboards/25keys/zinc/zinc.h
deleted file mode 100644
index 8a80538e4c..0000000000
--- a/keyboards/25keys/zinc/zinc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_25keys_zinc_reva
-    #include "reva.h"
-#endif
-#ifdef KEYBOARD_25keys_zinc_rev1
-    #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/2key2crawl/2key2crawl.c b/keyboards/2key2crawl/2key2crawl.c
deleted file mode 100644
index fe2161bef4..0000000000
--- a/keyboards/2key2crawl/2key2crawl.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "2key2crawl.h"
diff --git a/keyboards/2key2crawl/2key2crawl.h b/keyboards/2key2crawl/2key2crawl.h
deleted file mode 100644
index 6e8ee64208..0000000000
--- a/keyboards/2key2crawl/2key2crawl.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, K15, \
-	K10, K11, K12, K13, K14, K16  \
-) { \
-	{ K00,   K01,   K02,   K03,  KC_NO, KC_NO, KC_NO }, \
-	{ K10,   K11,   K12,   K13,  K14,   K15,   K16 },  \
-}
-
diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h
index 67a1b48157..a4088e4925 100644
--- a/keyboards/2key2crawl/config.h
+++ b/keyboards/2key2crawl/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C4, C5 }
-#define MATRIX_COL_PINS { B3, B4, B5, B6, B7, C7, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -16,7 +8,6 @@
 
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN C6
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json
index e4ab7f79a9..1752531ba1 100644
--- a/keyboards/2key2crawl/info.json
+++ b/keyboards/2key2crawl/info.json
@@ -8,28 +8,37 @@
         "pid": "0x6090",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B4", "B5", "B6", "B7", "C7", "B2"],
+        "rows": ["C4", "C5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1", "resolution": 1}
         ]
     },
+    "ws2812": {
+        "pin": "C6"
+    },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K15", "x":4, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 5], "x": 4, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
 
-                {"label":"K10", "x":0, "y":1},
-                {"label":"K11", "x":1, "y":1},
-                {"label":"K12", "x":2, "y":1},
-                {"label":"K13", "x":3, "y":1},
-                {"label":"K14", "x":4, "y":1},
-                {"label":"K16", "x":5.5, "y":0.5}
+                {"matrix": [1, 6], "x": 5.5, "y": 0.5}
             ]
         }
     }
diff --git a/keyboards/30wer/30wer.c b/keyboards/30wer/30wer.c
deleted file mode 100644
index a46c543196..0000000000
--- a/keyboards/30wer/30wer.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "30wer.h"
diff --git a/keyboards/30wer/config.h b/keyboards/30wer/config.h
deleted file mode 100644
index 23ccf24b81..0000000000
--- a/keyboards/30wer/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-
-/* pcb default pin-out */
-#define MATRIX_ROW_PINS { E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1, D0, D4, C6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/30wer/info.json b/keyboards/30wer/info.json
index bbaa61f6ba..bced976dd5 100644
--- a/keyboards/30wer/info.json
+++ b/keyboards/30wer/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5678",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1", "D0", "D4", "C6", "D7"],
+        "rows": ["E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/3keyecosystem/2key2/2key2.c b/keyboards/3keyecosystem/2key2/2key2.c
index 17e87b412e..11f4b8b217 100644
--- a/keyboards/3keyecosystem/2key2/2key2.c
+++ b/keyboards/3keyecosystem/2key2/2key2.c
@@ -14,7 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "2key2.h"
+#include "quantum.h"
 
 // RGB Matrix configuration
 // based on https://docs.qmk.fm/#/feature_rgb_matrix?id=common-configuration
diff --git a/keyboards/3keyecosystem/2key2/2key2.h b/keyboards/3keyecosystem/2key2/2key2.h
deleted file mode 100644
index 05af99101a..0000000000
--- a/keyboards/3keyecosystem/2key2/2key2.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2021 John Mueller
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01 \
-) { \
-    { k00, k01 }  \
-}
diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h
index 6bb66fc39f..49bd09eb7e 100644
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -16,16 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { F6 }
-#define MATRIX_COL_PINS { F4, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB matrix key backlighting */
-#define RGB_DI_PIN B2
 #define RGB_MATRIX_LED_COUNT 2
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE
diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json
index 1da073d0fc..f2d712072e 100644
--- a/keyboards/3keyecosystem/2key2/info.json
+++ b/keyboards/3keyecosystem/2key2/info.json
@@ -8,16 +8,27 @@
         "pid": "0x3304",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "D7"],
+        "rows": ["F6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7"
     },
+    "ws2812": {
+        "pin": "B2"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0}
             ]
         }
     }
diff --git a/keyboards/3keyecosystem/2key2/rules.mk b/keyboards/3keyecosystem/2key2/rules.mk
index 1246683290..94674b71a1 100644
--- a/keyboards/3keyecosystem/2key2/rules.mk
+++ b/keyboards/3keyecosystem/2key2/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes		# Enable RGB matrix
-RGB_MATRIX_DRIVER = WS2812	# Select WS2812 driver for RGB matrix
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/3w6/rev1/matrix.c b/keyboards/3w6/rev1/matrix.c
index ae2f96bfa1..8bb6c77aaa 100644
--- a/keyboards/3w6/rev1/matrix.c
+++ b/keyboards/3w6/rev1/matrix.c
@@ -24,7 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * to repeating that information all over the place.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "i2c_master.h"
 
 extern i2c_status_t tca9555_status;
diff --git a/keyboards/3w6/rev1/rev1.c b/keyboards/3w6/rev1/rev1.c
deleted file mode 100644
index 3944ec3b13..0000000000
--- a/keyboards/3w6/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 weteor
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
index c4f4a0441a..a6661cdc07 100644
--- a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
+++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
@@ -115,7 +115,7 @@ void  trackball_set_scrolling(bool scroll) { scrolling = scroll; }
 
 __attribute__((weak)) void pointing_device_init(void) { trackball_set_rgbw(0x80, 0x00, 0x00, 0x00); }
 
-void pointing_device_task(void) {
+bool pointing_device_task(void) {
     static bool     debounce;
     static uint16_t debounce_timer;
     uint8_t         state[5] = {};
@@ -173,5 +173,5 @@ void pointing_device_task(void) {
     update_member(&mouse.v, &h_offset);
 #endif
     pointing_device_set_report(mouse);
-    pointing_device_send();
+    return pointing_device_send();
 }
diff --git a/keyboards/3w6/rev2/matrix.c b/keyboards/3w6/rev2/matrix.c
index c47c24e1dc..49cb09a9f8 100644
--- a/keyboards/3w6/rev2/matrix.c
+++ b/keyboards/3w6/rev2/matrix.c
@@ -24,7 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * to repeating that information all over the place.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "i2c_master.h"
 
 extern i2c_status_t tca9555_status;
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index 86d1f0b90f..20ecf94708 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -21,22 +21,6 @@
 //#define MASTER_RIGHT
 //#define EE_HANDS
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json
index d0544f9a2e..70a2749a65 100644
--- a/keyboards/40percentclub/25/info.json
+++ b/keyboards/40percentclub/25/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0F25",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/40percentclub/4x4/4x4.c b/keyboards/40percentclub/4x4/4x4.c
deleted file mode 100644
index 8510b358f5..0000000000
--- a/keyboards/40percentclub/4x4/4x4.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x4.h"
diff --git a/keyboards/40percentclub/4x4/4x4.h b/keyboards/40percentclub/4x4/4x4.h
deleted file mode 100644
index 8cc5a150aa..0000000000
--- a/keyboards/40percentclub/4x4/4x4.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33 \
-) \
-{ \
-    { K00, K01, K02, K03, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K10, K11, K12, K13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K20, K21, K22, K23, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K30, K31, K32, K33, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___} \
-}
-#define LAYOUT_ortho_4x8( \
-    K00, K01, K02, K03, K04, K05, K06, K07, \
-    K10, K11, K12, K13, K14, K15, K16, K17, \
-    K20, K21, K22, K23, K24, K25, K26, K27, \
-    K30, K31, K32, K33, K34, K35, K36, K37\
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K30, K31, K32, K33, K34, K35, K35, K37, ___, ___, ___, ___, ___, ___, ___, ___} \
-}
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, ___, ___, ___, ___}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, ___, ___, ___, ___}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, ___, ___, ___, ___}, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, ___, ___, ___, ___} \
-}
-
-#define LAYOUT_ortho_4x16( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, K0f, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, K1f, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, K0f }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, K1f }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f } \
-}
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
index ac308220e4..7caa265c1a 100644
--- a/keyboards/40percentclub/4x4/config.h
+++ b/keyboards/40percentclub/4x4/config.h
@@ -2,23 +2,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B2, D1, D0, D4 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B7, D6, F7, F6, F5, F4, F1, F0, B3, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/info.json
index 7864832484..389aad3619 100644
--- a/keyboards/40percentclub/4x4/info.json
+++ b/keyboards/40percentclub/4x4/info.json
@@ -8,196 +8,201 @@
         "pid": "0x0A0C",
         "device_version": "44.4.4"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
+        "rows": ["B2", "D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x4", "ortho_4x12"],
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":3, "y":2, "matrix": [2, 3]},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3}
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":3, "y":3, "matrix": [3, 3]}
             ]
         },
         "LAYOUT_ortho_4x8": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x":4, "y":1, "matrix": [1, 4]},
+                {"x":5, "y":1, "matrix": [1, 5]},
+                {"x":6, "y":1, "matrix": [1, 6]},
+                {"x":7, "y":1, "matrix": [1, 7]},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x":4, "y":2, "matrix": [2, 4]},
+                {"x":5, "y":2, "matrix": [2, 5]},
+                {"x":6, "y":2, "matrix": [2, 6]},
+                {"x":7, "y":2, "matrix": [2, 7]},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3}
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":3, "y":3, "matrix": [3, 3]},
+                {"x":4, "y":3, "matrix": [3, 4]},
+                {"x":5, "y":3, "matrix": [3, 5]},
+                {"x":6, "y":3, "matrix": [3, 6]},
+                {"x":7, "y":3, "matrix": [3, 7]}
             ]
         },
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x":8, "y":0, "matrix": [0, 8]},
+                {"x":9, "y":0, "matrix": [0, 9]},
+                {"x":10, "y":0, "matrix": [0, 10]},
+                {"x":11, "y":0, "matrix": [0, 11]},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x":4, "y":1, "matrix": [1, 4]},
+                {"x":5, "y":1, "matrix": [1, 5]},
+                {"x":6, "y":1, "matrix": [1, 6]},
+                {"x":7, "y":1, "matrix": [1, 7]},
+                {"x":8, "y":1, "matrix": [1, 8]},
+                {"x":9, "y":1, "matrix": [1, 9]},
+                {"x":10, "y":1, "matrix": [1, 10]},
+                {"x":11, "y":1, "matrix": [1, 11]},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x":4, "y":2, "matrix": [2, 4]},
+                {"x":5, "y":2, "matrix": [2, 5]},
+                {"x":6, "y":2, "matrix": [2, 6]},
+                {"x":7, "y":2, "matrix": [2, 7]},
+                {"x":8, "y":2, "matrix": [2, 8]},
+                {"x":9, "y":2, "matrix": [2, 9]},
+                {"x":10, "y":2, "matrix": [2, 10]},
+                {"x":11, "y":2, "matrix": [2, 11]},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3}
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":3, "y":3, "matrix": [3, 3]},
+                {"x":4, "y":3, "matrix": [3, 4]},
+                {"x":5, "y":3, "matrix": [3, 5]},
+                {"x":6, "y":3, "matrix": [3, 6]},
+                {"x":7, "y":3, "matrix": [3, 7]},
+                {"x":8, "y":3, "matrix": [3, 8]},
+                {"x":9, "y":3, "matrix": [3, 9]},
+                {"x":10, "y":3, "matrix": [3, 10]},
+                {"x":11, "y":3, "matrix": [3, 11]}
             ]
         },
         "LAYOUT_ortho_4x16": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":6, "y":0, "matrix": [0, 6]},
+                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x":8, "y":0, "matrix": [0, 8]},
+                {"x":9, "y":0, "matrix": [0, 9]},
+                {"x":10, "y":0, "matrix": [0, 10]},
+                {"x":11, "y":0, "matrix": [0, 11]},
+                {"x":12, "y":0, "matrix": [0, 12]},
+                {"x":13, "y":0, "matrix": [0, 13]},
+                {"x":14, "y":0, "matrix": [0, 14]},
+                {"x":15, "y":0, "matrix": [0, 15]},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
-                {"x":15, "y":1},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x":4, "y":1, "matrix": [1, 4]},
+                {"x":5, "y":1, "matrix": [1, 5]},
+                {"x":6, "y":1, "matrix": [1, 6]},
+                {"x":7, "y":1, "matrix": [1, 7]},
+                {"x":8, "y":1, "matrix": [1, 8]},
+                {"x":9, "y":1, "matrix": [1, 9]},
+                {"x":10, "y":1, "matrix": [1, 10]},
+                {"x":11, "y":1, "matrix": [1, 11]},
+                {"x":12, "y":1, "matrix": [1, 12]},
+                {"x":13, "y":1, "matrix": [1, 13]},
+                {"x":14, "y":1, "matrix": [1, 14]},
+                {"x":15, "y":1, "matrix": [1, 15]},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
-                {"x":15, "y":2},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x":4, "y":2, "matrix": [2, 4]},
+                {"x":5, "y":2, "matrix": [2, 5]},
+                {"x":6, "y":2, "matrix": [2, 6]},
+                {"x":7, "y":2, "matrix": [2, 7]},
+                {"x":8, "y":2, "matrix": [2, 8]},
+                {"x":9, "y":2, "matrix": [2, 9]},
+                {"x":10, "y":2, "matrix": [2, 10]},
+                {"x":11, "y":2, "matrix": [2, 11]},
+                {"x":12, "y":2, "matrix": [2, 12]},
+                {"x":13, "y":2, "matrix": [2, 13]},
+                {"x":14, "y":2, "matrix": [2, 14]},
+                {"x":15, "y":2, "matrix": [2, 15]},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
-                {"x":15, "y":3}
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":3, "y":3, "matrix": [3, 3]},
+                {"x":4, "y":3, "matrix": [3, 4]},
+                {"x":5, "y":3, "matrix": [3, 5]},
+                {"x":6, "y":3, "matrix": [3, 6]},
+                {"x":7, "y":3, "matrix": [3, 7]},
+                {"x":8, "y":3, "matrix": [3, 8]},
+                {"x":9, "y":3, "matrix": [3, 9]},
+                {"x":10, "y":3, "matrix": [3, 10]},
+                {"x":11, "y":3, "matrix": [3, 11]},
+                {"x":12, "y":3, "matrix": [3, 12]},
+                {"x":13, "y":3, "matrix": [3, 13]},
+                {"x":14, "y":3, "matrix": [3, 14]},
+                {"x":15, "y":3, "matrix": [3, 15]}
             ]
         }
     }
diff --git a/keyboards/40percentclub/5x5/5x5.c b/keyboards/40percentclub/5x5/5x5.c
deleted file mode 100644
index b31fcd7814..0000000000
--- a/keyboards/40percentclub/5x5/5x5.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "5x5.h"
diff --git a/keyboards/40percentclub/5x5/5x5.h b/keyboards/40percentclub/5x5/5x5.h
deleted file mode 100644
index 182e9e8190..0000000000
--- a/keyboards/40percentclub/5x5/5x5.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_5x5( \
-    K00, K01, K02, K03, K04, \
-    K10, K11, K12, K13, K14, \
-    K20, K21, K22, K23, K24, \
-    K30, K31, K32, K33, K34, \
-    K40, K41, K42, K43, K44 \
-) \
-{ \
-    { K00, K01, K02, K03, K04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K10, K11, K12, K13, K14, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K20, K21, K22, K23, K24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K30, K31, K32, K33, K34, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
-    { K40, K41, K42, K43, K44, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___} \
-}
-
-#define LAYOUT_ortho_5x10( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49 \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, ___, ___, ___, ___, ___}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, ___, ___, ___, ___, ___}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, ___, ___, ___, ___, ___}, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, ___, ___, ___, ___, ___}, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, ___, ___, ___, ___, ___} \
-}
-
-#define LAYOUT_ortho_5x15( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, K4d, K4e \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e}, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e}, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, K4d, K4e} \
-}
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
index 078344e34b..7caa265c1a 100644
--- a/keyboards/40percentclub/5x5/config.h
+++ b/keyboards/40percentclub/5x5/config.h
@@ -2,23 +2,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B2, D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5, B6, B7, D6, F7, F6, F5, F4, F1, F0, B3, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/info.json
index 76554d54e4..3ebc123c9b 100644
--- a/keyboards/40percentclub/5x5/info.json
+++ b/keyboards/40percentclub/5x5/info.json
@@ -8,182 +8,187 @@
         "pid": "0x05B5",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
+        "rows": ["B2", "D1", "D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_5x5", "ortho_5x10", "ortho_5x15"],
     "layouts": {
         "LAYOUT_ortho_5x5": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x10": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":7, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x15": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":7, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index 8fbc9ea06f..20ecf94708 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -21,22 +21,6 @@
 //#define MASTER_RIGHT
 //#define EE_HANDS
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D7, E6 }
-#define MATRIX_COL_PINS { F6, F7, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/info.json
index a0892d2a7a..9ddd475570 100644
--- a/keyboards/40percentclub/6lit/info.json
+++ b/keyboards/40percentclub/6lit/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0F61",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1"],
+        "rows": ["D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index 4107b37948..20ecf94708 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -21,22 +21,6 @@
 //#define MASTER_RIGHT
 //#define EE_HANDS
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D7, E6, B4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/info.json
index ecc079f51b..53cda10128 100644
--- a/keyboards/40percentclub/foobar/info.json
+++ b/keyboards/40percentclub/foobar/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0F00",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h
index 3d6c38ec80..5f36081323 100644
--- a/keyboards/40percentclub/gherkin/config.h
+++ b/keyboards/40percentclub/gherkin/config.h
@@ -1,32 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_SNAKE
-#    define RGBLIGHT_EFFECT_KNIGHT
-#    define RGBLIGHT_EFFECT_CHRISTMAS
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_RGB_TEST
-#    define RGBLIGHT_EFFECT_ALTERNATING
-#    define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/40percentclub/gherkin/gherkin.c b/keyboards/40percentclub/gherkin/gherkin.c
deleted file mode 100644
index 2952d842cf..0000000000
--- a/keyboards/40percentclub/gherkin/gherkin.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "gherkin.h"
diff --git a/keyboards/40percentclub/gherkin/gherkin.h b/keyboards/40percentclub/gherkin/gherkin.h
deleted file mode 100644
index 70bffee302..0000000000
--- a/keyboards/40percentclub/gherkin/gherkin.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x10( \
-	 K00,   K01,   K02,   K03,   K04,   K05,   K10,   K11,   K12,   K13 , \
-	 K14,   K15,   K20,   K21,   K22,   K23,   K24,   K25,   K30,   K31 , \
-	 K32,   K33,   K34,   K35,   K40,   K41,   K42,   K43,   K44,   K45   \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15 }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25 }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35 }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45 }  \
-}
diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json
index ee85708f19..808a82d4ce 100644
--- a/keyboards/40percentclub/gherkin/info.json
+++ b/keyboards/40percentclub/gherkin/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
+    "rows": ["F7", "B1", "B3", "B2", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5"
   },
@@ -16,7 +21,40 @@
   "community_layouts": ["ortho_3x10"],
   "layouts": {
     "LAYOUT_ortho_3x10": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [1, 0], "x": 6, "y": 0},
+        {"matrix": [1, 1], "x": 7, "y": 0},
+        {"matrix": [1, 2], "x": 8, "y": 0},
+        {"matrix": [1, 3], "x": 9, "y": 0},
+
+        {"matrix": [1, 4], "x": 0, "y": 1},
+        {"matrix": [1, 5], "x": 1, "y": 1},
+        {"matrix": [2, 0], "x": 2, "y": 1},
+        {"matrix": [2, 1], "x": 3, "y": 1},
+        {"matrix": [2, 2], "x": 4, "y": 1},
+        {"matrix": [2, 3], "x": 5, "y": 1},
+        {"matrix": [2, 4], "x": 6, "y": 1},
+        {"matrix": [2, 5], "x": 7, "y": 1},
+        {"matrix": [3, 0], "x": 8, "y": 1},
+        {"matrix": [3, 1], "x": 9, "y": 1},
+
+        {"matrix": [3, 2], "x": 0, "y": 2},
+        {"matrix": [3, 3], "x": 1, "y": 2},
+        {"matrix": [3, 4], "x": 2, "y": 2},
+        {"matrix": [3, 5], "x": 3, "y": 2},
+        {"matrix": [4, 0], "x": 4, "y": 2},
+        {"matrix": [4, 1], "x": 5, "y": 2},
+        {"matrix": [4, 2], "x": 6, "y": 2},
+        {"matrix": [4, 3], "x": 7, "y": 2},
+        {"matrix": [4, 4], "x": 8, "y": 2},
+        {"matrix": [4, 5], "x": 9, "y": 2}
+      ]
     }
   }
 }
diff --git a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
index e1477fc069..f6c6117726 100644
--- a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
 #undef RGBLED_NUM
-#define RGB_DI_PIN D2
+#define WS2812_DI_PIN D2
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/gherkin/keymaps/michel/config.h b/keyboards/40percentclub/gherkin/keymaps/michel/config.h
index eadbb23ce2..2105fa65b5 100644
--- a/keyboards/40percentclub/gherkin/keymaps/michel/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/michel/config.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
 #undef RGBLED_NUM
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h b/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h
index bde9ec2055..0df91ad925 100644
--- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h
@@ -27,5 +27,4 @@
 
 #define TAPPING_TERM 200
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define QUICK_TAP_TERM 0
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
index 243b953f68..589a67f03d 100644
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
@@ -13,8 +13,6 @@
 
 #define PERMISSIVE_HOLD
        // makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM
-#define IGNORE_MOD_TAP_INTERRUPT
-        // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys.
 
 #define QUICK_TAP_TERM 0
         // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap)
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index af2a983fb4..8b4ccf1479 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/40percentclub/half_n_half/half_n_half.c b/keyboards/40percentclub/half_n_half/half_n_half.c
deleted file mode 100644
index e49e545798..0000000000
--- a/keyboards/40percentclub/half_n_half/half_n_half.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Boy_314
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "half_n_half.h"
diff --git a/keyboards/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json
index 6b847361dc..0bec859a5a 100644
--- a/keyboards/40percentclub/half_n_half/info.json
+++ b/keyboards/40percentclub/half_n_half/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4A1F",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
index f73fd055cc..be51c48d8a 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
+++ b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
@@ -17,6 +17,5 @@
 #pragma once
 
 // place overrides here
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM 200
diff --git a/keyboards/40percentclub/i75/i75.c b/keyboards/40percentclub/i75/i75.c
deleted file mode 100644
index 28684e7144..0000000000
--- a/keyboards/40percentclub/i75/i75.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "i75.h"
diff --git a/keyboards/40percentclub/i75/i75.h b/keyboards/40percentclub/i75/i75.h
deleted file mode 100644
index a31c9f6e6f..0000000000
--- a/keyboards/40percentclub/i75/i75.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_40percentclub_i75_promicro
-    #include "promicro.h"
-#elif KEYBOARD_40percentclub_i75_teensy2
-    #include "teensy2.h"
-#endif
diff --git a/keyboards/40percentclub/i75/info.json b/keyboards/40percentclub/i75/info.json
index 3e9d42c28d..8661257d6b 100644
--- a/keyboards/40percentclub/i75/info.json
+++ b/keyboards/40percentclub/i75/info.json
@@ -7,11 +7,5 @@
     "vid": "0x4025",
     "pid": "0x0A0C",
     "device_version": "1.7.5"
-  },
-  "community_layouts": ["ortho_5x15"],
-  "layouts": {
-      "LAYOUT_ortho_5x15": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
-      }
   }
 }
diff --git a/keyboards/40percentclub/i75/promicro/config.h b/keyboards/40percentclub/i75/promicro/config.h
deleted file mode 100644
index 844291c8df..0000000000
--- a/keyboards/40percentclub/i75/promicro/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/i75/promicro/info.json b/keyboards/40percentclub/i75/promicro/info.json
index 4369a04103..4c3f44469c 100644
--- a/keyboards/40percentclub/i75/promicro/info.json
+++ b/keyboards/40percentclub/i75/promicro/info.json
@@ -1,4 +1,95 @@
 {
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "community_layouts": ["ortho_5x15"],
+    "layouts": {
+        "LAYOUT_ortho_5x15": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [1, 1], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [1, 3], "x": 12, "y": 0},
+                {"matrix": [1, 4], "x": 13, "y": 0},
+                {"matrix": [1, 5], "x": 14, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 7], "x": 1, "y": 1},
+                {"matrix": [1, 8], "x": 2, "y": 1},
+                {"matrix": [2, 0], "x": 3, "y": 1},
+                {"matrix": [2, 1], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [2, 4], "x": 7, "y": 1},
+                {"matrix": [2, 5], "x": 8, "y": 1},
+                {"matrix": [2, 6], "x": 9, "y": 1},
+                {"matrix": [2, 7], "x": 10, "y": 1},
+                {"matrix": [2, 8], "x": 11, "y": 1},
+                {"matrix": [3, 0], "x": 12, "y": 1},
+                {"matrix": [3, 1], "x": 13, "y": 1},
+                {"matrix": [3, 2], "x": 14, "y": 1},
+
+                {"matrix": [3, 3], "x": 0, "y": 2},
+                {"matrix": [3, 4], "x": 1, "y": 2},
+                {"matrix": [3, 5], "x": 2, "y": 2},
+                {"matrix": [3, 6], "x": 3, "y": 2},
+                {"matrix": [3, 7], "x": 4, "y": 2},
+                {"matrix": [3, 8], "x": 5, "y": 2},
+                {"matrix": [4, 0], "x": 6, "y": 2},
+                {"matrix": [4, 1], "x": 7, "y": 2},
+                {"matrix": [4, 2], "x": 8, "y": 2},
+                {"matrix": [4, 3], "x": 9, "y": 2},
+                {"matrix": [4, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+                {"matrix": [4, 7], "x": 13, "y": 2},
+                {"matrix": [4, 8], "x": 14, "y": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 3},
+                {"matrix": [5, 1], "x": 1, "y": 3},
+                {"matrix": [5, 2], "x": 2, "y": 3},
+                {"matrix": [5, 3], "x": 3, "y": 3},
+                {"matrix": [5, 4], "x": 4, "y": 3},
+                {"matrix": [5, 5], "x": 5, "y": 3},
+                {"matrix": [5, 6], "x": 6, "y": 3},
+                {"matrix": [5, 7], "x": 7, "y": 3},
+                {"matrix": [5, 8], "x": 8, "y": 3},
+                {"matrix": [6, 0], "x": 9, "y": 3},
+                {"matrix": [6, 1], "x": 10, "y": 3},
+                {"matrix": [6, 2], "x": 11, "y": 3},
+                {"matrix": [6, 3], "x": 12, "y": 3},
+                {"matrix": [6, 4], "x": 13, "y": 3},
+                {"matrix": [6, 5], "x": 14, "y": 3},
+
+                {"matrix": [6, 6], "x": 0, "y": 4},
+                {"matrix": [6, 7], "x": 1, "y": 4},
+                {"matrix": [6, 8], "x": 2, "y": 4},
+                {"matrix": [7, 0], "x": 3, "y": 4},
+                {"matrix": [7, 1], "x": 4, "y": 4},
+                {"matrix": [7, 2], "x": 5, "y": 4},
+                {"matrix": [7, 3], "x": 6, "y": 4},
+                {"matrix": [7, 4], "x": 7, "y": 4},
+                {"matrix": [7, 5], "x": 8, "y": 4},
+                {"matrix": [7, 6], "x": 9, "y": 4},
+                {"matrix": [7, 7], "x": 10, "y": 4},
+                {"matrix": [7, 8], "x": 11, "y": 4},
+                {"matrix": [8, 0], "x": 12, "y": 4},
+                {"matrix": [8, 1], "x": 13, "y": 4},
+                {"matrix": [8, 2], "x": 14, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/40percentclub/i75/promicro/promicro.c b/keyboards/40percentclub/i75/promicro/promicro.c
deleted file mode 100644
index 28684e7144..0000000000
--- a/keyboards/40percentclub/i75/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "i75.h"
diff --git a/keyboards/40percentclub/i75/promicro/promicro.h b/keyboards/40percentclub/i75/promicro/promicro.h
deleted file mode 100644
index 29394855a6..0000000000
--- a/keyboards/40percentclub/i75/promicro/promicro.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "i75.h"
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x15( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, \
-    K16, K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, \
-    K33, K34, K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \
-    K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, K64, K65, \
-    K66, K67, K68, K70, K71, K72, K73, K74, K75, K76, K77, K78, K80, K81, K82  \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-  { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-  { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-  { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \
-  { K80, K81, K82 } \
-}
diff --git a/keyboards/40percentclub/i75/teensy2/config.h b/keyboards/40percentclub/i75/teensy2/config.h
deleted file mode 100644
index d8f09b1388..0000000000
--- a/keyboards/40percentclub/i75/teensy2/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, B7, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { C6, C7, D6, D7, B5, B6, F7, F6, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/i75/teensy2/info.json b/keyboards/40percentclub/i75/teensy2/info.json
index 0b2db81c11..cc441a1096 100644
--- a/keyboards/40percentclub/i75/teensy2/info.json
+++ b/keyboards/40percentclub/i75/teensy2/info.json
@@ -1,4 +1,95 @@
 {
+    "matrix_pins": {
+        "cols": ["C6", "C7", "D6", "D7", "B5", "B6", "F7", "F6", "F5"],
+        "rows": ["D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "halfkay"
+    "bootloader": "halfkay",
+    "community_layouts": ["ortho_5x15"],
+    "layouts": {
+        "LAYOUT_ortho_5x15": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [1, 1], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [1, 3], "x": 12, "y": 0},
+                {"matrix": [1, 4], "x": 13, "y": 0},
+                {"matrix": [1, 5], "x": 14, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 7], "x": 1, "y": 1},
+                {"matrix": [1, 8], "x": 2, "y": 1},
+                {"matrix": [2, 0], "x": 3, "y": 1},
+                {"matrix": [2, 1], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [2, 4], "x": 7, "y": 1},
+                {"matrix": [2, 5], "x": 8, "y": 1},
+                {"matrix": [2, 6], "x": 9, "y": 1},
+                {"matrix": [2, 7], "x": 10, "y": 1},
+                {"matrix": [2, 8], "x": 11, "y": 1},
+                {"matrix": [3, 0], "x": 12, "y": 1},
+                {"matrix": [3, 1], "x": 13, "y": 1},
+                {"matrix": [3, 2], "x": 14, "y": 1},
+
+                {"matrix": [3, 3], "x": 0, "y": 2},
+                {"matrix": [3, 4], "x": 1, "y": 2},
+                {"matrix": [3, 5], "x": 2, "y": 2},
+                {"matrix": [3, 6], "x": 3, "y": 2},
+                {"matrix": [3, 7], "x": 4, "y": 2},
+                {"matrix": [3, 8], "x": 5, "y": 2},
+                {"matrix": [4, 0], "x": 6, "y": 2},
+                {"matrix": [4, 1], "x": 7, "y": 2},
+                {"matrix": [4, 2], "x": 8, "y": 2},
+                {"matrix": [4, 3], "x": 9, "y": 2},
+                {"matrix": [4, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+                {"matrix": [4, 7], "x": 13, "y": 2},
+                {"matrix": [4, 8], "x": 14, "y": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 3},
+                {"matrix": [5, 1], "x": 1, "y": 3},
+                {"matrix": [5, 2], "x": 2, "y": 3},
+                {"matrix": [5, 3], "x": 3, "y": 3},
+                {"matrix": [5, 4], "x": 4, "y": 3},
+                {"matrix": [5, 5], "x": 5, "y": 3},
+                {"matrix": [5, 6], "x": 6, "y": 3},
+                {"matrix": [5, 7], "x": 7, "y": 3},
+                {"matrix": [5, 8], "x": 8, "y": 3},
+                {"matrix": [6, 0], "x": 9, "y": 3},
+                {"matrix": [6, 1], "x": 10, "y": 3},
+                {"matrix": [6, 2], "x": 11, "y": 3},
+                {"matrix": [6, 3], "x": 12, "y": 3},
+                {"matrix": [6, 4], "x": 13, "y": 3},
+                {"matrix": [6, 5], "x": 14, "y": 3},
+
+                {"matrix": [6, 6], "x": 0, "y": 4},
+                {"matrix": [6, 7], "x": 1, "y": 4},
+                {"matrix": [6, 8], "x": 2, "y": 4},
+                {"matrix": [7, 0], "x": 3, "y": 4},
+                {"matrix": [7, 1], "x": 4, "y": 4},
+                {"matrix": [7, 2], "x": 5, "y": 4},
+                {"matrix": [7, 3], "x": 6, "y": 4},
+                {"matrix": [7, 4], "x": 7, "y": 4},
+                {"matrix": [7, 5], "x": 8, "y": 4},
+                {"matrix": [7, 6], "x": 9, "y": 4},
+                {"matrix": [7, 7], "x": 10, "y": 4},
+                {"matrix": [7, 8], "x": 11, "y": 4},
+                {"matrix": [8, 0], "x": 12, "y": 4},
+                {"matrix": [8, 1], "x": 13, "y": 4},
+                {"matrix": [8, 2], "x": 14, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/40percentclub/i75/teensy2/teensy2.c b/keyboards/40percentclub/i75/teensy2/teensy2.c
deleted file mode 100644
index 28684e7144..0000000000
--- a/keyboards/40percentclub/i75/teensy2/teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "i75.h"
diff --git a/keyboards/40percentclub/i75/teensy2/teensy2.h b/keyboards/40percentclub/i75/teensy2/teensy2.h
deleted file mode 100644
index 29394855a6..0000000000
--- a/keyboards/40percentclub/i75/teensy2/teensy2.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "i75.h"
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x15( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, \
-    K16, K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, \
-    K33, K34, K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \
-    K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, K64, K65, \
-    K66, K67, K68, K70, K71, K72, K73, K74, K75, K76, K77, K78, K80, K81, K82  \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-  { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-  { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-  { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \
-  { K80, K81, K82 } \
-}
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index 2848c7a32c..e388bc9705 100644
--- a/keyboards/40percentclub/luddite/config.h
+++ b/keyboards/40percentclub/luddite/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -14,7 +7,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN B4
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json
index 948ef091bd..6600d6d24d 100644
--- a/keyboards/40percentclub/luddite/info.json
+++ b/keyboards/40percentclub/luddite/info.json
@@ -8,10 +8,18 @@
     "pid": "0x4C55",
     "device_version": "10.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5",
     "levels": 4
   },
+  "ws2812": {
+    "pin": "B4"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["60_ansi"],
diff --git a/keyboards/40percentclub/luddite/luddite.c b/keyboards/40percentclub/luddite/luddite.c
deleted file mode 100644
index 3e720ad571..0000000000
--- a/keyboards/40percentclub/luddite/luddite.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "luddite.h"
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
index 0a07934e75..b9449c4714 100644
--- a/keyboards/40percentclub/mf68/config.h
+++ b/keyboards/40percentclub/mf68/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/info.json
index 2c8a4c92d6..7218573856 100644
--- a/keyboards/40percentclub/mf68/info.json
+++ b/keyboards/40percentclub/mf68/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4D68",
     "device_version": "1.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"],
+    "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5",
     "breathing": true
@@ -17,7 +22,84 @@
   "community_layouts": ["68_ansi"],
   "layouts": {
       "LAYOUT_68_ansi": {
-          "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":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": [0, 6], "x": 6, "y": 0},
+            {"matrix": [0, 7], "x": 7, "y": 0},
+            {"matrix": [0, 8], "x": 8, "y": 0},
+            {"matrix": [1, 0], "x": 9, "y": 0},
+            {"matrix": [1, 1], "x": 10, "y": 0},
+            {"matrix": [1, 2], "x": 11, "y": 0},
+            {"matrix": [1, 3], "x": 12, "y": 0},
+            {"matrix": [1, 4], "x": 13, "y": 0, "w": 2},
+
+            {"matrix": [1, 5], "x": 15.25, "y": 0},
+            {"matrix": [1, 6], "x": 16.25, "y": 0},
+
+            {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+            {"matrix": [1, 8], "x": 1.5, "y": 1},
+            {"matrix": [2, 0], "x": 2.5, "y": 1},
+            {"matrix": [2, 1], "x": 3.5, "y": 1},
+            {"matrix": [2, 2], "x": 4.5, "y": 1},
+            {"matrix": [2, 3], "x": 5.5, "y": 1},
+            {"matrix": [2, 4], "x": 6.5, "y": 1},
+            {"matrix": [2, 5], "x": 7.5, "y": 1},
+            {"matrix": [2, 6], "x": 8.5, "y": 1},
+            {"matrix": [2, 7], "x": 9.5, "y": 1},
+            {"matrix": [2, 8], "x": 10.5, "y": 1},
+            {"matrix": [3, 0], "x": 11.5, "y": 1},
+            {"matrix": [3, 1], "x": 12.5, "y": 1},
+            {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5},
+
+            {"matrix": [3, 3], "x": 15.25, "y": 1},
+            {"matrix": [3, 4], "x": 16.25, "y": 1},
+
+            {"matrix": [3, 5], "x": 0, "y": 2, "w": 1.75},
+            {"matrix": [3, 6], "x": 1.75, "y": 2},
+            {"matrix": [3, 7], "x": 2.75, "y": 2},
+            {"matrix": [3, 8], "x": 3.75, "y": 2},
+            {"matrix": [4, 0], "x": 4.75, "y": 2},
+            {"matrix": [4, 1], "x": 5.75, "y": 2},
+            {"matrix": [4, 2], "x": 6.75, "y": 2},
+            {"matrix": [4, 3], "x": 7.75, "y": 2},
+            {"matrix": [4, 4], "x": 8.75, "y": 2},
+            {"matrix": [4, 5], "x": 9.75, "y": 2},
+            {"matrix": [4, 6], "x": 10.75, "y": 2},
+            {"matrix": [4, 7], "x": 11.75, "y": 2},
+            {"matrix": [4, 8], "x": 12.75, "y": 2, "w": 2.25},
+
+            {"matrix": [5, 0], "x": 0, "y": 3, "w": 2.25},
+            {"matrix": [5, 1], "x": 2.25, "y": 3},
+            {"matrix": [5, 2], "x": 3.25, "y": 3},
+            {"matrix": [5, 3], "x": 4.25, "y": 3},
+            {"matrix": [5, 4], "x": 5.25, "y": 3},
+            {"matrix": [5, 5], "x": 6.25, "y": 3},
+            {"matrix": [5, 6], "x": 7.25, "y": 3},
+            {"matrix": [5, 7], "x": 8.25, "y": 3},
+            {"matrix": [5, 8], "x": 9.25, "y": 3},
+            {"matrix": [6, 0], "x": 10.25, "y": 3},
+            {"matrix": [6, 1], "x": 11.25, "y": 3},
+            {"matrix": [6, 2], "x": 12.25, "y": 3, "w": 2.75},
+
+            {"matrix": [6, 3], "x": 15.25, "y": 3},
+
+            {"matrix": [6, 4], "x": 0, "y": 4, "w": 1.25},
+            {"matrix": [6, 5], "x": 1.25, "y": 4, "w": 1.25},
+            {"matrix": [6, 6], "x": 2.5, "y": 4, "w": 1.25},
+            {"matrix": [6, 7], "x": 3.75, "y": 4, "w": 6.25},
+            {"matrix": [6, 8], "x": 10, "y": 4, "w": 1.25},
+            {"matrix": [7, 0], "x": 11.25, "y": 4, "w": 1.25},
+            {"matrix": [7, 1], "x": 12.5, "y": 4, "w": 1.25},
+
+            {"matrix": [7, 2], "x": 14.25, "y": 4},
+            {"matrix": [7, 3], "x": 15.25, "y": 4},
+            {"matrix": [7, 4], "x": 16.25, "y": 4}
+          ]
       }
   }
 }
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
index 8d69a5a8af..c3e359e24e 100644
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
@@ -138,7 +138,7 @@ void led_blink(void) {
     backlight_toggle();
 }
 
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
     led_blink();
 }
 
diff --git a/keyboards/40percentclub/mf68/mf68.c b/keyboards/40percentclub/mf68/mf68.c
deleted file mode 100644
index 4abee8e0c3..0000000000
--- a/keyboards/40percentclub/mf68/mf68.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "mf68.h"
diff --git a/keyboards/40percentclub/mf68/mf68.h b/keyboards/40percentclub/mf68/mf68.h
deleted file mode 100644
index 71ee4229de..0000000000
--- a/keyboards/40percentclub/mf68/mf68.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_68_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14,     K15, K16, \
-    K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32,     K33, K34, \
-    K35,  K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47,     K48, \
-    K50,   K51, K52, K53, K54, K55, K56, K57, K58, K60, K61,    K62,          K63, \
-    K64,  K65,  K66,                 K67,              K68,  K70,  K71,  K72, K73, K74 \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, K71, K72, K73, K74, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h
index 39aa83e067..8641d6a37f 100644
--- a/keyboards/40percentclub/nano/config.h
+++ b/keyboards/40percentclub/nano/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json
index 86c73f1943..ddcf567d83 100644
--- a/keyboards/40percentclub/nano/info.json
+++ b/keyboards/40percentclub/nano/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0007",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "matrix_pins": {
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 6bdf5db350..57981dd27f 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@@ -16,25 +16,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D4, C6, D7, E6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 // enable RGB underglow
-#define RGB_DI_PIN B4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json
index fa12a8ef03..b58ee84edc 100644
--- a/keyboards/40percentclub/nori/info.json
+++ b/keyboards/40percentclub/nori/info.json
@@ -8,117 +8,137 @@
       "pid": "0x0A0C",
       "device_version": "4.4.4"
     },
+    "matrix_pins": {
+      "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D4", "C6", "D7", "E6"],
+      "rows": ["D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "B5"
     },
+    "ws2812": {
+      "pin": "B4"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x4", "ortho_4x12"],
     "layouts": {
       "LAYOUT_ortho_4x4": {
           "layout": [
-            { "w": 1, "x": 0, "y": 0 },
-            { "w": 1, "x": 1, "y": 0 },
-            { "w": 1, "x": 2, "y": 0 },
-            { "w": 1, "x": 3, "y": 0 },
-            { "w": 1, "x": 0, "y": 1 },
-            { "w": 1, "x": 1, "y": 1 },
-            { "w": 1, "x": 2, "y": 1 },
-            { "w": 1, "x": 3, "y": 1 },
-            { "w": 1, "x": 0, "y": 2 },
-            { "w": 1, "x": 1, "y": 2 },
-            { "w": 1, "x": 2, "y": 2 },
-            { "w": 1, "x": 3, "y": 2 },
-            { "w": 1, "x": 0, "y": 3 },
-            { "w": 1, "x": 1, "y": 3 },
-            { "w": 1, "x": 2, "y": 3 },
-            { "w": 1, "x": 3, "y": 3 } ]
+            {"matrix": [0, 0], "x": 0, "y": 0},
+            {"matrix": [0, 1], "x": 1, "y": 0},
+            {"matrix": [0, 2], "x": 2, "y": 0},
+            {"matrix": [0, 3], "x": 3, "y": 0},
+
+            {"matrix": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1},
+            {"matrix": [1, 3], "x": 3, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1, "y": 2},
+            {"matrix": [2, 2], "x": 2, "y": 2},
+            {"matrix": [2, 3], "x": 3, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3},
+            {"matrix": [3, 3], "x": 3, "y": 3}
+          ]
       },
       "LAYOUT_ortho_4x8": {
           "layout": [
-            { "w": 1, "x": 0, "y": 0 },
-            { "w": 1, "x": 1, "y": 0 },
-            { "w": 1, "x": 2, "y": 0 },
-            { "w": 1, "x": 3, "y": 0 },
-            { "w": 1, "x": 4, "y": 0 },
-            { "w": 1, "x": 5, "y": 0 },
-            { "w": 1, "x": 6, "y": 0 },
-            { "w": 1, "x": 7, "y": 0 },
-            { "w": 1, "x": 0, "y": 1 },
-            { "w": 1, "x": 1, "y": 1 },
-            { "w": 1, "x": 2, "y": 1 },
-            { "w": 1, "x": 3, "y": 1 },
-            { "w": 1, "x": 4, "y": 1 },
-            { "w": 1, "x": 5, "y": 1 },
-            { "w": 1, "x": 6, "y": 1 },
-            { "w": 1, "x": 7, "y": 1 },
-            { "w": 1, "x": 0, "y": 2 },
-            { "w": 1, "x": 1, "y": 2 },
-            { "w": 1, "x": 2, "y": 2 },
-            { "w": 1, "x": 3, "y": 2 },
-            { "w": 1, "x": 4, "y": 2 },
-            { "w": 1, "x": 5, "y": 2 },
-            { "w": 1, "x": 6, "y": 2 },
-            { "w": 1, "x": 7, "y": 2 },
-            { "w": 1, "x": 0, "y": 3 },
-            { "w": 1, "x": 1, "y": 3 },
-            { "w": 1, "x": 2, "y": 3 },
-            { "w": 1, "x": 3, "y": 3 },
-            { "w": 1, "x": 4, "y": 3 },
-            { "w": 1, "x": 5, "y": 3 },
-            { "w": 1, "x": 6, "y": 3 },
-            { "w": 1, "x": 7, "y": 3 } ]
+            {"matrix": [0, 0], "x": 0, "y": 0},
+            {"matrix": [0, 1], "x": 1, "y": 0},
+            {"matrix": [0, 2], "x": 2, "y": 0},
+            {"matrix": [0, 3], "x": 3, "y": 0},
+            {"matrix": [0, 4], "x": 4, "y": 0},
+            {"matrix": [0, 5], "x": 5, "y": 0},
+            {"matrix": [0, 6], "x": 6, "y": 0},
+            {"matrix": [0, 7], "x": 7, "y": 0},
+
+            {"matrix": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1},
+            {"matrix": [1, 3], "x": 3, "y": 1},
+            {"matrix": [1, 4], "x": 4, "y": 1},
+            {"matrix": [1, 5], "x": 5, "y": 1},
+            {"matrix": [1, 6], "x": 6, "y": 1},
+            {"matrix": [1, 7], "x": 7, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1, "y": 2},
+            {"matrix": [2, 2], "x": 2, "y": 2},
+            {"matrix": [2, 3], "x": 3, "y": 2},
+            {"matrix": [2, 4], "x": 4, "y": 2},
+            {"matrix": [2, 5], "x": 5, "y": 2},
+            {"matrix": [2, 6], "x": 6, "y": 2},
+            {"matrix": [2, 7], "x": 7, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3},
+            {"matrix": [3, 3], "x": 3, "y": 3},
+            {"matrix": [3, 4], "x": 4, "y": 3},
+            {"matrix": [3, 5], "x": 5, "y": 3},
+            {"matrix": [3, 6], "x": 6, "y": 3},
+            {"matrix": [3, 7], "x": 7, "y": 3}
+          ]
       },
         "LAYOUT_ortho_4x12": {
             "layout": [
-              { "w": 1, "x": 0, "y": 0 },
-              { "w": 1, "x": 1, "y": 0 },
-              { "w": 1, "x": 2, "y": 0 },
-              { "w": 1, "x": 3, "y": 0 },
-              { "w": 1, "x": 4, "y": 0 },
-              { "w": 1, "x": 5, "y": 0 },
-              { "w": 1, "x": 6, "y": 0 },
-              { "w": 1, "x": 7, "y": 0 },
-              { "w": 1, "x": 8, "y": 0 },
-              { "w": 1, "x": 9, "y": 0 },
-              { "w": 1, "x": 10, "y": 0 },
-              { "w": 1, "x": 11, "y": 0 },
-              { "w": 1, "x": 0, "y": 1 },
-              { "w": 1, "x": 1, "y": 1 },
-              { "w": 1, "x": 2, "y": 1 },
-              { "w": 1, "x": 3, "y": 1 },
-              { "w": 1, "x": 4, "y": 1 },
-              { "w": 1, "x": 5, "y": 1 },
-              { "w": 1, "x": 6, "y": 1 },
-              { "w": 1, "x": 7, "y": 1 },
-              { "w": 1, "x": 8, "y": 1 },
-              { "w": 1, "x": 9, "y": 1 },
-              { "w": 1, "x": 10, "y": 1 },
-              { "w": 1, "x": 11, "y": 1 },
-              { "w": 1, "x": 0, "y": 2 },
-              { "w": 1, "x": 1, "y": 2 },
-              { "w": 1, "x": 2, "y": 2 },
-              { "w": 1, "x": 3, "y": 2 },
-              { "w": 1, "x": 4, "y": 2 },
-              { "w": 1, "x": 5, "y": 2 },
-              { "w": 1, "x": 6, "y": 2 },
-              { "w": 1, "x": 7, "y": 2 },
-              { "w": 1, "x": 8, "y": 2 },
-              { "w": 1, "x": 9, "y": 2 },
-              { "w": 1, "x": 10, "y": 2 },
-              { "w": 1, "x": 11, "y": 2 },
-              { "w": 1, "x": 0, "y": 3 },
-              { "w": 1, "x": 1, "y": 3 },
-              { "w": 1, "x": 2, "y": 3 },
-              { "w": 1, "x": 3, "y": 3 },
-              { "w": 1, "x": 4, "y": 3 },
-              { "w": 1, "x": 5, "y": 3 },
-              { "w": 1, "x": 6, "y": 3 },
-              { "w": 1, "x": 7, "y": 3 },
-              { "w": 1, "x": 8, "y": 3 },
-              { "w": 1, "x": 9, "y": 3 },
-              { "w": 1, "x": 10, "y": 3 },
-              { "w": 1, "x": 11, "y": 3 } ]
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
+              {"matrix": [0, 4], "x": 4, "y": 0},
+              {"matrix": [0, 5], "x": 5, "y": 0},
+              {"matrix": [0, 6], "x": 6, "y": 0},
+              {"matrix": [0, 7], "x": 7, "y": 0},
+              {"matrix": [0, 8], "x": 8, "y": 0},
+              {"matrix": [0, 9], "x": 9, "y": 0},
+              {"matrix": [0, 10], "x": 10, "y": 0},
+              {"matrix": [0, 11], "x": 11, "y": 0},
+
+              {"matrix": [1, 0], "x": 0, "y": 1},
+              {"matrix": [1, 1], "x": 1, "y": 1},
+              {"matrix": [1, 2], "x": 2, "y": 1},
+              {"matrix": [1, 3], "x": 3, "y": 1},
+              {"matrix": [1, 4], "x": 4, "y": 1},
+              {"matrix": [1, 5], "x": 5, "y": 1},
+              {"matrix": [1, 6], "x": 6, "y": 1},
+              {"matrix": [1, 7], "x": 7, "y": 1},
+              {"matrix": [1, 8], "x": 8, "y": 1},
+              {"matrix": [1, 9], "x": 9, "y": 1},
+              {"matrix": [1, 10], "x": 10, "y": 1},
+              {"matrix": [1, 11], "x": 11, "y": 1},
+
+              {"matrix": [2, 0], "x": 0, "y": 2},
+              {"matrix": [2, 1], "x": 1, "y": 2},
+              {"matrix": [2, 2], "x": 2, "y": 2},
+              {"matrix": [2, 3], "x": 3, "y": 2},
+              {"matrix": [2, 4], "x": 4, "y": 2},
+              {"matrix": [2, 5], "x": 5, "y": 2},
+              {"matrix": [2, 6], "x": 6, "y": 2},
+              {"matrix": [2, 7], "x": 7, "y": 2},
+              {"matrix": [2, 8], "x": 8, "y": 2},
+              {"matrix": [2, 9], "x": 9, "y": 2},
+              {"matrix": [2, 10], "x": 10, "y": 2},
+              {"matrix": [2, 11], "x": 11, "y": 2},
+
+              {"matrix": [3, 0], "x": 0, "y": 3},
+              {"matrix": [3, 1], "x": 1, "y": 3},
+              {"matrix": [3, 2], "x": 2, "y": 3},
+              {"matrix": [3, 3], "x": 3, "y": 3},
+              {"matrix": [3, 4], "x": 4, "y": 3},
+              {"matrix": [3, 5], "x": 5, "y": 3},
+              {"matrix": [3, 6], "x": 6, "y": 3},
+              {"matrix": [3, 7], "x": 7, "y": 3},
+              {"matrix": [3, 8], "x": 8, "y": 3},
+              {"matrix": [3, 9], "x": 9, "y": 3},
+              {"matrix": [3, 10], "x": 10, "y": 3},
+              {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
index eacfacc5a7..f076ded9ba 100644
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT  // MT key must be held longer than tapping term for
-                                  // modifer to be registered
 #define RETRO_TAPPING_PER_KEY
 #define TAPPING_TERM_PER_KEY
 
diff --git a/keyboards/40percentclub/nori/nori.c b/keyboards/40percentclub/nori/nori.c
deleted file mode 100644
index f60cf98d86..0000000000
--- a/keyboards/40percentclub/nori/nori.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "nori.h"
diff --git a/keyboards/40percentclub/nori/nori.h b/keyboards/40percentclub/nori/nori.h
deleted file mode 100644
index 768598b7f8..0000000000
--- a/keyboards/40percentclub/nori/nori.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33 \
-) \
-{ \
-    { K00, K01, K02, K03, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-    { K10, K11, K12, K13, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-    { K20, K21, K22, K23, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-    { K30, K31, K32, K33, ___, ___, ___, ___, ___, ___, ___, ___ } \
-}
-#define LAYOUT_ortho_4x8( \
-    K00, K01, K02, K03, K04, K05, K06, K07, \
-    K10, K11, K12, K13, K14, K15, K16, K17, \
-    K20, K21, K22, K23, K24, K25, K26, K27, \
-    K30, K31, K32, K33, K34, K35, K36, K37\
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, ___, ___, ___, ___ }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, ___, ___, ___, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, ___, ___, ___, ___ }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___, ___, ___, ___ } \
-}
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b } \
-}
diff --git a/keyboards/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json
index f5f33e3d97..63420adf86 100644
--- a/keyboards/40percentclub/polyandry/info.json
+++ b/keyboards/40percentclub/polyandry/info.json
@@ -7,27 +7,5 @@
         "vid": "0x4025",
         "pid": "0x6060",
         "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x3": {
-            "layout": [
-                {"label": "k000", "x": 0, "y": 0},
-                {"label": "k001", "x": 1, "y": 0},
-                {"label": "k002", "x": 2, "y": 0},
-
-                {"label": "k003", "x": 0, "y": 1},
-                {"label": "k004", "x": 1, "y": 1},
-                {"label": "k005", "x": 2, "y": 1},
-
-                {"label": "k006", "x": 0, "y": 2},
-                {"label": "k007", "x": 1, "y": 2},
-                {"label": "k008", "x": 2, "y": 2},
-
-                {"label": "k009", "x": 0, "y": 3},
-                {"label": "k010", "x": 1, "y": 3},
-                {"label": "k011", "x": 2, "y": 3}
-
-            ]
-        }
     }
 }
diff --git a/keyboards/40percentclub/polyandry/polyandry.c b/keyboards/40percentclub/polyandry/polyandry.c
deleted file mode 100644
index 2b4be589b8..0000000000
--- a/keyboards/40percentclub/polyandry/polyandry.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "polyandry.h"
diff --git a/keyboards/40percentclub/polyandry/polyandry.h b/keyboards/40percentclub/polyandry/polyandry.h
deleted file mode 100644
index 5baf87ba62..0000000000
--- a/keyboards/40percentclub/polyandry/polyandry.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_40percentclub_polyandry_promicro
-    #include "promicro.h"
-#elif KEYBOARD_40percentclub_polyandry_teensy2
-    #include "teensy2.h"
-#endif
diff --git a/keyboards/40percentclub/polyandry/promicro/config.h b/keyboards/40percentclub/polyandry/promicro/config.h
deleted file mode 100644
index ff148a0b3f..0000000000
--- a/keyboards/40percentclub/polyandry/promicro/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* key matrix pins 
- * Direct pins is not used because there is not a shared ground position
- * between all compatible microcontrollers.
-*/ 
-#define MATRIX_ROW_PINS { D7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, E6, B4, F4, F5, F6, F7, B3, B2 }
-
-/* doesn't really matter lol */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/polyandry/promicro/info.json b/keyboards/40percentclub/polyandry/promicro/info.json
index 4369a04103..8a8cd98794 100644
--- a/keyboards/40percentclub/polyandry/promicro/info.json
+++ b/keyboards/40percentclub/polyandry/promicro/info.json
@@ -1,4 +1,30 @@
 {
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "E6", "B4", "F4", "F5", "F6", "F7", "B3", "B2"],
+        "rows": ["D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_ortho_4x3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [0, 3], "x": 0, "y": 1},
+                {"matrix": [0, 4], "x": 1, "y": 1},
+                {"matrix": [0, 5], "x": 2, "y": 1},
+
+                {"matrix": [0, 6], "x": 0, "y": 2},
+                {"matrix": [0, 7], "x": 1, "y": 2},
+                {"matrix": [0, 8], "x": 2, "y": 2},
+
+                {"matrix": [0, 9], "x": 0, "y": 3},
+                {"matrix": [0, 10], "x": 1, "y": 3},
+                {"matrix": [0, 11], "x": 2, "y": 3}
+            ]
+        }
+    }
 }
diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.c b/keyboards/40percentclub/polyandry/promicro/promicro.c
deleted file mode 100644
index ea1dd51788..0000000000
--- a/keyboards/40percentclub/polyandry/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "promicro.h"
diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.h b/keyboards/40percentclub/polyandry/promicro/promicro.h
deleted file mode 100644
index 0a6f8b36b8..0000000000
--- a/keyboards/40percentclub/polyandry/promicro/promicro.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "polyandry.h"
-
-#define LAYOUT_ortho_4x3( \
-	K000, K001, K002, \
- 	K003, K004, K005, \
-	K006, K007, K008, \
-	K009, K010, K011  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }  \
-}
diff --git a/keyboards/40percentclub/polyandry/teensy2/config.h b/keyboards/40percentclub/polyandry/teensy2/config.h
deleted file mode 100644
index 8eaeb3167a..0000000000
--- a/keyboards/40percentclub/polyandry/teensy2/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* key matrix pins */
-
-// Note from original contributor (ryjelsum):
-// Untested - don't have teensy2. if some keys do not function or are in wrong place,
-// please check the pin definitions. I may have screwed up. :) 
-
-#define MATRIX_ROW_PINS { D3 }
-#define MATRIX_COL_PINS { B7, D0, D1, D2, C6, C7, F6, F7, B6, B5, D7, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/polyandry/teensy2/info.json b/keyboards/40percentclub/polyandry/teensy2/info.json
index 0b2db81c11..33fd1d71df 100644
--- a/keyboards/40percentclub/polyandry/teensy2/info.json
+++ b/keyboards/40percentclub/polyandry/teensy2/info.json
@@ -1,4 +1,30 @@
 {
+    "matrix_pins": {
+        "cols": ["B7", "D0", "D1", "D2", "C6", "C7", "F6", "F7", "B6", "B5", "D7", "D6"],
+        "rows": ["D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "halfkay"
+    "bootloader": "halfkay",
+    "layouts": {
+        "LAYOUT_ortho_4x3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [0, 3], "x": 0, "y": 1},
+                {"matrix": [0, 4], "x": 1, "y": 1},
+                {"matrix": [0, 5], "x": 2, "y": 1},
+
+                {"matrix": [0, 6], "x": 0, "y": 2},
+                {"matrix": [0, 7], "x": 1, "y": 2},
+                {"matrix": [0, 8], "x": 2, "y": 2},
+
+                {"matrix": [0, 9], "x": 0, "y": 3},
+                {"matrix": [0, 10], "x": 1, "y": 3},
+                {"matrix": [0, 11], "x": 2, "y": 3}
+            ]
+        }
+    }
 }
diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.c b/keyboards/40percentclub/polyandry/teensy2/teensy2.c
deleted file mode 100644
index 33cfb6e553..0000000000
--- a/keyboards/40percentclub/polyandry/teensy2/teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "teensy2.h"
diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.h b/keyboards/40percentclub/polyandry/teensy2/teensy2.h
deleted file mode 100644
index ce7790434b..0000000000
--- a/keyboards/40percentclub/polyandry/teensy2/teensy2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-//NOTE TO FUTURE FROM RYJELSUM (original contributor):
-//This has been unchanged from the promicro.h file. 
-//I DO NOT HAVE A TEENSY 2.0 TO TEST WITH.
-//I believe this should still work - but it's not a sure thing.
-
-#include "polyandry.h"
-
-#define LAYOUT_ortho_4x3( \
-	K000, K001, K002, \
- 	K003, K004, K005, \
-	K006, K007, K008, \
-	K009, K010, K011  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }  \
-}
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index 357380e3a7..2199981c7c 100644
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
@@ -15,7 +7,6 @@
 #define PERMISSIVE_HOLD
 
 /* setup lighting */
-#define RGB_DI_PIN B5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json
index cbaefde2bd..c881f7c7d1 100644
--- a/keyboards/40percentclub/tomato/info.json
+++ b/keyboards/40percentclub/tomato/info.json
@@ -8,12 +8,53 @@
     "pid": "0x546F",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B5"
+  },
+  "matrix_pins": {
+    "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
+    "rows": ["F7", "B1", "B3", "B2", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_3x10"],
   "layouts": {
     "LAYOUT_ortho_3x10": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [1, 0], "x": 6, "y": 0},
+        {"matrix": [1, 1], "x": 7, "y": 0},
+        {"matrix": [1, 2], "x": 8, "y": 0},
+        {"matrix": [1, 3], "x": 9, "y": 0},
+
+        {"matrix": [1, 4], "x": 0, "y": 1},
+        {"matrix": [1, 5], "x": 1, "y": 1},
+        {"matrix": [2, 0], "x": 2, "y": 1},
+        {"matrix": [2, 1], "x": 3, "y": 1},
+        {"matrix": [2, 2], "x": 4, "y": 1},
+        {"matrix": [2, 3], "x": 5, "y": 1},
+        {"matrix": [2, 4], "x": 6, "y": 1},
+        {"matrix": [2, 5], "x": 7, "y": 1},
+        {"matrix": [3, 0], "x": 8, "y": 1},
+        {"matrix": [3, 1], "x": 9, "y": 1},
+
+        {"matrix": [3, 2], "x": 0, "y": 2},
+        {"matrix": [3, 3], "x": 1, "y": 2},
+        {"matrix": [3, 4], "x": 2, "y": 2},
+        {"matrix": [3, 5], "x": 3, "y": 2},
+        {"matrix": [4, 0], "x": 4, "y": 2},
+        {"matrix": [4, 1], "x": 5, "y": 2},
+        {"matrix": [4, 2], "x": 6, "y": 2},
+        {"matrix": [4, 3], "x": 7, "y": 2},
+        {"matrix": [4, 4], "x": 8, "y": 2},
+        {"matrix": [4, 5], "x": 9, "y": 2}
+      ]
     }
   }
 }
diff --git a/keyboards/40percentclub/tomato/tomato.c b/keyboards/40percentclub/tomato/tomato.c
deleted file mode 100644
index dbf8bfe12b..0000000000
--- a/keyboards/40percentclub/tomato/tomato.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tomato.h"
diff --git a/keyboards/40percentclub/tomato/tomato.h b/keyboards/40percentclub/tomato/tomato.h
deleted file mode 100644
index 70bffee302..0000000000
--- a/keyboards/40percentclub/tomato/tomato.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x10( \
-	 K00,   K01,   K02,   K03,   K04,   K05,   K10,   K11,   K12,   K13 , \
-	 K14,   K15,   K20,   K21,   K22,   K23,   K24,   K25,   K30,   K31 , \
-	 K32,   K33,   K34,   K35,   K40,   K41,   K42,   K43,   K44,   K45   \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15 }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25 }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35 }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45 }  \
-}
diff --git a/keyboards/40percentclub/ut47/info.json b/keyboards/40percentclub/ut47/info.json
index 055db80471..668f277f40 100644
--- a/keyboards/40percentclub/ut47/info.json
+++ b/keyboards/40percentclub/ut47/info.json
@@ -12,7 +12,58 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.5}, {"label":"LT(3) / Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2, "w":1.5}, {"label":"Z", "x":1.5, "y":2}, {"label":"X", "x":2.5, "y":2}, {"label":"C", "x":3.5, "y":2}, {"label":"V", "x":4.5, "y":2}, {"label":"B", "x":5.5, "y":2}, {"label":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":"<", "x":8.5, "y":2}, {"label":">", "x":9.5, "y":2}, {"label":"?", "x":10.5, "y":2}, {"label":"Shift / Enter", "x":11.5, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"GUI", "x":2, "y":3}, {"label":"Menu", "x":3, "y":3}, {"label":"MO(2)", "x":4, "y":3, "w":1.25}, {"x":5.25, "y":3, "w":2}, {"label":"MO(1)", "x":7.25, "y":3, "w":1.25}, {"label":"\u2190", "x":8.5, "y":3}, {"label":"\u2193", "x":9.5, "y":3}, {"label":"\u2191", "x":10.5, "y":3}, {"label":"\u2192", "x":11.5, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 10], "x": 10.25, "y": 1},
+        {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+        {"matrix": [2, 11], "x": 11.5, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3, "w": 1.25},
+        {"matrix": [3, 5], "x": 5.25, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/40percentclub/ut47/keymaps/rgb/config.h b/keyboards/40percentclub/ut47/keymaps/rgb/config.h
index 4b5ffc4f10..8dc267380a 100644
--- a/keyboards/40percentclub/ut47/keymaps/rgb/config.h
+++ b/keyboards/40percentclub/ut47/keymaps/rgb/config.h
@@ -28,5 +28,5 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN D3    // The pin the LED strip is connected to
+#define WS2812_DI_PIN D3    // The pin the LED strip is connected to
 #define RGBLED_NUM 7     // Number of LEDs in your strip
diff --git a/keyboards/40percentclub/ut47/ut47.c b/keyboards/40percentclub/ut47/ut47.c
index 9d46a4679d..d5675e1047 100644
--- a/keyboards/40percentclub/ut47/ut47.c
+++ b/keyboards/40percentclub/ut47/ut47.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "ut47.h"
+#include "quantum.h"
 #ifdef LED_ENABLE
   #include "uart.h"
 
diff --git a/keyboards/40percentclub/ut47/ut47.h b/keyboards/40percentclub/ut47/ut47.h
deleted file mode 100644
index f595d3a458..0000000000
--- a/keyboards/40percentclub/ut47/ut47.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2018 Carlos Filoteo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-  K30, K31, K32, K33, K34,    K35,   K37, K38, K39, K3a, K3b  \
-) \
-  { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b }, \
-    { K30, K31, K32, K33, K34, K35, K35, K37, K38, K39, K3a, K3b }  \
-  }
diff --git a/keyboards/45_ats/45_ats.c b/keyboards/45_ats/45_ats.c
deleted file mode 100644
index 0a2c069abd..0000000000
--- a/keyboards/45_ats/45_ats.c
+++ /dev/null
@@ -1,19 +0,0 @@
- /* 
- Copyright 2020 Alec Penland
- Copyright 2020 Garret Gartner
-  
- This program is free software: you can redistribute it and/or modify 
- it under the terms of the GNU General Public License as published by 
- the Free Software Foundation, either version 2 of the License, or 
- (at your option) any later version. 
-  
- This program is distributed in the hope that it will be useful, 
- but WITHOUT ANY WARRANTY; without even the implied warranty of 
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- GNU General Public License for more details. 
-  
- You should have received a copy of the GNU General Public License 
- along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#include "45_ats.h"
diff --git a/keyboards/45_ats/45_ats.h b/keyboards/45_ats/45_ats.h
deleted file mode 100644
index 42d1940e6f..0000000000
--- a/keyboards/45_ats/45_ats.h
+++ /dev/null
@@ -1,59 +0,0 @@
- /* 
- Copyright 2020 Alec Penland
- Copyright 2020 Garret Gartner
-  
- This program is free software: you can redistribute it and/or modify 
- it under the terms of the GNU General Public License as published by 
- the Free Software Foundation, either version 2 of the License, or 
- (at your option) any later version. 
-  
- This program is distributed in the hope that it will be useful, 
- but WITHOUT ANY WARRANTY; without even the implied warranty of 
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- GNU General Public License for more details. 
-  
- You should have received a copy of the GNU General Public License 
- along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define xxx KC_NO
-
-#define LAYOUT_split_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0D, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,    k1B,        k1D, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,         k2B,   k2D, \
-    k30, k31,  k32,      k33,      k36,        k38,   k39,    k3A, k3B, k3D    \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, xxx, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, xxx, k2D }, \
-    { k30, k31, k32, k33, xxx, xxx, k36, xxx, k38, k39, k3A, k3B, xxx, k3D }  \
-}
-
-#define LAYOUT_625_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0D, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,    k1B,        k1D, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,         k2B,   k2D, \
-    k30, k31,  k32,            k36,                 k39,      k3A, k3B, k3D    \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, xxx, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, xxx, k2D }, \
-    { k30, k31, k32, xxx, xxx, xxx, k36, xxx, xxx, k39, k3A, k3B, xxx, k3D }  \
-}
-
-#define LAYOUT_600_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0D, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,    k1B,        k1D, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,         k2B,   k2D, \
-    k30, k31,  k32,            k36,           k38,    k39,    k3A, k3B, k3D    \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, xxx, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, xxx, k2D }, \
-    { k30, k31, k32, xxx, xxx, xxx, k36, xxx, k38, k39, k3A, k3B, xxx, k3D }  \
-}
diff --git a/keyboards/45_ats/config.h b/keyboards/45_ats/config.h
index fcf2f8ea44..1d951890cd 100644
--- a/keyboards/45_ats/config.h
+++ b/keyboards/45_ats/config.h
@@ -18,13 +18,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D5, D7, D6 }
-#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, B7, F6, F5, F4, C7, F7, C6, B6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/45_ats/info.json b/keyboards/45_ats/info.json
index 0bf42f9a75..410a2a9ee1 100644
--- a/keyboards/45_ats/info.json
+++ b/keyboards/45_ats/info.json
@@ -8,6 +8,11 @@
       "pid": "0x4511",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "F6", "F5", "F4", "C7", "F7", "C6", "B6", "D4"],
+      "rows": ["D3", "D5", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "B4", "pin_b": "B5"}
@@ -18,161 +23,185 @@
     "layouts": {
       "LAYOUT_split_space": {
         "layout": [
-          {"label":"", "x":0, "y":0},
-          {"label":"", "x":1, "y":0},
-          {"label":"", "x":2, "y":0},
-          {"label":"", "x":3, "y":0},
-          {"label":"", "x":4, "y":0},
-          {"label":"", "x":5, "y":0},
-          {"label":"", "x":6, "y":0},
-          {"label":"", "x":7, "y":0},
-          {"label":"", "x":8, "y":0},
-          {"label":"", "x":9, "y":0},
-          {"label":"", "x":10, "y":0},
-          {"label":"", "x":11, "y":0},
-          {"label":"", "x":12, "y":0},
-          {"label":"", "x":13.5, "y":0},
-          {"label":"", "x":0, "y":1, "w":1.25},
-          {"label":"", "x":1.25, "y":1},
-          {"label":"", "x":2.25, "y":1},
-          {"label":"", "x":3.25, "y":1},
-          {"label":"", "x":4.25, "y":1},
-          {"label":"", "x":5.25, "y":1},
-          {"label":"", "x":6.25, "y":1},
-          {"label":"", "x":7.25, "y":1},
-          {"label":"", "x":8.25, "y":1},
-          {"label":"", "x":9.25, "y":1},
-          {"label":"", "x":10.25, "y":1},
-          {"label":"", "x":11.25, "y":1, "w":1.75},
-          {"label":"", "x":13.5, "y":1},
-          {"label":"", "x":0, "y":2, "w":1.75},
-          {"label":"", "x":1.75, "y":2},
-          {"label":"", "x":2.75, "y":2},
-          {"label":"", "x":3.75, "y":2},
-          {"label":"", "x":4.75, "y":2},
-          {"label":"", "x":5.75, "y":2},
-          {"label":"", "x":6.75, "y":2},
-          {"label":"", "x":7.75, "y":2},
-          {"label":"", "x":8.75, "y":2},
-          {"label":"", "x":9.75, "y":2},
-          {"label":"", "x":10.75, "y":2, "w":1.25},
-          {"label":"", "x":12.25, "y":2.25},
-          {"label":"", "x":13.5, "y":2},
-          {"label":"", "x":0, "y":3, "w":1.25},
-          {"label":"", "x":1.25, "y":3},
-          {"label":"", "x":2.25, "y":3, "w":1.25},
-          {"label":"", "x":3.5, "y":3, "w":2.75},
-          {"label":"", "x":6.25, "y":3, "w":2.25},
-          {"label":"", "x":8.5, "y":3, "w":1.25},
-          {"label":"", "x":9.75, "y":3, "w":1.25},
-          {"label":"", "x":11.25, "y":3.25},
-          {"label":"", "x":12.25, "y":3.25},
-          {"label":"", "x":13.25, "y":3.25}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+
+          {"matrix": [0, 13], "x": 13.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+          {"matrix": [1, 1], "x": 1.25, "y": 1},
+          {"matrix": [1, 2], "x": 2.25, "y": 1},
+          {"matrix": [1, 3], "x": 3.25, "y": 1},
+          {"matrix": [1, 4], "x": 4.25, "y": 1},
+          {"matrix": [1, 5], "x": 5.25, "y": 1},
+          {"matrix": [1, 6], "x": 6.25, "y": 1},
+          {"matrix": [1, 7], "x": 7.25, "y": 1},
+          {"matrix": [1, 8], "x": 8.25, "y": 1},
+          {"matrix": [1, 9], "x": 9.25, "y": 1},
+          {"matrix": [1, 10], "x": 10.25, "y": 1},
+          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+          {"matrix": [1, 13], "x": 13.5, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
+
+          {"matrix": [2, 13], "x": 13.5, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+          {"matrix": [3, 1], "x": 1.25, "y": 3},
+          {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+          {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75},
+          {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.25},
+          {"matrix": [3, 8], "x": 8.5, "y": 3, "w": 1.25},
+          {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.25},
+
+          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
         ]
       },
       "LAYOUT_625_space": {
         "layout": [
-          {"label":"", "x":0, "y":0},
-          {"label":"", "x":1, "y":0},
-          {"label":"", "x":2, "y":0},
-          {"label":"", "x":3, "y":0},
-          {"label":"", "x":4, "y":0},
-          {"label":"", "x":5, "y":0},
-          {"label":"", "x":6, "y":0},
-          {"label":"", "x":7, "y":0},
-          {"label":"", "x":8, "y":0},
-          {"label":"", "x":9, "y":0},
-          {"label":"", "x":10, "y":0},
-          {"label":"", "x":11, "y":0},
-          {"label":"", "x":12, "y":0},
-          {"label":"", "x":13.5, "y":0},
-          {"label":"", "x":0, "y":1, "w":1.25},
-          {"label":"", "x":1.25, "y":1},
-          {"label":"", "x":2.25, "y":1},
-          {"label":"", "x":3.25, "y":1},
-          {"label":"", "x":4.25, "y":1},
-          {"label":"", "x":5.25, "y":1},
-          {"label":"", "x":6.25, "y":1},
-          {"label":"", "x":7.25, "y":1},
-          {"label":"", "x":8.25, "y":1},
-          {"label":"", "x":9.25, "y":1},
-          {"label":"", "x":10.25, "y":1},
-          {"label":"", "x":11.25, "y":1, "w":1.75},
-          {"label":"", "x":13.5, "y":1},
-          {"label":"", "x":0, "y":2, "w":1.75},
-          {"label":"", "x":1.75, "y":2},
-          {"label":"", "x":2.75, "y":2},
-          {"label":"", "x":3.75, "y":2},
-          {"label":"", "x":4.75, "y":2},
-          {"label":"", "x":5.75, "y":2},
-          {"label":"", "x":6.75, "y":2},
-          {"label":"", "x":7.75, "y":2},
-          {"label":"", "x":8.75, "y":2},
-          {"label":"", "x":9.75, "y":2},
-          {"label":"", "x":10.75, "y":2, "w":1.25},
-          {"label":"", "x":12.25, "y":2.25},
-          {"label":"K", "x":13.5, "y":2},
-          {"label":"", "x":0, "y":3, "w":1.25},
-          {"label":"", "x":1.25, "y":3},
-          {"label":"", "x":2.25, "y":3, "w":1.25},
-          {"label":"", "x":3.5, "y":3, "w":6.25},
-          {"label":"", "x":9.75, "y":3, "w":1.25},
-          {"label":"", "x":11.25, "y":3.25},
-          {"label":"", "x":12.25, "y":3.25},
-          {"label":"", "x":13.25, "y":3.25}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+
+          {"matrix": [0, 13], "x": 13.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+          {"matrix": [1, 1], "x": 1.25, "y": 1},
+          {"matrix": [1, 2], "x": 2.25, "y": 1},
+          {"matrix": [1, 3], "x": 3.25, "y": 1},
+          {"matrix": [1, 4], "x": 4.25, "y": 1},
+          {"matrix": [1, 5], "x": 5.25, "y": 1},
+          {"matrix": [1, 6], "x": 6.25, "y": 1},
+          {"matrix": [1, 7], "x": 7.25, "y": 1},
+          {"matrix": [1, 8], "x": 8.25, "y": 1},
+          {"matrix": [1, 9], "x": 9.25, "y": 1},
+          {"matrix": [1, 10], "x": 10.25, "y": 1},
+          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+          {"matrix": [1, 13], "x": 13.5, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
+
+          {"matrix": [2, 13], "x": 13.5, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+          {"matrix": [3, 1], "x": 1.25, "y": 3},
+          {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+          {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6.25},
+          {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.25},
+
+          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
         ]
       },
       "LAYOUT_600_space": {
         "layout": [
-          {"label":"", "x":0, "y":0},
-          {"label":"", "x":1, "y":0},
-          {"label":"", "x":2, "y":0},
-          {"label":"", "x":3, "y":0},
-          {"label":"", "x":4, "y":0},
-          {"label":"", "x":5, "y":0},
-          {"label":"", "x":6, "y":0},
-          {"label":"", "x":7, "y":0},
-          {"label":"", "x":8, "y":0},
-          {"label":"", "x":9, "y":0},
-          {"label":"", "x":10, "y":0},
-          {"label":"", "x":11, "y":0},
-          {"label":"", "x":12, "y":0},
-          {"label":"", "x":13.5, "y":0},
-          {"label":"", "x":0, "y":1, "w":1.25},
-          {"label":"", "x":1.25, "y":1},
-          {"label":"", "x":2.25, "y":1},
-          {"label":"", "x":3.25, "y":1},
-          {"label":"", "x":4.25, "y":1},
-          {"label":"", "x":5.25, "y":1},
-          {"label":"", "x":6.25, "y":1},
-          {"label":"", "x":7.25, "y":1},
-          {"label":"", "x":8.25, "y":1},
-          {"label":"", "x":9.25, "y":1},
-          {"label":"", "x":10.25, "y":1},
-          {"label":"", "x":11.25, "y":1, "w":1.75},
-          {"label":"", "x":13.5, "y":1},
-          {"label":"", "x":0, "y":2, "w":1.75},
-          {"label":"", "x":1.75, "y":2},
-          {"label":"", "x":2.75, "y":2},
-          {"label":"", "x":3.75, "y":2},
-          {"label":"", "x":4.75, "y":2},
-          {"label":"", "x":5.75, "y":2},
-          {"label":"", "x":6.75, "y":2},
-          {"label":"", "x":7.75, "y":2},
-          {"label":"", "x":8.75, "y":2},
-          {"label":"", "x":9.75, "y":2},
-          {"label":"", "x":10.75, "y":2, "w":1.25},
-          {"label":"", "x":12.25, "y":2.25},
-          {"label":"", "x":13.5, "y":2},
-          {"label":"", "x":0, "y":3},
-          {"label":"", "x":1, "y":3},
-          {"label":"", "x":2, "y":3},
-          {"label":"", "x":3, "y":3, "w":6.00},
-          {"label":"", "x":9, "y":3},
-          {"label":"", "x":10, "y":3},
-          {"label":"", "x":11.25, "y":3.25},
-          {"label":"", "x":12.25, "y":3.25},
-          {"label":"", "x":13.25, "y":3.25}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+
+          {"matrix": [0, 13], "x": 13.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+          {"matrix": [1, 1], "x": 1.25, "y": 1},
+          {"matrix": [1, 2], "x": 2.25, "y": 1},
+          {"matrix": [1, 3], "x": 3.25, "y": 1},
+          {"matrix": [1, 4], "x": 4.25, "y": 1},
+          {"matrix": [1, 5], "x": 5.25, "y": 1},
+          {"matrix": [1, 6], "x": 6.25, "y": 1},
+          {"matrix": [1, 7], "x": 7.25, "y": 1},
+          {"matrix": [1, 8], "x": 8.25, "y": 1},
+          {"matrix": [1, 9], "x": 9.25, "y": 1},
+          {"matrix": [1, 10], "x": 10.25, "y": 1},
+          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+          {"matrix": [1, 13], "x": 13.5, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
+
+          {"matrix": [2, 13], "x": 13.5, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 6], "x": 3, "y": 3, "w": 6},
+          {"matrix": [3, 8], "x": 9, "y": 3},
+          {"matrix": [3, 9], "x": 10, "y": 3},
+
+          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
         ]
       }
     }
diff --git a/keyboards/4by3/4by3.c b/keyboards/4by3/4by3.c
deleted file mode 100644
index 3ae27260d4..0000000000
--- a/keyboards/4by3/4by3.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4by3.h"
\ No newline at end of file
diff --git a/keyboards/4by3/4by3.h b/keyboards/4by3/4by3.h
deleted file mode 100644
index b41628137a..0000000000
--- a/keyboards/4by3/4by3.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-/* LAYOUT_horizontal
- * ┌───�
- * │USB│
- * ├───┼───┬───┬───�
- * │K00│K01│K02│K03│
- * ├───┼───┼───┼───┤
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤
- * │K20│K21│K22│K23│
- * └───┴───┴───┴───┘
- */
-#define LAYOUT_horizontal( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23  \
-) { \
-	{ K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, K23 }  \
-}
-
-/* LAYOUT_vertical_right
- * ┌───┬───┬───┬───�
- * │K00│K01│K03│USB│
- * ├───┼───┼───┬───┘
- * │K04│K05│K06│
- * ├───┼───┼───┤
- * │K07│K08│K09│
- * ├───┼───┼───┤
- * │K10│K11│K12│
- * └───┴───┴───┘
- */
-#define LAYOUT_vertical_right( \
-	K20, K10, K00, \
-    K21, K11, K01, \
-    K22, K12, K02, \
-    K23, K13, K03  \
-) { \
-	{ K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, K23 }  \
-}
-
-/* LAYOUT_vertical_left
- *     ┌───┬───┬───�
- *     │K00│K01│K03│
- *     ├───┼───┼───┤
- *     │K04│K05│K06│
- *     ├───┼───┼───┤
- *     │K07│K08│K09│
- * ┌───┼───┼───┼───┤
- * │USB│K10│K11│K12│
- * └───┴───┴───┴───┘
- */
-#define LAYOUT_vertical_left( \
-	K03, K13, K23, \
-    K02, K12, K22, \
-    K01, K11, K21, \
-    K00, K10, K20  \
-) { \
-	{ K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, K23 }  \
-}
-
-#define LAYOUT LAYOUT_horizontal
diff --git a/keyboards/4by3/config.h b/keyboards/4by3/config.h
deleted file mode 100644
index 5f20b5b97a..0000000000
--- a/keyboards/4by3/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, D0, D4 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4by3/info.json b/keyboards/4by3/info.json
index 0ed57ce2f6..5a64ffcd53 100644
--- a/keyboards/4by3/info.json
+++ b/keyboards/4by3/info.json
@@ -8,30 +8,71 @@
         "pid": "0x2019",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4"],
+        "rows": ["D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_horizontal"
+    },
     "layouts": {
         "LAYOUT_horizontal": {
             "layout": [
-                { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 }, { "x": 3, "y": 0 },
-                { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 }, { "x": 3, "y": 1 },
-                { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 }, { "x": 3, "y": 2 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2}
             ]
         },
         "LAYOUT_vertical_right": {
             "layout": [
-                { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 },
-                { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 },
-                { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 },
-                { "x": 0, "y": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 }
+                {"matrix": [2, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 0], "x": 2, "y": 0},
+
+                {"matrix": [2, 1], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [0, 1], "x": 2, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2},
+                {"matrix": [1, 2], "x": 1, "y": 2},
+                {"matrix": [0, 2], "x": 2, "y": 2},
+
+                {"matrix": [2, 3], "x": 0, "y": 3},
+                {"matrix": [1, 3], "x": 1, "y": 3},
+                {"matrix": [0, 3], "x": 2, "y": 3}
             ]
         },
         "LAYOUT_vertical_left": {
             "layout": [
-                { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 },
-                { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 },
-                { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 },
-                { "x": 0, "y": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 }
+                {"matrix": [0, 3], "x": 0, "y": 0},
+                {"matrix": [1, 3], "x": 1, "y": 0},
+                {"matrix": [2, 3], "x": 2, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1},
+                {"matrix": [1, 2], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+
+                {"matrix": [0, 1], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 3},
+                {"matrix": [1, 0], "x": 1, "y": 3},
+                {"matrix": [2, 0], "x": 2, "y": 3}
             ]
         }
     }
diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h
index f7ef22d986..4ec3391a61 100644
--- a/keyboards/4pplet/aekiso60/rev_a/config.h
+++ b/keyboards/4pplet/aekiso60/rev_a/config.h
@@ -1,14 +1,5 @@
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS {C2,D0,B0,C7,C5}
-#define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
 
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json
index 18d86678d0..cbcf0f5997 100644
--- a/keyboards/4pplet/aekiso60/rev_a/info.json
+++ b/keyboards/4pplet/aekiso60/rev_a/info.json
@@ -4,6 +4,14 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"],
+        "rows": ["C2", "D0", "B0", "C7", "C5"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "C2",
         "esc_output": "C4"
diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h
index b5602b1cc0..e6f7c748a5 100644
--- a/keyboards/4pplet/aekiso60/rev_b/config.h
+++ b/keyboards/4pplet/aekiso60/rev_b/config.h
@@ -16,18 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B15,A9,B7,A1,A2}
-#define MATRIX_COL_PINS {A3,A4,F1,F0,C15,C14,C13,B9,B8,B6,B5,B4,B3,A15}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 12
 #define WS2812_EXTERNAL_PULLUP
-#define RGB_DI_PIN A8
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json
index 9f9f8bba8e..4e218f9365 100644
--- a/keyboards/4pplet/aekiso60/rev_b/info.json
+++ b/keyboards/4pplet/aekiso60/rev_b/info.json
@@ -4,6 +4,14 @@
         "pid": "0x0011",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B15", "A9", "B7", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A10"
     },
diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h
deleted file mode 100644
index b1743d0982..0000000000
--- a/keyboards/4pplet/bootleg/rev_a/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS {D0,C2,C4,D4,D2}
-#define MATRIX_COL_PINS {C5,C6,C7,B7,B6,B5,B4,B3,B2,B1,B0,D6,D5,D3,D1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/info.json
index 4f38932290..f149126a17 100644
--- a/keyboards/4pplet/bootleg/rev_a/info.json
+++ b/keyboards/4pplet/bootleg/rev_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5", "D3", "D1"],
+        "rows": ["D0", "C2", "C4", "D4", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "D0",
         "esc_output": "C4"
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
index 3d480a1e93..6114950220 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
@@ -16,16 +16,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define MATRIX_COL_PINS { A0, B1, B0, A4, B5, B4, B3 }
-#define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13}
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD2
 #define BACKLIGHT_PWM_CHANNEL   4
 #define BACKLIGHT_PAL_MODE      2
 
 /* Underglow */
-#define RGB_DI_PIN  A7
 #define WS2812_SPI  SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN A5
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
index 8748b32480..8fba2ee69b 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
@@ -8,11 +8,20 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "B1", "B0", "A4", "B5", "B4", "B3"],
+        "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A3",
         "levels": 10,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
@@ -74,7 +83,7 @@
                 { "label": ">", "x": 10.25, "y": 3 },
                 { "label": "?", "x": 11.25, "y": 3 },
                 { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "Fn", "x": 14, "y": 3, "w": 1 },
+                { "label": "Fn", "x": 14, "y": 3 },
                 { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
                 { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
                 { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
index 8b5bef208b..4e3e37ff3d 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
@@ -9,7 +9,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
index eed3b708c4..7c8c8a8cf2 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
@@ -16,10 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define MATRIX_COL_PINS { A0, A3, A4, A7, B5, B4, B3 }
-#define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13}
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -27,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Underglow */
 #define RGBLED_NUM 16
 #define WS2812_EXTERNAL_PULLUP
-#define RGB_DI_PIN A8
 
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
index 7ced2cf40c..c0f9ef3126 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0010",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A3", "A4", "A7", "B5", "B4", "B3"],
+        "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
@@ -18,6 +23,9 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "ws2812": {
+        "pin": "A8"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h
index 2764861e97..e033b16259 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/config.h
+++ b/keyboards/4pplet/perk60_iso/rev_a/config.h
@@ -16,10 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define MATRIX_COL_PINS { A1, B12, B14, A2, A0, A3, A4}
-#define MATRIX_ROW_PINS { C14, C13, B5, B4, B8, A15, B3, B9, A5, A7}
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json
index 07bd69f22e..9470d0ffe3 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/info.json
+++ b/keyboards/4pplet/perk60_iso/rev_a/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0009",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"],
+        "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "community_layouts": ["60_iso"],
diff --git a/keyboards/4pplet/perk60_iso/rev_a/rules.mk b/keyboards/4pplet/perk60_iso/rev_a/rules.mk
index dbdd70b907..d89fef7194 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/rules.mk
+++ b/keyboards/4pplet/perk60_iso/rev_a/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json
index 2125a491ca..40223b44e2 100644
--- a/keyboards/4pplet/steezy60/rev_a/info.json
+++ b/keyboards/4pplet/steezy60/rev_a/info.json
@@ -8,6 +8,10 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "qmk_lufa_bootloader": {
+        "esc_input": "C2",
+        "esc_output": "C4"
+    },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "community_layouts": [
@@ -38,7 +42,6 @@
     },
     "rgblight": {
         "led_count": 12,
-        "pin": "D3",
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -52,6 +55,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/4pplet/steezy60/rev_b/info.json b/keyboards/4pplet/steezy60/rev_b/info.json
index 6ffe02e506..6896b37844 100644
--- a/keyboards/4pplet/steezy60/rev_b/info.json
+++ b/keyboards/4pplet/steezy60/rev_b/info.json
@@ -38,7 +38,6 @@
     },
     "rgblight": {
         "led_count": 12,
-        "pin": "A8",
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -52,6 +51,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "A8"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/4pplet/unextended_std/rev_a/info.json b/keyboards/4pplet/unextended_std/rev_a/info.json
index 458439e7b7..1e88400947 100644
--- a/keyboards/4pplet/unextended_std/rev_a/info.json
+++ b/keyboards/4pplet/unextended_std/rev_a/info.json
@@ -32,8 +32,10 @@
         "audio": false
     },
 
+    "ws2812": {
+        "pin": "A8"
+    },
     "rgblight": {
-        "pin": "A8",
         "led_count": 16,
         "animations": {
             "alternating": true,
diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h
deleted file mode 100644
index 670c8132a1..0000000000
--- a/keyboards/4pplet/waffling60/rev_a/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {D4,D1,C2,C4,C7,B2}
-#define MATRIX_COL_PINS {D3,D0,D2,B6,B5,B4,B3,D6,D5,B0,B1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json
index 0b98be4876..ea24fceea0 100644
--- a/keyboards/4pplet/waffling60/rev_a/info.json
+++ b/keyboards/4pplet/waffling60/rev_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D0", "D2", "B6", "B5", "B4", "B3", "D6", "D5", "B0", "B1"],
+        "rows": ["D4", "D1", "C2", "C4", "C7", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "D4",
         "esc_output": "D3"
diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.c b/keyboards/4pplet/waffling60/rev_a/rev_a.c
deleted file mode 100644
index dc6c727fb7..0000000000
--- a/keyboards/4pplet/waffling60/rev_a/rev_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "rev_a.h"
diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h
index 7c1e13ce84..2552b1e451 100644
--- a/keyboards/4pplet/waffling60/rev_b/config.h
+++ b/keyboards/4pplet/waffling60/rev_b/config.h
@@ -16,16 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5}
-#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 1
 
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json
index 866ae5c1ac..143b9c207f 100644
--- a/keyboards/4pplet/waffling60/rev_b/info.json
+++ b/keyboards/4pplet/waffling60/rev_b/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0005",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
+        "rows": ["C2", "D0", "B0", "D6", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "C4",
         "esc_output": "C2"
diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h
index 689a515013..06e5db9090 100644
--- a/keyboards/4pplet/waffling60/rev_c/config.h
+++ b/keyboards/4pplet/waffling60/rev_c/config.h
@@ -16,16 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5}
-#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 1
 
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json
index 1a6937b096..0f7ba079d5 100644
--- a/keyboards/4pplet/waffling60/rev_c/info.json
+++ b/keyboards/4pplet/waffling60/rev_c/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0008",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
+        "rows": ["C2", "D0", "B0", "D6", "D5"]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "C4",
         "esc_output": "C2"
diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h
index 05e66f6a79..2ba774712a 100644
--- a/keyboards/4pplet/waffling60/rev_d/config.h
+++ b/keyboards/4pplet/waffling60/rev_d/config.h
@@ -16,18 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
-#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 1
 #define WS2812_EXTERNAL_PULLUP
-#define RGB_DI_PIN A8
 
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json
index 7b09f0a0d3..18ffba5abc 100644
--- a/keyboards/4pplet/waffling60/rev_d/info.json
+++ b/keyboards/4pplet/waffling60/rev_d/info.json
@@ -8,6 +8,14 @@
         "pid": "0x000E",
         "device_version": "0.0.4"
     },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+        "rows": ["B14", "A9", "B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/config.h
deleted file mode 100644
index beb204bb2d..0000000000
--- a/keyboards/4pplet/waffling60/rev_d_ansi/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
-#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/info.json
index dc3ea424bb..84f375371d 100644
--- a/keyboards/4pplet/waffling60/rev_d_ansi/info.json
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000D",
         "device_version": "0.0.4"
     },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+        "rows": ["B14", "A9", "B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/config.h b/keyboards/4pplet/waffling60/rev_d_iso/config.h
deleted file mode 100644
index cb2e06921a..0000000000
--- a/keyboards/4pplet/waffling60/rev_d_iso/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
-#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/info.json
index 8f9c34b563..c920744d27 100644
--- a/keyboards/4pplet/waffling60/rev_d_iso/info.json
+++ b/keyboards/4pplet/waffling60/rev_d_iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+        "rows": ["B14", "A9", "B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h
index 8b3dc47247..e42bb68b37 100644
--- a/keyboards/4pplet/waffling80/rev_a/config.h
+++ b/keyboards/4pplet/waffling80/rev_a/config.h
@@ -16,15 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS {C4,C5,B4,B3,B1,B0,D6,D5,D3,D4,D1,D2}
-#define MATRIX_COL_PINS {C6,C7,B7,B6,B5,B2,D0,C2}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D7
 #define RGBLED_NUM 2
 
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json
index 13bffb7384..dbb460532d 100644
--- a/keyboards/4pplet/waffling80/rev_a/info.json
+++ b/keyboards/4pplet/waffling80/rev_a/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "B7", "B6", "B5", "B2", "D0", "C2"],
+        "rows": ["C4", "C5", "B4", "B3", "B1", "B0", "D6", "D5", "D3", "D4", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "C4",
         "esc_output": "C6"
diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h
index c863208012..1bf561d74a 100644
--- a/keyboards/4pplet/waffling80/rev_b/config.h
+++ b/keyboards/4pplet/waffling80/rev_b/config.h
@@ -16,17 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS {B13,B12,A5,A4,A2,A1,F0,C15,C13,C14,F1,A0}
-#define MATRIX_COL_PINS {B2,B1,B0,A7,A6,A3,B9,B8}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 2
 #define WS2812_EXTERNAL_PULLUP
-#define RGB_DI_PIN A8
 
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json
index f6a835652f..378478c8af 100644
--- a/keyboards/4pplet/waffling80/rev_b/info.json
+++ b/keyboards/4pplet/waffling80/rev_b/info.json
@@ -8,6 +8,14 @@
         "pid": "0x000F",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0", "A7", "A6", "A3", "B9", "B8"],
+        "rows": ["B13", "B12", "A5", "A4", "A2", "A1", "F0", "C15", "C13", "C14", "F1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h
index 959bd92622..b9a17d4128 100644
--- a/keyboards/4pplet/yakiimo/rev_a/config.h
+++ b/keyboards/4pplet/yakiimo/rev_a/config.h
@@ -16,10 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define MATRIX_COL_PINS { B0, A5, A4, A3, A2, A1, A0, C15, A8 }
-#define MATRIX_ROW_PINS { B10, B1, C13, C14, B14, B12, B9, B8, B5, B4, A15, B3 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/4pplet/yakiimo/rev_a/info.json b/keyboards/4pplet/yakiimo/rev_a/info.json
index b902a0d6cf..137a27285c 100644
--- a/keyboards/4pplet/yakiimo/rev_a/info.json
+++ b/keyboards/4pplet/yakiimo/rev_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000A",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A8"],
+        "rows": ["B10", "B1", "C13", "C14", "B14", "B12", "B9", "B8", "B5", "B4", "A15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A6",
         "scroll_lock": "A7"
@@ -16,7 +21,113 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":2.75, "y":0}, {"label":"F1", "x":4.75, "y":0}, {"label":"F2", "x":5.75, "y":0}, {"label":"F3", "x":6.75, "y":0}, {"label":"F4", "x":7.75, "y":0}, {"label":"F5", "x":9.25, "y":0}, {"label":"F6", "x":10.25, "y":0}, {"label":"F7", "x":11.25, "y":0}, {"label":"F8", "x":12.25, "y":0}, {"label":"F9", "x":13.75, "y":0}, {"label":"F10", "x":14.75, "y":0}, {"label":"F11", "x":15.75, "y":0}, {"label":"F12", "x":16.75, "y":0}, {"label":"PrtSc", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "y":0}, {"label":"~", "x":2.75, "y":1.5}, {"label":"!", "x":3.75, "y":1.5}, {"label":"@", "x":4.75, "y":1.5}, {"label":"#", "x":5.75, "y":1.5}, {"label":"$", "x":6.75, "y":1.5}, {"label":"%", "x":7.75, "y":1.5}, {"label":"^", "x":8.75, "y":1.5}, {"label":"&", "x":9.75, "y":1.5}, {"label":"*", "x":10.75, "y":1.5}, {"label":"(", "x":11.75, "y":1.5}, {"label":")", "x":12.75, "y":1.5}, {"label":"_", "x":13.75, "y":1.5}, {"label":"+", "x":14.75, "y":1.5}, {"label":"|", "x":15.75, "y":1.5}, {"label":"~", "x":16.75, "y":1.5}, {"label":"Insert", "x":18, "y":1.5}, {"label":"Home", "x":19, "y":1.5}, {"label":"PgUp", "x":20, "y":1.5}, {"label":"Tab", "x":2.75, "y":2.5, "w":1.5}, {"label":"Q", "x":4.25, "y":2.5}, {"label":"W", "x":5.25, "y":2.5}, {"label":"E", "x":6.25, "y":2.5}, {"label":"R", "x":7.25, "y":2.5}, {"label":"T", "x":8.25, "y":2.5}, {"label":"Y", "x":9.25, "y":2.5}, {"label":"U", "x":10.25, "y":2.5}, {"label":"I", "x":11.25, "y":2.5}, {"label":"O", "x":12.25, "y":2.5}, {"label":"P", "x":13.25, "y":2.5}, {"label":"{", "x":14.25, "y":2.5}, {"label":"}", "x":15.25, "y":2.5}, {"label":"|", "x":16.25, "y":2.5, "w":1.5}, {"label":"Delete", "x":18, "y":2.5}, {"label":"End", "x":19, "y":2.5}, {"label":"PgDn", "x":20, "y":2.5}, {"label":"Caps Lock", "x":2.75, "y":3.5, "w":1.75}, {"label":"A", "x":4.5, "y":3.5}, {"label":"S", "x":5.5, "y":3.5}, {"label":"D", "x":6.5, "y":3.5}, {"label":"F", "x":7.5, "y":3.5}, {"label":"G", "x":8.5, "y":3.5}, {"label":"H", "x":9.5, "y":3.5}, {"label":"J", "x":10.5, "y":3.5}, {"label":"K", "x":11.5, "y":3.5}, {"label":"L", "x":12.5, "y":3.5}, {"label":":", "x":13.5, "y":3.5}, {"label":"\"", "x":14.5, "y":3.5}, {"label":"~", "x":15.5, "y":3.5}, {"label":"Enter", "x":16.5, "y":3.5, "w":1.25}, {"label":"Shift", "x":2.75, "y":4.5, "w":1.25}, {"label":"|", "x":4, "y":4.5}, {"label":"Z", "x":5, "y":4.5}, {"label":"X", "x":6, "y":4.5}, {"label":"C", "x":7, "y":4.5}, {"label":"V", "x":8, "y":4.5}, {"label":"B", "x":9, "y":4.5}, {"label":"N", "x":10, "y":4.5}, {"label":"M", "x":11, "y":4.5}, {"label":"<", "x":12, "y":4.5}, {"label":">", "x":13, "y":4.5}, {"label":"?", "x":14, "y":4.5}, {"label":"Shift", "x":15, "y":4.5, "w":1.75}, {"label":"Fn", "x":16.75, "y":4.5}, {"label":"\u2191", "x":19, "y":4.5}, {"label":"Ctrl", "x":2.75, "y":5.5, "w":1.5}, {"label":"Win", "x":4.25, "y":5.5}, {"label":"Alt", "x":5.25, "y":5.5, "w":1.5}, {"x":6.75, "y":5.5, "w":3}, {"x":9.75, "y":5.5}, {"x":10.75, "y":5.5, "w":3}, {"label":"AltGr", "x":13.75, "y":5.5, "w":1.5}, {"label":"Win", "x":15.25, "y":5.5}, {"label":"Ctrl", "x":16.25, "y":5.5, "w":1.5}, {"label":"\u2190", "x":18, "y":5.5}, {"label":"\u2193", "x":19, "y":5.5}, {"label":"\u2192", "x":20, "y":5.5}]
+            "layout": [
+                {"x":0, "y":0},
+
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.5, "y":0},
+
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.5},
+                {"x":1, "y":1.5},
+                {"x":2, "y":1.5},
+                {"x":3, "y":1.5},
+                {"x":4, "y":1.5},
+                {"x":5, "y":1.5},
+                {"x":6, "y":1.5},
+                {"x":7, "y":1.5},
+                {"x":8, "y":1.5},
+                {"x":9, "y":1.5},
+                {"x":10, "y":1.5},
+                {"x":11, "y":1.5},
+                {"x":12, "y":1.5},
+                {"x":13, "y":1.5},
+                {"x":14, "y":1.5},
+
+                {"x":15.25, "y":1.5},
+                {"x":16.25, "y":1.5},
+                {"x":17.25, "y":1.5},
+
+                {"x":0, "y":2.5, "w":1.5},
+                {"x":1.5, "y":2.5},
+                {"x":2.5, "y":2.5},
+                {"x":3.5, "y":2.5},
+                {"x":4.5, "y":2.5},
+                {"x":5.5, "y":2.5},
+                {"x":6.5, "y":2.5},
+                {"x":7.5, "y":2.5},
+                {"x":8.5, "y":2.5},
+                {"x":9.5, "y":2.5},
+                {"x":10.5, "y":2.5},
+                {"x":11.5, "y":2.5},
+                {"x":12.5, "y":2.5},
+                {"x":13.5, "y":2.5, "w":1.5},
+
+                {"x":15.25, "y":2.5},
+                {"x":16.25, "y":2.5},
+                {"x":17.25, "y":2.5},
+
+                {"x":0, "y":3.5, "w":1.75},
+                {"x":1.75, "y":3.5},
+                {"x":2.75, "y":3.5},
+                {"x":3.75, "y":3.5},
+                {"x":4.75, "y":3.5},
+                {"x":5.75, "y":3.5},
+                {"x":6.75, "y":3.5},
+                {"x":7.75, "y":3.5},
+                {"x":8.75, "y":3.5},
+                {"x":9.75, "y":3.5},
+                {"x":10.75, "y":3.5},
+                {"x":11.75, "y":3.5},
+                {"x":12.75, "y":3.5},
+                {"x":13.75, "y":3.5, "w":1.25},
+
+                {"x":0, "y":4.5, "w":1.25},
+                {"x":1.25, "y":4.5},
+                {"x":2.25, "y":4.5},
+                {"x":3.25, "y":4.5},
+                {"x":4.25, "y":4.5},
+                {"x":5.25, "y":4.5},
+                {"x":6.25, "y":4.5},
+                {"x":7.25, "y":4.5},
+                {"x":8.25, "y":4.5},
+                {"x":9.25, "y":4.5},
+                {"x":10.25, "y":4.5},
+                {"x":11.25, "y":4.5},
+                {"x":12.25, "y":4.5, "w":1.75},
+                {"x":14, "y":4.5},
+
+                {"x":16.25, "y":4.5},
+
+                {"x":0, "y":5.5, "w":1.5},
+                {"x":1.5, "y":5.5},
+                {"x":2.5, "y":5.5, "w":1.5},
+                {"x":4, "y":5.5, "w":3},
+                {"x":7, "y":5.5},
+                {"x":8, "y":5.5, "w":3},
+                {"x":11, "y":5.5, "w":1.5},
+                {"x":12.5, "y":5.5},
+                {"x":13.5, "y":5.5, "w":1.5},
+
+                {"x":15.25, "y":5.5},
+                {"x":16.25, "y":5.5},
+                {"x":17.25, "y":5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/7c8/framework/config.h b/keyboards/7c8/framework/config.h
index ba7016ab34..f6b4b30cf5 100644
--- a/keyboards/7c8/framework/config.h
+++ b/keyboards/7c8/framework/config.h
@@ -16,11 +16,7 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, D7, B2, D6, B3, D5, B4, D4, B5 }
-#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5 }
-
 #define TAP_CODE_DELAY 16
-#define DIODE_DIRECTION COL2ROW
 
 #define LEADER_TIMEOUT 250
 #define LEADER_PER_KEY_TIMING 150
diff --git a/keyboards/7c8/framework/framework.c b/keyboards/7c8/framework/framework.c
deleted file mode 100644
index 6ce105be97..0000000000
--- a/keyboards/7c8/framework/framework.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Steven Nguyen
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "framework.h"
diff --git a/keyboards/7c8/framework/framework.h b/keyboards/7c8/framework/framework.h
index 8de2837519..e35ac6e7fc 100644
--- a/keyboards/7c8/framework/framework.h
+++ b/keyboards/7c8/framework/framework.h
@@ -17,65 +17,6 @@
 #pragma once
 #include "quantum.h"
 
-#define ___ KC_NO
-
-#define LAYOUT_ortho_5x12( \
-        K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-        K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-        K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-        K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, \
-        K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b  \
-        ) { \
-          { K00, K01, K02, K03, K04, K05 }, \
-          { K06, K07, K08, K09, K0a, K0b }, \
-          { K10, K11, K12, K13, K14, K15 }, \
-          { K16, K17, K18, K19, K1a, K1b }, \
-          { K20, K21, K22, K23, K24, K25 }, \
-          { K26, K27, K28, K29, K2a, K2b }, \
-          { K30, K31, K32, K33, K34, K35 }, \
-          { K36, K37, K38, K39, K3a, K3b }, \
-          { K40, K41, K42, K43, K44, K45 }, \
-          { K46, K47, K48, K49, K4a, K4b }  \
-        }
-
-#define LAYOUT_ortho_5x12_1x2uC( \
-        K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-        K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-        K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-        K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, \
-        K40, K41, K42, K43, K44,    K45,   K47, K48, K49, K4a, K4b  \
-        ) { \
-          { K00, K01, K02, K03, K04, K05 }, \
-          { K06, K07, K08, K09, K0a, K0b }, \
-          { K10, K11, K12, K13, K14, K15 }, \
-          { K16, K17, K18, K19, K1a, K1b }, \
-          { K20, K21, K22, K23, K24, K25 }, \
-          { K26, K27, K28, K29, K2a, K2b }, \
-          { K30, K31, K32, K33, K34, K35 }, \
-          { K36, K37, K38, K39, K3a, K3b }, \
-          { K40, K41, K42, K43, K44, K45 }, \
-          { ___, K47, K48, K49, K4a, K4b }  \
-        }
-
-#define LAYOUT_preonic_2x2u( \
-        K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-        K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-        K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-        K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, \
-        K40, K41, K42, K43,    K45,     K46,    K48, K49, K4a, K4b  \
-        ) { \
-          { K00, K01, K02, K03, K04, K05 }, \
-          { K06, K07, K08, K09, K0a, K0b }, \
-          { K10, K11, K12, K13, K14, K15 }, \
-          { K16, K17, K18, K19, K1a, K1b }, \
-          { K20, K21, K22, K23, K24, K25 }, \
-          { K26, K27, K28, K29, K2a, K2b }, \
-          { K30, K31, K32, K33, K34, K35 }, \
-          { K36, K37, K38, K39, K3a, K3b }, \
-          { K40, K41, K42, K43, ___, K45 }, \
-          { K46, ___, K48, K49, K4a, K4b }  \
-        }
-
 #define framework_via( \
         K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
         K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
diff --git a/keyboards/7c8/framework/info.json b/keyboards/7c8/framework/info.json
index ca440e9a76..18c0289c9a 100644
--- a/keyboards/7c8/framework/info.json
+++ b/keyboards/7c8/framework/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
+        "rows": ["B0", "B1", "D7", "B2", "D6", "B3", "D5", "B4", "D4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1"}
@@ -18,203 +23,203 @@
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [1, 0], "x": 6, "y": 0},
+                {"matrix": [1, 1], "x": 7, "y": 0},
+                {"matrix": [1, 2], "x": 8, "y": 0},
+                {"matrix": [1, 3], "x": 9, "y": 0},
+                {"matrix": [1, 4], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1},
+                {"matrix": [2, 5], "x": 5, "y": 1},
+                {"matrix": [3, 0], "x": 6, "y": 1},
+                {"matrix": [3, 1], "x": 7, "y": 1},
+                {"matrix": [3, 2], "x": 8, "y": 1},
+                {"matrix": [3, 3], "x": 9, "y": 1},
+                {"matrix": [3, 4], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [4, 1], "x": 1, "y": 2},
+                {"matrix": [4, 2], "x": 2, "y": 2},
+                {"matrix": [4, 3], "x": 3, "y": 2},
+                {"matrix": [4, 4], "x": 4, "y": 2},
+                {"matrix": [4, 5], "x": 5, "y": 2},
+                {"matrix": [5, 0], "x": 6, "y": 2},
+                {"matrix": [5, 1], "x": 7, "y": 2},
+                {"matrix": [5, 2], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [6, 1], "x": 1, "y": 3},
+                {"matrix": [6, 2], "x": 2, "y": 3},
+                {"matrix": [6, 3], "x": 3, "y": 3},
+                {"matrix": [6, 4], "x": 4, "y": 3},
+                {"matrix": [6, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [8, 3], "x": 3, "y": 4},
+                {"matrix": [8, 4], "x": 4, "y": 4},
+                {"matrix": [8, 5], "x": 5, "y": 4},
+                {"matrix": [9, 0], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [9, 3], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 5], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x12_1x2uC": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [1, 0], "x": 6, "y": 0},
+                {"matrix": [1, 1], "x": 7, "y": 0},
+                {"matrix": [1, 2], "x": 8, "y": 0},
+                {"matrix": [1, 3], "x": 9, "y": 0},
+                {"matrix": [1, 4], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1},
+                {"matrix": [2, 5], "x": 5, "y": 1},
+                {"matrix": [3, 0], "x": 6, "y": 1},
+                {"matrix": [3, 1], "x": 7, "y": 1},
+                {"matrix": [3, 2], "x": 8, "y": 1},
+                {"matrix": [3, 3], "x": 9, "y": 1},
+                {"matrix": [3, 4], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [4, 1], "x": 1, "y": 2},
+                {"matrix": [4, 2], "x": 2, "y": 2},
+                {"matrix": [4, 3], "x": 3, "y": 2},
+                {"matrix": [4, 4], "x": 4, "y": 2},
+                {"matrix": [4, 5], "x": 5, "y": 2},
+                {"matrix": [5, 0], "x": 6, "y": 2},
+                {"matrix": [5, 1], "x": 7, "y": 2},
+                {"matrix": [5, 2], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [6, 1], "x": 1, "y": 3},
+                {"matrix": [6, 2], "x": 2, "y": 3},
+                {"matrix": [6, 3], "x": 3, "y": 3},
+                {"matrix": [6, 4], "x": 4, "y": 3},
+                {"matrix": [6, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4, "w": 2},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [8, 3], "x": 3, "y": 4},
+                {"matrix": [8, 4], "x": 4, "y": 4},
+                {"matrix": [8, 5], "x": 5, "y": 4, "w": 2},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [9, 3], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 5], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_preonic_2x2u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [1, 0], "x": 6, "y": 0},
+                {"matrix": [1, 1], "x": 7, "y": 0},
+                {"matrix": [1, 2], "x": 8, "y": 0},
+                {"matrix": [1, 3], "x": 9, "y": 0},
+                {"matrix": [1, 4], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1},
+                {"matrix": [2, 5], "x": 5, "y": 1},
+                {"matrix": [3, 0], "x": 6, "y": 1},
+                {"matrix": [3, 1], "x": 7, "y": 1},
+                {"matrix": [3, 2], "x": 8, "y": 1},
+                {"matrix": [3, 3], "x": 9, "y": 1},
+                {"matrix": [3, 4], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [4, 1], "x": 1, "y": 2},
+                {"matrix": [4, 2], "x": 2, "y": 2},
+                {"matrix": [4, 3], "x": 3, "y": 2},
+                {"matrix": [4, 4], "x": 4, "y": 2},
+                {"matrix": [4, 5], "x": 5, "y": 2},
+                {"matrix": [5, 0], "x": 6, "y": 2},
+                {"matrix": [5, 1], "x": 7, "y": 2},
+                {"matrix": [5, 2], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [6, 1], "x": 1, "y": 3},
+                {"matrix": [6, 2], "x": 2, "y": 3},
+                {"matrix": [6, 3], "x": 3, "y": 3},
+                {"matrix": [6, 4], "x": 4, "y": 3},
+                {"matrix": [6, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4, "w": 2},
-                {"x": 6, "y": 4, "w": 2},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [8, 3], "x": 3, "y": 4},
+                {"matrix": [8, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [9, 0], "x": 6, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [9, 3], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 5], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h
index fe5d7a4982..5139d4cf69 100644
--- a/keyboards/8pack/config.h
+++ b/keyboards/8pack/config.h
@@ -7,7 +7,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 // ws2812 options
-#define RGB_DI_PIN D2 // pin the DI on the ws2812 is hooked-up to
 #define RGBLED_NUM 8 // number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json
index 3e6b556fae..45dec97b33 100644
--- a/keyboards/8pack/info.json
+++ b/keyboards/8pack/info.json
@@ -11,6 +11,9 @@
     "pins": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
     "levels": 8
   },
+  "ws2812": {
+    "pin": "D2"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "matrix_pins": {
diff --git a/keyboards/9key/9key.c b/keyboards/9key/9key.c
deleted file mode 100644
index bbbabb81c4..0000000000
--- a/keyboards/9key/9key.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "9key.h"
diff --git a/keyboards/9key/9key.h b/keyboards/9key/9key.h
deleted file mode 100644
index ad809da4b8..0000000000
--- a/keyboards/9key/9key.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22 \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 } \
-}
diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h
index 8f721392c8..bb910a4427 100644
--- a/keyboards/9key/config.h
+++ b/keyboards/9key/config.h
@@ -17,17 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* 9Key PCB default pin-out */
-#define MATRIX_ROW_PINS { D1, D0, D4 }
-#define MATRIX_COL_PINS { F4, F5, F6 }
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN F7
-
 #define RGBLED_NUM 1    // Number of LEDs
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 200
diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json
index fa74573e3e..1dc9fad41a 100644
--- a/keyboards/9key/info.json
+++ b/keyboards/9key/info.json
@@ -8,11 +8,31 @@
     "pid": "0x0007",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F7"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6"],
+    "rows": ["D1", "D0", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2}
+      ]
     }
   }
 }
diff --git a/keyboards/abacus/abacus.c b/keyboards/abacus/abacus.c
deleted file mode 100644
index aef62aa921..0000000000
--- a/keyboards/abacus/abacus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 nickolaij
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "abacus.h"
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
index 2e28b792a1..f559702e03 100644
--- a/keyboards/abacus/config.h
+++ b/keyboards/abacus/config.h
@@ -17,27 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, D2, D4, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7, B3, E6, B2, B4, B6, B5}
-
 #define DIP_SWITCH_PINS { D0 }
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-#define RGB_DI_PIN D1
-
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 17
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_SNAKE
 #    define RGBLIGHT_EFFECT_KNIGHT
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json
index 132187db26..2b3bfa434b 100644
--- a/keyboards/abacus/info.json
+++ b/keyboards/abacus/info.json
@@ -8,64 +8,72 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"],
+        "rows": ["D3", "D2", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F0"}
         ]
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"k00", "x":0, "y":0, "w":1},
-                {"label":"k01", "x":1, "y":0, "w":1},
-                {"label":"k02", "x":2, "y":0, "w":1},
-                {"label":"k03", "x":3, "y":0, "w":1},
-                {"label":"k04", "x":4, "y":0, "w":1},
-                {"label":"k05", "x":5, "y":0, "w":1},
-                {"label":"k06", "x":6, "y":0, "w":1},
-                {"label":"k07", "x":7, "y":0, "w":1},
-                {"label":"k08", "x":8, "y":0, "w":1},
-                {"label":"k09", "x":9, "y":0, "w":1},
-                {"label":"k0a", "x":10, "y":0, "w":1},
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6, "y":0},
+                {"label":"k07", "x":7, "y":0},
+                {"label":"k08", "x":8, "y":0},
+                {"label":"k09", "x":9, "y":0},
+                {"label":"k0a", "x":10, "y":0},
                 {"label":"k0b", "x":11, "y":0, "w":1.75},
 
                 {"label":"k10", "x":0, "y":1, "w":1.25},
-                {"label":"k11", "x":1.25, "y":1, "w":1},
-                {"label":"k12", "x":2.25, "y":1, "w":1},
-                {"label":"k13", "x":3.25, "y":1, "w":1},
-                {"label":"k14", "x":4.25, "y":1, "w":1},
-                {"label":"k15", "x":5.25, "y":1, "w":1},
-                {"label":"k16", "x":6.25, "y":1, "w":1},
-                {"label":"k17", "x":7.25, "y":1, "w":1},
-                {"label":"k18", "x":8.25, "y":1, "w":1},
-                {"label":"k19", "x":9.25, "y":1, "w":1},
-                {"label":"k1a", "x":10.25, "y":1, "w":1},
+                {"label":"k11", "x":1.25, "y":1},
+                {"label":"k12", "x":2.25, "y":1},
+                {"label":"k13", "x":3.25, "y":1},
+                {"label":"k14", "x":4.25, "y":1},
+                {"label":"k15", "x":5.25, "y":1},
+                {"label":"k16", "x":6.25, "y":1},
+                {"label":"k17", "x":7.25, "y":1},
+                {"label":"k18", "x":8.25, "y":1},
+                {"label":"k19", "x":9.25, "y":1},
+                {"label":"k1a", "x":10.25, "y":1},
                 {"label":"k1b", "x":11.25, "y":1, "w":1.5},
 
                 {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2, "w":1},
-                {"label":"k22", "x":2.75, "y":2, "w":1},
-                {"label":"k23", "x":3.75, "y":2, "w":1},
-                {"label":"k24", "x":4.75, "y":2, "w":1},
-                {"label":"k25", "x":5.75, "y":2, "w":1},
-                {"label":"k26", "x":6.75, "y":2, "w":1},
-                {"label":"k27", "x":7.75, "y":2, "w":1},
-                {"label":"k28", "x":8.75, "y":2, "w":1},
-                {"label":"k29", "x":9.75, "y":2, "w":1},
-                {"label":"k2a", "x":10.75, "y":2, "w":1},
-                {"label":"k2b", "x":11.75, "y":2, "w":1},
+                {"label":"k21", "x":1.75, "y":2},
+                {"label":"k22", "x":2.75, "y":2},
+                {"label":"k23", "x":3.75, "y":2},
+                {"label":"k24", "x":4.75, "y":2},
+                {"label":"k25", "x":5.75, "y":2},
+                {"label":"k26", "x":6.75, "y":2},
+                {"label":"k27", "x":7.75, "y":2},
+                {"label":"k28", "x":8.75, "y":2},
+                {"label":"k29", "x":9.75, "y":2},
+                {"label":"k2a", "x":10.75, "y":2},
+                {"label":"k2b", "x":11.75, "y":2},
 
                 {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3, "w":1},
-                {"label":"k32", "x":2.25, "y":3, "w":1},
+                {"label":"k31", "x":1.25, "y":3},
+                {"label":"k32", "x":2.25, "y":3},
                 {"label":"k33", "x":3.25, "y":3, "w":2.75},
                 {"label":"k34", "x":6, "y":3, "w":2.75},
-                {"label":"k35", "x":8.75, "y":3, "w":1},
-                {"label":"k36", "x":9.75, "y":3, "w":1},
-                {"label":"k37", "x":10.75, "y":3, "w":1},
-                {"label":"k38", "x":11.75, "y":3, "w":1}
+                {"label":"k35", "x":8.75, "y":3},
+                {"label":"k36", "x":9.75, "y":3},
+                {"label":"k37", "x":10.75, "y":3},
+                {"label":"k38", "x":11.75, "y":3}
             ]
         }
     }
diff --git a/keyboards/abatskeyboardclub/nayeon/config.h b/keyboards/abatskeyboardclub/nayeon/config.h
index b10c977af4..b42ece99a6 100644
--- a/keyboards/abatskeyboardclub/nayeon/config.h
+++ b/keyboards/abatskeyboardclub/nayeon/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* RGB Matrix setup */
-#define RGB_DI_PIN GP19
 #define RGB_MATRIX_LED_COUNT 2
 #define RGBLED_NUM 2
 #define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/info.json
index 99c64034e5..d7e3718c0b 100644
--- a/keyboards/abatskeyboardclub/nayeon/info.json
+++ b/keyboards/abatskeyboardclub/nayeon/info.json
@@ -20,6 +20,13 @@
         "pid": "0x0001",
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "pin": "GP19",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040",
     "diode_direction": "COL2ROW",
@@ -31,491 +38,536 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
-                {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
-                {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/abatskeyboardclub/nayeon/nayeon.c b/keyboards/abatskeyboardclub/nayeon/nayeon.c
index f4c17966c9..504df12999 100644
--- a/keyboards/abatskeyboardclub/nayeon/nayeon.c
+++ b/keyboards/abatskeyboardclub/nayeon/nayeon.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nayeon.h"
+#include "quantum.h"
 
 led_config_t g_led_config = {{
     // Key Matrix to LED Index
diff --git a/keyboards/abatskeyboardclub/nayeon/nayeon.h b/keyboards/abatskeyboardclub/nayeon/nayeon.h
deleted file mode 100644
index fb1806f32d..0000000000
--- a/keyboards/abatskeyboardclub/nayeon/nayeon.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright 2022 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// ANSI layout
-// Full backspace
-// Full right shift
-// Full left shift
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                \
-    k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,                k4f,      \
-    k50, k51, k52,                k57,                     k5b, k5c, k5d, k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \
-    { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, ___, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// ANSI layout
-// Split backspace
-// Split right shift
-// Full left shift
-#define LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                     \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
-    k50, k51, k52,                k57,                     k5b, k5c, k5d,      k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \
-    { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, ___, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// ISO layout
-// Full backspace
-// Full right shift
-// Split left shift
-#define LAYOUT_tkl_f13_iso_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2d,                \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,                k4f,      \
-    k50, k51, k52,                k57,                     k5b, k5c, k5d, k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, ___, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// ISO layout
-// Split backspace
-// Split right shift
-// Split left shift
-#define LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2d,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
-    k50, k51, k52,                k57,                     k5b, k5c, k5d,      k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, ___, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// Layout for VIA
-// Split backspace
-// Split left shift
-// Split right shift
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
-    k50, k51, k52,                     k57,                k5b, k5c, k5d,      k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, ___, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
diff --git a/keyboards/abatskeyboardclub/nayeon/rules.mk b/keyboards/abatskeyboardclub/nayeon/rules.mk
index ae3dec4132..e458f33f3c 100644
--- a/keyboards/abatskeyboardclub/nayeon/rules.mk
+++ b/keyboards/abatskeyboardclub/nayeon/rules.mk
@@ -1,4 +1,2 @@
 # RGB Matrix
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = vendor
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
index f7932863e9..2058825ab0 100644
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ b/keyboards/abstract/ellipse/rev1/config.h
@@ -17,32 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, C7 }
-#define MATRIX_COL_PINS { F0, B6, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 3
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json
index 230e286c5d..9dfe255ba2 100644
--- a/keyboards/abstract/ellipse/rev1/info.json
+++ b/keyboards/abstract/ellipse/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B6", "B5"],
+        "rows": ["D3", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B1", "resolution": 2},
@@ -19,11 +24,22 @@
         "pin": "C6",
         "levels": 15
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/abstract/ellipse/rev1/rev1.c b/keyboards/abstract/ellipse/rev1/rev1.c
deleted file mode 100644
index f2a7e484cd..0000000000
--- a/keyboards/abstract/ellipse/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 AbstractKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/abstract/ellipse/rev1/rev1.h b/keyboards/abstract/ellipse/rev1/rev1.h
deleted file mode 100644
index de8b9bacb6..0000000000
--- a/keyboards/abstract/ellipse/rev1/rev1.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2019 AbstractKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K00, K01, K02, \
-    K10, K11, K12   \
-) \
-{ \
-    { K00, K01,   K02 }, \
-    { K10, K11,   K12 }, \
-}
-
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index 07378f5e3d..23f7172ea7 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/config.h
@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-
-//                         0   1   2   3   4   5   6   7   8   9   A   B   C   D
-#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 6
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -55,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json
index 00629035c0..008c2e37d9 100644
--- a/keyboards/acekeyboard/titan60/info.json
+++ b/keyboards/acekeyboard/titan60/info.json
@@ -8,10 +8,18 @@
         "pid": "0x5449",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+      "rows": ["B1", "B2", "B3", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "B7",
       "breathing": true
     },
+    "ws2812": {
+      "pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/acekeyboard/titan60/titan60.c b/keyboards/acekeyboard/titan60/titan60.c
deleted file mode 100644
index 64479f31c8..0000000000
--- a/keyboards/acekeyboard/titan60/titan60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 MechMerlin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "titan60.h"
diff --git a/keyboards/acheron/apollo/87h/87h.c b/keyboards/acheron/apollo/87h/87h.c
deleted file mode 100644
index 3d3f364ba8..0000000000
--- a/keyboards/acheron/apollo/87h/87h.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Alvaro "Gondolindrim" Volpato
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "87h.h"
diff --git a/keyboards/acheron/apollo/87h/87h.h b/keyboards/acheron/apollo/87h/87h.h
deleted file mode 100644
index 535575f451..0000000000
--- a/keyboards/acheron/apollo/87h/87h.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2022 Alvaro "Gondolindrim" Volpato
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_acheron_apollo_87h_gamma)
-    #include "gamma.h"
-#elif defined(KEYBOARD_acheron_apollo_87h_delta)
-    #include "delta.h"
-#endif
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 490c13c2e9..0798ffa70b 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                        C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } 
-#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4  }
-//                        R0 , R1 , R2 , R3 , R4 , R5 
-#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -30,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define RGB_DI_PIN B15
 #define RGB_MATRIX_LED_COUNT 87
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/acheron/apollo/87h/delta/delta.c b/keyboards/acheron/apollo/87h/delta/delta.c
index d55880d482..1e79584a9c 100644
--- a/keyboards/acheron/apollo/87h/delta/delta.c
+++ b/keyboards/acheron/apollo/87h/delta/delta.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "delta.h"
+#include "quantum.h"
 
 void board_init(void) {
     setPinInput(B9);
diff --git a/keyboards/acheron/apollo/87h/delta/delta.h b/keyboards/acheron/apollo/87h/delta/delta.h
deleted file mode 100644
index c3f5f6c22e..0000000000
--- a/keyboards/acheron/apollo/87h/delta/delta.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2022 �lvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_tkl_ansi( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, K0G, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                     \
-	K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,      \
-        K50, K51, K52,                K56,           K59, K5A, K5B, K5C,      K5E, K5F, K5G  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F, K0G }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, ___, ___, ___ }, \
-	{ K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-	{ K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, K5C, ___, K5E, K5F, K5G } \
-}
diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json
index 4e14f51df0..c2a702781b 100644
--- a/keyboards/acheron/apollo/87h/delta/info.json
+++ b/keyboards/acheron/apollo/87h/delta/info.json
@@ -4,6 +4,123 @@
         "pid": "0x8775",
         "device_version": "0.0.4"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
+        "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F401",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
 }
diff --git a/keyboards/acheron/apollo/87h/delta/rules.mk b/keyboards/acheron/apollo/87h/delta/rules.mk
index 0f7a9e78f7..ce1d65be0f 100644
--- a/keyboards/acheron/apollo/87h/delta/rules.mk
+++ b/keyboards/acheron/apollo/87h/delta/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index 07da517e24..6209fa21f7 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                        C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15 }
-#define MATRIX_COL_PINS { B3 , A15, A10, A8 , B14, B12, B10, B1 , B0 , A7 , A4 , A5 , A6 , C15, A0 , A1  }
-//                        R0 , R1 , R2 , R3 , R4 , R5
-#define MATRIX_ROW_PINS { C14, C13, B9 , B4 , A3 , A2 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/acheron/apollo/87h/gamma/gamma.c b/keyboards/acheron/apollo/87h/gamma/gamma.c
index 89eed483c1..fb381f52ce 100644
--- a/keyboards/acheron/apollo/87h/gamma/gamma.c
+++ b/keyboards/acheron/apollo/87h/gamma/gamma.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "gamma.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/acheron/apollo/87h/gamma/gamma.h b/keyboards/acheron/apollo/87h/gamma/gamma.h
deleted file mode 100644
index 97342016f2..0000000000
--- a/keyboards/acheron/apollo/87h/gamma/gamma.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2022 �lvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_tkl_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K4F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K4E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                     \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4D,      \
-    K50, K51, K52,                K56,           K59, K5A, K5B, K5C,      K5D, K5E, K5F \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, K5C, K5D, K5E, K5F } \
-}
diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json
index 4a93afd70c..f10a6adb67 100644
--- a/keyboards/acheron/apollo/87h/gamma/info.json
+++ b/keyboards/acheron/apollo/87h/gamma/info.json
@@ -4,6 +4,120 @@
         "pid": "0x8774",
         "device_version": "0.0.3"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"],
+        "rows": ["C14", "C13", "B9", "B4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F411",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 15], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
 }
diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk
index 419a95fe02..25c83bb136 100644
--- a/keyboards/acheron/apollo/87h/gamma/rules.mk
+++ b/keyboards/acheron/apollo/87h/gamma/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 KEYBOARD_SHARED_EP = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/acheron/apollo/87h/info.json b/keyboards/acheron/apollo/87h/info.json
index 7dbd896a18..ac47f594b5 100644
--- a/keyboards/acheron/apollo/87h/info.json
+++ b/keyboards/acheron/apollo/87h/info.json
@@ -4,103 +4,5 @@
     "maintainer": "Gondolindrim",
     "usb": {
         "vid": "0x4150"
-    },
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
-            ]
-        }
     }
 }
diff --git a/keyboards/acheron/apollo/87htsc/87htsc.c b/keyboards/acheron/apollo/87htsc/87htsc.c
index a476b7086e..de66897f72 100644
--- a/keyboards/acheron/apollo/87htsc/87htsc.c
+++ b/keyboards/acheron/apollo/87htsc/87htsc.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "87htsc.h"
+#include "quantum.h"
 
 void board_init(void) {
     setPinInput(B9);
diff --git a/keyboards/acheron/apollo/87htsc/87htsc.h b/keyboards/acheron/apollo/87htsc/87htsc.h
deleted file mode 100644
index edfb2f4dab..0000000000
--- a/keyboards/acheron/apollo/87htsc/87htsc.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2022 �lvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// 87t for 87-key plus tsangan
-#define LAYOUT_tkl_ansi_tsangan( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, K0G, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                     \
-	K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,      \
-        K50, K51, K52,                K56,                K5A, K5B, K5C,      K5E, K5F, K5G  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F, K0G }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, ___, ___, ___ }, \
-	{ K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-	{ K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, ___, K5E, K5F, K5G } \
-}
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index 8b61b285fd..e8dd40b32f 100644
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                        C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } 
-#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4  }
-//                        R0 , R1 , R2 , R3 , R4 , R5 
-#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -30,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define RGB_DI_PIN B15
 #define RGB_MATRIX_LED_COUNT 86
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json
index 68fc1b018a..5a140a7bdc 100644
--- a/keyboards/acheron/apollo/87htsc/info.json
+++ b/keyboards/acheron/apollo/87htsc/info.json
@@ -8,102 +8,121 @@
         "pid": "0x8776",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
+        "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
 
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/acheron/apollo/87htsc/rules.mk b/keyboards/acheron/apollo/87htsc/rules.mk
index 0f7a9e78f7..ce1d65be0f 100644
--- a/keyboards/acheron/apollo/87htsc/rules.mk
+++ b/keyboards/acheron/apollo/87htsc/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/88htsc/88htsc.c b/keyboards/acheron/apollo/88htsc/88htsc.c
index 574e1829de..8144fc57bc 100644
--- a/keyboards/acheron/apollo/88htsc/88htsc.c
+++ b/keyboards/acheron/apollo/88htsc/88htsc.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "88htsc.h"
+#include "quantum.h"
 
 led_config_t g_led_config = { {
 	{ 16       , 15         , 14         , 13         , 12         , 11         , 10         , 9          , 8          , 7          , 6          , 5          , 4          , 3          , 2          , 1          , 0         },
diff --git a/keyboards/acheron/apollo/88htsc/88htsc.h b/keyboards/acheron/apollo/88htsc/88htsc.h
deleted file mode 100644
index 0963663c3f..0000000000
--- a/keyboards/acheron/apollo/88htsc/88htsc.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2022 �lvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// 88T for 88-key plus tsangan
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                     \
-	K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,      \
-        K50, K51, K52,                K56,                K5A, K5B, K5C,      K5E, K5F, K5G  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, ___, ___, ___ }, \
-	{ K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-	{ K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, ___, K5E, K5F, K5G } \
-}
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 490c13c2e9..0798ffa70b 100644
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                        C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } 
-#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4  }
-//                        R0 , R1 , R2 , R3 , R4 , R5 
-#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -30,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define RGB_DI_PIN B15
 #define RGB_MATRIX_LED_COUNT 87
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json
index 92dd801826..9fc9210c80 100644
--- a/keyboards/acheron/apollo/88htsc/info.json
+++ b/keyboards/acheron/apollo/88htsc/info.json
@@ -8,103 +8,123 @@
         "pid": "0x8873",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
+        "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
 
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/acheron/apollo/88htsc/rules.mk b/keyboards/acheron/apollo/88htsc/rules.mk
index 0f7a9e78f7..ce1d65be0f 100644
--- a/keyboards/acheron/apollo/88htsc/rules.mk
+++ b/keyboards/acheron/apollo/88htsc/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/arctic/arctic.c b/keyboards/acheron/arctic/arctic.c
deleted file mode 100644
index 716150a107..0000000000
--- a/keyboards/acheron/arctic/arctic.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2015 �lvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "arctic.h"
diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h
index 0187e823fc..f608132b5a 100644
--- a/keyboards/acheron/arctic/config.h
+++ b/keyboards/acheron/arctic/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B0, A5, A4, A3, A2, A1, A0, F1, F0, C15, C14, C13, B9, B8}
-#define MATRIX_ROW_PINS { B7, B6, A6, A7, B1}
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/acheron/arctic/info.json b/keyboards/acheron/arctic/info.json
index 42a7bb7b42..f51a4c383e 100644
--- a/keyboards/acheron/arctic/info.json
+++ b/keyboards/acheron/arctic/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4152",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8"],
+        "rows": ["B7", "B6", "A6", "A7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/acheron/athena/alpha/alpha.c b/keyboards/acheron/athena/alpha/alpha.c
index 645e0ea635..26c00e41aa 100644
--- a/keyboards/acheron/athena/alpha/alpha.c
+++ b/keyboards/acheron/athena/alpha/alpha.c
@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "alpha.h"
-
+#include "quantum.h"
 
 void board_init(void) {
     setPinInput(B6);
diff --git a/keyboards/acheron/athena/alpha/alpha.h b/keyboards/acheron/athena/alpha/alpha.h
deleted file mode 100644
index 740b4280a1..0000000000
--- a/keyboards/acheron/athena/alpha/alpha.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* Copyright 2020 Gondolindrim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define ___ KC_NO
-
-#include "quantum.h"
-
-/*
- *              ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───� ┌───┬───┬───�
- *              │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │ │0E │0F │0G │ F13 Row
- *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
- *              ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- *              │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │0G │
- *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───┬───�      ┌───────�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │2E │1F │1G │      │1D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
- *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │3E │2F │2G │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴�3D  │ ISO Enter
- *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                   │3C │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───�       ┌─┴───┴────┤
- * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │     │4F │       │4C        │ 2.75u RShift
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───�   └──────────┘
- *              │50  │51  │52  │56                      │59  │5A  │5B  │5D  │ │5E │5F │5G │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *              │50   │51 │52   │56                         │5A   │5B │5D   │ Tsangan/WKL
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                       \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,        K5E, K5F, K5G  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,   K5E, K5F, K5G  \
-)\
-{\
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_ansi_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                       \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,        K5E, K5F, K5G  \
-)\
-{\
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_f13_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,   K5E, K5F, K5G  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                       \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,        K5E, K5F, K5G  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_iso( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,   K5E, K5F, K5G  \
-)\
-{\
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_iso_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                       \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,        K5E, K5F, K5G  \
-)\
-{\
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_f13_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,   K5E, K5F, K5G  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_f13_iso_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                       \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,        K5E, K5F, K5G  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index e99fb83328..1f91766add 100644
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { A8 , B14, B12, B10, B1 , B0 , A5 , A4 , A3 , A2 , A1 , A0 , C15, A7 , B4 , B3 , A15 }
-#define MATRIX_ROW_PINS { B9 , C13, B8 , B5 , A14 , C14 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
@@ -30,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      2
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 34
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json
index 2ebf2da8de..e72e8aece4 100644
--- a/keyboards/acheron/athena/alpha/info.json
+++ b/keyboards/acheron/athena/alpha/info.json
@@ -4,15 +4,987 @@
         "pid": "0x6584",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A8", "B14", "B12", "B10", "B1", "B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A7", "B4", "B3", "A15"],
+        "rows": ["B9", "C13", "B8", "B5", "A14", "C14"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 20,
         "on_state": 0,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "indicators": {
         "caps_lock": "A10"
     },
     "processor": "STM32F411",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
 }
diff --git a/keyboards/acheron/athena/athena.c b/keyboards/acheron/athena/athena.c
deleted file mode 100644
index aa5fae94f6..0000000000
--- a/keyboards/acheron/athena/athena.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Alvaro "Gondolindrim" Volpato
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "athena.h"
diff --git a/keyboards/acheron/athena/athena.h b/keyboards/acheron/athena/athena.h
deleted file mode 100644
index 0dd55ba8f1..0000000000
--- a/keyboards/acheron/athena/athena.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2022 Alvaro "Gondolindrim" Volpato
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_acheron_athena_alpha)
-    #include "alpha.h"
-#elif defined(KEYBOARD_acheron_athena_beta)
-    #include "beta.h"
-#endif
diff --git a/keyboards/acheron/athena/beta/beta.c b/keyboards/acheron/athena/beta/beta.c
index 06d40d1493..9ad9c71cc8 100644
--- a/keyboards/acheron/athena/beta/beta.c
+++ b/keyboards/acheron/athena/beta/beta.c
@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "beta.h"
-
+#include "quantum.h"
 
 void board_init(void) {
     setPinInput(B6);
diff --git a/keyboards/acheron/athena/beta/beta.h b/keyboards/acheron/athena/beta/beta.h
deleted file mode 100644
index 740b4280a1..0000000000
--- a/keyboards/acheron/athena/beta/beta.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* Copyright 2020 Gondolindrim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define ___ KC_NO
-
-#include "quantum.h"
-
-/*
- *              ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───� ┌───┬───┬───�
- *              │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │ │0E │0F │0G │ F13 Row
- *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
- *              ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- *              │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │0G │
- *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───┬───�      ┌───────�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │2E │1F │1G │      │1D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
- *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │3E │2F │2G │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴�3D  │ ISO Enter
- *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                   │3C │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───�       ┌─┴───┴────┤
- * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │     │4F │       │4C        │ 2.75u RShift
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───�   └──────────┘
- *              │50  │51  │52  │56                      │59  │5A  │5B  │5D  │ │5E │5F │5G │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *              │50   │51 │52   │56                         │5A   │5B │5D   │ Tsangan/WKL
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                       \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,        K5E, K5F, K5G  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,   K5E, K5F, K5G  \
-)\
-{\
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_ansi_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                       \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,        K5E, K5F, K5G  \
-)\
-{\
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_f13_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,   K5E, K5F, K5G  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                       \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,        K5E, K5F, K5G  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_iso( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,   K5E, K5F, K5G  \
-)\
-{\
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_iso_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                       \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,        K5E, K5F, K5G  \
-)\
-{\
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_f13_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,   K5E, K5F, K5G  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
-
-#define LAYOUT_tkl_f13_iso_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K2E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K3E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                       \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                K59, K5A, K5B, K5D,        K5E, K5F, K5G  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, ___, K5D, K5E, K5F, K5G }\
-}
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index 7fbc624522..0376a9ac2c 100644
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { C7 , C6 , B14, B12, B10, B1 , C4 , A7 , A6 , A5 , A4 , A3 , A2 , C5 , A10, A8 , C9 }
-#define MATRIX_ROW_PINS { C11, C12, C10, A15, C0 , A1 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
@@ -30,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL   3
 #define BACKLIGHT_PAL_MODE      2
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 34
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json
index dd8e766f90..b2ced072a8 100644
--- a/keyboards/acheron/athena/beta/info.json
+++ b/keyboards/acheron/athena/beta/info.json
@@ -4,14 +4,985 @@
         "pid": "0x6585",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B14", "B12", "B10", "B1", "C4", "A7", "A6", "A5", "A4", "A3", "A2", "C5", "A10", "A8", "C9"],
+        "rows": ["C11", "C12", "C10", "A15", "C0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B0",
         "levels": 20,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "indicators": {
         "caps_lock": "C8"
     },
     "processor": "STM32F401",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
 }
diff --git a/keyboards/acheron/athena/info.json b/keyboards/acheron/athena/info.json
index 34853a12f6..4f9d3b61e6 100644
--- a/keyboards/acheron/athena/info.json
+++ b/keyboards/acheron/athena/info.json
@@ -4,892 +4,5 @@
     "maintainer": "Gondolindrim",
     "usb": {
         "vid": "0xAC11"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25},
-                {"label":"Back Space", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":3.25, "w":1.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25},
-                {"label":"Back Space", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25},
-                {"label":"Back Space", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_split_bs_rshift": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25},
-                {"label":"Back Space", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_iso": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_iso_split_bs_rshift": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25},
-                {"label":"Back Space", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
-            ]
-        }
     }
 }
diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h
index ce12edfd33..a47b76953a 100644
--- a/keyboards/acheron/austin/config.h
+++ b/keyboards/acheron/austin/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B10, B11, B12, B13, B14, B15, A8, A9, A10, A5, A15, B3, B4, B5, B8, A3, C15, C14, F1 }
-#define MATRIX_ROW_PINS { C13, A4, A7, B0, B1, B2 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json
index dad488df8f..0cc16067e5 100755
--- a/keyboards/acheron/austin/info.json
+++ b/keyboards/acheron/austin/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4175",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A5", "A15", "B3", "B4", "B5", "B8", "A3", "C15", "C14", "F1"],
+        "rows": ["C13", "A4", "A7", "B0", "B1", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
diff --git a/keyboards/acheron/elongate/beta/beta.c b/keyboards/acheron/elongate/beta/beta.c
deleted file mode 100644
index ffa13d4fe1..0000000000
--- a/keyboards/acheron/elongate/beta/beta.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Gondolindrim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "beta.h"
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
index a3b19e7fe6..1d50a74696 100644
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/beta/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, B7, D5, B5, D6 }
-#define MATRIX_COL_PINS { F5, F6, F4, F1, F0, B2, B1, C6, B0, B3, E6, D4, B4}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 16
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json
index 1f625bca83..7c7c8ebf54 100644
--- a/keyboards/acheron/elongate/beta/info.json
+++ b/keyboards/acheron/elongate/beta/info.json
@@ -8,6 +8,14 @@
         "pid": "0x454C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"],
+        "rows": ["D3", "B7", "D5", "B5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D1",
         "num_lock": "D2",
diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
index 0ceba36100..082df4b497 100755
--- a/keyboards/acheron/elongate/delta/config.h
+++ b/keyboards/acheron/elongate/delta/config.h
@@ -17,17 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { A10, A9, A8, B14, B12, B11, B10, B2, B1, A7, A5, B9, B8, B7, B6 }
-#define MATRIX_ROW_PINS { B3, A15, B0, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 16
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json
index f5f87333eb..ca14cff1b5 100644
--- a/keyboards/acheron/elongate/delta/info.json
+++ b/keyboards/acheron/elongate/delta/info.json
@@ -8,12 +8,20 @@
         "pid": "0x454D",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B14", "B12", "B11", "B10", "B2", "B1", "A7", "A5", "B9", "B8", "B7", "B6"],
+        "rows": ["B3", "A15", "B0", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 20,
         "breathing": true,
         "breathing_period": 3
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/acheron/elongate/elongate.c b/keyboards/acheron/elongate/elongate.c
deleted file mode 100644
index 9bf0d893a9..0000000000
--- a/keyboards/acheron/elongate/elongate.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Copyright 2021 Gondolindrim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "elongate.h"
diff --git a/keyboards/acheron/elongate/elongate.h b/keyboards/acheron/elongate/elongate.h
deleted file mode 100644
index 2e58871643..0000000000
--- a/keyboards/acheron/elongate/elongate.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020-2022 Gondolindrim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_acheron_elongate_beta)
-  #include "beta.h"
-#elif defined(KEYBOARD_acheron_elongate_delta)
-  #include "delta.h"
-#endif
diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h
index 1a8eab8b80..4b007cf387 100644
--- a/keyboards/acheron/keebspcb/config.h
+++ b/keyboards/acheron/keebspcb/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B12, A1, A0, F1, F0, C15, C14, C13, B9, B8, B7, B6, B5}
-#define MATRIX_ROW_PINS { B4, B3, A2, A3, A4}
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/info.json
index 9c96a01191..5c53bc70e2 100644
--- a/keyboards/acheron/keebspcb/info.json
+++ b/keyboards/acheron/keebspcb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4B45",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B12", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5"],
+        "rows": ["B4", "B3", "A2", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["60_ansi_tsangan"],
diff --git a/keyboards/acheron/keebspcb/keebspcb.c b/keyboards/acheron/keebspcb/keebspcb.c
deleted file mode 100644
index 56109507cd..0000000000
--- a/keyboards/acheron/keebspcb/keebspcb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "keebspcb.h"
diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h
index e41924d0c6..f608132b5a 100644
--- a/keyboards/acheron/lasgweloth/config.h
+++ b/keyboards/acheron/lasgweloth/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B12, A2 , A1 , A0 , F1 , F0 , C15, C14, C13, A7 , A6 , A5 , A4 , B7}
-#define MATRIX_ROW_PINS { B9 , B8 , A3 , B0 , B1 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/info.json
index b97521e48e..47d4b55105 100644
--- a/keyboards/acheron/lasgweloth/info.json
+++ b/keyboards/acheron/lasgweloth/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7641",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5", "A4", "B7"],
+        "rows": ["B9", "B8", "A3", "B0", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift"],
diff --git a/keyboards/acheron/lasgweloth/lasgweloth.c b/keyboards/acheron/lasgweloth/lasgweloth.c
deleted file mode 100644
index be2052a399..0000000000
--- a/keyboards/acheron/lasgweloth/lasgweloth.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 �lvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "lasgweloth.h"
diff --git a/keyboards/acheron/shark/alpha/alpha.c b/keyboards/acheron/shark/alpha/alpha.c
deleted file mode 100644
index e841f3fbd5..0000000000
--- a/keyboards/acheron/shark/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 �lvaro "Gondolindrim" Volpato
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "alpha.h"
diff --git a/keyboards/acheron/shark/alpha/alpha.h b/keyboards/acheron/shark/alpha/alpha.h
deleted file mode 100644
index d58b72548a..0000000000
--- a/keyboards/acheron/shark/alpha/alpha.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2019 �lvaro "Gondolindrim" Volpato
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }  \
-}
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h
index 9c36ac3a1f..91f51146f0 100644
--- a/keyboards/acheron/shark/alpha/config.h
+++ b/keyboards/acheron/shark/alpha/config.h
@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {B4, A15, B10, B2}
-#define MATRIX_COL_PINS {B1, B12, A1, A7, A5, A4, A3, A2, A0, C15, C14, C13}
-//{C13, C14, C15, A0,A2,A3,A4,A5,A6, A1,B12,B1}
-/* Unused pins, in the default layout, are:
-EncA (B6) because it is not used in the default PCB
-All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason;
-B0, which is unconnected on the PCB
-*/
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 3
 
diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json
index d6b5dfcd0f..5250da4727 100644
--- a/keyboards/acheron/shark/alpha/info.json
+++ b/keyboards/acheron/shark/alpha/info.json
@@ -6,6 +6,11 @@
     "pid": "0x5368",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B1", "B12", "A1", "A7", "A5", "A4", "A3", "A2", "A0", "C15", "C14", "C13"],
+    "rows": ["B4", "A15", "B10", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B6", "pin_b": "B7"}
@@ -21,54 +26,57 @@
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/acheron/shark/beta/beta.c b/keyboards/acheron/shark/beta/beta.c
index 597dc78548..5592353ad7 100644
--- a/keyboards/acheron/shark/beta/beta.c
+++ b/keyboards/acheron/shark/beta/beta.c
@@ -14,19 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "beta.h"
+#include "quantum.h"
+
 void board_init(void) {
 	setPinInput(B6);
 	setPinInput(B7);
 }
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if(!encoder_update_user(index, clockwise)) return false;
-    if (index == 0) {
-        if (clockwise) tap_code_delay(KC_VOLU, 10);
-        else tap_code_delay(KC_VOLD, 10);
-    }   
-    return true;
-}
-#endif
diff --git a/keyboards/acheron/shark/beta/beta.h b/keyboards/acheron/shark/beta/beta.h
deleted file mode 100644
index 1002659d3d..0000000000
--- a/keyboards/acheron/shark/beta/beta.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 Gondolindrim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }  \
-}
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index 8cfc57b9d5..348b284a3f 100644
--- a/keyboards/acheron/shark/beta/config.h
+++ b/keyboards/acheron/shark/beta/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { A5 , A10, C13, B9 , B8 , B5 , B4 , B3 , A15, A0 , A1 , A2 }
-#define MATRIX_ROW_PINS { A8 , B14, A4 , A3 }
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
@@ -29,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      2
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 24
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json
index 73025df6c4..504e86f4b3 100644
--- a/keyboards/acheron/shark/beta/info.json
+++ b/keyboards/acheron/shark/beta/info.json
@@ -4,11 +4,19 @@
         "pid": "0x5369",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"],
+        "rows": ["A8", "B14", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14"}
         ]
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "backlight": {
         "pin": "A6",
         "levels": 20,
@@ -20,54 +28,57 @@
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 0, "y": 1 },
-                { "x": 1, "y": 1 },
-                { "x": 2, "y": 1 },
-                { "x": 3, "y": 1 },
-                { "x": 4, "y": 1 },
-                { "x": 5, "y": 1 },
-                { "x": 6, "y": 1 },
-                { "x": 7, "y": 1 },
-                { "x": 8, "y": 1 },
-                { "x": 9, "y": 1 },
-                { "x": 10, "y": 1 },
-                { "x": 11, "y": 1 },
-                { "x": 0, "y": 2 },
-                { "x": 1, "y": 2 },
-                { "x": 2, "y": 2 },
-                { "x": 3, "y": 2 },
-                { "x": 4, "y": 2 },
-                { "x": 5, "y": 2 },
-                { "x": 6, "y": 2 },
-                { "x": 7, "y": 2 },
-                { "x": 8, "y": 2 },
-                { "x": 9, "y": 2 },
-                { "x": 10, "y": 2 },
-                { "x": 11, "y": 2 },
-                { "x": 0, "y": 3 },
-                { "x": 1, "y": 3 },
-                { "x": 2, "y": 3 },
-                { "x": 3, "y": 3 },
-                { "x": 4, "y": 3 },
-                { "x": 5, "y": 3 },
-                { "x": 6, "y": 3 },
-                { "x": 7, "y": 3 },
-                { "x": 8, "y": 3 },
-                { "x": 9, "y": 3 },
-                { "x": 10, "y": 3 },
-                { "x": 11, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/acheron/shark/shark.c b/keyboards/acheron/shark/shark.c
deleted file mode 100644
index 1a660019e2..0000000000
--- a/keyboards/acheron/shark/shark.c
+++ /dev/null
@@ -1,14 +0,0 @@
- /* Copyright 2022 �lvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  */
-
-#include "shark.h"
diff --git a/keyboards/acheron/shark/shark.h b/keyboards/acheron/shark/shark.h
deleted file mode 100644
index 0f65419885..0000000000
--- a/keyboards/acheron/shark/shark.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_acheron_shark_alpha)
-  #include "alpha.h"
-#elif defined(KEYBOARD_acheron_shark_beta)
-  #include "beta.h"
-#endif
diff --git a/keyboards/ada/ada1800mini/ada1800mini.c b/keyboards/ada/ada1800mini/ada1800mini.c
deleted file mode 100644
index a7d8ead5df..0000000000
--- a/keyboards/ada/ada1800mini/ada1800mini.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "ada1800mini.h"
diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h
index 54da0bdad4..9465ac1b01 100644
--- a/keyboards/ada/ada1800mini/config.h
+++ b/keyboards/ada/ada1800mini/config.h
@@ -16,26 +16,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, B3, B2, B1 }
-
-#define DIODE_DIRECTION COL2ROW
-
-
 //TODO: implement RGB matrix when I get the hardware
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 100
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json
index e3f97c6706..4af2c200c2 100644
--- a/keyboards/ada/ada1800mini/info.json
+++ b/keyboards/ada/ada1800mini/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1800",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B3", "B2", "B1"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
index d8fc5bf226..dad8639fd6 100644
--- a/keyboards/ada/infinity81/config.h
+++ b/keyboards/ada/infinity81/config.h
@@ -3,25 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, F6, B7 }
-#define MATRIX_COL_PINS { D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F5, F1, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 107
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -38,7 +19,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ada/infinity81/infinity81.c b/keyboards/ada/infinity81/infinity81.c
deleted file mode 100644
index 7e20a1d705..0000000000
--- a/keyboards/ada/infinity81/infinity81.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "infinity81.h"
diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json
index 5c32cd0639..cc16b67c04 100644
--- a/keyboards/ada/infinity81/info.json
+++ b/keyboards/ada/infinity81/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0081",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F1", "F4"],
+        "rows": ["B3", "B2", "B1", "B0", "F6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index af72251dac..08db87fefe 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@@ -54,7 +54,6 @@
 #ifdef RGB_MATRIX_ENABLE
 
      /* RGB Defines */
-#    define RGB_DI_PIN GP19
 #    define RGB_MATRIX_LED_COUNT 12
 #    define RGBLED_NUM 12
 
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index 75c859adb1..8982caaae3 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -13,9 +13,16 @@
             {"pin_a": "GP18", "pin_b": "GP17"}
         ]
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "bootmagic": {
         "matrix": [1, 2]
     },
+    "ws2812": {
+        "pin": "GP19",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040",
     "matrix_pins": {
diff --git a/keyboards/adafruit/macropad/macropad.c b/keyboards/adafruit/macropad/macropad.c
index 398d0bbdfd..6661e43909 100644
--- a/keyboards/adafruit/macropad/macropad.c
+++ b/keyboards/adafruit/macropad/macropad.c
@@ -65,17 +65,3 @@ void audio_off_user(void) {
     writePinLow(SPEAKER_SHUTDOWN);
 }
 #endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk
index fd1ecf7cbc..23b15d77fc 100644
--- a/keyboards/adafruit/macropad/rules.mk
+++ b/keyboards/adafruit/macropad/rules.mk
@@ -13,8 +13,6 @@ AUDIO_ENABLE = yes          # Audio output
 AUDIO_DRIVER = pwm_hardware
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = vendor
 OLED_ENABLE = yes
 OLED_DRIVER = custom
 # Project specific files
diff --git a/keyboards/adelheid/adelheid.c b/keyboards/adelheid/adelheid.c
deleted file mode 100644
index 35fd2cd1e5..0000000000
--- a/keyboards/adelheid/adelheid.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 floookay
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "adelheid.h"
diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h
index e22e250f85..db23a53119 100644
--- a/keyboards/adelheid/config.h
+++ b/keyboards/adelheid/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, F4, D1, D2, D3, D5, F7 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, F6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/adelheid/info.json b/keyboards/adelheid/info.json
index 19970b27cf..c323d62a75 100644
--- a/keyboards/adelheid/info.json
+++ b/keyboards/adelheid/info.json
@@ -8,6 +8,11 @@
         "pid": "0xAD78",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "F6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "F4", "D1", "D2", "D3", "D5", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "C6"
     },
diff --git a/keyboards/adkb96/adkb96.c b/keyboards/adkb96/adkb96.c
index 93230ee00c..591a17c082 100644
--- a/keyboards/adkb96/adkb96.c
+++ b/keyboards/adkb96/adkb96.c
@@ -1,4 +1,4 @@
-#include "adkb96.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/adkb96/adkb96.h b/keyboards/adkb96/adkb96.h
deleted file mode 100644
index 5a47f16aad..0000000000
--- a/keyboards/adkb96/adkb96.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_adkb96_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json
index e86480d7d7..b293e03f73 100644
--- a/keyboards/adkb96/info.json
+++ b/keyboards/adkb96/info.json
@@ -8,494 +8,123 @@
 		"pid": "0xAD96",
 		"device_version": "0.0.1"
 	},
+	"matrix_pins": {
+		"cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+		"rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+	},
+	"diode_direction": "COL2ROW",
 	"split": {
 		"soft_serial_pin": "D0"
 	},
 	"processor": "atmega32u4",
 	"bootloader": "caterina",
+	"layout_aliases": {
+		"LAYOUT": "LAYOUT_ortho_6x16"
+	},
 	"layouts": {
 		"LAYOUT_ortho_6x16": {
 			"layout": [
-				{
-					"label": "L00",
-					"x": 0,
-					"y": 0
-				},
-				{
-					"label": "L01",
-					"x": 1,
-					"y": 0
-				},
-				{
-					"label": "L02",
-					"x": 2,
-					"y": 0
-				},
-				{
-					"label": "L03",
-					"x": 3,
-					"y": 0
-				},
-				{
-					"label": "L04",
-					"x": 4,
-					"y": 0
-				},
-				{
-					"label": "L05",
-					"x": 5,
-					"y": 0
-				},
-				{
-					"label": "L06",
-					"x": 6,
-					"y": 0
-				},
-				{
-					"label": "L07",
-					"x": 7,
-					"y": 0
-				},
-				{
-					"label": "R00",
-					"x": 8,
-					"y": 0
-				},
-				{
-					"label": "R01",
-					"x": 9,
-					"y": 0
-				},
-				{
-					"label": "R02",
-					"x": 10,
-					"y": 0
-				},
-				{
-					"label": "R03",
-					"x": 11,
-					"y": 0
-				},
-				{
-					"label": "R04",
-					"x": 12,
-					"y": 0
-				},
-				{
-					"label": "R05",
-					"x": 13,
-					"y": 0
-				},
-				{
-					"label": "R06",
-					"x": 14,
-					"y": 0
-				},
-				{
-					"label": "R07",
-					"x": 15,
-					"y": 0
-				},
-				{
-					"label": "L10",
-					"x": 0,
-					"y": 1
-				},
-				{
-					"label": "L11",
-					"x": 1,
-					"y": 1
-				},
-				{
-					"label": "L12",
-					"x": 2,
-					"y": 1
-				},
-				{
-					"label": "L13",
-					"x": 3,
-					"y": 1
-				},
-				{
-					"label": "L14",
-					"x": 4,
-					"y": 1
-				},
-				{
-					"label": "L15",
-					"x": 5,
-					"y": 1
-				},
-				{
-					"label": "L16",
-					"x": 6,
-					"y": 1
-				},
-				{
-					"label": "L17",
-					"x": 7,
-					"y": 1
-				},
-				{
-					"label": "R10",
-					"x": 8,
-					"y": 1
-				},
-				{
-					"label": "R11",
-					"x": 9,
-					"y": 1
-				},
-				{
-					"label": "R12",
-					"x": 10,
-					"y": 1
-				},
-				{
-					"label": "R13",
-					"x": 11,
-					"y": 1
-				},
-				{
-					"label": "R14",
-					"x": 12,
-					"y": 1
-				},
-				{
-					"label": "R15",
-					"x": 13,
-					"y": 1
-				},
-				{
-					"label": "R16",
-					"x": 14,
-					"y": 1
-				},
-				{
-					"label": "R17",
-					"x": 15,
-					"y": 1
-				},
-				{
-					"label": "L20",
-					"x": 0,
-					"y": 2
-				},
-				{
-					"label": "L21",
-					"x": 1,
-					"y": 2
-				},
-				{
-					"label": "L22",
-					"x": 2,
-					"y": 2
-				},
-				{
-					"label": "L23",
-					"x": 3,
-					"y": 2
-				},
-				{
-					"label": "L24",
-					"x": 4,
-					"y": 2
-				},
-				{
-					"label": "L25",
-					"x": 5,
-					"y": 2
-				},
-				{
-					"label": "L26",
-					"x": 6,
-					"y": 2
-				},
-				{
-					"label": "L27",
-					"x": 7,
-					"y": 2
-				},
-				{
-					"label": "R20",
-					"x": 8,
-					"y": 2
-				},
-				{
-					"label": "R21",
-					"x": 9,
-					"y": 2
-				},
-				{
-					"label": "R22",
-					"x": 10,
-					"y": 2
-				},
-				{
-					"label": "R23",
-					"x": 11,
-					"y": 2
-				},
-				{
-					"label": "R24",
-					"x": 12,
-					"y": 2
-				},
-				{
-					"label": "R25",
-					"x": 13,
-					"y": 2
-				},
-				{
-					"label": "R26",
-					"x": 14,
-					"y": 2
-				},
-				{
-					"label": "R27",
-					"x": 15,
-					"y": 2
-				},
-				{
-					"label": "L30",
-					"x": 0,
-					"y": 3
-				},
-				{
-					"label": "L31",
-					"x": 1,
-					"y": 3
-				},
-				{
-					"label": "L32",
-					"x": 2,
-					"y": 3
-				},
-				{
-					"label": "L33",
-					"x": 3,
-					"y": 3
-				},
-				{
-					"label": "L34",
-					"x": 4,
-					"y": 3
-				},
-				{
-					"label": "L35",
-					"x": 5,
-					"y": 3
-				},
-				{
-					"label": "L36",
-					"x": 6,
-					"y": 3
-				},
-				{
-					"label": "L37",
-					"x": 7,
-					"y": 3
-				},
-				{
-					"label": "R30",
-					"x": 8,
-					"y": 3
-				},
-				{
-					"label": "R31",
-					"x": 9,
-					"y": 3
-				},
-				{
-					"label": "R32",
-					"x": 10,
-					"y": 3
-				},
-				{
-					"label": "R33",
-					"x": 11,
-					"y": 3
-				},
-				{
-					"label": "R34",
-					"x": 12,
-					"y": 3
-				},
-				{
-					"label": "R35",
-					"x": 13,
-					"y": 3
-				},
-				{
-					"label": "R36",
-					"x": 14,
-					"y": 3
-				},
-				{
-					"label": "R37",
-					"x": 15,
-					"y": 3
-				},
-				{
-					"label": "L40",
-					"x": 0,
-					"y": 4
-				},
-				{
-					"label": "L41",
-					"x": 1,
-					"y": 4
-				},
-				{
-					"label": "L42",
-					"x": 2,
-					"y": 4
-				},
-				{
-					"label": "L43",
-					"x": 3,
-					"y": 4
-				},
-				{
-					"label": "L44",
-					"x": 4,
-					"y": 4
-				},
-				{
-					"label": "L45",
-					"x": 5,
-					"y": 4
-				},
-				{
-					"label": "L46",
-					"x": 6,
-					"y": 4
-				},
-				{
-					"label": "L47",
-					"x": 7,
-					"y": 4
-				},
-				{
-					"label": "R40",
-					"x": 8,
-					"y": 4
-				},
-				{
-					"label": "R41",
-					"x": 9,
-					"y": 4
-				},
-				{
-					"label": "R42",
-					"x": 10,
-					"y": 4
-				},
-				{
-					"label": "R43",
-					"x": 11,
-					"y": 4
-				},
-				{
-					"label": "R44",
-					"x": 12,
-					"y": 4
-				},
-				{
-					"label": "R45",
-					"x": 13,
-					"y": 4
-				},
-				{
-					"label": "R46",
-					"x": 14,
-					"y": 4
-				},
-				{
-					"label": "R47",
-					"x": 15,
-					"y": 4
-				},
-				{
-					"label": "L50",
-					"x": 0,
-					"y": 5
-				},
-				{
-					"label": "L51",
-					"x": 1,
-					"y": 5
-				},
-				{
-					"label": "L52",
-					"x": 2,
-					"y": 5
-				},
-				{
-					"label": "L53",
-					"x": 3,
-					"y": 5
-				},
-				{
-					"label": "L54",
-					"x": 4,
-					"y": 5
-				},
-				{
-					"label": "L55",
-					"x": 5,
-					"y": 5
-				},
-				{
-					"label": "L56",
-					"x": 6,
-					"y": 5
-				},
-				{
-					"label": "L57",
-					"x": 7,
-					"y": 5
-				},
-				{
-					"label": "R50",
-					"x": 8,
-					"y": 5
-				},
-				{
-					"label": "R51",
-					"x": 9,
-					"y": 5
-				},
-				{
-					"label": "R52",
-					"x": 10,
-					"y": 5
-				},
-				{
-					"label": "R53",
-					"x": 11,
-					"y": 5
-				},
-				{
-					"label": "R54",
-					"x": 12,
-					"y": 5
-				},
-				{
-					"label": "R55",
-					"x": 13,
-					"y": 5
-				},
-				{
-					"label": "R56",
-					"x": 14,
-					"y": 5
-				},
-				{
-					"label": "R57",
-					"x": 15,
-					"y": 5
-				}
+				{"matrix": [0, 0], "x": 0, "y": 0},
+				{"matrix": [0, 1], "x": 1, "y": 0},
+				{"matrix": [0, 2], "x": 2, "y": 0},
+				{"matrix": [0, 3], "x": 3, "y": 0},
+				{"matrix": [0, 4], "x": 4, "y": 0},
+				{"matrix": [0, 5], "x": 5, "y": 0},
+				{"matrix": [0, 6], "x": 6, "y": 0},
+				{"matrix": [0, 7], "x": 7, "y": 0},
+				{"matrix": [6, 0], "x": 8, "y": 0},
+				{"matrix": [6, 1], "x": 9, "y": 0},
+				{"matrix": [6, 2], "x": 10, "y": 0},
+				{"matrix": [6, 3], "x": 11, "y": 0},
+				{"matrix": [6, 4], "x": 12, "y": 0},
+				{"matrix": [6, 5], "x": 13, "y": 0},
+				{"matrix": [6, 6], "x": 14, "y": 0},
+				{"matrix": [6, 7], "x": 15, "y": 0},
+
+				{"matrix": [1, 0], "x": 0, "y": 1},
+				{"matrix": [1, 1], "x": 1, "y": 1},
+				{"matrix": [1, 2], "x": 2, "y": 1},
+				{"matrix": [1, 3], "x": 3, "y": 1},
+				{"matrix": [1, 4], "x": 4, "y": 1},
+				{"matrix": [1, 5], "x": 5, "y": 1},
+				{"matrix": [1, 6], "x": 6, "y": 1},
+				{"matrix": [1, 7], "x": 7, "y": 1},
+				{"matrix": [7, 0], "x": 8, "y": 1},
+				{"matrix": [7, 1], "x": 9, "y": 1},
+				{"matrix": [7, 2], "x": 10, "y": 1},
+				{"matrix": [7, 3], "x": 11, "y": 1},
+				{"matrix": [7, 4], "x": 12, "y": 1},
+				{"matrix": [7, 5], "x": 13, "y": 1},
+				{"matrix": [7, 6], "x": 14, "y": 1},
+				{"matrix": [7, 7], "x": 15, "y": 1},
+
+				{"matrix": [2, 0], "x": 0, "y": 2},
+				{"matrix": [2, 1], "x": 1, "y": 2},
+				{"matrix": [2, 2], "x": 2, "y": 2},
+				{"matrix": [2, 3], "x": 3, "y": 2},
+				{"matrix": [2, 4], "x": 4, "y": 2},
+				{"matrix": [2, 5], "x": 5, "y": 2},
+				{"matrix": [2, 6], "x": 6, "y": 2},
+				{"matrix": [2, 7], "x": 7, "y": 2},
+				{"matrix": [8, 0], "x": 8, "y": 2},
+				{"matrix": [8, 1], "x": 9, "y": 2},
+				{"matrix": [8, 2], "x": 10, "y": 2},
+				{"matrix": [8, 3], "x": 11, "y": 2},
+				{"matrix": [8, 4], "x": 12, "y": 2},
+				{"matrix": [8, 5], "x": 13, "y": 2},
+				{"matrix": [8, 6], "x": 14, "y": 2},
+				{"matrix": [8, 7], "x": 15, "y": 2},
+
+				{"matrix": [3, 0], "x": 0, "y": 3},
+				{"matrix": [3, 1], "x": 1, "y": 3},
+				{"matrix": [3, 2], "x": 2, "y": 3},
+				{"matrix": [3, 3], "x": 3, "y": 3},
+				{"matrix": [3, 4], "x": 4, "y": 3},
+				{"matrix": [3, 5], "x": 5, "y": 3},
+				{"matrix": [3, 6], "x": 6, "y": 3},
+				{"matrix": [3, 7], "x": 7, "y": 3},
+				{"matrix": [9, 0], "x": 8, "y": 3},
+				{"matrix": [9, 1], "x": 9, "y": 3},
+				{"matrix": [9, 2], "x": 10, "y": 3},
+				{"matrix": [9, 3], "x": 11, "y": 3},
+				{"matrix": [9, 4], "x": 12, "y": 3},
+				{"matrix": [9, 5], "x": 13, "y": 3},
+				{"matrix": [9, 6], "x": 14, "y": 3},
+				{"matrix": [9, 7], "x": 15, "y": 3},
+
+				{"matrix": [4, 0], "x": 0, "y": 4},
+				{"matrix": [4, 1], "x": 1, "y": 4},
+				{"matrix": [4, 2], "x": 2, "y": 4},
+				{"matrix": [4, 3], "x": 3, "y": 4},
+				{"matrix": [4, 4], "x": 4, "y": 4},
+				{"matrix": [4, 5], "x": 5, "y": 4},
+				{"matrix": [4, 6], "x": 6, "y": 4},
+				{"matrix": [4, 7], "x": 7, "y": 4},
+				{"matrix": [10, 0], "x": 8, "y": 4},
+				{"matrix": [10, 1], "x": 9, "y": 4},
+				{"matrix": [10, 2], "x": 10, "y": 4},
+				{"matrix": [10, 3], "x": 11, "y": 4},
+				{"matrix": [10, 4], "x": 12, "y": 4},
+				{"matrix": [10, 5], "x": 13, "y": 4},
+				{"matrix": [10, 6], "x": 14, "y": 4},
+				{"matrix": [10, 7], "x": 15, "y": 4},
+
+				{"matrix": [5, 0], "x": 0, "y": 5},
+				{"matrix": [5, 1], "x": 1, "y": 5},
+				{"matrix": [5, 2], "x": 2, "y": 5},
+				{"matrix": [5, 3], "x": 3, "y": 5},
+				{"matrix": [5, 4], "x": 4, "y": 5},
+				{"matrix": [5, 5], "x": 5, "y": 5},
+				{"matrix": [5, 6], "x": 6, "y": 5},
+				{"matrix": [5, 7], "x": 7, "y": 5},
+				{"matrix": [11, 0], "x": 8, "y": 5},
+				{"matrix": [11, 1], "x": 9, "y": 5},
+				{"matrix": [11, 2], "x": 10, "y": 5},
+				{"matrix": [11, 3], "x": 11, "y": 5},
+				{"matrix": [11, 4], "x": 12, "y": 5},
+				{"matrix": [11, 5], "x": 13, "y": 5},
+				{"matrix": [11, 6], "x": 14, "y": 5},
+				{"matrix": [11, 7], "x": 15, "y": 5}
 			]
 		}
 	}
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
index c5a9673671..89de3d9a64 100644
--- a/keyboards/adkb96/rev1/config.h
+++ b/keyboards/adkb96/rev1/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 100
 
diff --git a/keyboards/adkb96/rev1/rev1.c b/keyboards/adkb96/rev1/rev1.c
deleted file mode 100644
index 594c532994..0000000000
--- a/keyboards/adkb96/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "adkb96.h"
diff --git a/keyboards/adkb96/rev1/rev1.h b/keyboards/adkb96/rev1/rev1.h
deleted file mode 100644
index 4c4c7bae3c..0000000000
--- a/keyboards/adkb96/rev1/rev1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include "adkb96.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
-// Keymap with right side flipped
-// (TRRS jack on both halves are to the right)
-#define LAYOUT_ortho_6x16( \
-	L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
-	L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
-	L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
-	L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \
-	L40, L41, L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47, \
-	L50, L51, L52, L53, L54, L55, L56, L57, R50, R51, R52, R53, R54, R55, R56, R57 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05, L06, L07 }, \
-		{ L10, L11, L12, L13, L14, L15, L16, L17 }, \
-		{ L20, L21, L22, L23, L24, L25, L26, L27 }, \
-		{ L30, L31, L32, L33, L34, L35, L36, L37 }, \
-		{ L40, L41, L42, L43, L44, L45, L46, L47 }, \
-		{ L50, L51, L52, L53, L54, L55, L56, L57 }, \
-		{ R00, R01, R02, R03, R04, R05, R06, R07 }, \
-		{ R10, R11, R12, R13, R14, R15, R16, R17 }, \
-		{ R20, R21, R22, R23, R24, R25, R26, R27 }, \
-		{ R30, R31, R32, R33, R34, R35, R36, R37 }, \
-		{ R40, R41, R42, R43, R44, R45, R46, R47 }, \
-		{ R50, R51, R52, R53, R54, R55, R56, R57 } \
-	}
-
-#define LAYOUT LAYOUT_ortho_6x16
-
diff --git a/keyboards/adm42/adm42.c b/keyboards/adm42/adm42.c
deleted file mode 100644
index 0cae6c9ab5..0000000000
--- a/keyboards/adm42/adm42.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020-2022 Lorenzo Leonini
- * SPDX-License-Identifier: GPL-2.0-only
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "adm42.h"
diff --git a/keyboards/adm42/config.h b/keyboards/adm42/config.h
index 03749906e8..af23da4c66 100644
--- a/keyboards/adm42/config.h
+++ b/keyboards/adm42/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION ROW2COL
-
 #define TAP_CODE_DELAY 1
 
 #if defined(CONSOLE_ENABLE)
diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
index 3596cdb446..3fc07a2c1c 100644
--- a/keyboards/adm42/info.json
+++ b/keyboards/adm42/info.json
@@ -9,6 +9,17 @@
         "pid": "0xE873",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["C7", "D5", "D3", "D2"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h
index fa2bcb3e43..fbf2e300ef 100644
--- a/keyboards/adm42/rev4/config.h
+++ b/keyboards/adm42/rev4/config.h
@@ -16,13 +16,8 @@
 
 #pragma once
 
-#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, F0, F1, F4, F5, F6, F7 }
-#define MATRIX_ROW_PINS { C7, D5, D3, D2 }
-
 #define ADM42_LED E6
 
-#define RGB_DI_PIN B7
-
 #define RGB_MATRIX_LED_COUNT 42
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/adm42/rev4/rev4.c b/keyboards/adm42/rev4/rev4.c
index 2e22004f96..623b5cb5a3 100644
--- a/keyboards/adm42/rev4/rev4.c
+++ b/keyboards/adm42/rev4/rev4.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 led_config_t g_led_config = {
     {
diff --git a/keyboards/adm42/rev4/rules.mk b/keyboards/adm42/rev4/rules.mk
index 9be57067bb..aad92997d0 100644
--- a/keyboards/adm42/rev4/rules.mk
+++ b/keyboards/adm42/rev4/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/adpenrose/akemipad/config.h b/keyboards/adpenrose/akemipad/config.h
index 47fcf429ac..5756903c66 100644
--- a/keyboards/adpenrose/akemipad/config.h
+++ b/keyboards/adpenrose/akemipad/config.h
@@ -3,23 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, D7, E6, B6, B4, B5 }
-#define MATRIX_COL_PINS { D3, D2, F5, F6, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
 /* Audio functionality */
@@ -28,8 +11,6 @@
 #define AUDIO_ENABLE_TONE_MULTIPLEXING
 #define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10
 
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN F4
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 27
 #define RGB_MATRIX_CENTER { 60, 77 }
diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json
index 9b5a8d6ef6..6dc558c78e 100644
--- a/keyboards/adpenrose/akemipad/info.json
+++ b/keyboards/adpenrose/akemipad/info.json
@@ -7,6 +7,17 @@
         "pid": "0x0004",
         "vid": "0x4450"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "F5", "F6", "B2"],
+        "rows": ["D4", "D7", "E6", "B6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B3"}
diff --git a/keyboards/adpenrose/akemipad/rules.mk b/keyboards/adpenrose/akemipad/rules.mk
index 9886164987..084dbaec05 100644
--- a/keyboards/adpenrose/akemipad/rules.mk
+++ b/keyboards/adpenrose/akemipad/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h
index 5ffeb86837..9bfa7d996c 100644
--- a/keyboards/adpenrose/kintsugi/config.h
+++ b/keyboards/adpenrose/kintsugi/config.h
@@ -17,28 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, E6, D7, C6, D4, D2, F4, F5, B5, B4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
 /* Underglow options: */
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -54,4 +35,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json
index a26c65b42a..1014362503 100644
--- a/keyboards/adpenrose/kintsugi/info.json
+++ b/keyboards/adpenrose/kintsugi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "F1"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "F0"],
+        "rows": ["B0", "E6", "D7", "C6", "D4", "D2", "F4", "F5", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B7", "pin_b": "D5"}
diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h
index c9f606999e..43002ba35c 100644
--- a/keyboards/adpenrose/obi/config.h
+++ b/keyboards/adpenrose/obi/config.h
@@ -3,28 +3,9 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, C7, C6 }
-#define MATRIX_COL_PINS { F6, B7, B6, B4, B5, D6, D5, D3, D7, D4, D2, D1, D0, B0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
 /* Underglow options: */
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -40,4 +21,3 @@
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json
index c0c1b73c64..c3e8d7b43b 100644
--- a/keyboards/adpenrose/obi/info.json
+++ b/keyboards/adpenrose/obi/info.json
@@ -7,6 +7,14 @@
         "pid": "0x0002",
         "vid": "0x4450"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "B7", "B6", "B4", "B5", "D6", "D5", "D3", "D7", "D4", "D2", "D1", "D0", "B0"],
+        "rows": ["F4", "F5", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F0"}
diff --git a/keyboards/adpenrose/obi/obi.c b/keyboards/adpenrose/obi/obi.c
deleted file mode 100644
index 2efd4eba47..0000000000
--- a/keyboards/adpenrose/obi/obi.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2022 Arturo Avila (@ADPenrose)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "obi.h"
-
diff --git a/keyboards/adpenrose/shisaku/config.h b/keyboards/adpenrose/shisaku/config.h
index 47555b5190..9113167572 100644
--- a/keyboards/adpenrose/shisaku/config.h
+++ b/keyboards/adpenrose/shisaku/config.h
@@ -3,22 +3,5 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B2, B0, B1, D0, B4, D6, B3, D7 }
-#define MATRIX_COL_PINS { D1, C3, C4, D4, C0, C1, C2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Solenoid pin */
 #define SOLENOID_PIN C5
diff --git a/keyboards/adpenrose/shisaku/info.json b/keyboards/adpenrose/shisaku/info.json
index dd1aaf540a..9223f5a101 100644
--- a/keyboards/adpenrose/shisaku/info.json
+++ b/keyboards/adpenrose/shisaku/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "C3", "C4", "D4", "C0", "C1", "C2"],
+        "rows": ["B2", "B0", "B1", "D0", "B4", "D6", "B3", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "layouts": {
diff --git a/keyboards/adpenrose/shisaku/shisaku.c b/keyboards/adpenrose/shisaku/shisaku.c
deleted file mode 100644
index a1ab356ac6..0000000000
--- a/keyboards/adpenrose/shisaku/shisaku.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Arturo Avila (@ADPenrose)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "shisaku.h"
diff --git a/keyboards/aeboards/aegis/aegis.c b/keyboards/aeboards/aegis/aegis.c
deleted file mode 100644
index ccff6d62c9..0000000000
--- a/keyboards/aeboards/aegis/aegis.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/aeboards/aegis/config.h b/keyboards/aeboards/aegis/config.h
index edaef2f7b9..8606067a4c 100644
--- a/keyboards/aeboards/aegis/config.h
+++ b/keyboards/aeboards/aegis/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, F6, E6, F7, D1, D0, D6, D4, B4, D7, B6, B5 }
-#define MATRIX_COL_PINS { C7, C6, B7, D2, D3, B3, B2, B1, B0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json
index b3817db452..63b9ea551e 100644
--- a/keyboards/aeboards/aegis/info.json
+++ b/keyboards/aeboards/aegis/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0807",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B7", "D2", "D3", "B3", "B2", "B1", "B0"],
+        "rows": ["F5", "F6", "E6", "F7", "D1", "D0", "D6", "D4", "B4", "D7", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/aeboards/constellation/constellation.c b/keyboards/aeboards/constellation/constellation.c
deleted file mode 100755
index 0b8354d071..0000000000
--- a/keyboards/aeboards/constellation/constellation.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
-
-#include "constellation.h"
diff --git a/keyboards/aeboards/constellation/constellation.h b/keyboards/aeboards/constellation/constellation.h
deleted file mode 100755
index 3724b29d6a..0000000000
--- a/keyboards/aeboards/constellation/constellation.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_aeboards_constellation_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_aeboards_constellation_rev2)
-    #include "rev2.h"
-#elif defined(KEYBOARD_aeboards_constellation_rev3)
-    #include "rev3.h"
-#endif
diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h
index 83eb6e90d3..01155887a5 100755
--- a/keyboards/aeboards/constellation/rev1/config.h
+++ b/keyboards/aeboards/constellation/rev1/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, F0, F1, F4 }
-#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/info.json
index 6f82ab71f5..aec20e5829 100644
--- a/keyboards/aeboards/constellation/rev1/info.json
+++ b/keyboards/aeboards/constellation/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x065C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B1", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/aeboards/constellation/rev1/rev1.c b/keyboards/aeboards/constellation/rev1/rev1.c
deleted file mode 100755
index 6e8f0a1192..0000000000
--- a/keyboards/aeboards/constellation/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/aeboards/constellation/rev2/config.h b/keyboards/aeboards/constellation/rev2/config.h
index faaedf495d..f4b7be6bdf 100755
--- a/keyboards/aeboards/constellation/rev2/config.h
+++ b/keyboards/aeboards/constellation/rev2/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B15, A14, A2, B13, B14 }
-#define MATRIX_COL_PINS { B12, A1, H0, C15, C14, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/aeboards/constellation/rev2/info.json b/keyboards/aeboards/constellation/rev2/info.json
index 1009cca20d..ac79c2e336 100644
--- a/keyboards/aeboards/constellation/rev2/info.json
+++ b/keyboards/aeboards/constellation/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x065C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B12", "A1", "H0", "C15", "C14", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+        "rows": ["B15", "A14", "A2", "B13", "B14"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32L422",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/aeboards/constellation/rev3/config.h b/keyboards/aeboards/constellation/rev3/config.h
index 83eb6e90d3..01155887a5 100755
--- a/keyboards/aeboards/constellation/rev3/config.h
+++ b/keyboards/aeboards/constellation/rev3/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, F0, F1, F4 }
-#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/aeboards/constellation/rev3/info.json b/keyboards/aeboards/constellation/rev3/info.json
index 514fcb778e..b50c8893e1 100644
--- a/keyboards/aeboards/constellation/rev3/info.json
+++ b/keyboards/aeboards/constellation/rev3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x065D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B1", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/aeboards/constellation/rev3/rev3.c b/keyboards/aeboards/constellation/rev3/rev3.c
deleted file mode 100755
index 5c4257c9b9..0000000000
--- a/keyboards/aeboards/constellation/rev3/rev3.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev3.h"
diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h
index 8f5625e2eb..0bc48fb562 100644
--- a/keyboards/aeboards/ext65/rev2/config.h
+++ b/keyboards/aeboards/ext65/rev2/config.h
@@ -28,7 +28,6 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 24
-#define RGB_DI_PIN B15
 
 //SPI
 #define WS2812_SPI SPID2
diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json
index 2939dc89ea..159f8e8787 100644
--- a/keyboards/aeboards/ext65/rev2/info.json
+++ b/keyboards/aeboards/ext65/rev2/info.json
@@ -12,6 +12,10 @@
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
diff --git a/keyboards/aeboards/ext65/rev2/rules.mk b/keyboards/aeboards/ext65/rev2/rules.mk
index 0656736608..d52eea26d1 100644
--- a/keyboards/aeboards/ext65/rev2/rules.mk
+++ b/keyboards/aeboards/ext65/rev2/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/info.json
index ae95239637..55575017d2 100644
--- a/keyboards/aeboards/satellite/rev1/info.json
+++ b/keyboards/aeboards/satellite/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6553",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",
diff --git a/keyboards/aeboards/satellite/rev1/rules.mk b/keyboards/aeboards/satellite/rev1/rules.mk
index 125682bac3..1a4657b08c 100644
--- a/keyboards/aeboards/satellite/rev1/rules.mk
+++ b/keyboards/aeboards/satellite/rev1/rules.mk
@@ -12,7 +12,6 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes     # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = custom  # Enable RGB matrix effects.
 
 COMMON_VPATH += $(DRIVER_PATH)/issi
 
diff --git a/keyboards/aeboards/satellite/satellite.c b/keyboards/aeboards/satellite/satellite.c
deleted file mode 100644
index 97750559db..0000000000
--- a/keyboards/aeboards/satellite/satellite.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
-
-#include "satellite.h"
diff --git a/keyboards/aeboards/satellite/satellite.h b/keyboards/aeboards/satellite/satellite.h
deleted file mode 100644
index fcd03d72e4..0000000000
--- a/keyboards/aeboards/satellite/satellite.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_aeboards_satellite_rev1)
-    #include "rev1.h"
-#endif
diff --git a/keyboards/afternoonlabs/breeze/breeze.c b/keyboards/afternoonlabs/breeze/breeze.c
deleted file mode 100644
index a39b91c5ee..0000000000
--- a/keyboards/afternoonlabs/breeze/breeze.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "breeze.h"
diff --git a/keyboards/afternoonlabs/breeze/breeze.h b/keyboards/afternoonlabs/breeze/breeze.h
deleted file mode 100644
index 9a98bb9e69..0000000000
--- a/keyboards/afternoonlabs/breeze/breeze.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef KEYBOARD_afternoonlabs_breeze_rev0
-#    include "rev0.h"
-#endif
-#ifdef KEYBOARD_afternoonlabs_breeze_rev1
-#    include "rev1.h"
-#endif
diff --git a/keyboards/afternoonlabs/breeze/rev0/config.h b/keyboards/afternoonlabs/breeze/rev0/config.h
index be38eaf0ab..3500564544 100644
--- a/keyboards/afternoonlabs/breeze/rev0/config.h
+++ b/keyboards/afternoonlabs/breeze/rev0/config.h
@@ -16,12 +16,4 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1 }
-#define MATRIX_COL_PINS \
-    { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
-
 #define SPLIT_HAND_PIN B3
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json
index 19e22b8342..5d3ebbe5ca 100644
--- a/keyboards/afternoonlabs/breeze/rev0/info.json
+++ b/keyboards/afternoonlabs/breeze/rev0/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/afternoonlabs/breeze/rev0/rev0.c b/keyboards/afternoonlabs/breeze/rev0/rev0.c
deleted file mode 100644
index a39b91c5ee..0000000000
--- a/keyboards/afternoonlabs/breeze/rev0/rev0.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "breeze.h"
diff --git a/keyboards/afternoonlabs/breeze/rev0/rev0.h b/keyboards/afternoonlabs/breeze/rev0/rev0.h
index b7d7025be3..4ef5fd3286 100644
--- a/keyboards/afternoonlabs/breeze/rev0/rev0.h
+++ b/keyboards/afternoonlabs/breeze/rev0/rev0.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "breeze.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/afternoonlabs/breeze/rev1/config.h b/keyboards/afternoonlabs/breeze/rev1/config.h
index 1e51a357b2..d6bb6df14c 100644
--- a/keyboards/afternoonlabs/breeze/rev1/config.h
+++ b/keyboards/afternoonlabs/breeze/rev1/config.h
@@ -16,12 +16,4 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1 }
-#define MATRIX_COL_PINS \
-    { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
-
 #define SPLIT_HAND_PIN B3
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json
index 4feeeca875..191c3ffc63 100644
--- a/keyboards/afternoonlabs/breeze/rev1/info.json
+++ b/keyboards/afternoonlabs/breeze/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/afternoonlabs/breeze/rev1/rev1.c b/keyboards/afternoonlabs/breeze/rev1/rev1.c
deleted file mode 100644
index a39b91c5ee..0000000000
--- a/keyboards/afternoonlabs/breeze/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "breeze.h"
diff --git a/keyboards/afternoonlabs/breeze/rev1/rev1.h b/keyboards/afternoonlabs/breeze/rev1/rev1.h
index b7d7025be3..4ef5fd3286 100644
--- a/keyboards/afternoonlabs/breeze/rev1/rev1.h
+++ b/keyboards/afternoonlabs/breeze/rev1/rev1.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "breeze.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/afternoonlabs/gust/gust.c b/keyboards/afternoonlabs/gust/gust.c
deleted file mode 100644
index ee2a9fa5ca..0000000000
--- a/keyboards/afternoonlabs/gust/gust.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "gust.h"
diff --git a/keyboards/afternoonlabs/gust/gust.h b/keyboards/afternoonlabs/gust/gust.h
deleted file mode 100644
index 886dc3786f..0000000000
--- a/keyboards/afternoonlabs/gust/gust.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef KEYBOARD_afternoonlabs_gust_rev1
-#    include "rev1.h"
-#endif
diff --git a/keyboards/afternoonlabs/gust/rev1/config.h b/keyboards/afternoonlabs/gust/rev1/config.h
deleted file mode 100644
index db2839cfc9..0000000000
--- a/keyboards/afternoonlabs/gust/rev1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F5, F4, D0 }
-#define MATRIX_COL_PINS { D1, D2, D3 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/gust/rev1/info.json b/keyboards/afternoonlabs/gust/rev1/info.json
index a07fab20e2..4cfac9dc59 100644
--- a/keyboards/afternoonlabs/gust/rev1/info.json
+++ b/keyboards/afternoonlabs/gust/rev1/info.json
@@ -8,47 +8,27 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3"],
+        "rows": ["F5", "F4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "x": 2,
-                    "y": 3
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3}
             ]
         }
     }
diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.c b/keyboards/afternoonlabs/gust/rev1/rev1.c
deleted file mode 100644
index ee2a9fa5ca..0000000000
--- a/keyboards/afternoonlabs/gust/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "gust.h"
diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.h b/keyboards/afternoonlabs/gust/rev1/rev1.h
deleted file mode 100644
index 22c1910a1f..0000000000
--- a/keyboards/afternoonlabs/gust/rev1/rev1.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "gust.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    M00, M01, M02, \
-    M10, M11, M12,  \
-    M20, M21, M22  \
-) \
-{ \
-    { M00, M01, M02 }, \
-    { M10, M11, M12 }, \
-    { M20, M21, M22 }  \
-}
diff --git a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c
deleted file mode 100644
index 35268ecf6f..0000000000
--- a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "oceanbreeze.h"
diff --git a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h
deleted file mode 100644
index f51f55de13..0000000000
--- a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef KEYBOARD_afternoonlabs_oceanbreeze_rev1
-#    include "rev1.h"
-#endif
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
index 42621b39ef..d6bb6df14c 100644
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
@@ -16,12 +16,4 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1, B6 }
-#define MATRIX_COL_PINS \
-    { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
-
 #define SPLIT_HAND_PIN B3
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
index 531d2622ca..1a099ee548 100644
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c
deleted file mode 100644
index 35268ecf6f..0000000000
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "oceanbreeze.h"
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h
index 36de22ec18..08d175f8c0 100644
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "oceanbreeze.h"
-
 #include "quantum.h"
 
 #define XXX KC_NO
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/config.h b/keyboards/afternoonlabs/southern_breeze/rev1/config.h
index 1e51a357b2..d6bb6df14c 100644
--- a/keyboards/afternoonlabs/southern_breeze/rev1/config.h
+++ b/keyboards/afternoonlabs/southern_breeze/rev1/config.h
@@ -16,12 +16,4 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1 }
-#define MATRIX_COL_PINS \
-    { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
-
 #define SPLIT_HAND_PIN B3
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json
index 17bb446694..c9a7ecc3ca 100644
--- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json
+++ b/keyboards/afternoonlabs/southern_breeze/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c
deleted file mode 100644
index 65597253e4..0000000000
--- a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h
index eeecc06308..b8a83f6aad 100644
--- a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h
+++ b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "southern_breeze.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/afternoonlabs/southern_breeze/southern_breeze.c b/keyboards/afternoonlabs/southern_breeze/southern_breeze.c
deleted file mode 100644
index cac867cafa..0000000000
--- a/keyboards/afternoonlabs/southern_breeze/southern_breeze.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "southern_breeze.h"
diff --git a/keyboards/afternoonlabs/southern_breeze/southern_breeze.h b/keyboards/afternoonlabs/southern_breeze/southern_breeze.h
deleted file mode 100644
index a6923d6b1e..0000000000
--- a/keyboards/afternoonlabs/southern_breeze/southern_breeze.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef KEYBOARD_afternoonlabs_southern_breeze_rev1
-#    include "rev1.h"
-#endif
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/config.h b/keyboards/afternoonlabs/summer_breeze/rev1/config.h
index 1e51a357b2..d6bb6df14c 100644
--- a/keyboards/afternoonlabs/summer_breeze/rev1/config.h
+++ b/keyboards/afternoonlabs/summer_breeze/rev1/config.h
@@ -16,12 +16,4 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1 }
-#define MATRIX_COL_PINS \
-    { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
-
 #define SPLIT_HAND_PIN B3
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json
index e5ac8d452d..f42ad75bac 100644
--- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json
+++ b/keyboards/afternoonlabs/summer_breeze/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c
deleted file mode 100644
index 65597253e4..0000000000
--- a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h
index 6ab28066c3..5fda55504c 100644
--- a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h
+++ b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "summer_breeze.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/afternoonlabs/summer_breeze/summer_breeze.c b/keyboards/afternoonlabs/summer_breeze/summer_breeze.c
deleted file mode 100644
index 844b8c33a3..0000000000
--- a/keyboards/afternoonlabs/summer_breeze/summer_breeze.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "summer_breeze.h"
diff --git a/keyboards/afternoonlabs/summer_breeze/summer_breeze.h b/keyboards/afternoonlabs/summer_breeze/summer_breeze.h
deleted file mode 100644
index 0f3776b832..0000000000
--- a/keyboards/afternoonlabs/summer_breeze/summer_breeze.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef KEYBOARD_afternoonlabs_summer_breeze_rev1
-#    include "rev1.h"
-#endif
diff --git a/keyboards/ai03/andromeda/andromeda.c b/keyboards/ai03/andromeda/andromeda.c
deleted file mode 100644
index 5dd580effd..0000000000
--- a/keyboards/ai03/andromeda/andromeda.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Andrew Kannan
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "andromeda.h"
diff --git a/keyboards/ai03/andromeda/andromeda.h b/keyboards/ai03/andromeda/andromeda.h
deleted file mode 100644
index 1fcae4d772..0000000000
--- a/keyboards/ai03/andromeda/andromeda.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 Andrew Kannan
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_tkl_ansi_wkl( \
-	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                   \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,       K415,       \
-	K500,       K502,                         K507,                   K511,       K513, K514, K515, K516  \
-) { \
-	{ K000,  KC_NO,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012, K013,  K014,  K015,  K016 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213 , K214,  K215,  K216  }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO,  K313, KC_NO,  KC_NO, KC_NO }, \
-	{ K400,  KC_NO,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO,  K413, KC_NO,  K415, KC_NO }, \
-	{ K500,  KC_NO,  K502,  KC_NO, KC_NO, KC_NO, KC_NO,  K507, KC_NO, KC_NO, KC_NO,  K511,  KC_NO,  K513, K514,  K515,  K516 }  \
-}
diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h
index 1fb163a652..056f54d521 100644
--- a/keyboards/ai03/andromeda/config.h
+++ b/keyboards/ai03/andromeda/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, B5, B8, B9 }
-#define MATRIX_ROW_PINS { B4, B3, A15, A3, A4, A5 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ai03/andromeda/info.json b/keyboards/ai03/andromeda/info.json
index ade4938b82..fb3cf0d78d 100644
--- a/keyboards/ai03/andromeda/info.json
+++ b/keyboards/ai03/andromeda/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "B5", "B8", "B9"],
+        "rows": ["B4", "B3", "A15", "A3", "A4", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A2",
         "scroll_lock": "A1",
@@ -17,7 +22,105 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_tkl_ansi_wkl": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h
index 32065a4740..50001e978c 100644
--- a/keyboards/ai03/equinox/config.h
+++ b/keyboards/ai03/equinox/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, C5, D4, D5 }
-#define MATRIX_COL_PINS { D1, D2, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ai03/equinox/equinox.c b/keyboards/ai03/equinox/equinox.c
deleted file mode 100644
index a8ea38ecd1..0000000000
--- a/keyboards/ai03/equinox/equinox.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "equinox.h"
-
diff --git a/keyboards/ai03/equinox/rev0/config.h b/keyboards/ai03/equinox/rev0/config.h
deleted file mode 100644
index 78c6fb8fcd..0000000000
--- a/keyboards/ai03/equinox/rev0/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { C4, B7, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 }
diff --git a/keyboards/ai03/equinox/rev0/info.json b/keyboards/ai03/equinox/rev0/info.json
index d76623777e..f5dd365564 100644
--- a/keyboards/ai03/equinox/rev0/info.json
+++ b/keyboards/ai03/equinox/rev0/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C4", "B7", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"],
+        "rows": ["D3", "C5", "D4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D1",
         "levels": 5,
diff --git a/keyboards/ai03/equinox/rev1/info.json b/keyboards/ai03/equinox/rev1/info.json
index 19cd40d140..9c0727f7ba 100644
--- a/keyboards/ai03/equinox/rev1/info.json
+++ b/keyboards/ai03/equinox/rev1/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["D1", "D2", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"],
+        "rows": ["D3", "C5", "D4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5,
diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h
index 76e81dc2aa..9fe6627ecc 100644
--- a/keyboards/ai03/jp60/config.h
+++ b/keyboards/ai03/jp60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, B5, B4, D7, E6 }
-#define MATRIX_COL_PINS { D2, D1, D3, D5, D4, D6, C6, F0, F1, F4, F5, F6, F7, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json
index 3a07c7224c..c7b55c53be 100644
--- a/keyboards/ai03/jp60/info.json
+++ b/keyboards/ai03/jp60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0024",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D3", "D5", "D4", "D6", "C6", "F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+        "rows": ["B6", "B5", "B4", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ai03/jp60/jp60.c b/keyboards/ai03/jp60/jp60.c
deleted file mode 100644
index c18a99c6a6..0000000000
--- a/keyboards/ai03/jp60/jp60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 ai03
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "jp60.h"
diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h
index 10c8ab70ab..50001e978c 100644
--- a/keyboards/ai03/lunar/config.h
+++ b/keyboards/ai03/lunar/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ai03/lunar/info.json b/keyboards/ai03/lunar/info.json
index 6c069207e1..2b97d0042c 100644
--- a/keyboards/ai03/lunar/info.json
+++ b/keyboards/ai03/lunar/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B3", "D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ai03/lunar/lunar.c b/keyboards/ai03/lunar/lunar.c
deleted file mode 100644
index 9c7bf23a62..0000000000
--- a/keyboards/ai03/lunar/lunar.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "lunar.h"
diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json
index 6eed934739..a810ad4cc7 100644
--- a/keyboards/ai03/lunar_ii/info.json
+++ b/keyboards/ai03/lunar_ii/info.json
@@ -25,67 +25,67 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "matrix": [2, 12], "x": 14.0, "y": 0.0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3.0 },
-                { "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
-                { "matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4.0 },
-                { "matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4.0 },
-                { "matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4.0 },
-                { "matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4.0 },
-                { "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4.0 },
-                { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [2, 12], "x": 14, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4 },
+                { "matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4 },
+                { "matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4 },
+                { "matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4 },
+                { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
index 85d4ae5bfe..f4157a1729 100644
--- a/keyboards/ai03/orbit/config.h
+++ b/keyboards/ai03/orbit/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, D3 }
-#define MATRIX_COL_PINS { C7, B4, D7, D6, D4, F1, F0 }
-#define MATRIX_ROW_PINS_RIGHT { B6, B5, B4, D7, E6 }
-#define MATRIX_COL_PINS_RIGHT { D4, D6, F1, F0, F4, F5, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 
 #define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json
index 840fb1fc20..981f3cd685 100644
--- a/keyboards/ai03/orbit/info.json
+++ b/keyboards/ai03/orbit/info.json
@@ -8,11 +8,22 @@
         "pid": "0x0003",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["C7", "B4", "D7", "D6", "D4", "F1", "F0"],
+        "rows": ["F7", "F6", "F5", "F4", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D6", "F1", "F0", "F4", "F5", "C6"],
+                "rows": ["B6", "B5", "B4", "D7", "E6"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h
index 27a383f7bb..05d319d030 100644
--- a/keyboards/ai03/orbit_x/config.h
+++ b/keyboards/ai03/orbit_x/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, D6, D4, F0 }
-#define MATRIX_COL_PINS { E6, F6, B1, B0, C7, C6 }
-#define MATRIX_ROW_PINS_RIGHT { B5, D7, B4, D4 }
-#define MATRIX_COL_PINS_RIGHT { D6, B6, B1, B0, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN D5
 #define SPLIT_USB_DETECT
 #define SPLIT_USB_TIMEOUT 2500
diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json
index fdb26bddf4..dbc9f40d19 100644
--- a/keyboards/ai03/orbit_x/info.json
+++ b/keyboards/ai03/orbit_x/info.json
@@ -8,8 +8,19 @@
         "pid": "0x0014",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F6", "B1", "B0", "C7", "C6"],
+        "rows": ["D7", "D6", "D4", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D6", "B6", "B1", "B0", "B3", "B2"],
+                "rows": ["B5", "D7", "B4", "D4"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
@@ -31,12 +42,12 @@
                 {"x":0, "y":1.38},
                 {"x":1, "y":1.38},
                 {"x":2, "y":1.13},
-                {"x":3, "y":1.0},
+                {"x":3, "y":1},
                 {"x":4, "y":1.13},
                 {"x":5, "y":1.25},
                 {"x":7.5, "y":1.25},
                 {"x":8.5, "y":1.13},
-                {"x":9.5, "y":1.0},
+                {"x":9.5, "y":1},
                 {"x":10.5, "y":1.13},
                 {"x":11.5, "y":1.38},
                 {"x":12.5, "y":1.38},
diff --git a/keyboards/ai03/orbit_x/orbit_x.c b/keyboards/ai03/orbit_x/orbit_x.c
deleted file mode 100644
index 3327261add..0000000000
--- a/keyboards/ai03/orbit_x/orbit_x.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "orbit_x.h"
-
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
index 871f4bc8db..5cb8d283a8 100644
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/polaris/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 14
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json
index ae0fcb927d..b3970e8b5b 100644
--- a/keyboards/ai03/polaris/info.json
+++ b/keyboards/ai03/polaris/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
diff --git a/keyboards/ai03/polaris/polaris.c b/keyboards/ai03/polaris/polaris.c
deleted file mode 100644
index 256dcb930a..0000000000
--- a/keyboards/ai03/polaris/polaris.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "polaris.h"
diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h
index 04765c0788..50001e978c 100644
--- a/keyboards/ai03/quasar/config.h
+++ b/keyboards/ai03/quasar/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4, D6, D7 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ai03/quasar/info.json b/keyboards/ai03/quasar/info.json
index c29799484d..68dc3c4a6f 100644
--- a/keyboards/ai03/quasar/info.json
+++ b/keyboards/ai03/quasar/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0010",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ai03/quasar/quasar.c b/keyboards/ai03/quasar/quasar.c
deleted file mode 100644
index 75d77e355c..0000000000
--- a/keyboards/ai03/quasar/quasar.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "quasar.h"
diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h
index 027bc03faa..50001e978c 100644
--- a/keyboards/ai03/soyuz/config.h
+++ b/keyboards/ai03/soyuz/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, B6, E6, B4 }
-#define MATRIX_COL_PINS { F4, B3, D7, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ai03/soyuz/info.json b/keyboards/ai03/soyuz/info.json
index b008ef45b6..873b974f39 100644
--- a/keyboards/ai03/soyuz/info.json
+++ b/keyboards/ai03/soyuz/info.json
@@ -8,57 +8,66 @@
         "pid": "0x0018",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "B3", "D7", "B5"],
+        "rows": ["D4", "C6", "B6", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x4", "numpad_5x4"],
     "layouts": {
         "LAYOUT_ortho_5x4": {
             "layout": [
-				{"x":0, "y":0},
-				{"x":1, "y":0},
-				{"x":2, "y":0},
-				{"x":3, "y":0},
-				{"x":0, "y":1},
-				{"x":1, "y":1},
-				{"x":2, "y":1},
-				{"x":3, "y":1},
-				{"x":0, "y":2},
-				{"x":1, "y":2},
-				{"x":2, "y":2},
-				{"x":3, "y":2},
-				{"x":0, "y":3},
-				{"x":1, "y":3},
-				{"x":2, "y":3},
-				{"x":3, "y":3},
-				{"x":0, "y":4},
-				{"x":1, "y":4},
-				{"x":2, "y":4},
-				{"x":3, "y":4}
-			]
-		},
-		"LAYOUT_numpad_5x4": {
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
+        },
+        "LAYOUT_numpad_5x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":1, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 1, "h": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"x":0, "y":4, "w":2},
-                {"x":2, "y":4},
-                {"x":3, "y":3, "h":2}
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/ai03/soyuz/soyuz.c b/keyboards/ai03/soyuz/soyuz.c
deleted file mode 100644
index e643d14ec1..0000000000
--- a/keyboards/ai03/soyuz/soyuz.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "soyuz.h"
diff --git a/keyboards/ai03/soyuz/soyuz.h b/keyboards/ai03/soyuz/soyuz.h
deleted file mode 100644
index c7f15866e1..0000000000
--- a/keyboards/ai03/soyuz/soyuz.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
- 
-#define LAYOUT_ortho_5x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33, \
-	K40, K41, K42, K43  \
-) { \
-	{ K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, K23 }, \
-	{ K30, K31, K32, K33 }, \
-	{ K40, K41, K42, K43 }  \
-}
-
-/*
- * ┌───┬───┬───┬───�
- * │00 │01 │02 │03 │
- * ├───┼───┼───┼───┤
- * │10 │11 │12 │   │
- * ├───┼───┼───┤23 │
- * │20 │21 │22 │   │
- * ├───┼───┼───┼───┤
- * │30 │31 │32 │   │
- * ├───┴───┼───┤43 │
- * │41     │42 │   │
- * └───────┴───┴───┘
- */
-
-#define LAYOUT_numpad_5x4( \
-	k00, k01, k02, k03, \
-	k10, k11, k12,      \
-	k20, k21, k22, k23, \
-	k30, k31, k32,      \
-	     k41, k42, k43  \
-) { \
-	{ k00,   k01, k02, k03   }, \
-	{ k10,   k11, k12, KC_NO }, \
-	{ k20,   k21, k22, k23   }, \
-	{ k30,   k31, k32, KC_NO }, \
-	{ KC_NO, k41, k42, k43   }  \
-}
diff --git a/keyboards/ai03/vega/config.h b/keyboards/ai03/vega/config.h
index b2798481d4..b575a49f38 100644
--- a/keyboards/ai03/vega/config.h
+++ b/keyboards/ai03/vega/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B5, A3, A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6 }
-#define MATRIX_ROW_PINS { A1, A2, B3, A15, A10 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ai03/vega/info.json b/keyboards/ai03/vega/info.json
index 7b3c16cb52..3da23cac09 100644
--- a/keyboards/ai03/vega/info.json
+++ b/keyboards/ai03/vega/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0015",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6"],
+        "rows": ["A1", "A2", "B3", "A15", "A10"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h
index 30b7481688..43225e7a75 100644
--- a/keyboards/ai03/voyager60_alps/config.h
+++ b/keyboards/ai03/voyager60_alps/config.h
@@ -14,21 +14,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3}
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 14
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json
index a7a68e43b0..a0641fed37 100644
--- a/keyboards/ai03/voyager60_alps/info.json
+++ b/keyboards/ai03/voyager60_alps/info.json
@@ -8,6 +8,14 @@
         "pid": "0x060A",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ai03/voyager60_alps/voyager60_alps.c b/keyboards/ai03/voyager60_alps/voyager60_alps.c
deleted file mode 100644
index 251198c445..0000000000
--- a/keyboards/ai03/voyager60_alps/voyager60_alps.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-Copyright 2020 <t@ylor.io>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "voyager60_alps.h"
diff --git a/keyboards/aidansmithdotdev/fine40/fine40.c b/keyboards/aidansmithdotdev/fine40/fine40.c
index 73c453b6c0..2e60e7c921 100644
--- a/keyboards/aidansmithdotdev/fine40/fine40.c
+++ b/keyboards/aidansmithdotdev/fine40/fine40.c
@@ -68,18 +68,3 @@ bool oled_task_kb(void) {
 	return(true);
 }
 #endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-	// Volume control
-	if (clockwise) {
-		tap_code(KC_VOLU);
-	} else {
-		tap_code(KC_VOLD);
-	}
-	return false;
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/aidansmithdotdev/fine40/info.json b/keyboards/aidansmithdotdev/fine40/info.json
index c41557a920..eb0ec8f143 100644
--- a/keyboards/aidansmithdotdev/fine40/info.json
+++ b/keyboards/aidansmithdotdev/fine40/info.json
@@ -27,7 +27,7 @@
     },
     "encoder": {
         "rotary": [
-            {"pin_a": "D5", "pin_b": "B7", "resolution": 2}
+            {"pin_a": "B7", "pin_b": "D5", "resolution": 2}
         ]
     },
     "layouts": {
diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
index d157d9db31..69b9dacd27 100644
--- a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
@@ -41,3 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______
 ),
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_MAIN] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LEFT] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_TAB] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk b/keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c
index d157d9db31..69b9dacd27 100644
--- a/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c
@@ -41,3 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______
 ),
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_MAIN] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LEFT] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_TAB] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk b/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk
index 036bd6d1c3..f1adcab005 100644
--- a/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes
\ No newline at end of file
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/akb/eb46/config.h b/keyboards/akb/eb46/config.h
deleted file mode 100644
index 3fa5884805..0000000000
--- a/keyboards/akb/eb46/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2019 Elliot Powell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-  { B5, B4, D7, B6 }
-#define MATRIX_COL_PINS \
-  { B0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D4, D6, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/akb/eb46/eb46.c b/keyboards/akb/eb46/eb46.c
deleted file mode 100644
index a2113d0fe9..0000000000
--- a/keyboards/akb/eb46/eb46.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Elliot Powell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "eb46.h"
diff --git a/keyboards/akb/eb46/info.json b/keyboards/akb/eb46/info.json
index ad1f03501a..d5c4312cc6 100644
--- a/keyboards/akb/eb46/info.json
+++ b/keyboards/akb/eb46/info.json
@@ -7,6 +7,11 @@
         "pid": "0xFEED",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "C6"],
+        "rows": ["B5", "B4", "D7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/akb/ogr/info.json b/keyboards/akb/ogr/info.json
index f2583154ba..023788372d 100644
--- a/keyboards/akb/ogr/info.json
+++ b/keyboards/akb/ogr/info.json
@@ -29,85 +29,85 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.5, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.5, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.5, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.5, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.5, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.5, "y": 0.0 },
-                { "matrix": [0, 13], "x": 13.5, "y": 0.0 },
-                { "matrix": [0, 14], "x": 14.5, "y": 0.0 },
-                { "matrix": [0, 15], "x": 15.5, "y": 0.0 },
-                { "matrix": [0, 16], "x": 16.5, "y": 0.0 },
-                { "matrix": [0, 17], "x": 17.5, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.0 },
-                { "matrix": [1, 2], "w": 1.5, "x": 2.5, "y": 1.0 },
-                { "matrix": [1, 3], "x": 4.0, "y": 1.0 },
-                { "matrix": [1, 4], "x": 5.0, "y": 1.0 },
-                { "matrix": [1, 5], "x": 6.0, "y": 1.0 },
-                { "matrix": [1, 6], "x": 7.0, "y": 1.0 },
-                { "matrix": [1, 7], "x": 8.0, "y": 1.0 },
-                { "matrix": [1, 8], "x": 9.0, "y": 1.0 },
-                { "matrix": [1, 9], "x": 10.0, "y": 1.0 },
-                { "matrix": [1, 10], "x": 11.0, "y": 1.0 },
-                { "matrix": [1, 11], "x": 12.0, "y": 1.0 },
-                { "matrix": [1, 12], "x": 13.0, "y": 1.0 },
-                { "matrix": [1, 13], "x": 14.0, "y": 1.0 },
-                { "matrix": [1, 14], "x": 15.0, "y": 1.0 },
-                { "matrix": [1, 15], "w": 1.5, "x": 16.0, "y": 1.0 },
-                { "matrix": [1, 16], "x": 17.5, "y": 1.0 },
-                { "matrix": [2, 0], "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.0, "y": 2.0 },
-                { "matrix": [2, 2], "w": 1.75, "x": 2.5, "y": 2.0 },
-                { "matrix": [2, 3], "x": 4.25, "y": 2.0 },
-                { "matrix": [2, 4], "x": 5.25, "y": 2.0 },
-                { "matrix": [2, 5], "x": 6.25, "y": 2.0 },
-                { "matrix": [2, 6], "x": 7.25, "y": 2.0 },
-                { "matrix": [2, 7], "x": 8.25, "y": 2.0 },
-                { "matrix": [2, 8], "x": 9.25, "y": 2.0 },
-                { "matrix": [2, 9], "x": 10.25, "y": 2.0 },
-                { "matrix": [2, 10], "x": 11.25, "y": 2.0 },
-                { "matrix": [2, 11], "x": 12.25, "y": 2.0 },
-                { "matrix": [2, 12], "x": 13.25, "y": 2.0 },
-                { "matrix": [2, 13], "x": 14.25, "y": 2.0 },
-                { "matrix": [2, 15], "w": 2.25, "x": 15.25, "y": 2.0 },
-                { "matrix": [2, 16], "x": 17.5, "y": 2.0 },
-                { "matrix": [3, 0], "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 1], "x": 1.0, "y": 3.0 },
-                { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3.0 },
-                { "matrix": [3, 3], "x": 3.75, "y": 3.0 },
-                { "matrix": [3, 4], "x": 4.75, "y": 3.0 },
-                { "matrix": [3, 5], "x": 5.75, "y": 3.0 },
-                { "matrix": [3, 6], "x": 6.75, "y": 3.0 },
-                { "matrix": [3, 7], "x": 7.75, "y": 3.0 },
-                { "matrix": [3, 8], "x": 8.75, "y": 3.0 },
-                { "matrix": [3, 9], "x": 9.75, "y": 3.0 },
-                { "matrix": [3, 10], "x": 10.75, "y": 3.0 },
-                { "matrix": [3, 11], "x": 11.75, "y": 3.0 },
-                { "matrix": [3, 12], "x": 12.75, "y": 3.0 },
-                { "matrix": [3, 13], "x": 13.75, "y": 3.0 },
-                { "matrix": [3, 14], "w": 1.75, "x": 14.75, "y": 3.0 },
-                { "matrix": [3, 15], "x": 16.5, "y": 3.0 },
-                { "matrix": [3, 16], "x": 17.5, "y": 3.0 },
-                { "matrix": [4, 0], "x": 0.0, "y": 4.0 },
-                { "matrix": [4, 1], "x": 1.0, "y": 4.0 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 3], "w": 1.25, "x": 3.75, "y": 4.0 },
-                { "matrix": [4, 4], "w": 1.25, "x": 5.0, "y": 4.0 },
-                { "matrix": [4, 9], "w": 6.25, "x": 6.25, "y": 4.0 },
-                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
-                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4.0 },
-                { "matrix": [4, 14], "x": 15.5, "y": 4.0 },
-                { "matrix": [4, 15], "x": 16.5, "y": 4.0 },
-                { "matrix": [4, 16], "x": 17.5, "y": 4.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2.5, "y": 0 },
+                { "matrix": [0, 3], "x": 3.5, "y": 0 },
+                { "matrix": [0, 4], "x": 4.5, "y": 0 },
+                { "matrix": [0, 5], "x": 5.5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [0, 9], "x": 9.5, "y": 0 },
+                { "matrix": [0, 10], "x": 10.5, "y": 0 },
+                { "matrix": [0, 11], "x": 11.5, "y": 0 },
+                { "matrix": [0, 12], "x": 12.5, "y": 0 },
+                { "matrix": [0, 13], "x": 13.5, "y": 0 },
+                { "matrix": [0, 14], "x": 14.5, "y": 0 },
+                { "matrix": [0, 15], "x": 15.5, "y": 0 },
+                { "matrix": [0, 16], "x": 16.5, "y": 0 },
+                { "matrix": [0, 17], "x": 17.5, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "w": 1.5, "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 4, "y": 1 },
+                { "matrix": [1, 4], "x": 5, "y": 1 },
+                { "matrix": [1, 5], "x": 6, "y": 1 },
+                { "matrix": [1, 6], "x": 7, "y": 1 },
+                { "matrix": [1, 7], "x": 8, "y": 1 },
+                { "matrix": [1, 8], "x": 9, "y": 1 },
+                { "matrix": [1, 9], "x": 10, "y": 1 },
+                { "matrix": [1, 10], "x": 11, "y": 1 },
+                { "matrix": [1, 11], "x": 12, "y": 1 },
+                { "matrix": [1, 12], "x": 13, "y": 1 },
+                { "matrix": [1, 13], "x": 14, "y": 1 },
+                { "matrix": [1, 14], "x": 15, "y": 1 },
+                { "matrix": [1, 15], "w": 1.5, "x": 16, "y": 1 },
+                { "matrix": [1, 16], "x": 17.5, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "w": 1.75, "x": 2.5, "y": 2 },
+                { "matrix": [2, 3], "x": 4.25, "y": 2 },
+                { "matrix": [2, 4], "x": 5.25, "y": 2 },
+                { "matrix": [2, 5], "x": 6.25, "y": 2 },
+                { "matrix": [2, 6], "x": 7.25, "y": 2 },
+                { "matrix": [2, 7], "x": 8.25, "y": 2 },
+                { "matrix": [2, 8], "x": 9.25, "y": 2 },
+                { "matrix": [2, 9], "x": 10.25, "y": 2 },
+                { "matrix": [2, 10], "x": 11.25, "y": 2 },
+                { "matrix": [2, 11], "x": 12.25, "y": 2 },
+                { "matrix": [2, 12], "x": 13.25, "y": 2 },
+                { "matrix": [2, 13], "x": 14.25, "y": 2 },
+                { "matrix": [2, 15], "w": 2.25, "x": 15.25, "y": 2 },
+                { "matrix": [2, 16], "x": 17.5, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3 },
+                { "matrix": [3, 3], "x": 3.75, "y": 3 },
+                { "matrix": [3, 4], "x": 4.75, "y": 3 },
+                { "matrix": [3, 5], "x": 5.75, "y": 3 },
+                { "matrix": [3, 6], "x": 6.75, "y": 3 },
+                { "matrix": [3, 7], "x": 7.75, "y": 3 },
+                { "matrix": [3, 8], "x": 8.75, "y": 3 },
+                { "matrix": [3, 9], "x": 9.75, "y": 3 },
+                { "matrix": [3, 10], "x": 10.75, "y": 3 },
+                { "matrix": [3, 11], "x": 11.75, "y": 3 },
+                { "matrix": [3, 12], "x": 12.75, "y": 3 },
+                { "matrix": [3, 13], "x": 13.75, "y": 3 },
+                { "matrix": [3, 14], "w": 1.75, "x": 14.75, "y": 3 },
+                { "matrix": [3, 15], "x": 16.5, "y": 3 },
+                { "matrix": [3, 16], "x": 17.5, "y": 3 },
+                { "matrix": [4, 0], "x": 0, "y": 4 },
+                { "matrix": [4, 1], "x": 1, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 3], "w": 1.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 4], "w": 1.25, "x": 5, "y": 4 },
+                { "matrix": [4, 9], "w": 6.25, "x": 6.25, "y": 4 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 },
+                { "matrix": [4, 14], "x": 15.5, "y": 4 },
+                { "matrix": [4, 15], "x": 16.5, "y": 4 },
+                { "matrix": [4, 16], "x": 17.5, "y": 4 }
             ]
         }
    
diff --git a/keyboards/akb/raine/config.h b/keyboards/akb/raine/config.h
index 1f717ab436..4ffa418a09 100644
--- a/keyboards/akb/raine/config.h
+++ b/keyboards/akb/raine/config.h
@@ -16,16 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-  { E6, C6, F7, B2, B0 }
-#define MATRIX_COL_PINS \
-  { F6, F5, F4, B1, F1, F0, B3, B7, D0, D1, D2, D3, D5, D4, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/akb/raine/info.json b/keyboards/akb/raine/info.json
index f6f648e137..9fe50b25af 100644
--- a/keyboards/akb/raine/info.json
+++ b/keyboards/akb/raine/info.json
@@ -7,6 +7,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "B1", "F1", "F0", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
+        "rows": ["E6", "C6", "F7", "B2", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/akb/raine/raine.c b/keyboards/akb/raine/raine.c
deleted file mode 100644
index d73db4409b..0000000000
--- a/keyboards/akb/raine/raine.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2019 Elliot Powell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "raine.h"
diff --git a/keyboards/akb/vero/info.json b/keyboards/akb/vero/info.json
index 39f5422b53..637f3014d7 100644
--- a/keyboards/akb/vero/info.json
+++ b/keyboards/akb/vero/info.json
@@ -30,68 +30,68 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 1], "x": 1.25, "y": 3.0 },
-                { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "matrix": [3, 13], "x": 14.0, "y": 3.0 },
-                { "matrix": [4, 1], "x": 1.5, "y": 4.0 },
-                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 5], "w": 3.0, "x": 4.0, "y": 4.0 },
-                { "matrix": [4, 7], "w": 3.0, "x": 7.0, "y": 4.0 },
-                { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 },
-                { "matrix": [4, 11], "x": 11.5, "y": 4.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [0, 14], "x": 14, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 5], "w": 3, "x": 4, "y": 4 },
+                { "matrix": [4, 7], "w": 3, "x": 7, "y": 4 },
+                { "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "x": 11.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/akegata_denki/device_one/config.h b/keyboards/akegata_denki/device_one/config.h
deleted file mode 100644
index dc1e1cded3..0000000000
--- a/keyboards/akegata_denki/device_one/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B1, B0, A9, A8, A0 }
-#define MATRIX_COL_PINS { A2, A3, A4, A5, A6, A7, A1, A10, A15, B3, B4, B5, B6, B7, B8}
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/akegata_denki/device_one/device_one.c b/keyboards/akegata_denki/device_one/device_one.c
deleted file mode 100644
index 06e03ee893..0000000000
--- a/keyboards/akegata_denki/device_one/device_one.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "device_one.h"
diff --git a/keyboards/akegata_denki/device_one/info.json b/keyboards/akegata_denki/device_one/info.json
index a00144adf7..59449c4754 100644
--- a/keyboards/akegata_denki/device_one/info.json
+++ b/keyboards/akegata_denki/device_one/info.json
@@ -6,7 +6,12 @@
     "vid": "0xFEED",
     "pid": "0xADD0",
     "device_version": "0.0.1"
-    },
+  },
+  "matrix_pins": {
+    "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "A1", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+    "rows": ["B1", "B0", "A9", "A8", "A0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F042",
   "bootloader": "stm32-dfu",
   "board": "ST_NUCLEO32_F042K6",
diff --git a/keyboards/al1/al1.c b/keyboards/al1/al1.c
deleted file mode 100644
index a7d3980ece..0000000000
--- a/keyboards/al1/al1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "al1.h"
diff --git a/keyboards/alas/config.h b/keyboards/alas/config.h
index 95a8e7bcdb..a442481560 100644
--- a/keyboards/alas/config.h
+++ b/keyboards/alas/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 }
-#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the RESET keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
diff --git a/keyboards/alas/info.json b/keyboards/alas/info.json
index aa87efaae3..1563fd843c 100755
--- a/keyboards/alas/info.json
+++ b/keyboards/alas/info.json
@@ -8,6 +8,11 @@
         "pid": "0x414C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
index 148e9a7672..3b4ca30314 100644
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@@ -18,14 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SELECT_SOFT_SERIAL_SPEED 1
 
-#define DIODE_DIRECTION COL2ROW
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, F4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define RGB_DI_PIN B5
-
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 68
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
index 8211117625..3df4fb4c34 100644
--- a/keyboards/aleblazer/zodiark/info.json
+++ b/keyboards/aleblazer/zodiark/info.json
@@ -8,6 +8,17 @@
         "pid": "0xF902",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D4", "resolution": 3}
diff --git a/keyboards/aleblazer/zodiark/rules.mk b/keyboards/aleblazer/zodiark/rules.mk
index 402cbe3fbb..3f1afb07c1 100644
--- a/keyboards/aleblazer/zodiark/rules.mk
+++ b/keyboards/aleblazer/zodiark/rules.mk
@@ -15,4 +15,3 @@ OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; C
 ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
index e81b6a2010..b94b584df0 100644
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -50,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/alf/dc60/dc60.c b/keyboards/alf/dc60/dc60.c
deleted file mode 100644
index 4096d10a64..0000000000
--- a/keyboards/alf/dc60/dc60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dc60.h"
diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json
index faf199d8a0..9b5b806929 100644
--- a/keyboards/alf/dc60/info.json
+++ b/keyboards/alf/dc60/info.json
@@ -7,11 +7,19 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "indicators": {
         "caps_lock": "B7",
         "on_state": 0
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
index 04ebe0c657..467b15b1c5 100644
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 28
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json
index 8b3ae6f2ba..2eb6697f9c 100644
--- a/keyboards/alf/x11/info.json
+++ b/keyboards/alf/x11/info.json
@@ -8,10 +8,18 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "breathing": true
   },
+  "ws2812": {
+    "pin": "F7"
+  },
   "indicators": {
     "caps_lock": "C6",
     "num_lock": "E6",
diff --git a/keyboards/alf/x11/x11.c b/keyboards/alf/x11/x11.c
deleted file mode 100644
index 28e77ecd3f..0000000000
--- a/keyboards/alf/x11/x11.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "x11.h"
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
index 374873d5d5..c982289a0b 100644
--- a/keyboards/alf/x2/config.h
+++ b/keyboards/alf/x2/config.h
@@ -16,24 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS \
-    { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION   COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,4 +36,3 @@
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json
index 5e0b3087a8..7619f6ed66 100644
--- a/keyboards/alf/x2/info.json
+++ b/keyboards/alf/x2/info.json
@@ -8,10 +8,18 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "backlight": {
         "pin": "B6"
     },
diff --git a/keyboards/alf/x2/x2.c b/keyboards/alf/x2/x2.c
deleted file mode 100644
index e4352296b9..0000000000
--- a/keyboards/alf/x2/x2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 @fixed
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "x2.h"
diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h
index 585855ebe9..8fc29553d6 100644
--- a/keyboards/alfredslab/swift65/hotswap/config.h
+++ b/keyboards/alfredslab/swift65/hotswap/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B2, B3, D6, D4 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, C6, B6, B5, B4, D7, D5, D3, D1 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 22
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -51,4 +33,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/alfredslab/swift65/hotswap/hotswap.c b/keyboards/alfredslab/swift65/hotswap/hotswap.c
deleted file mode 100644
index 83546fff4e..0000000000
--- a/keyboards/alfredslab/swift65/hotswap/hotswap.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Steven Phillips (spooknik)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "hotswap.h"
-
diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json
index 89ac7c7b17..2e7f9bf2c2 100644
--- a/keyboards/alfredslab/swift65/hotswap/info.json
+++ b/keyboards/alfredslab/swift65/hotswap/info.json
@@ -8,6 +8,14 @@
         "pid": "0xD4C4",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1"],
+        "rows": ["B1", "B2", "B3", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h
index aa2502a0a1..79c1824d08 100644
--- a/keyboards/alfredslab/swift65/solder/config.h
+++ b/keyboards/alfredslab/swift65/solder/config.h
@@ -17,24 +17,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B2, B3, D4, D6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, C6, B6, B5, B4, D7, D5, D3, D1, D0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 14
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -51,4 +33,3 @@
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json
index 0f1d9c428e..79583e099c 100644
--- a/keyboards/alfredslab/swift65/solder/info.json
+++ b/keyboards/alfredslab/swift65/solder/info.json
@@ -8,6 +8,14 @@
         "pid": "0xD4C3",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1", "D0"],
+        "rows": ["B1", "B2", "B3", "D4", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/alfredslab/swift65/solder/solder.c b/keyboards/alfredslab/swift65/solder/solder.c
deleted file mode 100644
index 4dd021ba7c..0000000000
--- a/keyboards/alfredslab/swift65/solder/solder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Steven Phillips (spooknik)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "solder.h"
diff --git a/keyboards/aliceh66/pianoforte/config.h b/keyboards/aliceh66/pianoforte/config.h
index 40d071201a..91e0225569 100644
--- a/keyboards/aliceh66/pianoforte/config.h
+++ b/keyboards/aliceh66/pianoforte/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, F1, F0, E6, B6 }
-#define MATRIX_ROW_PINS { D1, D0, D3, D2, D5, B0, C6, C7, F6, F7, F5, F4 }
-#define DIODE_DIRECTION COL2ROW
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/info.json
index 56e2bf2cdf..8a7ec075bc 100644
--- a/keyboards/aliceh66/pianoforte/info.json
+++ b/keyboards/aliceh66/pianoforte/info.json
@@ -8,499 +8,549 @@
         "pid": "0x7066",
         "vid": "0x6168"
     },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "F1", "F0", "E6", "B6"],
+        "rows": ["D1", "D0", "D3", "D2", "D5", "B0", "C6", "C7", "F6", "F7", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_f13_ansi", "tkl_f13_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-				{"label":"Esc", "x":0, "y":0}, 
-				{"label":"F1", "x":1.25, "y":0}, 
-				{"label":"F2", "x":2.25, "y":0}, 
-				{"label":"F3", "x":3.25, "y":0}, 
-				{"label":"F4", "x":4.25, "y":0}, 
-				{"label":"F5", "x":5.5, "y":0}, 
-				{"label":"F6", "x":6.5, "y":0}, 
-				{"label":"F7", "x":7.5, "y":0}, 
-				{"label":"F8", "x":8.5, "y":0}, 
-				{"label":"F9", "x":9.75, "y":0}, 
-				{"label":"F10", "x":10.75, "y":0}, 
-				{"label":"F11", "x":11.75, "y":0}, 
-				{"label":"F12", "x":12.75, "y":0}, 
-				{"label":"F13", "x":14, "y":0}, 
-				{"label":"PrtSc", "x":15.25, "y":0}, 
-				{"label":"Scroll Lock", "x":16.25, "y":0}, 
-				{"label":"Pause Break", "x":17.25, "y":0}, 
-				
-				{"label":"`~", "x":0, "y":1.25}, 
-				{"label":"1!", "x":1, "y":1.25}, 
-				{"label":"2@", "x":2, "y":1.25}, 
-				{"label":"3#", "x":3, "y":1.25}, 
-				{"label":"4$", "x":4, "y":1.25}, 
-				{"label":"5%", "x":5, "y":1.25}, 
-				{"label":"6^", "x":6, "y":1.25}, 
-				{"label":"7&", "x":7, "y":1.25}, 
-				{"label":"8*", "x":8, "y":1.25}, 
-				{"label":"9(", "x":9, "y":1.25}, 
-				{"label":"0)", "x":10, "y":1.25}, 
-				{"label":"-_", "x":11, "y":1.25}, 
-				{"label":"=+", "x":12, "y":1.25},
-				{"label":"Backspace", "x":13, "y":1.25},
-				{"label":"SB2", "x":14, "y":1.25},
-				{"label":"Insert", "x":15.25, "y":1.25}, 
-				{"label":"Home", "x":16.25, "y":1.25}, 
-				{"label":"PgUp", "x":17.25, "y":1.25}, 
-				
-				{"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-				{"label":"Q", "x":1.5, "y":2.25}, 
-				{"label":"W", "x":2.5, "y":2.25}, 
-				{"label":"E", "x":3.5, "y":2.25}, 
-				{"label":"R", "x":4.5, "y":2.25}, 
-				{"label":"T", "x":5.5, "y":2.25}, 
-				{"label":"Y", "x":6.5, "y":2.25}, 
-				{"label":"U", "x":7.5, "y":2.25}, 
-				{"label":"I", "x":8.5, "y":2.25}, 
-				{"label":"O", "x":9.5, "y":2.25}, 
-				{"label":"P", "x":10.5, "y":2.25}, 
-				{"label":"[{", "x":11.5, "y":2.25}, 
-				{"label":"]}", "x":12.5, "y":2.25}, 
-				{"label":"Pipe", "x":13.5, "y":2.25, "w":1.5}, 
-				{"label":"Delete", "x":15.25, "y":2.25}, 
-				{"label":"End", "x":16.25, "y":2.25}, 
-				{"label":"PgDn", "x":17.25, "y":2.25}, 
-				
-				{"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-				{"label":"A", "x":1.75, "y":3.25}, 
-				{"label":"S", "x":2.75, "y":3.25}, 
-				{"label":"D", "x":3.75, "y":3.25}, 
-				{"label":"F", "x":4.75, "y":3.25}, 
-				{"label":"G", "x":5.75, "y":3.25}, 
-				{"label":"H", "x":6.75, "y":3.25}, 
-				{"label":"J", "x":7.75, "y":3.25}, 
-				{"label":"K", "x":8.75, "y":3.25}, 
-				{"label":"L", "x":9.75, "y":3.25}, 
-				{"label":";:", "x":10.75, "y":3.25}, 
-				{"label":"'\"", "x":11.75, "y":3.25}, 
-				{"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
-				
-				{"label":"Shift", "x":0, "y":4.25, "w":1.25},
-				{"label":"ISO Pipe", "x":1.25, "y":4.25}, 
-				{"label":"Z", "x":2.25, "y":4.25}, 
-				{"label":"X", "x":3.25, "y":4.25}, 
-				{"label":"C", "x":4.25, "y":4.25}, 
-				{"label":"V", "x":5.25, "y":4.25}, 
-				{"label":"B", "x":6.25, "y":4.25}, 
-				{"label":"N", "x":7.25, "y":4.25}, 
-				{"label":"M", "x":8.25, "y":4.25}, 
-				{"label":"<", "x":9.25, "y":4.25}, 
-				{"label":">", "x":10.25, "y":4.25}, 
-				{"label":"?", "x":11.25, "y":4.25}, 
-				{"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-				{"label":"Shift", "x":12.24, "y":4.25, "w":1.75},
-				{"label":"Fn", "x":14, "y":4.25},
-				{"label":"\u2191", "x":16.25, "y":4.25}, 
-				
-				{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-				{"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-				{"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-				{"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-				{"label":"Alt", "x":10, "y":5.25},
-				{"label":"Alt", "x":11, "y":5.25},
-				{"label":"Win", "x":12, "y":5.25},
-				{"label": "MO(1)", "x":13, "y": 5.25},
-				{"label":"Ctrl", "x":14, "y":5.25}, 
-				{"label":"\u2190", "x":15.25, "y":5.25}, 
-				{"label":"\u2193", "x":16.25, "y":5.25}, 
-				{"label":"\u2192", "x":17.25, "y":5.25}
-			]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 0], "x": 17.25, "y": 1.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 5.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [6, 7], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 6], "x": 12.24, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [9, 7], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 3], "x": 10, "y": 5.25},
+                {"matrix": [10, 5], "x": 11, "y": 5.25},
+                {"matrix": [11, 5], "x": 12, "y": 5.25},
+                {"matrix": [10, 6], "x": 13, "y": 5.25},
+                {"matrix": [11, 6], "x": 14, "y": 5.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
         },
-		"LAYOUT_tkl_f13_ansi": {
-			"layout": [
-				{"label":"Esc", "x":0, "y":0}, 
-				{"label":"F1", "x":1.25, "y":0}, 
-				{"label":"F2", "x":2.25, "y":0}, 
-				{"label":"F3", "x":3.25, "y":0}, 
-				{"label":"F4", "x":4.25, "y":0}, 
-				{"label":"F5", "x":5.5, "y":0}, 
-				{"label":"F6", "x":6.5, "y":0}, 
-				{"label":"F7", "x":7.5, "y":0}, 
-				{"label":"F8", "x":8.5, "y":0}, 
-				{"label":"F9", "x":9.75, "y":0}, 
-				{"label":"F10", "x":10.75, "y":0}, 
-				{"label":"F11", "x":11.75, "y":0}, 
-				{"label":"F12", "x":12.75, "y":0}, 
-				{"label":"F13", "x":14, "y":0}, 
-				{"label":"PrtSc", "x":15.25, "y":0}, 
-				{"label":"Scroll Lock", "x":16.25, "y":0}, 
-				{"label":"Pause Break", "x":17.25, "y":0}, 
-				
-				{"label":"`~", "x":0, "y":1.25}, 
-				{"label":"1!", "x":1, "y":1.25}, 
-				{"label":"2@", "x":2, "y":1.25}, 
-				{"label":"3#", "x":3, "y":1.25}, 
-				{"label":"4$", "x":4, "y":1.25}, 
-				{"label":"5%", "x":5, "y":1.25}, 
-				{"label":"6^", "x":6, "y":1.25}, 
-				{"label":"7&", "x":7, "y":1.25}, 
-				{"label":"8*", "x":8, "y":1.25}, 
-				{"label":"9(", "x":9, "y":1.25}, 
-				{"label":"0)", "x":10, "y":1.25}, 
-				{"label":"-_", "x":11, "y":1.25}, 
-				{"label":"=+", "x":12, "y":1.25},
-				{"label":"Backspace", "x":13, "y":1.25, "w":2},
-				{"label":"Insert", "x":15.25, "y":1.25}, 
-				{"label":"Home", "x":16.25, "y":1.25}, 
-				{"label":"PgUp", "x":17.25, "y":1.25}, 
-				
-				{"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-				{"label":"Q", "x":1.5, "y":2.25}, 
-				{"label":"W", "x":2.5, "y":2.25}, 
-				{"label":"E", "x":3.5, "y":2.25}, 
-				{"label":"R", "x":4.5, "y":2.25}, 
-				{"label":"T", "x":5.5, "y":2.25}, 
-				{"label":"Y", "x":6.5, "y":2.25}, 
-				{"label":"U", "x":7.5, "y":2.25}, 
-				{"label":"I", "x":8.5, "y":2.25}, 
-				{"label":"O", "x":9.5, "y":2.25}, 
-				{"label":"P", "x":10.5, "y":2.25}, 
-				{"label":"[{", "x":11.5, "y":2.25}, 
-				{"label":"]}", "x":12.5, "y":2.25}, 
-				{"label":"Pipe", "x":13.5, "y":2.25, "w":1.5}, 
-				{"label":"Delete", "x":15.25, "y":2.25}, 
-				{"label":"End", "x":16.25, "y":2.25}, 
-				{"label":"PgDn", "x":17.25, "y":2.25}, 
-				
-				{"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-				{"label":"A", "x":1.75, "y":3.25}, 
-				{"label":"S", "x":2.75, "y":3.25}, 
-				{"label":"D", "x":3.75, "y":3.25}, 
-				{"label":"F", "x":4.75, "y":3.25}, 
-				{"label":"G", "x":5.75, "y":3.25}, 
-				{"label":"H", "x":6.75, "y":3.25}, 
-				{"label":"J", "x":7.75, "y":3.25}, 
-				{"label":"K", "x":8.75, "y":3.25}, 
-				{"label":"L", "x":9.75, "y":3.25}, 
-				{"label":";:", "x":10.75, "y":3.25}, 
-				{"label":"'\"", "x":11.75, "y":3.25}, 
-				{"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
-				
-				{"label":"Shift", "x":0, "y":4.25, "w":2.25}, 
-				{"label":"Z", "x":2.25, "y":4.25}, 
-				{"label":"X", "x":3.25, "y":4.25}, 
-				{"label":"C", "x":4.25, "y":4.25}, 
-				{"label":"V", "x":5.25, "y":4.25}, 
-				{"label":"B", "x":6.25, "y":4.25}, 
-				{"label":"N", "x":7.25, "y":4.25}, 
-				{"label":"M", "x":8.25, "y":4.25}, 
-				{"label":"<", "x":9.25, "y":4.25}, 
-				{"label":">", "x":10.25, "y":4.25}, 
-				{"label":"?", "x":11.25, "y":4.25}, 
-				{"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-				{"label":"\u2191", "x":16.25, "y":4.25}, 
-				
-				{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-				{"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-				{"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-				{"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-				{"label":"Alt", "x":10, "y":5.25, "w":1.25},
-				{"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-				{"label":"MO(1)", "x":12.5, "y":5.25, "w":1.25},
-				{"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
-				{"label":"\u2190", "x":15.25, "y":5.25}, 
-				{"label":"\u2193", "x":16.25, "y":5.25}, 
-				{"label":"\u2192", "x":17.25, "y":5.25}
-			]
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
         },
-		"LAYOUT_tkl_f13_iso": {
-			"layout": [
-				{"label":"Esc", "x":0, "y":0}, 
-				{"label":"F1", "x":1.25, "y":0}, 
-				{"label":"F2", "x":2.25, "y":0}, 
-				{"label":"F3", "x":3.25, "y":0}, 
-				{"label":"F4", "x":4.25, "y":0}, 
-				{"label":"F5", "x":5.5, "y":0}, 
-				{"label":"F6", "x":6.5, "y":0}, 
-				{"label":"F7", "x":7.5, "y":0}, 
-				{"label":"F8", "x":8.5, "y":0}, 
-				{"label":"F9", "x":9.75, "y":0}, 
-				{"label":"F10", "x":10.75, "y":0}, 
-				{"label":"F11", "x":11.75, "y":0}, 
-				{"label":"F12", "x":12.75, "y":0}, 
-				{"label":"F13", "x":14, "y":0}, 
-				{"label":"PrtSc", "x":15.25, "y":0}, 
-				{"label":"Scroll Lock", "x":16.25, "y":0}, 
-				{"label":"Pause Break", "x":17.25, "y":0}, 
-				
-				{"label":"`~", "x":0, "y":1.25}, 
-				{"label":"1!", "x":1, "y":1.25}, 
-				{"label":"2@", "x":2, "y":1.25}, 
-				{"label":"3#", "x":3, "y":1.25}, 
-				{"label":"4$", "x":4, "y":1.25}, 
-				{"label":"5%", "x":5, "y":1.25}, 
-				{"label":"6^", "x":6, "y":1.25}, 
-				{"label":"7&", "x":7, "y":1.25}, 
-				{"label":"8*", "x":8, "y":1.25}, 
-				{"label":"9(", "x":9, "y":1.25}, 
-				{"label":"0)", "x":10, "y":1.25}, 
-				{"label":"-_", "x":11, "y":1.25}, 
-				{"label":"=+", "x":12, "y":1.25},
-				{"label":"Backspace", "x":13, "y":1.25, "w":2},
-				{"label":"Insert", "x":15.25, "y":1.25}, 
-				{"label":"Home", "x":16.25, "y":1.25}, 
-				{"label":"PgUp", "x":17.25, "y":1.25}, 
-				
-				{"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-				{"label":"Q", "x":1.5, "y":2.25}, 
-				{"label":"W", "x":2.5, "y":2.25}, 
-				{"label":"E", "x":3.5, "y":2.25}, 
-				{"label":"R", "x":4.5, "y":2.25}, 
-				{"label":"T", "x":5.5, "y":2.25}, 
-				{"label":"Y", "x":6.5, "y":2.25}, 
-				{"label":"U", "x":7.5, "y":2.25}, 
-				{"label":"I", "x":8.5, "y":2.25}, 
-				{"label":"O", "x":9.5, "y":2.25}, 
-				{"label":"P", "x":10.5, "y":2.25}, 
-				{"label":"[{", "x":11.5, "y":2.25},
-				{"label":"]}", "x":12.5, "y":2.25},
-				{"label":"Delete", "x":15.25, "y":2.25}, 
-				{"label":"End", "x":16.25, "y":2.25}, 
-				{"label":"PgDn", "x":17.25, "y":2.25}, 
-				
-				{"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-				{"label":"A", "x":1.75, "y":3.25}, 
-				{"label":"S", "x":2.75, "y":3.25}, 
-				{"label":"D", "x":3.75, "y":3.25}, 
-				{"label":"F", "x":4.75, "y":3.25}, 
-				{"label":"G", "x":5.75, "y":3.25}, 
-				{"label":"H", "x":6.75, "y":3.25}, 
-				{"label":"J", "x":7.75, "y":3.25}, 
-				{"label":"K", "x":8.75, "y":3.25}, 
-				{"label":"L", "x":9.75, "y":3.25}, 
-				{"label":";:", "x":10.75, "y":3.25},
-				{"label":"'", "x":11.75, "y":3.25},
-				{"label":"ISO #", "x":12.75, "y":3.25}, 
-				{"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, 
-				
-				{"label":"Shift", "x":0, "y":4.25, "w":1.25},
-				{"label":"ISO Pipe", "x":1.25, "y":4.25},
-				{"label":"Z", "x":2.25, "y":4.25}, 
-				{"label":"X", "x":3.25, "y":4.25}, 
-				{"label":"C", "x":4.25, "y":4.25}, 
-				{"label":"V", "x":5.25, "y":4.25}, 
-				{"label":"B", "x":6.25, "y":4.25}, 
-				{"label":"N", "x":7.25, "y":4.25}, 
-				{"label":"M", "x":8.25, "y":4.25}, 
-				{"label":"<", "x":9.25, "y":4.25}, 
-				{"label":">", "x":10.25, "y":4.25}, 
-				{"label":"?", "x":11.25, "y":4.25}, 
-				{"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-				{"label":"\u2191", "x":16.25, "y":4.25}, 
-				
-				{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-				{"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-				{"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-				{"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-				{"label":"Alt", "x":10, "y":5.25, "w":1.25},
-				{"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-				{"label":"MO(1)", "x":12.5, "y":5.25, "w":1.25},
-				{"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
-				{"label":"\u2190", "x":15.25, "y":5.25}, 
-				{"label":"\u2193", "x":16.25, "y":5.25}, 
-				{"label":"\u2192", "x":17.25, "y":5.25}
-			]				
-		},
-		"LAYOUT_tkl_ansi_7u": {
-			"layout": [
-				{"label":"Esc", "x":0, "y":0}, 
-				{"label":"F1", "x":1.25, "y":0}, 
-				{"label":"F2", "x":2.25, "y":0}, 
-				{"label":"F3", "x":3.25, "y":0}, 
-				{"label":"F4", "x":4.25, "y":0}, 
-				{"label":"F5", "x":5.5, "y":0}, 
-				{"label":"F6", "x":6.5, "y":0}, 
-				{"label":"F7", "x":7.5, "y":0}, 
-				{"label":"F8", "x":8.5, "y":0}, 
-				{"label":"F9", "x":9.75, "y":0}, 
-				{"label":"F10", "x":10.75, "y":0}, 
-				{"label":"F11", "x":11.75, "y":0}, 
-				{"label":"F12", "x":12.75, "y":0}, 
-				{"label":"F13", "x":14, "y":0}, 
-				{"label":"PrtSc", "x":15.25, "y":0}, 
-				{"label":"Scroll Lock", "x":16.25, "y":0}, 
-				{"label":"Pause Break", "x":17.25, "y":0}, 
-				
-				{"label":"`~", "x":0, "y":1.25}, 
-				{"label":"1!", "x":1, "y":1.25}, 
-				{"label":"2@", "x":2, "y":1.25}, 
-				{"label":"3#", "x":3, "y":1.25}, 
-				{"label":"4$", "x":4, "y":1.25}, 
-				{"label":"5%", "x":5, "y":1.25}, 
-				{"label":"6^", "x":6, "y":1.25}, 
-				{"label":"7&", "x":7, "y":1.25}, 
-				{"label":"8*", "x":8, "y":1.25}, 
-				{"label":"9(", "x":9, "y":1.25}, 
-				{"label":"0)", "x":10, "y":1.25}, 
-				{"label":"-_", "x":11, "y":1.25}, 
-				{"label":"=+", "x":12, "y":1.25},
-				{"label":"Backspace", "x":13, "y":1.25, "w":2},
-				{"label":"Insert", "x":15.25, "y":1.25}, 
-				{"label":"Home", "x":16.25, "y":1.25}, 
-				{"label":"PgUp", "x":17.25, "y":1.25}, 
-				
-				{"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-				{"label":"Q", "x":1.5, "y":2.25}, 
-				{"label":"W", "x":2.5, "y":2.25}, 
-				{"label":"E", "x":3.5, "y":2.25}, 
-				{"label":"R", "x":4.5, "y":2.25}, 
-				{"label":"T", "x":5.5, "y":2.25}, 
-				{"label":"Y", "x":6.5, "y":2.25}, 
-				{"label":"U", "x":7.5, "y":2.25}, 
-				{"label":"I", "x":8.5, "y":2.25}, 
-				{"label":"O", "x":9.5, "y":2.25}, 
-				{"label":"P", "x":10.5, "y":2.25}, 
-				{"label":"[{", "x":11.5, "y":2.25}, 
-				{"label":"]}", "x":12.5, "y":2.25}, 
-				{"label":"Pipe", "x":13.5, "y":2.25, "w":1.5}, 
-				{"label":"Delete", "x":15.25, "y":2.25}, 
-				{"label":"End", "x":16.25, "y":2.25}, 
-				{"label":"PgDn", "x":17.25, "y":2.25}, 
-				
-				{"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-				{"label":"A", "x":1.75, "y":3.25}, 
-				{"label":"S", "x":2.75, "y":3.25}, 
-				{"label":"D", "x":3.75, "y":3.25}, 
-				{"label":"F", "x":4.75, "y":3.25}, 
-				{"label":"G", "x":5.75, "y":3.25}, 
-				{"label":"H", "x":6.75, "y":3.25}, 
-				{"label":"J", "x":7.75, "y":3.25}, 
-				{"label":"K", "x":8.75, "y":3.25}, 
-				{"label":"L", "x":9.75, "y":3.25}, 
-				{"label":";:", "x":10.75, "y":3.25}, 
-				{"label":"'\"", "x":11.75, "y":3.25}, 
-				{"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
-				
-				{"label":"Shift", "x":0, "y":4.25, "w":2.25}, 
-				{"label":"Z", "x":2.25, "y":4.25}, 
-				{"label":"X", "x":3.25, "y":4.25}, 
-				{"label":"C", "x":4.25, "y":4.25}, 
-				{"label":"V", "x":5.25, "y":4.25}, 
-				{"label":"B", "x":6.25, "y":4.25}, 
-				{"label":"N", "x":7.25, "y":4.25}, 
-				{"label":"M", "x":8.25, "y":4.25}, 
-				{"label":"<", "x":9.25, "y":4.25}, 
-				{"label":">", "x":10.25, "y":4.25}, 
-				{"label":"?", "x":11.25, "y":4.25}, 
-				{"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-				{"label":"\u2191", "x":16.25, "y":4.25}, 
-				
-				{"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-				{"label":"Win", "x":1.5, "y":5.25},
-				{"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-				{"label":"Space", "x":4, "y":5.25, "w":7},
-				{"label":"Alt", "x":11, "y":5.25, "w":1.5},
-				{"label":"Win", "x":12.5, "y":5.25},
-				{"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, 
-				{"label":"\u2190", "x":15.25, "y":5.25}, 
-				{"label":"\u2193", "x":16.25, "y":5.25}, 
-				{"label":"\u2192", "x":17.25, "y":5.25}
-			]
-		},
-		"LAYOUT_tkl_iso_7u": {
-			"layout": [
-				{"label":"Esc", "x":0, "y":0}, 
-				{"label":"F1", "x":1.25, "y":0}, 
-				{"label":"F2", "x":2.25, "y":0}, 
-				{"label":"F3", "x":3.25, "y":0}, 
-				{"label":"F4", "x":4.25, "y":0}, 
-				{"label":"F5", "x":5.5, "y":0}, 
-				{"label":"F6", "x":6.5, "y":0}, 
-				{"label":"F7", "x":7.5, "y":0}, 
-				{"label":"F8", "x":8.5, "y":0}, 
-				{"label":"F9", "x":9.75, "y":0}, 
-				{"label":"F10", "x":10.75, "y":0}, 
-				{"label":"F11", "x":11.75, "y":0}, 
-				{"label":"F12", "x":12.75, "y":0}, 
-				{"label":"F13", "x":14, "y":0}, 
-				{"label":"PrtSc", "x":15.25, "y":0}, 
-				{"label":"Scroll Lock", "x":16.25, "y":0}, 
-				{"label":"Pause Break", "x":17.25, "y":0}, 
-				
-				{"label":"`~", "x":0, "y":1.25}, 
-				{"label":"1!", "x":1, "y":1.25}, 
-				{"label":"2@", "x":2, "y":1.25}, 
-				{"label":"3#", "x":3, "y":1.25}, 
-				{"label":"4$", "x":4, "y":1.25}, 
-				{"label":"5%", "x":5, "y":1.25}, 
-				{"label":"6^", "x":6, "y":1.25}, 
-				{"label":"7&", "x":7, "y":1.25}, 
-				{"label":"8*", "x":8, "y":1.25}, 
-				{"label":"9(", "x":9, "y":1.25}, 
-				{"label":"0)", "x":10, "y":1.25}, 
-				{"label":"-_", "x":11, "y":1.25}, 
-				{"label":"=+", "x":12, "y":1.25},
-				{"label":"Backspace", "x":13, "y":1.25, "w":2},
-				{"label":"Insert", "x":15.25, "y":1.25}, 
-				{"label":"Home", "x":16.25, "y":1.25}, 
-				{"label":"PgUp", "x":17.25, "y":1.25}, 
-				
-				{"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-				{"label":"Q", "x":1.5, "y":2.25}, 
-				{"label":"W", "x":2.5, "y":2.25}, 
-				{"label":"E", "x":3.5, "y":2.25}, 
-				{"label":"R", "x":4.5, "y":2.25}, 
-				{"label":"T", "x":5.5, "y":2.25}, 
-				{"label":"Y", "x":6.5, "y":2.25}, 
-				{"label":"U", "x":7.5, "y":2.25}, 
-				{"label":"I", "x":8.5, "y":2.25}, 
-				{"label":"O", "x":9.5, "y":2.25}, 
-				{"label":"P", "x":10.5, "y":2.25}, 
-				{"label":"[{", "x":11.5, "y":2.25},  
-				{"label":"]}", "x":12.5, "y":2.25},				
-				{"label":"Delete", "x":15.25, "y":2.25}, 
-				{"label":"End", "x":16.25, "y":2.25}, 
-				{"label":"PgDn", "x":17.25, "y":2.25}, 
-				
-				{"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-				{"label":"A", "x":1.75, "y":3.25}, 
-				{"label":"S", "x":2.75, "y":3.25}, 
-				{"label":"D", "x":3.75, "y":3.25}, 
-				{"label":"F", "x":4.75, "y":3.25}, 
-				{"label":"G", "x":5.75, "y":3.25}, 
-				{"label":"H", "x":6.75, "y":3.25}, 
-				{"label":"J", "x":7.75, "y":3.25}, 
-				{"label":"K", "x":8.75, "y":3.25}, 
-				{"label":"L", "x":9.75, "y":3.25}, 
-				{"label":";:", "x":10.75, "y":3.25},
-				{"label":"'", "x":11.75, "y":3.25},
-				{"label":"ISO #", "x":12.75, "y":3.25}, 
-				{"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, 
-				
-				{"label":"Shift", "x":0, "y":4.25, "w":1.25},
-				{"label":"ISO Pipe", "x":1.25, "y":4.25},
-				{"label":"Z", "x":2.25, "y":4.25}, 
-				{"label":"X", "x":3.25, "y":4.25}, 
-				{"label":"C", "x":4.25, "y":4.25}, 
-				{"label":"V", "x":5.25, "y":4.25}, 
-				{"label":"B", "x":6.25, "y":4.25}, 
-				{"label":"N", "x":7.25, "y":4.25}, 
-				{"label":"M", "x":8.25, "y":4.25}, 
-				{"label":"<", "x":9.25, "y":4.25}, 
-				{"label":">", "x":10.25, "y":4.25}, 
-				{"label":"?", "x":11.25, "y":4.25}, 
-				{"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-				{"label":"\u2191", "x":16.25, "y":4.25}, 
-				
-				{"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-				{"label":"Win", "x":1.5, "y":5.25},
-				{"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-				{"label":"Space", "x":4, "y":5.25, "w":7},
-				{"label":"Alt", "x":11, "y":5.25, "w":1.5},
-				{"label":"Win", "x":12.5, "y":5.25},
-				{"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, 
-				{"label":"\u2190", "x":15.25, "y":5.25}, 
-				{"label":"\u2193", "x":16.25, "y":5.25}, 
-				{"label":"\u2192", "x":17.25, "y":5.25}
-			]
-		}
-	}
+        "LAYOUT_tkl_ansi_7u": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_7u": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
 }
\ No newline at end of file
diff --git a/keyboards/aliceh66/pianoforte/pianoforte.c b/keyboards/aliceh66/pianoforte/pianoforte.c
deleted file mode 100644
index 3531744aef..0000000000
--- a/keyboards/aliceh66/pianoforte/pianoforte.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 AliceH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "pianoforte.h"
diff --git a/keyboards/aliceh66/pianoforte/pianoforte.h b/keyboards/aliceh66/pianoforte/pianoforte.h
deleted file mode 100644
index 614af44cfe..0000000000
--- a/keyboards/aliceh66/pianoforte/pianoforte.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-Copyright 2022 AliceH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_all( \
-	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056, K047, K057, K048, \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K066, K076, K067, \
-	K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K086, K096, K087, K097, \
-	K100, K110, K101,                   K113,                   K105, K115, K106, K116, K107, K117, K108 \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \
-	{ K010, K011, K012, K013, K014, K015, K016, K017, ____ }, \
-	{ K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \
-	{ K030, K031, K032, K033, K034, K035, K036, K037, ____ }, \
-	{ K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \
-	{ K050, K051, K052, K053, K054, K055, K056, K057, ____ }, \
-	{ K060, K061, K062, K063, K064, K065, K066, K067, ____ }, \
-	{ K070, K071, K072, K073, K074, K075, K076, ____, ____ }, \
-	{ K080, K081, K082, K083, K084, K085, K086, K087, ____ }, \
-	{ K090, K091, K092, K093, K094, K095, K096, K097, ____ }, \
-	{ K100, K101, ____, ____, ____, ____, K106, K107, K108 }, \
-	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
-}
-
-#define LAYOUT_tkl_f13_ansi( \
-	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056, K047, K057, K048, \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075,       K076, \
-	K080,       K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,       K096,       K097, \
-	K100, K110, K101,                   K113,                   K105, K115, K106, K116, K107, K117, K108 \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \
-	{ K010, K011, K012, K013, K014, K015, K016, K017, ____ }, \
-	{ K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \
-	{ K030, K031, K032, K033, K034, K035, K036, K037, ____ }, \
-	{ K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \
-	{ K050, K051, K052, K053, K054, K055, K056, K057, ____ }, \
-	{ K060, K061, K062, K063, K064, K065, ____, ____, ____ }, \
-	{ K070, K071, K072, K073, K074, K075, K076, ____, ____ }, \
-	{ K080, K081, K082, K083, K084, K085, ____, ____, ____ }, \
-	{ ____, K091, K092, K093, K094, K095, K096, K097, ____ }, \
-	{ K100, K101, ____, ____, ____, K105, K106, K107, K108 }, \
-	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
-}	
-
-#define LAYOUT_tkl_f13_iso( \
-	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046,       K047, K057, K048, \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K066, K076, \
-	K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,       K096,       K097, \
-	K100, K110, K101,                   K113,                   K105, K115, K106, K116, K107, K117, K108 \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \
-	{ K010, K011, K012, K013, K014, K015, K016, K017, ____ }, \
-	{ K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \
-	{ K030, K031, K032, K033, K034, K035, K036, K037, ____ }, \
-	{ K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \
-	{ K050, K051, K052, K053, K054, K055, ____, K057, ____ }, \
-	{ K060, K061, K062, K063, K064, K065, K066, ____, ____ }, \
-	{ K070, K071, K072, K073, K074, K075, K076, ____, ____ }, \
-	{ K080, K081, K082, K083, K084, K085, ____, ____, ____ }, \
-	{ K090, K091, K092, K093, K094, K095, K096, K097, ____ }, \
-	{ K100, K101, ____, ____, ____, K105, K106, K107, K108 }, \
-	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
-}	
-
-#define LAYOUT_tkl_ansi_7u( \
-	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056, K047, K057, K048, \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075,       K076, \
-	K080,       K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,       K096,       K097, \
-	K100, K110, K101,                   K113,                         K115, K106, K116, K107, K117, K108 \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \
-	{ K010, K011, K012, K013, K014, K015, K016, K017, ____ }, \
-	{ K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \
-	{ K030, K031, K032, K033, K034, K035, K036, K037, ____ }, \
-	{ K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \
-	{ K050, K051, K052, K053, K054, K055, K056, K057, ____ }, \
-	{ K060, K061, K062, K063, K064, K065, ____, ____, ____ }, \
-	{ K070, K071, K072, K073, K074, K075, K076, ____, ____ }, \
-	{ K080, K081, K082, K083, K084, K085, ____, ____, ____ }, \
-	{ ____, K091, K092, K093, K094, K095, K096, K097, ____ }, \
-	{ K100, K101, ____, ____, ____, ____, K106, K107, K108 }, \
-	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
-}
-
-#define LAYOUT_tkl_iso_7u( \
-	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046,       K047, K057, K048, \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K066, K076, \
-	K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,       K096,       K097, \
-	K100, K110, K101,                   K113,                         K115, K106, K116, K107, K117, K108 \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \
-	{ K010, K011, K012, K013, K014, K015, K016, K017, ____ }, \
-	{ K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \
-	{ K030, K031, K032, K033, K034, K035, K036, K037, ____ }, \
-	{ K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \
-	{ K050, K051, K052, K053, K054, K055, ____, K057, ____ }, \
-	{ K060, K061, K062, K063, K064, K065, K066, ____, ____ }, \
-	{ K070, K071, K072, K073, K074, K075, K076, ____, ____ }, \
-	{ K080, K081, K082, K083, K084, K085, ____, ____, ____ }, \
-	{ K090, K091, K092, K093, K094, K095, K096, K097, ____ }, \
-	{ K100, K101, ____, ____, ____, ____, K106, K107, K108 }, \
-	{ K110, ____, ____, K113, ____, K115, K116, K117, ____ }  \
-}
diff --git a/keyboards/aliceh66/pianoforte_hs/config.h b/keyboards/aliceh66/pianoforte_hs/config.h
index 7aa6ea4e4b..91e0225569 100644
--- a/keyboards/aliceh66/pianoforte_hs/config.h
+++ b/keyboards/aliceh66/pianoforte_hs/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, F5, E6, D4 }
-#define MATRIX_ROW_PINS { D2, D1, D3, D0, D5, B0, F0, F1, F7, F4, C7, C6 }
-#define DIODE_DIRECTION COL2ROW
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/info.json
index d6e7fa34e8..bfc9f7a839 100644
--- a/keyboards/aliceh66/pianoforte_hs/info.json
+++ b/keyboards/aliceh66/pianoforte_hs/info.json
@@ -8,105 +8,119 @@
         "pid": "0x7068",
         "vid": "0x6168"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "F5", "E6", "D4"],
+        "rows": ["D2", "D1", "D3", "D0", "D5", "B0", "F0", "F1", "F7", "F4", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
-		"LAYOUT_tkl_ansi": {
-			"layout": [
-				{"label":"Esc", "x":0, "y":0}, 
-				{"label":"F1", "x":1.25, "y":0}, 
-				{"label":"F2", "x":2.25, "y":0}, 
-				{"label":"F3", "x":3.25, "y":0}, 
-				{"label":"F4", "x":4.25, "y":0}, 
-				{"label":"F5", "x":5.5, "y":0}, 
-				{"label":"F6", "x":6.5, "y":0}, 
-				{"label":"F7", "x":7.5, "y":0}, 
-				{"label":"F8", "x":8.5, "y":0}, 
-				{"label":"F9", "x":9.75, "y":0}, 
-				{"label":"F10", "x":10.75, "y":0}, 
-				{"label":"F11", "x":11.75, "y":0}, 
-				{"label":"F12", "x":12.75, "y":0}, 
-				{"label":"F13", "x":14, "y":0}, 
-				{"label":"PrtSc", "x":15.25, "y":0}, 
-				{"label":"Scroll Lock", "x":16.25, "y":0}, 
-				{"label":"Pause Break", "x":17.25, "y":0}, 
-				
-				{"label":"`~", "x":0, "y":1.25}, 
-				{"label":"1!", "x":1, "y":1.25}, 
-				{"label":"2@", "x":2, "y":1.25}, 
-				{"label":"3#", "x":3, "y":1.25}, 
-				{"label":"4$", "x":4, "y":1.25}, 
-				{"label":"5%", "x":5, "y":1.25}, 
-				{"label":"6^", "x":6, "y":1.25}, 
-				{"label":"7&", "x":7, "y":1.25}, 
-				{"label":"8*", "x":8, "y":1.25}, 
-				{"label":"9(", "x":9, "y":1.25}, 
-				{"label":"0)", "x":10, "y":1.25}, 
-				{"label":"-_", "x":11, "y":1.25}, 
-				{"label":"=+", "x":12, "y":1.25},
-				{"label":"Backspace", "x":13, "y":1.25, "w":2},
-				{"label":"Insert", "x":15.25, "y":1.25}, 
-				{"label":"Home", "x":16.25, "y":1.25}, 
-				{"label":"PgUp", "x":17.25, "y":1.25}, 
-				
-				{"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-				{"label":"Q", "x":1.5, "y":2.25}, 
-				{"label":"W", "x":2.5, "y":2.25}, 
-				{"label":"E", "x":3.5, "y":2.25}, 
-				{"label":"R", "x":4.5, "y":2.25}, 
-				{"label":"T", "x":5.5, "y":2.25}, 
-				{"label":"Y", "x":6.5, "y":2.25}, 
-				{"label":"U", "x":7.5, "y":2.25}, 
-				{"label":"I", "x":8.5, "y":2.25}, 
-				{"label":"O", "x":9.5, "y":2.25}, 
-				{"label":"P", "x":10.5, "y":2.25}, 
-				{"label":"[{", "x":11.5, "y":2.25}, 
-				{"label":"]}", "x":12.5, "y":2.25}, 
-				{"label":"Pipe", "x":13.5, "y":2.25, "w":1.5}, 
-				{"label":"Delete", "x":15.25, "y":2.25}, 
-				{"label":"End", "x":16.25, "y":2.25}, 
-				{"label":"PgDn", "x":17.25, "y":2.25}, 
-				
-				{"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-				{"label":"A", "x":1.75, "y":3.25}, 
-				{"label":"S", "x":2.75, "y":3.25}, 
-				{"label":"D", "x":3.75, "y":3.25}, 
-				{"label":"F", "x":4.75, "y":3.25}, 
-				{"label":"G", "x":5.75, "y":3.25}, 
-				{"label":"H", "x":6.75, "y":3.25}, 
-				{"label":"J", "x":7.75, "y":3.25}, 
-				{"label":"K", "x":8.75, "y":3.25}, 
-				{"label":"L", "x":9.75, "y":3.25}, 
-				{"label":";:", "x":10.75, "y":3.25}, 
-				{"label":"'\"", "x":11.75, "y":3.25}, 
-				{"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
-				
-				{"label":"Shift", "x":0, "y":4.25, "w":2.25}, 
-				{"label":"Z", "x":2.25, "y":4.25}, 
-				{"label":"X", "x":3.25, "y":4.25}, 
-				{"label":"C", "x":4.25, "y":4.25}, 
-				{"label":"V", "x":5.25, "y":4.25}, 
-				{"label":"B", "x":6.25, "y":4.25}, 
-				{"label":"N", "x":7.25, "y":4.25}, 
-				{"label":"M", "x":8.25, "y":4.25}, 
-				{"label":"<", "x":9.25, "y":4.25}, 
-				{"label":">", "x":10.25, "y":4.25}, 
-				{"label":"?", "x":11.25, "y":4.25}, 
-				{"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-				{"label":"\u2191", "x":16.25, "y":4.25}, 
-				
-				{"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-				{"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-				{"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-				{"label":"Space", "x":4, "y":5.25, "w":6.25},
-				{"label":"Alt", "x":10, "y":5.25, "w":1.25},
-				{"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-				{"label":"MO(1)", "x":12.5, "y":5.25, "w":1.25},
-				{"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
-				{"label":"\u2190", "x":15.25, "y":5.25}, 
-				{"label":"\u2193", "x":16.25, "y":5.25}, 
-				{"label":"\u2192", "x":17.25, "y":5.25}
-			]
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 2], "x": 4, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
         }
-	}	
+    }
 }
\ No newline at end of file
diff --git a/keyboards/aliceh66/pianoforte_hs/pianoforte_hs.c b/keyboards/aliceh66/pianoforte_hs/pianoforte_hs.c
deleted file mode 100644
index 4617663fd3..0000000000
--- a/keyboards/aliceh66/pianoforte_hs/pianoforte_hs.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 AliceH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "pianoforte_hs.h"
diff --git a/keyboards/aliceh66/pianoforte_hs/pianoforte_hs.h b/keyboards/aliceh66/pianoforte_hs/pianoforte_hs.h
deleted file mode 100644
index cd24668766..0000000000
--- a/keyboards/aliceh66/pianoforte_hs/pianoforte_hs.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright 2022 AliceH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_tkl_ansi( \
-	K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, K008, \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, K028, \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056, K047, K057, K048, \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075,       K066, \
-	K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085,       K096,             K087, \
-	K100, K110, K101,             K112,                   K104, K115,       K106, K116, K107, K117, K108 \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \
-	{ K010, K011, K012, K013, K014, K015, K016, K017, ____ }, \
-	{ K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \
-	{ K030, K031, K032, K033, K034, K035, K036, K037, ____ }, \
-	{ K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \
-	{ K050, K051, K052, K053, K054, K055, K056, K057, ____ }, \
-	{ K060, K061, K062, K063, K064, K065, K066, ____, ____ }, \
-	{ K070, K071, K072, K073, K074, K075, ____, ____, ____ }, \
-	{ K080, K081, K082, K083, K084, K085, ____, K087, ____ }, \
-	{ K090, K091, K092, K093, K094, ____, K096, ____, ____ }, \
-	{ K100, K101, ____, ____, K104, ____, K106, K107, K108 }, \
-	{ K110, ____, K112, ____, ____, K115, K116, K117, ____ }  \
-}
diff --git a/keyboards/alpha/alpha.c b/keyboards/alpha/alpha.c
deleted file mode 100755
index 3029ba50a8..0000000000
--- a/keyboards/alpha/alpha.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "alpha.h"
diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h
index 828839870a..b4ab41d42c 100755
--- a/keyboards/alpha/config.h
+++ b/keyboards/alpha/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, B4, B5 }
-#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json
index 472bedb1fa..d7f32ec156 100644
--- a/keyboards/alpha/info.json
+++ b/keyboards/alpha/info.json
@@ -7,6 +7,14 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F4"
+  },
+  "matrix_pins": {
+    "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"],
+    "rows": ["D4", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/alpine65/alpine65.c b/keyboards/alpine65/alpine65.c
deleted file mode 100644
index 318862f659..0000000000
--- a/keyboards/alpine65/alpine65.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 �lvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "alpine65.h"
diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h
index 61af018700..856deb07a2 100644
--- a/keyboards/alpine65/config.h
+++ b/keyboards/alpine65/config.h
@@ -17,16 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B9 , B8 , B7 , B6 , B5 , B4 , B3 , A15, A9 , A8 , B14, B12, A10, A0 , A1 }
-#define MATRIX_ROW_PINS { C14, C15, C13, A2 , A3 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 68
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/alpine65/info.json b/keyboards/alpine65/info.json
index 1c1407b45b..2218f951fa 100644
--- a/keyboards/alpine65/info.json
+++ b/keyboards/alpine65/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0065",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "matrix_pins": {
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A9", "A8", "B14", "B12", "A10", "A0", "A1"],
+        "rows": ["C14", "C15", "C13", "A2", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/alps64/alps64.c b/keyboards/alps64/alps64.c
deleted file mode 100644
index 61270aaced..0000000000
--- a/keyboards/alps64/alps64.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "alps64.h"
diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h
index aff4064bb4..4b007cf387 100644
--- a/keyboards/alps64/config.h
+++ b/keyboards/alps64/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS {  B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_ROW_PINS {  D0, D1, D2, D3, D4, D5, D6, C2 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/alps64/info.json b/keyboards/alps64/info.json
index e1ea2b9b5e..3f3d6af0fc 100644
--- a/keyboards/alps64/info.json
+++ b/keyboards/alps64/info.json
@@ -4,10 +4,15 @@
   "url": "",
   "maintainer": "qmk",
   "usb": {
-        "vid": "0x6873",
-        "pid": "0x6464",
-        "device_version": "0.0.1"
-    },
+    "vid": "0x6873",
+    "pid": "0x6464",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"],
+    "rows": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "C5",
   },
diff --git a/keyboards/alt34/alt34.c b/keyboards/alt34/alt34.c
deleted file mode 100644
index f71f8092c9..0000000000
--- a/keyboards/alt34/alt34.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 Tommy Alatalo <@altosys>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "alt34.h"
diff --git a/keyboards/alt34/alt34.h b/keyboards/alt34/alt34.h
deleted file mode 100644
index 0d0bdd3fd4..0000000000
--- a/keyboards/alt34/alt34.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2022 Tommy Alatalo <@altosys>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_alt34_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h
index 60e4a857cf..ffff9dc8c6 100644
--- a/keyboards/alt34/rev1/config.h
+++ b/keyboards/alt34/rev1/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/alt34/rev1/info.json b/keyboards/alt34/rev1/info.json
index ce9e5388d7..cf90324c14 100644
--- a/keyboards/alt34/rev1/info.json
+++ b/keyboards/alt34/rev1/info.json
@@ -8,53 +8,58 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["split_3x5_2"],
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                {"x": 0, "y": 0.93},
-                {"x": 1, "y": 0.31},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.28},
-                {"x": 4, "y": 0.42},
+                {"matrix": [0, 0], "x": 0, "y": 0.93},
+                {"matrix": [0, 1], "x": 1, "y": 0.31},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.28},
+                {"matrix": [0, 4], "x": 4, "y": 0.42},
 
-                {"x": 7, "y": 0.42},
-                {"x": 8, "y": 0.28},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0.31},
-                {"x": 11, "y": 0.93},
+                {"matrix": [4, 4], "x": 7, "y": 0.42},
+                {"matrix": [4, 3], "x": 8, "y": 0.28},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 1], "x": 10, "y": 0.31},
+                {"matrix": [4, 0], "x": 11, "y": 0.93},
 
-                {"x": 0, "y": 1.93},
-                {"x": 1, "y": 1.31},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.28},
-                {"x": 4, "y": 1.42},
+                {"matrix": [1, 0], "x": 0, "y": 1.93},
+                {"matrix": [1, 1], "x": 1, "y": 1.31},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.28},
+                {"matrix": [1, 4], "x": 4, "y": 1.42},
 
-                {"x": 7, "y": 1.42},
-                {"x": 8, "y": 1.28},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1.31},
-                {"x": 11, "y": 1.93},
+                {"matrix": [5, 4], "x": 7, "y": 1.42},
+                {"matrix": [5, 3], "x": 8, "y": 1.28},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1.31},
+                {"matrix": [5, 0], "x": 11, "y": 1.93},
 
-                {"x": 0, "y": 2.93},
-                {"x": 1, "y": 2.31},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.28},
-                {"x": 4, "y": 2.42},
+                {"matrix": [2, 0], "x": 0, "y": 2.93},
+                {"matrix": [2, 1], "x": 1, "y": 2.31},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.28},
+                {"matrix": [2, 4], "x": 4, "y": 2.42},
 
-                {"x": 7, "y": 2.42},
-                {"x": 8, "y": 2.28},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2.31},
-                {"x": 11, "y": 2.93},
+                {"matrix": [6, 4], "x": 7, "y": 2.42},
+                {"matrix": [6, 3], "x": 8, "y": 2.28},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2.31},
+                {"matrix": [6, 0], "x": 11, "y": 2.93},
 
-                {"x": 3.5, "y": 3.45},
-                {"x": 4.5, "y": 3.7},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.45},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.7},
 
-                {"x": 6.5, "y": 3.7},
-                {"x": 7.5, "y": 3.45}
+                {"matrix": [7, 4], "x": 6.5, "y": 3.7},
+                {"matrix": [7, 3], "x": 7.5, "y": 3.45}
             ]
         }
     }
diff --git a/keyboards/alt34/rev1/rev1.c b/keyboards/alt34/rev1/rev1.c
deleted file mode 100644
index f71f8092c9..0000000000
--- a/keyboards/alt34/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 Tommy Alatalo <@altosys>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "alt34.h"
diff --git a/keyboards/alt34/rev1/rev1.h b/keyboards/alt34/rev1/rev1.h
deleted file mode 100644
index 5600b0d5ad..0000000000
--- a/keyboards/alt34/rev1/rev1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2022 Tommy Alatalo <@altosys>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "alt34.h"
-#include "quantum.h"
-
-#define ____ KC_NO
-
-/*              left hand                     right hand            */
-#define LAYOUT_split_3x5_2(\
-    K0_0, K0_1, K0_2, K0_3, K0_4,       K0_5, K0_6, K0_7, K0_8, K0_9,\
-    K1_0, K1_1, K1_2, K1_3, K1_4,       K1_5, K1_6, K1_7, K1_8, K1_9,\
-    K2_0, K2_1, K2_2, K2_3, K2_4,       K2_5, K2_6, K2_7, K2_8, K2_9,\
-                      K3_2, K3_3,       K3_4, K3_5 )\
-/* matrix positions */\
-{\
-    {K0_0,  K0_1,  K0_2,  K0_3,  K0_4},\
-    {K1_0,  K1_1,  K1_2,  K1_3,  K1_4},\
-    {K2_0,  K2_1,  K2_2,  K2_3,  K2_4},\
-    {____,  ____,  ____,  K3_2,  K3_3},\
-	\
-	{K0_9,  K0_8,  K0_7,  K0_6,  K0_5},\
-	{K1_9,  K1_8,  K1_7,  K1_6,  K1_5},\
-	{K2_9,  K2_8,  K2_7,  K2_6,  K2_5},\
-	{____,  ____,  ____,  K3_5,  K3_4} \
-}
diff --git a/keyboards/amag23/amag23.c b/keyboards/amag23/amag23.c
deleted file mode 100644
index 5fda69e999..0000000000
--- a/keyboards/amag23/amag23.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "amag23.h"
-
diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h
index 82e82fc469..34e622bfb3 100644
--- a/keyboards/amag23/config.h
+++ b/keyboards/amag23/config.h
@@ -15,13 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A0, A1, A2, A3 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #define RGBLED_NUM 7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/amag23/info.json b/keyboards/amag23/info.json
index 822f18c906..1bbcc854c5 100644
--- a/keyboards/amag23/info.json
+++ b/keyboards/amag23/info.json
@@ -8,6 +8,14 @@
         "pid": "0x2323",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B4", "B5"],
+        "rows": ["A0", "A1", "A2", "A3"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "layouts": {
diff --git a/keyboards/amag23/rules.mk b/keyboards/amag23/rules.mk
index 6cab98a640..8bee1e931e 100644
--- a/keyboards/amag23/rules.mk
+++ b/keyboards/amag23/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
diff --git a/keyboards/amjkeyboard/amj40/amj40.c b/keyboards/amjkeyboard/amj40/amj40.c
deleted file mode 100755
index f0f3121c6a..0000000000
--- a/keyboards/amjkeyboard/amj40/amj40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2017 Fabian Topfstedt
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "amj40.h"
diff --git a/keyboards/amjkeyboard/amj40/amj40.h b/keyboards/amjkeyboard/amj40/amj40.h
deleted file mode 100755
index 14ea383811..0000000000
--- a/keyboards/amjkeyboard/amj40/amj40.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright 2017 Fabian Topfstedt
- * Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* AMJ40 ver2.0 staggered layouts
- * ,-----------------------------------------------.
- * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0a |0b |
- * |-----------------------------------------------|
- * |10  |11 |12 |13 |14 |15 |16 |17 |18 |19 |1b    |
- * |-----------------------------------------------|
- * |20    |22 |23 |24 |25 |26 |27 |28 |29 |2a  |2b |
- * |-----------------------------------------------|
- * |30  |31 |32  |   34   |35        |39  |3a |3b  | Layout 1 Bottom Row
- * `-----------------------------------------------'
- * ,-----------------------------------------------.
- * |30  |31 |32 |           35           |3a  |3b  | Layout 2
- * `-----------------------------------------------'
- * ,-----------------------------------------------.
- * |30   |31 |32   |   34   |    35    |39 |3a |3b | Layout 3
- * `-----------------------------------------------'
- * ,-----------------------------------------------.
- * |30  |31 |32  |           35           |3a |3b  | Layout 4
- * `-----------------------------------------------'
- */
-
-// a.k.a. Layout 1 or Layout 3 (matrix is the same for both)
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,      k1b, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32,      k34, k35,                k39, k3a, k3b  \
-) { \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1b}, \
-    {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b}, \
-    {k30, k31, k32, XXX, k34, k35, XXX, XXX, XXX, k39, k3a, k3b} \
-}
-
-// a.k.a. Layout 2 or Layout 4 (matrix is the same for both)
-#define LAYOUT_625u_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,      k1b, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32,             k35,                   k3a, k3b  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1b }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, XXX, XXX, k35, XXX, XXX, XXX, XXX, k3a, k3b } \
-}
-
-/* AMJ40 ver2.0 ortholinear layouts
- * ,-----------------------------------------------.
- * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0a |0b |
- * |-----------------------------------------------|
- * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1a |1b |
- * |-----------------------------------------------|
- * |20 |21 |22 |23 |24 |25 |26 |27 |28 |29 |2a |2b |
- * |-----------------------------------------------|
- * |30 |31 |32 |33 |34 |    35    |38  |39 |3a |3b | 2.75u Spacebar
- * `-----------------------------------------------'
- * ,-----------------------------------------------.
- * |30 |31 |32 |          35           |39 |3a |3b | 6u Spacebar
- * `-----------------------------------------------'
- */
-
-// equivalent to LAYOUT_all
-#define LAYOUT_ortho_275u_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,     k35,      k38,  k39, k3a, k3b  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, XXX, XXX, k38, k39, k3a, k3b }  \
-}
-
-#define LAYOUT_ortho_600u_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32,             k35,              k39, k3a, k3b  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, XXX, XXX, k35, XXX, XXX, XXX, k39, k3a, k3b }  \
-}
diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index bdefff8c4f..9ec9dcbbeb 100755
--- a/keyboards/amjkeyboard/amj40/config.h
+++ b/keyboards/amjkeyboard/amj40/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { F4, F5, F6, F7}
-#define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -34,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Underlight configuration
  */
 
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json
index fe66c34b86..a3bbb13785 100644
--- a/keyboards/amjkeyboard/amj40/info.json
+++ b/keyboards/amjkeyboard/amj40/info.json
@@ -8,10 +8,18 @@
         "pid": "0x6072",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 4
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "indicators": {
         "caps_lock": "B2",
         "on_state": 0
@@ -21,201 +29,201 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2, "w":1.25},
-                {"x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3, "w":1.25},
-                {"x":3.5, "y":3, "w":2.25},
-                {"x":5.75, "y":3, "w":2.75},
-                {"x":8.5, "y":3, "w":1.25},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3, "w":1.25}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_625u_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2, "w":1.25},
-                {"x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3, "w":6.25},
-                {"x":9.5, "y":3, "w":1.25},
-                {"x":10.75, "y":3, "w":1.25}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3, "w": 6.25},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_ortho_600u_space": {
             "layout": [
-                {"label":"K00 (F4,F1)", "x":0, "y":0},
-                {"label":"K01 (F4,F0)", "x":1, "y":0},
-                {"label":"K02 (F4,E6)", "x":2, "y":0},
-                {"label":"K03 (F4,C7)", "x":3, "y":0},
-                {"label":"K04 (F4,C6)", "x":4, "y":0},
-                {"label":"K05 (F4,B0)", "x":5, "y":0},
-                {"label":"K06 (F4,D4)", "x":6, "y":0},
-                {"label":"K07 (F4,B1)", "x":7, "y":0},
-                {"label":"K08 (F4,B7)", "x":8, "y":0},
-                {"label":"K09 (F4,B5)", "x":9, "y":0},
-                {"label":"K0A (F4,B4)", "x":10, "y":0},
-                {"label":"K0B (F4,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (F5,F1)", "x":0, "y":1},
-                {"label":"K11 (F5,F0)", "x":1, "y":1},
-                {"label":"K12 (F5,E6)", "x":2, "y":1},
-                {"label":"K13 (F5,C7)", "x":3, "y":1},
-                {"label":"K14 (F5,C6)", "x":4, "y":1},
-                {"label":"K15 (F5,B0)", "x":5, "y":1},
-                {"label":"K16 (F5,D4)", "x":6, "y":1},
-                {"label":"K17 (F5,B1)", "x":7, "y":1},
-                {"label":"K18 (F5,B7)", "x":8, "y":1},
-                {"label":"K19 (F5,B5)", "x":9, "y":1},
-                {"label":"K1A (F5,B4)", "x":10, "y":1},
-                {"label":"K1B (F5,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (F6,F1)", "x":0, "y":2},
-                {"label":"K21 (F6,F0)", "x":1, "y":2},
-                {"label":"K22 (F6,E6)", "x":2, "y":2},
-                {"label":"K23 (F6,C7)", "x":3, "y":2},
-                {"label":"K24 (F6,C6)", "x":4, "y":2},
-                {"label":"K25 (F6,B0)", "x":5, "y":2},
-                {"label":"K26 (F6,D4)", "x":6, "y":2},
-                {"label":"K27 (F6,B1)", "x":7, "y":2},
-                {"label":"K28 (F6,B7)", "x":8, "y":2},
-                {"label":"K29 (F6,B5)", "x":9, "y":2},
-                {"label":"K2A (F6,B4)", "x":10, "y":2},
-                {"label":"K2B (F6,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (F7,F1)", "x":0, "y":3},
-                {"label":"K31 (F7,F0)", "x":1, "y":3},
-                {"label":"K32 (F7,E6)", "x":2, "y":3},
-                {"label":"K35 (F7,B0)", "x":3, "y":3, "w":6},
-                {"label":"K39 (F7,B5)", "x":9, "y":3},
-                {"label":"K3A (F7,B4)", "x":10, "y":3},
-                {"label":"K3B (F7,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 5], "x": 3, "y": 3, "w": 6},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_275u_space": {
             "layout": [
-                {"label":"K00 (F4,F1)", "x":0, "y":0},
-                {"label":"K01 (F4,F0)", "x":1, "y":0},
-                {"label":"K02 (F4,E6)", "x":2, "y":0},
-                {"label":"K03 (F4,C7)", "x":3, "y":0},
-                {"label":"K04 (F4,C6)", "x":4, "y":0},
-                {"label":"K05 (F4,B0)", "x":5, "y":0},
-                {"label":"K06 (F4,D4)", "x":6, "y":0},
-                {"label":"K07 (F4,B1)", "x":7, "y":0},
-                {"label":"K08 (F4,B7)", "x":8, "y":0},
-                {"label":"K09 (F4,B5)", "x":9, "y":0},
-                {"label":"K0A (F4,B4)", "x":10, "y":0},
-                {"label":"K0B (F4,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (F5,F1)", "x":0, "y":1},
-                {"label":"K11 (F5,F0)", "x":1, "y":1},
-                {"label":"K12 (F5,E6)", "x":2, "y":1},
-                {"label":"K13 (F5,C7)", "x":3, "y":1},
-                {"label":"K14 (F5,C6)", "x":4, "y":1},
-                {"label":"K15 (F5,B0)", "x":5, "y":1},
-                {"label":"K16 (F5,D4)", "x":6, "y":1},
-                {"label":"K17 (F5,B1)", "x":7, "y":1},
-                {"label":"K18 (F5,B7)", "x":8, "y":1},
-                {"label":"K19 (F5,B5)", "x":9, "y":1},
-                {"label":"K1A (F5,B4)", "x":10, "y":1},
-                {"label":"K1B (F5,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (F6,F1)", "x":0, "y":2},
-                {"label":"K21 (F6,F0)", "x":1, "y":2},
-                {"label":"K22 (F6,E6)", "x":2, "y":2},
-                {"label":"K23 (F6,C7)", "x":3, "y":2},
-                {"label":"K24 (F6,C6)", "x":4, "y":2},
-                {"label":"K25 (F6,B0)", "x":5, "y":2},
-                {"label":"K26 (F6,D4)", "x":6, "y":2},
-                {"label":"K27 (F6,B1)", "x":7, "y":2},
-                {"label":"K28 (F6,B7)", "x":8, "y":2},
-                {"label":"K29 (F6,B5)", "x":9, "y":2},
-                {"label":"K2A (F6,B4)", "x":10, "y":2},
-                {"label":"K2B (F6,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (F7,F1)", "x":0, "y":3},
-                {"label":"K31 (F7,F0)", "x":1, "y":3},
-                {"label":"K32 (F7,E6)", "x":2, "y":3},
-                {"label":"K33 (F7,C7)", "x":3, "y":3},
-                {"label":"K34 (F7,C6)", "x":4, "y":3},
-                {"label":"K35 (F7,B0)", "x":5, "y":3, "w":2.75},
-                {"label":"K38 (F7,B7)", "x":7.75, "y":3, "w":1.25},
-                {"label":"K39 (F7,B5)", "x":9, "y":3},
-                {"label":"K3A (F7,B4)", "x":10, "y":3},
-                {"label":"K3B (F7,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 7.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/amjkeyboard/amj60/amj60.c b/keyboards/amjkeyboard/amj60/amj60.c
deleted file mode 100644
index af0539a679..0000000000
--- a/keyboards/amjkeyboard/amj60/amj60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2016 Toni (@toneman77)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "amj60.h"
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index 0a38f73032..a6ecb26a96 100644
--- a/keyboards/amjkeyboard/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, D5 }
-#define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 8
 #    define RGBLIGHT_HUE_STEP 10
 #    define RGBLIGHT_SAT_STEP 17
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json
index d624894691..d6ef4175aa 100644
--- a/keyboards/amjkeyboard/amj60/info.json
+++ b/keyboards/amjkeyboard/amj60/info.json
@@ -8,11 +8,19 @@
         "pid": "0x6066",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["F7", "F6", "F5", "F4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 4,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "B2",
         "on_state": 0
diff --git a/keyboards/amjkeyboard/amj66/amj66.c b/keyboards/amjkeyboard/amj66/amj66.c
deleted file mode 100644
index 6d77e43a0a..0000000000
--- a/keyboards/amjkeyboard/amj66/amj66.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Alex Peters
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "amj66.h"
diff --git a/keyboards/amjkeyboard/amj66/amj66.h b/keyboards/amjkeyboard/amj66/amj66.h
deleted file mode 100644
index e2315f5e9f..0000000000
--- a/keyboards/amjkeyboard/amj66/amj66.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2018 Alex Peters
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-
-/* LAYOUT_all
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0F │    ISO Enter
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┤      ┌─────�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │ │1E │      │2C   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┘   ┌──┴�    │
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │         │1D │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┬─┴─�       └───┴────┘
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C  │3D │3E │
- * ├────┴┬──┴─┬─┴──┬┴───┴───┴─┬─┴───┴───┴┬──┴─┬─┴──┬┴────┼───┼───┼───�
- * │40   │41  │42  │43        │44        │45  │46  │47   │48 │49 │4A │
- * └─────┴────┴────┴──────────┴──────────┴────┴────┴─────┴───┴───┴───┘
- * 2u Backspace      = k0D
- * ISO #             = k1D
- * 2.25u Right Shift = k3C
- * 6.25u Space       = k44
- */
-#define LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, \
-    k10,      k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,        k1E, \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2C, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,           k43, k44,           k45, k46, k47,      k48, k49, k4A \
-) { \
-    {  k00,  k01,  k02,  k03,  k04,  k05,  k06,  k07,  k08,  k09,  k0A,  k0B,    k0C,    k0D,    k0E,    k0F    }, \
-    {  k10,  k11,  k12,  k13,  k14,  k15,  k16,  k17,  k18,  k19,  k1A,  k1B,    k1C,    k1D,    k1E,    KC_NO  }, \
-    {  k20,  k21,  k22,  k23,  k24,  k25,  k26,  k27,  k28,  k29,  k2A,  k2B,    k2C,    KC_NO,  KC_NO,  KC_NO  }, \
-    {  k30,  k31,  k32,  k33,  k34,  k35,  k36,  k37,  k38,  k39,  k3A,  k3B,    k3C,    k3D,    k3E,    KC_NO  }, \
-    {  k40,  k41,  k42,  k43,  k44,  k45,  k46,  k47,  k48,  k49,  k4A,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO  } \
-}
-
-#define LAYOUT_66_ansi( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,   k0F, \
-    k10,      k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k1E, \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2C, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3E, \
-    k40, k41, k42,                k44,           k45, k46, k47,      k48, k49, k4A \
-) { \
-    {  k00,  k01,    k02,  k03,    k04,  k05,  k06,  k07,  k08,  k09,  k0A,  k0B,    k0C,    k0D,    KC_NO,  k0F    }, \
-    {  k10,  k11,    k12,  k13,    k14,  k15,  k16,  k17,  k18,  k19,  k1A,  k1B,    k1C,    k1D,    k1E,    KC_NO  }, \
-    {  k20,  k21,    k22,  k23,    k24,  k25,  k26,  k27,  k28,  k29,  k2A,  k2B,    k2C,    KC_NO,  KC_NO,  KC_NO  }, \
-    {  k30,  KC_NO,  k32,  k33,    k34,  k35,  k36,  k37,  k38,  k39,  k3A,  k3B,    k3C,    KC_NO,  k3E,    KC_NO  }, \
-    {  k40,  k41,    k42,  KC_NO,  k44,  k45,  k46,  k47,  k48,  k49,  k4A,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO  } \
-}
-
-#define LAYOUT_66_iso( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,   k0F, \
-    k10,      k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,        k1E, \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2C, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3E, \
-    k40, k41, k42,                k44,           k45, k46, k47,      k48, k49, k4A \
-) { \
-    {  k00,  k01,  k02,  k03,    k04,  k05,  k06,  k07,  k08,  k09,  k0A,  k0B,    k0C,    k0D,    KC_NO,  k0F    }, \
-    {  k10,  k11,  k12,  k13,    k14,  k15,  k16,  k17,  k18,  k19,  k1A,  k1B,    k1C,    k1D,    k1E,    KC_NO  }, \
-    {  k20,  k21,  k22,  k23,    k24,  k25,  k26,  k27,  k28,  k29,  k2A,  k2B,    k2C,    KC_NO,  KC_NO,  KC_NO  }, \
-    {  k30,  k31,  k32,  k33,    k34,  k35,  k36,  k37,  k38,  k39,  k3A,  k3B,    k3C,    KC_NO,  k3E,    KC_NO  }, \
-    {  k40,  k41,  k42,  KC_NO,  k44,  k45,  k46,  k47,  k48,  k49,  k4A,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO  } \
-}
diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h
index 7271119876..b48aca7770 100644
--- a/keyboards/amjkeyboard/amj66/config.h
+++ b/keyboards/amjkeyboard/amj66/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { F0, B3, B2, B1, B0, B7, D0, D1, D2, D3, D5, D6, D7, B4, B5, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json
index ed41d4d58c..a28b91d7c6 100644
--- a/keyboards/amjkeyboard/amj66/info.json
+++ b/keyboards/amjkeyboard/amj66/info.json
@@ -8,6 +8,11 @@
         "pid": "0xBD66",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5", "B6"],
+        "rows": ["F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4",
         "breathing": true
@@ -18,217 +23,235 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"|", "x":13, "y":0},
-                {"label":"~", "x":14, "y":0},
-                {"label":"Insert", "x":15.5, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"Backspace", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15.5, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"ISO Backslash", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.25},
-                {"label":"HHKB Fn", "x":13.5, "y":3},
-                {"label":"Up", "x":14.5, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":2.75},
-                {"label":"Space", "x":6.75, "y":4, "w":2.75},
-                {"label":"Alt", "x":9.5, "y":4, "w":1.5},
-                {"label":"GUI", "x":11, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":12.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13.5, "y":4},
-                {"label":"Down", "x":14.5, "y":4},
-                {"label":"Right", "x":15.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+                {"matrix": [4, 4], "x": 6.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 5], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 13.5, "y": 4},
+                {"matrix": [4, 9], "x": 14.5, "y": 4},
+                {"matrix": [4, 10], "x": 15.5, "y": 4}
             ]
         },
         "LAYOUT_66_ansi": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15.5, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15.5, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.25},
-                {"label":"Up", "x":14.5, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4},
-                {"label":"Ctrl", "x":12.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13.5, "y":4},
-                {"label":"Down", "x":14.5, "y":4},
-                {"label":"Right", "x":15.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 11.25, "y": 4},
+                {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 13.5, "y": 4},
+                {"matrix": [4, 9], "x": 14.5, "y": 4},
+                {"matrix": [4, 10], "x": 15.5, "y": 4}
             ]
         },
         "LAYOUT_66_iso": {
             "layout": [
-                {"label":"\u00ac", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"\"", "x":2, "y":0},
-                {"label":"\u00a3", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15.5, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15.5, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"@", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.25},
-                {"label":"Up", "x":14.5, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":4},
-                {"label":"Ctrl", "x":12.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13.5, "y":4},
-                {"label":"Down", "x":14.5, "y":4},
-                {"label":"Right", "x":15.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 11.25, "y": 4},
+                {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 13.5, "y": 4},
+                {"matrix": [4, 9], "x": 14.5, "y": 4},
+                {"matrix": [4, 10], "x": 15.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/amjkeyboard/amj84/amj84.c b/keyboards/amjkeyboard/amj84/amj84.c
deleted file mode 100644
index 49116c48c3..0000000000
--- a/keyboards/amjkeyboard/amj84/amj84.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "amj84.h"
diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h
index 7aef945e5b..da28e92400 100644
--- a/keyboards/amjkeyboard/amj84/config.h
+++ b/keyboards/amjkeyboard/amj84/config.h
@@ -3,23 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, F7, F6, F5, F4, D5 }
-#define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7, D6, B3, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json
index 20f8fd99b1..aeb6194445 100644
--- a/keyboards/amjkeyboard/amj84/info.json
+++ b/keyboards/amjkeyboard/amj84/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6068",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "D1"],
+        "rows": ["D0", "F7", "F6", "F5", "F4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "breathing": true
diff --git a/keyboards/amjkeyboard/amj96/amj96.c b/keyboards/amjkeyboard/amj96/amj96.c
deleted file mode 100644
index 65fca6f12a..0000000000
--- a/keyboards/amjkeyboard/amj96/amj96.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 MechMerlin
-
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "amj96.h"
diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index 8511574b04..86a73b0eaf 100644
--- a/keyboards/amjkeyboard/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/config.h
@@ -36,8 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
@@ -54,7 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json
index eacc490221..1f36d4b0af 100644
--- a/keyboards/amjkeyboard/amj96/info.json
+++ b/keyboards/amjkeyboard/amj96/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6074",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/amjkeyboard/amjpad/amjpad.c b/keyboards/amjkeyboard/amjpad/amjpad.c
deleted file mode 100644
index 83cdedf688..0000000000
--- a/keyboards/amjkeyboard/amjpad/amjpad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "amjpad.h"
diff --git a/keyboards/amjkeyboard/amjpad/amjpad.h b/keyboards/amjkeyboard/amjpad/amjpad.h
deleted file mode 100644
index 976a7ab041..0000000000
--- a/keyboards/amjkeyboard/amjpad/amjpad.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-/* AMJPAD matrix layout
-   * ,-------------------.
-   * | 00 | 01 | 02 | 03 |
-   * |----|----|----|----|
-   * | 10 | 11 | 12 | 13 |
-   * |----|----|----|----|
-   * | 20 | 21 | 22 |    |
-   * |----|----|----| 23 |
-   * | 30 | 31 | 32 |    |
-   * |----|----|----|----|
-   * | 40 | 41 | 42 |    |
-   * |----|----|----| 43 |
-   * |   50    | 52 |    |
-   * `-------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_numpad_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, \
-    k30, k31, k32, k23, \
-    k40, k41, k42, \
-       k50,   k52, k43  \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, XXX }, \
-    { k40, k41, k42, k43 }, \
-    { k50, XXX, k52, XXX } \
-}
-
-#define LAYOUT_ortho_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-    k50, k51, k52, k53 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 }, \
-    { k50, k51, k52, k53 } \
-}
-
-void matrix_init_user(void);
-void matrix_scan_user(void);
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index 63e6e899fa..ecd9f99ed9 100644
--- a/keyboards/amjkeyboard/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, D5, D0 }
-#define MATRIX_COL_PINS { F1, F0, E6, C7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -34,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Underlight configuration
  */
 
-#define RGB_DI_PIN E2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json
index 7a22d14639..d5e1b042f4 100644
--- a/keyboards/amjkeyboard/amjpad/info.json
+++ b/keyboards/amjkeyboard/amjpad/info.json
@@ -8,10 +8,18 @@
     "pid": "0x6060",
     "device_version": "0.0.3"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "E6", "C7"],
+    "rows": ["F7", "F6", "F5", "F4", "D5", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "levels": 4
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "indicators": {
     "num_lock": "D6",
     "on_state": 0
@@ -21,10 +29,67 @@
   "community_layouts": ["numpad_6x4", "ortho_6x4"],
   "layouts": {
     "LAYOUT_numpad_6x4": {
-      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k23", "x":3, "y":2, "h":2}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k50", "x":0, "y":5, "w":2}, {"label":"k52", "x":2, "y":5}, {"label":"k43", "x":3, "y":4, "h":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+        {"matrix": [5, 2], "x": 2, "y": 5},
+        {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
+      ]
     },
     "LAYOUT_ortho_6x4": {
-      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k23", "x":3, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k33", "x":3, "y":3}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k43", "x":3, "y":4}, {"label":"k50", "x":0, "y":5}, {"label":"k51", "x":1, "y":5}, {"label":"k52", "x":2, "y":5}, {"label":"k53", "x":3, "y":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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+
+        {"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}
+      ]
     }
   }
 }
diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/info.json
index b8aae9d201..cb2a02989a 100644
--- a/keyboards/an_achronism/tetromino/info.json
+++ b/keyboards/an_achronism/tetromino/info.json
@@ -20,6 +20,10 @@
         "rgblight": false,
         "rgb_matrix": true
     },
+    "ws2812": {
+        "pin": "GP26",
+        "driver": "vendor"
+    },
     "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["GP0",  "GP1",  "GP2",  "GP3",  "GP4",  "GP5",  "GP6",
@@ -103,8 +107,7 @@
         }
     },
     "rgblight": {
-        "led_count": 70,
-        "pin": "GP26"
+        "led_count": 70
     },
     "rgb_matrix": {
         "driver": "WS2812",
diff --git a/keyboards/an_achronism/tetromino/rules.mk b/keyboards/an_achronism/tetromino/rules.mk
index ff20f6e38e..e69de29bb2 100644
--- a/keyboards/an_achronism/tetromino/rules.mk
+++ b/keyboards/an_achronism/tetromino/rules.mk
@@ -1,2 +0,0 @@
-# Use dedicated PIO on Raspberry Pi Pico for RGB LEDs:
-WS2812_DRIVER = vendor
diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json
index cb85035a22..272097dd8c 100644
--- a/keyboards/anavi/knob1/info.json
+++ b/keyboards/anavi/knob1/info.json
@@ -15,7 +15,6 @@
 	"rgblight": true
     },
     "rgblight": {
-        "pin": "GP12",
         "led_count": 1,
 	"hue_steps": 10,
 	"saturation_steps": 17,
@@ -34,6 +33,10 @@
 		"twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "GP12",
+        "driver": "vendor"
+    },
     "encoder": {
 	"enabled": true,
         "rotary": [
diff --git a/keyboards/anavi/knob1/knob1.c b/keyboards/anavi/knob1/knob1.c
index c1ed7b7726..bb6f1e38bf 100644
--- a/keyboards/anavi/knob1/knob1.c
+++ b/keyboards/anavi/knob1/knob1.c
@@ -14,18 +14,6 @@ void keyboard_post_init_kb(void) {
     keyboard_post_init_user();
 }
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return true;
-}
-#endif
-
 #ifdef OLED_ENABLE
 
 bool oled_task_kb(void) {
diff --git a/keyboards/anavi/knob1/rules.mk b/keyboards/anavi/knob1/rules.mk
index ed8acbe4ac..c3600290d9 100644
--- a/keyboards/anavi/knob1/rules.mk
+++ b/keyboards/anavi/knob1/rules.mk
@@ -1,5 +1,3 @@
-WS2812_DRIVER = vendor
-
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 
diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/info.json
index 8bea49066d..2500d2554e 100644
--- a/keyboards/anavi/knobs3/info.json
+++ b/keyboards/anavi/knobs3/info.json
@@ -20,7 +20,6 @@
         "rgblight": true
     },
     "rgblight": {
-        "pin": "GP12",
         "led_count": 1,
         "hue_steps": 10,
         "saturation_steps": 17,
@@ -39,6 +38,10 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "GP12",
+        "driver": "vendor"
+    },
     "encoder": {
     "enabled": true,
         "rotary": [
diff --git a/keyboards/anavi/knobs3/rules.mk b/keyboards/anavi/knobs3/rules.mk
index ed8acbe4ac..c3600290d9 100644
--- a/keyboards/anavi/knobs3/rules.mk
+++ b/keyboards/anavi/knobs3/rules.mk
@@ -1,5 +1,3 @@
-WS2812_DRIVER = vendor
-
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 
diff --git a/keyboards/anavi/macropad10/info.json b/keyboards/anavi/macropad10/info.json
index 5b1a9d8546..57f1d321ff 100644
--- a/keyboards/anavi/macropad10/info.json
+++ b/keyboards/anavi/macropad10/info.json
@@ -20,7 +20,6 @@
 	"rgblight": true
     },
     "rgblight": {
-        "pin": "GP3",
         "led_count": 4,
 	"hue_steps": 10,
 	"saturation_steps": 17,
@@ -39,6 +38,10 @@
 		"twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "GP3",
+        "driver": "vendor"
+    },
     "encoder": {
 	"enabled": true,
         "rotary": [
diff --git a/keyboards/anavi/macropad10/macropad10.c b/keyboards/anavi/macropad10/macropad10.c
deleted file mode 100644
index bebefd0da9..0000000000
--- a/keyboards/anavi/macropad10/macropad10.c
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2022 Leon Anavi <leon@anavi.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "encoder.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return true;
-}
-#endif
-
diff --git a/keyboards/anavi/macropad10/rules.mk b/keyboards/anavi/macropad10/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/anavi/macropad10/rules.mk
+++ b/keyboards/anavi/macropad10/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h
index fce7328718..2f848d551b 100644
--- a/keyboards/anavi/macropad8/config.h
+++ b/keyboards/anavi/macropad8/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812B RGB LED */
 #ifdef RGBLIGHT_ENABLE
-#   define RGB_DI_PIN F4
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json
index b52ca5a176..9032ac5fa8 100644
--- a/keyboards/anavi/macropad8/info.json
+++ b/keyboards/anavi/macropad8/info.json
@@ -12,6 +12,9 @@
     "pin": "D7",
     "breathing": true
   },
+  "ws2812": {
+    "pin": "F4"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "matrix_pins": {
diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/info.json
index c5a0c2a13c..15c3ca8ba1 100644
--- a/keyboards/annepro2/c15/info.json
+++ b/keyboards/annepro2/c15/info.json
@@ -3,5 +3,8 @@
     "usb": {
         "pid": "0xAC15"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
     "community_layouts": ["60_ansi"]
 }
diff --git a/keyboards/annepro2/c15/rules.mk b/keyboards/annepro2/c15/rules.mk
index 5041eae512..05b715e034 100644
--- a/keyboards/annepro2/c15/rules.mk
+++ b/keyboards/annepro2/c15/rules.mk
@@ -32,7 +32,6 @@ WEAR_LEVELING_DRIVER = spi_flash
 
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 
 # Keys
 CUSTOM_MATRIX = lite
diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/info.json
index d3e6ef6989..f7acff808c 100644
--- a/keyboards/annepro2/c18/info.json
+++ b/keyboards/annepro2/c18/info.json
@@ -3,5 +3,8 @@
     "usb": {
         "pid": "0xAC18"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
     "community_layouts": ["60_ansi", "60_iso"]
 }
diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk
index 7e1f904322..1d53851df6 100644
--- a/keyboards/annepro2/c18/rules.mk
+++ b/keyboards/annepro2/c18/rules.mk
@@ -32,7 +32,6 @@ WEAR_LEVELING_DRIVER = spi_flash
 
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 
 # Keys
 CUSTOM_MATRIX = lite
diff --git a/keyboards/ano/ano.c b/keyboards/ano/ano.c
index 0b6926deaf..925a24fbf6 100644
--- a/keyboards/ano/ano.c
+++ b/keyboards/ano/ano.c
@@ -15,27 +15,3 @@
  */
  
 #include "ano.h"
-
-/* The encoder_update_user is a function.
- * It'll be called by QMK every time you turn the encoder.
- *
- * The index parameter tells you which encoder was turned. If you only have
- * one encoder, the index will always be zero.
- * 
- * The clockwise parameter tells you the direction of the encoder. It'll be
- * true when you turned the encoder clockwise, and false otherwise.
- */
- 
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) { 
-        if (clockwise) {
-            tap_code(KC_AUDIO_VOL_UP);
-        } else {
-            tap_code(KC_AUDIO_VOL_DOWN);
-        }
-    }
-    return true; 
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/ano/config.h b/keyboards/ano/config.h
index df6d076d5c..296abfa02e 100644
--- a/keyboards/ano/config.h
+++ b/keyboards/ano/config.h
@@ -16,11 +16,6 @@
  
  #pragma once
 
-#define MATRIX_ROW_PINS { A4, B14, B15, B9, B10, B11 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, A5, A6, A7, A8, A15, A2, A1, A0, B8, B13 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/ano/info.json b/keyboards/ano/info.json
index 19d53a9ce1..fd4ff724b8 100644
--- a/keyboards/ano/info.json
+++ b/keyboards/ano/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0651",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "A5", "A6", "A7", "A8", "A15", "A2", "A1", "A0", "B8", "B13"],
+        "rows": ["A4", "B14", "B15", "B9", "B10", "B11"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B12", "pin_b": "A14", "resolution": 2}
diff --git a/keyboards/anomalykb/a65i/a65i.c b/keyboards/anomalykb/a65i/a65i.c
deleted file mode 100644
index ed9a82938c..0000000000
--- a/keyboards/anomalykb/a65i/a65i.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Lfgberg
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "a65i.h"
diff --git a/keyboards/anomalykb/a65i/a65i.h b/keyboards/anomalykb/a65i/a65i.h
deleted file mode 100644
index bc8a2bff18..0000000000
--- a/keyboards/anomalykb/a65i/a65i.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Copyright 2021 Lfgberg
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40, K41, K42,                     K47,           K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-    { K10, K11, K12, K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B, K1C,   KC_NO, K1E, K1F }, \
-    { K20, K21, K22, K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B, K2C,   K2D,   K2E, K2F }, \
-    { K30, K31, K32, K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A, K3B, K3C,   KC_NO, K3E, K3F }, \
-    { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47,   KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40, K41, K42,                     K47,           K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01,   K02, K03,   K04,   K05,   K06,   K07, K08,   K09,   K0A, K0B, K0C,   K0D,   KC_NO, K0F }, \
-    { K10, K11,   K12, K13,   K14,   K15,   K16,   K17, K18,   K19,   K1A, K1B, K1C,   KC_NO, K1E,   K1F }, \
-    { K20, K21,   K22, K23,   K24,   K25,   K26,   K27, K28,   K29,   K2A, K2B, KC_NO, K2D,   KC_NO, K2F }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36,   K37, K38,   K39,   K3A, K3B, K3C,   KC_NO, K3E,   K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E,   K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40, K41, K42,                     K47,           K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01,   K02, K03,   K04,   K05,   K06,   K07, K08,   K09,   K0A, K0B, K0C,   K0D,   K0E,   K0F }, \
-    { K10, K11,   K12, K13,   K14,   K15,   K16,   K17, K18,   K19,   K1A, K1B, K1C,   KC_NO, K1E,   K1F }, \
-    { K20, K21,   K22, K23,   K24,   K25,   K26,   K27, K28,   K29,   K2A, K2B, KC_NO, K2D,   KC_NO, K2F }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36,   K37, K38,   K39,   K3A, K3B, K3C,   KC_NO, K3E,   K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E,   K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40, K41, K42,                     K47,           K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03,   K04,   K05,   K06,   K07, K08,   K09,   K0A, K0B, K0C,   K0D,   KC_NO, K0F }, \
-    { K10, K11, K12, K13,   K14,   K15,   K16,   K17, K18,   K19,   K1A, K1B, K1C,   KC_NO, KC_NO, K1F }, \
-    { K20, K21, K22, K23,   K24,   K25,   K26,   K27, K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E,   K2F }, \
-    { K30, K31, K32, K33,   K34,   K35,   K36,   K37, K38,   K39,   K3A, K3B, K3C,   KC_NO, K3E,   K3F }, \
-    { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E,   K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40, K41, K42,                     K47,           K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03,   K04,   K05,   K06,   K07, K08,   K09,   K0A, K0B, K0C,   K0D,   K0E,   K0F }, \
-    { K10, K11, K12, K13,   K14,   K15,   K16,   K17, K18,   K19,   K1A, K1B, K1C,   KC_NO, KC_NO, K1F }, \
-    { K20, K21, K22, K23,   K24,   K25,   K26,   K27, K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E,   K2F }, \
-    { K30, K31, K32, K33,   K34,   K35,   K36,   K37, K38,   K39,   K3A, K3B, K3C,   KC_NO, K3E,   K3F }, \
-    { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E,   K4F }, \
-}
diff --git a/keyboards/anomalykb/a65i/config.h b/keyboards/anomalykb/a65i/config.h
index 4e13b2edd9..947f85bbb2 100644
--- a/keyboards/anomalykb/a65i/config.h
+++ b/keyboards/anomalykb/a65i/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, B5 }
-#define MATRIX_COL_PINS { D7, D6, D4, B4, B6, E6, F1, B7, C6, C7, D5, D3, D2, F0, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/anomalykb/a65i/info.json b/keyboards/anomalykb/a65i/info.json
index d3307d7964..553ad35daf 100644
--- a/keyboards/anomalykb/a65i/info.json
+++ b/keyboards/anomalykb/a65i/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "D6", "D4", "B4", "B6", "E6", "F1", "B7", "C6", "C7", "D5", "D3", "D2", "F0", "D1", "D0"],
+        "rows": ["B3", "B2", "B1", "B0", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -18,385 +23,385 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"~", "x":13, "y":0},
-                {"label":"Back", "x":14, "y":0},
-                {"label":"Print", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"ISO #/~", "x":16.25, "y":2},
-                {"label":"ANSI Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"ISO Enter", "x":17.25, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 16.25, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"ISO \\/|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"Delete", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"MO(1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Print", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"Delete", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"MO(1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"~", "x":13, "y":0},
-                {"label":"Back", "x":14, "y":0},
-                {"label":"Print", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"Delete", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"MO(1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Print", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"Delete", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"MO(1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"~", "x":13, "y":0},
-                {"label":"Back", "x":14, "y":0},
-                {"label":"Print", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"Delete", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"MO(1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
index 466eff89af..b84c595315 100644
--- a/keyboards/aos/tkl/config.h
+++ b/keyboards/aos/tkl/config.h
@@ -17,20 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D3, D2, B7, F1, C7, D5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, F4, F5, F6, F7, B6, B5, D7, B4, D6, F0, D1, C6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -46,4 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 50
-#endif
diff --git a/keyboards/aos/tkl/info.json b/keyboards/aos/tkl/info.json
index c6d37930a4..903079248a 100644
--- a/keyboards/aos/tkl/info.json
+++ b/keyboards/aos/tkl/info.json
@@ -7,96 +7,117 @@
         "pid": "0x1000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"],
+        "rows": ["D3", "D2", "B7", "F1", "C7", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_tkl_iso_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"£", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                {"label":"Space", "x":4, "y":5.5, "w":7},
-                {"label":"AltGr", "x":11, "y":5.5, "w":1.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/aos/tkl/tkl.c b/keyboards/aos/tkl/tkl.c
deleted file mode 100644
index b4ff32d8f4..0000000000
--- a/keyboards/aos/tkl/tkl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 aholland909
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "tkl.h"
diff --git a/keyboards/aos/tkl/tkl.h b/keyboards/aos/tkl/tkl.h
deleted file mode 100644
index de1b9da27c..0000000000
--- a/keyboards/aos/tkl/tkl.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Copyright 2020 aholland909
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_tkl_iso_wkl( \
-    K000,       K002, K003, K004, K005,    K006, K007, K008, K009,    K010, K011, K012, K013,    K014, K015, K016, \
-                                                                                                                   \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113,    K114, K115, K116, \
-    K200,    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, K215, K216, \
-    K300,     K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,   K213,                      \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,             K412,          K415,       \
-    K500,       K502,                      K505,                            K510,       K512,    K513, K515, K516  \
-) { \
-    { K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016  }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116  }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216  }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, KC_NO, K415,  KC_NO }, \
-    { K500,  KC_NO, K502,  KC_NO, KC_NO, KC_NO, KC_NO, K505, KC_NO, KC_NO, K510,  KC_NO, K512,  K513,  KC_NO, K515,  K516  }, \
-}
diff --git a/keyboards/aozora/aozora.c b/keyboards/aozora/aozora.c
deleted file mode 100644
index 4466858348..0000000000
--- a/keyboards/aozora/aozora.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Salmon Cat Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "aozora.h"
diff --git a/keyboards/aozora/config.h b/keyboards/aozora/config.h
index dc68828e0f..5171d0c312 100644
--- a/keyboards/aozora/config.h
+++ b/keyboards/aozora/config.h
@@ -16,21 +16,5 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D4, D6, D7, B4, B5, B6, C6, C7, F7, D2}
-
-#define DIODE_DIRECTION COL2ROW
-
 /* EEPROM for via */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/aozora/info.json b/keyboards/aozora/info.json
index b385261282..28bdfe072c 100644
--- a/keyboards/aozora/info.json
+++ b/keyboards/aozora/info.json
@@ -8,84 +8,179 @@
         "pid": "0xE86A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D2"],
+        "rows": ["F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (F6,B0)", "x":0, "y":0},
-                {"label":"K01 (F6,B1)", "x":1, "y":0},
-                {"label":"K02 (F6,B2)", "x":2, "y":0},
-                {"label":"K03 (F6,B3)", "x":3, "y":0},
-                {"label":"K04 (F6,B7)", "x":4, "y":0},
-                {"label":"K05 (F6,D0)", "x":5, "y":0},
-                {"label":"K06 (F6,D1)", "x":6, "y":0},
-                {"label":"K07 (F6,D4)", "x":7, "y":0},
-                {"label":"K08 (F6,D6)", "x":8, "y":0},
-                {"label":"K09 (F6,D7)", "x":9, "y":0},
-                {"label":"K0A (F6,B4)", "x":10, "y":0},
-                {"label":"K0B (F6,B5)", "x":11, "y":0},
-                {"label":"K0C (F6,B6)", "x":12, "y":0},
-                {"label":"K0D (F6,C6)", "x":13, "y":0, "w":2},
-                {"label":"K0E (F6,C7)", "x":15.25, "y":0},
-                {"label":"K0F (F6,F7)", "x":16.25, "y":0},
-                {"label":"K10 (F5,B0)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (F5,B1)", "x":1.5, "y":1},
-                {"label":"K12 (F5,B2)", "x":2.5, "y":1},
-                {"label":"K13 (F5,B3)", "x":3.5, "y":1},
-                {"label":"K14 (F5,B7)", "x":4.5, "y":1},
-                {"label":"K15 (F5,D0)", "x":5.5, "y":1},
-                {"label":"K16 (F5,D1)", "x":6.5, "y":1},
-                {"label":"K17 (F5,D4)", "x":7.5, "y":1},
-                {"label":"K18 (F5,D6)", "x":8.5, "y":1},
-                {"label":"K19 (F5,D7)", "x":9.5, "y":1},
-                {"label":"K1A (F5,B4)", "x":10.5, "y":1},
-                {"label":"K1B (F5,B5)", "x":11.5, "y":1},
-                {"label":"K1C (F5,B6)", "x":12.5, "y":1},
-                {"label":"K1D (F5,C6)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (F5,C7)", "x":15.25, "y":1},
-                {"label":"K1F (F5,F7)", "x":16.25, "y":1},
-                {"label":"K20 (F4,B0)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F4,B1)", "x":1.75, "y":2},
-                {"label":"K22 (F4,B2)", "x":2.75, "y":2},
-                {"label":"K23 (F4,B3)", "x":3.75, "y":2},
-                {"label":"K24 (F4,B7)", "x":4.75, "y":2},
-                {"label":"K25 (F4,D0)", "x":5.75, "y":2},
-                {"label":"K26 (F4,D1)", "x":6.75, "y":2},
-                {"label":"K27 (F4,D4)", "x":7.75, "y":2},
-                {"label":"K28 (F4,D6)", "x":8.75, "y":2},
-                {"label":"K29 (F4,D7)", "x":9.75, "y":2},
-                {"label":"K2A (F4,B4)", "x":10.75, "y":2},
-                {"label":"K2B (F4,B5)", "x":11.75, "y":2},
-                {"label":"K2D (F4,C6)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K30 (F1,B0)", "x":0, "y":3, "w":2.25},
-                {"label":"K31 (F1,B1)", "x":2.25, "y":3},
-                {"label":"K32 (F1,B2)", "x":3.25, "y":3},
-                {"label":"K33 (F1,B3)", "x":4.25, "y":3},
-                {"label":"K34 (F1,B7)", "x":5.25, "y":3},
-                {"label":"K35 (F1,D0)", "x":6.25, "y":3},
-                {"label":"K36 (F1,D1)", "x":7.25, "y":3},
-                {"label":"K37 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K38 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K39 (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3A (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3D (F1,C6)", "x":12.25, "y":3, "w":2.75},
-                {"label":"K3E (F1,C7)", "x":15.25, "y":3},
-                {"label":"K3F (F1,F7)", "x":16.25, "y":3},
-                {"label":"K40 (F0,B0)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F0,B1)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F0,B2)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K44 (F0,B7)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K48 (F0,D6)", "x":10, "y":4, "w":1.25},
-                {"label":"K49 (F0,D7)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4A (F0,B4)", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4D (F0,C6)", "x":14.25, "y":4},
-                {"label":"K4E (F0,C7)", "x":15.25, "y":4},
-                {"label":"K4F (F0,F7)", "x":16.25, "y":4}
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+
+                {"x":15.25, "y":3},
+                {"x":16.25, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+
+                {"x":14.25, "y":4},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4}
             ]
         },
         "LAYOUT_all": {
-            "layout": [{"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"|", "x":13, "y":1.25}, {"label":"Backspace", "x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Del", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"~", "x":12.75, "y":3.25}, {"label":"Enter", "x":13.75, "y":3.25, "w":1.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"|", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"\\", "x":12.25, "y":4.25}, {"label":"Shift", "x":13.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":15.25, "y":4.25}, {"label":"Fn", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"\u2190", "x":14.25, "y":5.25}, {"label":"\u2193", "x":15.25, "y":5.25}, {"label":"\u2192", "x":16.25, "y":5.25}]
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":2, "w":1.25},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3},
+                {"x":13.25, "y":3, "w":1.75},
+
+                {"x":15.25, "y":3},
+                {"x":16.25, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+
+                {"x":14.25, "y":4},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/aplyard/aplx6/info.json b/keyboards/aplyard/aplx6/info.json
index 0bd317c1a4..9f86182a33 100644
--- a/keyboards/aplyard/aplx6/info.json
+++ b/keyboards/aplyard/aplx6/info.json
@@ -5,18 +5,5 @@
     "maintainer": "Aplyard",
     "usb": {
         "vid": "0xE0E0"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1}
-            ]
-        }
     }
 }
diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h
deleted file mode 100644
index cd4a58eec5..0000000000
--- a/keyboards/aplyard/aplx6/rev1/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 April Aplyard <alex.fragiou@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* pin-out */
-#define MATRIX_ROW_PINS { E6, B3 }
-#define MATRIX_COL_PINS { F7, B6, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json
index 6a1ac3071b..943624fb8f 100644
--- a/keyboards/aplyard/aplx6/rev1/info.json
+++ b/keyboards/aplyard/aplx6/rev1/info.json
@@ -3,6 +3,24 @@
         "pid": "0x0030",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B6", "F4"],
+        "rows": ["E6", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
+            ]
+        }
+    }
 }
diff --git a/keyboards/aplyard/aplx6/rev1/rev1.c b/keyboards/aplyard/aplx6/rev1/rev1.c
deleted file mode 100644
index 7f6f8a3224..0000000000
--- a/keyboards/aplyard/aplx6/rev1/rev1.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 April Aplyard <alex.fragiou@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "rev1.h"
-
diff --git a/keyboards/aplyard/aplx6/rev1/rev1.h b/keyboards/aplyard/aplx6/rev1/rev1.h
deleted file mode 100644
index 6990d388e7..0000000000
--- a/keyboards/aplyard/aplx6/rev1/rev1.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-      k000, k001, k002, \
-      k100, k101, k102 \
-) \
-{ \
-    { k000, k001, k002 }, \
-    { k100, k101, k102 }  \
-} 
-
diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h
index f2793935cb..2724ccf117 100644
--- a/keyboards/aplyard/aplx6/rev2/config.h
+++ b/keyboards/aplyard/aplx6/rev2/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* 9Key PCB default pin-out */
-#define MATRIX_ROW_PINS { B4, B5 }
-#define MATRIX_COL_PINS { C6, D7, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 200
 
 #define TAP_CODE_DELAY 50
diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json
index 114894a714..2dc54180eb 100644
--- a/keyboards/aplyard/aplx6/rev2/info.json
+++ b/keyboards/aplyard/aplx6/rev2/info.json
@@ -3,11 +3,29 @@
         "pid": "0x0040",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6"],
+        "rows": ["B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F4"}
         ]
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
+            ]
+        }
+    }
 }
diff --git a/keyboards/aplyard/aplx6/rev2/rev2.c b/keyboards/aplyard/aplx6/rev2/rev2.c
deleted file mode 100644
index 1a97f50058..0000000000
--- a/keyboards/aplyard/aplx6/rev2/rev2.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2020 Aplyard 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */
-#include "rev2.h"
diff --git a/keyboards/aplyard/aplx6/rev2/rev2.h b/keyboards/aplyard/aplx6/rev2/rev2.h
deleted file mode 100644
index 193c6cd51c..0000000000
--- a/keyboards/aplyard/aplx6/rev2/rev2.h
+++ /dev/null
@@ -1,28 +0,0 @@
- /* Copyright 2020 Aplyard 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-      k000, k001, k002, \
-      k100, k101, k102 \
-) \
-{ \
-    { k000, k001, k002 }, \
-    { k100, k101, k102 }  \
-} 
-
-
diff --git a/keyboards/arabica37/arabica37.c b/keyboards/arabica37/arabica37.c
deleted file mode 100644
index 22fc63b0e9..0000000000
--- a/keyboards/arabica37/arabica37.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "arabica37.h"
diff --git a/keyboards/arabica37/arabica37.h b/keyboards/arabica37/arabica37.h
deleted file mode 100644
index 3255e71d10..0000000000
--- a/keyboards/arabica37/arabica37.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_arabica37_rev1
-  #include "rev1.h"
-#endif
diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h
index 495e8dcb32..07d567be65 100644
--- a/keyboards/arabica37/rev1/config.h
+++ b/keyboards/arabica37/rev1/config.h
@@ -18,17 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-
-// wiring of each half
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 50    // Number of LEDs
 #define RGBLED_SPLIT {25, 25}
 /*
diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json
index 3629bf761f..775257c8de 100644
--- a/keyboards/arabica37/rev1/info.json
+++ b/keyboards/arabica37/rev1/info.json
@@ -8,9 +8,17 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/arabica37/rev1/rev1.c b/keyboards/arabica37/rev1/rev1.c
deleted file mode 100644
index 22fc63b0e9..0000000000
--- a/keyboards/arabica37/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "arabica37.h"
diff --git a/keyboards/arabica37/rev1/rev1.h b/keyboards/arabica37/rev1/rev1.h
index 316de77f1d..8d247242f6 100644
--- a/keyboards/arabica37/rev1/rev1.h
+++ b/keyboards/arabica37/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "arabica37.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/ares/ares.c b/keyboards/ares/ares.c
deleted file mode 100644
index 80d4455179..0000000000
--- a/keyboards/ares/ares.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ares.h"
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
index 3d384af9ea..ddc21dae30 100644
--- a/keyboards/ares/config.h
+++ b/keyboards/ares/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 16
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json
index 391c7a8125..f32758ab47 100644
--- a/keyboards/ares/info.json
+++ b/keyboards/ares/info.json
@@ -8,6 +8,11 @@
         "pid": "0x422D",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
@@ -17,6 +22,9 @@
     "bootmagic": {
         "matrix": [4, 0]
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "layout_aliases": {
diff --git a/keyboards/ares/rules.mk b/keyboards/ares/rules.mk
index 2b6885bba1..ce73d877e7 100644
--- a/keyboards/ares/rules.mk
+++ b/keyboards/ares/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/mk0_avr_extra.c b/keyboards/argo_works/ishi/80/mk0_avr_extra/mk0_avr_extra.c
index 83d591eb0a..964d56bdfb 100644
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/mk0_avr_extra.c
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/mk0_avr_extra.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 static void render_logo(void) {
diff --git a/keyboards/arisu/arisu.c b/keyboards/arisu/arisu.c
deleted file mode 100644
index 443b67e9bf..0000000000
--- a/keyboards/arisu/arisu.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Fate
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "arisu.h"
diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h
index 5001da5590..3cf449a32b 100644
--- a/keyboards/arisu/config.h
+++ b/keyboards/arisu/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/arisu/info.json b/keyboards/arisu/info.json
index 1fe2eadbe3..941f9a467d 100644
--- a/keyboards/arisu/info.json
+++ b/keyboards/arisu/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h
index c48bc4ec6a..2f259d40f6 100644
--- a/keyboards/ash1800/config.h
+++ b/keyboards/ash1800/config.h
@@ -17,27 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D0, D1, D2, D3, D5, D4, D6 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, B0, B2, B1, B3, B7, C7 }
-
 #define NUM_LOCK_LED_PIN E6
 #define CAPS_LOCK_LED_PIN F0
 #define SCROLL_LOCK_LED_PIN F7
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ash1800/info.json b/keyboards/ash1800/info.json
index 2c9338b2f6..e843d52f2b 100644
--- a/keyboards/ash1800/info.json
+++ b/keyboards/ash1800/info.json
@@ -7,6 +7,11 @@
         "pid": "0x1800",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h
index e21327b99c..8f81c450eb 100644
--- a/keyboards/ash_xiix/config.h
+++ b/keyboards/ash_xiix/config.h
@@ -14,27 +14,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D0, D1, D2, D3, D5, D4, D6 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, B0, B2, B1, B3, B7, C7 }
-
 #define NUM_LOCK_LED_PIN E6
 #define CAPS_LOCK_LED_PIN F0
 #define SCROLL_LOCK_LED_PIN F7
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ash_xiix/info.json b/keyboards/ash_xiix/info.json
index 4bc7fb1987..3eaa711e31 100644
--- a/keyboards/ash_xiix/info.json
+++ b/keyboards/ash_xiix/info.json
@@ -8,6 +8,11 @@
         "pid": "0x14BC",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ashpil/modelm_usbc/config.h b/keyboards/ashpil/modelm_usbc/config.h
deleted file mode 100644
index 00c5f5626b..0000000000
--- a/keyboards/ashpil/modelm_usbc/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2019 ashpil
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C7, C6, C5, C4, C3, C2, C1, C0 }
-#define MATRIX_COL_PINS { E6, E7, F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/ashpil/modelm_usbc/info.json
index c048dd047a..71760995eb 100644
--- a/keyboards/ashpil/modelm_usbc/info.json
+++ b/keyboards/ashpil/modelm_usbc/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "E7", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5"],
+        "rows": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0"]
+    },
+    "diode_direction": "ROW2COL",
     "bootmagic": {
         "matrix": [0, 2]
     },
@@ -15,10 +20,251 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_fullsize_iso_wkl": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+
+                {"matrix": [2, 3], "x": 2, "y": 0},
+                {"matrix": [2, 4], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [1, 9], "x": 8.5, "y": 0},
+                {"matrix": [2, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 11], "x": 13, "y": 0},
+                {"matrix": [3, 12], "x": 14, "y": 0},
+
+                {"matrix": [3, 15], "x": 15.25, "y": 0},
+                {"matrix": [4, 15], "x": 16.25, "y": 0},
+                {"matrix": [6, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 2], "x": 0, "y": 1.5},
+                {"matrix": [3, 2], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [3, 4], "x": 3, "y": 1.5},
+                {"matrix": [3, 5], "x": 4, "y": 1.5},
+                {"matrix": [2, 5], "x": 5, "y": 1.5},
+                {"matrix": [2, 7], "x": 6, "y": 1.5},
+                {"matrix": [3, 7], "x": 7, "y": 1.5},
+                {"matrix": [3, 8], "x": 8, "y": 1.5},
+                {"matrix": [3, 9], "x": 9, "y": 1.5},
+                {"matrix": [3, 10], "x": 10, "y": 1.5},
+                {"matrix": [2, 10], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 13], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 13], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 13], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 11], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 11], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 11], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 12], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 13], "x": 20.5, "y": 3.5},
+
+                {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 11], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 12], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 13], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [7, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 11], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 13], "x": 20.5, "y": 5.5}
+            ]
         },
-		"LAYOUT_fullsize_ansi_wkl": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+        "LAYOUT_fullsize_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+
+                {"matrix": [2, 3], "x": 2, "y": 0},
+                {"matrix": [2, 4], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [1, 9], "x": 8.5, "y": 0},
+                {"matrix": [2, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 11], "x": 13, "y": 0},
+                {"matrix": [3, 12], "x": 14, "y": 0},
+
+                {"matrix": [3, 15], "x": 15.25, "y": 0},
+                {"matrix": [4, 15], "x": 16.25, "y": 0},
+                {"matrix": [6, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 2], "x": 0, "y": 1.5},
+                {"matrix": [3, 2], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [3, 4], "x": 3, "y": 1.5},
+                {"matrix": [3, 5], "x": 4, "y": 1.5},
+                {"matrix": [2, 5], "x": 5, "y": 1.5},
+                {"matrix": [2, 7], "x": 6, "y": 1.5},
+                {"matrix": [3, 7], "x": 7, "y": 1.5},
+                {"matrix": [3, 8], "x": 8, "y": 1.5},
+                {"matrix": [3, 9], "x": 9, "y": 1.5},
+                {"matrix": [3, 10], "x": 10, "y": 1.5},
+                {"matrix": [2, 10], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 13], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 13], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 13], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 11], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 11], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [1, 11], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 12], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 13], "x": 20.5, "y": 3.5},
+
+                {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [6, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 11], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 12], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 13], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [7, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 11], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 13], "x": 20.5, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/ashpil/modelm_usbc/modelm_usbc.c b/keyboards/ashpil/modelm_usbc/modelm_usbc.c
index e505c72233..92b577635c 100644
--- a/keyboards/ashpil/modelm_usbc/modelm_usbc.c
+++ b/keyboards/ashpil/modelm_usbc/modelm_usbc.c
@@ -13,7 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www./gnu.org/licenses/>.
  */
-#include "modelm_usbc.h"
+
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
   /* Setting status LEDs pins to output and +5V (off) */
diff --git a/keyboards/ashpil/modelm_usbc/modelm_usbc.h b/keyboards/ashpil/modelm_usbc/modelm_usbc.h
deleted file mode 100644
index da50b865c7..0000000000
--- a/keyboards/ashpil/modelm_usbc/modelm_usbc.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2019 ashpil
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- * The first section contains "names" for physical keys of the keyboard
- * and defines their position on the board.
- * The second section defines position of the keys on the switch matrix 
- * (where COLUMNS and ROWS crosses). */
-
-#define LAYOUT_fullsize_ansi_wkl( \
-    K5A,      K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M,   K5N, K5O, K5P, \
-    \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N,   K4O, K4P, K4Q,   K4R, K4S, K4T, K4U, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N,   K3O, K3P, K3Q,   K3R, K3S, K3T, K3U, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L,      K2N,                    K2O, K2P, K2Q, \
-    K1A,      K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L,      K1M,        K1N,        K1O, K1P, K1Q, K1R, \
-    K0A,      K0B,                K0C,                     K0D,      K0E,   K0F, K0G, K0H,   K0I,      K0J \
-) \
-{ \
-    { KC_NO, KC_NO, K5A,   KC_NO, K5E,   K2F, K5F,   K2G, K5G,   KC_NO, K2L,   KC_NO, K0I, K0J, K1N,   K0B   }, \
-    { KC_NO, K1A,   K3A,   K2A,   K5D,   K3F, K4N,   K3G, K3M,   K5H,   K3L,   K2O,   K2P, K2Q, KC_NO, KC_NO }, \
-    { K0A,   KC_NO, K4A,   K5B,   K5C,   K4F, K5J,   K4G, K4M,   K5I,   K4L,   K3O,   K4O, K4Q, K4P,   KC_NO }, \
-    { KC_NO, KC_NO, K4B,   K4C,   K4D,   K4E, K5K,   K4H, K4I,   K4J,   K4K,   K5L,   K5M, K3Q, K3P,   K5N   }, \
-    { KC_NO, KC_NO, K3B,   K3C,   K3D,   K3E, KC_NO, K3H, K3I,   K3J,   K3K,   K3R,   K3S, K3T, K3U,   K5O   }, \
-    { KC_NO, KC_NO, K2B,   K2C,   K2D,   K2E, K3N,   K2H, K2I,   K2J,   K2K,   K1O,   K1P, K1Q, K1R,   KC_NO }, \
-    { K0E,   K1M,   K1C,   K1D,   K1E,   K1F, K2N,   K1I, K1J,   K1K,   KC_NO, K4R,   K4S, K4T, K5P,   KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1G, K0C,   K1H, KC_NO, KC_NO, K1L,   K0G,   K0H, K4U, K0F,   K0D   }  \
-}
-
-#define LAYOUT_fullsize_iso_wkl( \
-    K5A,      K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M,   K5N, K5O, K5P, \
-    \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N,   K4O, K4P, K4Q,   K4R, K4S, K4T, K4U, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M,        K3O, K3P, K3Q,   K3R, K3S, K3T, K3U, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N,                    K2O, K2P, K2Q, \
-    K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L,      K1M,        K1N,        K1O, K1P, K1Q, K1R, \
-    K0A,      K0B,                K0C,                     K0D,      K0E,   K0F, K0G, K0H,   K0I,      K0J \
-) \
-{ \
-    { KC_NO, KC_NO, K5A,   K1B,   K5E,   K2F, K5F,   K2G, K5G,   KC_NO, K2L,   KC_NO, K0I, K0J, K1N,   K0B   }, \
-    { KC_NO, K1A,   K3A,   K2A,   K5D,   K3F, K4N,   K3G, K3M,   K5H,   K3L,   K2O,   K2P, K2Q, KC_NO, KC_NO }, \
-    { K0A,   KC_NO, K4A,   K5B,   K5C,   K4F, K5J,   K4G, K4M,   K5I,   K4L,   K3O,   K4O, K4Q, K4P,   KC_NO }, \
-    { KC_NO, KC_NO, K4B,   K4C,   K4D,   K4E, K5K,   K4H, K4I,   K4J,   K4K,   K5L,   K5M, K3Q, K3P,   K5N   }, \
-    { KC_NO, KC_NO, K3B,   K3C,   K3D,   K3E, KC_NO, K3H, K3I,   K3J,   K3K,   K3R,   K3S, K3T, K3U,   K5O   }, \
-    { KC_NO, KC_NO, K2B,   K2C,   K2D,   K2E, KC_NO, K2H, K2I,   K2J,   K2K,   K1O,   K1P, K1Q, K1R,   KC_NO }, \
-    { K0E,   K1M,   K1C,   K1D,   K1E,   K1F, K2N,   K1I, K1J,   K1K,   K2M,   K4R,   K4S, K4T, K5P,   KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1G, K0C,   K1H, KC_NO, KC_NO, K1L,   K0G,   K0H, K4U, K0F,   K0D   }  \
-}
diff --git a/keyboards/ask55/info.json b/keyboards/ask55/info.json
index 7606fc1133..738203f248 100644
--- a/keyboards/ask55/info.json
+++ b/keyboards/ask55/info.json
@@ -38,10 +38,12 @@
         "hue_steps": 8,
         "led_count": 8,
         "max_brightness": 255,
-        "pin": "F4",
         "saturation_steps": 8,
         "sleep": true
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "usb": {
         "device_version": "0.0.1",
         "pid": "0x3535",
diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h
index bf47051193..70ad2757b9 100644
--- a/keyboards/at_at/660m/config.h
+++ b/keyboards/at_at/660m/config.h
@@ -23,10 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LSE clock */
 #define STM32_LSECLK 32768
 
-#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B9, B8, B7, B6, B5, B3, B4, B0 }
-#define MATRIX_ROW_PINS { A3, A4, A5, A0, A1 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/at_at/660m/info.json b/keyboards/at_at/660m/info.json
index 8e5e511aa2..4fdd84daeb 100644
--- a/keyboards/at_at/660m/info.json
+++ b/keyboards/at_at/660m/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6600",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B9", "B8", "B7", "B6", "B5", "B3", "B4", "B0"],
+        "rows": ["A3", "A4", "A5", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
@@ -17,7 +22,7 @@
                 {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Del", "x":15.5, "y":1},
                 {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25},
                 {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.25}, {"label":"&uarr;", "x":14.5, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":6.25}, {"label":"Alt", "x":9.75, "y":4, "w":1.25}, {"label":"Fn", "x":11, "y":4, "w":1.25}, {"label":"Ctrl", "x":12.25, "y":4, "w":1.25}, {"label":"&larr;", "x":13.5, "y":4}, {"label":"&darr;", "x":14.5, "y":4}, {"label":"&rarr;", "x":15.5, "y":4}
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":6.25}, {"label":"Alt", "x":9.75, "y":4, "w":1.25}, {"label":"Fn", "x":11, "y":4, "w":1.25}, {"label":"Ctrl", "x":12.25, "y":4, "w":1.25}, {"label":"&larr;", "x":13.5, "y":4}, {"label":"&darr;", "x":14.5, "y":4}, {"label":"&rarr;", "x":15.5, "y":4}
             ]
         }
     }
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index 7379856a4f..994c0fd82f 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -16,17 +16,9 @@
 
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { F1, F7, F6, F5, F4, D5 }
-#define MATRIX_COL_PINS { F0, C7, C6, B6, B5, B4, D7, D6, B2, B7, D3, D2, D1, D0, B3 }
-
 #define ENCODERS_CCW_KEY { { 4, 5 } } // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 3, 5 } } // Note:  array is { col, row )
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -34,9 +26,6 @@
 #define LOCKING_RESYNC_ENABLE
 #define FORCE_NKRO
 
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
-
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_DISABLE_WHEN_USB_SUSPENDED true
@@ -88,5 +77,3 @@
 #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
-
-#endif
\ No newline at end of file
diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json
index 0269bd1e27..f7c0c0b3a8 100644
--- a/keyboards/atlantis/ak81_ve/info.json
+++ b/keyboards/atlantis/ak81_ve/info.json
@@ -7,6 +7,14 @@
         "pid": "0x0081",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"],
+        "rows": ["F1", "F7", "F6", "F5", "F4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "E6", "pin_b": "B0"}
@@ -16,6 +24,9 @@
         "caps_lock": "D4",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/atlantis/ak81_ve/rules.mk b/keyboards/atlantis/ak81_ve/rules.mk
index 3a7c70a102..aaaf913b96 100644
--- a/keyboards/atlantis/ak81_ve/rules.mk
+++ b/keyboards/atlantis/ak81_ve/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 DYNAMIC_MACRO_ENABLE = yes
 ENCODER_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/atlantis/encoder_actions.c b/keyboards/atlantis/encoder_actions.c
index 5bfba6d99f..126b665a8e 100644
--- a/keyboards/atlantis/encoder_actions.c
+++ b/keyboards/atlantis/encoder_actions.c
@@ -28,7 +28,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -40,7 +41,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/atlantis/ps17/config.h b/keyboards/atlantis/ps17/config.h
index 5638e334bd..a41720aeb5 100644
--- a/keyboards/atlantis/ps17/config.h
+++ b/keyboards/atlantis/ps17/config.h
@@ -9,7 +9,6 @@
 #define LED_INDICATOR_2_PIN D4
 
 /* RGB matrix */
-#define RGB_DI_PIN B7
 #define RGB_MATRIX_LED_COUNT 28
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/atlantis/ps17/info.json b/keyboards/atlantis/ps17/info.json
index 5b025c83f7..a4c505ce5a 100644
--- a/keyboards/atlantis/ps17/info.json
+++ b/keyboards/atlantis/ps17/info.json
@@ -26,6 +26,9 @@
         "cols": ["F6", "F7", "D3", "D6"],
         "rows": ["F0", "B4", "B5", "B6", "C6", "C7", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"]
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "encoder": {
         "rotary": [{
             "pin_a": "D2",
diff --git a/keyboards/atlantis/ps17/ps17.c b/keyboards/atlantis/ps17/ps17.c
index ccac1ce923..d660bdee6a 100644
--- a/keyboards/atlantis/ps17/ps17.c
+++ b/keyboards/atlantis/ps17/ps17.c
@@ -19,23 +19,6 @@ void keyboard_pre_init_kb(void) {
     keyboard_pre_init_user();
 }
 
-#if defined(ENCODER_ENABLE)
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        /* Don't process further events if user function exists and returns false */
-        return false;
-    }
-
-    /* Ignore index - only one encoder on this board */
-    if (clockwise) {
-        tap_code_delay(KC_VOLU, 10);
-    } else {
-        tap_code_delay(KC_VOLD, 10);
-    }
-    return false;
-}
-#endif
-
 #ifdef RGB_MATRIX_ENABLE
 void suspend_power_down_kb(void) {
     /* Disable indicator LEDs when going to sleep */
diff --git a/keyboards/atlas_65/atlas_65.c b/keyboards/atlas_65/atlas_65.c
deleted file mode 100644
index 536d8edf71..0000000000
--- a/keyboards/atlas_65/atlas_65.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Joshua Nguyen
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "atlas_65.h"
diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h
index 78beebcc65..d0851ac1fd 100644
--- a/keyboards/atlas_65/config.h
+++ b/keyboards/atlas_65/config.h
@@ -16,23 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/atlas_65/info.json b/keyboards/atlas_65/info.json
index 7d755c37bf..af2487f604 100644
--- a/keyboards/atlas_65/info.json
+++ b/keyboards/atlas_65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/atomic/atomic.c b/keyboards/atomic/atomic.c
index 1bd663c514..68f3ce9764 100644
--- a/keyboards/atomic/atomic.c
+++ b/keyboards/atomic/atomic.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "atomic.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
diff --git a/keyboards/atomic/atomic.h b/keyboards/atomic/atomic.h
deleted file mode 100644
index 7579f49e33..0000000000
--- a/keyboards/atomic/atomic.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2015 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_semi_standard( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,   K0E,    \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K2D,   K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,    K3C,   K3D, K3E, \
-     K40,  K41,  K43,           K46,                  K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B,   K0C,   KC_NO, K0E }, \
-    { K10, K11, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B,   K1C,   K1D,   K1E }, \
-    { K20, K21, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B,   KC_NO, K2D,   K2E }, \
-    { K30, K31, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, KC_NO, K3C,   K3D,   K3E }, \
-    { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,   K4D,   K4E }  \
-}
-
-#define LAYOUT_ortho_5x15( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h
index 9c50c21e3f..b9449c4714 100644
--- a/keyboards/atomic/config.h
+++ b/keyboards/atomic/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D5, B5, B6, C6 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/atomic/info.json b/keyboards/atomic/info.json
index 95f5088995..8635648ea0 100644
--- a/keyboards/atomic/info.json
+++ b/keyboards/atomic/info.json
@@ -7,6 +7,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "D3", "D2", "D1"],
+        "rows": ["D0", "D5", "B5", "B6", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
@@ -19,159 +24,159 @@
     "layouts": {
         "LAYOUT_semi_standard": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2, "w":2},
-                {"x":14, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 13], "x": 12, "y": 2, "w": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3, "w":2},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 12], "x": 11, "y": 3, "w": 2},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x15": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":7, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/atreus/astar/astar.c b/keyboards/atreus/astar/astar.c
deleted file mode 100644
index 19490deb99..0000000000
--- a/keyboards/atreus/astar/astar.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "atreus.h"
diff --git a/keyboards/atreus/astar/astar.h b/keyboards/atreus/astar/astar.h
deleted file mode 100644
index bf74ceb17f..0000000000
--- a/keyboards/atreus/astar/astar.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
diff --git a/keyboards/atreus/astar/config.h b/keyboards/atreus/astar/config.h
deleted file mode 100644
index 90bf37823d..0000000000
--- a/keyboards/atreus/astar/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D3, D2 }
-#if defined(PCBDOWN)
-  #define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
-#else
-  #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
-#endif
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/astar/info.json b/keyboards/atreus/astar/info.json
index 4369a04103..e201078ffe 100644
--- a/keyboards/atreus/astar/info.json
+++ b/keyboards/atreus/astar/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["D7", "C6", "B5", "B4", "E6", "D4", "B6", "F6", "F7", "D6", "B7"],
+        "rows": ["D0", "D1", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/atreus/astar_mirrored/astar_mirrored.c b/keyboards/atreus/astar_mirrored/astar_mirrored.c
deleted file mode 100644
index b8eacded63..0000000000
--- a/keyboards/atreus/astar_mirrored/astar_mirrored.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "astar_mirrored.h"
diff --git a/keyboards/atreus/astar_mirrored/astar_mirrored.h b/keyboards/atreus/astar_mirrored/astar_mirrored.h
deleted file mode 100644
index bf74ceb17f..0000000000
--- a/keyboards/atreus/astar_mirrored/astar_mirrored.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
diff --git a/keyboards/atreus/astar_mirrored/config.h b/keyboards/atreus/astar_mirrored/config.h
index 83c9cf7fc6..3bd163dec3 100644
--- a/keyboards/atreus/astar_mirrored/config.h
+++ b/keyboards/atreus/astar_mirrored/config.h
@@ -16,21 +16,4 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
 #define PCBDOWN 1
-
-#define MATRIX_ROW_PINS { D0, D1, D3, D2 }
-#define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/astar_mirrored/info.json b/keyboards/atreus/astar_mirrored/info.json
index 4369a04103..b83be5d29d 100644
--- a/keyboards/atreus/astar_mirrored/info.json
+++ b/keyboards/atreus/astar_mirrored/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B7", "D6", "F7", "F6", "B6", "D4", "E6", "B4", "B5", "C6", "D7"],
+        "rows": ["D0", "D1", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/atreus/atreus.c b/keyboards/atreus/atreus.c
deleted file mode 100644
index 33bb5f35ad..0000000000
--- a/keyboards/atreus/atreus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "atreus.h"
diff --git a/keyboards/atreus/atreus.h b/keyboards/atreus/atreus.h
index 2753434535..2a966b8641 100644
--- a/keyboards/atreus/atreus.h
+++ b/keyboards/atreus/atreus.h
@@ -18,20 +18,6 @@
 #include "quantum.h"
 #define ___ KC_NO
 
-#ifdef KEYBOARD_atreus_astar
-    #include "astar.h"
-#elif KEYBOARD_atreus_astar_mirrored
-    #include "astar_mirrored.h"
-#elif KEYBOARD_atreus_feather
-    #include "feather.h"
-#elif KEYBOARD_atreus_teensy2
-    #include "teensy2.h"
-#elif KEYBOARD_atreus_promicro
-    #include "promicro.h"
-#elif KEYBOARD_atreus_f103
-    #include "f103.h"
-#endif
-
 // This a shortcut to help you visually see your layout.
 // The first section contains all of the arguments.
 // The second converts the arguments into a two-dimensional array.
diff --git a/keyboards/atreus/f103/config.h b/keyboards/atreus/f103/config.h
deleted file mode 100644
index d6d3b033dd..0000000000
--- a/keyboards/atreus/f103/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-/* key matrix pins */
-#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, B5, B4, B3, A15, A10, A9 }
-#define MATRIX_ROW_PINS { A5, A4, A3, A2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/f103/f103.c b/keyboards/atreus/f103/f103.c
deleted file mode 100644
index acac0ed71c..0000000000
--- a/keyboards/atreus/f103/f103.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "f103.h"
diff --git a/keyboards/atreus/f103/f103.h b/keyboards/atreus/f103/f103.h
deleted file mode 100644
index 305b26798b..0000000000
--- a/keyboards/atreus/f103/f103.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
diff --git a/keyboards/atreus/f103/info.json b/keyboards/atreus/f103/info.json
index cf993be247..341ed4e8e6 100644
--- a/keyboards/atreus/f103/info.json
+++ b/keyboards/atreus/f103/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "A7", "A6", "B5", "B4", "B3", "A15", "A10", "A9"],
+        "rows": ["A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino"
 }
diff --git a/keyboards/atreus/feather/config.h b/keyboards/atreus/feather/config.h
index 34880f0e3e..505296a505 100644
--- a/keyboards/atreus/feather/config.h
+++ b/keyboards/atreus/feather/config.h
@@ -16,23 +16,4 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-// #define MATRIX_ROW_PINS { D0, D1, D3, D2 }
-// #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
-#define MATRIX_ROW_PINS { B7, D6, C7, F5 }
-#define MATRIX_COL_PINS { D7, B5, D1, D0, C6, B6, F0, D2, D3, F4, F1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define OUTPUT_AUTO_ENABLE
diff --git a/keyboards/atreus/feather/feather.c b/keyboards/atreus/feather/feather.c
deleted file mode 100644
index ceebc51c23..0000000000
--- a/keyboards/atreus/feather/feather.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "feather.h"
diff --git a/keyboards/atreus/feather/feather.h b/keyboards/atreus/feather/feather.h
deleted file mode 100644
index bf74ceb17f..0000000000
--- a/keyboards/atreus/feather/feather.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/info.json
index 4369a04103..1f70534b7f 100644
--- a/keyboards/atreus/feather/info.json
+++ b/keyboards/atreus/feather/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["D7", "B5", "D1", "D0", "C6", "B6", "F0", "D2", "D3", "F4", "F1"],
+        "rows": ["B7", "D6", "C7", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/atreus/keymaps/kejadlen/config.h b/keyboards/atreus/keymaps/kejadlen/config.h
index 5a9573c57f..a75070e199 100644
--- a/keyboards/atreus/keymaps/kejadlen/config.h
+++ b/keyboards/atreus/keymaps/kejadlen/config.h
@@ -7,7 +7,6 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define QUICK_TAP_TERM 0
 
 #define USB_MAX_POWER_CONSUMPTION 50
diff --git a/keyboards/atreus/keymaps/khitsule/config.h b/keyboards/atreus/keymaps/khitsule/config.h
index c74909a9ff..7fa3bf328e 100644
--- a/keyboards/atreus/keymaps/khitsule/config.h
+++ b/keyboards/atreus/keymaps/khitsule/config.h
@@ -3,6 +3,4 @@
 
 #include "../../config.h"
 
-#define IGNORE_MOD_TAP_INTERRUPT
-
 #endif
diff --git a/keyboards/atreus/promicro/config.h b/keyboards/atreus/promicro/config.h
deleted file mode 100644
index 6c0dd1d4b9..0000000000
--- a/keyboards/atreus/promicro/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, B2, B4, B5 }
-#if defined(PCBDOWN)
-  #define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B6, B3, B1, F7, F6, F5 }
-#else
-  #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B6, E6, D7, C6, D4, D0 }
-#endif
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/promicro/info.json b/keyboards/atreus/promicro/info.json
index 4369a04103..e614b4e2a0 100644
--- a/keyboards/atreus/promicro/info.json
+++ b/keyboards/atreus/promicro/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B6", "E6", "D7", "C6", "D4", "D0"],
+        "rows": ["F4", "B2", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/atreus/promicro/promicro.c b/keyboards/atreus/promicro/promicro.c
deleted file mode 100644
index ad08ac9f01..0000000000
--- a/keyboards/atreus/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "promicro.h"
diff --git a/keyboards/atreus/promicro/promicro.h b/keyboards/atreus/promicro/promicro.h
deleted file mode 100644
index bf74ceb17f..0000000000
--- a/keyboards/atreus/promicro/promicro.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
diff --git a/keyboards/atreus/teensy2/config.h b/keyboards/atreus/teensy2/config.h
deleted file mode 100644
index 4664561f9b..0000000000
--- a/keyboards/atreus/teensy2/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/teensy2/info.json b/keyboards/atreus/teensy2/info.json
index 0b2db81c11..067ea9a01d 100644
--- a/keyboards/atreus/teensy2/info.json
+++ b/keyboards/atreus/teensy2/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay"
 }
diff --git a/keyboards/atreus/teensy2/teensy2.c b/keyboards/atreus/teensy2/teensy2.c
deleted file mode 100644
index 19490deb99..0000000000
--- a/keyboards/atreus/teensy2/teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "atreus.h"
diff --git a/keyboards/atreus/teensy2/teensy2.h b/keyboards/atreus/teensy2/teensy2.h
deleted file mode 100644
index bf74ceb17f..0000000000
--- a/keyboards/atreus/teensy2/teensy2.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
diff --git a/keyboards/atreus62/atreus62.c b/keyboards/atreus62/atreus62.c
deleted file mode 100644
index ba5bce9899..0000000000
--- a/keyboards/atreus62/atreus62.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "atreus62.h"
\ No newline at end of file
diff --git a/keyboards/atreus62/config.h b/keyboards/atreus62/config.h
index b497998196..9b7700e013 100644
--- a/keyboards/atreus62/config.h
+++ b/keyboards/atreus62/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D2, D3, D1, D0, D4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/atreus62/info.json b/keyboards/atreus62/info.json
index 9818475ace..0221f2c551 100644
--- a/keyboards/atreus62/info.json
+++ b/keyboards/atreus62/info.json
@@ -4,10 +4,15 @@
   "url": "",
   "maintainer": "qmk",
   "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6062",
-        "device_version": "0.0.1"
-    },
+    "vid": "0xFEED",
+    "pid": "0x6062",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6"],
+    "rows": ["D2", "D3", "D1", "D0", "D4"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/atreus62/keymaps/hvp/config.h b/keyboards/atreus62/keymaps/hvp/config.h
index e1222e21f5..8013c0cb6d 100644
--- a/keyboards/atreus62/keymaps/hvp/config.h
+++ b/keyboards/atreus62/keymaps/hvp/config.h
@@ -1,5 +1,4 @@
 #pragma once
 
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
diff --git a/keyboards/atreyu/atreyu.c b/keyboards/atreyu/atreyu.c
deleted file mode 100644
index 0c5a97d18a..0000000000
--- a/keyboards/atreyu/atreyu.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Jesus Climent  (@climent)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "atreyu.h"
diff --git a/keyboards/atreyu/atreyu.h b/keyboards/atreyu/atreyu.h
deleted file mode 100644
index 64db24a4ee..0000000000
--- a/keyboards/atreyu/atreyu.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 Jesus Climent  (@climent)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#if defined(KEYBOARD_atreyu_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_atreyu_rev2)
-# include "rev2.h"
-#endif
diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h
index 99eb2c21e6..d7c434426b 100644
--- a/keyboards/atreyu/rev1/config.h
+++ b/keyboards/atreyu/rev1/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, E6, B4, B5, F6, F7, B1, B3, B6, B2 }
-#define MATRIX_COL_PINS { C6, D4, D0, D1, D2, D3 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
- 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/atreyu/rev1/info.json b/keyboards/atreyu/rev1/info.json
index 6d191d0635..00012812a4 100644
--- a/keyboards/atreyu/rev1/info.json
+++ b/keyboards/atreyu/rev1/info.json
@@ -8,6 +8,11 @@
       "pid": "0x0001",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D4", "D0", "D1", "D2", "D3"],
+        "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F4"}
diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h
index de63cf3bd1..d7c434426b 100644
--- a/keyboards/atreyu/rev2/config.h
+++ b/keyboards/atreyu/rev2/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, E6, B4, B5, F6, F7, B1, B3, B6, B2 }
-#define MATRIX_COL_PINS { F4, F5, C6, D4, D2, D3 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
- 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/atreyu/rev2/info.json b/keyboards/atreyu/rev2/info.json
index a890b8d271..707f8554e0 100644
--- a/keyboards/atreyu/rev2/info.json
+++ b/keyboards/atreyu/rev2/info.json
@@ -8,6 +8,11 @@
       "pid": "0x0001",
       "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "C6", "D4", "D2", "D3"],
+        "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D5", "pin_b": "B7"},
diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h
index 11b4549d46..dc6abdcaf2 100644
--- a/keyboards/atset/at1/config.h
+++ b/keyboards/atset/at1/config.h
@@ -15,13 +15,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D2 }
-#define MATRIX_COL_PINS { B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/atset/at1/info.json b/keyboards/atset/at1/info.json
index 8e68513a43..85b848e8d6 100644
--- a/keyboards/atset/at1/info.json
+++ b/keyboards/atset/at1/info.json
@@ -7,6 +7,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6"],
+    "rows": ["D2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h
index 77ace78035..dc6abdcaf2 100644
--- a/keyboards/atset/at12/config.h
+++ b/keyboards/atset/at12/config.h
@@ -15,13 +15,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { B6, B5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/atset/at12/info.json b/keyboards/atset/at12/info.json
index e7914318b8..7708afac20 100644
--- a/keyboards/atset/at12/info.json
+++ b/keyboards/atset/at12/info.json
@@ -7,6 +7,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6", "B5", "B4"],
+    "rows": ["D3", "D2", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h
index 6db5e0ead5..dc6abdcaf2 100644
--- a/keyboards/atset/at16/config.h
+++ b/keyboards/atset/at16/config.h
@@ -15,13 +15,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { B6, B5, B4, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/atset/at16/info.json b/keyboards/atset/at16/info.json
index 3ea641eec9..2d5daf6ab1 100644
--- a/keyboards/atset/at16/info.json
+++ b/keyboards/atset/at16/info.json
@@ -7,6 +7,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6", "B5", "B4", "B2"],
+    "rows": ["D3", "D2", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["ortho_4x4"],
diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h
index b9d7f7c641..dc6abdcaf2 100644
--- a/keyboards/atset/at3/config.h
+++ b/keyboards/atset/at3/config.h
@@ -15,13 +15,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D2 }
-#define MATRIX_COL_PINS { B6, B5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/atset/at3/info.json b/keyboards/atset/at3/info.json
index 1241361d71..9f804fad1a 100644
--- a/keyboards/atset/at3/info.json
+++ b/keyboards/atset/at3/info.json
@@ -7,6 +7,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6", "B5", "B4"],
+    "rows": ["D2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h
index 522ad5fec3..dc6abdcaf2 100644
--- a/keyboards/atset/at6/config.h
+++ b/keyboards/atset/at6/config.h
@@ -15,13 +15,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D2, D1 }
-#define MATRIX_COL_PINS { B6, B5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/atset/at6/info.json b/keyboards/atset/at6/info.json
index 03be76e696..bfcbafdff5 100644
--- a/keyboards/atset/at6/info.json
+++ b/keyboards/atset/at6/info.json
@@ -7,6 +7,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6", "B5", "B4"],
+    "rows": ["D2", "D1"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h
index cc0fa4cbc8..dc6abdcaf2 100644
--- a/keyboards/atset/at9/config.h
+++ b/keyboards/atset/at9/config.h
@@ -15,13 +15,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D2, D1, D0 }
-#define MATRIX_COL_PINS { B6, B5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/atset/at9/info.json b/keyboards/atset/at9/info.json
index ecff089964..2afafe5cef 100644
--- a/keyboards/atset/at9/info.json
+++ b/keyboards/atset/at9/info.json
@@ -7,6 +7,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6", "B5", "B4"],
+    "rows": ["D2", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/atxkb/1894/1894.c b/keyboards/atxkb/1894/1894.c
deleted file mode 100644
index 9ac75b91e4..0000000000
--- a/keyboards/atxkb/1894/1894.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "1894.h"
diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h
index e4f44cdfce..4a65cefa90 100644
--- a/keyboards/atxkb/1894/config.h
+++ b/keyboards/atxkb/1894/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 14
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/atxkb/1894/info.json b/keyboards/atxkb/1894/info.json
index fef98bcacf..489c3016e7 100644
--- a/keyboards/atxkb/1894/info.json
+++ b/keyboards/atxkb/1894/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
diff --git a/keyboards/aurora65/aurora65.c b/keyboards/aurora65/aurora65.c
deleted file mode 100644
index 0c51c51c5f..0000000000
--- a/keyboards/aurora65/aurora65.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "aurora65.h"
diff --git a/keyboards/aurora65/aurora65.h b/keyboards/aurora65/aurora65.h
deleted file mode 100644
index 5a8f0d6ef4..0000000000
--- a/keyboards/aurora65/aurora65.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,                K49, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/aurora65/config.h b/keyboards/aurora65/config.h
index 7b3f4608ea..44b15462ad 100644
--- a/keyboards/aurora65/config.h
+++ b/keyboards/aurora65/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, B2, B1, B0, A0, A1, A2, A3, A5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Light */
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
@@ -33,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_CHANNEL 5
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 36
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json
index 28adec5eab..fd03acb5bd 100644
--- a/keyboards/aurora65/info.json
+++ b/keyboards/aurora65/info.json
@@ -8,83 +8,92 @@
         "pid": "0x4136",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/aurora65/rules.mk b/keyboards/aurora65/rules.mk
index f430af42f4..000ee78e21 100644
--- a/keyboards/aurora65/rules.mk
+++ b/keyboards/aurora65/rules.mk
@@ -17,5 +17,4 @@ 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
-WS2812_DRIVER = pwm         # Driver for RGB uderglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/avalanche/avalanche.c b/keyboards/avalanche/avalanche.c
index 7efdf591d5..53bc5bd6aa 100644
--- a/keyboards/avalanche/avalanche.c
+++ b/keyboards/avalanche/avalanche.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Vitaly Volkov (@vlkv)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "avalanche.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/avalanche/avalanche.h b/keyboards/avalanche/avalanche.h
deleted file mode 100644
index 916019f0d0..0000000000
--- a/keyboards/avalanche/avalanche.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#ifdef KEYBOARD_avalanche_v1
-    #include "v1.h"
-#elif KEYBOARD_avalanche_v2
-    #include "v2.h"
-#elif KEYBOARD_avalanche_v3
-    #include "v3.h"
-#elif KEYBOARD_avalanche_v4
-    #include "v4.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/avalanche/v1/config.h b/keyboards/avalanche/v1/config.h
deleted file mode 100644
index 940476e03a..0000000000
--- a/keyboards/avalanche/v1/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json
index 518a0c0742..e8ce03904f 100644
--- a/keyboards/avalanche/v1/info.json
+++ b/keyboards/avalanche/v1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/avalanche/v1/v1.c b/keyboards/avalanche/v1/v1.c
deleted file mode 100644
index 1a0cff2e51..0000000000
--- a/keyboards/avalanche/v1/v1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "avalanche.h"
diff --git a/keyboards/avalanche/v1/v1.h b/keyboards/avalanche/v1/v1.h
index a8f55c7536..dd6c921e69 100644
--- a/keyboards/avalanche/v1/v1.h
+++ b/keyboards/avalanche/v1/v1.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "avalanche.h"
-
 #include "quantum.h"
 
 #define L__ KC_NO
diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h
index 3978f581e1..5d7c1c2047 100644
--- a/keyboards/avalanche/v2/config.h
+++ b/keyboards/avalanche/v2/config.h
@@ -3,13 +3,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12
 #define RGBLED_SPLIT { 6, 6 }
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json
index 7105fc1787..b7b7df5dff 100644
--- a/keyboards/avalanche/v2/info.json
+++ b/keyboards/avalanche/v2/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0002",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/avalanche/v2/v2.c b/keyboards/avalanche/v2/v2.c
deleted file mode 100644
index 1a0cff2e51..0000000000
--- a/keyboards/avalanche/v2/v2.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "avalanche.h"
diff --git a/keyboards/avalanche/v2/v2.h b/keyboards/avalanche/v2/v2.h
index 6832becdf7..f8319c3ef4 100644
--- a/keyboards/avalanche/v2/v2.h
+++ b/keyboards/avalanche/v2/v2.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "avalanche.h"
-
 #include "quantum.h"
 
 #define L__ KC_NO
diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h
index efe0c27932..c6042255e3 100644
--- a/keyboards/avalanche/v3/config.h
+++ b/keyboards/avalanche/v3/config.h
@@ -3,13 +3,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12
 #define RGBLED_SPLIT { 7, 7 }
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json
index 70ffcc9efc..20337f25c1 100644
--- a/keyboards/avalanche/v3/info.json
+++ b/keyboards/avalanche/v3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
@@ -16,6 +21,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/avalanche/v3/v3.c b/keyboards/avalanche/v3/v3.c
deleted file mode 100644
index 1a0cff2e51..0000000000
--- a/keyboards/avalanche/v3/v3.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "avalanche.h"
diff --git a/keyboards/avalanche/v3/v3.h b/keyboards/avalanche/v3/v3.h
index fde80607b2..426f979e9b 100644
--- a/keyboards/avalanche/v3/v3.h
+++ b/keyboards/avalanche/v3/v3.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "avalanche.h"
-
 #include "quantum.h"
 
 #define L__ KC_NO
diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h
index 86dff022e0..9279289ddf 100644
--- a/keyboards/avalanche/v4/config.h
+++ b/keyboards/avalanche/v4/config.h
@@ -3,13 +3,7 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGBLIGHT_ENABLE
-#    define RGB_DI_PIN D3
 #    define RGBLED_NUM 64
 #    define RGBLED_SPLIT { 32, 32 }
 #    define RGBLIGHT_SPLIT
diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
index 5b31b5ca11..786d11588a 100644
--- a/keyboards/avalanche/v4/info.json
+++ b/keyboards/avalanche/v4/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.4"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
@@ -16,6 +21,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/avalanche/v4/v4.c b/keyboards/avalanche/v4/v4.c
index 69c64fc53c..e5a651ce4a 100644
--- a/keyboards/avalanche/v4/v4.c
+++ b/keyboards/avalanche/v4/v4.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Vitaly Volkov (@vlkv)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "avalanche.h"
+#include "v4.h"
 
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/avalanche/v4/v4.h b/keyboards/avalanche/v4/v4.h
index fde80607b2..426f979e9b 100644
--- a/keyboards/avalanche/v4/v4.h
+++ b/keyboards/avalanche/v4/v4.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "avalanche.h"
-
 #include "quantum.h"
 
 #define L__ KC_NO
diff --git a/keyboards/aves60/aves60.c b/keyboards/aves60/aves60.c
deleted file mode 100644
index 4931deb7c9..0000000000
--- a/keyboards/aves60/aves60.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 Evelien Dekkers (@evyd13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "aves60.h"
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index f8a64364ad..623155f583 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -3,25 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F6, F7, F5, F1, F4 }
-#define MATRIX_COL_PINS { B2, B3, D0, D1, D2, D3, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 9
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
@@ -39,7 +20,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json
index 71420c4423..acbd542600 100644
--- a/keyboards/aves60/info.json
+++ b/keyboards/aves60/info.json
@@ -8,9 +8,17 @@
         "pid": "0xD408",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "D0", "D1", "D2", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F6", "F7", "F5", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [4, 6]
     },
+    "ws2812": {
+        "pin": "D5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/aves65/aves65.c b/keyboards/aves65/aves65.c
deleted file mode 100644
index f495edf737..0000000000
--- a/keyboards/aves65/aves65.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2019 I/O Keyboards <hello@iokeyboards.eu>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "aves65.h"
diff --git a/keyboards/aves65/aves65.h b/keyboards/aves65/aves65.h
deleted file mode 100644
index 701b3b3274..0000000000
--- a/keyboards/aves65/aves65.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-Copyright 2019 I/O Keyboards <hello@iokeyboards.eu>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-#include "quantum.h"
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k4a, k4b, k49, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_65_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k4a, k4b, k49, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_65_iso_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k4a, k4b, k49, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k4a, k4b, k49, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_65_ansi_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k4a, k4b, k49, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, k4b, k4c, k4d, k4e }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, k4b, k4c, k4d, k4e }  \
-}
diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h
index 9037aa13f4..05d7e7fb16 100644
--- a/keyboards/aves65/config.h
+++ b/keyboards/aves65/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {D4,D6,D7,B4,E6}
-#define MATRIX_COL_PINS {D0,D1,D2,D3,D5,B5,F0,F1,F4,F5,F6,F7,C7,C6,B6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -33,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Backlight configuration
  */
-#define RGB_DI_PIN B0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/aves65/info.json b/keyboards/aves65/info.json
index 8984465f07..38e619a0aa 100644
--- a/keyboards/aves65/info.json
+++ b/keyboards/aves65/info.json
@@ -8,702 +8,710 @@
         "pid": "0x9038",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"],
+        "rows": ["D4", "D6", "D7", "B4", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "D4",
         "esc_output": "D0"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso", "65_iso_blocker", "65_iso_blocker_split_bs"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k1d", "x":13, "y":0},
-                {"label":"k0d", "x":14, "y":0},
-                {"label":"k0e", "x":15, "y":0},
-
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k2c", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1e", "x":15, "y":1},
-
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                {"label":"k2e", "x":15, "y":2},
-
-                {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k4a", "x":10, "y":4},
-                {"label":"k4b", "x":11, "y":4},
-                {"label":"k49", "x":12, "y":4},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 9], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0, "w":2},
-                {"label":"k0e", "x":15, "y":0},
-
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k1e", "x":15, "y":1},
-
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2c", "x":12.75, "y":2},
-                {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"k2e", "x":15, "y":2},
-
-                {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k4a", "x":10, "y":4},
-                {"label":"k4b", "x":11, "y":4},
-                {"label":"k49", "x":12, "y":4},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 9], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_split_bs": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k1d", "x":13, "y":0},
-                {"label":"k0d", "x":14, "y":0},
-                {"label":"k0e", "x":15, "y":0},
-
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k1e", "x":15, "y":1},
-
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2c", "x":12.75, "y":2},
-                {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"k2e", "x":15, "y":2},
-
-                {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k4a", "x":10, "y":4},
-                {"label":"k4b", "x":11, "y":4},
-                {"label":"k49", "x":12, "y":4},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 9], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0, "w":2},
-                {"label":"k0e", "x":15, "y":0},
-
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k1e", "x":15, "y":1},
-
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2c", "x":12.75, "y":2},
-                {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"k2e", "x":15, "y":2},
-
-                {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k4a", "x":10, "y":4, "w":1.25},
-                {"label":"k4b", "x":11.25, "y":4, "w":1.25},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k1d", "x":13, "y":0},
-                {"label":"k0d", "x":14, "y":0},
-                {"label":"k0e", "x":15, "y":0},
-
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k1e", "x":15, "y":1},
-
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2c", "x":12.75, "y":2},
-                {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"k2e", "x":15, "y":2},
-
-                {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k4a", "x":10, "y":4, "w":1.25},
-                {"label":"k4b", "x":11.25, "y":4, "w":1.25},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0, "w":2},
-                {"label":"k0e", "x":15, "y":0},
-
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k2c", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1e", "x":15, "y":1},
-
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                {"label":"k2e", "x":15, "y":2},
-
-                {"label":"k30", "x":0, "y":3, "w":2.25},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k4a", "x":10, "y":4},
-                {"label":"k4b", "x":11, "y":4},
-                {"label":"k49", "x":12, "y":4},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 9], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k1d", "x":13, "y":0},
-                {"label":"k0d", "x":14, "y":0},
-                {"label":"k0e", "x":15, "y":0},
-
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k2c", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1e", "x":15, "y":1},
-
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                {"label":"k2e", "x":15, "y":2},
-
-                {"label":"k30", "x":0, "y":3, "w":2.25},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k4a", "x":10, "y":4},
-                {"label":"k4b", "x":11, "y":4},
-                {"label":"k49", "x":12, "y":4},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 9], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0, "w":2},
-                {"label":"k0e", "x":15, "y":0},
-
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k2c", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1e", "x":15, "y":1},
-
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                {"label":"k2e", "x":15, "y":2},
-
-                {"label":"k30", "x":0, "y":3, "w":2.25},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k4a", "x":10, "y":4, "w":1.25},
-                {"label":"k4b", "x":11.25, "y":4, "w":1.25},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k1d", "x":13, "y":0},
-                {"label":"k0d", "x":14, "y":0},
-                {"label":"k0e", "x":15, "y":0},
-
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k2c", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1e", "x":15, "y":1},
-
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                {"label":"k2e", "x":15, "y":2},
-
-                {"label":"k30", "x":0, "y":3, "w":2.25},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k4a", "x":10, "y":4, "w":1.25},
-                {"label":"k4b", "x":11.25, "y":4, "w":1.25},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/axolstudio/foundation_gamma/config.h b/keyboards/axolstudio/foundation_gamma/config.h
deleted file mode 100644
index c6cbb045b3..0000000000
--- a/keyboards/axolstudio/foundation_gamma/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B2, B1, B0, F7, F6, F5 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/axolstudio/foundation_gamma/foundation_gamma.c b/keyboards/axolstudio/foundation_gamma/foundation_gamma.c
deleted file mode 100644
index e686d8f321..0000000000
--- a/keyboards/axolstudio/foundation_gamma/foundation_gamma.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "foundation_gamma.h"
diff --git a/keyboards/axolstudio/foundation_gamma/foundation_gamma.h b/keyboards/axolstudio/foundation_gamma/foundation_gamma.h
deleted file mode 100644
index bf3a45dfb6..0000000000
--- a/keyboards/axolstudio/foundation_gamma/foundation_gamma.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013,        k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k213,  k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,        k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,    k312,                             \
-    k400,       k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,              k415,       \
-    k500, k501, k502,                   k506,                   k510, k511, k512,              k514, k515, k516  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____, ____ }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____ }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, ____, k514, k515, k516 }  \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013,    k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113,    k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,    k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,    k312,                         \
-    k400,       k401, k402, k403, k404, k405, k406, k407, k408, k409, k410,    k411,             k415,       \
-    k500, k501, k502,                   k506,                   k510, k511, k512,          k514, k515, k516  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214, k215, k216 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____, ____ }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, ____, ____, ____, k415, ____ }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, ____, k514, k515, k516 }  \
-}
diff --git a/keyboards/axolstudio/foundation_gamma/info.json b/keyboards/axolstudio/foundation_gamma/info.json
index ecc7bcad90..09ae1a222d 100644
--- a/keyboards/axolstudio/foundation_gamma/info.json
+++ b/keyboards/axolstudio/foundation_gamma/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE3EB",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "F4", "F1", "F0"],
+        "rows": ["B2", "B1", "B0", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7"
     },
@@ -21,186 +26,214 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":1.5, "y":5.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":12.5, "y":5.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5},
-                {"x":14, "y":1.5},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":1.75},
-                {"x":14, "y":4.5},
-                {"x":16.25, "y":4.5},
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":1.5, "y":5.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":12.5, "y":5.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [2, 13], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 12], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/axolstudio/helpo/config.h b/keyboards/axolstudio/helpo/config.h
deleted file mode 100644
index 549e53672c..0000000000
--- a/keyboards/axolstudio/helpo/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 kb-elmo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-
-#define MATRIX_ROW_PINS { A2, A3, A4, A5 }
-#define MATRIX_COL_PINS { A1, B4, B3, B2, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/axolstudio/helpo/helpo.c b/keyboards/axolstudio/helpo/helpo.c
deleted file mode 100644
index 04c7b4f1a0..0000000000
--- a/keyboards/axolstudio/helpo/helpo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "helpo.h"
diff --git a/keyboards/axolstudio/helpo/helpo.h b/keyboards/axolstudio/helpo/helpo.h
deleted file mode 100644
index f6b0e07964..0000000000
--- a/keyboards/axolstudio/helpo/helpo.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 kb-elmo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k04, k03, k02, k01, k00, \
-    k09, k08, k07, k06, k05, \
-    k14, k13, k12, k11, k10, \
-    k19, k18, k17, k16, k15  \
-) { \
-    { k00, k01, k02, k03, k04, }, \
-    { k05, k06, k07, k08, k09, }, \
-    { k10, k11, k12, k13, k14, }, \
-    { k15, k16, k17, k18, k19, }  \
-}
diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json
index 1174a32d05..cf74098bf5 100644
--- a/keyboards/axolstudio/helpo/info.json
+++ b/keyboards/axolstudio/helpo/info.json
@@ -8,31 +8,39 @@
         "pid": "0xC89F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "B4", "B3", "B2", "B1"],
+        "rows": ["A2", "A3", "A4", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3}
+                {"matrix": [0, 4], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 4, "y": 0},
+
+                {"matrix": [1, 4], "x": 0, "y": 1},
+                {"matrix": [1, 3], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 4, "y": 1},
+
+                {"matrix": [2, 4], "x": 0, "y": 2},
+                {"matrix": [2, 3], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [2, 0], "x": 4, "y": 2},
+
+                {"matrix": [3, 4], "x": 0, "y": 3},
+                {"matrix": [3, 3], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 1], "x": 3, "y": 3},
+                {"matrix": [3, 0], "x": 4, "y": 3}
             ]
         }
     }
diff --git a/keyboards/axolstudio/yeti/hotswap/config.h b/keyboards/axolstudio/yeti/hotswap/config.h
index 61f18a8b3a..694a6449f0 100644
--- a/keyboards/axolstudio/yeti/hotswap/config.h
+++ b/keyboards/axolstudio/yeti/hotswap/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-
-#define MATRIX_ROW_PINS { E6, C6, B4, B5, B6 }
-#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, B7, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json
index 40aa7b8b70..e65ab71e73 100644
--- a/keyboards/axolstudio/yeti/hotswap/info.json
+++ b/keyboards/axolstudio/yeti/hotswap/info.json
@@ -8,6 +8,14 @@
     "pid": "0x9F9E",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "IS31FL3733"
+  },
+  "matrix_pins": {
+    "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
+    "rows": ["E6", "C6", "B4", "B5", "B6"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/axolstudio/yeti/hotswap/rules.mk b/keyboards/axolstudio/yeti/hotswap/rules.mk
index 9a194e3724..154f1e5326 100644
--- a/keyboards/axolstudio/yeti/hotswap/rules.mk
+++ b/keyboards/axolstudio/yeti/hotswap/rules.mk
@@ -10,6 +10,5 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3733
 
 LTO_ENABLE = yes
diff --git a/keyboards/axolstudio/yeti/soldered/config.h b/keyboards/axolstudio/yeti/soldered/config.h
deleted file mode 100644
index 0e31a7113d..0000000000
--- a/keyboards/axolstudio/yeti/soldered/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 kb-elmo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, F7, D7, D6, D4, B3, B7, D0, D1, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/axolstudio/yeti/soldered/info.json b/keyboards/axolstudio/yeti/soldered/info.json
index 7bd5d8e095..a2b3097716 100644
--- a/keyboards/axolstudio/yeti/soldered/info.json
+++ b/keyboards/axolstudio/yeti/soldered/info.json
@@ -8,284 +8,331 @@
     "pid": "0x9F9F",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F6", "F5", "F4", "F1", "F0", "F7", "D7", "D6", "D4", "B3", "B7", "D0", "D1", "D2", "D3", "D5"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["alice", "alice_split_bs"],
   "layouts": {
     "LAYOUT_alice": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0, "w": 2},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":1.75},
-        {"x":17.25, "y":3},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [1, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 15], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [1, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [2, 13], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [2, 15], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 15], "x": 16.75, "y": 4, "w": 1.5}
       ]
     },
     "LAYOUT_alice_split_bs": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":1.75},
-        {"x":17.25, "y":3},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [1, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 13], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 15], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [1, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [2, 13], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [2, 15], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 15], "x": 16.75, "y": 4, "w": 1.5}
       ]
     },
     "LAYOUT_alice_full_rshift": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0, "w":2},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":2.75},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [1, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 15], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [1, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [2, 14], "x": 15.5, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 15], "x": 16.75, "y": 4, "w": 1.5}
       ]
     },
     "LAYOUT_alice_split_bs_full_rshift": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":2.75},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [1, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 13], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 15], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [1, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [2, 14], "x": 15.5, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 15], "x": 16.75, "y": 4, "w": 1.5}
       ]
     }
   }
diff --git a/keyboards/axolstudio/yeti/soldered/soldered.c b/keyboards/axolstudio/yeti/soldered/soldered.c
deleted file mode 100644
index 5041fabed0..0000000000
--- a/keyboards/axolstudio/yeti/soldered/soldered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "soldered.h"
diff --git a/keyboards/axolstudio/yeti/soldered/soldered.h b/keyboards/axolstudio/yeti/soldered/soldered.h
deleted file mode 100644
index 7c3b5cba1d..0000000000
--- a/keyboards/axolstudio/yeti/soldered/soldered.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2020 kb-elmo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice( \
-    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,      k14, \
-    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
-    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
-         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k45,      k47, \
-         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12, KC_NO,   k14, KC_NO }, \
-    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
-    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44,   k45, KC_NO,   k47 }, \
-    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
-}
-
-// Equivalent to LAYOUT_all
-#define LAYOUT_alice_split_bs( \
-    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k15, \
-    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
-    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
-         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k45,      k47, \
-         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13, KC_NO,   k15 }, \
-    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
-    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44,   k45, KC_NO,   k47 }, \
-    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k15, \
-    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
-    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
-         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60,      k46,      \
-         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13, KC_NO,   k15 }, \
-    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
-    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44, KC_NO,   k46, KC_NO }, \
-    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,      k14, \
-    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
-    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
-         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60,      k46,      \
-         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12, KC_NO,   k14, KC_NO }, \
-    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
-    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44, KC_NO,   k46, KC_NO }, \
-    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
-}
diff --git a/keyboards/aya/aya.c b/keyboards/aya/aya.c
deleted file mode 100644
index 95bc5794d8..0000000000
--- a/keyboards/aya/aya.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Dan Nixon
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "aya.h"
diff --git a/keyboards/aya/config.h b/keyboards/aya/config.h
index 56e966ce0f..14fc201d49 100644
--- a/keyboards/aya/config.h
+++ b/keyboards/aya/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define DIODE_DIRECTION ROW2COL
-
 #define SPLIT_HAND_PIN B5
 #define USE_I2C
diff --git a/keyboards/aya/info.json b/keyboards/aya/info.json
index 325ab9d721..d35001e132 100644
--- a/keyboards/aya/info.json
+++ b/keyboards/aya/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2925",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/aya/keymaps/default/config.h b/keyboards/aya/keymaps/default/config.h
index 5ef534d04f..6e57fd6499 100644
--- a/keyboards/aya/keymaps/default/config.h
+++ b/keyboards/aya/keymaps/default/config.h
@@ -16,4 +16,3 @@
 
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/b_sides/rev41lp/config.h b/keyboards/b_sides/rev41lp/config.h
deleted file mode 100644
index 0b644bec4a..0000000000
--- a/keyboards/b_sides/rev41lp/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 @cyril279
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { F4, B2, F5, B3, F6, B1, F7 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/b_sides/rev41lp/info.json b/keyboards/b_sides/rev41lp/info.json
index c0a5fd3365..3b5807f621 100644
--- a/keyboards/b_sides/rev41lp/info.json
+++ b/keyboards/b_sides/rev41lp/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5F10",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "B2", "F5", "B3", "F6", "B1", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 7,
diff --git a/keyboards/b_sides/rev41lp/keymaps/cyril/config.h b/keyboards/b_sides/rev41lp/keymaps/cyril/config.h
index 4677c5f1d4..7029bdddb7 100644
--- a/keyboards/b_sides/rev41lp/keymaps/cyril/config.h
+++ b/keyboards/b_sides/rev41lp/keymaps/cyril/config.h
@@ -18,4 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 150
 #define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h
index 1ad3156afa..19b366f4a8 100644
--- a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h
+++ b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h
@@ -22,7 +22,6 @@
 #define BACKLIGHT_DEFAULT_LEVEL 3
 
 #define COMBO_COUNT 3
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
 
diff --git a/keyboards/b_sides/rev41lp/rev41lp.c b/keyboards/b_sides/rev41lp/rev41lp.c
deleted file mode 100644
index d9ab1ed21e..0000000000
--- a/keyboards/b_sides/rev41lp/rev41lp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 @cyril279
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "rev41lp.h"
diff --git a/keyboards/bacca70/bacca70.c b/keyboards/bacca70/bacca70.c
deleted file mode 100644
index 174b4d97e7..0000000000
--- a/keyboards/bacca70/bacca70.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 keebnewb
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bacca70.h"
diff --git a/keyboards/bacca70/bacca70.h b/keyboards/bacca70/bacca70.h
deleted file mode 100644
index 0583fd8043..0000000000
--- a/keyboards/bacca70/bacca70.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2022 keebnewb
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
- #pragma once
-
- #include "quantum.h"
-
- #define ___ KC_NO
-
-#define LAYOUT_default( \
-    k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,  \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k67,  \
-    k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k96, k87,  \
-    ka0, ka1, ka3, kb5, ka7 \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, ___ }, \
-    { ___, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, ___, ___ }, \
-    { k60, k61, k62, k63, k64, k65, ___, k67 }, \
-    { k70, k71, k72, k73, k74, k75, ___, ___ }, \
-    { k80, k81, k82, k83, k84, k85, ___, k87 }, \
-    { ___, k91, k92, k93, k94, k95, k96, ___ }, \
-    { ka0, ka1, ___, ka3, ___, ___, ___, ka7 }, \
-    { ___, ___, ___, ___, ___, kb5, ___, ___ }  \
-}
-
-#define LAYOUT_debaccabean( \
-    k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,  \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47,  \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67,  \
-    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87,  \
-    ka0, ka1, ka2, ka3, ka4, kb5, ka7 \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, ___ }, \
-    { ___, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, ___ }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, k73, k74, k75, k76, ___ }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
-    { k90, k91, k92, k93, k94, k95, k96, ___ }, \
-    { ka0, ka1, ka2, ka3, ka4, ___, ___, ka7 }, \
-    { ___, ___, ___, ___, ___, kb5, ___, ___ }  \
-}
diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/config.h
index a093c267a9..0c56f57b20 100644
--- a/keyboards/bacca70/config.h
+++ b/keyboards/bacca70/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-//                         0   1   2   3   4   5   6   7   8    9   A    B
-#define MATRIX_ROW_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, A9, A10 }
-#define MATRIX_COL_PINS { A0, A1, A2, B12, B13, B14, B15, A8 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/bacca70/info.json b/keyboards/bacca70/info.json
index 8cff2b9060..143c19d987 100644
--- a/keyboards/bacca70/info.json
+++ b/keyboards/bacca70/info.json
@@ -8,171 +8,194 @@
         "pid": "0x6970",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "B12", "B13", "B14", "B15", "A8"],
+        "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A9", "A10"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_default": {
-          "layout": [
-            {"x":0, "y":0},
-            {"x":1.25, "y":0},
-            {"x":2.25, "y":0},
-            {"x":3.25, "y":0},
-            {"x":4.25, "y":0},
-            {"x":5.5, "y":0},
-            {"x":6.5, "y":0},
-            {"x":7.5, "y":0},
-            {"x":8.5, "y":0},
-            {"x":9.75, "y":0},
-            {"x":10.75, "y":0},
-            {"x":11.75, "y":0},
-            {"x":12.75, "y":0},
-            {"x":14, "y":0},
-            {"x":0, "y":1.25},
-            {"x":1, "y":1.25},
-            {"x":2, "y":1.25},
-            {"x":3, "y":1.25},
-            {"x":4, "y":1.25},
-            {"x":5, "y":1.25},
-            {"x":6, "y":1.25},
-            {"x":7, "y":1.25},
-            {"x":8, "y":1.25},
-            {"x":9, "y":1.25},
-            {"x":10, "y":1.25},
-            {"x":11, "y":1.25},
-            {"x":12, "y":1.25},
-            {"x":13, "y":1.25},
-            {"x":14, "y":1.25},
-            {"x":0, "y":2.25, "w":1.5},
-            {"x":1.5, "y":2.25},
-            {"x":2.5, "y":2.25},
-            {"x":3.5, "y":2.25},
-            {"x":4.5, "y":2.25},
-            {"x":5.5, "y":2.25},
-            {"x":6.5, "y":2.25},
-            {"x":7.5, "y":2.25},
-            {"x":8.5, "y":2.25},
-            {"x":9.5, "y":2.25},
-            {"x":10.5, "y":2.25},
-            {"x":11.5, "y":2.25},
-            {"x":12.5, "y":2.25},
-            {"x":13.5, "y":2.25, "w":1.5},
-            {"x":0, "y":3.25, "w":1.75},
-            {"x":1.75, "y":3.25},
-            {"x":2.75, "y":3.25},
-            {"x":3.75, "y":3.25},
-            {"x":4.75, "y":3.25},
-            {"x":5.75, "y":3.25},
-            {"x":6.75, "y":3.25},
-            {"x":7.75, "y":3.25},
-            {"x":8.75, "y":3.25},
-            {"x":9.75, "y":3.25},
-            {"x":10.75, "y":3.25},
-            {"x":11.75, "y":3.25},
-            {"x":12.75, "y":3.25, "w":2.25},
-            {"x":0, "y":4.25, "w":2.25},
-            {"x":2.25, "y":4.25},
-            {"x":3.25, "y":4.25},
-            {"x":4.25, "y":4.25},
-            {"x":5.25, "y":4.25},
-            {"x":6.25, "y":4.25},
-            {"x":7.25, "y":4.25},
-            {"x":8.25, "y":4.25},
-            {"x":9.25, "y":4.25},
-            {"x":10.25, "y":4.25},
-            {"x":11.25, "y":4.25},
-            {"x":12.25, "y":4.25, "w":1.75},
-            {"x":14, "y":4.25},
-            {"x":0, "y":5.25, "w":1.5},
-            {"x":2.5, "y":5.25, "w":1.5},
-            {"x":4, "y":5.25, "w":7},
-            {"x":11, "y":5.25, "w":1.5},
-            {"x":13.5, "y":5.25, "w":1.5}
-          ]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [1, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 7], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5}
+            ]
         },
         "LAYOUT_debaccabean": {
-          "layout": [
-            {"x":0, "y":0},
-            {"x":1.25, "y":0},
-            {"x":2.25, "y":0},
-            {"x":3.25, "y":0},
-            {"x":4.25, "y":0},
-            {"x":5.5, "y":0},
-            {"x":6.5, "y":0},
-            {"x":7.5, "y":0},
-            {"x":8.5, "y":0},
-            {"x":9.75, "y":0},
-            {"x":10.75, "y":0},
-            {"x":11.75, "y":0},
-            {"x":12.75, "y":0},
-            {"x":14, "y":0},
-            {"x":0, "y":1.25},
-            {"x":1, "y":1.25},
-            {"x":2, "y":1.25},
-            {"x":3, "y":1.25},
-            {"x":4, "y":1.25},
-            {"x":5, "y":1.25},
-            {"x":6, "y":1.25},
-            {"x":7, "y":1.25},
-            {"x":8, "y":1.25},
-            {"x":9, "y":1.25},
-            {"x":10, "y":1.25},
-            {"x":11, "y":1.25},
-            {"x":12, "y":1.25},
-            {"x":13, "y":1.25},
-            {"x":14, "y":1.25},
-            {"x":0, "y":2.25},
-            {"x":1, "y":2.25},
-            {"x":2, "y":2.25},
-            {"x":3, "y":2.25},
-            {"x":4, "y":2.25},
-            {"x":5, "y":2.25},
-            {"x":6, "y":2.25},
-            {"x":7, "y":2.25},
-            {"x":8, "y":2.25},
-            {"x":9, "y":2.25},
-            {"x":10, "y":2.25},
-            {"x":11, "y":2.25},
-            {"x":12, "y":2.25},
-            {"x":13, "y":2.25},
-            {"x":14, "y":2.25},
-            {"x":0, "y":3.25},
-            {"x":1, "y":3.25},
-            {"x":2, "y":3.25},
-            {"x":3, "y":3.25},
-            {"x":4, "y":3.25},
-            {"x":5, "y":3.25},
-            {"x":6, "y":3.25},
-            {"x":7, "y":3.25},
-            {"x":8, "y":3.25},
-            {"x":9, "y":3.25},
-            {"x":10, "y":3.25},
-            {"x":11, "y":3.25},
-            {"x":12, "y":3.25},
-            {"x":13, "y":3.25},
-            {"x":14, "y":3.25},
-            {"x":0, "y":4.25},
-            {"x":1, "y":4.25},
-            {"x":2, "y":4.25},
-            {"x":3, "y":4.25},
-            {"x":4, "y":4.25},
-            {"x":5, "y":4.25},
-            {"x":6, "y":4.25},
-            {"x":7, "y":4.25},
-            {"x":8, "y":4.25},
-            {"x":9, "y":4.25},
-            {"x":10, "y":4.25},
-            {"x":11, "y":4.25},
-            {"x":12, "y":4.25},
-            {"x":13, "y":4.25},
-            {"x":14, "y":4.25},
-            {"x":0, "y":5.25, "w":1.5},
-            {"x":2.5, "y":5.25, "w":1.5},
-            {"x":4, "y":5.25, "w":3},
-            {"x":7, "y":5.25},
-            {"x":8, "y":5.25, "w":3},
-            {"x":11, "y":5.25, "w":1.5},
-            {"x":13.5, "y":5.25, "w":1.5}
-          ]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [1, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 7], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25},
+                {"matrix": [5, 0], "x": 1, "y": 2.25},
+                {"matrix": [4, 1], "x": 2, "y": 2.25},
+                {"matrix": [5, 1], "x": 3, "y": 2.25},
+                {"matrix": [4, 2], "x": 4, "y": 2.25},
+                {"matrix": [5, 2], "x": 5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6, "y": 2.25},
+                {"matrix": [5, 3], "x": 7, "y": 2.25},
+                {"matrix": [4, 4], "x": 8, "y": 2.25},
+                {"matrix": [5, 4], "x": 9, "y": 2.25},
+                {"matrix": [4, 5], "x": 10, "y": 2.25},
+                {"matrix": [5, 5], "x": 11, "y": 2.25},
+                {"matrix": [4, 6], "x": 12, "y": 2.25},
+                {"matrix": [5, 6], "x": 13, "y": 2.25},
+                {"matrix": [4, 7], "x": 14, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25},
+                {"matrix": [7, 0], "x": 1, "y": 3.25},
+                {"matrix": [6, 1], "x": 2, "y": 3.25},
+                {"matrix": [7, 1], "x": 3, "y": 3.25},
+                {"matrix": [6, 2], "x": 4, "y": 3.25},
+                {"matrix": [7, 2], "x": 5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6, "y": 3.25},
+                {"matrix": [7, 3], "x": 7, "y": 3.25},
+                {"matrix": [6, 4], "x": 8, "y": 3.25},
+                {"matrix": [7, 4], "x": 9, "y": 3.25},
+                {"matrix": [6, 5], "x": 10, "y": 3.25},
+                {"matrix": [7, 5], "x": 11, "y": 3.25},
+                {"matrix": [6, 6], "x": 12, "y": 3.25},
+                {"matrix": [7, 6], "x": 13, "y": 3.25},
+                {"matrix": [6, 7], "x": 14, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25},
+                {"matrix": [9, 0], "x": 1, "y": 4.25},
+                {"matrix": [8, 1], "x": 2, "y": 4.25},
+                {"matrix": [9, 1], "x": 3, "y": 4.25},
+                {"matrix": [8, 2], "x": 4, "y": 4.25},
+                {"matrix": [9, 2], "x": 5, "y": 4.25},
+                {"matrix": [8, 3], "x": 6, "y": 4.25},
+                {"matrix": [9, 3], "x": 7, "y": 4.25},
+                {"matrix": [8, 4], "x": 8, "y": 4.25},
+                {"matrix": [9, 4], "x": 9, "y": 4.25},
+                {"matrix": [8, 5], "x": 10, "y": 4.25},
+                {"matrix": [9, 5], "x": 11, "y": 4.25},
+                {"matrix": [8, 6], "x": 12, "y": 4.25},
+                {"matrix": [9, 6], "x": 13, "y": 4.25},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 4, "y": 5.25, "w": 3},
+                {"matrix": [10, 3], "x": 7, "y": 5.25},
+                {"matrix": [10, 4], "x": 8, "y": 5.25, "w": 3},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5}
+            ]
         }
-      }
+    }
 }
diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h
index c4bc59fe7c..3005d1bcfb 100644
--- a/keyboards/baguette/config.h
+++ b/keyboards/baguette/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, B2, B1, E6, D6 }
-#define MATRIX_COL_PINS { B6, C6, C7, F7, F6, F5, F4, F1, F0, B0, D0, D1, D2, D3, D5, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/baguette/info.json b/keyboards/baguette/info.json
index 2714366c0e..c691bb4ffe 100644
--- a/keyboards/baguette/info.json
+++ b/keyboards/baguette/info.json
@@ -8,6 +8,11 @@
     "pid": "0x5050",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "D0", "D1", "D2", "D3", "D5", "D4"],
+    "rows": ["B3", "B2", "B1", "E6", "D6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "levels": 5,
diff --git a/keyboards/baion_808/baion_808.c b/keyboards/baion_808/baion_808.c
index 4f4b7adeab..e27b7c1ac4 100755
--- a/keyboards/baion_808/baion_808.c
+++ b/keyboards/baion_808/baion_808.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "baion_808.h"
+#include "quantum.h"
 
 void led_init_ports(void) {
     // Set our LED pins as open drain outputs
diff --git a/keyboards/baion_808/baion_808.h b/keyboards/baion_808/baion_808.h
deleted file mode 100644
index 944b46ef90..0000000000
--- a/keyboards/baion_808/baion_808.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* Copyright 2022 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,           K0E, K0F, KOG, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,           K4F,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, KOG }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,           K0E, K0F, KOG, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,           K4F,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, KOG }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_ansi_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,           K0E, K0F, KOG, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,           K4F,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, KOG }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,           K0E, K0F, KOG, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,           K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,      K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, KOG }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,           K0E, K0F, KOG, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,           K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,      K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, KOG }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,           K0E, K0F, KOG, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,           K4F,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, KOG }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_iso_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,           K0E, K0F, KOG, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,           K4F,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, KOG }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_iso_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,           K0E, K0F, KOG, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,           K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,      K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, KOG }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_iso_tsangan_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,           K0E, K0F, KOG, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,           K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,      K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, KOG }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
diff --git a/keyboards/baion_808/config.h b/keyboards/baion_808/config.h
index 92efc6d1e5..6f884a1428 100755
--- a/keyboards/baion_808/config.h
+++ b/keyboards/baion_808/config.h
@@ -17,11 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A2, A14, A15, B3, B4, B5 }
-#define MATRIX_COL_PINS { A1, B9, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15, A8 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the RESET keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/baion_808/info.json b/keyboards/baion_808/info.json
index 982bb67056..d8834ec066 100755
--- a/keyboards/baion_808/info.json
+++ b/keyboards/baion_808/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4238",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
+        "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "scroll_lock": "B7",
@@ -17,31 +22,951 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [2, 13], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
         },
         "LAYOUT_tkl_ansi": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":12.5, "y":5.25, "w":1.25}, {"x":13.75, "y":5.25, "w":1.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":12.5, "y":5.25, "w":1.25}, {"x":13.75, "y":5.25, "w":1.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":12.5, "y":5.25, "w":1.25}, {"x":13.75, "y":5.25, "w":1.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso_split_bs_rshift": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":12.5, "y":5.25, "w":1.25}, {"x":13.75, "y":5.25, "w":1.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso_tsangan": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h
index 07f6dcaf50..614d7a7813 100644
--- a/keyboards/bajjak/config.h
+++ b/keyboards/bajjak/config.h
@@ -46,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE  1
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index 7a25216afd..91a4eb0ae8 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -15,33 +15,14 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, D7, F6, C6, D4 }
-#define MATRIX_COL_PINS { D1, E6, F7, B1, B3, B2, D0 }
-
 #define MASTER_RIGHT
 #ifndef MASTER_RIGHT
 //  SPLIT_HAND_MATRIX_GRID was initially designed to use with left hand side diode D35 mounted and not pressing K7 on the right hand side during boot. However when a USB cable is reconnected immediately, it fails. Decided to use "MASTER_RIGHT" to make it more reliable.
 #   define SPLIT_HAND_MATRIX_GRID B5, D0
 #endif
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_USB_DETECT
 
-#define RGB_DI_PIN D3
-
 #ifdef RGB_MATRIX_ENABLE
 
 /* ws2812 RGB MATRIX */
diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json
index d0d470a4e4..0f96714954 100644
--- a/keyboards/bandominedoni/info.json
+++ b/keyboards/bandominedoni/info.json
@@ -8,6 +8,14 @@
         "pid": "0xF4B5",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"],
+        "rows": ["B5", "B4", "D7", "F6", "C6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2",
         "encoder": {
@@ -18,6 +26,9 @@
             }
         }
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/bandominedoni/rules.mk b/keyboards/bandominedoni/rules.mk
index 18ccf846ec..c32d761f10 100644
--- a/keyboards/bandominedoni/rules.mk
+++ b/keyboards/bandominedoni/rules.mk
@@ -14,6 +14,5 @@ MIDI_ENABLE = yes           # MIDI support
 ENCODER_ENABLE = yes        # encoder on mute button
 SPLIT_KEYBOARD = yes        # Enables split keyboard support
 RGB_MATRIX_ENABLE = no      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-RGB_MATRIX_DRIVER = WS2812  #
 
 LTO_ENABLE = yes
diff --git a/keyboards/bantam44/bantam44.c b/keyboards/bantam44/bantam44.c
deleted file mode 100644
index f995308ae7..0000000000
--- a/keyboards/bantam44/bantam44.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "bantam44.h"
\ No newline at end of file
diff --git a/keyboards/bantam44/config.h b/keyboards/bantam44/config.h
index f979b1b4ba..b9449c4714 100644
--- a/keyboards/bantam44/config.h
+++ b/keyboards/bantam44/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// Planck PCB default pin-out
-// Change this to how you wired your keyboard
-// COLS: Left to right, ROWS: Top to bottom
-#define MATRIX_ROW_PINS { F0, D6, D4, D5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, B6, F7, F6, F5, F4, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/bantam44/info.json b/keyboards/bantam44/info.json
index aadd885f6a..2f7eef9ba2 100644
--- a/keyboards/bantam44/info.json
+++ b/keyboards/bantam44/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "B6", "F7", "F6", "F5", "F4", "F1"],
+    "rows": ["F0", "D6", "D4", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/barleycorn_smd/barleycorn_smd.c b/keyboards/barleycorn_smd/barleycorn_smd.c
deleted file mode 100644
index d70689d8fe..0000000000
--- a/keyboards/barleycorn_smd/barleycorn_smd.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Matthew Dias
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "barleycorn_smd.h"
diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index 6dcd1d3d40..2d53b280f7 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D5, D5, D5, D5, D5, D5, D5, D5, D5, D5 }
 #define PORT_EXPANDER_ADDRESS 0x20
 
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 15
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json
index aca993e1a5..b24bd1321e 100644
--- a/keyboards/barleycorn_smd/info.json
+++ b/keyboards/barleycorn_smd/info.json
@@ -11,6 +11,9 @@
         "caps_lock": "B2",
         "num_lock": "B3"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/barracuda/barracuda.c b/keyboards/barracuda/barracuda.c
deleted file mode 100644
index f863b1917e..0000000000
--- a/keyboards/barracuda/barracuda.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 knaruo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "barracuda.h"
diff --git a/keyboards/barracuda/barracuda.h b/keyboards/barracuda/barracuda.h
deleted file mode 100644
index c6389d778b..0000000000
--- a/keyboards/barracuda/barracuda.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 knaruo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_3x11( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24  \
-) { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { KC_NO, R00, R01, R02, R03, R04 }, \
-    { KC_NO, R10, R11, R12, R13, R14 }, \
-    { KC_NO, R20, R21, R22, R23, R24 } \
-}
diff --git a/keyboards/barracuda/config.h b/keyboards/barracuda/config.h
index 5e8a798be6..5dd1c8d063 100644
--- a/keyboards/barracuda/config.h
+++ b/keyboards/barracuda/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C4, C5, C6, D1, D2, D3 }
-#define MATRIX_COL_PINS { D4, D5, D6, B0, B1, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/barracuda/info.json b/keyboards/barracuda/info.json
index d0909322c9..3b68e6e3f3 100644
--- a/keyboards/barracuda/info.json
+++ b/keyboards/barracuda/info.json
@@ -8,46 +8,51 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "D5", "D6", "B0", "B1", "B2"],
+        "rows": ["C4", "C5", "C6", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_3x11": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "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, 1], "x": 9, "y": 0},
+                {"matrix": [3, 2], "x": 10, "y": 0},
+                {"matrix": [3, 3], "x": 11, "y": 0},
+                {"matrix": [3, 4], "x": 12, "y": 0},
+                {"matrix": [3, 5], "x": 13, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "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, 1], "x": 9, "y": 1},
+                {"matrix": [4, 2], "x": 10, "y": 1},
+                {"matrix": [4, 3], "x": 11, "y": 1},
+                {"matrix": [4, 4], "x": 12, "y": 1},
+                {"matrix": [4, 5], "x": 13, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [5, 1], "x": 9, "y": 2},
+                {"matrix": [5, 2], "x": 10, "y": 2},
+                {"matrix": [5, 3], "x": 11, "y": 2},
+                {"matrix": [5, 4], "x": 12, "y": 2},
+                {"matrix": [5, 5], "x": 13, "y": 2}
             ]
         }
     }
diff --git a/keyboards/barracuda/keymaps/default/config.h b/keyboards/barracuda/keymaps/default/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/barracuda/keymaps/default/config.h
+++ b/keyboards/barracuda/keymaps/default/config.h
@@ -17,4 +17,3 @@
 #pragma once
 
 #define TAPPING_TERM    175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/barracuda/keymaps/via/config.h b/keyboards/barracuda/keymaps/via/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/barracuda/keymaps/via/config.h
+++ b/keyboards/barracuda/keymaps/via/config.h
@@ -17,4 +17,3 @@
 #pragma once
 
 #define TAPPING_TERM    175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h
index 6e0065c062..c1008da9b8 100644
--- a/keyboards/basekeys/slice/rev1/config.h
+++ b/keyboards/basekeys/slice/rev1/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Select hand configuration */
 //#define EE_HANDS
 #define MASTER_LEFT
diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/info.json
index fac0bf3682..d2dbd00a3d 100644
--- a/keyboards/basekeys/slice/rev1/info.json
+++ b/keyboards/basekeys/slice/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEC17",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/basekeys/slice/rev1/rev1.c b/keyboards/basekeys/slice/rev1/rev1.c
deleted file mode 100644
index a3c8f66fe0..0000000000
--- a/keyboards/basekeys/slice/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/basekeys/slice/rev1/rev1.h b/keyboards/basekeys/slice/rev1/rev1.h
index 26a5da31bc..f4d631eb6b 100644
--- a/keyboards/basekeys/slice/rev1/rev1.h
+++ b/keyboards/basekeys/slice/rev1/rev1.h
@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#include "slice.h"
-
 #include "quantum.h"
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
index a19d676b29..5535837b98 100644
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -16,12 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Select hand configuration */
 //#define EE_HANDS
 #define MASTER_LEFT
@@ -34,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB LED */
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 69    // Number of LEDs. backlight x69
 #define RGBLED_SPLIT { 34, 35 }
 #define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json
index fb6a19bc2f..d8791c7be5 100644
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ b/keyboards/basekeys/slice/rev1_rgb/info.json
@@ -8,20 +8,28 @@
         "pid": "0xEC15",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
         },
         "LAYOUT_split_left_space": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":1.75}, {"x":7.5, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":1.75}, {"x":7.5, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
         },
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":0.917}, {"x":6.667, "y":4, "w":0.916}, {"x":7.583, "y":4, "w":0.917}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":0.917}, {"x":6.667, "y":4, "w":0.916}, {"x":7.583, "y":4, "w":0.917}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
         }
     }
 }
diff --git a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c
deleted file mode 100644
index 9ab3d2539a..0000000000
--- a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1_rgb.h"
diff --git a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
index fdc5331585..0b0ea725e7 100644
--- a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
+++ b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#include "slice.h"
-
 #include "quantum.h"
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/keyboards/basekeys/slice/slice.c b/keyboards/basekeys/slice/slice.c
deleted file mode 100644
index 2d7d111f9a..0000000000
--- a/keyboards/basekeys/slice/slice.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "slice.h"
diff --git a/keyboards/basekeys/slice/slice.h b/keyboards/basekeys/slice/slice.h
deleted file mode 100644
index bc3eb813a2..0000000000
--- a/keyboards/basekeys/slice/slice.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#ifdef KEYBOARD_basekeys_slice_rev1
-  #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_basekeys_slice_rev1_rgb
-  #include "rev1_rgb.h"
-#endif
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
index c06395545d..6185245bd6 100644
--- a/keyboards/basekeys/trifecta/config.h
+++ b/keyboards/basekeys/trifecta/config.h
@@ -16,22 +16,10 @@
 
 #pragma once
 
-
-/* key matrix pins */
-
-#define MATRIX_ROW_PINS { B0, B7, F7, B1, B6, C6, C7, B5, F6, D2 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, D1, B2, D0, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-
-#define RGB_DI_PIN E6
 #define RGB_MATRIX_LED_COUNT 80
 
 /* RGB LED */
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 80    // Number of LEDs. backlight x69
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json
index 8743e3aad1..d52c54dbc6 100644
--- a/keyboards/basekeys/trifecta/info.json
+++ b/keyboards/basekeys/trifecta/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEAF3",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "D1", "B2", "D0", "B3"],
+        "rows": ["B0", "B7", "F7", "B1", "B6", "C6", "C7", "B5", "F6", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D4", "pin_b": "B4"},
@@ -18,6 +23,9 @@
     "bootmagic": {
         "matrix": [1, 0]
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/basketweave/basketweave.c b/keyboards/basketweave/basketweave.c
deleted file mode 100644
index 388810c9c8..0000000000
--- a/keyboards/basketweave/basketweave.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 null-ll
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "basketweave.h"
diff --git a/keyboards/basketweave/basketweave.h b/keyboards/basketweave/basketweave.h
deleted file mode 100644
index b08254406c..0000000000
--- a/keyboards/basketweave/basketweave.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 null-ll
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define ____ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-	  K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,        \
-	  K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K414, \
-	  K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,               \
-	         K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K214,        \
-	         K401,  K402,         K404,         K406,         K408,         K410,  K411,         K412,  K413,  K314  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
-	{ ____,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
-	{ ____,  K401,  K402,  ____,  K404,  ____,  K406,  ____,  K408,  ____,  K410,  K411,  K412,  K413,  K414 } \
-}
diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h
index 2c3f6f97f2..87864e2bf4 100644
--- a/keyboards/basketweave/config.h
+++ b/keyboards/basketweave/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A6, C6, C7, A7, A5 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, B0, B1, B2, D5, D6, C5, C4, C3, C2, C1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json
index 3ef505854e..825364424b 100644
--- a/keyboards/basketweave/info.json
+++ b/keyboards/basketweave/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8989",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"],
+        "rows": ["A6", "C6", "C7", "A7", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D7", "pin_b": "C0"}
@@ -18,75 +23,85 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"~", "x":1.5, "y":0},
-                {"label":"!", "x":2.5, "y":0},
-                {"label":"@", "x":3.5, "y":0},
-                {"label":"#", "x":4.5, "y":0},
-                {"label":"$", "x":5.5, "y":0},
-                {"label":"%", "x":6.5, "y":0},
-                {"label":"^", "x":7.5, "y":0},
-                {"label":"&", "x":10.5, "y":0},
-                {"label":"*", "x":11.5, "y":0},
-                {"label":"(", "x":12.5, "y":0},
-                {"label":")", "x":13.5, "y":0},
-                {"label":"_", "x":14.5, "y":0},
-                {"label":"+", "x":15.5, "y":0},
-                {"label":"Backspace", "x":16.5, "y":0, "w":2},
-                {"label":"Insert", "x":0, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":10, "y":1},
-                {"label":"U", "x":11, "y":1},
-                {"label":"I", "x":12, "y":1},
-                {"label":"O", "x":13, "y":1},
-                {"label":"P", "x":14, "y":1},
-                {"label":"{", "x":15, "y":1},
-                {"label":"}", "x":16, "y":1},
-                {"label":"|", "x":17, "y":1, "w":1.5},
-                {"label":"Mute", "x":19, "y":0.5},
-                {"label":"Delete", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
-                {"label":"A", "x":3.25, "y":2},
-                {"label":"S", "x":4.25, "y":2},
-                {"label":"D", "x":5.25, "y":2},
-                {"label":"F", "x":6.25, "y":2},
-                {"label":"G", "x":7.25, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":":", "x":14.25, "y":2},
-                {"label":"\"", "x":15.25, "y":2},
-                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-                {"label":"Shift", "x":1.5, "y":3, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3},
-                {"label":"X", "x":4.75, "y":3},
-                {"label":"C", "x":5.75, "y":3},
-                {"label":"V", "x":6.75, "y":3},
-                {"label":"B", "x":7.75, "y":3},
-                {"label":"B", "x":9.75, "y":3},
-                {"label":"N", "x":10.75, "y":3},
-                {"label":"M", "x":11.75, "y":3},
-                {"label":"<", "x":12.75, "y":3},
-                {"label":">", "x":13.75, "y":3},
-                {"label":"?", "x":14.75, "y":3},
-                {"label":"Shift", "x":15.75, "y":3, "w":1.75},
-                {"label":"Up", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
-                {"label":"Alt", "x":4.5, "y":4, "w":1.5},
-                {"label":"Space", "x":6, "y":4, "w":2},
-                {"label":"Fn", "x":8, "y":4},
-                {"label":"Space", "x":9.75, "y":4, "w":2.75},
-                {"label":"Alt", "x":12.5, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":15, "y":4, "w":1.5},
-                {"label":"Left", "x":16.75, "y":4.25},
-                {"label":"Down", "x":17.75, "y":4.25},
-                {"label":"Right", "x":18.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+                {"matrix": [0, 10], "x": 12.5, "y": 0},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0},
+                {"matrix": [0, 13], "x": 15.5, "y": 0},
+                {"matrix": [0, 14], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 10, "y": 1},
+                {"matrix": [1, 8], "x": 11, "y": 1},
+                {"matrix": [1, 9], "x": 12, "y": 1},
+                {"matrix": [1, 10], "x": 13, "y": 1},
+                {"matrix": [1, 11], "x": 14, "y": 1},
+                {"matrix": [1, 12], "x": 15, "y": 1},
+                {"matrix": [1, 13], "x": 16, "y": 1},
+                {"matrix": [1, 14], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 14], "x": 19, "y": 0.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 14], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 17.75, "y": 4.25},
+                {"matrix": [3, 14], "x": 18.75, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/basketweave/keymaps/default/keymap.c b/keyboards/basketweave/keymaps/default/keymap.c
index 379c9f7985..efe70b32ec 100644
--- a/keyboards/basketweave/keymaps/default/keymap.c
+++ b/keyboards/basketweave/keymaps/default/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "basketweave.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
index ef99f3b631..68901305c4 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
@@ -19,17 +19,10 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { A2, B8, A8, B9 }
-#define MATRIX_COL_PINS \
-    { B1, B10, B3, B4, B5 }
-
 /* Handedness. */
 #define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
 
 /* RGB settings. */
-#define RGB_DI_PIN A1
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
index cbe8ac12e7..3fc4587f36 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B10", "B3", "B4", "B5"],
+        "rows": ["A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
index 5196e2f5e9..c48862af2c 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -25,7 +24,6 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
index a74239f706..e373627d51 100644
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#define DIODE_DIRECTION ROW2COL
-
 /* Trackball angle adjustment. */
 #define ROTATIONAL_TRANSFORM_ANGLE -25
 
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
index 0a2db20561..d7b6d01bce 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
@@ -67,20 +67,6 @@
  */
 #define PERMISSIVE_HOLD
 
-/**
- * Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap.  Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
 /** Charybdis-specific features. */
 
 #ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
index 514a153623..6d24808af2 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
@@ -39,8 +39,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define SPLIT_HAND_PIN C14 // high = left, low = right
 
 // WS2812 RGB LED strip input and number of LEDs
-#    undef RGB_DI_PIN
-#    define RGB_DI_PIN A1
+#    undef WS2812_DI_PIN
+#    define WS2812_DI_PIN A1
 #    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 #    define WS2812_PWM_DRIVER PWMD2 // default: PWMD2
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
index 5d9d4662f0..fd33c84758 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
@@ -24,18 +24,6 @@
 /* Disable unused features. */
 #define NO_ACTION_ONESHOT
 
-/**
- * \brief Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap.  Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
 /* Charybdis-specific features. */
 
 #ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
index 909cd05978..dc0c6e4e03 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
@@ -18,22 +18,8 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { B7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { C7, F0, D7, E6, B4 }
-
-#define MATRIX_ROW_PINS_RIGHT \
-    { F0, C6, D4, B5 }
-#define MATRIX_COL_PINS_RIGHT \
-    { C7, B7, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
-/* RGB settings. */
-#define RGB_DI_PIN D3
-
 /* PMW3360 settings. */
 #define POINTING_DEVICE_CS_PIN B0
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
index 11cc51ad46..80a68aea5d 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
@@ -3,8 +3,25 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F0", "D7", "E6", "B4"],
+        "rows": ["B7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["C7", "B7", "D7", "E6", "B4"],
+                "rows": ["F0", "C6", "D4", "B5"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
index 1176b482ae..cc6c21e8d2 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 # Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
 # the trackball side).
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
index 510a55be41..3b91322247 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
@@ -17,17 +17,8 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
-/* RGB settings. */
-#define RGB_DI_PIN D3
-
 /* PMW3360 settings. */
 #define POINTING_DEVICE_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
index 5c56d68554..ee2692fa06 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
index 1176b482ae..cc6c21e8d2 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 # Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
 # the trackball side).
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
index 304e89ce21..e6e2a4f216 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP28, GP15, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP13
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP18
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
index 4b914a775f..3feffac0ab 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
index b67408f28e..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -27,4 +26,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
index d497261418..ee7745d41e 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP28, GP21, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP15
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP22
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
index 4b914a775f..c80cd648c3 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
index b67408f28e..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -27,4 +26,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
index 0138b9656f..6aa20712f6 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -33,7 +27,6 @@
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
 /* RGB settings. */
-#define RGB_DI_PIN D3
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
index 9e1c778cc3..7fd33fdc4d 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "D3",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
index 3895209c6a..f10636573e 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
@@ -17,7 +17,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -27,6 +26,5 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
index 93d897a4fe..985e79fabd 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
@@ -17,17 +17,10 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { A2, B8, A8, B9 }
-#define MATRIX_COL_PINS \
-    { B0, B1, B10, B3, B4, B5 }
-
 /* Handedness. */
 #define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
 
 /* RGB settings. */
-#define RGB_DI_PIN A1
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
index 9fa70f3ca1..a02c176d5e 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
+        "rows": ["A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
index 5196e2f5e9..c48862af2c 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -25,7 +24,6 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
index 19a2fb56f5..ba729aee3e 100644
--- a/keyboards/bastardkb/charybdis/3x6/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/config.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#define DIODE_DIRECTION ROW2COL
-
 /* Trackball angle adjustment. */
 #define ROTATIONAL_TRANSFORM_ANGLE -25
 
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
index 0fea2772d2..f5c54c58ae 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
@@ -17,22 +17,8 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { B7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { D5, C7, F0, D7, E6, B4 }
-
-#define MATRIX_ROW_PINS_RIGHT \
-    { F0, C6, D4, B5 }
-#define MATRIX_COL_PINS_RIGHT \
-    { F1, C7, B7, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
-/* RGB settings. */
-#define RGB_DI_PIN D3
-
 /* PMW3360 settings. */
 #define POINTING_DEVICE_CS_PIN B0
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
index 5a8b815e95..8fba6b33cd 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
@@ -3,8 +3,25 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
+        "rows": ["B7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
+                "rows": ["F0", "C6", "D4", "B5"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
index 7e5e593915..6862a8e309 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
index ba2bd4ac36..3b91322247 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
@@ -17,17 +17,8 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F6, F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
-/* RGB settings. */
-#define RGB_DI_PIN D3
-
 /* PMW3360 settings. */
 #define POINTING_DEVICE_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index d84a7f314c..7822fbc36d 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
index 7e5e593915..6862a8e309 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
index 053d780161..e6e2a4f216 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP15, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP13
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP18
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
index 4e1c96298d..f4b25121ef 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
index b67408f28e..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -27,4 +26,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
index e4afc5a866..ee7745d41e 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP21, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP15
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP22
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
index 4e1c96298d..8e9b413329 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
index b67408f28e..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -27,4 +26,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
index 658819f936..6aa20712f6 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F6, F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -33,7 +27,6 @@
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
 /* RGB settings. */
-#define RGB_DI_PIN D3
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index b667f6d76a..e67aa0d640 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "D3",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
index 3895209c6a..f10636573e 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
@@ -17,7 +17,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -27,6 +26,5 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
index e37df487fd..68901305c4 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
@@ -19,17 +19,10 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { B15, A2, B8, A8, B9 }
-#define MATRIX_COL_PINS \
-    { B0, B1, B10, B3, B4, B5 }
-
 /* Handedness. */
 #define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
 
 /* RGB settings. */
-#define RGB_DI_PIN A1
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
index ec2b0cbad0..c6bff84bf5 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
+        "rows": ["B15", "A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
index f9e94a34df..8ac0939d01 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported.
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -25,7 +24,6 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index 21887dca07..64b5158698 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#define DIODE_DIRECTION ROW2COL
-
 /* Trackball angle adjustment. */
 #define ROTATIONAL_TRANSFORM_ANGLE -25
 
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
index 44e81807ee..dc0c6e4e03 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
@@ -18,22 +18,8 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F1, B7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { D5, C7, F0, D7, E6, B4 }
-
-#define MATRIX_ROW_PINS_RIGHT \
-    { D5, F0, C6, D4, B5 }
-#define MATRIX_COL_PINS_RIGHT \
-    { F1, C7, B7, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
-/* RGB settings. */
-#define RGB_DI_PIN D3
-
 /* PMW3360 settings. */
 #define POINTING_DEVICE_CS_PIN B0
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
index c9921cd341..36f341e0e7 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
@@ -3,8 +3,25 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
+        "rows": ["F1", "B7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
+                "rows": ["D5", "F0", "C6", "D4", "B5"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
index f643c2d082..51c8c665e2 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported.
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 # Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
 # trackball side).
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
index 8e586b89b2..3b91322247 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
@@ -17,17 +17,8 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F4, F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F6, F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
-/* RGB settings. */
-#define RGB_DI_PIN D3
-
 /* PMW3360 settings. */
 #define POINTING_DEVICE_CS_PIN F0
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
index 9349712a41..3043400b7b 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F4", "F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
index f643c2d082..51c8c665e2 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported.
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 # Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
 # trackball side).
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
index 3e7e3529c8..e6e2a4f216 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP29, GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP15, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP13
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP18
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
index 6931f9e876..e6b47c984e 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
index b67408f28e..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -27,4 +26,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
index 827267d2cf..ee7745d41e 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP29, GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP21, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP15
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP22
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
index 6931f9e876..7814c41976 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
index b67408f28e..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -27,4 +26,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
index fc4e3efadf..6aa20712f6 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F4, F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F6, F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -33,7 +27,6 @@
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
 /* RGB settings. */
-#define RGB_DI_PIN D3
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
index 0b7ea21560..723f8ae5b1 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "D3",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F4", "F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
index 3895209c6a..f10636573e 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
@@ -17,7 +17,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
@@ -27,6 +26,5 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h b/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
deleted file mode 100644
index 7deb32d917..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// clang-format off
-#define LAYOUT_split_3x5_2(                             \
-  k00, k01, k02, k03, k04,     k44, k43, k42, k41, k40, \
-  k10, k11, k12, k13, k14,     k54, k53, k52, k51, k50, \
-  k20, k21, k22, k23, k24,     k64, k63, k62, k61, k60, \
-                 k30, k32,     k72, k70                 \
-)                                                       \
-{                                                       \
-  {   k00,   k01,   k02,   k03,   k04 },                \
-  {   k10,   k11,   k12,   k13,   k14 },                \
-  {   k20,   k21,   k22,   k23,   k24 },                \
-  {   k30, KC_NO,   k32, KC_NO, KC_NO },                \
-  {   k40,   k41,   k42,   k43,   k44 },                \
-  {   k50,   k51,   k52,   k53,   k54 },                \
-  {   k60,   k61,   k62,   k63,   k64 },                \
-  {   k70, KC_NO,   k72, KC_NO, KC_NO },                \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
index 3a5898c546..4366a8a3e9 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP4, GP5, GP28, GP26 }
-#define MATRIX_COL_PINS \
-    { GP8, GP9, GP7, GP6, GP27 }
-
 /* Handedness. */
 #define SPLIT_HAND_PIN GP29
 #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
index e4f48e6c7e..796d22dc71 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
@@ -1,5 +1,10 @@
 {
     "keyboard_name": "Dilemma (3x5+2) Assembled",
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
+        "rows": ["GP4", "GP5", "GP28", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json
index a758541149..bfd12e81d0 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/info.json
@@ -7,40 +7,47 @@
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                { "label": "L00", "x": 0, "y": 0 },
-                { "label": "L01", "x": 1, "y": 0 },
-                { "label": "L02", "x": 2, "y": 0 },
-                { "label": "L03", "x": 3, "y": 0 },
-                { "label": "L04", "x": 4, "y": 0 },
-                { "label": "R00", "x": 11, "y": 0 },
-                { "label": "R01", "x": 12, "y": 0 },
-                { "label": "R02", "x": 13, "y": 0 },
-                { "label": "R03", "x": 14, "y": 0 },
-                { "label": "R04", "x": 15, "y": 0 },
-                { "label": "L10", "x": 0, "y": 1 },
-                { "label": "L11", "x": 1, "y": 1 },
-                { "label": "L12", "x": 2, "y": 1 },
-                { "label": "L13", "x": 3, "y": 1 },
-                { "label": "L14", "x": 4, "y": 1 },
-                { "label": "R10", "x": 11, "y": 1 },
-                { "label": "R11", "x": 12, "y": 1 },
-                { "label": "R12", "x": 13, "y": 1 },
-                { "label": "R13", "x": 14, "y": 1 },
-                { "label": "R14", "x": 15, "y": 1 },
-                { "label": "L20", "x": 0, "y": 2 },
-                { "label": "L21", "x": 1, "y": 2 },
-                { "label": "L22", "x": 2, "y": 2 },
-                { "label": "L23", "x": 3, "y": 2 },
-                { "label": "L24", "x": 4, "y": 2 },
-                { "label": "R20", "x": 11, "y": 2 },
-                { "label": "R21", "x": 12, "y": 2 },
-                { "label": "R22", "x": 13, "y": 2 },
-                { "label": "R23", "x": 14, "y": 2 },
-                { "label": "R24", "x": 15, "y": 2 },
-                { "label": "L30", "x": 4, "y": 3 },
-                { "label": "L32", "x": 5, "y": 3 },
-                { "label": "R32", "x": 10, "y": 3 },
-                { "label": "R30", "x": 11, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 2], "x": 13, "y": 0},
+                {"matrix": [4, 1], "x": 14, "y": 0},
+                {"matrix": [4, 0], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [5, 4], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 2], "x": 13, "y": 1},
+                {"matrix": [5, 1], "x": 14, "y": 1},
+                {"matrix": [5, 0], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [6, 4], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 2], "x": 13, "y": 2},
+                {"matrix": [6, 1], "x": 14, "y": 2},
+                {"matrix": [6, 0], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 5, "y": 3},
+
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 0], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
index 2390d10ca5..8d8baa5c32 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
@@ -65,20 +65,6 @@
  */
 #define PERMISSIVE_HOLD
 
-/**
- * Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap.  Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
 /** Dilemma-specific features. */
 
 #ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
index 5bfac4b6c5..f92ea9a4c9 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
@@ -21,18 +21,6 @@
 #    define DYNAMIC_KEYMAP_LAYER_COUNT 6
 #endif // VIA_ENABLE
 
-/**
- * \brief Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap.  Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
 /* Charybdis-specific features. */
 
 #ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
index 67e9646845..fd7bb0f107 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP4, GP5, GP28, GP26 }
-#define MATRIX_COL_PINS \
-    { GP8, GP9, GP7, GP6, GP27 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
index aec0957ed6..7796a7c311 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
@@ -1,5 +1,10 @@
 {
     "keyboard_name": "Dilemma (3x5+2) Splinky",
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
+        "rows": ["GP4", "GP5", "GP28", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
index 0b6c657fda..b9787f473e 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
+++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "3x5_3.h"
+#include "quantum.h"
 
 /**
  * LEDs index.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h
deleted file mode 100644
index 566d5b81d2..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "dilemma.h"
-
-// clang-format off
-#define LAYOUT_split_3x5_3(                             \
-  k00, k01, k02, k03, k04,     k44, k43, k42, k41, k40, \
-  k10, k11, k12, k13, k14,     k54, k53, k52, k51, k50, \
-  k20, k21, k22, k23, k24,     k64, k63, k62, k61, k60, \
-            k32, k30, k31,     k71, k70, k72            \
-)                                                       \
-{                                                       \
-  {   k00,   k01,   k02,   k03,   k04 },                \
-  {   k10,   k11,   k12,   k13,   k14 },                \
-  {   k20,   k21,   k22,   k23,   k24 },                \
-  {   k30,   k31,   k32, KC_NO, KC_NO },                \
-  {   k40,   k41,   k42,   k43,   k44 },                \
-  {   k50,   k51,   k52,   k53,   k54 },                \
-  {   k60,   k61,   k62,   k63,   k64 },                \
-  {   k70,   k71,   k72, KC_NO, KC_NO },                \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
index a30b98a10a..c5fa0dc192 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -17,20 +17,10 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP4, GP5, GP27, GP26 }
-#define MATRIX_COL_PINS \
-    { GP8, GP9, GP7, GP6, GP28 }
-
 /* Handedness. */
 #define SPLIT_HAND_PIN GP29
 #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0  // Per-key.
-// #define RGB_DI_PIN GP10 // Underglow.
-
 /* CRC. */
 #define CRC8_USE_TABLE
 #define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index a4fe592587..57ea2c16df 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -4,51 +4,70 @@
         "device_version": "2.0.0",
         "pid": "0x1835"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
+        "rows": ["GP4", "GP5", "GP27", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040",
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                { "label": "L00", "x": 0, "y": 0 },
-                { "label": "L01", "x": 1, "y": 0 },
-                { "label": "L02", "x": 2, "y": 0 },
-                { "label": "L03", "x": 3, "y": 0 },
-                { "label": "L04", "x": 4, "y": 0 },
-                { "label": "R00", "x": 11, "y": 0 },
-                { "label": "R01", "x": 12, "y": 0 },
-                { "label": "R02", "x": 13, "y": 0 },
-                { "label": "R03", "x": 14, "y": 0 },
-                { "label": "R04", "x": 15, "y": 0 },
-                { "label": "L10", "x": 0, "y": 1 },
-                { "label": "L11", "x": 1, "y": 1 },
-                { "label": "L12", "x": 2, "y": 1 },
-                { "label": "L13", "x": 3, "y": 1 },
-                { "label": "L14", "x": 4, "y": 1 },
-                { "label": "R10", "x": 11, "y": 1 },
-                { "label": "R11", "x": 12, "y": 1 },
-                { "label": "R12", "x": 13, "y": 1 },
-                { "label": "R13", "x": 14, "y": 1 },
-                { "label": "R14", "x": 15, "y": 1 },
-                { "label": "L20", "x": 0, "y": 2 },
-                { "label": "L21", "x": 1, "y": 2 },
-                { "label": "L22", "x": 2, "y": 2 },
-                { "label": "L23", "x": 3, "y": 2 },
-                { "label": "L24", "x": 4, "y": 2 },
-                { "label": "R20", "x": 11, "y": 2 },
-                { "label": "R21", "x": 12, "y": 2 },
-                { "label": "R22", "x": 13, "y": 2 },
-                { "label": "R23", "x": 14, "y": 2 },
-                { "label": "R24", "x": 15, "y": 2 },
-                { "label": "L32", "x": 4, "y": 3 },
-                { "label": "L33", "x": 5, "y": 3 },
-                { "label": "L34", "x": 6, "y": 3 },
-                { "label": "R32", "x": 11, "y": 3 },
-                { "label": "R33", "x": 10, "y": 3 },
-                { "label": "R34", "x": 9, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 2], "x": 13, "y": 0},
+                {"matrix": [4, 1], "x": 14, "y": 0},
+                {"matrix": [4, 0], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [5, 4], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 2], "x": 13, "y": 1},
+                {"matrix": [5, 1], "x": 14, "y": 1},
+                {"matrix": [5, 0], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [6, 4], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 2], "x": 13, "y": 2},
+                {"matrix": [6, 1], "x": 14, "y": 2},
+                {"matrix": [6, 0], "x": 15, "y": 2},
+
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 0], "x": 5, "y": 3},
+                {"matrix": [3, 1], "x": 6, "y": 3},
+
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 10, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3}
             ]
         }
     }
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
index fce6c3a1f6..cfdafc4a51 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
@@ -59,18 +59,6 @@
  */
 #define PERMISSIVE_HOLD
 
-/**
- * Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap.  Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
 /** Dilemma-specific features. */
 
 #ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
index 5ab695a6c2..2b52cffbf7 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
@@ -15,10 +15,8 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = no     # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
 
 POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
diff --git a/keyboards/bastardkb/dilemma/config.h b/keyboards/bastardkb/dilemma/config.h
index 3ea785525c..d282c635ea 100644
--- a/keyboards/bastardkb/dilemma/config.h
+++ b/keyboards/bastardkb/dilemma/config.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION ROW2COL
-
 /* Pointing device configuration. */
 
 // Enable use of pointing device on slave split.
diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h
index f2c0784533..eefdd5babf 100644
--- a/keyboards/bastardkb/dilemma/dilemma.h
+++ b/keyboards/bastardkb/dilemma/dilemma.h
@@ -17,16 +17,6 @@
 
 #pragma once
 
-// clang-format off
-#if defined(KEYBOARD_bastardkb_dilemma_3x5_2_splinky) || defined (KEYBOARD_bastardkb_dilemma_3x5_2_assembled)
-#    include "3x5_2.h"
-#elif defined(KEYBOARD_bastardkb_dilemma_3x5_3)
-#    include "3x5_3.h"
-#else
-#    error "Unsuported format"
-#endif
-// clang-format on
-
 #include "quantum.h"
 
 #ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/scylla/blackpill/config.h b/keyboards/bastardkb/scylla/blackpill/config.h
index 773ee947d7..0c40ed74bc 100644
--- a/keyboards/bastardkb/scylla/blackpill/config.h
+++ b/keyboards/bastardkb/scylla/blackpill/config.h
@@ -19,17 +19,10 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { B15, A2, B8, A8, B9 }
-#define MATRIX_COL_PINS \
-    { B0, B1, B10, B3, B4, B5 }
-
 /* Handedness. */
 #define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
 
 /* RGB settings. */
-#define RGB_DI_PIN A1
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json
index a701797dc0..8b65317104 100644
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ b/keyboards/bastardkb/scylla/blackpill/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
+        "rows": ["B15", "A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
index b68437c19e..88d65fbb90 100644
--- a/keyboards/bastardkb/scylla/blackpill/rules.mk
+++ b/keyboards/bastardkb/scylla/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
 
@@ -23,7 +22,6 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
index 0f41dca37e..0ad3ecd17b 100644
--- a/keyboards/bastardkb/scylla/config.h
+++ b/keyboards/bastardkb/scylla/config.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB settings. */
 #define RGBLED_NUM 58
 #define RGBLED_SPLIT \
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index d8120f5070..682b2dc6db 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -6,64 +6,75 @@
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [
-                { "label": "L00", "x": 0, "y": 0 },
-                { "label": "L01", "x": 1, "y": 0 },
-                { "label": "L02", "x": 2, "y": 0 },
-                { "label": "L03", "x": 3, "y": 0 },
-                { "label": "L04", "x": 4, "y": 0 },
-                { "label": "L05", "x": 5, "y": 0 },
-                { "label": "R00", "x": 11, "y": 0 },
-                { "label": "R01", "x": 12, "y": 0 },
-                { "label": "R02", "x": 13, "y": 0 },
-                { "label": "R03", "x": 14, "y": 0 },
-                { "label": "R04", "x": 15, "y": 0 },
-                { "label": "R05", "x": 16, "y": 0 },
-                { "label": "L10", "x": 0, "y": 1 },
-                { "label": "L11", "x": 1, "y": 1 },
-                { "label": "L12", "x": 2, "y": 1 },
-                { "label": "L13", "x": 3, "y": 1 },
-                { "label": "L14", "x": 4, "y": 1 },
-                { "label": "L15", "x": 5, "y": 1 },
-                { "label": "R10", "x": 11, "y": 1 },
-                { "label": "R11", "x": 12, "y": 1 },
-                { "label": "R12", "x": 13, "y": 1 },
-                { "label": "R13", "x": 14, "y": 1 },
-                { "label": "R14", "x": 15, "y": 1 },
-                { "label": "R15", "x": 16, "y": 1 },
-                { "label": "L20", "x": 0, "y": 2 },
-                { "label": "L21", "x": 1, "y": 2 },
-                { "label": "L22", "x": 2, "y": 2 },
-                { "label": "L23", "x": 3, "y": 2 },
-                { "label": "L24", "x": 4, "y": 2 },
-                { "label": "L25", "x": 5, "y": 2 },
-                { "label": "R20", "x": 11, "y": 2 },
-                { "label": "R21", "x": 12, "y": 2 },
-                { "label": "R22", "x": 13, "y": 2 },
-                { "label": "R23", "x": 14, "y": 2 },
-                { "label": "R24", "x": 15, "y": 2 },
-                { "label": "R25", "x": 16, "y": 2 },
-                { "label": "L30", "x": 0, "y": 3 },
-                { "label": "L31", "x": 1, "y": 3 },
-                { "label": "L32", "x": 2, "y": 3 },
-                { "label": "L33", "x": 3, "y": 3 },
-                { "label": "L34", "x": 4, "y": 3 },
-                { "label": "L35", "x": 5, "y": 3 },
-                { "label": "R30", "x": 11, "y": 3 },
-                { "label": "R31", "x": 12, "y": 3 },
-                { "label": "R32", "x": 13, "y": 3 },
-                { "label": "R33", "x": 14, "y": 3 },
-                { "label": "R34", "x": 15, "y": 3 },
-                { "label": "R35", "x": 16, "y": 3 },
-                { "label": "L43", "x": 5, "y": 4 },
-                { "label": "L44", "x": 6, "y": 4 },
-                { "label": "L45", "x": 7, "y": 4 },
-                { "label": "R40", "x": 9, "y": 4 },
-                { "label": "R41", "x": 10, "y": 4 },
-                { "label": "R40", "x": 11, "y": 4 },
-                { "label": "L52", "x": 6, "y": 5 },
-                { "label": "L53", "x": 7, "y": 5 },
-                { "label": "R52", "x": 9, "y": 5 },
-                { "label": "R53", "x": 10, "y": 5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "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/scylla/keymaps/xyverz/config.h b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h
index 335f968e2a..4fa185e956 100644
--- a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h
+++ b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h
@@ -28,6 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 300
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define LEADER_PER_KEY_TIMING
 #define LEADER_TIMEOUT 300
\ No newline at end of file
diff --git a/keyboards/bastardkb/scylla/scylla.c b/keyboards/bastardkb/scylla/scylla.c
index 504cb0a219..7aaa0fc1ce 100644
--- a/keyboards/bastardkb/scylla/scylla.c
+++ b/keyboards/bastardkb/scylla/scylla.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scylla.h"
+#include "quantum.h"
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/scylla/scylla.h b/keyboards/bastardkb/scylla/scylla.h
deleted file mode 100644
index 4039ad3a94..0000000000
--- a/keyboards/bastardkb/scylla/scylla.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT_split_4x6_5(                                       \
-  k00, k01, k02, k03, k04, k05,     k55, k54, k53, k52, k51, k50, \
-  k10, k11, k12, k13, k14, k15,     k65, k64, k63, k62, k61, k60, \
-  k20, k21, k22, k23, k24, k25,     k75, k74, k73, k72, k71, k70, \
-  k30, k31, k32, k33, k34, k35,     k85, k84, k83, k82, k81, k80, \
-                 k43, k44, k41,     k91, k94, k93,                \
-                      k45, k42,     k92, k95                      \
-)                                                                 \
-{                                                                 \
-  {   k00,   k01,   k02,   k03,   k04,   k05 },                   \
-  {   k10,   k11,   k12,   k13,   k14,   k15 },                   \
-  {   k20,   k21,   k22,   k23,   k24,   k25 },                   \
-  {   k30,   k31,   k32,   k33,   k34,   k35 },                   \
-  { KC_NO,   k41,   k42,   k43,   k44,   k45 },                   \
-  {   k50,   k51,   k52,   k53,   k54,   k55 },                   \
-  {   k60,   k61,   k62,   k63,   k64,   k65 },                   \
-  {   k70,   k71,   k72,   k73,   k74,   k75 },                   \
-  {   k80,   k81,   k82,   k83,   k84,   k85 },                   \
-  { KC_NO,   k91,   k92,   k93,   k94,   k95 },                   \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/scylla/v1/elitec/config.h b/keyboards/bastardkb/scylla/v1/elitec/config.h
index 967a8c6c53..41b5aa1c66 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/config.h
+++ b/keyboards/bastardkb/scylla/v1/elitec/config.h
@@ -18,14 +18,5 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { D7, B5, F7, F6, B6 }
-#define MATRIX_COL_PINS \
-    { B4, E6, C6, B1, B3, B2 }
-
 /* Handedness. */
 #define MASTER_RIGHT
-
-/* RGB settings. */
-#define RGB_DI_PIN D2
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json
index 1ed2cee71d..ffac558bbc 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v1/elitec/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
+        "rows": ["D7", "B5", "F7", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/elitec/config.h b/keyboards/bastardkb/scylla/v2/elitec/config.h
index e9691010ed..e6b7fefa66 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/config.h
+++ b/keyboards/bastardkb/scylla/v2/elitec/config.h
@@ -17,14 +17,5 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F4, F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F6, F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
-
-/* RGB settings. */
-#define RGB_DI_PIN D3
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
index 4674e238a6..1a8643b27d 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F4", "F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
index f65dcfb0b3..977fb0a6e8 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP29, GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP15, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP13
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
index 6d3edbd0ee..8ba2d4d19a 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
index 8e2235ee9f..274e95c039 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
@@ -19,9 +19,7 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
index 09d5af43c8..e496023656 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP29, GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP21, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP15
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
index 6d3edbd0ee..c0cd88672b 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
index 8e2235ee9f..274e95c039 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
@@ -19,9 +19,7 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h
index 5528531b91..0bbfd39aee 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/config.h
+++ b/keyboards/bastardkb/scylla/v2/stemcell/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F4, F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F6, F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -33,7 +27,6 @@
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
 /* RGB settings. */
-#define RGB_DI_PIN D3
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index eccfea99f4..2c66f25554 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "D3",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F4", "F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index 70f7784de6..c42b71866e 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -17,11 +17,9 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/skeletyl/blackpill/config.h b/keyboards/bastardkb/skeletyl/blackpill/config.h
index cbff281ddc..0c40ed74bc 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/config.h
+++ b/keyboards/bastardkb/skeletyl/blackpill/config.h
@@ -19,17 +19,10 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { A2, B8, A8, B9 }
-#define MATRIX_COL_PINS \
-    { B1, B10, B3, B4, B5 }
-
 /* Handedness. */
 #define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
 
 /* RGB settings. */
-#define RGB_DI_PIN A1
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
index b058d2424a..2bec7f1981 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ b/keyboards/bastardkb/skeletyl/blackpill/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B10", "B3", "B4", "B5"],
+        "rows": ["A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
index b68437c19e..88d65fbb90 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk
+++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
 
@@ -23,7 +22,6 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index c1e0e0aa19..3e282f0f15 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB settings. */
 #define RGBLED_NUM 36
 #define RGBLED_SPLIT \
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index 90568ef1fd..b325ca7196 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -7,42 +7,49 @@
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                { "label": "L00", "x": 0, "y": 0 },
-                { "label": "L01", "x": 1, "y": 0 },
-                { "label": "L02", "x": 2, "y": 0 },
-                { "label": "L03", "x": 3, "y": 0 },
-                { "label": "L04", "x": 4, "y": 0 },
-                { "label": "R00", "x": 11, "y": 0 },
-                { "label": "R01", "x": 12, "y": 0 },
-                { "label": "R02", "x": 13, "y": 0 },
-                { "label": "R03", "x": 14, "y": 0 },
-                { "label": "R04", "x": 15, "y": 0 },
-                { "label": "L10", "x": 0, "y": 1 },
-                { "label": "L11", "x": 1, "y": 1 },
-                { "label": "L12", "x": 2, "y": 1 },
-                { "label": "L13", "x": 3, "y": 1 },
-                { "label": "L14", "x": 4, "y": 1 },
-                { "label": "R10", "x": 11, "y": 1 },
-                { "label": "R11", "x": 12, "y": 1 },
-                { "label": "R12", "x": 13, "y": 1 },
-                { "label": "R13", "x": 14, "y": 1 },
-                { "label": "R14", "x": 15, "y": 1 },
-                { "label": "L20", "x": 0, "y": 2 },
-                { "label": "L21", "x": 1, "y": 2 },
-                { "label": "L22", "x": 2, "y": 2 },
-                { "label": "L23", "x": 3, "y": 2 },
-                { "label": "L24", "x": 4, "y": 2 },
-                { "label": "R20", "x": 11, "y": 2 },
-                { "label": "R21", "x": 12, "y": 2 },
-                { "label": "R22", "x": 13, "y": 2 },
-                { "label": "R23", "x": 14, "y": 2 },
-                { "label": "R24", "x": 15, "y": 2 },
-                { "label": "L33", "x": 4, "y": 3 },
-                { "label": "L34", "x": 5, "y": 3 },
-                { "label": "L31", "x": 6, "y": 3 },
-                { "label": "R33", "x": 9, "y": 3 },
-                { "label": "R34", "x": 10, "y": 3 },
-                { "label": "R31", "x": 11, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 2], "x": 13, "y": 0},
+                {"matrix": [4, 1], "x": 14, "y": 0},
+                {"matrix": [4, 0], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [5, 4], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 2], "x": 13, "y": 1},
+                {"matrix": [5, 1], "x": 14, "y": 1},
+                {"matrix": [5, 0], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [6, 4], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 2], "x": 13, "y": 2},
+                {"matrix": [6, 1], "x": 14, "y": 2},
+                {"matrix": [6, 0], "x": 15, "y": 2},
+
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 0], "x": 6, "y": 3},
+
+                {"matrix": [7, 0], "x": 9, "y": 3},
+                {"matrix": [7, 3], "x": 10, "y": 3},
+                {"matrix": [7, 2], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/bastardkb/skeletyl/skeletyl.c b/keyboards/bastardkb/skeletyl/skeletyl.c
index b72becbb25..6c65c3fa87 100644
--- a/keyboards/bastardkb/skeletyl/skeletyl.c
+++ b/keyboards/bastardkb/skeletyl/skeletyl.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "skeletyl.h"
+#include "quantum.h"
 
 /**
  * LEDs index.
diff --git a/keyboards/bastardkb/skeletyl/skeletyl.h b/keyboards/bastardkb/skeletyl/skeletyl.h
deleted file mode 100644
index 6d8073153f..0000000000
--- a/keyboards/bastardkb/skeletyl/skeletyl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly DELAY <charly@codesink.dev>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT_split_3x5_3(                             \
-  k00, k01, k02, k03, k04,     k44, k43, k42, k41, k40, \
-  k10, k11, k12, k13, k14,     k54, k53, k52, k51, k50, \
-  k20, k21, k22, k23, k24,     k64, k63, k62, k61, k60, \
-            k32, k33, k30,     k70, k73, k72            \
-)                                                       \
-{                                                       \
-  {   k00,   k01,   k02,   k03,   k04 },                \
-  {   k10,   k11,   k12,   k13,   k14 },                \
-  {   k20,   k21,   k22,   k23,   k24 },                \
-  {   k30, KC_NO,   k32,   k33, KC_NO },                \
-  {   k40,   k41,   k42,   k43,   k44 },                \
-  {   k50,   k51,   k52,   k53,   k54 },                \
-  {   k60,   k61,   k62,   k63,   k64 },                \
-  {   k70, KC_NO,   k72,   k73, KC_NO },                \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/config.h b/keyboards/bastardkb/skeletyl/v1/elitec/config.h
index f98185755f..41b5aa1c66 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/config.h
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/config.h
@@ -18,14 +18,5 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { B5, F7, F6, B6 }
-#define MATRIX_COL_PINS \
-    { E6, C6, B1, B3, B2 }
-
 /* Handedness. */
 #define MASTER_RIGHT
-
-/* RGB settings. */
-#define RGB_DI_PIN D2
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
index 392e3168ff..f81bca976e 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "C6", "B1", "B3", "B2"],
+        "rows": ["B5", "F7", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/config.h b/keyboards/bastardkb/skeletyl/v2/elitec/config.h
index 6f001c5e24..e6b7fefa66 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/config.h
@@ -17,14 +17,5 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
-
-/* RGB settings. */
-#define RGB_DI_PIN D3
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
index ae98ff793a..2c43204ace 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
index 7fef28b05e..977fb0a6e8 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP28, GP15, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP13
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
index a39c13a0ae..023c4d553e 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
index 8e2235ee9f..274e95c039 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
@@ -19,9 +19,7 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
index eda378df84..e496023656 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP28, GP21, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP15
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
index a39c13a0ae..56a00a3c3d 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
index 8e2235ee9f..274e95c039 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
@@ -19,9 +19,7 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
index 86bbdd199b..0bbfd39aee 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -33,7 +27,6 @@
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
 /* RGB settings. */
-#define RGB_DI_PIN D3
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
index 257eb6f62e..cc4bcf887f 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "D3",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
index 70f7784de6..c42b71866e 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
@@ -17,11 +17,9 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h
index 7a273050c0..40a9b2cbeb 100644
--- a/keyboards/bastardkb/tbk/config.h
+++ b/keyboards/bastardkb/tbk/config.h
@@ -17,11 +17,6 @@
 
 #pragma once
 
-#define DIODE_DIRECTION ROW2COL
-#define MATRIX_ROW_PINS { D7, B5, F7, F6, B6 }
-#define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 }
-
-#define RGB_DI_PIN D2
 #define RGBLED_NUM 38
 #define RGBLED_SPLIT { 19, 19 }
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
index 22f10cee96..7da2d56ad5 100644
--- a/keyboards/bastardkb/tbk/info.json
+++ b/keyboards/bastardkb/tbk/info.json
@@ -5,6 +5,14 @@
         "device_version": "0.0.1",
         "pid": "0x1828"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
+        "rows": ["D7", "B5", "F7", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D0"
     },
@@ -13,64 +21,64 @@
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [
-                { "label": "L00", "x": 0, "y": 0 },
-                { "label": "L01", "x": 1, "y": 0 },
-                { "label": "L02", "x": 2, "y": 0 },
-                { "label": "L03", "x": 3, "y": 0 },
-                { "label": "L04", "x": 4, "y": 0 },
-                { "label": "L05", "x": 5, "y": 0 },
-                { "label": "R00", "x": 11, "y": 0 },
-                { "label": "R01", "x": 12, "y": 0 },
-                { "label": "R02", "x": 13, "y": 0 },
-                { "label": "R03", "x": 14, "y": 0 },
-                { "label": "R04", "x": 15, "y": 0 },
-                { "label": "R05", "x": 16, "y": 0 },
-                { "label": "L10", "x": 0, "y": 1 },
-                { "label": "L11", "x": 1, "y": 1 },
-                { "label": "L12", "x": 2, "y": 1 },
-                { "label": "L13", "x": 3, "y": 1 },
-                { "label": "L14", "x": 4, "y": 1 },
-                { "label": "L15", "x": 5, "y": 1 },
-                { "label": "R10", "x": 11, "y": 1 },
-                { "label": "R11", "x": 12, "y": 1 },
-                { "label": "R12", "x": 13, "y": 1 },
-                { "label": "R13", "x": 14, "y": 1 },
-                { "label": "R14", "x": 15, "y": 1 },
-                { "label": "R15", "x": 16, "y": 1 },
-                { "label": "L20", "x": 0, "y": 2 },
-                { "label": "L21", "x": 1, "y": 2 },
-                { "label": "L22", "x": 2, "y": 2 },
-                { "label": "L23", "x": 3, "y": 2 },
-                { "label": "L24", "x": 4, "y": 2 },
-                { "label": "L25", "x": 5, "y": 2 },
-                { "label": "R20", "x": 11, "y": 2 },
-                { "label": "R21", "x": 12, "y": 2 },
-                { "label": "R22", "x": 13, "y": 2 },
-                { "label": "R23", "x": 14, "y": 2 },
-                { "label": "R24", "x": 15, "y": 2 },
-                { "label": "R25", "x": 16, "y": 2 },
-                { "label": "L30", "x": 0, "y": 3 },
-                { "label": "L31", "x": 1, "y": 3 },
-                { "label": "L32", "x": 2, "y": 3 },
-                { "label": "L33", "x": 3, "y": 3 },
-                { "label": "L34", "x": 4, "y": 3 },
-                { "label": "L35", "x": 5, "y": 3 },
-                { "label": "R30", "x": 11, "y": 3 },
-                { "label": "R31", "x": 12, "y": 3 },
-                { "label": "R32", "x": 13, "y": 3 },
-                { "label": "R33", "x": 14, "y": 3 },
-                { "label": "R34", "x": 15, "y": 3 },
-                { "label": "R35", "x": 16, "y": 3 },
-                { "label": "L43", "x": 5, "y": 4 },
-                { "label": "L44", "x": 6, "y": 4 },
-                { "label": "L45", "x": 7, "y": 4 },
-                { "label": "R40", "x": 9, "y": 4 },
-                { "label": "R41", "x": 10, "y": 4 },
-                { "label": "R40", "x": 11, "y": 4 },
-                { "label": "L52", "x": 6, "y": 5 },
-                { "label": "L53", "x": 7, "y": 5 },
-                { "label": "R52", "x": 9, "y": 5 },
-                { "label": "R53", "x": 10, "y": 5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "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/keymaps/xyverz/config.h b/keyboards/bastardkb/tbk/keymaps/xyverz/config.h
index 335f968e2a..4fa185e956 100644
--- a/keyboards/bastardkb/tbk/keymaps/xyverz/config.h
+++ b/keyboards/bastardkb/tbk/keymaps/xyverz/config.h
@@ -28,6 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 300
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define LEADER_PER_KEY_TIMING
 #define LEADER_TIMEOUT 300
\ No newline at end of file
diff --git a/keyboards/bastardkb/tbk/tbk.c b/keyboards/bastardkb/tbk/tbk.c
deleted file mode 100644
index 4cebec2a54..0000000000
--- a/keyboards/bastardkb/tbk/tbk.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "tbk.h"
diff --git a/keyboards/bastardkb/tbk/tbk.h b/keyboards/bastardkb/tbk/tbk.h
deleted file mode 100644
index 5958097880..0000000000
--- a/keyboards/bastardkb/tbk/tbk.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT_split_4x6_5( \
-    k00, k01, k02, k03, k04, k05,            k55, k54, k53, k52, k51, k50, \
-    k10, k11, k12, k13, k14, k15,            k65, k64, k63, k62, k61, k60, \
-    k20, k21, k22, k23, k24, k25,            k75, k74, k73, k72, k71, k70, \
-    k30, k31, k32, k33, k34, k35,            k85, k84, k83, k82, k81, k80, \
-                   k43, k44, k41,            k91, k94, k93, \
-                        k45, k42,            k92, k95 \
-) \
-{ \
-    {   k00, k01, k02, k03, k04, k05 }, \
-    {   k10, k11, k12, k13, k14, k15 }, \
-    {   k20, k21, k22, k23, k24, k25 }, \
-    {   k30, k31, k32, k33, k34, k35 }, \
-    { KC_NO, k41, k42, k43, k44, k45 }, \
-    {   k50, k51, k52, k53, k54, k55 }, \
-    {   k60, k61, k62, k63, k64, k65 }, \
-    {   k70, k71, k72, k73, k74, k75 }, \
-    {   k80, k81, k82, k83, k84, k85 }, \
-    { KC_NO, k91, k92, k93, k94, k95 }, \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/tbkmini/blackpill/config.h b/keyboards/bastardkb/tbkmini/blackpill/config.h
index ba0c93ff93..0c40ed74bc 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/config.h
+++ b/keyboards/bastardkb/tbkmini/blackpill/config.h
@@ -19,17 +19,10 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { A2, B8, A8, B9 }
-#define MATRIX_COL_PINS \
-    { B0, B1, B10, B3, B4, B5 }
-
 /* Handedness. */
 #define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
 
 /* RGB settings. */
-#define RGB_DI_PIN A1
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json
index 025b442468..30a1b0ac94 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/info.json
+++ b/keyboards/bastardkb/tbkmini/blackpill/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
+        "rows": ["A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
index b68437c19e..88d65fbb90 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk
+++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
 
@@ -23,7 +22,6 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
index 9c2e0f8327..06c6e3ada4 100644
--- a/keyboards/bastardkb/tbkmini/config.h
+++ b/keyboards/bastardkb/tbkmini/config.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB settings. */
 #define RGBLED_NUM 42
 #define RGBLED_SPLIT \
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index 2056aeeb5d..94c357cd3b 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -7,48 +7,55 @@
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
-                { "label": "L00", "x": 0, "y": 0 },
-                { "label": "L01", "x": 1, "y": 0 },
-                { "label": "L02", "x": 2, "y": 0 },
-                { "label": "L03", "x": 3, "y": 0 },
-                { "label": "L04", "x": 4, "y": 0 },
-                { "label": "L05", "x": 5, "y": 0 },
-                { "label": "R00", "x": 11, "y": 0 },
-                { "label": "R01", "x": 12, "y": 0 },
-                { "label": "R02", "x": 13, "y": 0 },
-                { "label": "R03", "x": 14, "y": 0 },
-                { "label": "R04", "x": 15, "y": 0 },
-                { "label": "R05", "x": 16, "y": 0 },
-                { "label": "L10", "x": 0, "y": 1 },
-                { "label": "L11", "x": 1, "y": 1 },
-                { "label": "L12", "x": 2, "y": 1 },
-                { "label": "L13", "x": 3, "y": 1 },
-                { "label": "L14", "x": 4, "y": 1 },
-                { "label": "L15", "x": 5, "y": 1 },
-                { "label": "R10", "x": 11, "y": 1 },
-                { "label": "R11", "x": 12, "y": 1 },
-                { "label": "R12", "x": 13, "y": 1 },
-                { "label": "R13", "x": 14, "y": 1 },
-                { "label": "R14", "x": 15, "y": 1 },
-                { "label": "R15", "x": 16, "y": 1 },
-                { "label": "L20", "x": 0, "y": 2 },
-                { "label": "L21", "x": 1, "y": 2 },
-                { "label": "L22", "x": 2, "y": 2 },
-                { "label": "L23", "x": 3, "y": 2 },
-                { "label": "L24", "x": 4, "y": 2 },
-                { "label": "L25", "x": 5, "y": 2 },
-                { "label": "R20", "x": 11, "y": 2 },
-                { "label": "R21", "x": 12, "y": 2 },
-                { "label": "R22", "x": 13, "y": 2 },
-                { "label": "R23", "x": 14, "y": 2 },
-                { "label": "R24", "x": 15, "y": 2 },
-                { "label": "R25", "x": 16, "y": 2 },
-                { "label": "L33", "x": 5, "y": 3 },
-                { "label": "L34", "x": 6, "y": 3 },
-                { "label": "L31", "x": 7, "y": 3 },
-                { "label": "R33", "x": 9, "y": 3 },
-                { "label": "R34", "x": 10, "y": 3 },
-                { "label": "R31", "x": 11, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "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": 11, "y": 0},
+                {"matrix": [4, 4], "x": 12, "y": 0},
+                {"matrix": [4, 3], "x": 13, "y": 0},
+                {"matrix": [4, 2], "x": 14, "y": 0},
+                {"matrix": [4, 1], "x": 15, "y": 0},
+                {"matrix": [4, 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": [5, 5], "x": 11, "y": 1},
+                {"matrix": [5, 4], "x": 12, "y": 1},
+                {"matrix": [5, 3], "x": 13, "y": 1},
+                {"matrix": [5, 2], "x": 14, "y": 1},
+                {"matrix": [5, 1], "x": 15, "y": 1},
+                {"matrix": [5, 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": [6, 5], "x": 11, "y": 2},
+                {"matrix": [6, 4], "x": 12, "y": 2},
+                {"matrix": [6, 3], "x": 13, "y": 2},
+                {"matrix": [6, 2], "x": 14, "y": 2},
+                {"matrix": [6, 1], "x": 15, "y": 2},
+                {"matrix": [6, 0], "x": 16, "y": 2},
+
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 1], "x": 7, "y": 3},
+
+                {"matrix": [7, 1], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 3], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/bastardkb/tbkmini/tbkmini.c b/keyboards/bastardkb/tbkmini/tbkmini.c
index 34b42951a0..51baefb737 100644
--- a/keyboards/bastardkb/tbkmini/tbkmini.c
+++ b/keyboards/bastardkb/tbkmini/tbkmini.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tbkmini.h"
+#include "quantum.h"
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/tbkmini/tbkmini.h b/keyboards/bastardkb/tbkmini/tbkmini.h
deleted file mode 100644
index f031c9fed2..0000000000
--- a/keyboards/bastardkb/tbkmini/tbkmini.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly DELAY <charly@codesink.dev>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT_split_3x6_3(                                       \
-  k00, k01, k02, k03, k04, k05,     k45, k44, k43, k42, k41, k40, \
-  k10, k11, k12, k13, k14, k15,     k55, k54, k53, k52, k51, k50, \
-  k20, k21, k22, k23, k24, k25,     k65, k64, k63, k62, k61, k60, \
-                 k33, k34, k31,     k71, k74, k73                 \
-)                                                                 \
-{                                                                 \
-  {   k00,   k01,   k02,   k03,   k04,   k05 },                   \
-  {   k10,   k11,   k12,   k13,   k14,   k15 },                   \
-  {   k20,   k21,   k22,   k23,   k24,   k25 },                   \
-  { KC_NO,   k31, KC_NO,   k33,   k34, KC_NO },                   \
-  {   k40,   k41,   k42,   k43,   k44,   k45 },                   \
-  {   k50,   k51,   k52,   k53,   k54,   k55 },                   \
-  {   k60,   k61,   k62,   k63,   k64,   k65 },                   \
-  { KC_NO,   k71, KC_NO,   k73,   k74, KC_NO },                   \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/config.h b/keyboards/bastardkb/tbkmini/v1/elitec/config.h
index c17e20b3d7..41b5aa1c66 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/config.h
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/config.h
@@ -18,14 +18,5 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { B5, F7, F6, B6 }
-#define MATRIX_COL_PINS \
-    { B4, E6, C6, B1, B3, B2 }
-
 /* Handedness. */
 #define MASTER_RIGHT
-
-/* RGB settings. */
-#define RGB_DI_PIN D2
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
index 4fee403604..a5a90811ec 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
+        "rows": ["B5", "F7", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/config.h b/keyboards/bastardkb/tbkmini/v2/elitec/config.h
index 01ce7edc7c..e6b7fefa66 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/config.h
@@ -17,14 +17,5 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F6, F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
-
-/* RGB settings. */
-#define RGB_DI_PIN D3
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
index d91729481f..28c30f9ab7 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h
index d5da5febdf..977fb0a6e8 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP15, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP13
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
index 870f9db26e..1dc6607f3d 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
index 8e2235ee9f..274e95c039 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
@@ -19,9 +19,7 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h
index 8d60f74a6f..e496023656 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
-    { GP27, GP28, GP21, GP6, GP7, GP8 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -31,9 +25,6 @@
 // #define SPLIT_HAND_PIN GP15
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
-/* RGB settings. */
-#define RGB_DI_PIN GP0
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
index 870f9db26e..2c96b46c2a 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
@@ -3,9 +3,21 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
index 8e2235ee9f..274e95c039 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
@@ -19,9 +19,7 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h
index e40513cae8..0bbfd39aee 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
-    { F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
-    { F6, F5, B6, D7, E6, B4 }
-
 /* Handedness. */
 #define MASTER_RIGHT
 
@@ -33,7 +27,6 @@
 // #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
 
 /* RGB settings. */
-#define RGB_DI_PIN D3
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
index f8901144af..ae8a3c4d88 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
@@ -3,6 +3,18 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "ws2812": {
+        "pin": "D3",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
index 70f7784de6..c42b71866e 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
@@ -17,11 +17,9 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bbrfkr/dynamis/config.h b/keyboards/bbrfkr/dynamis/config.h
index 28c21cb9f5..4cad8086cd 100644
--- a/keyboards/bbrfkr/dynamis/config.h
+++ b/keyboards/bbrfkr/dynamis/config.h
@@ -16,13 +16,8 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B6, B4, D6, D5, D1, C6, B5, D7, D4, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7 }
-
 /* rgb num */
 #define RGBLED_NUM 10
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,8 +29,5 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define PMW33XX_CS_PIN SPI_SS_PIN
 #define POINTING_DEVICE_INVERT_Y
diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json
index 4f256e8ac5..5c1723b16c 100644
--- a/keyboards/bbrfkr/dynamis/info.json
+++ b/keyboards/bbrfkr/dynamis/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+        "rows": ["B6", "B4", "D6", "D5", "D1", "C6", "B5", "D7", "D4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B7", "pin_b": "E6"}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/bear_face/bear_face.c b/keyboards/bear_face/bear_face.c
deleted file mode 100644
index 30aa5140d4..0000000000
--- a/keyboards/bear_face/bear_face.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 chemicalwill <https://github.com/chemicalwill>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "bear_face.h"
diff --git a/keyboards/bear_face/bear_face.h b/keyboards/bear_face/bear_face.h
deleted file mode 100644
index c63b2bd012..0000000000
--- a/keyboards/bear_face/bear_face.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 chemicalwill <https://github.com/chemicalwill>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_bear_face_v1)
-#    include "v1.h"
-#elif defined(KEYBOARD_bear_face_v2)
-#    include "v2.h"
-#endif
diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h
index 82349297dd..2f3742c5d0 100644
--- a/keyboards/bear_face/config.h
+++ b/keyboards/bear_face/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* bear_face matrix pinout */
-#define MATRIX_ROW_PINS { F5, F6, F4, F1, B0, B6 }
-#define MATRIX_COL_PINS { B5, C7, C6, F0, E6, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/bear_face/info.json b/keyboards/bear_face/info.json
index f6f666d77f..357847f418 100644
--- a/keyboards/bear_face/info.json
+++ b/keyboards/bear_face/info.json
@@ -8,6 +8,11 @@
         "vid": "0xFEED",
         "pid": "0x09F5"
     },
+    "matrix_pins": {
+        "cols": ["B5", "C7", "C6", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["F5", "F6", "F4", "F1", "B0", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "F7"
     },
diff --git a/keyboards/bear_face/v1/v1.c b/keyboards/bear_face/v1/v1.c
index 443b3016d7..3f10d10994 100644
--- a/keyboards/bear_face/v1/v1.c
+++ b/keyboards/bear_face/v1/v1.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "bear_face.h"
+#include "v1.h"
 
 void keyboard_pre_init_kb(void) {
     //Sets LED pin as output
diff --git a/keyboards/bear_face/v2/v2.c b/keyboards/bear_face/v2/v2.c
index 443b3016d7..cf97145688 100644
--- a/keyboards/bear_face/v2/v2.c
+++ b/keyboards/bear_face/v2/v2.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "bear_face.h"
+#include "v2.h"
 
 void keyboard_pre_init_kb(void) {
     //Sets LED pin as output
diff --git a/keyboards/beatervan/beatervan.c b/keyboards/beatervan/beatervan.c
deleted file mode 100644
index 0730af001b..0000000000
--- a/keyboards/beatervan/beatervan.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "beatervan.h"
diff --git a/keyboards/beatervan/config.h b/keyboards/beatervan/config.h
index 0040b35e07..f482b43c10 100644
--- a/keyboards/beatervan/config.h
+++ b/keyboards/beatervan/config.h
@@ -16,23 +16,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5, F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/beatervan/info.json b/keyboards/beatervan/info.json
index 8218fa78fc..c86466e44f 100644
--- a/keyboards/beatervan/info.json
+++ b/keyboards/beatervan/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6276",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D1", "D0", "D4", "C6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/beekeeb/piantor/info.json b/keyboards/beekeeb/piantor/info.json
index 5d4fcf1ae8..b845361bc8 100644
--- a/keyboards/beekeeb/piantor/info.json
+++ b/keyboards/beekeeb/piantor/info.json
@@ -42,7 +42,10 @@
             }
         }
     },
-    "community_layouts": ["split_3x6_3"],
+    "community_layouts": [
+        "split_3x5_3",
+        "split_3x6_3"
+    ],
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
@@ -89,6 +92,46 @@
                 { "matrix": [7, 1], "x": 8.5, "y": 3.5 },
                 { "matrix": [7, 2], "x": 9.5, "y": 3.25 }
             ]
+        },
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0.25 },
+                { "matrix": [0, 1], "x": 1, "y": 0.125 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0.125 },
+                { "matrix": [0, 4], "x": 4, "y": 0.25 },
+                { "matrix": [4, 0], "x": 7, "y": 0.25 },
+                { "matrix": [4, 1], "x": 8, "y": 0.125 },
+                { "matrix": [4, 2], "x": 9, "y": 0 },
+                { "matrix": [4, 3], "x": 10, "y": 0.125 },
+                { "matrix": [4, 4], "x": 11, "y": 0.25 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.125 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1.125 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [5, 0], "x": 7, "y": 1.25 },
+                { "matrix": [5, 1], "x": 8, "y": 1.125 },
+                { "matrix": [5, 2], "x": 9, "y": 1 },
+                { "matrix": [5, 3], "x": 10, "y": 1.125 },
+                { "matrix": [5, 4], "x": 11, "y": 1.25 },
+                { "matrix": [2, 0], "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1, "y": 2.125 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2.125 },
+                { "matrix": [2, 4], "x": 4, "y": 2.25 },
+                { "matrix": [6, 0], "x": 7, "y": 2.25 },
+                { "matrix": [6, 1], "x": 8, "y": 2.125 },
+                { "matrix": [6, 2], "x": 9, "y": 2 },
+                { "matrix": [6, 3], "x": 10, "y": 2.125 },
+                { "matrix": [6, 4], "x": 11, "y": 2.25 },
+                { "matrix": [3, 0], "x": 2.5, "y": 3.25 },
+                { "matrix": [3, 1], "x": 3.5, "y": 3.5 },
+                { "matrix": [3, 2], "x": 4.5, "y": 3.75 },
+                { "matrix": [7, 0], "x": 6.5, "y": 3.75 },
+                { "matrix": [7, 1], "x": 7.5, "y": 3.5 },
+                { "matrix": [7, 2], "x": 8.5, "y": 3.25 }
+            ]
         }
     }
 }
diff --git a/keyboards/beekeeb/piantor/keymaps/3x5_3/keymap.c b/keyboards/beekeeb/piantor/keymaps/3x5_3/keymap.c
new file mode 100644
index 0000000000..26f7227a37
--- /dev/null
+++ b/keyboards/beekeeb/piantor/keymaps/3x5_3/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2022 beekeeb
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+      * ┌───┬───┬───┬───┬───�       ┌───┬───┬───┬───┬───�
+      * │ Q │ W │ E │ R │ T │       │ Y │ U │ I │ O │ P │
+      * ├───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┤
+      * │ A │ S │ D │ F │ G │       │ H │ J │ K │ L │ ; │
+      * ├───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┤
+      * │ Z │ X │ C │ V │ B │       │ N │ M │ , │ . │ / │
+      * └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+      *           ┌───�                   ┌───�
+      *           │GUI├───�           ┌───┤Alt│
+      *           └───┤Bsp├───�   ┌───┤Ent├───┘
+      *               └───┤   │   │   ├───┘
+      *                   └───┘   └───┘
+      */
+    [0] = LAYOUT_split_3x5_3(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+                                   KC_LGUI, KC_BSPC, KC_ESC,           KC_ENT,  KC_SPC,  KC_RCTL
+    )
+};
diff --git a/keyboards/bemeier/bmek/bmek.h b/keyboards/bemeier/bmek/bmek.h
index 4249d02566..26c95737e6 100755
--- a/keyboards/bemeier/bmek/bmek.h
+++ b/keyboards/bemeier/bmek/bmek.h
@@ -17,14 +17,6 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_bemeier_bmek_rev1)
-#    include "rev1.h"
-#elif defined(KEYBOARD_bemeier_bmek_rev2)
-#    include "rev2.h"
-#elif defined(KEYBOARD_bemeier_bmek_rev3)
-#    include "rev3.h"
-#endif
-
 #define XXX KC_NO  // makes the switch matrix easier to read
 
 // This layout is supported by all revisions
diff --git a/keyboards/bemeier/bmek/config.h b/keyboards/bemeier/bmek/config.h
index 564d5f24a2..861203cf2f 100755
--- a/keyboards/bemeier/bmek/config.h
+++ b/keyboards/bemeier/bmek/config.h
@@ -19,8 +19,6 @@
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20 
 
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_MODE_STATIC_GRADIENT
diff --git a/keyboards/bemeier/bmek/rev1/config.h b/keyboards/bemeier/bmek/rev1/config.h
deleted file mode 100755
index bfd93fb77d..0000000000
--- a/keyboards/bemeier/bmek/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-#define MATRIX_ROW_PINS \
-    { D4, D7, B6, B4, B7 }
-#define MATRIX_COL_PINS \
-    { F1, B0, B1, B2, B3, D0, D1, D2, C6, C7, F7, F6, F5, F4, B5 }
-#define RGB_DI_PIN E6
-
diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/info.json
index dab37baf04..c50cae166e 100644
--- a/keyboards/bemeier/bmek/rev1/info.json
+++ b/keyboards/bemeier/bmek/rev1/info.json
@@ -2,6 +2,14 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "C6", "C7", "F7", "F6", "F5", "F4", "B5"],
+        "rows": ["D4", "D7", "B6", "B4", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/bemeier/bmek/rev1/rev1.c b/keyboards/bemeier/bmek/rev1/rev1.c
deleted file mode 100755
index 24f0dcdb94..0000000000
--- a/keyboards/bemeier/bmek/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/bemeier/bmek/rev1/rev1.h b/keyboards/bemeier/bmek/rev1/rev1.h
deleted file mode 100755
index 1c46169bdc..0000000000
--- a/keyboards/bemeier/bmek/rev1/rev1.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/bemeier/bmek/rev2/config.h b/keyboards/bemeier/bmek/rev2/config.h
deleted file mode 100755
index d2ef3e23c2..0000000000
--- a/keyboards/bemeier/bmek/rev2/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-#define MATRIX_ROW_PINS \
-    { F4, F5, D7, B5, B4 }
-#define MATRIX_COL_PINS \
-    { F6, B0, B1, F7, C7, C6, B6, F1, B2, B3, D6, D3, D2, D1, D0 }
-
-#define RGB_DI_PIN E6
diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/info.json
index 65be217368..1ac54f5c79 100644
--- a/keyboards/bemeier/bmek/rev2/info.json
+++ b/keyboards/bemeier/bmek/rev2/info.json
@@ -2,6 +2,14 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "B1", "F7", "C7", "C6", "B6", "F1", "B2", "B3", "D6", "D3", "D2", "D1", "D0"],
+        "rows": ["F4", "F5", "D7", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/bemeier/bmek/rev2/rev2.c b/keyboards/bemeier/bmek/rev2/rev2.c
deleted file mode 100755
index 97ee43e318..0000000000
--- a/keyboards/bemeier/bmek/rev2/rev2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev2.h"
diff --git a/keyboards/bemeier/bmek/rev2/rev2.h b/keyboards/bemeier/bmek/rev2/rev2.h
deleted file mode 100755
index 1c46169bdc..0000000000
--- a/keyboards/bemeier/bmek/rev2/rev2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/bemeier/bmek/rev3/config.h b/keyboards/bemeier/bmek/rev3/config.h
deleted file mode 100755
index a8a1575b78..0000000000
--- a/keyboards/bemeier/bmek/rev3/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-#define MATRIX_ROW_PINS \
-    { F1, B4, B5, D6, D7 }
-#define MATRIX_COL_PINS \
-    { B6, C6, C7, F7, F6, F5, F4, F0, B7, D0, D1, D2, D3, D5, D4 }
-
-#define RGB_DI_PIN E6
diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/info.json
index 14c0e6d7cb..c951ca8e43 100644
--- a/keyboards/bemeier/bmek/rev3/info.json
+++ b/keyboards/bemeier/bmek/rev3/info.json
@@ -2,6 +2,14 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F0", "B7", "D0", "D1", "D2", "D3", "D5", "D4"],
+        "rows": ["F1", "B4", "B5", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/bemeier/bmek/rev3/rev3.c b/keyboards/bemeier/bmek/rev3/rev3.c
deleted file mode 100755
index 6193ab51b4..0000000000
--- a/keyboards/bemeier/bmek/rev3/rev3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev3.h"
diff --git a/keyboards/bemeier/bmek/rev3/rev3.h b/keyboards/bemeier/bmek/rev3/rev3.h
deleted file mode 100755
index f769927193..0000000000
--- a/keyboards/bemeier/bmek/rev3/rev3.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/*
-PCB rev3 has a number of layout options that rev2 and rev1 don't have,
-however, to me just using "ALL_67" for all for all keymaps seems easier to
-maintain than adding all possible permutations of layout options here.
-*/
diff --git a/keyboards/bfake/bfake.c b/keyboards/bfake/bfake.c
deleted file mode 100644
index 5eedcc1946..0000000000
--- a/keyboards/bfake/bfake.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "bfake.h"
diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h
index 768b1b3551..ddc21dae30 100644
--- a/keyboards/bfake/config.h
+++ b/keyboards/bfake/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 16
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/bfake/info.json b/keyboards/bfake/info.json
index fe457cb6d1..feb7c706c4 100644
--- a/keyboards/bfake/info.json
+++ b/keyboards/bfake/info.json
@@ -8,9 +8,17 @@
     "pid": "0x422D",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1"
   },
diff --git a/keyboards/bfake/rules.mk b/keyboards/bfake/rules.mk
index c7e6d3a3bb..90550484a6 100644
--- a/keyboards/bfake/rules.mk
+++ b/keyboards/bfake/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = no
-WS2812_DRIVER = i2c
diff --git a/keyboards/biacco42/ergo42/ergo42.c b/keyboards/biacco42/ergo42/ergo42.c
index bd7a7ffe19..1407d91689 100644
--- a/keyboards/biacco42/ergo42/ergo42.c
+++ b/keyboards/biacco42/ergo42/ergo42.c
@@ -1,4 +1,4 @@
-#include "ergo42.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/biacco42/ergo42/ergo42.h b/keyboards/biacco42/ergo42/ergo42.h
deleted file mode 100644
index 265e605e6c..0000000000
--- a/keyboards/biacco42/ergo42/ergo42.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_biacco42_ergo42_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
index 2ce8ad24dc..8f990eb8ed 100644
--- a/keyboards/biacco42/ergo42/rev1/config.h
+++ b/keyboards/biacco42/ergo42/rev1/config.h
@@ -19,22 +19,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/info.json
index a519cb23d6..e6f81d54af 100644
--- a/keyboards/biacco42/ergo42/rev1/info.json
+++ b/keyboards/biacco42/ergo42/rev1/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0042",
     "device_version": "1.0.0"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/biacco42/ergo42/rev1/rev1.c b/keyboards/biacco42/ergo42/rev1/rev1.c
deleted file mode 100644
index 626a0893bb..0000000000
--- a/keyboards/biacco42/ergo42/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ergo42.h"
diff --git a/keyboards/biacco42/ergo42/rev1/rev1.h b/keyboards/biacco42/ergo42/rev1/rev1.h
index 9a5aec4d26..5d92ba6752 100644
--- a/keyboards/biacco42/ergo42/rev1/rev1.h
+++ b/keyboards/biacco42/ergo42/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "ergo42.h"
-
 #include "quantum.h"
 
 #ifndef FLIP_HALF
diff --git a/keyboards/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h
index d01a9f389a..df5455b3c2 100644
--- a/keyboards/biacco42/meishi/config.h
+++ b/keyboards/biacco42/meishi/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B5 }
-#define MATRIX_COL_PINS { B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/biacco42/meishi/info.json b/keyboards/biacco42/meishi/info.json
index 629bbd139e..96e67d5078 100644
--- a/keyboards/biacco42/meishi/info.json
+++ b/keyboards/biacco42/meishi/info.json
@@ -8,15 +8,20 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6"],
+        "rows": ["B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0}
             ]
         }
     }
diff --git a/keyboards/biacco42/meishi/meishi.c b/keyboards/biacco42/meishi/meishi.c
deleted file mode 100644
index 85ede859d3..0000000000
--- a/keyboards/biacco42/meishi/meishi.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Biacco42
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "meishi.h"
diff --git a/keyboards/biacco42/meishi/meishi.h b/keyboards/biacco42/meishi/meishi.h
deleted file mode 100644
index 61b9f628db..0000000000
--- a/keyboards/biacco42/meishi/meishi.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2019 Biacco42
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    k00, k01, k02, k03\
-) \
-{ \
-    { k00, k01, k02, k03 }\
-}
-
diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
index c7614c0dbd..df5455b3c2 100644
--- a/keyboards/biacco42/meishi2/config.h
+++ b/keyboards/biacco42/meishi2/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D7, E6 }
-#define MATRIX_COL_PINS { F5, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/biacco42/meishi2/info.json b/keyboards/biacco42/meishi2/info.json
index ebdfc39028..fb88356968 100644
--- a/keyboards/biacco42/meishi2/info.json
+++ b/keyboards/biacco42/meishi2/info.json
@@ -8,15 +8,20 @@
     "pid": "0x0003",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F5", "F6"],
+    "rows": ["D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [1, 0], "x": 2, "y": 0},
+        {"matrix": [1, 1], "x": 3, "y": 0}
       ]
     }
   }
diff --git a/keyboards/biacco42/meishi2/meishi2.c b/keyboards/biacco42/meishi2/meishi2.c
deleted file mode 100644
index 14525ae175..0000000000
--- a/keyboards/biacco42/meishi2/meishi2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Biacco42
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "meishi2.h"
diff --git a/keyboards/biacco42/meishi2/meishi2.h b/keyboards/biacco42/meishi2/meishi2.h
deleted file mode 100644
index 776e0b0e1d..0000000000
--- a/keyboards/biacco42/meishi2/meishi2.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Biacco42
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03 \
-) \
-{ \
-    { k00, k01 }, \
-    { k02, k03 } \
-}
diff --git a/keyboards/binepad/bn003/config.h b/keyboards/binepad/bn003/config.h
index 997b75a4af..77f51ecf5a 100644
--- a/keyboards/binepad/bn003/config.h
+++ b/keyboards/binepad/bn003/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { C6 }
-#define MATRIX_COL_PINS { B4, B5, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/binepad/bn003/info.json b/keyboards/binepad/bn003/info.json
index 222d125281..408e670b95 100644
--- a/keyboards/binepad/bn003/info.json
+++ b/keyboards/binepad/bn003/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4287",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B4", "B5", "B6"],
+    "rows": ["C6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/binepad/bn006/config.h b/keyboards/binepad/bn006/config.h
index 200251cd1c..41c3822655 100755
--- a/keyboards/binepad/bn006/config.h
+++ b/keyboards/binepad/bn006/config.h
@@ -20,7 +20,6 @@
      * PLEASE NOTE:  Because the BN006 only has 6 keys, not all the animations are visually viable
      * =========================================================================================== */
 
-    #define RGB_DI_PIN B15
     #define RGB_MATRIX_LED_COUNT 6
     #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
     #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/binepad/bn006/info.json b/keyboards/binepad/bn006/info.json
index d7be1cfa3c..dfbeb733cb 100755
--- a/keyboards/binepad/bn006/info.json
+++ b/keyboards/binepad/bn006/info.json
@@ -24,6 +24,9 @@
         "pid": "0x426E",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
diff --git a/keyboards/binepad/bn009/config.h b/keyboards/binepad/bn009/config.h
deleted file mode 100644
index 1651cc699e..0000000000
--- a/keyboards/binepad/bn009/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020 BINEPAD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define MATRIX_ROW_PINS { D2, D1, D0 }
-#define MATRIX_COL_PINS { B6, B5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/binepad/bn009/info.json b/keyboards/binepad/bn009/info.json
index 8e4221f49f..3f673566aa 100644
--- a/keyboards/binepad/bn009/info.json
+++ b/keyboards/binepad/bn009/info.json
@@ -1,28 +1,33 @@
 {
-  "keyboard_name": "BN009",
   "manufacturer": "Binepad",
-  "url": "https://binepad.com",
+  "keyboard_name": "BN009",
   "maintainer": "binepad",
+  "features": {
+      "bootmagic": true,
+      "command": false,
+      "console": false,
+      "extrakey": true,
+      "mousekey": true,
+      "nkro": false
+  },
+  "url": "http://binepad.com",
   "usb": {
-    "vid": "0x4249",
-    "pid": "0x4295",
-    "device_version": "0.0.1"
+      "vid": "0x4249",
+      "pid": "0x4295"
   },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
   "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
-      ]
-    }
+      "LAYOUT_ortho_3x3": {
+          "layout": [
+              { "matrix": [0, 0], "x": 0, "y": 0, "label": "k00" },
+              { "matrix": [0, 1], "x": 1, "y": 0, "label": "k01" },
+              { "matrix": [0, 2], "x": 2, "y": 0, "label": "k02" },
+              { "matrix": [1, 0], "x": 0, "y": 1, "label": "k10" },
+              { "matrix": [1, 1], "x": 1, "y": 1, "label": "k11" },
+              { "matrix": [1, 2], "x": 2, "y": 1, "label": "k12" },
+              { "matrix": [2, 0], "x": 0, "y": 2, "label": "k20" },
+              { "matrix": [2, 1], "x": 1, "y": 2, "label": "k21" },
+              { "matrix": [2, 2], "x": 2, "y": 2, "label": "k22" }
+          ]
+      }
   }
-}
\ No newline at end of file
+}
diff --git a/keyboards/binepad/bn009/keymaps/default/keymap.c b/keyboards/binepad/bn009/keymaps/default/keymap.c
deleted file mode 100644
index 573a25d01d..0000000000
--- a/keyboards/binepad/bn009/keymaps/default/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2021 BINEPAD 
-	  * 
-	  * This program is free software: you can redistribute it and/or modify 
-	  * it under the terms of the GNU General Public License as published by 
-	  * the Free Software Foundation, either version 2 of the License, or 
-	  * (at your option) any later version. 
-	  * 
-	  * This program is distributed in the hope that it will be useful, 
-	  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-	  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-	  * GNU General Public License for more details. 
-	  * 
-	  * You should have received a copy of the GNU General Public License 
-	  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-	  */ 
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[0] = LAYOUT(
-  KC_7,    KC_8,    KC_9,
-  KC_4,    KC_5,    KC_6,
-  KC_1,    KC_2,    KC_3
-),
-
-	
-[1] = LAYOUT(
-  KC_NO,   KC_NO,   KC_NO,
-  KC_NO,   KC_NO,   KC_NO,
-  KC_NO,   KC_NO,   KC_NO
-),
-
-	
-[2] = LAYOUT(
-  KC_NO,   KC_NO,   KC_NO,
-  KC_NO,   KC_NO,   KC_NO,
-  KC_NO,   KC_NO,   KC_NO
-)
-
-};
diff --git a/keyboards/binepad/bn009r2/keymaps/default/keymap.json b/keyboards/binepad/bn009/keymaps/default/keymap.json
index 2d5410de04..2d5410de04 100644
--- a/keyboards/binepad/bn009r2/keymaps/default/keymap.json
+++ b/keyboards/binepad/bn009/keymaps/default/keymap.json
diff --git a/keyboards/binepad/bn009/keymaps/default/readme.md b/keyboards/binepad/bn009/keymaps/default/readme.md
deleted file mode 100644
index b3c7ba28dc..0000000000
--- a/keyboards/binepad/bn009/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# bn009 - Default layout
diff --git a/keyboards/binepad/bn009/keymaps/via/keymap.c b/keyboards/binepad/bn009/keymaps/via/keymap.c
deleted file mode 100644
index 4ce3d1ae78..0000000000
--- a/keyboards/binepad/bn009/keymaps/via/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 BINEPAD 
-	  * 
-	  * This program is free software: you can redistribute it and/or modify 
-	  * it under the terms of the GNU General Public License as published by 
-	  * the Free Software Foundation, either version 2 of the License, or 
-	  * (at your option) any later version. 
-	  * 
-	  * This program is distributed in the hope that it will be useful, 
-	  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-	  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-	  * GNU General Public License for more details. 
-	  * 
-	  * You should have received a copy of the GNU General Public License 
-	  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-	  */ 
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] =
-        LAYOUT(
-                KC_7 , KC_8 , KC_9, 
-                KC_4 , KC_5 , KC_6, 
-                KC_1 , KC_2 , KC_3
-              ),
-    [1] =
-        LAYOUT(
-                KC_NO , KC_NO, KC_NO,
-                KC_NO , KC_NO, KC_NO,
-                KC_NO , KC_NO, KC_NO
-              ),
-    [2] =
-        LAYOUT(
-                KC_NO , KC_NO, KC_NO,
-                KC_NO , KC_NO, KC_NO,
-                KC_NO , KC_NO, KC_NO
-              ),
-    [3] =
-        LAYOUT(
-                KC_NO , KC_NO, KC_NO,
-                KC_NO , KC_NO, KC_NO,
-                KC_NO , KC_NO, KC_NO
-              ),
-};
diff --git a/keyboards/binepad/bn009/keymaps/via/keymap.json b/keyboards/binepad/bn009/keymaps/via/keymap.json
new file mode 100644
index 0000000000..414859ec96
--- /dev/null
+++ b/keyboards/binepad/bn009/keymaps/via/keymap.json
@@ -0,0 +1,35 @@
+{
+  "config": {
+      "features": {
+          "via": true
+      }
+  },
+  "keyboard": "binepad/bn009r2",
+  "version": 1,
+  "author": "binepad",
+  "notes": "This file is a keymap.json file for binepad/bn009r2",
+  "keymap": "via",
+  "layout": "LAYOUT_ortho_3x3",
+  "layers": [
+      [
+          "KC_7", "KC_8", "KC_9",
+          "KC_4", "KC_5", "KC_6",
+          "KC_1", "KC_2", "KC_3"
+      ],
+      [
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO"
+      ],
+      [
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO"
+      ],
+      [
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO", 
+          "KC_NO", "KC_NO", "KC_NO"
+      ]
+  ]
+}
diff --git a/keyboards/binepad/bn009/keymaps/via/rules.mk b/keyboards/binepad/bn009/keymaps/via/rules.mk
deleted file mode 100644
index 1e5b99807c..0000000000
--- a/keyboards/binepad/bn009/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
diff --git a/keyboards/binepad/bn009/r1/info.json b/keyboards/binepad/bn009/r1/info.json
new file mode 100644
index 0000000000..b83ebd3ebc
--- /dev/null
+++ b/keyboards/binepad/bn009/r1/info.json
@@ -0,0 +1,14 @@
+{
+    "keyboard_name": "BN009 R1",
+    "bootloader": "atmel-dfu",
+      "diode_direction": "COL2ROW",
+      "matrix_pins": {
+          "cols": ["D2", "D1", "D0"],
+          "rows": ["B6", "B5", "B4"]
+      },
+      "processor": "atmega32u4",
+    "usb": {
+      "device_version": "0.0.1"
+    }
+  }
+  
\ No newline at end of file
diff --git a/keyboards/binepad/bn009/r1/readme.md b/keyboards/binepad/bn009/r1/readme.md
new file mode 100644
index 0000000000..125441c6a2
--- /dev/null
+++ b/keyboards/binepad/bn009/r1/readme.md
@@ -0,0 +1,3 @@
+# BINEPAD BN009 R1
+
+* Hardware Supported: BN009 R1 *(ft. ATmega32U4)*
diff --git a/keyboards/binepad/bn009/r1/rules.mk b/keyboards/binepad/bn009/r1/rules.mk
new file mode 100644
index 0000000000..10468472aa
--- /dev/null
+++ b/keyboards/binepad/bn009/r1/rules.mk
@@ -0,0 +1,4 @@
+# Copyright 2020 Binepad (@binpad)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+LTO_ENABLE = yes
diff --git a/keyboards/binepad/bn009r2/config.h b/keyboards/binepad/bn009/r2/config.h
index 45b63ec105..45b63ec105 100644
--- a/keyboards/binepad/bn009r2/config.h
+++ b/keyboards/binepad/bn009/r2/config.h
diff --git a/keyboards/binepad/bn009/r2/info.json b/keyboards/binepad/bn009/r2/info.json
new file mode 100644
index 0000000000..c011fe0e32
--- /dev/null
+++ b/keyboards/binepad/bn009/r2/info.json
@@ -0,0 +1,13 @@
+{
+    "keyboard_name": "BN009 R2",
+    "bootloader": "stm32duino",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A6"],
+        "rows": ["B6", "B7", "B2"]
+    },
+    "processor": "STM32F103",
+    "usb": {
+        "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/binepad/bn009/r2/readme.md b/keyboards/binepad/bn009/r2/readme.md
new file mode 100644
index 0000000000..eee6d1608c
--- /dev/null
+++ b/keyboards/binepad/bn009/r2/readme.md
@@ -0,0 +1,3 @@
+# BINEPAD BN009 R2
+
+* Hardware Supported: BN009 *(ft. STM32F103)*
diff --git a/keyboards/binepad/bn009r2/rules.mk b/keyboards/binepad/bn009/r2/rules.mk
index 837f4bffb5..837f4bffb5 100644
--- a/keyboards/binepad/bn009r2/rules.mk
+++ b/keyboards/binepad/bn009/r2/rules.mk
diff --git a/keyboards/binepad/bn009/readme.md b/keyboards/binepad/bn009/readme.md
index dc0442fa82..2b3153ca4d 100644
--- a/keyboards/binepad/bn009/readme.md
+++ b/keyboards/binepad/bn009/readme.md
@@ -4,14 +4,35 @@
 
 A 9% macropad.
 
-* Keyboard Maintainer: [BINEPAD]
-* Hardware Supported: BN009 PCB (ATmega32U4)
-* Hardware Availability: [Interest Check](https://www.binepad.com/bn009)
-
-**Physical reset button**: There's a small hole at the bottom of macropad. Use the reset pin provided in box and push it hard through the hole, so that it press the reset button on  pcb.
+* Keyboard Maintainer: [binepad](https://github.com/binepad)
+* Hardware Supported:
+    * BN009 R1 *(ft. ATmega32U4)*
+    * BN009 R2 *(ft. STM32F103)*
+* Hardware Availability: [binepad.com](https://www.binepad.com/bn009)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make binepad/bn009:default
+    make binepad/bn009/r1:default
+
+..or..
+
+    make binepad/bn009/r2:default
+
+Flashing example for this keyboard:
+
+    make binepad/bn009/r1:default:flash
+
+..or..
+
+    make binepad/bn009/r2:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button under the small hole on the back of the macropad
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` or `RESET` if it is available
diff --git a/keyboards/binepad/bn009/rules.mk b/keyboards/binepad/bn009/rules.mk
index 5356b24d77..74214d60ed 100644
--- a/keyboards/binepad/bn009/rules.mk
+++ b/keyboards/binepad/bn009/rules.mk
@@ -1,12 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+# This file is mostly left blank
+
+DEFAULT_FOLDER = binepad/bn009/r2
diff --git a/keyboards/binepad/bn009r2/info.json b/keyboards/binepad/bn009r2/info.json
deleted file mode 100644
index 5d126c866c..0000000000
--- a/keyboards/binepad/bn009r2/info.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "manufacturer": "Binepad",
-    "keyboard_name": "BN009 R2",
-    "maintainer": "binepad",
-    "bootloader": "stm32duino",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
-    "matrix_pins": {
-        "cols": ["A1", "A2", "A6"],
-        "rows": ["B6", "B7", "B2"]
-    },
-    "processor": "STM32F103",
-    "url": "http://binepad.com",
-    "usb": {
-        "vid": "0x4249",
-        "pid": "0x4295",
-        "device_version": "2.0.0"
-    },
-    "community_layouts": ["ortho_3x3"],
-    "layouts": {
-        "LAYOUT_ortho_3x3": {
-            "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/binepad/bn009r2/keymaps/via/keymap.json b/keyboards/binepad/bn009r2/keymaps/via/keymap.json
deleted file mode 100644
index 797c54d43a..0000000000
--- a/keyboards/binepad/bn009r2/keymaps/via/keymap.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "config": {
-        "features": {
-            "via": true
-        }
-    },
-    "keyboard": "binepad/bn009r2",
-    "version": 1,
-    "author": "binepad",
-    "notes": "This file is a keymap.json file for binepad/bn009r2",
-    "keymap": "via",
-    "layout": "LAYOUT_ortho_3x3",
-    "layers": [
-        [
-            "KC_7", "KC_8", "KC_9",
-            "KC_4", "KC_5", "KC_6",
-            "KC_1", "KC_2", "KC_3"
-        ],
-        [
-            "KC_NO", "KC_NO", "KC_NO", 
-            "KC_NO", "KC_NO", "KC_NO", 
-            "KC_NO", "KC_NO", "KC_NO"
-        ],
-        [
-            "KC_NO", "KC_NO", "KC_NO", 
-            "KC_NO", "KC_NO", "KC_NO", 
-            "KC_NO", "KC_NO", "KC_NO"
-        ],
-        [
-            "KC_NO", "KC_NO", "KC_NO", 
-            "KC_NO", "KC_NO", "KC_NO", 
-            "KC_NO", "KC_NO", "KC_NO"
-        ]
-    ]
-}
diff --git a/keyboards/binepad/bn009r2/readme.md b/keyboards/binepad/bn009r2/readme.md
deleted file mode 100644
index 5444a08843..0000000000
--- a/keyboards/binepad/bn009r2/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# BINEPAD BN009 R2
-
-![BINEPAD BN009](https://imgur.com/fu0iXD0h.jpg)
-
-*A 9% macropad*
-
-* Keyboard Maintainer: [binepad](https://github.com/binepad)
-* Hardware Supported: BN009 *(ft. STM32F103)*
-* Hardware Availability: [binepad.com](https://www.binepad.com/bn009)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make binepad/bn009r2:default
-
-Flashing example for this keyboard:
-
-    make binepad/bn009r2:default:flash
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
-## Bootloader
-
-Enter the bootloader in 3 ways:
-
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key) and plug in the keyboard
-* **Physical reset button**: Briefly press the button under the small hole on the back of the macropad
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` or `RESET` if it is available
diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h
index 32e179e918..7ddb779209 100644
--- a/keyboards/bioi/f60/config.h
+++ b/keyboards/bioi/f60/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, E6, F1, F5, F4 }
-#define MATRIX_COL_PINS { F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D0, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 5
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -43,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-#endif
diff --git a/keyboards/bioi/f60/f60.c b/keyboards/bioi/f60/f60.c
deleted file mode 100644
index 2af81d7ba9..0000000000
--- a/keyboards/bioi/f60/f60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "f60.h"
diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json
index 65c59db2b4..35215dc5d0 100644
--- a/keyboards/bioi/f60/info.json
+++ b/keyboards/bioi/f60/info.json
@@ -8,11 +8,19 @@
         "pid": "0x4660",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D0", "D1"],
+        "rows": ["B0", "E6", "F1", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 8,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "indicators": {
         "caps_lock": "F0"
     },
diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h
index d3172d1812..d1039d0896 100644
--- a/keyboards/bioi/g60/config.h
+++ b/keyboards/bioi/g60/config.h
@@ -17,26 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-#define MATRIX_ROW_PINS { E6, B0, F1, F5, F4 }
-#define MATRIX_COL_PINS { F6, F7, B3, C7, C6, B6, B5, D5, B4, D7, D6, D4, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow */
-#define RGB_DI_PIN B1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json
index 16b09ca00c..46004318f0 100644
--- a/keyboards/bioi/g60/info.json
+++ b/keyboards/bioi/g60/info.json
@@ -8,10 +8,18 @@
         "pid": "0x6080",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
+        "rows": ["E6", "B0", "F1", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 12
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h
index eb20ed7515..d58c58713c 100644
--- a/keyboards/bioi/g60ble/config.h
+++ b/keyboards/bioi/g60ble/config.h
@@ -1,22 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { E6, B0, F1, F5, F4 }
-#define MATRIX_COL_PINS \
-    { F6, F7, B3, C7, C6, B6, B5, D5, B4, D7, D6, D4, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json
index cca5ed456f..a73df0556a 100644
--- a/keyboards/bioi/g60ble/info.json
+++ b/keyboards/bioi/g60ble/info.json
@@ -8,10 +8,18 @@
         "pid": "0x6080",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
+        "rows": ["E6", "B0", "F1", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 8
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h
index 6d609e0185..93ab008b66 100644
--- a/keyboards/bioi/morgan65/config.h
+++ b/keyboards/bioi/morgan65/config.h
@@ -17,26 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-#define MATRIX_ROW_PINS { E6, C6, F4, B2, D4 }
-#define MATRIX_COL_PINS { F5, F6, F7, C7, B0, B7, B5, D5, B4, D7, D6, D1, D0, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow */
-#define RGB_DI_PIN B1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json
index 1a822b2113..2cd9baf665 100644
--- a/keyboards/bioi/morgan65/info.json
+++ b/keyboards/bioi/morgan65/info.json
@@ -8,10 +8,18 @@
         "pid": "0x6581",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "C7", "B0", "B7", "B5", "D5", "B4", "D7", "D6", "D1", "D0", "B3"],
+        "rows": ["E6", "C6", "F4", "B2", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "B6",
       "levels": 12
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h
index 6556560112..13f5533c9f 100644
--- a/keyboards/bioi/s65/config.h
+++ b/keyboards/bioi/s65/config.h
@@ -17,26 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-#define MATRIX_ROW_PINS { D2, D0, D1, F7, D6 }
-#define MATRIX_COL_PINS { F1, B3, F4, F5, F6, E6, C7, B2, B1, C6, B6, B5, B4, D7, D4, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/info.json
index b80b37b2ea..aa57e030ee 100644
--- a/keyboards/bioi/s65/info.json
+++ b/keyboards/bioi/s65/info.json
@@ -8,10 +8,18 @@
         "pid": "0x5365",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "B3", "F4", "F5", "F6", "E6", "C7", "B2", "B1", "C6", "B6", "B5", "B4", "D7", "D4", "D5"],
+        "rows": ["D2", "D0", "D1", "F7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 12
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/black_hellebore/config.h b/keyboards/black_hellebore/config.h
index d951bb71b4..ae0bc0aedb 100644
--- a/keyboards/black_hellebore/config.h
+++ b/keyboards/black_hellebore/config.h
@@ -26,7 +26,6 @@
 	#define WS2812_DMA_STREAM STM32_DMA1_STREAM6
 	#define WS2812_DMA_CHANNEL 7						//7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298)
 
-	#define RGB_DI_PIN A7                               // The pin connected to the data pin of the LEDs    
     #define RGB_MATRIX_LED_COUNT 61                     // The number of LEDs connected
     
     #define RGB_MATRIX_KEYPRESSES                       // reacts to keypresses
diff --git a/keyboards/black_hellebore/info.json b/keyboards/black_hellebore/info.json
index 1e02544157..f7d35c58fd 100644
--- a/keyboards/black_hellebore/info.json
+++ b/keyboards/black_hellebore/info.json
@@ -13,6 +13,10 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
     "matrix_pins": {
         "cols": ["B15", "B14", "B13", "A9", "A2", "B1", "B9", "B7", "B5", "B4", "B0", "A8", "B6", "B3"],
         "rows": ["A15", "B8", "A4", "A3", "B2"]
@@ -24,7 +28,8 @@
         "pid": "0x4467",
         "vid": "0x3141"
     },
-    "rgb_matrix": {		
+    "rgb_matrix": {	
+        "driver": "WS2812",
         "layout": [
             { "flags": 4, "matrix": [0, 0] , "x": 7  , "y": 5 } ,
             { "flags": 4, "matrix": [0, 1] , "x": 22 , "y": 5 } ,
diff --git a/keyboards/black_hellebore/rules.mk b/keyboards/black_hellebore/rules.mk
index 5c0a6c7c04..e69de29bb2 100644
--- a/keyboards/black_hellebore/rules.mk
+++ b/keyboards/black_hellebore/rules.mk
@@ -1,2 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = pwm
diff --git a/keyboards/blackplum/blackplum.c b/keyboards/blackplum/blackplum.c
deleted file mode 100644
index ea8d34e9d9..0000000000
--- a/keyboards/blackplum/blackplum.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "blackplum.h"
diff --git a/keyboards/blackplum/blackplum.h b/keyboards/blackplum/blackplum.h
deleted file mode 100644
index fbd7814735..0000000000
--- a/keyboards/blackplum/blackplum.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_68_ansi( \
-	K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66,  \
-    K80,      K81,      K82,      K83,      K84,      K85,      K86,	 K76, K67, K77\
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17 }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27 }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37 }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45,   K46 }, \
-	{ K50,   K51,   K52,   K53,   K54,   K55 }, \
-	{ K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67 }, \
-	{ K70,   K71,   K72,   K73,   K74,	 K75,	K76,   K77 }, \
-	{ K80,   K81,   K82,   K83,   K84,	 K85,	K86 } \
-}
-
diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h
index aedf2b5544..ec4300c811 100644
--- a/keyboards/blackplum/config.h
+++ b/keyboards/blackplum/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, B6, B4, B5, D6, D7, D5, D3, D4 }
-#define MATRIX_COL_PINS { D0, D1, D2, F7, F6, F5, F4, F1 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -15,7 +8,6 @@
 
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN C7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/blackplum/info.json b/keyboards/blackplum/info.json
index c869fcbef5..bc9786c09a 100644
--- a/keyboards/blackplum/info.json
+++ b/keyboards/blackplum/info.json
@@ -8,12 +8,97 @@
         "pid": "0x4250",
         "device_version": "10.0.1"
     },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1"],
+        "rows": ["C6", "B6", "B4", "B5", "D6", "D7", "D5", "D3", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["68_ansi"],
      "layouts": {
         "LAYOUT_68_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Insert", "x":15.25, "y":0}, {"label":"PgUp", "x":16.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"PgDn", "x":16.25, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"OS", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":12.5, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 7], "x": 16.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 1], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 3], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [7, 6], "x": 14.25, "y": 4.25},
+                {"matrix": [6, 7], "x": 15.25, "y": 4.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 4.25}
+            ]
         }
     }
 }
diff --git a/keyboards/blank/blank01/blank01.c b/keyboards/blank/blank01/blank01.c
deleted file mode 100644
index 7b74a1ae34..0000000000
--- a/keyboards/blank/blank01/blank01.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 gkeyboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "blank01.h"
diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h
index d5c752d7f5..aea945a035 100644
--- a/keyboards/blank/blank01/config.h
+++ b/keyboards/blank/blank01/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, B3 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B5, B4, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/blank/blank01/info.json b/keyboards/blank/blank01/info.json
index 1370981344..77f0dfe12f 100644
--- a/keyboards/blank/blank01/info.json
+++ b/keyboards/blank/blank01/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4B01",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B5", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D0", "D1", "D2", "D3", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7"
     },
diff --git a/keyboards/blank_tehnologii/manibus/config.h b/keyboards/blank_tehnologii/manibus/config.h
index 81e7ce637d..a5b93107dd 100644
--- a/keyboards/blank_tehnologii/manibus/config.h
+++ b/keyboards/blank_tehnologii/manibus/config.h
@@ -18,12 +18,3 @@
 
 
 #define EE_HANDS
-
-/* define pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, D3, C6 }
-#define MATRIX_COL_PINS { D7, B4, B5, B6, F0, D4, D6 }
-#define MATRIX_ROW_PINS_RIGHT { F5, F1, B2, B1, C6 }
-#define MATRIX_COL_PINS_RIGHT { B6, B5, D6, D5, D3, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/blank_tehnologii/manibus/info.json b/keyboards/blank_tehnologii/manibus/info.json
index 4044a561c1..938f4d93f8 100644
--- a/keyboards/blank_tehnologii/manibus/info.json
+++ b/keyboards/blank_tehnologii/manibus/info.json
@@ -9,8 +9,19 @@
         "pid": "0x0000",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D7", "B4", "B5", "B6", "F0", "D4", "D6"],
+        "rows": ["F4", "F5", "F6", "D3", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["B6", "B5", "D6", "D5", "D3", "D7", "B4"],
+                "rows": ["F5", "F1", "B2", "B1", "C6"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h b/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h
index d3017fbc06..2644dc8d65 100644
--- a/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h
+++ b/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h
@@ -17,7 +17,6 @@
 #pragma once
 #define EE_HANDS
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 #define MOUSEKEY_INTERVAL 16
 #define MOUSEKEY_MAX_SPEED 3
 #define MOUSEKEY_TIME_TO_MAX 30
diff --git a/keyboards/blank_tehnologii/manibus/manibus.c b/keyboards/blank_tehnologii/manibus/manibus.c
deleted file mode 100644
index 77ef2602d5..0000000000
--- a/keyboards/blank_tehnologii/manibus/manibus.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 SamuraiKek
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "manibus.h"
diff --git a/keyboards/blaster75/blaster75.c b/keyboards/blaster75/blaster75.c
deleted file mode 100644
index 2b5f60a566..0000000000
--- a/keyboards/blaster75/blaster75.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Altain
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "blaster75.h"
\ No newline at end of file
diff --git a/keyboards/blaster75/blaster75.h b/keyboards/blaster75/blaster75.h
index b3b6995d30..4bf63f7fa0 100644
--- a/keyboards/blaster75/blaster75.h
+++ b/keyboards/blaster75/blaster75.h
@@ -90,8 +90,8 @@ ANSI Layout :
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
     { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, XXX, K4B, K4C, K4D, XXX }, \
     { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E }  \
 }
diff --git a/keyboards/blaster75/config.h b/keyboards/blaster75/config.h
deleted file mode 100644
index f6d8d07de8..0000000000
--- a/keyboards/blaster75/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 Altain
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Matrix Pinouts */
-//                         0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B0, B4, B5, B6, B7, C6, C7, D0, D1, D2, D3, D4, D5, D6, D7 } 
-
-/* Diode Direction */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/blaster75/info.json b/keyboards/blaster75/info.json
index 47561bc286..e357422b62 100644
--- a/keyboards/blaster75/info.json
+++ b/keyboards/blaster75/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB075",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B4", "B5", "B6", "B7", "C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/blockboy/ac980mini/config.h b/keyboards/blockboy/ac980mini/config.h
index 66101c91f1..57ba70ec11 100644
--- a/keyboards/blockboy/ac980mini/config.h
+++ b/keyboards/blockboy/ac980mini/config.h
@@ -4,10 +4,8 @@
 #pragma once
 
 // RGB configuration
-#define RGB_DI_PIN B7
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT  81
-//#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 81
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/blockboy/ac980mini/info.json b/keyboards/blockboy/ac980mini/info.json
index b26d5fa630..1f1e88afe5 100644
--- a/keyboards/blockboy/ac980mini/info.json
+++ b/keyboards/blockboy/ac980mini/info.json
@@ -15,6 +15,12 @@
         "pid": "0x6060",
         "vid": "0xFEED"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/blockboy/ac980mini/rules.mk b/keyboards/blockboy/ac980mini/rules.mk
index e564d512da..6111d23a8c 100644
--- a/keyboards/blockboy/ac980mini/rules.mk
+++ b/keyboards/blockboy/ac980mini/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h
index ecc29f6399..9b796dcece 100644
--- a/keyboards/blockey/config.h
+++ b/keyboards/blockey/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, D1, D4, E6, B5, D2, F6, B3, B2, B6 }
-#define MATRIX_COL_PINS { D0, B4, C6, D7, F4, F5, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN B1
-
 #define RGBLED_NUM 4
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/blockey/info.json b/keyboards/blockey/info.json
index 404614fd99..27aa9f62a1 100644
--- a/keyboards/blockey/info.json
+++ b/keyboards/blockey/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B1"
+  },
+  "matrix_pins": {
+    "cols": ["D0", "B4", "C6", "D7", "F4", "F5", "F7"],
+    "rows": ["D3", "D1", "D4", "E6", "B5", "D2", "F6", "B3", "B2", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h
index de47d3a071..23f99a7211 100644
--- a/keyboards/bluebell/swoop/config.h
+++ b/keyboards/bluebell/swoop/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { B1, F7, F6, F5, F4 }
-#define DIODE_DIRECTION COL2ROW
-
 #define EE_HANDS
 
 // OLED driver
@@ -29,8 +24,6 @@
 #endif
 
 // RGB underglow and per key
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
@@ -44,4 +37,3 @@
   #define RGBLIGHT_SAT_STEP 17
   #define RGBLIGHT_VAL_STEP 17
   #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json
index 49dcc857e9..ee671fea27 100644
--- a/keyboards/bluebell/swoop/info.json
+++ b/keyboards/bluebell/swoop/info.json
@@ -8,6 +8,14 @@
     "pid": "0x3046",
     "device_version": "1.0.0"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "matrix_pins": {
+    "cols": ["B1", "F7", "F6", "F5", "F4"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B4", "pin_b": "B5"}
@@ -29,42 +37,49 @@
   "layouts": {
     "LAYOUT_split_3x5_3": {
       "layout": [
-        {"label":"SW1",  "x":0, "y":0.375},
-        {"label":"SW2",  "x":1, "y":0.125},
-        {"label":"SW3",  "x":2, "y":0},
-        {"label":"SW4",  "x":3, "y":0.125},
-        {"label":"SW5",  "x":4, "y":0.25},
-        {"label":"SW19", "x":8, "y":0.25},
-        {"label":"SW20", "x":9, "y":0.125},
-        {"label":"SW21", "x":10, "y":0},
-        {"label":"SW22", "x":11, "y":0.125},
-        {"label":"SW23", "x":12, "y":0.375},
-        {"label":"SW6",  "x":0, "y":1.375},
-        {"label":"SW7",  "x":1, "y":1.125},
-        {"label":"SW8", "x":2, "y":1},
-        {"label":"SW9", "x":3, "y":1.125},
-        {"label":"SW10", "x":4, "y":1.25},
-        {"label":"SW24", "x":8, "y":1.25},
-        {"label":"SW25", "x":9,  "y":1.125},
-        {"label":"SW26", "x":10, "y":1},
-        {"label":"SW27", "x":11, "y":1.125},
-        {"label":"SW28", "x":12, "y":1.375},
-        {"label":"SW11", "x":0, "y":2.375},
-        {"label":"SW12", "x":1, "y":2.125},
-        {"label":"SW13", "x":2, "y":2},
-        {"label":"SW14", "x":3, "y":2.125},
-        {"label":"SW15", "x":4, "y":2.25},
-        {"label":"SW29", "x":8, "y":2.25},
-        {"label":"SW30", "x":9,  "y":2.125},
-        {"label":"SW31", "x":10, "y":2},
-        {"label":"SW32", "x":11, "y":2.125},
-        {"label":"SW33", "x":12, "y":2.375},
-        {"label":"SW16", "x":2.875, "y":3.25},
-        {"label":"SW17", "x":4, "y":3.375},
-        {"label":"SW28", "x":5.125, "y":3.625},
-        {"label":"SW34", "x":6.875, "y":3.625},
-        {"label":"SW35", "x":8, "y":3.375},
-        {"label":"SW36", "x":9.125, "y":3.25}
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.125},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.125},
+        {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+        {"matrix": [4, 4], "x": 8, "y": 0.25},
+        {"matrix": [4, 3], "x": 9, "y": 0.125},
+        {"matrix": [4, 2], "x": 10, "y": 0},
+        {"matrix": [4, 1], "x": 11, "y": 0.125},
+        {"matrix": [4, 0], "x": 12, "y": 0.375},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.125},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.125},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+        {"matrix": [5, 4], "x": 8, "y": 1.25},
+        {"matrix": [5, 3], "x": 9, "y": 1.125},
+        {"matrix": [5, 2], "x": 10, "y": 1},
+        {"matrix": [5, 1], "x": 11, "y": 1.125},
+        {"matrix": [5, 0], "x": 12, "y": 1.375},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.125},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.125},
+        {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+        {"matrix": [6, 4], "x": 8, "y": 2.25},
+        {"matrix": [6, 3], "x": 9, "y": 2.125},
+        {"matrix": [6, 2], "x": 10, "y": 2},
+        {"matrix": [6, 1], "x": 11, "y": 2.125},
+        {"matrix": [6, 0], "x": 12, "y": 2.375},
+
+        {"matrix": [3, 2], "x": 2.875, "y": 3.25},
+        {"matrix": [3, 3], "x": 4, "y": 3.375},
+        {"matrix": [3, 4], "x": 5.125, "y": 3.625},
+
+        {"matrix": [7, 4], "x": 6.875, "y": 3.625},
+        {"matrix": [7, 3], "x": 8, "y": 3.375},
+        {"matrix": [7, 2], "x": 9.125, "y": 3.25}
       ]
     }
   }
diff --git a/keyboards/bluebell/swoop/swoop.c b/keyboards/bluebell/swoop/swoop.c
deleted file mode 100644
index a373b48c47..0000000000
--- a/keyboards/bluebell/swoop/swoop.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 James White <jamesmnw@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "swoop.h"
diff --git a/keyboards/bluebell/swoop/swoop.h b/keyboards/bluebell/swoop/swoop.h
deleted file mode 100644
index 4160f3af8a..0000000000
--- a/keyboards/bluebell/swoop/swoop.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 James White <jamesmnw@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_split_3x5_3( \
-    L00, L01, L02, L03, L04,          R00, R01, R02, R03, R04, \
-    L10, L11, L12, L13, L14,          R10, R11, R12, R13, R14, \
-    L20, L21, L22, L23, L24,          R20, R21, R22, R23, R24, \
-              L30, L31, L32,          R30, R31, R32 \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04 }, \
-        { L10, L11, L12, L13, L14 }, \
-        { L20, L21, L22, L23, L24 }, \
-        { ___, ___, L30, L31, L32 }, \
-        { R04, R03, R02, R01, R00 }, \
-        { R14, R13, R12, R11, R10 }, \
-        { R24, R23, R22, R21, R20 }, \
-        { ___, ___, R32, R31, R30 } \
-    }
diff --git a/keyboards/boardrun/bizarre/bizarre.c b/keyboards/boardrun/bizarre/bizarre.c
deleted file mode 100644
index 10125f57b8..0000000000
--- a/keyboards/boardrun/bizarre/bizarre.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bizarre.h"
diff --git a/keyboards/boardrun/bizarre/bizarre.h b/keyboards/boardrun/bizarre/bizarre.h
deleted file mode 100644
index 656ab673b9..0000000000
--- a/keyboards/boardrun/bizarre/bizarre.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115, k116, \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313, k314, k315,      \
-         k41, k42, k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,      k413,    k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12, k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, k116,  k117 }, \
-  { k21,   k22, k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
-  { KC_NO, k32, k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  k314,  k315, KC_NO, KC_NO }, \
-  { k41,   k42, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
-  { KC_NO, k52, KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516,  KC_NO } \
-}
-
-#define LAYOUT_ansi( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115,   \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313,     k315,      \
-         k41,      k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12,   k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, KC_NO,  k117 }, \
-  { k21,   k22,   k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
-  { KC_NO, k32,   k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  KC_NO, k315, KC_NO, KC_NO }, \
-  { k41,   KC_NO, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
-  { KC_NO, k52,   KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516, KC_NO } \
-}
-
-#define LAYOUT_split_bs( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115, k116,   \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313,     k315,      \
-         k41,      k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12,   k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, k116,  k117 }, \
-  { k21,   k22,   k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
-  { KC_NO, k32,   k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  KC_NO, k315, KC_NO, KC_NO }, \
-  { k41,   KC_NO, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
-  { KC_NO, k52,   KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516, KC_NO } \
-}
-
-#define LAYOUT_iso( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114,   k115,    \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,          \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313, k314, k315,    \
-         k41, k42, k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12, k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115,  KC_NO,  k117 }, \
-  { k21,   k22, k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  KC_NO, KC_NO, KC_NO }, \
-  { KC_NO, k32, k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  k314,  k315,  KC_NO, KC_NO }, \
-  { k41,   k42, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415,  KC_NO, KC_NO }, \
-  { KC_NO, k52, KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515,  k516,  KC_NO } \
-}
diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h
index 0d8bdde6dc..a367b59dd3 100644
--- a/keyboards/boardrun/bizarre/config.h
+++ b/keyboards/boardrun/bizarre/config.h
@@ -15,23 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, B2, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -54,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 // ws2812 options
-#define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/info.json
index 49d67451cb..8c6253965b 100644
--- a/keyboards/boardrun/bizarre/info.json
+++ b/keyboards/boardrun/bizarre/info.json
@@ -9,395 +9,349 @@
         "pid": "0x5339",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"Backspace"},
-                {"y":0, "x":19.5, "label":"Bksp (Split)"},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                {"y":1, "x":18.75,"label":"\\| (ANSI)", "w":1.5},
-                
-                
-                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"#~ (ISO)"},
-                {"y":2, "x":19,   "label":"Enter (ANSI or ISO)", "w":1.25},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":1.25},
-                {"y":3, "x":1.75, "label":"\\| (ISO)"},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0},
+                {"matrix": [0, 15], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+                {"matrix": [1, 14], "x": 18.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 13], "x": 18, "y": 2},
+                {"matrix": [2, 14], "x": 19, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"Backspace", "w":2},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                {"y":1, "x":18.75,"label":"\\", "w":1.5},
-                
-                
-                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"Enter", "w":2.25},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":2.25},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+                {"matrix": [1, 14], "x": 18.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 14], "x": 18, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         },
         "LAYOUT_split_bs": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"\\"},
-                {"y":0, "x":19.5, "label":"Del"},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                {"y":1, "x":18.75,"label":"Backspace", "w":1.5},
-                
-                
-                {"y":2, "x":1.25, "label":"Control", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"Enter", "w":2.25},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":2.25},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0},
+                {"matrix": [0, 15], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+                {"matrix": [1, 14], "x": 18.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 14], "x": 18, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"Backspace", "w":2},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                
-                
-                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"#"},
-                {"y":1, "x":19,   "label":"Enter", "w":1.25, "h":2},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":1.25},
-                {"y":3, "x":1.75, "label":"\\"},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 13], "x": 18, "y": 2},
+                {"matrix": [2, 14], "x": 19, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         }
-        
     }
-
 }
diff --git a/keyboards/boardrun/bizarre/keymaps/default/keymap.c b/keyboards/boardrun/bizarre/keymaps/default/keymap.c
index f27c7a2c30..91a1ab1084 100644
--- a/keyboards/boardrun/bizarre/keymaps/default/keymap.c
+++ b/keyboards/boardrun/bizarre/keymaps/default/keymap.c
@@ -27,15 +27,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /*Bizarre Base Layer (defaults for "any" layout)
     * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
-    * ¦ HOME  ¦   ¦ ESC   ¦ `~    ¦ 1     ¦ ¦ 2     ¦ 3     ¦ 4     ¦ 5     ¦                   ¦ 6     ¦ 7     ¦ 8     ¦ 9     ¦ ¦ 0     ¦ -     ¦ =     ¦ BKSP  ¦ DEL   ¦
-    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
-    * ¦ END   ¦     ¦ TAB       ¦ Q     ¦   ¦ W     ¦ E     ¦ R     ¦ T     ¦                   ¦ Y     ¦ U     ¦ I     ¦ O     ¦   ¦ P     ¦ [     ¦ ]     ¦ \ ANSI    ¦
-    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
-    *           ¦ CAPS        ¦ A     ¦     ¦ S     ¦ D     ¦ F     ¦ G     ¦                   ¦ H     ¦ J     ¦ K     ¦ L     ¦     ¦ ;     ¦ '     ¦ # ISO ¦ ENTER   ¦
-    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
-    *     ¦ LSHIFT  ¦ \ ISO ¦ Z     ¦       ¦ X     ¦ C     ¦ V     ¦ B     ¦ LGUI  ¦   ¦ FN    ¦ N     ¦ M     ¦ ,     ¦ .     ¦       ¦ /     ¦ RSHIFT      ¦ UP    ¦
-    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
-    *           ¦ LCTRL     ¦                           ¦ LALT      ¦ SPACE         ¦   ¦ SPACE               ¦                           ¦ RCTRL     ¦ LEFT  ¦ DOWN  ¦ RIGHT ¦
+    * ¦ HOME  ¦   ¦ ESC   ¦ `~    ¦ 1     ¦ ¦ 2     ¦ 3     ¦ 4     ¦ 5     ¦                   ¦ 6     ¦ 7     ¦ 8     ¦ 9     ¦ ¦ 0     ¦ -     ¦ =     ¦ BKSP  ¦ DEL   ¦
+    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
+    * ¦ END   ¦     ¦ TAB       ¦ Q     ¦   ¦ W     ¦ E     ¦ R     ¦ T     ¦                   ¦ Y     ¦ U     ¦ I     ¦ O     ¦   ¦ P     ¦ [     ¦ ]     ¦ \ ANSI    ¦
+    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
+    *           ¦ CAPS        ¦ A     ¦     ¦ S     ¦ D     ¦ F     ¦ G     ¦                   ¦ H     ¦ J     ¦ K     ¦ L     ¦     ¦ ;     ¦ '     ¦ # ISO ¦ ENTER   ¦
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
+    *     ¦ LSHIFT  ¦ \ ISO ¦ Z     ¦       ¦ X     ¦ C     ¦ V     ¦ B     ¦ LGUI  ¦   ¦ FN    ¦ N     ¦ M     ¦ ,     ¦ .     ¦       ¦ /     ¦ RSHIFT      ¦ UP    ¦
+    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
+    *           ¦ LCTRL     ¦                           ¦ LALT      ¦ SPACE         ¦   ¦ SPACE               ¦                           ¦ RCTRL     ¦ LEFT  ¦ DOWN  ¦ RIGHT ¦
     *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
     */
     
@@ -49,15 +49,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     /*Bizarre Function Layer
     * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
-    * ¦ QK_BOOT ¦   ¦       ¦       ¦ F1    ¦ ¦ F2    ¦ F3    ¦ F4    ¦ F5    ¦                   ¦ F6    ¦ F7    ¦ F8    ¦ F9    ¦ ¦ F10   ¦ F11   ¦ F12   ¦ DEL   ¦       ¦
-    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
-    * ¦       ¦     ¦           ¦       ¦   ¦       ¦       ¦       ¦       ¦                   ¦       ¦       ¦ INS   ¦       ¦   ¦ PRINT ¦       ¦       ¦           ¦
-    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
-    *           ¦             ¦       ¦     ¦ SCRLL ¦       ¦       ¦       ¦                   ¦       ¦       ¦       ¦       ¦     ¦       ¦       ¦       ¦         ¦
-    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
-    *     ¦         ¦       ¦       ¦       ¦       ¦       ¦       ¦ PAUSE ¦ RGUI  ¦   ¦       ¦       ¦ MENU  ¦       ¦       ¦       ¦       ¦             ¦ PGUP  ¦
-    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
-    *           ¦           ¦                           ¦           ¦               ¦   ¦ RALT                ¦                           ¦           ¦ HOME  ¦ PGDN  ¦ END   ¦
+    * ¦ QK_BOOT ¦   ¦       ¦       ¦ F1    ¦ ¦ F2    ¦ F3    ¦ F4    ¦ F5    ¦                   ¦ F6    ¦ F7    ¦ F8    ¦ F9    ¦ ¦ F10   ¦ F11   ¦ F12   ¦ DEL   ¦       ¦
+    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
+    * ¦       ¦     ¦           ¦       ¦   ¦       ¦       ¦       ¦       ¦                   ¦       ¦       ¦ INS   ¦       ¦   ¦ PRINT ¦       ¦       ¦           ¦
+    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
+    *           ¦             ¦       ¦     ¦ SCRLL ¦       ¦       ¦       ¦                   ¦       ¦       ¦       ¦       ¦     ¦       ¦       ¦       ¦         ¦
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
+    *     ¦         ¦       ¦       ¦       ¦       ¦       ¦       ¦ PAUSE ¦ RGUI  ¦   ¦       ¦       ¦ MENU  ¦       ¦       ¦       ¦       ¦             ¦ PGUP  ¦
+    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
+    *           ¦           ¦                           ¦           ¦               ¦   ¦ RALT                ¦                           ¦           ¦ HOME  ¦ PGDN  ¦ END   ¦
     *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
     */
     
diff --git a/keyboards/boardrun/classic/classic.c b/keyboards/boardrun/classic/classic.c
deleted file mode 100644
index 49eea39329..0000000000
--- a/keyboards/boardrun/classic/classic.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "classic.h"
diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
index b2cd5ab73c..a1d1a3a544 100644
--- a/keyboards/boardrun/classic/config.h
+++ b/keyboards/boardrun/classic/config.h
@@ -15,23 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, B2, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -54,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 // ws2812 options
-#define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/boardrun/classic/info.json b/keyboards/boardrun/classic/info.json
index 60839d5ef0..74f53cf2cd 100644
--- a/keyboards/boardrun/classic/info.json
+++ b/keyboards/boardrun/classic/info.json
@@ -9,6 +9,14 @@
         "pid": "0x5338",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/boardsource/beiwagon/config.h b/keyboards/boardsource/beiwagon/config.h
index 587dda7381..75b5888bc3 100644
--- a/keyboards/boardsource/beiwagon/config.h
+++ b/keyboards/boardsource/beiwagon/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-#define RGB_DI_PIN C6
 #define RGB_MATRIX_LED_COUNT 18
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
diff --git a/keyboards/boardsource/beiwagon/info.json b/keyboards/boardsource/beiwagon/info.json
index 69ce8d96f1..ac0e023c44 100644
--- a/keyboards/boardsource/beiwagon/info.json
+++ b/keyboards/boardsource/beiwagon/info.json
@@ -10,6 +10,9 @@
     "mousekey": false,
     "rgb_matrix": true
   },
+  "ws2812": {
+    "pin": "C6"
+  },
   "matrix_pins": {
     "cols": ["B5", "B6", "B7"],
     "rows": ["B0", "B1", "B2", "B3"]
@@ -22,6 +25,7 @@
     "vid": "0x4273"
   },
   "rgb_matrix": {
+    "driver": "WS2812",
     "layout": [
       { "flags": 2, "x": 16, "y": 38 },
       { "flags": 2, "x": 16, "y": 113 },
diff --git a/keyboards/boardsource/beiwagon/rules.mk b/keyboards/boardsource/beiwagon/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/boardsource/beiwagon/rules.mk
+++ b/keyboards/boardsource/beiwagon/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/boardsource/holiday/spooky/info.json b/keyboards/boardsource/holiday/spooky/info.json
index 393b4fd806..359b95c699 100644
--- a/keyboards/boardsource/holiday/spooky/info.json
+++ b/keyboards/boardsource/holiday/spooky/info.json
@@ -22,7 +22,6 @@
   },
   "rgblight": {
     "led_count": 5,
-    "pin": "D3",
     "sleep": true,
     "animations": {
       "alternating": true,
@@ -37,6 +36,9 @@
       "twinkle": true
     }
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "community_layouts": [
     "ortho_2x3"
   ],
diff --git a/keyboards/boardsource/lulu/avr/info.json b/keyboards/boardsource/lulu/avr/info.json
index 2c9155f6ad..53e8f31056 100644
--- a/keyboards/boardsource/lulu/avr/info.json
+++ b/keyboards/boardsource/lulu/avr/info.json
@@ -10,7 +10,7 @@
   "split": {
     "soft_serial_pin": "D2"
   },
-  "rgblight": {
+  "ws2812": {
      "pin": "D3"
   },
   "encoder": {
diff --git a/keyboards/boardsource/lulu/keymaps/davidrambo/config.h b/keyboards/boardsource/lulu/keymaps/davidrambo/config.h
index 8728002a39..7dea913a0f 100644
--- a/keyboards/boardsource/lulu/keymaps/davidrambo/config.h
+++ b/keyboards/boardsource/lulu/keymaps/davidrambo/config.h
@@ -23,7 +23,6 @@
 
 #define TAPPING_TERM 210
 /*#define PERMISSIVE_HOLD*/
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_FORCE_HOLD
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/boardsource/lulu/rp2040/config.h b/keyboards/boardsource/lulu/rp2040/config.h
index 4f50a586df..2c86e48e6f 100644
--- a/keyboards/boardsource/lulu/rp2040/config.h
+++ b/keyboards/boardsource/lulu/rp2040/config.h
@@ -9,4 +9,3 @@
 #define I2C_DRIVER I2CD1
 #define I2C1_SDA_PIN GP22
 #define I2C1_SCL_PIN GP23
-#define RGB_DI_PIN GP29
diff --git a/keyboards/boardsource/lulu/rp2040/info.json b/keyboards/boardsource/lulu/rp2040/info.json
index c50260c7c5..eb57c593b4 100644
--- a/keyboards/boardsource/lulu/rp2040/info.json
+++ b/keyboards/boardsource/lulu/rp2040/info.json
@@ -9,5 +9,9 @@
     "rotary": [
       { "pin_a": "GP8", "pin_b": "GP9" }
     ]
+  },
+  "ws2812": {
+    "pin": "GP29",
+    "driver": "vendor"
   }
 }
diff --git a/keyboards/boardsource/lulu/rp2040/rules.mk b/keyboards/boardsource/lulu/rp2040/rules.mk
index 8fb51ec82d..161ec22b16 100644
--- a/keyboards/boardsource/lulu/rp2040/rules.mk
+++ b/keyboards/boardsource/lulu/rp2040/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/boardsource/microdox/v1/info.json b/keyboards/boardsource/microdox/v1/info.json
index ba8307221a..6e47fbd2c4 100644
--- a/keyboards/boardsource/microdox/v1/info.json
+++ b/keyboards/boardsource/microdox/v1/info.json
@@ -13,7 +13,6 @@
     "soft_serial_pin": "D2"
   },
   "rgblight": {
-    "pin": "D3",
     "sleep": true,
     "led_count": 12,
     "split_count": [6, 6],
@@ -30,5 +29,8 @@
       "static_gradient": true,
       "twinkle": true
     }
-  }
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
 }
diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h
index 4846bf5146..236254317a 100644
--- a/keyboards/boardsource/microdox/v2/config.h
+++ b/keyboards/boardsource/microdox/v2/config.h
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#define RGB_DI_PIN B5
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 #define RGB_MATRIX_LED_COUNT 44
 #define RGB_MATRIX_SPLIT { 22, 22 }
diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/info.json
index a53dfff708..ca9b976023 100644
--- a/keyboards/boardsource/microdox/v2/info.json
+++ b/keyboards/boardsource/microdox/v2/info.json
@@ -9,6 +9,9 @@
   "usb": {
     "device_version": "2.0.0"
   },
+  "ws2812": {
+    "pin": "B5"
+  },
   "encoder": {
     "enabled": true,
     "rotary": [
@@ -32,6 +35,7 @@
     }
   },
   "rgb_matrix": {
+    "driver": "WS2812",
     "layout": [
       { "flags": 2, "x": 12, "y": 11 },
       { "flags": 2, "x": 86, "y": 11 },
diff --git a/keyboards/boardsource/microdox/v2/rules.mk b/keyboards/boardsource/microdox/v2/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/boardsource/microdox/v2/rules.mk
+++ b/keyboards/boardsource/microdox/v2/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/boardsource/technik_o/config.h b/keyboards/boardsource/technik_o/config.h
index c6edbf1c4e..1148c13ebc 100644
--- a/keyboards/boardsource/technik_o/config.h
+++ b/keyboards/boardsource/technik_o/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-#define RGB_DI_PIN C6
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_LED_COUNT 58
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/boardsource/technik_o/info.json b/keyboards/boardsource/technik_o/info.json
index d84a976e13..df0dbd63a5 100644
--- a/keyboards/boardsource/technik_o/info.json
+++ b/keyboards/boardsource/technik_o/info.json
@@ -11,6 +11,9 @@
     "nkro": true,
     "rgb_matrix": true
   },
+  "ws2812": {
+    "pin": "C6"
+  },
   "matrix_pins": {
     "cols": ["B5", "B6", "B7", "F5", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6"],
     "rows": ["B0", "B1", "B2", "B3"]
@@ -22,7 +25,8 @@
     "pid": "0x0079",
     "vid": "0x4273"
   },
-  "rgb_matrix": { 
+  "rgb_matrix": {
+    "driver": "WS2812",
     "layout": [
       { "flags": 2, "x": 220, "y": 17 },
       { "flags": 2, "x": 172, "y": 17 },
diff --git a/keyboards/boardsource/technik_o/rules.mk b/keyboards/boardsource/technik_o/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/boardsource/technik_o/rules.mk
+++ b/keyboards/boardsource/technik_o/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/boardsource/technik_s/config.h b/keyboards/boardsource/technik_s/config.h
index ab4d79147c..fe6518356e 100644
--- a/keyboards/boardsource/technik_s/config.h
+++ b/keyboards/boardsource/technik_s/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-#define RGB_DI_PIN C6
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_LED_COUNT 55
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/boardsource/technik_s/info.json b/keyboards/boardsource/technik_s/info.json
index 6593845e83..089acc9397 100644
--- a/keyboards/boardsource/technik_s/info.json
+++ b/keyboards/boardsource/technik_s/info.json
@@ -11,6 +11,9 @@
     "nkro": true,
     "rgb_matrix": true
   },
+  "ws2812": {
+    "pin": "C6"
+  },
   "matrix_pins": {
     "cols": ["B5", "B6", "B7", "F5", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6"],
     "rows": ["B0", "B1", "B2", "B3"]
@@ -23,6 +26,7 @@
     "vid": "0x4273"
   },
   "rgb_matrix": {
+    "driver": "WS2812",
     "layout": [
       { "flags": 2, "x": 220, "y": 17 },
       { "flags": 2, "x": 172, "y": 17 },
diff --git a/keyboards/boardsource/technik_s/rules.mk b/keyboards/boardsource/technik_s/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/boardsource/technik_s/rules.mk
+++ b/keyboards/boardsource/technik_s/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
index 46f10affcd..c73d93fa9d 100644
--- a/keyboards/boardsource/the_mark/info.json
+++ b/keyboards/boardsource/the_mark/info.json
@@ -24,7 +24,6 @@
   },
   "rgblight": {
     "led_count": 24,
-    "pin": "C6",
     "sleep": true,
     "max_brightness": 200,
     "animations": {
@@ -40,7 +39,11 @@
       "twinkle": true
     }
   },
+  "ws2812": {
+    "pin": "C6"
+  },
   "rgb_matrix": {
+    "driver": "WS2812",
     "layout": [
       { "flags": 2, "x": 224, "y": 42},
       { "flags": 2, "x": 224, "y": 21},
diff --git a/keyboards/boardsource/the_mark/rules.mk b/keyboards/boardsource/the_mark/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/boardsource/the_mark/rules.mk
+++ b/keyboards/boardsource/the_mark/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/boardwalk/boardwalk.h b/keyboards/boardwalk/boardwalk.h
deleted file mode 100644
index 8a613ce49d..0000000000
--- a/keyboards/boardwalk/boardwalk.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x14( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \
-  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412, k413 \
-) \
-{ \
-  { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013 }, \
-  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113 }, \
-  { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213 }, \
-  { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313 }, \
-  { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412, k413 } \
-}
-
-#define LAYOUT_ortho_2x2u( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \
-  k40, k41, k42, k43, k44,   k45,     k47,     k49, k410, k411, k412, k413  \
-) \
-{ \
-  { k00,   k01, k02, k03, k04, k05, k06,   k07, k08,   k09, k010, k011, k012, k013   }, \
-  { k10,   k11, k12, k13, k14, k15, k16,   k17, k18,   k19, k110, k111, k112, k113   }, \
-  { k20,   k21, k22, k23, k24, k25, k26,   k27, k28,   k29, k210, k211, k212, k213   }, \
-  { k30,   k31, k32, k33, k34, k35, k36,   k37, k38,   k39, k310, k311, k312, k313   }, \
-  { k40,   k41, k42, k43, k44, k45, KC_NO, k47, KC_NO, k49, k410, k411, k412, k413   } \
-}
-
-#define LAYOUT_ortho_hhkb( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \
-       k41, k42, k43, k44,   k45,     k47,     k49, k410, k411, k412       \
-) \
-{ \
-  { k00,   k01, k02, k03, k04, k05, k06,   k07, k08,   k09, k010, k011, k012, k013   }, \
-  { k10,   k11, k12, k13, k14, k15, k16,   k17, k18,   k19, k110, k111, k112, k113   }, \
-  { k20,   k21, k22, k23, k24, k25, k26,   k27, k28,   k29, k210, k211, k212, k213   }, \
-  { k30,   k31, k32, k33, k34, k35, k36,   k37, k38,   k39, k310, k311, k312, k313   }, \
-  { KC_NO, k41, k42, k43, k44, k45, KC_NO, k47, KC_NO, k49, k410, k411, k412, KC_NO } \
-}
-
-#define LAYOUT_ortho_7u( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \
-       k41, k42,                       k46,               k411, k412        \
-) \
-{ \
-  { k00,   k01, k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k010,  k011, k012, k013   }, \
-  { k10,   k11, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k110,  k111, k112, k113   }, \
-  { k20,   k21, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k210,  k211, k212, k213   }, \
-  { k30,   k31, k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k310,  k311, k312, k313   }, \
-  { KC_NO, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k411, k412, KC_NO } \
-}
-
-#define LAYOUT_2u_arrow( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \
-  k40, k41, k42, k43,    k44,      k46,   k48, k49, k410, k411, k412, k413 \
-) \
-{ \
-  { k00, k01, k02, k03, k04, k05,   k06, k07,   k08, k09, k010, k011, k012, k013 }, \
-  { k10, k11, k12, k13, k14, k15,   k16, k17,   k18, k19, k110, k111, k112, k113 }, \
-  { k20, k21, k22, k23, k24, k25,   k26, k27,   k28, k29, k210, k211, k212, k213 }, \
-  { k30, k31, k32, k33, k34, k35,   k36, k37,   k38, k39, k310, k311, k312, k313 }, \
-  { k40, k41, k42, k43, k44, KC_NO, k46, KC_NO, k48, k49, k410, k411, k412, k413 } \
-}
-
-#define LAYOUT_625u_arrow( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \
-  k40, k41, k42,              k45,             k49, k410, k411, k412, k413 \
-) \
-{ \
-  { k00, k01, k02, k03,   k04,   k05,   k06,   k07,   k08,   k09, k010, k011, k012, k013 }, \
-  { k10, k11, k12, k13,   k14,   k15,   k16,   k17,   k18,   k19, k110, k111, k112, k113 }, \
-  { k20, k21, k22, k23,   k24,   k25,   k26,   k27,   k28,   k29, k210, k211, k212, k213 }, \
-  { k30, k31, k32, k33,   k34,   k35,   k36,   k37,   k38,   k39, k310, k311, k312, k313 }, \
-  { k40, k41, k42, KC_NO, KC_NO, k45,   KC_NO, KC_NO, KC_NO, k49, k410, k411, k412, k413 } \
-}
diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h
index 38cdc18fce..a1d1a3a544 100644
--- a/keyboards/boardwalk/config.h
+++ b/keyboards/boardwalk/config.h
@@ -15,23 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -54,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 // ws2812 options
-#define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/boardwalk/info.json b/keyboards/boardwalk/info.json
index 76fea555e4..8a04fc121e 100644
--- a/keyboards/boardwalk/info.json
+++ b/keyboards/boardwalk/info.json
@@ -8,454 +8,462 @@
         "pid": "0x5337",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x14"],
     "layouts": {
         "LAYOUT_ortho_5x14": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.5},
-                {"x": 1.5, "y": 0},
-                {"x": 2.5, "y": 0},
-                {"x": 3.5, "y": 0},
-                {"x": 4.5, "y": 0},
-                {"x": 5.5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 10.5, "y": 0},
-                {"x": 11.5, "y": 0},
-                {"x": 12.5, "y": 0},
-                {"x": 13.5, "y": 0, "w": 1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0, "w": 1.5},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
 
-                {"x": 0, "y": 3, "w": 1.5},
-                {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.5},
 
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4},
-                {"x": 3.5, "y": 4},
-                {"x": 4.5, "y": 4},
-                {"x": 5.5, "y": 4},
-                {"x": 6.5, "y": 4},
-                {"x": 7.5, "y": 4},
-                {"x": 8.5, "y": 4},
-                {"x": 9.5, "y": 4},
-                {"x": 10.5, "y": 4},
-                {"x": 11.5, "y": 4},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "x": 5.5, "y": 4},
+                {"matrix": [4, 6], "x": 6.5, "y": 4},
+                {"matrix": [4, 7], "x": 7.5, "y": 4},
+                {"matrix": [4, 8], "x": 8.5, "y": 4},
+                {"matrix": [4, 9], "x": 9.5, "y": 4},
+                {"matrix": [4, 10], "x": 10.5, "y": 4},
+                {"matrix": [4, 11], "x": 11.5, "y": 4},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_ortho_hhkb": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.5},
-                {"x": 1.5, "y": 0},
-                {"x": 2.5, "y": 0},
-                {"x": 3.5, "y": 0},
-                {"x": 4.5, "y": 0},
-                {"x": 5.5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 10.5, "y": 0},
-                {"x": 11.5, "y": 0},
-                {"x": 12.5, "y": 0},
-                {"x": 13.5, "y": 0, "w": 1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0, "w": 1.5},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
 
-                {"x": 0, "y": 3, "w": 1.5},
-                {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.5},
 
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4},
-                {"x": 3.5, "y": 4},
-                {"x": 4.5, "y": 4},
-                {"x": 5.5, "y": 4, "w": 2},
-                {"x": 7.5, "y": 4, "w": 2},
-                {"x": 9.5, "y": 4},
-                {"x": 10.5, "y": 4},
-                {"x": 11.5, "y": 4},
-                {"x": 12.5, "y": 4}
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7.5, "y": 4, "w": 2},
+                {"matrix": [4, 9], "x": 9.5, "y": 4},
+                {"matrix": [4, 10], "x": 10.5, "y": 4},
+                {"matrix": [4, 11], "x": 11.5, "y": 4},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
             ]
         },
         "LAYOUT_ortho_7u": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.5},
-                {"x": 1.5, "y": 0},
-                {"x": 2.5, "y": 0},
-                {"x": 3.5, "y": 0},
-                {"x": 4.5, "y": 0},
-                {"x": 5.5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 10.5, "y": 0},
-                {"x": 11.5, "y": 0},
-                {"x": 12.5, "y": 0},
-                {"x": 13.5, "y": 0, "w": 1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0, "w": 1.5},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
 
-                {"x": 0, "y": 3, "w": 1.5},
-                {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.5},
 
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4}
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
             ]
         },
         "LAYOUT_2u_arrow": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.5},
-                {"x": 1.5, "y": 0},
-                {"x": 2.5, "y": 0},
-                {"x": 3.5, "y": 0},
-                {"x": 4.5, "y": 0},
-                {"x": 5.5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 10.5, "y": 0},
-                {"x": 11.5, "y": 0},
-                {"x": 12.5, "y": 0},
-                {"x": 13.5, "y": 0, "w": 1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0, "w": 1.5},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2, "w": 1.5},
-                {"x": 14, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 13], "x": 14, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.5},
-                {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3, "w": 1.5},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4},
-                {"x": 3.5, "y": 4},
-                {"x": 4.5, "y": 4, "w": 2},
-                {"x": 6.5, "y": 4, "w": 2},
-                {"x": 8.5, "y": 4},
-                {"x": 9.5, "y": 4, "w": 1.25},
-                {"x": 10.75, "y": 4, "w": 1.25},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 2},
+                {"matrix": [4, 8], "x": 8.5, "y": 4},
+                {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 10.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
             ]
         },
         "LAYOUT_625u_arrow": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.5},
-                {"x": 1.5, "y": 0},
-                {"x": 2.5, "y": 0},
-                {"x": 3.5, "y": 0},
-                {"x": 4.5, "y": 0},
-                {"x": 5.5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 10.5, "y": 0},
-                {"x": 11.5, "y": 0},
-                {"x": 12.5, "y": 0},
-                {"x": 13.5, "y": 0, "w": 1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0, "w": 1.5},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2, "w": 1.5},
-                {"x": 14, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 13], "x": 14, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.5},
-                {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3, "w": 1.5},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4},
-                {"x": 3.5, "y": 4, "w": 6.25},
-                {"x": 9.75, "y": 4},
-                {"x": 10.75, "y": 4, "w": 1.25},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 5], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4},
+                {"matrix": [4, 10], "x": 10.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
             ]
         },
         "LAYOUT_ortho_2x2u": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.5},
-                {"x": 1.5, "y": 0},
-                {"x": 2.5, "y": 0},
-                {"x": 3.5, "y": 0},
-                {"x": 4.5, "y": 0},
-                {"x": 5.5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 10.5, "y": 0},
-                {"x": 11.5, "y": 0},
-                {"x": 12.5, "y": 0},
-                {"x": 13.5, "y": 0, "w": 1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0, "w": 1.5},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
 
-                {"x": 0, "y": 3, "w": 1.5},
-                {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.5},
 
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4},
-                {"x": 3.5, "y": 4},
-                {"x": 4.5, "y": 4},
-                {"x": 5.5, "y": 4, "w": 2},
-                {"x": 7.5, "y": 4, "w": 2},
-                {"x": 9.5, "y": 4},
-                {"x": 10.5, "y": 4},
-                {"x": 11.5, "y": 4},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7.5, "y": 4, "w": 2},
+                {"matrix": [4, 9], "x": 9.5, "y": 4},
+                {"matrix": [4, 10], "x": 10.5, "y": 4},
+                {"matrix": [4, 11], "x": 11.5, "y": 4},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/bobpad/bobpad.c b/keyboards/bobpad/bobpad.c
index 59507d7d8c..67b124ace2 100644
--- a/keyboards/bobpad/bobpad.c
+++ b/keyboards/bobpad/bobpad.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bobpad.h"
+#include "quantum.h"
 
 bool led_update_kb(led_t led_state) {
     if (!led_update_user(led_state)) { return false; }
diff --git a/keyboards/bobpad/bobpad.h b/keyboards/bobpad/bobpad.h
deleted file mode 100644
index da9c0fa025..0000000000
--- a/keyboards/bobpad/bobpad.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Ananya Kirti
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x3( \
-    K00, K01, K02,   \
-    K10, K11, K12    \
-) { \
-    { K00,   K01,   K02   }, \
-    { K10,   K11,   K12   }, \
-}
diff --git a/keyboards/bobpad/config.h b/keyboards/bobpad/config.h
deleted file mode 100644
index 1b4ca326d9..0000000000
--- a/keyboards/bobpad/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Ananya Kirti
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F7, B1 }
-#define MATRIX_COL_PINS { F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bobpad/info.json b/keyboards/bobpad/info.json
index 43e614dbad..eb6a25104b 100644
--- a/keyboards/bobpad/info.json
+++ b/keyboards/bobpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4"],
+        "rows": ["F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B2"}
@@ -26,12 +31,13 @@
     "layouts": {
         "LAYOUT_ortho_2x3": {
             "layout": [
-                {"label":"K00 (B0,B2)", "x":0, "y":0},
-                {"label":"K01 (B0,B3)", "x":1, "y":0},
-                {"label":"K02 (B0,B4)", "x":2, "y":0},
-                {"label":"K10 (B1,B2)", "x":0, "y":1},
-                {"label":"K11 (B1,B3)", "x":1, "y":1},
-                {"label":"K12 (B1,B4)", "x":2, "y":1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
             ]
         }
     }
diff --git a/keyboards/bolsa/bolsalice/bolsalice.c b/keyboards/bolsa/bolsalice/bolsalice.c
deleted file mode 100644
index 8fc60ce213..0000000000
--- a/keyboards/bolsa/bolsalice/bolsalice.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 CMM.Studio Freather
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "bolsalice.h"
diff --git a/keyboards/bolsa/bolsalice/bolsalice.h b/keyboards/bolsa/bolsalice/bolsalice.h
deleted file mode 100644
index 475b5b101d..0000000000
--- a/keyboards/bolsa/bolsalice/bolsalice.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright 2022 CMM.Studio Freather
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_alice_split_bs( \
-	K00, K01, K02, K03, K04, K05, K06, K07,     K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, \
-	K10, K11, K12, K13, K14, K15, K16,          K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \
-	K20, K21, K22, K23, K24, K25, K26,          K27, K28, K29, K2A, K2B, K2C, K2D,  \
-	     K31, K32, K33, K34, K35, K36,          K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-	     K41,      K43, K45, K46,               K48, K4A,                          K4E \
-){ \
-	{K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E},\
-	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E},\
-	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E},\
-	{XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E},\
-	{XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E},\
-}
-
-#define LAYOUT_alice( \
-	K00, K01, K02, K03, K04, K05, K06, K07,    K08, K09, K0A, K0B, K0C, K0D, K0E,\
-	K10, K11, K12, K13, K14, K15, K16,         K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \
-	K20, K21, K22, K23, K24, K25, K26,         K27, K28, K29, K2A, K2B, K2C, K2D,  \
-	     K31, K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
-	     K41,      K43, K45, K46,              K48, K4A,                          K4E \
-){ \
-	{K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E},\
-	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX},\
-	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E},\
-	{XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E},\
-	{XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E},\
-}
-
-
diff --git a/keyboards/bolsa/bolsalice/config.h b/keyboards/bolsa/bolsalice/config.h
index 8d95b371bd..3ced3989ef 100644
--- a/keyboards/bolsa/bolsalice/config.h
+++ b/keyboards/bolsa/bolsalice/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B2, B3, C7, C6, B5 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B4, D7, D6, D4, D5, D3, D2, D1 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 8
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -40,4 +32,3 @@
     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
     #define RGBLIGHT_EFFECT_RGB_TEST
     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/bolsa/bolsalice/info.json b/keyboards/bolsa/bolsalice/info.json
index 7e32e74a56..25ef2f617b 100644
--- a/keyboards/bolsa/bolsalice/info.json
+++ b/keyboards/bolsa/bolsalice/info.json
@@ -6,6 +6,14 @@
         "vid": "0x4253",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+        "rows": ["B2", "B3", "C7", "C6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "url": "",
@@ -14,141 +22,163 @@
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"~", "x":1.75, "y":0},
-                {"label":"!", "x":2.75, "y":0},
-                {"label":"@", "x":3.75, "y":0},
-                {"label":"#", "x":4.75, "y":0},
-                {"label":"$", "x":5.75, "y":0},
-                {"label":"%", "x":6.75, "y":0},
-                {"label":"^", "x":7.75, "y":0},
-                {"label":"&", "x":10, "y":0},
-                {"label":"*", "x":11, "y":0},
-                {"label":"(", "x":12, "y":0},
-                {"label":")", "x":13, "y":0},
-                {"label":"_", "x":14, "y":0},
-                {"label":"+", "x":15, "y":0},
-                {"label":"|", "x":16, "y":0},
-                {"label":"~", "x":17, "y":0},
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":9.75, "y":1},
-                {"label":"U", "x":10.75, "y":1},
-                {"label":"I", "x":11.75, "y":1},
-                {"label":"O", "x":12.75, "y":1},
-                {"label":"P", "x":13.75, "y":1},
-                {"label":"{", "x":14.75, "y":1},
-                {"label":"}", "x":15.75, "y":1},
-                {"label":"Backspace", "x":16.75, "y":1, "w":1.5},
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Control", "x":1.25, "y":2, "w":1.75},
-                {"label":"A", "x":3, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":":", "x":14.25, "y":2},
-                {"label":"\"", "x":15.25, "y":2},
-                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-                {"label":"Shift", "x":1, "y":3, "w":2.25},
-                {"label":"Z", "x":3.25, "y":3},
-                {"label":"X", "x":4.25, "y":3},
-                {"label":"C", "x":5.25, "y":3},
-                {"label":"V", "x":6.25, "y":3},
-                {"label":"B", "x":7.25, "y":3},
-                {"label":"B", "x":10, "y":3},
-                {"label":"N", "x":11, "y":3},
-                {"label":"M", "x":12, "y":3},
-                {"label":"<", "x":13, "y":3},
-                {"label":">", "x":14, "y":3},
-                {"label":"?", "x":15, "y":3},
-                {"label":"Shift", "x":16, "y":3, "w":1.75},
-                {"label":"Fn1", "x":17.75, "y":3},
-                {"label":"Ctrl", "x":1, "y":4, "w":1.5},
-                {"label":"Alt", "x":4, "y":4, "w":1.5},
-                {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
-                {"label":"Fn2", "x":7.75, "y":4},
-                {"label":"RSpace", "x":10, "y":4, "w":2.75},
-                {"label":"RAlt", "x":12.75, "y":4, "w":1.5},
-                {"label":"RCtl", "x":17, "y":4, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0},
+                {"matrix": [1, 14], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [2, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 15, "y": 3},
+                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"~", "x":1.75, "y":0},
-                {"label":"!", "x":2.75, "y":0},
-                {"label":"@", "x":3.75, "y":0},
-                {"label":"#", "x":4.75, "y":0},
-                {"label":"$", "x":5.75, "y":0},
-                {"label":"%", "x":6.75, "y":0},
-                {"label":"^", "x":7.75, "y":0},
-                {"label":"&", "x":10, "y":0},
-                {"label":"*", "x":11, "y":0},
-                {"label":"(", "x":12, "y":0},
-                {"label":")", "x":13, "y":0},
-                {"label":"_", "x":14, "y":0},
-                {"label":"+", "x":15, "y":0},
-                {"label":"Backspace", "x":16, "y":0, "w":2},
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":9.75, "y":1},
-                {"label":"U", "x":10.75, "y":1},
-                {"label":"I", "x":11.75, "y":1},
-                {"label":"O", "x":12.75, "y":1},
-                {"label":"P", "x":13.75, "y":1},
-                {"label":"{", "x":14.75, "y":1},
-                {"label":"}", "x":15.75, "y":1},
-                {"label":"|", "x":16.75, "y":1, "w":1.5},
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Control", "x":1.25, "y":2, "w":1.75},
-                {"label":"A", "x":3, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":":", "x":14.25, "y":2},
-                {"label":"\"", "x":15.25, "y":2},
-                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-                {"label":"Shift", "x":1, "y":3, "w":2.25},
-                {"label":"Z", "x":3.25, "y":3},
-                {"label":"X", "x":4.25, "y":3},
-                {"label":"C", "x":5.25, "y":3},
-                {"label":"V", "x":6.25, "y":3},
-                {"label":"B", "x":7.25, "y":3},
-                {"label":"B", "x":10, "y":3},
-                {"label":"N", "x":11, "y":3},
-                {"label":"M", "x":12, "y":3},
-                {"label":"<", "x":13, "y":3},
-                {"label":">", "x":14, "y":3},
-                {"label":"?", "x":15, "y":3},
-                {"label":"Shift", "x":16, "y":3, "w":1.75},
-                {"label":"Fn1", "x":17.75, "y":3},
-                {"label":"Ctrl", "x":1, "y":4, "w":1.5},
-                {"label":"Alt", "x":4, "y":4, "w":1.5},
-                {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
-                {"label":"Fn2", "x":7.75, "y":4},
-                {"label":"RSpace", "x":10, "y":4, "w":2.75},
-                {"label":"RAlt", "x":12.75, "y":4, "w":1.5},
-                {"label":"RCtl", "x":17, "y":4, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [2, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 15, "y": 3},
+                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
             ]
         }
     },
diff --git a/keyboards/bolsa/damapad/config.h b/keyboards/bolsa/damapad/config.h
deleted file mode 100644
index 9342bd0283..0000000000
--- a/keyboards/bolsa/damapad/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/*
-Copyright 2021 Matthew Dias
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, F7, C7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, B7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
diff --git a/keyboards/bolsa/damapad/damapad.c b/keyboards/bolsa/damapad/damapad.c
index d57a60c166..c2464d3f95 100644
--- a/keyboards/bolsa/damapad/damapad.c
+++ b/keyboards/bolsa/damapad/damapad.c
@@ -65,17 +65,3 @@ oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
     return OLED_ROTATION_180;
 }
 #endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/bolsa/damapad/info.json b/keyboards/bolsa/damapad/info.json
index 72e432c871..22d4ba3d39 100644
--- a/keyboards/bolsa/damapad/info.json
+++ b/keyboards/bolsa/damapad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6470",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "B7"],
+        "rows": ["E6", "F7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B3", "resolution": 2}
diff --git a/keyboards/bop/bop.c b/keyboards/bop/bop.c
deleted file mode 100644
index 492d7cfe37..0000000000
--- a/keyboards/bop/bop.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Brandon Lewis
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "bop.h"
diff --git a/keyboards/bop/config.h b/keyboards/bop/config.h
index 211e7f4f76..7d7310ec0e 100644
--- a/keyboards/bop/config.h
+++ b/keyboards/bop/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D4 }
-#define MATRIX_COL_PINS { D5, C5, B0, B1, B2, B3, B4, B5, B6, E7, E6, F0, F7, F6, F5, F4, F3, F2, F1, C6 }
-//    If your board is spamming the end column, change C7 to C6 in the line above and short those pins on the controller
-                        
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/bop/info.json b/keyboards/bop/info.json
index a10de48d68..d892612a7f 100644
--- a/keyboards/bop/info.json
+++ b/keyboards/bop/info.json
@@ -8,6 +8,11 @@
         "pid": "0x626F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "C5", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "E7", "E6", "F0", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "C6"],
+        "rows": ["B7", "D0", "D1", "D2", "D3", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "at90usb1286",
     "bootloader": "halfkay",
     "layouts": {
diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h
index 1c175166ee..1dcbcdb5b8 100644
--- a/keyboards/boston/config.h
+++ b/keyboards/boston/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-#define MATRIX_COL_PINS \
-    { B10, B11, B12, B13, B14, B15, A8, A9, A10, A15, B3, B4, B7, B8, B9, C14, C15, F0, A3 }
-#define MATRIX_ROW_PINS \
-    { B5, B6, A7, B0, B1, B2, A4 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
@@ -32,7 +26,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGBLED */
-#define RGB_DI_PIN A5
 #define RGBLED_NUM 1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json
index 1d8e39f29d..f169d0966c 100644
--- a/keyboards/boston/info.json
+++ b/keyboards/boston/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4176",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3", "B4", "B7", "B8", "B9", "C14", "C15", "F0", "A3"],
+        "rows": ["B5", "B6", "A7", "B0", "B1", "B2", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C13", "pin_b": "F1", "resolution": 2}
@@ -18,6 +23,9 @@
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "A5"
+    },
     "indicators": {
         "caps_lock": "A1",
         "num_lock": "A0",
diff --git a/keyboards/boston/rules.mk b/keyboards/boston/rules.mk
index 8d99a6cd0b..176d6b7982 100644
--- a/keyboards/boston/rules.mk
+++ b/keyboards/boston/rules.mk
@@ -14,6 +14,3 @@ ENCODER_ENABLE = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
-# RGB setting
-WS2812_DRIVER = bitbang
diff --git a/keyboards/boston_meetup/2019/2019.c b/keyboards/boston_meetup/2019/2019.c
index e558048f6a..1097c58de2 100644
--- a/keyboards/boston_meetup/2019/2019.c
+++ b/keyboards/boston_meetup/2019/2019.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "2019.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 #include "rgb_matrix.h"
diff --git a/keyboards/boston_meetup/2019/2019.h b/keyboards/boston_meetup/2019/2019.h
deleted file mode 100644
index fbba5c3154..0000000000
--- a/keyboards/boston_meetup/2019/2019.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 ishtob
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "boston_meetup.h"
-
diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index 00e8648df8..d609409cb5 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -1,22 +1,5 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS { A3, B8, B9, B1 }
-#define MATRIX_COL_PINS { A7, A8, B2, B10 }
-
 //Audio
 #undef AUDIO_VOICES
 #undef AUDIO_PIN
@@ -38,17 +21,6 @@
 #define OLED_UPDATE_INTERVAL 33 // ~30fps
 
 /*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-/*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
  */
@@ -125,7 +97,6 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 10
-#define RGB_DI_PIN B5
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json
index 22f54c3472..d50e92e17c 100644
--- a/keyboards/boston_meetup/2019/info.json
+++ b/keyboards/boston_meetup/2019/info.json
@@ -2,11 +2,22 @@
     "usb": {
         "device_version": "20.1.9"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A7", "A8", "B2", "B10"],
+        "rows": ["A3", "B8", "B9", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B13", "pin_b": "B14"}
         ]
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
index a32fadf0b0..b2f1131ffd 100644
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes          # Audio output
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = DRV2605L
 OLED_ENABLE = yes
diff --git a/keyboards/boston_meetup/boston_meetup.c b/keyboards/boston_meetup/boston_meetup.c
deleted file mode 100644
index a9201ac852..0000000000
--- a/keyboards/boston_meetup/boston_meetup.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "boston_meetup.h"
-
diff --git a/keyboards/boston_meetup/boston_meetup.h b/keyboards/boston_meetup/boston_meetup.h
deleted file mode 100644
index e1d9d92060..0000000000
--- a/keyboards/boston_meetup/boston_meetup.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_boston_meetup_2019
-    #include "2019.h"
-#define LAYOUT( \
-    K00, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-  ) \
-{ \
-  {  K00,  KC_NO, KC_NO, KC_NO  }, \
-  {  K10,  K11,   K12,   K13    }, \
-  {  K20,  K21,   K22,   K23    }, \
-  {  K30,  K31,   K32,   K33    }  \
-}
-#endif
-
-#include "quantum.h"
\ No newline at end of file
diff --git a/keyboards/boston_meetup/config.h b/keyboards/boston_meetup/config.h
deleted file mode 100644
index 80379fab18..0000000000
--- a/keyboards/boston_meetup/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-//#define AUDIO_VOICES
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boston_meetup/info.json b/keyboards/boston_meetup/info.json
index 2c25d4ff06..6be55c249c 100644
--- a/keyboards/boston_meetup/info.json
+++ b/keyboards/boston_meetup/info.json
@@ -9,6 +9,24 @@
   },
   "layouts": {
     "LAYOUT": {
- "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":3, "y":1}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}]    }
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3}
+      ]
+    }
   }
 }
diff --git a/keyboards/botanicalkeyboards/fm2u/info.json b/keyboards/botanicalkeyboards/fm2u/info.json
index 0d4dd1e88b..3f9009625d 100644
--- a/keyboards/botanicalkeyboards/fm2u/info.json
+++ b/keyboards/botanicalkeyboards/fm2u/info.json
@@ -42,7 +42,7 @@
         },
         "LAYOUT_1u5": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.50, "matrix": [0, 0]}
+                {"x": 0, "y": 0, "w": 1.5, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_1u75": {
diff --git a/keyboards/box75/box75.c b/keyboards/box75/box75.c
deleted file mode 100644
index 43d3030907..0000000000
--- a/keyboards/box75/box75.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 �lvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "box75.h"
diff --git a/keyboards/box75/config.h b/keyboards/box75/config.h
index d7b265f4e3..f608132b5a 100644
--- a/keyboards/box75/config.h
+++ b/keyboards/box75/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B11, B10, B2 , B1, B0, A7 , A6, A5, A4, A3, A8, B15, B14, B13, A15 }
-#define MATRIX_ROW_PINS { A10, A9 , B12, A2, A1, A0 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/box75/info.json b/keyboards/box75/info.json
index fabf306730..097366637e 100644
--- a/keyboards/box75/info.json
+++ b/keyboards/box75/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB075",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14", "B13", "A15"],
+        "rows": ["A10", "A9", "B12", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
index 63a1f97726..2dae864ddb 100644
--- a/keyboards/bpiphany/four_banger/config.h
+++ b/keyboards/bpiphany/four_banger/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B2, B6 }
-#define MATRIX_COL_PINS { B5, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/bpiphany/four_banger/four_banger.c b/keyboards/bpiphany/four_banger/four_banger.c
deleted file mode 100644
index 20aefb61d9..0000000000
--- a/keyboards/bpiphany/four_banger/four_banger.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "four_banger.h"
\ No newline at end of file
diff --git a/keyboards/bpiphany/four_banger/four_banger.h b/keyboards/bpiphany/four_banger/four_banger.h
deleted file mode 100644
index 1d735a1f0f..0000000000
--- a/keyboards/bpiphany/four_banger/four_banger.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x2( \
-    k00, k01, \
-    k10, k11 \
-) { \
-    { k00, k01 }, \
-    { k10, k11 } \
-}
diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/info.json
index cb9b7d148d..ce9b4a7ec5 100644
--- a/keyboards/bpiphany/four_banger/info.json
+++ b/keyboards/bpiphany/four_banger/info.json
@@ -8,16 +8,24 @@
         "pid": "0x2004",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B4"],
+        "rows": ["B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_2x2": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1}
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1}
             ]
         }
     }
diff --git a/keyboards/bpiphany/frosty_flake/20130602/20130602.c b/keyboards/bpiphany/frosty_flake/20130602/20130602.c
index 2c8e7517b9..05abbb567e 100644
--- a/keyboards/bpiphany/frosty_flake/20130602/20130602.c
+++ b/keyboards/bpiphany/frosty_flake/20130602/20130602.c
@@ -1,4 +1,4 @@
-#include "frosty_flake.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinOutput(B7); // caps lock
diff --git a/keyboards/bpiphany/frosty_flake/20140521/20140521.c b/keyboards/bpiphany/frosty_flake/20140521/20140521.c
index 65c40ab86e..3c8bf3bd79 100644
--- a/keyboards/bpiphany/frosty_flake/20140521/20140521.c
+++ b/keyboards/bpiphany/frosty_flake/20140521/20140521.c
@@ -1,4 +1,4 @@
-#include "frosty_flake.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinOutput(B7); // num lock
diff --git a/keyboards/bpiphany/frosty_flake/frosty_flake.h b/keyboards/bpiphany/frosty_flake/frosty_flake.h
deleted file mode 100644
index f4f69f1a3d..0000000000
--- a/keyboards/bpiphany/frosty_flake/frosty_flake.h
+++ /dev/null
@@ -1,136 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-
-/*
-  Matrix col/row mapping
-
-  ,----.    ,-------------------. ,-------------------. ,-------------------. ,--------------.
-  | J6 |    | I4 | H4 | H2 | H6 | | A7 | E6 | D2 | D4 | | B4 | B7 | B6 | B0 | | C7 | C5 | A5 |
-  `----'    `-------------------' `-------------------' `-------------------' `--------------'
-  ,-------------------------------------------------------------------------. ,--------------. ,-------------------.
-  | J4 | J7 | I7 | H7 | G7 | G4 | F4 | F7 | E7 | D7 | R7 | R4 | E4 |     B2 | | L4 | O4 | Q4 | | K1 | L1 | Q1 | Q0 |
-  |-------------------------------------------------------------------------| |--------------| |-------------------|
-  | J2   | J5 | I5 | H5 | G5 | G2 | F2 | F5 | E5 | D5 | R5 | R2 | E2 |   B3 | | K4 | O7 | Q7 | | K5 | L5 | Q5 | O5 |
-  |-------------------------------------------------------------------------| '--------------' |--------------     |
-  | O5    | J3 | I3 | H3 | G3 | G6 | F6 | F3 | E3 | D3 | R3 | R6 |       B1 |                  | K2 | L2 | Q2 |    |
-  |-------------------------------------------------------------------------|      ,----.      |-------------------|
-  | N2      | J1 | I1 | H1 | G1 | G0 | F0 | F1 | E1 | D1 | R0 |          N3 |      | O6 |      | K3 | L3 | Q3 | O3 |
-  |-------------------------------------------------------------------------| ,--------------. |--------------     |
-  | A4 | P2 | C6 |                  K6                  | C0 | M3 | D0 | A1 | | O0 | K0 | L0 | | L6      | Q6 |    |
-  `-------------------------------------------------------------------------' `--------------' `-------------------'
-*/
-#define LAYOUT( \
-  KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \
-  KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-  KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-  KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2,      \
-  KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-  KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \
-) \
-{ \
-/*        0        1        2        3        4        5        6        7        */ \
-/* A */ { KC_NO,   KA1,     KC_NO,   KC_NO,   KA4,     KA5,     KC_NO,   KA7,     }, \
-/* B */ { KB0,     KB1,     KB2,     KB3,     KB4,     KC_NO,   KB6,     KB7,     }, \
-/* C */ { KC0,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC5,     KC6,     KC7,     }, \
-/* D */ { KD0,     KD1,     KD2,     KD3,     KD4,     KD5,     KC_NO,   KD7,     }, \
-/* E */ { KC_NO,   KE1,     KE2,     KE3,     KE4,     KE5,     KE6,     KE7,     }, \
-/* F */ { KF0,     KF1,     KF2,     KF3,     KF4,     KF5,     KF6,     KF7,     }, \
-/* G */ { KG0,     KG1,     KG2,     KG3,     KG4,     KG5,     KG6,     KG7,     }, \
-/* H */ { KC_NO,   KH1,     KH2,     KH3,     KH4,     KH5,     KH6,     KH7,     }, \
-/* I */ { KC_NO,   KI1,     KI2,     KI3,     KI4,     KI5,     KI6,     KI7,     }, \
-/* J */ { KC_NO,   KJ1,     KJ2,     KJ3,     KJ4,     KJ5,     KJ6,     KJ7,     }, \
-/* K */ { KK0,     KK1,     KK2,     KK3,     KK4,     KK5,     KK6,     KC_NO,   }, \
-/* L */ { KL0,     KL1,     KL2,     KL3,     KL4,     KL5,     KL6,     KC_NO,   }, \
-/* M */ { KC_NO,   KC_NO,   KC_NO,   KM3,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   }, \
-/* N */ { KC_NO,   KC_NO,   KN2,     KN3,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   }, \
-/* O */ { KO0,     KC_NO,   KC_NO,   KO3,     KO4,     KO5,     KO6,     KO7,     }, \
-/* P */ { KC_NO,   KC_NO,   KP2,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   }, \
-/* Q */ { KQ0,     KQ1,     KQ2,     KQ3,     KQ4,     KQ5,     KQ6,     KQ7,     }, \
-/* R */ { KR0,     KC_NO,   KR2,     KR3,     KR4,     KR5,     KR6,     KR7,     }, \
-}
-
-/*
-  Matrix col/row mapping (TKL)
-
-  ,----.    ,-------------------. ,-------------------. ,-------------------. ,--------------.
-  | J6 |    | I4 | H4 | H2 | H6 | | A7 | E6 | D2 | D4 | | B4 | B7 | B6 | B0 | | C7 | C5 | A5 |
-  `----'    `-------------------' `-------------------' `-------------------' `--------------'
-  ,-------------------------------------------------------------------------. ,--------------.
-  | J4 | J7 | I7 | H7 | G7 | G4 | F4 | F7 | E7 | D7 | R7 | R4 | E4 |     B2 | | L4 | O4 | Q4 |
-  |-------------------------------------------------------------------------| |--------------|
-  | J2   | J5 | I5 | H5 | G5 | G2 | F2 | F5 | E5 | D5 | R5 | R2 | E2 |   B3 | | K4 | O7 | Q7 |
-  |-------------------------------------------------------------------------| '--------------'
-  | O5    | J3 | I3 | H3 | G3 | G6 | F6 | F3 | E3 | D3 | R3 | R6 |       B1 |
-  |-------------------------------------------------------------------------|      ,----.
-  | N2      | J1 | I1 | H1 | G1 | G0 | F0 | F1 | E1 | D1 | R0 |          N3 |      | O6 |
-  |-------------------------------------------------------------------------| ,--------------.
-  | A4 | P2 | C6 |                  K6                  | C0 | M3 | D0 | A1 | | O0 | K0 | L0 |
-  `-------------------------------------------------------------------------' `--------------'
-*/
-
-#define LAYOUT_tkl( \
-  KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-  KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4, \
-  KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7, \
-  KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                  \
-  KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,      \
-  KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0  \
-) \
-{ \
-/*        0        1        2        3        4        5        6        7        */ \
-/* A */ { KC_NO,   KA1,     KC_NO,   KC_NO,   KA4,     KA5,     KC_NO,   KA7,     }, \
-/* B */ { KB0,     KB1,     KB2,     KB3,     KB4,     KC_NO,   KB6,     KB7,     }, \
-/* C */ { KC0,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC5,     KC6,     KC7,     }, \
-/* D */ { KD0,     KD1,     KD2,     KD3,     KD4,     KD5,     KC_NO,   KD7,     }, \
-/* E */ { KC_NO,   KE1,     KE2,     KE3,     KE4,     KE5,     KE6,     KE7,     }, \
-/* F */ { KF0,     KF1,     KF2,     KF3,     KF4,     KF5,     KF6,     KF7,     }, \
-/* G */ { KG0,     KG1,     KG2,     KG3,     KG4,     KG5,     KG6,     KG7,     }, \
-/* H */ { KC_NO,   KH1,     KH2,     KH3,     KH4,     KH5,     KH6,     KH7,     }, \
-/* I */ { KC_NO,   KI1,     KI2,     KI3,     KI4,     KI5,     KI6,     KI7,     }, \
-/* J */ { KC_NO,   KJ1,     KJ2,     KJ3,     KJ4,     KJ5,     KJ6,     KJ7,     }, \
-/* K */ { KK0,     KC_NO,   KC_NO,   KC_NO,   KK4,     KC_NO,   KK6,     KC_NO,   }, \
-/* L */ { KL0,     KC_NO,   KC_NO,   KC_NO,   KL4,     KC_NO,   KC_NO,   KC_NO,   }, \
-/* M */ { KC_NO,   KC_NO,   KC_NO,   KM3,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   }, \
-/* N */ { KC_NO,   KC_NO,   KN2,     KN3,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   }, \
-/* O */ { KO0,     KC_NO,   KC_NO,   KC_NO,   KO4,     KC_NO,   KO6,     KO7,     }, \
-/* P */ { KC_NO,   KC_NO,   KP2,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   }, \
-/* Q */ { KC_NO,   KC_NO,   KC_NO,   KC_NO,   KQ4,     KC_NO,   KC_NO,   KQ7,     }, \
-/* R */ { KR0,     KC_NO,   KR2,     KR3,     KR4,     KR5,     KR6,     KR7,     }, \
-}
-
-#define LAYOUT_tkl_ansi( \
-  KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-  KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4, \
-  KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7, \
-  KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                  \
-  KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,      \
-  KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0  \
-) \
-{ \
-/*        0        1        2        3        4        5        6        7        */ \
-/* A */ { KC_NO,   KA1,     KC_NO,   KC_NO,   KA4,     KA5,     KC_NO,   KA7,     }, \
-/* B */ { KB0,     KB1,     KB2,     KB3,     KB4,     KC_NO,   KB6,     KB7,     }, \
-/* C */ { KC0,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC5,     KC6,     KC7,     }, \
-/* D */ { KD0,     KD1,     KD2,     KD3,     KD4,     KD5,     KC_NO,   KD7,     }, \
-/* E */ { KC_NO,   KE1,     KE2,     KE3,     KE4,     KE5,     KE6,     KE7,     }, \
-/* F */ { KF0,     KF1,     KF2,     KF3,     KF4,     KF5,     KF6,     KF7,     }, \
-/* G */ { KG0,     KG1,     KG2,     KG3,     KG4,     KG5,     KG6,     KG7,     }, \
-/* H */ { KC_NO,   KH1,     KH2,     KH3,     KH4,     KH5,     KH6,     KH7,     }, \
-/* I */ { KC_NO,   KI1,     KI2,     KI3,     KI4,     KI5,     KC_NO,   KI7,     }, \
-/* J */ { KC_NO,   KJ1,     KJ2,     KJ3,     KJ4,     KJ5,     KJ6,     KJ7,     }, \
-/* K */ { KK0,     KC_NO,   KC_NO,   KC_NO,   KK4,     KC_NO,   KK6,     KC_NO,   }, \
-/* L */ { KL0,     KC_NO,   KC_NO,   KC_NO,   KL4,     KC_NO,   KC_NO,   KC_NO,   }, \
-/* M */ { KC_NO,   KC_NO,   KC_NO,   KM3,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   }, \
-/* N */ { KC_NO,   KC_NO,   KN2,     KN3,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   }, \
-/* O */ { KO0,     KC_NO,   KC_NO,   KC_NO,   KO4,     KC_NO,   KO6,     KO7,     }, \
-/* P */ { KC_NO,   KC_NO,   KP2,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   }, \
-/* Q */ { KC_NO,   KC_NO,   KC_NO,   KC_NO,   KQ4,     KC_NO,   KC_NO,   KQ7,     }, \
-/* R */ { KR0,     KC_NO,   KR2,     KR3,     KR4,     KR5,     KR6,     KR7,     }, \
-}
-
diff --git a/keyboards/bpiphany/frosty_flake/info.json b/keyboards/bpiphany/frosty_flake/info.json
index 021bac2ddd..748ad68076 100644
--- a/keyboards/bpiphany/frosty_flake/info.json
+++ b/keyboards/bpiphany/frosty_flake/info.json
@@ -14,294 +14,338 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"Print Screen", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"`", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"=", "x":12, "y":1.5},
-        {"label":"Backspace", "x":13, "y":1.5, "w":2},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Num Lock", "x":18.5, "y":1.5},
-        {"label":"/", "x":19.5, "y":1.5},
-        {"label":"*", "x":20.5, "y":1.5},
-        {"label":"-", "x":21.5, "y":1.5},
-        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.5},
-        {"label":"W", "x":2.5, "y":2.5},
-        {"label":"E", "x":3.5, "y":2.5},
-        {"label":"R", "x":4.5, "y":2.5},
-        {"label":"T", "x":5.5, "y":2.5},
-        {"label":"Y", "x":6.5, "y":2.5},
-        {"label":"U", "x":7.5, "y":2.5},
-        {"label":"I", "x":8.5, "y":2.5},
-        {"label":"O", "x":9.5, "y":2.5},
-        {"label":"P", "x":10.5, "y":2.5},
-        {"label":"[", "x":11.5, "y":2.5},
-        {"label":"]", "x":12.5, "y":2.5},
-        {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-        {"label":"Delete", "x":15.25, "y":2.5},
-        {"label":"End", "x":16.25, "y":2.5},
-        {"label":"Page Down", "x":17.25, "y":2.5},
-        {"label":"7", "x":18.5, "y":2.5},
-        {"label":"8", "x":19.5, "y":2.5},
-        {"label":"9", "x":20.5, "y":2.5},
-        {"label":"+", "x":21.5, "y":2.5, "h":2},
-        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.5},
-        {"label":"S", "x":2.75, "y":3.5},
-        {"label":"D", "x":3.75, "y":3.5},
-        {"label":"F", "x":4.75, "y":3.5},
-        {"label":"G", "x":5.75, "y":3.5},
-        {"label":"H", "x":6.75, "y":3.5},
-        {"label":"J", "x":7.75, "y":3.5},
-        {"label":"K", "x":8.75, "y":3.5},
-        {"label":"L", "x":9.75, "y":3.5},
-        {"label":";", "x":10.75, "y":3.5},
-        {"label":"'", "x":11.75, "y":3.5},
-        {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-        {"label":"4", "x":18.5, "y":3.5},
-        {"label":"5", "x":19.5, "y":3.5},
-        {"label":"6", "x":20.5, "y":3.5},
-        {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-        {"label":"ISO \\", "x":1.25, "y":4.5},
-        {"label":"Z", "x":2.25, "y":4.5},
-        {"label":"X", "x":3.25, "y":4.5},
-        {"label":"C", "x":4.25, "y":4.5},
-        {"label":"V", "x":5.25, "y":4.5},
-        {"label":"B", "x":6.25, "y":4.5},
-        {"label":"N", "x":7.25, "y":4.5},
-        {"label":"M", "x":8.25, "y":4.5},
-        {"label":",", "x":9.25, "y":4.5},
-        {"label":".", "x":10.25, "y":4.5},
-        {"label":"/", "x":11.25, "y":4.5},
-        {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-        {"label":"Up", "x":16.25, "y":4.5},
-        {"label":"1", "x":18.5, "y":4.5},
-        {"label":"2", "x":19.5, "y":4.5},
-        {"label":"3", "x":20.5, "y":4.5},
-        {"label":"Enter", "x":21.5, "y":4.5, "h":2},
-        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-        {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-        {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-        {"label":"Left", "x":15.25, "y":5.5},
-        {"label":"Down", "x":16.25, "y":5.5},
-        {"label":"Right", "x":17.25, "y":5.5},
-        {"label":"0", "x":18.5, "y":5.5, "w":2},
-        {"label":".", "x":20.5, "y":5.5}
+        {"matrix": [9, 6], "x": 0, "y": 0},
+
+        {"matrix": [8, 4], "x": 2, "y": 0},
+        {"matrix": [7, 4], "x": 3, "y": 0},
+        {"matrix": [7, 2], "x": 4, "y": 0},
+        {"matrix": [7, 6], "x": 5, "y": 0},
+
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [4, 6], "x": 7.5, "y": 0},
+        {"matrix": [3, 2], "x": 8.5, "y": 0},
+        {"matrix": [3, 4], "x": 9.5, "y": 0},
+
+        {"matrix": [1, 4], "x": 11, "y": 0},
+        {"matrix": [1, 7], "x": 12, "y": 0},
+        {"matrix": [1, 6], "x": 13, "y": 0},
+        {"matrix": [1, 0], "x": 14, "y": 0},
+
+        {"matrix": [2, 7], "x": 15.25, "y": 0},
+        {"matrix": [2, 5], "x": 16.25, "y": 0},
+        {"matrix": [0, 5], "x": 17.25, "y": 0},
+
+        {"matrix": [9, 4], "x": 0, "y": 1.5},
+        {"matrix": [9, 7], "x": 1, "y": 1.5},
+        {"matrix": [8, 7], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [6, 7], "x": 4, "y": 1.5},
+        {"matrix": [6, 4], "x": 5, "y": 1.5},
+        {"matrix": [5, 4], "x": 6, "y": 1.5},
+        {"matrix": [5, 7], "x": 7, "y": 1.5},
+        {"matrix": [4, 7], "x": 8, "y": 1.5},
+        {"matrix": [3, 7], "x": 9, "y": 1.5},
+        {"matrix": [17, 7], "x": 10, "y": 1.5},
+        {"matrix": [17, 4], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [1, 2], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [11, 4], "x": 15.25, "y": 1.5},
+        {"matrix": [14, 4], "x": 16.25, "y": 1.5},
+        {"matrix": [16, 4], "x": 17.25, "y": 1.5},
+
+        {"matrix": [10, 1], "x": 18.5, "y": 1.5},
+        {"matrix": [11, 1], "x": 19.5, "y": 1.5},
+        {"matrix": [16, 1], "x": 20.5, "y": 1.5},
+        {"matrix": [16, 0], "x": 21.5, "y": 1.5},
+
+        {"matrix": [9, 2], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [9, 5], "x": 1.5, "y": 2.5},
+        {"matrix": [8, 5], "x": 2.5, "y": 2.5},
+        {"matrix": [7, 5], "x": 3.5, "y": 2.5},
+        {"matrix": [6, 5], "x": 4.5, "y": 2.5},
+        {"matrix": [6, 2], "x": 5.5, "y": 2.5},
+        {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [4, 5], "x": 8.5, "y": 2.5},
+        {"matrix": [3, 5], "x": 9.5, "y": 2.5},
+        {"matrix": [17, 5], "x": 10.5, "y": 2.5},
+        {"matrix": [17, 2], "x": 11.5, "y": 2.5},
+        {"matrix": [4, 2], "x": 12.5, "y": 2.5},
+        {"matrix": [1, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [10, 4], "x": 15.25, "y": 2.5},
+        {"matrix": [14, 7], "x": 16.25, "y": 2.5},
+        {"matrix": [16, 7], "x": 17.25, "y": 2.5},
+
+        {"matrix": [10, 5], "x": 18.5, "y": 2.5},
+        {"matrix": [11, 5], "x": 19.5, "y": 2.5},
+        {"matrix": [16, 5], "x": 20.5, "y": 2.5},
+        {"matrix": [14, 5], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [8, 2], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [9, 3], "x": 1.75, "y": 3.5},
+        {"matrix": [8, 3], "x": 2.75, "y": 3.5},
+        {"matrix": [7, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [6, 3], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [5, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [5, 3], "x": 7.75, "y": 3.5},
+        {"matrix": [4, 3], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [17, 3], "x": 10.75, "y": 3.5},
+        {"matrix": [17, 6], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [10, 2], "x": 18.5, "y": 3.5},
+        {"matrix": [11, 2], "x": 19.5, "y": 3.5},
+        {"matrix": [16, 2], "x": 20.5, "y": 3.5},
+
+        {"matrix": [13, 2], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [8, 6], "x": 1.25, "y": 4.5},
+        {"matrix": [9, 1], "x": 2.25, "y": 4.5},
+        {"matrix": [8, 1], "x": 3.25, "y": 4.5},
+        {"matrix": [7, 1], "x": 4.25, "y": 4.5},
+        {"matrix": [6, 1], "x": 5.25, "y": 4.5},
+        {"matrix": [6, 0], "x": 6.25, "y": 4.5},
+        {"matrix": [5, 0], "x": 7.25, "y": 4.5},
+        {"matrix": [5, 1], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 1], "x": 9.25, "y": 4.5},
+        {"matrix": [3, 1], "x": 10.25, "y": 4.5},
+        {"matrix": [17, 0], "x": 11.25, "y": 4.5},
+        {"matrix": [13, 3], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [14, 6], "x": 16.25, "y": 4.5},
+
+        {"matrix": [10, 3], "x": 18.5, "y": 4.5},
+        {"matrix": [11, 3], "x": 19.5, "y": 4.5},
+        {"matrix": [16, 3], "x": 20.5, "y": 4.5},
+        {"matrix": [14, 3], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [0, 4], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [15, 2], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 6], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [10, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [2, 0], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [12, 3], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 0], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [14, 0], "x": 15.25, "y": 5.5},
+        {"matrix": [10, 0], "x": 16.25, "y": 5.5},
+        {"matrix": [11, 0], "x": 17.25, "y": 5.5},
+
+        {"matrix": [11, 6], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [16, 6], "x": 20.5, "y": 5.5}
       ]
     },
     "LAYOUT_tkl": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"Print Screen", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"`", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"=", "x":12, "y":1.5},
-        {"label":"Backspace", "x":13, "y":1.5, "w":2},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.5},
-        {"label":"W", "x":2.5, "y":2.5},
-        {"label":"E", "x":3.5, "y":2.5},
-        {"label":"R", "x":4.5, "y":2.5},
-        {"label":"T", "x":5.5, "y":2.5},
-        {"label":"Y", "x":6.5, "y":2.5},
-        {"label":"U", "x":7.5, "y":2.5},
-        {"label":"I", "x":8.5, "y":2.5},
-        {"label":"O", "x":9.5, "y":2.5},
-        {"label":"P", "x":10.5, "y":2.5},
-        {"label":"[", "x":11.5, "y":2.5},
-        {"label":"]", "x":12.5, "y":2.5},
-        {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-        {"label":"Delete", "x":15.25, "y":2.5},
-        {"label":"End", "x":16.25, "y":2.5},
-        {"label":"Page Down", "x":17.25, "y":2.5},
-        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.5},
-        {"label":"S", "x":2.75, "y":3.5},
-        {"label":"D", "x":3.75, "y":3.5},
-        {"label":"F", "x":4.75, "y":3.5},
-        {"label":"G", "x":5.75, "y":3.5},
-        {"label":"H", "x":6.75, "y":3.5},
-        {"label":"J", "x":7.75, "y":3.5},
-        {"label":"K", "x":8.75, "y":3.5},
-        {"label":"L", "x":9.75, "y":3.5},
-        {"label":";", "x":10.75, "y":3.5},
-        {"label":"'", "x":11.75, "y":3.5},
-        {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-        {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-        {"label":"ISO \\", "x":1.25, "y":4.5},
-        {"label":"Z", "x":2.25, "y":4.5},
-        {"label":"X", "x":3.25, "y":4.5},
-        {"label":"C", "x":4.25, "y":4.5},
-        {"label":"V", "x":5.25, "y":4.5},
-        {"label":"B", "x":6.25, "y":4.5},
-        {"label":"N", "x":7.25, "y":4.5},
-        {"label":"M", "x":8.25, "y":4.5},
-        {"label":",", "x":9.25, "y":4.5},
-        {"label":".", "x":10.25, "y":4.5},
-        {"label":"/", "x":11.25, "y":4.5},
-        {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-        {"label":"Up", "x":16.25, "y":4.5},
-        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-        {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-        {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-        {"label":"Left", "x":15.25, "y":5.5},
-        {"label":"Down", "x":16.25, "y":5.5},
-        {"label":"Right", "x":17.25, "y":5.5}
+        {"matrix": [9, 6], "x": 0, "y": 0},
+
+        {"matrix": [8, 4], "x": 2, "y": 0},
+        {"matrix": [7, 4], "x": 3, "y": 0},
+        {"matrix": [7, 2], "x": 4, "y": 0},
+        {"matrix": [7, 6], "x": 5, "y": 0},
+
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [4, 6], "x": 7.5, "y": 0},
+        {"matrix": [3, 2], "x": 8.5, "y": 0},
+        {"matrix": [3, 4], "x": 9.5, "y": 0},
+
+        {"matrix": [1, 4], "x": 11, "y": 0},
+        {"matrix": [1, 7], "x": 12, "y": 0},
+        {"matrix": [1, 6], "x": 13, "y": 0},
+        {"matrix": [1, 0], "x": 14, "y": 0},
+
+        {"matrix": [2, 7], "x": 15.25, "y": 0},
+        {"matrix": [2, 5], "x": 16.25, "y": 0},
+        {"matrix": [0, 5], "x": 17.25, "y": 0},
+
+        {"matrix": [9, 4], "x": 0, "y": 1.5},
+        {"matrix": [9, 7], "x": 1, "y": 1.5},
+        {"matrix": [8, 7], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [6, 7], "x": 4, "y": 1.5},
+        {"matrix": [6, 4], "x": 5, "y": 1.5},
+        {"matrix": [5, 4], "x": 6, "y": 1.5},
+        {"matrix": [5, 7], "x": 7, "y": 1.5},
+        {"matrix": [4, 7], "x": 8, "y": 1.5},
+        {"matrix": [3, 7], "x": 9, "y": 1.5},
+        {"matrix": [17, 7], "x": 10, "y": 1.5},
+        {"matrix": [17, 4], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [1, 2], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [11, 4], "x": 15.25, "y": 1.5},
+        {"matrix": [14, 4], "x": 16.25, "y": 1.5},
+        {"matrix": [16, 4], "x": 17.25, "y": 1.5},
+
+        {"matrix": [9, 2], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [9, 5], "x": 1.5, "y": 2.5},
+        {"matrix": [8, 5], "x": 2.5, "y": 2.5},
+        {"matrix": [7, 5], "x": 3.5, "y": 2.5},
+        {"matrix": [6, 5], "x": 4.5, "y": 2.5},
+        {"matrix": [6, 2], "x": 5.5, "y": 2.5},
+        {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [4, 5], "x": 8.5, "y": 2.5},
+        {"matrix": [3, 5], "x": 9.5, "y": 2.5},
+        {"matrix": [17, 5], "x": 10.5, "y": 2.5},
+        {"matrix": [17, 2], "x": 11.5, "y": 2.5},
+        {"matrix": [4, 2], "x": 12.5, "y": 2.5},
+        {"matrix": [1, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [10, 4], "x": 15.25, "y": 2.5},
+        {"matrix": [14, 7], "x": 16.25, "y": 2.5},
+        {"matrix": [16, 7], "x": 17.25, "y": 2.5},
+
+        {"matrix": [8, 2], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [9, 3], "x": 1.75, "y": 3.5},
+        {"matrix": [8, 3], "x": 2.75, "y": 3.5},
+        {"matrix": [7, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [6, 3], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [5, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [5, 3], "x": 7.75, "y": 3.5},
+        {"matrix": [4, 3], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [17, 3], "x": 10.75, "y": 3.5},
+        {"matrix": [17, 6], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [13, 2], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [8, 6], "x": 1.25, "y": 4.5},
+        {"matrix": [9, 1], "x": 2.25, "y": 4.5},
+        {"matrix": [8, 1], "x": 3.25, "y": 4.5},
+        {"matrix": [7, 1], "x": 4.25, "y": 4.5},
+        {"matrix": [6, 1], "x": 5.25, "y": 4.5},
+        {"matrix": [6, 0], "x": 6.25, "y": 4.5},
+        {"matrix": [5, 0], "x": 7.25, "y": 4.5},
+        {"matrix": [5, 1], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 1], "x": 9.25, "y": 4.5},
+        {"matrix": [3, 1], "x": 10.25, "y": 4.5},
+        {"matrix": [17, 0], "x": 11.25, "y": 4.5},
+        {"matrix": [13, 3], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [14, 6], "x": 16.25, "y": 4.5},
+
+        {"matrix": [0, 4], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [15, 2], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 6], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [10, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [2, 0], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [12, 3], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 0], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [14, 0], "x": 15.25, "y": 5.5},
+        {"matrix": [10, 0], "x": 16.25, "y": 5.5},
+        {"matrix": [11, 0], "x": 17.25, "y": 5.5}
       ]
     },
     "LAYOUT_tkl_ansi": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"Print Screen", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"`", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"=", "x":12, "y":1.5},
-        {"label":"Backspace", "x":13, "y":1.5, "w":2},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.5},
-        {"label":"W", "x":2.5, "y":2.5},
-        {"label":"E", "x":3.5, "y":2.5},
-        {"label":"R", "x":4.5, "y":2.5},
-        {"label":"T", "x":5.5, "y":2.5},
-        {"label":"Y", "x":6.5, "y":2.5},
-        {"label":"U", "x":7.5, "y":2.5},
-        {"label":"I", "x":8.5, "y":2.5},
-        {"label":"O", "x":9.5, "y":2.5},
-        {"label":"P", "x":10.5, "y":2.5},
-        {"label":"[", "x":11.5, "y":2.5},
-        {"label":"]", "x":12.5, "y":2.5},
-        {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-        {"label":"Delete", "x":15.25, "y":2.5},
-        {"label":"End", "x":16.25, "y":2.5},
-        {"label":"Page Down", "x":17.25, "y":2.5},
-        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.5},
-        {"label":"S", "x":2.75, "y":3.5},
-        {"label":"D", "x":3.75, "y":3.5},
-        {"label":"F", "x":4.75, "y":3.5},
-        {"label":"G", "x":5.75, "y":3.5},
-        {"label":"H", "x":6.75, "y":3.5},
-        {"label":"J", "x":7.75, "y":3.5},
-        {"label":"K", "x":8.75, "y":3.5},
-        {"label":"L", "x":9.75, "y":3.5},
-        {"label":";", "x":10.75, "y":3.5},
-        {"label":"'", "x":11.75, "y":3.5},
-        {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-        {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-        {"label":"Z", "x":2.25, "y":4.5},
-        {"label":"X", "x":3.25, "y":4.5},
-        {"label":"C", "x":4.25, "y":4.5},
-        {"label":"V", "x":5.25, "y":4.5},
-        {"label":"B", "x":6.25, "y":4.5},
-        {"label":"N", "x":7.25, "y":4.5},
-        {"label":"M", "x":8.25, "y":4.5},
-        {"label":",", "x":9.25, "y":4.5},
-        {"label":".", "x":10.25, "y":4.5},
-        {"label":"/", "x":11.25, "y":4.5},
-        {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-        {"label":"Up", "x":16.25, "y":4.5},
-        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-        {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-        {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-        {"label":"Left", "x":15.25, "y":5.5},
-        {"label":"Down", "x":16.25, "y":5.5},
-        {"label":"Right", "x":17.25, "y":5.5}
+        {"matrix": [9, 6], "x": 0, "y": 0},
+
+        {"matrix": [8, 4], "x": 2, "y": 0},
+        {"matrix": [7, 4], "x": 3, "y": 0},
+        {"matrix": [7, 2], "x": 4, "y": 0},
+        {"matrix": [7, 6], "x": 5, "y": 0},
+
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [4, 6], "x": 7.5, "y": 0},
+        {"matrix": [3, 2], "x": 8.5, "y": 0},
+        {"matrix": [3, 4], "x": 9.5, "y": 0},
+
+        {"matrix": [1, 4], "x": 11, "y": 0},
+        {"matrix": [1, 7], "x": 12, "y": 0},
+        {"matrix": [1, 6], "x": 13, "y": 0},
+        {"matrix": [1, 0], "x": 14, "y": 0},
+
+        {"matrix": [2, 7], "x": 15.25, "y": 0},
+        {"matrix": [2, 5], "x": 16.25, "y": 0},
+        {"matrix": [0, 5], "x": 17.25, "y": 0},
+
+        {"matrix": [9, 4], "x": 0, "y": 1.5},
+        {"matrix": [9, 7], "x": 1, "y": 1.5},
+        {"matrix": [8, 7], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [6, 7], "x": 4, "y": 1.5},
+        {"matrix": [6, 4], "x": 5, "y": 1.5},
+        {"matrix": [5, 4], "x": 6, "y": 1.5},
+        {"matrix": [5, 7], "x": 7, "y": 1.5},
+        {"matrix": [4, 7], "x": 8, "y": 1.5},
+        {"matrix": [3, 7], "x": 9, "y": 1.5},
+        {"matrix": [17, 7], "x": 10, "y": 1.5},
+        {"matrix": [17, 4], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [1, 2], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [11, 4], "x": 15.25, "y": 1.5},
+        {"matrix": [14, 4], "x": 16.25, "y": 1.5},
+        {"matrix": [16, 4], "x": 17.25, "y": 1.5},
+
+        {"matrix": [9, 2], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [9, 5], "x": 1.5, "y": 2.5},
+        {"matrix": [8, 5], "x": 2.5, "y": 2.5},
+        {"matrix": [7, 5], "x": 3.5, "y": 2.5},
+        {"matrix": [6, 5], "x": 4.5, "y": 2.5},
+        {"matrix": [6, 2], "x": 5.5, "y": 2.5},
+        {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [4, 5], "x": 8.5, "y": 2.5},
+        {"matrix": [3, 5], "x": 9.5, "y": 2.5},
+        {"matrix": [17, 5], "x": 10.5, "y": 2.5},
+        {"matrix": [17, 2], "x": 11.5, "y": 2.5},
+        {"matrix": [4, 2], "x": 12.5, "y": 2.5},
+        {"matrix": [1, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [10, 4], "x": 15.25, "y": 2.5},
+        {"matrix": [14, 7], "x": 16.25, "y": 2.5},
+        {"matrix": [16, 7], "x": 17.25, "y": 2.5},
+
+        {"matrix": [8, 2], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [9, 3], "x": 1.75, "y": 3.5},
+        {"matrix": [8, 3], "x": 2.75, "y": 3.5},
+        {"matrix": [7, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [6, 3], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [5, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [5, 3], "x": 7.75, "y": 3.5},
+        {"matrix": [4, 3], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [17, 3], "x": 10.75, "y": 3.5},
+        {"matrix": [17, 6], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [13, 2], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [9, 1], "x": 2.25, "y": 4.5},
+        {"matrix": [8, 1], "x": 3.25, "y": 4.5},
+        {"matrix": [7, 1], "x": 4.25, "y": 4.5},
+        {"matrix": [6, 1], "x": 5.25, "y": 4.5},
+        {"matrix": [6, 0], "x": 6.25, "y": 4.5},
+        {"matrix": [5, 0], "x": 7.25, "y": 4.5},
+        {"matrix": [5, 1], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 1], "x": 9.25, "y": 4.5},
+        {"matrix": [3, 1], "x": 10.25, "y": 4.5},
+        {"matrix": [17, 0], "x": 11.25, "y": 4.5},
+        {"matrix": [13, 3], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [14, 6], "x": 16.25, "y": 4.5},
+
+        {"matrix": [0, 4], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [15, 2], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 6], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [10, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [2, 0], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [12, 3], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 0], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [14, 0], "x": 15.25, "y": 5.5},
+        {"matrix": [10, 0], "x": 16.25, "y": 5.5},
+        {"matrix": [11, 0], "x": 17.25, "y": 5.5}
       ]
     }
   }
diff --git a/keyboards/bpiphany/ghost_squid/ghost_squid.h b/keyboards/bpiphany/ghost_squid/ghost_squid.h
index 55259ba740..63d3ea0d5e 100644
--- a/keyboards/bpiphany/ghost_squid/ghost_squid.h
+++ b/keyboards/bpiphany/ghost_squid/ghost_squid.h
@@ -21,59 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define fn_led_on() writePinLow(D0)
 #define fn_led_off() writePinHigh(D0)
-
-#define  ___ KC_NO
-
-/*
- *              ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- *              │J6 │   │I4 │H4 │H2 │H6 │ │A7 │E6 │D2 │D4 │ │B4 │B7 │B6 │B0 │ │C7 │C5 │A5 │
- *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───┬───� ┌───┬───┬───┬───�
- *              │J4 │J7 │I7 │H7 │G7 │G4 │F4 │F7 │E7 │D7 │R7 │R4 │E4 │B2     │ │L4 │O4 │Q4 │ │K1 │L1 │Q1 │Q0 │
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤      ┌─────�
- *              │J2   │J5 │I5 │H5 │G5 │G2 │F2 │F5 │E5 │D5 │R5 │R2 │E2 │B3   │ │K4 │O7 │Q7 │ │K5 │L5 │Q5 │O5 │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┤   │   ┌──┴�B1  │ ISO Enter
- *  LShift      │I2    │J3 │I3 │H3 │G3 │G6 │F6 │F3 │E3 │D3 │R3 │R6 │B1      │               │K2 │L2 │Q2 │   │   │B3 │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───�     ├───┼───┼───┼───┤   └───┴────┘
- * │N2      │   │N2  │I6 │J1 │I1 │H1 │G1 │G0 │F0 │F1 │E1 │D1 │R0 │N3        │     │O6 │     │K3 │L3 │Q3 │O3 │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───� ├───┴───┼───┤   │
- *              │A4  │P2  │C6  │K6                      │C0  │M3  │D0  │A1  │ │O0 │K0 │L0 │ │L6     │Q6 │   │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
- */
-
-#define LAYOUT_fullsize_ansi( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2,      \
-    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \
-    ) { /*        00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , KQ0 , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , KK1 , KL1 , ___ , ___ , ___ , ___ , KQ1 , ___ }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , KK2 , KL2 , ___ , KN2 , ___ , KP2 , KQ2 , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , KK3 , KL3 , KM3 , KN3 , KO3 , ___ , KQ3 , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , KK5 , KL5 , ___ , ___ , KO5 , ___ , KQ5 , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , ___ , KJ6 , KK6 , KL6 , ___ , ___ , KO6 , ___ , KQ6 , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-    }
-
-#define LAYOUT_fullsize_iso( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2,        KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB3, KB1,                    KK2, KL2, KQ2,      \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \
-    ) { /*        00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , KQ0 , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , KK1 , KL1 , ___ , ___ , ___ , ___ , KQ1 , ___ }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , KK2 , KL2 , ___ , KN2 , ___ , KP2 , KQ2 , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , KK3 , KL3 , KM3 , KN3 , KO3 , ___ , KQ3 , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , KK5 , KL5 , ___ , ___ , KO5 , ___ , KQ5 , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , KI6 , KJ6 , KK6 , KL6 , ___ , ___ , KO6 , ___ , KQ6 , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-    }
-
diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json
index bed329ccaf..49b6e10309 100644
--- a/keyboards/bpiphany/ghost_squid/info.json
+++ b/keyboards/bpiphany/ghost_squid/info.json
@@ -23,229 +23,255 @@
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen,", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Ins", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25, "h": 2},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25, "h":2},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25, "w":2},
-                {"label":".", "x":20.5, "y":5.25}
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.25},
+                {"matrix": [7, 9], "x": 1, "y": 1.25},
+                {"matrix": [7, 8], "x": 2, "y": 1.25},
+                {"matrix": [7, 7], "x": 3, "y": 1.25},
+                {"matrix": [7, 6], "x": 4, "y": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 1.25},
+                {"matrix": [7, 5], "x": 7, "y": 1.25},
+                {"matrix": [7, 4], "x": 8, "y": 1.25},
+                {"matrix": [7, 3], "x": 9, "y": 1.25},
+                {"matrix": [7, 17], "x": 10, "y": 1.25},
+                {"matrix": [4, 17], "x": 11, "y": 1.25},
+                {"matrix": [4, 4], "x": 12, "y": 1.25},
+                {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 10], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 19.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 16], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 1], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.25},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [5, 10], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 11], "x": 19.5, "y": 2.25},
+                {"matrix": [5, 16], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.25},
+                {"matrix": [1, 1], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [2, 10], "x": 18.5, "y": 3.25},
+                {"matrix": [2, 11], "x": 19.5, "y": 3.25},
+                {"matrix": [2, 16], "x": 20.5, "y": 3.25},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.25},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.25},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.25},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.25},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.25},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.25},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.25},
+
+                {"matrix": [3, 10], "x": 18.5, "y": 4.25},
+                {"matrix": [3, 11], "x": 19.5, "y": 4.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 4.25},
+                {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.25},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.25},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [6, 16], "x": 20.5, "y": 5.25}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen,", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25, "h": 2},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25, "h":2},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25, "w":2},
-                {"label":".", "x":20.5, "y":5.25}
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.25},
+                {"matrix": [7, 9], "x": 1, "y": 1.25},
+                {"matrix": [7, 8], "x": 2, "y": 1.25},
+                {"matrix": [7, 7], "x": 3, "y": 1.25},
+                {"matrix": [7, 6], "x": 4, "y": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 1.25},
+                {"matrix": [7, 5], "x": 7, "y": 1.25},
+                {"matrix": [7, 4], "x": 8, "y": 1.25},
+                {"matrix": [7, 3], "x": 9, "y": 1.25},
+                {"matrix": [7, 17], "x": 10, "y": 1.25},
+                {"matrix": [4, 17], "x": 11, "y": 1.25},
+                {"matrix": [4, 4], "x": 12, "y": 1.25},
+                {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 10], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 19.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 16], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.25},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.25},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [5, 10], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 11], "x": 19.5, "y": 2.25},
+                {"matrix": [5, 16], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 1], "x": 12.75, "y": 3.25},
+                {"matrix": [1, 1], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 10], "x": 18.5, "y": 3.25},
+                {"matrix": [2, 11], "x": 19.5, "y": 3.25},
+                {"matrix": [2, 16], "x": 20.5, "y": 3.25},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.25},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.25},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.25},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.25},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.25},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.25},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.25},
+
+                {"matrix": [3, 10], "x": 18.5, "y": 4.25},
+                {"matrix": [3, 11], "x": 19.5, "y": 4.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 4.25},
+                {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.25},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.25},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [6, 16], "x": 20.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/bpiphany/hid_liber/hid_liber.c b/keyboards/bpiphany/hid_liber/hid_liber.c
deleted file mode 100755
index 2e4ddb3293..0000000000
--- a/keyboards/bpiphany/hid_liber/hid_liber.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2012 Jun Wako <wakojun@gmail.com>: LED init
- * Copyright 2017 Mathias Andersson <wraul@dbox.se>: Phantom config
- * Copyright 2018 bakageta <amo@bakageta.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hid_liber.h"
diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h
index 21ed9d44c7..0d23223dc9 100644
--- a/keyboards/bpiphany/kitten_paw/config.h
+++ b/keyboards/bpiphany/kitten_paw/config.h
@@ -22,22 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-//#define MATRIX_ROW_PINS { D0, D5 }
-//#define MATRIX_COL_PINS { F1, F0, B0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json
index 03e5162481..64a38a6e56 100644
--- a/keyboards/bpiphany/kitten_paw/info.json
+++ b/keyboards/bpiphany/kitten_paw/info.json
@@ -19,11 +19,257 @@
   "community_layouts": ["fullsize_ansi"],
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"KC_NUBS", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
-    },
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
 
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
+    },
     "LAYOUT_fullsize_ansi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
     }
   }
 }
diff --git a/keyboards/bpiphany/kitten_paw/kitten_paw.c b/keyboards/bpiphany/kitten_paw/kitten_paw.c
deleted file mode 100644
index e71b3c8011..0000000000
--- a/keyboards/bpiphany/kitten_paw/kitten_paw.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kitten_paw.h"
diff --git a/keyboards/bpiphany/kitten_paw/kitten_paw.h b/keyboards/bpiphany/kitten_paw/kitten_paw.h
deleted file mode 100644
index d4a9a16656..0000000000
--- a/keyboards/bpiphany/kitten_paw/kitten_paw.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-/*
-  Matrix col/row mapping
-
-  ,----.    ,-------------------. ,-------------------. ,-------------------. ,--------------.
-  | J6 |    | I4 | H4 | H2 | H6 | | A7 | E6 | D2 | D4 | | B4 | B7 | B6 | B0 | | C7 | C5 | A5 |
-  `----'    `-------------------' `-------------------' `-------------------' `--------------'
-  ,-------------------------------------------------------------------------. ,--------------. ,-------------------.
-  | J4 | J7 | I7 | H7 | G7 | G4 | F4 | F7 | E7 | D7 | R7 | R4 | E4 |     B2 | | L4 | O4 | Q4 | | K1 | L1 | Q1 | Q0 |
-  |-------------------------------------------------------------------------| |--------------| |-------------------|
-  | J2   | J5 | I5 | H5 | G5 | G2 | F2 | F5 | E5 | D5 | R5 | R2 | E2 |   B3 | | K4 | O7 | Q7 | | K5 | L5 | Q5 | O5 |
-  |-------------------------------------------------------------------------| '--------------' |--------------     |
-  | O5    | J3 | I3 | H3 | G3 | G6 | F6 | F3 | E3 | D3 | R3 | R6 |       B1 |                  | K2 | L2 | Q2 |    |
-  |-------------------------------------------------------------------------|      ,----.      |-------------------|
-  | N2 | I6 | J1 | I1 | H1 | G1 | G0 | F0 | F1 | E1 | D1 | R0 |          N3 |      | O6 |      | K3 | L3 | Q3 | O3 |
-  |-------------------------------------------------------------------------| ,--------------. |--------------     |
-  | A4 | P2 | C6 |                  K6                  | C0 | M3 | D0 | A1 | | O0 | K0 | L0 | | L6      | Q6 |    |
-  `-------------------------------------------------------------------------' `--------------' `-------------------'
-*/
-
-#define LAYOUT( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \
-) { \
-    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \
-    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \
-    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \
-    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \
-    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \
-    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \
-    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \
-    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \
-    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \
-) { \
-    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \
-    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \
-    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \
-    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \
-    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \
-    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \
-    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, XXX, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \
-    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \
-}
diff --git a/keyboards/bpiphany/pegasushoof/2013/2013.h b/keyboards/bpiphany/pegasushoof/2013/2013.h
deleted file mode 100644
index 7454c7c860..0000000000
--- a/keyboards/bpiphany/pegasushoof/2013/2013.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Copyright 2016 Daniel Svensson <dsvensson@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "matrix.h"
-#include "quantum.h"
-
-#define LAYOUT( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                  \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,      \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0  \
-    ) { /*         00-A   01-B   02-C   03-D   04-E   05-F   06-G   07-H   08-I   09-J   10-K   11-L   12-M   13-N   14-O   15-P   16-Q   17-R */  \
-        /* 0 */  { KC_NO, KB0,   KC0,   KD0,   KC_NO, KF0,   KG0,   KC_NO, KC_NO, KC_NO, KK0,   KL0,   KC_NO, KC_NO, KO0,   KC_NO, KC_NO, KR0   }, \
-        /* 1 */  { KA1,   KB1,   KC_NO, KD1,   KE1,   KF1,   KG1,   KH1,   KI1,   KJ1,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-        /* 2 */  { KC_NO, KB2,   KC_NO, KD2,   KE2,   KF2,   KG2,   KH2,   KI2,   KJ2,   KC_NO, KC_NO, KC_NO, KN2,   KC_NO, KP2,   KC_NO, KR2   }, \
-        /* 3 */  { KC_NO, KB3,   KC_NO, KD3,   KE3,   KF3,   KG3,   KH3,   KI3,   KJ3,   KC_NO, KC_NO, KM3,   KN3,   KC_NO, KC_NO, KC_NO, KR3   }, \
-        /* 4 */  { KA4,   KB4,   KC_NO, KD4,   KE4,   KF4,   KG4,   KH4,   KI4,   KJ4,   KK4,   KL4,   KC_NO, KC_NO, KO4,   KC_NO, KQ4,   KR4   }, \
-        /* 5 */  { KA5,   KC_NO, KC5,   KD5,   KE5,   KF5,   KG5,   KH5,   KI5,   KJ5,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KR5   }, \
-        /* 6 */  { KC_NO, KB6,   KC6,   KC_NO, KE6,   KF6,   KG6,   KH6,   KI6,   KJ6,   KK6,   KC_NO, KC_NO, KC_NO, KO6,   KC_NO, KC_NO, KR6   }, \
-        /* 7 */  { KA7,   KB7,   KC7,   KD7,   KE7,   KF7,   KG7,   KH7,   KI7,   KJ7,   KC_NO, KC_NO, KC_NO, KC_NO, KO7,   KC_NO, KQ7,   KR7   }  \
-    }
-
-#define LAYOUT_tkl_ansi( \
-    KG6,      KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0,   KN5, KN7, KP7, \
-    KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2,   KR4, KC4, KE4, \
-    KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2, KO3,   KQ4, KC5, KE5, \
-    KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6,      KO1,                  \
-    KB2,      KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0,      KB3,        KC6,      \
-    KP4, KD2, KN6,                KQ6,                KN0, KA3, KM0, KP1,   KC0, KQ0, KR0  \
-    ) { /*         00-A   01-B   02-C   03-D   04-E  05-F    06-G   07-H   08-I   09-J   10-K   11-L   12-M   13-N   14-O   15-P   16-Q   17-R */  \
-        /* 0 */  { KC_NO, KC_NO, KC0,   KC_NO, KC_NO, KF0,   KC_NO, KC_NO, KC_NO, KJ0,   KK0,   KC_NO, KM0,   KN0,   KO0,   KC_NO, KQ0,   KR0   }, \
-        /* 1 */  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KG1,   KH1,   KI1,   KJ1,   KK1,   KL1,   KM1,   KC_NO, KO1,   KP1,   KC_NO, KC_NO }, \
-        /* 2 */  { KC_NO, KB2,   KC_NO, KD2,   KC_NO, KF2,   KG2,   KH2,   KI2,   KJ2,   KK2,   KL2,   KM2,   KC_NO, KO2,   KC_NO, KC_NO, KC_NO }, \
-        /* 3 */  { KA3,   KB3,   KC_NO, KC_NO, KC_NO, KF3,   KG3,   KH3,   KI3,   KJ3,   KK3,   KL3,   KM3,   KC_NO, KO3,   KC_NO, KC_NO, KC_NO }, \
-        /* 4 */  { KC_NO, KC_NO, KC4,   KC_NO, KE4,   KF4,   KG4,   KH4,   KI4,   KJ4,   KK4,   KL4,   KM4,   KC_NO, KO4,   KP4,   KQ4,   KR4   }, \
-        /* 5 */  { KC_NO, KC_NO, KC5,   KC_NO, KE5,   KF5,   KG5,   KH5,   KI5,   KJ5,   KK5,   KL5,   KM5,   KN5,   KO5,   KP5,   KC_NO, KC_NO }, \
-        /* 6 */  { KC_NO, KC_NO, KC6,   KC_NO, KC_NO, KF6,   KG6,   KC_NO, KI6,   KJ6,   KK6,   KL6,   KC_NO, KN6,   KO6,   KC_NO, KQ6,   KC_NO }, \
-        /* 7 */  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KF7,   KG7,   KH7,   KI7,   KJ7,   KK7,   KL7,   KM7,   KN7,   KC_NO, KP7,   KC_NO, KC_NO }  \
-    }
-
-#define LAYOUT_tkl_jis( \
-    KG6,      KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0,        KN5, KN7, KP7, \
-    KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO7, KO2,   KR4, KC4, KE4, \
-    KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2,             KQ4, KC5, KE5, \
-    KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6, KO3, KO1,                       \
-    KB2,      KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0, KL0, KB3,             KC6,      \
-    KP4, KD2, KN6, KG0,           KQ6,           KH0, KI0, KN0, KM0, KP1,        KC0, KQ0, KR0  \
-    ) { /*         00-A   01-B   02-C   03-D   04-E   05-F   06-G   07-H   08-I   09-J   10-K   11-L   12-M   13-N   14-O   15-P   16-Q   17-R */ \
-        /* 0 */  { KC_NO, KC_NO, KC0,   KC_NO, KC_NO, KF0,   KG0,   KH0,   KI0,   KJ0,   KK0,   KL0,   KM0,   KN0,   KO0,   KC_NO, KQ0,   KR0   },\
-        /* 1 */  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KG1,   KH1,   KI1,   KJ1,   KK1,   KL1,   KM1,   KC_NO, KO1,   KP1,   KC_NO, KC_NO },\
-        /* 2 */  { KC_NO, KB2,   KC_NO, KD2,   KC_NO, KF2,   KG2,   KH2,   KI2,   KJ2,   KK2,   KL2,   KM2,   KC_NO, KO2,   KC_NO, KC_NO, KC_NO },\
-        /* 3 */  { KC_NO, KB3,   KC_NO, KC_NO, KC_NO, KF3,   KG3,   KH3,   KI3,   KJ3,   KK3,   KL3,   KM3,   KC_NO, KO3,   KC_NO, KC_NO, KC_NO },\
-        /* 4 */  { KC_NO, KC_NO, KC4,   KC_NO, KE4,   KF4,   KG4,   KH4,   KI4,   KJ4,   KK4,   KL4,   KM4,   KC_NO, KO4,   KP4,   KQ4,   KR4   },\
-        /* 5 */  { KC_NO, KC_NO, KC5,   KC_NO, KE5,   KF5,   KG5,   KH5,   KI5,   KJ5,   KK5,   KL5,   KM5,   KN5,   KO5,   KP5,   KC_NO, KC_NO },\
-        /* 6 */  { KC_NO, KC_NO, KC6,   KC_NO, KC_NO, KF6,   KG6,   KC_NO, KI6,   KJ6,   KK6,   KL6,   KC_NO, KN6,   KO6,   KC_NO, KQ6,   KC_NO },\
-        /* 7 */  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KF7,   KG7,   KH7,   KI7,   KJ7,   KK7,   KL7,   KK7,   KL7,   KO7,   KP7,   KC_NO, KC_NO } \
-}
diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/info.json
index 3d83844fe4..82995aa27d 100644
--- a/keyboards/bpiphany/pegasushoof/2013/info.json
+++ b/keyboards/bpiphany/pegasushoof/2013/info.json
@@ -10,280 +10,319 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"`", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"=", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[", "x":11.5, "y":2.5},
-                {"label":"]", "x":12.5, "y":2.5},
-                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":"'", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.5},
+                {"matrix": [7, 9], "x": 1, "y": 1.5},
+                {"matrix": [7, 8], "x": 2, "y": 1.5},
+                {"matrix": [7, 7], "x": 3, "y": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 1.5},
+                {"matrix": [4, 6], "x": 5, "y": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 1.5},
+                {"matrix": [7, 5], "x": 7, "y": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 1.5},
+                {"matrix": [7, 3], "x": 9, "y": 1.5},
+                {"matrix": [7, 17], "x": 10, "y": 1.5},
+                {"matrix": [4, 17], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"`", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"=", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[", "x":11.5, "y":2.5},
-                {"label":"]", "x":12.5, "y":2.5},
-                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":"'", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [6, 6], "x": 0, "y": 0},
+
+                {"matrix": [4, 7], "x": 2, "y": 0},
+                {"matrix": [4, 8], "x": 3, "y": 0},
+                {"matrix": [2, 8], "x": 4, "y": 0},
+                {"matrix": [6, 8], "x": 5, "y": 0},
+
+                {"matrix": [5, 15], "x": 6.5, "y": 0},
+                {"matrix": [6, 11], "x": 7.5, "y": 0},
+                {"matrix": [2, 12], "x": 8.5, "y": 0},
+                {"matrix": [4, 12], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 14], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [6, 14], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 0},
+                {"matrix": [7, 13], "x": 16.25, "y": 0},
+                {"matrix": [7, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 6], "x": 0, "y": 1.5},
+                {"matrix": [5, 6], "x": 1, "y": 1.5},
+                {"matrix": [5, 7], "x": 2, "y": 1.5},
+                {"matrix": [5, 8], "x": 3, "y": 1.5},
+                {"matrix": [5, 9], "x": 4, "y": 1.5},
+                {"matrix": [4, 9], "x": 5, "y": 1.5},
+                {"matrix": [4, 10], "x": 6, "y": 1.5},
+                {"matrix": [5, 10], "x": 7, "y": 1.5},
+                {"matrix": [5, 11], "x": 8, "y": 1.5},
+                {"matrix": [5, 12], "x": 9, "y": 1.5},
+                {"matrix": [5, 5], "x": 10, "y": 1.5},
+                {"matrix": [4, 5], "x": 11, "y": 1.5},
+                {"matrix": [4, 11], "x": 12, "y": 1.5},
+                {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 17], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 2], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 4], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 1.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 2.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 3.5, "y": 2.5},
+                {"matrix": [7, 9], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [7, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [7, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [7, 12], "x": 9.5, "y": 2.5},
+                {"matrix": [7, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 16], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 2], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 4], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 6], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 6], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 7], "x": 3.25, "y": 4.5},
+                {"matrix": [1, 8], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [0, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 12], "x": 10.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [6, 2], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 0], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [0, 2], "x": 15.25, "y": 5.5},
+                {"matrix": [0, 16], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 17], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_jis": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"Half-width/Full-width", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"^", "x":12, "y":1.5},
-                {"label":"Yen", "x":13, "y":1.5},
-                {"label":"Backspace", "x":14, "y":1.5},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"@", "x":11.5, "y":2.5},
-                {"label":"[", "x":12.5, "y":2.5},
-                {"label":"Del", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":":", "x":11.75, "y":3.5},
-                {"label":"]", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"\\", "x":12.25, "y":4.5},
-                {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5},
-                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
-                {"label":"Muhenkan", "x":3.5, "y":5.5},
-                {"label":"Space", "x":4.5, "y":5.5, "w":4.5},
-                {"label":"Henkan", "x":9, "y":5.5, "w":1.25},
-                {"label":"Kana", "x":10.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":11.5, "y":5.5, "w":1.25},
-                {"label":"Fn", "x":12.75, "y":5.5},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [6, 6], "x": 0, "y": 0},
+
+                {"matrix": [4, 7], "x": 2, "y": 0},
+                {"matrix": [4, 8], "x": 3, "y": 0},
+                {"matrix": [2, 8], "x": 4, "y": 0},
+                {"matrix": [6, 8], "x": 5, "y": 0},
+
+                {"matrix": [5, 15], "x": 6.5, "y": 0},
+                {"matrix": [6, 11], "x": 7.5, "y": 0},
+                {"matrix": [2, 12], "x": 8.5, "y": 0},
+                {"matrix": [4, 12], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 14], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [6, 14], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 0},
+                {"matrix": [7, 13], "x": 16.25, "y": 0},
+                {"matrix": [7, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 6], "x": 0, "y": 1.5},
+                {"matrix": [5, 6], "x": 1, "y": 1.5},
+                {"matrix": [5, 7], "x": 2, "y": 1.5},
+                {"matrix": [5, 8], "x": 3, "y": 1.5},
+                {"matrix": [5, 9], "x": 4, "y": 1.5},
+                {"matrix": [4, 9], "x": 5, "y": 1.5},
+                {"matrix": [4, 10], "x": 6, "y": 1.5},
+                {"matrix": [5, 10], "x": 7, "y": 1.5},
+                {"matrix": [5, 11], "x": 8, "y": 1.5},
+                {"matrix": [5, 12], "x": 9, "y": 1.5},
+                {"matrix": [5, 5], "x": 10, "y": 1.5},
+                {"matrix": [4, 5], "x": 11, "y": 1.5},
+                {"matrix": [4, 11], "x": 12, "y": 1.5},
+                {"matrix": [7, 14], "x": 13, "y": 1.5},
+                {"matrix": [2, 14], "x": 14, "y": 1.5},
+
+                {"matrix": [4, 17], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 2], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 4], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 1.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 2.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 3.5, "y": 2.5},
+                {"matrix": [7, 9], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [7, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [7, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [7, 12], "x": 9.5, "y": 2.5},
+                {"matrix": [7, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 16], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 2], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 4], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 6], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 6], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 7], "x": 3.25, "y": 4.5},
+                {"matrix": [1, 8], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [0, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 12], "x": 10.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [0, 11], "x": 12.25, "y": 4.5},
+                {"matrix": [3, 1], "x": 13.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [6, 2], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 1.25, "y": 5.5},
+                {"matrix": [6, 13], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.5, "y": 5.5},
+                {"matrix": [6, 16], "x": 4.5, "y": 5.5, "w": 4.5},
+                {"matrix": [0, 7], "x": 9, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 10.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 13], "x": 11.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 12], "x": 12.75, "y": 5.5},
+                {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [0, 2], "x": 15.25, "y": 5.5},
+                {"matrix": [0, 16], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 17], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/bpiphany/pegasushoof/2015/2015.h b/keyboards/bpiphany/pegasushoof/2015/2015.h
deleted file mode 100644
index 2b4fac85f3..0000000000
--- a/keyboards/bpiphany/pegasushoof/2015/2015.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-Copyright 2016 Daniel Svensson <dsvensson@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "matrix.h"
-#include "quantum.h"
-
-#define  ___ XXXXXXX
-
-#define LAYOUT( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                  \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,      \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0  \
-    ) { /*         00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , ___ , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , ___ , ___ , ___ , KN2 , ___ , KP2 , ___ , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , ___ , ___ , KM3 , KN3 , ___ , ___ , ___ , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , KI6 , KJ6 , KK6 , ___ , ___ , ___ , KO6 , ___ , ___ , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-    }
-
-#define LAYOUT_tkl_ansi( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                  \
-    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,      \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0  \
-    ) { /*         00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , ___ , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , ___ , ___ , ___ , KN2 , ___ , KP2 , ___ , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , ___ , ___ , KM3 , KN3 , ___ , ___ , ___ , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , ___ , KJ6 , KK6 , ___ , ___ , ___ , KO6 , ___ , ___ , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-    }
-
-#define LAYOUT_tkl_iso( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2,        KK4, KO7, KQ7, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB3, KB1,                  \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,      \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0  \
-    ) { /*         00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , ___ , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , ___ , ___ , ___ , KN2 , ___ , KP2 , ___ , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , ___ , ___ , KM3 , KN3 , ___ , ___ , ___ , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , KI6 , KJ6 , KK6 , ___ , ___ , ___ , KO6 , ___ , ___ , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-    }
-
-#define LAYOUT_tkl_jis( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,        KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB5, KB2,   KL4, KO4, KQ4, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2,             KK4, KO7, KQ7, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB3, KB1,                       \
-    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KE0, KN3,             KO6,      \
-    KA4, KP2, KC6, KJ0,           KK6,           KI0, KH0, KC0, KD0, KA1,        KO0, KK0, KL0  \
-    ) { /*         00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , KE0 , KF0 , KG0 , KH0 , KI0 , KJ0 , KK0 , KL0 , ___ , ___ , KO0 , ___ , ___ , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,     }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , ___ , ___ , ___ , KN2 , ___ , KP2 , ___ , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , ___ , ___ , ___ , KN3 , ___ , ___ , ___ , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , KB5 , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , ___ , KJ6 , KK6 , ___ , ___ , ___ , KO6 , ___ , ___ , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-}
diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/info.json
index e583db7daf..592128a6b2 100644
--- a/keyboards/bpiphany/pegasushoof/2015/info.json
+++ b/keyboards/bpiphany/pegasushoof/2015/info.json
@@ -10,372 +10,424 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"`", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"=", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[", "x":11.5, "y":2.5},
-                {"label":"]", "x":12.5, "y":2.5},
-                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":"'", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.5},
+                {"matrix": [7, 9], "x": 1, "y": 1.5},
+                {"matrix": [7, 8], "x": 2, "y": 1.5},
+                {"matrix": [7, 7], "x": 3, "y": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 1.5},
+                {"matrix": [4, 6], "x": 5, "y": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 1.5},
+                {"matrix": [7, 5], "x": 7, "y": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 1.5},
+                {"matrix": [7, 3], "x": 9, "y": 1.5},
+                {"matrix": [7, 17], "x": 10, "y": 1.5},
+                {"matrix": [4, 17], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"`", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"=", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[", "x":11.5, "y":2.5},
-                {"label":"]", "x":12.5, "y":2.5},
-                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":"'", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.5},
+                {"matrix": [7, 9], "x": 1, "y": 1.5},
+                {"matrix": [7, 8], "x": 2, "y": 1.5},
+                {"matrix": [7, 7], "x": 3, "y": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 1.5},
+                {"matrix": [4, 6], "x": 5, "y": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 1.5},
+                {"matrix": [7, 5], "x": 7, "y": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 1.5},
+                {"matrix": [7, 3], "x": 9, "y": 1.5},
+                {"matrix": [7, 17], "x": 10, "y": 1.5},
+                {"matrix": [4, 17], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"`", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"=", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[", "x":11.5, "y":2.5},
-                {"label":"]", "x":12.5, "y":2.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":"'", "x":11.75, "y":3.5},
-                {"label":"#", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"\\", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"↑", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"App", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"�", "x":15.25, "y":5.5},
-                {"label":"↓", "x":16.25, "y":5.5},
-                {"label":"→", "x":17.25, "y":5.5}
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.5},
+                {"matrix": [7, 9], "x": 1, "y": 1.5},
+                {"matrix": [7, 8], "x": 2, "y": 1.5},
+                {"matrix": [7, 7], "x": 3, "y": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 1.5},
+                {"matrix": [4, 6], "x": 5, "y": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 1.5},
+                {"matrix": [7, 5], "x": 7, "y": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 1.5},
+                {"matrix": [7, 3], "x": 9, "y": 1.5},
+                {"matrix": [7, 17], "x": 10, "y": 1.5},
+                {"matrix": [4, 17], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 12.75, "y": 3.5},
+                {"matrix": [1, 1], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_jis": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"Half-width/Full-width", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"^", "x":12, "y":1.5},
-                {"label":"Yen", "x":13, "y":1.5},
-                {"label":"Backspace", "x":14, "y":1.5},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"@", "x":11.5, "y":2.5},
-                {"label":"[", "x":12.5, "y":2.5},
-                {"label":"Del", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":":", "x":11.75, "y":3.5},
-                {"label":"]", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"\\", "x":12.25, "y":4.5},
-                {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5},
-                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
-                {"label":"Muhenkan", "x":3.5, "y":5.5},
-                {"label":"Space", "x":4.5, "y":5.5, "w":4.5},
-                {"label":"Henkan", "x":9, "y":5.5, "w":1.25},
-                {"label":"Kana", "x":10.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":11.5, "y":5.5, "w":1.25},
-                {"label":"Fn", "x":12.75, "y":5.5},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.5},
+                {"matrix": [7, 9], "x": 1, "y": 1.5},
+                {"matrix": [7, 8], "x": 2, "y": 1.5},
+                {"matrix": [7, 7], "x": 3, "y": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 1.5},
+                {"matrix": [4, 6], "x": 5, "y": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 1.5},
+                {"matrix": [7, 5], "x": 7, "y": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 1.5},
+                {"matrix": [7, 3], "x": 9, "y": 1.5},
+                {"matrix": [7, 17], "x": 10, "y": 1.5},
+                {"matrix": [4, 17], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [5, 1], "x": 13, "y": 1.5},
+                {"matrix": [2, 1], "x": 14, "y": 1.5},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 12.75, "y": 3.5},
+                {"matrix": [1, 1], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+                {"matrix": [0, 4], "x": 12.25, "y": 4.5},
+                {"matrix": [3, 13], "x": 13.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.5},
+                {"matrix": [6, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.5, "y": 5.5},
+                {"matrix": [6, 10], "x": 4.5, "y": 5.5, "w": 4.5},
+                {"matrix": [0, 8], "x": 9, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 7], "x": 10.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 2], "x": 11.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.75, "y": 5.5},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json
index 75d126eb50..659c6f3267 100644
--- a/keyboards/bpiphany/tiger_lily/info.json
+++ b/keyboards/bpiphany/tiger_lily/info.json
@@ -19,10 +19,257 @@
   "community_layouts": ["fullsize_ansi"],
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
     },
     "LAYOUT_fullsize_ansi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
     }
   }
 }
diff --git a/keyboards/bpiphany/tiger_lily/tiger_lily.c b/keyboards/bpiphany/tiger_lily/tiger_lily.c
deleted file mode 100644
index f57f8b5f50..0000000000
--- a/keyboards/bpiphany/tiger_lily/tiger_lily.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tiger_lily.h"
diff --git a/keyboards/bpiphany/tiger_lily/tiger_lily.h b/keyboards/bpiphany/tiger_lily/tiger_lily.h
deleted file mode 100644
index b1a872e215..0000000000
--- a/keyboards/bpiphany/tiger_lily/tiger_lily.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-
-/*
-  Matrix col/row mapping
-
-  ,----.    ,-------------------. ,-------------------. ,-------------------. ,--------------.
-  | J6 |    | I4 | H4 | H2 | H6 | | A7 | E6 | D2 | D4 | | B4 | B7 | B6 | B0 | | C7 | C5 | A5 |
-  `----'    `-------------------' `-------------------' `-------------------' `--------------'
-  ,-------------------------------------------------------------------------. ,--------------. ,-------------------.
-  | J4 | J7 | I7 | H7 | G7 | G4 | F4 | F7 | E7 | D7 | R7 | R4 | E4 |     B2 | | L4 | O4 | Q4 | | K1 | L1 | Q1 | Q0 |
-  |-------------------------------------------------------------------------| |--------------| |-------------------|
-  | J2   | J5 | I5 | H5 | G5 | G2 | F2 | F5 | E5 | D5 | R5 | R2 | E2 |   B3 | | K4 | O7 | Q7 | | K5 | L5 | Q5 | O5 |
-  |-------------------------------------------------------------------------| '--------------' |--------------     |
-  | O5    | J3 | I3 | H3 | G3 | G6 | F6 | F3 | E3 | D3 | R3 | R6 |       B1 |                  | K2 | L2 | Q2 |    |
-  |-------------------------------------------------------------------------|      ,----.      |-------------------|
-  | N2      | J1 | I1 | H1 | G1 | G0 | F0 | F1 | E1 | D1 | R0 |          N3 |      | O6 |      | K3 | L3 | Q3 | O3 |
-  |-------------------------------------------------------------------------| ,--------------. |--------------     |
-  | A4 | P2 | C6 |                  K6                  | C0 | M3 | D0 | A1 | | O0 | K0 | L0 | | L6      | Q6 |    |
-  `-------------------------------------------------------------------------' `--------------' `-------------------'
-*/
-#define LAYOUT( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \
-) { \
-    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \
-    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \
-    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \
-    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \
-    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \
-    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \
-    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \
-    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \
-    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \
-) { \
-    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \
-    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \
-    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \
-    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \
-    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \
-    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \
-    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, XXX, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \
-    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \
-}
diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/info.json
index 7f16025525..4ca48fee99 100644
--- a/keyboards/bpiphany/unloved_bastard/info.json
+++ b/keyboards/bpiphany/unloved_bastard/info.json
@@ -16,15 +16,323 @@
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "community_layouts": ["tkl_ansi", "tkl_iso"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_all"
+  },
   "layouts": {
     "LAYOUT_all": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+      "layout": [
+        {"matrix": [6, 6], "x": 0, "y": 0},
+
+        {"matrix": [4, 7], "x": 2, "y": 0},
+        {"matrix": [4, 8], "x": 3, "y": 0},
+        {"matrix": [2, 8], "x": 4, "y": 0},
+        {"matrix": [6, 8], "x": 5, "y": 0},
+
+        {"matrix": [5, 15], "x": 6.5, "y": 0},
+        {"matrix": [6, 11], "x": 7.5, "y": 0},
+        {"matrix": [2, 12], "x": 8.5, "y": 0},
+        {"matrix": [4, 12], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 14], "x": 11, "y": 0},
+        {"matrix": [5, 14], "x": 12, "y": 0},
+        {"matrix": [6, 14], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 0},
+        {"matrix": [7, 13], "x": 16.25, "y": 0},
+        {"matrix": [7, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 6], "x": 0, "y": 1.5},
+        {"matrix": [5, 6], "x": 1, "y": 1.5},
+        {"matrix": [5, 7], "x": 2, "y": 1.5},
+        {"matrix": [5, 8], "x": 3, "y": 1.5},
+        {"matrix": [5, 9], "x": 4, "y": 1.5},
+        {"matrix": [4, 9], "x": 5, "y": 1.5},
+        {"matrix": [4, 10], "x": 6, "y": 1.5},
+        {"matrix": [5, 10], "x": 7, "y": 1.5},
+        {"matrix": [5, 11], "x": 8, "y": 1.5},
+        {"matrix": [5, 12], "x": 9, "y": 1.5},
+        {"matrix": [5, 5], "x": 10, "y": 1.5},
+        {"matrix": [4, 5], "x": 11, "y": 1.5},
+        {"matrix": [4, 11], "x": 12, "y": 1.5},
+        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 17], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 2], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 4], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [7, 6], "x": 1.5, "y": 2.5},
+        {"matrix": [7, 7], "x": 2.5, "y": 2.5},
+        {"matrix": [7, 8], "x": 3.5, "y": 2.5},
+        {"matrix": [7, 9], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+        {"matrix": [7, 10], "x": 7.5, "y": 2.5},
+        {"matrix": [7, 11], "x": 8.5, "y": 2.5},
+        {"matrix": [7, 12], "x": 9.5, "y": 2.5},
+        {"matrix": [7, 5], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 16], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 2], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 4], "x": 17.25, "y": 2.5},
+
+        {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 6], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 9], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 10], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [6, 7], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 9], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 10], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 10], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 11], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 12], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 2], "x": 16.25, "y": 4.5},
+
+        {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 2], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 16], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 17], "x": 17.25, "y": 5.5}
+      ]
     },
     "LAYOUT_tkl_iso": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+      "layout": [
+        {"matrix": [6, 6], "x": 0, "y": 0},
+
+        {"matrix": [4, 7], "x": 2, "y": 0},
+        {"matrix": [4, 8], "x": 3, "y": 0},
+        {"matrix": [2, 8], "x": 4, "y": 0},
+        {"matrix": [6, 8], "x": 5, "y": 0},
+
+        {"matrix": [5, 15], "x": 6.5, "y": 0},
+        {"matrix": [6, 11], "x": 7.5, "y": 0},
+        {"matrix": [2, 12], "x": 8.5, "y": 0},
+        {"matrix": [4, 12], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 14], "x": 11, "y": 0},
+        {"matrix": [5, 14], "x": 12, "y": 0},
+        {"matrix": [6, 14], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 0},
+        {"matrix": [7, 13], "x": 16.25, "y": 0},
+        {"matrix": [7, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 6], "x": 0, "y": 1.5},
+        {"matrix": [5, 6], "x": 1, "y": 1.5},
+        {"matrix": [5, 7], "x": 2, "y": 1.5},
+        {"matrix": [5, 8], "x": 3, "y": 1.5},
+        {"matrix": [5, 9], "x": 4, "y": 1.5},
+        {"matrix": [4, 9], "x": 5, "y": 1.5},
+        {"matrix": [4, 10], "x": 6, "y": 1.5},
+        {"matrix": [5, 10], "x": 7, "y": 1.5},
+        {"matrix": [5, 11], "x": 8, "y": 1.5},
+        {"matrix": [5, 12], "x": 9, "y": 1.5},
+        {"matrix": [5, 5], "x": 10, "y": 1.5},
+        {"matrix": [4, 5], "x": 11, "y": 1.5},
+        {"matrix": [4, 11], "x": 12, "y": 1.5},
+        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 17], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 2], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 4], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [7, 6], "x": 1.5, "y": 2.5},
+        {"matrix": [7, 7], "x": 2.5, "y": 2.5},
+        {"matrix": [7, 8], "x": 3.5, "y": 2.5},
+        {"matrix": [7, 9], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+        {"matrix": [7, 10], "x": 7.5, "y": 2.5},
+        {"matrix": [7, 11], "x": 8.5, "y": 2.5},
+        {"matrix": [7, 12], "x": 9.5, "y": 2.5},
+        {"matrix": [7, 5], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 12.5, "y": 2.5},
+
+        {"matrix": [4, 16], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 2], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 4], "x": 17.25, "y": 2.5},
+
+        {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 6], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 9], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 10], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 14], "x": 12.75, "y": 3.5},
+        {"matrix": [1, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+        {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [6, 7], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 9], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 10], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 10], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 11], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 12], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 2], "x": 16.25, "y": 4.5},
+
+        {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 2], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 16], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 17], "x": 17.25, "y": 5.5}
+      ]
     },
     "LAYOUT_tkl_ansi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+      "layout": [
+        {"matrix": [6, 6], "x": 0, "y": 0},
+
+        {"matrix": [4, 7], "x": 2, "y": 0},
+        {"matrix": [4, 8], "x": 3, "y": 0},
+        {"matrix": [2, 8], "x": 4, "y": 0},
+        {"matrix": [6, 8], "x": 5, "y": 0},
+
+        {"matrix": [5, 15], "x": 6.5, "y": 0},
+        {"matrix": [6, 11], "x": 7.5, "y": 0},
+        {"matrix": [2, 12], "x": 8.5, "y": 0},
+        {"matrix": [4, 12], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 14], "x": 11, "y": 0},
+        {"matrix": [5, 14], "x": 12, "y": 0},
+        {"matrix": [6, 14], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 0},
+        {"matrix": [7, 13], "x": 16.25, "y": 0},
+        {"matrix": [7, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 6], "x": 0, "y": 1.5},
+        {"matrix": [5, 6], "x": 1, "y": 1.5},
+        {"matrix": [5, 7], "x": 2, "y": 1.5},
+        {"matrix": [5, 8], "x": 3, "y": 1.5},
+        {"matrix": [5, 9], "x": 4, "y": 1.5},
+        {"matrix": [4, 9], "x": 5, "y": 1.5},
+        {"matrix": [4, 10], "x": 6, "y": 1.5},
+        {"matrix": [5, 10], "x": 7, "y": 1.5},
+        {"matrix": [5, 11], "x": 8, "y": 1.5},
+        {"matrix": [5, 12], "x": 9, "y": 1.5},
+        {"matrix": [5, 5], "x": 10, "y": 1.5},
+        {"matrix": [4, 5], "x": 11, "y": 1.5},
+        {"matrix": [4, 11], "x": 12, "y": 1.5},
+        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 17], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 2], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 4], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [7, 6], "x": 1.5, "y": 2.5},
+        {"matrix": [7, 7], "x": 2.5, "y": 2.5},
+        {"matrix": [7, 8], "x": 3.5, "y": 2.5},
+        {"matrix": [7, 9], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+        {"matrix": [7, 10], "x": 7.5, "y": 2.5},
+        {"matrix": [7, 11], "x": 8.5, "y": 2.5},
+        {"matrix": [7, 12], "x": 9.5, "y": 2.5},
+        {"matrix": [7, 5], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 16], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 2], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 4], "x": 17.25, "y": 2.5},
+
+        {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 6], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 9], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 10], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 6], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 9], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 10], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 10], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 11], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 12], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 2], "x": 16.25, "y": 4.5},
+
+        {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 2], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 16], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 17], "x": 17.25, "y": 5.5}
+      ]
     }
   }
 }
diff --git a/keyboards/bpiphany/unloved_bastard/unloved_bastard.c b/keyboards/bpiphany/unloved_bastard/unloved_bastard.c
deleted file mode 100644
index f4b8032a01..0000000000
--- a/keyboards/bpiphany/unloved_bastard/unloved_bastard.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Alexander Fougner <fougner89 at gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "unloved_bastard.h"
diff --git a/keyboards/bpiphany/unloved_bastard/unloved_bastard.h b/keyboards/bpiphany/unloved_bastard/unloved_bastard.h
deleted file mode 100644
index 26fce8749a..0000000000
--- a/keyboards/bpiphany/unloved_bastard/unloved_bastard.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2018 Alexander Fougner <fougner89 at gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    KG6,      KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0,   KN5, KN7, KP7, \
-    KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2,   KR4, KC4, KE4, \
-    KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2, KO3,   KQ4, KC5, KE5, \
-    KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6,      KO1, \
-    KB2, KH6, KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0,      KB3,        KC6, \
-    KP4, KN2, KN6,                KQ6,                KN0, KN3, KM0, KP1,   KC0, KQ0, KR0 \
-) { \
-    { XXX, XXX, KC0, XXX, XXX, KF0, XXX, XXX, XXX, KJ0, KK0, XXX, KM0, KN0, KO0, XXX, KQ0, KR0 }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, KG1, KH1, KI1, KJ1, KK1, KL1, KM1, XXX, KO1, KP1, XXX, XXX }, \
-    { XXX, KB2, XXX, XXX, XXX, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, KM2, KN2, KO2, XXX, XXX, XXX }, \
-    { XXX, KB3, XXX, XXX, XXX, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, XXX, XXX }, \
-    { XXX, XXX, KC4, XXX, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, KM4, XXX, KO4, KP4, KQ4, KR4 }, \
-    { XXX, XXX, KC5, XXX, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, KM5, KN5, KO5, KP5, XXX, XXX }, \
-    { XXX, XXX, KC6, XXX, XXX, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, XXX, KN6, KO6, XXX, KQ6, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, KF7, KG7, KH7, KI7, KJ7, KK7, KL7, KM7, KN7, XXX, KP7, XXX, XXX } \
-}
-
-#define LAYOUT_tkl_ansi( \
-    KG6,      KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0,   KN5, KN7, KP7, \
-    KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2,   KR4, KC4, KE4, \
-    KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2, KO3,   KQ4, KC5, KE5, \
-    KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6,      KO1, \
-    KB2,      KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0,      KB3,        KC6, \
-    KP4, KN2, KN6,                KQ6,                KN0, KN3, KM0, KP1,   KC0, KQ0, KR0 \
-) { \
-    { XXX, XXX, KC0, XXX, XXX, KF0, XXX, XXX, XXX, KJ0, KK0, XXX, KM0, KN0, KO0, XXX, KQ0, KR0 }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, KG1, KH1, KI1, KJ1, KK1, KL1, KM1, XXX, KO1, KP1, XXX, XXX }, \
-    { XXX, KB2, XXX, XXX, XXX, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, KM2, KN2, KO2, XXX, XXX, XXX }, \
-    { XXX, KB3, XXX, XXX, XXX, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, XXX, XXX }, \
-    { XXX, XXX, KC4, XXX, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, KM4, XXX, KO4, KP4, KQ4, KR4 }, \
-    { XXX, XXX, KC5, XXX, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, KM5, KN5, KO5, KP5, XXX, XXX }, \
-    { XXX, XXX, KC6, XXX, XXX, KF6, KG6, XXX, KI6, KJ6, KK6, KL6, XXX, KN6, KO6, XXX, KQ6, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, KF7, KG7, KH7, KI7, KJ7, KK7, KL7, KM7, KN7, XXX, KP7, XXX, XXX } \
-}
-
-#define LAYOUT_tkl_iso( \
-    KG6,      KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0,   KN5, KN7, KP7, \
-    KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2,   KR4, KC4, KE4, \
-    KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2,        KQ4, KC5, KE5, \
-    KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6, KO3, KO1, \
-    KB2, KH6, KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0,      KB3,        KC6, \
-    KP4, KN2, KN6,                KQ6,                KN0, KN3, KM0, KP1,   KC0, KQ0, KR0 \
-) { \
-    { XXX, XXX, KC0, XXX, XXX, KF0, XXX, XXX, XXX, KJ0, KK0, XXX, KM0, KN0, KO0, XXX, KQ0, KR0 }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, KG1, KH1, KI1, KJ1, KK1, KL1, KM1, XXX, KO1, KP1, XXX, XXX }, \
-    { XXX, KB2, XXX, XXX, XXX, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, KM2, KN2, KO2, XXX, XXX, XXX }, \
-    { XXX, KB3, XXX, XXX, XXX, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, XXX, XXX }, \
-    { XXX, XXX, KC4, XXX, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, KM4, XXX, KO4, KP4, KQ4, KR4 }, \
-    { XXX, XXX, KC5, XXX, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, KM5, KN5, KO5, KP5, XXX, XXX }, \
-    { XXX, XXX, KC6, XXX, XXX, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, XXX, KN6, KO6, XXX, KQ6, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, KF7, KG7, KH7, KI7, KJ7, KK7, KL7, KM7, KN7, XXX, KP7, XXX, XXX } \
-}
-
-#define LAYOUT LAYOUT_all
diff --git a/keyboards/bt66tech/bt66tech60/bt66tech60.c b/keyboards/bt66tech/bt66tech60/bt66tech60.c
deleted file mode 100644
index e7218b9e93..0000000000
--- a/keyboards/bt66tech/bt66tech60/bt66tech60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 bt66tech
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "bt66tech60.h"
diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h
index c5007ffbbb..6f951724f1 100644
--- a/keyboards/bt66tech/bt66tech60/config.h
+++ b/keyboards/bt66tech/bt66tech60/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12 }
-#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 1
 
@@ -39,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 9
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json
index 91b824b6a4..4999eab168 100644
--- a/keyboards/bt66tech/bt66tech60/info.json
+++ b/keyboards/bt66tech/bt66tech60/info.json
@@ -8,11 +8,20 @@
         "pid": "0x7070",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12"],
+        "rows": ["B10", "B1", "B0", "A7", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A8",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/bt66tech/bt66tech60/rules.mk b/keyboards/bt66tech/bt66tech60/rules.mk
index 5989895b84..bfd3bcd1b4 100644
--- a/keyboards/bt66tech/bt66tech60/rules.mk
+++ b/keyboards/bt66tech/bt66tech60/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
 
 DEFAULT_FOLDER = bt66tech/bt66tech60
 
diff --git a/keyboards/bthlabs/geekpad/config.h b/keyboards/bthlabs/geekpad/config.h
deleted file mode 100644
index e610685f99..0000000000
--- a/keyboards/bthlabs/geekpad/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2019-present Tomek Wójcik <contact@bthlabs.pl>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4, F5, F6 }
-#define MATRIX_COL_PINS { D4, D0, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/bthlabs/geekpad/geekpad.c b/keyboards/bthlabs/geekpad/geekpad.c
deleted file mode 100644
index 6b8edd31c3..0000000000
--- a/keyboards/bthlabs/geekpad/geekpad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019-present Tomek Wójcik <contact@bthlabs.pl>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "geekpad.h"
diff --git a/keyboards/bthlabs/geekpad/geekpad.h b/keyboards/bthlabs/geekpad/geekpad.h
deleted file mode 100644
index 4dc6800fe5..0000000000
--- a/keyboards/bthlabs/geekpad/geekpad.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019-present Tomek Wójcik <contact@bthlabs.pl>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22  \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 } \
-}
diff --git a/keyboards/bthlabs/geekpad/info.json b/keyboards/bthlabs/geekpad/info.json
index d68530dadf..c1b0ef54c0 100644
--- a/keyboards/bthlabs/geekpad/info.json
+++ b/keyboards/bthlabs/geekpad/info.json
@@ -8,20 +8,27 @@
     "pid": "0x4257",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D4", "D0", "D1"],
+    "rows": ["F4", "F5", "F6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x": 0, "y": 0},
-        {"x": 1, "y": 0},
-        {"x": 2,"y": 0},
-        {"x": 0, "y": 1},
-        {"x": 1, "y": 1},
-        {"x": 2,"y": 1},
-        {"x": 0, "y": 2},
-        {"x": 1, "y": 2},
-        {"x": 2,"y": 2}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2}
       ]
     }
   }
diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h
index e59cba6a50..a637e9e335 100644
--- a/keyboards/bubble75/hotswap/config.h
+++ b/keyboards/bubble75/hotswap/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, C7, F1 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, E6, F0, D0, D1, D4, D6, D7, B4, B5, B6, C6 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -32,7 +26,6 @@
 
 /* WS2812 RGB */
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN B7
 #define RGBLED_NUM 81
 #define RGB_MATRIX_LED_COUNT 81
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json
index b9519f15f1..fd913dfecf 100644
--- a/keyboards/bubble75/hotswap/info.json
+++ b/keyboards/bubble75/hotswap/info.json
@@ -8,6 +8,17 @@
         "pid": "0x5A4C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F5", "F6", "F7", "C7", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/bubble75/hotswap/rules.mk b/keyboards/bubble75/hotswap/rules.mk
index d8dc7dca6f..c11ab0df94 100644
--- a/keyboards/bubble75/hotswap/rules.mk
+++ b/keyboards/bubble75/hotswap/rules.mk
@@ -9,5 +9,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 NO_USB_STARTUP_CHECK = yes
\ No newline at end of file
diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
index 3d1926093c..89009938e4 100644
--- a/keyboards/buildakb/potato65/config.h
+++ b/keyboards/buildakb/potato65/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -55,8 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -73,4 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 240
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/buildakb/potato65/info.json b/keyboards/buildakb/potato65/info.json
index 505eb72b11..d49362f118 100644
--- a/keyboards/buildakb/potato65/info.json
+++ b/keyboards/buildakb/potato65/info.json
@@ -8,312 +8,320 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4 },
-                { "x":11, "y":4 },
-                { "x":12, "y":4 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4 },
-                { "x":11, "y":4 },
-                { "x":12, "y":4 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs_2_right_mods": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.5 },
-                { "x":11.5, "y":4, "w":1.5 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_2_right_mods": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.5 },
-                { "x":11.5, "y":4, "w":1.5 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/buildakb/potato65/potato65.c b/keyboards/buildakb/potato65/potato65.c
deleted file mode 100644
index 6070a7c115..0000000000
--- a/keyboards/buildakb/potato65/potato65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Maelkk
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "potato65.h"
diff --git a/keyboards/buildakb/potato65/potato65.h b/keyboards/buildakb/potato65/potato65.h
deleted file mode 100644
index c6ad67e4f4..0000000000
--- a/keyboards/buildakb/potato65/potato65.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2021 Maelkk
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_split_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409, k410, k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  k410,  k411,  k412,  k413,  KC_NO, k415 }  \
-}
-
-#define LAYOUT_65_ansi( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,       k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409, k410, k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  k410,  k411,  k412,  k413,  KC_NO, k415 }  \
-}
-
-#define LAYOUT_65_ansi_split_bs_2_right_mods( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409,       k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  KC_NO, k411,  k412,  k413,  KC_NO, k415 }  \
-}
-
-#define LAYOUT_65_ansi_2_right_mods( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,       k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409,       k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  KC_NO, k411,  k412,  k413,  KC_NO, k415 }  \
-}
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
index cfd82ac3b6..b8cb223b0c 100644
--- a/keyboards/buildakb/potato65hs/config.h
+++ b/keyboards/buildakb/potato65hs/config.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, F4, F6, F0, D2 }
-#define MATRIX_COL_PINS { D3, D4, D6, D7, B4, B5, B6, F1, B0, B1, B2, B3, B7, D0, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,4 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 240
 #    define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/buildakb/potato65hs/info.json b/keyboards/buildakb/potato65hs/info.json
index 8d41e422e4..466983fde8 100644
--- a/keyboards/buildakb/potato65hs/info.json
+++ b/keyboards/buildakb/potato65hs/info.json
@@ -8,83 +8,91 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
+        "rows": ["F5", "F4", "F6", "F0", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"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},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4, "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/buildakb/potato65hs/potato65hs.c b/keyboards/buildakb/potato65hs/potato65hs.c
deleted file mode 100644
index 2b5ca899b3..0000000000
--- a/keyboards/buildakb/potato65hs/potato65hs.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Maelkk
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "potato65hs.h"
diff --git a/keyboards/buildakb/potato65hs/potato65hs.h b/keyboards/buildakb/potato65hs/potato65hs.h
deleted file mode 100644
index 5f7b9cbf19..0000000000
--- a/keyboards/buildakb/potato65hs/potato65hs.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Maelkk
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-    K400, K401, K402, K403,                               K409, K410,       K411, K413, K414  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \
-    { K400,  K401,  K402,  K403,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K409,  K410,  KC_NO, K411,  K413,  K414 }  \
-}
diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
index 629fa34c2b..7390e2d319 100644
--- a/keyboards/buildakb/potato65s/config.h
+++ b/keyboards/buildakb/potato65s/config.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, F4, F6, F0, D2 }
-#define MATRIX_COL_PINS { D3, D4, D6, D7, B4, B5, B6, F1, B0, B1, B2, B3, B7, D0, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,4 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 240
 #    define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/info.json
index 47e6690389..5b81266ee3 100644
--- a/keyboards/buildakb/potato65s/info.json
+++ b/keyboards/buildakb/potato65s/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
+        "rows": ["F5", "F4", "F6", "F0", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/buildakb/potato65s/potato65s.c b/keyboards/buildakb/potato65s/potato65s.c
deleted file mode 100644
index 0d86564128..0000000000
--- a/keyboards/buildakb/potato65s/potato65s.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Maelkk
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "potato65s.h"
diff --git a/keyboards/buzzard/buzzard.c b/keyboards/buzzard/buzzard.c
deleted file mode 100644
index 00ad12a23e..0000000000
--- a/keyboards/buzzard/buzzard.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "buzzard.h"
diff --git a/keyboards/buzzard/buzzard.h b/keyboards/buzzard/buzzard.h
deleted file mode 100644
index f094e4af39..0000000000
--- a/keyboards/buzzard/buzzard.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_buzzard_rev1)
-#   include "rev1.h"
-#endif
\ No newline at end of file
diff --git a/keyboards/buzzard/keymaps/crehmann/config.h b/keyboards/buzzard/keymaps/crehmann/config.h
index c5638c767d..181396ad26 100644
--- a/keyboards/buzzard/keymaps/crehmann/config.h
+++ b/keyboards/buzzard/keymaps/crehmann/config.h
@@ -6,9 +6,6 @@
 // Configure the global tapping term (default: 200ms)
 #define TAPPING_TERM 200
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
 
@@ -35,4 +32,4 @@
 #ifdef PS2_MOUSE_ENABLE
 #define PS2_MOUSE_SCROLL_BTN_MASK (1<<PS2_MOUSE_BTN_RIGHT)
 #define PS2_MOUSE_SCROLL_BTN_SEND 500
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/buzzard/keymaps/default/config.h b/keyboards/buzzard/keymaps/default/config.h
index 0f1db48977..2a42e17d0c 100644
--- a/keyboards/buzzard/keymaps/default/config.h
+++ b/keyboards/buzzard/keymaps/default/config.h
@@ -6,9 +6,6 @@
 // Configure the global tapping term (default: 200ms)
 #define TAPPING_TERM 200
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
 
@@ -36,4 +33,4 @@
 #ifdef PS2_MOUSE_ENABLE
 #define PS2_MOUSE_SCROLL_BTN_MASK (1<<PS2_MOUSE_BTN_RIGHT)   // using the right mouse button for scrolling (other buttons can be configured)
 #define PS2_MOUSE_SCROLL_BTN_SEND 500
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h
index fb028e0f64..f29441fac8 100644
--- a/keyboards/buzzard/rev1/config.h
+++ b/keyboards/buzzard/rev1/config.h
@@ -3,15 +3,6 @@
 
 #pragma once
 
-// wiring
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS \
-    { B1, B3, B2, B6, B5, B4}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json
index 173eb49e72..3cd9d387ca 100644
--- a/keyboards/buzzard/rev1/info.json
+++ b/keyboards/buzzard/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB077",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6", "B5", "B4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/buzzard/rev1/rev1.h b/keyboards/buzzard/rev1/rev1.h
index c73e9164f0..74c5fef08e 100644
--- a/keyboards/buzzard/rev1/rev1.h
+++ b/keyboards/buzzard/rev1/rev1.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "buzzard.h"
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *
diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h
index dc8c82f7b0..5be5ba8b67 100644
--- a/keyboards/cablecardesigns/cypher/rev6/config.h
+++ b/keyboards/cablecardesigns/cypher/rev6/config.h
@@ -2,20 +2,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, F1, F5, F6, F7, D1, F4, D4, C6, C7 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, B7, B3, B2, B1, F0 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 3
    #define RGBLIGHT_HUE_STEP 12
    #define RGBLIGHT_SAT_STEP 25
@@ -32,4 +23,3 @@
    #define RGBLIGHT_EFFECT_RGB_TEST
    #define RGBLIGHT_EFFECT_ALTERNATING
    #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json
index 4fc447236e..4301e45de5 100644
--- a/keyboards/cablecardesigns/cypher/rev6/info.json
+++ b/keyboards/cablecardesigns/cypher/rev6/info.json
@@ -6,11 +6,19 @@
       "pid": "0xAA99",
       "device_version": "0.0.2"
     },
+    "matrix_pins": {
+      "cols": ["D6", "D7", "B4", "B5", "B6", "B7", "B3", "B2", "B1", "F0"],
+      "rows": ["B0", "F1", "F5", "F6", "F7", "D1", "F4", "D4", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "D0",
       "levels": 5,
       "breathing": true
     },
+    "ws2812": {
+      "pin": "D5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/cablecardesigns/cypher/rev6/rev6.c b/keyboards/cablecardesigns/cypher/rev6/rev6.c
deleted file mode 100644
index 56e615122a..0000000000
--- a/keyboards/cablecardesigns/cypher/rev6/rev6.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2022 Cable Car Designs (@westfoxtrot)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "rev6.h"
\ No newline at end of file
diff --git a/keyboards/caffeinated/serpent65/config.h b/keyboards/caffeinated/serpent65/config.h
index cd974173a1..bb14ae71b1 100644
--- a/keyboards/caffeinated/serpent65/config.h
+++ b/keyboards/caffeinated/serpent65/config.h
@@ -17,29 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {B11, B10, B2, B1, B0, A7, A6, A5, B13, B12}
-#define MATRIX_COL_PINS {A1, A2, A3, A4, B14, B15, A8, A9}
-//{C13, C14, C15, A0,A2,A3,A4,A5,A6, A1,B12,B1}
-/* Unused pins, in the default layout, are:
-EncA (B6) because it is not used in the default PCB
-All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason;
-B0, which is unconnected on the PCB
-*/
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/caffeinated/serpent65/info.json b/keyboards/caffeinated/serpent65/info.json
index de52e1776e..f2e0c2b4d5 100644
--- a/keyboards/caffeinated/serpent65/info.json
+++ b/keyboards/caffeinated/serpent65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6501",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "B14", "B15", "A8", "A9"],
+        "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B13", "B12"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/caffeinated/serpent65/serpent65.c b/keyboards/caffeinated/serpent65/serpent65.c
deleted file mode 100644
index ad812ee44c..0000000000
--- a/keyboards/caffeinated/serpent65/serpent65.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 jrfhoutx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "serpent65.h"
diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json
index 069d812665..20ce131329 100644
--- a/keyboards/canary/canary60rgb/info.json
+++ b/keyboards/canary/canary60rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x0621",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index 757db92403..c269ae5172 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -15,24 +15,6 @@
  */
  #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
-#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,7 +30,6 @@
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_SLEEP
-#endif
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/canary/canary60rgb/v1/rules.mk
index 66e5cfa2ae..3bbc926379 100644
--- a/keyboards/canary/canary60rgb/v1/rules.mk
+++ b/keyboards/canary/canary60rgb/v1/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes          # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 
 LTO_ENABLE = yes
diff --git a/keyboards/cannonkeys/adelie/adelie.c b/keyboards/cannonkeys/adelie/adelie.c
deleted file mode 100644
index 04764169ee..0000000000
--- a/keyboards/cannonkeys/adelie/adelie.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "adelie.h"
diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h
index e5f6cbedab..a401d62151 100644
--- a/keyboards/cannonkeys/adelie/config.h
+++ b/keyboards/cannonkeys/adelie/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F1, B1, B0 }
-#define MATRIX_COL_PINS { F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 3
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json
index d075dc199a..e1dc68ac8f 100644
--- a/keyboards/cannonkeys/adelie/info.json
+++ b/keyboards/cannonkeys/adelie/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B2"],
+        "rows": ["F4", "F1", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/cannonkeys/aella/aella.c b/keyboards/cannonkeys/aella/aella.c
deleted file mode 100644
index 862bf41451..0000000000
--- a/keyboards/cannonkeys/aella/aella.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "aella.h"
diff --git a/keyboards/cannonkeys/aella/config.h b/keyboards/cannonkeys/aella/config.h
index a03a1f3fb8..4b007cf387 100644
--- a/keyboards/cannonkeys/aella/config.h
+++ b/keyboards/cannonkeys/aella/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A5, B0, B1, B2, B10, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { A13, B12, B11, B14, A8, A7 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/info.json
index 1fc2da7d64..be8335bfd3 100644
--- a/keyboards/cannonkeys/aella/info.json
+++ b/keyboards/cannonkeys/aella/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A5", "B0", "B1", "B2", "B10", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "B12", "B11", "B14", "A8", "A7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/cannonkeys/an_c/an_c.c b/keyboards/cannonkeys/an_c/an_c.c
deleted file mode 100644
index 9dfb80e9e2..0000000000
--- a/keyboards/cannonkeys/an_c/an_c.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "an_c.h"
diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h
index a6b9872268..aced1f333c 100644
--- a/keyboards/cannonkeys/an_c/config.h
+++ b/keyboards/cannonkeys/an_c/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B11, B10, B2, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 }
-#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -40,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json
index 0517bb09d3..b6bc41de02 100644
--- a/keyboards/cannonkeys/an_c/info.json
+++ b/keyboards/cannonkeys/an_c/info.json
@@ -8,11 +8,20 @@
         "pid": "0xA00C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+        "rows": ["B1", "B0", "A7", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["60_ansi", "60_tsangan_hhkb"],
diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk
index 8b82556130..b7ab91a339 100644
--- a/keyboards/cannonkeys/an_c/rules.mk
+++ b/keyboards/cannonkeys/an_c/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/atlas/atlas.c b/keyboards/cannonkeys/atlas/atlas.c
deleted file mode 100644
index 8b0b236fe9..0000000000
--- a/keyboards/cannonkeys/atlas/atlas.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "atlas.h"
diff --git a/keyboards/cannonkeys/atlas/atlas.h b/keyboards/cannonkeys/atlas/atlas.h
deleted file mode 100644
index 2a6bf7d88a..0000000000
--- a/keyboards/cannonkeys/atlas/atlas.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44,   k45   , k47, k48, k49, k4a, k4b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b }, \
-}
-
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b }, \
-}
-
-#define LAYOUT_ortho_5x12_2x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43,    k45,     k47,    k48, k49, k4a, k4b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, KC_NO, k45, KC_NO, k47, k48, k49, k4a, k4b }, \
-}
diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h
index 9689ba3d22..1296ad8dcc 100644
--- a/keyboards/cannonkeys/atlas/config.h
+++ b/keyboards/cannonkeys/atlas/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A2, A1, A0, F1, F0, C15, C14, C13, B9, A15, A10, A9 }
-#define MATRIX_ROW_PINS { A8, B14, B12, B4, B3 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -39,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #define WS2812_SPI SPID2
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 22
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/info.json
index fbc4e94d83..6fc7724b2b 100644
--- a/keyboards/cannonkeys/atlas/info.json
+++ b/keyboards/cannonkeys/atlas/info.json
@@ -8,196 +8,217 @@
         "pid": "0xA7A5",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "B15",
+      "driver": "spi"
+    },
+    "matrix_pins": {
+      "cols": ["A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "A15", "A10", "A9"],
+      "rows": ["A8", "B14", "B12", "B4", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
       "LAYOUT_ortho_5x12": {
         "layout": [
-          {"label":"`", "x":0, "y":0},
-          {"label":"1", "x":1, "y":0},
-          {"label":"2", "x":2, "y":0},
-          {"label":"3", "x":3, "y":0},
-          {"label":"4", "x":4, "y":0},
-          {"label":"5", "x":5, "y":0},
-          {"label":"6", "x":6, "y":0},
-          {"label":"7", "x":7, "y":0},
-          {"label":"8", "x":8, "y":0},
-          {"label":"9", "x":9, "y":0},
-          {"label":"0", "x":10, "y":0},
-          {"label":"Backspace", "x":11, "y":0},
-          {"label":"Tab", "x":0, "y":1},
-          {"label":"Q", "x":1, "y":1},
-          {"label":"W", "x":2, "y":1},
-          {"label":"E", "x":3, "y":1},
-          {"label":"R", "x":4, "y":1},
-          {"label":"T", "x":5, "y":1},
-          {"label":"Y", "x":6, "y":1},
-          {"label":"U", "x":7, "y":1},
-          {"label":"I", "x":8, "y":1},
-          {"label":"O", "x":9, "y":1},
-          {"label":"P", "x":10, "y":1},
-          {"label":"Delete", "x":11, "y":1},
-          {"label":"Esc", "x":0, "y":2},
-          {"label":"A", "x":1, "y":2},
-          {"label":"S", "x":2, "y":2},
-          {"label":"D", "x":3, "y":2},
-          {"label":"F", "x":4, "y":2},
-          {"label":"G", "x":5, "y":2},
-          {"label":"H", "x":6, "y":2},
-          {"label":"J", "x":7, "y":2},
-          {"label":"K", "x":8, "y":2},
-          {"label":"L", "x":9, "y":2},
-          {"label":";", "x":10, "y":2},
-          {"label":"'", "x":11, "y":2},
-          {"label":"Shift", "x":0, "y":3},
-          {"label":"Z", "x":1, "y":3},
-          {"label":"X", "x":2, "y":3},
-          {"label":"C", "x":3, "y":3},
-          {"label":"V", "x":4, "y":3},
-          {"label":"B", "x":5, "y":3},
-          {"label":"N", "x":6, "y":3},
-          {"label":"M", "x":7, "y":3},
-          {"label":",", "x":8, "y":3},
-          {"label":".", "x":9, "y":3},
-          {"label":"/", "x":10, "y":3},
-          {"label":"Enter", "x":11, "y":3},
-          {"label":"Fn", "x":0, "y":4},
-          {"label":"Ctrl", "x":1, "y":4},
-          {"label":"Alt", "x":2, "y":4},
-          {"label":"Meta", "x":3, "y":4},
-          {"label":"Lower", "x":4, "y":4},
-          {"label":"Space", "x":5, "y":4},
-          {"label":"Space", "x":6, "y":4},
-          {"label":"Raise", "x":7, "y":4},
-          {"label":"Left", "x":8, "y":4},
-          {"label":"Down", "x":9, "y":4},
-          {"label":"Up", "x":10, "y":4},
-          {"label":"Right", "x":11, "y":4}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+          {"matrix": [1, 7], "x": 7, "y": 1},
+          {"matrix": [1, 8], "x": 8, "y": 1},
+          {"matrix": [1, 9], "x": 9, "y": 1},
+          {"matrix": [1, 10], "x": 10, "y": 1},
+          {"matrix": [1, 11], "x": 11, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+          {"matrix": [2, 7], "x": 7, "y": 2},
+          {"matrix": [2, 8], "x": 8, "y": 2},
+          {"matrix": [2, 9], "x": 9, "y": 2},
+          {"matrix": [2, 10], "x": 10, "y": 2},
+          {"matrix": [2, 11], "x": 11, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [3, 6], "x": 6, "y": 3},
+          {"matrix": [3, 7], "x": 7, "y": 3},
+          {"matrix": [3, 8], "x": 8, "y": 3},
+          {"matrix": [3, 9], "x": 9, "y": 3},
+          {"matrix": [3, 10], "x": 10, "y": 3},
+          {"matrix": [3, 11], "x": 11, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 4], "x": 4, "y": 4},
+          {"matrix": [4, 5], "x": 5, "y": 4},
+          {"matrix": [4, 6], "x": 6, "y": 4},
+          {"matrix": [4, 7], "x": 7, "y": 4},
+          {"matrix": [4, 8], "x": 8, "y": 4},
+          {"matrix": [4, 9], "x": 9, "y": 4},
+          {"matrix": [4, 10], "x": 10, "y": 4},
+          {"matrix": [4, 11], "x": 11, "y": 4}
         ]
       },
       "LAYOUT_ortho_5x12_1x2uC": {
         "layout": [
-          {"label":"`", "x":0, "y":0},
-          {"label":"1", "x":1, "y":0},
-          {"label":"2", "x":2, "y":0},
-          {"label":"3", "x":3, "y":0},
-          {"label":"4", "x":4, "y":0},
-          {"label":"5", "x":5, "y":0},
-          {"label":"6", "x":6, "y":0},
-          {"label":"7", "x":7, "y":0},
-          {"label":"8", "x":8, "y":0},
-          {"label":"9", "x":9, "y":0},
-          {"label":"0", "x":10, "y":0},
-          {"label":"Backspace", "x":11, "y":0},
-          {"label":"Tab", "x":0, "y":1},
-          {"label":"Q", "x":1, "y":1},
-          {"label":"W", "x":2, "y":1},
-          {"label":"E", "x":3, "y":1},
-          {"label":"R", "x":4, "y":1},
-          {"label":"T", "x":5, "y":1},
-          {"label":"Y", "x":6, "y":1},
-          {"label":"U", "x":7, "y":1},
-          {"label":"I", "x":8, "y":1},
-          {"label":"O", "x":9, "y":1},
-          {"label":"P", "x":10, "y":1},
-          {"label":"Delete", "x":11, "y":1},
-          {"label":"Esc", "x":0, "y":2},
-          {"label":"A", "x":1, "y":2},
-          {"label":"S", "x":2, "y":2},
-          {"label":"D", "x":3, "y":2},
-          {"label":"F", "x":4, "y":2},
-          {"label":"G", "x":5, "y":2},
-          {"label":"H", "x":6, "y":2},
-          {"label":"J", "x":7, "y":2},
-          {"label":"K", "x":8, "y":2},
-          {"label":"L", "x":9, "y":2},
-          {"label":";", "x":10, "y":2},
-          {"label":"'", "x":11, "y":2},
-          {"label":"Shift", "x":0, "y":3},
-          {"label":"Z", "x":1, "y":3},
-          {"label":"X", "x":2, "y":3},
-          {"label":"C", "x":3, "y":3},
-          {"label":"V", "x":4, "y":3},
-          {"label":"B", "x":5, "y":3},
-          {"label":"N", "x":6, "y":3},
-          {"label":"M", "x":7, "y":3},
-          {"label":",", "x":8, "y":3},
-          {"label":".", "x":9, "y":3},
-          {"label":"/", "x":10, "y":3},
-          {"label":"Enter", "x":11, "y":3},
-          {"label":"Fn", "x":0, "y":4},
-          {"label":"Ctrl", "x":1, "y":4},
-          {"label":"Alt", "x":2, "y":4},
-          {"label":"Meta", "x":3, "y":4},
-          {"label":"Lower", "x":4, "y":4},
-          {"label":"Space", "x":5, "y":4, "w":2},
-          {"label":"Raise", "x":7, "y":4},
-          {"label":"Left", "x":8, "y":4},
-          {"label":"Down", "x":9, "y":4},
-          {"label":"Up", "x":10, "y":4},
-          {"label":"Right", "x":11, "y":4}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+          {"matrix": [1, 7], "x": 7, "y": 1},
+          {"matrix": [1, 8], "x": 8, "y": 1},
+          {"matrix": [1, 9], "x": 9, "y": 1},
+          {"matrix": [1, 10], "x": 10, "y": 1},
+          {"matrix": [1, 11], "x": 11, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+          {"matrix": [2, 7], "x": 7, "y": 2},
+          {"matrix": [2, 8], "x": 8, "y": 2},
+          {"matrix": [2, 9], "x": 9, "y": 2},
+          {"matrix": [2, 10], "x": 10, "y": 2},
+          {"matrix": [2, 11], "x": 11, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [3, 6], "x": 6, "y": 3},
+          {"matrix": [3, 7], "x": 7, "y": 3},
+          {"matrix": [3, 8], "x": 8, "y": 3},
+          {"matrix": [3, 9], "x": 9, "y": 3},
+          {"matrix": [3, 10], "x": 10, "y": 3},
+          {"matrix": [3, 11], "x": 11, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 4], "x": 4, "y": 4},
+          {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+          {"matrix": [4, 7], "x": 7, "y": 4},
+          {"matrix": [4, 8], "x": 8, "y": 4},
+          {"matrix": [4, 9], "x": 9, "y": 4},
+          {"matrix": [4, 10], "x": 10, "y": 4},
+          {"matrix": [4, 11], "x": 11, "y": 4}
         ]
       },
       "LAYOUT_ortho_5x12_2x2uC": {
         "layout": [
-          {"label":"`", "x":0, "y":0},
-          {"label":"1", "x":1, "y":0},
-          {"label":"2", "x":2, "y":0},
-          {"label":"3", "x":3, "y":0},
-          {"label":"4", "x":4, "y":0},
-          {"label":"5", "x":5, "y":0},
-          {"label":"6", "x":6, "y":0},
-          {"label":"7", "x":7, "y":0},
-          {"label":"8", "x":8, "y":0},
-          {"label":"9", "x":9, "y":0},
-          {"label":"0", "x":10, "y":0},
-          {"label":"Backspace", "x":11, "y":0},
-          {"label":"Tab", "x":0, "y":1},
-          {"label":"Q", "x":1, "y":1},
-          {"label":"W", "x":2, "y":1},
-          {"label":"E", "x":3, "y":1},
-          {"label":"R", "x":4, "y":1},
-          {"label":"T", "x":5, "y":1},
-          {"label":"Y", "x":6, "y":1},
-          {"label":"U", "x":7, "y":1},
-          {"label":"I", "x":8, "y":1},
-          {"label":"O", "x":9, "y":1},
-          {"label":"P", "x":10, "y":1},
-          {"label":"Delete", "x":11, "y":1},
-          {"label":"Esc", "x":0, "y":2},
-          {"label":"A", "x":1, "y":2},
-          {"label":"S", "x":2, "y":2},
-          {"label":"D", "x":3, "y":2},
-          {"label":"F", "x":4, "y":2},
-          {"label":"G", "x":5, "y":2},
-          {"label":"H", "x":6, "y":2},
-          {"label":"J", "x":7, "y":2},
-          {"label":"K", "x":8, "y":2},
-          {"label":"L", "x":9, "y":2},
-          {"label":";", "x":10, "y":2},
-          {"label":"'", "x":11, "y":2},
-          {"label":"Shift", "x":0, "y":3},
-          {"label":"Z", "x":1, "y":3},
-          {"label":"X", "x":2, "y":3},
-          {"label":"C", "x":3, "y":3},
-          {"label":"V", "x":4, "y":3},
-          {"label":"B", "x":5, "y":3},
-          {"label":"N", "x":6, "y":3},
-          {"label":"M", "x":7, "y":3},
-          {"label":",", "x":8, "y":3},
-          {"label":".", "x":9, "y":3},
-          {"label":"/", "x":10, "y":3},
-          {"label":"Enter", "x":11, "y":3},
-          {"label":"Fn", "x":0, "y":4},
-          {"label":"Ctrl", "x":1, "y":4},
-          {"label":"Alt", "x":2, "y":4},
-          {"label":"Meta", "x":3, "y":4},
-          {"label":"Space1", "x":4, "y":4, "w":2},
-          {"label":"Space2", "x":6, "y":4, "w":2},
-          {"label":"Left", "x":8, "y":4},
-          {"label":"Down", "x":9, "y":4},
-          {"label":"Up", "x":10, "y":4},
-          {"label":"Right", "x":11, "y":4}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+          {"matrix": [1, 7], "x": 7, "y": 1},
+          {"matrix": [1, 8], "x": 8, "y": 1},
+          {"matrix": [1, 9], "x": 9, "y": 1},
+          {"matrix": [1, 10], "x": 10, "y": 1},
+          {"matrix": [1, 11], "x": 11, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+          {"matrix": [2, 7], "x": 7, "y": 2},
+          {"matrix": [2, 8], "x": 8, "y": 2},
+          {"matrix": [2, 9], "x": 9, "y": 2},
+          {"matrix": [2, 10], "x": 10, "y": 2},
+          {"matrix": [2, 11], "x": 11, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [3, 6], "x": 6, "y": 3},
+          {"matrix": [3, 7], "x": 7, "y": 3},
+          {"matrix": [3, 8], "x": 8, "y": 3},
+          {"matrix": [3, 9], "x": 9, "y": 3},
+          {"matrix": [3, 10], "x": 10, "y": 3},
+          {"matrix": [3, 11], "x": 11, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 5], "x": 4, "y": 4, "w": 2},
+          {"matrix": [4, 7], "x": 6, "y": 4, "w": 2},
+          {"matrix": [4, 8], "x": 8, "y": 4},
+          {"matrix": [4, 9], "x": 9, "y": 4},
+          {"matrix": [4, 10], "x": 10, "y": 4},
+          {"matrix": [4, 11], "x": 11, "y": 4}
         ]
       }
     }
diff --git a/keyboards/cannonkeys/atlas/rules.mk b/keyboards/cannonkeys/atlas/rules.mk
index fa596a2fb8..451e1c675c 100644
--- a/keyboards/cannonkeys/atlas/rules.mk
+++ b/keyboards/cannonkeys/atlas/rules.mk
@@ -9,4 +9,3 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
diff --git a/keyboards/cannonkeys/atlas_alps/atlas_alps.c b/keyboards/cannonkeys/atlas_alps/atlas_alps.c
deleted file mode 100644
index b1cdb84517..0000000000
--- a/keyboards/cannonkeys/atlas_alps/atlas_alps.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "atlas_alps.h"
diff --git a/keyboards/cannonkeys/atlas_alps/atlas_alps.h b/keyboards/cannonkeys/atlas_alps/atlas_alps.h
deleted file mode 100644
index 5cdb15a603..0000000000
--- a/keyboards/cannonkeys/atlas_alps/atlas_alps.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B  \
-  ) { \
-    { k00,  k01,  k02,  k03,  k04,  k05,  k06,  k07,  k08,  k09,  k0A, k0B }, \
-    { k10,  k11,  k12,  k13,  k14,  k15,  k16,  k17,  k18,  k19,  k1A, k1B }, \
-    { k20,  k21,  k22,  k23,  k24,  k25,  k26,  k27,  k28,  k29,  k2A, k2B }, \
-    { k30,  k31,  k32,  k33,  k34,  k35,  k36,  k37,  k38,  k39,  k3A, k3B }, \
-    { k40,  k41,  k42,  k43,  k44,  k45,  k46,  k47,  k48,  k49,  k4A, k4B } \
-  }
diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h
index 9adbb67a2f..3854b33fab 100644
--- a/keyboards/cannonkeys/atlas_alps/config.h
+++ b/keyboards/cannonkeys/atlas_alps/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B4, D1, D7, D6 }
-#define MATRIX_COL_PINS { B6, C6, D2, E6, C7, B3, F7, F6, F5, F4, F1, F0 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -33,7 +24,6 @@
 
 
 // ws2812 options
-#define RGB_DI_PIN D4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json
index e1831be72a..913dea01c2 100644
--- a/keyboards/cannonkeys/atlas_alps/info.json
+++ b/keyboards/cannonkeys/atlas_alps/info.json
@@ -8,12 +8,85 @@
         "pid": "0xA7A5",
         "device_version": "0.1.0"
     },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "D2", "E6", "C7", "B3", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B5", "B4", "D1", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x12"],
     "layouts": {
         "LAYOUT_ortho_5x12": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"|", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Y", "x":6, "y":1}, {"label":"U", "x":7, "y":1}, {"label":"I", "x":8, "y":1}, {"label":"O", "x":9, "y":1}, {"label":"P", "x":10, "y":1}, {"label":"Back Space", "x":11, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";", "x":10, "y":2}, {"label":"'", "x":11, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"N", "x":6, "y":3}, {"label":"M", "x":7, "y":3}, {"label":",", "x":8, "y":3}, {"label":".", "x":9, "y":3}, {"label":"/", "x":10, "y":3}, {"label":"Return", "x":11, "y":3}, {"label":"Caps Lock", "x":0, "y":4}, {"label":"Ctrl", "x":1, "y":4}, {"label":"Alt", "x":2, "y":4}, {"label":"Super", "x":3, "y":4}, {"label":"&dArr;", "x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"label":"&uArr;", "x":7, "y":4}, {"label":"&larr;", "x":8, "y":4}, {"label":"&darr;", "x":9, "y":4}, {"label":"&uarr;", "x":10, "y":4}, {"label":"&rarr;", "x":11, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/balance/balance.c b/keyboards/cannonkeys/balance/balance.c
index 2bb4485521..b0de0a3ae3 100644
--- a/keyboards/cannonkeys/balance/balance.c
+++ b/keyboards/cannonkeys/balance/balance.c
@@ -15,13 +15,3 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "balance.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return true;
-}
diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h
index 5d93b09a27..f9c629dad8 100644
--- a/keyboards/cannonkeys/balance/config.h
+++ b/keyboards/cannonkeys/balance/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, F1, C15, B3, C14, C13, B9, B8, B7 }
-#define MATRIX_ROW_PINS { B4, A15, A14, A0, F0 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json
index b9844e5295..7a1db4a0ec 100644
--- a/keyboards/cannonkeys/balance/info.json
+++ b/keyboards/cannonkeys/balance/info.json
@@ -8,6 +8,11 @@
         "pid": "0xBA77",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "F1", "C15", "B3", "C14", "C13", "B9", "B8", "B7"],
+        "rows": ["B4", "A15", "A14", "A0", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B6", "resolution": 2}
diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/info.json
index 0515152901..64ca1975b6 100644
--- a/keyboards/cannonkeys/brutalv2_1800/info.json
+++ b/keyboards/cannonkeys/brutalv2_1800/info.json
@@ -34,44 +34,44 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
-                { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
-                { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
-                { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
-                { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
-                { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
-                { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
-                { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 13], "x": 14.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 15.5, "y": 0.0 },
-                { "matrix": [0, 15], "x": 16.5, "y": 0.0 },
-                { "matrix": [0, 16], "x": 17.5, "y": 0.0 },
-                { "matrix": [0, 17], "x": 18.5, "y": 0.0 },
-                { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "matrix": [3, 12], "x": 14.0, "y": 1.25 },
+                { "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": "Del", "matrix": [0, 13], "x": 14, "y": 0 },
+                { "matrix": [0, 14], "x": 15.5, "y": 0 },
+                { "matrix": [0, 15], "x": 16.5, "y": 0 },
+                { "matrix": [0, 16], "x": 17.5, "y": 0 },
+                { "matrix": [0, 17], "x": 18.5, "y": 0 },
+                { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": ")", "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 },
+                { "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "matrix": [3, 12], "x": 14, "y": 1.25 },
                 { "label": "Insert", "matrix": [1, 14], "x": 15.5, "y": 1.25 },
                 { "label": "Home", "matrix": [1, 15], "x": 16.5, "y": 1.25 },
                 { "label": "PgUp", "matrix": [1, 16], "x": 17.5, "y": 1.25 },
                 { "matrix": [1, 17], "x": 18.5, "y": 1.25 },
-                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "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 },
@@ -89,7 +89,7 @@
                 { "label": "End", "matrix": [2, 15], "x": 16.5, "y": 2.25 },
                 { "label": "PgDn", "matrix": [2, 16], "x": 17.5, "y": 2.25 },
                 { "matrix": [2, 17], "x": 18.5, "y": 2.25 },
-                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "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 },
@@ -106,7 +106,7 @@
                 { "matrix": [3, 15], "x": 16.5, "y": 3.25 },
                 { "matrix": [3, 16], "x": 17.5, "y": 3.25 },
                 { "matrix": [3, 17], "x": 18.5, "y": 3.25 },
-                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "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 },
@@ -124,11 +124,11 @@
                 { "matrix": [4, 15], "x": 16.5, "y": 4.25 },
                 { "matrix": [4, 16], "x": 17.5, "y": 4.25 },
                 { "matrix": [4, 17], "x": 18.5, "y": 4.25 },
-                { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+                { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
                 { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
                 { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 10.0, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 10, "y": 5.25 },
                 { "label": "Ctrl", "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.25 },
                 { "label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.25 },
                 { "label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.25 },
diff --git a/keyboards/cannonkeys/brutalv2_65/brutalv2_65.c b/keyboards/cannonkeys/brutalv2_65/brutalv2_65.c
deleted file mode 100644
index e7102c47f2..0000000000
--- a/keyboards/cannonkeys/brutalv2_65/brutalv2_65.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "brutalv2_65.h"
diff --git a/keyboards/cannonkeys/brutalv2_65/config.h b/keyboards/cannonkeys/brutalv2_65/config.h
index 14b14879d6..ae9c049bc1 100644
--- a/keyboards/cannonkeys/brutalv2_65/config.h
+++ b/keyboards/cannonkeys/brutalv2_65/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { C13, C15, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2 }
-#define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/info.json
index 000e541557..699b31fea2 100644
--- a/keyboards/cannonkeys/brutalv2_65/info.json
+++ b/keyboards/cannonkeys/brutalv2_65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0008",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C13", "C15", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2"],
+        "rows": ["C14", "A1", "B14", "B15", "A8"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B3",
         "on_state": 0
diff --git a/keyboards/cannonkeys/caerdroia/info.json b/keyboards/cannonkeys/caerdroia/info.json
index 9fb4da4c93..1b3bd40e67 100644
--- a/keyboards/cannonkeys/caerdroia/info.json
+++ b/keyboards/cannonkeys/caerdroia/info.json
@@ -31,41 +31,41 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
-                { "matrix": [0, 10], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 13.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 14.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 15.25, "y": 0.0 },
-                { "matrix": [0, 15], "x": 16.25, "y": 0.0 },
-                { "matrix": [0, 16], "x": 17.25, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "matrix": [3, 12], "x": 14.0, "y": 1.25 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [0, 9], "x": 9.5, "y": 0 },
+                { "matrix": [0, 10], "x": 11, "y": 0 },
+                { "matrix": [0, 11], "x": 12, "y": 0 },
+                { "matrix": [0, 12], "x": 13, "y": 0 },
+                { "matrix": [0, 13], "x": 14, "y": 0 },
+                { "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "matrix": [0, 16], "x": 17.25, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "matrix": [3, 12], "x": 14, "y": 1.25 },
                 { "matrix": [1, 14], "x": 15.25, "y": 1.25 },
                 { "matrix": [1, 15], "x": 16.25, "y": 1.25 },
                 { "matrix": [1, 16], "x": 17.25, "y": 1.25 },
-                { "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -82,7 +82,7 @@
                 { "matrix": [2, 14], "x": 15.25, "y": 2.25 },
                 { "matrix": [2, 15], "x": 16.25, "y": 2.25 },
                 { "matrix": [2, 16], "x": 17.25, "y": 2.25 },
-                { "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "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 },
@@ -95,7 +95,7 @@
                 { "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "matrix": [4, 1], "x": 1.25, "y": 4.25 },
                 { "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -108,13 +108,13 @@
                 { "matrix": [4, 10], "x": 10.25, "y": 4.25 },
                 { "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25 },
-                { "matrix": [4, 13], "x": 14.0, "y": 4.25 },
+                { "matrix": [4, 13], "x": 14, "y": 4.25 },
                 { "matrix": [4, 15], "x": 16.25, "y": 4.25 },
-                { "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "matrix": [5, 6], "w": 7, "x": 4.0, "y": 5.25 },
-                { "matrix": [5, 11], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
+                { "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
                 { "matrix": [5, 12], "x": 12.5, "y": 5.25 },
                 { "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "matrix": [5, 14], "x": 15.25, "y": 5.25 },
diff --git a/keyboards/cannonkeys/chimera65/chimera65.c b/keyboards/cannonkeys/chimera65/chimera65.c
deleted file mode 100644
index 14f170d9c2..0000000000
--- a/keyboards/cannonkeys/chimera65/chimera65.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "chimera65.h"
diff --git a/keyboards/cannonkeys/chimera65/chimera65.h b/keyboards/cannonkeys/chimera65/chimera65.h
deleted file mode 100644
index 81532f3f19..0000000000
--- a/keyboards/cannonkeys/chimera65/chimera65.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,       \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K400, K401, K402,                   K406,             K409, K410, K411, K412, K413,       K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
-	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, K409,  K410,  K411,  K412,  K413,  KC_NO, K415 }  \
-}
diff --git a/keyboards/cannonkeys/chimera65/config.h b/keyboards/cannonkeys/chimera65/config.h
index 26e04106ab..a47b76953a 100644
--- a/keyboards/cannonkeys/chimera65/config.h
+++ b/keyboards/cannonkeys/chimera65/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B11, B10, B2, B1, A5, A4, A3, A2, A1, F0, C15, C14, A9, A8, A10, B3 }
-#define MATRIX_ROW_PINS { A13, A14, A15, C13, B8 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/cannonkeys/chimera65/info.json b/keyboards/cannonkeys/chimera65/info.json
index cdd07c3459..e9881750d9 100644
--- a/keyboards/cannonkeys/chimera65/info.json
+++ b/keyboards/cannonkeys/chimera65/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC024",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "A5", "A4", "A3", "A2", "A1", "F0", "C15", "C14", "A9", "A8", "A10", "B3"],
+        "rows": ["A13", "A14", "A15", "C13", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
@@ -18,85 +23,85 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
 
-                {"x": 15.5, "y": 2},
+                {"matrix": [2, 15], "x": 15.5, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
 
-                {"x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
 
-                {"x": 15.5, "y": 3},
+                {"matrix": [3, 15], "x": 15.5, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
 
-                {"x": 13.25, "y": 4.25},
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25}
+                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/cannonkeys/chimera65_hs/info.json b/keyboards/cannonkeys/chimera65_hs/info.json
index bea5e6b7c8..be1e83e190 100644
--- a/keyboards/cannonkeys/chimera65_hs/info.json
+++ b/keyboards/cannonkeys/chimera65_hs/info.json
@@ -30,70 +30,70 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "matrix": [1, 14], "x": 15.5, "y": 1.0 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "matrix": [2, 14], "x": 15.5, "y": 2.0 },
-                { "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [0, 14], "x": 14, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [1, 14], "x": 15.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [2, 14], "x": 15.5, "y": 2 },
+                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
                 { "matrix": [3, 13], "x": 14.25, "y": 3.25 },
-                { "matrix": [3, 14], "x": 15.5, "y": 3.0 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
-                { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 },
-                { "matrix": [4, 11], "w": 1.5, "x": 11.5, "y": 4.0 },
+                { "matrix": [3, 14], "x": 15.5, "y": 3 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "w": 1.5, "x": 11.5, "y": 4 },
                 { "matrix": [4, 12], "x": 13.25, "y": 4.25 },
                 { "matrix": [4, 13], "x": 14.25, "y": 4.25 },
                 { "matrix": [4, 14], "x": 15.25, "y": 4.25 }
diff --git a/keyboards/cannonkeys/cloudline/cloudline.c b/keyboards/cannonkeys/cloudline/cloudline.c
deleted file mode 100644
index d2b347a455..0000000000
--- a/keyboards/cannonkeys/cloudline/cloudline.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Andrew Kannan (@awkannan)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "cloudline.h"
diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h
index d7c7052163..a3fc30fc3d 100644
--- a/keyboards/cannonkeys/cloudline/config.h
+++ b/keyboards/cannonkeys/cloudline/config.h
@@ -3,10 +3,6 @@
 
 #pragma once
 
-#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B14, A8, A9, A10, A3, B0, A2, A1, A7, A0, B4, B6, B7 }
-#define MATRIX_ROW_PINS { A15, B3, B5, A4, A5, F1 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -16,7 +12,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json
index d5d8b817ea..a0b432f7ba 100644
--- a/keyboards/cannonkeys/cloudline/info.json
+++ b/keyboards/cannonkeys/cloudline/info.json
@@ -8,6 +8,15 @@
         "pid": "0x000A",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B10", "B11", "B12", "B14", "A8", "A9", "A10", "A3", "B0", "A2", "A1", "A7", "A0", "B4", "B6", "B7"],
+        "rows": ["A15", "B3", "B5", "A4", "A5", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
diff --git a/keyboards/cannonkeys/cloudline/rules.mk b/keyboards/cannonkeys/cloudline/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/cloudline/rules.mk
+++ b/keyboards/cannonkeys/cloudline/rules.mk
@@ -13,7 +13,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/crin/config.h b/keyboards/cannonkeys/crin/config.h
index c275e78f23..d6e974b21d 100644
--- a/keyboards/cannonkeys/crin/config.h
+++ b/keyboards/cannonkeys/crin/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B0, C15, C14, A7, A5, C13, A4, A2, A1, A0, B9, B8, B7, A3, B6, B4, B3, A15 }
-#define MATRIX_ROW_PINS { B11, B10, B2, F0, B5 }
-#define DIODE_DIRECTION COL2ROW
-
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/cannonkeys/crin/crin.c b/keyboards/cannonkeys/crin/crin.c
deleted file mode 100644
index 9f6039ff09..0000000000
--- a/keyboards/cannonkeys/crin/crin.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "crin.h"
diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json
index 6c6afa0f89..0fa01b54a2 100644
--- a/keyboards/cannonkeys/crin/info.json
+++ b/keyboards/cannonkeys/crin/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0012",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "C15", "C14", "A7", "A5", "C13", "A4", "A2", "A1", "A0", "B9", "B8", "B7", "A3", "B6", "B4", "B3", "A15"],
+        "rows": ["B11", "B10", "B2", "F0", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h
index 9e034e7c12..20f73d95a2 100644
--- a/keyboards/cannonkeys/db60/config.h
+++ b/keyboards/cannonkeys/db60/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B11, B10, B2, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 }
-#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 }
-#define DIODE_DIRECTION COL2ROW
-
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -42,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define WS2812_SPI SPID2
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json
index 5f4a94d367..99a4425752 100644
--- a/keyboards/cannonkeys/db60/info.json
+++ b/keyboards/cannonkeys/db60/info.json
@@ -6,11 +6,20 @@
         "vid": "0xCA04",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+        "rows": ["B1", "B0", "A7", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rules.mk
index 56e7b05c52..9a57c69c7e 100644
--- a/keyboards/cannonkeys/db60/rules.mk
+++ b/keyboards/cannonkeys/db60/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
 
 DEFAULT_FOLDER = cannonkeys/db60/rev2
 
diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h
index cd6fa15243..947648f59e 100644
--- a/keyboards/cannonkeys/devastatingtkl/config.h
+++ b/keyboards/cannonkeys/devastatingtkl/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B14, A8, A9, A10, A3, B0, A2, A1, A7, A0, B4, B6, B7 }
-#define MATRIX_ROW_PINS { A15, B3, B5, A4, A5, F1 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -40,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/devastatingtkl/devastatingtkl.c b/keyboards/cannonkeys/devastatingtkl/devastatingtkl.c
deleted file mode 100644
index 46072b4090..0000000000
--- a/keyboards/cannonkeys/devastatingtkl/devastatingtkl.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "devastatingtkl.h"
diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json
index 557b53817b..205b4af6d7 100644
--- a/keyboards/cannonkeys/devastatingtkl/info.json
+++ b/keyboards/cannonkeys/devastatingtkl/info.json
@@ -8,11 +8,20 @@
         "pid": "0xDE57",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B10", "B11", "B12", "B14", "A8", "A9", "A10", "A3", "B0", "A2", "A1", "A7", "A0", "B4", "B6", "B7"],
+        "rows": ["A15", "B3", "B5", "A4", "A5", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/cannonkeys/devastatingtkl/rules.mk b/keyboards/cannonkeys/devastatingtkl/rules.mk
index 8b82556130..b7ab91a339 100644
--- a/keyboards/cannonkeys/devastatingtkl/rules.mk
+++ b/keyboards/cannonkeys/devastatingtkl/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/ellipse/info.json b/keyboards/cannonkeys/ellipse/info.json
index 7788b893bf..461ec4971e 100644
--- a/keyboards/cannonkeys/ellipse/info.json
+++ b/keyboards/cannonkeys/ellipse/info.json
@@ -36,71 +36,71 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "label": "Bksp", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
-                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
-                { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4.0 },
-                { "label": "Fn", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
-                { "label": "Menu", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4.0 }
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "Fn", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/ellipse_hs/info.json b/keyboards/cannonkeys/ellipse_hs/info.json
index 76cb0cfae2..f83f26bcaa 100644
--- a/keyboards/cannonkeys/ellipse_hs/info.json
+++ b/keyboards/cannonkeys/ellipse_hs/info.json
@@ -26,68 +26,68 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "label": "Bksp", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
-                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Del", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Bksp", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/gentoo/config.h b/keyboards/cannonkeys/gentoo/config.h
index 14b14879d6..ae9c049bc1 100644
--- a/keyboards/cannonkeys/gentoo/config.h
+++ b/keyboards/cannonkeys/gentoo/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { C13, C15, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2 }
-#define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/gentoo/gentoo.c b/keyboards/cannonkeys/gentoo/gentoo.c
deleted file mode 100644
index a535e9b44c..0000000000
--- a/keyboards/cannonkeys/gentoo/gentoo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "gentoo.h"
diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/info.json
index 6b0c9399be..0608a560be 100644
--- a/keyboards/cannonkeys/gentoo/info.json
+++ b/keyboards/cannonkeys/gentoo/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C13", "C15", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2"],
+        "rows": ["C14", "A1", "B14", "B15", "A8"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B3",
         "on_state": 0
diff --git a/keyboards/cannonkeys/gentoo_hs/config.h b/keyboards/cannonkeys/gentoo_hs/config.h
index 8c83fe3fc6..4b007cf387 100644
--- a/keyboards/cannonkeys/gentoo_hs/config.h
+++ b/keyboards/cannonkeys/gentoo_hs/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A8, C13, B9, B8, B7, B6, B5, B4, B3, A7, A5, A4, A3, A2, A1 }
-#define MATRIX_ROW_PINS { A14, A15, A0, B1, B0 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/gentoo_hs/gentoo_hs.c b/keyboards/cannonkeys/gentoo_hs/gentoo_hs.c
deleted file mode 100644
index 8ecaa655f8..0000000000
--- a/keyboards/cannonkeys/gentoo_hs/gentoo_hs.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "gentoo_hs.h"
diff --git a/keyboards/cannonkeys/gentoo_hs/gentoo_hs.h b/keyboards/cannonkeys/gentoo_hs/gentoo_hs.h
deleted file mode 100644
index 681de34985..0000000000
--- a/keyboards/cannonkeys/gentoo_hs/gentoo_hs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_default( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-	K400, K401, K402,                   K406,                   K410, K411, K412, K413, K414  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  ____,  K213,  K214 }, \
-	{ K300,  ____,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
-	{ K400,  K401,  K402,  ____,  ____,  ____,  K406,  ____,  ____,  ____,  K410,  K411,  K412,  K413,  K414 }  \
-}
diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/info.json
index 8595a321b2..95e0c09aed 100644
--- a/keyboards/cannonkeys/gentoo_hs/info.json
+++ b/keyboards/cannonkeys/gentoo_hs/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0010",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A7", "A5", "A4", "A3", "A2", "A1"],
+        "rows": ["A14", "A15", "A0", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B14",
         "on_state": 0
@@ -17,77 +22,83 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Del", "x":15.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15.5, "y":1},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15.5, "y":2},
+                {"matrix": [3, 14], "x": 15.5, "y": 3},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14.25, "y":3.25},
-                {"label":"Fn", "x":15.5, "y":3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label":"Left", "x":13.25, "y":4.25},
-                {"label":"Down", "x":14.25, "y":4.25},
-                {"label":"Right", "x":15.25, "y":4.25}
+                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
index 103faf39f9..043ee2908a 100644
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { B5, B4, D7, F5, F6, F7, F4, D2, D0 }
-#define MATRIX_ROW_PINS { E6, B7, B0, B1, F1, F0, C6, C7, D4, D6, D5, D3 }
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D1
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/cannonkeys/hoodrowg/hoodrowg.c b/keyboards/cannonkeys/hoodrowg/hoodrowg.c
deleted file mode 100644
index f3aff6a32b..0000000000
--- a/keyboards/cannonkeys/hoodrowg/hoodrowg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 CannonKeys LLC
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "hoodrowg.h"
diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json
index 4d0adb731a..6a3846465d 100644
--- a/keyboards/cannonkeys/hoodrowg/info.json
+++ b/keyboards/cannonkeys/hoodrowg/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "D7", "F5", "F6", "F7", "F4", "D2", "D0"],
+        "rows": ["E6", "B7", "B0", "B1", "F1", "F0", "C6", "C7", "D4", "D6", "D5", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "scroll_lock": "B2"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h
index 8e7158765d..aced1f333c 100644
--- a/keyboards/cannonkeys/instant60/config.h
+++ b/keyboards/cannonkeys/instant60/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B2, B10, B11, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 }
-#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -40,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json
index 56f5126d0d..7994bdd547 100644
--- a/keyboards/cannonkeys/instant60/info.json
+++ b/keyboards/cannonkeys/instant60/info.json
@@ -8,11 +8,20 @@
         "pid": "0x1600",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B10", "B11", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+        "rows": ["B1", "B0", "A7", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["60_ansi", "60_tsangan_hhkb"],
diff --git a/keyboards/cannonkeys/instant60/instant60.c b/keyboards/cannonkeys/instant60/instant60.c
deleted file mode 100644
index 25b7099b0b..0000000000
--- a/keyboards/cannonkeys/instant60/instant60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "instant60.h"
diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk
index 8b82556130..b7ab91a339 100644
--- a/keyboards/cannonkeys/instant60/rules.mk
+++ b/keyboards/cannonkeys/instant60/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h
index 5afccde3a7..65ffa50103 100644
--- a/keyboards/cannonkeys/instant65/config.h
+++ b/keyboards/cannonkeys/instant65/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A8, C13, B9, B8, B7, B6, B5, B4, B3, A7, A5, A4, A3, A2, A1 }
-#define MATRIX_ROW_PINS { A14, A15, A0, B1, B0 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -40,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json
index eedb9bd5c7..23b667cf6c 100644
--- a/keyboards/cannonkeys/instant65/info.json
+++ b/keyboards/cannonkeys/instant65/info.json
@@ -8,16 +8,98 @@
         "pid": "0x1565",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A7", "A5", "A4", "A3", "A2", "A1"],
+        "rows": ["A14", "A15", "A0", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_default": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/instant65/instant65.c b/keyboards/cannonkeys/instant65/instant65.c
deleted file mode 100644
index 5efbf8226c..0000000000
--- a/keyboards/cannonkeys/instant65/instant65.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "instant65.h"
diff --git a/keyboards/cannonkeys/instant65/instant65.h b/keyboards/cannonkeys/instant65/instant65.h
deleted file mode 100644
index 0e2d4ae372..0000000000
--- a/keyboards/cannonkeys/instant65/instant65.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-	K400, K401, K402,                   K406,                   K410, K411, K412, K413, K414  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
-	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  K414 }  \
-}
diff --git a/keyboards/cannonkeys/instant65/rules.mk b/keyboards/cannonkeys/instant65/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/instant65/rules.mk
+++ b/keyboards/cannonkeys/instant65/rules.mk
@@ -13,7 +13,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/iron165/config.h b/keyboards/cannonkeys/iron165/config.h
index eb7011b349..eb890c1cbf 100644
--- a/keyboards/cannonkeys/iron165/config.h
+++ b/keyboards/cannonkeys/iron165/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A8, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { B12, B13, B14, B15, A1 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/cannonkeys/iron165/info.json b/keyboards/cannonkeys/iron165/info.json
index b0ad19785c..3ec67e95b6 100644
--- a/keyboards/cannonkeys/iron165/info.json
+++ b/keyboards/cannonkeys/iron165/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5165",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A5", "B10", "A3", "A2", "B0", "A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B12", "B13", "B14", "B15", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
@@ -17,8 +22,82 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_default": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         }
     }
-
 }
diff --git a/keyboards/cannonkeys/iron165/iron165.c b/keyboards/cannonkeys/iron165/iron165.c
deleted file mode 100644
index da21712fb2..0000000000
--- a/keyboards/cannonkeys/iron165/iron165.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "iron165.h"
diff --git a/keyboards/cannonkeys/iron165/iron165.h b/keyboards/cannonkeys/iron165/iron165.h
deleted file mode 100644
index d5579a09a4..0000000000
--- a/keyboards/cannonkeys/iron165/iron165.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,       \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K400, K401, K402,                   K406,                   K410, K411, K412, K413,       K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
-	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO,  K410,  K411,  K412,  K413,  KC_NO, K415 }  \
-}
diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h
index 57fa0cf7c3..2c1baa101d 100644
--- a/keyboards/cannonkeys/malicious_ergo/config.h
+++ b/keyboards/cannonkeys/malicious_ergo/config.h
@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B1, B0, A7, A1, A5, A4, A3, A10, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { B2, B10, B11, A2, A0 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -42,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json
index 9058e07878..3b54ee75b6 100644
--- a/keyboards/cannonkeys/malicious_ergo/info.json
+++ b/keyboards/cannonkeys/malicious_ergo/info.json
@@ -8,11 +8,20 @@
         "pid": "0x0009",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A1", "A5", "A4", "A3", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B2", "B10", "B11", "A2", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "indicators": {
         "caps_lock": "A8",
         "num_lock": "A9",
@@ -23,7 +32,94 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_default": {
-            "layout": [{"x":0.5, "y":0}, {"x":1.75, "y":0}, {"x":2.75, "y":0}, {"x":3.75, "y":0}, {"x":4.75, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":18, "y":0}, {"x":0.25, "y":1}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1}, {"x":15.5, "y":1}, {"x":16.5, "y":1, "w":1.5}, {"x":18.25, "y":1}, {"x":0, "y":2}, {"x":1.375, "y":2, "w":1.75}, {"x":3.125, "y":2}, {"x":4.13, "y":2}, {"x":5.13, "y":2}, {"x":6.13, "y":2}, {"x":7.13, "y":2}, {"x":9.88, "y":2}, {"x":10.88, "y":2}, {"x":11.88, "y":2}, {"x":12.88, "y":2}, {"x":13.88, "y":2}, {"x":14.88, "y":2}, {"x":15.88, "y":2, "w":2.25}, {"x":18.5, "y":2}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3}, {"x":1.5, "y":4, "w":1.5}, {"x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2}, {"x":7.75, "y":4, "w":1.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":14.25, "y":4, "w":1.5}, {"x":16.25, "y":4}, {"x":17.25, "y":4}, {"x":18.25, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.75, "y": 0},
+                {"matrix": [0, 9], "x": 10.75, "y": 0},
+                {"matrix": [0, 10], "x": 11.75, "y": 0},
+                {"matrix": [0, 11], "x": 12.75, "y": 0},
+                {"matrix": [0, 12], "x": 13.75, "y": 0},
+                {"matrix": [0, 13], "x": 14.75, "y": 0},
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
+                {"matrix": [0, 15], "x": 16.75, "y": 0},
+
+                {"matrix": [0, 16], "x": 18, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 8], "x": 9.5, "y": 1},
+                {"matrix": [1, 9], "x": 10.5, "y": 1},
+                {"matrix": [1, 10], "x": 11.5, "y": 1},
+                {"matrix": [1, 11], "x": 12.5, "y": 1},
+                {"matrix": [1, 12], "x": 13.5, "y": 1},
+                {"matrix": [1, 13], "x": 14.5, "y": 1},
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 16], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.375, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.125, "y": 2},
+                {"matrix": [2, 3], "x": 4.13, "y": 2},
+                {"matrix": [2, 4], "x": 5.13, "y": 2},
+                {"matrix": [2, 5], "x": 6.13, "y": 2},
+                {"matrix": [2, 6], "x": 7.13, "y": 2},
+
+                {"matrix": [2, 8], "x": 9.88, "y": 2},
+                {"matrix": [2, 9], "x": 10.88, "y": 2},
+                {"matrix": [2, 10], "x": 11.88, "y": 2},
+                {"matrix": [2, 11], "x": 12.88, "y": 2},
+                {"matrix": [2, 12], "x": 13.88, "y": 2},
+                {"matrix": [2, 13], "x": 14.88, "y": 2},
+                {"matrix": [2, 15], "x": 15.88, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 16], "x": 18.5, "y": 2},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+                {"matrix": [3, 14], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 14.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4},
+                {"matrix": [4, 16], "x": 18.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c b/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c
deleted file mode 100644
index 58e33a3889..0000000000
--- a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "malicious_ergo.h"
diff --git a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.h b/keyboards/cannonkeys/malicious_ergo/malicious_ergo.h
deleted file mode 100644
index 191baf768f..0000000000
--- a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_default( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,\
-  K10, K11, K12, K13, K14, K15, K16,      K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,\
-  K20, K21, K22, K23, K24, K25, K26,      K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G,\
-       K31, K32, K33, K34, K35, K36,      K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,     \
-       K41,      K43, K44,      K46,           K49,      K4B,      K4D, K4E, K4F, K3G \
-) { \
-  {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G  }, \
-  {  K10, K11, K12, K13, K14, K15, K16, ___, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, ___, K28, K29, K2A, K2B, K2C, K2D, ___, K2F, K2G  }, \
-  {  ___, K31, K32, K33, K34, K35, K36, ___, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, ___ }, \
-  {  ___, K41, ___, K43, K44, ___, K46, ___, ___, K49, ___, K4B, ___, K4D, K4E, K4F, K3G  }  \
-}
diff --git a/keyboards/cannonkeys/malicious_ergo/rules.mk b/keyboards/cannonkeys/malicious_ergo/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/malicious_ergo/rules.mk
+++ b/keyboards/cannonkeys/malicious_ergo/rules.mk
@@ -13,7 +13,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/moment/info.json b/keyboards/cannonkeys/moment/info.json
index 462c42d9b6..63da2b29e4 100644
--- a/keyboards/cannonkeys/moment/info.json
+++ b/keyboards/cannonkeys/moment/info.json
@@ -36,70 +36,70 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "label": "Bksp", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
-                { "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2.0 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
-                { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
-                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/moment_hs/info.json b/keyboards/cannonkeys/moment_hs/info.json
index 721eb80ad2..098d0dc4cf 100644
--- a/keyboards/cannonkeys/moment_hs/info.json
+++ b/keyboards/cannonkeys/moment_hs/info.json
@@ -30,68 +30,68 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "label": "Bksp", "matrix": [0, 14], "x": 13.0, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 13], "x": 14.0, "y": 0.0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
-                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Bksp", "matrix": [0, 14], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/nearfield/config.h b/keyboards/cannonkeys/nearfield/config.h
deleted file mode 100755
index 5c989ba3f3..0000000000
--- a/keyboards/cannonkeys/nearfield/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 Dr.Doof
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B4, D2, D4, D6, D7 }
-#define MATRIX_COL_PINS { D3, D5, C6, C7, B6, B5, B7, F0, F1, F4, F5, F6, F7, B3, B2, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/info.json
index 83550cbd36..998cbc14d6 100644
--- a/keyboards/cannonkeys/nearfield/info.json
+++ b/keyboards/cannonkeys/nearfield/info.json
@@ -8,6 +8,11 @@
        "pid":"0x0002",
        "device_version":"0.0.1"
     },
+    "matrix_pins": {
+       "cols": ["D3", "D5", "C6", "C7", "B6", "B5", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "D1"],
+       "rows": ["B4", "D2", "D4", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 0,
diff --git a/keyboards/cannonkeys/nearfield/nearfield.c b/keyboards/cannonkeys/nearfield/nearfield.c
deleted file mode 100755
index 7a635209de..0000000000
--- a/keyboards/cannonkeys/nearfield/nearfield.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Dr.Doof
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "nearfield.h"
diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h
index 6d2ab14c6b..65ffa50103 100644
--- a/keyboards/cannonkeys/obliterated75/config.h
+++ b/keyboards/cannonkeys/obliterated75/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { A13, B12, B11, B14, A8, A1 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -40,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json
index 30ea22bd74..bc8d774009 100644
--- a/keyboards/cannonkeys/obliterated75/info.json
+++ b/keyboards/cannonkeys/obliterated75/info.json
@@ -8,11 +8,20 @@
         "pid": "0x0B75",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A5", "B10", "A3", "A2", "B0", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "B12", "B11", "B14", "A8", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/cannonkeys/obliterated75/obliterated75.c b/keyboards/cannonkeys/obliterated75/obliterated75.c
deleted file mode 100644
index 347a643836..0000000000
--- a/keyboards/cannonkeys/obliterated75/obliterated75.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "obliterated75.h"
diff --git a/keyboards/cannonkeys/obliterated75/rules.mk b/keyboards/cannonkeys/obliterated75/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/obliterated75/rules.mk
+++ b/keyboards/cannonkeys/obliterated75/rules.mk
@@ -13,7 +13,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/onyx/config.h b/keyboards/cannonkeys/onyx/config.h
index 3c95a53960..a47b76953a 100644
--- a/keyboards/cannonkeys/onyx/config.h
+++ b/keyboards/cannonkeys/onyx/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B1, B0, C15, C14, A7, A5, C13, A4, A2, A1, A0, B9, B8, B7, A3, B6, B4, B3, A15 }
-#define MATRIX_ROW_PINS { B11, B10, B2, F0, B5 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/info.json
index a4e1a69c9c..0227024f02 100644
--- a/keyboards/cannonkeys/onyx/info.json
+++ b/keyboards/cannonkeys/onyx/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "C15", "C14", "A7", "A5", "C13", "A4", "A2", "A1", "A0", "B9", "B8", "B7", "A3", "B6", "B4", "B3", "A15"],
+        "rows": ["B11", "B10", "B2", "F0", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
diff --git a/keyboards/cannonkeys/onyx/onyx.c b/keyboards/cannonkeys/onyx/onyx.c
deleted file mode 100644
index fee271c9ee..0000000000
--- a/keyboards/cannonkeys/onyx/onyx.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2020 Andrew Kannan
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include "onyx.h"
diff --git a/keyboards/cannonkeys/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h
index 5c864541c7..eaf33bbfa0 100644
--- a/keyboards/cannonkeys/ortho48/config.h
+++ b/keyboards/cannonkeys/ortho48/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, B14, A15, A0, C15, C14}
-#define MATRIX_ROW_PINS { B12, C13, A2, A1 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 1
 
@@ -39,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 9
 #define WS2812_SPI SPID2
 
diff --git a/keyboards/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/info.json
index ba7f1dbdd4..dd4879b5be 100644
--- a/keyboards/cannonkeys/ortho48/info.json
+++ b/keyboards/cannonkeys/ortho48/info.json
@@ -8,116 +8,131 @@
     "pid": "0x4F48",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14"],
+    "rows": ["B12", "C13", "A2", "A1"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "A8",
     "levels": 6,
     "breathing": true
   },
+  "ws2812": {
+    "pin": "B15",
+    "driver": "spi"
+  },
   "processor": "STM32F103",
   "bootloader": "stm32duino",
   "community_layouts": ["ortho_4x12"],
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [
-        {"label":"Tab", "x":0, "y":0},
-        {"label":"Q", "x":1, "y":0},
-        {"label":"W", "x":2, "y":0},
-        {"label":"E", "x":3, "y":0},
-        {"label":"R", "x":4, "y":0},
-        {"label":"T", "x":5, "y":0},
-        {"label":"Y", "x":6, "y":0},
-        {"label":"U", "x":7, "y":0},
-        {"label":"I", "x":8, "y":0},
-        {"label":"O", "x":9, "y":0},
-        {"label":"P", "x":10, "y":0},
-        {"label":"Delete", "x":11, "y":0},
-        {"label":"Esc", "x":0, "y":1},
-        {"label":"A", "x":1, "y":1},
-        {"label":"S", "x":2, "y":1},
-        {"label":"D", "x":3, "y":1},
-        {"label":"F", "x":4, "y":1},
-        {"label":"G", "x":5, "y":1},
-        {"label":"H", "x":6, "y":1},
-        {"label":"J", "x":7, "y":1},
-        {"label":"K", "x":8, "y":1},
-        {"label":"L", "x":9, "y":1},
-        {"label":";", "x":10, "y":1},
-        {"label":"'", "x":11, "y":1},
-        {"label":"Shift", "x":0, "y":2},
-        {"label":"Z", "x":1, "y":2},
-        {"label":"X", "x":2, "y":2},
-        {"label":"C", "x":3, "y":2},
-        {"label":"V", "x":4, "y":2},
-        {"label":"B", "x":5, "y":2},
-        {"label":"N", "x":6, "y":2},
-        {"label":"M", "x":7, "y":2},
-        {"label":",", "x":8, "y":2},
-        {"label":".", "x":9, "y":2},
-        {"label":"/", "x":10, "y":2},
-        {"label":"Enter", "x":11, "y":2},
-        {"label":"Fn", "x":0, "y":3},
-        {"label":"Ctrl", "x":1, "y":3},
-        {"label":"Alt", "x":2, "y":3},
-        {"label":"Meta", "x":3, "y":3},
-        {"label":"Lower", "x":4, "y":3},
-        {"label":"Space", "x":5, "y":3},
-        {"label":"Space", "x":6, "y":3},
-        {"label":"Raise", "x":7, "y":3},
-        {"label":"Left", "x":8, "y":3},
-        {"label":"Down", "x":9, "y":3},
-        {"label":"Up", "x":10, "y":3},
-        {"label":"Right", "x":11, "y":3}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_1x2uC": {
       "layout": [
-        {"label":"Tab", "x":0, "y":0},
-        {"label":"Q", "x":1, "y":0},
-        {"label":"W", "x":2, "y":0},
-        {"label":"E", "x":3, "y":0},
-        {"label":"R", "x":4, "y":0},
-        {"label":"T", "x":5, "y":0},
-        {"label":"Y", "x":6, "y":0},
-        {"label":"U", "x":7, "y":0},
-        {"label":"I", "x":8, "y":0},
-        {"label":"O", "x":9, "y":0},
-        {"label":"P", "x":10, "y":0},
-        {"label":"Delete", "x":11, "y":0},
-        {"label":"Esc", "x":0, "y":1},
-        {"label":"A", "x":1, "y":1},
-        {"label":"S", "x":2, "y":1},
-        {"label":"D", "x":3, "y":1},
-        {"label":"F", "x":4, "y":1},
-        {"label":"G", "x":5, "y":1},
-        {"label":"H", "x":6, "y":1},
-        {"label":"J", "x":7, "y":1},
-        {"label":"K", "x":8, "y":1},
-        {"label":"L", "x":9, "y":1},
-        {"label":";", "x":10, "y":1},
-        {"label":"'", "x":11, "y":1},
-        {"label":"Shift", "x":0, "y":2},
-        {"label":"Z", "x":1, "y":2},
-        {"label":"X", "x":2, "y":2},
-        {"label":"C", "x":3, "y":2},
-        {"label":"V", "x":4, "y":2},
-        {"label":"B", "x":5, "y":2},
-        {"label":"N", "x":6, "y":2},
-        {"label":"M", "x":7, "y":2},
-        {"label":",", "x":8, "y":2},
-        {"label":".", "x":9, "y":2},
-        {"label":"/", "x":10, "y":2},
-        {"label":"Enter", "x":11, "y":2},
-        {"label":"Fn", "x":0, "y":3},
-        {"label":"Ctrl", "x":1, "y":3},
-        {"label":"Alt", "x":2, "y":3},
-        {"label":"Meta", "x":3, "y":3},
-        {"label":"Lower", "x":4, "y":3},
-        {"label":"Space", "x":5, "y":3, "w":2},
-        {"label":"Raise", "x":7, "y":3},
-        {"label":"Left", "x":8, "y":3},
-        {"label":"Down", "x":9, "y":3},
-        {"label":"Up", "x":10, "y":3},
-        {"label":"Right", "x":11, "y":3}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/cannonkeys/ortho48/ortho48.c b/keyboards/cannonkeys/ortho48/ortho48.c
deleted file mode 100644
index fe38f02007..0000000000
--- a/keyboards/cannonkeys/ortho48/ortho48.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "ortho48.h"
-
diff --git a/keyboards/cannonkeys/ortho48/ortho48.h b/keyboards/cannonkeys/ortho48/ortho48.h
deleted file mode 100644
index 1e51c37af7..0000000000
--- a/keyboards/cannonkeys/ortho48/ortho48.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,   k35   , k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
diff --git a/keyboards/cannonkeys/ortho48/rules.mk b/keyboards/cannonkeys/ortho48/rules.mk
index f7dee7ff20..57a302eec3 100644
--- a/keyboards/cannonkeys/ortho48/rules.mk
+++ b/keyboards/cannonkeys/ortho48/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h
index f9c6596a9f..c8c8c93e51 100644
--- a/keyboards/cannonkeys/ortho60/config.h
+++ b/keyboards/cannonkeys/ortho60/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 }
-#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 1
 
@@ -40,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 16
 #define WS2812_SPI SPID2
 
diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json
index 8426955dae..3b672f4f6d 100644
--- a/keyboards/cannonkeys/ortho60/info.json
+++ b/keyboards/cannonkeys/ortho60/info.json
@@ -8,140 +8,157 @@
     "pid": "0x4F60",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+    "rows": ["B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "A8",
     "levels": 6,
     "breathing": true
   },
+  "ws2812": {
+    "pin": "B15",
+    "driver": "spi"
+  },
   "processor": "STM32F103",
   "bootloader": "stm32duino",
   "community_layouts": ["ortho_5x12"],
   "layouts": {
     "LAYOUT_ortho_5x12": {
       "layout": [
-        {"label":"`", "x":0, "y":0},
-        {"label":"1", "x":1, "y":0},
-        {"label":"2", "x":2, "y":0},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0},
-        {"label":"5", "x":5, "y":0},
-        {"label":"6", "x":6, "y":0},
-        {"label":"7", "x":7, "y":0},
-        {"label":"8", "x":8, "y":0},
-        {"label":"9", "x":9, "y":0},
-        {"label":"0", "x":10, "y":0},
-        {"label":"Backspace", "x":11, "y":0},
-        {"label":"Tab", "x":0, "y":1},
-        {"label":"Q", "x":1, "y":1},
-        {"label":"W", "x":2, "y":1},
-        {"label":"E", "x":3, "y":1},
-        {"label":"R", "x":4, "y":1},
-        {"label":"T", "x":5, "y":1},
-        {"label":"Y", "x":6, "y":1},
-        {"label":"U", "x":7, "y":1},
-        {"label":"I", "x":8, "y":1},
-        {"label":"O", "x":9, "y":1},
-        {"label":"P", "x":10, "y":1},
-        {"label":"Delete", "x":11, "y":1},
-        {"label":"Esc", "x":0, "y":2},
-        {"label":"A", "x":1, "y":2},
-        {"label":"S", "x":2, "y":2},
-        {"label":"D", "x":3, "y":2},
-        {"label":"F", "x":4, "y":2},
-        {"label":"G", "x":5, "y":2},
-        {"label":"H", "x":6, "y":2},
-        {"label":"J", "x":7, "y":2},
-        {"label":"K", "x":8, "y":2},
-        {"label":"L", "x":9, "y":2},
-        {"label":";", "x":10, "y":2},
-        {"label":"'", "x":11, "y":2},
-        {"label":"Shift", "x":0, "y":3},
-        {"label":"Z", "x":1, "y":3},
-        {"label":"X", "x":2, "y":3},
-        {"label":"C", "x":3, "y":3},
-        {"label":"V", "x":4, "y":3},
-        {"label":"B", "x":5, "y":3},
-        {"label":"N", "x":6, "y":3},
-        {"label":"M", "x":7, "y":3},
-        {"label":",", "x":8, "y":3},
-        {"label":".", "x":9, "y":3},
-        {"label":"/", "x":10, "y":3},
-        {"label":"Enter", "x":11, "y":3},
-        {"label":"Fn", "x":0, "y":4},
-        {"label":"Ctrl", "x":1, "y":4},
-        {"label":"Alt", "x":2, "y":4},
-        {"label":"Meta", "x":3, "y":4},
-        {"label":"Lower", "x":4, "y":4},
-        {"label":"Space", "x":5, "y":4},
-        {"label":"Space", "x":6, "y":4},
-        {"label":"Raise", "x":7, "y":4},
-        {"label":"Left", "x":8, "y":4},
-        {"label":"Down", "x":9, "y":4},
-        {"label":"Up", "x":10, "y":4},
-        {"label":"Right", "x":11, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
+        {"matrix": [4, 7], "x": 7, "y": 4},
+        {"matrix": [4, 8], "x": 8, "y": 4},
+        {"matrix": [4, 9], "x": 9, "y": 4},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4}
       ]
     },
     "LAYOUT_1x2uC": {
       "layout": [
-        {"label":"`", "x":0, "y":0},
-        {"label":"1", "x":1, "y":0},
-        {"label":"2", "x":2, "y":0},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0},
-        {"label":"5", "x":5, "y":0},
-        {"label":"6", "x":6, "y":0},
-        {"label":"7", "x":7, "y":0},
-        {"label":"8", "x":8, "y":0},
-        {"label":"9", "x":9, "y":0},
-        {"label":"0", "x":10, "y":0},
-        {"label":"Backspace", "x":11, "y":0},
-        {"label":"Tab", "x":0, "y":1},
-        {"label":"Q", "x":1, "y":1},
-        {"label":"W", "x":2, "y":1},
-        {"label":"E", "x":3, "y":1},
-        {"label":"R", "x":4, "y":1},
-        {"label":"T", "x":5, "y":1},
-        {"label":"Y", "x":6, "y":1},
-        {"label":"U", "x":7, "y":1},
-        {"label":"I", "x":8, "y":1},
-        {"label":"O", "x":9, "y":1},
-        {"label":"P", "x":10, "y":1},
-        {"label":"Delete", "x":11, "y":1},
-        {"label":"Esc", "x":0, "y":2},
-        {"label":"A", "x":1, "y":2},
-        {"label":"S", "x":2, "y":2},
-        {"label":"D", "x":3, "y":2},
-        {"label":"F", "x":4, "y":2},
-        {"label":"G", "x":5, "y":2},
-        {"label":"H", "x":6, "y":2},
-        {"label":"J", "x":7, "y":2},
-        {"label":"K", "x":8, "y":2},
-        {"label":"L", "x":9, "y":2},
-        {"label":";", "x":10, "y":2},
-        {"label":"'", "x":11, "y":2},
-        {"label":"Shift", "x":0, "y":3},
-        {"label":"Z", "x":1, "y":3},
-        {"label":"X", "x":2, "y":3},
-        {"label":"C", "x":3, "y":3},
-        {"label":"V", "x":4, "y":3},
-        {"label":"B", "x":5, "y":3},
-        {"label":"N", "x":6, "y":3},
-        {"label":"M", "x":7, "y":3},
-        {"label":",", "x":8, "y":3},
-        {"label":".", "x":9, "y":3},
-        {"label":"/", "x":10, "y":3},
-        {"label":"Enter", "x":11, "y":3},
-        {"label":"Fn", "x":0, "y":4},
-        {"label":"Ctrl", "x":1, "y":4},
-        {"label":"Alt", "x":2, "y":4},
-        {"label":"Meta", "x":3, "y":4},
-        {"label":"Lower", "x":4, "y":4},
-        {"label":"Space", "x":5, "y":4, "w":2},
-        {"label":"Raise", "x":7, "y":4},
-        {"label":"Left", "x":8, "y":4},
-        {"label":"Down", "x":9, "y":4},
-        {"label":"Up", "x":10, "y":4},
-        {"label":"Right", "x":11, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+        {"matrix": [4, 7], "x": 7, "y": 4},
+        {"matrix": [4, 8], "x": 8, "y": 4},
+        {"matrix": [4, 9], "x": 9, "y": 4},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4}
       ]
     }
   }
diff --git a/keyboards/cannonkeys/ortho60/ortho60.c b/keyboards/cannonkeys/ortho60/ortho60.c
deleted file mode 100644
index f917ef96f9..0000000000
--- a/keyboards/cannonkeys/ortho60/ortho60.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "ortho60.h"
-
diff --git a/keyboards/cannonkeys/ortho60/ortho60.h b/keyboards/cannonkeys/ortho60/ortho60.h
deleted file mode 100644
index 0f3ae127aa..0000000000
--- a/keyboards/cannonkeys/ortho60/ortho60.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44,   k45   , k47, k48, k49, k4a, k4b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b }, \
-}
-
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b }, \
-}
diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk
index f7dee7ff20..57a302eec3 100644
--- a/keyboards/cannonkeys/ortho60/rules.mk
+++ b/keyboards/cannonkeys/ortho60/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/ortho60v2/info.json b/keyboards/cannonkeys/ortho60v2/info.json
index 03e1a28f30..0f7c6ba0c6 100644
--- a/keyboards/cannonkeys/ortho60v2/info.json
+++ b/keyboards/cannonkeys/ortho60v2/info.json
@@ -38,66 +38,66 @@
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
-                { "label": "`", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "1", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "label": "2", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "label": "3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "label": "4", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "label": "5", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "label": "6", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "label": "7", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "label": "8", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "label": "9", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "label": "0", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "label": "Tab", "matrix": [1, 0], "x": 0.0, "y": 1.0 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.0, "y": 1.0 },
-                { "label": "W", "matrix": [1, 2], "x": 2.0, "y": 1.0 },
-                { "label": "E", "matrix": [1, 3], "x": 3.0, "y": 1.0 },
-                { "label": "R", "matrix": [1, 4], "x": 4.0, "y": 1.0 },
-                { "label": "T", "matrix": [1, 5], "x": 5.0, "y": 1.0 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.0, "y": 1.0 },
-                { "label": "U", "matrix": [1, 7], "x": 7.0, "y": 1.0 },
-                { "label": "I", "matrix": [1, 8], "x": 8.0, "y": 1.0 },
-                { "label": "O", "matrix": [1, 9], "x": 9.0, "y": 1.0 },
-                { "label": "P", "matrix": [1, 10], "x": 10.0, "y": 1.0 },
-                { "label": "Back Space", "matrix": [1, 11], "x": 11.0, "y": 1.0 },
-                { "label": "Esc", "matrix": [2, 0], "x": 0.0, "y": 2.0 },
-                { "label": "A", "matrix": [2, 1], "x": 1.0, "y": 2.0 },
-                { "label": "S", "matrix": [2, 2], "x": 2.0, "y": 2.0 },
-                { "label": "D", "matrix": [2, 3], "x": 3.0, "y": 2.0 },
-                { "label": "F", "matrix": [2, 4], "x": 4.0, "y": 2.0 },
-                { "label": "G", "matrix": [2, 5], "x": 5.0, "y": 2.0 },
-                { "label": "H", "matrix": [2, 6], "x": 6.0, "y": 2.0 },
-                { "label": "J", "matrix": [2, 7], "x": 7.0, "y": 2.0 },
-                { "label": "K", "matrix": [2, 8], "x": 8.0, "y": 2.0 },
-                { "label": "L", "matrix": [2, 9], "x": 9.0, "y": 2.0 },
-                { "label": ";", "matrix": [2, 10], "x": 10.0, "y": 2.0 },
-                { "label": "'", "matrix": [2, 11], "x": 11.0, "y": 2.0 },
-                { "label": "Shift", "matrix": [3, 0], "x": 0.0, "y": 3.0 },
-                { "label": "Z", "matrix": [3, 1], "x": 1.0, "y": 3.0 },
-                { "label": "X", "matrix": [3, 2], "x": 2.0, "y": 3.0 },
-                { "label": "C", "matrix": [3, 3], "x": 3.0, "y": 3.0 },
-                { "label": "V", "matrix": [3, 4], "x": 4.0, "y": 3.0 },
-                { "label": "B", "matrix": [3, 5], "x": 5.0, "y": 3.0 },
-                { "label": "N", "matrix": [3, 6], "x": 6.0, "y": 3.0 },
-                { "label": "M", "matrix": [3, 7], "x": 7.0, "y": 3.0 },
-                { "label": ",", "matrix": [3, 8], "x": 8.0, "y": 3.0 },
-                { "label": ".", "matrix": [3, 9], "x": 9.0, "y": 3.0 },
-                { "label": "/", "matrix": [3, 10], "x": 10.0, "y": 3.0 },
-                { "label": "Return", "matrix": [3, 11], "x": 11.0, "y": 3.0 },
-                { "matrix": [4, 0], "x": 0.0, "y": 4.0 },
-                { "label": "Ctrl", "matrix": [4, 1], "x": 1.0, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 2], "x": 2.0, "y": 4.0 },
-                { "label": "Super", "matrix": [4, 3], "x": 3.0, "y": 4.0 },
-                { "label": "Lower", "matrix": [4, 4], "x": 4.0, "y": 4.0 },
-                { "matrix": [4, 5], "x": 5.0, "y": 4.0 },
-                { "matrix": [4, 6], "x": 6.0, "y": 4.0 },
-                { "label": "Raise", "matrix": [4, 7], "x": 7.0, "y": 4.0 },
-                { "label": "&larr;", "matrix": [4, 8], "x": 8.0, "y": 4.0 },
-                { "label": "&darr;", "matrix": [4, 9], "x": 9.0, "y": 4.0 },
-                { "label": "&uarr;", "matrix": [4, 10], "x": 10.0, "y": 4.0 },
-                { "label": "&rarr;", "matrix": [4, 11], "x": 11.0, "y": 4.0 }
+                { "label": "`", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "Del", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10, "y": 1 },
+                { "label": "Back Space", "matrix": [1, 11], "x": 11, "y": 1 },
+                { "label": "Esc", "matrix": [2, 0], "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9, "y": 2 },
+                { "label": ";", "matrix": [2, 10], "x": 10, "y": 2 },
+                { "label": "'", "matrix": [2, 11], "x": 11, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 1], "x": 1, "y": 3 },
+                { "label": "X", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "label": "C", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "V", "matrix": [3, 4], "x": 4, "y": 3 },
+                { "label": "B", "matrix": [3, 5], "x": 5, "y": 3 },
+                { "label": "N", "matrix": [3, 6], "x": 6, "y": 3 },
+                { "label": "M", "matrix": [3, 7], "x": 7, "y": 3 },
+                { "label": ",", "matrix": [3, 8], "x": 8, "y": 3 },
+                { "label": ".", "matrix": [3, 9], "x": 9, "y": 3 },
+                { "label": "/", "matrix": [3, 10], "x": 10, "y": 3 },
+                { "label": "Return", "matrix": [3, 11], "x": 11, "y": 3 },
+                { "matrix": [4, 0], "x": 0, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 1], "x": 1, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "x": 2, "y": 4 },
+                { "label": "Super", "matrix": [4, 3], "x": 3, "y": 4 },
+                { "label": "Lower", "matrix": [4, 4], "x": 4, "y": 4 },
+                { "matrix": [4, 5], "x": 5, "y": 4 },
+                { "matrix": [4, 6], "x": 6, "y": 4 },
+                { "label": "Raise", "matrix": [4, 7], "x": 7, "y": 4 },
+                { "label": "&larr;", "matrix": [4, 8], "x": 8, "y": 4 },
+                { "label": "&darr;", "matrix": [4, 9], "x": 9, "y": 4 },
+                { "label": "&uarr;", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "&rarr;", "matrix": [4, 11], "x": 11, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/ortho60v2/ortho60v2.c b/keyboards/cannonkeys/ortho60v2/ortho60v2.c
index 0fc9239ee8..3e0248abda 100644
--- a/keyboards/cannonkeys/ortho60v2/ortho60v2.c
+++ b/keyboards/cannonkeys/ortho60v2/ortho60v2.c
@@ -15,17 +15,3 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "ortho60v2.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    if (clockwise) {
-        tap_code_delay(KC_VOLU, 10);
-    } else {
-        tap_code_delay(KC_VOLD, 10);
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h
index 5246778d13..c8c8c93e51 100644
--- a/keyboards/cannonkeys/ortho75/config.h
+++ b/keyboards/cannonkeys/ortho75/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, B14, A15, A0, C15, C14, B7, B6, B5 }
-#define MATRIX_ROW_PINS { B12, C13, A2, A1, A3 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 1
 
@@ -40,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 16
 #define WS2812_SPI SPID2
 
diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/info.json
index 751eeb5297..dd2b78b998 100644
--- a/keyboards/cannonkeys/ortho75/info.json
+++ b/keyboards/cannonkeys/ortho75/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6464",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14", "B7", "B6", "B5"],
+    "rows": ["B12", "C13", "A2", "A1", "A3"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B9", "pin_b": "B8"}
@@ -18,87 +23,95 @@
     "levels": 6,
     "breathing": true
   },
+  "ws2812": {
+    "pin": "B15",
+    "driver": "spi"
+  },
   "processor": "STM32F103",
   "bootloader": "stm32duino",
   "community_layouts": ["ortho_5x15"],
   "layouts": {
     "LAYOUT_ortho_5x15": {
       "layout": [
-        {"label":"`", "x":0, "y":0},
-        {"label":"1", "x":1, "y":0},
-        {"label":"2", "x":2, "y":0},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0},
-        {"label":"5", "x":5, "y":0},
-        {"label":"6", "x":6, "y":0},
-        {"label":"7", "x":7, "y":0},
-        {"label":"8", "x":8, "y":0},
-        {"label":"9", "x":9, "y":0},
-        {"label":"0", "x":10, "y":0},
-        {"label":"Backspace", "x":11, "y":0},
-        {"label":"0", "x":12, "y":0},
-        {"label":"0", "x":13, "y":0},
-        {"label":"0", "x":14, "y":0},
-        {"label":"Tab", "x":0, "y":1},
-        {"label":"Q", "x":1, "y":1},
-        {"label":"W", "x":2, "y":1},
-        {"label":"E", "x":3, "y":1},
-        {"label":"R", "x":4, "y":1},
-        {"label":"T", "x":5, "y":1},
-        {"label":"Y", "x":6, "y":1},
-        {"label":"U", "x":7, "y":1},
-        {"label":"I", "x":8, "y":1},
-        {"label":"O", "x":9, "y":1},
-        {"label":"P", "x":10, "y":1},
-        {"label":"Delete", "x":11, "y":1},
-        {"label":"0", "x":12, "y":1},
-        {"label":"0", "x":13, "y":1},
-        {"label":"0", "x":14, "y":1},
-        {"label":"Esc", "x":0, "y":2},
-        {"label":"A", "x":1, "y":2},
-        {"label":"S", "x":2, "y":2},
-        {"label":"D", "x":3, "y":2},
-        {"label":"F", "x":4, "y":2},
-        {"label":"G", "x":5, "y":2},
-        {"label":"H", "x":6, "y":2},
-        {"label":"J", "x":7, "y":2},
-        {"label":"K", "x":8, "y":2},
-        {"label":"L", "x":9, "y":2},
-        {"label":";", "x":10, "y":2},
-        {"label":"'", "x":11, "y":2},
-        {"label":"0", "x":12, "y":2},
-        {"label":"0", "x":13, "y":2},
-        {"label":"0", "x":14, "y":2},
-        {"label":"Shift", "x":0, "y":3},
-        {"label":"Z", "x":1, "y":3},
-        {"label":"X", "x":2, "y":3},
-        {"label":"C", "x":3, "y":3},
-        {"label":"V", "x":4, "y":3},
-        {"label":"B", "x":5, "y":3},
-        {"label":"N", "x":6, "y":3},
-        {"label":"M", "x":7, "y":3},
-        {"label":",", "x":8, "y":3},
-        {"label":".", "x":9, "y":3},
-        {"label":"/", "x":10, "y":3},
-        {"label":"Enter", "x":11, "y":3},
-        {"label":"0", "x":12, "y":3},
-        {"label":"0", "x":13, "y":3},
-        {"label":"0", "x":14, "y":3},
-        {"label":"Fn", "x":0, "y":4},
-        {"label":"Ctrl", "x":1, "y":4},
-        {"label":"Alt", "x":2, "y":4},
-        {"label":"Meta", "x":3, "y":4},
-        {"label":"Lower", "x":4, "y":4},
-        {"label":"Space", "x":5, "y":4},
-        {"label":"Space", "x":6, "y":4},
-        {"label":"Raise", "x":7, "y":4},
-        {"label":"Left", "x":8, "y":4},
-        {"label":"Down", "x":9, "y":4},
-        {"label":"Up", "x":10, "y":4},
-        {"label":"Right", "x":11, "y":4},
-        {"label":"0", "x":12, "y":4},
-        {"label":"0", "x":13, "y":4},
-        {"label":"0", "x":14, "y":4}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 13], "x": 13, "y": 0},
+          {"matrix": [0, 14], "x": 14, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+          {"matrix": [1, 7], "x": 7, "y": 1},
+          {"matrix": [1, 8], "x": 8, "y": 1},
+          {"matrix": [1, 9], "x": 9, "y": 1},
+          {"matrix": [1, 10], "x": 10, "y": 1},
+          {"matrix": [1, 11], "x": 11, "y": 1},
+          {"matrix": [1, 12], "x": 12, "y": 1},
+          {"matrix": [1, 13], "x": 13, "y": 1},
+          {"matrix": [1, 14], "x": 14, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+          {"matrix": [2, 7], "x": 7, "y": 2},
+          {"matrix": [2, 8], "x": 8, "y": 2},
+          {"matrix": [2, 9], "x": 9, "y": 2},
+          {"matrix": [2, 10], "x": 10, "y": 2},
+          {"matrix": [2, 11], "x": 11, "y": 2},
+          {"matrix": [2, 12], "x": 12, "y": 2},
+          {"matrix": [2, 13], "x": 13, "y": 2},
+          {"matrix": [2, 14], "x": 14, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [3, 6], "x": 6, "y": 3},
+          {"matrix": [3, 7], "x": 7, "y": 3},
+          {"matrix": [3, 8], "x": 8, "y": 3},
+          {"matrix": [3, 9], "x": 9, "y": 3},
+          {"matrix": [3, 10], "x": 10, "y": 3},
+          {"matrix": [3, 11], "x": 11, "y": 3},
+          {"matrix": [3, 12], "x": 12, "y": 3},
+          {"matrix": [3, 13], "x": 13, "y": 3},
+          {"matrix": [3, 14], "x": 14, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 4], "x": 4, "y": 4},
+          {"matrix": [4, 5], "x": 5, "y": 4},
+          {"matrix": [4, 6], "x": 6, "y": 4},
+          {"matrix": [4, 7], "x": 7, "y": 4},
+          {"matrix": [4, 8], "x": 8, "y": 4},
+          {"matrix": [4, 9], "x": 9, "y": 4},
+          {"matrix": [4, 10], "x": 10, "y": 4},
+          {"matrix": [4, 11], "x": 11, "y": 4},
+          {"matrix": [4, 12], "x": 12, "y": 4},
+          {"matrix": [4, 13], "x": 13, "y": 4},
+          {"matrix": [4, 14], "x": 14, "y": 4}
       ]
     }
   }
diff --git a/keyboards/cannonkeys/ortho75/ortho75.c b/keyboards/cannonkeys/ortho75/ortho75.c
index 58b7396a1b..366f4e7767 100644
--- a/keyboards/cannonkeys/ortho75/ortho75.c
+++ b/keyboards/cannonkeys/ortho75/ortho75.c
@@ -1,5 +1,5 @@
 
-#include "ortho75.h"
+#include "quantum.h"
 
 #define MEDIA_KEY_DELAY 10
 
diff --git a/keyboards/cannonkeys/ortho75/ortho75.h b/keyboards/cannonkeys/ortho75/ortho75.h
deleted file mode 100644
index d23e064296..0000000000
--- a/keyboards/cannonkeys/ortho75/ortho75.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x15( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \
-}
diff --git a/keyboards/cannonkeys/ortho75/rules.mk b/keyboards/cannonkeys/ortho75/rules.mk
index ee4421ed3a..2407875062 100644
--- a/keyboards/cannonkeys/ortho75/rules.mk
+++ b/keyboards/cannonkeys/ortho75/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
 ENCODER_ENABLE = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h
index 287b1484e9..c766c83f65 100644
--- a/keyboards/cannonkeys/practice60/config.h
+++ b/keyboards/cannonkeys/practice60/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14 }
-#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 1
 
@@ -40,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 9
 #define WS2812_SPI SPID2
 
diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/info.json
index a25485038b..7b3384a0fb 100644
--- a/keyboards/cannonkeys/practice60/info.json
+++ b/keyboards/cannonkeys/practice60/info.json
@@ -8,11 +8,20 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
+    "rows": ["B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "A8",
     "levels": 6,
     "breathing": true
   },
+  "ws2812": {
+    "pin": "B15",
+    "driver": "spi"
+  },
   "processor": "STM32F103",
   "bootloader": "stm32duino",
   "community_layouts": ["60_ansi"],
diff --git a/keyboards/cannonkeys/practice60/practice60.c b/keyboards/cannonkeys/practice60/practice60.c
deleted file mode 100644
index d2cf47deb8..0000000000
--- a/keyboards/cannonkeys/practice60/practice60.c
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "practice60.h"
diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk
index 07f7d949d9..01c330aeb6 100644
--- a/keyboards/cannonkeys/practice60/rules.mk
+++ b/keyboards/cannonkeys/practice60/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
 
 DEFAULT_FOLDER = cannonkeys/practice60
 
diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h
index ac3f193da9..0163604ead 100644
--- a/keyboards/cannonkeys/practice65/config.h
+++ b/keyboards/cannonkeys/practice65/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B8, B0, A0, B5, B10, B9, A6, B12, A7, A5, A4, A3, A2, A1, B13, B14 }
-#define MATRIX_ROW_PINS { B4, B11, B1, B7, B6 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 1
 
@@ -40,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
 
diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/info.json
index 17e548a825..28841b48a6 100644
--- a/keyboards/cannonkeys/practice65/info.json
+++ b/keyboards/cannonkeys/practice65/info.json
@@ -8,16 +8,99 @@
         "pid": "0x6565",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B8", "B0", "A0", "B5", "B10", "B9", "A6", "B12", "A7", "A5", "A4", "A3", "A2", "A1", "B13", "B14"],
+        "rows": ["B4", "B11", "B1", "B7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A8",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
-    "layouts": {
+   "layouts": {
         "LAYOUT_default": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/practice65/practice65.c b/keyboards/cannonkeys/practice65/practice65.c
deleted file mode 100644
index 10f60460fa..0000000000
--- a/keyboards/cannonkeys/practice65/practice65.c
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "practice65.h"
diff --git a/keyboards/cannonkeys/practice65/practice65.h b/keyboards/cannonkeys/practice65/practice65.h
deleted file mode 100644
index dec02af936..0000000000
--- a/keyboards/cannonkeys/practice65/practice65.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define KNO KC_NO
-
-#define LAYOUT_default( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2F, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-  K40, K41,  K42,               K46,           K49, K4A, K4B, K4C, K4D,      K4F \
-) { \
-  {  K00,  K01,  K02,  K03,  K04,    K05,    K06,    K07,    K08,    K09,  K0A,  K0B,  K0C,    K0D,   K0E,    K0F }, \
-  {  K10,  K11,  K12,  K13,  K14,    K15,    K16,    K17,    K18,    K19,  K1A,  K1B,  K1C,    K1D,   KC_NO ,  K1F }, \
-  {  K20,  K21,  K22,  K23,  K24,    K25,    K26,    K27,    K28,    K29,  K2A,  K2B,  KC_NO,  K2D,   KC_NO,  K2F  }, \
-  {  K30,  KNO,  K32,  K33,  K34,    K35,    K36,    K37,    K38,    K39,  K3A,  K3B,  K3C,    K3D,   KC_NO,  K3F  }, \
-  {  K40,  K41,  K42,  KNO,  KC_NO,  KC_NO,  K46,    KC_NO,  KC_NO,  K49,  K4A,  K4B,  K4C,    K4D,   KC_NO,  K4F  }  \
-}
diff --git a/keyboards/cannonkeys/practice65/rules.mk b/keyboards/cannonkeys/practice65/rules.mk
index f7dee7ff20..57a302eec3 100644
--- a/keyboards/cannonkeys/practice65/rules.mk
+++ b/keyboards/cannonkeys/practice65/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/rekt1800/config.h b/keyboards/cannonkeys/rekt1800/config.h
index 37d156feb9..7f21b3f8a8 100644
--- a/keyboards/cannonkeys/rekt1800/config.h
+++ b/keyboards/cannonkeys/rekt1800/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B12, A14, A15, B3, B4, B5, B6, B7, B8, B9, A7, B0, B1, B2, B10, A3, A4, A5, C15 }
-#define MATRIX_ROW_PINS { C13, C14, A0, A1, A2, B11 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/info.json
index e68f214427..675b572739 100644
--- a/keyboards/cannonkeys/rekt1800/info.json
+++ b/keyboards/cannonkeys/rekt1800/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2377",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B12", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A7", "B0", "B1", "B2", "B10", "A3", "A4", "A5", "C15"],
+        "rows": ["C13", "C14", "A0", "A1", "A2", "B11"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
diff --git a/keyboards/cannonkeys/rekt1800/rekt1800.c b/keyboards/cannonkeys/rekt1800/rekt1800.c
deleted file mode 100644
index 3a8673b955..0000000000
--- a/keyboards/cannonkeys/rekt1800/rekt1800.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rekt1800.h"
diff --git a/keyboards/cannonkeys/ripple/info.json b/keyboards/cannonkeys/ripple/info.json
index 63564ae7ce..66ca4e8695 100644
--- a/keyboards/cannonkeys/ripple/info.json
+++ b/keyboards/cannonkeys/ripple/info.json
@@ -23,9 +23,12 @@
         "backlight": true,
         "rgblight": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "rgblight": {
         "led_count": 20,
-        "pin": "B15",
         "hue_steps": 17,
         "saturation_steps": 17,
         "brightness_steps": 17,
diff --git a/keyboards/cannonkeys/ripple/rules.mk b/keyboards/cannonkeys/ripple/rules.mk
index 2f5938630c..2a5031cd32 100644
--- a/keyboards/cannonkeys/ripple/rules.mk
+++ b/keyboards/cannonkeys/ripple/rules.mk
@@ -1,7 +1,5 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-WS2812_DRIVER = spi
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
index 5edf9fdeb9..29c78c2398 100644
--- a/keyboards/cannonkeys/sagittarius/config.h
+++ b/keyboards/cannonkeys/sagittarius/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A7, A5, A4, A3, A2, A1, A0, B5, A13, B2, B1, B0, B9, B8, B7, B6 }
-#define MATRIX_ROW_PINS { B10, B14, A8, A9, A10, C13, C14, C15, F0, F1 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -41,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 8
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json
index 2b25ee6b98..0980cb4275 100644
--- a/keyboards/cannonkeys/sagittarius/info.json
+++ b/keyboards/cannonkeys/sagittarius/info.json
@@ -8,11 +8,20 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A7", "A5", "A4", "A3", "A2", "A1", "A0", "B5", "A13", "B2", "B1", "B0", "B9", "B8", "B7", "B6"],
+        "rows": ["B10", "B14", "A8", "A9", "A10", "C13", "C14", "C15", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "indicators": {
         "caps_lock": "B3",
         "num_lock": "B4",
@@ -22,7 +31,93 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_default": {
-            "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":0, "y":1}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1}, {"x":17.75, "y":1, "w":1.5}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2, "w":1.25}, {"x":19.25, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":1.25}, {"x":2.75, "y":3}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3, "w":1.25}, {"x":17.25, "y":3}, {"x":18.25, "y":3}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4, "w":2.25}, {"x":11, "y":4, "w":1.75}, {"x":12.75, "y":4}, {"x":16.25, "y":4}, {"x":17.25, "y":4}, {"x":18.25, "y":4}]
+            "layout": [
+                {"label": "k11", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "k12", "matrix": [0, 1], "x": 1.5, "y": 0},
+                {"label": "k13", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "k14", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "k15", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "k16", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "k17", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "k18", "matrix": [0, 7], "x": 7.5, "y": 0},
+
+                {"label": "k69", "matrix": [5, 8], "x": 10.75, "y": 0},
+                {"label": "k610", "matrix": [5, 9], "x": 11.75, "y": 0},
+                {"label": "k611", "matrix": [5, 10], "x": 12.75, "y": 0},
+                {"label": "k612", "matrix": [5, 11], "x": 13.75, "y": 0},
+                {"label": "k613", "matrix": [5, 12], "x": 14.75, "y": 0},
+                {"label": "k614", "matrix": [5, 13], "x": 15.75, "y": 0},
+                {"label": "k615", "matrix": [5, 14], "x": 16.75, "y": 0},
+                {"label": "k616", "matrix": [5, 15], "x": 17.75, "y": 0},
+
+                {"label": "k21", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "k22", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"label": "k23", "matrix": [1, 2], "x": 3, "y": 1},
+                {"label": "k24", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "k25", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "k26", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "k27", "matrix": [1, 6], "x": 7, "y": 1},
+
+                {"label": "k78", "matrix": [6, 7], "x": 10.75, "y": 1},
+                {"label": "k79", "matrix": [6, 8], "x": 11.75, "y": 1},
+                {"label": "k710", "matrix": [6, 9], "x": 12.75, "y": 1},
+                {"label": "k711", "matrix": [6, 10], "x": 13.75, "y": 1},
+                {"label": "k712", "matrix": [6, 11], "x": 14.75, "y": 1},
+                {"label": "k713", "matrix": [6, 12], "x": 15.75, "y": 1},
+                {"label": "k714", "matrix": [6, 13], "x": 16.75, "y": 1},
+                {"label": "k715", "matrix": [6, 14], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"label": "k31", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "k32", "matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"label": "k33", "matrix": [2, 2], "x": 3.25, "y": 2},
+                {"label": "k34", "matrix": [2, 3], "x": 4.25, "y": 2},
+                {"label": "k35", "matrix": [2, 4], "x": 5.25, "y": 2},
+                {"label": "k36", "matrix": [2, 5], "x": 6.25, "y": 2},
+                {"label": "k37", "matrix": [2, 6], "x": 7.25, "y": 2},
+
+                {"label": "k88", "matrix": [7, 7], "x": 11, "y": 2},
+                {"label": "k89", "matrix": [7, 8], "x": 12, "y": 2},
+                {"label": "k810", "matrix": [7, 9], "x": 13, "y": 2},
+                {"label": "k811", "matrix": [7, 10], "x": 14, "y": 2},
+                {"label": "k812", "matrix": [7, 11], "x": 15, "y": 2},
+                {"label": "k813", "matrix": [7, 12], "x": 16, "y": 2},
+                {"label": "k814", "matrix": [7, 13], "x": 17, "y": 2},
+                {"label": "k815", "matrix": [7, 14], "x": 18, "y": 2, "w": 1.25},
+                {"label": "k816", "matrix": [7, 15], "x": 19.25, "y": 2},
+
+                {"label": "k41", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "k42", "matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+                {"label": "k43", "matrix": [3, 2], "x": 2.75, "y": 3},
+                {"label": "k44", "matrix": [3, 3], "x": 3.75, "y": 3},
+                {"label": "k45", "matrix": [3, 4], "x": 4.75, "y": 3},
+                {"label": "k46", "matrix": [3, 5], "x": 5.75, "y": 3},
+                {"label": "k47", "matrix": [3, 6], "x": 6.75, "y": 3},
+                {"label": "k48", "matrix": [3, 7], "x": 7.75, "y": 3},
+
+                {"label": "k99", "matrix": [8, 8], "x": 11, "y": 3},
+                {"label": "k910", "matrix": [8, 9], "x": 12, "y": 3},
+                {"label": "k911", "matrix": [8, 10], "x": 13, "y": 3},
+                {"label": "k912", "matrix": [8, 11], "x": 14, "y": 3},
+                {"label": "k913", "matrix": [8, 12], "x": 15, "y": 3},
+                {"label": "k914", "matrix": [8, 13], "x": 16, "y": 3, "w": 1.25},
+                {"label": "k915", "matrix": [8, 14], "x": 17.25, "y": 3},
+                {"label": "k916", "matrix": [8, 15], "x": 18.25, "y": 3},
+
+                {"label": "k51", "matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"label": "k52", "matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+                {"label": "k57", "matrix": [4, 6], "x": 5.5, "y": 4},
+                {"label": "k58", "matrix": [4, 7], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"label": "k109", "matrix": [9, 8], "x": 11, "y": 4, "w": 1.75},
+                {"label": "k1010", "matrix": [9, 9], "x": 12.75, "y": 4},
+                {"label": "k1014", "matrix": [9, 13], "x": 16.25, "y": 4},
+                {"label": "k1015", "matrix": [9, 14], "x": 17.25, "y": 4},
+                {"label": "k1016", "matrix": [9, 15], "x": 18.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/sagittarius/rules.mk b/keyboards/cannonkeys/sagittarius/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/sagittarius/rules.mk
+++ b/keyboards/cannonkeys/sagittarius/rules.mk
@@ -13,7 +13,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/sagittarius/sagittarius.c b/keyboards/cannonkeys/sagittarius/sagittarius.c
deleted file mode 100644
index ea1b979c49..0000000000
--- a/keyboards/cannonkeys/sagittarius/sagittarius.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2020 Andrew Kannan
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include "sagittarius.h"
diff --git a/keyboards/cannonkeys/sagittarius/sagittarius.h b/keyboards/cannonkeys/sagittarius/sagittarius.h
deleted file mode 100644
index ba2fb2bc18..0000000000
--- a/keyboards/cannonkeys/sagittarius/sagittarius.h
+++ /dev/null
@@ -1,38 +0,0 @@
- /* Copyright 2020 Andrew Kannan
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-    k11, k12, k13, k14, k15, k16, k17, k18, k69, k610, k611, k612, k613, k614, k615, k616, \
-    k21, k22, k23, k24, k25, k26, k27, k78, k79, k710, k711, k712, k713, k714, k715, \
-    k31, k32, k33, k34, k35, k36, k37, k88, k89, k810, k811, k812, k813, k814, k815, k816, \
-    k41, k42, k43, k44, k45, k46, k47, k48, k99, k910, k911, k912, k913, k914, k915, k916, \
-    k51, k52, k57, k58, k109, k1010, k1014, k1015, k1016 \
-) { \
-	{ k11, k12, k13, k14, k15, k16, k17, k18, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ k21, k22, k23, k24, k25, k26, k27, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ k31, k32, k33, k34, k35, k36, k37, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ k41, k42, k43, k44, k45, k46, k47, k48, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ k51, k52, KC_NO, KC_NO, KC_NO, KC_NO, k57, k58, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO },  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k69, k610, k611, k612, k613, k614, k615, k616 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k78, k79, k710, k711, k712, k713, k714, k715, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k88, k89, k810, k811, k812, k813, k814, k815, k816 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k99, k910, k911, k912, k913, k914, k915, k916 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k109, k1010, KC_NO, KC_NO, KC_NO, k1014, k1015, k1016 }\
-}
diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h
index ac9548dd27..9005b064b7 100644
--- a/keyboards/cannonkeys/satisfaction75/config.h
+++ b/keyboards/cannonkeys/satisfaction75/config.h
@@ -23,10 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LSE clock */
 #define STM32_LSECLK 32768
 
-#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B13, B14, A8, A9, A10, B0, A7, A5, B5, A15, A1 }
-#define MATRIX_ROW_PINS { B3, B4, A0, A2, A4, A3 }
-#define DIODE_DIRECTION COL2ROW
-
 // I2C config
 #define I2C_DRIVER I2CD1
 #define I2C1_SCL_PIN B6
diff --git a/keyboards/cannonkeys/satisfaction75/info.json b/keyboards/cannonkeys/satisfaction75/info.json
index 9bf8459b1a..60695b9ac7 100644
--- a/keyboards/cannonkeys/satisfaction75/info.json
+++ b/keyboards/cannonkeys/satisfaction75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x57F5",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B10", "B11", "B12", "B13", "B14", "A8", "A9", "A10", "B0", "A7", "A5", "B5", "A15", "A1"],
+        "rows": ["B3", "B4", "A0", "A2", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B9", "pin_b": "B8", "resolution": 2}
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/info.json b/keyboards/cannonkeys/satisfaction75/prototype/info.json
index 9fad4142aa..af184cf1a9 100644
--- a/keyboards/cannonkeys/satisfaction75/prototype/info.json
+++ b/keyboards/cannonkeys/satisfaction75/prototype/info.json
@@ -1,7 +1,198 @@
 {
     "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K002", "matrix": [0, 2], "x": 1, "y": 0},
+                {"label": "K003", "matrix": [0, 3], "x": 2, "y": 0},
+                {"label": "K004", "matrix": [0, 4], "x": 3, "y": 0},
+                {"label": "K005", "matrix": [0, 5], "x": 4, "y": 0},
+                {"label": "K006", "matrix": [0, 6], "x": 5, "y": 0},
+                {"label": "K007", "matrix": [0, 7], "x": 6, "y": 0},
+                {"label": "K008", "matrix": [0, 8], "x": 7, "y": 0},
+                {"label": "K009", "matrix": [0, 9], "x": 8, "y": 0},
+                {"label": "K010", "matrix": [0, 10], "x": 9, "y": 0},
+                {"label": "K011", "matrix": [0, 11], "x": 10, "y": 0},
+                {"label": "K012", "matrix": [0, 12], "x": 11, "y": 0},
+                {"label": "K013", "matrix": [0, 13], "x": 12, "y": 0},
+
+                {"label": "K100", "matrix": [1, 0], "x": 13, "y": 0},
+                {"label": "K101", "matrix": [1, 1], "x": 14, "y": 0},
+                {"label": "K102", "matrix": [1, 2], "x": 15, "y": 0},
+                {"label": "K103", "matrix": [1, 3], "x": 16, "y": 0},
+                {"label": "K104", "matrix": [1, 4], "x": 17, "y": 0},
+                {"label": "K105", "matrix": [1, 5], "x": 18, "y": 0},
+                {"label": "K106", "matrix": [1, 6], "x": 19, "y": 0},
+                {"label": "K107", "matrix": [1, 7], "x": 20, "y": 0},
+                {"label": "K108", "matrix": [1, 8], "x": 21, "y": 0},
+                {"label": "K109", "matrix": [1, 9], "x": 22, "y": 0},
+                {"label": "K110", "matrix": [1, 10], "x": 23, "y": 0},
+                {"label": "K111", "matrix": [1, 11], "x": 24, "y": 0},
+                {"label": "K112", "matrix": [1, 12], "x": 25, "y": 0},
+                {"label": "K113", "matrix": [1, 13], "x": 26, "y": 0},
+                {"label": "K114", "matrix": [1, 14], "x": 27, "y": 0},
+                {"label": "K115", "matrix": [1, 15], "x": 28, "y": 0},
+
+                {"label": "K200", "matrix": [2, 0], "x": 29, "y": 0},
+                {"label": "K201", "matrix": [2, 1], "x": 30, "y": 0},
+                {"label": "K202", "matrix": [2, 2], "x": 31, "y": 0},
+                {"label": "K203", "matrix": [2, 3], "x": 32, "y": 0},
+                {"label": "K204", "matrix": [2, 4], "x": 33, "y": 0},
+                {"label": "K205", "matrix": [2, 5], "x": 34, "y": 0},
+                {"label": "K206", "matrix": [2, 6], "x": 35, "y": 0},
+                {"label": "K207", "matrix": [2, 7], "x": 36, "y": 0},
+                {"label": "K208", "matrix": [2, 8], "x": 37, "y": 0},
+                {"label": "K209", "matrix": [2, 9], "x": 38, "y": 0},
+                {"label": "K210", "matrix": [2, 10], "x": 39, "y": 0},
+                {"label": "K211", "matrix": [2, 11], "x": 40, "y": 0},
+                {"label": "K212", "matrix": [2, 12], "x": 41, "y": 0},
+                {"label": "K213", "matrix": [2, 13], "x": 42, "y": 0},
+                {"label": "K215", "matrix": [2, 15], "x": 43, "y": 0},
+
+                {"label": "K300", "matrix": [3, 0], "x": 44, "y": 0},
+                {"label": "K301", "matrix": [3, 1], "x": 45, "y": 0},
+                {"label": "K302", "matrix": [3, 2], "x": 46, "y": 0},
+                {"label": "K303", "matrix": [3, 3], "x": 47, "y": 0},
+                {"label": "K304", "matrix": [3, 4], "x": 48, "y": 0},
+                {"label": "K305", "matrix": [3, 5], "x": 49, "y": 0},
+                {"label": "K306", "matrix": [3, 6], "x": 50, "y": 0},
+                {"label": "K307", "matrix": [3, 7], "x": 51, "y": 0},
+                {"label": "K308", "matrix": [3, 8], "x": 52, "y": 0},
+                {"label": "K309", "matrix": [3, 9], "x": 53, "y": 0},
+                {"label": "K310", "matrix": [3, 10], "x": 54, "y": 0},
+                {"label": "K311", "matrix": [3, 11], "x": 55, "y": 0},
+                {"label": "K312", "matrix": [3, 12], "x": 56, "y": 0},
+                {"label": "K313", "matrix": [3, 13], "x": 57, "y": 0},
+                {"label": "K315", "matrix": [3, 15], "x": 58, "y": 0},
+
+                {"label": "K400", "matrix": [4, 0], "x": 59, "y": 0},
+                {"label": "K401", "matrix": [4, 1], "x": 60, "y": 0},
+                {"label": "K402", "matrix": [4, 2], "x": 61, "y": 0},
+                {"label": "K403", "matrix": [4, 3], "x": 62, "y": 0},
+                {"label": "K404", "matrix": [4, 4], "x": 63, "y": 0},
+                {"label": "K405", "matrix": [4, 5], "x": 64, "y": 0},
+                {"label": "K406", "matrix": [4, 6], "x": 65, "y": 0},
+                {"label": "K407", "matrix": [4, 7], "x": 66, "y": 0},
+                {"label": "K408", "matrix": [4, 8], "x": 67, "y": 0},
+                {"label": "K409", "matrix": [4, 9], "x": 68, "y": 0},
+                {"label": "K410", "matrix": [4, 10], "x": 69, "y": 0},
+                {"label": "K411", "matrix": [4, 11], "x": 70, "y": 0},
+                {"label": "K412", "matrix": [4, 12], "x": 71, "y": 0},
+                {"label": "K413", "matrix": [4, 13], "x": 72, "y": 0},
+                {"label": "K415", "matrix": [4, 15], "x": 73, "y": 0},
+
+                {"label": "K500", "matrix": [5, 0], "x": 74, "y": 0},
+                {"label": "K501", "matrix": [5, 1], "x": 75, "y": 0},
+                {"label": "K502", "matrix": [5, 2], "x": 76, "y": 0},
+                {"label": "K503", "matrix": [5, 3], "x": 77, "y": 0},
+                {"label": "K505", "matrix": [5, 5], "x": 78, "y": 0},
+                {"label": "K507", "matrix": [5, 7], "x": 79, "y": 0},
+                {"label": "K509", "matrix": [5, 9], "x": 80, "y": 0},
+                {"label": "K510", "matrix": [5, 10], "x": 81, "y": 0},
+                {"label": "K511", "matrix": [5, 11], "x": 82, "y": 0},
+                {"label": "K512", "matrix": [5, 12], "x": 83, "y": 0},
+                {"label": "K513", "matrix": [5, 13], "x": 84, "y": 0},
+                {"label": "K515", "matrix": [5, 15], "x": 85, "y": 0}
+            ]
+        },
         "LAYOUT_default": {
-            "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.5, "y":1}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.5, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+            "layout": [
+                {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "K002", "matrix": [0, 2], "x": 1.5, "y": 0},
+                {"label": "K003", "matrix": [0, 3], "x": 2.5, "y": 0},
+                {"label": "K004", "matrix": [0, 4], "x": 3.5, "y": 0},
+                {"label": "K005", "matrix": [0, 5], "x": 4.5, "y": 0},
+
+                {"label": "K006", "matrix": [0, 6], "x": 5.75, "y": 0},
+                {"label": "K007", "matrix": [0, 7], "x": 6.75, "y": 0},
+                {"label": "K008", "matrix": [0, 8], "x": 7.75, "y": 0},
+                {"label": "K009", "matrix": [0, 9], "x": 8.75, "y": 0},
+
+                {"label": "K010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K013", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "K103", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "K104", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "K105", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "K106", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "K107", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "K108", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "K109", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "K110", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "K115", "matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "K203", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "K204", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "K205", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "K206", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "K207", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "K208", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "K209", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "K210", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "K215", "matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "K303", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "K304", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "K305", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "K306", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "K307", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K308", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "K309", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "K315", "matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "K401", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "K402", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "K403", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "K404", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "K405", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "K406", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "K407", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": "K408", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": "K409", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "K410", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "K411", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"label": "K413", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"label": "K415", "matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "K505", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "K509", "matrix": [5, 9], "x": 10, "y": 5.25},
+                {"label": "K510", "matrix": [5, 10], "x": 11, "y": 5.25},
+                {"label": "K511", "matrix": [5, 11], "x": 12, "y": 5.25},
+
+                {"label": "K512", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "K513", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "K515", "matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/prototype.h b/keyboards/cannonkeys/satisfaction75/prototype/prototype.h
deleted file mode 100644
index ed4c7d793d..0000000000
--- a/keyboards/cannonkeys/satisfaction75/prototype/prototype.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include "satisfaction75.h"
-
-#define LAYOUT_default( \
-	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,             \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,             K315, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,       K415, \
-	K500, K501, K502,             K505,                   K509, K510, K511, K512, K513,       K515  \
-) { \
-	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO,  K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, KC_NO,  K315 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  KC_NO,  K415 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, K509,  K510,  K511,  K512,  K513,  KC_NO,  K515 } \
-}
-
-// Expose All Keys - Split backspace - ISO Extra keys - Split space bottom row
-#define LAYOUT_all( \
-	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,             \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,       K415, \
-	K500, K501, K502, K503,       K505,       K507,       K509, K510, K511, K512, K513,       K515  \
-) { \
-	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,   K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO,  K315 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO,  K415 }, \
-	{ K500,  K501,  K502,  K503,  KC_NO, K505,  KC_NO, K507,  KC_NO, K509,  K510,  K511,  K512,  K513,  KC_NO,  K515 } \
-}
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/info.json b/keyboards/cannonkeys/satisfaction75/rev1/info.json
index 15986435c5..cc4ad80d42 100644
--- a/keyboards/cannonkeys/satisfaction75/rev1/info.json
+++ b/keyboards/cannonkeys/satisfaction75/rev1/info.json
@@ -1,27 +1,604 @@
 {
     "layouts": {
         "LAYOUT_default": {
-            "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.5, "y":1}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.5, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
-        },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-        "LAYOUT_iso": {
-            "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.5, "y":1}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"x":15.5, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-        "LAYOUT_3x2": {
-            "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.5, "y":1}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.5, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.5}, {"x":11.5, "y":5.25, "w":1.5}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         },
+        "LAYOUT_3x2": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-        "LAYOUT_2x2": {
-            "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.5, "y":1}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.5, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25, "w":1.5}, {"x":3, "y":5.25, "w":7}, {"x":10, "y":5.25, "w":1.5}, {"x":11.5, "y":5.25, "w":1.5}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         },
+        "LAYOUT_2x2": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-        "LAYOUT_split_space": {
-            "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.5, "y":1}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.5, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":2.25}, {"x":6, "y":5.25, "w":1.25}, {"x":7.25, "y":5.25, "w":2.75}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         },
+        "LAYOUT_split_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
 
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.5, "y":1}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"x":13.75, "y":3.25, "w":1.25}, {"x":15.5, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14.25, "y":4.5}, {"x":15.5, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":2.25}, {"x":6, "y":5.25, "w":1.25}, {"x":7.25, "y":5.25, "w":2.75}, {"x":10, "y":5.25}, {"x":11, "y":5.25}, {"x":12, "y":5.25}, {"x":13.25, "y":5.5}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/rev1.h b/keyboards/cannonkeys/satisfaction75/rev1/rev1.h
deleted file mode 100644
index 65ff16b985..0000000000
--- a/keyboards/cannonkeys/satisfaction75/rev1/rev1.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma once
-
-#include "satisfaction75.h"
-
-// This layout is the default - it's what's in VIA
-// ANSI, bottom row 1.25/1.25/1.25/6.25/1/1/1
-#define LAYOUT_default( \
-	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,             \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,       K315, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,       K415, \
-	K500, K501, K502,             K505,                   K509, K510, K511, K512, K513,       K515  \
-) { \
-	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO,  K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO,  K315 }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO,  K415 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, K509,  K510,  K511,  K512,  K513,  KC_NO,  K515 } \
-}
-
-// ISO, bottom row 1.25/1.25/1.25/6.25/1/1/1
-#define LAYOUT_iso( \
-	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,             \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,       K415, \
-	K500, K501, K502,             K505,                   K509, K510, K511, K512, K513,       K515  \
-) { \
-	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO,  K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO,  K315 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO,  K415 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, K509,  K510,  K511,  K512,  K513,  KC_NO,  K515 } \
-}
-
-// ANSI, bottom row 1.25/1.25/1.25/6.25/1.5/1.5
-#define LAYOUT_3x2( \
-	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,             \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,       K315, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,       K415, \
-	K500, K501, K502,             K505,                   K509,       K511, K512, K513,       K515  \
-) { \
-	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO,  K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO,  K315 }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO,  K415 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, K509,  KC_NO, K511,  K512,  K513,  KC_NO,  K515 } \
-}
-
-// ANSI, WKL bottom row 1.5/1.5/7/1.5/1.5, Split Backspace
-#define LAYOUT_2x2( \
-	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,             \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,       K315, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,       K415, \
-	K500, K501,                   K505,                   K509,       K511, K512, K513,       K515  \
-) { \
-	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,   K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO,  K315 }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO,  K415 }, \
-	{ K500,  K501,  KC_NO, KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, K509,  KC_NO, K511,  K512,  K513,  KC_NO,  K515 } \
-}
-
-// ANSI, bottom row 1.25/1.25/1.25/2.25/1.25/2.75/1/1/1
-// ANSI, bottom row 1.25/1.25/1.25/2.75/1.25/2.25/1/1/1
-#define LAYOUT_split_space( \
-	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,             \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,       K315, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,       K415, \
-	K500, K501, K502, K503,       K505,       K507,       K509, K510, K511, K512, K513,       K515  \
-) { \
-	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO,  K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO,  K315 }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO,  K415 }, \
-	{ K500,  K501,  K502,  K503,  KC_NO, K505,  KC_NO, K507,  KC_NO, K509,  K510,  K511,  K512,  K513,  KC_NO,  K515 } \
-}
-
-
-// Expose All Keys - Split backspace - ISO Extra keys - Split space bottom row
-#define LAYOUT_all( \
-	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,             \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,       K415, \
-	K500, K501, K502, K503,       K505,       K507,       K509, K510, K511, K512, K513,       K515  \
-) { \
-	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  KC_NO }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,   K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO,  K315 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO,  K415 }, \
-	{ K500,  K501,  K502,  K503,  KC_NO, K505,  KC_NO, K507,  KC_NO, K509,  K510,  K511,  K512,  K513,  KC_NO,  K515 } \
-}
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.h b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
index 9e28bb32a1..157eff902e 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.h
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
@@ -2,12 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_cannonkeys_satisfaction75_prototype
-    #include "prototype.h"
-#else
-    #include "rev1.h"
-#endif
-
 #include "via.h" // only for EEPROM address
 #define EEPROM_ENABLED_ENCODER_MODES (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
 #define EEPROM_CUSTOM_BACKLIGHT (VIA_EEPROM_CUSTOM_CONFIG_ADDR+1)
diff --git a/keyboards/cannonkeys/savage65/config.h b/keyboards/cannonkeys/savage65/config.h
index 79414a9a78..6aac0aefb4 100644
--- a/keyboards/cannonkeys/savage65/config.h
+++ b/keyboards/cannonkeys/savage65/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { B12, B11, B14, A8, A1 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -41,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json
index 1aa34de891..540327c6b8 100644
--- a/keyboards/cannonkeys/savage65/info.json
+++ b/keyboards/cannonkeys/savage65/info.json
@@ -8,30 +8,402 @@
         "pid": "0x5A65",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A5", "B10", "A3", "A2", "B0", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B12", "B11", "B14", "A8", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker"],
     "layouts": {
         "LAYOUT_default": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_blocker": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_iso_blocker": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         }
     }
-
 }
diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk
index 8b82556130..b7ab91a339 100644
--- a/keyboards/cannonkeys/savage65/rules.mk
+++ b/keyboards/cannonkeys/savage65/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/savage65/savage65.c b/keyboards/cannonkeys/savage65/savage65.c
deleted file mode 100644
index d8e610c8b9..0000000000
--- a/keyboards/cannonkeys/savage65/savage65.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "savage65.h"
diff --git a/keyboards/cannonkeys/savage65/savage65.h b/keyboards/cannonkeys/savage65/savage65.h
deleted file mode 100644
index 8f9642ad0e..0000000000
--- a/keyboards/cannonkeys/savage65/savage65.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K400, K401, K402,                   K406,                   K410, K411, K412, K413,       K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
-	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO,  K410,  K411,  K412,  K413,  KC_NO, K415 }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,       K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K400, K401, K402,                   K406,                   K410, K411, K412, K413,       K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  KC_NO, K215 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
-	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO,  K410,  K411,  K412,  K413,  KC_NO, K415 }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,       K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K400, K401, K402,                   K406,                   K410, K411, K412, K413,       K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  KC_NO, K215 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
-	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO,  K410,  K411,  K412,  K413,  KC_NO, K415 }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,       K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K400, K401, K402,                   K406,                         K411, K412, K413,       K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  KC_NO, K215 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
-	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO,  KC_NO, K411,  K412,  K413,  KC_NO, K415 }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,             K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K400, K401, K402,                   K406,                   K410, K411, K412, K413,       K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, KC_NO, K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
-	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO,  K410,  K411,  K412,  K413,  KC_NO, K415 }  \
-}
diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json
index 9672161bfc..ef54762328 100644
--- a/keyboards/cannonkeys/serenity/info.json
+++ b/keyboards/cannonkeys/serenity/info.json
@@ -32,7 +32,6 @@
     },
     "rgblight": {
         "led_count": 12,
-        "pin": "B15",
         "hue_steps": 24,
         "saturation_steps": 16,
         "brightness_steps": 16,
@@ -49,6 +48,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "indicators": {
         "caps_lock": "B9",
         "scroll_lock": "F0",
@@ -57,42 +59,42 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
-                { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
-                { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
-                { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
-                { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
-                { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
-                { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
-                { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
-                { "label": "F13", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0.0 },
-                { "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0.0 },
-                { "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0.0 },
-                { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "Bksp", "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "label": "Del", "matrix": [1, 14], "x": 14.0, "y": 1.25 },
+                { "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, 14], "x": 14, "y": 0 },
+                { "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0 },
+                { "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0 },
+                { "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0 },
+                { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": ")", "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": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "label": "Del", "matrix": [1, 14], "x": 14, "y": 1.25 },
                 { "label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25 },
                 { "label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25 },
                 { "label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25 },
-                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "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 },
@@ -109,7 +111,7 @@
                 { "label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25 },
                 { "label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25 },
                 { "label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25 },
-                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "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 },
@@ -123,7 +125,7 @@
                 { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "|", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
                 { "label": "Enter", "matrix": [3, 14], "w": 1.25, "x": 13.75, "y": 3.25 },
-                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.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 },
@@ -138,11 +140,11 @@
                 { "label": "Shift", "matrix": [4, 12], "w": 1.75, "x": 14.75, "y": 4.25 },
                 { "label": "Fn", "matrix": [4, 14], "x": 16.5, "y": 4.25 },
                 { "label": "\u2191", "matrix": [4, 16], "x": 18.75, "y": 4.25 },
-                { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+                { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
                 { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
                 { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10.0, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
                 { "label": "Fn", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
                 { "label": "Ctrl", "matrix": [5, 14], "w": 1.25, "x": 13.75, "y": 5.25 },
diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h
index 8722ba8d54..d344ffaee6 100644
--- a/keyboards/cannonkeys/tmov2/config.h
+++ b/keyboards/cannonkeys/tmov2/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B14, A14, B1, C13, C14, C15, F0, F1, B9, B8, B7, B6, B5, B4, B3, A15 }
-#define MATRIX_ROW_PINS { A10, A9, A8, B12 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -41,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 22
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json
index bdb6cd7453..4d5d564e66 100644
--- a/keyboards/cannonkeys/tmov2/info.json
+++ b/keyboards/cannonkeys/tmov2/info.json
@@ -8,16 +8,84 @@
         "pid": "0x70F2",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B14", "A14", "B1", "C13", "C14", "C15", "F0", "F1", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["A10", "A9", "A8", "B12"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_default": {
-            "layout": [{"x":0, "y":0}, {"label":"Tab", "x":1.25, "y":0, "w":1.5}, {"label":"Q", "x":2.75, "y":0}, {"label":"W", "x":3.75, "y":0}, {"label":"E", "x":4.75, "y":0}, {"label":"R", "x":5.75, "y":0}, {"label":"T", "x":6.75, "y":0}, {"label":"Y", "x":7.75, "y":0}, {"label":"U", "x":8.75, "y":0}, {"label":"I", "x":9.75, "y":0}, {"label":"O", "x":10.75, "y":0}, {"label":"P", "x":11.75, "y":0}, {"label":"{", "x":12.75, "y":0}, {"label":"}", "x":13.75, "y":0}, {"label":"Backspace", "x":14.75, "y":0}, {"x":0, "y":1}, {"label":"Caps Lock", "x":1.25, "y":1, "w":1.75}, {"label":"A", "x":3, "y":1}, {"label":"S", "x":4, "y":1}, {"label":"D", "x":5, "y":1}, {"label":"F", "x":6, "y":1}, {"label":"G", "x":7, "y":1}, {"label":"H", "x":8, "y":1}, {"label":"J", "x":9, "y":1}, {"label":"K", "x":10, "y":1}, {"label":"L", "x":11, "y":1}, {"label":":", "x":12, "y":1}, {"label":"\"", "x":13, "y":1}, {"label":"Enter", "x":14, "y":1, "w":1.75}, {"x":0, "y":2}, {"label":"Shift", "x":1.25, "y":2, "w":1.25}, {"label":"ISO \\", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"?", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2, "w":1.25}, {"x":14.75, "y":2}, {"x":0, "y":3}, {"label":"Win", "x":3.25, "y":3}, {"label":"Alt", "x":4.25, "y":3, "w":1.5}, {"x":5.75, "y":3, "w":2.25}, {"x":8, "y":3, "w":2.75}, {"label":"Alt", "x":10.75, "y":3, "w":1.5}, {"label":"Menu", "x":12.25, "y":3}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.5},
+                {"matrix": [0, 3], "x": 2.75, "y": 0},
+                {"matrix": [0, 4], "x": 3.75, "y": 0},
+                {"matrix": [0, 5], "x": 4.75, "y": 0},
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [0, 14], "x": 13.75, "y": 0},
+                {"matrix": [0, 15], "x": 14.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 8], "x": 8, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.5},
+                {"matrix": [3, 11], "x": 12.25, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk
index 8b82556130..b7ab91a339 100644
--- a/keyboards/cannonkeys/tmov2/rules.mk
+++ b/keyboards/cannonkeys/tmov2/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/tmov2/tmov2.c b/keyboards/cannonkeys/tmov2/tmov2.c
deleted file mode 100644
index 47295ac270..0000000000
--- a/keyboards/cannonkeys/tmov2/tmov2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tmov2.h"
diff --git a/keyboards/cannonkeys/tmov2/tmov2.h b/keyboards/cannonkeys/tmov2/tmov2.h
deleted file mode 100644
index f1f3920403..0000000000
--- a/keyboards/cannonkeys/tmov2/tmov2.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-    K000, K001,       K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-    K100, K101,       K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,       \
-    K300,             K303, K304,       K306,       K308,       K310, K311                          \
-) { \
-    { K000,  K001,  KC_NO,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015  }, \
-    { K100,  K101,  KC_NO,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  KC_NO }, \
-    { K200,  K201,  K202,   K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  KC_NO }, \
-    { K300,  KC_NO, KC_NO,  K303,  K304,  KC_NO, K306,  KC_NO, K308,  KC_NO, K310,  K311,  KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h
index 8987acd837..6aac0aefb4 100644
--- a/keyboards/cannonkeys/tsukuyomi/config.h
+++ b/keyboards/cannonkeys/tsukuyomi/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A7, A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { B12, B11, B14, A8, A1 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -41,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json
index fb5b22e5b7..e370e1acc0 100644
--- a/keyboards/cannonkeys/tsukuyomi/info.json
+++ b/keyboards/cannonkeys/tsukuyomi/info.json
@@ -8,16 +8,111 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A7", "A5", "B10", "A3", "A2", "B0", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B12", "B11", "B14", "A8", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_default": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":8.25, "y":0}, {"label":"*", "x":9.25, "y":0}, {"label":"(", "x":10.25, "y":0}, {"label":")", "x":11.25, "y":0}, {"label":"_", "x":12.25, "y":0}, {"label":"+", "x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":7.75, "y":1}, {"label":"U", "x":8.75, "y":1}, {"label":"I", "x":9.75, "y":1}, {"label":"O", "x":10.75, "y":1}, {"label":"P", "x":11.75, "y":1}, {"label":"{", "x":12.75, "y":1}, {"label":"}", "x":13.75, "y":1}, {"label":"|", "x":14.75, "y":1, "w":1.5}, {"x":16.25, "y":1}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":8, "y":2}, {"label":"J", "x":9, "y":2}, {"label":"K", "x":10, "y":2}, {"label":"L", "x":11, "y":2}, {"label":":", "x":12, "y":2}, {"label":"\"", "x":13, "y":2}, {"x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":1.25}, {"x":16.25, "y":2}, {"x":0, "y":3}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":8.5, "y":3}, {"label":"M", "x":9.5, "y":3}, {"label":"<", "x":10.5, "y":3}, {"label":">", "x":11.5, "y":3}, {"label":"?", "x":12.5, "y":3}, {"label":"Shift", "x":13.5, "y":3, "w":1.75}, {"x":15.25, "y":3}, {"x":16.25, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":6.25}, {"label":"Alt", "x":11.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 1.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/tsukuyomi/rules.mk b/keyboards/cannonkeys/tsukuyomi/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/tsukuyomi/rules.mk
+++ b/keyboards/cannonkeys/tsukuyomi/rules.mk
@@ -13,7 +13,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/tsukuyomi/tsukuyomi.c b/keyboards/cannonkeys/tsukuyomi/tsukuyomi.c
deleted file mode 100644
index aca92f07db..0000000000
--- a/keyboards/cannonkeys/tsukuyomi/tsukuyomi.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2020 Andrew Kannan
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include "tsukuyomi.h"
diff --git a/keyboards/cannonkeys/tsukuyomi/tsukuyomi.h b/keyboards/cannonkeys/tsukuyomi/tsukuyomi.h
deleted file mode 100644
index 46c55413e1..0000000000
--- a/keyboards/cannonkeys/tsukuyomi/tsukuyomi.h
+++ /dev/null
@@ -1,33 +0,0 @@
- /* Copyright 2020 Andrew Kannan
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-	K00M, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K10M, K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K20M, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K30M, K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K40M, K400, K401, K402,                   K406,                   K410, K411, K412, K413,       K415  \
-) { \
-	{ K00M,  K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K10M,  K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, K115 }, \
-	{ K20M,  K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ K30M,  K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
-	{ K40M,  K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO,  K410,  K411,  K412,  K413,  KC_NO, K415 }  \
-}
diff --git a/keyboards/cannonkeys/typeb/info.json b/keyboards/cannonkeys/typeb/info.json
index d09eb90026..b80474f46e 100644
--- a/keyboards/cannonkeys/typeb/info.json
+++ b/keyboards/cannonkeys/typeb/info.json
@@ -30,67 +30,67 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "matrix": [2, 12], "x": 14.0, "y": 0.0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 1], "x": 1.25, "y": 3.0 },
-                { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "matrix": [3, 13], "x": 14.0, "y": 3.0 },
-                { "matrix": [4, 1], "x": 1.5, "y": 4.0 },
-                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 6, "x": 4.0, "y": 4.0 },
-                { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 },
-                { "matrix": [4, 11], "x": 11.5, "y": 4.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [2, 12], "x": 14, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6, "x": 4, "y": 4 },
+                { "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "x": 11.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/vicious40/config.h b/keyboards/cannonkeys/vicious40/config.h
index d989d427ff..a47b76953a 100644
--- a/keyboards/cannonkeys/vicious40/config.h
+++ b/keyboards/cannonkeys/vicious40/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B0, A7, A5, B1, B2, B10, B11, A9, B6, B7, B8, B9 }
-#define MATRIX_ROW_PINS { A15, B3, B4, B5 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/info.json
index 384343b8e9..d6669155cf 100644
--- a/keyboards/cannonkeys/vicious40/info.json
+++ b/keyboards/cannonkeys/vicious40/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "A7", "A5", "B1", "B2", "B10", "B11", "A9", "B6", "B7", "B8", "B9"],
+        "rows": ["A15", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
@@ -17,7 +22,57 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_default": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Up", "x":10.75, "y":2}, {"label":"?", "x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Super", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Space", "x":3, "y":3, "w":2.25}, {"label":"Space", "x":5.25, "y":3, "w":1.25}, {"label":"Space", "x":6.5, "y":3, "w":2.75}, {"label":"Left", "x":9.75, "y":3}, {"label":"Down", "x":10.75, "y":3}, {"label":"Right", "x":11.75, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/vicious40/vicious40.c b/keyboards/cannonkeys/vicious40/vicious40.c
deleted file mode 100644
index ae8ca5082b..0000000000
--- a/keyboards/cannonkeys/vicious40/vicious40.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 Andrew Kannan
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include "vicious40.h"
diff --git a/keyboards/cannonkeys/vicious40/vicious40.h b/keyboards/cannonkeys/vicious40/vicious40.h
deleted file mode 100644
index fd48716748..0000000000
--- a/keyboards/cannonkeys/vicious40/vicious40.h
+++ /dev/null
@@ -1,33 +0,0 @@
- /* Copyright 2021 Andrew Kannan
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXXX KC_NO
-
-#define LAYOUT_default( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-	K300, K301, K302, K303, K304,       K306,             K309, K310, K311 \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-	{ K300,  K301,  K302,  K303,  K304,  XXXX,  K306,  XXXX,  XXXX,  K309,  K310,  K311 } \
-}
diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h
index 65f64c2f09..1d8a04fe70 100644
--- a/keyboards/capsunlocked/cu24/config.h
+++ b/keyboards/capsunlocked/cu24/config.h
@@ -16,25 +16,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { E6, F5, B4, B6, C6, C7 }
-#define MATRIX_COL_PINS { F0, F1, D0, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Glow */
-#define RGB_DI_PIN F4     // The pin the LED strip is connected to
 #define RGBLED_NUM 5     // Number of LEDs in your strip
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/capsunlocked/cu24/cu24.c b/keyboards/capsunlocked/cu24/cu24.c
deleted file mode 100644
index 0c976f076f..0000000000
--- a/keyboards/capsunlocked/cu24/cu24.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "cu24.h"
diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json
index ea361a2bf4..22ef9df89b 100644
--- a/keyboards/capsunlocked/cu24/info.json
+++ b/keyboards/capsunlocked/cu24/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "D0", "D1"],
+        "rows": ["E6", "F5", "B4", "B6", "C6", "C7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B5",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/capsunlocked/cu65/config.h b/keyboards/capsunlocked/cu65/config.h
index fd829724fc..cf38d9dcc6 100644
--- a/keyboards/capsunlocked/cu65/config.h
+++ b/keyboards/capsunlocked/cu65/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F1, F4, F5, F6, D3 }
-#define MATRIX_COL_PINS { D6, D7, D4, B4, B5, B6, C6, D5, C7, F0, E6, B0, B1, B7, B3, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/capsunlocked/cu65/cu65.c b/keyboards/capsunlocked/cu65/cu65.c
deleted file mode 100644
index 2b7f720e13..0000000000
--- a/keyboards/capsunlocked/cu65/cu65.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 CapsUnlocked
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "cu65.h"
diff --git a/keyboards/capsunlocked/cu65/info.json b/keyboards/capsunlocked/cu65/info.json
index 8f91a34974..ce45526d31 100644
--- a/keyboards/capsunlocked/cu65/info.json
+++ b/keyboards/capsunlocked/cu65/info.json
@@ -8,314 +8,319 @@
         "pid": "0x0065",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "D4", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "E6", "B0", "B1", "B7", "B3", "B2"],
+        "rows": ["F1", "F4", "F5", "F6", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker", "65_iso_blocker", "65_iso_blocker_split_bs"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":2, "w":1.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"Home", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h
index cdc031b93b..9c55906c31 100644
--- a/keyboards/capsunlocked/cu7/config.h
+++ b/keyboards/capsunlocked/cu7/config.h
@@ -16,30 +16,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D7, F0, F6 }
-#define MATRIX_COL_PINS { F5, F7, F4 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -57,4 +38,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
 #define RGBLIGHT_LIMIT_VAL 50
-#endif
diff --git a/keyboards/capsunlocked/cu7/cu7.c b/keyboards/capsunlocked/cu7/cu7.c
deleted file mode 100644
index 815ac53c94..0000000000
--- a/keyboards/capsunlocked/cu7/cu7.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "cu7.h"
diff --git a/keyboards/capsunlocked/cu7/cu7.h b/keyboards/capsunlocked/cu7/cu7.h
deleted file mode 100644
index 2f30dbb2d5..0000000000
--- a/keyboards/capsunlocked/cu7/cu7.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-	         K01,       \
-	  K10,   K11,  K12, \
-      K20,   K21,  K22  \
-) { \
-	{ KC_NO, K01,  KC_NO }, \
-	{ K10,   K11,  K12 },   \
-    { K20,   K21,  K22 }    \
-}
-
diff --git a/keyboards/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json
index ebd7b6d491..94eb2aea0c 100644
--- a/keyboards/capsunlocked/cu7/info.json
+++ b/keyboards/capsunlocked/cu7/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F1"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F7", "F4"],
+        "rows": ["D7", "F0", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D6", "pin_b": "D4", "resolution": 2}
@@ -18,15 +26,15 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0.5, "y":0, "w":2, "h":2},
+                {"matrix": [0, 1], "x": 0.5, "y": 0, "w": 2, "h": 2},
 
-                {"x":0, "y":2.5},
-                {"x":1, "y":2.5},
-                {"x":2, "y":2.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 1], "x": 1, "y": 2.5},
+                {"matrix": [1, 2], "x": 2, "y": 2.5},
 
-                {"x":0, "y":3.5},
-                {"x":1, "y":3.5},
-                {"x":2, "y":3.5}
+                {"matrix": [2, 0], "x": 0, "y": 3.5},
+                {"matrix": [2, 1], "x": 1, "y": 3.5},
+                {"matrix": [2, 2], "x": 2, "y": 3.5}
             ]
         }
     }
diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h
index 52dff09103..67f1f43c44 100644
--- a/keyboards/capsunlocked/cu75/config.h
+++ b/keyboards/capsunlocked/cu75/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROW_PINS {F1, B7, B3, D2, D3, B2}
-#define MATRIX_COL_PINS {F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, B1, B0, F0}
-
-#define RGB_DI_PIN C7  // Have to set it to something to get the ws2812 code to compile
 #define RGBLED_NUM 24     // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/capsunlocked/cu75/cu75.c b/keyboards/capsunlocked/cu75/cu75.c
index fff0c10ef6..c894d18602 100644
--- a/keyboards/capsunlocked/cu75/cu75.c
+++ b/keyboards/capsunlocked/cu75/cu75.c
@@ -2,7 +2,6 @@
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
 #include "cu75.h"
-#include "keymap.h"
 #include "debug.h"
 #include "../lfkeyboards/issi.h"
 #include "../lfkeyboards/TWIlib.h"
diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/info.json
index 7f4eb623ac..5be11f6cb0 100644
--- a/keyboards/capsunlocked/cu75/info.json
+++ b/keyboards/capsunlocked/cu75/info.json
@@ -8,10 +8,18 @@
     "pid": "0x6062",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B1", "B0", "F0"],
+    "rows": ["F1", "B7", "B3", "D2", "D3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "driver": "custom",
     "levels": 8
   },
+  "ws2812": {
+    "pin": "C7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/capsunlocked/cu80/v1/config.h b/keyboards/capsunlocked/cu80/v1/config.h
index d604623f6e..991c996ea8 100644
--- a/keyboards/capsunlocked/cu80/v1/config.h
+++ b/keyboards/capsunlocked/cu80/v1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B1, B5, B4, F7, D7, D6 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, C7, C6, B6, B0, E6, B7, B3, B2, D2, D3, D5, D4}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/capsunlocked/cu80/v1/info.json b/keyboards/capsunlocked/cu80/v1/info.json
index 72b2e681c9..097ffe4d9f 100644
--- a/keyboards/capsunlocked/cu80/v1/info.json
+++ b/keyboards/capsunlocked/cu80/v1/info.json
@@ -8,15 +8,226 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B0", "E6", "B7", "B3", "B2", "D2", "D3", "D5", "D4"],
+        "rows": ["B1", "B5", "B4", "F7", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_iso", "tkl_ansi"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_iso"
+    },
     "layouts": {
-        "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"\u00ac", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"\"", "x":2, "y":1.5}, {"label":"\u00a3", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"@", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
         },
         "LAYOUT_tkl_ansi":{
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/capsunlocked/cu80/v1/v1.c b/keyboards/capsunlocked/cu80/v1/v1.c
deleted file mode 100644
index 96161175b2..0000000000
--- a/keyboards/capsunlocked/cu80/v1/v1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Andy Holland
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "v1.h"
diff --git a/keyboards/capsunlocked/cu80/v1/v1.h b/keyboards/capsunlocked/cu80/v1/v1.h
deleted file mode 100644
index 607b7e3afb..0000000000
--- a/keyboards/capsunlocked/cu80/v1/v1.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-Copyright 2020 Andy Holland
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_all( \
-    K000,       K001, K002, K003, K004,    K005, K006, K007, K008,    K010, K011, K012, K013,    K014, K015, K016, \
-                                                                                                                   \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113,    K114, K115, K116, \
-    K200,    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, K215, K216, \
-    K300,     K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,   K313,                      \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,             K413,          K415,       \
-    K500, K501, K502,                      K506,                      K509, K510, K511, K513,    K514, K515, K516  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  KC_NO, K010,  K011,  K012,  K013,  K014,  K015,  K016  }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116  }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215,  K216  }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, KC_NO, KC_NO }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  KC_NO, K415,  KC_NO }, \
-    { K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, K509,  K510,  K511,  KC_NO, K513,  K514,  K515,  K516  }, \
-}
-
-#define LAYOUT_tkl_iso LAYOUT_all
-
-#define LAYOUT_tkl_ansi( \
-    K000,       K001, K002, K003, K004,    K005, K006, K007, K008,    K010, K011, K012, K013,    K014, K015, K016, \
-                                                                                                                   \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113,    K114, K115, K116, \
-    K200,    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,    K312,    K214, K215, K216, \
-    K300,     K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,         K313,                      \
-    K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,             K413,          K415,       \
-    K500, K501, K502,                      K506,                      K509, K510, K511, K513,    K514, K515, K516  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  KC_NO, K010,  K011,  K012,  K013,  K014,  K015,  K016  }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116  }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215,  K216  }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, KC_NO, KC_NO }, \
-    { K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  KC_NO, K415,  KC_NO }, \
-    { K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, K509,  K510,  K511,  KC_NO, K513,  K514,  K515,  K516  }, \
-}
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/info.json b/keyboards/capsunlocked/cu80/v2_ansi/info.json
index 09bf2e334c..c9d4b88926 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/info.json
+++ b/keyboards/capsunlocked/cu80/v2_ansi/info.json
@@ -39,9 +39,11 @@
     "hue_steps": 8,
     "led_count": 87,
     "max_brightness": 50,
-    "pin": "E6",
     "saturation_steps": 8
   },
+  "ws2812": {
+    "pin": "E6"
+  },
   "url": "https://caps-unlocked.com/cu80-round-2/",
   "usb": {
     "device_version": "0.0.1",
@@ -53,93 +55,106 @@
       "c_macro": true,
       "filename": "keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.h",
       "layout": [
-        { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "F1", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "F2", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "F3", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "F4", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "F5", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0 },
-        { "label": "F6", "matrix": [0, 7], "w": 1, "x": 7.5, "y": 0 },
-        { "label": "F7", "matrix": [0, 8], "w": 1, "x": 8.5, "y": 0 },
-        { "label": "F8", "matrix": [0, 9], "w": 1, "x": 9.5, "y": 0 },
-        { "label": "F9", "matrix": [0, 10], "w": 1, "x": 11, "y": 0 },
-        { "label": "F10", "matrix": [0, 11], "w": 1, "x": 12, "y": 0 },
-        { "label": "F11", "matrix": [0, 12], "w": 1, "x": 13, "y": 0 },
-        { "label": "F12", "matrix": [0, 13], "w": 1, "x": 14, "y": 0 },
-        { "label": "PrtSc", "matrix": [0, 14], "w": 1, "x": 15.25, "y": 0 },
-        { "label": "Scroll Lock", "matrix": [0, 15], "w": 1, "x": 16.25, "y": 0 },
-        { "label": "Pause", "matrix": [0, 16], "w": 1, "x": 17.25, "y": 0 },
-        { "label": "\u00ac", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.5 },
-        { "label": "!", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.5 },
-        { "label": "@", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.5 },
-        { "label": "\u00a3", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.5 },
-        { "label": "$", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.5 },
-        { "label": "%", "matrix": [1, 5], "w": 1, "x": 5, "y": 1.5 },
-        { "label": "^", "matrix": [1, 6], "w": 1, "x": 6, "y": 1.5 },
-        { "label": "&", "matrix": [1, 7], "w": 1, "x": 7, "y": 1.5 },
-        { "label": "*", "matrix": [1, 8], "w": 1, "x": 8, "y": 1.5 },
-        { "label": "(", "matrix": [1, 9], "w": 1, "x": 9, "y": 1.5 },
-        { "label": ")", "matrix": [1, 10], "w": 1, "x": 10, "y": 1.5 },
-        { "label": "_", "matrix": [1, 11], "w": 1, "x": 11, "y": 1.5 },
-        { "label": "+", "matrix": [1, 12], "w": 1, "x": 12, "y": 1.5 },
-        { "label": "Backspace", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5 },
-        { "label": "Insert", "matrix": [1, 14], "w": 1, "x": 15.25, "y": 1.5 },
-        { "label": "Home", "matrix": [1, 15], "w": 1, "x": 16.25, "y": 1.5 },
-        { "label": "PgUp", "matrix": [1, 16], "w": 1, "x": 17.25, "y": 1.5 },
-        { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 },
-        { "label": "Q", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.5 },
-        { "label": "W", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.5 },
-        { "label": "E", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2.5 },
-        { "label": "R", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.5 },
-        { "label": "T", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.5 },
-        { "label": "Y", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.5 },
-        { "label": "U", "matrix": [2, 7], "w": 1, "x": 7.5, "y": 2.5 },
-        { "label": "I", "matrix": [2, 8], "w": 1, "x": 8.5, "y": 2.5 },
-        { "label": "O", "matrix": [2, 9], "w": 1, "x": 9.5, "y": 2.5 },
-        { "label": "P", "matrix": [2, 10], "w": 1, "x": 10.5, "y": 2.5 },
-        { "label": "{", "matrix": [2, 11], "w": 1, "x": 11.5, "y": 2.5 },
-        { "label": "}", "matrix": [2, 12], "w": 1, "x": 12.5, "y": 2.5 },
-        { "label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 },
-        { "label": "Delete", "matrix": [2, 14], "w": 1, "x": 15.25, "y": 2.5 },
-        { "label": "End", "matrix": [2, 15], "w": 1, "x": 16.25, "y": 2.5 },
-        { "label": "PgDn", "matrix": [2, 16], "w": 1, "x": 17.25, "y": 2.5 },
-        { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 },
-        { "label": "A", "matrix": [3, 1], "w": 1, "x": 1.75, "y": 3.5 },
-        { "label": "S", "matrix": [3, 2], "w": 1, "x": 2.75, "y": 3.5 },
-        { "label": "D", "matrix": [3, 3], "w": 1, "x": 3.75, "y": 3.5 },
-        { "label": "F", "matrix": [3, 4], "w": 1, "x": 4.75, "y": 3.5 },
-        { "label": "G", "matrix": [3, 5], "w": 1, "x": 5.75, "y": 3.5 },
-        { "label": "H", "matrix": [3, 6], "w": 1, "x": 6.75, "y": 3.5 },
-        { "label": "J", "matrix": [3, 7], "w": 1, "x": 7.75, "y": 3.5 },
-        { "label": "K", "matrix": [3, 8], "w": 1, "x": 8.75, "y": 3.5 },
-        { "label": "L", "matrix": [3, 9], "w": 1, "x": 9.75, "y": 3.5 },
-        { "label": ":", "matrix": [3, 10], "w": 1, "x": 10.75, "y": 3.5 },
-        { "label": "\"", "matrix": [3, 11], "w": 1, "x": 11.75, "y": 3.5 },
-        { "label": "Enter", "matrix": [3, 12], "w": 2.25, "x": 12.75, "y": 3.5 },
-        { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.5 },
-        { "label": "Z", "matrix": [4, 2], "w": 1, "x": 2.25, "y": 4.5 },
-        { "label": "X", "matrix": [4, 3], "w": 1, "x": 3.25, "y": 4.5 },
-        { "label": "C", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 },
-        { "label": "V", "matrix": [4, 5], "w": 1, "x": 5.25, "y": 4.5 },
-        { "label": "B", "matrix": [4, 6], "w": 1, "x": 6.25, "y": 4.5 },
-        { "label": "N", "matrix": [4, 7], "w": 1, "x": 7.25, "y": 4.5 },
-        { "label": "M", "matrix": [4, 8], "w": 1, "x": 8.25, "y": 4.5 },
-        { "label": "<", "matrix": [4, 9], "w": 1, "x": 9.25, "y": 4.5 },
-        { "label": ">", "matrix": [4, 10], "w": 1, "x": 10.25, "y": 4.5 },
-        { "label": "?", "matrix": [4, 11], "w": 1, "x": 11.25, "y": 4.5 },
-        { "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.5 },
-        { "label": "Up", "matrix": [4, 15], "w": 1, "x": 16.25, "y": 4.5 },
-        { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 },
-        { "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.5 },
-        { "label": "Win", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.5 },
-        { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.5 },
-        { "label": "Win", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 5.5 },
-        { "label": "AltGr", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 5.5 },
-        { "label": "Ctrl", "matrix": [5, 11], "w": 1.25, "x": 12.5, "y": 5.5 },
-        { "label": "Fn", "matrix": [5, 12], "w": 1.25, "x": 13.75, "y": 5.5 },
-        { "label": "Left", "matrix": [5, 13], "w": 1, "x": 15.25, "y": 5.5 },
-        { "label": "Down", "matrix": [5, 15], "w": 1, "x": 16.25, "y": 5.5 },
-        { "label": "Right", "matrix": [5, 16], "w": 1, "x": 17.25, "y": 5.5 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 11, "y": 0},
+        {"matrix": [0, 11], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.5}
       ]
     }
   }
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json b/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json
index 52676aa041..45b4b9c8cd 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json
+++ b/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json
@@ -3,6 +3,9 @@
   "features": {
     "rgblight": false
   },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
   "usb": {
     "pid": "0x0082"
   }
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk b/keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk
index d213c84de3..9470477f49 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk
+++ b/keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk
@@ -1,4 +1,3 @@
 RGB_MATRIX_ENABLE = yes     # Enable RGB matrix
-RGB_MATRIX_DRIVER = WS2812  # Set Driver to WS2812
 
 LTO_ENABLE = yes
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c b/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c
index 3c26c5d580..f014479ef8 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c
+++ b/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "v2_ansi.h"
+#include "quantum.h"
 
 #ifdef CU80_RGB
 
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.h b/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.h
deleted file mode 100644
index 61aecfa008..0000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_tkl_ansi( \
-    K000,       K002, K003, K004, K005,    K006, K007, K008, K009,    K010, K011, K012, K013,    K014, K015, K016, \
-                                                                                                                   \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113,    K114, K115, K116, \
-    K200,    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,    K213,    K214, K215, K216, \
-    K300,     K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,    K312,                           \
-        K400,  K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,             K412,          K415,       \
-    K500, K501, K502,                      K505,                     K509,  K510,  K511, K512,    K513, K515, K516 \
-) { \
-    { K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016  }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116  }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216  }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, KC_NO, K415,  KC_NO }, \
-    { K500,  K501,  K502,  KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO,  K509,  K510,  K511,  K512,  K513,  KC_NO, K515,  K516  }, \
-}
diff --git a/keyboards/capsunlocked/cu80/v2_iso/info.json b/keyboards/capsunlocked/cu80/v2_iso/info.json
index 0c71c940c1..b7225214ba 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/info.json
+++ b/keyboards/capsunlocked/cu80/v2_iso/info.json
@@ -39,9 +39,11 @@
     "hue_steps": 8,
     "led_count": 88,
     "max_brightness": 50,
-    "pin": "E6",
     "saturation_steps": 8
   },
+  "ws2812": {
+    "pin": "E6"
+  },
   "url": "https://caps-unlocked.com/cu80-round-2/",
   "usb": {
     "device_version": "0.0.1",
@@ -53,94 +55,107 @@
       "c_macro": true,
       "filename": "keyboards/capsunlocked/cu80/v2_iso/v2_iso.h",
       "layout": [
-        { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "F1", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "F2", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "F3", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "F4", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "F5", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0 },
-        { "label": "F6", "matrix": [0, 7], "w": 1, "x": 7.5, "y": 0 },
-        { "label": "F7", "matrix": [0, 8], "w": 1, "x": 8.5, "y": 0 },
-        { "label": "F8", "matrix": [0, 9], "w": 1, "x": 9.5, "y": 0 },
-        { "label": "F9", "matrix": [0, 10], "w": 1, "x": 11, "y": 0 },
-        { "label": "F10", "matrix": [0, 11], "w": 1, "x": 12, "y": 0 },
-        { "label": "F11", "matrix": [0, 12], "w": 1, "x": 13, "y": 0 },
-        { "label": "F12", "matrix": [0, 13], "w": 1, "x": 14, "y": 0 },
-        { "label": "PrtSc", "matrix": [0, 14], "w": 1, "x": 15.25, "y": 0 },
-        { "label": "Scroll Lock", "matrix": [0, 15], "w": 1, "x": 16.25, "y": 0 },
-        { "label": "Pause", "matrix": [0, 16], "w": 1, "x": 17.25, "y": 0 },
-        { "label": "\u00ac", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.5 },
-        { "label": "!", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.5 },
-        { "label": "\"", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.5 },
-        { "label": "\u00a3", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.5 },
-        { "label": "$", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.5 },
-        { "label": "%", "matrix": [1, 5], "w": 1, "x": 5, "y": 1.5 },
-        { "label": "^", "matrix": [1, 6], "w": 1, "x": 6, "y": 1.5 },
-        { "label": "&", "matrix": [1, 7], "w": 1, "x": 7, "y": 1.5 },
-        { "label": "*", "matrix": [1, 8], "w": 1, "x": 8, "y": 1.5 },
-        { "label": "(", "matrix": [1, 9], "w": 1, "x": 9, "y": 1.5 },
-        { "label": ")", "matrix": [1, 10], "w": 1, "x": 10, "y": 1.5 },
-        { "label": "_", "matrix": [1, 11], "w": 1, "x": 11, "y": 1.5 },
-        { "label": "+", "matrix": [1, 12], "w": 1, "x": 12, "y": 1.5 },
-        { "label": "Backspace", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5 },
-        { "label": "Insert", "matrix": [1, 14], "w": 1, "x": 15.25, "y": 1.5 },
-        { "label": "Home", "matrix": [1, 15], "w": 1, "x": 16.25, "y": 1.5 },
-        { "label": "PgUp", "matrix": [1, 16], "w": 1, "x": 17.25, "y": 1.5 },
-        { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 },
-        { "label": "Q", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.5 },
-        { "label": "W", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.5 },
-        { "label": "E", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2.5 },
-        { "label": "R", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.5 },
-        { "label": "T", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.5 },
-        { "label": "Y", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.5 },
-        { "label": "U", "matrix": [2, 7], "w": 1, "x": 7.5, "y": 2.5 },
-        { "label": "I", "matrix": [2, 8], "w": 1, "x": 8.5, "y": 2.5 },
-        { "label": "O", "matrix": [2, 9], "w": 1, "x": 9.5, "y": 2.5 },
-        { "label": "P", "matrix": [2, 10], "w": 1, "x": 10.5, "y": 2.5 },
-        { "label": "{", "matrix": [2, 11], "w": 1, "x": 11.5, "y": 2.5 },
-        { "label": "}", "matrix": [2, 12], "w": 1, "x": 12.5, "y": 2.5 },
-        { "label": "Delete", "matrix": [2, 14], "w": 1, "x": 15.25, "y": 2.5 },
-        { "label": "End", "matrix": [2, 15], "w": 1, "x": 16.25, "y": 2.5 },
-        { "label": "PgDn", "matrix": [2, 16], "w": 1, "x": 17.25, "y": 2.5 },
-        { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 },
-        { "label": "A", "matrix": [3, 1], "w": 1, "x": 1.75, "y": 3.5 },
-        { "label": "S", "matrix": [3, 2], "w": 1, "x": 2.75, "y": 3.5 },
-        { "label": "D", "matrix": [3, 3], "w": 1, "x": 3.75, "y": 3.5 },
-        { "label": "F", "matrix": [3, 4], "w": 1, "x": 4.75, "y": 3.5 },
-        { "label": "G", "matrix": [3, 5], "w": 1, "x": 5.75, "y": 3.5 },
-        { "label": "H", "matrix": [3, 6], "w": 1, "x": 6.75, "y": 3.5 },
-        { "label": "J", "matrix": [3, 7], "w": 1, "x": 7.75, "y": 3.5 },
-        { "label": "K", "matrix": [3, 8], "w": 1, "x": 8.75, "y": 3.5 },
-        { "label": "L", "matrix": [3, 9], "w": 1, "x": 9.75, "y": 3.5 },
-        { "label": ":", "matrix": [3, 10], "w": 1, "x": 10.75, "y": 3.5 },
-        { "label": "@", "matrix": [3, 11], "w": 1, "x": 11.75, "y": 3.5 },
-        { "label": "~", "matrix": [3, 12], "w": 1, "x": 12.75, "y": 3.5 },
-        { "h": 2, "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2.5 },
-        { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 },
-        { "label": "|", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4.5 },
-        { "label": "Z", "matrix": [4, 2], "w": 1, "x": 2.25, "y": 4.5 },
-        { "label": "X", "matrix": [4, 3], "w": 1, "x": 3.25, "y": 4.5 },
-        { "label": "C", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 },
-        { "label": "V", "matrix": [4, 5], "w": 1, "x": 5.25, "y": 4.5 },
-        { "label": "B", "matrix": [4, 6], "w": 1, "x": 6.25, "y": 4.5 },
-        { "label": "N", "matrix": [4, 7], "w": 1, "x": 7.25, "y": 4.5 },
-        { "label": "M", "matrix": [4, 8], "w": 1, "x": 8.25, "y": 4.5 },
-        { "label": "<", "matrix": [4, 9], "w": 1, "x": 9.25, "y": 4.5 },
-        { "label": ">", "matrix": [4, 10], "w": 1, "x": 10.25, "y": 4.5 },
-        { "label": "?", "matrix": [4, 11], "w": 1, "x": 11.25, "y": 4.5 },
-        { "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.5 },
-        { "label": "Up", "matrix": [4, 15], "w": 1, "x": 16.25, "y": 4.5 },
-        { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 },
-        { "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.5 },
-        { "label": "Win", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.5 },
-        { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.5 },
-        { "label": "Win", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 5.5 },
-        { "label": "AltGr", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 5.5 },
-        { "label": "Ctrl", "matrix": [5, 11], "w": 1.25, "x": 12.5, "y": 5.5 },
-        { "label": "Fn", "matrix": [5, 12], "w": 1.25, "x": 13.75, "y": 5.5 },
-        { "label": "Left", "matrix": [5, 13], "w": 1, "x": 15.25, "y": 5.5 },
-        { "label": "Down", "matrix": [5, 15], "w": 1, "x": 16.25, "y": 5.5 },
-        { "label": "Right", "matrix": [5, 16], "w": 1, "x": 17.25, "y": 5.5 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 11, "y": 0},
+        {"matrix": [0, 11], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+        {"matrix": [2, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.5}
       ]
     }
   }
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json b/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json
index e04971c21a..4f08f6116a 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json
+++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json
@@ -3,6 +3,9 @@
   "features": {
     "rgblight": false
   },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
   "usb": {
     "pid": "0x0083"
   }
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk b/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
index d213c84de3..9470477f49 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
+++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
@@ -1,4 +1,3 @@
 RGB_MATRIX_ENABLE = yes     # Enable RGB matrix
-RGB_MATRIX_DRIVER = WS2812  # Set Driver to WS2812
 
 LTO_ENABLE = yes
diff --git a/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c b/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
index caa13cfa81..acb1d835aa 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
+++ b/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
@@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "v2_iso.h"
+#include "quantum.h"
+
 #ifdef CU80_RGB
 
 void matrix_init_kb(void) {
diff --git a/keyboards/capsunlocked/cu80/v2_iso/v2_iso.h b/keyboards/capsunlocked/cu80/v2_iso/v2_iso.h
deleted file mode 100644
index affdc9da9f..0000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/v2_iso.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_tkl_iso( \
-    K000,       K002, K003, K004, K005,    K006, K007, K008, K009,    K010, K011, K012, K013,    K014, K015, K016, \
-                                                                                                                   \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113,    K114, K115, K116, \
-    K200,    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, K215, K216, \
-    K300,     K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,   K213,                      \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,             K412,          K415,       \
-    K500, K501, K502,                      K505,                     K509,  K510,  K511, K512,    K513, K515, K516 \
-) { \
-    { K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016  }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116  }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216  }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, KC_NO, K415,  KC_NO }, \
-    { K500,  K501,  K502,  KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO,  K509,  K510,  K511,  K512,  K513,  KC_NO, K515,  K516  }, \
-}
diff --git a/keyboards/carbo65/config.h b/keyboards/carbo65/config.h
index af627558fe..79fdc4275f 100644
--- a/keyboards/carbo65/config.h
+++ b/keyboards/carbo65/config.h
@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 }
-#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14, B15 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/carbo65/info.json b/keyboards/carbo65/info.json
index c77e3bb9e6..c63c2c747c 100644
--- a/keyboards/carbo65/info.json
+++ b/keyboards/carbo65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4336",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "on_state": 0
diff --git a/keyboards/catch22/catch22.c b/keyboards/catch22/catch22.c
deleted file mode 100644
index 11a983936e..0000000000
--- a/keyboards/catch22/catch22.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2018 QMK Community
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "catch22.h"
diff --git a/keyboards/catch22/catch22.h b/keyboards/catch22/catch22.h
deleted file mode 100644
index 6eefb9cd51..0000000000
--- a/keyboards/catch22/catch22.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2018 QMK Community
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-     K01, K02, K03, K04, \
-     K11, K12, K13, K14, \
-K20, K21, K22, K23, K24, \
-K30, K31, K32, K33, K34, \
-     K41, K42, K43, K44 \
-) { \
-  { KC_NO, K01, K02, K03, K04 },  \
-  { KC_NO, K11, K12, K13, K14 },  \
-  { K20,   K21, K22, K23, K24 },  \
-  { K30,   K31, K32, K33, K34 },  \
-  { KC_NO, K41, K42, K43, K44 },  \
-}
diff --git a/keyboards/catch22/config.h b/keyboards/catch22/config.h
index 91bf0b5d95..98e0780698 100644
--- a/keyboards/catch22/config.h
+++ b/keyboards/catch22/config.h
@@ -16,21 +16,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     false \
 )
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN F6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/catch22/info.json b/keyboards/catch22/info.json
index dcdf23f953..6ffd3117af 100644
--- a/keyboards/catch22/info.json
+++ b/keyboards/catch22/info.json
@@ -6,11 +6,46 @@
         "pid": "0xCA22",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F6"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6"],
+        "rows": ["B6", "B2", "B3", "B1", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"A", "x":1, "y":0}, {"label":"B", "x":2, "y":0}, {"label":"C", "x":3, "y":0}, {"label":"D", "x":4, "y":0}, {"label":"E", "x":1, "y":1}, {"label":"F", "x":2, "y":1}, {"label":"G", "x":3, "y":1}, {"label":"H", "x":4, "y":1}, {"label":"I", "x":0, "y":2}, {"label":"J", "x":1, "y":2}, {"label":"K", "x":2, "y":2}, {"label":"L", "x":3, "y":2}, {"label":"M", "x":4, "y":2}, {"label":"1", "x":0, "y":3, "h":2}, {"label":"N", "x":1, "y":3}, {"label":"O", "x":2, "y":3}, {"label":"P", "x":3, "y":3}, {"label":"Q", "x":4, "y":3}, {"label":"R", "x":1, "y":4}, {"label":"S", "x":2, "y":4}, {"label":"T", "x":3, "y":4}, {"label":"U", "x":4, "y":4}]
+            "layout": [
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "h": 2},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/centromere/centromere.h b/keyboards/centromere/centromere.h
index bf13aa7b00..078cdca07f 100644
--- a/keyboards/centromere/centromere.h
+++ b/keyboards/centromere/centromere.h
@@ -27,39 +27,3 @@
 #define set_led_magenta red_led_on;  grn_led_off; blu_led_on
 #define set_led_cyan    red_led_off; grn_led_on;  blu_led_on
 #define set_led_white   red_led_on;  grn_led_on;  blu_led_on
-
-// For readability
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_split_3x6_3( \
-  k0a, k00, k01, k02, k03, k04,      k05, k06, k07, k08, k09, k0b, \
-  k1a, k10, k11, k12, k13, k14,      k15, k16, k17, k18, k19, k1b,\
-  k2a, k20, k21, k22, k23, k24,      k25, k26, k27, k28, k29, k2b,\
-                 k32, k33, k34,      k35, k36, k37  \
-) \
-  {                                                       \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \
-    { ___, ___, k2a, k1a, k0a, k0b, k1b, k2b, ___, ___ }  \
-  }
-
-#define LAYOUT_split_3x5_3( \
-  k00, k01, k02, k03, k04,      k05, k06, k07, k08, k09, \
-  k10, k11, k12, k13, k14,      k15, k16, k17, k18, k19,\
-  k20, k21, k22, k23, k24,      k25, k26, k27, k28, k29,\
-            k32, k33, k34,      k35, k36, k37  \
-) \
-  {                                                       \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \
-    { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }  \
-  }
-
-#define LAYOUT LAYOUT_split_3x6_3
diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json
index cd1c07c67c..5f9b57d97a 100644
--- a/keyboards/centromere/info.json
+++ b/keyboards/centromere/info.json
@@ -11,91 +11,108 @@
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["split_3x5_3" "split_3x6_3"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x6_3"
+    },
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
-                {"label":"Tab", "x":0, "y":0.25},
-                {"label":"Q", "x":1, "y":0.25},
-                {"label":"W", "x":2, "y":0.125},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0.125},
-                {"label":"T", "x":5, "y":0.25},
-                {"label":"Y", "x":8, "y":0.25},
-                {"label":"U", "x":9, "y":0.125},
-                {"label":"I", "x":10, "y":0},
-                {"label":"O", "x":11, "y":0.125},
-                {"label":"P", "x":12, "y":0.25},
-                {"label":"Backspace", "x":13, "y":0.25},
-                {"label":"LCtrl", "x":0, "y":1.25},
-                {"label":"A", "x":1, "y":1.25},
-                {"label":"S", "x":2, "y":1.125},
-                {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1.125},
-                {"label":"G", "x":5, "y":1.25},
-                {"label":"H", "x":8, "y":1.25},
-                {"label":"J", "x":9, "y":1.125},
-                {"label":"K", "x":10, "y":1},
-                {"label":"L", "x":11, "y":1.125},
-                {"label":";", "x":12, "y":1.25},
-                {"label":"'", "x":13, "y":1.25},
-                {"label":"Shift", "x":0, "y":2.25},
-                {"label":"Z", "x":1, "y":2.25},
-                {"label":"X", "x":2, "y":2.125},
-                {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2.125},
-                {"label":"B", "x":5, "y":2.25},
-                {"label":"N", "x":8, "y":2.25},
-                {"label":"M", "x":9, "y":2.125},
-                {"label":",", "x":10, "y":2},
-                {"label":".", "x":11, "y":2.125},
-                {"label":"/", "x":12, "y":2.25},
-                {"label":"Enter", "x":13, "y":2.25},
-                {"label":"LGUI", "x":3.5, "y":3.125},
-                {"label":"MO(_FN)", "x":4.5, "y":3.25},
-                {"label":"Space", "x":5.5, "y":3.375},
-                {"label":"Space", "x":7.5, "y":3.375},
-                {"label":"MO(_NUM)", "x":8.5, "y":3.25},
-                {"label":"RAlt", "x":9.5, "y":3.125}
+                {"matrix": [4, 4], "x": 0, "y": 0.25},
+                {"matrix": [0, 0], "x": 1, "y": 0.25},
+                {"matrix": [0, 1], "x": 2, "y": 0.125},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0.125},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+
+                {"matrix": [0, 5], "x": 8, "y": 0.25},
+                {"matrix": [0, 6], "x": 9, "y": 0.125},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0.125},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [4, 5], "x": 13, "y": 0.25},
+
+                {"matrix": [4, 3], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1, "y": 1.25},
+                {"matrix": [1, 1], "x": 2, "y": 1.125},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1.125},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+
+                {"matrix": [1, 5], "x": 8, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.125},
+                {"matrix": [1, 7], "x": 10, "y": 1},
+                {"matrix": [1, 8], "x": 11, "y": 1.125},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [4, 6], "x": 13, "y": 1.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 2.25},
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [2, 1], "x": 2, "y": 2.125},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2.125},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+
+                {"matrix": [2, 5], "x": 8, "y": 2.25},
+                {"matrix": [2, 6], "x": 9, "y": 2.125},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2.125},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [4, 7], "x": 13, "y": 2.25},
+
+                {"matrix": [3, 2], "x": 3.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.375},
+
+                {"matrix": [3, 5], "x": 7.5, "y": 3.375},
+                {"matrix": [3, 6], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 7], "x": 9.5, "y": 3.125}
             ]
         },
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"label":"Q", "x":0, "y":0.25},
-                {"label":"W", "x":1, "y":0.125},
-                {"label":"E", "x":2, "y":0},
-                {"label":"R", "x":3, "y":0.125},
-                {"label":"T", "x":4, "y":0.25},
-                {"label":"Y", "x":7, "y":0.25},
-                {"label":"U", "x":8, "y":0.125},
-                {"label":"I", "x":9, "y":0},
-                {"label":"O", "x":10, "y":0.125},
-                {"label":"P", "x":11, "y":0.25},
-                {"label":"A", "x":0, "y":1.25},
-                {"label":"S", "x":1, "y":1.125},
-                {"label":"D", "x":2, "y":1},
-                {"label":"F", "x":3, "y":1.125},
-                {"label":"G", "x":4, "y":1.25},
-                {"label":"H", "x":7, "y":1.25},
-                {"label":"J", "x":8, "y":1.125},
-                {"label":"K", "x":9, "y":1},
-                {"label":"L", "x":10, "y":1.125},
-                {"label":";", "x":11, "y":1.25},
-                {"label":"Z", "x":0, "y":2.25},
-                {"label":"X", "x":1, "y":2.125},
-                {"label":"C", "x":2, "y":2},
-                {"label":"V", "x":3, "y":2.125},
-                {"label":"B", "x":4, "y":2.25},
-                {"label":"N", "x":7, "y":2.25},
-                {"label":"M", "x":8, "y":2.125},
-                {"label":",", "x":9, "y":2},
-                {"label":".", "x":10, "y":2.125},
-                {"label":"/", "x":11, "y":2.25},
-                {"label":"LGUI", "x":2.5, "y":3.125},
-                {"label":"MO(_FN)", "x":3.5, "y":3.25},
-                {"label":"Space", "x":4.5, "y":3.375},
-                {"label":"Space", "x":6.5, "y":3.375},
-                {"label":"MO(_NUM)", "x":7.5, "y":3.25},
-                {"label":"RAlt", "x":8.5, "y":3.125}
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.125},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.125},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+                {"matrix": [0, 5], "x": 7, "y": 0.25},
+                {"matrix": [0, 6], "x": 8, "y": 0.125},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0.125},
+                {"matrix": [0, 9], "x": 11, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.125},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+                {"matrix": [1, 5], "x": 7, "y": 1.25},
+                {"matrix": [1, 6], "x": 8, "y": 1.125},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1.125},
+                {"matrix": [1, 9], "x": 11, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.125},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [2, 5], "x": 7, "y": 2.25},
+                {"matrix": [2, 6], "x": 8, "y": 2.125},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2.125},
+                {"matrix": [2, 9], "x": 11, "y": 2.25},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.375},
+
+                {"matrix": [3, 5], "x": 6.5, "y": 3.375},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.125}
             ]
         }
     }
diff --git a/keyboards/centromere/keymaps/mini_bom/config.h b/keyboards/centromere/keymaps/mini_bom/config.h
index 61b0a76297..7c40fba2a3 100644
--- a/keyboards/centromere/keymaps/mini_bom/config.h
+++ b/keyboards/centromere/keymaps/mini_bom/config.h
@@ -25,4 +25,3 @@
 #    undef TAPPING_TERM
 #endif
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/cest73/tkm/config.h b/keyboards/cest73/tkm/config.h
index 062d3434eb..9b6132cbdb 100644
--- a/keyboards/cest73/tkm/config.h
+++ b/keyboards/cest73/tkm/config.h
@@ -15,18 +15,5 @@
   */ 
 #pragma once
 
-
-/* matrix sz handy ruler:  1   2   3   4   5   6   7   8   9  10  11  12 */
-/* key matrix pins */
-/*    row    handy ruler: r0  r1  r2  r3  r4  r5  r6  r7  r8  r9  r10 */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7, D0 }
-/*    column handy ruler: c0  c1  c2  c3  c4  c5  c6  c7  c8  c9 */
-#define MATRIX_COL_PINS { D1, D2, D3, D4, D5, D6, D7, F0, F1, F4 }
-
-//NOTE: if D6 pin shows any issues in exploatation the LED on the Teensy is to be removed
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* force n-key rollover*/
 #define FORCE_NKRO
diff --git a/keyboards/cest73/tkm/info.json b/keyboards/cest73/tkm/info.json
index 6054f24467..e55973be0f 100644
--- a/keyboards/cest73/tkm/info.json
+++ b/keyboards/cest73/tkm/info.json
@@ -8,6 +8,11 @@
         "pid": "0xAA55",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "E6"
     },
diff --git a/keyboards/cest73/tkm/tkm.c b/keyboards/cest73/tkm/tkm.c
deleted file mode 100644
index b127e9eb53..0000000000
--- a/keyboards/cest73/tkm/tkm.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2021 cest73 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#include "tkm.h"
diff --git a/keyboards/chalice/chalice.c b/keyboards/chalice/chalice.c
deleted file mode 100644
index 1d7cc12228..0000000000
--- a/keyboards/chalice/chalice.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 null-ll
- * Copyright 2021 Jels, Josh Johnson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "chalice.h"
diff --git a/keyboards/chalice/chalice.h b/keyboards/chalice/chalice.h
deleted file mode 100644
index c55cd4ba0b..0000000000
--- a/keyboards/chalice/chalice.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2020 null-ll
- * Copyright 2021 Jels, Josh Johnson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define ___ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-      K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K46,      \
-      K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K56,      \
-      K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K66, K76,           \
-           K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K86, K96,      \
-           K80, K91,      K82,      K92,      K83,      K93, K84,      K94, K85, K95  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06 }, \
-    { K10, K11, K12, K13, K14, K15, K16 }, \
-    { K20, K21, K22, K23, K24, K25, K26 }, \
-    { K30, K31, K32, K33, K34, K35, K36 }, \
-    { K40, K41, K42, K43, K44, K45, K46 }, \
-    { K50, K51, K52, K53, K54, K55, K56 }, \
-    { K60, K61, K62, K63, K64, K65, K66 }, \
-    { K70, K71, K72, K73, K74, K75, K76 }, \
-    { K80, ___, K82, K83, K84, K85, K86 }, \
-    { ___, K91, K92, K93, K94, K95, K96 }  \
-}
-
-#define LAYOUT_split_bs( \
-      K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K46, K81, \
-      K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K56,      \
-      K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K66, K76,           \
-           K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K86, K96,      \
-           K80, K91,      K82,      K92,      K83,      K93, K84,      K94, K85, K95  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06 }, \
-    { K10, K11, K12, K13, K14, K15, K16 }, \
-    { K20, K21, K22, K23, K24, K25, K26 }, \
-    { K30, K31, K32, K33, K34, K35, K36 }, \
-    { K40, K41, K42, K43, K44, K45, K46 }, \
-    { K50, K51, K52, K53, K54, K55, K56 }, \
-    { K60, K61, K62, K63, K64, K65, K66 }, \
-    { K70, K71, K72, K73, K74, K75, K76 }, \
-    { K80, K81, K82, K83, K84, K85, K86 }, \
-    { ___, K91, K92, K93, K94, K95, K96 }  \
-}
diff --git a/keyboards/chalice/config.h b/keyboards/chalice/config.h
index a71d46d6b5..6bbd5af9bf 100644
--- a/keyboards/chalice/config.h
+++ b/keyboards/chalice/config.h
@@ -17,15 +17,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS {F4, D1, D0, F5, D4, F6, B4, B5, B2, B6}
-#define MATRIX_COL_PINS {F7, C6, B1, D2, E6, B3, D7}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-
 #ifdef RGBLIGHT_ENABLE
     #define RGBLED_NUM 14
     #define RGBLIGHT_SLEEP  
diff --git a/keyboards/chalice/info.json b/keyboards/chalice/info.json
index 35f5c5fb1e..6b447c1fe6 100644
--- a/keyboards/chalice/info.json
+++ b/keyboards/chalice/info.json
@@ -8,160 +8,183 @@
         "pid": "0x000C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "C6", "B1", "D2", "E6", "B3", "D7"],
+        "rows": ["F4", "D1", "D0", "F5", "D4", "F6", "B4", "B5", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"`~", "x":1.5, "y":0},
-                {"label":"1!", "x":2.5, "y":0},
-                {"label":"2@", "x":3.5, "y":0},
-                {"label":"3#", "x":4.5, "y":0},
-                {"label":"4$", "x":5.5, "y":0},
-                {"label":"5%", "x":6.5, "y":0},
-                {"label":"6^", "x":7.5, "y":0},
-                {"label":"7&", "x":10.5, "y":0},
-                {"label":"8*", "x":11.5, "y":0},
-                {"label":"9(", "x":12.5, "y":0},
-                {"label":"0)", "x":13.5, "y":0},
-                {"label":"-_", "x":14.5, "y":0},
-                {"label":"=+", "x":15.5, "y":0},
-                {"label":"Backspace", "x":16.5, "y":0, "w":2},
-
-                {"label":"Insert", "x":0, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":10, "y":1},
-                {"label":"U", "x":11, "y":1},
-                {"label":"I", "x":12, "y":1},
-                {"label":"O", "x":13, "y":1},
-                {"label":"P", "x":14, "y":1},
-                {"label":"[{", "x":15, "y":1},
-                {"label":"]}", "x":16, "y":1},
-                {"label":"\\|", "x":17, "y":1, "w":1.5},
-
-                {"label":"Delete", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
-                {"label":"A", "x":3.25, "y":2},
-                {"label":"S", "x":4.25, "y":2},
-                {"label":"D", "x":5.25, "y":2},
-                {"label":"F", "x":6.25, "y":2},
-                {"label":"G", "x":7.25, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":";:", "x":14.25, "y":2},
-                {"label":"'\"", "x":15.25, "y":2},
-                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3},
-                {"label":"X", "x":4.75, "y":3},
-                {"label":"C", "x":5.75, "y":3},
-                {"label":"V", "x":6.75, "y":3},
-                {"label":"B", "x":7.75, "y":3},
-                {"label":"B", "x":9.75, "y":3},
-                {"label":"N", "x":10.75, "y":3},
-                {"label":"M", "x":11.75, "y":3},
-                {"label":",<", "x":12.75, "y":3},
-                {"label":".>", "x":13.75, "y":3},
-                {"label":"/?", "x":14.75, "y":3},
-                {"label":"Shift", "x":15.75, "y":3, "w":1.75},
-                {"label":"Up", "x":17.5, "y":3},
-
-                {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
-                {"label":"Alt", "x":4.5, "y":4, "w":1.5},
-                {"label":"Space", "x":6, "y":4, "w":2.25},
-                {"label":"Fn", "x":8.25, "y":4},
-                {"label":"Space", "x":9.75, "y":4, "w":2.75},
-                {"label":"Alt", "x":12.5, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":15, "y":4, "w":1.5},
-                {"label":"Left", "x":16.5, "y":4},
-                {"label":"Down", "x":17.5, "y":4},
-                {"label":"Right", "x":18.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [1, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 10.5, "y": 0},
+                {"matrix": [1, 4], "x": 11.5, "y": 0},
+                {"matrix": [0, 5], "x": 12.5, "y": 0},
+                {"matrix": [1, 5], "x": 13.5, "y": 0},
+                {"matrix": [0, 6], "x": 14.5, "y": 0},
+                {"matrix": [1, 6], "x": 15.5, "y": 0},
+                {"matrix": [4, 6], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 1},
+                {"matrix": [3, 1], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [3, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+
+                {"matrix": [3, 3], "x": 10, "y": 1},
+                {"matrix": [2, 4], "x": 11, "y": 1},
+                {"matrix": [3, 4], "x": 12, "y": 1},
+                {"matrix": [2, 5], "x": 13, "y": 1},
+                {"matrix": [3, 5], "x": 14, "y": 1},
+                {"matrix": [2, 6], "x": 15, "y": 1},
+                {"matrix": [3, 6], "x": 16, "y": 1},
+                {"matrix": [5, 6], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 3.25, "y": 2},
+                {"matrix": [5, 1], "x": 4.25, "y": 2},
+                {"matrix": [4, 2], "x": 5.25, "y": 2},
+                {"matrix": [5, 2], "x": 6.25, "y": 2},
+                {"matrix": [4, 3], "x": 7.25, "y": 2},
+                {"matrix": [5, 3], "x": 10.25, "y": 2},
+                {"matrix": [4, 4], "x": 11.25, "y": 2},
+                {"matrix": [5, 4], "x": 12.25, "y": 2},
+                {"matrix": [4, 5], "x": 13.25, "y": 2},
+                {"matrix": [5, 5], "x": 14.25, "y": 2},
+                {"matrix": [6, 6], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 3.75, "y": 3},
+                {"matrix": [6, 1], "x": 4.75, "y": 3},
+                {"matrix": [7, 1], "x": 5.75, "y": 3},
+                {"matrix": [6, 2], "x": 6.75, "y": 3},
+                {"matrix": [7, 2], "x": 7.75, "y": 3},
+
+                {"matrix": [6, 3], "x": 9.75, "y": 3},
+                {"matrix": [7, 3], "x": 10.75, "y": 3},
+                {"matrix": [6, 4], "x": 11.75, "y": 3},
+                {"matrix": [7, 4], "x": 12.75, "y": 3},
+                {"matrix": [6, 5], "x": 13.75, "y": 3},
+                {"matrix": [7, 5], "x": 14.75, "y": 3},
+                {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [9, 6], "x": 17.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 2], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [9, 2], "x": 8.25, "y": 4},
+
+                {"matrix": [8, 3], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 15, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 16.5, "y": 4},
+                {"matrix": [8, 5], "x": 17.5, "y": 4},
+                {"matrix": [9, 5], "x": 18.5, "y": 4}
             ]
         },
         "LAYOUT_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"`~", "x":1.5, "y":0},
-                {"label":"1!", "x":2.5, "y":0},
-                {"label":"2@", "x":3.5, "y":0},
-                {"label":"3#", "x":4.5, "y":0},
-                {"label":"4$", "x":5.5, "y":0},
-                {"label":"5%", "x":6.5, "y":0},
-                {"label":"6^", "x":7.5, "y":0},
-                {"label":"7&", "x":10.5, "y":0},
-                {"label":"8*", "x":11.5, "y":0},
-                {"label":"9(", "x":12.5, "y":0},
-                {"label":"0)", "x":13.5, "y":0},
-                {"label":"-_", "x":14.5, "y":0},
-                {"label":"=+", "x":15.5, "y":0},
-                {"label":"Backspace", "x":16.5, "y":0},
-                {"label":"Backspace", "x":17.5, "y":0},
-
-                {"label":"Insert", "x":0, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":10, "y":1},
-                {"label":"U", "x":11, "y":1},
-                {"label":"I", "x":12, "y":1},
-                {"label":"O", "x":13, "y":1},
-                {"label":"P", "x":14, "y":1},
-                {"label":"[{", "x":15, "y":1},
-                {"label":"]}", "x":16, "y":1},
-                {"label":"\\|", "x":17, "y":1, "w":1.5},
-
-                {"label":"Delete", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
-                {"label":"A", "x":3.25, "y":2},
-                {"label":"S", "x":4.25, "y":2},
-                {"label":"D", "x":5.25, "y":2},
-                {"label":"F", "x":6.25, "y":2},
-                {"label":"G", "x":7.25, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":";:", "x":14.25, "y":2},
-                {"label":"'\"", "x":15.25, "y":2},
-                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3},
-                {"label":"X", "x":4.75, "y":3},
-                {"label":"C", "x":5.75, "y":3},
-                {"label":"V", "x":6.75, "y":3},
-                {"label":"B", "x":7.75, "y":3},
-                {"label":"B", "x":9.75, "y":3},
-                {"label":"N", "x":10.75, "y":3},
-                {"label":"M", "x":11.75, "y":3},
-                {"label":",<", "x":12.75, "y":3},
-                {"label":".>", "x":13.75, "y":3},
-                {"label":"/?", "x":14.75, "y":3},
-                {"label":"Shift", "x":15.75, "y":3, "w":1.75},
-                {"label":"Up", "x":17.5, "y":3},
-
-                {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
-                {"label":"Alt", "x":4.5, "y":4, "w":1.5},
-                {"label":"Space", "x":6, "y":4, "w":2.25},
-                {"label":"Fn", "x":8.25, "y":4},
-                {"label":"Space", "x":9.75, "y":4, "w":2.75},
-                {"label":"Alt", "x":12.5, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":15, "y":4, "w":1.5},
-                {"label":"Left", "x":16.5, "y":4},
-                {"label":"Down", "x":17.5, "y":4},
-                {"label":"Right", "x":18.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [1, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 10.5, "y": 0},
+                {"matrix": [1, 4], "x": 11.5, "y": 0},
+                {"matrix": [0, 5], "x": 12.5, "y": 0},
+                {"matrix": [1, 5], "x": 13.5, "y": 0},
+                {"matrix": [0, 6], "x": 14.5, "y": 0},
+                {"matrix": [1, 6], "x": 15.5, "y": 0},
+                {"matrix": [4, 6], "x": 16.5, "y": 0},
+                {"matrix": [8, 1], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 1},
+                {"matrix": [3, 1], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [3, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+
+                {"matrix": [3, 3], "x": 10, "y": 1},
+                {"matrix": [2, 4], "x": 11, "y": 1},
+                {"matrix": [3, 4], "x": 12, "y": 1},
+                {"matrix": [2, 5], "x": 13, "y": 1},
+                {"matrix": [3, 5], "x": 14, "y": 1},
+                {"matrix": [2, 6], "x": 15, "y": 1},
+                {"matrix": [3, 6], "x": 16, "y": 1},
+                {"matrix": [5, 6], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 3.25, "y": 2},
+                {"matrix": [5, 1], "x": 4.25, "y": 2},
+                {"matrix": [4, 2], "x": 5.25, "y": 2},
+                {"matrix": [5, 2], "x": 6.25, "y": 2},
+                {"matrix": [4, 3], "x": 7.25, "y": 2},
+
+                {"matrix": [5, 3], "x": 10.25, "y": 2},
+                {"matrix": [4, 4], "x": 11.25, "y": 2},
+                {"matrix": [5, 4], "x": 12.25, "y": 2},
+                {"matrix": [4, 5], "x": 13.25, "y": 2},
+                {"matrix": [5, 5], "x": 14.25, "y": 2},
+                {"matrix": [6, 6], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 3.75, "y": 3},
+                {"matrix": [6, 1], "x": 4.75, "y": 3},
+                {"matrix": [7, 1], "x": 5.75, "y": 3},
+                {"matrix": [6, 2], "x": 6.75, "y": 3},
+                {"matrix": [7, 2], "x": 7.75, "y": 3},
+
+                {"matrix": [6, 3], "x": 9.75, "y": 3},
+                {"matrix": [7, 3], "x": 10.75, "y": 3},
+                {"matrix": [6, 4], "x": 11.75, "y": 3},
+                {"matrix": [7, 4], "x": 12.75, "y": 3},
+                {"matrix": [6, 5], "x": 13.75, "y": 3},
+                {"matrix": [7, 5], "x": 14.75, "y": 3},
+                {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [9, 6], "x": 17.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 2], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [9, 2], "x": 8.25, "y": 4},
+
+                {"matrix": [8, 3], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 15, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 16.5, "y": 4},
+                {"matrix": [8, 5], "x": 17.5, "y": 4},
+                {"matrix": [9, 5], "x": 18.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/chaos65/chaos65.c b/keyboards/chaos65/chaos65.c
deleted file mode 100644
index 4a56f8a2ae..0000000000
--- a/keyboards/chaos65/chaos65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "chaos65.h"
diff --git a/keyboards/chaos65/chaos65.h b/keyboards/chaos65/chaos65.h
deleted file mode 100644
index 28d4916b7f..0000000000
--- a/keyboards/chaos65/chaos65.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright 2022 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │48 │0E │    │0D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�2C  │ ISO Enter
- *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │2D │   │1D │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- *              │40  │41  │42  │46                      │4A  │4B  │ │4C │4D │4E │
- *              └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬─┬───┬───┬───�
- *              │40   │41 │42   │46                         │4A   │ │4C │4D │4E │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k48, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,    k2C,        k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, k3E, \
-    k40, k41, k42,                k46,                k4A, k4B,      k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, k48, ___, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,    k2C,   k2D, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,    k2C,   k2D, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,                k46,                     k4A, k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, ___, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2C, k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2C, k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,                k46,                     k4A, k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, ___, k4C, k4D, k4E }  \
-}
diff --git a/keyboards/chaos65/config.h b/keyboards/chaos65/config.h
index 713238dfa6..caf3e9d4e4 100644
--- a/keyboards/chaos65/config.h
+++ b/keyboards/chaos65/config.h
@@ -16,13 +16,5 @@
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* NKRO */
 #define FORCE_NKRO
diff --git a/keyboards/chaos65/info.json b/keyboards/chaos65/info.json
index 3243967c03..7b7e6d91f8 100644
--- a/keyboards/chaos65/info.json
+++ b/keyboards/chaos65/info.json
@@ -8,385 +8,390 @@
         "pid": "0x1688",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_tsangan", "65_iso_blocker"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [4, 8], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 13], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 13], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/charue/charon/charon.c b/keyboards/charue/charon/charon.c
deleted file mode 100644
index 2c4a518a31..0000000000
--- a/keyboards/charue/charon/charon.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Charue Design
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "charon.h"
diff --git a/keyboards/charue/charon/config.h b/keyboards/charue/charon/config.h
deleted file mode 100644
index 1140991c95..0000000000
--- a/keyboards/charue/charon/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Charue Design
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, C7 }
-#define MATRIX_COL_PINS { D3, D5, B4, D7, D6, D4, F7, F6, F5, F4, F1, F0, B5, B6, C6 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/charue/charon/info.json b/keyboards/charue/charon/info.json
index 406b845492..a4a8504fc8 100644
--- a/keyboards/charue/charon/info.json
+++ b/keyboards/charue/charon/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4348",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "B4", "D7", "D6", "D4", "F7", "F6", "F5", "F4", "F1", "F0", "B5", "B6", "C6"],
+        "rows": ["B0", "B1", "B2", "B3", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "E6"
     },
diff --git a/keyboards/charue/sunsetter/config.h b/keyboards/charue/sunsetter/config.h
deleted file mode 100644
index 1219eac27c..0000000000
--- a/keyboards/charue/sunsetter/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2020 Michael Pio "Coarse" Mayol  <mfmayol@up.edu.ph>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MATRIX_COL_PINS { B13, B12, B1, B0, A7, A6, A5, A4, A3, B9, B8, B7, B6, B5, B4, F0, B3, A15 }
-#define MATRIX_ROW_PINS { A8, B14, B11, B10, B2 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/charue/sunsetter/info.json b/keyboards/charue/sunsetter/info.json
index 651561f47d..b499907a85 100644
--- a/keyboards/charue/sunsetter/info.json
+++ b/keyboards/charue/sunsetter/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5353",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B13", "B12", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "F0", "B3", "A15"],
+        "rows": ["A8", "B14", "B11", "B10", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F1",
         "on_state": 0
diff --git a/keyboards/charue/sunsetter/sunsetter.c b/keyboards/charue/sunsetter/sunsetter.c
deleted file mode 100644
index 4d1cdf4e80..0000000000
--- a/keyboards/charue/sunsetter/sunsetter.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Michael Pio "Coarse" Mayol  <mfmayol@up.edu.ph>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "sunsetter.h"
diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h
index b3a3ab3f9b..4ef27597b3 100644
--- a/keyboards/charue/sunsetter_r2/config.h
+++ b/keyboards/charue/sunsetter_r2/config.h
@@ -3,17 +3,7 @@
 
 #pragma once
 
-
-/* Keyboard Matrix Assignment s*/
-#define MATRIX_ROW_PINS { B3, B2, F4, F5, F6 }
-#define MATRIX_COL_PINS { F0, F1, F7, B1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB */
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 10
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -25,7 +15,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json
index fcd9d0b3fe..8b7ea90cf0 100644
--- a/keyboards/charue/sunsetter_r2/info.json
+++ b/keyboards/charue/sunsetter_r2/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5335",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F7", "B1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["B3", "B2", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0"
     },
diff --git a/keyboards/charue/sunsetter_r2/sunsetter_r2.c b/keyboards/charue/sunsetter_r2/sunsetter_r2.c
deleted file mode 100644
index 86b75fdd18..0000000000
--- a/keyboards/charue/sunsetter_r2/sunsetter_r2.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Charue Design
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "sunsetter_r2.h"
diff --git a/keyboards/chavdai40/rev1/config.h b/keyboards/chavdai40/rev1/config.h
index 9918802434..277219f16d 100644
--- a/keyboards/chavdai40/rev1/config.h
+++ b/keyboards/chavdai40/rev1/config.h
@@ -22,9 +22,3 @@
 
 /* usb power settings */
 #define USB_MAX_POWER_CONSUMPTION 100
-
-#define MATRIX_ROW_PINS { A0, A15, B5, B6 }
-#define MATRIX_COL_PINS { B8, B4, B3, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/chavdai40/rev1/info.json b/keyboards/chavdai40/rev1/info.json
index 9f345a3ae7..0e518b6de0 100644
--- a/keyboards/chavdai40/rev1/info.json
+++ b/keyboards/chavdai40/rev1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B8", "B4", "B3", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"],
+        "rows": ["A0", "A15", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F042",
     "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/chavdai40/rev1/rev1.c b/keyboards/chavdai40/rev1/rev1.c
deleted file mode 100644
index 116c301c2b..0000000000
--- a/keyboards/chavdai40/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 t-miyajima
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/chavdai40/rev2/config.h b/keyboards/chavdai40/rev2/config.h
index c6f7884275..277219f16d 100644
--- a/keyboards/chavdai40/rev2/config.h
+++ b/keyboards/chavdai40/rev2/config.h
@@ -22,9 +22,3 @@
 
 /* usb power settings */
 #define USB_MAX_POWER_CONSUMPTION 100
-
-#define MATRIX_ROW_PINS { A0, A15, B5, B6 }
-#define MATRIX_COL_PINS { B7, B4, B3, A8, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/chavdai40/rev2/info.json b/keyboards/chavdai40/rev2/info.json
index 5ffacfd303..3216cb565d 100644
--- a/keyboards/chavdai40/rev2/info.json
+++ b/keyboards/chavdai40/rev2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B4", "B3", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"],
+        "rows": ["A0", "A15", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F042",
     "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/chavdai40/rev2/rev2.c b/keyboards/chavdai40/rev2/rev2.c
deleted file mode 100644
index 6bd488c299..0000000000
--- a/keyboards/chavdai40/rev2/rev2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 t-miyajima
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev2.h"
diff --git a/keyboards/checkerboards/axon40/axon40.c b/keyboards/checkerboards/axon40/axon40.c
deleted file mode 100644
index a18e99cfab..0000000000
--- a/keyboards/checkerboards/axon40/axon40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Nathan Spears
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "axon40.h"
diff --git a/keyboards/checkerboards/axon40/config.h b/keyboards/checkerboards/axon40/config.h
index aca5940c63..530fa06413 100644
--- a/keyboards/checkerboards/axon40/config.h
+++ b/keyboards/checkerboards/axon40/config.h
@@ -16,22 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D2, D3, D1, D5 }
-#define MATRIX_COL_PINS { C7, B7, D4, D6, F0, F1, C6, B6, B5, B4, E6, B0 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/checkerboards/axon40/info.json b/keyboards/checkerboards/axon40/info.json
index d3c6c1cb70..b687df03fe 100644
--- a/keyboards/checkerboards/axon40/info.json
+++ b/keyboards/checkerboards/axon40/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1119",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "B7", "D4", "D6", "F0", "F1", "C6", "B6", "B5", "B4", "E6", "B0"],
+        "rows": ["D2", "D3", "D1", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/checkerboards/candybar_ortho/candybar_ortho.c b/keyboards/checkerboards/candybar_ortho/candybar_ortho.c
deleted file mode 100644
index 8f127cd36e..0000000000
--- a/keyboards/checkerboards/candybar_ortho/candybar_ortho.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Nathan Spears
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "candybar_ortho.h"
diff --git a/keyboards/checkerboards/candybar_ortho/config.h b/keyboards/checkerboards/candybar_ortho/config.h
index 966e9c79a5..0033db5d2b 100644
--- a/keyboards/checkerboards/candybar_ortho/config.h
+++ b/keyboards/checkerboards/candybar_ortho/config.h
@@ -16,22 +16,12 @@
 
  #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B4, D4, D7, D6, B5, B6, C7, C6 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D0, D1, D2 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/checkerboards/candybar_ortho/info.json b/keyboards/checkerboards/candybar_ortho/info.json
index a254f9ef6e..036ea9e49b 100644
--- a/keyboards/checkerboards/candybar_ortho/info.json
+++ b/keyboards/checkerboards/candybar_ortho/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3215",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D0", "D1", "D2"],
+        "rows": ["B4", "D4", "D7", "D6", "B5", "B6", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/checkerboards/g_idb60/config.h b/keyboards/checkerboards/g_idb60/config.h
index 78a8f5ed63..9b8adff3ec 100644
--- a/keyboards/checkerboards/g_idb60/config.h
+++ b/keyboards/checkerboards/g_idb60/config.h
@@ -17,14 +17,6 @@ Copyright 2021 Nathan Spears
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D6, D7, B4, B5, F7 }
-#define MATRIX_COL_PINS { B6, C6, C7, D4, F6, F0, B0, F1, F4, F5, D1, D0, D3, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/checkerboards/g_idb60/g_idb60.c b/keyboards/checkerboards/g_idb60/g_idb60.c
deleted file mode 100644
index d09f2dbb20..0000000000
--- a/keyboards/checkerboards/g_idb60/g_idb60.c
+++ /dev/null
@@ -1,18 +0,0 @@
- /*
- Copyright 2021 Nathan Spears
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "g_idb60.h"
diff --git a/keyboards/checkerboards/g_idb60/info.json b/keyboards/checkerboards/g_idb60/info.json
index ff4cc80b5e..3e3b1aaa0b 100644
--- a/keyboards/checkerboards/g_idb60/info.json
+++ b/keyboards/checkerboards/g_idb60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3508",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "D4", "F6", "F0", "B0", "F1", "F4", "F5", "D1", "D0", "D3", "D5"],
+        "rows": ["D6", "D7", "B4", "B5", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/checkerboards/nop60/config.h b/keyboards/checkerboards/nop60/config.h
index adf72e2f65..3c52543d25 100644
--- a/keyboards/checkerboards/nop60/config.h
+++ b/keyboards/checkerboards/nop60/config.h
@@ -17,18 +17,9 @@ Copyright 2021 Nathan Spears
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F1, E6, B7, C6 }
-#define MATRIX_COL_PINS { F6, F5, F4, D0, D7, D3, D4, D5, D6, F7, C7, B4, B6, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 
 // ws2812 options
-#define RGB_DI_PIN D2 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/checkerboards/nop60/info.json b/keyboards/checkerboards/nop60/info.json
index 96467b7702..5ebda17059 100644
--- a/keyboards/checkerboards/nop60/info.json
+++ b/keyboards/checkerboards/nop60/info.json
@@ -8,11 +8,19 @@
         "pid": "0x1416",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "D0", "D7", "D3", "D4", "D5", "D6", "F7", "C7", "B4", "B6", "B5"],
+        "rows": ["F0", "F1", "E6", "B7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D1",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/checkerboards/nop60/nop60.c b/keyboards/checkerboards/nop60/nop60.c
deleted file mode 100644
index b8a67e87df..0000000000
--- a/keyboards/checkerboards/nop60/nop60.c
+++ /dev/null
@@ -1,18 +0,0 @@
- /*
- Copyright 2021 Nathan Spears
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "nop60.h"
diff --git a/keyboards/checkerboards/phoenix45_ortho/config.h b/keyboards/checkerboards/phoenix45_ortho/config.h
index 8c11a3ccf7..21d76ea1ac 100644
--- a/keyboards/checkerboards/phoenix45_ortho/config.h
+++ b/keyboards/checkerboards/phoenix45_ortho/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D2, D1, D0, C4 }
-#define MATRIX_COL_PINS { D3, C2, C5, B0, D6, D5, D4, B4, B5, B6, B7, C7, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/info.json
index 23f6b024fa..1e77fae0e8 100644
--- a/keyboards/checkerboards/phoenix45_ortho/info.json
+++ b/keyboards/checkerboards/phoenix45_ortho/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1849",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "C2", "C5", "B0", "D6", "D5", "D4", "B4", "B5", "B6", "B7", "C7", "C6"],
+        "rows": ["D2", "D1", "D0", "C4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B2"}
@@ -17,13 +22,166 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_2x225u": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"x":11, "y":1}, {"label":"'", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"x":11, "y":2}, {"label":"Return", "x":12, "y":2}, {"label":"Hyper", "x":0, "y":3, "w":1.25}, {"label":"Super", "x":1.25, "y":3}, {"label":"Meta", "x":2.25, "y":3, "w":1.5}, {"x":3.75, "y":3, "w":2.25}, {"label":"Fn", "x":6, "y":3}, {"x":7, "y":3, "w":2.25}, {"label":"Meta", "x":9.25, "y":3, "w":1.5}, {"label":"Super", "x":10.75, "y":3}, {"label":"Hyper", "x":11.75, "y":3, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 8], "x": 7, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
+            ]
         },
         "LAYOUT_ortho_2x3u": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"x":11, "y":1}, {"label":"'", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"x":11, "y":2}, {"label":"Return", "x":12, "y":2}, {"label":"Hyper", "x":0, "y":3, "w":1.25}, {"label":"Super", "x":1.25, "y":3}, {"label":"Meta", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":3}, {"x":6.5, "y":3, "w":3}, {"label":"Meta", "x":9.5, "y":3, "w":1.25}, {"label":"Super", "x":10.75, "y":3}, {"label":"Hyper", "x":11.75, "y":3, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 3},
+                {"matrix": [3, 8], "x": 6.5, "y": 3, "w": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
+            ]
         },
-"LAYOUT_ortho_6u": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"x":11, "y":0}, {"label":"Back Space", "x":12, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"x":11, "y":1}, {"label":"'", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"x":11, "y":2}, {"label":"Return", "x":12, "y":2}, {"label":"Hyper", "x":0, "y":3, "w":1.25}, {"label":"Super", "x":1.25, "y":3}, {"label":"Meta", "x":2.25, "y":3, "w":1.25}, {"label":"", "x":3.5, "y":3, "w":6}, {"label":"Meta", "x":9.5, "y":3, "w":1.25}, {"label":"Super", "x":10.75, "y":3}, {"label":"Hyper", "x":11.75, "y":3, "w":1.25}]
+        "LAYOUT_ortho_6u": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6},
+                {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.c b/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.c
deleted file mode 100644
index 89ce3f5ce9..0000000000
--- a/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "phoenix45_ortho.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLD, 10);
-        } else {
-            tap_code_delay(KC_VOLU, 10);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h b/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h
deleted file mode 100644
index 8abf2875a9..0000000000
--- a/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-
-#define LAYOUT_ortho_2x225u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
-    k30, k31, k32,      k34,      k36,      k38, k39,      k3B, k3C  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
-    { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, k39, XXX, k3B, k3C }  \
-}
-
-#define LAYOUT_ortho_2x3u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
-    k30, k31, k32,      k34,                k38, k39,      k3B, k3C  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
-    { k30, k31, k32, XXX, k34, XXX, XXX, XXX, k38, k39, XXX, k3B, k3C }  \
-}
-
-#define LAYOUT_ortho_6u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, kOC, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
-    k30, k31, k32,                k36,           k39,      k3B, k3C  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, kOC }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k2C }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k3C }, \
-    { k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, k39, XXX, k3B, k3C }  \
-}
diff --git a/keyboards/checkerboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h
index 0d8e9404e2..50aa698524 100644
--- a/keyboards/checkerboards/plexus75/config.h
+++ b/keyboards/checkerboards/plexus75/config.h
@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D2, B3, B1, F1, F0 }
-#define MATRIX_COL_PINS { B2, B0, D1, F7, F6, F5, F4, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -45,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 // ws2812 options
-#define RGB_DI_PIN D3 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/checkerboards/plexus75/info.json b/keyboards/checkerboards/plexus75/info.json
index 87d2e74deb..c9e04c36b4 100644
--- a/keyboards/checkerboards/plexus75/info.json
+++ b/keyboards/checkerboards/plexus75/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5338",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B0", "D1", "F7", "F6", "F5", "F4", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["D2", "B3", "B1", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/checkerboards/plexus75_he/config.h b/keyboards/checkerboards/plexus75_he/config.h
index f8ccc0e356..bfa5878383 100644
--- a/keyboards/checkerboards/plexus75_he/config.h
+++ b/keyboards/checkerboards/plexus75_he/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C2, D0, D1, D2, D6, B0, B3, B2, C6, B1 }
-#define MATRIX_COL_PINS { C4, C5, D3, C7, B7, B6, B5, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -31,7 +23,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 // ws2812 options
-#define RGB_DI_PIN D4 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/checkerboards/plexus75_he/info.json b/keyboards/checkerboards/plexus75_he/info.json
index dbac1f2f6a..071b47c797 100644
--- a/keyboards/checkerboards/plexus75_he/info.json
+++ b/keyboards/checkerboards/plexus75_he/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5339",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "D3", "C7", "B7", "B6", "B5", "B4"],
+        "rows": ["C2", "D0", "D1", "D2", "D6", "B0", "B3", "B2", "C6", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/checkerboards/plexus75_he/plexus75_he.c b/keyboards/checkerboards/plexus75_he/plexus75_he.c
deleted file mode 100644
index 1c7dad7ab7..0000000000
--- a/keyboards/checkerboards/plexus75_he/plexus75_he.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "plexus75_he.h"
diff --git a/keyboards/checkerboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h
index cec9db65e9..6fe6785edb 100644
--- a/keyboards/checkerboards/pursuit40/config.h
+++ b/keyboards/checkerboards/pursuit40/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D2, D1, F4, F5 }
-#define MATRIX_COL_PINS { F1, E6, B7, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -47,7 +39,6 @@
 //#define NO_ACTION_ONESHOT
 
 // ws2812 options
-#define RGB_DI_PIN F0 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/checkerboards/pursuit40/info.json b/keyboards/checkerboards/pursuit40/info.json
index f9915cdf19..d7f66ea8e6 100644
--- a/keyboards/checkerboards/pursuit40/info.json
+++ b/keyboards/checkerboards/pursuit40/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1620",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "E6", "B7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["D2", "D1", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/checkerboards/pursuit40/pursuit40.c b/keyboards/checkerboards/pursuit40/pursuit40.c
deleted file mode 100644
index 4fed33c34a..0000000000
--- a/keyboards/checkerboards/pursuit40/pursuit40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pursuit40.h"
diff --git a/keyboards/checkerboards/quark/config.h b/keyboards/checkerboards/quark/config.h
index 42ccb06300..efa8f93d3e 100644
--- a/keyboards/checkerboards/quark/config.h
+++ b/keyboards/checkerboards/quark/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C5, C4, C6, C7, B7 }
-#define MATRIX_COL_PINS { B4, B5, B6, B3, C2, B2, D6, D2, D3, D4, D5, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -31,7 +23,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 // ws2812 options
-#define RGB_DI_PIN D0 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json
index 0f7f3b0f44..262cd6e60c 100644
--- a/keyboards/checkerboards/quark/info.json
+++ b/keyboards/checkerboards/quark/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5340",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B3", "C2", "B2", "D6", "D2", "D3", "D4", "D5", "B1"],
+        "rows": ["C5", "C4", "C6", "C7", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "D1"}
@@ -19,376 +27,400 @@
     "layouts": {
         "LAYOUT_ortho_5x12_2x225u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6, "y": 4, "w": 2.25},
-                {"x": 8.25, "y": 4, "w": 1.25},
-                {"x": 9.5, "y": 4, "w": 1.25},
-                {"x": 10.75, "y": 4, "w": 1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "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, 7], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_ortho_5x12_2x3u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4, "w": 1.5},
-                {"x": 3, "y": 4, "w": 3},
-                {"x": 6, "y": 4, "w": 3},
-                {"x": 9, "y": 4, "w": 1.5},
-                {"x": 10.5, "y": 4, "w": 1.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 3, "y": 4, "w": 3},
+                {"matrix": [4, 7], "x": 6, "y": 4, "w": 3},
+                {"matrix": [4, 10], "x": 9, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 10.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_ortho_5x12_7u": {
             "layout": [
-              {"x":0, "y":0},
-              {"x":1, "y":0},
-              {"x":2, "y":0},
-              {"x":3, "y":0},
-              {"x":4, "y":0},
-              {"x":5, "y":0},
-              {"x":6, "y":0},
-              {"x":7, "y":0},
-              {"x":8, "y":0},
-              {"x":9, "y":0},
-              {"x":10, "y":0},
-              {"x":11, "y":0},
-              {"x":0, "y":1},
-              {"x":1, "y":1},
-              {"x":2, "y":1},
-              {"x":3, "y":1},
-              {"x":4, "y":1},
-              {"x":5, "y":1},
-              {"x":6, "y":1},
-              {"x":7, "y":1},
-              {"x":8, "y":1},
-              {"x":9, "y":1},
-              {"x":10, "y":1},
-              {"x":11, "y":1},
-              {"x":0, "y":2},
-              {"x":1, "y":2},
-              {"x":2, "y":2},
-              {"x":3, "y":2},
-              {"x":4, "y":2},
-              {"x":5, "y":2},
-              {"x":6, "y":2},
-              {"x":7, "y":2},
-              {"x":8, "y":2},
-              {"x":9, "y":2},
-              {"x":10, "y":2},
-              {"x":11, "y":2},
-              {"x":0, "y":3},
-              {"x":1, "y":3},
-              {"x":2, "y":3},
-              {"x":3, "y":3},
-              {"x":4, "y":3},
-              {"x":5, "y":3},
-              {"x":6, "y":3},
-              {"x":7, "y":3},
-              {"x":8, "y":3},
-              {"x":9, "y":3},
-              {"x":10, "y":3},
-              {"x":11, "y":3},
-              {"x":0, "y":4, "w":1.25},
-              {"x":1.25, "y":4, "w":1.25},
-              {"x":2.5, "y":4, "w":7},
-              {"x":9.5, "y":4, "w":1.25},
-              {"x":10.75, "y":4, "w":1.25}
+              {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_planck_mit": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3, "w": 2},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12_2x225u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3, "w": 1.25},
-                {"x": 2.5, "y": 3, "w": 1.25},
-                {"x": 3.75, "y": 3, "w": 2.25},
-                {"x": 6, "y": 3, "w": 2.25},
-                {"x": 8.25, "y": 3, "w": 1.25},
-                {"x": 9.5, "y": 3, "w": 1.25},
-                {"x": 10.75, "y": 3, "w": 1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_ortho_4x12_2x3u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3, "w": 3},
-                {"x": 6, "y": 3, "w": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 4], "x": 3, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/checkerboards/quark/quark.c b/keyboards/checkerboards/quark/quark.c
deleted file mode 100644
index 736b955424..0000000000
--- a/keyboards/checkerboards/quark/quark.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quark.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLD, 10);
-        } else {
-            tap_code_delay(KC_VOLU, 10);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/checkerboards/quark/quark.h b/keyboards/checkerboards/quark/quark.h
deleted file mode 100644
index be2cc3f932..0000000000
--- a/keyboards/checkerboards/quark/quark.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright 2020 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_ortho_5x12_2x225u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
-    k40, k41,      k43, k44,           k47, k48,      k4A, k4B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { k40, k41, XXX, k43, k44, XXX, XXX, k47, k48, XXX, k4A, k4B } \
-}
-
-#define LAYOUT_ortho_5x12_2x3u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
-    k40, k41,           k44,           k47,           k4A, k4B  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { k40, k41, XXX, XXX, k44, XXX, XXX, k47, XXX, XXX, k4A, k4B } \
-}
-
-#define LAYOUT_ortho_5x12_7u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
-    k40, k41,           k44,                          k4A, k4B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { k40, k41, XXX, XXX, k44, XXX, XXX, XXX, XXX, XXX, k4A, k4B } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_planck_mit( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34,    k35,   k36, k37, k38, k39, k3A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, XXX, k36, k37, k38, k39, k3A }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_ortho_4x12_2x225u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31,      k33, k34,           k37, k38,      k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, XXX, k33, k34, XXX, XXX, k37, k38, XXX, k3A, k3B }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_ortho_4x12_2x3u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32,      k34,           k37,      k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, XXX, k34, XXX, XXX, k37, XXX, k39, k3A, k3B }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/checkerboards/quark_lp/config.h b/keyboards/checkerboards/quark_lp/config.h
index 89fc05ed71..75345075e7 100644
--- a/keyboards/checkerboards/quark_lp/config.h
+++ b/keyboards/checkerboards/quark_lp/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C5, C4, C6, C7 }
-#define MATRIX_COL_PINS { B6, B5, B4, B3, B0, D6, D5, D4, D3, D2, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -31,8 +24,6 @@
 
 #define TAPPING_TOGGLE 2
 
-#define RGB_DI_PIN C2 // pin the DI on the ws2812 is hooked-up to
-
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_LED_COUNT 51
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/info.json
index 6cd764fa80..264bddad12 100644
--- a/keyboards/checkerboards/quark_lp/info.json
+++ b/keyboards/checkerboards/quark_lp/info.json
@@ -8,17 +8,181 @@
         "pid": "0x5354",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "B4", "B3", "B0", "D6", "D5", "D4", "D3", "D2", "D1", "D0"],
+        "rows": ["C5", "C4", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_4x12": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"&uArr;", "x":7, "y":3}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}, {"label":"&rarr;", "x":11, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
         },
         "LAYOUT_ortho_4x12_1x2uC": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"&uArr;", "x":7, "y":3}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}, {"label":"&rarr;", "x":11, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
         },
         "LAYOUT_ortho_4x12_2x2u": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":6, "y":3, "w":2}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}, {"label":"&rarr;", "x":11, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/checkerboards/quark_lp/quark_lp.c b/keyboards/checkerboards/quark_lp/quark_lp.c
index a46110e8b9..89c685f2b5 100644
--- a/keyboards/checkerboards/quark_lp/quark_lp.c
+++ b/keyboards/checkerboards/quark_lp/quark_lp.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quark_lp.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/checkerboards/quark_lp/quark_lp.h b/keyboards/checkerboards/quark_lp/quark_lp.h
deleted file mode 100644
index a7bb3fda8b..0000000000
--- a/keyboards/checkerboards/quark_lp/quark_lp.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }  \
-}
-
-#define LAYOUT_ortho_4x12_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35,      k37, k38, k39, k3A, k3B  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, XXX, k37, k38, k39, k3A, k3B }  \
-}
-
-#define LAYOUT_ortho_4x12_2x2u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34,      k36,      k38, k39, k3A, k3B  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, XXX, k36, XXX, k38, k39, k3A, k3B }  \
-}
diff --git a/keyboards/checkerboards/quark_lp/rules.mk b/keyboards/checkerboards/quark_lp/rules.mk
index b1d915ebb5..f868af936d 100644
--- a/keyboards/checkerboards/quark_lp/rules.mk
+++ b/keyboards/checkerboards/quark_lp/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h
index 69781c0fa2..4136faaa7a 100644
--- a/keyboards/checkerboards/quark_plus/config.h
+++ b/keyboards/checkerboards/quark_plus/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B4, B1, C2, D0, D6, B0, B6, B5 }
-#define MATRIX_COL_PINS { C6, D1, D5, D4, D3, D2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -31,7 +23,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 // ws2812 options
-#define RGB_DI_PIN C5 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/info.json
index 49ab42adcb..8f68d8c0c6 100644
--- a/keyboards/checkerboards/quark_plus/info.json
+++ b/keyboards/checkerboards/quark_plus/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5344",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "C5"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D1", "D5", "D4", "D3", "D2"],
+        "rows": ["B4", "B1", "C2", "D0", "D6", "B0", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "C7", "pin_b": "B7"},
diff --git a/keyboards/checkerboards/quark_plus/quark_plus.h b/keyboards/checkerboards/quark_plus/quark_plus.h
index 4152acbe50..ca98b3957e 100644
--- a/keyboards/checkerboards/quark_plus/quark_plus.h
+++ b/keyboards/checkerboards/quark_plus/quark_plus.h
@@ -47,7 +47,7 @@
     { k30, k31, k32, k33, k34, k35 }, \
     { k40, k41, k42, k43, k44, k45 }, \
     { k50, k51, k52, k53, k54, k55 }, \
-    { k60, k61, k62, XXX, k64, k65 }, \
+    { k60, k61, k62, k63, k64, k65 }, \
     { k70, k71, XXX, k73, k74, k75 } \
 }
 #define LAYOUT_2x225u( \
diff --git a/keyboards/checkerboards/quark_squared/config.h b/keyboards/checkerboards/quark_squared/config.h
index 85bed28b45..514ce68f3f 100644
--- a/keyboards/checkerboards/quark_squared/config.h
+++ b/keyboards/checkerboards/quark_squared/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C5, C4, C6, C7, B7 }
-#define MATRIX_COL_PINS { B4, B5, B6, B3, C2, B2, D6, D2, D3, D4, D5, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -31,7 +23,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 // ws2812 options
-#define RGB_DI_PIN D0 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json
index de8496a798..a5fb22db85 100644
--- a/keyboards/checkerboards/quark_squared/info.json
+++ b/keyboards/checkerboards/quark_squared/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5342",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B3", "C2", "B2", "D6", "D2", "D3", "D4", "D5", "B1"],
+        "rows": ["C5", "C4", "C6", "C7", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "D1"}
diff --git a/keyboards/checkerboards/quark_squared/quark_squared.c b/keyboards/checkerboards/quark_squared/quark_squared.c
index 1ead754eaf..fbd7346cc0 100644
--- a/keyboards/checkerboards/quark_squared/quark_squared.c
+++ b/keyboards/checkerboards/quark_squared/quark_squared.c
@@ -15,15 +15,3 @@
  */
 
 #include "quark_squared.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLD, 10);
-        } else {
-            tap_code_delay(KC_VOLU, 10);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/checkerboards/snop60/config.h b/keyboards/checkerboards/snop60/config.h
index 5015355170..d11757cc15 100644
--- a/keyboards/checkerboards/snop60/config.h
+++ b/keyboards/checkerboards/snop60/config.h
@@ -17,16 +17,7 @@ Copyright 2022 Nathan Spears
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D6, B4, B5 }
-#define MATRIX_COL_PINS { B6, C6, C7, D5, F7, F6, F5, F4, F1, F0, B0, E6, D4, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 // ws2812 options
-#define RGB_DI_PIN B1 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/info.json
index 0c543a7c85..ab4aabd5a4 100644
--- a/keyboards/checkerboards/snop60/info.json
+++ b/keyboards/checkerboards/snop60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2416",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "D5", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "E6", "D4", "D7"],
+        "rows": ["B7", "D0", "D6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D3"}
@@ -18,6 +23,9 @@
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/checkerboards/ud40_ortho_alt/config.h b/keyboards/checkerboards/ud40_ortho_alt/config.h
index 76fe9ae327..788fbe39a9 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/config.h
+++ b/keyboards/checkerboards/ud40_ortho_alt/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, F0, F1, F4 }
-#define MATRIX_COL_PINS { B2, B1, F7, D6, D7, B4, B5, B6, C6, C7, F5, F6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -31,7 +23,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 // ws2812 options
-#define RGB_DI_PIN D4 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/checkerboards/ud40_ortho_alt/info.json b/keyboards/checkerboards/ud40_ortho_alt/info.json
index fa72a206d3..7d49bdb5b4 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/info.json
+++ b/keyboards/checkerboards/ud40_ortho_alt/info.json
@@ -8,23 +8,262 @@
         "pid": "0x7030",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "F7", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6"],
+        "rows": ["E6", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_default": {
-             "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.25}, {"x":8.25, "y":3, "w":1.25}, {"x":9.5, "y":3, "w":1.25}, {"x":10.75, "y":3, "w":1.25}]
-		   },
-	       "LAYOUT_2x3u_alt": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3, "w":1.5}, {"x":1.5, "y":3, "w":1.5}, {"x":3, "y":3, "w":3}, {"x":6, "y":3, "w":3}, {"x":9, "y":3, "w":1.5}, {"x":10.5, "y":3, "w":1.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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+            ]
+        },
+        "LAYOUT_2x3u_alt": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 1.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 4], "x": 3, "y": 3, "w": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3, "w": 1.5},
+                {"matrix": [3, 11], "x": 10.5, "y": 3, "w": 1.5}
+            ]
+        },
         "LAYOUT_600u": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":6}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 2, "y": 3},
+                {"matrix": [3, 6], "x": 3, "y": 3, "w": 6},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
         "LAYOUT_600u_alt": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3, "w":1.5}, {"x":1.5, "y":3, "w":1.5}, {"x":3, "y":3, "w":6}, {"x":9, "y":3, "w":1.5}, {"x":10.5, "y":3, "w":1.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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 1.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 3, "y": 3, "w": 6},
+                {"matrix": [3, 9], "x": 9, "y": 3, "w": 1.5},
+                {"matrix": [3, 11], "x": 10.5, "y": 3, "w": 1.5}
+            ]
+        },
         "LAYOUT_700u": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":7}, {"x":9.5, "y":3, "w":1.25}, {"x":10.75, "y":3, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 2.5, "y": 3, "w": 7},
+                {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.c b/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.c
deleted file mode 100644
index 7000732a13..0000000000
--- a/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ud40_ortho_alt.h"
diff --git a/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.h b/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.h
deleted file mode 100644
index 9a0bb6b608..0000000000
--- a/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_default( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31,      k32, k33,      k34,      k35, k36,      k37  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, XXX, k32, k33, XXX, k34, XXX, k35, k36, XXX, k37 } \
-}
-
-#define LAYOUT_2x3u_alt( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30,           k31, k32,      k33,           k34,      k35  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, XXX, XXX, k31, k32, XXX, k33, XXX, XXX, k34, XXX, k35 } \
-}
-
-#define LAYOUT_600u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31,      k32,           k33,      k34, k35,      k36 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, XXX, k32, XXX, XXX, k33, XXX, k34, k35, XXX, k36 } \
-}
-
-#define LAYOUT_600u_alt( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30,           k31,           k32,           k33,      k34 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, XXX, XXX, k31, XXX, XXX, k32, XXX, XXX, k33, XXX, k34 } \
-}
-
-#define LAYOUT_700u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31,                     k32,           k33,      k34 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, XXX, XXX, XXX, XXX, k32, XXX, XXX, k33, XXX, k34 } \
-}
diff --git a/keyboards/cherrybstudio/cb1800/cb1800.c b/keyboards/cherrybstudio/cb1800/cb1800.c
deleted file mode 100644
index 6a42e65db5..0000000000
--- a/keyboards/cherrybstudio/cb1800/cb1800.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "cb1800.h"
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index cc6d24ebc1..21aeb17d77 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -13,26 +13,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- *                        0   1   2   3   4   5   6   7   8   9
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -47,4 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json
index 8d96a17bcc..8be7721b0f 100644
--- a/keyboards/cherrybstudio/cb1800/info.json
+++ b/keyboards/cherrybstudio/cb1800/info.json
@@ -8,12 +8,20 @@
         "pid": "0x1818",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F5",
         "num_lock": "F6",
         "scroll_lock": "F7",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/cherrybstudio/cb65/cb65.c b/keyboards/cherrybstudio/cb65/cb65.c
deleted file mode 100644
index 4ff1006adf..0000000000
--- a/keyboards/cherrybstudio/cb65/cb65.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "cb65.h"
diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h
index b298fec8dc..e463e1d6c7 100644
--- a/keyboards/cherrybstudio/cb65/config.h
+++ b/keyboards/cherrybstudio/cb65/config.h
@@ -13,27 +13,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- *                        0   1   2   3   4   5   6   7   8
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, F7, B5, B6, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Lighting */
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,4 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json
index 223d5560d4..8360bf3a06 100644
--- a/keyboards/cherrybstudio/cb65/info.json
+++ b/keyboards/cherrybstudio/cb65/info.json
@@ -8,11 +8,19 @@
         "pid": "0x6565",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "F7", "B5", "B6", "C6"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F1",
         "scroll_lock": "F4",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/cherrybstudio/cb87/cb87.c b/keyboards/cherrybstudio/cb87/cb87.c
deleted file mode 100644
index 4dcdd898eb..0000000000
--- a/keyboards/cherrybstudio/cb87/cb87.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "cb87.h"
\ No newline at end of file
diff --git a/keyboards/cherrybstudio/cb87/cb87.h b/keyboards/cherrybstudio/cb87/cb87.h
deleted file mode 100644
index b3106894bd..0000000000
--- a/keyboards/cherrybstudio/cb87/cb87.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K000,      K001, K002, K003, K004,   K005, K006, K007, K008,    K009, K100, K101, K102,    K103, K104, K105,  \
-    K106, K107, K108, K109, K200, K201, K202, K203, K204, K205, K206, K207, K208,     K209,    K300, K301, K302,  \
-    K303,   K304, K305, K306, K307, K308, K309, K400, K401, K402, K403, K404, K405,   K406,    K407, K408, K409,  \
-    K500,    K501, K502, K503, K504, K505, K506, K507, K508, K509, K600, K601, K602,  K603,                       \
-    K604, K605, K606, K607, K608, K609, K700, K701, K702, K703, K704, K705,           K706,          K707,       \
-    K708,  K709,  K800,              K801,                K802,  K803,  K804,    K805,         K806, K807, K808   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409 }, \
-	{ K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509 }, \
-	{ K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609 }, \
-	{ K700,  K701,  K702,  K703,  K704,  K705,  K706,  K707,  K708,  K709 }, \
-	{ K800,  K801,  K802,  K803,  K804,  K805,  K806,  K807,  K808,  KC_NO }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K000,      K001, K002, K003, K004,   K005, K006, K007, K008,    K009, K100, K101, K102,    K103, K104, K105, \
-    K106, K107, K108, K109, K200, K201, K202, K203, K204, K205, K206, K207, K208,     K209,    K300, K301, K302, \
-    K303,   K304, K305, K306, K307, K308, K309, K400, K401, K402, K403, K404, K405,   K406,    K407, K408, K409, \
-    K500,    K501, K502, K503, K504, K505, K506, K507, K508, K509, K600, K601,        K603,                      \
-    K604,       K606, K607, K608, K609, K700, K701, K702, K703, K704, K705,           K706,          K707,       \
-    K708,  K709,  K800,              K801,                K802,  K803,  K804,    K805,         K806, K807, K808  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309 }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409 }, \
-    { K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509 }, \
-    { K600,  K601,  KC_NO, K603,  K604,  KC_NO, K606,  K607,  K608,  K609 }, \
-    { K700,  K701,  K702,  K703,  K704,  K705,  K706,  K707,  K708,  K709 }, \
-    { K800,  K801,  K802,  K803,  K804,  K805,  K806,  K807,  K808,  KC_NO }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    K000,      K001, K002, K003, K004,   K005, K006, K007, K008,    K009, K100, K101, K102,    K103, K104, K105, \
-    K106, K107, K108, K109, K200, K201, K202, K203, K204, K205, K206, K207, K208,     K209,    K300, K301, K302, \
-    K303,   K304, K305, K306, K307, K308, K309, K400, K401, K402, K403, K404, K405,            K407, K408, K409, \
-    K500,    K501, K502, K503, K504, K505, K506, K507, K508, K509, K600, K601, K602,  K603,                      \
-    K604, K605, K606, K607, K608, K609, K700, K701, K702, K703, K704, K705,           K706,          K707,       \
-    K708,  K709,  K800,              K801,                K802,  K803,  K804,    K805,         K806, K807, K808  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309 }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  KC_NO, K407,  K408,  K409 }, \
-    { K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509 }, \
-    { K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609 }, \
-    { K700,  K701,  K702,  K703,  K704,  K705,  K706,  K707,  K708,  K709 }, \
-    { K800,  K801,  K802,  K803,  K804,  K805,  K806,  K807,  K808,  KC_NO }  \
-}
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index f78600ed04..ddb9102d36 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -13,26 +13,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- *                        0   1   2   3   4   5   6   7   8   9
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -47,4 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json
index 09a4fe132a..ac32d5f8ea 100644
--- a/keyboards/cherrybstudio/cb87/info.json
+++ b/keyboards/cherrybstudio/cb87/info.json
@@ -8,9 +8,17 @@
         "pid": "0x8787",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "indicators": {
         "caps_lock": "F0",
         "scroll_lock": "F4",
@@ -22,288 +30,317 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"=", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[", "x":11.5, "y":2.5},
-                {"label":"]", "x":12.5, "y":2.5},
-                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":"'", "x":11.75, "y":3.5},
-                {"label":"ISO", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":3.5, "w":1.25},
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"ISO", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"App", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [1, 0], "x": 12, "y": 0},
+                {"matrix": [1, 1], "x": 13, "y": 0},
+                {"matrix": [1, 2], "x": 14, "y": 0},
+
+                {"matrix": [1, 3], "x": 15.25, "y": 0},
+                {"matrix": [1, 4], "x": 16.25, "y": 0},
+                {"matrix": [1, 5], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [2, 1], "x": 5, "y": 1.5},
+                {"matrix": [2, 2], "x": 6, "y": 1.5},
+                {"matrix": [2, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [2, 5], "x": 9, "y": 1.5},
+                {"matrix": [2, 6], "x": 10, "y": 1.5},
+                {"matrix": [2, 7], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [2, 9], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [3, 0], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 1], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 2], "x": 17.25, "y": 1.5},
+
+                {"matrix": [3, 3], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 4], "x": 1.5, "y": 2.5},
+                {"matrix": [3, 5], "x": 2.5, "y": 2.5},
+                {"matrix": [3, 6], "x": 3.5, "y": 2.5},
+                {"matrix": [3, 7], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 9], "x": 17.25, "y": 2.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [6, 4], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [7, 8], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 9], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 0], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 1], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [8, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 3], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [8, 6], "x": 15.25, "y": 5.5},
+                {"matrix": [8, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [8, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [1, 0], "x": 12, "y": 0},
+                {"matrix": [1, 1], "x": 13, "y": 0},
+                {"matrix": [1, 2], "x": 14, "y": 0},
+
+                {"matrix": [1, 3], "x": 15.25, "y": 0},
+                {"matrix": [1, 4], "x": 16.25, "y": 0},
+                {"matrix": [1, 5], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [2, 1], "x": 5, "y": 1.5},
+                {"matrix": [2, 2], "x": 6, "y": 1.5},
+                {"matrix": [2, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [2, 5], "x": 9, "y": 1.5},
+                {"matrix": [2, 6], "x": 10, "y": 1.5},
+                {"matrix": [2, 7], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [2, 9], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [3, 0], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 1], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 2], "x": 17.25, "y": 1.5},
+
+                {"matrix": [3, 3], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 4], "x": 1.5, "y": 2.5},
+                {"matrix": [3, 5], "x": 2.5, "y": 2.5},
+                {"matrix": [3, 6], "x": 3.5, "y": 2.5},
+                {"matrix": [3, 7], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 9], "x": 17.25, "y": 2.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [6, 4], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [6, 6], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [7, 8], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 9], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 0], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 1], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [8, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 3], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [8, 6], "x": 15.25, "y": 5.5},
+                {"matrix": [8, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [8, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5},
-                {"x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"x":0, "y":4.5, "w":1.25},
-                {"x":1.25, "y":4.5},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [1, 0], "x": 12, "y": 0},
+                {"matrix": [1, 1], "x": 13, "y": 0},
+                {"matrix": [1, 2], "x": 14, "y": 0},
+
+                {"matrix": [1, 3], "x": 15.25, "y": 0},
+                {"matrix": [1, 4], "x": 16.25, "y": 0},
+                {"matrix": [1, 5], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [2, 1], "x": 5, "y": 1.5},
+                {"matrix": [2, 2], "x": 6, "y": 1.5},
+                {"matrix": [2, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [2, 5], "x": 9, "y": 1.5},
+                {"matrix": [2, 6], "x": 10, "y": 1.5},
+                {"matrix": [2, 7], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [2, 9], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [3, 0], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 1], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 2], "x": 17.25, "y": 1.5},
+
+                {"matrix": [3, 3], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 4], "x": 1.5, "y": 2.5},
+                {"matrix": [3, 5], "x": 2.5, "y": 2.5},
+                {"matrix": [3, 6], "x": 3.5, "y": 2.5},
+                {"matrix": [3, 7], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 9], "x": 17.25, "y": 2.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 4], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [7, 8], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 9], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 0], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 1], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [8, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 3], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [8, 6], "x": 15.25, "y": 5.5},
+                {"matrix": [8, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [8, 8], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h
index eedd4de339..a4643fae38 100644
--- a/keyboards/cherrybstudio/cb87rgb/config.h
+++ b/keyboards/cherrybstudio/cb87rgb/config.h
@@ -13,25 +13,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- *                        0   1   2   3   4   5   6   7   8   9
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, F6 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
 #define RGB_MATRIX_LED_COUNT 92
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json
index 059b6d61d4..bbdbfde9a9 100644
--- a/keyboards/cherrybstudio/cb87rgb/info.json
+++ b/keyboards/cherrybstudio/cb87rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x8785",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
         "layouts": {
diff --git a/keyboards/cherrybstudio/cb87rgb/rules.mk b/keyboards/cherrybstudio/cb87rgb/rules.mk
index 02c7c58f15..2539b3f85f 100644
--- a/keyboards/cherrybstudio/cb87rgb/rules.mk
+++ b/keyboards/cherrybstudio/cb87rgb/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/cherrybstudio/cb87v2/cb87v2.c b/keyboards/cherrybstudio/cb87v2/cb87v2.c
deleted file mode 100644
index 8d2fbba409..0000000000
--- a/keyboards/cherrybstudio/cb87v2/cb87v2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "cb87v2.h"
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index 55b8bc4bee..4c66b113e7 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -13,26 +13,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- *                        0   1   2   3   4   5   6   7   8   9
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, F6 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -47,4 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json
index 45aea95248..63872a922b 100644
--- a/keyboards/cherrybstudio/cb87v2/info.json
+++ b/keyboards/cherrybstudio/cb87v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8788",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6"
     },
@@ -16,6 +21,9 @@
         "scroll_lock": "F4",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/cheshire/curiosity/config.h b/keyboards/cheshire/curiosity/config.h
index 8c60236697..71b0146437 100644
--- a/keyboards/cheshire/curiosity/config.h
+++ b/keyboards/cheshire/curiosity/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B13, B14, A4, A2, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, B9, B8, B7, B6, B5, B4, B3, A15 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/cheshire/curiosity/curiosity.c b/keyboards/cheshire/curiosity/curiosity.c
index e52499b352..9db2651e94 100644
--- a/keyboards/cheshire/curiosity/curiosity.c
+++ b/keyboards/cheshire/curiosity/curiosity.c
@@ -1,4 +1,4 @@
-#include "curiosity.h"
+#include "quantum.h"
 
 void matrix_init_board(void){
     setPinOutput(A8);
diff --git a/keyboards/cheshire/curiosity/curiosity.h b/keyboards/cheshire/curiosity/curiosity.h
deleted file mode 100644
index c26b03e20a..0000000000
--- a/keyboards/cheshire/curiosity/curiosity.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2019 zvecr<git@zvecr.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define ____ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_alice_split_bs( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-  K100, K101, K102, K103, K104, K105, K106,       K108, K109, K110, K111, K112, K113, K114, K115, \
-  K200, K201, K202, K203, K204, K205, K206,       K208, K209, K210, K211, K212, K213,      K215,  \
-        K301, K302, K303, K304, K305, K306,       K308, K309, K310, K311, K312, K313, K314, K315, \
-        K401,       K403,       K405, K406,             K409,       K411,                K414 \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015}, \
-    { K100, K101, K102, K103, K104, K105, K106, ____, K108, K109, K110, K111, K112, K113, K114, K115}, \
-    { K200, K201, K202, K203, K204, K205, K206, ____, K208, K209, K210, K211, K212, K213, ____, K215}, \
-    { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \
-    { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \
-}
-
-#define LAYOUT_alice( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-  K100, K101, K102, K103, K104, K105, K106,       K108, K109, K110, K111, K112, K113, K114, K115, \
-  K200, K201, K202, K203, K204, K205, K206,       K208, K209, K210, K211, K212, K213,      K215,  \
-        K301, K302, K303, K304, K305, K306,       K308, K309, K310, K311, K312, K313, K314, K315, \
-        K401,       K403,       K405, K406,             K409,       K411,                K414 \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, K015}, \
-    { K100, K101, K102, K103, K104, K105, K106, ____, K108, K109, K110, K111, K112, K113, K114, K115}, \
-    { K200, K201, K202, K203, K204, K205, K206, ____, K208, K209, K210, K211, K212, K213, ____, K215}, \
-    { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \
-    { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \
-}
-
-#define LAYOUT_default LAYOUT_alice_split_bs
diff --git a/keyboards/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/info.json
index 74a37dc2d6..fa8180e5af 100644
--- a/keyboards/cheshire/curiosity/info.json
+++ b/keyboards/cheshire/curiosity/info.json
@@ -7,155 +7,180 @@
         "pid": "0x0FAD",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B13", "B14", "A4", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_default": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Del", "x":17, "y":0.25},
-                {"label":"Backspace", "x":18, "y":0.25},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 14], "x": 17, "y": 0.25},
+                {"matrix": [0, 15], "x": 18, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "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.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "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": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 15], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 14], "x": 18, "y": 4.25, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Backspace", "x":17, "y":0.25, "w":2},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 15], "x": 17, "y": 0.25, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "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.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "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": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 15], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 14], "x": 18, "y": 4.25, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/chickenman/ciel/ciel.c b/keyboards/chickenman/ciel/ciel.c
deleted file mode 100644
index de8302bfb4..0000000000
--- a/keyboards/chickenman/ciel/ciel.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ciel.h"
diff --git a/keyboards/chickenman/ciel/config.h b/keyboards/chickenman/ciel/config.h
index c2cae71086..2a4bb26963 100644
--- a/keyboards/chickenman/ciel/config.h
+++ b/keyboards/chickenman/ciel/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C5, C4, B0, C7, B7 }
-#define MATRIX_COL_PINS { C6, B6, B5, B4, B3, B2, B1, D6, D5, D4, D3, D2, D1, D0, C2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/chickenman/ciel/info.json b/keyboards/chickenman/ciel/info.json
index b6a4f5e8f7..af2684d993 100644
--- a/keyboards/chickenman/ciel/info.json
+++ b/keyboards/chickenman/ciel/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D3", "D2", "D1", "D0", "C2"],
+        "rows": ["C5", "C4", "B0", "C7", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_tsangan_hhkb"],
diff --git a/keyboards/chickenman/ciel65/info.json b/keyboards/chickenman/ciel65/info.json
index 648a60e030..ea50a589a4 100644
--- a/keyboards/chickenman/ciel65/info.json
+++ b/keyboards/chickenman/ciel65/info.json
@@ -28,7 +28,6 @@
         "key_lock": false
     },
     "rgblight": {
-        "pin": "F0",
         "led_count": 14,
         "hue_steps": 8,
         "saturation_steps": 8,
@@ -48,6 +47,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/chlx/merro60/config.h b/keyboards/chlx/merro60/config.h
index f9f0068b16..18198a8bce 100644
--- a/keyboards/chlx/merro60/config.h
+++ b/keyboards/chlx/merro60/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, D5, D3, B5, F4 }
-#define MATRIX_COL_PINS { B7, D1, D0, B0, B1, E6, B2, B3, D2, D7, B4, B6, C6, C7, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/chlx/merro60/info.json b/keyboards/chlx/merro60/info.json
index bbb3124868..99308fecde 100644
--- a/keyboards/chlx/merro60/info.json
+++ b/keyboards/chlx/merro60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0601",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B7", "D1", "D0", "B0", "B1", "E6", "B2", "B3", "D2", "D7", "B4", "B6", "C6", "C7", "D6"],
+        "rows": ["D4", "D5", "D3", "B5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/chlx/merro60/merro60.c b/keyboards/chlx/merro60/merro60.c
deleted file mode 100644
index 4182c65c76..0000000000
--- a/keyboards/chlx/merro60/merro60.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 
-Copyright 2021 Alexander Lee <chlx.bsmt@gmail.com> 
-
-This program is free software: you can redistribute it and/or modify 
-it under the terms of the GNU General Public License as published by 
-the Free Software Foundation, either version 2 of the License, or 
-(at your option) any later version. 
-
-This program is distributed in the hope that it will be useful, 
-but WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-GNU General Public License for more details. 
-
-You should have received a copy of the GNU General Public License 
-along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/ 
-
-#include "merro60.h"
-
diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h
index 731309b6fa..62b31cf95b 100644
--- a/keyboards/chlx/str_merro60/config.h
+++ b/keyboards/chlx/str_merro60/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, C7, F7, F6, F5, F4, F1, F0, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, E6, B0, B1, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #   define RGBLIGHT_EFFECT_BREATHING
 #   define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #   define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -53,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define RGBLIGHT_SAT_STEP 8
 #   define RGBLIGHT_VAL_STEP 8
 #   define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json
index e9ab25aedb..e7ae711c7d 100644
--- a/keyboards/chlx/str_merro60/info.json
+++ b/keyboards/chlx/str_merro60/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0602",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "E6", "B0", "B1", "B2"],
+        "rows": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/chlx/str_merro60/str_merro60.c b/keyboards/chlx/str_merro60/str_merro60.c
deleted file mode 100644
index fd4f843d74..0000000000
--- a/keyboards/chlx/str_merro60/str_merro60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* 
-Copyright 2021 Alexander Lee <chlx.bsmt@gmail.com> 
-
-This program is free software: you can redistribute it and/or modify 
-it under the terms of the GNU General Public License as published by 
-the Free Software Foundation, either version 2 of the License, or 
-(at your option) any later version. 
-
-This program is distributed in the hope that it will be useful, 
-but WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-GNU General Public License for more details. 
-
-You should have received a copy of the GNU General Public License 
-along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/ 
-
-#include "str_merro60.h"
diff --git a/keyboards/chocofly/chocofly.c b/keyboards/chocofly/chocofly.c
deleted file mode 100644
index 8ae38602ab..0000000000
--- a/keyboards/chocofly/chocofly.c
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "chocofly.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/chocofly/chocofly.h b/keyboards/chocofly/chocofly.h
deleted file mode 100644
index 7d94774625..0000000000
--- a/keyboards/chocofly/chocofly.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#ifdef KEYBOARD_chocofly_v1
-    #include "v1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/chocofly/v1/config.h b/keyboards/chocofly/v1/config.h
deleted file mode 100644
index a1886ffafa..0000000000
--- a/keyboards/chocofly/v1/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/chocofly/v1/info.json b/keyboards/chocofly/v1/info.json
index ab4fde45e6..e7578ae942 100644
--- a/keyboards/chocofly/v1/info.json
+++ b/keyboards/chocofly/v1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
diff --git a/keyboards/chocofly/v1/v1.c b/keyboards/chocofly/v1/v1.c
deleted file mode 100644
index 6c142b7453..0000000000
--- a/keyboards/chocofly/v1/v1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "v1.h"
diff --git a/keyboards/chocofly/v1/v1.h b/keyboards/chocofly/v1/v1.h
index 5f07f6c325..bf3c93f8be 100644
--- a/keyboards/chocofly/v1/v1.h
+++ b/keyboards/chocofly/v1/v1.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "chocofly.h"
-
 #include "quantum.h"
 
 #define K__ KC_NO
diff --git a/keyboards/chocv/chocv.c b/keyboards/chocv/chocv.c
deleted file mode 100644
index c79f8a1b75..0000000000
--- a/keyboards/chocv/chocv.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 BrickBots Labs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "chocv.h"
diff --git a/keyboards/chocv/chocv.h b/keyboards/chocv/chocv.h
deleted file mode 100644
index 2691dfcb83..0000000000
--- a/keyboards/chocv/chocv.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 BrickBots Labs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-
-#define LAYOUT_split_3x5_3( \
-   k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,\
-   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\
-   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\
-             k30, k31, k32, k33, k34, k35          \
-   ) \
-   { \
-   { k00, k01,   k02,   k03, k04, k05, k06, k07, k08, k09}, \
-   { k10, k11,   k12,   k13, k14, k15, k16, k17, k18, k19}, \
-   { k20, k21,   k22,   k23, k24, k25, k26, k27, k28, k29}, \
-   { KC_NO, KC_NO, k30, k31, k32, k33, k34, k35, KC_NO, KC_NO}  \
-   }
-
diff --git a/keyboards/chocv/config.h b/keyboards/chocv/config.h
deleted file mode 100644
index 5d61c7d4d7..0000000000
--- a/keyboards/chocv/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 BrickBots Labs
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
- #pragma once
-
-
- #define MATRIX_ROW_PINS { F4, F5, D1, D0 }
- #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, C6, D7, E6, B4, B5}
-
- /* COL2ROW, ROW2COL*/
- #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/chocv/info.json b/keyboards/chocv/info.json
index ce82fd6e44..e5361b1399 100644
--- a/keyboards/chocv/info.json
+++ b/keyboards/chocv/info.json
@@ -8,55 +8,60 @@
     "pid": "0x0002",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6", "B2", "B3", "B1", "F7", "C6", "D7", "E6", "B4", "B5"],
+    "rows": ["F4", "F5", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "qmk-dfu",
   "community_layouts": ["split_3x5_3"],
   "layouts": {
     "LAYOUT_split_3x5_3": {
       "layout": [
-        {"label":"Q", "x":0, "y":0.3},
-        {"label":"W", "x":1, "y":0.1},
-        {"label":"E", "x":2, "y":0},
-        {"label":"R", "x":3, "y":0.1},
-        {"label":"T", "x":4, "y":0.2},
+        {"matrix": [0, 0], "x": 0, "y": 0.3},
+        {"matrix": [0, 1], "x": 1, "y": 0.1},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.1},
+        {"matrix": [0, 4], "x": 4, "y": 0.2},
 
-        {"label":"Y", "x":8, "y":0.2},
-        {"label":"U", "x":9, "y":0.1},
-        {"label":"I", "x":10, "y":0},
-        {"label":"O", "x":11, "y":0.1},
-        {"label":"P", "x":12, "y":0.3},
+        {"matrix": [0, 5], "x": 8, "y": 0.2},
+        {"matrix": [0, 6], "x": 9, "y": 0.1},
+        {"matrix": [0, 7], "x": 10, "y": 0},
+        {"matrix": [0, 8], "x": 11, "y": 0.1},
+        {"matrix": [0, 9], "x": 12, "y": 0.3},
 
-        {"label":"A", "x":0, "y":1.3},
-        {"label":"S", "x":1, "y":1.1},
-        {"label":"D", "x":2, "y":1},
-        {"label":"F", "x":3, "y":1.1},
-        {"label":"G", "x":4, "y":1.2},
+        {"matrix": [1, 0], "x": 0, "y": 1.3},
+        {"matrix": [1, 1], "x": 1, "y": 1.1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.1},
+        {"matrix": [1, 4], "x": 4, "y": 1.2},
 
-        {"label":"H", "x":8, "y":1.2},
-        {"label":"J", "x":9, "y":1.1},
-        {"label":"K", "x":10, "y":1},
-        {"label":"L", "x":11, "y":1.1},
-        {"label":";", "x":12, "y":1.3},
+        {"matrix": [1, 5], "x": 8, "y": 1.2},
+        {"matrix": [1, 6], "x": 9, "y": 1.1},
+        {"matrix": [1, 7], "x": 10, "y": 1},
+        {"matrix": [1, 8], "x": 11, "y": 1.1},
+        {"matrix": [1, 9], "x": 12, "y": 1.3},
 
-        {"label":"Z", "x":0, "y":2.3},
-        {"label":"X", "x":1, "y":2.1},
-        {"label":"C", "x":2, "y":2},
-        {"label":"V", "x":3, "y":2.1},
-        {"label":"B", "x":4, "y":2.2},
+        {"matrix": [2, 0], "x": 0, "y": 2.3},
+        {"matrix": [2, 1], "x": 1, "y": 2.1},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.1},
+        {"matrix": [2, 4], "x": 4, "y": 2.2},
 
-        {"label":"N", "x":8, "y":2.2},
-        {"label":"M", "x":9, "y":2.1},
-        {"label":",", "x":10, "y":2},
-        {"label":".", "x":11, "y":2.1},
-        {"label":"/", "x":12, "y":2.3},
+        {"matrix": [2, 5], "x": 8, "y": 2.2},
+        {"matrix": [2, 6], "x": 9, "y": 2.1},
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2.1},
+        {"matrix": [2, 9], "x": 12, "y": 2.3},
 
-        {"label":"KC_LSFT", "x":3, "y":3.7},
-        {"label":"LC_LALT", "x":4, "y":3.7},
-        {"label":"KC_ENT", "x":5, "y":3.2, "h":1.5},
+        {"matrix": [3, 2], "x": 3, "y": 3.7},
+        {"matrix": [3, 3], "x": 4, "y": 3.7},
+        {"matrix": [3, 4], "x": 5, "y": 3.2, "h": 1.5},
 
-        {"label":"KC_SPC", "x":7, "y":3.2, "h":1.5},
-        {"label":"KC_DEL", "x":8, "y":3.7},
-        {"label":"KC_RCTL", "x":9, "y":3.7}
+        {"matrix": [3, 5], "x": 7, "y": 3.2, "h": 1.5},
+        {"matrix": [3, 6], "x": 8, "y": 3.7},
+        {"matrix": [3, 7], "x": 9, "y": 3.7}
       ]
     }
   }
diff --git a/keyboards/chromatonemini/config.h b/keyboards/chromatonemini/config.h
index ef83bdad8a..b5d7155516 100644
--- a/keyboards/chromatonemini/config.h
+++ b/keyboards/chromatonemini/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifdef RGB_MATRIX_ENABLE
 
 /* ws2812 RGB MATRIX */
diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/info.json
index c4307fe988..e81e52e6c0 100644
--- a/keyboards/chromatonemini/info.json
+++ b/keyboards/chromatonemini/info.json
@@ -17,6 +17,12 @@
         "rgblight": false,
         "audio": false
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": [ "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6" ],
diff --git a/keyboards/chromatonemini/rules.mk b/keyboards/chromatonemini/rules.mk
index 0e94fdb0d7..4da205a168 100644
--- a/keyboards/chromatonemini/rules.mk
+++ b/keyboards/chromatonemini/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_DRIVER = WS2812  #
 LTO_ENABLE = yes
diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/info.json
index e55d3b9e50..ba25a63e95 100644
--- a/keyboards/cipulot/ec_23u/info.json
+++ b/keyboards/cipulot/ec_23u/info.json
@@ -27,7 +27,6 @@
     "processor": "STM32F401",
     "rgblight": {
         "led_count": 21,
-        "pin": "B5",
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -41,6 +40,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "url": "https://www.github.com/Cipulot/EC23U",
     "usb": {
         "device_version": "0.0.1",
diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/info.json
index ae92d44e78..2f597d6bf5 100644
--- a/keyboards/cipulot/ec_pro2/info.json
+++ b/keyboards/cipulot/ec_pro2/info.json
@@ -24,7 +24,6 @@
     "processor": "STM32F401",
     "rgblight": {
         "led_count": 22,
-        "pin": "B14",
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -38,6 +37,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B14"
+    },
     "url": "https://www.github.com/Cipulot/EC-Pro-2",
     "usb": {
         "device_version": "0.0.1",
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/info.json b/keyboards/cipulot/ec_prox/ansi_iso/info.json
index df1ad3ba6b..7c26c89515 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/info.json
+++ b/keyboards/cipulot/ec_prox/ansi_iso/info.json
@@ -24,7 +24,6 @@
     "processor": "STM32F401",
     "rgblight": {
         "led_count": 22,
-        "pin": "B12",
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -38,6 +37,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B12"
+    },
     "url": "https://www.github.com/Cipulot/EC-Pro-X",
     "usb": {
         "device_version": "0.0.1",
diff --git a/keyboards/cipulot/ec_prox/jis/info.json b/keyboards/cipulot/ec_prox/jis/info.json
index bcb5a11a12..f4e97c1e63 100644
--- a/keyboards/cipulot/ec_prox/jis/info.json
+++ b/keyboards/cipulot/ec_prox/jis/info.json
@@ -24,7 +24,6 @@
     "processor": "STM32F401",
     "rgblight": {
         "led_count": 22,
-        "pin": "B12",
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -38,6 +37,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B12"
+    },
     "url": "https://www.github.com/Cipulot/EC-Pro-X",
     "usb": {
         "device_version": "0.0.1",
diff --git a/keyboards/cipulot/kallos/config.h b/keyboards/cipulot/kallos/config.h
index 66140bc3ed..bb51142311 100644
--- a/keyboards/cipulot/kallos/config.h
+++ b/keyboards/cipulot/kallos/config.h
@@ -17,18 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
-    { B3, B2, F0, C7, F4, F1 }
-#define MATRIX_COL_PINS \
-    { F5, F6, C6, B6, B5, B4, D7, D6, D4, D5, D3, F7, D2, D1, B7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Lightbar pin and LED count definitions*/
-#define RGB_DI_PIN D0
 #define RGBLED_NUM 13
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/info.json
index 1295d76e7f..f9fd74acfe 100644
--- a/keyboards/cipulot/kallos/info.json
+++ b/keyboards/cipulot/kallos/info.json
@@ -8,422 +8,113 @@
         "pid": "0x6B7A",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F7", "D2", "D1", "B7"],
+        "rows": ["B3", "B2", "F0", "C7", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {
-                    "label": "0,0",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "0,1",
-                    "x": 1.25,
-                    "y": 0
-                },
-                {
-                    "label": "0,2",
-                    "x": 2.25,
-                    "y": 0
-                },
-                {
-                    "label": "0,3",
-                    "x": 3.25,
-                    "y": 0
-                },
-                {
-                    "label": "0,4",
-                    "x": 4.25,
-                    "y": 0
-                },
-                {
-                    "label": "0,5",
-                    "x": 5.5,
-                    "y": 0
-                },
-                {
-                    "label": "0,6",
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "label": "0,7",
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "label": "0,8",
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "label": "0,9",
-                    "x": 9.75,
-                    "y": 0
-                },
-                {
-                    "label": "0,10",
-                    "x": 10.75,
-                    "y": 0
-                },
-                {
-                    "label": "0,11",
-                    "x": 11.75,
-                    "y": 0
-                },
-                {
-                    "label": "0,12",
-                    "x": 12.75,
-                    "y": 0
-                },
-                {
-                    "label": "0,13",
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "label": "0,14",
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "label": "1,0",
-                    "x": 0,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,1",
-                    "x": 1,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,2",
-                    "x": 2,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,3",
-                    "x": 3,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,4",
-                    "x": 4,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,5",
-                    "x": 5,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,6",
-                    "x": 6,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,7",
-                    "x": 7,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,8",
-                    "x": 8,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,9",
-                    "x": 9,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,10",
-                    "x": 10,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,11",
-                    "x": 11,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,12",
-                    "x": 12,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,13",
-                    "x": 13,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,14",
-                    "x": 14,
-                    "y": 1.25
-                },
-                {
-                    "label": "2,14",
-                    "x": 15.25,
-                    "y": 1.25
-                },
-                {
-                    "label": "2,0",
-                    "x": 0,
-                    "y": 2.25,
-                    "w": 1.5
-                },
-                {
-                    "label": "2,1",
-                    "x": 1.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,2",
-                    "x": 2.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,3",
-                    "x": 3.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,4",
-                    "x": 4.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,5",
-                    "x": 5.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,6",
-                    "x": 6.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,7",
-                    "x": 7.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,8",
-                    "x": 8.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,9",
-                    "x": 9.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,10",
-                    "x": 10.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,11",
-                    "x": 11.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,12",
-                    "x": 12.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,13",
-                    "x": 13.5,
-                    "y": 2.25,
-                    "w": 1.5
-                },
-                {
-                    "label": "3,14",
-                    "x": 15.25,
-                    "y": 2.25
-                },
-                {
-                    "label": "3,0",
-                    "x": 0,
-                    "y": 3.25,
-                    "w": 1.75
-                },
-                {
-                    "label": "3,1",
-                    "x": 1.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,2",
-                    "x": 2.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,3",
-                    "x": 3.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,4",
-                    "x": 4.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,5",
-                    "x": 5.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,6",
-                    "x": 6.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,7",
-                    "x": 7.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,8",
-                    "x": 8.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,9",
-                    "x": 9.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,10",
-                    "x": 10.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,11",
-                    "x": 11.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,13",
-                    "x": 12.75,
-                    "y": 3.25,
-                    "w": 2.25
-                },
-                {
-                    "label": "4,0",
-                    "x": 0,
-                    "y": 4.25,
-                    "w": 2.25
-                },
-                {
-                    "label": "4,1",
-                    "x": 2.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,2",
-                    "x": 3.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,3",
-                    "x": 4.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,4",
-                    "x": 5.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,5",
-                    "x": 6.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,6",
-                    "x": 7.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,7",
-                    "x": 8.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,8",
-                    "x": 9.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,9",
-                    "x": 10.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,10",
-                    "x": 11.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,12",
-                    "x": 12.25,
-                    "y": 4.25,
-                    "w": 1.75
-                },
-                {
-                    "label": "4,13",
-                    "x": 14.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "5,0",
-                    "x": 0,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "label": "5,1",
-                    "x": 2.13,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "label": "5,6",
-                    "x": 3.38,
-                    "y": 5.25,
-                    "w": 6.25
-                },
-                {
-                    "label": "5,9",
-                    "x": 9.63,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "label": "5,10",
-                    "x": 11.75,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "label": "5,12",
-                    "x": 13.25,
-                    "y": 5.5
-                },
-                {
-                    "label": "5,13",
-                    "x": 14.25,
-                    "y": 5.5
-                },
-                {
-                    "label": "5,14",
-                    "x": 15.25,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 2.13, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.38, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 9.63, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/cipulot/kallos/kallos.c b/keyboards/cipulot/kallos/kallos.c
deleted file mode 100644
index 77f41f9075..0000000000
--- a/keyboards/cipulot/kallos/kallos.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kallos.h"
diff --git a/keyboards/cipulot/kallos/kallos.h b/keyboards/cipulot/kallos/kallos.h
deleted file mode 100644
index bf71b6becf..0000000000
--- a/keyboards/cipulot/kallos/kallos.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k214, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k314, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313, \
-    k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410,       k412, k413, \
-    k500, k501,                   k506,                   k509, k510, k512, k513, k514  \
-) { \
-    { k000,  k001,   k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014  }, \
-    { k100,  k101,   k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  k114  }, \
-    { k200,  k201,   k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  k212,  k213,  k214  }, \
-    { k300,  k301,   k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  KC_NO, k313,  k314  }, \
-    { k400,  k401,   k402,  k403,  k404,  k405,  k406,  k407,  k408,  k409,  k410,  KC_NO, k412,  k413,  KC_NO }, \
-    { k500,  k501,   KC_NO, KC_NO, KC_NO, KC_NO, k506,  KC_NO, KC_NO, k509,  k510,  KC_NO, k512,  k513,  k514  }  \
-}
diff --git a/keyboards/cipulot/kawayo/config.h b/keyboards/cipulot/kawayo/config.h
index 1a9b80ee58..a87365e69d 100644
--- a/keyboards/cipulot/kawayo/config.h
+++ b/keyboards/cipulot/kawayo/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS \
-    { B1, B12, C13, A7, B0 }
-#define MATRIX_COL_PINS \
-    { B10, A0, B9, B8, B7, B6, B5, B4, B3, A15, A14, A4, A3, A2, A1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cipulot/kawayo/info.json b/keyboards/cipulot/kawayo/info.json
index f335b2b76c..069c6f43ba 100644
--- a/keyboards/cipulot/kawayo/info.json
+++ b/keyboards/cipulot/kawayo/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6B7F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"],
+        "rows": ["B1", "B12", "C13", "A7", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
@@ -17,598 +22,598 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Fn", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Page Up", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Down", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Page Up", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Down", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Page Up", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Down", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_cb_blocker": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Fn", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_cb_blocker_split_bs": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Fn", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_cb_blocker_tsangan": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Fn", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_cb_blocker_tsangan_split_bs": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Fn", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/cipulot/kawayo/kawayo.c b/keyboards/cipulot/kawayo/kawayo.c
deleted file mode 100644
index 1dee38696e..0000000000
--- a/keyboards/cipulot/kawayo/kawayo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kawayo.h"
\ No newline at end of file
diff --git a/keyboards/cipulot/kawayo/kawayo.h b/keyboards/cipulot/kawayo/kawayo.h
deleted file mode 100644
index 41ab80821a..0000000000
--- a/keyboards/cipulot/kawayo/kawayo.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright 2022 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- *                                                     ┌───────�
- *                                        2u Backspace │0E     │▒▒▒  Corner Blocker (CB)
- *                                                     └───────┴────
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │2E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │2D │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B    │3C │3D │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │45                      │49  │4A  │ │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────�
- * │40   │41 │42   │45                         │4A   │ Blocker Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,   k0E,    k2E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2C, k2D, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, \
-    k40, k41, k42,           k45,                k49, k4A,           k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
-    { k40, k41, k42, ___, ___, k45, ___, ___, ___, k49, k4A, k4B, k4C, k4D, ___ }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k2E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2C, k2D, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, \
-    k40, k41, k42,           k45,                k49, k4A,           k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
-    { k40, k41, k42, ___, ___, k45, ___, ___, ___, k49, k4A, k4B, k4C, k4D, ___ }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,   k0E,    k2E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2C, k2D, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, \
-    k40, k41, k42,           k45,                     k4A,           k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
-    { k40, k41, k42, ___, ___, k45, ___, ___, ___, ___, k4A, k4B, k4C, k4D, ___ }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k2E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2C, k2D, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, \
-    k40, k41, k42,           k45,                     k4A,           k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
-    { k40, k41, k42, ___, ___, k45, ___, ___, ___, ___, k4A, k4B, k4C, k4D, ___ }  \
-}
-
-#define LAYOUT_65_ansi_cb_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,   k0E,         \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2C, k2D, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, \
-    k40, k41, k42,           k45,                k49, k4A,           k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
-    { k40, k41, k42, ___, ___, k45, ___, ___, ___, k49, k4A, k4B, k4C, k4D, ___ }  \
-}
-
-#define LAYOUT_65_ansi_cb_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,      \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2C, k2D, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, \
-    k40, k41, k42,           k45,                k49, k4A,           k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
-    { k40, k41, k42, ___, ___, k45, ___, ___, ___, k49, k4A, k4B, k4C, k4D, ___ }  \
-}
-
-#define LAYOUT_65_ansi_cb_blocker_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,   k0E,         \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2C, k2D, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, \
-    k40, k41, k42,           k45,                     k4A,           k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
-    { k40, k41, k42, ___, ___, k45, ___, ___, ___, ___, k4A, k4B, k4C, k4D, ___ }  \
-}
-
-#define LAYOUT_65_ansi_cb_blocker_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,      \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2C, k2D, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, \
-    k40, k41, k42,           k45,                     k4A,           k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
-    { k40, k41, k42, ___, ___, k45, ___, ___, ___, ___, k4A, k4B, k4C, k4D, ___ }  \
-}
diff --git a/keyboards/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/info.json
index 53e401f6cf..579a67cf34 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/info.json
+++ b/keyboards/cipulot/rf_r1_8_9xu/info.json
@@ -28,7 +28,6 @@
     "processor": "STM32F401",
     "rgblight": {
         "led_count": 22,
-        "pin": "A15",
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -42,6 +41,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "A15"
+    },
     "url": "https://www.github.com/Cipulot/RF_R1_8-9Xu",
     "usb": {
         "device_version": "0.0.1",
@@ -54,41 +56,41 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "1,13", "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "x": 14.0, "y": 1.25 },
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25 },
                 { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 },
                 { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
                 { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -106,7 +108,7 @@
                 { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 },
                 { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 },
                 { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
                 { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
                 { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -120,7 +122,7 @@
                 { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
                 { "label": "3,13", "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25 },
                 { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -135,14 +137,14 @@
                 { "label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25 },
                 { "label": "4,13", "matrix": [4, 13], "w": 1.75, "x": 13.25, "y": 4.25 },
                 { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4.0, "y": 5.25 },
+                { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4, "y": 5.25 },
                 { "label": "5,6", "matrix": [5, 6], "w": 2.5, "x": 5.5, "y": 5.25 },
-                { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8.0, "y": 5.25 },
+                { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8, "y": 5.25 },
                 { "label": "5,8", "matrix": [5, 8], "w": 1.5, "x": 9.5, "y": 5.25 },
-                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 },
                 { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 },
                 { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 },
@@ -152,40 +154,40 @@
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13.0, "y": 1.25 },
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25 },
                 { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 },
                 { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
                 { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -202,7 +204,7 @@
                 { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 },
                 { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 },
                 { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
                 { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
                 { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -215,7 +217,7 @@
                 { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0.0, "y": 4.25 },
+                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
                 { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
                 { "label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25 },
@@ -228,11 +230,11 @@
                 { "label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
                 { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4.0, "y": 5.25 },
-                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
+                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 },
                 { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 },
                 { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 },
@@ -242,40 +244,40 @@
         },
         "LAYOUT_tkl_iso_tsangan": {
             "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13.0, "y": 1.25 },
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25 },
                 { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 },
                 { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
                 { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -292,7 +294,7 @@
                 { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 },
                 { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 },
                 { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
                 { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
                 { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -305,7 +307,7 @@
                 { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25 },
                 { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -319,11 +321,11 @@
                 { "label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
                 { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4.0, "y": 5.25 },
-                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
+                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 },
                 { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 },
                 { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 },
@@ -333,41 +335,41 @@
         },
         "LAYOUT_tkl_jis": {
             "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "1,13", "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "x": 14.0, "y": 1.25 },
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25 },
                 { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 },
                 { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
                 { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -384,7 +386,7 @@
                 { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 },
                 { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 },
                 { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
                 { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
                 { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -397,7 +399,7 @@
                 { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0.0, "y": 4.25 },
+                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
                 { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
                 { "label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25 },
@@ -411,14 +413,14 @@
                 { "label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25 },
                 { "label": "4,13", "matrix": [4, 13], "w": 1.75, "x": 13.25, "y": 4.25 },
                 { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4.0, "y": 5.25 },
+                { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4, "y": 5.25 },
                 { "label": "5,6", "matrix": [5, 6], "w": 2.5, "x": 5.5, "y": 5.25 },
-                { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8.0, "y": 5.25 },
+                { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8, "y": 5.25 },
                 { "label": "5,8", "matrix": [5, 8], "w": 1.5, "x": 9.5, "y": 5.25 },
-                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 },
                 { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 },
                 { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 },
diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json
index a33d44561d..512b4ba960 100644
--- a/keyboards/citrus/erdnuss65/info.json
+++ b/keyboards/citrus/erdnuss65/info.json
@@ -30,8 +30,10 @@
         "rgblight": true,
         "audio": false
     },
+    "ws2812": {
+        "pin": "A15"
+    },
     "rgblight": {
-        "pin": "A15",
         "led_count": 1
     },
     "layouts": {
diff --git a/keyboards/ck60i/ck60i.c b/keyboards/ck60i/ck60i.c
index 7e5cd33218..b102aad40c 100644
--- a/keyboards/ck60i/ck60i.c
+++ b/keyboards/ck60i/ck60i.c
@@ -16,15 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "ck60i.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h
index 908eb0d188..3db1523344 100644
--- a/keyboards/ck60i/config.h
+++ b/keyboards/ck60i/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B12, A2 , A1 , A0 , F1 , F0 , B11, B10, B2 , B1 , B0 , A7 , C15, C14}
-#define MATRIX_ROW_PINS { B9 , C13, A3 , B14, A8}
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -30,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 16
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/ck60i/info.json b/keyboards/ck60i/info.json
index 22e8f265f6..e48f22ab49 100644
--- a/keyboards/ck60i/info.json
+++ b/keyboards/ck60i/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6049",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "B11", "B10", "B2", "B1", "B0", "A7", "C15", "C14"],
+        "rows": ["B9", "C13", "A3", "B14", "A8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A5", "pin_b": "A4"}
@@ -18,6 +23,9 @@
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/ckeys/handwire_101/config.h b/keyboards/ckeys/handwire_101/config.h
index 791c68f739..95780766c5 100755
--- a/keyboards/ckeys/handwire_101/config.h
+++ b/keyboards/ckeys/handwire_101/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ckeys/handwire_101/handwire_101.c b/keyboards/ckeys/handwire_101/handwire_101.c
deleted file mode 100755
index 7d251ddce6..0000000000
--- a/keyboards/ckeys/handwire_101/handwire_101.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Branden Byers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "handwire_101.h"
diff --git a/keyboards/ckeys/handwire_101/handwire_101.h b/keyboards/ckeys/handwire_101/handwire_101.h
deleted file mode 100755
index 5d6ef6ff09..0000000000
--- a/keyboards/ckeys/handwire_101/handwire_101.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Branden Byers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33 \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 } \
-}
diff --git a/keyboards/ckeys/handwire_101/info.json b/keyboards/ckeys/handwire_101/info.json
index 3d270685c5..27e43a6512 100644
--- a/keyboards/ckeys/handwire_101/info.json
+++ b/keyboards/ckeys/handwire_101/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layout_aliases": {
@@ -16,25 +21,25 @@
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/ckeys/nakey/config.h b/keyboards/ckeys/nakey/config.h
index e8c0aaebbe..60f42fbcda 100644
--- a/keyboards/ckeys/nakey/config.h
+++ b/keyboards/ckeys/nakey/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ckeys/nakey/info.json b/keyboards/ckeys/nakey/info.json
index 453ad39b13..5971c432d0 100644
--- a/keyboards/ckeys/nakey/info.json
+++ b/keyboards/ckeys/nakey/info.json
@@ -8,12 +8,39 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3"],
+    "rows": ["F1", "F4", "F5", "F6", "F7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "community_layouts": ["numpad_5x4"],
   "layouts": {
     "LAYOUT_numpad_5x4": {
-      "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
+      ]
     }
   }
 }
diff --git a/keyboards/ckeys/nakey/nakey.c b/keyboards/ckeys/nakey/nakey.c
deleted file mode 100644
index 84c0b03ff6..0000000000
--- a/keyboards/ckeys/nakey/nakey.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2018 James Underwood
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "nakey.h"
diff --git a/keyboards/ckeys/nakey/nakey.h b/keyboards/ckeys/nakey/nakey.h
deleted file mode 100644
index bdb26afa26..0000000000
--- a/keyboards/ckeys/nakey/nakey.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2018 James Underwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_numpad_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, \
-    k20, k21, k22, k13, \
-    k30, k31, k32, \
-    k40,      k41, k33 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, XXX }, \
-    { k30, k31, k32, k33 }, \
-    { k40, XXX, k41, XXX } \
-}
diff --git a/keyboards/ckeys/obelus/config.h b/keyboards/ckeys/obelus/config.h
index 1bc6def7fd..0588edea27 100644
--- a/keyboards/ckeys/obelus/config.h
+++ b/keyboards/ckeys/obelus/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { F0, F1, B2, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ckeys/obelus/info.json b/keyboards/ckeys/obelus/info.json
index 9697e3a9dd..78ef0227c5 100644
--- a/keyboards/ckeys/obelus/info.json
+++ b/keyboards/ckeys/obelus/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "B2", "B3"],
+    "rows": ["F4", "F5", "F6", "F7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
@@ -16,7 +21,27 @@
   "community_layouts": ["ortho_4x4"],
   "layouts": {
     "LAYOUT_ortho_4x4": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/ckeys/obelus/obelus.c b/keyboards/ckeys/obelus/obelus.c
index fc6b961f2a..123d93f0f4 100644
--- a/keyboards/ckeys/obelus/obelus.c
+++ b/keyboards/ckeys/obelus/obelus.c
@@ -1,4 +1,4 @@
-#include "obelus.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
diff --git a/keyboards/ckeys/obelus/obelus.h b/keyboards/ckeys/obelus/obelus.h
deleted file mode 100644
index 76ff4f1a9f..0000000000
--- a/keyboards/ckeys/obelus/obelus.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_ortho_4x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 } \
-}
diff --git a/keyboards/ckeys/thedora/config.h b/keyboards/ckeys/thedora/config.h
index 5bcb91e822..8eaf7dc2f3 100755
--- a/keyboards/ckeys/thedora/config.h
+++ b/keyboards/ckeys/thedora/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A2, A1, A0, B8 }
-#define MATRIX_COL_PINS { B5, B4, B3, B2, B1, B0 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ckeys/thedora/info.json b/keyboards/ckeys/thedora/info.json
index b72287fc2e..e86d162ace 100644
--- a/keyboards/ckeys/thedora/info.json
+++ b/keyboards/ckeys/thedora/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B5", "B4", "B3", "B2", "B1", "B0"],
+    "rows": ["A2", "A1", "A0", "B8"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B13", "pin_b": "B15"}
@@ -19,30 +24,30 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"k00", "x":1, "y":0},
-        {"label":"k01", "x":2, "y":0},
-        {"label":"k02", "x":3, "y":0},
-        {"label":"k03", "x":4, "y":0},
-        {"label":"k04", "x":5, "y":0},
+        {"matrix": [0, 0], "x": 1, "y": 0},
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
 
-        {"label":"k10", "x":1, "y":1},
-        {"label":"k11", "x":2, "y":1},
-        {"label":"k12", "x":3, "y":1},
-        {"label":"k13", "x":4, "y":1},
-        {"label":"k14", "x":5, "y":1},
+        {"matrix": [1, 0], "x": 1, "y": 1},
+        {"matrix": [1, 1], "x": 2, "y": 1},
+        {"matrix": [1, 2], "x": 3, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1},
+        {"matrix": [1, 4], "x": 5, "y": 1},
 
-        {"label":"k20", "x":1, "y":2},
-        {"label":"k21", "x":2, "y":2},
-        {"label":"k22", "x":3, "y":2},
-        {"label":"k23", "x":4, "y":2},
-        {"label":"k24", "x":5, "y":2},
+        {"matrix": [2, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
 
-        {"label":"k05 (Rotary Push)", "x":0, "y":3},
-        {"label":"k30", "x":1, "y":3},
-        {"label":"k31", "x":2, "y":3},
-        {"label":"k32", "x":3, "y":3},
-        {"label":"k33", "x":4, "y":3},
-        {"label":"k34", "x":5, "y":3}
+        {"matrix": [0, 5], "x": 0, "y": 3},
+        {"matrix": [3, 0], "x": 1, "y": 3},
+        {"matrix": [3, 1], "x": 2, "y": 3},
+        {"matrix": [3, 2], "x": 3, "y": 3},
+        {"matrix": [3, 3], "x": 4, "y": 3},
+        {"matrix": [3, 4], "x": 5, "y": 3}
       ]
     }
   }
diff --git a/keyboards/ckeys/thedora/thedora.c b/keyboards/ckeys/thedora/thedora.c
index 58953f7437..c9c4069534 100755
--- a/keyboards/ckeys/thedora/thedora.c
+++ b/keyboards/ckeys/thedora/thedora.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "thedora.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
diff --git a/keyboards/ckeys/thedora/thedora.h b/keyboards/ckeys/thedora/thedora.h
deleted file mode 100755
index 5e66f67166..0000000000
--- a/keyboards/ckeys/thedora/thedora.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 Branden Byers (@brandenbyers)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-         k00, k01, k02, k03, k04, \
-         k10, k11, k12, k13, k14, \
-         k20, k21, k22, k23, k24, \
-    k05, k30, k31, k32, k33, k34  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, XXX }, \
-    { k20, k21, k22, k23, k24, XXX }, \
-    { k30, k31, k32, k33, k34, XXX }  \
-}
diff --git a/keyboards/ckeys/washington/config.h b/keyboards/ckeys/washington/config.h
index b57e29acde..1b4e5a6d87 100644
--- a/keyboards/ckeys/washington/config.h
+++ b/keyboards/ckeys/washington/config.h
@@ -15,23 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6 }
-#define MATRIX_COL_PINS { F7, B1, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ckeys/washington/info.json b/keyboards/ckeys/washington/info.json
index b9bb2fce7b..d6029eeabb 100644
--- a/keyboards/ckeys/washington/info.json
+++ b/keyboards/ckeys/washington/info.json
@@ -8,6 +8,11 @@
         "pid": "0x002A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3"],
+        "rows": ["F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D4", "pin_b": "C6"}
@@ -21,7 +26,21 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":0, "y":0.75}, {"x":0.5, "y":1.75}, {"x":1.5, "y":2}]
+            "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": [1, 0], "x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 0.75},
+
+                {"matrix": [2, 1], "x": 0.5, "y": 1.75},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/ckeys/washington/washington.c b/keyboards/ckeys/washington/washington.c
deleted file mode 100644
index 58089caac4..0000000000
--- a/keyboards/ckeys/washington/washington.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 merlin04
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "washington.h"
diff --git a/keyboards/ckeys/washington/washington.h b/keyboards/ckeys/washington/washington.h
deleted file mode 100644
index 6fba7b3281..0000000000
--- a/keyboards/ckeys/washington/washington.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 merlin04
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 }  \
-}
diff --git a/keyboards/clawsome/bookerboard/bookerboard.c b/keyboards/clawsome/bookerboard/bookerboard.c
deleted file mode 100644
index 2cf132de59..0000000000
--- a/keyboards/clawsome/bookerboard/bookerboard.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bookerboard.h"
\ No newline at end of file
diff --git a/keyboards/clawsome/bookerboard/bookerboard.h b/keyboards/clawsome/bookerboard/bookerboard.h
deleted file mode 100644
index 11ece7594b..0000000000
--- a/keyboards/clawsome/bookerboard/bookerboard.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02,   \
-    K10, K11, K12,   \
-    K20, K21, K22,   \
-    K30, K31, K32    \
-) { \
-    { K00,   K01,   K02   }, \
-    { K10,   K11,   K12   }, \
-    { K20,   K21,   K22   }, \
-    { K30,   K31,   K32   }, \
-}
diff --git a/keyboards/clawsome/bookerboard/config.h b/keyboards/clawsome/bookerboard/config.h
deleted file mode 100644
index 60c531b89f..0000000000
--- a/keyboards/clawsome/bookerboard/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 AAClawson (AlisGraveNil)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, E6, D7 }
-#define MATRIX_COL_PINS { B6, B2, B3 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/bookerboard/info.json b/keyboards/clawsome/bookerboard/info.json
index 2e153f567d..8c6a4dc0f9 100644
--- a/keyboards/clawsome/bookerboard/info.json
+++ b/keyboards/clawsome/bookerboard/info.json
@@ -8,23 +8,31 @@
         "pid": "0x41CE",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3"],
+        "rows": ["B5", "B4", "E6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (B5,B6)", "x":0, "y":0},
-                {"label":"K01 (B5,B2)", "x":1, "y":0},
-                {"label":"K02 (B5,B3)", "x":2, "y":0},
-                {"label":"K10 (B4,B6)", "x":0, "y":1},
-                {"label":"K11 (B4,B2)", "x":1, "y":1},
-                {"label":"K12 (B4,B3)", "x":2, "y":1},
-                {"label":"K20 (E6,B6)", "x":0, "y":2},
-                {"label":"K21 (E6,B2)", "x":1, "y":2},
-                {"label":"K22 (E6,B3)", "x":2, "y":2},
-                {"label":"K30 (D7,B6)", "x":0, "y":3},
-                {"label":"K31 (D7,B2)", "x":1, "y":3},
-                {"label":"K32 (D7,B3)", "x":2, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3}
             ]
         }
     }
diff --git a/keyboards/clawsome/coupe/config.h b/keyboards/clawsome/coupe/config.h
deleted file mode 100644
index bad945e802..0000000000
--- a/keyboards/clawsome/coupe/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 AAClawson (AlisGraveNil)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, D2, C6, B5, D4, B4, D0, D3, D1, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B6, B3, B2 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/coupe/coupe.c b/keyboards/clawsome/coupe/coupe.c
deleted file mode 100644
index 80aca53943..0000000000
--- a/keyboards/clawsome/coupe/coupe.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "coupe.h"
\ No newline at end of file
diff --git a/keyboards/clawsome/coupe/info.json b/keyboards/clawsome/coupe/info.json
index be50f5c13e..7bbc577308 100644
--- a/keyboards/clawsome/coupe/info.json
+++ b/keyboards/clawsome/coupe/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7E94",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B6", "B3", "B2"],
+        "rows": ["D7", "D2", "C6", "B5", "D4", "B4", "D0", "D3", "D1", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/clawsome/doodle/config.h b/keyboards/clawsome/doodle/config.h
deleted file mode 100644
index 7dcdcc03a8..0000000000
--- a/keyboards/clawsome/doodle/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6 }
-#define MATRIX_COL_PINS { D7, F4, E6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/doodle/doodle.c b/keyboards/clawsome/doodle/doodle.c
deleted file mode 100644
index 4f1b773512..0000000000
--- a/keyboards/clawsome/doodle/doodle.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "doodle.h"
\ No newline at end of file
diff --git a/keyboards/clawsome/doodle/doodle.h b/keyboards/clawsome/doodle/doodle.h
deleted file mode 100644
index 131d50ad26..0000000000
--- a/keyboards/clawsome/doodle/doodle.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02,   \
-    K10, K11, K12    \
-) { \
-    { K00,   K01,   K02   }, \
-    { K10,   K11,   K12   } \
-}
diff --git a/keyboards/clawsome/doodle/info.json b/keyboards/clawsome/doodle/info.json
index 6c40392ec8..e7883a6f1a 100644
--- a/keyboards/clawsome/doodle/info.json
+++ b/keyboards/clawsome/doodle/info.json
@@ -8,17 +8,23 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "F4", "E6"],
+        "rows": ["D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D4,D7)", "x":0, "y":0},
-                {"label":"K01 (D4,F4)", "x":1, "y":0},
-                {"label":"K02 (D4,E6)", "x":2, "y":0},
-                {"label":"K10 (C6,D7)", "x":0, "y":1},
-                {"label":"K11 (C6,F4)", "x":1, "y":1},
-                {"label":"K12 (C6,E6)", "x":2, "y":1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
             ]
         }
     }
diff --git a/keyboards/clawsome/fightpad/config.h b/keyboards/clawsome/fightpad/config.h
deleted file mode 100644
index a62845a6af..0000000000
--- a/keyboards/clawsome/fightpad/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 AAClawson (AlisGraveNil)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B6 }
-#define MATRIX_COL_PINS { D7, E6, B4, B2, B3, B1, F7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/fightpad/fightpad.c b/keyboards/clawsome/fightpad/fightpad.c
deleted file mode 100644
index f0dae8eaf3..0000000000
--- a/keyboards/clawsome/fightpad/fightpad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "fightpad.h"
\ No newline at end of file
diff --git a/keyboards/clawsome/fightpad/fightpad.h b/keyboards/clawsome/fightpad/fightpad.h
deleted file mode 100644
index ff92afd6bb..0000000000
--- a/keyboards/clawsome/fightpad/fightpad.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-         K01,           K03, K04, K05, K06,   \
-    K10, K11, K12,      K13, K14, K15, K16    \
-) { \
-    { KC_NO, K01,   KC_NO, K03,   K04,   K05,   K06   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16   }, \
-}
diff --git a/keyboards/clawsome/fightpad/info.json b/keyboards/clawsome/fightpad/info.json
index df9c621627..fbd4673dd7 100644
--- a/keyboards/clawsome/fightpad/info.json
+++ b/keyboards/clawsome/fightpad/info.json
@@ -8,23 +8,31 @@
         "pid": "0x481C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B2", "B3", "B1", "F7"],
+        "rows": ["B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K01 (B5,E6)", "x":1, "y":0},
-                {"label":"K03 (B5,B2)", "x":4, "y":0},
-                {"label":"K04 (B5,B3)", "x":5, "y":0},
-                {"label":"K05 (B5,B1)", "x":6, "y":0},
-                {"label":"K06 (B5,F7)", "x":7, "y":0},
-                {"label":"K10 (B6,D7)", "x":0, "y":1},
-                {"label":"K11 (B6,E6)", "x":1, "y":1},
-                {"label":"K12 (B6,B4)", "x":2, "y":1},
-                {"label":"K13 (B6,B2)", "x":4, "y":1},
-                {"label":"K14 (B6,B3)", "x":5, "y":1},
-                {"label":"K15 (B6,B1)", "x":6, "y":1},
-                {"label":"K16 (B6,F7)", "x":7, "y":1}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1}
             ]
         }
     }
diff --git a/keyboards/clawsome/gamebuddy/v1_0/config.h b/keyboards/clawsome/gamebuddy/v1_0/config.h
deleted file mode 100644
index bf867467f2..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_0/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2020 AAClawson (AlisGraveNil)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { D1, D0, E6, B3, B2 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, C6, D7, B6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/gamebuddy/v1_0/info.json b/keyboards/clawsome/gamebuddy/v1_0/info.json
index 273755e62c..269c4b8602 100644
--- a/keyboards/clawsome/gamebuddy/v1_0/info.json
+++ b/keyboards/clawsome/gamebuddy/v1_0/info.json
@@ -8,37 +8,46 @@
         "pid": "0x17B9",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "C6", "D7", "B6"],
+        "rows": ["D1", "D0", "E6", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D1,F5)", "x":0, "y":0},
-                {"label":"K01 (D1,F6)", "x":1, "y":0},
-                {"label":"K02 (D1,F7)", "x":2, "y":0},
-                {"label":"K03 (D1,B1)", "x":3, "y":0},
-                {"label":"K04 (D1,C6)", "x":4, "y":0},
-                {"label":"K05 (D1,D7)", "x":5, "y":0},
-                {"label":"K10 (D0,F5)", "x":0, "y":1},
-                {"label":"K11 (D0,F6)", "x":1, "y":1},
-                {"label":"K12 (D0,F7)", "x":2, "y":1},
-                {"label":"K13 (D0,B1)", "x":3, "y":1},
-                {"label":"K14 (D0,C6)", "x":4, "y":1},
-                {"label":"K15 (D0,D7)", "x":5, "y":1},
-                {"label":"K20 (E6,F5)", "x":0, "y":2, "w":2},
-                {"label":"K22 (E6,F7)", "x":2, "y":2},
-                {"label":"K23 (E6,B1)", "x":3, "y":2},
-                {"label":"K24 (E6,C6)", "x":4, "y":2},
-                {"label":"K25 (E6,D7)", "x":5, "y":2},
-                {"label":"K30 (B3,F5)", "x":0, "y":3},
-                {"label":"K31 (B3,F6)", "x":1, "y":3},
-                {"label":"K32 (B3,F7)", "x":2, "y":3},
-                {"label":"K33 (B3,B1)", "x":3, "y":3},
-                {"label":"K34 (B3,C6)", "x":4, "y":3},
-                {"label":"K35 (B3,D7)", "x":5, "y":3},
-                {"label":"K46 (B2,B6)", "x":6, "y":3, "h":2},
-                {"label":"K44 (B2,C6)", "x":4, "y":4},
-                {"label":"K45 (B2,D7)", "x":5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [4, 6], "x": 6, "y": 3, "h": 2},
+
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/clawsome/gamebuddy/v1_0/v1_0.c b/keyboards/clawsome/gamebuddy/v1_0/v1_0.c
deleted file mode 100644
index b63474c28a..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_0/v1_0.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "v1_0.h"
diff --git a/keyboards/clawsome/gamebuddy/v1_0/v1_0.h b/keyboards/clawsome/gamebuddy/v1_0/v1_0.h
deleted file mode 100644
index f1ee9ab357..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_0/v1_0.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05,        \
-    K10, K11, K12, K13, K14, K15,        \
-    K20,      K22, K23, K24, K25,        \
-    K30, K31, K32, K33, K34, K35, K46,   \
-                        K44, K45         \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   KC_NO }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K44,   K45,   K46   }, \
-}
diff --git a/keyboards/clawsome/gamebuddy/v1_m/config.h b/keyboards/clawsome/gamebuddy/v1_m/config.h
deleted file mode 100644
index 5c2f368800..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_m/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, D7, B5, B3, B2 }
-#define MATRIX_COL_PINS { B1, F7, F6, F5, E6, B4, B6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/gamebuddy/v1_m/info.json b/keyboards/clawsome/gamebuddy/v1_m/info.json
index 9c9ee3938b..3709bbbe3c 100644
--- a/keyboards/clawsome/gamebuddy/v1_m/info.json
+++ b/keyboards/clawsome/gamebuddy/v1_m/info.json
@@ -8,38 +8,47 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "F7", "F6", "F5", "E6", "B4", "B6"],
+        "rows": ["C6", "D7", "B5", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (C6,B1)", "x":0, "y":0},
-                {"label":"K01 (C6,F7)", "x":1, "y":0},
-                {"label":"K02 (C6,F6)", "x":2, "y":0},
-                {"label":"K03 (C6,F5)", "x":3, "y":0},
-                {"label":"K04 (C6,E6)", "x":4, "y":0},
-                {"label":"K05 (C6,B4)", "x":5, "y":0},
-                {"label":"K10 (D7,B1)", "x":0, "y":1},
-                {"label":"K11 (D7,F7)", "x":1, "y":1},
-                {"label":"K12 (D7,F6)", "x":2, "y":1},
-                {"label":"K13 (D7,F5)", "x":3, "y":1},
-                {"label":"K14 (D7,E6)", "x":4, "y":1},
-                {"label":"K15 (D7,B4)", "x":5, "y":1},
-                {"label":"K20 (B5,B1)", "x":0, "y":2},
-                {"label":"K21 (B5,F7)", "x":1, "y":2},
-                {"label":"K22 (B5,F6)", "x":2, "y":2},
-                {"label":"K23 (B5,F5)", "x":3, "y":2},
-                {"label":"K24 (B5,E6)", "x":4, "y":2},
-                {"label":"K25 (B5,B4)", "x":5, "y":2},
-                {"label":"K30 (B3,B1)", "x":0, "y":3},
-                {"label":"K31 (B3,F7)", "x":1, "y":3},
-                {"label":"K32 (B3,F6)", "x":2, "y":3},
-                {"label":"K33 (B3,F5)", "x":3, "y":3},
-                {"label":"K34 (B3,E6)", "x":4, "y":3},
-                {"label":"K35 (B3,B4)", "x":5, "y":3},
-                {"label":"K46 (B2,B6)", "x":6, "y":3, "h":2},
-                {"label":"K44 (B2,E6)", "x":4, "y":4},
-                {"label":"K45 (B2,B4)", "x":5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [4, 6], "x": 6, "y": 3, "h": 2},
+
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/clawsome/gamebuddy/v1_m/v1_m.c b/keyboards/clawsome/gamebuddy/v1_m/v1_m.c
deleted file mode 100644
index 88db72d27b..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_m/v1_m.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "v1_m.h"
diff --git a/keyboards/clawsome/gamebuddy/v1_m/v1_m.h b/keyboards/clawsome/gamebuddy/v1_m/v1_m.h
deleted file mode 100644
index 23e4d03bbc..0000000000
--- a/keyboards/clawsome/gamebuddy/v1_m/v1_m.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05,        \
-    K10, K11, K12, K13, K14, K15,        \
-    K20, K21, K22, K23, K24, K25,        \
-    K30, K31, K32, K33, K34, K35, K46,   \
-                        K44, K45         \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K44,   K45,   K46   }, \
-}
diff --git a/keyboards/clawsome/hatchback/config.h b/keyboards/clawsome/hatchback/config.h
deleted file mode 100644
index 0c0cd52041..0000000000
--- a/keyboards/clawsome/hatchback/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B6, D4, B4, D0, B5, D1, E6, D2, D7, D3, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D5, C7, F1 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/hatchback/hatchback.c b/keyboards/clawsome/hatchback/hatchback.c
deleted file mode 100644
index 117593a688..0000000000
--- a/keyboards/clawsome/hatchback/hatchback.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hatchback.h"
diff --git a/keyboards/clawsome/hatchback/info.json b/keyboards/clawsome/hatchback/info.json
index 63cd7a80d7..79af5d5279 100644
--- a/keyboards/clawsome/hatchback/info.json
+++ b/keyboards/clawsome/hatchback/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D5", "C7", "F1"],
+        "rows": ["B0", "B6", "D4", "B4", "D0", "B5", "D1", "E6", "D2", "D7", "D3", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/clawsome/luggage_rack/config.h b/keyboards/clawsome/luggage_rack/config.h
deleted file mode 100644
index b6df355827..0000000000
--- a/keyboards/clawsome/luggage_rack/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, F4, B0, B2, F7, B6, B1, F5, F6 }
-#define MATRIX_COL_PINS { D4, D0, D1 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/luggage_rack/info.json b/keyboards/clawsome/luggage_rack/info.json
index e903890122..5996c9d8f4 100644
--- a/keyboards/clawsome/luggage_rack/info.json
+++ b/keyboards/clawsome/luggage_rack/info.json
@@ -8,24 +8,33 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "D0", "D1"],
+        "rows": ["D3", "F4", "B0", "B2", "F7", "B6", "B1", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D3,D4)", "x":0, "y":0},
-                {"label":"K11 (F4,D0)", "x":1, "y":0},
-                {"label":"K02 (D3,D1)", "x":2, "y":0},
-                {"label":"K20 (B0,D4)", "x":0, "y":1.5},
-                {"label":"K31 (B2,D0)", "x":1, "y":1.5},
-                {"label":"K22 (B0,D1)", "x":2, "y":1.5},
-                {"label":"K40 (F7,D4)", "x":0, "y":2.5},
-                {"label":"K51 (B6,D0)", "x":1, "y":2.5},
-                {"label":"K42 (F7,D1)", "x":2, "y":2.5},
-                {"label":"K61 (B1,D0)", "x":1, "y":4.5},
-                {"label":"K70 (F5,D4)", "x":0, "y":5.5},
-                {"label":"K81 (F6,D0)", "x":1, "y":5.5},
-                {"label":"K72 (F5,D1)", "x":2, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 1], "x": 1, "y": 1.5},
+                {"matrix": [2, 2], "x": 2, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5},
+                {"matrix": [5, 1], "x": 1, "y": 2.5},
+                {"matrix": [4, 2], "x": 2, "y": 2.5},
+
+                {"matrix": [6, 1], "x": 1, "y": 4.5},
+
+                {"matrix": [7, 0], "x": 0, "y": 5.5},
+                {"matrix": [8, 1], "x": 1, "y": 5.5},
+                {"matrix": [7, 2], "x": 2, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/clawsome/luggage_rack/luggage_rack.c b/keyboards/clawsome/luggage_rack/luggage_rack.c
deleted file mode 100644
index 3a49c797d0..0000000000
--- a/keyboards/clawsome/luggage_rack/luggage_rack.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "luggage_rack.h"
diff --git a/keyboards/clawsome/luggage_rack/luggage_rack.h b/keyboards/clawsome/luggage_rack/luggage_rack.h
deleted file mode 100644
index 20c4947bd2..0000000000
--- a/keyboards/clawsome/luggage_rack/luggage_rack.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K11, K02,   \
-    K20, K31, K22,   \
-    K40, K51, K42,   \
-                     \
-         K61,        \
-    K70, K81, K72    \
-) { \
-    { K00,   KC_NO, K02   }, \
-    { KC_NO, K11,   KC_NO }, \
-    { K20,   KC_NO, K22   }, \
-    { KC_NO, K31,   KC_NO }, \
-    { K40,   KC_NO, K42   }, \
-    { KC_NO, K51,   KC_NO }, \
-    { KC_NO, K61,   KC_NO }, \
-    { K70,   KC_NO, K72   }, \
-    { KC_NO, K81,   KC_NO }, \
-}
diff --git a/keyboards/clawsome/numeros/config.h b/keyboards/clawsome/numeros/config.h
deleted file mode 100644
index a1ee98579f..0000000000
--- a/keyboards/clawsome/numeros/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 AAClawson (AlisGraveNil)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, C6, B2, B6, B5 }
-#define MATRIX_COL_PINS { B3, E6, D7, D4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/numeros/info.json b/keyboards/clawsome/numeros/info.json
index 06e9ba9751..c1b3565b63 100644
--- a/keyboards/clawsome/numeros/info.json
+++ b/keyboards/clawsome/numeros/info.json
@@ -8,33 +8,38 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "E6", "D7", "D4"],
+        "rows": ["D0", "C6", "B2", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":1, "h":2},
+                {"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},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"x":0, "y":4, "w":2},
-                {"x":2, "y":4},
-                {"x":3, "y":3, "h":2}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/clawsome/numeros/numeros.c b/keyboards/clawsome/numeros/numeros.c
deleted file mode 100644
index daa7fb1b8d..0000000000
--- a/keyboards/clawsome/numeros/numeros.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "numeros.h"
diff --git a/keyboards/clawsome/numeros/numeros.h b/keyboards/clawsome/numeros/numeros.h
deleted file mode 100644
index a7a8ee1e09..0000000000
--- a/keyboards/clawsome/numeros/numeros.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_5x4( \
-    K00, K01, K02, K03,   \
-    K10, K11, K12,        \
-    K20, K21, K22, K13,   \
-    K30, K31, K32,        \
-    K40,      K42, K33    \
-) { \
-    { K00,   K01,   K02,   K03   }, \
-    { K10,   K11,   K12,   K13   }, \
-    { K20,   K21,   K22,   KC_NO }, \
-    { K30,   K31,   K32,   K33   }, \
-    { K40,   KC_NO, K42,   KC_NO }, \
-}
diff --git a/keyboards/clawsome/roadster/config.h b/keyboards/clawsome/roadster/config.h
deleted file mode 100644
index 30294c7cfb..0000000000
--- a/keyboards/clawsome/roadster/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 AAClawson (AlisGraveNil)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D3, D0, D1 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/roadster/info.json b/keyboards/clawsome/roadster/info.json
index 4e486b037e..69ecaee368 100644
--- a/keyboards/clawsome/roadster/info.json
+++ b/keyboards/clawsome/roadster/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
+        "rows": ["D2", "D3", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/clawsome/roadster/roadster.c b/keyboards/clawsome/roadster/roadster.c
deleted file mode 100644
index be57d7c2f4..0000000000
--- a/keyboards/clawsome/roadster/roadster.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "roadster.h"
\ No newline at end of file
diff --git a/keyboards/clawsome/sedan/config.h b/keyboards/clawsome/sedan/config.h
deleted file mode 100644
index b7fe854916..0000000000
--- a/keyboards/clawsome/sedan/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 AAClawson (AlisGraveNil)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, D4, D0, D1, D3 }
-#define MATRIX_COL_PINS { B0, F4, F7, B1, B3, B2, B6, F0, F1, C7, D5, B7, B5, B4, E6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/sedan/info.json b/keyboards/clawsome/sedan/info.json
index fc6ddd8a78..dd116e6487 100644
--- a/keyboards/clawsome/sedan/info.json
+++ b/keyboards/clawsome/sedan/info.json
@@ -8,80 +8,89 @@
         "pid": "0x8C78",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "F4", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "C7", "D5", "B7", "B5", "B4", "E6"],
+        "rows": ["C6", "D4", "D0", "D1", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
-                {"label":"K0E (B0,D3)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
-                {"label":"K31 (B3,B6)", "x":2.25, "y":3},
-                {"label":"K32 (B3,B7)", "x":3.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":4.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":5.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":6.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":7.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":8.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":9.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":10.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":11.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K45 (B4,C2)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (B4,C6)", "x":10, "y":4},
-                {"label":"K4A (B4,C7)", "x":11, "y":4},
-                {"label":"K4B (B4,D0)", "x":12, "y":4},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/clawsome/sedan/sedan.c b/keyboards/clawsome/sedan/sedan.c
deleted file mode 100644
index 4977bf6978..0000000000
--- a/keyboards/clawsome/sedan/sedan.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "sedan.h"
\ No newline at end of file
diff --git a/keyboards/clawsome/sedan/sedan.h b/keyboards/clawsome/sedan/sedan.h
deleted file mode 100644
index 7af9476676..0000000000
--- a/keyboards/clawsome/sedan/sedan.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1E,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,        K2E,   \
-    K30,       K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,     K3D, K3E,   \
-    K40,            K41, K42, K45, K49, K4A, K4B, K4C,                    K4D, K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, K45,   KC_NO, KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
diff --git a/keyboards/clawsome/sidekick/config.h b/keyboards/clawsome/sidekick/config.h
deleted file mode 100644
index be550c7a71..0000000000
--- a/keyboards/clawsome/sidekick/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2020 AAClawson (AlisGraveNil)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { D0, C6, B2, B6, B5 }
-#define MATRIX_COL_PINS { F6, F5, B1, B3, E6, D7, D4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/sidekick/info.json b/keyboards/clawsome/sidekick/info.json
index 93e170a09a..ee4df7538c 100644
--- a/keyboards/clawsome/sidekick/info.json
+++ b/keyboards/clawsome/sidekick/info.json
@@ -8,38 +8,47 @@
         "pid": "0xDB9F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B1", "B3", "E6", "D7", "D4"],
+        "rows": ["D0", "C6", "B2", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D0,F6)", "x":0, "y":0},
-                {"label":"K01 (D0,F5)", "x":1, "y":0},
-                {"label":"K02 (D0,B1)", "x":2, "y":0},
-                {"label":"K03 (D0,B3)", "x":3, "y":0},
-                {"label":"K04 (D0,E6)", "x":4, "y":0},
-                {"label":"K05 (D0,D7)", "x":5, "y":0},
-                {"label":"K06 (D0,D4)", "x":6, "y":0},
-                {"label":"K10 (C6,F6)", "x":0, "y":1},
-                {"label":"K11 (C6,F5)", "x":1, "y":1},
-                {"label":"K12 (C6,B1)", "x":2, "y":1},
-                {"label":"K13 (C6,B3)", "x":3, "y":1},
-                {"label":"K14 (C6,E6)", "x":4, "y":1},
-                {"label":"K15 (C6,D7)", "x":5, "y":1},
-                {"label":"K16 (C6,D4)", "x":6, "y":1, "h":2},
-                {"label":"K23 (B2,B3)", "x":3, "y":2},
-                {"label":"K24 (B2,E6)", "x":4, "y":2},
-                {"label":"K25 (B2,D7)", "x":5, "y":2},
-                {"label":"K31 (B6,F5)", "x":1, "y":3},
-                {"label":"K33 (B6,B3)", "x":3, "y":3},
-                {"label":"K34 (B6,E6)", "x":4, "y":3},
-                {"label":"K35 (B6,D7)", "x":5, "y":3},
-                {"label":"K36 (B6,D4)", "x":6, "y":3, "h":2},
-                {"label":"K40 (B5,F6)", "x":0, "y":4},
-                {"label":"K41 (B5,F5)", "x":1, "y":4},
-                {"label":"K42 (B5,B1)", "x":2, "y":4},
-                {"label":"K43 (B5,B3)", "x":3, "y":4, "w":2},
-                {"label":"K45 (B5,D7)", "x":5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "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, "h": 2},
+
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [3, 1], "x": 1, "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, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/clawsome/sidekick/sidekick.c b/keyboards/clawsome/sidekick/sidekick.c
deleted file mode 100644
index 4f52b1ba12..0000000000
--- a/keyboards/clawsome/sidekick/sidekick.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "sidekick.h"
diff --git a/keyboards/clawsome/sidekick/sidekick.h b/keyboards/clawsome/sidekick/sidekick.h
deleted file mode 100644
index fcb93a9bb1..0000000000
--- a/keyboards/clawsome/sidekick/sidekick.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06,   \
-    K10, K11, K12, K13, K14, K15, K16,   \
-                   K23, K24, K25,        \
-         K31,      K33, K34, K35, K36,   \
-    K40, K41, K42, K43,      K45         \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16   }, \
-    { KC_NO, KC_NO, KC_NO, K23,   K24,   K25,   KC_NO }, \
-    { KC_NO, K31,   KC_NO, K33,   K34,   K35,   K36   }, \
-    { K40,   K41,   K42,   K43,   KC_NO, K45,   KC_NO }, \
-}
-
diff --git a/keyboards/clawsome/suv/config.h b/keyboards/clawsome/suv/config.h
deleted file mode 100644
index 915ec1cf5b..0000000000
--- a/keyboards/clawsome/suv/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, B6, D0, F6, D4, F7, B3, B1, B0, C6, B2, D7 }
-#define MATRIX_COL_PINS { D3, D2, D1, B4, B5, B7, D5, C7, F1, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/clawsome/suv/info.json b/keyboards/clawsome/suv/info.json
index 2dadb4f79d..ddf951c9bb 100644
--- a/keyboards/clawsome/suv/info.json
+++ b/keyboards/clawsome/suv/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "B4", "B5", "B7", "D5", "C7", "F1", "F5", "F4"],
+        "rows": ["F0", "B6", "D0", "F6", "D4", "F7", "B3", "B1", "B0", "C6", "B2", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/clawsome/suv/suv.c b/keyboards/clawsome/suv/suv.c
deleted file mode 100644
index d456be8850..0000000000
--- a/keyboards/clawsome/suv/suv.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "suv.h"
\ No newline at end of file
diff --git a/keyboards/clickety_split/leeloo/info.json b/keyboards/clickety_split/leeloo/info.json
index cdd9d713a6..9978f4dd55 100644
--- a/keyboards/clickety_split/leeloo/info.json
+++ b/keyboards/clickety_split/leeloo/info.json
@@ -8,6 +8,11 @@
     "pid": "0x2022",
     "device_version": "0.1.3"
   },
+  "matrix_pins": {
+    "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "F5", "pin_b": "F4"}
@@ -45,13 +50,13 @@
         {"label":"TAB", "x":0, "y":1.5},
         {"label":"Q", "x":1, "y":1.4},
         {"label":"W", "x":2, "y":1.2},
-        {"label":"E", "x":3, "y":1.0},
+        {"label":"E", "x":3, "y":1},
         {"label":"R", "x":4, "y":1.2},
         {"label":"T", "x":5, "y":1.4},
 
         {"label":"Y", "x":9, "y":1.4},
         {"label":"U", "x":10, "y":1.2},
-        {"label":"I", "x":11, "y":1.0},
+        {"label":"I", "x":11, "y":1},
         {"label":"O", "x":12, "y":1.2},
         {"label":"P", "x":13, "y":1.4},
         {"label":"GRV", "x":14, "y":1.5},
@@ -59,13 +64,13 @@
         {"label":"CAPS", "x":0, "y":2.5},
         {"label":"A", "x":1, "y":2.4},
         {"label":"S", "x":2, "y":2.2},
-        {"label":"D", "x":3, "y":2.0},
+        {"label":"D", "x":3, "y":2},
         {"label":"F", "x":4, "y":2.2},
         {"label":"G", "x":5, "y":2.4},
 
         {"label":"H", "x":9, "y":2.4},
         {"label":"J", "x":10, "y":2.2},
-        {"label":"K", "x":11, "y":2.0},
+        {"label":"K", "x":11, "y":2},
         {"label":"L", "x":12, "y":2.2},
         {"label":";", "x":13, "y":2.4},
         {"label":"'", "x":14, "y":2.5},
@@ -73,7 +78,7 @@
         {"label":"Shift", "x":0, "y":3.5},
         {"label":"Z", "x":1, "y":3.4},
         {"label":"X", "x":2, "y":3.2},
-        {"label":"C", "x":3, "y":3.0},
+        {"label":"C", "x":3, "y":3},
         {"label":"V", "x":4, "y":3.2},
         {"label":"B", "x":5, "y":3.4},
         {"label":"GUI", "x":6.25, "y":3.4},
@@ -81,7 +86,7 @@
         {"label":"GUI", "x":7.75, "y":3.4},
         {"label":"N", "x":9, "y":3.4},
         {"label":"M", "x":10, "y":3.2},
-        {"label":",", "x":11, "y":3.0},
+        {"label":",", "x":11, "y":3},
         {"label":".", "x":12, "y":3.2},
         {"label":"/", "x":13, "y":3.4},
         {"label":"Shift", "x":14, "y":3.5},
diff --git a/keyboards/clickety_split/leeloo/keymaps/default/config.h b/keyboards/clickety_split/leeloo/keymaps/default/config.h
index c944579972..d0348d06ef 100644
--- a/keyboards/clickety_split/leeloo/keymaps/default/config.h
+++ b/keyboards/clickety_split/leeloo/keymaps/default/config.h
@@ -24,8 +24,6 @@
 
 #ifdef TAPPING_TERM
     #undef TAPPING_TERM
-
-    #define IGNORE_MOD_TAP_INTERRUPT
     #define QUICK_TAP_TERM 0
     #define TAPPING_TERM 150
 #endif
diff --git a/keyboards/clickety_split/leeloo/leeloo.c b/keyboards/clickety_split/leeloo/leeloo.c
index ea3902d899..864f31cbb7 100644
--- a/keyboards/clickety_split/leeloo/leeloo.c
+++ b/keyboards/clickety_split/leeloo/leeloo.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "leeloo.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/clickety_split/leeloo/leeloo.h b/keyboards/clickety_split/leeloo/leeloo.h
deleted file mode 100644
index 98cfddae34..0000000000
--- a/keyboards/clickety_split/leeloo/leeloo.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2022 Clickety Split Ltd.
- *                https://clicketysplit.ca
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_clickety_split_leeloo_rev1)
-#    include "rev1.h"
-#endif
diff --git a/keyboards/clickety_split/leeloo/rev1/config.h b/keyboards/clickety_split/leeloo/rev1/config.h
index b309fa210b..96c6b71d37 100644
--- a/keyboards/clickety_split/leeloo/rev1/config.h
+++ b/keyboards/clickety_split/leeloo/rev1/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 100
 
diff --git a/keyboards/clickety_split/leeloo/rev1/rev1.c b/keyboards/clickety_split/leeloo/rev1/rev1.c
deleted file mode 100644
index 31e27144fb..0000000000
--- a/keyboards/clickety_split/leeloo/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2022 Clickety Split Ltd.
- *                https://clicketysplit.ca
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "leeloo.h"
diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json
index a8e933d028..d9525e4f12 100644
--- a/keyboards/clueboard/17/info.json
+++ b/keyboards/clueboard/17/info.json
@@ -37,9 +37,11 @@
     "brightness_steps": 17,
     "hue_steps": 10,
     "led_count": 4,
-    "pin": "F6",
     "saturation_steps": 17
   },
+  "ws2812": {
+    "pin": "F6"
+  },
   "url": "",
   "usb": {
     "device_version": "0.0.1",
@@ -55,23 +57,23 @@
   "layouts": {
     "LAYOUT_numpad_5x4": {
       "layout": [
-        { "label": "Num Lock", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "/", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "*", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "-", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "7", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
-        { "label": "8", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 },
-        { "label": "9", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
-        { "label": "4", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
-        { "label": "5", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
-        { "label": "6", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
-        { "h": 2, "label": "+", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 },
-        { "label": "1", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
-        { "label": "2", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 },
-        { "label": "3", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 },
+        { "label": "Num Lock", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "/", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "*", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "-", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "7", "matrix": [1, 0], "x": 0, "y": 1 },
+        { "label": "8", "matrix": [1, 1], "x": 1, "y": 1 },
+        { "label": "9", "matrix": [1, 2], "x": 2, "y": 1 },
+        { "label": "4", "matrix": [2, 0], "x": 0, "y": 2 },
+        { "label": "5", "matrix": [2, 1], "x": 1, "y": 2 },
+        { "label": "6", "matrix": [2, 2], "x": 2, "y": 2 },
+        { "h": 2, "label": "+", "matrix": [1, 3], "x": 3, "y": 1 },
+        { "label": "1", "matrix": [3, 0], "x": 0, "y": 3 },
+        { "label": "2", "matrix": [3, 1], "x": 1, "y": 3 },
+        { "label": "3", "matrix": [3, 2], "x": 2, "y": 3 },
         { "label": "0", "matrix": [4, 0], "w": 2, "x": 0, "y": 4 },
-        { "label": ".", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 },
-        { "h": 2, "label": "Enter", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }
+        { "label": ".", "matrix": [4, 2], "x": 2, "y": 4 },
+        { "h": 2, "label": "Enter", "matrix": [3, 3], "x": 3, "y": 3 }
       ]
     }
   }
diff --git a/keyboards/clueboard/2x1800/2018/2018.c b/keyboards/clueboard/2x1800/2018/2018.c
deleted file mode 100644
index dee0c01b5b..0000000000
--- a/keyboards/clueboard/2x1800/2018/2018.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 Zach White <skullydazed@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "2018.h"
diff --git a/keyboards/clueboard/2x1800/2018/2018.h b/keyboards/clueboard/2x1800/2018/2018.h
deleted file mode 100644
index 6e2d3b3831..0000000000
--- a/keyboards/clueboard/2x1800/2018/2018.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 Zach White <skullydazed@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json
index 03162625c6..4517f21d1e 100644
--- a/keyboards/clueboard/2x1800/2018/info.json
+++ b/keyboards/clueboard/2x1800/2018/info.json
@@ -42,9 +42,11 @@
     "brightness_steps": 8,
     "hue_steps": 8,
     "led_count": 16,
-    "pin": "C6",
     "saturation_steps": 8
   },
+  "ws2812": {
+    "pin": "C6"
+  },
   "usb": {
     "pid": "0x23A0"
   },
@@ -54,386 +56,386 @@
   "layouts": {
     "LAYOUT_4u_space": {
       "layout": [
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 0 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 0 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 0 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 },
+        { "matrix": [0, 0], "x": 0, "y": 0 },
+        { "matrix": [0, 1], "x": 1, "y": 0 },
+        { "matrix": [0, 2], "x": 2, "y": 0 },
+        { "matrix": [0, 3], "x": 3, "y": 0 },
+        { "matrix": [0, 4], "x": 4.75, "y": 0 },
+        { "matrix": [0, 6], "x": 6.25, "y": 0 },
+        { "matrix": [0, 7], "x": 7.25, "y": 0 },
+        { "matrix": [0, 8], "x": 8.25, "y": 0 },
+        { "matrix": [0, 9], "x": 9.25, "y": 0 },
+        { "matrix": [0, 10], "x": 10.75, "y": 0 },
+        { "matrix": [6, 0], "x": 11.75, "y": 0 },
+        { "matrix": [6, 1], "x": 12.75, "y": 0 },
+        { "matrix": [6, 2], "x": 13.75, "y": 0 },
+        { "matrix": [6, 3], "x": 15.25, "y": 0 },
+        { "matrix": [6, 4], "x": 16.25, "y": 0 },
+        { "matrix": [6, 5], "x": 17.25, "y": 0 },
+        { "matrix": [6, 6], "x": 18.25, "y": 0 },
+        { "matrix": [6, 7], "x": 20, "y": 0 },
+        { "matrix": [6, 8], "x": 21, "y": 0 },
+        { "matrix": [6, 9], "x": 22, "y": 0 },
+        { "matrix": [6, 10], "x": 23, "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.5, "y": 1.25 },
+        { "matrix": [1, 5], "x": 5.5, "y": 1.25 },
+        { "matrix": [1, 6], "x": 6.5, "y": 1.25 },
+        { "matrix": [1, 7], "x": 7.5, "y": 1.25 },
+        { "matrix": [1, 8], "x": 8.5, "y": 1.25 },
+        { "matrix": [1, 9], "x": 9.5, "y": 1.25 },
+        { "matrix": [1, 10], "x": 10.5, "y": 1.25 },
+        { "matrix": [7, 0], "x": 11.5, "y": 1.25 },
+        { "matrix": [7, 1], "x": 12.5, "y": 1.25 },
+        { "matrix": [7, 2], "x": 13.5, "y": 1.25 },
+        { "matrix": [7, 3], "x": 14.5, "y": 1.25 },
+        { "matrix": [7, 4], "x": 15.5, "y": 1.25 },
+        { "matrix": [7, 5], "x": 16.5, "y": 1.25 },
         { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 },
+        { "matrix": [7, 7], "x": 20, "y": 1.25 },
+        { "matrix": [7, 8], "x": 21, "y": 1.25 },
+        { "matrix": [7, 9], "x": 22, "y": 1.25 },
+        { "matrix": [7, 10], "x": 23, "y": 1.25 },
+        { "h": 2, "matrix": [2, 0], "x": 0, "y": 2.25 },
+        { "matrix": [2, 1], "x": 1, "y": 2.25 },
+        { "matrix": [2, 2], "x": 2, "y": 2.25 },
+        { "matrix": [2, 3], "x": 3, "y": 2.25 },
         { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 },
+        { "matrix": [2, 5], "x": 6, "y": 2.25 },
+        { "matrix": [2, 6], "x": 7, "y": 2.25 },
+        { "matrix": [2, 7], "x": 8, "y": 2.25 },
+        { "matrix": [2, 8], "x": 9, "y": 2.25 },
+        { "matrix": [2, 9], "x": 10, "y": 2.25 },
+        { "matrix": [2, 10], "x": 11, "y": 2.25 },
+        { "matrix": [8, 0], "x": 12, "y": 2.25 },
+        { "matrix": [8, 1], "x": 13, "y": 2.25 },
+        { "matrix": [8, 2], "x": 14, "y": 2.25 },
+        { "matrix": [8, 3], "x": 15, "y": 2.25 },
+        { "matrix": [8, 4], "x": 16, "y": 2.25 },
+        { "matrix": [8, 5], "x": 17, "y": 2.25 },
         { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 },
+        { "matrix": [8, 7], "x": 20, "y": 2.25 },
+        { "matrix": [8, 8], "x": 21, "y": 2.25 },
+        { "matrix": [8, 9], "x": 22, "y": 2.25 },
+        { "h": 2, "matrix": [8, 10], "x": 23, "y": 2.25 },
+        { "matrix": [3, 1], "x": 1, "y": 3.25 },
+        { "matrix": [3, 2], "x": 2, "y": 3.25 },
+        { "matrix": [3, 3], "x": 3, "y": 3.25 },
         { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 },
+        { "matrix": [3, 5], "x": 6.25, "y": 3.25 },
+        { "matrix": [3, 6], "x": 7.25, "y": 3.25 },
+        { "matrix": [3, 7], "x": 8.25, "y": 3.25 },
+        { "matrix": [3, 8], "x": 9.25, "y": 3.25 },
+        { "matrix": [3, 9], "x": 10.25, "y": 3.25 },
+        { "matrix": [3, 10], "x": 11.25, "y": 3.25 },
+        { "matrix": [9, 0], "x": 12.25, "y": 3.25 },
+        { "matrix": [9, 1], "x": 13.25, "y": 3.25 },
+        { "matrix": [9, 2], "x": 14.25, "y": 3.25 },
+        { "matrix": [9, 3], "x": 15.25, "y": 3.25 },
+        { "matrix": [9, 4], "x": 16.25, "y": 3.25 },
         { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 },
+        { "matrix": [9, 7], "x": 20, "y": 3.25 },
+        { "matrix": [9, 8], "x": 21, "y": 3.25 },
+        { "matrix": [9, 9], "x": 22, "y": 3.25 },
+        { "h": 2, "matrix": [4, 0], "x": 0, "y": 4.25 },
+        { "matrix": [4, 1], "x": 1, "y": 4.25 },
+        { "matrix": [4, 2], "x": 2, "y": 4.25 },
+        { "matrix": [4, 3], "x": 3, "y": 4.25 },
         { "matrix": [4, 4], "w": 1.25, "x": 5.5, "y": 4.25 },
-        { "matrix": [4, 5], "w": 1, "x": 6.75, "y": 4.25 },
-        { "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4.25 },
-        { "matrix": [4, 7], "w": 1, "x": 8.75, "y": 4.25 },
-        { "matrix": [4, 8], "w": 1, "x": 9.75, "y": 4.25 },
-        { "matrix": [4, 9], "w": 1, "x": 10.75, "y": 4.25 },
-        { "matrix": [4, 10], "w": 1, "x": 11.75, "y": 4.25 },
-        { "matrix": [10, 0], "w": 1, "x": 12.75, "y": 4.25 },
-        { "matrix": [10, 1], "w": 1, "x": 13.75, "y": 4.25 },
-        { "matrix": [10, 2], "w": 1, "x": 14.75, "y": 4.25 },
-        { "matrix": [10, 3], "w": 1, "x": 15.75, "y": 4.25 },
+        { "matrix": [4, 5], "x": 6.75, "y": 4.25 },
+        { "matrix": [4, 6], "x": 7.75, "y": 4.25 },
+        { "matrix": [4, 7], "x": 8.75, "y": 4.25 },
+        { "matrix": [4, 8], "x": 9.75, "y": 4.25 },
+        { "matrix": [4, 9], "x": 10.75, "y": 4.25 },
+        { "matrix": [4, 10], "x": 11.75, "y": 4.25 },
+        { "matrix": [10, 0], "x": 12.75, "y": 4.25 },
+        { "matrix": [10, 1], "x": 13.75, "y": 4.25 },
+        { "matrix": [10, 2], "x": 14.75, "y": 4.25 },
+        { "matrix": [10, 3], "x": 15.75, "y": 4.25 },
         { "matrix": [10, 4], "w": 1.75, "x": 16.75, "y": 4.25 },
-        { "matrix": [10, 5], "w": 1, "x": 20, "y": 4.25 },
-        { "matrix": [9, 6], "w": 1, "x": 21, "y": 4.25 },
-        { "matrix": [10, 7], "w": 1, "x": 22, "y": 4.25 },
-        { "h": 2, "matrix": [10, 8], "w": 1, "x": 23, "y": 4.25 },
-        { "matrix": [10, 9], "w": 1, "x": 4.25, "y": 4.5 },
-        { "matrix": [10, 10], "w": 1, "x": 18.75, "y": 4.5 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 },
-        { "matrix": [5, 3], "w": 1, "x": 6.5, "y": 5.25 },
-        { "matrix": [5, 4], "w": 1, "x": 7.5, "y": 5.25 },
-        { "matrix": [5, 5], "w": 1, "x": 8.5, "y": 5.25 },
+        { "matrix": [10, 5], "x": 20, "y": 4.25 },
+        { "matrix": [9, 6], "x": 21, "y": 4.25 },
+        { "matrix": [10, 7], "x": 22, "y": 4.25 },
+        { "h": 2, "matrix": [10, 8], "x": 23, "y": 4.25 },
+        { "matrix": [10, 9], "x": 4.25, "y": 4.5 },
+        { "matrix": [10, 10], "x": 18.75, "y": 4.5 },
+        { "matrix": [5, 1], "x": 1, "y": 5.25 },
+        { "matrix": [5, 2], "x": 2, "y": 5.25 },
+        { "matrix": [5, 3], "x": 6.5, "y": 5.25 },
+        { "matrix": [5, 4], "x": 7.5, "y": 5.25 },
+        { "matrix": [5, 5], "x": 8.5, "y": 5.25 },
         { "matrix": [5, 6], "w": 4, "x": 9.5, "y": 5.25 },
-        { "matrix": [5, 7], "w": 1, "x": 13.5, "y": 5.25 },
-        { "matrix": [5, 8], "w": 1, "x": 14.5, "y": 5.25 },
-        { "matrix": [11, 0], "w": 1, "x": 15.5, "y": 5.25 },
-        { "matrix": [11, 2], "w": 1, "x": 16.5, "y": 5.25 },
-        { "matrix": [11, 3], "w": 1, "x": 21, "y": 5.25 },
-        { "matrix": [11, 4], "w": 1, "x": 22, "y": 5.25 },
-        { "matrix": [11, 5], "w": 1, "x": 3.25, "y": 5.5 },
-        { "matrix": [10, 6], "w": 1, "x": 4.25, "y": 5.5 },
-        { "matrix": [11, 6], "w": 1, "x": 5.25, "y": 5.5 },
-        { "matrix": [11, 7], "w": 1, "x": 17.75, "y": 5.5 },
-        { "matrix": [11, 8], "w": 1, "x": 18.75, "y": 5.5 },
-        { "matrix": [11, 9], "w": 1, "x": 19.75, "y": 5.5 }
+        { "matrix": [5, 7], "x": 13.5, "y": 5.25 },
+        { "matrix": [5, 8], "x": 14.5, "y": 5.25 },
+        { "matrix": [11, 0], "x": 15.5, "y": 5.25 },
+        { "matrix": [11, 2], "x": 16.5, "y": 5.25 },
+        { "matrix": [11, 3], "x": 21, "y": 5.25 },
+        { "matrix": [11, 4], "x": 22, "y": 5.25 },
+        { "matrix": [11, 5], "x": 3.25, "y": 5.5 },
+        { "matrix": [10, 6], "x": 4.25, "y": 5.5 },
+        { "matrix": [11, 6], "x": 5.25, "y": 5.5 },
+        { "matrix": [11, 7], "x": 17.75, "y": 5.5 },
+        { "matrix": [11, 8], "x": 18.75, "y": 5.5 },
+        { "matrix": [11, 9], "x": 19.75, "y": 5.5 }
       ]
     },
     "LAYOUT_7u_space": {
       "layout": [
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 0 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 0 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 0 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 },
+        { "matrix": [0, 0], "x": 0, "y": 0 },
+        { "matrix": [0, 1], "x": 1, "y": 0 },
+        { "matrix": [0, 2], "x": 2, "y": 0 },
+        { "matrix": [0, 3], "x": 3, "y": 0 },
+        { "matrix": [0, 4], "x": 4.75, "y": 0 },
+        { "matrix": [0, 6], "x": 6.25, "y": 0 },
+        { "matrix": [0, 7], "x": 7.25, "y": 0 },
+        { "matrix": [0, 8], "x": 8.25, "y": 0 },
+        { "matrix": [0, 9], "x": 9.25, "y": 0 },
+        { "matrix": [0, 10], "x": 10.75, "y": 0 },
+        { "matrix": [6, 0], "x": 11.75, "y": 0 },
+        { "matrix": [6, 1], "x": 12.75, "y": 0 },
+        { "matrix": [6, 2], "x": 13.75, "y": 0 },
+        { "matrix": [6, 3], "x": 15.25, "y": 0 },
+        { "matrix": [6, 4], "x": 16.25, "y": 0 },
+        { "matrix": [6, 5], "x": 17.25, "y": 0 },
+        { "matrix": [6, 6], "x": 18.25, "y": 0 },
+        { "matrix": [6, 7], "x": 20, "y": 0 },
+        { "matrix": [6, 8], "x": 21, "y": 0 },
+        { "matrix": [6, 9], "x": 22, "y": 0 },
+        { "matrix": [6, 10], "x": 23, "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.5, "y": 1.25 },
+        { "matrix": [1, 5], "x": 5.5, "y": 1.25 },
+        { "matrix": [1, 6], "x": 6.5, "y": 1.25 },
+        { "matrix": [1, 7], "x": 7.5, "y": 1.25 },
+        { "matrix": [1, 8], "x": 8.5, "y": 1.25 },
+        { "matrix": [1, 9], "x": 9.5, "y": 1.25 },
+        { "matrix": [1, 10], "x": 10.5, "y": 1.25 },
+        { "matrix": [7, 0], "x": 11.5, "y": 1.25 },
+        { "matrix": [7, 1], "x": 12.5, "y": 1.25 },
+        { "matrix": [7, 2], "x": 13.5, "y": 1.25 },
+        { "matrix": [7, 3], "x": 14.5, "y": 1.25 },
+        { "matrix": [7, 4], "x": 15.5, "y": 1.25 },
+        { "matrix": [7, 5], "x": 16.5, "y": 1.25 },
         { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 },
+        { "matrix": [7, 7], "x": 20, "y": 1.25 },
+        { "matrix": [7, 8], "x": 21, "y": 1.25 },
+        { "matrix": [7, 9], "x": 22, "y": 1.25 },
+        { "matrix": [7, 10], "x": 23, "y": 1.25 },
+        { "h": 2, "matrix": [2, 0], "x": 0, "y": 2.25 },
+        { "matrix": [2, 1], "x": 1, "y": 2.25 },
+        { "matrix": [2, 2], "x": 2, "y": 2.25 },
+        { "matrix": [2, 3], "x": 3, "y": 2.25 },
         { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 },
+        { "matrix": [2, 5], "x": 6, "y": 2.25 },
+        { "matrix": [2, 6], "x": 7, "y": 2.25 },
+        { "matrix": [2, 7], "x": 8, "y": 2.25 },
+        { "matrix": [2, 8], "x": 9, "y": 2.25 },
+        { "matrix": [2, 9], "x": 10, "y": 2.25 },
+        { "matrix": [2, 10], "x": 11, "y": 2.25 },
+        { "matrix": [8, 0], "x": 12, "y": 2.25 },
+        { "matrix": [8, 1], "x": 13, "y": 2.25 },
+        { "matrix": [8, 2], "x": 14, "y": 2.25 },
+        { "matrix": [8, 3], "x": 15, "y": 2.25 },
+        { "matrix": [8, 4], "x": 16, "y": 2.25 },
+        { "matrix": [8, 5], "x": 17, "y": 2.25 },
         { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 },
+        { "matrix": [8, 7], "x": 20, "y": 2.25 },
+        { "matrix": [8, 8], "x": 21, "y": 2.25 },
+        { "matrix": [8, 9], "x": 22, "y": 2.25 },
+        { "h": 2, "matrix": [8, 10], "x": 23, "y": 2.25 },
+        { "matrix": [3, 1], "x": 1, "y": 3.25 },
+        { "matrix": [3, 2], "x": 2, "y": 3.25 },
+        { "matrix": [3, 3], "x": 3, "y": 3.25 },
         { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 },
+        { "matrix": [3, 5], "x": 6.25, "y": 3.25 },
+        { "matrix": [3, 6], "x": 7.25, "y": 3.25 },
+        { "matrix": [3, 7], "x": 8.25, "y": 3.25 },
+        { "matrix": [3, 8], "x": 9.25, "y": 3.25 },
+        { "matrix": [3, 9], "x": 10.25, "y": 3.25 },
+        { "matrix": [3, 10], "x": 11.25, "y": 3.25 },
+        { "matrix": [9, 0], "x": 12.25, "y": 3.25 },
+        { "matrix": [9, 1], "x": 13.25, "y": 3.25 },
+        { "matrix": [9, 2], "x": 14.25, "y": 3.25 },
+        { "matrix": [9, 3], "x": 15.25, "y": 3.25 },
+        { "matrix": [9, 4], "x": 16.25, "y": 3.25 },
         { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 },
+        { "matrix": [9, 7], "x": 20, "y": 3.25 },
+        { "matrix": [9, 8], "x": 21, "y": 3.25 },
+        { "matrix": [9, 9], "x": 22, "y": 3.25 },
+        { "h": 2, "matrix": [4, 0], "x": 0, "y": 4.25 },
+        { "matrix": [4, 1], "x": 1, "y": 4.25 },
+        { "matrix": [4, 2], "x": 2, "y": 4.25 },
+        { "matrix": [4, 3], "x": 3, "y": 4.25 },
         { "matrix": [4, 4], "w": 1.25, "x": 5.5, "y": 4.25 },
-        { "matrix": [4, 5], "w": 1, "x": 6.75, "y": 4.25 },
-        { "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4.25 },
-        { "matrix": [4, 7], "w": 1, "x": 8.75, "y": 4.25 },
-        { "matrix": [4, 8], "w": 1, "x": 9.75, "y": 4.25 },
-        { "matrix": [4, 9], "w": 1, "x": 10.75, "y": 4.25 },
-        { "matrix": [4, 10], "w": 1, "x": 11.75, "y": 4.25 },
-        { "matrix": [10, 0], "w": 1, "x": 12.75, "y": 4.25 },
-        { "matrix": [10, 1], "w": 1, "x": 13.75, "y": 4.25 },
-        { "matrix": [10, 2], "w": 1, "x": 14.75, "y": 4.25 },
-        { "matrix": [10, 3], "w": 1, "x": 15.75, "y": 4.25 },
+        { "matrix": [4, 5], "x": 6.75, "y": 4.25 },
+        { "matrix": [4, 6], "x": 7.75, "y": 4.25 },
+        { "matrix": [4, 7], "x": 8.75, "y": 4.25 },
+        { "matrix": [4, 8], "x": 9.75, "y": 4.25 },
+        { "matrix": [4, 9], "x": 10.75, "y": 4.25 },
+        { "matrix": [4, 10], "x": 11.75, "y": 4.25 },
+        { "matrix": [10, 0], "x": 12.75, "y": 4.25 },
+        { "matrix": [10, 1], "x": 13.75, "y": 4.25 },
+        { "matrix": [10, 2], "x": 14.75, "y": 4.25 },
+        { "matrix": [10, 3], "x": 15.75, "y": 4.25 },
         { "matrix": [10, 4], "w": 1.75, "x": 16.75, "y": 4.25 },
-        { "matrix": [10, 5], "w": 1, "x": 20, "y": 4.25 },
-        { "matrix": [9, 6], "w": 1, "x": 21, "y": 4.25 },
-        { "matrix": [10, 7], "w": 1, "x": 22, "y": 4.25 },
-        { "h": 2, "matrix": [10, 8], "w": 1, "x": 23, "y": 4.25 },
-        { "matrix": [10, 9], "w": 1, "x": 4.25, "y": 4.5 },
-        { "matrix": [10, 10], "w": 1, "x": 18.75, "y": 4.5 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 },
-        { "matrix": [5, 3], "w": 1, "x": 6.5, "y": 5.25 },
-        { "matrix": [5, 4], "w": 1, "x": 7.5, "y": 5.25 },
+        { "matrix": [10, 5], "x": 20, "y": 4.25 },
+        { "matrix": [9, 6], "x": 21, "y": 4.25 },
+        { "matrix": [10, 7], "x": 22, "y": 4.25 },
+        { "h": 2, "matrix": [10, 8], "x": 23, "y": 4.25 },
+        { "matrix": [10, 9], "x": 4.25, "y": 4.5 },
+        { "matrix": [10, 10], "x": 18.75, "y": 4.5 },
+        { "matrix": [5, 1], "x": 1, "y": 5.25 },
+        { "matrix": [5, 2], "x": 2, "y": 5.25 },
+        { "matrix": [5, 3], "x": 6.5, "y": 5.25 },
+        { "matrix": [5, 4], "x": 7.5, "y": 5.25 },
         { "matrix": [5, 5], "w": 7, "x": 8.5, "y": 5.25 },
-        { "matrix": [5, 6], "w": 1, "x": 15.5, "y": 5.25 },
-        { "matrix": [5, 7], "w": 1, "x": 16.5, "y": 5.25 },
-        { "matrix": [11, 0], "w": 1, "x": 21, "y": 5.25 },
-        { "matrix": [11, 4], "w": 1, "x": 22, "y": 5.25 },
-        { "matrix": [11, 5], "w": 1, "x": 3.25, "y": 5.5 },
-        { "matrix": [10, 6], "w": 1, "x": 4.25, "y": 5.5 },
-        { "matrix": [11, 6], "w": 1, "x": 5.25, "y": 5.5 },
-        { "matrix": [11, 7], "w": 1, "x": 17.75, "y": 5.5 },
-        { "matrix": [11, 8], "w": 1, "x": 18.75, "y": 5.5 },
-        { "matrix": [11, 9], "w": 1, "x": 19.75, "y": 5.5 }
+        { "matrix": [5, 6], "x": 15.5, "y": 5.25 },
+        { "matrix": [5, 7], "x": 16.5, "y": 5.25 },
+        { "matrix": [11, 0], "x": 21, "y": 5.25 },
+        { "matrix": [11, 4], "x": 22, "y": 5.25 },
+        { "matrix": [11, 5], "x": 3.25, "y": 5.5 },
+        { "matrix": [10, 6], "x": 4.25, "y": 5.5 },
+        { "matrix": [11, 6], "x": 5.25, "y": 5.5 },
+        { "matrix": [11, 7], "x": 17.75, "y": 5.5 },
+        { "matrix": [11, 8], "x": 18.75, "y": 5.5 },
+        { "matrix": [11, 9], "x": 19.75, "y": 5.5 }
       ]
     },
     "LAYOUT_all": {
       "layout": [
-        { "label": "Home", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "End", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "PgUp", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "PgDn", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "Esc", "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 },
-        { "label": "F1", "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 },
-        { "label": "F2", "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 },
-        { "label": "F3", "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 },
-        { "label": "F4", "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 },
-        { "label": "F5", "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 },
-        { "label": "F6", "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 },
-        { "label": "F7", "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 },
-        { "label": "F8", "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 },
-        { "label": "F9", "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 },
-        { "label": "F10", "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 },
-        { "label": "F11", "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 },
-        { "label": "F12", "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 },
-        { "label": "PrtSc", "matrix": [6, 7], "w": 1, "x": 20, "y": 0 },
-        { "label": "Scroll Lock", "matrix": [6, 8], "w": 1, "x": 21, "y": 0 },
-        { "label": "Pause", "matrix": [6, 9], "w": 1, "x": 22, "y": 0 },
-        { "label": "Insert", "matrix": [6, 10], "w": 1, "x": 23, "y": 0 },
-        { "label": "-", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 },
-        { "label": "Num Lock", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 },
-        { "label": "/", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 },
-        { "label": "*", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 },
-        { "label": "~", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 },
-        { "label": "!", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-        { "label": "@", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 },
-        { "label": "#", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 },
-        { "label": "$", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 },
-        { "label": "%", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 },
-        { "label": "^", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 },
-        { "label": "&", "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 },
-        { "label": "*", "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 },
-        { "label": "(", "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 },
-        { "label": ")", "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 },
-        { "label": "_", "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 },
-        { "label": "+", "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 },
+        { "label": "Home", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "End", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "PgUp", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "PgDn", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "Esc", "matrix": [0, 4], "x": 4.75, "y": 0 },
+        { "label": "F1", "matrix": [0, 6], "x": 6.25, "y": 0 },
+        { "label": "F2", "matrix": [0, 7], "x": 7.25, "y": 0 },
+        { "label": "F3", "matrix": [0, 8], "x": 8.25, "y": 0 },
+        { "label": "F4", "matrix": [0, 9], "x": 9.25, "y": 0 },
+        { "label": "F5", "matrix": [0, 10], "x": 10.75, "y": 0 },
+        { "label": "F6", "matrix": [6, 0], "x": 11.75, "y": 0 },
+        { "label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0 },
+        { "label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0 },
+        { "label": "F9", "matrix": [6, 3], "x": 15.25, "y": 0 },
+        { "label": "F10", "matrix": [6, 4], "x": 16.25, "y": 0 },
+        { "label": "F11", "matrix": [6, 5], "x": 17.25, "y": 0 },
+        { "label": "F12", "matrix": [6, 6], "x": 18.25, "y": 0 },
+        { "label": "PrtSc", "matrix": [6, 7], "x": 20, "y": 0 },
+        { "label": "Scroll Lock", "matrix": [6, 8], "x": 21, "y": 0 },
+        { "label": "Pause", "matrix": [6, 9], "x": 22, "y": 0 },
+        { "label": "Insert", "matrix": [6, 10], "x": 23, "y": 0 },
+        { "label": "-", "matrix": [1, 0], "x": 0, "y": 1.25 },
+        { "label": "Num Lock", "matrix": [1, 1], "x": 1, "y": 1.25 },
+        { "label": "/", "matrix": [1, 2], "x": 2, "y": 1.25 },
+        { "label": "*", "matrix": [1, 3], "x": 3, "y": 1.25 },
+        { "label": "~", "matrix": [1, 4], "x": 4.5, "y": 1.25 },
+        { "label": "!", "matrix": [1, 5], "x": 5.5, "y": 1.25 },
+        { "label": "@", "matrix": [1, 6], "x": 6.5, "y": 1.25 },
+        { "label": "#", "matrix": [1, 7], "x": 7.5, "y": 1.25 },
+        { "label": "$", "matrix": [1, 8], "x": 8.5, "y": 1.25 },
+        { "label": "%", "matrix": [1, 9], "x": 9.5, "y": 1.25 },
+        { "label": "^", "matrix": [1, 10], "x": 10.5, "y": 1.25 },
+        { "label": "&", "matrix": [7, 0], "x": 11.5, "y": 1.25 },
+        { "label": "*", "matrix": [7, 1], "x": 12.5, "y": 1.25 },
+        { "label": "(", "matrix": [7, 2], "x": 13.5, "y": 1.25 },
+        { "label": ")", "matrix": [7, 3], "x": 14.5, "y": 1.25 },
+        { "label": "_", "matrix": [7, 4], "x": 15.5, "y": 1.25 },
+        { "label": "+", "matrix": [7, 5], "x": 16.5, "y": 1.25 },
         { "label": "Backspace", "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 },
-        { "label": "Num Lock", "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 },
-        { "label": "/", "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 },
-        { "label": "*", "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 },
-        { "label": "-", "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 },
-        { "h": 2, "label": "+", "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 },
-        { "label": "7", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 },
-        { "label": "8", "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 },
-        { "label": "9", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 },
+        { "label": "Num Lock", "matrix": [7, 7], "x": 20, "y": 1.25 },
+        { "label": "/", "matrix": [7, 8], "x": 21, "y": 1.25 },
+        { "label": "*", "matrix": [7, 9], "x": 22, "y": 1.25 },
+        { "label": "-", "matrix": [7, 10], "x": 23, "y": 1.25 },
+        { "h": 2, "label": "+", "matrix": [2, 0], "x": 0, "y": 2.25 },
+        { "label": "7", "matrix": [2, 1], "x": 1, "y": 2.25 },
+        { "label": "8", "matrix": [2, 2], "x": 2, "y": 2.25 },
+        { "label": "9", "matrix": [2, 3], "x": 3, "y": 2.25 },
         { "label": "Tab", "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 },
-        { "label": "Q", "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 },
-        { "label": "W", "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 },
-        { "label": "E", "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 },
-        { "label": "R", "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 },
-        { "label": "T", "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 },
-        { "label": "Y", "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 },
-        { "label": "U", "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 },
-        { "label": "I", "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 },
-        { "label": "O", "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 },
-        { "label": "P", "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 },
-        { "label": "{", "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 },
-        { "label": "}", "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 },
+        { "label": "Q", "matrix": [2, 5], "x": 6, "y": 2.25 },
+        { "label": "W", "matrix": [2, 6], "x": 7, "y": 2.25 },
+        { "label": "E", "matrix": [2, 7], "x": 8, "y": 2.25 },
+        { "label": "R", "matrix": [2, 8], "x": 9, "y": 2.25 },
+        { "label": "T", "matrix": [2, 9], "x": 10, "y": 2.25 },
+        { "label": "Y", "matrix": [2, 10], "x": 11, "y": 2.25 },
+        { "label": "U", "matrix": [8, 0], "x": 12, "y": 2.25 },
+        { "label": "I", "matrix": [8, 1], "x": 13, "y": 2.25 },
+        { "label": "O", "matrix": [8, 2], "x": 14, "y": 2.25 },
+        { "label": "P", "matrix": [8, 3], "x": 15, "y": 2.25 },
+        { "label": "{", "matrix": [8, 4], "x": 16, "y": 2.25 },
+        { "label": "}", "matrix": [8, 5], "x": 17, "y": 2.25 },
         { "label": "|", "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 },
-        { "label": "7", "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 },
-        { "label": "8", "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 },
-        { "label": "9", "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 },
-        { "h": 2, "label": "+", "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 },
-        { "label": "4", "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 },
-        { "label": "5", "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 },
-        { "label": "6", "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 },
+        { "label": "7", "matrix": [8, 7], "x": 20, "y": 2.25 },
+        { "label": "8", "matrix": [8, 8], "x": 21, "y": 2.25 },
+        { "label": "9", "matrix": [8, 9], "x": 22, "y": 2.25 },
+        { "h": 2, "label": "+", "matrix": [8, 10], "x": 23, "y": 2.25 },
+        { "label": "4", "matrix": [3, 1], "x": 1, "y": 3.25 },
+        { "label": "5", "matrix": [3, 2], "x": 2, "y": 3.25 },
+        { "label": "6", "matrix": [3, 3], "x": 3, "y": 3.25 },
         { "label": "Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 },
-        { "label": "A", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 },
-        { "label": "S", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 },
-        { "label": "D", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 },
-        { "label": "F", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 },
-        { "label": "G", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 },
-        { "label": "H", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 },
-        { "label": "J", "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 },
-        { "label": "K", "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 },
-        { "label": "L", "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 },
-        { "label": ":", "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 },
-        { "label": "\"", "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 },
+        { "label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.25 },
+        { "label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.25 },
+        { "label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.25 },
+        { "label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.25 },
+        { "label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.25 },
+        { "label": "H", "matrix": [3, 10], "x": 11.25, "y": 3.25 },
+        { "label": "J", "matrix": [9, 0], "x": 12.25, "y": 3.25 },
+        { "label": "K", "matrix": [9, 1], "x": 13.25, "y": 3.25 },
+        { "label": "L", "matrix": [9, 2], "x": 14.25, "y": 3.25 },
+        { "label": ":", "matrix": [9, 3], "x": 15.25, "y": 3.25 },
+        { "label": "\"", "matrix": [9, 4], "x": 16.25, "y": 3.25 },
         { "label": "Enter", "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 },
-        { "label": "4", "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 },
-        { "label": "5", "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 },
-        { "label": "6", "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 },
-        { "h": 2, "label": "Enter", "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 },
-        { "label": "1", "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 },
-        { "label": "2", "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 },
-        { "label": "3", "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 },
-        { "label": "\\u2191", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 },
+        { "label": "4", "matrix": [9, 7], "x": 20, "y": 3.25 },
+        { "label": "5", "matrix": [9, 8], "x": 21, "y": 3.25 },
+        { "label": "6", "matrix": [9, 9], "x": 22, "y": 3.25 },
+        { "h": 2, "label": "Enter", "matrix": [4, 0], "x": 0, "y": 4.25 },
+        { "label": "1", "matrix": [4, 1], "x": 1, "y": 4.25 },
+        { "label": "2", "matrix": [4, 2], "x": 2, "y": 4.25 },
+        { "label": "3", "matrix": [4, 3], "x": 3, "y": 4.25 },
+        { "label": "\\u2191", "matrix": [4, 4], "x": 4.25, "y": 4.5 },
         { "label": "Shift", "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 4.25 },
-        { "label": "Z", "matrix": [4, 6], "w": 1, "x": 6.75, "y": 4.25 },
-        { "label": "X", "matrix": [4, 7], "w": 1, "x": 7.75, "y": 4.25 },
-        { "label": "C", "matrix": [4, 8], "w": 1, "x": 8.75, "y": 4.25 },
-        { "label": "V", "matrix": [4, 9], "w": 1, "x": 9.75, "y": 4.25 },
-        { "label": "B", "matrix": [4, 10], "w": 1, "x": 10.75, "y": 4.25 },
-        { "label": "N", "matrix": [10, 0], "w": 1, "x": 11.75, "y": 4.25 },
-        { "label": "M", "matrix": [10, 1], "w": 1, "x": 12.75, "y": 4.25 },
-        { "label": "<", "matrix": [10, 2], "w": 1, "x": 13.75, "y": 4.25 },
-        { "label": ">", "matrix": [10, 3], "w": 1, "x": 14.75, "y": 4.25 },
-        { "label": "?", "matrix": [10, 4], "w": 1, "x": 15.75, "y": 4.25 },
+        { "label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.25 },
+        { "label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.25 },
+        { "label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.25 },
+        { "label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.25 },
+        { "label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.25 },
+        { "label": "N", "matrix": [10, 0], "x": 11.75, "y": 4.25 },
+        { "label": "M", "matrix": [10, 1], "x": 12.75, "y": 4.25 },
+        { "label": "<", "matrix": [10, 2], "x": 13.75, "y": 4.25 },
+        { "label": ">", "matrix": [10, 3], "x": 14.75, "y": 4.25 },
+        { "label": "?", "matrix": [10, 4], "x": 15.75, "y": 4.25 },
         { "label": "Shift", "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 4.25 },
-        { "label": "\\u2191", "matrix": [9, 6], "w": 1, "x": 18.75, "y": 4.5 },
-        { "label": "1", "matrix": [10, 7], "w": 1, "x": 20, "y": 4.25 },
-        { "label": "2", "matrix": [10, 8], "w": 1, "x": 21, "y": 4.25 },
-        { "label": "3", "matrix": [10, 9], "w": 1, "x": 22, "y": 4.25 },
-        { "h": 2, "label": "Enter", "matrix": [10, 10], "w": 1, "x": 23, "y": 4.25 },
-        { "label": "0", "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 },
-        { "label": ".", "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 },
-        { "label": "\\u2190", "matrix": [5, 3], "w": 1, "x": 3.25, "y": 5.5 },
-        { "label": "\\u2193", "matrix": [5, 4], "w": 1, "x": 4.25, "y": 5.5 },
-        { "label": "\\u2192", "matrix": [5, 5], "w": 1, "x": 5.25, "y": 5.5 },
-        { "label": "Ctrl", "matrix": [5, 6], "w": 1, "x": 6.5, "y": 5.25 },
-        { "label": "Win", "matrix": [5, 7], "w": 1, "x": 7.5, "y": 5.25 },
-        { "label": "Alt", "matrix": [5, 8], "w": 1, "x": 8.5, "y": 5.25 },
-        { "label": "1u", "matrix": [5, 9], "w": 1, "x": 9.5, "y": 5.25 },
-        { "label": "1u", "matrix": [5, 10], "w": 1, "x": 10.5, "y": 5.25 },
-        { "label": "1u", "matrix": [11, 0], "w": 1, "x": 11.5, "y": 5.25 },
-        { "label": "1u", "matrix": [11, 1], "w": 1, "x": 12.5, "y": 5.25 },
-        { "label": "Alt", "matrix": [11, 2], "w": 1, "x": 13.5, "y": 5.25 },
-        { "label": "Win", "matrix": [11, 3], "w": 1, "x": 14.5, "y": 5.25 },
-        { "label": "Menu", "matrix": [11, 4], "w": 1, "x": 15.5, "y": 5.25 },
-        { "label": "Ctrl", "matrix": [11, 5], "w": 1, "x": 16.5, "y": 5.25 },
-        { "label": "\\u2190", "matrix": [10, 6], "w": 1, "x": 17.75, "y": 5.5 },
-        { "label": "\\u2193", "matrix": [11, 6], "w": 1, "x": 18.75, "y": 5.5 },
-        { "label": "\\u2192", "matrix": [11, 7], "w": 1, "x": 19.75, "y": 5.5 },
-        { "label": "0", "matrix": [11, 8], "w": 1, "x": 21, "y": 5.25 },
-        { "label": ".", "matrix": [11, 9], "w": 1, "x": 22, "y": 5.25 }
+        { "label": "\\u2191", "matrix": [9, 6], "x": 18.75, "y": 4.5 },
+        { "label": "1", "matrix": [10, 7], "x": 20, "y": 4.25 },
+        { "label": "2", "matrix": [10, 8], "x": 21, "y": 4.25 },
+        { "label": "3", "matrix": [10, 9], "x": 22, "y": 4.25 },
+        { "h": 2, "label": "Enter", "matrix": [10, 10], "x": 23, "y": 4.25 },
+        { "label": "0", "matrix": [5, 1], "x": 1, "y": 5.25 },
+        { "label": ".", "matrix": [5, 2], "x": 2, "y": 5.25 },
+        { "label": "\\u2190", "matrix": [5, 3], "x": 3.25, "y": 5.5 },
+        { "label": "\\u2193", "matrix": [5, 4], "x": 4.25, "y": 5.5 },
+        { "label": "\\u2192", "matrix": [5, 5], "x": 5.25, "y": 5.5 },
+        { "label": "Ctrl", "matrix": [5, 6], "x": 6.5, "y": 5.25 },
+        { "label": "Win", "matrix": [5, 7], "x": 7.5, "y": 5.25 },
+        { "label": "Alt", "matrix": [5, 8], "x": 8.5, "y": 5.25 },
+        { "label": "1u", "matrix": [5, 9], "x": 9.5, "y": 5.25 },
+        { "label": "1u", "matrix": [5, 10], "x": 10.5, "y": 5.25 },
+        { "label": "1u", "matrix": [11, 0], "x": 11.5, "y": 5.25 },
+        { "label": "1u", "matrix": [11, 1], "x": 12.5, "y": 5.25 },
+        { "label": "Alt", "matrix": [11, 2], "x": 13.5, "y": 5.25 },
+        { "label": "Win", "matrix": [11, 3], "x": 14.5, "y": 5.25 },
+        { "label": "Menu", "matrix": [11, 4], "x": 15.5, "y": 5.25 },
+        { "label": "Ctrl", "matrix": [11, 5], "x": 16.5, "y": 5.25 },
+        { "label": "\\u2190", "matrix": [10, 6], "x": 17.75, "y": 5.5 },
+        { "label": "\\u2193", "matrix": [11, 6], "x": 18.75, "y": 5.5 },
+        { "label": "\\u2192", "matrix": [11, 7], "x": 19.75, "y": 5.5 },
+        { "label": "0", "matrix": [11, 8], "x": 21, "y": 5.25 },
+        { "label": ".", "matrix": [11, 9], "x": 22, "y": 5.25 }
       ]
     }
   }
diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json
index 0eebbabb6d..f2922a239a 100644
--- a/keyboards/clueboard/2x1800/2019/info.json
+++ b/keyboards/clueboard/2x1800/2019/info.json
@@ -41,1198 +41,1198 @@
   "layouts": {
     "LAYOUT_1u_ansi": {
       "layout": [
-        { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
-        { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 },
-        { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 },
+        { "matrix": [12, 3], "x": 3, "y": 0 },
+        { "matrix": [12, 4], "x": 4, "y": 0 },
+        { "matrix": [12, 9], "x": 19, "y": 0 },
+        { "matrix": [12, 10], "x": 20, "y": 0 },
+        { "matrix": [0, 0], "x": 0, "y": 1.5 },
+        { "matrix": [0, 1], "x": 1, "y": 1.5 },
+        { "matrix": [0, 2], "x": 2, "y": 1.5 },
+        { "matrix": [0, 3], "x": 3, "y": 1.5 },
+        { "matrix": [0, 4], "x": 4.75, "y": 1.5 },
+        { "matrix": [0, 6], "x": 6.25, "y": 1.5 },
+        { "matrix": [0, 7], "x": 7.25, "y": 1.5 },
+        { "matrix": [0, 8], "x": 8.25, "y": 1.5 },
+        { "matrix": [0, 9], "x": 9.25, "y": 1.5 },
+        { "matrix": [0, 10], "x": 10.75, "y": 1.5 },
+        { "matrix": [6, 0], "x": 11.75, "y": 1.5 },
+        { "matrix": [6, 1], "x": 12.75, "y": 1.5 },
+        { "matrix": [6, 2], "x": 13.75, "y": 1.5 },
+        { "matrix": [6, 3], "x": 15.25, "y": 1.5 },
+        { "matrix": [6, 4], "x": 16.25, "y": 1.5 },
+        { "matrix": [6, 5], "x": 17.25, "y": 1.5 },
+        { "matrix": [6, 6], "x": 18.25, "y": 1.5 },
+        { "matrix": [6, 7], "x": 20, "y": 1.5 },
+        { "matrix": [6, 8], "x": 21, "y": 1.5 },
+        { "matrix": [6, 9], "x": 22, "y": 1.5 },
+        { "matrix": [6, 10], "x": 23, "y": 1.5 },
+        { "matrix": [1, 0], "x": 0, "y": 2.75 },
+        { "matrix": [1, 1], "x": 1, "y": 2.75 },
+        { "matrix": [1, 2], "x": 2, "y": 2.75 },
+        { "matrix": [1, 3], "x": 3, "y": 2.75 },
+        { "matrix": [1, 4], "x": 4.5, "y": 2.75 },
+        { "matrix": [1, 5], "x": 5.5, "y": 2.75 },
+        { "matrix": [1, 6], "x": 6.5, "y": 2.75 },
+        { "matrix": [1, 7], "x": 7.5, "y": 2.75 },
+        { "matrix": [1, 8], "x": 8.5, "y": 2.75 },
+        { "matrix": [1, 9], "x": 9.5, "y": 2.75 },
+        { "matrix": [1, 10], "x": 10.5, "y": 2.75 },
+        { "matrix": [7, 0], "x": 11.5, "y": 2.75 },
+        { "matrix": [7, 1], "x": 12.5, "y": 2.75 },
+        { "matrix": [7, 2], "x": 13.5, "y": 2.75 },
+        { "matrix": [7, 3], "x": 14.5, "y": 2.75 },
+        { "matrix": [7, 4], "x": 15.5, "y": 2.75 },
+        { "matrix": [7, 5], "x": 16.5, "y": 2.75 },
         { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 },
+        { "matrix": [7, 7], "x": 20, "y": 2.75 },
+        { "matrix": [7, 8], "x": 21, "y": 2.75 },
+        { "matrix": [7, 9], "x": 22, "y": 2.75 },
+        { "matrix": [7, 10], "x": 23, "y": 2.75 },
+        { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 },
+        { "matrix": [2, 1], "x": 1, "y": 3.75 },
+        { "matrix": [2, 2], "x": 2, "y": 3.75 },
+        { "matrix": [2, 3], "x": 3, "y": 3.75 },
         { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 },
+        { "matrix": [2, 5], "x": 6, "y": 3.75 },
+        { "matrix": [2, 6], "x": 7, "y": 3.75 },
+        { "matrix": [2, 7], "x": 8, "y": 3.75 },
+        { "matrix": [2, 8], "x": 9, "y": 3.75 },
+        { "matrix": [2, 9], "x": 10, "y": 3.75 },
+        { "matrix": [2, 10], "x": 11, "y": 3.75 },
+        { "matrix": [8, 0], "x": 12, "y": 3.75 },
+        { "matrix": [8, 1], "x": 13, "y": 3.75 },
+        { "matrix": [8, 2], "x": 14, "y": 3.75 },
+        { "matrix": [8, 3], "x": 15, "y": 3.75 },
+        { "matrix": [8, 4], "x": 16, "y": 3.75 },
+        { "matrix": [8, 5], "x": 17, "y": 3.75 },
         { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 3.75 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 },
+        { "matrix": [8, 7], "x": 20, "y": 3.75 },
+        { "matrix": [8, 8], "x": 21, "y": 3.75 },
+        { "matrix": [8, 9], "x": 22, "y": 3.75 },
+        { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 },
+        { "matrix": [3, 1], "x": 1, "y": 4.75 },
+        { "matrix": [3, 2], "x": 2, "y": 4.75 },
+        { "matrix": [3, 3], "x": 3, "y": 4.75 },
         { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 },
+        { "matrix": [3, 5], "x": 6.25, "y": 4.75 },
+        { "matrix": [3, 6], "x": 7.25, "y": 4.75 },
+        { "matrix": [3, 7], "x": 8.25, "y": 4.75 },
+        { "matrix": [3, 8], "x": 9.25, "y": 4.75 },
+        { "matrix": [3, 9], "x": 10.25, "y": 4.75 },
+        { "matrix": [3, 10], "x": 11.25, "y": 4.75 },
+        { "matrix": [9, 0], "x": 12.25, "y": 4.75 },
+        { "matrix": [9, 1], "x": 13.25, "y": 4.75 },
+        { "matrix": [9, 2], "x": 14.25, "y": 4.75 },
+        { "matrix": [9, 3], "x": 15.25, "y": 4.75 },
+        { "matrix": [9, 4], "x": 16.25, "y": 4.75 },
         { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 4.75 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 },
-        { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 },
+        { "matrix": [9, 7], "x": 20, "y": 4.75 },
+        { "matrix": [9, 8], "x": 21, "y": 4.75 },
+        { "matrix": [9, 9], "x": 22, "y": 4.75 },
+        { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 },
+        { "matrix": [4, 1], "x": 1, "y": 5.75 },
+        { "matrix": [4, 2], "x": 2, "y": 5.75 },
+        { "matrix": [4, 3], "x": 3, "y": 5.75 },
+        { "matrix": [4, 4], "x": 4.25, "y": 6 },
         { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 },
-        { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 },
-        { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 },
-        { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 },
-        { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 },
-        { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 },
-        { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 },
-        { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 },
-        { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 },
-        { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 },
-        { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 },
+        { "matrix": [4, 6], "x": 6.75, "y": 5.75 },
+        { "matrix": [4, 7], "x": 7.75, "y": 5.75 },
+        { "matrix": [4, 8], "x": 8.75, "y": 5.75 },
+        { "matrix": [4, 9], "x": 9.75, "y": 5.75 },
+        { "matrix": [4, 10], "x": 10.75, "y": 5.75 },
+        { "matrix": [10, 0], "x": 11.75, "y": 5.75 },
+        { "matrix": [10, 1], "x": 12.75, "y": 5.75 },
+        { "matrix": [10, 2], "x": 13.75, "y": 5.75 },
+        { "matrix": [10, 3], "x": 14.75, "y": 5.75 },
+        { "matrix": [10, 4], "x": 15.75, "y": 5.75 },
         { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 },
-        { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 },
-        { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 },
-        { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 },
-        { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 },
-        { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 },
-        { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 },
-        { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 },
-        { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 },
-        { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 },
-        { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 },
-        { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 },
-        { "matrix": [5, 9], "w": 1, "x": 9.5, "y": 6.75 },
-        { "matrix": [5, 10], "w": 1, "x": 10.5, "y": 6.75 },
-        { "matrix": [11, 0], "w": 1, "x": 11.5, "y": 6.75 },
-        { "matrix": [11, 1], "w": 1, "x": 12.5, "y": 6.75 },
-        { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 },
-        { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 },
-        { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 },
-        { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 },
-        { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 },
-        { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 },
-        { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 },
-        { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 },
-        { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 }
+        { "matrix": [9, 6], "x": 18.75, "y": 6 },
+        { "matrix": [10, 7], "x": 20, "y": 5.75 },
+        { "matrix": [10, 8], "x": 21, "y": 5.75 },
+        { "matrix": [10, 9], "x": 22, "y": 5.75 },
+        { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 },
+        { "matrix": [5, 1], "x": 1, "y": 6.75 },
+        { "matrix": [5, 2], "x": 2, "y": 6.75 },
+        { "matrix": [5, 3], "x": 3.25, "y": 7 },
+        { "matrix": [5, 4], "x": 4.25, "y": 7 },
+        { "matrix": [5, 5], "x": 5.25, "y": 7 },
+        { "matrix": [5, 6], "x": 6.5, "y": 6.75 },
+        { "matrix": [5, 7], "x": 7.5, "y": 6.75 },
+        { "matrix": [5, 8], "x": 8.5, "y": 6.75 },
+        { "matrix": [5, 9], "x": 9.5, "y": 6.75 },
+        { "matrix": [5, 10], "x": 10.5, "y": 6.75 },
+        { "matrix": [11, 0], "x": 11.5, "y": 6.75 },
+        { "matrix": [11, 1], "x": 12.5, "y": 6.75 },
+        { "matrix": [11, 2], "x": 13.5, "y": 6.75 },
+        { "matrix": [11, 3], "x": 14.5, "y": 6.75 },
+        { "matrix": [11, 4], "x": 15.5, "y": 6.75 },
+        { "matrix": [11, 5], "x": 16.5, "y": 6.75 },
+        { "matrix": [10, 6], "x": 17.75, "y": 7 },
+        { "matrix": [11, 6], "x": 18.75, "y": 7 },
+        { "matrix": [11, 7], "x": 19.75, "y": 7 },
+        { "matrix": [11, 8], "x": 21, "y": 6.75 },
+        { "matrix": [11, 9], "x": 22, "y": 6.75 }
       ]
     },
     "LAYOUT_1u_iso": {
       "layout": [
-        { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
-        { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 },
-        { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 },
+        { "matrix": [12, 3], "x": 3, "y": 0 },
+        { "matrix": [12, 4], "x": 4, "y": 0 },
+        { "matrix": [12, 9], "x": 19, "y": 0 },
+        { "matrix": [12, 10], "x": 20, "y": 0 },
+        { "matrix": [0, 0], "x": 0, "y": 1.5 },
+        { "matrix": [0, 1], "x": 1, "y": 1.5 },
+        { "matrix": [0, 2], "x": 2, "y": 1.5 },
+        { "matrix": [0, 3], "x": 3, "y": 1.5 },
+        { "matrix": [0, 4], "x": 4.75, "y": 1.5 },
+        { "matrix": [0, 6], "x": 6.25, "y": 1.5 },
+        { "matrix": [0, 7], "x": 7.25, "y": 1.5 },
+        { "matrix": [0, 8], "x": 8.25, "y": 1.5 },
+        { "matrix": [0, 9], "x": 9.25, "y": 1.5 },
+        { "matrix": [0, 10], "x": 10.75, "y": 1.5 },
+        { "matrix": [6, 0], "x": 11.75, "y": 1.5 },
+        { "matrix": [6, 1], "x": 12.75, "y": 1.5 },
+        { "matrix": [6, 2], "x": 13.75, "y": 1.5 },
+        { "matrix": [6, 3], "x": 15.25, "y": 1.5 },
+        { "matrix": [6, 4], "x": 16.25, "y": 1.5 },
+        { "matrix": [6, 5], "x": 17.25, "y": 1.5 },
+        { "matrix": [6, 6], "x": 18.25, "y": 1.5 },
+        { "matrix": [6, 7], "x": 20, "y": 1.5 },
+        { "matrix": [6, 8], "x": 21, "y": 1.5 },
+        { "matrix": [6, 9], "x": 22, "y": 1.5 },
+        { "matrix": [6, 10], "x": 23, "y": 1.5 },
+        { "matrix": [1, 0], "x": 0, "y": 2.75 },
+        { "matrix": [1, 1], "x": 1, "y": 2.75 },
+        { "matrix": [1, 2], "x": 2, "y": 2.75 },
+        { "matrix": [1, 3], "x": 3, "y": 2.75 },
+        { "matrix": [1, 4], "x": 4.5, "y": 2.75 },
+        { "matrix": [1, 5], "x": 5.5, "y": 2.75 },
+        { "matrix": [1, 6], "x": 6.5, "y": 2.75 },
+        { "matrix": [1, 7], "x": 7.5, "y": 2.75 },
+        { "matrix": [1, 8], "x": 8.5, "y": 2.75 },
+        { "matrix": [1, 9], "x": 9.5, "y": 2.75 },
+        { "matrix": [1, 10], "x": 10.5, "y": 2.75 },
+        { "matrix": [7, 0], "x": 11.5, "y": 2.75 },
+        { "matrix": [7, 1], "x": 12.5, "y": 2.75 },
+        { "matrix": [7, 2], "x": 13.5, "y": 2.75 },
+        { "matrix": [7, 3], "x": 14.5, "y": 2.75 },
+        { "matrix": [7, 4], "x": 15.5, "y": 2.75 },
+        { "matrix": [7, 5], "x": 16.5, "y": 2.75 },
         { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 },
+        { "matrix": [7, 7], "x": 20, "y": 2.75 },
+        { "matrix": [7, 8], "x": 21, "y": 2.75 },
+        { "matrix": [7, 9], "x": 22, "y": 2.75 },
+        { "matrix": [7, 10], "x": 23, "y": 2.75 },
+        { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 },
+        { "matrix": [2, 1], "x": 1, "y": 3.75 },
+        { "matrix": [2, 2], "x": 2, "y": 3.75 },
+        { "matrix": [2, 3], "x": 3, "y": 3.75 },
         { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 },
+        { "matrix": [2, 5], "x": 6, "y": 3.75 },
+        { "matrix": [2, 6], "x": 7, "y": 3.75 },
+        { "matrix": [2, 7], "x": 8, "y": 3.75 },
+        { "matrix": [2, 8], "x": 9, "y": 3.75 },
+        { "matrix": [2, 9], "x": 10, "y": 3.75 },
+        { "matrix": [2, 10], "x": 11, "y": 3.75 },
+        { "matrix": [8, 0], "x": 12, "y": 3.75 },
+        { "matrix": [8, 1], "x": 13, "y": 3.75 },
+        { "matrix": [8, 2], "x": 14, "y": 3.75 },
+        { "matrix": [8, 3], "x": 15, "y": 3.75 },
+        { "matrix": [8, 4], "x": 16, "y": 3.75 },
+        { "matrix": [8, 5], "x": 17, "y": 3.75 },
+        { "matrix": [8, 7], "x": 20, "y": 3.75 },
+        { "matrix": [8, 8], "x": 21, "y": 3.75 },
+        { "matrix": [8, 9], "x": 22, "y": 3.75 },
+        { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 },
+        { "matrix": [3, 1], "x": 1, "y": 4.75 },
+        { "matrix": [3, 2], "x": 2, "y": 4.75 },
+        { "matrix": [3, 3], "x": 3, "y": 4.75 },
         { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 },
-        { "matrix": [9, 10], "w": 1, "x": 17.25, "y": 4.75 },
+        { "matrix": [3, 5], "x": 6.25, "y": 4.75 },
+        { "matrix": [3, 6], "x": 7.25, "y": 4.75 },
+        { "matrix": [3, 7], "x": 8.25, "y": 4.75 },
+        { "matrix": [3, 8], "x": 9.25, "y": 4.75 },
+        { "matrix": [3, 9], "x": 10.25, "y": 4.75 },
+        { "matrix": [3, 10], "x": 11.25, "y": 4.75 },
+        { "matrix": [9, 0], "x": 12.25, "y": 4.75 },
+        { "matrix": [9, 1], "x": 13.25, "y": 4.75 },
+        { "matrix": [9, 2], "x": 14.25, "y": 4.75 },
+        { "matrix": [9, 3], "x": 15.25, "y": 4.75 },
+        { "matrix": [9, 4], "x": 16.25, "y": 4.75 },
+        { "matrix": [9, 10], "x": 17.25, "y": 4.75 },
         { "h": 2, "matrix": [9, 5], "w": 1.25, "x": 18.25, "y": 3.75 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 },
-        { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 },
+        { "matrix": [9, 7], "x": 20, "y": 4.75 },
+        { "matrix": [9, 8], "x": 21, "y": 4.75 },
+        { "matrix": [9, 9], "x": 22, "y": 4.75 },
+        { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 },
+        { "matrix": [4, 1], "x": 1, "y": 5.75 },
+        { "matrix": [4, 2], "x": 2, "y": 5.75 },
+        { "matrix": [4, 3], "x": 3, "y": 5.75 },
+        { "matrix": [4, 4], "x": 4.25, "y": 6 },
         { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 },
-        { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 },
-        { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 },
-        { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 },
-        { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 },
-        { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 },
-        { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 },
-        { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 },
-        { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 },
-        { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 },
-        { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 },
+        { "matrix": [4, 6], "x": 6.75, "y": 5.75 },
+        { "matrix": [4, 7], "x": 7.75, "y": 5.75 },
+        { "matrix": [4, 8], "x": 8.75, "y": 5.75 },
+        { "matrix": [4, 9], "x": 9.75, "y": 5.75 },
+        { "matrix": [4, 10], "x": 10.75, "y": 5.75 },
+        { "matrix": [10, 0], "x": 11.75, "y": 5.75 },
+        { "matrix": [10, 1], "x": 12.75, "y": 5.75 },
+        { "matrix": [10, 2], "x": 13.75, "y": 5.75 },
+        { "matrix": [10, 3], "x": 14.75, "y": 5.75 },
+        { "matrix": [10, 4], "x": 15.75, "y": 5.75 },
         { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 },
-        { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 },
-        { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 },
-        { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 },
-        { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 },
-        { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 },
-        { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 },
-        { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 },
-        { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 },
-        { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 },
-        { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 },
-        { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 },
-        { "matrix": [5, 9], "w": 1, "x": 9.5, "y": 6.75 },
-        { "matrix": [5, 10], "w": 1, "x": 10.5, "y": 6.75 },
-        { "matrix": [11, 0], "w": 1, "x": 11.5, "y": 6.75 },
-        { "matrix": [11, 1], "w": 1, "x": 12.5, "y": 6.75 },
-        { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 },
-        { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 },
-        { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 },
-        { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 },
-        { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 },
-        { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 },
-        { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 },
-        { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 },
-        { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 }
+        { "matrix": [9, 6], "x": 18.75, "y": 6 },
+        { "matrix": [10, 7], "x": 20, "y": 5.75 },
+        { "matrix": [10, 8], "x": 21, "y": 5.75 },
+        { "matrix": [10, 9], "x": 22, "y": 5.75 },
+        { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 },
+        { "matrix": [5, 1], "x": 1, "y": 6.75 },
+        { "matrix": [5, 2], "x": 2, "y": 6.75 },
+        { "matrix": [5, 3], "x": 3.25, "y": 7 },
+        { "matrix": [5, 4], "x": 4.25, "y": 7 },
+        { "matrix": [5, 5], "x": 5.25, "y": 7 },
+        { "matrix": [5, 6], "x": 6.5, "y": 6.75 },
+        { "matrix": [5, 7], "x": 7.5, "y": 6.75 },
+        { "matrix": [5, 8], "x": 8.5, "y": 6.75 },
+        { "matrix": [5, 9], "x": 9.5, "y": 6.75 },
+        { "matrix": [5, 10], "x": 10.5, "y": 6.75 },
+        { "matrix": [11, 0], "x": 11.5, "y": 6.75 },
+        { "matrix": [11, 1], "x": 12.5, "y": 6.75 },
+        { "matrix": [11, 2], "x": 13.5, "y": 6.75 },
+        { "matrix": [11, 3], "x": 14.5, "y": 6.75 },
+        { "matrix": [11, 4], "x": 15.5, "y": 6.75 },
+        { "matrix": [11, 5], "x": 16.5, "y": 6.75 },
+        { "matrix": [10, 6], "x": 17.75, "y": 7 },
+        { "matrix": [11, 6], "x": 18.75, "y": 7 },
+        { "matrix": [11, 7], "x": 19.75, "y": 7 },
+        { "matrix": [11, 8], "x": 21, "y": 6.75 },
+        { "matrix": [11, 9], "x": 22, "y": 6.75 }
       ]
     },
     "LAYOUT_2u_ansi": {
       "layout": [
-        { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
-        { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 },
-        { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 },
+        { "matrix": [12, 3], "x": 3, "y": 0 },
+        { "matrix": [12, 4], "x": 4, "y": 0 },
+        { "matrix": [12, 9], "x": 19, "y": 0 },
+        { "matrix": [12, 10], "x": 20, "y": 0 },
+        { "matrix": [0, 0], "x": 0, "y": 1.5 },
+        { "matrix": [0, 1], "x": 1, "y": 1.5 },
+        { "matrix": [0, 2], "x": 2, "y": 1.5 },
+        { "matrix": [0, 3], "x": 3, "y": 1.5 },
+        { "matrix": [0, 4], "x": 4.75, "y": 1.5 },
+        { "matrix": [0, 6], "x": 6.25, "y": 1.5 },
+        { "matrix": [0, 7], "x": 7.25, "y": 1.5 },
+        { "matrix": [0, 8], "x": 8.25, "y": 1.5 },
+        { "matrix": [0, 9], "x": 9.25, "y": 1.5 },
+        { "matrix": [0, 10], "x": 10.75, "y": 1.5 },
+        { "matrix": [6, 0], "x": 11.75, "y": 1.5 },
+        { "matrix": [6, 1], "x": 12.75, "y": 1.5 },
+        { "matrix": [6, 2], "x": 13.75, "y": 1.5 },
+        { "matrix": [6, 3], "x": 15.25, "y": 1.5 },
+        { "matrix": [6, 4], "x": 16.25, "y": 1.5 },
+        { "matrix": [6, 5], "x": 17.25, "y": 1.5 },
+        { "matrix": [6, 6], "x": 18.25, "y": 1.5 },
+        { "matrix": [6, 7], "x": 20, "y": 1.5 },
+        { "matrix": [6, 8], "x": 21, "y": 1.5 },
+        { "matrix": [6, 9], "x": 22, "y": 1.5 },
+        { "matrix": [6, 10], "x": 23, "y": 1.5 },
+        { "matrix": [1, 0], "x": 0, "y": 2.75 },
+        { "matrix": [1, 1], "x": 1, "y": 2.75 },
+        { "matrix": [1, 2], "x": 2, "y": 2.75 },
+        { "matrix": [1, 3], "x": 3, "y": 2.75 },
+        { "matrix": [1, 4], "x": 4.5, "y": 2.75 },
+        { "matrix": [1, 5], "x": 5.5, "y": 2.75 },
+        { "matrix": [1, 6], "x": 6.5, "y": 2.75 },
+        { "matrix": [1, 7], "x": 7.5, "y": 2.75 },
+        { "matrix": [1, 8], "x": 8.5, "y": 2.75 },
+        { "matrix": [1, 9], "x": 9.5, "y": 2.75 },
+        { "matrix": [1, 10], "x": 10.5, "y": 2.75 },
+        { "matrix": [7, 0], "x": 11.5, "y": 2.75 },
+        { "matrix": [7, 1], "x": 12.5, "y": 2.75 },
+        { "matrix": [7, 2], "x": 13.5, "y": 2.75 },
+        { "matrix": [7, 3], "x": 14.5, "y": 2.75 },
+        { "matrix": [7, 4], "x": 15.5, "y": 2.75 },
+        { "matrix": [7, 5], "x": 16.5, "y": 2.75 },
         { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 },
+        { "matrix": [7, 7], "x": 20, "y": 2.75 },
+        { "matrix": [7, 8], "x": 21, "y": 2.75 },
+        { "matrix": [7, 9], "x": 22, "y": 2.75 },
+        { "matrix": [7, 10], "x": 23, "y": 2.75 },
+        { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 },
+        { "matrix": [2, 1], "x": 1, "y": 3.75 },
+        { "matrix": [2, 2], "x": 2, "y": 3.75 },
+        { "matrix": [2, 3], "x": 3, "y": 3.75 },
         { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 },
+        { "matrix": [2, 5], "x": 6, "y": 3.75 },
+        { "matrix": [2, 6], "x": 7, "y": 3.75 },
+        { "matrix": [2, 7], "x": 8, "y": 3.75 },
+        { "matrix": [2, 8], "x": 9, "y": 3.75 },
+        { "matrix": [2, 9], "x": 10, "y": 3.75 },
+        { "matrix": [2, 10], "x": 11, "y": 3.75 },
+        { "matrix": [8, 0], "x": 12, "y": 3.75 },
+        { "matrix": [8, 1], "x": 13, "y": 3.75 },
+        { "matrix": [8, 2], "x": 14, "y": 3.75 },
+        { "matrix": [8, 3], "x": 15, "y": 3.75 },
+        { "matrix": [8, 4], "x": 16, "y": 3.75 },
+        { "matrix": [8, 5], "x": 17, "y": 3.75 },
         { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 3.75 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 },
+        { "matrix": [8, 7], "x": 20, "y": 3.75 },
+        { "matrix": [8, 8], "x": 21, "y": 3.75 },
+        { "matrix": [8, 9], "x": 22, "y": 3.75 },
+        { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 },
+        { "matrix": [3, 1], "x": 1, "y": 4.75 },
+        { "matrix": [3, 2], "x": 2, "y": 4.75 },
+        { "matrix": [3, 3], "x": 3, "y": 4.75 },
         { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 },
+        { "matrix": [3, 5], "x": 6.25, "y": 4.75 },
+        { "matrix": [3, 6], "x": 7.25, "y": 4.75 },
+        { "matrix": [3, 7], "x": 8.25, "y": 4.75 },
+        { "matrix": [3, 8], "x": 9.25, "y": 4.75 },
+        { "matrix": [3, 9], "x": 10.25, "y": 4.75 },
+        { "matrix": [3, 10], "x": 11.25, "y": 4.75 },
+        { "matrix": [9, 0], "x": 12.25, "y": 4.75 },
+        { "matrix": [9, 1], "x": 13.25, "y": 4.75 },
+        { "matrix": [9, 2], "x": 14.25, "y": 4.75 },
+        { "matrix": [9, 3], "x": 15.25, "y": 4.75 },
+        { "matrix": [9, 4], "x": 16.25, "y": 4.75 },
         { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 4.75 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 },
-        { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 },
+        { "matrix": [9, 7], "x": 20, "y": 4.75 },
+        { "matrix": [9, 8], "x": 21, "y": 4.75 },
+        { "matrix": [9, 9], "x": 22, "y": 4.75 },
+        { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 },
+        { "matrix": [4, 1], "x": 1, "y": 5.75 },
+        { "matrix": [4, 2], "x": 2, "y": 5.75 },
+        { "matrix": [4, 3], "x": 3, "y": 5.75 },
+        { "matrix": [4, 4], "x": 4.25, "y": 6 },
         { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 },
-        { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 },
-        { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 },
-        { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 },
-        { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 },
-        { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 },
-        { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 },
-        { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 },
-        { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 },
-        { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 },
-        { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 },
+        { "matrix": [4, 6], "x": 6.75, "y": 5.75 },
+        { "matrix": [4, 7], "x": 7.75, "y": 5.75 },
+        { "matrix": [4, 8], "x": 8.75, "y": 5.75 },
+        { "matrix": [4, 9], "x": 9.75, "y": 5.75 },
+        { "matrix": [4, 10], "x": 10.75, "y": 5.75 },
+        { "matrix": [10, 0], "x": 11.75, "y": 5.75 },
+        { "matrix": [10, 1], "x": 12.75, "y": 5.75 },
+        { "matrix": [10, 2], "x": 13.75, "y": 5.75 },
+        { "matrix": [10, 3], "x": 14.75, "y": 5.75 },
+        { "matrix": [10, 4], "x": 15.75, "y": 5.75 },
         { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 },
-        { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 },
-        { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 },
-        { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 },
-        { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 },
-        { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 },
-        { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 },
-        { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 },
-        { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 },
-        { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 },
-        { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 },
-        { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 },
-        { "matrix": [5, 9], "w": 1, "x": 9.5, "y": 6.75 },
+        { "matrix": [9, 6], "x": 18.75, "y": 6 },
+        { "matrix": [10, 7], "x": 20, "y": 5.75 },
+        { "matrix": [10, 8], "x": 21, "y": 5.75 },
+        { "matrix": [10, 9], "x": 22, "y": 5.75 },
+        { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 },
+        { "matrix": [5, 1], "x": 1, "y": 6.75 },
+        { "matrix": [5, 2], "x": 2, "y": 6.75 },
+        { "matrix": [5, 3], "x": 3.25, "y": 7 },
+        { "matrix": [5, 4], "x": 4.25, "y": 7 },
+        { "matrix": [5, 5], "x": 5.25, "y": 7 },
+        { "matrix": [5, 6], "x": 6.5, "y": 6.75 },
+        { "matrix": [5, 7], "x": 7.5, "y": 6.75 },
+        { "matrix": [5, 8], "x": 8.5, "y": 6.75 },
+        { "matrix": [5, 9], "x": 9.5, "y": 6.75 },
         { "matrix": [11, 0], "w": 2, "x": 10.5, "y": 6.75 },
-        { "matrix": [11, 1], "w": 1, "x": 12.5, "y": 6.75 },
-        { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 },
-        { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 },
-        { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 },
-        { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 },
-        { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 },
-        { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 },
-        { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 },
-        { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 },
-        { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 }
+        { "matrix": [11, 1], "x": 12.5, "y": 6.75 },
+        { "matrix": [11, 2], "x": 13.5, "y": 6.75 },
+        { "matrix": [11, 3], "x": 14.5, "y": 6.75 },
+        { "matrix": [11, 4], "x": 15.5, "y": 6.75 },
+        { "matrix": [11, 5], "x": 16.5, "y": 6.75 },
+        { "matrix": [10, 6], "x": 17.75, "y": 7 },
+        { "matrix": [11, 6], "x": 18.75, "y": 7 },
+        { "matrix": [11, 7], "x": 19.75, "y": 7 },
+        { "matrix": [11, 8], "x": 21, "y": 6.75 },
+        { "matrix": [11, 9], "x": 22, "y": 6.75 }
       ]
     },
     "LAYOUT_2u_iso": {
       "layout": [
-        { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
-        { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 },
-        { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 },
+        { "matrix": [12, 3], "x": 3, "y": 0 },
+        { "matrix": [12, 4], "x": 4, "y": 0 },
+        { "matrix": [12, 9], "x": 19, "y": 0 },
+        { "matrix": [12, 10], "x": 20, "y": 0 },
+        { "matrix": [0, 0], "x": 0, "y": 1.5 },
+        { "matrix": [0, 1], "x": 1, "y": 1.5 },
+        { "matrix": [0, 2], "x": 2, "y": 1.5 },
+        { "matrix": [0, 3], "x": 3, "y": 1.5 },
+        { "matrix": [0, 4], "x": 4.75, "y": 1.5 },
+        { "matrix": [0, 6], "x": 6.25, "y": 1.5 },
+        { "matrix": [0, 7], "x": 7.25, "y": 1.5 },
+        { "matrix": [0, 8], "x": 8.25, "y": 1.5 },
+        { "matrix": [0, 9], "x": 9.25, "y": 1.5 },
+        { "matrix": [0, 10], "x": 10.75, "y": 1.5 },
+        { "matrix": [6, 0], "x": 11.75, "y": 1.5 },
+        { "matrix": [6, 1], "x": 12.75, "y": 1.5 },
+        { "matrix": [6, 2], "x": 13.75, "y": 1.5 },
+        { "matrix": [6, 3], "x": 15.25, "y": 1.5 },
+        { "matrix": [6, 4], "x": 16.25, "y": 1.5 },
+        { "matrix": [6, 5], "x": 17.25, "y": 1.5 },
+        { "matrix": [6, 6], "x": 18.25, "y": 1.5 },
+        { "matrix": [6, 7], "x": 20, "y": 1.5 },
+        { "matrix": [6, 8], "x": 21, "y": 1.5 },
+        { "matrix": [6, 9], "x": 22, "y": 1.5 },
+        { "matrix": [6, 10], "x": 23, "y": 1.5 },
+        { "matrix": [1, 0], "x": 0, "y": 2.75 },
+        { "matrix": [1, 1], "x": 1, "y": 2.75 },
+        { "matrix": [1, 2], "x": 2, "y": 2.75 },
+        { "matrix": [1, 3], "x": 3, "y": 2.75 },
+        { "matrix": [1, 4], "x": 4.5, "y": 2.75 },
+        { "matrix": [1, 5], "x": 5.5, "y": 2.75 },
+        { "matrix": [1, 6], "x": 6.5, "y": 2.75 },
+        { "matrix": [1, 7], "x": 7.5, "y": 2.75 },
+        { "matrix": [1, 8], "x": 8.5, "y": 2.75 },
+        { "matrix": [1, 9], "x": 9.5, "y": 2.75 },
+        { "matrix": [1, 10], "x": 10.5, "y": 2.75 },
+        { "matrix": [7, 0], "x": 11.5, "y": 2.75 },
+        { "matrix": [7, 1], "x": 12.5, "y": 2.75 },
+        { "matrix": [7, 2], "x": 13.5, "y": 2.75 },
+        { "matrix": [7, 3], "x": 14.5, "y": 2.75 },
+        { "matrix": [7, 4], "x": 15.5, "y": 2.75 },
+        { "matrix": [7, 5], "x": 16.5, "y": 2.75 },
         { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 },
+        { "matrix": [7, 7], "x": 20, "y": 2.75 },
+        { "matrix": [7, 8], "x": 21, "y": 2.75 },
+        { "matrix": [7, 9], "x": 22, "y": 2.75 },
+        { "matrix": [7, 10], "x": 23, "y": 2.75 },
+        { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 },
+        { "matrix": [2, 1], "x": 1, "y": 3.75 },
+        { "matrix": [2, 2], "x": 2, "y": 3.75 },
+        { "matrix": [2, 3], "x": 3, "y": 3.75 },
         { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 },
+        { "matrix": [2, 5], "x": 6, "y": 3.75 },
+        { "matrix": [2, 6], "x": 7, "y": 3.75 },
+        { "matrix": [2, 7], "x": 8, "y": 3.75 },
+        { "matrix": [2, 8], "x": 9, "y": 3.75 },
+        { "matrix": [2, 9], "x": 10, "y": 3.75 },
+        { "matrix": [2, 10], "x": 11, "y": 3.75 },
+        { "matrix": [8, 0], "x": 12, "y": 3.75 },
+        { "matrix": [8, 1], "x": 13, "y": 3.75 },
+        { "matrix": [8, 2], "x": 14, "y": 3.75 },
+        { "matrix": [8, 3], "x": 15, "y": 3.75 },
+        { "matrix": [8, 4], "x": 16, "y": 3.75 },
+        { "matrix": [8, 5], "x": 17, "y": 3.75 },
+        { "matrix": [8, 7], "x": 20, "y": 3.75 },
+        { "matrix": [8, 8], "x": 21, "y": 3.75 },
+        { "matrix": [8, 9], "x": 22, "y": 3.75 },
+        { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 },
+        { "matrix": [3, 1], "x": 1, "y": 4.75 },
+        { "matrix": [3, 2], "x": 2, "y": 4.75 },
+        { "matrix": [3, 3], "x": 3, "y": 4.75 },
         { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 },
-        { "matrix": [9, 10], "w": 1, "x": 17.25, "y": 4.75 },
+        { "matrix": [3, 5], "x": 6.25, "y": 4.75 },
+        { "matrix": [3, 6], "x": 7.25, "y": 4.75 },
+        { "matrix": [3, 7], "x": 8.25, "y": 4.75 },
+        { "matrix": [3, 8], "x": 9.25, "y": 4.75 },
+        { "matrix": [3, 9], "x": 10.25, "y": 4.75 },
+        { "matrix": [3, 10], "x": 11.25, "y": 4.75 },
+        { "matrix": [9, 0], "x": 12.25, "y": 4.75 },
+        { "matrix": [9, 1], "x": 13.25, "y": 4.75 },
+        { "matrix": [9, 2], "x": 14.25, "y": 4.75 },
+        { "matrix": [9, 3], "x": 15.25, "y": 4.75 },
+        { "matrix": [9, 4], "x": 16.25, "y": 4.75 },
+        { "matrix": [9, 10], "x": 17.25, "y": 4.75 },
         { "h": 2, "matrix": [9, 5], "w": 1.25, "x": 18.25, "y": 3.75 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 },
-        { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 },
+        { "matrix": [9, 7], "x": 20, "y": 4.75 },
+        { "matrix": [9, 8], "x": 21, "y": 4.75 },
+        { "matrix": [9, 9], "x": 22, "y": 4.75 },
+        { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 },
+        { "matrix": [4, 1], "x": 1, "y": 5.75 },
+        { "matrix": [4, 2], "x": 2, "y": 5.75 },
+        { "matrix": [4, 3], "x": 3, "y": 5.75 },
+        { "matrix": [4, 4], "x": 4.25, "y": 6 },
         { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 },
-        { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 },
-        { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 },
-        { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 },
-        { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 },
-        { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 },
-        { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 },
-        { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 },
-        { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 },
-        { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 },
-        { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 },
+        { "matrix": [4, 6], "x": 6.75, "y": 5.75 },
+        { "matrix": [4, 7], "x": 7.75, "y": 5.75 },
+        { "matrix": [4, 8], "x": 8.75, "y": 5.75 },
+        { "matrix": [4, 9], "x": 9.75, "y": 5.75 },
+        { "matrix": [4, 10], "x": 10.75, "y": 5.75 },
+        { "matrix": [10, 0], "x": 11.75, "y": 5.75 },
+        { "matrix": [10, 1], "x": 12.75, "y": 5.75 },
+        { "matrix": [10, 2], "x": 13.75, "y": 5.75 },
+        { "matrix": [10, 3], "x": 14.75, "y": 5.75 },
+        { "matrix": [10, 4], "x": 15.75, "y": 5.75 },
         { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 },
-        { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 },
-        { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 },
-        { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 },
-        { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 },
-        { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 },
-        { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 },
-        { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 },
-        { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 },
-        { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 },
-        { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 },
-        { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 },
-        { "matrix": [5, 9], "w": 1, "x": 9.5, "y": 6.75 },
+        { "matrix": [9, 6], "x": 18.75, "y": 6 },
+        { "matrix": [10, 7], "x": 20, "y": 5.75 },
+        { "matrix": [10, 8], "x": 21, "y": 5.75 },
+        { "matrix": [10, 9], "x": 22, "y": 5.75 },
+        { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 },
+        { "matrix": [5, 1], "x": 1, "y": 6.75 },
+        { "matrix": [5, 2], "x": 2, "y": 6.75 },
+        { "matrix": [5, 3], "x": 3.25, "y": 7 },
+        { "matrix": [5, 4], "x": 4.25, "y": 7 },
+        { "matrix": [5, 5], "x": 5.25, "y": 7 },
+        { "matrix": [5, 6], "x": 6.5, "y": 6.75 },
+        { "matrix": [5, 7], "x": 7.5, "y": 6.75 },
+        { "matrix": [5, 8], "x": 8.5, "y": 6.75 },
+        { "matrix": [5, 9], "x": 9.5, "y": 6.75 },
         { "matrix": [11, 0], "w": 2, "x": 10.5, "y": 6.75 },
-        { "matrix": [11, 1], "w": 1, "x": 12.5, "y": 6.75 },
-        { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 },
-        { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 },
-        { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 },
-        { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 },
-        { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 },
-        { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 },
-        { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 },
-        { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 },
-        { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 }
+        { "matrix": [11, 1], "x": 12.5, "y": 6.75 },
+        { "matrix": [11, 2], "x": 13.5, "y": 6.75 },
+        { "matrix": [11, 3], "x": 14.5, "y": 6.75 },
+        { "matrix": [11, 4], "x": 15.5, "y": 6.75 },
+        { "matrix": [11, 5], "x": 16.5, "y": 6.75 },
+        { "matrix": [10, 6], "x": 17.75, "y": 7 },
+        { "matrix": [11, 6], "x": 18.75, "y": 7 },
+        { "matrix": [11, 7], "x": 19.75, "y": 7 },
+        { "matrix": [11, 8], "x": 21, "y": 6.75 },
+        { "matrix": [11, 9], "x": 22, "y": 6.75 }
       ]
     },
     "LAYOUT_4u_ansi": {
       "layout": [
-        { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
-        { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 },
-        { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 },
+        { "matrix": [12, 3], "x": 3, "y": 0 },
+        { "matrix": [12, 4], "x": 4, "y": 0 },
+        { "matrix": [12, 9], "x": 19, "y": 0 },
+        { "matrix": [12, 10], "x": 20, "y": 0 },
+        { "matrix": [0, 0], "x": 0, "y": 1.5 },
+        { "matrix": [0, 1], "x": 1, "y": 1.5 },
+        { "matrix": [0, 2], "x": 2, "y": 1.5 },
+        { "matrix": [0, 3], "x": 3, "y": 1.5 },
+        { "matrix": [0, 4], "x": 4.75, "y": 1.5 },
+        { "matrix": [0, 6], "x": 6.25, "y": 1.5 },
+        { "matrix": [0, 7], "x": 7.25, "y": 1.5 },
+        { "matrix": [0, 8], "x": 8.25, "y": 1.5 },
+        { "matrix": [0, 9], "x": 9.25, "y": 1.5 },
+        { "matrix": [0, 10], "x": 10.75, "y": 1.5 },
+        { "matrix": [6, 0], "x": 11.75, "y": 1.5 },
+        { "matrix": [6, 1], "x": 12.75, "y": 1.5 },
+        { "matrix": [6, 2], "x": 13.75, "y": 1.5 },
+        { "matrix": [6, 3], "x": 15.25, "y": 1.5 },
+        { "matrix": [6, 4], "x": 16.25, "y": 1.5 },
+        { "matrix": [6, 5], "x": 17.25, "y": 1.5 },
+        { "matrix": [6, 6], "x": 18.25, "y": 1.5 },
+        { "matrix": [6, 7], "x": 20, "y": 1.5 },
+        { "matrix": [6, 8], "x": 21, "y": 1.5 },
+        { "matrix": [6, 9], "x": 22, "y": 1.5 },
+        { "matrix": [6, 10], "x": 23, "y": 1.5 },
+        { "matrix": [1, 0], "x": 0, "y": 2.75 },
+        { "matrix": [1, 1], "x": 1, "y": 2.75 },
+        { "matrix": [1, 2], "x": 2, "y": 2.75 },
+        { "matrix": [1, 3], "x": 3, "y": 2.75 },
+        { "matrix": [1, 4], "x": 4.5, "y": 2.75 },
+        { "matrix": [1, 5], "x": 5.5, "y": 2.75 },
+        { "matrix": [1, 6], "x": 6.5, "y": 2.75 },
+        { "matrix": [1, 7], "x": 7.5, "y": 2.75 },
+        { "matrix": [1, 8], "x": 8.5, "y": 2.75 },
+        { "matrix": [1, 9], "x": 9.5, "y": 2.75 },
+        { "matrix": [1, 10], "x": 10.5, "y": 2.75 },
+        { "matrix": [7, 0], "x": 11.5, "y": 2.75 },
+        { "matrix": [7, 1], "x": 12.5, "y": 2.75 },
+        { "matrix": [7, 2], "x": 13.5, "y": 2.75 },
+        { "matrix": [7, 3], "x": 14.5, "y": 2.75 },
+        { "matrix": [7, 4], "x": 15.5, "y": 2.75 },
+        { "matrix": [7, 5], "x": 16.5, "y": 2.75 },
         { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 },
+        { "matrix": [7, 7], "x": 20, "y": 2.75 },
+        { "matrix": [7, 8], "x": 21, "y": 2.75 },
+        { "matrix": [7, 9], "x": 22, "y": 2.75 },
+        { "matrix": [7, 10], "x": 23, "y": 2.75 },
+        { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 },
+        { "matrix": [2, 1], "x": 1, "y": 3.75 },
+        { "matrix": [2, 2], "x": 2, "y": 3.75 },
+        { "matrix": [2, 3], "x": 3, "y": 3.75 },
         { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 },
+        { "matrix": [2, 5], "x": 6, "y": 3.75 },
+        { "matrix": [2, 6], "x": 7, "y": 3.75 },
+        { "matrix": [2, 7], "x": 8, "y": 3.75 },
+        { "matrix": [2, 8], "x": 9, "y": 3.75 },
+        { "matrix": [2, 9], "x": 10, "y": 3.75 },
+        { "matrix": [2, 10], "x": 11, "y": 3.75 },
+        { "matrix": [8, 0], "x": 12, "y": 3.75 },
+        { "matrix": [8, 1], "x": 13, "y": 3.75 },
+        { "matrix": [8, 2], "x": 14, "y": 3.75 },
+        { "matrix": [8, 3], "x": 15, "y": 3.75 },
+        { "matrix": [8, 4], "x": 16, "y": 3.75 },
+        { "matrix": [8, 5], "x": 17, "y": 3.75 },
         { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 3.75 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 },
+        { "matrix": [8, 7], "x": 20, "y": 3.75 },
+        { "matrix": [8, 8], "x": 21, "y": 3.75 },
+        { "matrix": [8, 9], "x": 22, "y": 3.75 },
+        { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 },
+        { "matrix": [3, 1], "x": 1, "y": 4.75 },
+        { "matrix": [3, 2], "x": 2, "y": 4.75 },
+        { "matrix": [3, 3], "x": 3, "y": 4.75 },
         { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 },
+        { "matrix": [3, 5], "x": 6.25, "y": 4.75 },
+        { "matrix": [3, 6], "x": 7.25, "y": 4.75 },
+        { "matrix": [3, 7], "x": 8.25, "y": 4.75 },
+        { "matrix": [3, 8], "x": 9.25, "y": 4.75 },
+        { "matrix": [3, 9], "x": 10.25, "y": 4.75 },
+        { "matrix": [3, 10], "x": 11.25, "y": 4.75 },
+        { "matrix": [9, 0], "x": 12.25, "y": 4.75 },
+        { "matrix": [9, 1], "x": 13.25, "y": 4.75 },
+        { "matrix": [9, 2], "x": 14.25, "y": 4.75 },
+        { "matrix": [9, 3], "x": 15.25, "y": 4.75 },
+        { "matrix": [9, 4], "x": 16.25, "y": 4.75 },
         { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 4.75 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 },
-        { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 },
+        { "matrix": [9, 7], "x": 20, "y": 4.75 },
+        { "matrix": [9, 8], "x": 21, "y": 4.75 },
+        { "matrix": [9, 9], "x": 22, "y": 4.75 },
+        { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 },
+        { "matrix": [4, 1], "x": 1, "y": 5.75 },
+        { "matrix": [4, 2], "x": 2, "y": 5.75 },
+        { "matrix": [4, 3], "x": 3, "y": 5.75 },
+        { "matrix": [4, 4], "x": 4.25, "y": 6 },
         { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 },
-        { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 },
-        { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 },
-        { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 },
-        { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 },
-        { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 },
-        { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 },
-        { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 },
-        { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 },
-        { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 },
-        { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 },
+        { "matrix": [4, 6], "x": 6.75, "y": 5.75 },
+        { "matrix": [4, 7], "x": 7.75, "y": 5.75 },
+        { "matrix": [4, 8], "x": 8.75, "y": 5.75 },
+        { "matrix": [4, 9], "x": 9.75, "y": 5.75 },
+        { "matrix": [4, 10], "x": 10.75, "y": 5.75 },
+        { "matrix": [10, 0], "x": 11.75, "y": 5.75 },
+        { "matrix": [10, 1], "x": 12.75, "y": 5.75 },
+        { "matrix": [10, 2], "x": 13.75, "y": 5.75 },
+        { "matrix": [10, 3], "x": 14.75, "y": 5.75 },
+        { "matrix": [10, 4], "x": 15.75, "y": 5.75 },
         { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 },
-        { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 },
-        { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 },
-        { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 },
-        { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 },
-        { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 },
-        { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 },
-        { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 },
-        { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 },
-        { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 },
-        { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 },
-        { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 },
+        { "matrix": [9, 6], "x": 18.75, "y": 6 },
+        { "matrix": [10, 7], "x": 20, "y": 5.75 },
+        { "matrix": [10, 8], "x": 21, "y": 5.75 },
+        { "matrix": [10, 9], "x": 22, "y": 5.75 },
+        { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 },
+        { "matrix": [5, 1], "x": 1, "y": 6.75 },
+        { "matrix": [5, 2], "x": 2, "y": 6.75 },
+        { "matrix": [5, 3], "x": 3.25, "y": 7 },
+        { "matrix": [5, 4], "x": 4.25, "y": 7 },
+        { "matrix": [5, 5], "x": 5.25, "y": 7 },
+        { "matrix": [5, 6], "x": 6.5, "y": 6.75 },
+        { "matrix": [5, 7], "x": 7.5, "y": 6.75 },
+        { "matrix": [5, 8], "x": 8.5, "y": 6.75 },
         { "matrix": [11, 0], "w": 4, "x": 9.5, "y": 6.75 },
-        { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 },
-        { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 },
-        { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 },
-        { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 },
-        { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 },
-        { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 },
-        { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 },
-        { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 },
-        { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 }
+        { "matrix": [11, 2], "x": 13.5, "y": 6.75 },
+        { "matrix": [11, 3], "x": 14.5, "y": 6.75 },
+        { "matrix": [11, 4], "x": 15.5, "y": 6.75 },
+        { "matrix": [11, 5], "x": 16.5, "y": 6.75 },
+        { "matrix": [10, 6], "x": 17.75, "y": 7 },
+        { "matrix": [11, 6], "x": 18.75, "y": 7 },
+        { "matrix": [11, 7], "x": 19.75, "y": 7 },
+        { "matrix": [11, 8], "x": 21, "y": 6.75 },
+        { "matrix": [11, 9], "x": 22, "y": 6.75 }
       ]
     },
     "LAYOUT_4u_iso": {
       "layout": [
-        { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
-        { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 },
-        { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 },
+        { "matrix": [12, 3], "x": 3, "y": 0 },
+        { "matrix": [12, 4], "x": 4, "y": 0 },
+        { "matrix": [12, 9], "x": 19, "y": 0 },
+        { "matrix": [12, 10], "x": 20, "y": 0 },
+        { "matrix": [0, 0], "x": 0, "y": 1.5 },
+        { "matrix": [0, 1], "x": 1, "y": 1.5 },
+        { "matrix": [0, 2], "x": 2, "y": 1.5 },
+        { "matrix": [0, 3], "x": 3, "y": 1.5 },
+        { "matrix": [0, 4], "x": 4.75, "y": 1.5 },
+        { "matrix": [0, 6], "x": 6.25, "y": 1.5 },
+        { "matrix": [0, 7], "x": 7.25, "y": 1.5 },
+        { "matrix": [0, 8], "x": 8.25, "y": 1.5 },
+        { "matrix": [0, 9], "x": 9.25, "y": 1.5 },
+        { "matrix": [0, 10], "x": 10.75, "y": 1.5 },
+        { "matrix": [6, 0], "x": 11.75, "y": 1.5 },
+        { "matrix": [6, 1], "x": 12.75, "y": 1.5 },
+        { "matrix": [6, 2], "x": 13.75, "y": 1.5 },
+        { "matrix": [6, 3], "x": 15.25, "y": 1.5 },
+        { "matrix": [6, 4], "x": 16.25, "y": 1.5 },
+        { "matrix": [6, 5], "x": 17.25, "y": 1.5 },
+        { "matrix": [6, 6], "x": 18.25, "y": 1.5 },
+        { "matrix": [6, 7], "x": 20, "y": 1.5 },
+        { "matrix": [6, 8], "x": 21, "y": 1.5 },
+        { "matrix": [6, 9], "x": 22, "y": 1.5 },
+        { "matrix": [6, 10], "x": 23, "y": 1.5 },
+        { "matrix": [1, 0], "x": 0, "y": 2.75 },
+        { "matrix": [1, 1], "x": 1, "y": 2.75 },
+        { "matrix": [1, 2], "x": 2, "y": 2.75 },
+        { "matrix": [1, 3], "x": 3, "y": 2.75 },
+        { "matrix": [1, 4], "x": 4.5, "y": 2.75 },
+        { "matrix": [1, 5], "x": 5.5, "y": 2.75 },
+        { "matrix": [1, 6], "x": 6.5, "y": 2.75 },
+        { "matrix": [1, 7], "x": 7.5, "y": 2.75 },
+        { "matrix": [1, 8], "x": 8.5, "y": 2.75 },
+        { "matrix": [1, 9], "x": 9.5, "y": 2.75 },
+        { "matrix": [1, 10], "x": 10.5, "y": 2.75 },
+        { "matrix": [7, 0], "x": 11.5, "y": 2.75 },
+        { "matrix": [7, 1], "x": 12.5, "y": 2.75 },
+        { "matrix": [7, 2], "x": 13.5, "y": 2.75 },
+        { "matrix": [7, 3], "x": 14.5, "y": 2.75 },
+        { "matrix": [7, 4], "x": 15.5, "y": 2.75 },
+        { "matrix": [7, 5], "x": 16.5, "y": 2.75 },
         { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 },
+        { "matrix": [7, 7], "x": 20, "y": 2.75 },
+        { "matrix": [7, 8], "x": 21, "y": 2.75 },
+        { "matrix": [7, 9], "x": 22, "y": 2.75 },
+        { "matrix": [7, 10], "x": 23, "y": 2.75 },
+        { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 },
+        { "matrix": [2, 1], "x": 1, "y": 3.75 },
+        { "matrix": [2, 2], "x": 2, "y": 3.75 },
+        { "matrix": [2, 3], "x": 3, "y": 3.75 },
         { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 },
+        { "matrix": [2, 5], "x": 6, "y": 3.75 },
+        { "matrix": [2, 6], "x": 7, "y": 3.75 },
+        { "matrix": [2, 7], "x": 8, "y": 3.75 },
+        { "matrix": [2, 8], "x": 9, "y": 3.75 },
+        { "matrix": [2, 9], "x": 10, "y": 3.75 },
+        { "matrix": [2, 10], "x": 11, "y": 3.75 },
+        { "matrix": [8, 0], "x": 12, "y": 3.75 },
+        { "matrix": [8, 1], "x": 13, "y": 3.75 },
+        { "matrix": [8, 2], "x": 14, "y": 3.75 },
+        { "matrix": [8, 3], "x": 15, "y": 3.75 },
+        { "matrix": [8, 4], "x": 16, "y": 3.75 },
+        { "matrix": [8, 5], "x": 17, "y": 3.75 },
+        { "matrix": [8, 7], "x": 20, "y": 3.75 },
+        { "matrix": [8, 8], "x": 21, "y": 3.75 },
+        { "matrix": [8, 9], "x": 22, "y": 3.75 },
+        { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 },
+        { "matrix": [3, 1], "x": 1, "y": 4.75 },
+        { "matrix": [3, 2], "x": 2, "y": 4.75 },
+        { "matrix": [3, 3], "x": 3, "y": 4.75 },
         { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 },
-        { "matrix": [9, 10], "w": 1, "x": 17.25, "y": 4.75 },
+        { "matrix": [3, 5], "x": 6.25, "y": 4.75 },
+        { "matrix": [3, 6], "x": 7.25, "y": 4.75 },
+        { "matrix": [3, 7], "x": 8.25, "y": 4.75 },
+        { "matrix": [3, 8], "x": 9.25, "y": 4.75 },
+        { "matrix": [3, 9], "x": 10.25, "y": 4.75 },
+        { "matrix": [3, 10], "x": 11.25, "y": 4.75 },
+        { "matrix": [9, 0], "x": 12.25, "y": 4.75 },
+        { "matrix": [9, 1], "x": 13.25, "y": 4.75 },
+        { "matrix": [9, 2], "x": 14.25, "y": 4.75 },
+        { "matrix": [9, 3], "x": 15.25, "y": 4.75 },
+        { "matrix": [9, 4], "x": 16.25, "y": 4.75 },
+        { "matrix": [9, 10], "x": 17.25, "y": 4.75 },
         { "h": 2, "matrix": [9, 5], "w": 1.25, "x": 18.25, "y": 3.75 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 },
-        { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 },
+        { "matrix": [9, 7], "x": 20, "y": 4.75 },
+        { "matrix": [9, 8], "x": 21, "y": 4.75 },
+        { "matrix": [9, 9], "x": 22, "y": 4.75 },
+        { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 },
+        { "matrix": [4, 1], "x": 1, "y": 5.75 },
+        { "matrix": [4, 2], "x": 2, "y": 5.75 },
+        { "matrix": [4, 3], "x": 3, "y": 5.75 },
+        { "matrix": [4, 4], "x": 4.25, "y": 6 },
         { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 },
-        { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 },
-        { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 },
-        { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 },
-        { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 },
-        { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 },
-        { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 },
-        { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 },
-        { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 },
-        { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 },
-        { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 },
+        { "matrix": [4, 6], "x": 6.75, "y": 5.75 },
+        { "matrix": [4, 7], "x": 7.75, "y": 5.75 },
+        { "matrix": [4, 8], "x": 8.75, "y": 5.75 },
+        { "matrix": [4, 9], "x": 9.75, "y": 5.75 },
+        { "matrix": [4, 10], "x": 10.75, "y": 5.75 },
+        { "matrix": [10, 0], "x": 11.75, "y": 5.75 },
+        { "matrix": [10, 1], "x": 12.75, "y": 5.75 },
+        { "matrix": [10, 2], "x": 13.75, "y": 5.75 },
+        { "matrix": [10, 3], "x": 14.75, "y": 5.75 },
+        { "matrix": [10, 4], "x": 15.75, "y": 5.75 },
         { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 },
-        { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 },
-        { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 },
-        { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 },
-        { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 },
-        { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 },
-        { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 },
-        { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 },
-        { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 },
-        { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 },
-        { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 },
-        { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 },
+        { "matrix": [9, 6], "x": 18.75, "y": 6 },
+        { "matrix": [10, 7], "x": 20, "y": 5.75 },
+        { "matrix": [10, 8], "x": 21, "y": 5.75 },
+        { "matrix": [10, 9], "x": 22, "y": 5.75 },
+        { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 },
+        { "matrix": [5, 1], "x": 1, "y": 6.75 },
+        { "matrix": [5, 2], "x": 2, "y": 6.75 },
+        { "matrix": [5, 3], "x": 3.25, "y": 7 },
+        { "matrix": [5, 4], "x": 4.25, "y": 7 },
+        { "matrix": [5, 5], "x": 5.25, "y": 7 },
+        { "matrix": [5, 6], "x": 6.5, "y": 6.75 },
+        { "matrix": [5, 7], "x": 7.5, "y": 6.75 },
+        { "matrix": [5, 8], "x": 8.5, "y": 6.75 },
         { "matrix": [11, 0], "w": 4, "x": 9.5, "y": 6.75 },
-        { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 },
-        { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 },
-        { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 },
-        { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 },
-        { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 },
-        { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 },
-        { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 },
-        { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 },
-        { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 }
+        { "matrix": [11, 2], "x": 13.5, "y": 6.75 },
+        { "matrix": [11, 3], "x": 14.5, "y": 6.75 },
+        { "matrix": [11, 4], "x": 15.5, "y": 6.75 },
+        { "matrix": [11, 5], "x": 16.5, "y": 6.75 },
+        { "matrix": [10, 6], "x": 17.75, "y": 7 },
+        { "matrix": [11, 6], "x": 18.75, "y": 7 },
+        { "matrix": [11, 7], "x": 19.75, "y": 7 },
+        { "matrix": [11, 8], "x": 21, "y": 6.75 },
+        { "matrix": [11, 9], "x": 22, "y": 6.75 }
       ]
     },
     "LAYOUT_7u_ansi": {
       "layout": [
-        { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
-        { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 },
-        { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 },
+        { "matrix": [12, 3], "x": 3, "y": 0 },
+        { "matrix": [12, 4], "x": 4, "y": 0 },
+        { "matrix": [12, 9], "x": 19, "y": 0 },
+        { "matrix": [12, 10], "x": 20, "y": 0 },
+        { "matrix": [0, 0], "x": 0, "y": 1.5 },
+        { "matrix": [0, 1], "x": 1, "y": 1.5 },
+        { "matrix": [0, 2], "x": 2, "y": 1.5 },
+        { "matrix": [0, 3], "x": 3, "y": 1.5 },
+        { "matrix": [0, 4], "x": 4.75, "y": 1.5 },
+        { "matrix": [0, 6], "x": 6.25, "y": 1.5 },
+        { "matrix": [0, 7], "x": 7.25, "y": 1.5 },
+        { "matrix": [0, 8], "x": 8.25, "y": 1.5 },
+        { "matrix": [0, 9], "x": 9.25, "y": 1.5 },
+        { "matrix": [0, 10], "x": 10.75, "y": 1.5 },
+        { "matrix": [6, 0], "x": 11.75, "y": 1.5 },
+        { "matrix": [6, 1], "x": 12.75, "y": 1.5 },
+        { "matrix": [6, 2], "x": 13.75, "y": 1.5 },
+        { "matrix": [6, 3], "x": 15.25, "y": 1.5 },
+        { "matrix": [6, 4], "x": 16.25, "y": 1.5 },
+        { "matrix": [6, 5], "x": 17.25, "y": 1.5 },
+        { "matrix": [6, 6], "x": 18.25, "y": 1.5 },
+        { "matrix": [6, 7], "x": 20, "y": 1.5 },
+        { "matrix": [6, 8], "x": 21, "y": 1.5 },
+        { "matrix": [6, 9], "x": 22, "y": 1.5 },
+        { "matrix": [6, 10], "x": 23, "y": 1.5 },
+        { "matrix": [1, 0], "x": 0, "y": 2.75 },
+        { "matrix": [1, 1], "x": 1, "y": 2.75 },
+        { "matrix": [1, 2], "x": 2, "y": 2.75 },
+        { "matrix": [1, 3], "x": 3, "y": 2.75 },
+        { "matrix": [1, 4], "x": 4.5, "y": 2.75 },
+        { "matrix": [1, 5], "x": 5.5, "y": 2.75 },
+        { "matrix": [1, 6], "x": 6.5, "y": 2.75 },
+        { "matrix": [1, 7], "x": 7.5, "y": 2.75 },
+        { "matrix": [1, 8], "x": 8.5, "y": 2.75 },
+        { "matrix": [1, 9], "x": 9.5, "y": 2.75 },
+        { "matrix": [1, 10], "x": 10.5, "y": 2.75 },
+        { "matrix": [7, 0], "x": 11.5, "y": 2.75 },
+        { "matrix": [7, 1], "x": 12.5, "y": 2.75 },
+        { "matrix": [7, 2], "x": 13.5, "y": 2.75 },
+        { "matrix": [7, 3], "x": 14.5, "y": 2.75 },
+        { "matrix": [7, 4], "x": 15.5, "y": 2.75 },
+        { "matrix": [7, 5], "x": 16.5, "y": 2.75 },
         { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 },
+        { "matrix": [7, 7], "x": 20, "y": 2.75 },
+        { "matrix": [7, 8], "x": 21, "y": 2.75 },
+        { "matrix": [7, 9], "x": 22, "y": 2.75 },
+        { "matrix": [7, 10], "x": 23, "y": 2.75 },
+        { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 },
+        { "matrix": [2, 1], "x": 1, "y": 3.75 },
+        { "matrix": [2, 2], "x": 2, "y": 3.75 },
+        { "matrix": [2, 3], "x": 3, "y": 3.75 },
         { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 },
+        { "matrix": [2, 5], "x": 6, "y": 3.75 },
+        { "matrix": [2, 6], "x": 7, "y": 3.75 },
+        { "matrix": [2, 7], "x": 8, "y": 3.75 },
+        { "matrix": [2, 8], "x": 9, "y": 3.75 },
+        { "matrix": [2, 9], "x": 10, "y": 3.75 },
+        { "matrix": [2, 10], "x": 11, "y": 3.75 },
+        { "matrix": [8, 0], "x": 12, "y": 3.75 },
+        { "matrix": [8, 1], "x": 13, "y": 3.75 },
+        { "matrix": [8, 2], "x": 14, "y": 3.75 },
+        { "matrix": [8, 3], "x": 15, "y": 3.75 },
+        { "matrix": [8, 4], "x": 16, "y": 3.75 },
+        { "matrix": [8, 5], "x": 17, "y": 3.75 },
         { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 3.75 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 },
+        { "matrix": [8, 7], "x": 20, "y": 3.75 },
+        { "matrix": [8, 8], "x": 21, "y": 3.75 },
+        { "matrix": [8, 9], "x": 22, "y": 3.75 },
+        { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 },
+        { "matrix": [3, 1], "x": 1, "y": 4.75 },
+        { "matrix": [3, 2], "x": 2, "y": 4.75 },
+        { "matrix": [3, 3], "x": 3, "y": 4.75 },
         { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 },
+        { "matrix": [3, 5], "x": 6.25, "y": 4.75 },
+        { "matrix": [3, 6], "x": 7.25, "y": 4.75 },
+        { "matrix": [3, 7], "x": 8.25, "y": 4.75 },
+        { "matrix": [3, 8], "x": 9.25, "y": 4.75 },
+        { "matrix": [3, 9], "x": 10.25, "y": 4.75 },
+        { "matrix": [3, 10], "x": 11.25, "y": 4.75 },
+        { "matrix": [9, 0], "x": 12.25, "y": 4.75 },
+        { "matrix": [9, 1], "x": 13.25, "y": 4.75 },
+        { "matrix": [9, 2], "x": 14.25, "y": 4.75 },
+        { "matrix": [9, 3], "x": 15.25, "y": 4.75 },
+        { "matrix": [9, 4], "x": 16.25, "y": 4.75 },
         { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 4.75 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 },
-        { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 },
+        { "matrix": [9, 7], "x": 20, "y": 4.75 },
+        { "matrix": [9, 8], "x": 21, "y": 4.75 },
+        { "matrix": [9, 9], "x": 22, "y": 4.75 },
+        { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 },
+        { "matrix": [4, 1], "x": 1, "y": 5.75 },
+        { "matrix": [4, 2], "x": 2, "y": 5.75 },
+        { "matrix": [4, 3], "x": 3, "y": 5.75 },
+        { "matrix": [4, 4], "x": 4.25, "y": 6 },
         { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 },
-        { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 },
-        { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 },
-        { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 },
-        { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 },
-        { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 },
-        { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 },
-        { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 },
-        { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 },
-        { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 },
-        { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 },
+        { "matrix": [4, 6], "x": 6.75, "y": 5.75 },
+        { "matrix": [4, 7], "x": 7.75, "y": 5.75 },
+        { "matrix": [4, 8], "x": 8.75, "y": 5.75 },
+        { "matrix": [4, 9], "x": 9.75, "y": 5.75 },
+        { "matrix": [4, 10], "x": 10.75, "y": 5.75 },
+        { "matrix": [10, 0], "x": 11.75, "y": 5.75 },
+        { "matrix": [10, 1], "x": 12.75, "y": 5.75 },
+        { "matrix": [10, 2], "x": 13.75, "y": 5.75 },
+        { "matrix": [10, 3], "x": 14.75, "y": 5.75 },
+        { "matrix": [10, 4], "x": 15.75, "y": 5.75 },
         { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 },
-        { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 },
-        { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 },
-        { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 },
-        { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 },
-        { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 },
-        { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 },
-        { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 },
-        { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 },
-        { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 },
-        { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 },
+        { "matrix": [9, 6], "x": 18.75, "y": 6 },
+        { "matrix": [10, 7], "x": 20, "y": 5.75 },
+        { "matrix": [10, 8], "x": 21, "y": 5.75 },
+        { "matrix": [10, 9], "x": 22, "y": 5.75 },
+        { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 },
+        { "matrix": [5, 1], "x": 1, "y": 6.75 },
+        { "matrix": [5, 2], "x": 2, "y": 6.75 },
+        { "matrix": [5, 3], "x": 3.25, "y": 7 },
+        { "matrix": [5, 4], "x": 4.25, "y": 7 },
+        { "matrix": [5, 5], "x": 5.25, "y": 7 },
+        { "matrix": [5, 6], "x": 6.5, "y": 6.75 },
+        { "matrix": [5, 7], "x": 7.5, "y": 6.75 },
         { "matrix": [11, 0], "w": 7, "x": 8.5, "y": 6.75 },
-        { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 },
-        { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 },
-        { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 },
-        { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 },
-        { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 },
-        { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 },
-        { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 }
+        { "matrix": [11, 4], "x": 15.5, "y": 6.75 },
+        { "matrix": [11, 5], "x": 16.5, "y": 6.75 },
+        { "matrix": [10, 6], "x": 17.75, "y": 7 },
+        { "matrix": [11, 6], "x": 18.75, "y": 7 },
+        { "matrix": [11, 7], "x": 19.75, "y": 7 },
+        { "matrix": [11, 8], "x": 21, "y": 6.75 },
+        { "matrix": [11, 9], "x": 22, "y": 6.75 }
       ]
     },
     "LAYOUT_7u_iso": {
       "layout": [
-        { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
-        { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 },
-        { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 },
+        { "matrix": [12, 3], "x": 3, "y": 0 },
+        { "matrix": [12, 4], "x": 4, "y": 0 },
+        { "matrix": [12, 9], "x": 19, "y": 0 },
+        { "matrix": [12, 10], "x": 20, "y": 0 },
+        { "matrix": [0, 0], "x": 0, "y": 1.5 },
+        { "matrix": [0, 1], "x": 1, "y": 1.5 },
+        { "matrix": [0, 2], "x": 2, "y": 1.5 },
+        { "matrix": [0, 3], "x": 3, "y": 1.5 },
+        { "matrix": [0, 4], "x": 4.75, "y": 1.5 },
+        { "matrix": [0, 6], "x": 6.25, "y": 1.5 },
+        { "matrix": [0, 7], "x": 7.25, "y": 1.5 },
+        { "matrix": [0, 8], "x": 8.25, "y": 1.5 },
+        { "matrix": [0, 9], "x": 9.25, "y": 1.5 },
+        { "matrix": [0, 10], "x": 10.75, "y": 1.5 },
+        { "matrix": [6, 0], "x": 11.75, "y": 1.5 },
+        { "matrix": [6, 1], "x": 12.75, "y": 1.5 },
+        { "matrix": [6, 2], "x": 13.75, "y": 1.5 },
+        { "matrix": [6, 3], "x": 15.25, "y": 1.5 },
+        { "matrix": [6, 4], "x": 16.25, "y": 1.5 },
+        { "matrix": [6, 5], "x": 17.25, "y": 1.5 },
+        { "matrix": [6, 6], "x": 18.25, "y": 1.5 },
+        { "matrix": [6, 7], "x": 20, "y": 1.5 },
+        { "matrix": [6, 8], "x": 21, "y": 1.5 },
+        { "matrix": [6, 9], "x": 22, "y": 1.5 },
+        { "matrix": [6, 10], "x": 23, "y": 1.5 },
+        { "matrix": [1, 0], "x": 0, "y": 2.75 },
+        { "matrix": [1, 1], "x": 1, "y": 2.75 },
+        { "matrix": [1, 2], "x": 2, "y": 2.75 },
+        { "matrix": [1, 3], "x": 3, "y": 2.75 },
+        { "matrix": [1, 4], "x": 4.5, "y": 2.75 },
+        { "matrix": [1, 5], "x": 5.5, "y": 2.75 },
+        { "matrix": [1, 6], "x": 6.5, "y": 2.75 },
+        { "matrix": [1, 7], "x": 7.5, "y": 2.75 },
+        { "matrix": [1, 8], "x": 8.5, "y": 2.75 },
+        { "matrix": [1, 9], "x": 9.5, "y": 2.75 },
+        { "matrix": [1, 10], "x": 10.5, "y": 2.75 },
+        { "matrix": [7, 0], "x": 11.5, "y": 2.75 },
+        { "matrix": [7, 1], "x": 12.5, "y": 2.75 },
+        { "matrix": [7, 2], "x": 13.5, "y": 2.75 },
+        { "matrix": [7, 3], "x": 14.5, "y": 2.75 },
+        { "matrix": [7, 4], "x": 15.5, "y": 2.75 },
+        { "matrix": [7, 5], "x": 16.5, "y": 2.75 },
         { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 },
+        { "matrix": [7, 7], "x": 20, "y": 2.75 },
+        { "matrix": [7, 8], "x": 21, "y": 2.75 },
+        { "matrix": [7, 9], "x": 22, "y": 2.75 },
+        { "matrix": [7, 10], "x": 23, "y": 2.75 },
+        { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 },
+        { "matrix": [2, 1], "x": 1, "y": 3.75 },
+        { "matrix": [2, 2], "x": 2, "y": 3.75 },
+        { "matrix": [2, 3], "x": 3, "y": 3.75 },
         { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 },
+        { "matrix": [2, 5], "x": 6, "y": 3.75 },
+        { "matrix": [2, 6], "x": 7, "y": 3.75 },
+        { "matrix": [2, 7], "x": 8, "y": 3.75 },
+        { "matrix": [2, 8], "x": 9, "y": 3.75 },
+        { "matrix": [2, 9], "x": 10, "y": 3.75 },
+        { "matrix": [2, 10], "x": 11, "y": 3.75 },
+        { "matrix": [8, 0], "x": 12, "y": 3.75 },
+        { "matrix": [8, 1], "x": 13, "y": 3.75 },
+        { "matrix": [8, 2], "x": 14, "y": 3.75 },
+        { "matrix": [8, 3], "x": 15, "y": 3.75 },
+        { "matrix": [8, 4], "x": 16, "y": 3.75 },
+        { "matrix": [8, 5], "x": 17, "y": 3.75 },
+        { "matrix": [8, 7], "x": 20, "y": 3.75 },
+        { "matrix": [8, 8], "x": 21, "y": 3.75 },
+        { "matrix": [8, 9], "x": 22, "y": 3.75 },
+        { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 },
+        { "matrix": [3, 1], "x": 1, "y": 4.75 },
+        { "matrix": [3, 2], "x": 2, "y": 4.75 },
+        { "matrix": [3, 3], "x": 3, "y": 4.75 },
         { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 },
-        { "matrix": [9, 10], "w": 1, "x": 17.25, "y": 4.75 },
+        { "matrix": [3, 5], "x": 6.25, "y": 4.75 },
+        { "matrix": [3, 6], "x": 7.25, "y": 4.75 },
+        { "matrix": [3, 7], "x": 8.25, "y": 4.75 },
+        { "matrix": [3, 8], "x": 9.25, "y": 4.75 },
+        { "matrix": [3, 9], "x": 10.25, "y": 4.75 },
+        { "matrix": [3, 10], "x": 11.25, "y": 4.75 },
+        { "matrix": [9, 0], "x": 12.25, "y": 4.75 },
+        { "matrix": [9, 1], "x": 13.25, "y": 4.75 },
+        { "matrix": [9, 2], "x": 14.25, "y": 4.75 },
+        { "matrix": [9, 3], "x": 15.25, "y": 4.75 },
+        { "matrix": [9, 4], "x": 16.25, "y": 4.75 },
+        { "matrix": [9, 10], "x": 17.25, "y": 4.75 },
         { "h": 2, "matrix": [9, 5], "w": 1.25, "x": 18.25, "y": 3.75 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 },
-        { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 },
+        { "matrix": [9, 7], "x": 20, "y": 4.75 },
+        { "matrix": [9, 8], "x": 21, "y": 4.75 },
+        { "matrix": [9, 9], "x": 22, "y": 4.75 },
+        { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 },
+        { "matrix": [4, 1], "x": 1, "y": 5.75 },
+        { "matrix": [4, 2], "x": 2, "y": 5.75 },
+        { "matrix": [4, 3], "x": 3, "y": 5.75 },
+        { "matrix": [4, 4], "x": 4.25, "y": 6 },
         { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 },
-        { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 },
-        { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 },
-        { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 },
-        { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 },
-        { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 },
-        { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 },
-        { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 },
-        { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 },
-        { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 },
-        { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 },
+        { "matrix": [4, 6], "x": 6.75, "y": 5.75 },
+        { "matrix": [4, 7], "x": 7.75, "y": 5.75 },
+        { "matrix": [4, 8], "x": 8.75, "y": 5.75 },
+        { "matrix": [4, 9], "x": 9.75, "y": 5.75 },
+        { "matrix": [4, 10], "x": 10.75, "y": 5.75 },
+        { "matrix": [10, 0], "x": 11.75, "y": 5.75 },
+        { "matrix": [10, 1], "x": 12.75, "y": 5.75 },
+        { "matrix": [10, 2], "x": 13.75, "y": 5.75 },
+        { "matrix": [10, 3], "x": 14.75, "y": 5.75 },
+        { "matrix": [10, 4], "x": 15.75, "y": 5.75 },
         { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 },
-        { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 },
-        { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 },
-        { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 },
-        { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 },
-        { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 },
-        { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 },
-        { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 },
-        { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 },
-        { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 },
-        { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 },
+        { "matrix": [9, 6], "x": 18.75, "y": 6 },
+        { "matrix": [10, 7], "x": 20, "y": 5.75 },
+        { "matrix": [10, 8], "x": 21, "y": 5.75 },
+        { "matrix": [10, 9], "x": 22, "y": 5.75 },
+        { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 },
+        { "matrix": [5, 1], "x": 1, "y": 6.75 },
+        { "matrix": [5, 2], "x": 2, "y": 6.75 },
+        { "matrix": [5, 3], "x": 3.25, "y": 7 },
+        { "matrix": [5, 4], "x": 4.25, "y": 7 },
+        { "matrix": [5, 5], "x": 5.25, "y": 7 },
+        { "matrix": [5, 6], "x": 6.5, "y": 6.75 },
+        { "matrix": [5, 7], "x": 7.5, "y": 6.75 },
         { "matrix": [11, 0], "w": 7, "x": 8.5, "y": 6.75 },
-        { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 },
-        { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 },
-        { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 },
-        { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 },
-        { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 },
-        { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 },
-        { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 }
+        { "matrix": [11, 4], "x": 15.5, "y": 6.75 },
+        { "matrix": [11, 5], "x": 16.5, "y": 6.75 },
+        { "matrix": [10, 6], "x": 17.75, "y": 7 },
+        { "matrix": [11, 6], "x": 18.75, "y": 7 },
+        { "matrix": [11, 7], "x": 19.75, "y": 7 },
+        { "matrix": [11, 8], "x": 21, "y": 6.75 },
+        { "matrix": [11, 9], "x": 22, "y": 6.75 }
       ]
     },
     "LAYOUT_all": {
       "layout": [
-        { "matrix": [12, 3], "w": 1, "x": 3, "y": 0 },
-        { "matrix": [12, 4], "w": 1, "x": 4, "y": 0 },
-        { "matrix": [12, 9], "w": 1, "x": 19, "y": 0 },
-        { "matrix": [12, 10], "w": 1, "x": 20, "y": 0 },
-        { "matrix": [0, 0], "w": 1, "x": 0, "y": 1.5 },
-        { "matrix": [0, 1], "w": 1, "x": 1, "y": 1.5 },
-        { "matrix": [0, 2], "w": 1, "x": 2, "y": 1.5 },
-        { "matrix": [0, 3], "w": 1, "x": 3, "y": 1.5 },
-        { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 1.5 },
-        { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 1.5 },
-        { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 1.5 },
-        { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 1.5 },
-        { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 1.5 },
-        { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 1.5 },
-        { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 1.5 },
-        { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 1.5 },
-        { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 1.5 },
-        { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 1.5 },
-        { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 1.5 },
-        { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 1.5 },
-        { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 1.5 },
-        { "matrix": [6, 7], "w": 1, "x": 20, "y": 1.5 },
-        { "matrix": [6, 8], "w": 1, "x": 21, "y": 1.5 },
-        { "matrix": [6, 9], "w": 1, "x": 22, "y": 1.5 },
-        { "matrix": [6, 10], "w": 1, "x": 23, "y": 1.5 },
-        { "matrix": [1, 0], "w": 1, "x": 0, "y": 2.75 },
-        { "matrix": [1, 1], "w": 1, "x": 1, "y": 2.75 },
-        { "matrix": [1, 2], "w": 1, "x": 2, "y": 2.75 },
-        { "matrix": [1, 3], "w": 1, "x": 3, "y": 2.75 },
-        { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 2.75 },
-        { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 2.75 },
-        { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 2.75 },
-        { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 2.75 },
-        { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 2.75 },
-        { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 2.75 },
-        { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 2.75 },
-        { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 2.75 },
-        { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 2.75 },
-        { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 2.75 },
-        { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 2.75 },
-        { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 2.75 },
-        { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 2.75 },
+        { "matrix": [12, 3], "x": 3, "y": 0 },
+        { "matrix": [12, 4], "x": 4, "y": 0 },
+        { "matrix": [12, 9], "x": 19, "y": 0 },
+        { "matrix": [12, 10], "x": 20, "y": 0 },
+        { "matrix": [0, 0], "x": 0, "y": 1.5 },
+        { "matrix": [0, 1], "x": 1, "y": 1.5 },
+        { "matrix": [0, 2], "x": 2, "y": 1.5 },
+        { "matrix": [0, 3], "x": 3, "y": 1.5 },
+        { "matrix": [0, 4], "x": 4.75, "y": 1.5 },
+        { "matrix": [0, 6], "x": 6.25, "y": 1.5 },
+        { "matrix": [0, 7], "x": 7.25, "y": 1.5 },
+        { "matrix": [0, 8], "x": 8.25, "y": 1.5 },
+        { "matrix": [0, 9], "x": 9.25, "y": 1.5 },
+        { "matrix": [0, 10], "x": 10.75, "y": 1.5 },
+        { "matrix": [6, 0], "x": 11.75, "y": 1.5 },
+        { "matrix": [6, 1], "x": 12.75, "y": 1.5 },
+        { "matrix": [6, 2], "x": 13.75, "y": 1.5 },
+        { "matrix": [6, 3], "x": 15.25, "y": 1.5 },
+        { "matrix": [6, 4], "x": 16.25, "y": 1.5 },
+        { "matrix": [6, 5], "x": 17.25, "y": 1.5 },
+        { "matrix": [6, 6], "x": 18.25, "y": 1.5 },
+        { "matrix": [6, 7], "x": 20, "y": 1.5 },
+        { "matrix": [6, 8], "x": 21, "y": 1.5 },
+        { "matrix": [6, 9], "x": 22, "y": 1.5 },
+        { "matrix": [6, 10], "x": 23, "y": 1.5 },
+        { "matrix": [1, 0], "x": 0, "y": 2.75 },
+        { "matrix": [1, 1], "x": 1, "y": 2.75 },
+        { "matrix": [1, 2], "x": 2, "y": 2.75 },
+        { "matrix": [1, 3], "x": 3, "y": 2.75 },
+        { "matrix": [1, 4], "x": 4.5, "y": 2.75 },
+        { "matrix": [1, 5], "x": 5.5, "y": 2.75 },
+        { "matrix": [1, 6], "x": 6.5, "y": 2.75 },
+        { "matrix": [1, 7], "x": 7.5, "y": 2.75 },
+        { "matrix": [1, 8], "x": 8.5, "y": 2.75 },
+        { "matrix": [1, 9], "x": 9.5, "y": 2.75 },
+        { "matrix": [1, 10], "x": 10.5, "y": 2.75 },
+        { "matrix": [7, 0], "x": 11.5, "y": 2.75 },
+        { "matrix": [7, 1], "x": 12.5, "y": 2.75 },
+        { "matrix": [7, 2], "x": 13.5, "y": 2.75 },
+        { "matrix": [7, 3], "x": 14.5, "y": 2.75 },
+        { "matrix": [7, 4], "x": 15.5, "y": 2.75 },
+        { "matrix": [7, 5], "x": 16.5, "y": 2.75 },
         { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 2.75 },
-        { "matrix": [7, 7], "w": 1, "x": 20, "y": 2.75 },
-        { "matrix": [7, 8], "w": 1, "x": 21, "y": 2.75 },
-        { "matrix": [7, 9], "w": 1, "x": 22, "y": 2.75 },
-        { "matrix": [7, 10], "w": 1, "x": 23, "y": 2.75 },
-        { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 3.75 },
-        { "matrix": [2, 1], "w": 1, "x": 1, "y": 3.75 },
-        { "matrix": [2, 2], "w": 1, "x": 2, "y": 3.75 },
-        { "matrix": [2, 3], "w": 1, "x": 3, "y": 3.75 },
+        { "matrix": [7, 7], "x": 20, "y": 2.75 },
+        { "matrix": [7, 8], "x": 21, "y": 2.75 },
+        { "matrix": [7, 9], "x": 22, "y": 2.75 },
+        { "matrix": [7, 10], "x": 23, "y": 2.75 },
+        { "h": 2, "matrix": [2, 0], "x": 0, "y": 3.75 },
+        { "matrix": [2, 1], "x": 1, "y": 3.75 },
+        { "matrix": [2, 2], "x": 2, "y": 3.75 },
+        { "matrix": [2, 3], "x": 3, "y": 3.75 },
         { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 3.75 },
-        { "matrix": [2, 5], "w": 1, "x": 6, "y": 3.75 },
-        { "matrix": [2, 6], "w": 1, "x": 7, "y": 3.75 },
-        { "matrix": [2, 7], "w": 1, "x": 8, "y": 3.75 },
-        { "matrix": [2, 8], "w": 1, "x": 9, "y": 3.75 },
-        { "matrix": [2, 9], "w": 1, "x": 10, "y": 3.75 },
-        { "matrix": [2, 10], "w": 1, "x": 11, "y": 3.75 },
-        { "matrix": [8, 0], "w": 1, "x": 12, "y": 3.75 },
-        { "matrix": [8, 1], "w": 1, "x": 13, "y": 3.75 },
-        { "matrix": [8, 2], "w": 1, "x": 14, "y": 3.75 },
-        { "matrix": [8, 3], "w": 1, "x": 15, "y": 3.75 },
-        { "matrix": [8, 4], "w": 1, "x": 16, "y": 3.75 },
-        { "matrix": [8, 5], "w": 1, "x": 17, "y": 3.75 },
+        { "matrix": [2, 5], "x": 6, "y": 3.75 },
+        { "matrix": [2, 6], "x": 7, "y": 3.75 },
+        { "matrix": [2, 7], "x": 8, "y": 3.75 },
+        { "matrix": [2, 8], "x": 9, "y": 3.75 },
+        { "matrix": [2, 9], "x": 10, "y": 3.75 },
+        { "matrix": [2, 10], "x": 11, "y": 3.75 },
+        { "matrix": [8, 0], "x": 12, "y": 3.75 },
+        { "matrix": [8, 1], "x": 13, "y": 3.75 },
+        { "matrix": [8, 2], "x": 14, "y": 3.75 },
+        { "matrix": [8, 3], "x": 15, "y": 3.75 },
+        { "matrix": [8, 4], "x": 16, "y": 3.75 },
+        { "matrix": [8, 5], "x": 17, "y": 3.75 },
         { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 3.75 },
-        { "matrix": [8, 7], "w": 1, "x": 20, "y": 3.75 },
-        { "matrix": [8, 8], "w": 1, "x": 21, "y": 3.75 },
-        { "matrix": [8, 9], "w": 1, "x": 22, "y": 3.75 },
-        { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 3.75 },
-        { "matrix": [3, 1], "w": 1, "x": 1, "y": 4.75 },
-        { "matrix": [3, 2], "w": 1, "x": 2, "y": 4.75 },
-        { "matrix": [3, 3], "w": 1, "x": 3, "y": 4.75 },
+        { "matrix": [8, 7], "x": 20, "y": 3.75 },
+        { "matrix": [8, 8], "x": 21, "y": 3.75 },
+        { "matrix": [8, 9], "x": 22, "y": 3.75 },
+        { "h": 2, "matrix": [8, 10], "x": 23, "y": 3.75 },
+        { "matrix": [3, 1], "x": 1, "y": 4.75 },
+        { "matrix": [3, 2], "x": 2, "y": 4.75 },
+        { "matrix": [3, 3], "x": 3, "y": 4.75 },
         { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 4.75 },
-        { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 4.75 },
-        { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 4.75 },
-        { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 4.75 },
-        { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 4.75 },
-        { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 4.75 },
-        { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 4.75 },
-        { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 4.75 },
-        { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 4.75 },
-        { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 4.75 },
-        { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 4.75 },
-        { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 4.75 },
-        { "matrix": [9, 10], "w": 1, "x": 17.25, "y": 4.75 },
+        { "matrix": [3, 5], "x": 6.25, "y": 4.75 },
+        { "matrix": [3, 6], "x": 7.25, "y": 4.75 },
+        { "matrix": [3, 7], "x": 8.25, "y": 4.75 },
+        { "matrix": [3, 8], "x": 9.25, "y": 4.75 },
+        { "matrix": [3, 9], "x": 10.25, "y": 4.75 },
+        { "matrix": [3, 10], "x": 11.25, "y": 4.75 },
+        { "matrix": [9, 0], "x": 12.25, "y": 4.75 },
+        { "matrix": [9, 1], "x": 13.25, "y": 4.75 },
+        { "matrix": [9, 2], "x": 14.25, "y": 4.75 },
+        { "matrix": [9, 3], "x": 15.25, "y": 4.75 },
+        { "matrix": [9, 4], "x": 16.25, "y": 4.75 },
+        { "matrix": [9, 10], "x": 17.25, "y": 4.75 },
         { "matrix": [9, 5], "w": 1.25, "x": 18.25, "y": 4.75 },
-        { "matrix": [9, 7], "w": 1, "x": 20, "y": 4.75 },
-        { "matrix": [9, 8], "w": 1, "x": 21, "y": 4.75 },
-        { "matrix": [9, 9], "w": 1, "x": 22, "y": 4.75 },
-        { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 5.75 },
-        { "matrix": [4, 1], "w": 1, "x": 1, "y": 5.75 },
-        { "matrix": [4, 2], "w": 1, "x": 2, "y": 5.75 },
-        { "matrix": [4, 3], "w": 1, "x": 3, "y": 5.75 },
-        { "matrix": [4, 4], "w": 1, "x": 4.25, "y": 6 },
+        { "matrix": [9, 7], "x": 20, "y": 4.75 },
+        { "matrix": [9, 8], "x": 21, "y": 4.75 },
+        { "matrix": [9, 9], "x": 22, "y": 4.75 },
+        { "h": 2, "matrix": [4, 0], "x": 0, "y": 5.75 },
+        { "matrix": [4, 1], "x": 1, "y": 5.75 },
+        { "matrix": [4, 2], "x": 2, "y": 5.75 },
+        { "matrix": [4, 3], "x": 3, "y": 5.75 },
+        { "matrix": [4, 4], "x": 4.25, "y": 6 },
         { "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 5.75 },
-        { "matrix": [4, 6], "w": 1, "x": 6.75, "y": 5.75 },
-        { "matrix": [4, 7], "w": 1, "x": 7.75, "y": 5.75 },
-        { "matrix": [4, 8], "w": 1, "x": 8.75, "y": 5.75 },
-        { "matrix": [4, 9], "w": 1, "x": 9.75, "y": 5.75 },
-        { "matrix": [4, 10], "w": 1, "x": 10.75, "y": 5.75 },
-        { "matrix": [10, 0], "w": 1, "x": 11.75, "y": 5.75 },
-        { "matrix": [10, 1], "w": 1, "x": 12.75, "y": 5.75 },
-        { "matrix": [10, 2], "w": 1, "x": 13.75, "y": 5.75 },
-        { "matrix": [10, 3], "w": 1, "x": 14.75, "y": 5.75 },
-        { "matrix": [10, 4], "w": 1, "x": 15.75, "y": 5.75 },
+        { "matrix": [4, 6], "x": 6.75, "y": 5.75 },
+        { "matrix": [4, 7], "x": 7.75, "y": 5.75 },
+        { "matrix": [4, 8], "x": 8.75, "y": 5.75 },
+        { "matrix": [4, 9], "x": 9.75, "y": 5.75 },
+        { "matrix": [4, 10], "x": 10.75, "y": 5.75 },
+        { "matrix": [10, 0], "x": 11.75, "y": 5.75 },
+        { "matrix": [10, 1], "x": 12.75, "y": 5.75 },
+        { "matrix": [10, 2], "x": 13.75, "y": 5.75 },
+        { "matrix": [10, 3], "x": 14.75, "y": 5.75 },
+        { "matrix": [10, 4], "x": 15.75, "y": 5.75 },
         { "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 5.75 },
-        { "matrix": [9, 6], "w": 1, "x": 18.75, "y": 6 },
-        { "matrix": [10, 7], "w": 1, "x": 20, "y": 5.75 },
-        { "matrix": [10, 8], "w": 1, "x": 21, "y": 5.75 },
-        { "matrix": [10, 9], "w": 1, "x": 22, "y": 5.75 },
-        { "h": 2, "matrix": [10, 10], "w": 1, "x": 23, "y": 5.75 },
-        { "matrix": [5, 1], "w": 1, "x": 1, "y": 6.75 },
-        { "matrix": [5, 2], "w": 1, "x": 2, "y": 6.75 },
-        { "matrix": [5, 3], "w": 1, "x": 3.25, "y": 7 },
-        { "matrix": [5, 4], "w": 1, "x": 4.25, "y": 7 },
-        { "matrix": [5, 5], "w": 1, "x": 5.25, "y": 7 },
-        { "matrix": [5, 6], "w": 1, "x": 6.5, "y": 6.75 },
-        { "matrix": [5, 7], "w": 1, "x": 7.5, "y": 6.75 },
-        { "matrix": [5, 8], "w": 1, "x": 8.5, "y": 6.75 },
-        { "matrix": [5, 9], "w": 1, "x": 9.5, "y": 6.75 },
-        { "matrix": [5, 10], "w": 1, "x": 10.5, "y": 6.75 },
-        { "matrix": [11, 0], "w": 1, "x": 11.5, "y": 6.75 },
-        { "matrix": [11, 1], "w": 1, "x": 12.5, "y": 6.75 },
-        { "matrix": [11, 2], "w": 1, "x": 13.5, "y": 6.75 },
-        { "matrix": [11, 3], "w": 1, "x": 14.5, "y": 6.75 },
-        { "matrix": [11, 4], "w": 1, "x": 15.5, "y": 6.75 },
-        { "matrix": [11, 5], "w": 1, "x": 16.5, "y": 6.75 },
-        { "matrix": [10, 6], "w": 1, "x": 17.75, "y": 7 },
-        { "matrix": [11, 6], "w": 1, "x": 18.75, "y": 7 },
-        { "matrix": [11, 7], "w": 1, "x": 19.75, "y": 7 },
-        { "matrix": [11, 8], "w": 1, "x": 21, "y": 6.75 },
-        { "matrix": [11, 9], "w": 1, "x": 22, "y": 6.75 }
+        { "matrix": [9, 6], "x": 18.75, "y": 6 },
+        { "matrix": [10, 7], "x": 20, "y": 5.75 },
+        { "matrix": [10, 8], "x": 21, "y": 5.75 },
+        { "matrix": [10, 9], "x": 22, "y": 5.75 },
+        { "h": 2, "matrix": [10, 10], "x": 23, "y": 5.75 },
+        { "matrix": [5, 1], "x": 1, "y": 6.75 },
+        { "matrix": [5, 2], "x": 2, "y": 6.75 },
+        { "matrix": [5, 3], "x": 3.25, "y": 7 },
+        { "matrix": [5, 4], "x": 4.25, "y": 7 },
+        { "matrix": [5, 5], "x": 5.25, "y": 7 },
+        { "matrix": [5, 6], "x": 6.5, "y": 6.75 },
+        { "matrix": [5, 7], "x": 7.5, "y": 6.75 },
+        { "matrix": [5, 8], "x": 8.5, "y": 6.75 },
+        { "matrix": [5, 9], "x": 9.5, "y": 6.75 },
+        { "matrix": [5, 10], "x": 10.5, "y": 6.75 },
+        { "matrix": [11, 0], "x": 11.5, "y": 6.75 },
+        { "matrix": [11, 1], "x": 12.5, "y": 6.75 },
+        { "matrix": [11, 2], "x": 13.5, "y": 6.75 },
+        { "matrix": [11, 3], "x": 14.5, "y": 6.75 },
+        { "matrix": [11, 4], "x": 15.5, "y": 6.75 },
+        { "matrix": [11, 5], "x": 16.5, "y": 6.75 },
+        { "matrix": [10, 6], "x": 17.75, "y": 7 },
+        { "matrix": [11, 6], "x": 18.75, "y": 7 },
+        { "matrix": [11, 7], "x": 19.75, "y": 7 },
+        { "matrix": [11, 8], "x": 21, "y": 6.75 },
+        { "matrix": [11, 9], "x": 22, "y": 6.75 }
       ]
     }
   }
diff --git a/keyboards/clueboard/2x1800/2021/info.json b/keyboards/clueboard/2x1800/2021/info.json
index 44842c0e16..3565fba938 100644
--- a/keyboards/clueboard/2x1800/2021/info.json
+++ b/keyboards/clueboard/2x1800/2021/info.json
@@ -38,386 +38,386 @@
     "layouts": {
         "LAYOUT_4u_space": {
             "layout": [
-                { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 },
-                { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 },
-                { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 },
-                { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 },
-                { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 },
-                { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 },
-                { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 },
-                { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 },
-                { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 },
-                { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 },
-                { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 },
-                { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 },
-                { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 },
-                { "matrix": [6, 7], "w": 1, "x": 20, "y": 0 },
-                { "matrix": [6, 8], "w": 1, "x": 21, "y": 0 },
-                { "matrix": [6, 9], "w": 1, "x": 22, "y": 0 },
-                { "matrix": [6, 10], "w": 1, "x": 23, "y": 0 },
-                { "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 },
-                { "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 },
-                { "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 },
-                { "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 },
-                { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 },
-                { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-                { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 },
-                { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 },
-                { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 },
-                { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 },
-                { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 },
-                { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 },
-                { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 },
-                { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 },
-                { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 },
-                { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 },
-                { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4.75, "y": 0 },
+                { "matrix": [0, 6], "x": 6.25, "y": 0 },
+                { "matrix": [0, 7], "x": 7.25, "y": 0 },
+                { "matrix": [0, 8], "x": 8.25, "y": 0 },
+                { "matrix": [0, 9], "x": 9.25, "y": 0 },
+                { "matrix": [0, 10], "x": 10.75, "y": 0 },
+                { "matrix": [6, 0], "x": 11.75, "y": 0 },
+                { "matrix": [6, 1], "x": 12.75, "y": 0 },
+                { "matrix": [6, 2], "x": 13.75, "y": 0 },
+                { "matrix": [6, 3], "x": 15.25, "y": 0 },
+                { "matrix": [6, 4], "x": 16.25, "y": 0 },
+                { "matrix": [6, 5], "x": 17.25, "y": 0 },
+                { "matrix": [6, 6], "x": 18.25, "y": 0 },
+                { "matrix": [6, 7], "x": 20, "y": 0 },
+                { "matrix": [6, 8], "x": 21, "y": 0 },
+                { "matrix": [6, 9], "x": 22, "y": 0 },
+                { "matrix": [6, 10], "x": 23, "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.5, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1.25 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1.25 },
+                { "matrix": [7, 0], "x": 11.5, "y": 1.25 },
+                { "matrix": [7, 1], "x": 12.5, "y": 1.25 },
+                { "matrix": [7, 2], "x": 13.5, "y": 1.25 },
+                { "matrix": [7, 3], "x": 14.5, "y": 1.25 },
+                { "matrix": [7, 4], "x": 15.5, "y": 1.25 },
+                { "matrix": [7, 5], "x": 16.5, "y": 1.25 },
                 { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 },
-                { "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 },
-                { "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 },
-                { "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 },
-                { "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 },
-                { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 },
-                { "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 },
-                { "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 },
-                { "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 },
+                { "matrix": [7, 7], "x": 20, "y": 1.25 },
+                { "matrix": [7, 8], "x": 21, "y": 1.25 },
+                { "matrix": [7, 9], "x": 22, "y": 1.25 },
+                { "matrix": [7, 10], "x": 23, "y": 1.25 },
+                { "h": 2, "matrix": [2, 0], "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2, "y": 2.25 },
+                { "matrix": [2, 3], "x": 3, "y": 2.25 },
                 { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 },
-                { "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 },
-                { "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 },
-                { "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 },
-                { "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 },
-                { "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 },
-                { "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 },
-                { "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 },
-                { "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 },
-                { "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 },
-                { "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 },
-                { "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 },
-                { "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 },
+                { "matrix": [2, 5], "x": 6, "y": 2.25 },
+                { "matrix": [2, 6], "x": 7, "y": 2.25 },
+                { "matrix": [2, 7], "x": 8, "y": 2.25 },
+                { "matrix": [2, 8], "x": 9, "y": 2.25 },
+                { "matrix": [2, 9], "x": 10, "y": 2.25 },
+                { "matrix": [2, 10], "x": 11, "y": 2.25 },
+                { "matrix": [8, 0], "x": 12, "y": 2.25 },
+                { "matrix": [8, 1], "x": 13, "y": 2.25 },
+                { "matrix": [8, 2], "x": 14, "y": 2.25 },
+                { "matrix": [8, 3], "x": 15, "y": 2.25 },
+                { "matrix": [8, 4], "x": 16, "y": 2.25 },
+                { "matrix": [8, 5], "x": 17, "y": 2.25 },
                 { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 },
-                { "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 },
-                { "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 },
-                { "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 },
-                { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 },
-                { "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 },
-                { "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 },
-                { "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 },
+                { "matrix": [8, 7], "x": 20, "y": 2.25 },
+                { "matrix": [8, 8], "x": 21, "y": 2.25 },
+                { "matrix": [8, 9], "x": 22, "y": 2.25 },
+                { "h": 2, "matrix": [8, 10], "x": 23, "y": 2.25 },
+                { "matrix": [3, 1], "x": 1, "y": 3.25 },
+                { "matrix": [3, 2], "x": 2, "y": 3.25 },
+                { "matrix": [3, 3], "x": 3, "y": 3.25 },
                 { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 },
-                { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 },
-                { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 },
-                { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 },
-                { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 },
-                { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 },
-                { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 },
-                { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 },
-                { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 },
-                { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 },
-                { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 },
-                { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 },
+                { "matrix": [3, 5], "x": 6.25, "y": 3.25 },
+                { "matrix": [3, 6], "x": 7.25, "y": 3.25 },
+                { "matrix": [3, 7], "x": 8.25, "y": 3.25 },
+                { "matrix": [3, 8], "x": 9.25, "y": 3.25 },
+                { "matrix": [3, 9], "x": 10.25, "y": 3.25 },
+                { "matrix": [3, 10], "x": 11.25, "y": 3.25 },
+                { "matrix": [9, 0], "x": 12.25, "y": 3.25 },
+                { "matrix": [9, 1], "x": 13.25, "y": 3.25 },
+                { "matrix": [9, 2], "x": 14.25, "y": 3.25 },
+                { "matrix": [9, 3], "x": 15.25, "y": 3.25 },
+                { "matrix": [9, 4], "x": 16.25, "y": 3.25 },
                 { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 },
-                { "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 },
-                { "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 },
-                { "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 },
-                { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 },
-                { "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 },
-                { "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 },
-                { "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 },
+                { "matrix": [9, 7], "x": 20, "y": 3.25 },
+                { "matrix": [9, 8], "x": 21, "y": 3.25 },
+                { "matrix": [9, 9], "x": 22, "y": 3.25 },
+                { "h": 2, "matrix": [4, 0], "x": 0, "y": 4.25 },
+                { "matrix": [4, 1], "x": 1, "y": 4.25 },
+                { "matrix": [4, 2], "x": 2, "y": 4.25 },
+                { "matrix": [4, 3], "x": 3, "y": 4.25 },
                 { "matrix": [4, 4], "w": 1.25, "x": 5.5, "y": 4.25 },
-                { "matrix": [4, 5], "w": 1, "x": 6.75, "y": 4.25 },
-                { "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4.25 },
-                { "matrix": [4, 7], "w": 1, "x": 8.75, "y": 4.25 },
-                { "matrix": [4, 8], "w": 1, "x": 9.75, "y": 4.25 },
-                { "matrix": [4, 9], "w": 1, "x": 10.75, "y": 4.25 },
-                { "matrix": [4, 10], "w": 1, "x": 11.75, "y": 4.25 },
-                { "matrix": [10, 0], "w": 1, "x": 12.75, "y": 4.25 },
-                { "matrix": [10, 1], "w": 1, "x": 13.75, "y": 4.25 },
-                { "matrix": [10, 2], "w": 1, "x": 14.75, "y": 4.25 },
-                { "matrix": [10, 3], "w": 1, "x": 15.75, "y": 4.25 },
+                { "matrix": [4, 5], "x": 6.75, "y": 4.25 },
+                { "matrix": [4, 6], "x": 7.75, "y": 4.25 },
+                { "matrix": [4, 7], "x": 8.75, "y": 4.25 },
+                { "matrix": [4, 8], "x": 9.75, "y": 4.25 },
+                { "matrix": [4, 9], "x": 10.75, "y": 4.25 },
+                { "matrix": [4, 10], "x": 11.75, "y": 4.25 },
+                { "matrix": [10, 0], "x": 12.75, "y": 4.25 },
+                { "matrix": [10, 1], "x": 13.75, "y": 4.25 },
+                { "matrix": [10, 2], "x": 14.75, "y": 4.25 },
+                { "matrix": [10, 3], "x": 15.75, "y": 4.25 },
                 { "matrix": [10, 4], "w": 1.75, "x": 16.75, "y": 4.25 },
-                { "matrix": [10, 5], "w": 1, "x": 20, "y": 4.25 },
-                { "matrix": [9, 6], "w": 1, "x": 21, "y": 4.25 },
-                { "matrix": [10, 7], "w": 1, "x": 22, "y": 4.25 },
-                { "h": 2, "matrix": [10, 8], "w": 1, "x": 23, "y": 4.25 },
-                { "matrix": [10, 9], "w": 1, "x": 4.25, "y": 4.5 },
-                { "matrix": [10, 10], "w": 1, "x": 18.75, "y": 4.5 },
-                { "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 },
-                { "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 },
-                { "matrix": [5, 3], "w": 1, "x": 6.5, "y": 5.25 },
-                { "matrix": [5, 4], "w": 1, "x": 7.5, "y": 5.25 },
-                { "matrix": [5, 5], "w": 1, "x": 8.5, "y": 5.25 },
+                { "matrix": [10, 5], "x": 20, "y": 4.25 },
+                { "matrix": [9, 6], "x": 21, "y": 4.25 },
+                { "matrix": [10, 7], "x": 22, "y": 4.25 },
+                { "h": 2, "matrix": [10, 8], "x": 23, "y": 4.25 },
+                { "matrix": [10, 9], "x": 4.25, "y": 4.5 },
+                { "matrix": [10, 10], "x": 18.75, "y": 4.5 },
+                { "matrix": [5, 1], "x": 1, "y": 5.25 },
+                { "matrix": [5, 2], "x": 2, "y": 5.25 },
+                { "matrix": [5, 3], "x": 6.5, "y": 5.25 },
+                { "matrix": [5, 4], "x": 7.5, "y": 5.25 },
+                { "matrix": [5, 5], "x": 8.5, "y": 5.25 },
                 { "matrix": [5, 6], "w": 4, "x": 9.5, "y": 5.25 },
-                { "matrix": [5, 7], "w": 1, "x": 13.5, "y": 5.25 },
-                { "matrix": [5, 8], "w": 1, "x": 14.5, "y": 5.25 },
-                { "matrix": [11, 0], "w": 1, "x": 15.5, "y": 5.25 },
-                { "matrix": [11, 2], "w": 1, "x": 16.5, "y": 5.25 },
-                { "matrix": [11, 3], "w": 1, "x": 21, "y": 5.25 },
-                { "matrix": [11, 4], "w": 1, "x": 22, "y": 5.25 },
-                { "matrix": [11, 5], "w": 1, "x": 3.25, "y": 5.5 },
-                { "matrix": [10, 6], "w": 1, "x": 4.25, "y": 5.5 },
-                { "matrix": [11, 6], "w": 1, "x": 5.25, "y": 5.5 },
-                { "matrix": [11, 7], "w": 1, "x": 17.75, "y": 5.5 },
-                { "matrix": [11, 8], "w": 1, "x": 18.75, "y": 5.5 },
-                { "matrix": [11, 9], "w": 1, "x": 19.75, "y": 5.5 }
+                { "matrix": [5, 7], "x": 13.5, "y": 5.25 },
+                { "matrix": [5, 8], "x": 14.5, "y": 5.25 },
+                { "matrix": [11, 0], "x": 15.5, "y": 5.25 },
+                { "matrix": [11, 2], "x": 16.5, "y": 5.25 },
+                { "matrix": [11, 3], "x": 21, "y": 5.25 },
+                { "matrix": [11, 4], "x": 22, "y": 5.25 },
+                { "matrix": [11, 5], "x": 3.25, "y": 5.5 },
+                { "matrix": [10, 6], "x": 4.25, "y": 5.5 },
+                { "matrix": [11, 6], "x": 5.25, "y": 5.5 },
+                { "matrix": [11, 7], "x": 17.75, "y": 5.5 },
+                { "matrix": [11, 8], "x": 18.75, "y": 5.5 },
+                { "matrix": [11, 9], "x": 19.75, "y": 5.5 }
             ]
         },
         "LAYOUT_7u_space": {
             "layout": [
-                { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 },
-                { "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 },
-                { "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 },
-                { "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 },
-                { "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 },
-                { "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 },
-                { "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 },
-                { "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 },
-                { "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 },
-                { "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 },
-                { "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 },
-                { "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 },
-                { "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 },
-                { "matrix": [6, 7], "w": 1, "x": 20, "y": 0 },
-                { "matrix": [6, 8], "w": 1, "x": 21, "y": 0 },
-                { "matrix": [6, 9], "w": 1, "x": 22, "y": 0 },
-                { "matrix": [6, 10], "w": 1, "x": 23, "y": 0 },
-                { "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 },
-                { "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 },
-                { "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 },
-                { "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 },
-                { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 },
-                { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-                { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 },
-                { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 },
-                { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 },
-                { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 },
-                { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 },
-                { "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 },
-                { "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 },
-                { "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 },
-                { "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 },
-                { "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 },
-                { "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4.75, "y": 0 },
+                { "matrix": [0, 6], "x": 6.25, "y": 0 },
+                { "matrix": [0, 7], "x": 7.25, "y": 0 },
+                { "matrix": [0, 8], "x": 8.25, "y": 0 },
+                { "matrix": [0, 9], "x": 9.25, "y": 0 },
+                { "matrix": [0, 10], "x": 10.75, "y": 0 },
+                { "matrix": [6, 0], "x": 11.75, "y": 0 },
+                { "matrix": [6, 1], "x": 12.75, "y": 0 },
+                { "matrix": [6, 2], "x": 13.75, "y": 0 },
+                { "matrix": [6, 3], "x": 15.25, "y": 0 },
+                { "matrix": [6, 4], "x": 16.25, "y": 0 },
+                { "matrix": [6, 5], "x": 17.25, "y": 0 },
+                { "matrix": [6, 6], "x": 18.25, "y": 0 },
+                { "matrix": [6, 7], "x": 20, "y": 0 },
+                { "matrix": [6, 8], "x": 21, "y": 0 },
+                { "matrix": [6, 9], "x": 22, "y": 0 },
+                { "matrix": [6, 10], "x": 23, "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.5, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1.25 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1.25 },
+                { "matrix": [7, 0], "x": 11.5, "y": 1.25 },
+                { "matrix": [7, 1], "x": 12.5, "y": 1.25 },
+                { "matrix": [7, 2], "x": 13.5, "y": 1.25 },
+                { "matrix": [7, 3], "x": 14.5, "y": 1.25 },
+                { "matrix": [7, 4], "x": 15.5, "y": 1.25 },
+                { "matrix": [7, 5], "x": 16.5, "y": 1.25 },
                 { "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 },
-                { "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 },
-                { "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 },
-                { "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 },
-                { "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 },
-                { "h": 2, "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 },
-                { "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 },
-                { "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 },
-                { "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 },
+                { "matrix": [7, 7], "x": 20, "y": 1.25 },
+                { "matrix": [7, 8], "x": 21, "y": 1.25 },
+                { "matrix": [7, 9], "x": 22, "y": 1.25 },
+                { "matrix": [7, 10], "x": 23, "y": 1.25 },
+                { "h": 2, "matrix": [2, 0], "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2, "y": 2.25 },
+                { "matrix": [2, 3], "x": 3, "y": 2.25 },
                 { "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 },
-                { "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 },
-                { "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 },
-                { "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 },
-                { "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 },
-                { "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 },
-                { "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 },
-                { "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 },
-                { "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 },
-                { "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 },
-                { "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 },
-                { "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 },
-                { "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 },
+                { "matrix": [2, 5], "x": 6, "y": 2.25 },
+                { "matrix": [2, 6], "x": 7, "y": 2.25 },
+                { "matrix": [2, 7], "x": 8, "y": 2.25 },
+                { "matrix": [2, 8], "x": 9, "y": 2.25 },
+                { "matrix": [2, 9], "x": 10, "y": 2.25 },
+                { "matrix": [2, 10], "x": 11, "y": 2.25 },
+                { "matrix": [8, 0], "x": 12, "y": 2.25 },
+                { "matrix": [8, 1], "x": 13, "y": 2.25 },
+                { "matrix": [8, 2], "x": 14, "y": 2.25 },
+                { "matrix": [8, 3], "x": 15, "y": 2.25 },
+                { "matrix": [8, 4], "x": 16, "y": 2.25 },
+                { "matrix": [8, 5], "x": 17, "y": 2.25 },
                 { "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 },
-                { "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 },
-                { "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 },
-                { "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 },
-                { "h": 2, "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 },
-                { "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 },
-                { "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 },
-                { "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 },
+                { "matrix": [8, 7], "x": 20, "y": 2.25 },
+                { "matrix": [8, 8], "x": 21, "y": 2.25 },
+                { "matrix": [8, 9], "x": 22, "y": 2.25 },
+                { "h": 2, "matrix": [8, 10], "x": 23, "y": 2.25 },
+                { "matrix": [3, 1], "x": 1, "y": 3.25 },
+                { "matrix": [3, 2], "x": 2, "y": 3.25 },
+                { "matrix": [3, 3], "x": 3, "y": 3.25 },
                 { "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 },
-                { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 },
-                { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 },
-                { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 },
-                { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 },
-                { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 },
-                { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 },
-                { "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 },
-                { "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 },
-                { "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 },
-                { "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 },
-                { "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 },
+                { "matrix": [3, 5], "x": 6.25, "y": 3.25 },
+                { "matrix": [3, 6], "x": 7.25, "y": 3.25 },
+                { "matrix": [3, 7], "x": 8.25, "y": 3.25 },
+                { "matrix": [3, 8], "x": 9.25, "y": 3.25 },
+                { "matrix": [3, 9], "x": 10.25, "y": 3.25 },
+                { "matrix": [3, 10], "x": 11.25, "y": 3.25 },
+                { "matrix": [9, 0], "x": 12.25, "y": 3.25 },
+                { "matrix": [9, 1], "x": 13.25, "y": 3.25 },
+                { "matrix": [9, 2], "x": 14.25, "y": 3.25 },
+                { "matrix": [9, 3], "x": 15.25, "y": 3.25 },
+                { "matrix": [9, 4], "x": 16.25, "y": 3.25 },
                 { "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 },
-                { "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 },
-                { "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 },
-                { "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 },
-                { "h": 2, "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 },
-                { "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 },
-                { "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 },
-                { "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 },
+                { "matrix": [9, 7], "x": 20, "y": 3.25 },
+                { "matrix": [9, 8], "x": 21, "y": 3.25 },
+                { "matrix": [9, 9], "x": 22, "y": 3.25 },
+                { "h": 2, "matrix": [4, 0], "x": 0, "y": 4.25 },
+                { "matrix": [4, 1], "x": 1, "y": 4.25 },
+                { "matrix": [4, 2], "x": 2, "y": 4.25 },
+                { "matrix": [4, 3], "x": 3, "y": 4.25 },
                 { "matrix": [4, 4], "w": 1.25, "x": 5.5, "y": 4.25 },
-                { "matrix": [4, 5], "w": 1, "x": 6.75, "y": 4.25 },
-                { "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4.25 },
-                { "matrix": [4, 7], "w": 1, "x": 8.75, "y": 4.25 },
-                { "matrix": [4, 8], "w": 1, "x": 9.75, "y": 4.25 },
-                { "matrix": [4, 9], "w": 1, "x": 10.75, "y": 4.25 },
-                { "matrix": [4, 10], "w": 1, "x": 11.75, "y": 4.25 },
-                { "matrix": [10, 0], "w": 1, "x": 12.75, "y": 4.25 },
-                { "matrix": [10, 1], "w": 1, "x": 13.75, "y": 4.25 },
-                { "matrix": [10, 2], "w": 1, "x": 14.75, "y": 4.25 },
-                { "matrix": [10, 3], "w": 1, "x": 15.75, "y": 4.25 },
+                { "matrix": [4, 5], "x": 6.75, "y": 4.25 },
+                { "matrix": [4, 6], "x": 7.75, "y": 4.25 },
+                { "matrix": [4, 7], "x": 8.75, "y": 4.25 },
+                { "matrix": [4, 8], "x": 9.75, "y": 4.25 },
+                { "matrix": [4, 9], "x": 10.75, "y": 4.25 },
+                { "matrix": [4, 10], "x": 11.75, "y": 4.25 },
+                { "matrix": [10, 0], "x": 12.75, "y": 4.25 },
+                { "matrix": [10, 1], "x": 13.75, "y": 4.25 },
+                { "matrix": [10, 2], "x": 14.75, "y": 4.25 },
+                { "matrix": [10, 3], "x": 15.75, "y": 4.25 },
                 { "matrix": [10, 4], "w": 1.75, "x": 16.75, "y": 4.25 },
-                { "matrix": [10, 5], "w": 1, "x": 20, "y": 4.25 },
-                { "matrix": [9, 6], "w": 1, "x": 21, "y": 4.25 },
-                { "matrix": [10, 7], "w": 1, "x": 22, "y": 4.25 },
-                { "h": 2, "matrix": [10, 8], "w": 1, "x": 23, "y": 4.25 },
-                { "matrix": [10, 9], "w": 1, "x": 4.25, "y": 4.5 },
-                { "matrix": [10, 10], "w": 1, "x": 18.75, "y": 4.5 },
-                { "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 },
-                { "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 },
-                { "matrix": [5, 3], "w": 1, "x": 6.5, "y": 5.25 },
-                { "matrix": [5, 4], "w": 1, "x": 7.5, "y": 5.25 },
+                { "matrix": [10, 5], "x": 20, "y": 4.25 },
+                { "matrix": [9, 6], "x": 21, "y": 4.25 },
+                { "matrix": [10, 7], "x": 22, "y": 4.25 },
+                { "h": 2, "matrix": [10, 8], "x": 23, "y": 4.25 },
+                { "matrix": [10, 9], "x": 4.25, "y": 4.5 },
+                { "matrix": [10, 10], "x": 18.75, "y": 4.5 },
+                { "matrix": [5, 1], "x": 1, "y": 5.25 },
+                { "matrix": [5, 2], "x": 2, "y": 5.25 },
+                { "matrix": [5, 3], "x": 6.5, "y": 5.25 },
+                { "matrix": [5, 4], "x": 7.5, "y": 5.25 },
                 { "matrix": [5, 5], "w": 7, "x": 8.5, "y": 5.25 },
-                { "matrix": [5, 6], "w": 1, "x": 15.5, "y": 5.25 },
-                { "matrix": [5, 7], "w": 1, "x": 16.5, "y": 5.25 },
-                { "matrix": [11, 0], "w": 1, "x": 21, "y": 5.25 },
-                { "matrix": [11, 4], "w": 1, "x": 22, "y": 5.25 },
-                { "matrix": [11, 5], "w": 1, "x": 3.25, "y": 5.5 },
-                { "matrix": [10, 6], "w": 1, "x": 4.25, "y": 5.5 },
-                { "matrix": [11, 6], "w": 1, "x": 5.25, "y": 5.5 },
-                { "matrix": [11, 7], "w": 1, "x": 17.75, "y": 5.5 },
-                { "matrix": [11, 8], "w": 1, "x": 18.75, "y": 5.5 },
-                { "matrix": [11, 9], "w": 1, "x": 19.75, "y": 5.5 }
+                { "matrix": [5, 6], "x": 15.5, "y": 5.25 },
+                { "matrix": [5, 7], "x": 16.5, "y": 5.25 },
+                { "matrix": [11, 0], "x": 21, "y": 5.25 },
+                { "matrix": [11, 4], "x": 22, "y": 5.25 },
+                { "matrix": [11, 5], "x": 3.25, "y": 5.5 },
+                { "matrix": [10, 6], "x": 4.25, "y": 5.5 },
+                { "matrix": [11, 6], "x": 5.25, "y": 5.5 },
+                { "matrix": [11, 7], "x": 17.75, "y": 5.5 },
+                { "matrix": [11, 8], "x": 18.75, "y": 5.5 },
+                { "matrix": [11, 9], "x": 19.75, "y": 5.5 }
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "label": "Home", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "End", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "label": "PgUp", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "PgDn", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "label": "Esc", "matrix": [0, 4], "w": 1, "x": 4.75, "y": 0 },
-                { "label": "F1", "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 },
-                { "label": "F2", "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 },
-                { "label": "F3", "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 },
-                { "label": "F4", "matrix": [0, 9], "w": 1, "x": 9.25, "y": 0 },
-                { "label": "F5", "matrix": [0, 10], "w": 1, "x": 10.75, "y": 0 },
-                { "label": "F6", "matrix": [6, 0], "w": 1, "x": 11.75, "y": 0 },
-                { "label": "F7", "matrix": [6, 1], "w": 1, "x": 12.75, "y": 0 },
-                { "label": "F8", "matrix": [6, 2], "w": 1, "x": 13.75, "y": 0 },
-                { "label": "F9", "matrix": [6, 3], "w": 1, "x": 15.25, "y": 0 },
-                { "label": "F10", "matrix": [6, 4], "w": 1, "x": 16.25, "y": 0 },
-                { "label": "F11", "matrix": [6, 5], "w": 1, "x": 17.25, "y": 0 },
-                { "label": "F12", "matrix": [6, 6], "w": 1, "x": 18.25, "y": 0 },
-                { "label": "PrtSc", "matrix": [6, 7], "w": 1, "x": 20, "y": 0 },
-                { "label": "Scroll Lock", "matrix": [6, 8], "w": 1, "x": 21, "y": 0 },
-                { "label": "Pause", "matrix": [6, 9], "w": 1, "x": 22, "y": 0 },
-                { "label": "Insert", "matrix": [6, 10], "w": 1, "x": 23, "y": 0 },
-                { "label": "-", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.25 },
-                { "label": "Num Lock", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.25 },
-                { "label": "/", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.25 },
-                { "label": "*", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.25 },
-                { "label": "~", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.25 },
-                { "label": "!", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-                { "label": "@", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25 },
-                { "label": "#", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1.25 },
-                { "label": "$", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1.25 },
-                { "label": "%", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1.25 },
-                { "label": "^", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1.25 },
-                { "label": "&", "matrix": [7, 0], "w": 1, "x": 11.5, "y": 1.25 },
-                { "label": "*", "matrix": [7, 1], "w": 1, "x": 12.5, "y": 1.25 },
-                { "label": "(", "matrix": [7, 2], "w": 1, "x": 13.5, "y": 1.25 },
-                { "label": ")", "matrix": [7, 3], "w": 1, "x": 14.5, "y": 1.25 },
-                { "label": "_", "matrix": [7, 4], "w": 1, "x": 15.5, "y": 1.25 },
-                { "label": "+", "matrix": [7, 5], "w": 1, "x": 16.5, "y": 1.25 },
+                { "label": "Home", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "End", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "PgUp", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "PgDn", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "Esc", "matrix": [0, 4], "x": 4.75, "y": 0 },
+                { "label": "F1", "matrix": [0, 6], "x": 6.25, "y": 0 },
+                { "label": "F2", "matrix": [0, 7], "x": 7.25, "y": 0 },
+                { "label": "F3", "matrix": [0, 8], "x": 8.25, "y": 0 },
+                { "label": "F4", "matrix": [0, 9], "x": 9.25, "y": 0 },
+                { "label": "F5", "matrix": [0, 10], "x": 10.75, "y": 0 },
+                { "label": "F6", "matrix": [6, 0], "x": 11.75, "y": 0 },
+                { "label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0 },
+                { "label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0 },
+                { "label": "F9", "matrix": [6, 3], "x": 15.25, "y": 0 },
+                { "label": "F10", "matrix": [6, 4], "x": 16.25, "y": 0 },
+                { "label": "F11", "matrix": [6, 5], "x": 17.25, "y": 0 },
+                { "label": "F12", "matrix": [6, 6], "x": 18.25, "y": 0 },
+                { "label": "PrtSc", "matrix": [6, 7], "x": 20, "y": 0 },
+                { "label": "Scroll Lock", "matrix": [6, 8], "x": 21, "y": 0 },
+                { "label": "Pause", "matrix": [6, 9], "x": 22, "y": 0 },
+                { "label": "Insert", "matrix": [6, 10], "x": 23, "y": 0 },
+                { "label": "-", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "Num Lock", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "/", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "*", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "~", "matrix": [1, 4], "x": 4.5, "y": 1.25 },
+                { "label": "!", "matrix": [1, 5], "x": 5.5, "y": 1.25 },
+                { "label": "@", "matrix": [1, 6], "x": 6.5, "y": 1.25 },
+                { "label": "#", "matrix": [1, 7], "x": 7.5, "y": 1.25 },
+                { "label": "$", "matrix": [1, 8], "x": 8.5, "y": 1.25 },
+                { "label": "%", "matrix": [1, 9], "x": 9.5, "y": 1.25 },
+                { "label": "^", "matrix": [1, 10], "x": 10.5, "y": 1.25 },
+                { "label": "&", "matrix": [7, 0], "x": 11.5, "y": 1.25 },
+                { "label": "*", "matrix": [7, 1], "x": 12.5, "y": 1.25 },
+                { "label": "(", "matrix": [7, 2], "x": 13.5, "y": 1.25 },
+                { "label": ")", "matrix": [7, 3], "x": 14.5, "y": 1.25 },
+                { "label": "_", "matrix": [7, 4], "x": 15.5, "y": 1.25 },
+                { "label": "+", "matrix": [7, 5], "x": 16.5, "y": 1.25 },
                 { "label": "Backspace", "matrix": [7, 6], "w": 2, "x": 17.5, "y": 1.25 },
-                { "label": "Num Lock", "matrix": [7, 7], "w": 1, "x": 20, "y": 1.25 },
-                { "label": "/", "matrix": [7, 8], "w": 1, "x": 21, "y": 1.25 },
-                { "label": "*", "matrix": [7, 9], "w": 1, "x": 22, "y": 1.25 },
-                { "label": "-", "matrix": [7, 10], "w": 1, "x": 23, "y": 1.25 },
-                { "h": 2, "label": "+", "matrix": [2, 0], "w": 1, "x": 0, "y": 2.25 },
-                { "label": "7", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.25 },
-                { "label": "8", "matrix": [2, 2], "w": 1, "x": 2, "y": 2.25 },
-                { "label": "9", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.25 },
+                { "label": "Num Lock", "matrix": [7, 7], "x": 20, "y": 1.25 },
+                { "label": "/", "matrix": [7, 8], "x": 21, "y": 1.25 },
+                { "label": "*", "matrix": [7, 9], "x": 22, "y": 1.25 },
+                { "label": "-", "matrix": [7, 10], "x": 23, "y": 1.25 },
+                { "h": 2, "label": "+", "matrix": [2, 0], "x": 0, "y": 2.25 },
+                { "label": "7", "matrix": [2, 1], "x": 1, "y": 2.25 },
+                { "label": "8", "matrix": [2, 2], "x": 2, "y": 2.25 },
+                { "label": "9", "matrix": [2, 3], "x": 3, "y": 2.25 },
                 { "label": "Tab", "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.25 },
-                { "label": "Q", "matrix": [2, 5], "w": 1, "x": 6, "y": 2.25 },
-                { "label": "W", "matrix": [2, 6], "w": 1, "x": 7, "y": 2.25 },
-                { "label": "E", "matrix": [2, 7], "w": 1, "x": 8, "y": 2.25 },
-                { "label": "R", "matrix": [2, 8], "w": 1, "x": 9, "y": 2.25 },
-                { "label": "T", "matrix": [2, 9], "w": 1, "x": 10, "y": 2.25 },
-                { "label": "Y", "matrix": [2, 10], "w": 1, "x": 11, "y": 2.25 },
-                { "label": "U", "matrix": [8, 0], "w": 1, "x": 12, "y": 2.25 },
-                { "label": "I", "matrix": [8, 1], "w": 1, "x": 13, "y": 2.25 },
-                { "label": "O", "matrix": [8, 2], "w": 1, "x": 14, "y": 2.25 },
-                { "label": "P", "matrix": [8, 3], "w": 1, "x": 15, "y": 2.25 },
-                { "label": "{", "matrix": [8, 4], "w": 1, "x": 16, "y": 2.25 },
-                { "label": "}", "matrix": [8, 5], "w": 1, "x": 17, "y": 2.25 },
+                { "label": "Q", "matrix": [2, 5], "x": 6, "y": 2.25 },
+                { "label": "W", "matrix": [2, 6], "x": 7, "y": 2.25 },
+                { "label": "E", "matrix": [2, 7], "x": 8, "y": 2.25 },
+                { "label": "R", "matrix": [2, 8], "x": 9, "y": 2.25 },
+                { "label": "T", "matrix": [2, 9], "x": 10, "y": 2.25 },
+                { "label": "Y", "matrix": [2, 10], "x": 11, "y": 2.25 },
+                { "label": "U", "matrix": [8, 0], "x": 12, "y": 2.25 },
+                { "label": "I", "matrix": [8, 1], "x": 13, "y": 2.25 },
+                { "label": "O", "matrix": [8, 2], "x": 14, "y": 2.25 },
+                { "label": "P", "matrix": [8, 3], "x": 15, "y": 2.25 },
+                { "label": "{", "matrix": [8, 4], "x": 16, "y": 2.25 },
+                { "label": "}", "matrix": [8, 5], "x": 17, "y": 2.25 },
                 { "label": "|", "matrix": [8, 6], "w": 1.5, "x": 18, "y": 2.25 },
-                { "label": "7", "matrix": [8, 7], "w": 1, "x": 20, "y": 2.25 },
-                { "label": "8", "matrix": [8, 8], "w": 1, "x": 21, "y": 2.25 },
-                { "label": "9", "matrix": [8, 9], "w": 1, "x": 22, "y": 2.25 },
-                { "h": 2, "label": "+", "matrix": [8, 10], "w": 1, "x": 23, "y": 2.25 },
-                { "label": "4", "matrix": [3, 1], "w": 1, "x": 1, "y": 3.25 },
-                { "label": "5", "matrix": [3, 2], "w": 1, "x": 2, "y": 3.25 },
-                { "label": "6", "matrix": [3, 3], "w": 1, "x": 3, "y": 3.25 },
+                { "label": "7", "matrix": [8, 7], "x": 20, "y": 2.25 },
+                { "label": "8", "matrix": [8, 8], "x": 21, "y": 2.25 },
+                { "label": "9", "matrix": [8, 9], "x": 22, "y": 2.25 },
+                { "h": 2, "label": "+", "matrix": [8, 10], "x": 23, "y": 2.25 },
+                { "label": "4", "matrix": [3, 1], "x": 1, "y": 3.25 },
+                { "label": "5", "matrix": [3, 2], "x": 2, "y": 3.25 },
+                { "label": "6", "matrix": [3, 3], "x": 3, "y": 3.25 },
                 { "label": "Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.25 },
-                { "label": "A", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3.25 },
-                { "label": "S", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3.25 },
-                { "label": "D", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3.25 },
-                { "label": "F", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3.25 },
-                { "label": "G", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3.25 },
-                { "label": "H", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3.25 },
-                { "label": "J", "matrix": [9, 0], "w": 1, "x": 12.25, "y": 3.25 },
-                { "label": "K", "matrix": [9, 1], "w": 1, "x": 13.25, "y": 3.25 },
-                { "label": "L", "matrix": [9, 2], "w": 1, "x": 14.25, "y": 3.25 },
-                { "label": ":", "matrix": [9, 3], "w": 1, "x": 15.25, "y": 3.25 },
-                { "label": "\"", "matrix": [9, 4], "w": 1, "x": 16.25, "y": 3.25 },
+                { "label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.25 },
+                { "label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.25 },
+                { "label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.25 },
+                { "label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.25 },
+                { "label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.25 },
+                { "label": "H", "matrix": [3, 10], "x": 11.25, "y": 3.25 },
+                { "label": "J", "matrix": [9, 0], "x": 12.25, "y": 3.25 },
+                { "label": "K", "matrix": [9, 1], "x": 13.25, "y": 3.25 },
+                { "label": "L", "matrix": [9, 2], "x": 14.25, "y": 3.25 },
+                { "label": ":", "matrix": [9, 3], "x": 15.25, "y": 3.25 },
+                { "label": "\"", "matrix": [9, 4], "x": 16.25, "y": 3.25 },
                 { "label": "Enter", "matrix": [9, 5], "w": 2.25, "x": 17.25, "y": 3.25 },
-                { "label": "4", "matrix": [9, 7], "w": 1, "x": 20, "y": 3.25 },
-                { "label": "5", "matrix": [9, 8], "w": 1, "x": 21, "y": 3.25 },
-                { "label": "6", "matrix": [9, 9], "w": 1, "x": 22, "y": 3.25 },
-                { "h": 2, "label": "Enter", "matrix": [4, 0], "w": 1, "x": 0, "y": 4.25 },
-                { "label": "1", "matrix": [4, 1], "w": 1, "x": 1, "y": 4.25 },
-                { "label": "2", "matrix": [4, 2], "w": 1, "x": 2, "y": 4.25 },
-                { "label": "3", "matrix": [4, 3], "w": 1, "x": 3, "y": 4.25 },
-                { "label": "\\u2191", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 },
+                { "label": "4", "matrix": [9, 7], "x": 20, "y": 3.25 },
+                { "label": "5", "matrix": [9, 8], "x": 21, "y": 3.25 },
+                { "label": "6", "matrix": [9, 9], "x": 22, "y": 3.25 },
+                { "h": 2, "label": "Enter", "matrix": [4, 0], "x": 0, "y": 4.25 },
+                { "label": "1", "matrix": [4, 1], "x": 1, "y": 4.25 },
+                { "label": "2", "matrix": [4, 2], "x": 2, "y": 4.25 },
+                { "label": "3", "matrix": [4, 3], "x": 3, "y": 4.25 },
+                { "label": "\\u2191", "matrix": [4, 4], "x": 4.25, "y": 4.5 },
                 { "label": "Shift", "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 4.25 },
-                { "label": "Z", "matrix": [4, 6], "w": 1, "x": 6.75, "y": 4.25 },
-                { "label": "X", "matrix": [4, 7], "w": 1, "x": 7.75, "y": 4.25 },
-                { "label": "C", "matrix": [4, 8], "w": 1, "x": 8.75, "y": 4.25 },
-                { "label": "V", "matrix": [4, 9], "w": 1, "x": 9.75, "y": 4.25 },
-                { "label": "B", "matrix": [4, 10], "w": 1, "x": 10.75, "y": 4.25 },
-                { "label": "N", "matrix": [10, 0], "w": 1, "x": 11.75, "y": 4.25 },
-                { "label": "M", "matrix": [10, 1], "w": 1, "x": 12.75, "y": 4.25 },
-                { "label": "<", "matrix": [10, 2], "w": 1, "x": 13.75, "y": 4.25 },
-                { "label": ">", "matrix": [10, 3], "w": 1, "x": 14.75, "y": 4.25 },
-                { "label": "?", "matrix": [10, 4], "w": 1, "x": 15.75, "y": 4.25 },
+                { "label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.25 },
+                { "label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.25 },
+                { "label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.25 },
+                { "label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.25 },
+                { "label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.25 },
+                { "label": "N", "matrix": [10, 0], "x": 11.75, "y": 4.25 },
+                { "label": "M", "matrix": [10, 1], "x": 12.75, "y": 4.25 },
+                { "label": "<", "matrix": [10, 2], "x": 13.75, "y": 4.25 },
+                { "label": ">", "matrix": [10, 3], "x": 14.75, "y": 4.25 },
+                { "label": "?", "matrix": [10, 4], "x": 15.75, "y": 4.25 },
                 { "label": "Shift", "matrix": [10, 5], "w": 1.75, "x": 16.75, "y": 4.25 },
-                { "label": "\\u2191", "matrix": [9, 6], "w": 1, "x": 18.75, "y": 4.5 },
-                { "label": "1", "matrix": [10, 7], "w": 1, "x": 20, "y": 4.25 },
-                { "label": "2", "matrix": [10, 8], "w": 1, "x": 21, "y": 4.25 },
-                { "label": "3", "matrix": [10, 9], "w": 1, "x": 22, "y": 4.25 },
-                { "h": 2, "label": "Enter", "matrix": [10, 10], "w": 1, "x": 23, "y": 4.25 },
-                { "label": "0", "matrix": [5, 1], "w": 1, "x": 1, "y": 5.25 },
-                { "label": ".", "matrix": [5, 2], "w": 1, "x": 2, "y": 5.25 },
-                { "label": "\\u2190", "matrix": [5, 3], "w": 1, "x": 3.25, "y": 5.5 },
-                { "label": "\\u2193", "matrix": [5, 4], "w": 1, "x": 4.25, "y": 5.5 },
-                { "label": "\\u2192", "matrix": [5, 5], "w": 1, "x": 5.25, "y": 5.5 },
-                { "label": "Ctrl", "matrix": [5, 6], "w": 1, "x": 6.5, "y": 5.25 },
-                { "label": "Win", "matrix": [5, 7], "w": 1, "x": 7.5, "y": 5.25 },
-                { "label": "Alt", "matrix": [5, 8], "w": 1, "x": 8.5, "y": 5.25 },
-                { "label": "1u", "matrix": [5, 9], "w": 1, "x": 9.5, "y": 5.25 },
-                { "label": "1u", "matrix": [5, 10], "w": 1, "x": 10.5, "y": 5.25 },
-                { "label": "1u", "matrix": [11, 0], "w": 1, "x": 11.5, "y": 5.25 },
-                { "label": "1u", "matrix": [11, 1], "w": 1, "x": 12.5, "y": 5.25 },
-                { "label": "Alt", "matrix": [11, 2], "w": 1, "x": 13.5, "y": 5.25 },
-                { "label": "Win", "matrix": [11, 3], "w": 1, "x": 14.5, "y": 5.25 },
-                { "label": "Menu", "matrix": [11, 4], "w": 1, "x": 15.5, "y": 5.25 },
-                { "label": "Ctrl", "matrix": [11, 5], "w": 1, "x": 16.5, "y": 5.25 },
-                { "label": "\\u2190", "matrix": [10, 6], "w": 1, "x": 17.75, "y": 5.5 },
-                { "label": "\\u2193", "matrix": [11, 6], "w": 1, "x": 18.75, "y": 5.5 },
-                { "label": "\\u2192", "matrix": [11, 7], "w": 1, "x": 19.75, "y": 5.5 },
-                { "label": "0", "matrix": [11, 8], "w": 1, "x": 21, "y": 5.25 },
-                { "label": ".", "matrix": [11, 9], "w": 1, "x": 22, "y": 5.25 }
+                { "label": "\\u2191", "matrix": [9, 6], "x": 18.75, "y": 4.5 },
+                { "label": "1", "matrix": [10, 7], "x": 20, "y": 4.25 },
+                { "label": "2", "matrix": [10, 8], "x": 21, "y": 4.25 },
+                { "label": "3", "matrix": [10, 9], "x": 22, "y": 4.25 },
+                { "h": 2, "label": "Enter", "matrix": [10, 10], "x": 23, "y": 4.25 },
+                { "label": "0", "matrix": [5, 1], "x": 1, "y": 5.25 },
+                { "label": ".", "matrix": [5, 2], "x": 2, "y": 5.25 },
+                { "label": "\\u2190", "matrix": [5, 3], "x": 3.25, "y": 5.5 },
+                { "label": "\\u2193", "matrix": [5, 4], "x": 4.25, "y": 5.5 },
+                { "label": "\\u2192", "matrix": [5, 5], "x": 5.25, "y": 5.5 },
+                { "label": "Ctrl", "matrix": [5, 6], "x": 6.5, "y": 5.25 },
+                { "label": "Win", "matrix": [5, 7], "x": 7.5, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 8], "x": 8.5, "y": 5.25 },
+                { "label": "1u", "matrix": [5, 9], "x": 9.5, "y": 5.25 },
+                { "label": "1u", "matrix": [5, 10], "x": 10.5, "y": 5.25 },
+                { "label": "1u", "matrix": [11, 0], "x": 11.5, "y": 5.25 },
+                { "label": "1u", "matrix": [11, 1], "x": 12.5, "y": 5.25 },
+                { "label": "Alt", "matrix": [11, 2], "x": 13.5, "y": 5.25 },
+                { "label": "Win", "matrix": [11, 3], "x": 14.5, "y": 5.25 },
+                { "label": "Menu", "matrix": [11, 4], "x": 15.5, "y": 5.25 },
+                { "label": "Ctrl", "matrix": [11, 5], "x": 16.5, "y": 5.25 },
+                { "label": "\\u2190", "matrix": [10, 6], "x": 17.75, "y": 5.5 },
+                { "label": "\\u2193", "matrix": [11, 6], "x": 18.75, "y": 5.5 },
+                { "label": "\\u2192", "matrix": [11, 7], "x": 19.75, "y": 5.5 },
+                { "label": "0", "matrix": [11, 8], "x": 21, "y": 5.25 },
+                { "label": ".", "matrix": [11, 9], "x": 22, "y": 5.25 }
             ]
         }
     }
diff --git a/keyboards/clueboard/60/60.c b/keyboards/clueboard/60/60.c
deleted file mode 100644
index 90d1661394..0000000000
--- a/keyboards/clueboard/60/60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 skully <skullydazed@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "60.h"
diff --git a/keyboards/clueboard/60/60.h b/keyboards/clueboard/60/60.h
deleted file mode 100644
index 9a019ccf6d..0000000000
--- a/keyboards/clueboard/60/60.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 skully <skullydazed@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json
index d89253fa3e..0a97eed0e0 100644
--- a/keyboards/clueboard/60/info.json
+++ b/keyboards/clueboard/60/info.json
@@ -39,58 +39,58 @@
   "layouts": {
     "LAYOUT_60_ansi": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
         { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
         { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
         { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
         { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
@@ -104,61 +104,61 @@
     },
     "LAYOUT_60_ansi_split_bs_rshift": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
-        { "label": "k0d", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
-        { "label": "Back", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+        { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+        { "label": "Back", "matrix": [0, 14], "x": 14, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
         { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
         { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
         { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
-        { "label": "k3e", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 },
+        { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -171,59 +171,59 @@
     },
     "LAYOUT_60_iso": {
       "layout": [
-        { "label": "\\u00ac", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "\"", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "\\u00a3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+        { "label": "\\u00ac", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "\"", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "\\u00a3", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
         { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
         { "h": 2, "label": "Enter", "matrix": [2, 0], "w": 1.25, "x": 13.75, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 2], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 3], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 4], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 5], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 6], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 7], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 8], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [2, 9], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [2, 10], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [2, 11], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "@", "matrix": [2, 12], "w": 1, "x": 11.75, "y": 2 },
-        { "label": "~", "matrix": [2, 14], "w": 1, "x": 12.75, "y": 2 },
+        { "label": "A", "matrix": [2, 2], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 3], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 4], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 5], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 6], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 7], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 8], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [2, 9], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [2, 10], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [2, 11], "x": 10.75, "y": 2 },
+        { "label": "@", "matrix": [2, 12], "x": 11.75, "y": 2 },
+        { "label": "~", "matrix": [2, 14], "x": 12.75, "y": 2 },
         { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-        { "label": "|", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
@@ -237,58 +237,58 @@
     },
     "LAYOUT_aek": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
         { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
         { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
         { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
         { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.5, "y": 4 },
@@ -301,63 +301,63 @@
     },
     "LAYOUT_all": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
-        { "label": "k0d", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
-        { "label": "Back", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+        { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+        { "label": "Back", "matrix": [0, 14], "x": 14, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
         { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
-        { "label": "k2c", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+        { "label": "k2c", "matrix": [2, 12], "x": 12.75, "y": 2 },
         { "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2 },
-        { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
+        { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 },
         { "label": "Shift", "matrix": [3, 1], "w": 1.25, "x": 1, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
-        { "label": "k3e", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 },
+        { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json
index ed7d39cf95..c460080a29 100644
--- a/keyboards/clueboard/66/rev1/info.json
+++ b/keyboards/clueboard/66/rev1/info.json
@@ -42,9 +42,11 @@
     "brightness_steps": 17,
     "hue_steps": 10,
     "led_count": 14,
-    "pin": "B2",
     "saturation_steps": 17
   },
+  "ws2812": {
+    "pin": "B2"
+  },
   "usb": {
     "device_version": "0.0.1",
     "pid": "0x2301",
@@ -57,62 +59,62 @@
   "layouts": {
     "LAYOUT_66_ansi": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
         { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
-        { "label": "k0F", "matrix": [0, 15], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "k0F", "matrix": [0, 15], "x": 15.5, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
         { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "k1F", "matrix": [1, 15], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "k1F", "matrix": [1, 15], "x": 15.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
         { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
         { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [3, 13], "w": 2.25, "x": 12.25, "y": 3 },
-        { "label": "k3E", "matrix": [3, 14], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "k3E", "matrix": [3, 14], "x": 14.5, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -120,70 +122,70 @@
         { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 9.75, "y": 4 },
         { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11, "y": 4 },
         { "label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "k4D", "matrix": [4, 13], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "k4E", "matrix": [4, 14], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "k4F", "matrix": [4, 15], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "k4D", "matrix": [4, 13], "x": 13.5, "y": 4 },
+        { "label": "k4E", "matrix": [4, 14], "x": 14.5, "y": 4 },
+        { "label": "k4F", "matrix": [4, 15], "x": 15.5, "y": 4 }
       ]
     },
     "LAYOUT_66_iso": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
         { "label": "Backspace", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
-        { "label": "Insert", "matrix": [0, 15], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "Insert", "matrix": [0, 15], "x": 15.5, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
-        { "label": "Delete", "matrix": [1, 15], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+        { "label": "Delete", "matrix": [1, 15], "x": 15.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
-        { "label": "", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+        { "label": "", "matrix": [2, 12], "x": 12.75, "y": 2 },
         { "h": 2, "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
         { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-        { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [3, 13], "w": 2.25, "x": 12.25, "y": 3 },
-        { "label": "\u2191", "matrix": [3, 14], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "\u2191", "matrix": [3, 14], "x": 14.5, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -191,86 +193,86 @@
         { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 9.75, "y": 4 },
         { "label": "Ctrl", "matrix": [4, 11], "w": 1.25, "x": 11, "y": 4 },
         { "label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "\u2190", "matrix": [4, 13], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "\u2193", "matrix": [4, 14], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "\u2192", "matrix": [4, 15], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "\u2190", "matrix": [4, 13], "x": 13.5, "y": 4 },
+        { "label": "\u2193", "matrix": [4, 14], "x": 14.5, "y": 4 },
+        { "label": "\u2192", "matrix": [4, 15], "x": 15.5, "y": 4 }
       ]
     },
     "LAYOUT_all": {
       "layout": [
-        { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-        { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-        { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-        { "label": "DASH", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-        { "label": "EQUALSIGN", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
-        { "label": "YEN", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
-        { "label": "BACKSPACE", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 },
-        { "label": "PAGEUP", "matrix": [0, 15], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "GRAVE", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
+        { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
+        { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
+        { "label": "DASH", "matrix": [0, 11], "x": 11, "y": 0 },
+        { "label": "EQUALSIGN", "matrix": [0, 12], "x": 12, "y": 0 },
+        { "label": "YEN", "matrix": [0, 13], "x": 13, "y": 0 },
+        { "label": "BACKSPACE", "matrix": [0, 14], "x": 14, "y": 0 },
+        { "label": "PAGEUP", "matrix": [0, 15], "x": 15.5, "y": 0 },
         { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "LBRACKET", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "RBRACKET", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+        { "label": "LBRACKET", "matrix": [1, 11], "x": 11.5, "y": 1 },
+        { "label": "RBRACKET", "matrix": [1, 12], "x": 12.5, "y": 1 },
         { "label": "BACKSLASH", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "PAGEDOWN", "matrix": [1, 15], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "PAGEDOWN", "matrix": [1, 15], "x": 15.5, "y": 1 },
         { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-        { "label": "SEMICOLON", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "QUOTE", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
-        { "label": "ISOHASH", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+        { "label": "SEMICOLON", "matrix": [2, 10], "x": 10.75, "y": 2 },
+        { "label": "QUOTE", "matrix": [2, 11], "x": 11.75, "y": 2 },
+        { "label": "ISOHASH", "matrix": [2, 12], "x": 12.75, "y": 2 },
         { "label": "ENTER", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 },
         { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-        { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "COMMA", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
-        { "label": "PERIOD", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "SLASH", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
-        { "label": "JPBACKSLASH", "matrix": [3, 12], "w": 1, "x": 12.25, "y": 3 },
+        { "label": "ISOBACKSLASH", "matrix": [3, 1], "x": 1.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+        { "label": "COMMA", "matrix": [3, 9], "x": 9.25, "y": 3 },
+        { "label": "PERIOD", "matrix": [3, 10], "x": 10.25, "y": 3 },
+        { "label": "SLASH", "matrix": [3, 11], "x": 11.25, "y": 3 },
+        { "label": "JPBACKSLASH", "matrix": [3, 12], "x": 12.25, "y": 3 },
         { "label": "RSHIFT", "matrix": [3, 13], "w": 1.25, "x": 13.25, "y": 3 },
-        { "label": "UP", "matrix": [3, 14], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "UP", "matrix": [3, 14], "x": 14.5, "y": 3 },
         { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-        { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 },
+        { "label": "LALT", "matrix": [4, 1], "x": 1.25, "y": 4 },
         { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 },
         { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 },
         { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 },
         { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 },
         { "label": "HENKAN", "matrix": [4, 9], "w": 1.25, "x": 8.75, "y": 4 },
         { "label": "RCMD", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
-        { "label": "RCTRL", "matrix": [4, 11], "w": 1, "x": 11.25, "y": 4 },
+        { "label": "RCTRL", "matrix": [4, 11], "x": 11.25, "y": 4 },
         { "label": "FN", "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "LEFT", "matrix": [4, 13], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "DOWN", "matrix": [4, 14], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "RIGHT", "matrix": [4, 15], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "LEFT", "matrix": [4, 13], "x": 13.5, "y": 4 },
+        { "label": "DOWN", "matrix": [4, 14], "x": 14.5, "y": 4 },
+        { "label": "RIGHT", "matrix": [4, 15], "x": 15.5, "y": 4 }
       ]
     }
   }
diff --git a/keyboards/clueboard/66/rev1/rev1.c b/keyboards/clueboard/66/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/clueboard/66/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/clueboard/66/rev1/rev1.h b/keyboards/clueboard/66/rev1/rev1.h
deleted file mode 100644
index ef5b3f3e04..0000000000
--- a/keyboards/clueboard/66/rev1/rev1.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json
index 5945c2c833..fc178b12ab 100644
--- a/keyboards/clueboard/66/rev2/info.json
+++ b/keyboards/clueboard/66/rev2/info.json
@@ -42,9 +42,11 @@
     "brightness_steps": 17,
     "hue_steps": 32,
     "led_count": 14,
-    "pin": "D7",
     "saturation_steps": 17
   },
+  "ws2812": {
+    "pin": "D7"
+  },
   "usb": {
     "device_version": "0.0.1",
     "pid": "0x2320",
@@ -61,62 +63,62 @@
   "layouts": {
     "LAYOUT_66_ansi": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 },
         { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
-        { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 },
         { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 },
         { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
         { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
-        { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -124,70 +126,70 @@
         { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
         { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
         { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     },
     "LAYOUT_66_iso": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 },
         { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
-        { "label": "Insert", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "Insert", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
-        { "label": "Delete", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 },
+        { "label": "Delete", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
-        { "label": "", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 },
+        { "label": "", "matrix": [7, 4], "x": 12.75, "y": 2 },
         { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 },
         { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-        { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
-        { "label": "\u2191", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "\u2191", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -195,86 +197,86 @@
         { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
         { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
         { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "\u2190", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "\u2193", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "\u2192", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "\u2190", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "\u2193", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "\u2192", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     },
     "LAYOUT_all": {
       "layout": [
-        { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "8", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "9", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": "0", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "DASH", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "EQUALSIGN", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
-        { "label": "YEN", "matrix": [5, 5], "w": 1, "x": 13, "y": 0 },
-        { "label": "BACKSPACE", "matrix": [5, 6], "w": 1, "x": 14, "y": 0 },
-        { "label": "PAGEUP", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "GRAVE", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "8", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "9", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": "0", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "DASH", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "EQUALSIGN", "matrix": [5, 4], "x": 12, "y": 0 },
+        { "label": "YEN", "matrix": [5, 5], "x": 13, "y": 0 },
+        { "label": "BACKSPACE", "matrix": [5, 6], "x": 14, "y": 0 },
+        { "label": "PAGEUP", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "LBRACKET", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "RBRACKET", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "LBRACKET", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "RBRACKET", "matrix": [6, 4], "x": 12.5, "y": 1 },
         { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "PAGEDOWN", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "PAGEDOWN", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": "SEMICOLON", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "QUOTE", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
-        { "label": "ISOHASH", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": "SEMICOLON", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "QUOTE", "matrix": [7, 3], "x": 11.75, "y": 2 },
+        { "label": "ISOHASH", "matrix": [7, 4], "x": 12.75, "y": 2 },
         { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 },
         { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-        { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "COMMA", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": "PERIOD", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "SLASH", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
-        { "label": "JPBACKSLASH", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 },
+        { "label": "ISOBACKSLASH", "matrix": [3, 1], "x": 1.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "COMMA", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": "PERIOD", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "SLASH", "matrix": [8, 3], "x": 11.25, "y": 3 },
+        { "label": "JPBACKSLASH", "matrix": [8, 4], "x": 12.25, "y": 3 },
         { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 },
-        { "label": "UP", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "UP", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-        { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 },
+        { "label": "LALT", "matrix": [4, 1], "x": 1.25, "y": 4 },
         { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 },
         { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 },
         { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 },
         { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 },
         { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 },
         { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
-        { "label": "RCTRL", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 },
+        { "label": "RCTRL", "matrix": [9, 3], "x": 11.25, "y": 4 },
         { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "LEFT", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "DOWN", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "RIGHT", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "LEFT", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "DOWN", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "RIGHT", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     }
   }
diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json
index 4c0569622c..5ab4506ee4 100644
--- a/keyboards/clueboard/66/rev3/info.json
+++ b/keyboards/clueboard/66/rev3/info.json
@@ -42,9 +42,11 @@
     "brightness_steps": 17,
     "hue_steps": 32,
     "led_count": 18,
-    "pin": "D7",
     "saturation_steps": 17
   },
+  "ws2812": {
+    "pin": "D7"
+  },
   "usb": {
     "device_version": "0.0.1",
     "pid": "0x2370",
@@ -61,62 +63,62 @@
   "layouts": {
     "LAYOUT_66_ansi": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 },
         { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
-        { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 },
         { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 },
         { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
         { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
-        { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -124,70 +126,70 @@
         { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
         { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
         { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     },
     "LAYOUT_66_iso": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 },
         { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
-        { "label": "Insert", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "Insert", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
-        { "label": "Delete", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 },
+        { "label": "Delete", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
-        { "label": "", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 },
+        { "label": "", "matrix": [7, 4], "x": 12.75, "y": 2 },
         { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 },
         { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-        { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
-        { "label": "\u2191", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "\u2191", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -195,86 +197,86 @@
         { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
         { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
         { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "\u2190", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "\u2193", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "\u2192", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "\u2190", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "\u2193", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "\u2192", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     },
     "LAYOUT_all": {
       "layout": [
-        { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "8", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "9", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": "0", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "DASH", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "EQUALSIGN", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
-        { "label": "YEN", "matrix": [5, 5], "w": 1, "x": 13, "y": 0 },
-        { "label": "BACKSPACE", "matrix": [5, 6], "w": 1, "x": 14, "y": 0 },
-        { "label": "PAGEUP", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "GRAVE", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "8", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "9", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": "0", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "DASH", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "EQUALSIGN", "matrix": [5, 4], "x": 12, "y": 0 },
+        { "label": "YEN", "matrix": [5, 5], "x": 13, "y": 0 },
+        { "label": "BACKSPACE", "matrix": [5, 6], "x": 14, "y": 0 },
+        { "label": "PAGEUP", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "LBRACKET", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "RBRACKET", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "LBRACKET", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "RBRACKET", "matrix": [6, 4], "x": 12.5, "y": 1 },
         { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "PAGEDOWN", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "PAGEDOWN", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": "SEMICOLON", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "QUOTE", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
-        { "label": "ISOHASH", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": "SEMICOLON", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "QUOTE", "matrix": [7, 3], "x": 11.75, "y": 2 },
+        { "label": "ISOHASH", "matrix": [7, 4], "x": 12.75, "y": 2 },
         { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 },
         { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-        { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "COMMA", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": "PERIOD", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "SLASH", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
-        { "label": "JPBACKSLASH", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 },
+        { "label": "ISOBACKSLASH", "matrix": [3, 1], "x": 1.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "COMMA", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": "PERIOD", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "SLASH", "matrix": [8, 3], "x": 11.25, "y": 3 },
+        { "label": "JPBACKSLASH", "matrix": [8, 4], "x": 12.25, "y": 3 },
         { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 },
-        { "label": "UP", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "UP", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-        { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 },
+        { "label": "LALT", "matrix": [4, 1], "x": 1.25, "y": 4 },
         { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 },
         { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 },
         { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 },
         { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 },
         { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 },
         { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
-        { "label": "RCTRL", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 },
+        { "label": "RCTRL", "matrix": [9, 3], "x": 11.25, "y": 4 },
         { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "LEFT", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "DOWN", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "RIGHT", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "LEFT", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "DOWN", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "RIGHT", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     }
   }
diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json
index 2c19b85d0d..5b9239263a 100644
--- a/keyboards/clueboard/66/rev4/info.json
+++ b/keyboards/clueboard/66/rev4/info.json
@@ -40,9 +40,11 @@
     "brightness_steps": 17,
     "hue_steps": 32,
     "led_count": 18,
-    "pin": "D7",
     "saturation_steps": 17
   },
+  "ws2812": {
+    "pin": "D7"
+  },
   "usb": {
     "device_version": "0.0.1",
     "pid": "0x2390",
@@ -55,62 +57,62 @@
   "layouts": {
     "LAYOUT_66_ansi": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 },
         { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
-        { "label": "Page Up", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "Page Up", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 },
         { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "Page Down", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "Page Down", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 },
         { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
         { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
-        { "label": "Up", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "Up", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -118,70 +120,70 @@
         { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
         { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
         { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "Left", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "Down", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "Up", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "Left", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "Down", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "Up", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     },
     "LAYOUT_66_iso": {
       "layout": [
-        { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+        { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 },
         { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
-        { "label": "Insert", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "Insert", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
-        { "label": "Delete", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 },
+        { "label": "Delete", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
-        { "label": "", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 },
+        { "label": "", "matrix": [7, 4], "x": 12.75, "y": 2 },
         { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 },
         { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-        { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 },
         { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
-        { "label": "\u2191", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "\u2191", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -189,86 +191,86 @@
         { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
         { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
         { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "\u2190", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "\u2193", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "\u2192", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "\u2190", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "\u2193", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "\u2192", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     },
     "LAYOUT_all": {
       "layout": [
-        { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "8", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "9", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": "0", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "DASH", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "EQUALSIGN", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
-        { "label": "YEN", "matrix": [5, 5], "w": 1, "x": 13, "y": 0 },
-        { "label": "BACKSPACE", "matrix": [5, 6], "w": 1, "x": 14, "y": 0 },
-        { "label": "PAGEUP", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "GRAVE", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "8", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "9", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": "0", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "DASH", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "EQUALSIGN", "matrix": [5, 4], "x": 12, "y": 0 },
+        { "label": "YEN", "matrix": [5, 5], "x": 13, "y": 0 },
+        { "label": "BACKSPACE", "matrix": [5, 6], "x": 14, "y": 0 },
+        { "label": "PAGEUP", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "LBRACKET", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "RBRACKET", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "LBRACKET", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "RBRACKET", "matrix": [6, 4], "x": 12.5, "y": 1 },
         { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "PAGEDOWN", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "PAGEDOWN", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": "SEMICOLON", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "QUOTE", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
-        { "label": "ISOHASH", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+        { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": "SEMICOLON", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "QUOTE", "matrix": [7, 3], "x": 11.75, "y": 2 },
+        { "label": "ISOHASH", "matrix": [7, 4], "x": 12.75, "y": 2 },
         { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 },
         { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-        { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-        { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "COMMA", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": "PERIOD", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "SLASH", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
-        { "label": "JPBACKSLASH", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 },
+        { "label": "ISOBACKSLASH", "matrix": [3, 1], "x": 1.25, "y": 3 },
+        { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "COMMA", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": "PERIOD", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "SLASH", "matrix": [8, 3], "x": 11.25, "y": 3 },
+        { "label": "JPBACKSLASH", "matrix": [8, 4], "x": 12.25, "y": 3 },
         { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 },
-        { "label": "UP", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "UP", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-        { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 },
+        { "label": "LALT", "matrix": [4, 1], "x": 1.25, "y": 4 },
         { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 },
         { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 },
         { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 },
         { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 },
         { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 },
         { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
-        { "label": "RCTRL", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 },
+        { "label": "RCTRL", "matrix": [9, 3], "x": 11.25, "y": 4 },
         { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "LEFT", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "DOWN", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "RIGHT", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "LEFT", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "DOWN", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "RIGHT", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     }
   }
diff --git a/keyboards/clueboard/66_hotswap/66_hotswap.c b/keyboards/clueboard/66_hotswap/66_hotswap.c
deleted file mode 100644
index cc38050a9e..0000000000
--- a/keyboards/clueboard/66_hotswap/66_hotswap.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "66_hotswap.h"  
diff --git a/keyboards/clueboard/66_hotswap/66_hotswap.h b/keyboards/clueboard/66_hotswap/66_hotswap.h
deleted file mode 100644
index a1ea44841f..0000000000
--- a/keyboards/clueboard/66_hotswap/66_hotswap.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_clueboard_66_hotswap_gen1
-    #include "gen1.h"
-#endif
-
-#ifdef KEYBOARD_clueboard_66_hotswap_prototype
-    #include "prototype.h"
-#endif
diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.c b/keyboards/clueboard/66_hotswap/gen1/gen1.c
index 72b8b8bbab..a935884a0b 100644
--- a/keyboards/clueboard/66_hotswap/gen1/gen1.c
+++ b/keyboards/clueboard/66_hotswap/gen1/gen1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "gen1.h"
+#include "quantum.h"
 
 #ifdef LED_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.h b/keyboards/clueboard/66_hotswap/gen1/gen1.h
deleted file mode 100644
index 98f9ba1424..0000000000
--- a/keyboards/clueboard/66_hotswap/gen1/gen1.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2017 Clueboard <info@clueboard.co>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json
index afa4f8adb5..647ad869a9 100644
--- a/keyboards/clueboard/66_hotswap/gen1/info.json
+++ b/keyboards/clueboard/66_hotswap/gen1/info.json
@@ -35,132 +35,132 @@
   "layouts": {
     "LAYOUT_66_ansi": {
       "layout": [
-        { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "k50", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "k51", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": "k52", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "k53", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "k54", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+        { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "k50", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "k51", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": "k52", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "k53", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "k54", "matrix": [5, 4], "x": 12, "y": 0 },
         { "label": "k55", "matrix": [5, 5], "w": 2, "x": 13, "y": 0 },
-        { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "k60", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "k61", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "k62", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "k63", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "k64", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1 },
         { "label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "k70", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "k71", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": "k72", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "k73", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+        { "label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2 },
         { "label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
         { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-        { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "k80", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "k81", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": "k82", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "k83", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3 },
         { "label": "k85", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
-        { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
         { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
         { "label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
-        { "label": "k93", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 },
+        { "label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4 },
         { "label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     },
     "LAYOUT_all": {
       "layout": [
-        { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "k50", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "k51", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": "k52", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "k53", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "k54", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+        { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "k50", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "k51", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": "k52", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "k53", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "k54", "matrix": [5, 4], "x": 12, "y": 0 },
         { "label": "k55", "matrix": [5, 5], "w": 2, "x": 13, "y": 0 },
-        { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "k60", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "k61", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "k62", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "k63", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "k64", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1 },
         { "label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "k70", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "k71", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": "k72", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "k73", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+        { "label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2 },
         { "label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
         { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-        { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "k80", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "k81", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": "k82", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "k83", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3 },
         { "label": "k85", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
-        { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -168,11 +168,11 @@
         { "label": "k46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4 },
         { "label": "k90", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 },
         { "label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
-        { "label": "k93", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 },
+        { "label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4 },
         { "label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     }
   }
diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json
index 522eda3fba..b6049b5649 100644
--- a/keyboards/clueboard/66_hotswap/prototype/info.json
+++ b/keyboards/clueboard/66_hotswap/prototype/info.json
@@ -42,9 +42,11 @@
     "brightness_steps": 17,
     "hue_steps": 32,
     "led_count": 26,
-    "pin": "D7",
     "saturation_steps": 17
   },
+  "ws2812": {
+    "pin": "D7"
+  },
   "usb": {
     "device_version": "0.0.1",
     "pid": "0x2390",
@@ -61,134 +63,134 @@
   "layouts": {
     "LAYOUT_66_ansi": {
       "layout": [
-        { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "k50", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "k51", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": "k52", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "k53", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "k54", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+        { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "k50", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "k51", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": "k52", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "k53", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "k54", "matrix": [5, 4], "x": 12, "y": 0 },
         { "label": "k56", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
-        { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "k60", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "k61", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "k62", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "k63", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "k64", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1 },
         { "label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "k70", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "k71", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": "k72", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "k73", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+        { "label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2 },
         { "label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
         { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-        { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "k80", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "k81", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": "k82", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "k83", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+        { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3 },
         { "label": "k85", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
-        { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
         { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
         { "label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
-        { "label": "k93", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 },
+        { "label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4 },
         { "label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     },
     "LAYOUT_all": {
       "layout": [
-        { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "k50", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "k51", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-        { "label": "k52", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-        { "label": "k53", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-        { "label": "k54", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+        { "label": "k00", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "k01", "matrix": [0, 1], "x": 1, "y": 0 },
+        { "label": "k02", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+        { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+        { "label": "k50", "matrix": [5, 0], "x": 8, "y": 0 },
+        { "label": "k51", "matrix": [5, 1], "x": 9, "y": 0 },
+        { "label": "k52", "matrix": [5, 2], "x": 10, "y": 0 },
+        { "label": "k53", "matrix": [5, 3], "x": 11, "y": 0 },
+        { "label": "k54", "matrix": [5, 4], "x": 12, "y": 0 },
         { "label": "k56", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
-        { "label": "k57", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+        { "label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0 },
         { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-        { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-        { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-        { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-        { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-        { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-        { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-        { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-        { "label": "k60", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-        { "label": "k61", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-        { "label": "k62", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-        { "label": "k63", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-        { "label": "k64", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+        { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1 },
+        { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1 },
+        { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 },
+        { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1 },
+        { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1 },
+        { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1 },
+        { "label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1 },
+        { "label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1 },
+        { "label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1 },
+        { "label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1 },
+        { "label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1 },
+        { "label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1 },
         { "label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-        { "label": "k67", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+        { "label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1 },
         { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-        { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-        { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-        { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-        { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-        { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-        { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-        { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-        { "label": "k70", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-        { "label": "k71", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-        { "label": "k72", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-        { "label": "k73", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+        { "label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2 },
+        { "label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2 },
+        { "label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2 },
+        { "label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2 },
+        { "label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2 },
+        { "label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2 },
+        { "label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2 },
+        { "label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2 },
+        { "label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2 },
+        { "label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2 },
+        { "label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2 },
         { "label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
         { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-        { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-        { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-        { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-        { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-        { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-        { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-        { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-        { "label": "k80", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-        { "label": "k81", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-        { "label": "k82", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-        { "label": "k83", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
-        { "label": "k84", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 },
+        { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+        { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+        { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+        { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+        { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+        { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+        { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+        { "label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3 },
+        { "label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3 },
+        { "label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3 },
+        { "label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3 },
+        { "label": "k84", "matrix": [8, 4], "x": 12.25, "y": 3 },
         { "label": "k85", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 },
-        { "label": "k86", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+        { "label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3 },
         { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
         { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
         { "label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -196,11 +198,11 @@
         { "label": "k46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4 },
         { "label": "k90", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 },
         { "label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
-        { "label": "k93", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 },
+        { "label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4 },
         { "label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-        { "label": "k95", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-        { "label": "k96", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-        { "label": "k97", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+        { "label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4 },
+        { "label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4 },
+        { "label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4 }
       ]
     }
   }
diff --git a/keyboards/clueboard/66_hotswap/prototype/prototype.c b/keyboards/clueboard/66_hotswap/prototype/prototype.c
index 4ce3dd65f7..c89fbafbff 100644
--- a/keyboards/clueboard/66_hotswap/prototype/prototype.c
+++ b/keyboards/clueboard/66_hotswap/prototype/prototype.c
@@ -1,4 +1,4 @@
-#include "prototype.h"
+#include "quantum.h"
 #include "print.h"
 
 void backlight_init_ports(void) {
diff --git a/keyboards/clueboard/66_hotswap/prototype/prototype.h b/keyboards/clueboard/66_hotswap/prototype/prototype.h
deleted file mode 100644
index 1277cfbbab..0000000000
--- a/keyboards/clueboard/66_hotswap/prototype/prototype.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-#include "quantum.h"
-
diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/info.json
index 24a9399923..bd4f6c5958 100644
--- a/keyboards/clueboard/california/info.json
+++ b/keyboards/clueboard/california/info.json
@@ -26,16 +26,16 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1, "matrix": [0, 0]},
-                {"x": 1, "y": 0, "w": 1, "matrix": [0, 1]},
-                {"x": 0, "y": 1, "w": 1, "matrix": [1, 0]},
-                {"x": 1, "y": 1, "w": 1, "matrix": [1, 1]},
-                {"x": 1, "y": 2, "w": 1, "matrix": [2, 1]},
-                {"x": 1.25, "y": 3, "w": 1, "matrix": [3, 0]},
-                {"x": 2.25, "y": 3, "w": 1, "matrix": [3, 1]},
-                {"x": 2, "y": 4, "w": 1, "matrix": [4, 0]},
-                {"x": 3, "y": 4, "w": 1, "matrix": [4, 1]},
-                {"x": 3.75, "y": 5, "w": 1, "matrix": [5, 1]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 1.25, "y": 3, "matrix": [3, 0]},
+                {"x": 2.25, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 4, "matrix": [4, 0]},
+                {"x": 3, "y": 4, "matrix": [4, 1]},
+                {"x": 3.75, "y": 5, "matrix": [5, 1]}
             ]
         }
     }
diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json
index 4564768c19..568185f3ee 100644
--- a/keyboards/clueboard/card/info.json
+++ b/keyboards/clueboard/card/info.json
@@ -29,9 +29,11 @@
     "brightness_steps": 17,
     "hue_steps": 10,
     "led_count": 4,
-    "pin": "E6",
     "saturation_steps": 17
   },
+  "ws2812": {
+    "pin": "E6"
+  },
   "usb": {
     "device_version": "0.0.1",
     "pid": "0x2330",
@@ -47,15 +49,15 @@
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        { "label": "ON/OFF", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "SAT+", "matrix": [0, 1], "w": 1, "x": 4, "y": 0 },
-        { "label": "BRIGHT+", "matrix": [0, 2], "w": 1, "x": 8, "y": 0 },
-        { "label": "HUE-", "matrix": [1, 0], "w": 1, "x": 2, "y": 1 },
-        { "label": "HUE+", "matrix": [1, 2], "w": 1, "x": 6, "y": 1 },
-        { "label": "MODE", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
-        { "label": "SAT-", "matrix": [2, 1], "w": 1, "x": 4, "y": 2 },
-        { "label": "BRIGHT-", "matrix": [2, 2], "w": 1, "x": 8, "y": 2 },
-        { "label": "LAYER", "matrix": [1, 1], "w": 1, "x": 2, "y": 4 },
+        { "label": "ON/OFF", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "SAT+", "matrix": [0, 1], "x": 4, "y": 0 },
+        { "label": "BRIGHT+", "matrix": [0, 2], "x": 8, "y": 0 },
+        { "label": "HUE-", "matrix": [1, 0], "x": 2, "y": 1 },
+        { "label": "HUE+", "matrix": [1, 2], "x": 6, "y": 1 },
+        { "label": "MODE", "matrix": [2, 0], "x": 0, "y": 2 },
+        { "label": "SAT-", "matrix": [2, 1], "x": 4, "y": 2 },
+        { "label": "BRIGHT-", "matrix": [2, 2], "x": 8, "y": 2 },
+        { "label": "LAYER", "matrix": [1, 1], "x": 2, "y": 4 },
         { "h": 2, "label": "MX1", "matrix": [3, 0], "w": 2, "x": 4, "y": 6 },
         { "h": 2, "label": "MX2", "matrix": [3, 1], "w": 2, "x": 6, "y": 6 },
         { "h": 2, "label": "MX3", "matrix": [3, 2], "w": 2, "x": 8, "y": 6 }
diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h
index 3e0f08ab9a..97f19f3ffa 100644
--- a/keyboards/cmm_studio/fuji65/config.h
+++ b/keyboards/cmm_studio/fuji65/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, D7, D6, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, D5, D3, D2, D1, D0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 8
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -49,7 +31,6 @@
     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
     #define RGBLIGHT_EFFECT_RGB_TEST
     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/fuji65.c b/keyboards/cmm_studio/fuji65/fuji65.c
deleted file mode 100644
index 46695a0d21..0000000000
--- a/keyboards/cmm_studio/fuji65/fuji65.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "fuji65.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json
index 9f47befd54..824213303e 100644
--- a/keyboards/cmm_studio/fuji65/info.json
+++ b/keyboards/cmm_studio/fuji65/info.json
@@ -8,6 +8,14 @@
         "pid": "0x364D",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B5", "B4", "D7", "D6", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/cmm_studio/saka68/hotswap/config.h b/keyboards/cmm_studio/saka68/hotswap/config.h
deleted file mode 100644
index b8a29be0de..0000000000
--- a/keyboards/cmm_studio/saka68/hotswap/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 CMM.Studio Freather
-
-
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D1, B0, F6, F7 }
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, F5, F4, F1, F0, B1, B2, B3, D3, D5 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cmm_studio/saka68/hotswap/hotswap.c b/keyboards/cmm_studio/saka68/hotswap/hotswap.c
deleted file mode 100644
index 14454b58ba..0000000000
--- a/keyboards/cmm_studio/saka68/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hotswap.h"
diff --git a/keyboards/cmm_studio/saka68/hotswap/hotswap.h b/keyboards/cmm_studio/saka68/hotswap/hotswap.h
deleted file mode 100644
index f8b45f0980..0000000000
--- a/keyboards/cmm_studio/saka68/hotswap/hotswap.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_68_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0E, K0F,  \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E, K1F,  \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,                    \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3E,       \
-    K40,  K41,  K42,              K46,                K49,  K4A,  K4B,     K4D, K4E, K4F   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, KC_NO }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   KC_NO }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   K4B,   KC_NO, K4D,   K4E,   K4F   }, \
-}
-
-#define LAYOUT_68_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0E, K0F,  \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,          K1E, K1F,  \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,               \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3E,       \
-    K40,  K41,  K42,              K46,                K49,  K4A,  K4B,     K4D, K4E, K4F   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E,   K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   KC_NO }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   K4B,   KC_NO, K4D,   K4E,   K4F   }, \
-}
diff --git a/keyboards/cmm_studio/saka68/hotswap/info.json b/keyboards/cmm_studio/saka68/hotswap/info.json
index ee91cf527f..e2327e8145 100644
--- a/keyboards/cmm_studio/saka68/hotswap/info.json
+++ b/keyboards/cmm_studio/saka68/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5348",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "D3", "D5"],
+        "rows": ["D2", "D1", "B0", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -17,155 +22,163 @@
     "layouts": {
         "LAYOUT_68_ansi": {
             "layout": [
-                {"label":"K00 (D2,D4)", "x":0, "y":0},
-                {"label":"K01 (D2,D6)", "x":1, "y":0},
-                {"label":"K02 (D2,D7)", "x":2, "y":0},
-                {"label":"K03 (D2,B4)", "x":3, "y":0},
-                {"label":"K04 (D2,B5)", "x":4, "y":0},
-                {"label":"K05 (D2,B6)", "x":5, "y":0},
-                {"label":"K06 (D2,C6)", "x":6, "y":0},
-                {"label":"K07 (D2,F5)", "x":7, "y":0},
-                {"label":"K08 (D2,F4)", "x":8, "y":0},
-                {"label":"K09 (D2,F1)", "x":9, "y":0},
-                {"label":"K0A (D2,F0)", "x":10, "y":0},
-                {"label":"K0B (D2,B1)", "x":11, "y":0},
-                {"label":"K0C (D2,B2)", "x":12, "y":0},
-                {"label":"K0D (D2,B3)", "x":13, "y":0, "w":2},
-                {"label":"K0E (D2,D3)", "x":15.25, "y":0},
-                {"label":"K0F (D2,D5)", "x":16.25, "y":0},
-
-                {"label":"K10 (D1,D4)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (D1,D6)", "x":1.5, "y":1},
-                {"label":"K12 (D1,D7)", "x":2.5, "y":1},
-                {"label":"K13 (D1,B4)", "x":3.5, "y":1},
-                {"label":"K14 (D1,B5)", "x":4.5, "y":1},
-                {"label":"K15 (D1,B6)", "x":5.5, "y":1},
-                {"label":"K16 (D1,C6)", "x":6.5, "y":1},
-                {"label":"K17 (D1,F5)", "x":7.5, "y":1},
-                {"label":"K18 (D1,F4)", "x":8.5, "y":1},
-                {"label":"K19 (D1,F1)", "x":9.5, "y":1},
-                {"label":"K1A (D1,F0)", "x":10.5, "y":1},
-                {"label":"K1B (D1,B1)", "x":11.5, "y":1},
-                {"label":"K1C (D1,B2)", "x":12.5, "y":1},
-                {"label":"K1D (D1,B3)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (D1,D3)", "x":15.25, "y":1},
-                {"label":"K1F (D1,D5)", "x":16.25, "y":1},
-
-                {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B0,D6)", "x":1.75, "y":2},
-                {"label":"K22 (B0,D7)", "x":2.75, "y":2},
-                {"label":"K23 (B0,B4)", "x":3.75, "y":2},
-                {"label":"K24 (B0,B5)", "x":4.75, "y":2},
-                {"label":"K25 (B0,B6)", "x":5.75, "y":2},
-                {"label":"K26 (B0,C6)", "x":6.75, "y":2},
-                {"label":"K27 (B0,F5)", "x":7.75, "y":2},
-                {"label":"K28 (B0,F4)", "x":8.75, "y":2},
-                {"label":"K29 (B0,F1)", "x":9.75, "y":2},
-                {"label":"K2A (B0,F0)", "x":10.75, "y":2},
-                {"label":"K2B (B0,B1)", "x":11.75, "y":2},
-                {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
-
-                {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (F6,D7)", "x":2.25, "y":3},
-                {"label":"K33 (F6,B4)", "x":3.25, "y":3},
-                {"label":"K34 (F6,B5)", "x":4.25, "y":3},
-                {"label":"K35 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K36 (F6,C6)", "x":6.25, "y":3},
-                {"label":"K37 (F6,F5)", "x":7.25, "y":3},
-                {"label":"K38 (F6,F4)", "x":8.25, "y":3},
-                {"label":"K39 (F6,F1)", "x":9.25, "y":3},
-                {"label":"K3A (F6,F0)", "x":10.25, "y":3},
-                {"label":"K3B (F6,B1)", "x":11.25, "y":3},
-                {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
-                {"label":"K3E (F6,D3)", "x":15.25, "y":3},
-
-                {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (F7,F1)", "x":10, "y":4, "w":1.25},
-                {"label":"K4A (F7,F0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4B (F7,B1)", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4D (F7,B3)", "x":14.25, "y":4},
-                {"label":"K4E (F7,D3)", "x":15.25, "y":4},
-                {"label":"K4F (F7,D5)", "x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_iso": {
             "layout": [
-                {"label":"K00 (D2,D4)", "x":0, "y":0},
-                {"label":"K01 (D2,D6)", "x":1, "y":0},
-                {"label":"K02 (D2,D7)", "x":2, "y":0},
-                {"label":"K03 (D2,B4)", "x":3, "y":0},
-                {"label":"K04 (D2,B5)", "x":4, "y":0},
-                {"label":"K05 (D2,B6)", "x":5, "y":0},
-                {"label":"K06 (D2,C6)", "x":6, "y":0},
-                {"label":"K07 (D2,F5)", "x":7, "y":0},
-                {"label":"K08 (D2,F4)", "x":8, "y":0},
-                {"label":"K09 (D2,F1)", "x":9, "y":0},
-                {"label":"K0A (D2,F0)", "x":10, "y":0},
-                {"label":"K0B (D2,B1)", "x":11, "y":0},
-                {"label":"K0C (D2,B2)", "x":12, "y":0},
-                {"label":"K0D (D2,B3)", "x":13, "y":0, "w":2},
-                {"label":"K0E (D2,D3)", "x":15.25, "y":0},
-                {"label":"K0F (D2,D5)", "x":16.25, "y":0},
-
-                {"label":"K10 (D1,D4)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (D1,D6)", "x":1.5, "y":1},
-                {"label":"K12 (D1,D7)", "x":2.5, "y":1},
-                {"label":"K13 (D1,B4)", "x":3.5, "y":1},
-                {"label":"K14 (D1,B5)", "x":4.5, "y":1},
-                {"label":"K15 (D1,B6)", "x":5.5, "y":1},
-                {"label":"K16 (D1,C6)", "x":6.5, "y":1},
-                {"label":"K17 (D1,F5)", "x":7.5, "y":1},
-                {"label":"K18 (D1,F4)", "x":8.5, "y":1},
-                {"label":"K19 (D1,F1)", "x":9.5, "y":1},
-                {"label":"K1A (D1,F0)", "x":10.5, "y":1},
-                {"label":"K1B (D1,B1)", "x":11.5, "y":1},
-                {"label":"K1C (D1,B2)", "x":12.5, "y":1},
-                {"label":"K1E (D1,D3)", "x":15.25, "y":1},
-                {"label":"K1F (D1,D5)", "x":16.25, "y":1},
-
-                {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B0,D6)", "x":1.75, "y":2},
-                {"label":"K22 (B0,D7)", "x":2.75, "y":2},
-                {"label":"K23 (B0,B4)", "x":3.75, "y":2},
-                {"label":"K24 (B0,B5)", "x":4.75, "y":2},
-                {"label":"K25 (B0,B6)", "x":5.75, "y":2},
-                {"label":"K26 (B0,C6)", "x":6.75, "y":2},
-                {"label":"K27 (B0,F5)", "x":7.75, "y":2},
-                {"label":"K28 (B0,F4)", "x":8.75, "y":2},
-                {"label":"K29 (B0,F1)", "x":9.75, "y":2},
-                {"label":"K2A (B0,F0)", "x":10.75, "y":2},
-                {"label":"K2B (B0,B1)", "x":11.75, "y":2},
-                {"label":"K2C (B0,B2)", "x":12.75, "y":2},
-                {"label":"K2D (B0,B3)", "x":13.75, "y":1, "w":1.25, "h":2},
-
-                {"label":"K30 (F6,D4)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (F6,D6)", "x":1.25, "y":3},
-                {"label":"K32 (F6,D7)", "x":2.25, "y":3},
-                {"label":"K33 (F6,B4)", "x":3.25, "y":3},
-                {"label":"K34 (F6,B5)", "x":4.25, "y":3},
-                {"label":"K35 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K36 (F6,C6)", "x":6.25, "y":3},
-                {"label":"K37 (F6,F5)", "x":7.25, "y":3},
-                {"label":"K38 (F6,F4)", "x":8.25, "y":3},
-                {"label":"K39 (F6,F1)", "x":9.25, "y":3},
-                {"label":"K3A (F6,F0)", "x":10.25, "y":3},
-                {"label":"K3B (F6,B1)", "x":11.25, "y":3},
-                {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
-                {"label":"K3E (F6,D3)", "x":15.25, "y":3},
-
-                {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (F7,F1)", "x":10, "y":4, "w":1.25},
-                {"label":"K4A (F7,F0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4B (F7,B1)", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4D (F7,B3)", "x":14.25, "y":4},
-                {"label":"K4E (F7,D3)", "x":15.25, "y":4},
-                {"label":"K4F (F7,D5)", "x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/cmm_studio/saka68/solder/config.h b/keyboards/cmm_studio/saka68/solder/config.h
deleted file mode 100644
index 76960df064..0000000000
--- a/keyboards/cmm_studio/saka68/solder/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0, B0, F6, F7 }
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, F5, F4, F1, F0, B1, B2, B3, D2, D3, D5 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cmm_studio/saka68/solder/info.json b/keyboards/cmm_studio/saka68/solder/info.json
index 8612ead7ae..145883fc1d 100644
--- a/keyboards/cmm_studio/saka68/solder/info.json
+++ b/keyboards/cmm_studio/saka68/solder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x534B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "D2", "D3", "D5"],
+        "rows": ["D1", "D0", "B0", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -17,310 +22,326 @@
     "layouts": {
         "LAYOUT_68_ansi": {
             "layout": [
-                {"label":"K00 (D1,D4)", "x":0, "y":0},
-                {"label":"K01 (D1,D6)", "x":1, "y":0},
-                {"label":"K02 (D1,D7)", "x":2, "y":0},
-                {"label":"K03 (D1,B4)", "x":3, "y":0},
-                {"label":"K04 (D1,B5)", "x":4, "y":0},
-                {"label":"K05 (D1,B6)", "x":5, "y":0},
-                {"label":"K06 (D1,C6)", "x":6, "y":0},
-                {"label":"K07 (D1,F5)", "x":7, "y":0},
-                {"label":"K08 (D1,F4)", "x":8, "y":0},
-                {"label":"K09 (D1,F1)", "x":9, "y":0},
-                {"label":"K0A (D1,F0)", "x":10, "y":0},
-                {"label":"K0B (D1,B1)", "x":11, "y":0},
-                {"label":"K0C (D1,B2)", "x":12, "y":0},
-                {"label":"K0D (D1,B3)", "x":13, "y":0, "w":2},
-                {"label":"K0F (D1,D3)", "x":15.25, "y":0},
-                {"label":"K0G (D1,D5)", "x":16.25, "y":0},
-
-                {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (D0,D6)", "x":1.5, "y":1},
-                {"label":"K12 (D0,D7)", "x":2.5, "y":1},
-                {"label":"K13 (D0,B4)", "x":3.5, "y":1},
-                {"label":"K14 (D0,B5)", "x":4.5, "y":1},
-                {"label":"K15 (D0,B6)", "x":5.5, "y":1},
-                {"label":"K16 (D0,C6)", "x":6.5, "y":1},
-                {"label":"K17 (D0,F5)", "x":7.5, "y":1},
-                {"label":"K18 (D0,F4)", "x":8.5, "y":1},
-                {"label":"K19 (D0,F1)", "x":9.5, "y":1},
-                {"label":"K1A (D0,F0)", "x":10.5, "y":1},
-                {"label":"K1B (D0,B1)", "x":11.5, "y":1},
-                {"label":"K1C (D0,B2)", "x":12.5, "y":1},
-                {"label":"K1D (D0,B3)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (D0,D2)", "x":15.25, "y":1},
-                {"label":"K1F (D0,D3)", "x":16.25, "y":1},
-
-                {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B0,D6)", "x":1.75, "y":2},
-                {"label":"K22 (B0,D7)", "x":2.75, "y":2},
-                {"label":"K23 (B0,B4)", "x":3.75, "y":2},
-                {"label":"K24 (B0,B5)", "x":4.75, "y":2},
-                {"label":"K25 (B0,B6)", "x":5.75, "y":2},
-                {"label":"K26 (B0,C6)", "x":6.75, "y":2},
-                {"label":"K27 (B0,F5)", "x":7.75, "y":2},
-                {"label":"K28 (B0,F4)", "x":8.75, "y":2},
-                {"label":"K29 (B0,F1)", "x":9.75, "y":2},
-                {"label":"K2A (B0,F0)", "x":10.75, "y":2},
-                {"label":"K2B (B0,B1)", "x":11.75, "y":2},
-                {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
-
-                {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (F6,D7)", "x":2.25, "y":3},
-                {"label":"K33 (F6,B4)", "x":3.25, "y":3},
-                {"label":"K34 (F6,B5)", "x":4.25, "y":3},
-                {"label":"K35 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K36 (F6,C6)", "x":6.25, "y":3},
-                {"label":"K37 (F6,F5)", "x":7.25, "y":3},
-                {"label":"K38 (F6,F4)", "x":8.25, "y":3},
-                {"label":"K39 (F6,F1)", "x":9.25, "y":3},
-                {"label":"K3A (F6,F0)", "x":10.25, "y":3},
-                {"label":"K3B (F6,B1)", "x":11.25, "y":3},
-                {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
-                {"label":"K3E (F6,D2)", "x":15.25, "y":3},
-
-                {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4D (F7,B3)", "x":14.25, "y":4},
-                {"label":"K4E (F7,D2)", "x":15.25, "y":4},
-                {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_ansi_split_bs": {
             "layout": [
-                {"label":"K00 (D1,D4)", "x":0, "y":0},
-                {"label":"K01 (D1,D6)", "x":1, "y":0},
-                {"label":"K02 (D1,D7)", "x":2, "y":0},
-                {"label":"K03 (D1,B4)", "x":3, "y":0},
-                {"label":"K04 (D1,B5)", "x":4, "y":0},
-                {"label":"K05 (D1,B6)", "x":5, "y":0},
-                {"label":"K06 (D1,C6)", "x":6, "y":0},
-                {"label":"K07 (D1,F5)", "x":7, "y":0},
-                {"label":"K08 (D1,F4)", "x":8, "y":0},
-                {"label":"K09 (D1,F1)", "x":9, "y":0},
-                {"label":"K0A (D1,F0)", "x":10, "y":0},
-                {"label":"K0B (D1,B1)", "x":11, "y":0},
-                {"label":"K0C (D1,B2)", "x":12, "y":0},
-                {"label":"K0D (D1,B3)", "x":13, "y":0},
-                {"label":"K0E (D1,D2)", "x":14, "y":0},
-                {"label":"K0F (D1,D3)", "x":15.25, "y":0},
-                {"label":"K0G (D1,D5)", "x":16.25, "y":0},
-
-                {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (D0,D6)", "x":1.5, "y":1},
-                {"label":"K12 (D0,D7)", "x":2.5, "y":1},
-                {"label":"K13 (D0,B4)", "x":3.5, "y":1},
-                {"label":"K14 (D0,B5)", "x":4.5, "y":1},
-                {"label":"K15 (D0,B6)", "x":5.5, "y":1},
-                {"label":"K16 (D0,C6)", "x":6.5, "y":1},
-                {"label":"K17 (D0,F5)", "x":7.5, "y":1},
-                {"label":"K18 (D0,F4)", "x":8.5, "y":1},
-                {"label":"K19 (D0,F1)", "x":9.5, "y":1},
-                {"label":"K1A (D0,F0)", "x":10.5, "y":1},
-                {"label":"K1B (D0,B1)", "x":11.5, "y":1},
-                {"label":"K1C (D0,B2)", "x":12.5, "y":1},
-                {"label":"K1D (D0,B3)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (D0,D2)", "x":15.25, "y":1},
-                {"label":"K1F (D0,D3)", "x":16.25, "y":1},
-
-                {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B0,D6)", "x":1.75, "y":2},
-                {"label":"K22 (B0,D7)", "x":2.75, "y":2},
-                {"label":"K23 (B0,B4)", "x":3.75, "y":2},
-                {"label":"K24 (B0,B5)", "x":4.75, "y":2},
-                {"label":"K25 (B0,B6)", "x":5.75, "y":2},
-                {"label":"K26 (B0,C6)", "x":6.75, "y":2},
-                {"label":"K27 (B0,F5)", "x":7.75, "y":2},
-                {"label":"K28 (B0,F4)", "x":8.75, "y":2},
-                {"label":"K29 (B0,F1)", "x":9.75, "y":2},
-                {"label":"K2A (B0,F0)", "x":10.75, "y":2},
-                {"label":"K2B (B0,B1)", "x":11.75, "y":2},
-                {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
-
-                {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (F6,D7)", "x":2.25, "y":3},
-                {"label":"K33 (F6,B4)", "x":3.25, "y":3},
-                {"label":"K34 (F6,B5)", "x":4.25, "y":3},
-                {"label":"K35 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K36 (F6,C6)", "x":6.25, "y":3},
-                {"label":"K37 (F6,F5)", "x":7.25, "y":3},
-                {"label":"K38 (F6,F4)", "x":8.25, "y":3},
-                {"label":"K39 (F6,F1)", "x":9.25, "y":3},
-                {"label":"K3A (F6,F0)", "x":10.25, "y":3},
-                {"label":"K3B (F6,B1)", "x":11.25, "y":3},
-                {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
-                {"label":"K3E (F6,D2)", "x":15.25, "y":3},
-
-                {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4D (F7,B3)", "x":14.25, "y":4},
-                {"label":"K4E (F7,D2)", "x":15.25, "y":4},
-                {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_iso": {
             "layout": [
-                {"label":"K00 (D1,D4)", "x":0, "y":0},
-                {"label":"K01 (D1,D6)", "x":1, "y":0},
-                {"label":"K02 (D1,D7)", "x":2, "y":0},
-                {"label":"K03 (D1,B4)", "x":3, "y":0},
-                {"label":"K04 (D1,B5)", "x":4, "y":0},
-                {"label":"K05 (D1,B6)", "x":5, "y":0},
-                {"label":"K06 (D1,C6)", "x":6, "y":0},
-                {"label":"K07 (D1,F5)", "x":7, "y":0},
-                {"label":"K08 (D1,F4)", "x":8, "y":0},
-                {"label":"K09 (D1,F1)", "x":9, "y":0},
-                {"label":"K0A (D1,F0)", "x":10, "y":0},
-                {"label":"K0B (D1,B1)", "x":11, "y":0},
-                {"label":"K0C (D1,B2)", "x":12, "y":0},
-                {"label":"K0D (D1,B3)", "x":13, "y":0, "w":2},
-                {"label":"K0F (D1,D3)", "x":15.25, "y":0},
-                {"label":"K0G (D1,D5)", "x":16.25, "y":0},
-
-                {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (D0,D6)", "x":1.5, "y":1},
-                {"label":"K12 (D0,D7)", "x":2.5, "y":1},
-                {"label":"K13 (D0,B4)", "x":3.5, "y":1},
-                {"label":"K14 (D0,B5)", "x":4.5, "y":1},
-                {"label":"K15 (D0,B6)", "x":5.5, "y":1},
-                {"label":"K16 (D0,C6)", "x":6.5, "y":1},
-                {"label":"K17 (D0,F5)", "x":7.5, "y":1},
-                {"label":"K18 (D0,F4)", "x":8.5, "y":1},
-                {"label":"K19 (D0,F1)", "x":9.5, "y":1},
-                {"label":"K1A (D0,F0)", "x":10.5, "y":1},
-                {"label":"K1B (D0,B1)", "x":11.5, "y":1},
-                {"label":"K1C (D0,B2)", "x":12.5, "y":1},
-                {"label":"K1E (D0,D2)", "x":15.25, "y":1},
-                {"label":"K1F (D0,D3)", "x":16.25, "y":1},
-
-                {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B0,D6)", "x":1.75, "y":2},
-                {"label":"K22 (B0,D7)", "x":2.75, "y":2},
-                {"label":"K23 (B0,B4)", "x":3.75, "y":2},
-                {"label":"K24 (B0,B5)", "x":4.75, "y":2},
-                {"label":"K25 (B0,B6)", "x":5.75, "y":2},
-                {"label":"K26 (B0,C6)", "x":6.75, "y":2},
-                {"label":"K27 (B0,F5)", "x":7.75, "y":2},
-                {"label":"K28 (B0,F4)", "x":8.75, "y":2},
-                {"label":"K29 (B0,F1)", "x":9.75, "y":2},
-                {"label":"K2A (B0,F0)", "x":10.75, "y":2},
-                {"label":"K2B (B0,B1)", "x":11.75, "y":2},
-                {"label":"K2C (B0,B2)", "x":12.75, "y":2},
-                {"label":"K2D (B0,B3)", "x":13.75, "y":1, "w":1.25, "h":2},
-
-                {"label":"K30 (F6,D4)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (F6,D6)", "x":1.25, "y":3},
-                {"label":"K32 (F6,D7)", "x":2.25, "y":3},
-                {"label":"K33 (F6,B4)", "x":3.25, "y":3},
-                {"label":"K34 (F6,B5)", "x":4.25, "y":3},
-                {"label":"K35 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K36 (F6,C6)", "x":6.25, "y":3},
-                {"label":"K37 (F6,F5)", "x":7.25, "y":3},
-                {"label":"K38 (F6,F4)", "x":8.25, "y":3},
-                {"label":"K39 (F6,F1)", "x":9.25, "y":3},
-                {"label":"K3A (F6,F0)", "x":10.25, "y":3},
-                {"label":"K3B (F6,B1)", "x":11.25, "y":3},
-                {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
-                {"label":"K3E (F6,D2)", "x":15.25, "y":3},
-
-                {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4D (F7,B3)", "x":14.25, "y":4},
-                {"label":"K4E (F7,D2)", "x":15.25, "y":4},
-                {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_iso_split_bs": {
             "layout": [
-                {"label":"K00 (D1,D4)", "x":0, "y":0},
-                {"label":"K01 (D1,D6)", "x":1, "y":0},
-                {"label":"K02 (D1,D7)", "x":2, "y":0},
-                {"label":"K03 (D1,B4)", "x":3, "y":0},
-                {"label":"K04 (D1,B5)", "x":4, "y":0},
-                {"label":"K05 (D1,B6)", "x":5, "y":0},
-                {"label":"K06 (D1,C6)", "x":6, "y":0},
-                {"label":"K07 (D1,F5)", "x":7, "y":0},
-                {"label":"K08 (D1,F4)", "x":8, "y":0},
-                {"label":"K09 (D1,F1)", "x":9, "y":0},
-                {"label":"K0A (D1,F0)", "x":10, "y":0},
-                {"label":"K0B (D1,B1)", "x":11, "y":0},
-                {"label":"K0C (D1,B2)", "x":12, "y":0},
-                {"label":"K0D (D1,B3)", "x":13, "y":0},
-                {"label":"K0E (D1,D2)", "x":14, "y":0},
-                {"label":"K0F (D1,D3)", "x":15.25, "y":0},
-                {"label":"K0G (D1,D5)", "x":16.25, "y":0},
-
-                {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (D0,D6)", "x":1.5, "y":1},
-                {"label":"K12 (D0,D7)", "x":2.5, "y":1},
-                {"label":"K13 (D0,B4)", "x":3.5, "y":1},
-                {"label":"K14 (D0,B5)", "x":4.5, "y":1},
-                {"label":"K15 (D0,B6)", "x":5.5, "y":1},
-                {"label":"K16 (D0,C6)", "x":6.5, "y":1},
-                {"label":"K17 (D0,F5)", "x":7.5, "y":1},
-                {"label":"K18 (D0,F4)", "x":8.5, "y":1},
-                {"label":"K19 (D0,F1)", "x":9.5, "y":1},
-                {"label":"K1A (D0,F0)", "x":10.5, "y":1},
-                {"label":"K1B (D0,B1)", "x":11.5, "y":1},
-                {"label":"K1C (D0,B2)", "x":12.5, "y":1},
-                {"label":"K1E (D0,D2)", "x":15.25, "y":1},
-                {"label":"K1F (D0,D3)", "x":16.25, "y":1},
-
-                {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B0,D6)", "x":1.75, "y":2},
-                {"label":"K22 (B0,D7)", "x":2.75, "y":2},
-                {"label":"K23 (B0,B4)", "x":3.75, "y":2},
-                {"label":"K24 (B0,B5)", "x":4.75, "y":2},
-                {"label":"K25 (B0,B6)", "x":5.75, "y":2},
-                {"label":"K26 (B0,C6)", "x":6.75, "y":2},
-                {"label":"K27 (B0,F5)", "x":7.75, "y":2},
-                {"label":"K28 (B0,F4)", "x":8.75, "y":2},
-                {"label":"K29 (B0,F1)", "x":9.75, "y":2},
-                {"label":"K2A (B0,F0)", "x":10.75, "y":2},
-                {"label":"K2B (B0,B1)", "x":11.75, "y":2},
-                {"label":"K2C (B0,B2)", "x":12.75, "y":2},
-                {"label":"K2D (B0,B3)", "x":13.75, "y":1, "w":1.25, "h":2},
-
-                {"label":"K30 (F6,D4)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (F6,D6)", "x":1.25, "y":3},
-                {"label":"K32 (F6,D7)", "x":2.25, "y":3},
-                {"label":"K33 (F6,B4)", "x":3.25, "y":3},
-                {"label":"K34 (F6,B5)", "x":4.25, "y":3},
-                {"label":"K35 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K36 (F6,C6)", "x":6.25, "y":3},
-                {"label":"K37 (F6,F5)", "x":7.25, "y":3},
-                {"label":"K38 (F6,F4)", "x":8.25, "y":3},
-                {"label":"K39 (F6,F1)", "x":9.25, "y":3},
-                {"label":"K3A (F6,F0)", "x":10.25, "y":3},
-                {"label":"K3B (F6,B1)", "x":11.25, "y":3},
-                {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
-                {"label":"K3E (F6,D2)", "x":15.25, "y":3},
-
-                {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4D (F7,B3)", "x":14.25, "y":4},
-                {"label":"K4E (F7,D2)", "x":15.25, "y":4},
-                {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/cmm_studio/saka68/solder/solder.c b/keyboards/cmm_studio/saka68/solder/solder.c
deleted file mode 100644
index 195c14023b..0000000000
--- a/keyboards/cmm_studio/saka68/solder/solder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "solder.h"
diff --git a/keyboards/cmm_studio/saka68/solder/solder.h b/keyboards/cmm_studio/saka68/solder/solder.h
deleted file mode 100644
index a39205f247..0000000000
--- a/keyboards/cmm_studio/saka68/solder/solder.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2020 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_68_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0F, K0G,  \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E, K1F,  \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,                    \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3E,       \
-    K40,  K41,  K42,              K46,                K4A,  K4B,  K4C,     K4D, K4E, K4F   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO, K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, KC_NO, KC_NO }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K4A,   K4B,   K4C,   KC_NO,   K4D,   K4E,   K4F,   KC_NO }, \
-}
-
-#define LAYOUT_68_ansi_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,  K0F, K0G,  \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E, K1F,  \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,                    \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3E,       \
-    K40,  K41,  K42,              K46,                K4A,  K4B,  K4C,     K4D, K4E, K4F   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, KC_NO, KC_NO }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   KC_NO }, \
-}
-
-#define LAYOUT_68_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0F, K0G,  \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,          K1E, K1F,  \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,               \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3E,       \
-    K40,  K41,  K42,              K46,                K4A,  K4B,  K4C,     K4D, K4E, K4F   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO, K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E,   K1F,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, KC_NO, KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   KC_NO }, \
-}
-
-#define LAYOUT_68_iso_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,  K0F, K0G,  \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,          K1E, K1F,  \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,               \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3E,       \
-    K40,  K41,  K42,              K46,                K4A,  K4B,  K4C,     K4D, K4E, K4F   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E,   K1F,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, KC_NO, KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   KC_NO }, \
-}
diff --git a/keyboards/coarse/cordillera/config.h b/keyboards/coarse/cordillera/config.h
index e251f6f90d..ef26abfc02 100644
--- a/keyboards/coarse/cordillera/config.h
+++ b/keyboards/coarse/cordillera/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 }
-#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD1
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/coarse/cordillera/cordillera.c b/keyboards/coarse/cordillera/cordillera.c
deleted file mode 100644
index 437547ff28..0000000000
--- a/keyboards/coarse/cordillera/cordillera.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 coarse <coarsekeys@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "cordillera.h"
diff --git a/keyboards/coarse/cordillera/cordillera.h b/keyboards/coarse/cordillera/cordillera.h
deleted file mode 100644
index 01ae781cfb..0000000000
--- a/keyboards/coarse/cordillera/cordillera.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-Copyright 2020 coarse <coarsekeys@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// Full backspace
-// Split right shift
-#define LAYOUT_alice( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,   k0f,    \
-    k10, k11, k12, k13, k14, k15, k16,      k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
-    k20, k21, k22, k23, k24, k25, k26,      k28, k29, k2a, k2b, k2c, k2d,      k2f, \
-         k31, k32, k33, k34, k35, k36,      k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
-         k41,      k43,      k45, k46,           k49,      k4b,                k4f  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { XXX, k41, XXX, k43, XXX, k45, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \
-}
-
-// Split backspace
-// Split right shift
-#define LAYOUT_alice_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
-    k10, k11, k12, k13, k14, k15, k16,      k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
-    k20, k21, k22, k23, k24, k25, k26,      k28, k29, k2a, k2b, k2c, k2d,      k2f, \
-         k31, k32, k33, k34, k35, k36,      k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
-         k41,      k43,      k45, k46,           k49,      k4b,                k4f \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { XXX, k41, XXX, k43, XXX, k45, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \
-}
-
-// Split backspace
-// Full right shift
-#define LAYOUT_alice_split_bs_full_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
-    k10, k11, k12, k13, k14, k15, k16,      k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
-    k20, k21, k22, k23, k24, k25, k26,      k28, k29, k2a, k2b, k2c, k2d,      k2f, \
-         k31, k32, k33, k34, k35, k36,      k38, k39, k3a, k3b, k3c, k3d,   k3e,    \
-         k41,      k43,      k45, k46,           k49,      k4b,                k4f  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { XXX, k41, XXX, k43, XXX, k45, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \
-}
-
-// Full backspace
-// Full right shift
-#define LAYOUT_alice_full_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,   k0f,    \
-    k10, k11, k12, k13, k14, k15, k16,      k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
-    k20, k21, k22, k23, k24, k25, k26,      k28, k29, k2a, k2b, k2c, k2d,      k2f, \
-         k31, k32, k33, k34, k35, k36,      k38, k39, k3a, k3b, k3c, k3d,   k3e,    \
-         k41,      k43,      k45, k46,           k49,      k4b,                k4f  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { XXX, k41, XXX, k43, XXX, k45, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \
-}
diff --git a/keyboards/coarse/cordillera/info.json b/keyboards/coarse/cordillera/info.json
index 9d84f0dee3..7252f65f29 100644
--- a/keyboards/coarse/cordillera/info.json
+++ b/keyboards/coarse/cordillera/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1401",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "B9", "F1", "A10", "A9"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A8",
         "levels": 6,
@@ -25,294 +30,322 @@
     "layouts": {
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Backspace", "x":17, "y":0.25, "w":2},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 15], "x": 17, "y": 0.25, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "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.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "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": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 15], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 15], "x": 18, "y": 4.25, "w": 1.5}
             ]
         },
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Del", "x":17, "y":0.25},
-                {"label":"Backspace", "x":18, "y":0.25},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 14], "x": 17, "y": 0.25},
+                {"matrix": [0, 15], "x": 18, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "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.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "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": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 15], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 15], "x": 18, "y": 4.25, "w": 1.5}
             ]
         },
         "LAYOUT_alice_split_bs_full_rshift": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Del", "x":17, "y":0.25},
-                {"label":"Backspace", "x":18, "y":0.25},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":2.75},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 14], "x": 17, "y": 0.25},
+                {"matrix": [0, 15], "x": 18, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "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.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "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": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 15], "x": 18, "y": 4.25, "w": 1.5}
             ]
         },
         "LAYOUT_alice_full_rshift": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Backspace", "x":17, "y":0.25, "w":2},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":2.75},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 15], "x": 17, "y": 0.25, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "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.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "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": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 15], "x": 18, "y": 4.25, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/coarse/ixora/config.h b/keyboards/coarse/ixora/config.h
deleted file mode 100644
index 1d10a99696..0000000000
--- a/keyboards/coarse/ixora/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-
-#define MATRIX_ROW_PINS { A0 }
-#define MATRIX_COL_PINS { B4, A15, B3, A1, B6, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/coarse/ixora/info.json b/keyboards/coarse/ixora/info.json
index ef7bae5129..c38424ffa7 100644
--- a/keyboards/coarse/ixora/info.json
+++ b/keyboards/coarse/ixora/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0C61",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B4", "A15", "B3", "A1", "B6", "B5"],
+        "rows": ["A0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A10",
         "num_lock": "A9",
diff --git a/keyboards/coarse/ixora/ixora.c b/keyboards/coarse/ixora/ixora.c
deleted file mode 100644
index f2dcd864aa..0000000000
--- a/keyboards/coarse/ixora/ixora.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ixora.h"
diff --git a/keyboards/coarse/vinta/config.h b/keyboards/coarse/vinta/config.h
deleted file mode 100644
index 629f4b9b16..0000000000
--- a/keyboards/coarse/vinta/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-
-#define MATRIX_ROW_PINS { A10, A9, B0, A7, A6 }
-#define MATRIX_COL_PINS { A5, A4, A3, A2, A1, A0, F1, F0, B7, B6, B5, B4, B3, A15, A14, A13 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/coarse/vinta/info.json b/keyboards/coarse/vinta/info.json
index 8a615aac0d..a430ea36b7 100644
--- a/keyboards/coarse/vinta/info.json
+++ b/keyboards/coarse/vinta/info.json
@@ -8,19 +8,243 @@
     "pid": "0x0C61",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A13"],
+    "rows": ["A10", "A9", "B0", "A7", "A6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F042",
   "bootloader": "stm32-dfu",
   "debounce": 0,
   "community_layouts": ["65_ansi_blocker"],
   "layouts": {
     "LAYOUT_69_ansi": {
-        "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Del", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Reset", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
+        {"matrix": [3, 10], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4},
+        {"matrix": [4, 10], "x": 11, "y": 4},
+        {"matrix": [4, 12], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
+      ]
     },
     "LAYOUT_68_tada": {
-        "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"~", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Del", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Menu", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
+        {"matrix": [3, 10], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4},
+        {"matrix": [4, 10], "x": 11, "y": 4},
+        {"matrix": [4, 12], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
+      ]
     },
     "LAYOUT_65_ansi_blocker": {
-        "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"~", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Del", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
+        {"matrix": [3, 10], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/coarse/vinta/vinta.c b/keyboards/coarse/vinta/vinta.c
deleted file mode 100644
index edd45511b4..0000000000
--- a/keyboards/coarse/vinta/vinta.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "vinta.h"
diff --git a/keyboards/coarse/vinta/vinta.h b/keyboards/coarse/vinta/vinta.h
deleted file mode 100644
index 18f51cd434..0000000000
--- a/keyboards/coarse/vinta/vinta.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-
-#define LAYOUT_69_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2E, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,      k3C,      k3E, k3F, \
-    k40, k41, k42,           k45,                k49, k4A,      k4C, k4D, k4E, k4F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, XXX, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, XXX, k3E, k3F }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, k4C, k4D, k4E, k4F } \
-}
-
-#define LAYOUT_68_tada( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2E, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,      k3C,      k3E, k3F, \
-    k40, k41, k42,           k45,                k49, k4A,      k4C, k4D, k4E, k4F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, XXX, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, XXX, k3E, k3F }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, XXX, k4D, k4E, k4F } \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2E, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,      k3C,      k3E, k3F, \
-    k40, k41, k42,           k45,                k49, k4A,           k4D, k4E, k4F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, XXX, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, XXX, k3E, k3F }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, XXX, k4D, k4E, k4F } \
-}
diff --git a/keyboards/coban/pad3a/pad3a.c b/keyboards/coban/pad3a/pad3a.c
deleted file mode 100644
index bd07a83a8f..0000000000
--- a/keyboards/coban/pad3a/pad3a.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 RyanDam (https://github.com/RyanDam)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#if defined(ENCODER_ENABLE)
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (clockwise) {
-        tap_code_delay(KC_VOLU, 10);
-    } else {
-        tap_code_delay(KC_VOLD, 10);
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/compound/compound.c b/keyboards/compound/compound.c
deleted file mode 100644
index 046eae950f..0000000000
--- a/keyboards/compound/compound.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Rafael Yumagulov
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "compound.h"
diff --git a/keyboards/compound/config.h b/keyboards/compound/config.h
deleted file mode 100644
index f2824f9630..0000000000
--- a/keyboards/compound/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 Rafael Yumagulov
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B0,B7,D0,D1,D2}
-#define MATRIX_COL_PINS {F0,D5,D4,D6,D7,B4,B5,B6,C6,C7,F7,F6,F5,F4,F1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/compound/info.json b/keyboards/compound/info.json
index ea280b386b..f3b95cec42 100644
--- a/keyboards/compound/info.json
+++ b/keyboards/compound/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB0BA",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
+        "rows": ["B0", "B7", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h
index e81b8a2094..77d7f36bcc 100644
--- a/keyboards/contender/config.h
+++ b/keyboards/contender/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, D3, B5, B7, B4, B2 }
-#define MATRIX_COL_PINS { C7, D6, B3, B0, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C6
 #define RGBLED_NUM 33
 #define RGBLIGHT_LED_MAP { \
    0, 1, 2, 3, \
diff --git a/keyboards/contender/contender.c b/keyboards/contender/contender.c
deleted file mode 100644
index 5e00516206..0000000000
--- a/keyboards/contender/contender.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 sotoba
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "contender.h"
diff --git a/keyboards/contender/contender.h b/keyboards/contender/contender.h
deleted file mode 100644
index 4dd71a5d24..0000000000
--- a/keyboards/contender/contender.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 sotoba
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-      k00, k01, k02, k03, \
-      k10, k11, k12, k13, \
-      k20, k21, k22, k23, \
-    k30, k31, k32, k33, k34, \
-    k40, k41, k42, k43, k44, \
-    k50, k51, k52, k53 \
-) { \
-    { KC_NO, k00, k01, k02, k03 }, \
-    { KC_NO, k10, k11, k12, k13 }, \
-    { KC_NO, k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33, k34 }, \
-    { k40, k41, k42, k43, k44 }, \
-    { k50, k51, k52, k53, KC_NO } \
-}
diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json
index 942963aaee..e8ef7da4a3 100644
--- a/keyboards/contender/info.json
+++ b/keyboards/contender/info.json
@@ -8,37 +8,50 @@
         "pid": "0xC010",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C6"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "D6", "B3", "B0", "B1"],
+        "rows": ["D4", "D3", "B5", "B7", "B4", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"label":"Esc", "x":1, "y":0},
-              {"label":"Tab", "x":2, "y":0},
-              {"label":"Shift", "x":3, "y":0},
-              {"label":"Back", "x":4, "y":0},
-              {"label":"Num", "x":1, "y":1.25},
-              {"label":"/", "x":2, "y":1.25},
-              {"label":"*", "x":3, "y":1.25},
-              {"label":"=", "x":4, "y":1.25},
-              {"label":"7", "x":1, "y":2.25},
-              {"label":"8", "x":2, "y":2.25},
-              {"label":"9", "x":3, "y":2.25},
-              {"label":"-", "x":4, "y":2.25},
-              {"label":"fn","x":0, "y":3.25},
-              {"label":"4", "x":1, "y":3.25},
-              {"label":"5", "x":2, "y":3.25},
-              {"label":"6", "x":3, "y":3.25},
-              {"label":"+", "x":4, "y":3.25},
-              {"label":"RGB","x":0, "y":4.25},
-              {"label":"1", "x":1, "y":4.25},
-              {"label":"2", "x":2, "y":4.25},
-              {"label":"3", "x":3, "y":4.25},
-              {"label":"Enter", "x":4, "y":4.25, "h":2},
-              {"label":"TG","x":0, "y":5.25},
-              {"label":"0", "x":1, "y":5.25},
-              {"label":"00", "x":2, "y":5.25},
-              {"label":".", "x":3, "y":5.25}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 1], "x": 1, "y": 1.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": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+                {"matrix": [4, 4], "x": 4, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/contra/keymaps/enigma/config.h b/keyboards/contra/keymaps/enigma/config.h
index 87f0199876..4fc612e3ea 100644
--- a/keyboards/contra/keymaps/enigma/config.h
+++ b/keyboards/contra/keymaps/enigma/config.h
@@ -16,12 +16,10 @@
 
 #pragma once
 
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN F7
     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
     #define RGBLIGHT_EFFECT_SNAKE
     #define RGBLED_NUM 12
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-#endif
\ No newline at end of file
diff --git a/keyboards/contra/keymaps/maxr1998/config.h b/keyboards/contra/keymaps/maxr1998/config.h
index 6475cc20a6..5580ffeae8 100644
--- a/keyboards/contra/keymaps/maxr1998/config.h
+++ b/keyboards/contra/keymaps/maxr1998/config.h
@@ -4,7 +4,7 @@
 
 #define TAPPING_TOGGLE 2
 
-#define RGB_DI_PIN          F7 // pin the DI on the WS2812B is hooked-up to
+#define WS2812_DI_PIN          F7 // pin the DI on the WS2812B is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/info.json
index 4f6f11b33e..9bfb402fab 100644
--- a/keyboards/controllerworks/mini36/info.json
+++ b/keyboards/controllerworks/mini36/info.json
@@ -23,9 +23,10 @@
             ["GP20", "GP21", "GP22",   null,   null]
         ]
     },
-    "rgblight": {
-        "pin": "GP0"
-     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "split": {
         "enabled": true,
         "matrix_pins": {
diff --git a/keyboards/controllerworks/mini36/rules.mk b/keyboards/controllerworks/mini36/rules.mk
index f487b11ec8..ee37cd7f6f 100644
--- a/keyboards/controllerworks/mini36/rules.mk
+++ b/keyboards/controllerworks/mini36/rules.mk
@@ -1,3 +1,2 @@
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
 OLED_DRIVER   = SSD1306
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/info.json
index b18747c62c..c6e0f12aed 100644
--- a/keyboards/controllerworks/mini42/info.json
+++ b/keyboards/controllerworks/mini42/info.json
@@ -23,9 +23,10 @@
             ["GP20", "GP21", "GP22", null, null, null]
         ]
     },
-    "rgblight": {
-        "pin": "GP0"
-     },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
     "split": {
         "enabled": true,
         "main": "left",
diff --git a/keyboards/controllerworks/mini42/rules.mk b/keyboards/controllerworks/mini42/rules.mk
index 6e32bfc897..71f52c4e4d 100644
--- a/keyboards/controllerworks/mini42/rules.mk
+++ b/keyboards/controllerworks/mini42/rules.mk
@@ -1,3 +1,2 @@
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
 OLED_DRIVER   = SSD1306
diff --git a/keyboards/converter/a1200/a1200.c b/keyboards/converter/a1200/a1200.c
deleted file mode 100644
index 5e7e404287..0000000000
--- a/keyboards/converter/a1200/a1200.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 8bits4ever
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "a1200.h"
diff --git a/keyboards/converter/a1200/a1200.h b/keyboards/converter/a1200/a1200.h
deleted file mode 100644
index 3f7defb244..0000000000
--- a/keyboards/converter/a1200/a1200.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 8bits4ever
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- * The first section contains "names" for physical keys of the keyboard
- * and defines their position on the board.
- * The second section defines position of the keys on the switch matrix 
- * (where COLUMNS and ROWS crosses). */
-
-#define LAYOUT( \
-    K5A,      K5B, K5C, K5D, K5E, K5F,      K5G, K5H, K5I, K5J, K5K,    \
-    \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N,K4O,    K4P, K4Q,       K4R, K4S, K4T, K4U, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M,                             K3R, K3S, K3T, K3U, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O,       K2P,        K2Q, K2R, K2S, K2T, \
-    K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L,      K1M,       K0F, K0G, K0H,   K1O, K1P, K1Q, K1R, \
-    K0A,      K0B,                K0C,                     K0D,      K0E,                        K0I,      K0J \
-) \
-{ \
-/* "Q" */ { K3A,   K3B,   K3C,   K3D,   K3E,   K3F,  K3G,   K3H,  K3I,   K3J,   K3K,   K3L,   K3M,  K2O,   K0F,   K1A }, \
-/* "A" */ { K2B,   K2C,   K2D,   K2E,   K2F,   K2G,  K2H,   K2I,  K2J,   K2K,   K2L,   K2M,   K2N,  K4P,   K0H,   K0B }, \
-/* "Z" */ { K1B,   K1C,   K1D,   K1E,   K1F,   K1G,  K1H,   K1I,  K1J,   K1K,   K1L,   K4O,   K0C,  K4O,   K0G,   K0A }, \
-/* PAD */ { K4U,   K2T,   K3T,   K2S,   K1Q,   K0J,  K3S,   K2R,  K1P,   K1R,   K3R,   K2Q,   K1O,  K0I,   K3U,   K1A }, \
-/* "1" */ { K4A,   K4B,   K4C,   K4D,   K4E,   K4F,  K4G,   K4H,  K4I,   K4J,   K4K,   K4L,   K4M,  K4N,   K2P,   K2A }, \
-/* 05 */  { _x_,   _x_,   _x_,   _x_,   _x_,   _x_,  _x_,   _x_,  _x_,   _x_,   _x_,   _x_,   _x_,  _x_,   _x_,   K1M }, \
-/* FN  */ { K5A,   K4R,   K5B,   K5C,   K5D,   K5E,  K5F,   K4S,  K5G,   K4T,   K5H,   K5I,   K5J,  K5K,   K4Q,   K0D }, \
-/* 07 */  { _x_,   _x_,   _x_,   _x_,   _x_,   _x_,  _x_,   _x_,  _x_,   _x_,   _x_,   _x_,   _x_,  _x_,   _x_,   K0E }, \
-}
-/*         A(15)  B(16)  C(17)  D(18)  E(19)  F(20) G(21)  H(22) I(23)  J(24)  K(25)  L(26)   M(27) N(28)  O(29)  P(30)       */
diff --git a/keyboards/converter/a1200/info.json b/keyboards/converter/a1200/info.json
index 1b46444ba8..ab269afe97 100644
--- a/keyboards/converter/a1200/info.json
+++ b/keyboards/converter/a1200/info.json
@@ -3,107 +3,118 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-            {"label":"Esc", "x":0, "y":0}, 
-            {"label":"F1", "x":2, "y":0}, 
-            {"label":"F2", "x":3, "y":0}, 
-            {"label":"F3", "x":4, "y":0}, 
-            {"label":"F4", "x":5, "y":0}, 
-            {"label":"F5", "x":6, "y":0}, 
-            {"label":"F6", "x":8, "y":0}, 
-            {"label":"F7", "x":9, "y":0}, 
-            {"label":"F8", "x":10, "y":0}, 
-            {"label":"F9", "x":11, "y":0}, 
-            {"label":"F10", "x":12, "y":0},
-             
-            {"label":"~", "x":0, "y":1.5}, 
-            {"label":"!", "x":1, "y":1.5}, 
-            {"label":"@", "x":2, "y":1.5}, 
-            {"label":"#", "x":3, "y":1.5}, 
-            {"label":"$", "x":4, "y":1.5}, 
-            {"label":"%", "x":5, "y":1.5}, 
-            {"label":"^", "x":6, "y":1.5}, 
-            {"label":"&", "x":7, "y":1.5}, 
-            {"label":"*", "x":8, "y":1.5}, 
-            {"label":"(", "x":9, "y":1.5}, 
-            {"label":")", "x":10, "y":1.5}, 
-            {"label":"_", "x":11, "y":1.5}, 
-            {"label":"+", "x":12, "y":1.5}, 
-            {"label":"`", "x":13, "y":1.5}, 
-            {"label":"Backspace", "x":14, "y":1.5}, 
-            {"label":"Del", "x":15.25, "y":1.5, "w":1.5}, 
-            {"label":"Help", "x":16.75, "y":1.5, "w":1.5}, 
-            {"label":"Num Lock", "x":18.5, "y":1.5}, 
-            {"label":"/", "x":19.5, "y":1.5}, 
-            {"label":"*", "x":20.5, "y":1.5}, 
-            {"label":"-", "x":21.5, "y":1.5}, 
-            
-            {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-            {"label":"Q", "x":1.5, "y":2.5}, 
-            {"label":"W", "x":2.5, "y":2.5}, 
-            {"label":"E", "x":3.5, "y":2.5}, 
-            {"label":"R", "x":4.5, "y":2.5}, 
-            {"label":"T", "x":5.5, "y":2.5}, 
-            {"label":"Y", "x":6.5, "y":2.5}, 
-            {"label":"U", "x":7.5, "y":2.5}, 
-            {"label":"I", "x":8.5, "y":2.5}, 
-            {"label":"O", "x":9.5, "y":2.5}, 
-            {"label":"P", "x":10.5, "y":2.5}, 
-            {"label":"{", "x":11.5, "y":2.5}, 
-            {"label":"}", "x":12.5, "y":2.5}, 
-            {"label":"7", "x":18.5, "y":2.5}, 
-            {"label":"8", "x":19.5, "y":2.5}, 
-            {"label":"9", "x":20.5, "y":2.5}, 
-            {"label":"+", "x":21.5, "y":2.5},
-             
-            {"label":"CTRL", "x":0, "y":3.5}, 
-            {"label":"Caps Lock", "x":1, "y":3.5}, 
-            {"label":"A", "x":2, "y":3.5}, 
-            {"label":"S", "x":3, "y":3.5}, 
-            {"label":"D", "x":4, "y":3.5}, 
-            {"label":"F", "x":5, "y":3.5}, 
-            {"label":"G", "x":6, "y":3.5}, 
-            {"label":"H", "x":7, "y":3.5}, 
-            {"label":"J", "x":8, "y":3.5}, 
-            {"label":"K", "x":9, "y":3.5}, 
-            {"label":"L", "x":10, "y":3.5}, 
-            {"label":":", "x":11, "y":3.5}, 
-            {"label":"\"", "x":12, "y":3.5}, 
-            {"label":"~", "x":13, "y":3.5}, 
-            {"label":"Enter", "x":14, "y":2.5, "w":1, "h":2}, 
-            {"label":"\u2191", "x":16.25, "y":3.5}, 
-            {"label":"4", "x":18.5, "y":3.5}, 
-            {"label":"5", "x":19.5, "y":3.5}, 
-            {"label":"6", "x":20.5, "y":3.5}, 
-            {"label":"+", "x":21.5, "y":3.5},
-            
-            {"label":"Shift", "x":0, "y":4.5, "w":1.25}, 
-            {"label":"|", "x":1.25, "y":4.5}, 
-            {"label":"Z", "x":2.25, "y":4.5}, 
-            {"label":"X", "x":3.25, "y":4.5}, 
-            {"label":"C", "x":4.25, "y":4.5}, 
-            {"label":"V", "x":5.25, "y":4.5}, 
-            {"label":"B", "x":6.25, "y":4.5}, 
-            {"label":"N", "x":7.25, "y":4.5}, 
-            {"label":"M", "x":8.25, "y":4.5}, 
-            {"label":"<", "x":9.25, "y":4.5}, 
-            {"label":">", "x":10.25, "y":4.5}, 
-            {"label":"?", "x":11.25, "y":4.5}, 
-            {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
-            {"label":"\u2190", "x":15.25, "y":4.5}, 
-            {"label":"\u2193", "x":16.25, "y":4.5}, 
-            {"label":"\u2192", "x":17.25, "y":4.5}, 
-            {"label":"1", "x":18.5, "y":4.5}, 
-            {"label":"2", "x":19.5, "y":4.5}, 
-            {"label":"3", "x":20.5, "y":4.5}, 
-            {"label":"Enter", "x":21.5, "y":4.5, "h":2}, 
-            
-            {"label":"Alt", "x":1, "y":5.5, "w":1.5}, 
-            {"label":"Amiga", "x":2.5, "y":5.5, "w":1.5}, 
-            {"label":"Space", "x":4, "y":5.5, "w":7}, 
-            {"label":"Amiga", "x":11, "y":5.5, "w":1.5}, 
-            {"label":"Alt", "x":12.5, "y":5.5, "w":1.5}, 
-            {"label":"0", "x":18.5, "y":5.5, "w":2}, 
-            {"label":".", "x":20.5, "y":5.5}]
+                {"matrix": [6, 0], "x": 0, "y": 0},
+
+                {"matrix": [6, 2], "x": 2, "y": 0},
+                {"matrix": [6, 3], "x": 3, "y": 0},
+                {"matrix": [6, 4], "x": 4, "y": 0},
+                {"matrix": [6, 5], "x": 5, "y": 0},
+                {"matrix": [6, 6], "x": 6, "y": 0},
+
+                {"matrix": [6, 8], "x": 8, "y": 0},
+                {"matrix": [6, 10], "x": 9, "y": 0},
+                {"matrix": [6, 11], "x": 10, "y": 0},
+                {"matrix": [6, 12], "x": 11, "y": 0},
+                {"matrix": [6, 13], "x": 12, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1.5},
+                {"matrix": [4, 1], "x": 1, "y": 1.5},
+                {"matrix": [4, 2], "x": 2, "y": 1.5},
+                {"matrix": [4, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 1.5},
+                {"matrix": [4, 5], "x": 5, "y": 1.5},
+                {"matrix": [4, 6], "x": 6, "y": 1.5},
+                {"matrix": [4, 7], "x": 7, "y": 1.5},
+                {"matrix": [4, 8], "x": 8, "y": 1.5},
+                {"matrix": [4, 9], "x": 9, "y": 1.5},
+                {"matrix": [4, 10], "x": 10, "y": 1.5},
+                {"matrix": [4, 11], "x": 11, "y": 1.5},
+                {"matrix": [4, 12], "x": 12, "y": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 1.5},
+                {"matrix": [2, 11], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 13], "x": 15.25, "y": 1.5, "w": 1.5},
+                {"matrix": [6, 14], "x": 16.75, "y": 1.5, "w": 1.5},
+
+                {"matrix": [6, 1], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [3, 0], "x": 21.5, "y": 1.5},
+
+                {"matrix": [0, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [0, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [0, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [0, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [0, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [0, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [0, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [0, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [0, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [0, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [0, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [0, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [3, 10], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 6], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [3, 14], "x": 21.5, "y": 2.5},
+
+                {"matrix": [4, 15], "x": 0, "y": 3.5},
+                {"matrix": [1, 0], "x": 1, "y": 3.5},
+                {"matrix": [1, 1], "x": 2, "y": 3.5},
+                {"matrix": [1, 2], "x": 3, "y": 3.5},
+                {"matrix": [1, 3], "x": 4, "y": 3.5},
+                {"matrix": [1, 4], "x": 5, "y": 3.5},
+                {"matrix": [1, 5], "x": 6, "y": 3.5},
+                {"matrix": [1, 6], "x": 7, "y": 3.5},
+                {"matrix": [1, 7], "x": 8, "y": 3.5},
+                {"matrix": [1, 8], "x": 9, "y": 3.5},
+                {"matrix": [1, 9], "x": 10, "y": 3.5},
+                {"matrix": [1, 10], "x": 11, "y": 3.5},
+                {"matrix": [1, 11], "x": 12, "y": 3.5},
+                {"matrix": [1, 12], "x": 13, "y": 3.5},
+                {"matrix": [0, 13], "x": 14, "y": 2.5, "h": 2},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 3.5},
+
+                {"matrix": [3, 11], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 3], "x": 20.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 21.5, "y": 3.5},
+
+                {"matrix": [3, 15], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [2, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [2, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [2, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [2, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [2, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [2, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [2, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [2, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [2, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [2, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [2, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 15], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 4.5},
+                {"matrix": [2, 14], "x": 16.25, "y": 4.5},
+                {"matrix": [1, 14], "x": 17.25, "y": 4.5},
+
+                {"matrix": [3, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [3, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [3, 4], "x": 20.5, "y": 4.5},
+                {"matrix": [3, 9], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [2, 15], "x": 1, "y": 5.5, "w": 1.5},
+                {"matrix": [1, 15], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 12], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [6, 15], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 15], "x": 12.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [3, 5], "x": 20.5, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/converter/a1200/miss1200/config.h b/keyboards/converter/a1200/miss1200/config.h
deleted file mode 100644
index 07e8b9ac93..0000000000
--- a/keyboards/converter/a1200/miss1200/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2021 8bits4ever
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0, B1, B3 }
-#define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/converter/a1200/miss1200/info.json b/keyboards/converter/a1200/miss1200/info.json
index 326d73ec83..74d569b8d9 100644
--- a/keyboards/converter/a1200/miss1200/info.json
+++ b/keyboards/converter/a1200/miss1200/info.json
@@ -6,6 +6,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "B0",
         "on_state": 0
diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h
index 6b2204ec43..21ba99e0b7 100644
--- a/keyboards/converter/a1200/mistress1200/config.h
+++ b/keyboards/converter/a1200/mistress1200/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0, B1, B3 }
-#define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #define TAPPING_TOGGLE 3
 
 #undef LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/info.json
index dfbe75c79c..c37bdadd61 100644
--- a/keyboards/converter/a1200/mistress1200/info.json
+++ b/keyboards/converter/a1200/mistress1200/info.json
@@ -6,6 +6,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "B0",
         "on_state": 0
diff --git a/keyboards/converter/a1200/teensy2pp/config.h b/keyboards/converter/a1200/teensy2pp/config.h
deleted file mode 100644
index c859413d18..0000000000
--- a/keyboards/converter/a1200/teensy2pp/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2021 8bits4ever
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right 
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2, C3, C4, C5, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/converter/a1200/teensy2pp/info.json b/keyboards/converter/a1200/teensy2pp/info.json
index a69aa38278..e4d0c09c0f 100644
--- a/keyboards/converter/a1200/teensy2pp/info.json
+++ b/keyboards/converter/a1200/teensy2pp/info.json
@@ -6,6 +6,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"],
+        "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "B6"
     },
diff --git a/keyboards/converter/adb_usb/adb_usb.c b/keyboards/converter/adb_usb/adb_usb.c
deleted file mode 100644
index 7026d62751..0000000000
--- a/keyboards/converter/adb_usb/adb_usb.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "adb_usb.h"
-#include <avr/io.h>
-#include "quantum.h"
diff --git a/keyboards/converter/hp_46010a/hp_46010a.c b/keyboards/converter/hp_46010a/hp_46010a.c
deleted file mode 100644
index 915a220f91..0000000000
--- a/keyboards/converter/hp_46010a/hp_46010a.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "hp_46010a.h"
-#include <avr/io.h>
-#include "quantum.h"
\ No newline at end of file
diff --git a/keyboards/converter/hp_46010a/hp_46010a.h b/keyboards/converter/hp_46010a/hp_46010a.h
index fd5adfc639..86fb3806f0 100644
--- a/keyboards/converter/hp_46010a/hp_46010a.h
+++ b/keyboards/converter/hp_46010a/hp_46010a.h
@@ -54,7 +54,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {KEY_Y,     KEY_T,    KEY_R,    KEY_E,    KEY_W,    KEY_Q,    KEY_TAB,  KEY_U    }, \
     {KEY_RES,   KEY_F,    KEY_D,    KEY_S,    KEY_A,    KC_NO,    KEY_2,    KEY_H    }, \
     {KEY_P7,    KEY_P4,   KEY_P8,   KEY_P5,   KEY_P9,   KEY_P6,   KEY_PADE, KEY_PCOM }, \
-    {KEY_MULT,  KEY_P1,   KEY_DIV,  KEY_P2,   KEY_PLUS, KEY_P3,   KEY_MINU, KEY_PTAB }, \
+    {KEY_MULT,  KEY_P1,   KEY_DIV,  KEY_P2,   KEY_ADD,  KEY_P3,   KEY_SUBT, KEY_PTAB }, \
     {KEY_B1,    KEY_P0,   KEY_B2,   KC_NO,    KEY_B3,   KEY_PDOT, KEY_B4,   KC_NO    }, \
     {KEY_B,     KEY_V,    KEY_C,    KEY_X,    KEY_Z,    KEY_PRNT, KEY_DELE, KEY_N    }, \
 }
diff --git a/keyboards/converter/ibm_terminal/ibm_terminal.c b/keyboards/converter/ibm_terminal/ibm_terminal.c
deleted file mode 100644
index fd64a21ace..0000000000
--- a/keyboards/converter/ibm_terminal/ibm_terminal.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ibm_terminal.h"
diff --git a/keyboards/converter/m0110_usb/m0110_usb.c b/keyboards/converter/m0110_usb/m0110_usb.c
deleted file mode 100644
index a2f98cced6..0000000000
--- a/keyboards/converter/m0110_usb/m0110_usb.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "m0110_usb.h"
-#include <avr/io.h>
-#include "quantum.h"
diff --git a/keyboards/converter/modelm101/config.h b/keyboards/converter/modelm101/config.h
index 00d991fcc8..764fb56f64 100644
--- a/keyboards/converter/modelm101/config.h
+++ b/keyboards/converter/modelm101/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0 }
-#define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D6, D5, D4, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* The Model M has no diodes */
 #define MATRIX_HAS_GHOST
 
diff --git a/keyboards/converter/modelm101/info.json b/keyboards/converter/modelm101/info.json
index 9bffe2e242..a3698672ba 100644
--- a/keyboards/converter/modelm101/info.json
+++ b/keyboards/converter/modelm101/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2"],
+        "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "at90usb1286",
     "bootloader": "halfkay",
     "layouts": {
diff --git a/keyboards/converter/modelm101_teensy2/config.h b/keyboards/converter/modelm101_teensy2/config.h
index 7e0e627bd9..764fb56f64 100644
--- a/keyboards/converter/modelm101_teensy2/config.h
+++ b/keyboards/converter/modelm101_teensy2/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, C6, C7, D5, D4 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, B0, B1, B2, B3, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* The Model M has no diodes */
 #define MATRIX_HAS_GHOST
 
diff --git a/keyboards/converter/modelm101_teensy2/info.json b/keyboards/converter/modelm101_teensy2/info.json
index 12ee7274d7..efeb041c3c 100644
--- a/keyboards/converter/modelm101_teensy2/info.json
+++ b/keyboards/converter/modelm101_teensy2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "B0", "B1", "B2", "B3", "B7"],
+        "rows": ["D0", "D1", "D2", "D3", "C6", "C7", "D5", "D4"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "E6",
         "on_state": 0
diff --git a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c b/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c
deleted file mode 100644
index 8283d91eda..0000000000
--- a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 iw0rm3r
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "modelm101_teensy2.h"
diff --git a/keyboards/converter/modelm_ssk/config.h b/keyboards/converter/modelm_ssk/config.h
index f38e3db3dd..3b6e758833 100644
--- a/keyboards/converter/modelm_ssk/config.h
+++ b/keyboards/converter/modelm_ssk/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D5, D4, D3, D2, D1 }
-#define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* The Model M does not have NKRO */
 #define MATRIX_HAS_GHOST
 
diff --git a/keyboards/converter/modelm_ssk/info.json b/keyboards/converter/modelm_ssk/info.json
index 348e6e6dca..ff2c6cc217 100644
--- a/keyboards/converter/modelm_ssk/info.json
+++ b/keyboards/converter/modelm_ssk/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D5", "D4", "D3", "D2", "D1"],
+        "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "B6",
         "num_lock": "B4",
diff --git a/keyboards/converter/numeric_keypad_iie/config.h b/keyboards/converter/numeric_keypad_iie/config.h
deleted file mode 100644
index 81671354fd..0000000000
--- a/keyboards/converter/numeric_keypad_iie/config.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright 2019 Adam Newbold <adam@neatnik.net>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
-
-Pin Mappings
-============
-
-Dsub-15 Connection
-------------------
-
-          Dsub-15 (female)
-    ,-------------------------.
-    \ 08 07 06 05 04 03 02 01 /
-     \ 15 14 13 12 11 10 09  /
-      `---------------------'
-
-Header Pins
------------
- _____________________________________
-|                                     |
-|  11  10  9  8  7  6  5  4  3  2  1  |
-|_____________________________________|
-
-
-Header / Matrix
----------------
-
-Pin             Name        Description
---------------------------------------------------------------
-1,2,5,3,4,6     Y0-Y5       Y-direction key-matrix connections
-7               NC
-9,11,10,8       X4-X7       X-direction key-matrix connections
-
-
-Microcontroller Configuration
------------------------------
-
-(Pins are for an Arduino Micro)
-
-+-----------------------------------+
-| Dsub-15 | Header | Matrix | Micro |
-|---------+--------+--------+-------|
-|   12    |   11   |   X5   |   B0  |
-|   11    |   10   |   X6   |   D3  |
-|   10    |    9   |   X4   |   B2  |
-|    9    |    8   |   X7   |   D2  |
-|   NC    |    7   |   NC   |   --  |
-|    7    |    6   |   Y5   |   E6  |
-|    6    |    5   |   Y2   |   D4  |
-|    5    |    4   |   Y4   |   D7  |
-|    3    |    3   |   Y3   |   C6  |
-|    2    |    2   |   Y1   |   D0  |
-|    1    |    1   |   Y0   |   D1  |
-+-----------------------------------+
-
-Note: Dsub-15 pins 4, 8, 13, 14, and 15 are unused
-
-Reference
----------
-
-https://deskthority.net/wiki/Apple_Numeric_Keypad_IIe
-https://geekhack.org/index.php?topic=78048.0
-http://wiki.apple2.org/index.php?title=Pinouts#Apple_.2F.2Fe_Numeric_Keypad_connector
-
-*/
-
-#define MATRIX_ROW_PINS { B0, B2, D2, D3 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/info.json
index 41b75f69b9..a6a81507ec 100644
--- a/keyboards/converter/numeric_keypad_iie/info.json
+++ b/keyboards/converter/numeric_keypad_iie/info.json
@@ -8,11 +8,52 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6"],
+        "rows": ["B0", "B2", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"7", "x":2, "y":0}, {"label":"8", "x":3, "y":0}, {"label":"9", "x":4, "y":0}, {"label":"(", "x":5.5, "y":0}, {"label":")", "x":6.5, "y":0}, {"label":"\u2190", "x":0, "y":1}, {"label":"4", "x":2, "y":1}, {"label":"5", "x":3, "y":1}, {"label":"6", "x":4, "y":1}, {"label":"\u2212", "x":5.5, "y":1}, {"label":"\u00f7", "x":6.5, "y":1}, {"label":"\u2192", "x":0, "y":2}, {"label":"1", "x":2, "y":2}, {"label":"2", "x":3, "y":2}, {"label":"3", "x":4, "y":2}, {"label":"+", "x":5.5, "y":2}, {"label":"\u00d7", "x":6.5, "y":2}, {"label":"Space", "x":0, "y":3}, {"label":"0", "x":1.5, "y":3, "w":1.5}, {"label":",", "x":3, "y":3}, {"label":".", "x":4, "y":3}, {"label":"Ret", "x":5.5, "y":3}, {"label":"Print", "x":6.5, "y":3}]
+            "layout": [
+                {"matrix": [0, 1], "x": 0, "y": 0},
+
+                {"matrix": [0, 5], "x": 2, "y": 0},
+                {"matrix": [3, 2], "x": 3, "y": 0},
+                {"matrix": [3, 3], "x": 4, "y": 0},
+
+                {"matrix": [2, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+
+                {"matrix": [1, 1], "x": 0, "y": 1},
+
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [0, 3], "x": 3, "y": 1},
+                {"matrix": [0, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [1, 0], "x": 6.5, "y": 1},
+
+                {"matrix": [3, 1], "x": 0, "y": 2},
+
+                {"matrix": [1, 3], "x": 2, "y": 2},
+                {"matrix": [1, 4], "x": 3, "y": 2},
+                {"matrix": [1, 5], "x": 4, "y": 2},
+
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 0], "x": 6.5, "y": 2},
+
+                {"matrix": [2, 1], "x": 0, "y": 3},
+
+                {"matrix": [1, 2], "x": 1.5, "y": 3, "w": 1.5},
+                {"matrix": [2, 5], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+
+                {"matrix": [2, 4], "x": 5.5, "y": 3},
+                {"matrix": [2, 0], "x": 6.5, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c
deleted file mode 100644
index 341af05b31..0000000000
--- a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Adam Newbold <adam@neatnik.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "numeric_keypad_iie.h"
diff --git a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h
deleted file mode 100644
index 8892b5553b..0000000000
--- a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright Adam Newbold <adam@neatnik.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-    K_ESC,   K_7, K_8,     K_9,   K_LEFT_PARENS, K_RIGHT_PARENS, \
-    K_LEFT,  K_4, K_5,     K_6,   K_MINUS,       K_DIVIDE,       \
-    K_RIGHT, K_1, K_2,     K_3,   K_PLUS,        K_MULTIPLY,     \
-    K_SPACE, K_0, K_COMMA, K_DOT, K_RETURN,      K_PRINT         \
-){ \
-    { K_RIGHT_PARENS, K_ESC,   K_4,           K_5,     K_6,      K_7     },\
-    { K_DIVIDE,       K_LEFT,  K_0,           K_1,     K_2,      K_3     },\
-    { K_PRINT,        K_SPACE, K_LEFT_PARENS, K_MINUS, K_RETURN, K_COMMA },\
-    { K_MULTIPLY,     K_RIGHT, K_8,           K_9,     K_DOT,    K_PLUS  },\
-}
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c
index 4226dfa52c..016b562254 100644
--- a/keyboards/converter/palm_usb/matrix.c
+++ b/keyboards/converter/palm_usb/matrix.c
@@ -17,7 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "uart.h"
 #include "timer.h"
 
@@ -134,14 +136,14 @@ uint8_t rts_reset(void) {
     if (firstread) {
         writePinLow(RTS_PIN);
     } 
-     _delay_ms(10);
+     wait_ms(10);
     writePinHigh(RTS_PIN);
     
 
 /* the future is Arm 
     if (!palReadPad(RTS_PIN_IOPRT))
   {
-    _delay_ms(10);
+    wait_ms(10);
     palSetPadMode(RTS_PINn_IOPORT, PinDirectionOutput_PUSHPULL);
     palSetPad(RTS_PORT, RTS_PIN);
   }
@@ -150,13 +152,13 @@ uint8_t rts_reset(void) {
     palSetPadMode(RTS_PIN_RTS_PORT, PinDirectionOutput_PUSHPULL);
     palSetPad(RTS_PORT, RTS_PIN);
     palClearPad(RTS_PORT, RTS_PIN);
-    _delay_ms(10);
+    wait_ms(10);
     palSetPad(RTS_PORT, RTS_PIN);
   }
 */
 
 
- _delay_ms(5);  
+ wait_ms(5);  
  //print("rts\n");
  return 1;
 }
@@ -222,7 +224,7 @@ uint8_t handspring_handshake(void) {
 
 uint8_t handspring_reset(void) {
     writePinLow(VCC_PIN);
-    _delay_ms(5);
+    wait_ms(5);
     writePinHigh(VCC_PIN);
 
     if ( handspring_handshake() ) {
@@ -257,7 +259,7 @@ void matrix_init(void)
         last_activity = timer_read();
     } else { 
         print("failed handshake");
-        _delay_ms(1000);
+        wait_ms(1000);
         //BUG /should/ power cycle or toggle RTS & reset, but this usually works. 
     }
 
@@ -271,7 +273,7 @@ void matrix_init(void)
         last_activity = timer_read();
     } else { 
         print("failed handshake");
-        _delay_ms(1000);
+        wait_ms(1000);
         //BUG /should/ power cycle or toggle RTS & reset, but this usually works. 
     }
 
diff --git a/keyboards/converter/periboard_512/periboard_512.c b/keyboards/converter/periboard_512/periboard_512.c
deleted file mode 100644
index 11c65e923a..0000000000
--- a/keyboards/converter/periboard_512/periboard_512.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Sife
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "periboard_512.h"
diff --git a/keyboards/converter/siemens_tastatur/config.h b/keyboards/converter/siemens_tastatur/config.h
index b21326d298..49725a9592 100644
--- a/keyboards/converter/siemens_tastatur/config.h
+++ b/keyboards/converter/siemens_tastatur/config.h
@@ -21,11 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 19
 
-//This is all fake and not used
-#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/converter/siemens_tastatur/siemens_tastatur.c b/keyboards/converter/siemens_tastatur/siemens_tastatur.c
deleted file mode 100644
index 21d00c8c30..0000000000
--- a/keyboards/converter/siemens_tastatur/siemens_tastatur.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2019 Yiancar
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "siemens_tastatur.h"
diff --git a/keyboards/converter/sun_usb/command_extra.c b/keyboards/converter/sun_usb/command_extra.c
deleted file mode 100644
index b15f9dc9bd..0000000000
--- a/keyboards/converter/sun_usb/command_extra.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "uart.h"
-
-bool sun_bell = false;
-bool sun_click = false;
-
-
-bool command_extra(uint8_t code)
-{
-    switch (code) {
-        case KC_H:
-        case KC_SLASH: /* ? */
-            print("\n\n----- Sun converter Help -----\n");
-            print("Home:        Toggle Bell\n");
-            print("End:         Toggle Click\n");
-            print("PgUp:        LED all On\n");
-            print("PgDown:      LED all Off\n");
-            print("Insert:      Layout\n");
-            print("Delete:      Reset\n");
-            return false;
-        case KC_DEL:
-            print("Reset\n");
-            uart_write(0x01);
-            break;
-        case KC_HOME:
-	    sun_bell = !sun_bell;
-	    if (sun_bell) {
-                print("Bell On\n");
-	        uart_write(0x02);
-	    } else {
-	        print("Bell Off\n");
-	        uart_write(0x03);
-	    }
-            break;
-        case KC_END:
-	    sun_click = !sun_click;
-	    if (sun_click) {
-	        print("Click On\n");
-		uart_write(0x0A);
-	    } else {
-	        print("Click Off\n");
-                uart_write(0x0B);
-	    }
-	    break;
-        case KC_PGUP:
-            print("LED all on\n");
-            uart_write(0x0E);
-            uart_write(0xFF);
-            break;
-        case KC_PGDN:
-            print("LED all off\n");
-            uart_write(0x0E);
-            uart_write(0x00);
-            break;
-        case KC_INSERT:
-            print("layout\n");
-            uart_write(0x0F);
-            break;
-        default:
-            xprintf("Unknown extra command: %02X\n", code);
-            return false;
-    }
-    return true;
-}
diff --git a/keyboards/converter/sun_usb/led.c b/keyboards/converter/sun_usb/led.c
index f8d183fd48..493825bac8 100644
--- a/keyboards/converter/sun_usb/led.c
+++ b/keyboards/converter/sun_usb/led.c
@@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
+#include "led.h"
+#include "print.h"
 #include "uart.h"
 
 void led_set(uint8_t usb_led)
diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c
index 9f22eca1eb..bf1d5f807f 100644
--- a/keyboards/converter/sun_usb/matrix.c
+++ b/keyboards/converter/sun_usb/matrix.c
@@ -15,7 +15,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "host.h"
+#include "led.h"
+#include "debug.h"
+#include "wait.h"
 #include "uart.h"
 
 /*
@@ -86,9 +90,9 @@ void matrix_init(void)
     /*     print("."); */
     /*     while (uart_read()); */
     /*     uart_write(0x01); */
-    /*     _delay_ms(500); */
+    /*     wait_ms(500); */
     /*     if (uart_read() == 0xFF) { */
-    /*         _delay_ms(500); */
+    /*         wait_ms(500); */
     /*         if (uart_read() == 0x04) */
     /*             break; */
     /*     } */
@@ -112,7 +116,7 @@ uint8_t matrix_scan(void)
     switch (code) {
         case 0xFF:  // reset success: FF 04
             print("reset: ");
-            _delay_ms(500);
+            wait_ms(500);
             code = uart_read();
             xprintf("%02X\n", code);
             if (code == 0x04) {
@@ -122,12 +126,12 @@ uint8_t matrix_scan(void)
             return 0;
         case 0xFE:  // layout: FE <layout>
             print("layout: ");
-            _delay_ms(500);
+            wait_ms(500);
             xprintf("%02X\n", uart_read());
             return 0;
         case 0x7E:  // reset fail: 7E 01
             print("reset fail: ");
-            _delay_ms(500);
+            wait_ms(500);
             xprintf("%02X\n", uart_read());
             return 0;
         case 0x7F:
diff --git a/keyboards/converter/usb_usb/ble/ble.c b/keyboards/converter/usb_usb/ble/ble.c
deleted file mode 100644
index 387eb8166c..0000000000
--- a/keyboards/converter/usb_usb/ble/ble.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ble.h"
diff --git a/keyboards/converter/usb_usb/ble/ble.h b/keyboards/converter/usb_usb/ble/ble.h
deleted file mode 100644
index 3351176047..0000000000
--- a/keyboards/converter/usb_usb/ble/ble.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "usb_usb.h"
diff --git a/keyboards/converter/usb_usb/hasu/hasu.c b/keyboards/converter/usb_usb/hasu/hasu.c
deleted file mode 100644
index 3357735ffd..0000000000
--- a/keyboards/converter/usb_usb/hasu/hasu.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "hasu.h"
diff --git a/keyboards/converter/usb_usb/hasu/hasu.h b/keyboards/converter/usb_usb/hasu/hasu.h
deleted file mode 100644
index 3351176047..0000000000
--- a/keyboards/converter/usb_usb/hasu/hasu.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "usb_usb.h"
diff --git a/keyboards/converter/usb_usb/info.json b/keyboards/converter/usb_usb/info.json
index 8e4a28ab46..2f3e8913c5 100644
--- a/keyboards/converter/usb_usb/info.json
+++ b/keyboards/converter/usb_usb/info.json
@@ -13,550 +13,560 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 0, "y": 1},
-
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
-
-                {"x": 15.25, "y": 1},
-                {"x": 16.25, "y": 1},
-                {"x": 17.25, "y": 1},
-
-                {"x": 18.5, "y": 1},
-                {"x": 19.5, "y": 1},
-                {"x": 20.5, "y": 1},
-                {"x": 21.5, "y": 1},
-
-                {"x": 22.75, "y": 1},
-
-                {"x": 0, "y": 2.5},
-                {"x": 1, "y": 2.5},
-                {"x": 2, "y": 2.5},
-                {"x": 3, "y": 2.5},
-                {"x": 4, "y": 2.5},
-                {"x": 5, "y": 2.5},
-                {"x": 6, "y": 2.5},
-                {"x": 7, "y": 2.5},
-                {"x": 8, "y": 2.5},
-                {"x": 9, "y": 2.5},
-                {"x": 10, "y": 2.5},
-                {"x": 11, "y": 2.5},
-                {"x": 12, "y": 2.5},
-                {"x": 13, "y": 2.5},
-                {"x": 14, "y": 2.5},
-
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 18.5, "y": 2.5},
-                {"x": 19.5, "y": 2.5},
-                {"x": 20.5, "y": 2.5},
-                {"x": 21.5, "y": 2.5},
-
-                {"x": 22.75, "y": 2.5},
-                {"x": 23.75, "y": 2.5},
-
-                {"x": 0, "y": 3.5, "w": 1.5},
-                {"x": 1.5, "y": 3.5},
-                {"x": 2.5, "y": 3.5},
-                {"x": 3.5, "y": 3.5},
-                {"x": 4.5, "y": 3.5},
-                {"x": 5.5, "y": 3.5},
-                {"x": 6.5, "y": 3.5},
-                {"x": 7.5, "y": 3.5},
-                {"x": 8.5, "y": 3.5},
-                {"x": 9.5, "y": 3.5},
-                {"x": 10.5, "y": 3.5},
-                {"x": 11.5, "y": 3.5},
-                {"x": 12.5, "y": 3.5},
-                {"x": 13.5, "y": 3.5, "w": 1.5},
-
-                {"x": 15.25, "y": 3.5},
-                {"x": 16.25, "y": 3.5},
-                {"x": 17.25, "y": 3.5},
-
-                {"x": 18.5, "y": 3.5},
-                {"x": 19.5, "y": 3.5},
-                {"x": 20.5, "y": 3.5},
-                {"x": 21.5, "y": 3.5},
-
-                {"x": 22.75, "y": 3.5},
-                {"x": 23.75, "y": 3.5},
-
-                {"x": 0, "y": 4.5, "w": 1.75},
-                {"x": 1.75, "y": 4.5},
-                {"x": 2.75, "y": 4.5},
-                {"x": 3.75, "y": 4.5},
-                {"x": 4.75, "y": 4.5},
-                {"x": 5.75, "y": 4.5},
-                {"x": 6.75, "y": 4.5},
-                {"x": 7.75, "y": 4.5},
-                {"x": 8.75, "y": 4.5},
-                {"x": 9.75, "y": 4.5},
-                {"x": 10.75, "y": 4.5},
-                {"x": 11.75, "y": 4.5},
-                {"x": 12.75, "y": 4.5},
-                {"x": 13.75, "y": 4.5, "w": 1.25},
-
-                {"x": 18.5, "y": 4.5},
-                {"x": 19.5, "y": 4.5},
-                {"x": 20.5, "y": 4.5},
-                {"x": 21.5, "y": 4.5},
-
-                {"x": 22.75, "y": 4.5},
-                {"x": 23.75, "y": 4.5},
-
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5},
-                {"x": 2.25, "y": 5.5},
-                {"x": 3.25, "y": 5.5},
-                {"x": 4.25, "y": 5.5},
-                {"x": 5.25, "y": 5.5},
-                {"x": 6.25, "y": 5.5},
-                {"x": 7.25, "y": 5.5},
-                {"x": 8.25, "y": 5.5},
-                {"x": 9.25, "y": 5.5},
-                {"x": 10.25, "y": 5.5},
-                {"x": 11.25, "y": 5.5},
-                {"x": 12.25, "y": 5.5},
-                {"x": 13.25, "y": 5.5, "w": 1.75},
-
-                {"x": 16.25, "y": 5.5},
-
-                {"x": 18.5, "y": 5.5},
-                {"x": 19.5, "y": 5.5},
-                {"x": 20.5, "y": 5.5},
-                {"x": 21.5, "y": 5.5},
-
-                {"x": 22.75, "y": 5.5},
-                {"x": 23.75, "y": 5.5},
-
-                {"x": 0, "y": 6.5},
-                {"x": 1, "y": 6.5},
-                {"x": 2, "y": 6.5},
-                {"x": 3, "y": 6.5},
-                {"x": 4, "y": 6.5},
-                {"x": 5, "y": 6.5, "w": 3},
-                {"x": 8, "y": 6.5},
-                {"x": 9, "y": 6.5},
-                {"x": 10, "y": 6.5},
-                {"x": 11, "y": 6.5},
-                {"x": 12, "y": 6.5},
-                {"x": 13, "y": 6.5},
-                {"x": 14, "y": 6.5},
-
-                {"x": 15.25, "y": 6.5},
-                {"x": 16.25, "y": 6.5},
-                {"x": 17.25, "y": 6.5},
-
-                {"x": 18.5, "y": 6.5, "w": 2},
-                {"x": 20.5, "y": 6.5},
-                {"x": 21.5, "y": 6.5},
-
-                {"x": 22.75, "y": 6.5},
-                {"x": 23.75, "y": 6.5}
+                {"matrix": [6, 8], "x": 2, "y": 0},
+                {"matrix": [6, 9], "x": 3, "y": 0},
+                {"matrix": [6, 10], "x": 4, "y": 0},
+                {"matrix": [6, 11], "x": 5, "y": 0},
+
+                {"matrix": [6, 12], "x": 6.5, "y": 0},
+                {"matrix": [6, 13], "x": 7.5, "y": 0},
+                {"matrix": [6, 14], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.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": [2, 9], "x": 0, "y": 1},
+
+                {"matrix": [3, 10], "x": 2, "y": 1},
+                {"matrix": [3, 11], "x": 3, "y": 1},
+                {"matrix": [3, 12], "x": 4, "y": 1},
+                {"matrix": [3, 13], "x": 5, "y": 1},
+
+                {"matrix": [3, 14], "x": 6.5, "y": 1},
+                {"matrix": [3, 15], "x": 7.5, "y": 1},
+                {"matrix": [4, 0], "x": 8.5, "y": 1},
+                {"matrix": [4, 1], "x": 9.5, "y": 1},
+
+                {"matrix": [4, 2], "x": 11, "y": 1},
+                {"matrix": [4, 3], "x": 12, "y": 1},
+                {"matrix": [4, 4], "x": 13, "y": 1},
+                {"matrix": [4, 5], "x": 14, "y": 1},
+
+                {"matrix": [4, 6], "x": 15.25, "y": 1},
+                {"matrix": [4, 7], "x": 16.25, "y": 1},
+                {"matrix": [4, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [8, 1], "x": 18.5, "y": 1},
+                {"matrix": [8, 0], "x": 19.5, "y": 1},
+                {"matrix": [7, 15], "x": 20.5, "y": 1},
+                {"matrix": [6, 6], "x": 21.5, "y": 1},
+
+                {"matrix": [7, 5], "x": 22.75, "y": 1},
+
+                {"matrix": [3, 5], "x": 0, "y": 2.5},
+                {"matrix": [1, 14], "x": 1, "y": 2.5},
+                {"matrix": [1, 15], "x": 2, "y": 2.5},
+                {"matrix": [2, 0], "x": 3, "y": 2.5},
+                {"matrix": [2, 1], "x": 4, "y": 2.5},
+                {"matrix": [2, 2], "x": 5, "y": 2.5},
+                {"matrix": [2, 3], "x": 6, "y": 2.5},
+                {"matrix": [2, 4], "x": 7, "y": 2.5},
+                {"matrix": [2, 5], "x": 8, "y": 2.5},
+                {"matrix": [2, 6], "x": 9, "y": 2.5},
+                {"matrix": [2, 7], "x": 10, "y": 2.5},
+                {"matrix": [2, 13], "x": 11, "y": 2.5},
+                {"matrix": [2, 14], "x": 12, "y": 2.5},
+                {"matrix": [8, 9], "x": 13, "y": 2.5},
+                {"matrix": [2, 10], "x": 14, "y": 2.5},
+
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 11], "x": 17.25, "y": 2.5},
+
+                {"matrix": [5, 3], "x": 18.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 19.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 2.5},
+
+                {"matrix": [7, 8], "x": 22.75, "y": 2.5},
+                {"matrix": [7, 9], "x": 23.75, "y": 2.5},
+
+                {"matrix": [2, 11], "x": 0, "y": 3.5, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 3.5},
+                {"matrix": [1, 10], "x": 2.5, "y": 3.5},
+                {"matrix": [0, 8], "x": 3.5, "y": 3.5},
+                {"matrix": [1, 5], "x": 4.5, "y": 3.5},
+                {"matrix": [1, 7], "x": 5.5, "y": 3.5},
+                {"matrix": [1, 12], "x": 6.5, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.5, "y": 3.5},
+                {"matrix": [0, 12], "x": 8.5, "y": 3.5},
+                {"matrix": [1, 2], "x": 9.5, "y": 3.5},
+                {"matrix": [1, 3], "x": 10.5, "y": 3.5},
+                {"matrix": [2, 15], "x": 11.5, "y": 3.5},
+                {"matrix": [3, 0], "x": 12.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 13.5, "y": 3.5, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 3.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 3.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 3.5},
+
+                {"matrix": [5, 15], "x": 18.5, "y": 3.5},
+                {"matrix": [6, 0], "x": 19.5, "y": 3.5},
+                {"matrix": [6, 1], "x": 20.5, "y": 3.5},
+                {"matrix": [5, 7], "x": 21.5, "y": 3.5},
+
+                {"matrix": [7, 6], "x": 22.75, "y": 3.5},
+                {"matrix": [7, 10], "x": 23.75, "y": 3.5},
+
+                {"matrix": [3, 9], "x": 0, "y": 4.5, "w": 1.75},
+                {"matrix": [0, 4], "x": 1.75, "y": 4.5},
+                {"matrix": [1, 6], "x": 2.75, "y": 4.5},
+                {"matrix": [0, 7], "x": 3.75, "y": 4.5},
+                {"matrix": [0, 9], "x": 4.75, "y": 4.5},
+                {"matrix": [0, 10], "x": 5.75, "y": 4.5},
+                {"matrix": [0, 11], "x": 6.75, "y": 4.5},
+                {"matrix": [0, 13], "x": 7.75, "y": 4.5},
+                {"matrix": [0, 14], "x": 8.75, "y": 4.5},
+                {"matrix": [0, 15], "x": 9.75, "y": 4.5},
+                {"matrix": [3, 3], "x": 10.75, "y": 4.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 4.5},
+                {"matrix": [3, 2], "x": 12.75, "y": 4.5},
+                {"matrix": [2, 8], "x": 13.75, "y": 4.5, "w": 1.25},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 13], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 14], "x": 20.5, "y": 4.5},
+                {"matrix": [8, 5], "x": 21.5, "y": 4.5},
+
+                {"matrix": [7, 7], "x": 22.75, "y": 4.5},
+                {"matrix": [7, 12], "x": 23.75, "y": 4.5},
+
+                {"matrix": [14, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 4], "x": 1.25, "y": 5.5},
+                {"matrix": [1, 13], "x": 2.25, "y": 5.5},
+                {"matrix": [1, 11], "x": 3.25, "y": 5.5},
+                {"matrix": [0, 6], "x": 4.25, "y": 5.5},
+                {"matrix": [1, 9], "x": 5.25, "y": 5.5},
+                {"matrix": [0, 5], "x": 6.25, "y": 5.5},
+                {"matrix": [1, 1], "x": 7.25, "y": 5.5},
+                {"matrix": [1, 0], "x": 8.25, "y": 5.5},
+                {"matrix": [3, 6], "x": 9.25, "y": 5.5},
+                {"matrix": [3, 7], "x": 10.25, "y": 5.5},
+                {"matrix": [3, 8], "x": 11.25, "y": 5.5},
+                {"matrix": [8, 7], "x": 12.25, "y": 5.5},
+                {"matrix": [14, 5], "x": 13.25, "y": 5.5, "w": 1.75},
+
+                {"matrix": [5, 2], "x": 16.25, "y": 5.5},
+
+                {"matrix": [5, 9], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 10], "x": 19.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 20.5, "y": 5.5},
+                {"matrix": [6, 7], "x": 21.5, "y": 5.5},
+
+                {"matrix": [7, 4], "x": 22.75, "y": 5.5},
+                {"matrix": [7, 13], "x": 23.75, "y": 5.5},
+
+                {"matrix": [14, 0], "x": 0, "y": 6.5},
+                {"matrix": [14, 3], "x": 1, "y": 6.5},
+                {"matrix": [14, 2], "x": 2, "y": 6.5},
+                {"matrix": [8, 11], "x": 3, "y": 6.5},
+                {"matrix": [9, 1], "x": 4, "y": 6.5},
+                {"matrix": [2, 12], "x": 5, "y": 6.5, "w": 3},
+                {"matrix": [9, 0], "x": 8, "y": 6.5},
+                {"matrix": [8, 10], "x": 9, "y": 6.5},
+                {"matrix": [8, 8], "x": 10, "y": 6.5},
+                {"matrix": [14, 6], "x": 11, "y": 6.5},
+                {"matrix": [14, 7], "x": 12, "y": 6.5},
+                {"matrix": [6, 5], "x": 13, "y": 6.5},
+                {"matrix": [14, 4], "x": 14, "y": 6.5},
+
+                {"matrix": [5, 0], "x": 15.25, "y": 6.5},
+                {"matrix": [5, 1], "x": 16.25, "y": 6.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 6.5},
+
+                {"matrix": [6, 2], "x": 18.5, "y": 6.5, "w": 2},
+                {"matrix": [6, 3], "x": 20.5, "y": 6.5},
+                {"matrix": [5, 8], "x": 21.5, "y": 6.5},
+
+                {"matrix": [7, 14], "x": 22.75, "y": 6.5},
+                {"matrix": [7, 11], "x": 23.75, "y": 6.5}
             ]
         },
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
-
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 18.5, "y": 1.5},
-                {"x": 19.5, "y": 1.5},
-                {"x": 20.5, "y": 1.5},
-                {"x": 21.5, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 18.5, "y": 2.5},
-                {"x": 19.5, "y": 2.5},
-                {"x": 20.5, "y": 2.5},
-                {"x": 21.5, "y": 2.5, "h": 2},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"x": 18.5, "y": 3.5},
-                {"x": 19.5, "y": 3.5},
-                {"x": 20.5, "y": 3.5},
-
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"x": 16.25, "y": 4.5},
-
-                {"x": 18.5, "y": 4.5},
-                {"x": 19.5, "y": 4.5},
-                {"x": 20.5, "y": 4.5},
-                {"x": 21.5, "y": 4.5, "h": 2},
-
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5},
-
-                {"x": 18.5, "y": 5.5, "w": 2},
-                {"x": 20.5, "y": 5.5}
+                {"matrix": [2, 9], "x": 0, "y": 0},
+
+                {"matrix": [3, 10], "x": 2, "y": 0},
+                {"matrix": [3, 11], "x": 3, "y": 0},
+                {"matrix": [3, 12], "x": 4, "y": 0},
+                {"matrix": [3, 13], "x": 5, "y": 0},
+
+                {"matrix": [3, 14], "x": 6.5, "y": 0},
+                {"matrix": [3, 15], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "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": [4, 6], "x": 15.25, "y": 0},
+                {"matrix": [4, 7], "x": 16.25, "y": 0},
+                {"matrix": [4, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [3, 5], "x": 0, "y": 1.5},
+                {"matrix": [1, 14], "x": 1, "y": 1.5},
+                {"matrix": [1, 15], "x": 2, "y": 1.5},
+                {"matrix": [2, 0], "x": 3, "y": 1.5},
+                {"matrix": [2, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [2, 4], "x": 7, "y": 1.5},
+                {"matrix": [2, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 6], "x": 9, "y": 1.5},
+                {"matrix": [2, 7], "x": 10, "y": 1.5},
+                {"matrix": [2, 13], "x": 11, "y": 1.5},
+                {"matrix": [2, 14], "x": 12, "y": 1.5},
+                {"matrix": [2, 10], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 10], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 11], "x": 17.25, "y": 1.5},
+
+                {"matrix": [5, 3], "x": 18.5, "y": 1.5},
+                {"matrix": [5, 4], "x": 19.5, "y": 1.5},
+                {"matrix": [5, 5], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 11], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 2.5, "y": 2.5},
+                {"matrix": [0, 8], "x": 3.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 12], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [0, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 9.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [5, 15], "x": 18.5, "y": 2.5},
+                {"matrix": [6, 0], "x": 19.5, "y": 2.5},
+                {"matrix": [6, 1], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 9], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [0, 4], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 6], "x": 2.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [0, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 11], "x": 6.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 7.75, "y": 3.5},
+                {"matrix": [0, 14], "x": 8.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [2, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [5, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [5, 14], "x": 20.5, "y": 3.5},
+
+                {"matrix": [14, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 13], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 3.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [1, 1], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 0], "x": 8.25, "y": 4.5},
+                {"matrix": [3, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [3, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [3, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [14, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [5, 2], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 8], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [14, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 3], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 12], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [14, 6], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 4], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 0], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 1], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [6, 2], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [6, 3], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
-
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 18.5, "y": 1.5},
-                {"x": 19.5, "y": 1.5},
-                {"x": 20.5, "y": 1.5},
-                {"x": 21.5, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 18.5, "y": 2.5},
-                {"x": 19.5, "y": 2.5},
-                {"x": 20.5, "y": 2.5},
-                {"x": 21.5, "y": 2.5, "h": 2},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5},
-                {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"x": 18.5, "y": 3.5},
-                {"x": 19.5, "y": 3.5},
-                {"x": 20.5, "y": 3.5},
-
-                {"x": 0, "y": 4.5, "w": 1.25},
-                {"x": 1.25, "y": 4.5},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"x": 16.25, "y": 4.5},
-
-                {"x": 18.5, "y": 4.5},
-                {"x": 19.5, "y": 4.5},
-                {"x": 20.5, "y": 4.5},
-                {"x": 21.5, "y": 4.5, "h": 2},
-
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5},
-
-                {"x": 18.5, "y": 5.5, "w": 2},
-                {"x": 20.5, "y": 5.5}
+                {"matrix": [2, 9], "x": 0, "y": 0},
+
+                {"matrix": [3, 10], "x": 2, "y": 0},
+                {"matrix": [3, 11], "x": 3, "y": 0},
+                {"matrix": [3, 12], "x": 4, "y": 0},
+                {"matrix": [3, 13], "x": 5, "y": 0},
+
+                {"matrix": [3, 14], "x": 6.5, "y": 0},
+                {"matrix": [3, 15], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "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": [4, 6], "x": 15.25, "y": 0},
+                {"matrix": [4, 7], "x": 16.25, "y": 0},
+                {"matrix": [4, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [3, 5], "x": 0, "y": 1.5},
+                {"matrix": [1, 14], "x": 1, "y": 1.5},
+                {"matrix": [1, 15], "x": 2, "y": 1.5},
+                {"matrix": [2, 0], "x": 3, "y": 1.5},
+                {"matrix": [2, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [2, 4], "x": 7, "y": 1.5},
+                {"matrix": [2, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 6], "x": 9, "y": 1.5},
+                {"matrix": [2, 7], "x": 10, "y": 1.5},
+                {"matrix": [2, 13], "x": 11, "y": 1.5},
+                {"matrix": [2, 14], "x": 12, "y": 1.5},
+                {"matrix": [2, 10], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 10], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 11], "x": 17.25, "y": 1.5},
+
+                {"matrix": [5, 3], "x": 18.5, "y": 1.5},
+                {"matrix": [5, 4], "x": 19.5, "y": 1.5},
+                {"matrix": [5, 5], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 11], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 2.5, "y": 2.5},
+                {"matrix": [0, 8], "x": 3.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 12], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [0, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 9.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [5, 15], "x": 18.5, "y": 2.5},
+                {"matrix": [6, 0], "x": 19.5, "y": 2.5},
+                {"matrix": [6, 1], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 9], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [0, 4], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 6], "x": 2.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [0, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 11], "x": 6.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 7.75, "y": 3.5},
+                {"matrix": [0, 14], "x": 8.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 12.75, "y": 3.5},
+                {"matrix": [2, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [5, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [5, 14], "x": 20.5, "y": 3.5},
+
+                {"matrix": [14, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [1, 13], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 3.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [1, 1], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 0], "x": 8.25, "y": 4.5},
+                {"matrix": [3, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [3, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [3, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [14, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [5, 2], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 8], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [14, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 3], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 12], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [14, 6], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 4], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 0], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 1], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [6, 2], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [6, 3], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_jis": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5},
-                {"x": 14, "y": 1.5},
-
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 18.5, "y": 1.5},
-                {"x": 19.5, "y": 1.5},
-                {"x": 20.5, "y": 1.5},
-                {"x": 21.5, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 18.5, "y": 2.5},
-                {"x": 19.5, "y": 2.5},
-                {"x": 20.5, "y": 2.5},
-                {"x": 21.5, "y": 2.5, "h": 2},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5},
-                {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"x": 18.5, "y": 3.5},
-                {"x": 19.5, "y": 3.5},
-                {"x": 20.5, "y": 3.5},
-
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5},
-                {"x": 13.25, "y": 4.5, "w": 1.75},
-
-                {"x": 16.25, "y": 4.5},
-
-                {"x": 18.5, "y": 4.5},
-                {"x": 19.5, "y": 4.5},
-                {"x": 20.5, "y": 4.5},
-                {"x": 21.5, "y": 4.5, "h": 2},
-
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 1.25},
-                {"x": 5, "y": 5.5, "w": 2.5},
-                {"x": 7.5, "y": 5.5, "w": 1.25},
-                {"x": 8.75, "y": 5.5, "w": 1.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5},
-
-                {"x": 18.5, "y": 5.5, "w": 2},
-                {"x": 20.5, "y": 5.5}
+                {"matrix": [2, 9], "x": 0, "y": 0},
+
+                {"matrix": [3, 10], "x": 2, "y": 0},
+                {"matrix": [3, 11], "x": 3, "y": 0},
+                {"matrix": [3, 12], "x": 4, "y": 0},
+                {"matrix": [3, 13], "x": 5, "y": 0},
+
+                {"matrix": [3, 14], "x": 6.5, "y": 0},
+                {"matrix": [3, 15], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "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": [4, 6], "x": 15.25, "y": 0},
+                {"matrix": [4, 7], "x": 16.25, "y": 0},
+                {"matrix": [4, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [3, 5], "x": 0, "y": 1.5},
+                {"matrix": [1, 14], "x": 1, "y": 1.5},
+                {"matrix": [1, 15], "x": 2, "y": 1.5},
+                {"matrix": [2, 0], "x": 3, "y": 1.5},
+                {"matrix": [2, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [2, 4], "x": 7, "y": 1.5},
+                {"matrix": [2, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 6], "x": 9, "y": 1.5},
+                {"matrix": [2, 7], "x": 10, "y": 1.5},
+                {"matrix": [2, 13], "x": 11, "y": 1.5},
+                {"matrix": [2, 14], "x": 12, "y": 1.5},
+                {"matrix": [8, 9], "x": 13, "y": 1.5},
+                {"matrix": [2, 10], "x": 14, "y": 1.5},
+
+                {"matrix": [4, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 10], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 11], "x": 17.25, "y": 1.5},
+
+                {"matrix": [5, 3], "x": 18.5, "y": 1.5},
+                {"matrix": [5, 4], "x": 19.5, "y": 1.5},
+                {"matrix": [5, 5], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 11], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 2.5, "y": 2.5},
+                {"matrix": [0, 8], "x": 3.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 12], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [0, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 9.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [5, 15], "x": 18.5, "y": 2.5},
+                {"matrix": [6, 0], "x": 19.5, "y": 2.5},
+                {"matrix": [6, 1], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 9], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [0, 4], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 6], "x": 2.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [0, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 11], "x": 6.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 7.75, "y": 3.5},
+                {"matrix": [0, 14], "x": 8.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 12.75, "y": 3.5},
+                {"matrix": [2, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [5, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [5, 14], "x": 20.5, "y": 3.5},
+
+                {"matrix": [14, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 13], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 3.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [1, 1], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 0], "x": 8.25, "y": 4.5},
+                {"matrix": [3, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [3, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [3, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 7], "x": 12.25, "y": 4.5},
+                {"matrix": [14, 5], "x": 13.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [5, 2], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 8], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [14, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 3], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 11], "x": 3.75, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 12], "x": 5, "y": 5.5, "w": 2.5},
+                {"matrix": [8, 10], "x": 7.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 8], "x": 8.75, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 6], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 4], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 0], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 1], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [6, 2], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [6, 3], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
index 76cf311462..d34f91d21e 100644
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
@@ -87,12 +87,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------' `-----------' `---------------'
     */
     [_SUPERDUPER] = LAYOUT_fullsize_ansi(
-        ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,       ______,     ______,    ______,  ______,  ______,               ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,       ______,     ______,    ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  ______,  C(KC_1), C(S(KC_TAB)), C(KC_TAB),  C(KC_9),   ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-        ______,  KC_LALT, ______,  ______,  KC_BSPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_UP,        KC_RIGHT,   KC_DEL,    ______,                    ______,                                    ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,       ______,     TG(_SUPERDUPER),                      ______,               ______,              ______,  ______,  ______,  ______,
-        ______,  ______,  ______,                    KC_LSFT,                                                        ______,  ______,  ______,  ______,      ______,  ______,  ______,     ______,           ______
+        _______,          _______, _______, _______, _______, _______, _______, _______,      _______,    _______,   _______, _______, _______,              _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,    _______,   _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, C(KC_1), C(S(KC_TAB)), C(KC_TAB),  C(KC_9),   _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
+        _______, KC_LALT, _______, _______, KC_BSPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_UP,        KC_RIGHT,   KC_DEL,    _______,                   _______,                                   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,    TG(_SUPERDUPER),                      _______,              _______,             _______, _______, _______, _______,
+        _______, _______, _______,                   KC_LSFT,                                                        _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
     ),
 
     /* Dev
@@ -112,12 +112,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------' `-----------' `---------------'
     */
     [_DEV] = LAYOUT_fullsize_ansi(
-        ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                            ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                        ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_MINS, S(KC_EQL), S(KC_9), S(KC_0),  ______,  ______,                     ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  S(KC_MINS), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC),  ______,                       ______,                                    ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  KC_EQL, S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH),                             ______,               ______,              ______,  ______,  ______,  ______,
-        ______,  ______,  ______,                    ______,                                                            ______,  ______,  ______,  ______,      ______,  ______,  ______,     ______,           ______
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                           _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                       _______,     _______, _______, _______,    _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_MINS, S(KC_EQL), S(KC_9), S(KC_0),  _______, _______,                    _______,     _______, _______, _______,    _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, S(KC_MINS), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC),  _______,                      _______,                                   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, KC_EQL, S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH),                               _______,              _______,             _______, _______, _______, _______,
+        _______, _______, _______,                   _______,                                                           _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
     ),
 
     /* Adjust
@@ -137,12 +137,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------' `-----------'    `---------------'
     */
     [_ADJUST] = LAYOUT_fullsize_ansi(
-        ______,                ______,  ______,    ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,               ______,  ______,  ______,
-        ______,  ______,       ______,  ______,    ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      KC_MPLY, KC_MNXT, KC_VOLU,    ______,  ______,  ______,  ______,
-        ______,  DF(_QWERTY),  ______,  ______,    ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      KC_MSTP, KC_MPRV, KC_VOLD,    ______,  ______,  ______,  ______,
-        ______,  ______,       ______,  ______,    ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                    ______,                                    ______,  ______,  ______,
-        ______,  ______,       ______,  DF(_CKO),  ______,  ______,  KC_MPLY,  KC_MUTE, KC_VOLD, KC_VOLU, TG(_SUPERDUPER),                   ______,               ______,              ______,  ______,  ______,  ______,
-        ______,  ______,       ______,                      ______,                                               ______,  ______,  ______,  ______,      ______,  ______,  ______,     ______,           ______
+        _______,               _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______,
+        _______, _______,      _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     KC_MPLY, KC_MNXT, KC_VOLU,    _______, _______, _______, _______,
+        _______, DF(_QWERTY),  _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     KC_MSTP, KC_MPRV, KC_VOLD,    _______, _______, _______, _______,
+        _______, _______,      _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______,                   _______,                                   _______, _______, _______,
+        _______, _______,      _______, DF(_CKO),  _______, _______, KC_MPLY,  KC_MUTE, KC_VOLD, KC_VOLU, TG(_SUPERDUPER),                   _______,              _______,             _______, _______, _______, _______,
+        _______, _______,      _______,                     _______,                                              _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
     )
 
 /* Empty layout for future reference
@@ -163,12 +163,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  /*
   *  [_EMPTY] = LAYOUT_fullsize_ansi(
-  *      ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,               ______,  ______,  ______,
-  *      ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-  *      ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-  *      ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                    ______,                                    ______,  ______,  ______,
-  *      ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                             ______,               ______,              ______,  ______,  ______,  ______,
-  *      ______,  ______,  ______,                    ______,                                               ______,  ______,  ______,  ______,      ______,  ______,  ______,     ______,           ______
+  *      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______,
+  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
+  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
+  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,                                   _______, _______, _______,
+  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,              _______,             _______, _______, _______, _______,
+  *      _______, _______, _______,                   _______,                                              _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
   *  ),
  */
 };
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
index fc9ebfa15d..67e1075654 100644
--- a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
@@ -55,13 +55,13 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
     LAYOUT_all(
-                      ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
-    ______,           ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,             ______,______,______,    ______,______,______,______,    ______,
-    KC_GRV,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, ______, ______, ______,  ______,  ______, ______,  ______, ______, ______,         ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    ______,  KC_MUTE, KC_VOLD, KC_MPLY, ______, ______, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT, ______, ______,         ______, ______,                              ______,______,______,______,    ______,______,
-    ______,  ______,  ______, ______,   ______, ______, ______,  ______,  ______, ______,  ______, ______,         ______, ______,            ______,           ______,______,______,______,    ______,______,
-    ______,  ______,  ______, ______,   ______,         ______,           ______, ______,  ______, ______, ______, ______, QK_BOOT,    ______,______,______,    ______,       ______,______,    ______,______
+                      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,   _______, _______, _______, _______,   _______,
+    KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,   _______, _______, _______, _______,   _______, _______,
+    KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______,   _______, _______, _______, _______,   _______, _______,
+    _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______, _______,                                 _______, _______, _______, _______,   _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,             _______,            _______, _______, _______, _______,   _______, _______,
+    _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, QK_BOOT,    _______, _______, _______,   _______,          _______, _______,   _______, _______
     ),
 };
 
diff --git a/keyboards/converter/usb_usb/keymaps/default/keymap.c b/keyboards/converter/usb_usb/keymaps/default/keymap.c
index 51a7a179af..36d5cd8780 100644
--- a/keyboards/converter/usb_usb/keymaps/default/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/default/keymap.c
@@ -46,12 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
     [1] = LAYOUT_all(
-                      ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
-    ______,           ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,             ______,______,______,    ______,______,______,______,    ______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______,         ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______,         ______, ______,                              ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______,         ______, ______,            ______,           ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______,         ______,           ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,       ______,______,    ______,______
+                      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______,    _______, _______, _______, _______,    _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,    _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  _______, _______, _______,    _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,                                _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,           _______,             _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,    _______,          _______, _______,    _______, _______
     ),
 };
diff --git a/keyboards/converter/usb_usb/keymaps/narze/config.h b/keyboards/converter/usb_usb/keymaps/narze/config.h
index 9ab1637306..fddd9cd376 100644
--- a/keyboards/converter/usb_usb/keymaps/narze/config.h
+++ b/keyboards/converter/usb_usb/keymaps/narze/config.h
@@ -26,7 +26,6 @@
 #define COMBO_TERM 20
 #define COMBO_COUNT 1
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 
 #define SUPER_DUPER_SOUND S__NOTE(_B1)
diff --git a/keyboards/converter/usb_usb/keymaps/narze/keymap.c b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
index 78faa7975e..7b1b0ec445 100644
--- a/keyboards/converter/usb_usb/keymaps/narze/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
@@ -76,13 +76,13 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     KC_LCTL, KC_LALT, GUI_UNDS,KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_BSPC, KC_RALT, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
     [_SUPERDUPER] = LAYOUT_all(
-                      ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
-    QK_BOOT,          ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,             ______,______,______,    ______,______,______,______,    ______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  BRWS_L, BRWS_R, ______, ______, ______,         ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    KC_SPC, KC_LALT, _______, _______, KC_BSPC,KC_LGUI,KC_LEFT, KC_DOWN,   KC_UP,KC_RGHT,  KC_DEL, ______,         ______, ______,                              ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______,         ______, ______,            ______,           ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______,         KC_LSFT,           ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,       ______,______,    ______,______
+                      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,   _______, _______, _______, _______,    _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,   _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, BRWS_L,  BRWS_R,  _______, _______, _______,          _______,    _______, _______, _______,   _______, _______, _______, _______,    _______, _______,
+    KC_SPC,  KC_LALT, _______, _______, KC_BSPC, KC_LGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DEL,  _______,          _______, _______,                                 _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,             _______,            _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______,          KC_LSFT,          _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,   _______,          _______, _______,    _______, _______
     ),
 };
 
diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.c b/keyboards/converter/usb_usb/pro_micro/pro_micro.c
deleted file mode 100644
index f10142f81a..0000000000
--- a/keyboards/converter/usb_usb/pro_micro/pro_micro.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "pro_micro.h"
diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.h b/keyboards/converter/usb_usb/pro_micro/pro_micro.h
deleted file mode 100644
index 3351176047..0000000000
--- a/keyboards/converter/usb_usb/pro_micro/pro_micro.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "usb_usb.h"
diff --git a/keyboards/converter/usb_usb/usb_usb.c b/keyboards/converter/usb_usb/usb_usb.c
deleted file mode 100644
index e8f224ad46..0000000000
--- a/keyboards/converter/usb_usb/usb_usb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "usb_usb.h"
diff --git a/keyboards/converter/usb_usb/usb_usb.h b/keyboards/converter/usb_usb/usb_usb.h
deleted file mode 100644
index bcd8b52974..0000000000
--- a/keyboards/converter/usb_usb/usb_usb.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
-Copyright 2017 Balz Guenat <balz.guenat@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_converter_usb_usb_ble)
-#    include "ble.h"
-#elif defined(KEYBOARD_converter_usb_usb_hasu)
-#    include "hasu.h"
-#elif defined(KEYBOARD_converter_usb_usb_pro_micro)
-#    include "pro_micro.h"
-#endif
-
-#define XXX KC_NO
-
-#define ______ KC_TRNS
-
-/*         ,---------------. ,---------------. ,---------------.
- *         |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
- * ,---.   |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------.
- * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | Help  |
- * `---'   `---------------' `---------------' `---------------' `-----------' `---------------' `-------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------. ,-------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -| |Stp|Agn|
- * |-----------------------------------------------------------| |-----------| |---------------| |-------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +| |Mnu|Und|
- * |-----------------------------------------------------------| `-----------' |---------------| |-------|
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  #|Retn|               |  4|  5|  6|KP,| |Sel|Cpy|
- * |-----------------------------------------------------------|     ,---.     |---------------| |-------|
- * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /| RO|Shift |     |Up |     |  1|  2|  3|KP=| |Exe|Pst|
- * |-----------------------------------------------------------| ,-----------. |---------------| |-------|
- * |Ctl|Gui|Alt|MHEN|HNJ| Space  |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent| |Fnd|Cut|
- * `-----------------------------------------------------------' `-----------' `---------------' `-------'
- *
- *
- * App:         Windows Menu key
- * Gui:         Windows key, Mac ⌘ key or Meta key
- *
- * Pwr:         Power for Unix and Mac
- * VDn,Vup,Mut: Volume control for Unix and Mac
- * Stp,Agn..:   for Unix
- *
- * KP,:         Brazilian Keypad Comma
- * KP=:         Keypad = for Mac
- * <,#:         ISO keys(UK legend)
- * JPY:         Japanese Yen(ï¿¥)
- * RO:          Japanese � or Brazilian /
- * MHEN:        Japanese 無変� Non Conversion
- * HENK:        Japanese 変� Conversion
- * KANA:        Japanese �� Hiragana/Katakana
- *              https://en.wikipedia.org/wiki/Keyboard_layout#Japanese
- * H/E:         Korean 한/� Hangul/English
- * HNJ:         Korean 한� Hanja
- *              https://en.wikipedia.org/wiki/Keyboard_layout#Hangul_.28for_Korean.29
- *
- * TODO: use same keycode to pass through instead of KC_NO?
- */
-#define LAYOUT_all( \
-              k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k70, k71, k72, k73, \
-    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,       k46, k47, k48,  k81, k80, k7F, k66,  k75, \
-\
-    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k89, k2A,  k49, k4A, k4B,  k53, k54, k55, k56,  k78, k79, \
-    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k31,       k4C, k4D, k4E,  k5F, k60, k61, k57,  k76, k7A, \
-    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32, k28,                       k5C, k5D, k5E, k85,  k77, k7C, \
-    kE1, k64, k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38, k87, kE5,            k52,       k59, k5A, k5B, k67,  k74, k7D, \
-    kE0, kE3, kE2, k8B, k91,      k2C, k90, k8A, k88, kE6, kE7, k65, kE4,       k50, k51, k4F,  k62,      k63, k58,  k7E, k7B \
-) { \
-    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F }, \
-    { k80, k81, XXX, XXX, XXX, k85, XXX, k87, k88, k89, k8A, k8B, XXX, XXX, XXX, XXX }, \
-    { k90, k91, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-/* ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
- * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
- * `---'   `---------------' `---------------' `---------------' `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|    Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +|
- * |-----------------------------------------------------------| `-----------' |-----------|   |
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return|               |  4|  5|  6|  +|
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |     |Up |     |  1|  2|  3|   |
- * |-----------------------------------------------------------| ,-----------. |-----------|   |
- * |Ctl|Gui|Alt|           Space               |Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|Ent|
- * `-----------------------------------------------------------' `-----------' `---------------'
- */
-#define LAYOUT_fullsize_ansi( \
-    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,  k46, k47, k48, \
-\
-    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k2A,  k49, k4A, k4B,  k53, k54, k55, k56, \
-    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k31,  k4C, k4D, k4E,  k5F, k60, k61, k57, \
-    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34,      k28,                  k5C, k5D, k5E, \
-    kE1,      k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38,      kE5,       k52,       k59, k5A, k5B, k58, \
-    kE0, kE3, kE2,                k2C,                kE6, kE7, k65, kE4,  k50, k51, k4F,  k62,      k63 \
-) { \
-    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, XXX, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
-    { k60, k61, k62, k63, XXX, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-/* ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
- * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
- * `---'   `---------------' `---------------' `---------------' `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|    Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| Retn| |Del|End|PgD| |  7|  8|  9|  +|
- * |------------------------------------------------------`    | `-----------' |-----------|   |
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  #|    |               |  4|  5|  6|   |
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |     |Up |     |  1|  2|  3|Ent|
- * |-----------------------------------------------------------| ,-----------. |-----------|   |
- * |Ctl|Gui|Alt|           Space               |Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|   |
- * `-----------------------------------------------------------' `-----------' `---------------'
- */
-#define LAYOUT_fullsize_iso( \
-    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,  k46, k47, k48, \
-\
-    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k2A,  k49, k4A, k4B,  k53, k54, k55, k56, \
-    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30,       k4C, k4D, k4E,  k5F, k60, k61, k57, \
-    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32, k28,                  k5C, k5D, k5E, \
-    kE1, k64, k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38,      kE5,       k52,       k59, k5A, k5B, k58, \
-    kE0, kE3, kE2,                k2C,                kE6, kE7, k65, kE4,  k50, k51, k4F,  k62,      k63 \
-) { \
-    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
-    { k60, k61, k62, k63, k64, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-/* ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
- * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
- * `---'   `---------------' `---------------' `---------------' `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  ^|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  @|  [| Retn| |Del|End|PgD| |  7|  8|  9|  +|
- * |------------------------------------------------------`    | `-----------' |-----------|   |
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  ]|    |               |  4|  5|  6|   |
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * |Shft    |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /| RO|Shift |     |Up |     |  1|  2|  3|Ent|
- * |-----------------------------------------------------------| ,-----------. |-----------|   |
- * |Ctl|Gui|Alt|MHEN|      Space      |HENK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|   |
- * `-----------------------------------------------------------' `-----------' `---------------'
- */
-#define LAYOUT_fullsize_jis( \
-    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,       k46, k47, k48, \
-\
-    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k89, k2A,  k49, k4A, k4B,  k53, k54, k55, k56, \
-    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30,            k4C, k4D, k4E,  k5F, k60, k61, k57, \
-    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32, k28,                       k5C, k5D, k5E, \
-    kE1,      k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38, k87, kE5,            k52,       k59, k5A, k5B, k58, \
-    kE0, kE3, kE2, k8B,      k2C,           k8A, k88, kE6, kE7, k65, kE4,       k50, k51, k4F,  k62,      k63 \
-) { \
-    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
-    { k60, k61, k62, k63, XXX, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k87, k88, k89, k8A, k8B, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/converter/xmk/xmk.c b/keyboards/converter/xmk/xmk.c
index a0426e95dc..e0df96fc2d 100644
--- a/keyboards/converter/xmk/xmk.c
+++ b/keyboards/converter/xmk/xmk.c
@@ -3,7 +3,7 @@
 
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #if defined (XMK_DEBUG)
 void keyboard_post_init_kb(void) {
diff --git a/keyboards/converter/xmk/xmk_matrix.c b/keyboards/converter/xmk/xmk_matrix.c
index 7327ad5cfe..41eca9fe46 100644
--- a/keyboards/converter/xmk/xmk_matrix.c
+++ b/keyboards/converter/xmk/xmk_matrix.c
@@ -4,6 +4,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "xmk_matrix.h"
+#include "matrix.h"
+#include "debug.h"
 
 bool xmk_changed = false;
 matrix_row_t xmk_rows[MATRIX_ROWS];
diff --git a/keyboards/converter/xmk/xmk_matrix.h b/keyboards/converter/xmk/xmk_matrix.h
index 45514dea04..2a988253f9 100644
--- a/keyboards/converter/xmk/xmk_matrix.h
+++ b/keyboards/converter/xmk/xmk_matrix.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
-#include QMK_KEYBOARD_H
+#include <stdbool.h>
+#include <stdint.h>
 
 void xmk_matrix_key(bool press, uint8_t key);
diff --git a/keyboards/converter/xt_usb/xt_usb.c b/keyboards/converter/xt_usb/xt_usb.c
deleted file mode 100644
index 88acee0b0f..0000000000
--- a/keyboards/converter/xt_usb/xt_usb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "xt_usb.h"
diff --git a/keyboards/cool836a/config.h b/keyboards/cool836a/config.h
index 1010646969..886f8a69f1 100644
--- a/keyboards/cool836a/config.h
+++ b/keyboards/cool836a/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, B5, B4, F4, B1, B6 }
-#define MATRIX_COL_PINS { F5, D0, B2, C6, D7, E6 }
-
-/* COL2ROW, ROW2COL */
-//#define DIODE_DIRECTION COL2ROW
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cool836a/cool836a.c b/keyboards/cool836a/cool836a.c
deleted file mode 100644
index 5795bf9546..0000000000
--- a/keyboards/cool836a/cool836a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ohashi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "cool836a.h"
diff --git a/keyboards/cool836a/info.json b/keyboards/cool836a/info.json
index e2488c43e0..bcdbbef97c 100644
--- a/keyboards/cool836a/info.json
+++ b/keyboards/cool836a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D0", "B2", "C6", "D7", "E6"],
+        "rows": ["D1", "B5", "B4", "F4", "B1", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.c b/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.c
deleted file mode 100755
index aab96c9388..0000000000
--- a/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 mini-ninja-64
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "click_pad_v1.h"
diff --git a/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.h b/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.h
deleted file mode 100755
index a5a8d9d699..0000000000
--- a/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2019 mini-ninja-64
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( k00 ) { { k00 } }
\ No newline at end of file
diff --git a/keyboards/copenhagen_click/click_pad_v1/config.h b/keyboards/copenhagen_click/click_pad_v1/config.h
index 2f30b0bb1c..970e69e7f6 100755
--- a/keyboards/copenhagen_click/click_pad_v1/config.h
+++ b/keyboards/copenhagen_click/click_pad_v1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7 }
-#define MATRIX_COL_PINS { F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/copenhagen_click/click_pad_v1/info.json b/keyboards/copenhagen_click/click_pad_v1/info.json
index f6abac2e6a..213425abc0 100755
--- a/keyboards/copenhagen_click/click_pad_v1/info.json
+++ b/keyboards/copenhagen_click/click_pad_v1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5"],
+        "rows": ["F7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5",
         "breathing": true
@@ -16,7 +21,9 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}]
+            "layout": [
+                {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0}
+            ]
         }
     }
 }
diff --git a/keyboards/coseyfannitutti/discipad/config.h b/keyboards/coseyfannitutti/discipad/config.h
index 0f304c68b5..edcaedfb79 100644
--- a/keyboards/coseyfannitutti/discipad/config.h
+++ b/keyboards/coseyfannitutti/discipad/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
-#define MATRIX_ROW_PINS { B1, B0, D7, D6, D4 }
-#define MATRIX_COL_PINS { C0, C1, C2, C3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/coseyfannitutti/discipad/discipad.c b/keyboards/coseyfannitutti/discipad/discipad.c
deleted file mode 100644
index 4bdb1c6c20..0000000000
--- a/keyboards/coseyfannitutti/discipad/discipad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 coseyfannitutti
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "discipad.h"
diff --git a/keyboards/coseyfannitutti/discipad/discipad.h b/keyboards/coseyfannitutti/discipad/discipad.h
deleted file mode 100644
index 5ce8b46342..0000000000
--- a/keyboards/coseyfannitutti/discipad/discipad.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 coseyfannitutti
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define _x_ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_numpad_5x4( \
-  K00, K01, K02, K03, \
-  K10, K11, K12,      \
-  K20, K21, K22, K23, \
-  K30, K31, K32,      \
-  K40,      K42, K43  \
-) { \
-{ K00, K01, K02, K03, }, \
-{ K10, K11, K12, _x_, }, \
-{ K20, K21, K22, K23, }, \
-{ K30, K31, K32, _x_, }, \
-{ K40, _x_, K42, K43, }, \
-}
-
diff --git a/keyboards/coseyfannitutti/discipad/info.json b/keyboards/coseyfannitutti/discipad/info.json
index ac3d9a07c5..d7291698b3 100644
--- a/keyboards/coseyfannitutti/discipad/info.json
+++ b/keyboards/coseyfannitutti/discipad/info.json
@@ -8,11 +8,38 @@
         "pid": "0x1769",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3"],
+        "rows": ["B1", "B0", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "layouts": {
         "LAYOUT_numpad_5x4": {
-            "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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": [2, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/coseyfannitutti/discipline/config.h b/keyboards/coseyfannitutti/discipline/config.h
index e91656f198..d43ae80cb9 100644
--- a/keyboards/coseyfannitutti/discipline/config.h
+++ b/keyboards/coseyfannitutti/discipline/config.h
@@ -16,24 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B2, A1, B1, A0, B0 }
-#define MATRIX_COL_PINS { A2, B3, A3, B4, A4, D5, D6, C6, C5, C4, C3, C2, C1, C0, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/coseyfannitutti/discipline/discipline.c b/keyboards/coseyfannitutti/discipline/discipline.c
deleted file mode 100644
index 50ba0bae54..0000000000
--- a/keyboards/coseyfannitutti/discipline/discipline.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 coseyfannitutti
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "discipline.h"
diff --git a/keyboards/coseyfannitutti/discipline/discipline.h b/keyboards/coseyfannitutti/discipline/discipline.h
deleted file mode 100644
index ebfebfe382..0000000000
--- a/keyboards/coseyfannitutti/discipline/discipline.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Copyright 2019 coseyfannitutti
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A,      K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, _x_, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_ansi_wkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,                K46,           K49, K4A,      K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, _x_, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_ansi_lwkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso_blocker( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A,      K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, _x_, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso_wkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,                K46,           K49, K4A,      K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, _x_, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso_lwkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/info.json
index aa1afd9fcc..e699bc0a46 100644
--- a/keyboards/coseyfannitutti/discipline/info.json
+++ b/keyboards/coseyfannitutti/discipline/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6869",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7"],
+        "rows": ["B2", "A1", "B1", "A0", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "layout_aliases": {
@@ -22,606 +27,606 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.5},
-                {"x":11.5, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_wkl": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4, "w":1.5},
-                {"x":3, "y":4, "w":7},
-                {"x":10, "y":4, "w":1.5},
-                {"x":11.5, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_lwkl": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4, "w":1.5},
-                {"x":3, "y":4, "w":7},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.5},
-                {"x":11.5, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_wkl": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4, "w":1.5},
-                {"x":3, "y":4, "w":7},
-                {"x":10, "y":4, "w":1.5},
-                {"x":11.5, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_lwkl": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4, "w":1.5},
-                {"x":3, "y":4, "w":7},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h
index 5ee6b135fc..760c1645b0 100644
--- a/keyboards/coseyfannitutti/mullet/config.h
+++ b/keyboards/coseyfannitutti/mullet/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, B0, F0, F1 }
-#define MATRIX_COL_PINS { B2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/coseyfannitutti/mullet/info.json b/keyboards/coseyfannitutti/mullet/info.json
index 8bdb22f18d..5e645373a3 100644
--- a/keyboards/coseyfannitutti/mullet/info.json
+++ b/keyboards/coseyfannitutti/mullet/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6969",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3"],
+        "rows": ["D0", "D1", "B0", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/coseyfannitutti/mullet/mullet.c b/keyboards/coseyfannitutti/mullet/mullet.c
deleted file mode 100644
index 18445a6c93..0000000000
--- a/keyboards/coseyfannitutti/mullet/mullet.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 COSEYFANNITUTTI
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mullet.h"
diff --git a/keyboards/coseyfannitutti/mulletpad/config.h b/keyboards/coseyfannitutti/mulletpad/config.h
deleted file mode 100644
index 6cd992c919..0000000000
--- a/keyboards/coseyfannitutti/mulletpad/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2019 COSEYFANNITUTTI
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4, F1, F5, F6, F7 }
-#define MATRIX_COL_PINS { F0, C7, C6, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/coseyfannitutti/mulletpad/info.json b/keyboards/coseyfannitutti/mulletpad/info.json
index be3ef711cc..454e2d2bec 100644
--- a/keyboards/coseyfannitutti/mulletpad/info.json
+++ b/keyboards/coseyfannitutti/mulletpad/info.json
@@ -8,12 +8,39 @@
         "pid": "0x6666",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "C7", "C6", "B6"],
+        "rows": ["F4", "F1", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
-            "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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": [2, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/coseyfannitutti/mulletpad/mulletpad.c b/keyboards/coseyfannitutti/mulletpad/mulletpad.c
deleted file mode 100644
index 72bb19c303..0000000000
--- a/keyboards/coseyfannitutti/mulletpad/mulletpad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 COSEYFANNITUTTI
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mulletpad.h"
diff --git a/keyboards/coseyfannitutti/mulletpad/mulletpad.h b/keyboards/coseyfannitutti/mulletpad/mulletpad.h
deleted file mode 100644
index 41c5c014a9..0000000000
--- a/keyboards/coseyfannitutti/mulletpad/mulletpad.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 COSEYFANNITUTTI
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define _x_ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_numpad_5x4( \
-  K00, K01, K02, K03, \
-  K10, K11, K12,      \
-  K20, K21, K22, K23, \
-  K30, K31, K32,      \
-  K40,      K42, K43  \
-) { \
-{ K00, K01, K02, K03, }, \
-{ K10, K11, K12, _x_, }, \
-{ K20, K21, K22, K23, }, \
-{ K30, K31, K32, _x_, }, \
-{ K40, _x_, K42, K43, }, \
-}
diff --git a/keyboards/coseyfannitutti/mysterium/config.h b/keyboards/coseyfannitutti/mysterium/config.h
index 2c9c5629cf..0acee7345a 100644
--- a/keyboards/coseyfannitutti/mysterium/config.h
+++ b/keyboards/coseyfannitutti/mysterium/config.h
@@ -16,24 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                         0   1   2   3   4  5   6   7   8   9   10  11  12  13  14  15  16  17*/
-#define MATRIX_ROW_PINS { C2, C3, C7, C4, C6, C5 }
-#define MATRIX_COL_PINS { A0, B0, A1, B1, A2, B2, A3, B3, A4, B4, A5, A6, A7, D6, D5, D1, D0, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/info.json
index f89161a596..74813fc232 100644
--- a/keyboards/coseyfannitutti/mysterium/info.json
+++ b/keyboards/coseyfannitutti/mysterium/info.json
@@ -8,21 +8,430 @@
         "pid": "0x8769",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "B4", "A5", "A6", "A7", "D6", "D5", "D1", "D0", "D7"],
+        "rows": ["C2", "C3", "C7", "C4", "C6", "C5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.25, "w":1.25}, {"label":"Fn", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_ansi_7u": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":1.5, "y":5.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Fn", "x":12.5, "y":5.25}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso": {
-            "layout": [{"x":0, "y":0.25}, {"x":2, "y":0.25}, {"x":3, "y":0.25}, {"x":4, "y":0.25}, {"x":5, "y":0.25}, {"x":6.5, "y":0.25}, {"x":7.5, "y":0.25}, {"x":8.5, "y":0.25}, {"x":9.5, "y":0.25}, {"x":11, "y":0.25}, {"x":12, "y":0.25}, {"x":13, "y":0.25}, {"x":14, "y":0.25}, {"x":15.25, "y":0.25}, {"x":16.25, "y":0.25}, {"x":17.25, "y":0.25}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 16], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 11], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso_7u": {
-            "layout": [{"x":0, "y":0.25}, {"x":2, "y":0.25}, {"x":3, "y":0.25}, {"x":4, "y":0.25}, {"x":5, "y":0.25}, {"x":6.5, "y":0.25}, {"x":7.5, "y":0.25}, {"x":8.5, "y":0.25}, {"x":9.5, "y":0.25}, {"x":11, "y":0.25}, {"x":12, "y":0.25}, {"x":13, "y":0.25}, {"x":14, "y":0.25}, {"x":15.25, "y":0.25}, {"x":16.25, "y":0.25}, {"x":17.25, "y":0.25}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 16], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 11], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/coseyfannitutti/mysterium/mysterium.c b/keyboards/coseyfannitutti/mysterium/mysterium.c
deleted file mode 100644
index 4bfbd844c1..0000000000
--- a/keyboards/coseyfannitutti/mysterium/mysterium.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 coseyfannitutti
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mysterium.h"
\ No newline at end of file
diff --git a/keyboards/coseyfannitutti/mysterium/mysterium.h b/keyboards/coseyfannitutti/mysterium/mysterium.h
deleted file mode 100644
index aa2e2b18da..0000000000
--- a/keyboards/coseyfannitutti/mysterium/mysterium.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2019 coseyfannitutti
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,           K4D,           K4G,      \
-	K50, K51, K52,                K56,           K59, K5A,      K5C,      K5E, K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, _x_, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
-
-#define LAYOUT_tkl_ansi_7u( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,           K4D,           K4G,      \
-    K50, K51, K52,                K56,                K5A,      K5C,      K5E, K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, _x_, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                     \
-    K40, K01, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4G,      \
-    K50, K51, K52,                K56,           K59, K5A,      K5C,      K5E, K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K01, _x_, K4D, _x_, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
-
-#define LAYOUT_tkl_iso_7u( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K2D,                     \
-    K40, K01, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4G,      \
-    K50, K51, K52,                K56,                K5A,      K5C,      K5E, K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K01, _x_, K4D, _x_, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
diff --git a/keyboards/coseyfannitutti/romeo/config.h b/keyboards/coseyfannitutti/romeo/config.h
index ea75f82f4b..31a3fe8cb0 100644
--- a/keyboards/coseyfannitutti/romeo/config.h
+++ b/keyboards/coseyfannitutti/romeo/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
-/*                        0   1   2   3   4   5   6   7   8   9  10  11*/
-#define MATRIX_ROW_PINS { B1, B4, B3, B2 }
-#define MATRIX_COL_PINS { C5, C4, C3, D0, C2, D1, C1, C0, D4, B0, D7, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/coseyfannitutti/romeo/info.json b/keyboards/coseyfannitutti/romeo/info.json
index a2dbb61486..e42a0206e4 100644
--- a/keyboards/coseyfannitutti/romeo/info.json
+++ b/keyboards/coseyfannitutti/romeo/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4069",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C5", "C4", "C3", "D0", "C2", "D1", "C1", "C0", "D4", "B0", "D7", "D6"],
+        "rows": ["B1", "B4", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "layouts": {
diff --git a/keyboards/coseyfannitutti/romeo/romeo.c b/keyboards/coseyfannitutti/romeo/romeo.c
deleted file mode 100644
index 696a764070..0000000000
--- a/keyboards/coseyfannitutti/romeo/romeo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 coseyfannitutti
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "romeo.h"
diff --git a/keyboards/cosmo65/config.h b/keyboards/cosmo65/config.h
index b8131f5d7d..c97f9dbac4 100644
--- a/keyboards/cosmo65/config.h
+++ b/keyboards/cosmo65/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see http://www.gnu.org/licenses/.
 
 
 /* RGB Lighting */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -27,8 +26,3 @@ along with this program.  If not, see http://www.gnu.org/licenses/.
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
-
-/* keyboard matrix assignments */
-#define MATRIX_ROW_PINS { D5, D0, F0, F5, F4 }
-#define MATRIX_COL_PINS { E6, D4, D6, D7, B4, B5, B6, C6, C7, D1, D2, D3, F1, F6 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cosmo65/info.json b/keyboards/cosmo65/info.json
index a0bd7ed6e4..7495f06594 100644
--- a/keyboards/cosmo65/info.json
+++ b/keyboards/cosmo65/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6331",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D1", "D2", "D3", "F1", "F6"],
+        "rows": ["D5", "D0", "F0", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
@@ -70,7 +78,7 @@
                 { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
                 { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
                 { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "matrix": [4, 3], "w": 1, "x": 1.25, "y": 3 },
+                { "matrix": [4, 3], "x": 1.25, "y": 3 },
                 { "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4 },
                 { "matrix": [4, 5], "w": 1.25, "x": 6.5, "y": 4 },
                 { "matrix": [4, 6], "w": 2.25, "x": 7.75, "y": 4 },
diff --git a/keyboards/cozykeys/bloomer/bloomer.c b/keyboards/cozykeys/bloomer/bloomer.c
deleted file mode 100644
index b8612504b1..0000000000
--- a/keyboards/cozykeys/bloomer/bloomer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "bloomer.h"
diff --git a/keyboards/cozykeys/bloomer/bloomer.h b/keyboards/cozykeys/bloomer/bloomer.h
deleted file mode 100644
index f85b80889f..0000000000
--- a/keyboards/cozykeys/bloomer/bloomer.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#if defined(KEYBOARD_cozykeys_bloomer_v2)
-    #include "v2.h"
-#elif defined(KEYBOARD_cozykeys_bloomer_v3)
-    #include "v3.h"
-#endif
diff --git a/keyboards/cozykeys/bloomer/config.h b/keyboards/cozykeys/bloomer/config.h
index 3e13941d50..7bd53ef0bd 100644
--- a/keyboards/cozykeys/bloomer/config.h
+++ b/keyboards/cozykeys/bloomer/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Enable RGB backlight
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D7
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/cozykeys/bloomer/info.json b/keyboards/cozykeys/bloomer/info.json
index ed0bb78867..96db04787e 100644
--- a/keyboards/cozykeys/bloomer/info.json
+++ b/keyboards/cozykeys/bloomer/info.json
@@ -6,5 +6,8 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x1191"
+    },
+    "ws2812": {
+        "pin": "D7"
     }
 }
diff --git a/keyboards/cozykeys/bloomer/v2/config.h b/keyboards/cozykeys/bloomer/v2/config.h
deleted file mode 100644
index 214d5d549b..0000000000
--- a/keyboards/cozykeys/bloomer/v2/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 }
-#define DIODE_DIRECTION COL2ROW
-
diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/info.json
index e1963db040..daa2e87807 100644
--- a/keyboards/cozykeys/bloomer/v2/info.json
+++ b/keyboards/cozykeys/bloomer/v2/info.json
@@ -2,12 +2,17 @@
   "usb": {
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B4", "C6", "E6", "B5", "B6", "B7", "D6", "C7"],
+    "rows": ["D0", "D1", "D3", "D2", "D4", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k00", "x":  0.868, "y":   0.0, "r":  10 },
+        { "label": "k00", "x":  0.868, "y":     0, "r":  10 },
         { "label": "k01", "x":  1.853, "y": 0.174, "r":  10 },
         { "label": "k02", "x":  2.856, "y": 0.244, "r":  10 },
         { "label": "k03", "x":  3.896, "y": 0.107, "r":  10 },
@@ -21,7 +26,7 @@
         { "label": "k11", "x": 12.166, "y": 0.107, "r": -10 },
         { "label": "k12", "x": 13.196, "y": 0.192, "r": -10 },
         { "label": "k13", "x": 14.208, "y": 0.174, "r": -10 },
-        { "label": "k14", "x": 15.193, "y":   0.0, "r": -10 },
+        { "label": "k14", "x": 15.193, "y":     0, "r": -10 },
         { "label": "k15", "x":  0.695, "y": 0.985, "r":  10 },
         { "label": "k16", "x":  1.679, "y": 1.158, "r":  10 },
         { "label": "k17", "x":  2.682, "y": 1.229, "r":  10 },
@@ -79,7 +84,7 @@
         { "label": "k69", "x": 13.891, "y": 4.131, "r": -10 },
         { "label": "k70", "x": 14.903, "y": 4.113, "r": -10 },
         { "label": "k71", "x": 15.888, "y": 3.939, "r": -10 },
-        { "label": "k72", "x":    0.0, "y": 4.924, "r":  10 },
+        { "label": "k72", "x":      0, "y": 4.924, "r":  10 },
         { "label": "k73", "x":  0.985, "y": 5.098, "r":  10 },
         { "label": "k74", "x":  1.988, "y": 5.168, "r":  10 },
         { "label": "k75", "x":  3.027, "y": 5.031, "r":  10 },
diff --git a/keyboards/cozykeys/bloomer/v2/v2.c b/keyboards/cozykeys/bloomer/v2/v2.c
deleted file mode 100644
index 47dd093734..0000000000
--- a/keyboards/cozykeys/bloomer/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "v2.h"
diff --git a/keyboards/cozykeys/bloomer/v3/config.h b/keyboards/cozykeys/bloomer/v3/config.h
deleted file mode 100644
index 214d5d549b..0000000000
--- a/keyboards/cozykeys/bloomer/v3/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 }
-#define DIODE_DIRECTION COL2ROW
-
diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/info.json
index 8540b0878e..a7ceb820c8 100644
--- a/keyboards/cozykeys/bloomer/v3/info.json
+++ b/keyboards/cozykeys/bloomer/v3/info.json
@@ -2,12 +2,17 @@
   "usb": {
     "device_version": "0.0.3"
   },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B4", "C6", "E6", "B5", "B6", "B7", "D6", "C7"],
+    "rows": ["D0", "D1", "D3", "D2", "D4", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k00", "x":  0.868, "y":   0.0, "r":  10 },
+        { "label": "k00", "x":  0.868, "y":     0, "r":  10 },
         { "label": "k01", "x":  1.853, "y": 0.174, "r":  10 },
         { "label": "k02", "x":  2.856, "y": 0.244, "r":  10 },
         { "label": "k03", "x":  3.896, "y": 0.107, "r":  10 },
@@ -18,7 +23,7 @@
         { "label": "k08", "x": 12.376, "y": 0.107, "r": -10 },
         { "label": "k09", "x": 13.406, "y": 0.192, "r": -10 },
         { "label": "k10", "x": 14.418, "y": 0.174, "r": -10 },
-        { "label": "k11", "x": 15.403, "y":   0.0, "r": -10 },
+        { "label": "k11", "x": 15.403, "y":     0, "r": -10 },
         { "label": "k12", "x":  0.695, "y": 0.985, "r":  10 },
         { "label": "k13", "x":  1.679, "y": 1.158, "r":  10 },
         { "label": "k14", "x":  2.682, "y": 1.229, "r":  10 },
@@ -80,7 +85,7 @@
         { "label": "k70", "x": 14.101, "y": 4.131, "r": -10 },
         { "label": "k71", "x": 15.113, "y": 4.113, "r": -10 },
         { "label": "k72", "x": 16.098, "y": 3.939, "r": -10 },
-        { "label": "k73", "x":    0.0, "y": 4.924, "r":  10 },
+        { "label": "k73", "x":      0, "y": 4.924, "r":  10 },
         { "label": "k74", "x":  0.985, "y": 5.098, "r":  10 },
         { "label": "k75", "x":  1.988, "y": 5.168, "r":  10 },
         { "label": "k76", "x":  3.027, "y": 5.031, "r":  10 },
diff --git a/keyboards/cozykeys/bloomer/v3/v3.c b/keyboards/cozykeys/bloomer/v3/v3.c
deleted file mode 100644
index 080cacd791..0000000000
--- a/keyboards/cozykeys/bloomer/v3/v3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "v3.h"
diff --git a/keyboards/cozykeys/speedo/speedo.c b/keyboards/cozykeys/speedo/speedo.c
deleted file mode 100644
index 852459f8c6..0000000000
--- a/keyboards/cozykeys/speedo/speedo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "speedo.h"
diff --git a/keyboards/cozykeys/speedo/speedo.h b/keyboards/cozykeys/speedo/speedo.h
deleted file mode 100644
index 2a2adff423..0000000000
--- a/keyboards/cozykeys/speedo/speedo.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#ifdef KEYBOARD_cozykeys_speedo_v2
-    #include "v2.h"
-#elif KEYBOARD_cozykeys_speedo_v3
-    #include "v3.h"
-#endif
diff --git a/keyboards/cozykeys/speedo/v2/config.h b/keyboards/cozykeys/speedo/v2/config.h
index 6752b3934a..2643e4de4a 100644
--- a/keyboards/cozykeys/speedo/v2/config.h
+++ b/keyboards/cozykeys/speedo/v2/config.h
@@ -16,12 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { D1, D2, D3, C6, C7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, D0, B7, B3, B2, B1, B0 }
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 // Locking resynchronize hack
diff --git a/keyboards/cozykeys/speedo/v2/info.json b/keyboards/cozykeys/speedo/v2/info.json
index 6527ed1257..ddeec48844 100644
--- a/keyboards/cozykeys/speedo/v2/info.json
+++ b/keyboards/cozykeys/speedo/v2/info.json
@@ -8,12 +8,17 @@
     "pid": "0x1192",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "D0", "B7", "B3", "B2", "B1", "B0"],
+    "rows": ["D1", "D2", "D3", "C6", "C7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k01", "x":  0.693, "y":   0.0, "r":  10 },
+        { "label": "k01", "x":  0.693, "y":     0, "r":  10 },
         { "label": "k02", "x":  1.675, "y": 0.173, "r":  10 },
         { "label": "k03", "x":  2.685, "y": 0.191, "r":  10 },
         { "label": "k04", "x":  3.712, "y": 0.106, "r":  10 },
@@ -24,7 +29,7 @@
         { "label": "k09", "x":  9.435, "y": 0.106, "r": -10 },
         { "label": "k10", "x": 10.463, "y": 0.191, "r": -10 },
         { "label": "k11", "x": 11.472, "y": 0.173, "r": -10 },
-        { "label": "k12", "x": 12.454, "y":   0.0, "r": -10 },
+        { "label": "k12", "x": 12.454, "y":     0, "r": -10 },
         { "label": "k13", "x":   0.52, "y": 0.982, "r":  10 },
         { "label": "k14", "x":  1.502, "y": 1.155, "r":  10 },
         { "label": "k15", "x":  2.511, "y": 1.174, "r":  10 },
@@ -65,7 +70,7 @@
         { "label": "k50", "x": 10.982, "y": 3.138, "r": -10 },
         { "label": "k51", "x": 11.992, "y":  3.12, "r": -10 },
         { "label": "k52", "x": 12.974, "y": 2.947, "r": -10 },
-        { "label": "k53", "x":    0.0, "y": 3.929, "r":  10 },
+        { "label": "k53", "x":      0, "y": 3.929, "r":  10 },
         { "label": "k54", "x":  0.982, "y": 4.102, "r":  10 },
         { "label": "k55", "x":  1.992, "y":  4.12, "r":  10 },
         { "label": "k56", "x":   3.02, "y": 4.035, "r":  10 },
diff --git a/keyboards/cozykeys/speedo/v2/v2.c b/keyboards/cozykeys/speedo/v2/v2.c
deleted file mode 100644
index 1cab752140..0000000000
--- a/keyboards/cozykeys/speedo/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "v2.h"
diff --git a/keyboards/cozykeys/speedo/v2/v2.h b/keyboards/cozykeys/speedo/v2/v2.h
index 295d6f8faf..ad1bdd2f26 100644
--- a/keyboards/cozykeys/speedo/v2/v2.h
+++ b/keyboards/cozykeys/speedo/v2/v2.h
@@ -21,16 +21,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ___ KC_NO
 
 #define LAYOUT( \
-    k01, k02, k03, k04, k05, k06,           k07, k08, k09, k10, k11, k12, \
-    k13, k14, k15, k16, k17, k18,    k19,   k20, k21, k22, k23, k24, k25, \
-    k26, k27, k28, k29, k30, k31,    k32,   k33, k34, k35, k36, k37, k38, \
-    k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, \
-    k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 \
-) \
-{ \
-    { k01, k01, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
-    { k13, k15, k15, k16, k17, k18, k19, ___, k20, k21, k22, k23, k24, k25 }, \
-    { k26, k28, k28, k29, k30, k31, ___, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52 }, \
-    { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
+    k00, k01, k02, k03, k04, k05,           k08, k09, k0A, k0B, k0C, k0D, \
+    k10, k11, k12, k13, k14, k15,    k16,   k18, k19, k1A, k1B, k1C, k1D, \
+    k20, k21, k22, k23, k24, k25,    k27,   k28, k29, k2A, k2B, k2C, k2D, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D \
+) { \
+    { k00, k01, k02, k03, k04, k05, ___, ___, k08, k09, k0A, k0B, k0C, k0D }, \
+    { k10, k11, k12, k13, k14, k15, k16, ___, k18, k19, k1A, k1B, k1C, k1D }, \
+    { k20, k21, k22, k23, k24, k25, ___, k27, k28, k29, k2A, k2B, k2C, k2D }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \
 }
diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h
index 885b09d0ba..6943064510 100644
--- a/keyboards/cozykeys/speedo/v3/config.h
+++ b/keyboards/cozykeys/speedo/v3/config.h
@@ -16,14 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B6, B2, E6, D7, C6, D4, D0, D1 }
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B5
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
index 2aa0d94485..0632dfd52d 100644
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ b/keyboards/cozykeys/speedo/v3/info.json
@@ -8,6 +8,14 @@
     "pid": "0x1192",
     "device_version": "0.0.3"
   },
+  "ws2812": {
+    "pin": "B5"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2", "E6", "D7", "C6", "D4", "D0", "D1"],
+    "rows": ["F0", "F1", "C7", "D5", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/cozykeys/speedo/v3/v3.c b/keyboards/cozykeys/speedo/v3/v3.c
deleted file mode 100644
index f35be99e22..0000000000
--- a/keyboards/cozykeys/speedo/v3/v3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "v3.h"
diff --git a/keyboards/cradio/info.json b/keyboards/cradio/info.json
index e5e43b55b6..e2679325c4 100644
--- a/keyboards/cradio/info.json
+++ b/keyboards/cradio/info.json
@@ -55,40 +55,40 @@
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                { "label": "L01", "matrix": [0, 0], "w": 1, "x": 0, "y": 1.27 },
-                { "label": "L02", "matrix": [0, 1], "w": 1, "x": 1, "y": 0.31 },
-                { "label": "L03", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "L04", "matrix": [0, 3], "w": 1, "x": 3, "y": 0.28 },
-                { "label": "L05", "matrix": [0, 4], "w": 1, "x": 4, "y": 0.42 },
-                { "label": "R01", "matrix": [4, 0], "w": 1, "x": 8, "y": 0.42 },
-                { "label": "R02", "matrix": [4, 1], "w": 1, "x": 9, "y": 0.28 },
-                { "label": "R03", "matrix": [4, 2], "w": 1, "x": 10, "y": 0 },
-                { "label": "R04", "matrix": [4, 3], "w": 1, "x": 11, "y": 0.31 },
-                { "label": "R05", "matrix": [4, 4], "w": 1, "x": 12, "y": 1.27 },
-                { "label": "L06", "matrix": [1, 0], "w": 1, "x": 0, "y": 2.27 },
-                { "label": "L07", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.31 },
-                { "label": "L08", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
-                { "label": "L09", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.28 },
-                { "label": "L10", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.42 },
-                { "label": "R06", "matrix": [5, 0], "w": 1, "x": 8, "y": 1.42 },
-                { "label": "R07", "matrix": [5, 1], "w": 1, "x": 9, "y": 1.28 },
-                { "label": "R08", "matrix": [5, 2], "w": 1, "x": 10, "y": 1 },
-                { "label": "R09", "matrix": [5, 3], "w": 1, "x": 11, "y": 1.31 },
-                { "label": "R10", "matrix": [5, 4], "w": 1, "x": 12, "y": 2.27 },
-                { "label": "L11", "matrix": [2, 0], "w": 1, "x": 0, "y": 3.27 },
-                { "label": "L12", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.31 },
-                { "label": "L13", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
-                { "label": "L14", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.28 },
-                { "label": "L15", "matrix": [2, 4], "w": 1, "x": 4, "y": 2.42 },
-                { "label": "R11", "matrix": [6, 0], "w": 1, "x": 8, "y": 2.42 },
-                { "label": "R12", "matrix": [6, 1], "w": 1, "x": 9, "y": 2.28 },
-                { "label": "R13", "matrix": [6, 2], "w": 1, "x": 10, "y": 2 },
-                { "label": "R14", "matrix": [6, 3], "w": 1, "x": 11, "y": 2.31 },
-                { "label": "R15", "matrix": [6, 4], "w": 1, "x": 12, "y": 3.27 },
-                { "label": "L16", "matrix": [3, 0], "w": 1, "x": 4, "y": 3.9 },
-                { "label": "L17", "matrix": [3, 1], "w": 1, "x": 5, "y": 3.7 },
-                { "label": "R16", "matrix": [7, 0], "w": 1, "x": 7, "y": 3.7 },
-                { "label": "R17", "matrix": [7, 1], "w": 1, "x": 8, "y": 3.9 }
+                { "label": "L01", "matrix": [0, 0], "x": 0, "y": 1.27 },
+                { "label": "L02", "matrix": [0, 1], "x": 1, "y": 0.31 },
+                { "label": "L03", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "L04", "matrix": [0, 3], "x": 3, "y": 0.28 },
+                { "label": "L05", "matrix": [0, 4], "x": 4, "y": 0.42 },
+                { "label": "R01", "matrix": [4, 0], "x": 8, "y": 0.42 },
+                { "label": "R02", "matrix": [4, 1], "x": 9, "y": 0.28 },
+                { "label": "R03", "matrix": [4, 2], "x": 10, "y": 0 },
+                { "label": "R04", "matrix": [4, 3], "x": 11, "y": 0.31 },
+                { "label": "R05", "matrix": [4, 4], "x": 12, "y": 1.27 },
+                { "label": "L06", "matrix": [1, 0], "x": 0, "y": 2.27 },
+                { "label": "L07", "matrix": [1, 1], "x": 1, "y": 1.31 },
+                { "label": "L08", "matrix": [1, 2], "x": 2, "y": 1 },
+                { "label": "L09", "matrix": [1, 3], "x": 3, "y": 1.28 },
+                { "label": "L10", "matrix": [1, 4], "x": 4, "y": 1.42 },
+                { "label": "R06", "matrix": [5, 0], "x": 8, "y": 1.42 },
+                { "label": "R07", "matrix": [5, 1], "x": 9, "y": 1.28 },
+                { "label": "R08", "matrix": [5, 2], "x": 10, "y": 1 },
+                { "label": "R09", "matrix": [5, 3], "x": 11, "y": 1.31 },
+                { "label": "R10", "matrix": [5, 4], "x": 12, "y": 2.27 },
+                { "label": "L11", "matrix": [2, 0], "x": 0, "y": 3.27 },
+                { "label": "L12", "matrix": [2, 1], "x": 1, "y": 2.31 },
+                { "label": "L13", "matrix": [2, 2], "x": 2, "y": 2 },
+                { "label": "L14", "matrix": [2, 3], "x": 3, "y": 2.28 },
+                { "label": "L15", "matrix": [2, 4], "x": 4, "y": 2.42 },
+                { "label": "R11", "matrix": [6, 0], "x": 8, "y": 2.42 },
+                { "label": "R12", "matrix": [6, 1], "x": 9, "y": 2.28 },
+                { "label": "R13", "matrix": [6, 2], "x": 10, "y": 2 },
+                { "label": "R14", "matrix": [6, 3], "x": 11, "y": 2.31 },
+                { "label": "R15", "matrix": [6, 4], "x": 12, "y": 3.27 },
+                { "label": "L16", "matrix": [3, 0], "x": 4, "y": 3.9 },
+                { "label": "L17", "matrix": [3, 1], "x": 5, "y": 3.7 },
+                { "label": "R16", "matrix": [7, 0], "x": 7, "y": 3.7 },
+                { "label": "R17", "matrix": [7, 1], "x": 8, "y": 3.9 }
             ]
         }
     }
diff --git a/keyboards/cradio/keymaps/default/config.h b/keyboards/cradio/keymaps/default/config.h
index dd469ca553..4b5a8b30be 100644
--- a/keyboards/cradio/keymaps/default/config.h
+++ b/keyboards/cradio/keymaps/default/config.h
@@ -21,7 +21,6 @@
 
 // Defaults for usable home row mods
 #define TAPPING_TERM 230
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // Improved mouse key defaults
 // Delay between pressing a key and cursor movement
diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h
index fdf42006ff..f8a8dc9013 100644
--- a/keyboards/craftwalk/config.h
+++ b/keyboards/craftwalk/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F6, B3, B5 }
-#define MATRIX_COL_PINS { B1, F7, F5, F4, B2, E6, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 19
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
   #define RGBLIGHT_EFFECT_RGB_TEST
   #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/craftwalk/craftwalk.c b/keyboards/craftwalk/craftwalk.c
deleted file mode 100644
index 9b1ea8e2e4..0000000000
--- a/keyboards/craftwalk/craftwalk.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 sotoba
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "craftwalk.h"
diff --git a/keyboards/craftwalk/craftwalk.h b/keyboards/craftwalk/craftwalk.h
deleted file mode 100644
index 80c32ef05e..0000000000
--- a/keyboards/craftwalk/craftwalk.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 sotoba
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-       k00, k01, k02, \
-  k10, k11, k12, k13, \
-  k20, k21, k22, k23, k24, k25, k26 \
-) \
-{ \
-  { KC_NO, k00, k01, k02, KC_NO, KC_NO, KC_NO }, \
-  { k10, k11, k12, k13, KC_NO, KC_NO, KC_NO },  \
-  { k20, k21, k22, k23, k24, k25, k26 } \
-}
diff --git a/keyboards/craftwalk/info.json b/keyboards/craftwalk/info.json
index 6fd1b7cea6..b3f3fbbe57 100644
--- a/keyboards/craftwalk/info.json
+++ b/keyboards/craftwalk/info.json
@@ -8,25 +8,36 @@
       "pid": "0x2E8F",
       "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "D3"
+    },
+    "matrix_pins": {
+      "cols": ["B1", "F7", "F5", "F4", "B2", "E6", "B4"],
+      "rows": ["F6", "B3", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"label":"Q", "x":1.25, "y":0.25},
-              {"label":"W", "x":2.25, "y":0},
-              {"label":"E", "x":3.25, "y":0.25},
-              {"label":"Ctrl", "x":0, "y":1},
-              {"label":"A", "x":1.25, "y":1.25},
-              {"label":"S", "x":2.25, "y":1},
-              {"label":"D", "x":3.25, "y":1.25},
-              {"label":"Shift", "x":0, "y":2},
-              {"label":"Adjust", "x":1.25, "y":2.25},
-              {"label":"Mouse", "x":2.25, "y":2},
-              {"label":"Mouse", "x":3.25, "y":2.25},
-              {"label":"F", "x":4.25, "y":2},
-              {"label":"Num", "x":5.25, "y":3, "h":1.5},
-              {"label":"Space", "x":6.25, "y":3, "h":1.5}
+                {"matrix": [0, 1], "x": 1.25, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+
+                {"matrix": [2, 5], "x": 5.25, "y": 3, "h": 1.5},
+                {"matrix": [2, 6], "x": 6.25, "y": 3, "h": 1.5}
             ]
         }
     }
diff --git a/keyboards/crawlpad/config.h b/keyboards/crawlpad/config.h
index f0c5263403..4378435471 100755
--- a/keyboards/crawlpad/config.h
+++ b/keyboards/crawlpad/config.h
@@ -1,16 +1,8 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5 }
-#define MATRIX_COL_PINS { D4, D5, D6, D7 }
-
 /* Pins for custom per-row LEDs. Should be changed to use named pins. */
 #define LED_ROW_PINS { 8, 9, 10, 11 }
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -23,7 +15,6 @@
 )
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/crawlpad/crawlpad.c b/keyboards/crawlpad/crawlpad.c
deleted file mode 100755
index d48f0a409f..0000000000
--- a/keyboards/crawlpad/crawlpad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "crawlpad.h"
diff --git a/keyboards/crawlpad/crawlpad.h b/keyboards/crawlpad/crawlpad.h
deleted file mode 100755
index 572907c256..0000000000
--- a/keyboards/crawlpad/crawlpad.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ K30,   K31,   K32,   K33 }  \
-}
-
diff --git a/keyboards/crawlpad/info.json b/keyboards/crawlpad/info.json
index 0cdc5ef29a..0d4d38d4ea 100644
--- a/keyboards/crawlpad/info.json
+++ b/keyboards/crawlpad/info.json
@@ -8,28 +8,39 @@
     "pid": "0x6070",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "matrix_pins": {
+    "cols": ["D4", "D5", "D6", "D7"],
+    "rows": ["F0", "F1", "F4", "F5"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["ortho_4x4"],
   "layouts": {
     "LAYOUT_ortho_4x4": {
       "layout": [
-        {"label":"7", "x":0, "y":0},
-        {"label":"8", "x":1, "y":0},
-        {"label":"9", "x":2, "y":0},
-        {"label":"+", "x":3, "y":0},
-        {"label":"4", "x":0, "y":1},
-        {"label":"5", "x":1, "y":1},
-        {"label":"6", "x":2, "y":1},
-        {"label":"-", "x":3, "y":1},
-        {"label":"1", "x":0, "y":2},
-        {"label":"2", "x":1, "y":2},
-        {"label":"3", "x":2, "y":2},
-        {"label":"*", "x":3, "y":2},
-        {"label":"Fn", "x":0, "y":3},
-        {"label":"0", "x":1, "y":3},
-        {"label":".", "x":2, "y":3},
-        {"label":"Enter", "x":3, "y":3}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3}
       ]
     }
   }
diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index 15f68b19b2..f87c8e54b6 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 84
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/crazy_keyboard_68/crazy_keyboard_68.c b/keyboards/crazy_keyboard_68/crazy_keyboard_68.c
deleted file mode 100644
index cbea93fb85..0000000000
--- a/keyboards/crazy_keyboard_68/crazy_keyboard_68.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 chent7
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "crazy_keyboard_68.h"
diff --git a/keyboards/crazy_keyboard_68/crazy_keyboard_68.h b/keyboards/crazy_keyboard_68/crazy_keyboard_68.h
deleted file mode 100644
index c253824be4..0000000000
--- a/keyboards/crazy_keyboard_68/crazy_keyboard_68.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2020 chent7
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* Crazy Keyboard 68 (ANSI) layout
- * ,----------------------------------------------------------------.
- * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
- * |----------------------------------------------------------------|
- * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d | 1e |
- * |----------------------------------------------------------------|
- * | 20    | 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c| 2d    | 2e |
- * |----------------------------------------------------------------|
- * | 31     | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
- * |----------------------------------------------------------------|
- * | 40 | 41 | 43 |        46             | 49| 4a|  4b| 4c| 4d| 4e |
- * `----------------------------------------------------------------'
- *
- * This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2d, k2e, \
-    k31,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k43,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \
-    {XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e}  \
-}
diff --git a/keyboards/crazy_keyboard_68/info.json b/keyboards/crazy_keyboard_68/info.json
index 740813ff4d..5e7416545d 100644
--- a/keyboards/crazy_keyboard_68/info.json
+++ b/keyboards/crazy_keyboard_68/info.json
@@ -8,84 +8,96 @@
         "pid": "0x13DE",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0, "w":2},
-                {"label":"k0e", "x":15, "y":0},
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k1d", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1e", "x":15, "y":1},
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k22", "x":1.75, "y":2},
-                {"label":"k23", "x":2.75, "y":2},
-                {"label":"k24", "x":3.75, "y":2},
-                {"label":"k25", "x":4.75, "y":2},
-                {"label":"k26", "x":5.75, "y":2},
-                {"label":"k27", "x":6.75, "y":2},
-                {"label":"k28", "x":7.75, "y":2},
-                {"label":"k29", "x":8.75, "y":2},
-                {"label":"k2a", "x":9.75, "y":2},
-                {"label":"k2b", "x":10.75, "y":2},
-                {"label":"k2c", "x":11.75, "y":2},
-                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                {"label":"k2e", "x":15, "y":2},
-                {"label":"k31", "x":0, "y":3, "w":2.25},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k43", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k49", "x":10, "y":4},
-                {"label":"k4a", "x":11, "y":4},
-                {"label":"k4b", "x":12, "y":4},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/crbn/config.h b/keyboards/crbn/config.h
index 840d8e7ca5..f7584af0bb 100644
--- a/keyboards/crbn/config.h
+++ b/keyboards/crbn/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B1, F7, F6 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/crbn/crbn.c b/keyboards/crbn/crbn.c
deleted file mode 100644
index 866f2d4265..0000000000
--- a/keyboards/crbn/crbn.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 Harry Herring
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "crbn.h"
-/* Encoder setting. only one encoder despite 4 possible spots */
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return true;
-}
diff --git a/keyboards/crbn/crbn.h b/keyboards/crbn/crbn.h
deleted file mode 100644
index 26a186473b..0000000000
--- a/keyboards/crbn/crbn.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2020 Harry Herring
-	*
-	* This program is free software: you can redistribute it and/or modify
-	* it under the terms of the GNU General Public License as published by
-	* the Free Software Foundation, either version 2 of the License, or
-	* (at your option) any later version.
-	*
-	* This program is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	* GNU General Public License for more details.
-	*
-	* You should have received a copy of the GNU General Public License
-	* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-		K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-		K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-		K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-		K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \
-) { \
-		{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-		{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-		{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-		{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }  \
-}
-
-#define LAYOUT_planck_mit( \
-		K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-		K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-		K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-		K300, K301, K302, K303, K304,    K305,    K307, K308, K309, K310, K311  \
-) { \
-		{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-		{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-		{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-		{ K300,  K301,  K302,  K303,  K304,  K305, KC_NO,  K307,  K308,  K309,  K310,  K311 }  \
-}
-
-#define LAYOUT_2x2u( \
-		K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-		K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-		K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-		K300, K301, K302, K303,    K304,       K307,    K308, K309, K310, K311  \
-) { \
-		{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-		{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-		{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-		{ K300,  K301,  K302,  K303,  K304, KC_NO, KC_NO,  K307,  K308,  K309,  K310,  K311 }  \
-}
diff --git a/keyboards/crbn/info.json b/keyboards/crbn/info.json
index 20d5ad2ff4..752b389d90 100644
--- a/keyboards/crbn/info.json
+++ b/keyboards/crbn/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0002",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2"],
+    "rows": ["B3", "B1", "F7", "F6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
@@ -23,153 +28,165 @@
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "w": 1, "x": 0, "y": 0 },
-        { "w": 1, "x": 1, "y": 0 },
-        { "w": 1, "x": 2, "y": 0 },
-        { "w": 1, "x": 3, "y": 0 },
-        { "w": 1, "x": 4, "y": 0 },
-        { "w": 1, "x": 5, "y": 0 },
-        { "w": 1, "x": 6, "y": 0 },
-        { "w": 1, "x": 7, "y": 0 },
-        { "w": 1, "x": 8, "y": 0 },
-        { "w": 1, "x": 9, "y": 0 },
-        { "w": 1, "x": 10, "y": 0 },
-        { "w": 1, "x": 11, "y": 0 },
-        { "w": 1, "x": 0, "y": 1 },
-        { "w": 1, "x": 1, "y": 1 },
-        { "w": 1, "x": 2, "y": 1 },
-        { "w": 1, "x": 3, "y": 1 },
-        { "w": 1, "x": 4, "y": 1 },
-        { "w": 1, "x": 5, "y": 1 },
-        { "w": 1, "x": 6, "y": 1 },
-        { "w": 1, "x": 7, "y": 1 },
-        { "w": 1, "x": 8, "y": 1 },
-        { "w": 1, "x": 9, "y": 1 },
-        { "w": 1, "x": 10, "y": 1 },
-        { "w": 1, "x": 11, "y": 1 },
-        { "w": 1, "x": 0, "y": 2 },
-        { "w": 1, "x": 1, "y": 2 },
-        { "w": 1, "x": 2, "y": 2 },
-        { "w": 1, "x": 3, "y": 2 },
-        { "w": 1, "x": 4, "y": 2 },
-        { "w": 1, "x": 5, "y": 2 },
-        { "w": 1, "x": 6, "y": 2 },
-        { "w": 1, "x": 7, "y": 2 },
-        { "w": 1, "x": 8, "y": 2 },
-        { "w": 1, "x": 9, "y": 2 },
-        { "w": 1, "x": 10, "y": 2 },
-        { "w": 1, "x": 11, "y": 2 },
-        { "w": 1, "x": 0, "y": 3 },
-        { "w": 1, "x": 1, "y": 3 },
-        { "w": 1, "x": 2, "y": 3 },
-        { "w": 1, "x": 3, "y": 3 },
-        { "w": 1, "x": 4, "y": 3 },
-        { "w": 1, "x": 5, "y": 3 },
-        { "w": 1, "x": 6, "y": 3 },
-        { "w": 1, "x": 7, "y": 3 },
-        { "w": 1, "x": 8, "y": 3 },
-        { "w": 1, "x": 9, "y": 3 },
-        { "w": 1, "x": 10, "y": 3 },
-        { "w": 1, "x": 11, "y": 3 } ]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
     "LAYOUT_planck_mit": {
       "layout": [
-        { "w": 1, "x": 0, "y": 0 },
-        { "w": 1, "x": 1, "y": 0 },
-        { "w": 1, "x": 2, "y": 0 },
-        { "w": 1, "x": 3, "y": 0 },
-        { "w": 1, "x": 4, "y": 0 },
-        { "w": 1, "x": 5, "y": 0 },
-        { "w": 1, "x": 6, "y": 0 },
-        { "w": 1, "x": 7, "y": 0 },
-        { "w": 1, "x": 8, "y": 0 },
-        { "w": 1, "x": 9, "y": 0 },
-        { "w": 1, "x": 10, "y": 0 },
-        { "w": 1, "x": 11, "y": 0 },
-        { "w": 1, "x": 0, "y": 1 },
-        { "w": 1, "x": 1, "y": 1 },
-        { "w": 1, "x": 2, "y": 1 },
-        { "w": 1, "x": 3, "y": 1 },
-        { "w": 1, "x": 4, "y": 1 },
-        { "w": 1, "x": 5, "y": 1 },
-        { "w": 1, "x": 6, "y": 1 },
-        { "w": 1, "x": 7, "y": 1 },
-        { "w": 1, "x": 8, "y": 1 },
-        { "w": 1, "x": 9, "y": 1 },
-        { "w": 1, "x": 10, "y": 1 },
-        { "w": 1, "x": 11, "y": 1 },
-        { "w": 1, "x": 0, "y": 2 },
-        { "w": 1, "x": 1, "y": 2 },
-        { "w": 1, "x": 2, "y": 2 },
-        { "w": 1, "x": 3, "y": 2 },
-        { "w": 1, "x": 4, "y": 2 },
-        { "w": 1, "x": 5, "y": 2 },
-        { "w": 1, "x": 6, "y": 2 },
-        { "w": 1, "x": 7, "y": 2 },
-        { "w": 1, "x": 8, "y": 2 },
-        { "w": 1, "x": 9, "y": 2 },
-        { "w": 1, "x": 10, "y": 2 },
-        { "w": 1, "x": 11, "y": 2 },
-        { "w": 1, "x": 0, "y": 3 },
-        { "w": 1, "x": 1, "y": 3 },
-        { "w": 1, "x": 2, "y": 3 },
-        { "w": 1, "x": 3, "y": 3 },
-        { "w": 1, "x": 4, "y": 3 },
-        { "w": 2, "x": 5, "y": 3 },
-        { "w": 1, "x": 7, "y": 3 },
-        { "w": 1, "x": 8, "y": 3 },
-        { "w": 1, "x": 9, "y": 3 },
-        { "w": 1, "x": 10, "y": 3 },
-        { "w": 1, "x": 11, "y": 3 } ]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
     "LAYOUT_2x2u": {
       "layout": [
-        { "w": 1, "x": 0, "y": 0 },
-        { "w": 1, "x": 1, "y": 0 },
-        { "w": 1, "x": 2, "y": 0 },
-        { "w": 1, "x": 3, "y": 0 },
-        { "w": 1, "x": 4, "y": 0 },
-        { "w": 1, "x": 5, "y": 0 },
-        { "w": 1, "x": 6, "y": 0 },
-        { "w": 1, "x": 7, "y": 0 },
-        { "w": 1, "x": 8, "y": 0 },
-        { "w": 1, "x": 9, "y": 0 },
-        { "w": 1, "x": 10, "y": 0 },
-        { "w": 1, "x": 11, "y": 0 },
-        { "w": 1, "x": 0, "y": 1 },
-        { "w": 1, "x": 1, "y": 1 },
-        { "w": 1, "x": 2, "y": 1 },
-        { "w": 1, "x": 3, "y": 1 },
-        { "w": 1, "x": 4, "y": 1 },
-        { "w": 1, "x": 5, "y": 1 },
-        { "w": 1, "x": 6, "y": 1 },
-        { "w": 1, "x": 7, "y": 1 },
-        { "w": 1, "x": 8, "y": 1 },
-        { "w": 1, "x": 9, "y": 1 },
-        { "w": 1, "x": 10, "y": 1 },
-        { "w": 1, "x": 11, "y": 1 },
-        { "w": 1, "x": 0, "y": 2 },
-        { "w": 1, "x": 1, "y": 2 },
-        { "w": 1, "x": 2, "y": 2 },
-        { "w": 1, "x": 3, "y": 2 },
-        { "w": 1, "x": 4, "y": 2 },
-        { "w": 1, "x": 5, "y": 2 },
-        { "w": 1, "x": 6, "y": 2 },
-        { "w": 1, "x": 7, "y": 2 },
-        { "w": 1, "x": 8, "y": 2 },
-        { "w": 1, "x": 9, "y": 2 },
-        { "w": 1, "x": 10, "y": 2 },
-        { "w": 1, "x": 11, "y": 2 },
-        { "w": 1, "x": 0, "y": 3 },
-        { "w": 1, "x": 1, "y": 3 },
-        { "w": 1, "x": 2, "y": 3 },
-        { "w": 1, "x": 3, "y": 3 },
-        { "w": 2, "x": 4, "y": 3 },
-        { "w": 2, "x": 6, "y": 3 },
-        { "w": 1, "x": 8, "y": 3 },
-        { "w": 1, "x": 9, "y": 3 },
-        { "w": 1, "x": 10, "y": 3 },
-        { "w": 1, "x": 11, "y": 3 } ]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/creatkeebs/glacier/config.h b/keyboards/creatkeebs/glacier/config.h
index 68655d9d8f..81016b23a0 100644
--- a/keyboards/creatkeebs/glacier/config.h
+++ b/keyboards/creatkeebs/glacier/config.h
@@ -16,33 +16,8 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F1, F4, E6, F5, D0 }
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, F6, B0, B6, C6, C7, B1, B2, B3, B7, D3, D2, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/creatkeebs/glacier/glacier.c b/keyboards/creatkeebs/glacier/glacier.c
deleted file mode 100644
index 27ff4d02c7..0000000000
--- a/keyboards/creatkeebs/glacier/glacier.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */
-
-#include "glacier.h"
diff --git a/keyboards/creatkeebs/glacier/glacier.h b/keyboards/creatkeebs/glacier/glacier.h
deleted file mode 100644
index 91400e8b13..0000000000
--- a/keyboards/creatkeebs/glacier/glacier.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016,       \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,       \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,       \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                           \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,       K415,             \
-	K500, K501, K502,             K505,                         K510, K511,       K513, K514, K515, K516        \
-) { \
-	{ K000,  K001,   K002,  K003,  K004,   K005,  K006,  K007,  K008,   K009,   K010,  K011,  K012,   K013,  K014,   K015,  K016  }, \
-	{ K100,  K101,   K102,  K103,  K104,   K105,  K106,  K107,  K108,   K109,   K110,  K111,  K112,   K113,  K114,    K115,  K116  }, \
-	{ K200,  K201,   K202,  K203,  K204,   K205,  K206,  K207,  K208,   K209,   K210,  K211,  K212,   K213,  K214,    K215,  K216  }, \
-	{ K300,  K301,   K302,  K303,  K304,   K305,  K306,  K307,  K308,   K309,   K310,  K311,  KC_NO,  K313,  KC_NO,   KC_NO, KC_NO }, \
-	{ K400,  KC_NO,  K402,  K403,  K404,   K405,  K406,  K407,  K408,   K409,   K410,  K411,  KC_NO,  K413,  KC_NO,   K415,  KC_NO }, \
-	{ K500,  K501,   K502,  KC_NO, KC_NO,  K505,  KC_NO, KC_NO, KC_NO,  KC_NO,  K510,  K511,  KC_NO,  K513,  K514,    K515,  K516  }  \
-}
diff --git a/keyboards/creatkeebs/glacier/info.json b/keyboards/creatkeebs/glacier/info.json
index 227adcbea2..8b4aeacfca 100644
--- a/keyboards/creatkeebs/glacier/info.json
+++ b/keyboards/creatkeebs/glacier/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "F6", "B0", "B6", "C6", "C7", "B1", "B2", "B3", "B7", "D3", "D2", "D1"],
+        "rows": ["F0", "F1", "F4", "E6", "F5", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -17,93 +22,107 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/creatkeebs/thera/config.h b/keyboards/creatkeebs/thera/config.h
deleted file mode 100644
index 3a17d73f17..0000000000
--- a/keyboards/creatkeebs/thera/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B2, B1, B0, E6, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
-
-
diff --git a/keyboards/creatkeebs/thera/info.json b/keyboards/creatkeebs/thera/info.json
index d30721658f..5124ba95d6 100644
--- a/keyboards/creatkeebs/thera/info.json
+++ b/keyboards/creatkeebs/thera/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6061",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5"],
+        "rows": ["B2", "B1", "B0", "E6", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/creatkeebs/thera/thera.c b/keyboards/creatkeebs/thera/thera.c
deleted file mode 100644
index db4f27d908..0000000000
--- a/keyboards/creatkeebs/thera/thera.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "thera.h"
diff --git a/keyboards/crimsonkeyboards/resume1800/config.h b/keyboards/crimsonkeyboards/resume1800/config.h
index 35b0326ec6..7c66ab16c6 100644
--- a/keyboards/crimsonkeyboards/resume1800/config.h
+++ b/keyboards/crimsonkeyboards/resume1800/config.h
@@ -16,24 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { A5, A0, A1, B1, B2, B0 }
-#define MATRIX_COL_PINS { A2, B3, A3, B4, A4, D1, D5, D6, A6, A7, C7, C6, C5, C4, D7, C3, C2, C1, C0, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json
index dbb1fa2ed9..4a259cbd93 100644
--- a/keyboards/crimsonkeyboards/resume1800/info.json
+++ b/keyboards/crimsonkeyboards/resume1800/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC18B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A2", "B3", "A3", "B4", "A4", "D1", "D5", "D6", "A6", "A7", "C7", "C6", "C5", "C4", "D7", "C3", "C2", "C1", "C0", "D0"],
+        "rows": ["A5", "A0", "A1", "B1", "B2", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
     	"caps_lock": "B6",
     	"num_lock": "B5"
diff --git a/keyboards/crimsonkeyboards/resume1800/resume1800.c b/keyboards/crimsonkeyboards/resume1800/resume1800.c
deleted file mode 100644
index 63194c6605..0000000000
--- a/keyboards/crimsonkeyboards/resume1800/resume1800.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "resume1800.h"
\ No newline at end of file
diff --git a/keyboards/crin/config.h b/keyboards/crin/config.h
index 880213cc11..3fe5a40329 100644
--- a/keyboards/crin/config.h
+++ b/keyboards/crin/config.h
@@ -17,9 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, B9, B8, B7, B6, B5, B4, B3 }
-#define MATRIX_ROW_PINS { A9, A8, B15, B14, B13 }
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/crin/crin.c b/keyboards/crin/crin.c
deleted file mode 100644
index dd7d938308..0000000000
--- a/keyboards/crin/crin.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 KnoblesseOblige
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "crin.h"
diff --git a/keyboards/crin/info.json b/keyboards/crin/info.json
index 748e64c437..1e0bc9b38b 100644
--- a/keyboards/crin/info.json
+++ b/keyboards/crin/info.json
@@ -8,6 +8,11 @@
         "pid": "0xCC11",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3"],
+        "rows": ["A9", "A8", "B15", "B14", "B13"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
diff --git a/keyboards/crkbd/config.h b/keyboards/crkbd/config.h
deleted file mode 100644
index 709cf4acb0..0000000000
--- a/keyboards/crkbd/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS \
-    { D4, C6, D7, E6 }
-
-// wiring of each half
-#define MATRIX_COL_PINS \
-    { F4, F5, F6, F7, B1, B3 }
-// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/crkbd/crkbd.c b/keyboards/crkbd/crkbd.c
index 6220c9822a..aadc0bacf0 100644
--- a/keyboards/crkbd/crkbd.c
+++ b/keyboards/crkbd/crkbd.c
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "crkbd.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/crkbd/crkbd.h b/keyboards/crkbd/crkbd.h
deleted file mode 100644
index 3fae1a400c..0000000000
--- a/keyboards/crkbd/crkbd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#ifdef KEYBOARD_crkbd_rev1
-#    include "rev1.h"
-#endif
-#ifdef KEYBOARD_crkbd_r2g
-#    include "r2g.h"
-#endif
-
-
-#include "quantum.h"
diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json
index 778b33c565..94b5f18083 100644
--- a/keyboards/crkbd/info.json
+++ b/keyboards/crkbd/info.json
@@ -8,108 +8,14 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
-  "community_layouts": ["split_3x5_3", "split_3x6_3"],
-  "layouts": {
-    "LAYOUT_split_3x6_3": {
-      "layout": [
-        {"label":"Esc", "x":0, "y":0.3},
-        {"label":"Q", "x":1, "y":0.3},
-        {"label":"W", "x":2, "y":0.1},
-        {"label":"E", "x":3, "y":0},
-        {"label":"R", "x":4, "y":0.1},
-        {"label":"T", "x":5, "y":0.2},
-
-        {"label":"Y", "x":9, "y":0.2},
-        {"label":"U", "x":10, "y":0.1},
-        {"label":"I", "x":11, "y":0},
-        {"label":"O", "x":12, "y":0.1},
-        {"label":"P", "x":13, "y":0.3},
-        {"label":"Back Space", "x":14, "y":0.3},
-
-        {"label":"Ctrl / Tab", "x":0, "y":1.3},
-        {"label":"A", "x":1, "y":1.3},
-        {"label":"S", "x":2, "y":1.1},
-        {"label":"D", "x":3, "y":1},
-        {"label":"F", "x":4, "y":1.1},
-        {"label":"G", "x":5, "y":1.2},
-
-        {"label":"H", "x":9, "y":1.2},
-        {"label":"J", "x":10, "y":1.1},
-        {"label":"K", "x":11, "y":1},
-        {"label":"L", "x":12, "y":1.1},
-        {"label":";", "x":13, "y":1.3},
-        {"label":"'", "x":14, "y":1.3},
-
-        {"label":"Shift", "x":0, "y":2.3},
-        {"label":"Z", "x":1, "y":2.3},
-        {"label":"X", "x":2, "y":2.1},
-        {"label":"C", "x":3, "y":2},
-        {"label":"V", "x":4, "y":2.1},
-        {"label":"B", "x":5, "y":2.2},
-
-        {"label":"N", "x":9, "y":2.2},
-        {"label":"M", "x":10, "y":2.1},
-        {"label":",", "x":11, "y":2},
-        {"label":".", "x":12, "y":2.1},
-        {"label":"/", "x":13, "y":2.3},
-        {"label":"Shift", "x":14, "y":2.3},
-
-        {"label":"GUI", "x":4, "y":3.7},
-        {"label":"Lower", "x":5, "y":3.7},
-        {"label":"Space", "x":6, "y":3.2, "h":1.5},
-
-        {"label":"Enter", "x":8, "y":3.2, "h":1.5},
-        {"label":"Raise", "x":9, "y":3.7},
-        {"label":"Alt", "x":10, "y":3.7}
-      ]
-    },
-    "LAYOUT_split_3x5_3": {
-      "layout": [
-        {"label":"Q", "x":0, "y":0.3},
-        {"label":"W", "x":1, "y":0.1},
-        {"label":"E", "x":2, "y":0},
-        {"label":"R", "x":3, "y":0.1},
-        {"label":"T", "x":4, "y":0.2},
-
-        {"label":"Y", "x":8, "y":0.2},
-        {"label":"U", "x":9, "y":0.1},
-        {"label":"I", "x":10, "y":0},
-        {"label":"O", "x":11, "y":0.1},
-        {"label":"P", "x":12, "y":0.3},
-
-        {"label":"A", "x":0, "y":1.3},
-        {"label":"S", "x":1, "y":1.1},
-        {"label":"D", "x":2, "y":1},
-        {"label":"F", "x":3, "y":1.1},
-        {"label":"G", "x":4, "y":1.2},
-
-        {"label":"H", "x":8, "y":1.2},
-        {"label":"J", "x":9, "y":1.1},
-        {"label":"K", "x":10, "y":1},
-        {"label":"L", "x":11, "y":1.1},
-        {"label":";", "x":12, "y":1.3},
-
-        {"label":"Z", "x":0, "y":2.3},
-        {"label":"X", "x":1, "y":2.1},
-        {"label":"C", "x":2, "y":2},
-        {"label":"V", "x":3, "y":2.1},
-        {"label":"B", "x":4, "y":2.2},
-
-        {"label":"N", "x":8, "y":2.2},
-        {"label":"M", "x":9, "y":2.1},
-        {"label":",", "x":10, "y":2},
-        {"label":".", "x":11, "y":2.1},
-        {"label":"/", "x":12, "y":2.3},
-
-        {"label":"GUI", "x":3, "y":3.7},
-        {"label":"Lower", "x":4, "y":3.7},
-        {"label":"Space", "x":5, "y":3.2, "h":1.5},
-
-        {"label":"Enter", "x":7, "y":3.2, "h":1.5},
-        {"label":"Raise", "x":8, "y":3.7},
-        {"label":"Alt", "x":9, "y":3.7}
-      ]
-    }
-  }
+  "community_layouts": ["split_3x5_3", "split_3x6_3"]
 }
diff --git a/keyboards/crkbd/keymaps/antosha417/config.h b/keyboards/crkbd/keymaps/antosha417/config.h
index bfe2b143d2..983f274ace 100644
--- a/keyboards/crkbd/keymaps/antosha417/config.h
+++ b/keyboards/crkbd/keymaps/antosha417/config.h
@@ -32,6 +32,5 @@
 #endif
 
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 #define COMBO_TERM 30
 
diff --git a/keyboards/crkbd/keymaps/ardakilic/config.h b/keyboards/crkbd/keymaps/ardakilic/config.h
index 95e7ddb329..59e348981f 100644
--- a/keyboards/crkbd/keymaps/ardakilic/config.h
+++ b/keyboards/crkbd/keymaps/ardakilic/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 200
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define RETRO_TAPPING
 
 
diff --git a/keyboards/crkbd/keymaps/armand1m/config.h b/keyboards/crkbd/keymaps/armand1m/config.h
index f4b8c08a3f..8d97cf1465 100644
--- a/keyboards/crkbd/keymaps/armand1m/config.h
+++ b/keyboards/crkbd/keymaps/armand1m/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define QUICK_TAP_TERM 0
 // #define PERMISSIVE_HOLD
 #define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/benrestech/config.h b/keyboards/crkbd/keymaps/benrestech/config.h
index f700899883..b827d76fcb 100644
--- a/keyboards/crkbd/keymaps/benrestech/config.h
+++ b/keyboards/crkbd/keymaps/benrestech/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 175
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/bermeo/config.h b/keyboards/crkbd/keymaps/bermeo/config.h
index 188f717aba..fce27a7265 100644
--- a/keyboards/crkbd/keymaps/bermeo/config.h
+++ b/keyboards/crkbd/keymaps/bermeo/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 150
 // #define RETRO_TAPPING
-// #define IGNORE_MOD_TAP_INTERRUPT
 // #define PERMISSIVE_HOLD
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/crkbd/keymaps/cameronjlarsen/config.h b/keyboards/crkbd/keymaps/cameronjlarsen/config.h
index f0f4fb14db..1d83214a77 100644
--- a/keyboards/crkbd/keymaps/cameronjlarsen/config.h
+++ b/keyboards/crkbd/keymaps/cameronjlarsen/config.h
@@ -25,7 +25,6 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 135
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define CAPS_WORD_IDLE_TIMEOUT 5000  // Turn off Caps Word after 5 seconds.
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/crkbd/keymaps/crkdves/config.h b/keyboards/crkbd/keymaps/crkdves/config.h
index ca025830b4..07d930137f 100644
--- a/keyboards/crkbd/keymaps/crkdves/config.h
+++ b/keyboards/crkbd/keymaps/crkdves/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 200
 // #define RETRO_TAPPING
-// #define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef RGBLIGHT_ENABLE
     #define RGBLIGHT_SLEEP
diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h
index bf33cc90aa..5be6a0449b 100644
--- a/keyboards/crkbd/keymaps/crkqwes/config.h
+++ b/keyboards/crkbd/keymaps/crkqwes/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 200
 // #define RETRO_TAPPING
-// #define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/edvorakjp/config.h b/keyboards/crkbd/keymaps/edvorakjp/config.h
index ee4e7388be..94896f6898 100644
--- a/keyboards/crkbd/keymaps/edvorakjp/config.h
+++ b/keyboards/crkbd/keymaps/edvorakjp/config.h
@@ -10,7 +10,6 @@
 
 // #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef RGBLIGHT_ENABLE
 #    undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/gotham/config.h b/keyboards/crkbd/keymaps/gotham/config.h
index 3f56ef92a5..753854c01c 100644
--- a/keyboards/crkbd/keymaps/gotham/config.h
+++ b/keyboards/crkbd/keymaps/gotham/config.h
@@ -3,7 +3,6 @@
 #define EE_HANDS
 #define SPLIT_USB_DETECT
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM 250
 
diff --git a/keyboards/crkbd/keymaps/hvp/config.h b/keyboards/crkbd/keymaps/hvp/config.h
index a926f67537..1a9ac69498 100644
--- a/keyboards/crkbd/keymaps/hvp/config.h
+++ b/keyboards/crkbd/keymaps/hvp/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 150
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef RGBLIGHT_ENABLE
 #    undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/julian_turner/config.h b/keyboards/crkbd/keymaps/julian_turner/config.h
index 3b875235a8..2d200d7d55 100644
--- a/keyboards/crkbd/keymaps/julian_turner/config.h
+++ b/keyboards/crkbd/keymaps/julian_turner/config.h
@@ -25,9 +25,6 @@
 // Configure the global tapping term (default: 200ms)
 #define TAPPING_TERM 500
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
 
diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h
index ff00a04a8d..5644812e5e 100644
--- a/keyboards/crkbd/keymaps/markstos/config.h
+++ b/keyboards/crkbd/keymaps/markstos/config.h
@@ -42,9 +42,6 @@ This is the C configuration file for the keymap
 #define QMK_LED     D5
 #define QMK_SPEAKER C6
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // When enabled, typing a mod-tap plus second within term will register as the mod-combo
 // Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold 
 #define PERMISSIVE_HOLD
diff --git a/keyboards/crkbd/keymaps/nimishgautam/config.h b/keyboards/crkbd/keymaps/nimishgautam/config.h
index 53b5f1b834..d169988be7 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/config.h
+++ b/keyboards/crkbd/keymaps/nimishgautam/config.h
@@ -21,7 +21,6 @@
 //Tapping values
 //#define QUICK_TAP_TERM 0
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD_PER_KEY
 
 
diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index 95485797cc..d0cda95794 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -98,7 +98,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 140
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define TAPPING_TOGGLE 2
 
diff --git a/keyboards/crkbd/keymaps/sharkby7e/config.h b/keyboards/crkbd/keymaps/sharkby7e/config.h
index 60503a51a5..50a4247765 100644
--- a/keyboards/crkbd/keymaps/sharkby7e/config.h
+++ b/keyboards/crkbd/keymaps/sharkby7e/config.h
@@ -30,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define QUICK_TAP_TERM 0
 #define TAPPING_TERM 200
 
-#define IGNORE_MOD_TAP_INTERRUPT
-
 #ifdef RGBLIGHT_ENABLE
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/crkbd/keymaps/snowe/config.h b/keyboards/crkbd/keymaps/snowe/config.h
index 57a253428b..82097c503a 100644
--- a/keyboards/crkbd/keymaps/snowe/config.h
+++ b/keyboards/crkbd/keymaps/snowe/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 200
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
 
 #ifdef RGBLIGHT_ENABLE
@@ -55,8 +54,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
 
-// fix for me putting alt under A and being a fast typist
-#define IGNORE_MOD_TAP_INTERRUPT
-
 #define LAYER_STATE_8BIT
 #define SPLIT_WPM_ENABLE
diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h
index 6cd090f9fd..97614f3b70 100644
--- a/keyboards/crkbd/keymaps/soundmonster/config.h
+++ b/keyboards/crkbd/keymaps/soundmonster/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 150
 #define RETRO_TAPPING
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/config.h b/keyboards/crkbd/keymaps/thunderbird2086/config.h
index 41e5c3ff43..ad2bfcabc7 100644
--- a/keyboards/crkbd/keymaps/thunderbird2086/config.h
+++ b/keyboards/crkbd/keymaps/thunderbird2086/config.h
@@ -8,7 +8,6 @@
 
 // #define RGB_LAYER_ENABLE
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 
 #if defined(TAPPING_TERM)
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h
index cddd09e5b6..89b58e4648 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h
@@ -38,5 +38,5 @@
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B7, D5 }
 
 /* ws2812 RGB LED */
-#undef RGB_DI_PIN
-#define RGB_DI_PIN B5
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN B5
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.c b/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.c
index afccb8c7ed..4dc336c420 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.c
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.c
@@ -43,7 +43,7 @@ uint8_t readRegister(uint8_t address) {
   return data;
 }
 
-void pointing_device_task(void){
+bool pointing_device_task(void){
   uint8_t motion = readRegister(0x02);
 
   // Motion has occurred on the trackpad
@@ -73,6 +73,6 @@ void pointing_device_task(void){
     }
 
     pointing_device_set_report(currentReport);
-    pointing_device_send();
   }
+  return pointing_device_send();
 }
diff --git a/keyboards/crkbd/keymaps/xyverz/config.h b/keyboards/crkbd/keymaps/xyverz/config.h
index 2ccbb229b8..3b7eab62e6 100644
--- a/keyboards/crkbd/keymaps/xyverz/config.h
+++ b/keyboards/crkbd/keymaps/xyverz/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 300
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define LEADER_PER_KEY_TIMING
 #define LEADER_TIMEOUT 300
 
diff --git a/keyboards/crkbd/lib/layer_state_reader.c b/keyboards/crkbd/lib/layer_state_reader.c
index 601fd71958..7dd1702485 100644
--- a/keyboards/crkbd/lib/layer_state_reader.c
+++ b/keyboards/crkbd/lib/layer_state_reader.c
@@ -1,7 +1,5 @@
-
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 #include <stdio.h>
-#include "crkbd.h"
 
 // in the future, should use (1U<<_LAYER_NAME) instead, but needs to be moved to keymap,c
 #define L_BASE 0
diff --git a/keyboards/crkbd/lib/rgb_state_reader.c b/keyboards/crkbd/lib/rgb_state_reader.c
index e0efe2e528..3d74fb45e4 100644
--- a/keyboards/crkbd/lib/rgb_state_reader.c
+++ b/keyboards/crkbd/lib/rgb_state_reader.c
@@ -1,6 +1,5 @@
 #ifdef RGBLIGHT_ENABLE
 
-#include QMK_KEYBOARD_H
 #include <stdio.h>
 
 extern rgblight_config_t rgblight_config;
diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h
index 2219e0d228..e44626739d 100644
--- a/keyboards/crkbd/r2g/config.h
+++ b/keyboards/crkbd/r2g/config.h
@@ -19,9 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN      D3
-
 #ifdef RGBLIGHT_ENABLE
 
 #   define RGBLIGHT_EFFECT_BREATHING
@@ -69,7 +66,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #endif
 
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_USB_DETECT
 
diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json
index 8c878dfcc8..6440a61bf7 100644
--- a/keyboards/crkbd/r2g/info.json
+++ b/keyboards/crkbd/r2g/info.json
@@ -2,5 +2,113 @@
     "split": {
         "soft_serial_pin": "D2"
     },
-    "bootloader": "atmel-dfu"
+    "ws2812": {
+        "pin": "D3"
+    },
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x6_3"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 1], "x": 0, "y": 0.3},
+                {"matrix": [0, 2], "x": 1, "y": 0.1},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0.1},
+                {"matrix": [0, 5], "x": 4, "y": 0.2},
+
+                {"matrix": [4, 5], "x": 8, "y": 0.2},
+                {"matrix": [4, 4], "x": 9, "y": 0.1},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0.1},
+                {"matrix": [4, 1], "x": 12, "y": 0.3},
+
+                {"matrix": [1, 1], "x": 0, "y": 1.3},
+                {"matrix": [1, 2], "x": 1, "y": 1.1},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1.1},
+                {"matrix": [1, 5], "x": 4, "y": 1.2},
+
+                {"matrix": [5, 5], "x": 8, "y": 1.2},
+                {"matrix": [5, 4], "x": 9, "y": 1.1},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1.1},
+                {"matrix": [5, 1], "x": 12, "y": 1.3},
+
+                {"matrix": [2, 1], "x": 0, "y": 2.3},
+                {"matrix": [2, 2], "x": 1, "y": 2.1},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2.1},
+                {"matrix": [2, 5], "x": 4, "y": 2.2},
+
+                {"matrix": [6, 5], "x": 8, "y": 2.2},
+                {"matrix": [6, 4], "x": 9, "y": 2.1},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2.1},
+                {"matrix": [6, 1], "x": 12, "y": 2.3},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.7},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
+                {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
+
+                {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 3.7},
+                {"matrix": [7, 3], "x": 9, "y": 3.7}
+            ]
+        },
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.3},
+                {"matrix": [0, 1], "x": 1, "y": 0.3},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.2},
+
+                {"matrix": [4, 5], "x": 9, "y": 0.2},
+                {"matrix": [4, 4], "x": 10, "y": 0.1},
+                {"matrix": [4, 3], "x": 11, "y": 0},
+                {"matrix": [4, 2], "x": 12, "y": 0.1},
+                {"matrix": [4, 1], "x": 13, "y": 0.3},
+                {"matrix": [4, 0], "x": 14, "y": 0.3},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.3},
+                {"matrix": [1, 1], "x": 1, "y": 1.3},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.2},
+
+                {"matrix": [5, 5], "x": 9, "y": 1.2},
+                {"matrix": [5, 4], "x": 10, "y": 1.1},
+                {"matrix": [5, 3], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1.1},
+                {"matrix": [5, 1], "x": 13, "y": 1.3},
+                {"matrix": [5, 0], "x": 14, "y": 1.3},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.3},
+                {"matrix": [2, 1], "x": 1, "y": 2.3},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.2},
+
+                {"matrix": [6, 5], "x": 9, "y": 2.2},
+                {"matrix": [6, 4], "x": 10, "y": 2.1},
+                {"matrix": [6, 3], "x": 11, "y": 2},
+                {"matrix": [6, 2], "x": 12, "y": 2.1},
+                {"matrix": [6, 1], "x": 13, "y": 2.3},
+                {"matrix": [6, 0], "x": 14, "y": 2.3},
+
+                {"matrix": [3, 3], "x": 4, "y": 3.7},
+                {"matrix": [3, 4], "x": 5, "y": 3.7},
+                {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
+
+                {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
+                {"matrix": [7, 4], "x": 9, "y": 3.7},
+                {"matrix": [7, 3], "x": 10, "y": 3.7}
+            ]
+        }
+    }
 }
diff --git a/keyboards/crkbd/r2g/r2g.c b/keyboards/crkbd/r2g/r2g.c
index 7fb95c043c..a4d138b98a 100644
--- a/keyboards/crkbd/r2g/r2g.c
+++ b/keyboards/crkbd/r2g/r2g.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "r2g.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/crkbd/r2g/r2g.h b/keyboards/crkbd/r2g/r2g.h
deleted file mode 100644
index 126c4b8998..0000000000
--- a/keyboards/crkbd/r2g/r2g.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "crkbd.h"
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT_split_3x6_3( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-                      L30, L31, L32, R30, R31, R32 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \
-    { R05, R04, R03, R02, R01, R00 }, \
-    { R15, R14, R13, R12, R11, R10 }, \
-    { R25, R24, R23, R22, R21, R20 }, \
-    { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
-  }
-
-#define LAYOUT_split_3x5_3( \
-  L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
-  L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
-  L20, L21, L22, L23, L24,           R20, R21, R22, R23, R24, \
-                 L30, L31, L32, R30, R31, R32 \
-  ) \
-  { \
-    { KC_NO, L00, L01, L02, L03, L04 }, \
-    { KC_NO, L10, L11, L12, L13, L14 }, \
-    { KC_NO, L20, L21, L22, L23, L24 }, \
-    { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \
-    { KC_NO, R04, R03, R02, R01, R00 }, \
-    { KC_NO, R14, R13, R12, R11, R10 }, \
-    { KC_NO, R24, R23, R22, R21, R20 }, \
-    { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
-  }
-
-
-#define LAYOUT LAYOUT_split_3x6_3
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
index 1614ebc53b..2378a8637f 100644
--- a/keyboards/crkbd/rev1/config.h
+++ b/keyboards/crkbd/rev1/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN      D3
-
 #ifdef RGBLIGHT_ENABLE
 #    define RGBLED_NUM 54 // Number of LEDs
 #    define RGBLED_SPLIT \
@@ -35,5 +32,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         { 27, 27 }
 #    define SPLIT_TRANSPORT_MIRROR
 #endif
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json
index 931c20aa4d..cadb908cf1 100644
--- a/keyboards/crkbd/rev1/info.json
+++ b/keyboards/crkbd/rev1/info.json
@@ -2,5 +2,113 @@
     "split": {
         "soft_serial_pin": "D2"
     },
-    "bootloader": "caterina"
+    "ws2812": {
+        "pin": "D3"
+    },
+    "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x6_3"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 1], "x": 0, "y": 0.3},
+                {"matrix": [0, 2], "x": 1, "y": 0.1},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0.1},
+                {"matrix": [0, 5], "x": 4, "y": 0.2},
+
+                {"matrix": [4, 5], "x": 8, "y": 0.2},
+                {"matrix": [4, 4], "x": 9, "y": 0.1},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0.1},
+                {"matrix": [4, 1], "x": 12, "y": 0.3},
+
+                {"matrix": [1, 1], "x": 0, "y": 1.3},
+                {"matrix": [1, 2], "x": 1, "y": 1.1},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1.1},
+                {"matrix": [1, 5], "x": 4, "y": 1.2},
+
+                {"matrix": [5, 5], "x": 8, "y": 1.2},
+                {"matrix": [5, 4], "x": 9, "y": 1.1},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1.1},
+                {"matrix": [5, 1], "x": 12, "y": 1.3},
+
+                {"matrix": [2, 1], "x": 0, "y": 2.3},
+                {"matrix": [2, 2], "x": 1, "y": 2.1},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2.1},
+                {"matrix": [2, 5], "x": 4, "y": 2.2},
+
+                {"matrix": [6, 5], "x": 8, "y": 2.2},
+                {"matrix": [6, 4], "x": 9, "y": 2.1},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2.1},
+                {"matrix": [6, 1], "x": 12, "y": 2.3},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.7},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
+                {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
+
+                {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 3.7},
+                {"matrix": [7, 3], "x": 9, "y": 3.7}
+            ]
+        },
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.3},
+                {"matrix": [0, 1], "x": 1, "y": 0.3},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.2},
+
+                {"matrix": [4, 5], "x": 9, "y": 0.2},
+                {"matrix": [4, 4], "x": 10, "y": 0.1},
+                {"matrix": [4, 3], "x": 11, "y": 0},
+                {"matrix": [4, 2], "x": 12, "y": 0.1},
+                {"matrix": [4, 1], "x": 13, "y": 0.3},
+                {"matrix": [4, 0], "x": 14, "y": 0.3},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.3},
+                {"matrix": [1, 1], "x": 1, "y": 1.3},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.2},
+
+                {"matrix": [5, 5], "x": 9, "y": 1.2},
+                {"matrix": [5, 4], "x": 10, "y": 1.1},
+                {"matrix": [5, 3], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1.1},
+                {"matrix": [5, 1], "x": 13, "y": 1.3},
+                {"matrix": [5, 0], "x": 14, "y": 1.3},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.3},
+                {"matrix": [2, 1], "x": 1, "y": 2.3},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.2},
+
+                {"matrix": [6, 5], "x": 9, "y": 2.2},
+                {"matrix": [6, 4], "x": 10, "y": 2.1},
+                {"matrix": [6, 3], "x": 11, "y": 2},
+                {"matrix": [6, 2], "x": 12, "y": 2.1},
+                {"matrix": [6, 1], "x": 13, "y": 2.3},
+                {"matrix": [6, 0], "x": 14, "y": 2.3},
+
+                {"matrix": [3, 3], "x": 4, "y": 3.7},
+                {"matrix": [3, 4], "x": 5, "y": 3.7},
+                {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
+
+                {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
+                {"matrix": [7, 4], "x": 9, "y": 3.7},
+                {"matrix": [7, 3], "x": 10, "y": 3.7}
+            ]
+        }
+    }
 }
diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c
index 63e4bed522..cb337d15bc 100644
--- a/keyboards/crkbd/rev1/rev1.c
+++ b/keyboards/crkbd/rev1/rev1.c
@@ -15,7 +15,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "rev1.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h
deleted file mode 100644
index 126c4b8998..0000000000
--- a/keyboards/crkbd/rev1/rev1.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "crkbd.h"
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT_split_3x6_3( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-                      L30, L31, L32, R30, R31, R32 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \
-    { R05, R04, R03, R02, R01, R00 }, \
-    { R15, R14, R13, R12, R11, R10 }, \
-    { R25, R24, R23, R22, R21, R20 }, \
-    { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
-  }
-
-#define LAYOUT_split_3x5_3( \
-  L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
-  L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
-  L20, L21, L22, L23, L24,           R20, R21, R22, R23, R24, \
-                 L30, L31, L32, R30, R31, R32 \
-  ) \
-  { \
-    { KC_NO, L00, L01, L02, L03, L04 }, \
-    { KC_NO, L10, L11, L12, L13, L14 }, \
-    { KC_NO, L20, L21, L22, L23, L24 }, \
-    { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \
-    { KC_NO, R04, R03, R02, R01, R00 }, \
-    { KC_NO, R14, R13, R12, R11, R10 }, \
-    { KC_NO, R24, R23, R22, R21, R20 }, \
-    { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
-  }
-
-
-#define LAYOUT LAYOUT_split_3x6_3
diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk
index 8feaf50a07..89dbcd35bd 100644
--- a/keyboards/crkbd/rules.mk
+++ b/keyboards/crkbd/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 
 # if firmware size over limit, try this option
diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h
index 665340e7af..bc7cf57dcf 100644
--- a/keyboards/crypt_macro/config.h
+++ b/keyboards/crypt_macro/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_CHANNEL 3
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
 
-#define RGB_DI_PIN B4
 #define RGBLED_NUM 11
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json
index c26bf041fa..59a80f4b3a 100644
--- a/keyboards/crypt_macro/info.json
+++ b/keyboards/crypt_macro/info.json
@@ -8,6 +8,10 @@
         "pid": "0x434D",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B4",
+        "driver": "pwm"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "matrix_pins": {
diff --git a/keyboards/crypt_macro/rules.mk b/keyboards/crypt_macro/rules.mk
index f430af42f4..000ee78e21 100644
--- a/keyboards/crypt_macro/rules.mk
+++ b/keyboards/crypt_macro/rules.mk
@@ -17,5 +17,4 @@ 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
-WS2812_DRIVER = pwm         # Driver for RGB uderglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json
index 1ea89ad92a..ee032bd5ee 100644
--- a/keyboards/custommk/evo70/info.json
+++ b/keyboards/custommk/evo70/info.json
@@ -30,7 +30,6 @@
     },
     "rgblight": {
         "led_count": 48,
-        "pin": "B2",
         "hue_steps": 4,
         "saturation_steps": 8,
         "brightness_steps": 4,
@@ -47,6 +46,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/custommk/evo70/keymaps/via/keymap.c b/keyboards/custommk/evo70/keymaps/via/keymap.c
index 74f68590cf..8019834b4f 100644
--- a/keyboards/custommk/evo70/keymaps/via/keymap.c
+++ b/keyboards/custommk/evo70/keymaps/via/keymap.c
@@ -19,31 +19,31 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT(
-						  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, 
-						  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,    KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
-		KC_F1,   KC_F2,   KC_CAPS, 			KC_A,    KC_S,    KC_D,     KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN, 
-	    KC_F3,   KC_F4,            KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END, 
+						  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+						  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,    KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+		KC_F1,   KC_F2,   KC_CAPS, 			KC_A,    KC_S,    KC_D,     KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN,
+	    KC_F3,   KC_F4,            KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
 		KC_F5,   KC_F6,   KC_LCTL, KC_LWIN,          KC_LALT,                    KC_SPACE, KC_NO,   KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT),
 
 	[1] = LAYOUT(
-						  QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, 
-						  KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_F7,   KC_F8,   KC_TRNS,          BL_TOGG, BL_STEP, BL_BRTG,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	    KC_F9,   KC_F10,           KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD,  RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+						  QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+						  KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_F7,   KC_F8,   KC_TRNS,          BL_TOGG, BL_STEP, BL_BRTG,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	    KC_F9,   KC_F10,           KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD,  RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,          KC_TRNS,                    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	[2] = LAYOUT(
-						  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-						  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	    KC_TRNS, KC_TRNS, 		   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+						  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+						  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	    KC_TRNS, KC_TRNS, 		   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	[3] = LAYOUT(
-						  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-						  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	    KC_TRNS, KC_TRNS, 		   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+						  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+						  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	    KC_TRNS, KC_TRNS, 		   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 };
@@ -57,12 +57,14 @@ void set_custom_encoder_mode_user(bool custom_mode) {
 
 keyevent_t encoder_ccw = {
     .key = (keypos_t){.row = 4, .col = 7},
-    .pressed = false
+    .pressed = false,
+	.type = KEY_EVENT
 };
 
 keyevent_t encoder_cw = {
     .key = (keypos_t){.row = 4, .col = 10},
-    .pressed = false
+    .pressed = false,
+	.type = KEY_EVENT
 };
 
 
@@ -70,12 +72,12 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 	if (custom_encoder_mode) {
 	    if (clockwise) {
 	        encoder_cw.pressed = true;
-		    encoder_cw.time = (timer_read() | 1);
+		    encoder_cw.time = timer_read();
 		    action_exec(encoder_cw);
 	    }
 	    else {
 		    encoder_ccw.pressed = true;
-		    encoder_ccw.time = (timer_read() | 1);
+		    encoder_ccw.time = timer_read();
 		    action_exec(encoder_ccw);
 	    }
 		return false;
@@ -84,15 +86,15 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 
 void matrix_scan_user(void) {
-	if (IS_PRESSED(encoder_ccw)) {
+	if (encoder_ccw.pressed) {
 		encoder_ccw.pressed = false;
-		encoder_ccw.time = (timer_read() | 1);
+		encoder_ccw.time = timer_read();
 		action_exec(encoder_ccw);
 	}
 
-	if (IS_PRESSED(encoder_cw)) {
+	if (encoder_cw.pressed) {
 		encoder_cw.pressed = false;
-		encoder_cw.time = (timer_read() | 1);
+		encoder_cw.time = timer_read();
 		action_exec(encoder_cw);
 	}
-}
\ No newline at end of file
+}
diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h
index c5e7661c65..2967c1a31c 100644
--- a/keyboards/custommk/genesis/rev1/config.h
+++ b/keyboards/custommk/genesis/rev1/config.h
@@ -16,17 +16,8 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5 }
-#define MATRIX_COL_PINS { F4, F5, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
-#define RGB_DI_PIN E6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json
index aaab705432..11ac7db8d0 100644
--- a/keyboards/custommk/genesis/rev1/info.json
+++ b/keyboards/custommk/genesis/rev1/info.json
@@ -8,6 +8,14 @@
         "pid": "0xFAB0",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "D7", "B4"],
+        "rows": ["F0", "C7", "C6", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F6", "pin_b": "F7", "resolution": 2},
@@ -18,10 +26,57 @@
     "bootloader": "qmk-dfu",
     "layouts": {
         "LAYOUT_ortho_5x4": {
-            "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"Mute", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Pg Up", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Pg Dn", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"Spc", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
         },
         "LAYOUT_numpad_5x4": {
-            "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3, "h":2}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [2, 0], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [2, 1], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [4, 0], "x": 3, "y": 3, "h": 2},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 3], "x": 2, "y": 4}
+            ]
         }
         
     }
diff --git a/keyboards/custommk/genesis/rev1/rev1.c b/keyboards/custommk/genesis/rev1/rev1.c
deleted file mode 100644
index ac40eedbf2..0000000000
--- a/keyboards/custommk/genesis/rev1/rev1.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    /* top left encoder */
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    /* top right encoder */
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/custommk/genesis/rev1/rev1.h b/keyboards/custommk/genesis/rev1/rev1.h
deleted file mode 100644
index 0516b41ad8..0000000000
--- a/keyboards/custommk/genesis/rev1/rev1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K23, \
-    K30, K31, K32,      \
-    K40,      K42, K43  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   KC_NO }, \
-    { K40,   KC_NO, K42,   K43 }  \
-}
-
-#define LAYOUT_ortho_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }, \
-    { K40,   K41,   K42,   K43 }  \
-}
-
diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h
index f152f723fe..7f9e79ba2c 100644
--- a/keyboards/custommk/genesis/rev2/config.h
+++ b/keyboards/custommk/genesis/rev2/config.h
@@ -16,17 +16,8 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5, B0}
-#define MATRIX_COL_PINS { F4, F5, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
-#define RGB_DI_PIN E6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json
index 45b83c512a..f084e6411f 100644
--- a/keyboards/custommk/genesis/rev2/info.json
+++ b/keyboards/custommk/genesis/rev2/info.json
@@ -8,6 +8,14 @@
         "pid": "0xFAB1",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "D7", "B4"],
+        "rows": ["F0", "C7", "C6", "B6", "B5", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F6", "pin_b": "F7", "resolution": 2},
@@ -18,71 +26,90 @@
     "bootloader": "qmk-dfu",
     "layouts": {
         "LAYOUT_ortho_5x4": {
-            "layout": [{"label":"MO(1)", "x":0, "y":0},
-                       {"label":"/", "x":1, "y":0},
-                       {"label":"*", "x":2, "y":0},
-                       {"label":"Mute", "x":3, "y":0},
-                       {"label":"7", "x":0, "y":1},
-                       {"label":"8", "x":1, "y":1},
-                       {"label":"9", "x":2, "y":1},
-                       {"label":"+", "x":3, "y":1},
-                       {"label":"4", "x":0, "y":2},
-                       {"label":"5", "x":1, "y":2},
-                       {"label":"6", "x":2, "y":2},
-                       {"label":"Pg Up", "x":3, "y":2},
-                       {"label":"1", "x":0, "y":3},
-                       {"label":"2", "x":1, "y":3},
-                       {"label":"3", "x":2, "y":3},
-                       {"label":"Pg Dn", "x":3, "y":3},
-                       {"label":"0", "x":0, "y":4},
-                       {"label":"Spc", "x":1, "y":4},
-                       {"label":".", "x":2, "y":4},
-                       {"label":"Enter", "x":3, "y":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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
         },
         "LAYOUT_numpad_5x4": {
-            "layout": [{"label":"MO(1)", "x":0, "y":0},
-                {"label":"/", "x":1, "y":0},
-                {"label":"*", "x":2, "y":0},
-                {"label":"-", "x":3, "y":0},
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1}, 
-                {"label":"+", "x":3, "y":1, "h":2},
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3},
-                {"label":"Enter", "x":3, "y":3, "h":2},
-                {"label":"0", "x":0, "y":4, "w":2},
-                {"label":".", "x":2, "y":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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [2, 0], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [2, 1], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [4, 0], "x": 3, "y": 3, "h": 2},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 3], "x": 2, "y": 4}
+            ]
         },
         "LAYOUT_via_6x4": {
-            "layout": [{"label":"Vol-", "x":0, "y":0},
-                       {"label":"Vol+", "x":1, "y":0},
-                       {"label":"Vol-", "x":3, "y":0},
-                       {"label":"Vol+", "x":4, "y":0},
-                       {"label":"MO(1)", "x":0.5, "y":1.1},
-                       {"label":"/", "x":1.5, "y":1.1},
-                       {"label":"*", "x":2.5, "y":1.1}, 
-                       {"label":"Mute", "x":3.5, "y":1.1}, 
-                       {"label":"7", "x":0.5, "y":2.1}, 
-                       {"label":"8", "x":1.5, "y":2.1}, 
-                       {"label":"9", "x":2.5, "y":2.1}, 
-                       {"label":"+", "x":3.5, "y":2.1}, 
-                       {"label":"4", "x":0.5, "y":3.1}, 
-                       {"label":"5", "x":1.5, "y":3.1}, 
-                       {"label":"6", "x":2.5, "y":3.1}, 
-                       {"label":"Pg Up", "x":3.5, "y":3.1}, 
-                       {"label":"1", "x":0.5, "y":4.1}, 
-                       {"label":"2", "x":1.5, "y":4.1}, 
-                       {"label":"3", "x":2.5, "y":4.1}, 
-                       {"label":"Pg Dn", "x":3.5, "y":4.1}, 
-                       {"label":"0", "x":0.5, "y":5.1}, 
-                       {"label":"Spc", "x":1.5, "y":5.1}, 
-                       {"label":".", "x":2.5, "y":5.1}, 
-                       {"label":"Enter", "x":3.5, "y":5.1}]
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 3, "y": 0},
+                {"matrix": [5, 3], "x": 4, "y": 0},
+
+                {"matrix": [0, 0], "x": 0.5, "y": 1.1},
+                {"matrix": [0, 1], "x": 1.5, "y": 1.1},
+                {"matrix": [0, 2], "x": 2.5, "y": 1.1},
+                {"matrix": [0, 3], "x": 3.5, "y": 1.1},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 2.1},
+                {"matrix": [1, 1], "x": 1.5, "y": 2.1},
+                {"matrix": [1, 2], "x": 2.5, "y": 2.1},
+                {"matrix": [1, 3], "x": 3.5, "y": 2.1},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 3.1},
+                {"matrix": [2, 1], "x": 1.5, "y": 3.1},
+                {"matrix": [2, 2], "x": 2.5, "y": 3.1},
+                {"matrix": [2, 3], "x": 3.5, "y": 3.1},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 4.1},
+                {"matrix": [3, 1], "x": 1.5, "y": 4.1},
+                {"matrix": [3, 2], "x": 2.5, "y": 4.1},
+                {"matrix": [3, 3], "x": 3.5, "y": 4.1},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 5.1},
+                {"matrix": [4, 1], "x": 1.5, "y": 5.1},
+                {"matrix": [4, 2], "x": 2.5, "y": 5.1},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.1}
+            ]
         }
     }
 }
diff --git a/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c b/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c
index eb0f7772cf..6739b8857d 100644
--- a/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c
+++ b/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 #include QMK_KEYBOARD_H
 
 //#define GENESIS_LAYER_COLORS
@@ -26,34 +26,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT_via_6x4(
 		    KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,
-			MO(1),   KC_PSLS, KC_PAST, KC_PMNS, 
-			KC_P7,   KC_P8,   KC_P9,   KC_PGUP, 
-			KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
-			KC_P1,   KC_P2,   KC_P3,   KC_PGDN, 
+			MO(1),   KC_PSLS, KC_PAST, KC_PMNS,
+			KC_P7,   KC_P8,   KC_P9,   KC_PGUP,
+			KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+			KC_P1,   KC_P2,   KC_P3,   KC_PGDN,
 			KC_P0,   KC_SPC,  KC_PDOT, KC_PENT),
 
 	[1] = LAYOUT_via_6x4(
 		    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, 
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, 
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 			RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS),
 
 	[2] = LAYOUT_via_6x4(
 		    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	[3] = LAYOUT_via_6x4(
 		    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 };
@@ -95,49 +95,53 @@ void keyboard_post_init_user(void) {
 
 keyevent_t encoder_left_ccw = {
     .key = (keypos_t){.row = 5, .col = 0},
-    .pressed = false
+    .pressed = false,
+	.type = KEY_EVENT
 };
 
 keyevent_t encoder_left_cw = {
     .key = (keypos_t){.row = 5, .col = 1},
-    .pressed = false
+    .pressed = false,
+	.type = KEY_EVENT
 };
 
 keyevent_t encoder_right_ccw = {
     .key = (keypos_t){.row = 5, .col = 2},
-    .pressed = false
+    .pressed = false,
+	.type = KEY_EVENT
 };
 
 keyevent_t encoder_right_cw = {
     .key = (keypos_t){.row = 5, .col = 3},
-    .pressed = false
+    .pressed = false,
+	.type = KEY_EVENT
 };
 
 void matrix_scan_user(void) {
-    if (IS_PRESSED(encoder_left_ccw)) {
+    if (encoder_left_ccw.pressed) {
         encoder_left_ccw.pressed = false;
-        encoder_left_ccw.time = (timer_read() | 1);
+        encoder_left_ccw.time = timer_read();
         action_exec(encoder_left_ccw);
     }
 
-    if (IS_PRESSED(encoder_left_cw)) {
+    if (encoder_left_cw.pressed) {
         encoder_left_cw.pressed = false;
-        encoder_left_cw.time = (timer_read() | 1);
+        encoder_left_cw.time = timer_read();
         action_exec(encoder_left_cw);
     }
 
-    if (IS_PRESSED(encoder_right_ccw)) {
+    if (encoder_right_ccw.pressed) {
         encoder_right_ccw.pressed = false;
-        encoder_right_ccw.time = (timer_read() | 1);
+        encoder_right_ccw.time = timer_read();
         action_exec(encoder_right_ccw);
     }
 
-    if (IS_PRESSED(encoder_right_cw)) {
+    if (encoder_right_cw.pressed) {
         encoder_right_cw.pressed = false;
-        encoder_right_cw.time = (timer_read() | 1);
+        encoder_right_cw.time = timer_read();
         action_exec(encoder_right_cw);
     }
-	
+
 }
 
 
@@ -145,21 +149,21 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 	if (index == 0) {
 		if (clockwise) {
 			encoder_left_cw.pressed = true;
-			encoder_left_cw.time = (timer_read() | 1);
+			encoder_left_cw.time = timer_read();
 			action_exec(encoder_left_cw);
 		} else {
 			encoder_left_ccw.pressed = true;
-			encoder_left_ccw.time = (timer_read() | 1);
+			encoder_left_ccw.time = timer_read();
 			action_exec(encoder_left_ccw);
 		}
 	} else {
 		if (clockwise) {
 			encoder_right_cw.pressed = true;
-			encoder_right_cw.time = (timer_read() | 1);
+			encoder_right_cw.time = timer_read();
 			action_exec(encoder_right_cw);
 		} else {
 			encoder_right_ccw.pressed = true;
-			encoder_right_ccw.time = (timer_read() | 1);
+			encoder_right_ccw.time = timer_read();
 			action_exec(encoder_right_ccw);
 		}
 	}
diff --git a/keyboards/custommk/genesis/rev2/rev2.c b/keyboards/custommk/genesis/rev2/rev2.c
deleted file mode 100644
index bfa4cb0558..0000000000
--- a/keyboards/custommk/genesis/rev2/rev2.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    /* top left encoder */
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    /* top right encoder */
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return false;
-}
-
diff --git a/keyboards/custommk/genesis/rev2/rev2.h b/keyboards/custommk/genesis/rev2/rev2.h
deleted file mode 100644
index e978e706c3..0000000000
--- a/keyboards/custommk/genesis/rev2/rev2.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2020 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_5x4(   \
-    K00,  K01,   K02,  K03,  \
-    K10,  K11,   K12,        \
-    K20,  K21,   K22,  K23,  \
-    K30,  K31,   K32,        \
-    K40,         K42,  K43   \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   KC_NO }, \
-    { K40,   KC_NO, K42,   K43 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO} \
-}
-
-#define LAYOUT_ortho_5x4( \
-    K00,  K01,   K02,  K03,  \
-    K10,  K11,   K12,  K13,  \
-    K20,  K21,   K22,  K23,  \
-    K30,  K31,   K32,  K33,  \
-    K40,  K41,   K42,  K43   \
-) { \
-    { K00,   K01,   K02,   K03  }, \
-    { K10,   K11,   K12,   K13  }, \
-    { K20,   K21,   K22,   K23  }, \
-    { K30,   K31,   K32,   K33  }, \
-    { K40,   K41,   K42,   K43  }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO}  \
-}
-
-
-#define LAYOUT_via_6x4( \
-    E00A, E00B,  E01A, E01B, \
-    K00,  K01,   K02,  K03,  \
-    K10,  K11,   K12,  K13,  \
-    K20,  K21,   K22,  K23,  \
-    K30,  K31,   K32,  K33,  \
-    K40,  K41,   K42,  K43   \
-) { \
-    { K00,   K01,   K02,   K03  }, \
-    { K10,   K11,   K12,   K13  }, \
-    { K20,   K21,   K22,   K23  }, \
-    { K30,   K31,   K32,   K33  }, \
-    { K40,   K41,   K42,   K43  }, \
-    { E00A,  E00B,  E01A,  E01B }  \
-}
diff --git a/keyboards/cutie_club/borsdorf/borsdorf.c b/keyboards/cutie_club/borsdorf/borsdorf.c
deleted file mode 100644
index 94ca279864..0000000000
--- a/keyboards/cutie_club/borsdorf/borsdorf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Cutie Club
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "borsdorf.h"
diff --git a/keyboards/cutie_club/borsdorf/config.h b/keyboards/cutie_club/borsdorf/config.h
index 655ac6ece1..c25df59397 100644
--- a/keyboards/cutie_club/borsdorf/config.h
+++ b/keyboards/cutie_club/borsdorf/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { A15, A14, B12, B5, B4 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cutie_club/borsdorf/info.json b/keyboards/cutie_club/borsdorf/info.json
index c53dc5f9dd..3bd5ba0b09 100644
--- a/keyboards/cutie_club/borsdorf/info.json
+++ b/keyboards/cutie_club/borsdorf/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6D8A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0"],
+        "rows": ["A15", "A14", "B12", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B13"
     },
diff --git a/keyboards/cutie_club/giant_macro_pad/config.h b/keyboards/cutie_club/giant_macro_pad/config.h
index c78221d4c8..c5eb6384a3 100755
--- a/keyboards/cutie_club/giant_macro_pad/config.h
+++ b/keyboards/cutie_club/giant_macro_pad/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { C10, C11, C12, D2,  B3,  B4,  B5,  B6,  B7,  B8,  A3,  B2,  B1,  B0,  C5,  C4,  A7,  A6,  A5,  A4 }
-#define MATRIX_COL_PINS { C9,  C8,  C7,  C6,  B15, B14, B13, B12, A8,  A15, B9,  A2,  A1,  A0,  C3,  C2,  C1,  C0,  F1,  F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.c b/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.c
deleted file mode 100755
index 934817aca2..0000000000
--- a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Cutie Club
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "giant_macro_pad.h"
diff --git a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h b/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h
deleted file mode 100755
index 478846e3c2..0000000000
--- a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 Cutie Club
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_20x20( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15, k00_16, k00_17, k00_18, k00_19, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, k01_14, k01_15, k01_16, k01_17, k01_18, k01_19, \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, k02_14, k02_15, k02_16, k02_17, k02_18, k02_19, \
-    k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, k03_14, k03_15, k03_16, k03_17, k03_18, k03_19, \
-    k04_00, k04_01, k04_02, k04_03, k04_04, k04_05, k04_06, k04_07, k04_08, k04_09, k04_10, k04_11, k04_12, k04_13, k04_14, k04_15, k04_16, k04_17, k04_18, k04_19, \
-    k05_00, k05_01, k05_02, k05_03, k05_04, k05_05, k05_06, k05_07, k05_08, k05_09, k05_10, k05_11, k05_12, k05_13, k05_14, k05_15, k05_16, k05_17, k05_18, k05_19, \
-    k06_00, k06_01, k06_02, k06_03, k06_04, k06_05, k06_06, k06_07, k06_08, k06_09, k06_10, k06_11, k06_12, k06_13, k06_14, k06_15, k06_16, k06_17, k06_18, k06_19, \
-    k07_00, k07_01, k07_02, k07_03, k07_04, k07_05, k07_06, k07_07, k07_08, k07_09, k07_10, k07_11, k07_12, k07_13, k07_14, k07_15, k07_16, k07_17, k07_18, k07_19, \
-    k08_00, k08_01, k08_02, k08_03, k08_04, k08_05, k08_06, k08_07, k08_08, k08_09, k08_10, k08_11, k08_12, k08_13, k08_14, k08_15, k08_16, k08_17, k08_18, k08_19, \
-    k09_00, k09_01, k09_02, k09_03, k09_04, k09_05, k09_06, k09_07, k09_08, k09_09, k09_10, k09_11, k09_12, k09_13, k09_14, k09_15, k09_16, k09_17, k09_18, k09_19, \
-    k10_00, k10_01, k10_02, k10_03, k10_04, k10_05, k10_06, k10_07, k10_08, k10_09, k10_10, k10_11, k10_12, k10_13, k10_14, k10_15, k10_16, k10_17, k10_18, k10_19, \
-    k11_00, k11_01, k11_02, k11_03, k11_04, k11_05, k11_06, k11_07, k11_08, k11_09, k11_10, k11_11, k11_12, k11_13, k11_14, k11_15, k11_16, k11_17, k11_18, k11_19, \
-    k12_00, k12_01, k12_02, k12_03, k12_04, k12_05, k12_06, k12_07, k12_08, k12_09, k12_10, k12_11, k12_12, k12_13, k12_14, k12_15, k12_16, k12_17, k12_18, k12_19, \
-    k13_00, k13_01, k13_02, k13_03, k13_04, k13_05, k13_06, k13_07, k13_08, k13_09, k13_10, k13_11, k13_12, k13_13, k13_14, k13_15, k13_16, k13_17, k13_18, k13_19, \
-    k14_00, k14_01, k14_02, k14_03, k14_04, k14_05, k14_06, k14_07, k14_08, k14_09, k14_10, k14_11, k14_12, k14_13, k14_14, k14_15, k14_16, k14_17, k14_18, k14_19, \
-    k15_00, k15_01, k15_02, k15_03, k15_04, k15_05, k15_06, k15_07, k15_08, k15_09, k15_10, k15_11, k15_12, k15_13, k15_14, k15_15, k15_16, k15_17, k15_18, k15_19, \
-    k16_00, k16_01, k16_02, k16_03, k16_04, k16_05, k16_06, k16_07, k16_08, k16_09, k16_10, k16_11, k16_12, k16_13, k16_14, k16_15, k16_16, k16_17, k16_18, k16_19, \
-    k17_00, k17_01, k17_02, k17_03, k17_04, k17_05, k17_06, k17_07, k17_08, k17_09, k17_10, k17_11, k17_12, k17_13, k17_14, k17_15, k17_16, k17_17, k17_18, k17_19, \
-    k18_00, k18_01, k18_02, k18_03, k18_04, k18_05, k18_06, k18_07, k18_08, k18_09, k18_10, k18_11, k18_12, k18_13, k18_14, k18_15, k18_16, k18_17, k18_18, k18_19, \
-    k19_00, k19_01, k19_02, k19_03, k19_04, k19_05, k19_06, k19_07, k19_08, k19_09, k19_10, k19_11, k19_12, k19_13, k19_14, k19_15, k19_16, k19_17, k19_18, k19_19 \
-) \
-{ \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15, k00_16, k00_17, k00_18, k00_19 }, \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, k01_14, k01_15, k01_16, k01_17, k01_18, k01_19 }, \
-    { k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, k02_14, k02_15, k02_16, k02_17, k02_18, k02_19 }, \
-    { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, k03_14, k03_15, k03_16, k03_17, k03_18, k03_19 }, \
-    { k04_00, k04_01, k04_02, k04_03, k04_04, k04_05, k04_06, k04_07, k04_08, k04_09, k04_10, k04_11, k04_12, k04_13, k04_14, k04_15, k04_16, k04_17, k04_18, k04_19 }, \
-    { k05_00, k05_01, k05_02, k05_03, k05_04, k05_05, k05_06, k05_07, k05_08, k05_09, k05_10, k05_11, k05_12, k05_13, k05_14, k05_15, k05_16, k05_17, k05_18, k05_19 }, \
-    { k06_00, k06_01, k06_02, k06_03, k06_04, k06_05, k06_06, k06_07, k06_08, k06_09, k06_10, k06_11, k06_12, k06_13, k06_14, k06_15, k06_16, k06_17, k06_18, k06_19 }, \
-    { k07_00, k07_01, k07_02, k07_03, k07_04, k07_05, k07_06, k07_07, k07_08, k07_09, k07_10, k07_11, k07_12, k07_13, k07_14, k07_15, k07_16, k07_17, k07_18, k07_19 }, \
-    { k08_00, k08_01, k08_02, k08_03, k08_04, k08_05, k08_06, k08_07, k08_08, k08_09, k08_10, k08_11, k08_12, k08_13, k08_14, k08_15, k08_16, k08_17, k08_18, k08_19 }, \
-    { k09_00, k09_01, k09_02, k09_03, k09_04, k09_05, k09_06, k09_07, k09_08, k09_09, k09_10, k09_11, k09_12, k09_13, k09_14, k09_15, k09_16, k09_17, k09_18, k09_19 }, \
-    { k10_00, k10_01, k10_02, k10_03, k10_04, k10_05, k10_06, k10_07, k10_08, k10_09, k10_10, k10_11, k10_12, k10_13, k10_14, k10_15, k10_16, k10_17, k10_18, k10_19 }, \
-    { k11_00, k11_01, k11_02, k11_03, k11_04, k11_05, k11_06, k11_07, k11_08, k11_09, k11_10, k11_11, k11_12, k11_13, k11_14, k11_15, k11_16, k11_17, k11_18, k11_19 }, \
-    { k12_00, k12_01, k12_02, k12_03, k12_04, k12_05, k12_06, k12_07, k12_08, k12_09, k12_10, k12_11, k12_12, k12_13, k12_14, k12_15, k12_16, k12_17, k12_18, k12_19 }, \
-    { k13_00, k13_01, k13_02, k13_03, k13_04, k13_05, k13_06, k13_07, k13_08, k13_09, k13_10, k13_11, k13_12, k13_13, k13_14, k13_15, k13_16, k13_17, k13_18, k13_19 }, \
-    { k14_00, k14_01, k14_02, k14_03, k14_04, k14_05, k14_06, k14_07, k14_08, k14_09, k14_10, k14_11, k14_12, k14_13, k14_14, k14_15, k14_16, k14_17, k14_18, k14_19 }, \
-    { k15_00, k15_01, k15_02, k15_03, k15_04, k15_05, k15_06, k15_07, k15_08, k15_09, k15_10, k15_11, k15_12, k15_13, k15_14, k15_15, k15_16, k15_17, k15_18, k15_19 }, \
-    { k16_00, k16_01, k16_02, k16_03, k16_04, k16_05, k16_06, k16_07, k16_08, k16_09, k16_10, k16_11, k16_12, k16_13, k16_14, k16_15, k16_16, k16_17, k16_18, k16_19 }, \
-    { k17_00, k17_01, k17_02, k17_03, k17_04, k17_05, k17_06, k17_07, k17_08, k17_09, k17_10, k17_11, k17_12, k17_13, k17_14, k17_15, k17_16, k17_17, k17_18, k17_19 }, \
-    { k18_00, k18_01, k18_02, k18_03, k18_04, k18_05, k18_06, k18_07, k18_08, k18_09, k18_10, k18_11, k18_12, k18_13, k18_14, k18_15, k18_16, k18_17, k18_18, k18_19 }, \
-    { k19_00, k19_01, k19_02, k19_03, k19_04, k19_05, k19_06, k19_07, k19_08, k19_09, k19_10, k19_11, k19_12, k19_13, k19_14, k19_15, k19_16, k19_17, k19_18, k19_19 }  \
-}
diff --git a/keyboards/cutie_club/giant_macro_pad/info.json b/keyboards/cutie_club/giant_macro_pad/info.json
index d68b8aa4d4..8132fa62a5 100644
--- a/keyboards/cutie_club/giant_macro_pad/info.json
+++ b/keyboards/cutie_club/giant_macro_pad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x74B6",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C9", "C8", "C7", "C6", "B15", "B14", "B13", "B12", "A8", "A15", "B9", "A2", "A1", "A0", "C3", "C2", "C1", "C0", "F1", "F0"],
+        "rows": ["C10", "C11", "C12", "D2", "B3", "B4", "B5", "B6", "B7", "B8", "A3", "B2", "B1", "B0", "C5", "C4", "A7", "A6", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
@@ -16,425 +21,425 @@
     "layouts": {
         "LAYOUT_ortho_20x20": {
             "layout": [
-                {"label":"k00_00", "x":0, "y":0},
-                {"label":"k00_01", "x":1, "y":0},
-                {"label":"k00_02", "x":2, "y":0},
-                {"label":"k00_03", "x":3, "y":0},
-                {"label":"k00_04", "x":4, "y":0},
-                {"label":"k00_05", "x":5, "y":0},
-                {"label":"k00_06", "x":6, "y":0},
-                {"label":"k00_07", "x":7, "y":0},
-                {"label":"k00_08", "x":8, "y":0},
-                {"label":"k00_09", "x":9, "y":0},
-                {"label":"k00_10", "x":10, "y":0},
-                {"label":"k00_11", "x":11, "y":0},
-                {"label":"k00_12", "x":12, "y":0},
-                {"label":"k00_13", "x":13, "y":0},
-                {"label":"k00_14", "x":14, "y":0},
-                {"label":"k00_15", "x":15, "y":0},
-                {"label":"k00_16", "x":16, "y":0},
-                {"label":"k00_17", "x":17, "y":0},
-                {"label":"k00_18", "x":18, "y":0},
-                {"label":"k00_19", "x":19, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0},
+                {"matrix": [0, 18], "x": 18, "y": 0},
+                {"matrix": [0, 19], "x": 19, "y": 0},
 
-                {"label":"k01_00", "x":0, "y":1},
-                {"label":"k01_01", "x":1, "y":1},
-                {"label":"k01_02", "x":2, "y":1},
-                {"label":"k01_03", "x":3, "y":1},
-                {"label":"k01_04", "x":4, "y":1},
-                {"label":"k01_05", "x":5, "y":1},
-                {"label":"k01_06", "x":6, "y":1},
-                {"label":"k01_07", "x":7, "y":1},
-                {"label":"k01_08", "x":8, "y":1},
-                {"label":"k01_09", "x":9, "y":1},
-                {"label":"k01_10", "x":10, "y":1},
-                {"label":"k01_11", "x":11, "y":1},
-                {"label":"k01_12", "x":12, "y":1},
-                {"label":"k01_13", "x":13, "y":1},
-                {"label":"k01_14", "x":14, "y":1},
-                {"label":"k01_15", "x":15, "y":1},
-                {"label":"k01_16", "x":16, "y":1},
-                {"label":"k01_17", "x":17, "y":1},
-                {"label":"k01_18", "x":18, "y":1},
-                {"label":"k01_19", "x":19, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1},
+                {"matrix": [1, 17], "x": 17, "y": 1},
+                {"matrix": [1, 18], "x": 18, "y": 1},
+                {"matrix": [1, 19], "x": 19, "y": 1},
 
-                {"label":"k02_00", "x":0, "y":2},
-                {"label":"k02_01", "x":1, "y":2},
-                {"label":"k02_02", "x":2, "y":2},
-                {"label":"k02_03", "x":3, "y":2},
-                {"label":"k02_04", "x":4, "y":2},
-                {"label":"k02_05", "x":5, "y":2},
-                {"label":"k02_06", "x":6, "y":2},
-                {"label":"k02_07", "x":7, "y":2},
-                {"label":"k02_08", "x":8, "y":2},
-                {"label":"k02_09", "x":9, "y":2},
-                {"label":"k02_10", "x":10, "y":2},
-                {"label":"k02_11", "x":11, "y":2},
-                {"label":"k02_12", "x":12, "y":2},
-                {"label":"k02_13", "x":13, "y":2},
-                {"label":"k02_14", "x":14, "y":2},
-                {"label":"k02_15", "x":15, "y":2},
-                {"label":"k02_16", "x":16, "y":2},
-                {"label":"k02_17", "x":17, "y":2},
-                {"label":"k02_18", "x":18, "y":2},
-                {"label":"k02_19", "x":19, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 2},
+                {"matrix": [2, 17], "x": 17, "y": 2},
+                {"matrix": [2, 18], "x": 18, "y": 2},
+                {"matrix": [2, 19], "x": 19, "y": 2},
 
-                {"label":"k03_00", "x":0, "y":3},
-                {"label":"k03_01", "x":1, "y":3},
-                {"label":"k03_02", "x":2, "y":3},
-                {"label":"k03_03", "x":3, "y":3},
-                {"label":"k03_04", "x":4, "y":3},
-                {"label":"k03_05", "x":5, "y":3},
-                {"label":"k03_06", "x":6, "y":3},
-                {"label":"k03_07", "x":7, "y":3},
-                {"label":"k03_08", "x":8, "y":3},
-                {"label":"k03_09", "x":9, "y":3},
-                {"label":"k03_10", "x":10, "y":3},
-                {"label":"k03_11", "x":11, "y":3},
-                {"label":"k03_12", "x":12, "y":3},
-                {"label":"k03_13", "x":13, "y":3},
-                {"label":"k03_14", "x":14, "y":3},
-                {"label":"k03_15", "x":15, "y":3},
-                {"label":"k03_16", "x":16, "y":3},
-                {"label":"k03_17", "x":17, "y":3},
-                {"label":"k03_18", "x":18, "y":3},
-                {"label":"k03_19", "x":19, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [3, 17], "x": 17, "y": 3},
+                {"matrix": [3, 18], "x": 18, "y": 3},
+                {"matrix": [3, 19], "x": 19, "y": 3},
 
-                {"label":"k04_00", "x":0, "y":4},
-                {"label":"k04_01", "x":1, "y":4},
-                {"label":"k04_02", "x":2, "y":4},
-                {"label":"k04_03", "x":3, "y":4},
-                {"label":"k04_04", "x":4, "y":4},
-                {"label":"k04_05", "x":5, "y":4},
-                {"label":"k04_06", "x":6, "y":4},
-                {"label":"k04_07", "x":7, "y":4},
-                {"label":"k04_08", "x":8, "y":4},
-                {"label":"k04_09", "x":9, "y":4},
-                {"label":"k04_10", "x":10, "y":4},
-                {"label":"k04_11", "x":11, "y":4},
-                {"label":"k04_12", "x":12, "y":4},
-                {"label":"k04_13", "x":13, "y":4},
-                {"label":"k04_14", "x":14, "y":4},
-                {"label":"k04_15", "x":15, "y":4},
-                {"label":"k04_16", "x":16, "y":4},
-                {"label":"k04_17", "x":17, "y":4},
-                {"label":"k04_18", "x":18, "y":4},
-                {"label":"k04_19", "x":19, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4},
+                {"matrix": [4, 17], "x": 17, "y": 4},
+                {"matrix": [4, 18], "x": 18, "y": 4},
+                {"matrix": [4, 19], "x": 19, "y": 4},
 
-                {"label":"k05_00", "x":0, "y":5},
-                {"label":"k05_01", "x":1, "y":5},
-                {"label":"k05_02", "x":2, "y":5},
-                {"label":"k05_03", "x":3, "y":5},
-                {"label":"k05_04", "x":4, "y":5},
-                {"label":"k05_05", "x":5, "y":5},
-                {"label":"k05_06", "x":6, "y":5},
-                {"label":"k05_07", "x":7, "y":5},
-                {"label":"k05_08", "x":8, "y":5},
-                {"label":"k05_09", "x":9, "y":5},
-                {"label":"k05_10", "x":10, "y":5},
-                {"label":"k05_11", "x":11, "y":5},
-                {"label":"k05_12", "x":12, "y":5},
-                {"label":"k05_13", "x":13, "y":5},
-                {"label":"k05_14", "x":14, "y":5},
-                {"label":"k05_15", "x":15, "y":5},
-                {"label":"k05_16", "x":16, "y":5},
-                {"label":"k05_17", "x":17, "y":5},
-                {"label":"k05_18", "x":18, "y":5},
-                {"label":"k05_19", "x":19, "y":5},
+                {"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": [5, 9], "x": 9, "y": 5},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5},
+                {"matrix": [5, 16], "x": 16, "y": 5},
+                {"matrix": [5, 17], "x": 17, "y": 5},
+                {"matrix": [5, 18], "x": 18, "y": 5},
+                {"matrix": [5, 19], "x": 19, "y": 5},
 
-                {"label":"k06_00", "x":0, "y":6},
-                {"label":"k06_01", "x":1, "y":6},
-                {"label":"k06_02", "x":2, "y":6},
-                {"label":"k06_03", "x":3, "y":6},
-                {"label":"k06_04", "x":4, "y":6},
-                {"label":"k06_05", "x":5, "y":6},
-                {"label":"k06_06", "x":6, "y":6},
-                {"label":"k06_07", "x":7, "y":6},
-                {"label":"k06_08", "x":8, "y":6},
-                {"label":"k06_09", "x":9, "y":6},
-                {"label":"k06_10", "x":10, "y":6},
-                {"label":"k06_11", "x":11, "y":6},
-                {"label":"k06_12", "x":12, "y":6},
-                {"label":"k06_13", "x":13, "y":6},
-                {"label":"k06_14", "x":14, "y":6},
-                {"label":"k06_15", "x":15, "y":6},
-                {"label":"k06_16", "x":16, "y":6},
-                {"label":"k06_17", "x":17, "y":6},
-                {"label":"k06_18", "x":18, "y":6},
-                {"label":"k06_19", "x":19, "y":6},
+                {"matrix": [6, 0], "x": 0, "y": 6},
+                {"matrix": [6, 1], "x": 1, "y": 6},
+                {"matrix": [6, 2], "x": 2, "y": 6},
+                {"matrix": [6, 3], "x": 3, "y": 6},
+                {"matrix": [6, 4], "x": 4, "y": 6},
+                {"matrix": [6, 5], "x": 5, "y": 6},
+                {"matrix": [6, 6], "x": 6, "y": 6},
+                {"matrix": [6, 7], "x": 7, "y": 6},
+                {"matrix": [6, 8], "x": 8, "y": 6},
+                {"matrix": [6, 9], "x": 9, "y": 6},
+                {"matrix": [6, 10], "x": 10, "y": 6},
+                {"matrix": [6, 11], "x": 11, "y": 6},
+                {"matrix": [6, 12], "x": 12, "y": 6},
+                {"matrix": [6, 13], "x": 13, "y": 6},
+                {"matrix": [6, 14], "x": 14, "y": 6},
+                {"matrix": [6, 15], "x": 15, "y": 6},
+                {"matrix": [6, 16], "x": 16, "y": 6},
+                {"matrix": [6, 17], "x": 17, "y": 6},
+                {"matrix": [6, 18], "x": 18, "y": 6},
+                {"matrix": [6, 19], "x": 19, "y": 6},
 
-                {"label":"k07_00", "x":0, "y":7},
-                {"label":"k07_01", "x":1, "y":7},
-                {"label":"k07_02", "x":2, "y":7},
-                {"label":"k07_03", "x":3, "y":7},
-                {"label":"k07_04", "x":4, "y":7},
-                {"label":"k07_05", "x":5, "y":7},
-                {"label":"k07_06", "x":6, "y":7},
-                {"label":"k07_07", "x":7, "y":7},
-                {"label":"k07_08", "x":8, "y":7},
-                {"label":"k07_09", "x":9, "y":7},
-                {"label":"k07_10", "x":10, "y":7},
-                {"label":"k07_11", "x":11, "y":7},
-                {"label":"k07_12", "x":12, "y":7},
-                {"label":"k07_13", "x":13, "y":7},
-                {"label":"k07_14", "x":14, "y":7},
-                {"label":"k07_15", "x":15, "y":7},
-                {"label":"k07_16", "x":16, "y":7},
-                {"label":"k07_17", "x":17, "y":7},
-                {"label":"k07_18", "x":18, "y":7},
-                {"label":"k07_19", "x":19, "y":7},
+                {"matrix": [7, 0], "x": 0, "y": 7},
+                {"matrix": [7, 1], "x": 1, "y": 7},
+                {"matrix": [7, 2], "x": 2, "y": 7},
+                {"matrix": [7, 3], "x": 3, "y": 7},
+                {"matrix": [7, 4], "x": 4, "y": 7},
+                {"matrix": [7, 5], "x": 5, "y": 7},
+                {"matrix": [7, 6], "x": 6, "y": 7},
+                {"matrix": [7, 7], "x": 7, "y": 7},
+                {"matrix": [7, 8], "x": 8, "y": 7},
+                {"matrix": [7, 9], "x": 9, "y": 7},
+                {"matrix": [7, 10], "x": 10, "y": 7},
+                {"matrix": [7, 11], "x": 11, "y": 7},
+                {"matrix": [7, 12], "x": 12, "y": 7},
+                {"matrix": [7, 13], "x": 13, "y": 7},
+                {"matrix": [7, 14], "x": 14, "y": 7},
+                {"matrix": [7, 15], "x": 15, "y": 7},
+                {"matrix": [7, 16], "x": 16, "y": 7},
+                {"matrix": [7, 17], "x": 17, "y": 7},
+                {"matrix": [7, 18], "x": 18, "y": 7},
+                {"matrix": [7, 19], "x": 19, "y": 7},
 
-                {"label":"k08_00", "x":0, "y":8},
-                {"label":"k08_01", "x":1, "y":8},
-                {"label":"k08_02", "x":2, "y":8},
-                {"label":"k08_03", "x":3, "y":8},
-                {"label":"k08_04", "x":4, "y":8},
-                {"label":"k08_05", "x":5, "y":8},
-                {"label":"k08_06", "x":6, "y":8},
-                {"label":"k08_07", "x":7, "y":8},
-                {"label":"k08_08", "x":8, "y":8},
-                {"label":"k08_09", "x":9, "y":8},
-                {"label":"k08_10", "x":10, "y":8},
-                {"label":"k08_11", "x":11, "y":8},
-                {"label":"k08_12", "x":12, "y":8},
-                {"label":"k08_13", "x":13, "y":8},
-                {"label":"k08_14", "x":14, "y":8},
-                {"label":"k08_15", "x":15, "y":8},
-                {"label":"k08_16", "x":16, "y":8},
-                {"label":"k08_17", "x":17, "y":8},
-                {"label":"k08_18", "x":18, "y":8},
-                {"label":"k08_19", "x":19, "y":8},
+                {"matrix": [8, 0], "x": 0, "y": 8},
+                {"matrix": [8, 1], "x": 1, "y": 8},
+                {"matrix": [8, 2], "x": 2, "y": 8},
+                {"matrix": [8, 3], "x": 3, "y": 8},
+                {"matrix": [8, 4], "x": 4, "y": 8},
+                {"matrix": [8, 5], "x": 5, "y": 8},
+                {"matrix": [8, 6], "x": 6, "y": 8},
+                {"matrix": [8, 7], "x": 7, "y": 8},
+                {"matrix": [8, 8], "x": 8, "y": 8},
+                {"matrix": [8, 9], "x": 9, "y": 8},
+                {"matrix": [8, 10], "x": 10, "y": 8},
+                {"matrix": [8, 11], "x": 11, "y": 8},
+                {"matrix": [8, 12], "x": 12, "y": 8},
+                {"matrix": [8, 13], "x": 13, "y": 8},
+                {"matrix": [8, 14], "x": 14, "y": 8},
+                {"matrix": [8, 15], "x": 15, "y": 8},
+                {"matrix": [8, 16], "x": 16, "y": 8},
+                {"matrix": [8, 17], "x": 17, "y": 8},
+                {"matrix": [8, 18], "x": 18, "y": 8},
+                {"matrix": [8, 19], "x": 19, "y": 8},
 
-                {"label":"k09_00", "x":0, "y":9},
-                {"label":"k09_01", "x":1, "y":9},
-                {"label":"k09_02", "x":2, "y":9},
-                {"label":"k09_03", "x":3, "y":9},
-                {"label":"k09_04", "x":4, "y":9},
-                {"label":"k09_05", "x":5, "y":9},
-                {"label":"k09_06", "x":6, "y":9},
-                {"label":"k09_07", "x":7, "y":9},
-                {"label":"k09_08", "x":8, "y":9},
-                {"label":"k09_09", "x":9, "y":9},
-                {"label":"k09_10", "x":10, "y":9},
-                {"label":"k09_11", "x":11, "y":9},
-                {"label":"k09_12", "x":12, "y":9},
-                {"label":"k09_13", "x":13, "y":9},
-                {"label":"k09_14", "x":14, "y":9},
-                {"label":"k09_15", "x":15, "y":9},
-                {"label":"k09_16", "x":16, "y":9},
-                {"label":"k09_17", "x":17, "y":9},
-                {"label":"k09_18", "x":18, "y":9},
-                {"label":"k09_19", "x":19, "y":9},
+                {"matrix": [9, 0], "x": 0, "y": 9},
+                {"matrix": [9, 1], "x": 1, "y": 9},
+                {"matrix": [9, 2], "x": 2, "y": 9},
+                {"matrix": [9, 3], "x": 3, "y": 9},
+                {"matrix": [9, 4], "x": 4, "y": 9},
+                {"matrix": [9, 5], "x": 5, "y": 9},
+                {"matrix": [9, 6], "x": 6, "y": 9},
+                {"matrix": [9, 7], "x": 7, "y": 9},
+                {"matrix": [9, 8], "x": 8, "y": 9},
+                {"matrix": [9, 9], "x": 9, "y": 9},
+                {"matrix": [9, 10], "x": 10, "y": 9},
+                {"matrix": [9, 11], "x": 11, "y": 9},
+                {"matrix": [9, 12], "x": 12, "y": 9},
+                {"matrix": [9, 13], "x": 13, "y": 9},
+                {"matrix": [9, 14], "x": 14, "y": 9},
+                {"matrix": [9, 15], "x": 15, "y": 9},
+                {"matrix": [9, 16], "x": 16, "y": 9},
+                {"matrix": [9, 17], "x": 17, "y": 9},
+                {"matrix": [9, 18], "x": 18, "y": 9},
+                {"matrix": [9, 19], "x": 19, "y": 9},
 
-                {"label":"k10_00", "x":0, "y":10},
-                {"label":"k10_01", "x":1, "y":10},
-                {"label":"k10_02", "x":2, "y":10},
-                {"label":"k10_03", "x":3, "y":10},
-                {"label":"k10_04", "x":4, "y":10},
-                {"label":"k10_05", "x":5, "y":10},
-                {"label":"k10_06", "x":6, "y":10},
-                {"label":"k10_07", "x":7, "y":10},
-                {"label":"k10_08", "x":8, "y":10},
-                {"label":"k10_09", "x":9, "y":10},
-                {"label":"k10_10", "x":10, "y":10},
-                {"label":"k10_11", "x":11, "y":10},
-                {"label":"k10_12", "x":12, "y":10},
-                {"label":"k10_13", "x":13, "y":10},
-                {"label":"k10_14", "x":14, "y":10},
-                {"label":"k10_15", "x":15, "y":10},
-                {"label":"k10_16", "x":16, "y":10},
-                {"label":"k10_17", "x":17, "y":10},
-                {"label":"k10_18", "x":18, "y":10},
-                {"label":"k10_19", "x":19, "y":10},
+                {"matrix": [10, 0], "x": 0, "y": 10},
+                {"matrix": [10, 1], "x": 1, "y": 10},
+                {"matrix": [10, 2], "x": 2, "y": 10},
+                {"matrix": [10, 3], "x": 3, "y": 10},
+                {"matrix": [10, 4], "x": 4, "y": 10},
+                {"matrix": [10, 5], "x": 5, "y": 10},
+                {"matrix": [10, 6], "x": 6, "y": 10},
+                {"matrix": [10, 7], "x": 7, "y": 10},
+                {"matrix": [10, 8], "x": 8, "y": 10},
+                {"matrix": [10, 9], "x": 9, "y": 10},
+                {"matrix": [10, 10], "x": 10, "y": 10},
+                {"matrix": [10, 11], "x": 11, "y": 10},
+                {"matrix": [10, 12], "x": 12, "y": 10},
+                {"matrix": [10, 13], "x": 13, "y": 10},
+                {"matrix": [10, 14], "x": 14, "y": 10},
+                {"matrix": [10, 15], "x": 15, "y": 10},
+                {"matrix": [10, 16], "x": 16, "y": 10},
+                {"matrix": [10, 17], "x": 17, "y": 10},
+                {"matrix": [10, 18], "x": 18, "y": 10},
+                {"matrix": [10, 19], "x": 19, "y": 10},
 
-                {"label":"k11_00", "x":0, "y":11},
-                {"label":"k11_01", "x":1, "y":11},
-                {"label":"k11_02", "x":2, "y":11},
-                {"label":"k11_03", "x":3, "y":11},
-                {"label":"k11_04", "x":4, "y":11},
-                {"label":"k11_05", "x":5, "y":11},
-                {"label":"k11_06", "x":6, "y":11},
-                {"label":"k11_07", "x":7, "y":11},
-                {"label":"k11_08", "x":8, "y":11},
-                {"label":"k11_09", "x":9, "y":11},
-                {"label":"k11_10", "x":10, "y":11},
-                {"label":"k11_11", "x":11, "y":11},
-                {"label":"k11_12", "x":12, "y":11},
-                {"label":"k11_13", "x":13, "y":11},
-                {"label":"k11_14", "x":14, "y":11},
-                {"label":"k11_15", "x":15, "y":11},
-                {"label":"k11_16", "x":16, "y":11},
-                {"label":"k11_17", "x":17, "y":11},
-                {"label":"k11_18", "x":18, "y":11},
-                {"label":"k11_19", "x":19, "y":11},
+                {"matrix": [11, 0], "x": 0, "y": 11},
+                {"matrix": [11, 1], "x": 1, "y": 11},
+                {"matrix": [11, 2], "x": 2, "y": 11},
+                {"matrix": [11, 3], "x": 3, "y": 11},
+                {"matrix": [11, 4], "x": 4, "y": 11},
+                {"matrix": [11, 5], "x": 5, "y": 11},
+                {"matrix": [11, 6], "x": 6, "y": 11},
+                {"matrix": [11, 7], "x": 7, "y": 11},
+                {"matrix": [11, 8], "x": 8, "y": 11},
+                {"matrix": [11, 9], "x": 9, "y": 11},
+                {"matrix": [11, 10], "x": 10, "y": 11},
+                {"matrix": [11, 11], "x": 11, "y": 11},
+                {"matrix": [11, 12], "x": 12, "y": 11},
+                {"matrix": [11, 13], "x": 13, "y": 11},
+                {"matrix": [11, 14], "x": 14, "y": 11},
+                {"matrix": [11, 15], "x": 15, "y": 11},
+                {"matrix": [11, 16], "x": 16, "y": 11},
+                {"matrix": [11, 17], "x": 17, "y": 11},
+                {"matrix": [11, 18], "x": 18, "y": 11},
+                {"matrix": [11, 19], "x": 19, "y": 11},
 
-                {"label":"k12_00", "x":0, "y":12},
-                {"label":"k12_01", "x":1, "y":12},
-                {"label":"k12_02", "x":2, "y":12},
-                {"label":"k12_03", "x":3, "y":12},
-                {"label":"k12_04", "x":4, "y":12},
-                {"label":"k12_05", "x":5, "y":12},
-                {"label":"k12_06", "x":6, "y":12},
-                {"label":"k12_07", "x":7, "y":12},
-                {"label":"k12_08", "x":8, "y":12},
-                {"label":"k12_09", "x":9, "y":12},
-                {"label":"k12_10", "x":10, "y":12},
-                {"label":"k12_11", "x":11, "y":12},
-                {"label":"k12_12", "x":12, "y":12},
-                {"label":"k12_13", "x":13, "y":12},
-                {"label":"k12_14", "x":14, "y":12},
-                {"label":"k12_15", "x":15, "y":12},
-                {"label":"k12_16", "x":16, "y":12},
-                {"label":"k12_17", "x":17, "y":12},
-                {"label":"k12_18", "x":18, "y":12},
-                {"label":"k12_19", "x":19, "y":12},
+                {"matrix": [12, 0], "x": 0, "y": 12},
+                {"matrix": [12, 1], "x": 1, "y": 12},
+                {"matrix": [12, 2], "x": 2, "y": 12},
+                {"matrix": [12, 3], "x": 3, "y": 12},
+                {"matrix": [12, 4], "x": 4, "y": 12},
+                {"matrix": [12, 5], "x": 5, "y": 12},
+                {"matrix": [12, 6], "x": 6, "y": 12},
+                {"matrix": [12, 7], "x": 7, "y": 12},
+                {"matrix": [12, 8], "x": 8, "y": 12},
+                {"matrix": [12, 9], "x": 9, "y": 12},
+                {"matrix": [12, 10], "x": 10, "y": 12},
+                {"matrix": [12, 11], "x": 11, "y": 12},
+                {"matrix": [12, 12], "x": 12, "y": 12},
+                {"matrix": [12, 13], "x": 13, "y": 12},
+                {"matrix": [12, 14], "x": 14, "y": 12},
+                {"matrix": [12, 15], "x": 15, "y": 12},
+                {"matrix": [12, 16], "x": 16, "y": 12},
+                {"matrix": [12, 17], "x": 17, "y": 12},
+                {"matrix": [12, 18], "x": 18, "y": 12},
+                {"matrix": [12, 19], "x": 19, "y": 12},
 
-                {"label":"k13_00", "x":0, "y":13},
-                {"label":"k13_01", "x":1, "y":13},
-                {"label":"k13_02", "x":2, "y":13},
-                {"label":"k13_03", "x":3, "y":13},
-                {"label":"k13_04", "x":4, "y":13},
-                {"label":"k13_05", "x":5, "y":13},
-                {"label":"k13_06", "x":6, "y":13},
-                {"label":"k13_07", "x":7, "y":13},
-                {"label":"k13_08", "x":8, "y":13},
-                {"label":"k13_09", "x":9, "y":13},
-                {"label":"k13_10", "x":10, "y":13},
-                {"label":"k13_11", "x":11, "y":13},
-                {"label":"k13_12", "x":12, "y":13},
-                {"label":"k13_13", "x":13, "y":13},
-                {"label":"k13_14", "x":14, "y":13},
-                {"label":"k13_15", "x":15, "y":13},
-                {"label":"k13_16", "x":16, "y":13},
-                {"label":"k13_17", "x":17, "y":13},
-                {"label":"k13_18", "x":18, "y":13},
-                {"label":"k13_19", "x":19, "y":13},
+                {"matrix": [13, 0], "x": 0, "y": 13},
+                {"matrix": [13, 1], "x": 1, "y": 13},
+                {"matrix": [13, 2], "x": 2, "y": 13},
+                {"matrix": [13, 3], "x": 3, "y": 13},
+                {"matrix": [13, 4], "x": 4, "y": 13},
+                {"matrix": [13, 5], "x": 5, "y": 13},
+                {"matrix": [13, 6], "x": 6, "y": 13},
+                {"matrix": [13, 7], "x": 7, "y": 13},
+                {"matrix": [13, 8], "x": 8, "y": 13},
+                {"matrix": [13, 9], "x": 9, "y": 13},
+                {"matrix": [13, 10], "x": 10, "y": 13},
+                {"matrix": [13, 11], "x": 11, "y": 13},
+                {"matrix": [13, 12], "x": 12, "y": 13},
+                {"matrix": [13, 13], "x": 13, "y": 13},
+                {"matrix": [13, 14], "x": 14, "y": 13},
+                {"matrix": [13, 15], "x": 15, "y": 13},
+                {"matrix": [13, 16], "x": 16, "y": 13},
+                {"matrix": [13, 17], "x": 17, "y": 13},
+                {"matrix": [13, 18], "x": 18, "y": 13},
+                {"matrix": [13, 19], "x": 19, "y": 13},
 
-                {"label":"k14_00", "x":0, "y":14},
-                {"label":"k14_01", "x":1, "y":14},
-                {"label":"k14_02", "x":2, "y":14},
-                {"label":"k14_03", "x":3, "y":14},
-                {"label":"k14_04", "x":4, "y":14},
-                {"label":"k14_05", "x":5, "y":14},
-                {"label":"k14_06", "x":6, "y":14},
-                {"label":"k14_07", "x":7, "y":14},
-                {"label":"k14_08", "x":8, "y":14},
-                {"label":"k14_09", "x":9, "y":14},
-                {"label":"k14_10", "x":10, "y":14},
-                {"label":"k14_11", "x":11, "y":14},
-                {"label":"k14_12", "x":12, "y":14},
-                {"label":"k14_13", "x":13, "y":14},
-                {"label":"k14_14", "x":14, "y":14},
-                {"label":"k14_15", "x":15, "y":14},
-                {"label":"k14_16", "x":16, "y":14},
-                {"label":"k14_17", "x":17, "y":14},
-                {"label":"k14_18", "x":18, "y":14},
-                {"label":"k14_19", "x":19, "y":14},
+                {"matrix": [14, 0], "x": 0, "y": 14},
+                {"matrix": [14, 1], "x": 1, "y": 14},
+                {"matrix": [14, 2], "x": 2, "y": 14},
+                {"matrix": [14, 3], "x": 3, "y": 14},
+                {"matrix": [14, 4], "x": 4, "y": 14},
+                {"matrix": [14, 5], "x": 5, "y": 14},
+                {"matrix": [14, 6], "x": 6, "y": 14},
+                {"matrix": [14, 7], "x": 7, "y": 14},
+                {"matrix": [14, 8], "x": 8, "y": 14},
+                {"matrix": [14, 9], "x": 9, "y": 14},
+                {"matrix": [14, 10], "x": 10, "y": 14},
+                {"matrix": [14, 11], "x": 11, "y": 14},
+                {"matrix": [14, 12], "x": 12, "y": 14},
+                {"matrix": [14, 13], "x": 13, "y": 14},
+                {"matrix": [14, 14], "x": 14, "y": 14},
+                {"matrix": [14, 15], "x": 15, "y": 14},
+                {"matrix": [14, 16], "x": 16, "y": 14},
+                {"matrix": [14, 17], "x": 17, "y": 14},
+                {"matrix": [14, 18], "x": 18, "y": 14},
+                {"matrix": [14, 19], "x": 19, "y": 14},
 
-                {"label":"k15_00", "x":0, "y":15},
-                {"label":"k15_01", "x":1, "y":15},
-                {"label":"k15_02", "x":2, "y":15},
-                {"label":"k15_03", "x":3, "y":15},
-                {"label":"k15_04", "x":4, "y":15},
-                {"label":"k15_05", "x":5, "y":15},
-                {"label":"k15_06", "x":6, "y":15},
-                {"label":"k15_07", "x":7, "y":15},
-                {"label":"k15_08", "x":8, "y":15},
-                {"label":"k15_09", "x":9, "y":15},
-                {"label":"k15_10", "x":10, "y":15},
-                {"label":"k15_11", "x":11, "y":15},
-                {"label":"k15_12", "x":12, "y":15},
-                {"label":"k15_13", "x":13, "y":15},
-                {"label":"k15_14", "x":14, "y":15},
-                {"label":"k15_15", "x":15, "y":15},
-                {"label":"k15_16", "x":16, "y":15},
-                {"label":"k15_17", "x":17, "y":15},
-                {"label":"k15_18", "x":18, "y":15},
-                {"label":"k15_19", "x":19, "y":15},
+                {"matrix": [15, 0], "x": 0, "y": 15},
+                {"matrix": [15, 1], "x": 1, "y": 15},
+                {"matrix": [15, 2], "x": 2, "y": 15},
+                {"matrix": [15, 3], "x": 3, "y": 15},
+                {"matrix": [15, 4], "x": 4, "y": 15},
+                {"matrix": [15, 5], "x": 5, "y": 15},
+                {"matrix": [15, 6], "x": 6, "y": 15},
+                {"matrix": [15, 7], "x": 7, "y": 15},
+                {"matrix": [15, 8], "x": 8, "y": 15},
+                {"matrix": [15, 9], "x": 9, "y": 15},
+                {"matrix": [15, 10], "x": 10, "y": 15},
+                {"matrix": [15, 11], "x": 11, "y": 15},
+                {"matrix": [15, 12], "x": 12, "y": 15},
+                {"matrix": [15, 13], "x": 13, "y": 15},
+                {"matrix": [15, 14], "x": 14, "y": 15},
+                {"matrix": [15, 15], "x": 15, "y": 15},
+                {"matrix": [15, 16], "x": 16, "y": 15},
+                {"matrix": [15, 17], "x": 17, "y": 15},
+                {"matrix": [15, 18], "x": 18, "y": 15},
+                {"matrix": [15, 19], "x": 19, "y": 15},
 
-                {"label":"k16_00", "x":0, "y":16},
-                {"label":"k16_01", "x":1, "y":16},
-                {"label":"k16_02", "x":2, "y":16},
-                {"label":"k16_03", "x":3, "y":16},
-                {"label":"k16_04", "x":4, "y":16},
-                {"label":"k16_05", "x":5, "y":16},
-                {"label":"k16_06", "x":6, "y":16},
-                {"label":"k16_07", "x":7, "y":16},
-                {"label":"k16_08", "x":8, "y":16},
-                {"label":"k16_09", "x":9, "y":16},
-                {"label":"k16_10", "x":10, "y":16},
-                {"label":"k16_11", "x":11, "y":16},
-                {"label":"k16_12", "x":12, "y":16},
-                {"label":"k16_13", "x":13, "y":16},
-                {"label":"k16_14", "x":14, "y":16},
-                {"label":"k16_15", "x":15, "y":16},
-                {"label":"k16_16", "x":16, "y":16},
-                {"label":"k16_17", "x":17, "y":16},
-                {"label":"k16_18", "x":18, "y":16},
-                {"label":"k16_19", "x":19, "y":16},
+                {"matrix": [16, 0], "x": 0, "y": 16},
+                {"matrix": [16, 1], "x": 1, "y": 16},
+                {"matrix": [16, 2], "x": 2, "y": 16},
+                {"matrix": [16, 3], "x": 3, "y": 16},
+                {"matrix": [16, 4], "x": 4, "y": 16},
+                {"matrix": [16, 5], "x": 5, "y": 16},
+                {"matrix": [16, 6], "x": 6, "y": 16},
+                {"matrix": [16, 7], "x": 7, "y": 16},
+                {"matrix": [16, 8], "x": 8, "y": 16},
+                {"matrix": [16, 9], "x": 9, "y": 16},
+                {"matrix": [16, 10], "x": 10, "y": 16},
+                {"matrix": [16, 11], "x": 11, "y": 16},
+                {"matrix": [16, 12], "x": 12, "y": 16},
+                {"matrix": [16, 13], "x": 13, "y": 16},
+                {"matrix": [16, 14], "x": 14, "y": 16},
+                {"matrix": [16, 15], "x": 15, "y": 16},
+                {"matrix": [16, 16], "x": 16, "y": 16},
+                {"matrix": [16, 17], "x": 17, "y": 16},
+                {"matrix": [16, 18], "x": 18, "y": 16},
+                {"matrix": [16, 19], "x": 19, "y": 16},
 
-                {"label":"k17_00", "x":0, "y":17},
-                {"label":"k17_01", "x":1, "y":17},
-                {"label":"k17_02", "x":2, "y":17},
-                {"label":"k17_03", "x":3, "y":17},
-                {"label":"k17_04", "x":4, "y":17},
-                {"label":"k17_05", "x":5, "y":17},
-                {"label":"k17_06", "x":6, "y":17},
-                {"label":"k17_07", "x":7, "y":17},
-                {"label":"k17_08", "x":8, "y":17},
-                {"label":"k17_09", "x":9, "y":17},
-                {"label":"k17_10", "x":10, "y":17},
-                {"label":"k17_11", "x":11, "y":17},
-                {"label":"k17_12", "x":12, "y":17},
-                {"label":"k17_13", "x":13, "y":17},
-                {"label":"k17_14", "x":14, "y":17},
-                {"label":"k17_15", "x":15, "y":17},
-                {"label":"k17_16", "x":16, "y":17},
-                {"label":"k17_17", "x":17, "y":17},
-                {"label":"k17_18", "x":18, "y":17},
-                {"label":"k17_19", "x":19, "y":17},
+                {"matrix": [17, 0], "x": 0, "y": 17},
+                {"matrix": [17, 1], "x": 1, "y": 17},
+                {"matrix": [17, 2], "x": 2, "y": 17},
+                {"matrix": [17, 3], "x": 3, "y": 17},
+                {"matrix": [17, 4], "x": 4, "y": 17},
+                {"matrix": [17, 5], "x": 5, "y": 17},
+                {"matrix": [17, 6], "x": 6, "y": 17},
+                {"matrix": [17, 7], "x": 7, "y": 17},
+                {"matrix": [17, 8], "x": 8, "y": 17},
+                {"matrix": [17, 9], "x": 9, "y": 17},
+                {"matrix": [17, 10], "x": 10, "y": 17},
+                {"matrix": [17, 11], "x": 11, "y": 17},
+                {"matrix": [17, 12], "x": 12, "y": 17},
+                {"matrix": [17, 13], "x": 13, "y": 17},
+                {"matrix": [17, 14], "x": 14, "y": 17},
+                {"matrix": [17, 15], "x": 15, "y": 17},
+                {"matrix": [17, 16], "x": 16, "y": 17},
+                {"matrix": [17, 17], "x": 17, "y": 17},
+                {"matrix": [17, 18], "x": 18, "y": 17},
+                {"matrix": [17, 19], "x": 19, "y": 17},
 
-                {"label":"k18_00", "x":0, "y":18},
-                {"label":"k18_01", "x":1, "y":18},
-                {"label":"k18_02", "x":2, "y":18},
-                {"label":"k18_03", "x":3, "y":18},
-                {"label":"k18_04", "x":4, "y":18},
-                {"label":"k18_05", "x":5, "y":18},
-                {"label":"k18_06", "x":6, "y":18},
-                {"label":"k18_07", "x":7, "y":18},
-                {"label":"k18_08", "x":8, "y":18},
-                {"label":"k18_09", "x":9, "y":18},
-                {"label":"k18_10", "x":10, "y":18},
-                {"label":"k18_11", "x":11, "y":18},
-                {"label":"k18_12", "x":12, "y":18},
-                {"label":"k18_13", "x":13, "y":18},
-                {"label":"k18_14", "x":14, "y":18},
-                {"label":"k18_15", "x":15, "y":18},
-                {"label":"k18_16", "x":16, "y":18},
-                {"label":"k18_17", "x":17, "y":18},
-                {"label":"k18_18", "x":18, "y":18},
-                {"label":"k18_19", "x":19, "y":18},
+                {"matrix": [18, 0], "x": 0, "y": 18},
+                {"matrix": [18, 1], "x": 1, "y": 18},
+                {"matrix": [18, 2], "x": 2, "y": 18},
+                {"matrix": [18, 3], "x": 3, "y": 18},
+                {"matrix": [18, 4], "x": 4, "y": 18},
+                {"matrix": [18, 5], "x": 5, "y": 18},
+                {"matrix": [18, 6], "x": 6, "y": 18},
+                {"matrix": [18, 7], "x": 7, "y": 18},
+                {"matrix": [18, 8], "x": 8, "y": 18},
+                {"matrix": [18, 9], "x": 9, "y": 18},
+                {"matrix": [18, 10], "x": 10, "y": 18},
+                {"matrix": [18, 11], "x": 11, "y": 18},
+                {"matrix": [18, 12], "x": 12, "y": 18},
+                {"matrix": [18, 13], "x": 13, "y": 18},
+                {"matrix": [18, 14], "x": 14, "y": 18},
+                {"matrix": [18, 15], "x": 15, "y": 18},
+                {"matrix": [18, 16], "x": 16, "y": 18},
+                {"matrix": [18, 17], "x": 17, "y": 18},
+                {"matrix": [18, 18], "x": 18, "y": 18},
+                {"matrix": [18, 19], "x": 19, "y": 18},
 
-                {"label":"k19_00", "x":0, "y":19},
-                {"label":"k19_01", "x":1, "y":19},
-                {"label":"k19_02", "x":2, "y":19},
-                {"label":"k19_03", "x":3, "y":19},
-                {"label":"k19_04", "x":4, "y":19},
-                {"label":"k19_05", "x":5, "y":19},
-                {"label":"k19_06", "x":6, "y":19},
-                {"label":"k19_07", "x":7, "y":19},
-                {"label":"k19_08", "x":8, "y":19},
-                {"label":"k19_09", "x":9, "y":19},
-                {"label":"k19_10", "x":10, "y":19},
-                {"label":"k19_11", "x":11, "y":19},
-                {"label":"k19_12", "x":12, "y":19},
-                {"label":"k19_13", "x":13, "y":19},
-                {"label":"k19_14", "x":14, "y":19},
-                {"label":"k19_15", "x":15, "y":19},
-                {"label":"k19_16", "x":16, "y":19},
-                {"label":"k19_17", "x":17, "y":19},
-                {"label":"k19_18", "x":18, "y":19},
-                {"label":"k19_19", "x":19, "y":19}
+                {"matrix": [19, 0], "x": 0, "y": 19},
+                {"matrix": [19, 1], "x": 1, "y": 19},
+                {"matrix": [19, 2], "x": 2, "y": 19},
+                {"matrix": [19, 3], "x": 3, "y": 19},
+                {"matrix": [19, 4], "x": 4, "y": 19},
+                {"matrix": [19, 5], "x": 5, "y": 19},
+                {"matrix": [19, 6], "x": 6, "y": 19},
+                {"matrix": [19, 7], "x": 7, "y": 19},
+                {"matrix": [19, 8], "x": 8, "y": 19},
+                {"matrix": [19, 9], "x": 9, "y": 19},
+                {"matrix": [19, 10], "x": 10, "y": 19},
+                {"matrix": [19, 11], "x": 11, "y": 19},
+                {"matrix": [19, 12], "x": 12, "y": 19},
+                {"matrix": [19, 13], "x": 13, "y": 19},
+                {"matrix": [19, 14], "x": 14, "y": 19},
+                {"matrix": [19, 15], "x": 15, "y": 19},
+                {"matrix": [19, 16], "x": 16, "y": 19},
+                {"matrix": [19, 17], "x": 17, "y": 19},
+                {"matrix": [19, 18], "x": 18, "y": 19},
+                {"matrix": [19, 19], "x": 19, "y": 19}
             ]
         }
     }
diff --git a/keyboards/cutie_club/keebcats/denis/config.h b/keyboards/cutie_club/keebcats/denis/config.h
index 7e46d166b7..c5eb6384a3 100644
--- a/keyboards/cutie_club/keebcats/denis/config.h
+++ b/keyboards/cutie_club/keebcats/denis/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B2, D0, F5, F4, F1 }
-#define MATRIX_COL_PINS { E6, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cutie_club/keebcats/denis/denis.c b/keyboards/cutie_club/keebcats/denis/denis.c
deleted file mode 100644
index c661e8cbb5..0000000000
--- a/keyboards/cutie_club/keebcats/denis/denis.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Cutie Club
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "denis.h"
diff --git a/keyboards/cutie_club/keebcats/denis/info.json b/keyboards/cutie_club/keebcats/denis/info.json
index 0fe5fcf534..c4171df94d 100644
--- a/keyboards/cutie_club/keebcats/denis/info.json
+++ b/keyboards/cutie_club/keebcats/denis/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB260",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+        "rows": ["B2", "D0", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F0"
     },
diff --git a/keyboards/cutie_club/keebcats/dougal/config.h b/keyboards/cutie_club/keebcats/dougal/config.h
index d2f4b19e87..c5eb6384a3 100644
--- a/keyboards/cutie_club/keebcats/dougal/config.h
+++ b/keyboards/cutie_club/keebcats/dougal/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B2, D0, F5, F4, F1 }
-#define MATRIX_COL_PINS { E6, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cutie_club/keebcats/dougal/dougal.c b/keyboards/cutie_club/keebcats/dougal/dougal.c
deleted file mode 100644
index 8f247bd287..0000000000
--- a/keyboards/cutie_club/keebcats/dougal/dougal.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Cutie Club
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "dougal.h"
diff --git a/keyboards/cutie_club/keebcats/dougal/dougal.h b/keyboards/cutie_club/keebcats/dougal/dougal.h
deleted file mode 100644
index e035177dcd..0000000000
--- a/keyboards/cutie_club/keebcats/dougal/dougal.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2021 Cutie Club
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�      ┌───────�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │      │0E     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      └─┬─────┤
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤     ┌──┴�2D  │ ISO Enter
- *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │     │2C │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   ┌─┴───┴────┤
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3F │   │3C        │ 2.75u RShift
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤   └──────────┘
- *              │40  │41  │42  │44      │46  │48        │49 │4A │4B │4C │4D │4F │
- *              └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘
- *              ┌────┬────┬────┬────────────────────────┬───┬───┬───�
- *              │40  │41  │42  │46                      │49 │4A │4B │ Standard
- *              └────┴────┴────┴────────────────────────┴───┴───┴───┘
- *              ┌─────┬─────┬───────────────────────────┬─────┬─────�
- *              │40   │41   │46                         │49   │4A   │ WKL
- *              └─────┴─────┴───────────────────────────┴─────┴─────┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────�
- *              │40   │41 │42   │46                         │4A   │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, k3F, \
-    k40, k41, k42,      k44,      k46,      k48, k49, k4A, k4B,      k4C, k4D, k4F  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
-    { k40, k41, k42, ___, k44, ___, k46, ___, k48, k49, k4A, k4B, k4C, k4D, ___, k4F }  \
-}
-
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
-    k40, k41, k42,                k46,           k49, k4A, k4B, k4C, k4D, k4F  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___, k2F }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, ___, k4F }  \
-}
-
-#define LAYOUT_65_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
-    k40, k41, k42,                k46,           k49, k4A, k4B, k4C, k4D, k4F  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, ___, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, ___, k4F }  \
-}
diff --git a/keyboards/cutie_club/keebcats/dougal/info.json b/keyboards/cutie_club/keebcats/dougal/info.json
index 7555611d89..da7f99283b 100644
--- a/keyboards/cutie_club/keebcats/dougal/info.json
+++ b/keyboards/cutie_club/keebcats/dougal/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB265",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "B7"],
+        "rows": ["B2", "D0", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F0"
     },
@@ -16,232 +21,236 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "x": 13, "y": 0 },
-                { "x": 14, "y": 0 },
-                { "x": 15, "y": 0 },
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1 },
-                { "x": 2.5, "y": 1 },
-                { "x": 3.5, "y": 1 },
-                { "x": 4.5, "y": 1 },
-                { "x": 5.5, "y": 1 },
-                { "x": 6.5, "y": 1 },
-                { "x": 7.5, "y": 1 },
-                { "x": 8.5, "y": 1 },
-                { "x": 9.5, "y": 1 },
-                { "x": 10.5, "y": 1 },
-                { "x": 11.5, "y": 1 },
-                { "x": 12.5, "y": 1 },
-                { "x": 13.5, "y": 1, "w": 1.5 },
-                { "x": 15, "y": 1 },
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2 },
-                { "x": 2.75, "y": 2 },
-                { "x": 3.75, "y": 2 },
-                { "x": 4.75, "y": 2 },
-                { "x": 5.75, "y": 2 },
-                { "x": 6.75, "y": 2 },
-                { "x": 7.75, "y": 2 },
-                { "x": 8.75, "y": 2 },
-                { "x": 9.75, "y": 2 },
-                { "x": 10.75, "y": 2 },
-                { "x": 11.75, "y": 2 },
-                { "x": 12.75, "y": 2 },
-                { "x": 14, "y": 2 },
-                { "x": 15, "y": 2 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3 },
-                { "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3 },
-                { "x": 4.25, "y": 3 },
-                { "x": 5.25, "y": 3 },
-                { "x": 6.25, "y": 3 },
-                { "x": 7.25, "y": 3 },
-                { "x": 8.25, "y": 3 },
-                { "x": 9.25, "y": 3 },
-                { "x": 10.25, "y": 3 },
-                { "x": 11.25, "y": 3 },
-                { "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14, "y": 3 },
-                { "x": 15, "y": 3 },
-                { "x": 0, "y": 4, "w": 1.25 },
-                { "x": 1.25, "y": 4, "w": 1.25 },
-                { "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 2.25 },
-                { "x": 6, "y": 4, "w": 1.25 },
-                { "x": 7.25, "y": 4, "w": 2.75 },
-                { "x": 10, "y": 4 },
-                { "x": 11, "y": 4 },
-                { "x": 12, "y": 4 },
-                { "x": 13, "y": 4 },
-                { "x": 14, "y": 4 },
-                { "x": 15, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/cutie_club/novus/config.h b/keyboards/cutie_club/novus/config.h
index 001aeb5375..4c65b71f76 100644
--- a/keyboards/cutie_club/novus/config.h
+++ b/keyboards/cutie_club/novus/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B6, C6, C7, B2, B3, D0, D1, D2, D3, D7, B4, B5, D5, D4, D6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cutie_club/novus/info.json b/keyboards/cutie_club/novus/info.json
index 834021416a..e51a007def 100644
--- a/keyboards/cutie_club/novus/info.json
+++ b/keyboards/cutie_club/novus/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3F42",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "B2", "B3", "D0", "D1", "D2", "D3", "D7", "B4", "B5", "D5", "D4", "D6"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/cutie_club/novus/novus.c b/keyboards/cutie_club/novus/novus.c
deleted file mode 100644
index 2fe5fbfc8f..0000000000
--- a/keyboards/cutie_club/novus/novus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Cutie Club
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "novus.h"
diff --git a/keyboards/cutie_club/wraith/config.h b/keyboards/cutie_club/wraith/config.h
index e7a7104856..46a265902c 100644
--- a/keyboards/cutie_club/wraith/config.h
+++ b/keyboards/cutie_club/wraith/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cutie_club/wraith/info.json b/keyboards/cutie_club/wraith/info.json
index 4c27785468..f18b39837e 100644
--- a/keyboards/cutie_club/wraith/info.json
+++ b/keyboards/cutie_club/wraith/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B3",
         "on_state": 0
diff --git a/keyboards/cx60/config.h b/keyboards/cx60/config.h
index 5b9aea0a99..f14a164f57 100644
--- a/keyboards/cx60/config.h
+++ b/keyboards/cx60/config.h
@@ -16,16 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { F1, F4, F5, F6, E6 }
-#define MATRIX_COL_PINS { C7, C6, F7, F0, B4, D7, D6, B0, B1, B2, B3, D2, D3, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow */
-#define RGB_DI_PIN B6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/cx60/cx60.c b/keyboards/cx60/cx60.c
deleted file mode 100644
index 2277d14638..0000000000
--- a/keyboards/cx60/cx60.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-Copyright 2021 Horns Lyn <hornslyn@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "cx60.h"
diff --git a/keyboards/cx60/info.json b/keyboards/cx60/info.json
index c859379563..63d72e7e01 100644
--- a/keyboards/cx60/info.json
+++ b/keyboards/cx60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3630",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "F7", "F0", "B4", "D7", "D6", "B0", "B1", "B2", "B3", "D2", "D3", "D5"],
+        "rows": ["F1", "F4", "F5", "F6", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
@@ -16,6 +21,9 @@
         "caps_lock": "B5",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/cxt_studio/config.h b/keyboards/cxt_studio/config.h
index 82a60de39b..5c60daad9d 100644
--- a/keyboards/cxt_studio/config.h
+++ b/keyboards/cxt_studio/config.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #define RGB_MATRIX_LED_COUNT 12
-#define RGB_DI_PIN F7
 
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
 
diff --git a/keyboards/cxt_studio/cxt_studio.c b/keyboards/cxt_studio/cxt_studio.c
index 2e7622ff91..2b36905340 100644
--- a/keyboards/cxt_studio/cxt_studio.c
+++ b/keyboards/cxt_studio/cxt_studio.c
@@ -1,7 +1,7 @@
 // Copyright 2023 Colin Kinloch (@ColinKinloch)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 static uint8_t anim = 0;
 
diff --git a/keyboards/cxt_studio/info.json b/keyboards/cxt_studio/info.json
index 35e8031819..0c0dba55da 100644
--- a/keyboards/cxt_studio/info.json
+++ b/keyboards/cxt_studio/info.json
@@ -14,6 +14,9 @@
         "encoder": true,
         "rgb_matrix": true
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "matrix_pins": {
         "cols": ["D4", "D7", "B4", "B5"],
         "rows": ["C7", "C6", "D6", "F4"]
diff --git a/keyboards/cybergear/macro25/info.json b/keyboards/cybergear/macro25/info.json
index 8d0701104c..1737c5f8fd 100644
--- a/keyboards/cybergear/macro25/info.json
+++ b/keyboards/cybergear/macro25/info.json
@@ -14,8 +14,17 @@
     "layouts": {
         "LAYOUT_ortho_2x5": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1}
             ]
         }
     },
diff --git a/keyboards/cybergear/macro25/macro25.c b/keyboards/cybergear/macro25/macro25.c
deleted file mode 100644
index 662c5c1fe3..0000000000
--- a/keyboards/cybergear/macro25/macro25.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 CyberGear Marius Kavoliunas
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "macro25.h"
diff --git a/keyboards/cybergear/macro25/macro25.h b/keyboards/cybergear/macro25/macro25.h
deleted file mode 100644
index 22b814a97b..0000000000
--- a/keyboards/cybergear/macro25/macro25.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 CyberGear Marius Kavoliunas
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x5( \
-    K00, K01, K02, K03, K04, \
-    K05, K06, K07, K08, K09  \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K05, K06, K07, K08, K09 }, \
-}
diff --git a/keyboards/dailycraft/bat43/bat43.c b/keyboards/dailycraft/bat43/bat43.c
deleted file mode 100644
index 5d52c672b6..0000000000
--- a/keyboards/dailycraft/bat43/bat43.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bat43.h"
diff --git a/keyboards/dailycraft/bat43/bat43.h b/keyboards/dailycraft/bat43/bat43.h
deleted file mode 100644
index 046788a0a1..0000000000
--- a/keyboards/dailycraft/bat43/bat43.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_dailycraft_bat43_rev1
-    #include "rev1.h"
-#endif
-#ifdef KEYBOARD_dailycraft_bat43_rev2
-    #include "rev2.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/dailycraft/bat43/config.h b/keyboards/dailycraft/bat43/config.h
deleted file mode 100644
index 55fc373ea8..0000000000
--- a/keyboards/dailycraft/bat43/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2020 yfuku
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, D7, C6, D4, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, B5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dailycraft/bat43/info.json b/keyboards/dailycraft/bat43/info.json
index e60001252d..93d7ca1423 100644
--- a/keyboards/dailycraft/bat43/info.json
+++ b/keyboards/dailycraft/bat43/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "B5", "B4"],
+        "rows": ["E6", "D7", "C6", "D4", "F7", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/dailycraft/bat43/rev1/rev1.c b/keyboards/dailycraft/bat43/rev1/rev1.c
deleted file mode 100644
index cff7598740..0000000000
--- a/keyboards/dailycraft/bat43/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/dailycraft/bat43/rev2/rev2.c b/keyboards/dailycraft/bat43/rev2/rev2.c
deleted file mode 100644
index cffc0acd32..0000000000
--- a/keyboards/dailycraft/bat43/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/dailycraft/claw44/claw44.c b/keyboards/dailycraft/claw44/claw44.c
deleted file mode 100644
index d87103065c..0000000000
--- a/keyboards/dailycraft/claw44/claw44.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "claw44.h"
diff --git a/keyboards/dailycraft/claw44/claw44.h b/keyboards/dailycraft/claw44/claw44.h
deleted file mode 100644
index 76ecda6e90..0000000000
--- a/keyboards/dailycraft/claw44/claw44.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_dailycraft_claw44_rev1
-  #include "rev1.h"
-#endif
diff --git a/keyboards/dailycraft/claw44/rev1/config.h b/keyboards/dailycraft/claw44/rev1/config.h
deleted file mode 100644
index 13e3177b0e..0000000000
--- a/keyboards/dailycraft/claw44/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json
index 1168d21fa6..9173f12edc 100644
--- a/keyboards/dailycraft/claw44/rev1/info.json
+++ b/keyboards/dailycraft/claw44/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
@@ -21,8 +26,8 @@
                 {"label":"L02", "x":2, "y":0.35},
                 {"label":"L03", "x":3, "y":0},
                 {"label":"L04", "x":4, "y":0.05},
-                {"label":"L05", "x":5, "y":0.10},
-                {"label":"R00", "x":11.5, "y":0.10},
+                {"label":"L05", "x":5, "y":0.1},
+                {"label":"R00", "x":11.5, "y":0.1},
                 {"label":"R01", "x":12.5, "y":0.05},
                 {"label":"R02", "x":13.5, "y":0},
                 {"label":"R03", "x":14.5, "y":0.35},
@@ -33,8 +38,8 @@
                 {"label":"L12", "x":2, "y":1.35},
                 {"label":"L13", "x":3, "y":1},
                 {"label":"L14", "x":4, "y":1.05},
-                {"label":"L15", "x":5, "y":1.10},
-                {"label":"R10", "x":11.5, "y":1.10},
+                {"label":"L15", "x":5, "y":1.1},
+                {"label":"R10", "x":11.5, "y":1.1},
                 {"label":"R11", "x":12.5, "y":1.05},
                 {"label":"R12", "x":13.5, "y":1},
                 {"label":"R13", "x":14.5, "y":1.35},
@@ -45,20 +50,20 @@
                 {"label":"L22", "x":2, "y":2.35},
                 {"label":"L23", "x":3, "y":2},
                 {"label":"L24", "x":4, "y":2.05},
-                {"label":"L25", "x":5, "y":2.10},
-                {"label":"R20", "x":11.5, "y":2.10},
+                {"label":"L25", "x":5, "y":2.1},
+                {"label":"R20", "x":11.5, "y":2.1},
                 {"label":"R21", "x":12.5, "y":2.05},
                 {"label":"R22", "x":13.5, "y":2},
                 {"label":"R23", "x":14.5, "y":2.35},
                 {"label":"R24", "x":15.5, "y":3.03},
                 {"label":"R25", "x":16.5, "y":3.18},
                 {"label":"L30", "x":4, "y":3.05},
-                {"label":"L31", "x":5, "y":3.10},
-                {"label":"L32", "x":6, "y":3.20, "w":1.25},
-                {"label":"L33", "x":7.25, "y":3.50},
-                {"label":"R30", "x":9.25, "y":3.50},
-                {"label":"R31", "x":10.25, "y":3.20, "w":1.25},
-                {"label":"R32", "x":11.5, "y":3.10},
+                {"label":"L31", "x":5, "y":3.1},
+                {"label":"L32", "x":6, "y":3.2, "w":1.25},
+                {"label":"L33", "x":7.25, "y":3.5},
+                {"label":"R30", "x":9.25, "y":3.5},
+                {"label":"R31", "x":10.25, "y":3.2, "w":1.25},
+                {"label":"R32", "x":11.5, "y":3.1},
                 {"label":"R33", "x":12.5, "y":3.05}
             ]
         }
diff --git a/keyboards/dailycraft/claw44/rev1/rev1.c b/keyboards/dailycraft/claw44/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/dailycraft/claw44/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/dailycraft/owl8/keymaps/via/keymap.c b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
index 6e3f6ea90b..1a3bb0f0ae 100644
--- a/keyboards/dailycraft/owl8/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
@@ -52,46 +52,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 keyevent_t encoder1_ccw = {
     .key = (keypos_t){.row = 0, .col = 12},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder1_cw = {
     .key = (keypos_t){.row = 0, .col = 13},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder2_ccw = {
     .key = (keypos_t){.row = 0, .col = 14},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder2_cw = {
     .key = (keypos_t){.row = 0, .col = 15},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 void matrix_scan_user(void) {
-    if (IS_PRESSED(encoder1_ccw)) {
+    if (encoder1_ccw.pressed) {
         encoder1_ccw.pressed = false;
-        encoder1_ccw.time = (timer_read() | 1);
+        encoder1_ccw.time = timer_read();
         action_exec(encoder1_ccw);
     }
 
-    if (IS_PRESSED(encoder1_cw)) {
+    if (encoder1_cw.pressed) {
         encoder1_cw.pressed = false;
-        encoder1_cw.time = (timer_read() | 1);
+        encoder1_cw.time = timer_read();
         action_exec(encoder1_cw);
     }
 
-    if (IS_PRESSED(encoder2_ccw)) {
+    if (encoder2_ccw.pressed) {
         encoder2_ccw.pressed = false;
-        encoder2_ccw.time = (timer_read() | 1);
+        encoder2_ccw.time = timer_read();
         action_exec(encoder2_ccw);
     }
 
-    if (IS_PRESSED(encoder2_cw)) {
+    if (encoder2_cw.pressed) {
         encoder2_cw.pressed = false;
-        encoder2_cw.time = (timer_read() | 1);
+        encoder2_cw.time = timer_read();
         action_exec(encoder2_cw);
     }
 }
@@ -100,21 +104,21 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* First encoder */
         if (clockwise) {
             encoder1_cw.pressed = true;
-            encoder1_cw.time = (timer_read() | 1);
+            encoder1_cw.time = timer_read();
             action_exec(encoder1_cw);
         } else {
             encoder1_ccw.pressed = true;
-            encoder1_ccw.time = (timer_read() | 1);
+            encoder1_ccw.time = timer_read();
             action_exec(encoder1_ccw);
         }
     } else if (index == 1) {
         if (clockwise) {
             encoder2_cw.pressed = true;
-            encoder2_cw.time = (timer_read() | 1);
+            encoder2_cw.time = timer_read();
             action_exec(encoder2_cw);
         } else {
             encoder2_ccw.pressed = true;
-            encoder2_ccw.time = (timer_read() | 1);
+            encoder2_ccw.time = timer_read();
             action_exec(encoder2_ccw);
         }
     }
diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h
index 11c2825ca9..7da6e3f1bf 100644
--- a/keyboards/dailycraft/sandbox/rev1/config.h
+++ b/keyboards/dailycraft/sandbox/rev1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4 }
-#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/sandbox/rev1/info.json b/keyboards/dailycraft/sandbox/rev1/info.json
index 9dcf988997..8ff7c65a2f 100644
--- a/keyboards/dailycraft/sandbox/rev1/info.json
+++ b/keyboards/dailycraft/sandbox/rev1/info.json
@@ -8,22 +8,27 @@
         "pid": "0x0009",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3", "B2", "B6"],
+        "rows": ["B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1", "x":0, "y":0},
-                {"label":"2", "x":1, "y":0},
-                {"label":"3", "x":2, "y":0},
-                {"label":"4", "x":3, "y":0},
-                {"label":"5", "x":4, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
 
-                {"label":"6", "x":0, "y":1},
-                {"label":"7", "x":1, "y":1},
-                {"label":"8", "x":2, "y":1},
-                {"label":"9", "x":3, "y":1},
-                {"label":"0", "x":4, "y":1}
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1}
             ]
         }
     }
diff --git a/keyboards/dailycraft/sandbox/rev1/rev1.c b/keyboards/dailycraft/sandbox/rev1/rev1.c
deleted file mode 100644
index dccf24c746..0000000000
--- a/keyboards/dailycraft/sandbox/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/dailycraft/sandbox/rev1/rev1.h b/keyboards/dailycraft/sandbox/rev1/rev1.h
deleted file mode 100644
index d15cffe1ae..0000000000
--- a/keyboards/dailycraft/sandbox/rev1/rev1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, \
-    k10, k11, k12, k13, k14  \
-) { \
-    { k00, k01, k02, k03, k04 }, \
-    { k10, k11, k12, k13, k14 }  \
-}
diff --git a/keyboards/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h
index 11c2825ca9..7da6e3f1bf 100644
--- a/keyboards/dailycraft/sandbox/rev2/config.h
+++ b/keyboards/dailycraft/sandbox/rev2/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4 }
-#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json
index c0fd7745d0..99535b9473 100644
--- a/keyboards/dailycraft/sandbox/rev2/info.json
+++ b/keyboards/dailycraft/sandbox/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0011",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3", "B2", "B6"],
+        "rows": ["B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
@@ -16,27 +21,29 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1", "x":0, "y":0},
-                {"label":"2", "x":1, "y":0},
-                {"label":"3", "x":2, "y":0},
-                {"label":"4", "x":3, "y":0},
-                {"label":"5", "x":4, "y":0},
-                {"label":"A", "x":6, "y":0},
-                {"label":"B", "x":7, "y":0},
-                {"label":"C", "x":8, "y":0},
-                {"label":"D", "x":9, "y":0},
-                {"label":"E", "x":10, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [2, 0], "x": 6, "y": 0},
+                {"matrix": [2, 1], "x": 7, "y": 0},
+                {"matrix": [2, 2], "x": 8, "y": 0},
+                {"matrix": [2, 3], "x": 9, "y": 0},
+                {"matrix": [2, 4], "x": 10, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
 
-                {"label":"6", "x":0, "y":1},
-                {"label":"7", "x":1, "y":1},
-                {"label":"8", "x":2, "y":1},
-                {"label":"9", "x":3, "y":1},
-                {"label":"0", "x":4, "y":1},
-                {"label":"F", "x":6, "y":1},
-                {"label":"G", "x":7, "y":1},
-                {"label":"H", "x":8, "y":1},
-                {"label":"I", "x":9, "y":1},
-                {"label":"J", "x":10, "y":1}
+                {"matrix": [3, 0], "x": 6, "y": 1},
+                {"matrix": [3, 1], "x": 7, "y": 1},
+                {"matrix": [3, 2], "x": 8, "y": 1},
+                {"matrix": [3, 3], "x": 9, "y": 1},
+                {"matrix": [3, 4], "x": 10, "y": 1}
             ]
         }
     }
diff --git a/keyboards/dailycraft/sandbox/rev2/rev2.c b/keyboards/dailycraft/sandbox/rev2/rev2.c
deleted file mode 100644
index 96aa6cd314..0000000000
--- a/keyboards/dailycraft/sandbox/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/dailycraft/sandbox/rev2/rev2.h b/keyboards/dailycraft/sandbox/rev2/rev2.h
deleted file mode 100644
index f5cc3de8a0..0000000000
--- a/keyboards/dailycraft/sandbox/rev2/rev2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
-    L10, L11, L12, L13, L14, R10, R11, R12, R13, R14  \
-) { \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { R00, R01, R02, R03, R04 }, \
-    { R10, R11, R12, R13, R14 }  \
-}
diff --git a/keyboards/dailycraft/sandbox/sandbox.c b/keyboards/dailycraft/sandbox/sandbox.c
index 0b576a8291..51a9f88a6d 100644
--- a/keyboards/dailycraft/sandbox/sandbox.c
+++ b/keyboards/dailycraft/sandbox/sandbox.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sandbox.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/dailycraft/sandbox/sandbox.h b/keyboards/dailycraft/sandbox/sandbox.h
deleted file mode 100644
index e9c9ff99c3..0000000000
--- a/keyboards/dailycraft/sandbox/sandbox.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_dailycraft_sandbox_rev1
-#    include "rev1.h"
-#endif
-#ifdef KEYBOARD_dailycraft_sandbox_rev2
-#    include "rev2.h"
-#endif
diff --git a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
index 602d3fb10d..30de32fa60 100644
--- a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
@@ -44,46 +44,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 keyevent_t encoder1_ccw = {
     .key = (keypos_t){.row = 0, .col = 4},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder1_cw = {
     .key = (keypos_t){.row = 0, .col = 5},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder2_ccw = {
     .key = (keypos_t){.row = 0, .col = 6},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder2_cw = {
     .key = (keypos_t){.row = 0, .col = 7},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 void matrix_scan_user(void) {
-    if (IS_PRESSED(encoder1_ccw)) {
+    if (encoder1_ccw.pressed) {
         encoder1_ccw.pressed = false;
-        encoder1_ccw.time = (timer_read() | 1);
+        encoder1_ccw.time = timer_read();
         action_exec(encoder1_ccw);
     }
 
-    if (IS_PRESSED(encoder1_cw)) {
+    if (encoder1_cw.pressed) {
         encoder1_cw.pressed = false;
-        encoder1_cw.time = (timer_read() | 1);
+        encoder1_cw.time = timer_read();
         action_exec(encoder1_cw);
     }
 
-    if (IS_PRESSED(encoder2_ccw)) {
+    if (encoder2_ccw.pressed) {
         encoder2_ccw.pressed = false;
-        encoder2_ccw.time = (timer_read() | 1);
+        encoder2_ccw.time = timer_read();
         action_exec(encoder2_ccw);
     }
 
-    if (IS_PRESSED(encoder2_cw)) {
+    if (encoder2_cw.pressed) {
         encoder2_cw.pressed = false;
-        encoder2_cw.time = (timer_read() | 1);
+        encoder2_cw.time = timer_read();
         action_exec(encoder2_cw);
     }
 }
@@ -92,21 +96,21 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* First encoder */
         if (clockwise) {
             encoder1_cw.pressed = true;
-            encoder1_cw.time = (timer_read() | 1);
+            encoder1_cw.time = timer_read();
             action_exec(encoder1_cw);
         } else {
             encoder1_ccw.pressed = true;
-            encoder1_ccw.time = (timer_read() | 1);
+            encoder1_ccw.time = timer_read();
             action_exec(encoder1_ccw);
         }
     } else if (index == 1) {
         if (clockwise) {
             encoder2_cw.pressed = true;
-            encoder2_cw.time = (timer_read() | 1);
+            encoder2_cw.time = timer_read();
             action_exec(encoder2_cw);
         } else {
             encoder2_ccw.pressed = true;
-            encoder2_ccw.time = (timer_read() | 1);
+            encoder2_ccw.time = timer_read();
             action_exec(encoder2_ccw);
         }
     }
diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h
index b4ec32ba1d..7da6e3f1bf 100644
--- a/keyboards/dailycraft/wings42/rev1/config.h
+++ b/keyboards/dailycraft/wings42/rev1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/info.json
index 6a5e5040d5..657c8a9e51 100644
--- a/keyboards/dailycraft/wings42/rev1/info.json
+++ b/keyboards/dailycraft/wings42/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
@@ -19,51 +24,55 @@
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
-                {"label":"L00", "x":0, "y":0.875},
-                {"label":"L01", "x":1, "y":0.625},
-                {"label":"L02", "x":2, "y":0.375},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0.125},
-                {"label":"R00", "x":9, "y":0.125},
-                {"label":"R01", "x":10, "y":0},
-                {"label":"R02", "x":11, "y":0},
-                {"label":"R03", "x":12, "y":0.375},
-                {"label":"R04", "x":13, "y":0.625},
-                {"label":"R05", "x":14, "y":0.875},
+                {"matrix": [0, 0], "x": 0, "y": 0.875},
+                {"matrix": [0, 1], "x": 1, "y": 0.625},
+                {"matrix": [0, 2], "x": 2, "y": 0.375},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.125},
+
+                {"matrix": [4, 5], "x": 9, "y": 0.125},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0},
+                {"matrix": [4, 2], "x": 12, "y": 0.375},
+                {"matrix": [4, 1], "x": 13, "y": 0.625},
+                {"matrix": [4, 0], "x": 14, "y": 0.875},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.875},
+                {"matrix": [1, 1], "x": 1, "y": 1.625},
+                {"matrix": [1, 2], "x": 2, "y": 1.375},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.125},
+
+                {"matrix": [5, 5], "x": 9, "y": 1.125},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1.375},
+                {"matrix": [5, 1], "x": 13, "y": 1.625},
+                {"matrix": [5, 0], "x": 14, "y": 1.875},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.875},
+                {"matrix": [2, 1], "x": 1, "y": 2.625},
+                {"matrix": [2, 2], "x": 2, "y": 2.375},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.125},
 
-                {"label":"L10", "x":0, "y":1.875},
-                {"label":"L11", "x":1, "y":1.625},
-                {"label":"L12", "x":2, "y":1.375},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1.125},
-                {"label":"R10", "x":9, "y":1.125},
-                {"label":"R11", "x":10, "y":1},
-                {"label":"R12", "x":11, "y":1},
-                {"label":"R13", "x":12, "y":1.375},
-                {"label":"R14", "x":13, "y":1.625},
-                {"label":"R15", "x":14, "y":1.875},
+                {"matrix": [6, 5], "x": 9, "y": 2.125},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2},
+                {"matrix": [6, 2], "x": 12, "y": 2.375},
+                {"matrix": [6, 1], "x": 13, "y": 2.625},
+                {"matrix": [6, 0], "x": 14, "y": 2.875},
 
-                {"label":"L20", "x":0, "y":2.875},
-                {"label":"L21", "x":1, "y":2.625},
-                {"label":"L22", "x":2, "y":2.375},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2.125},
-                {"label":"R20", "x":9, "y":2.125},
-                {"label":"R21", "x":10, "y":2},
-                {"label":"R22", "x":11, "y":2},
-                {"label":"R23", "x":12, "y":2.375},
-                {"label":"R24", "x":13, "y":2.625},
-                {"label":"R25", "x":14, "y":2.875},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3.125},
+                {"matrix": [3, 5], "x": 6, "y": 3.375},
 
-                {"label":"L30", "x":4, "y":3},
-                {"label":"L31", "x":5, "y":3.125},
-                {"label":"L32", "x":6, "y":3.375},
-                {"label":"R30", "x":8, "y":3.375},
-                {"label":"R31", "x":9, "y":3.125},
-                {"label":"R32", "x":10, "y":3}
+                {"matrix": [7, 5], "x": 8, "y": 3.375},
+                {"matrix": [7, 4], "x": 9, "y": 3.125},
+                {"matrix": [7, 3], "x": 10, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dailycraft/wings42/rev1/rev1.c b/keyboards/dailycraft/wings42/rev1/rev1.c
deleted file mode 100644
index dccf24c746..0000000000
--- a/keyboards/dailycraft/wings42/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/dailycraft/wings42/rev1/rev1.h b/keyboards/dailycraft/wings42/rev1/rev1.h
deleted file mode 100644
index cd6e35a711..0000000000
--- a/keyboards/dailycraft/wings42/rev1/rev1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x6_3( \
-    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-                        L30, L31, L32, R30, R31, R32 \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05 }, \
-        { L10, L11, L12, L13, L14, L15 }, \
-        { L20, L21, L22, L23, L24, L25 }, \
-        { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \
-        { R05, R04, R03, R02, R01, R00 }, \
-        { R15, R14, R13, R12, R11, R10 }, \
-        { R25, R24, R23, R22, R21, R20 }, \
-        { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \
-    }
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
index d2067fbb52..7da6e3f1bf 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B2, B4 }
-#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4, B6, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/info.json
index 51184b3ebd..164e770172 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/info.json
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B6", "B5"],
+        "rows": ["D4", "C6", "D7", "E6", "B2", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c
deleted file mode 100644
index 3d0d203704..0000000000
--- a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1_extkeys.h"
diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h
index bd115ee140..7da6e3f1bf 100644
--- a/keyboards/dailycraft/wings42/rev2/config.h
+++ b/keyboards/dailycraft/wings42/rev2/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, NO_PIN }
-#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json
index bd8e97916a..09cf423e93 100644
--- a/keyboards/dailycraft/wings42/rev2/info.json
+++ b/keyboards/dailycraft/wings42/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D4", "C6", "D7", "E6", null]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
@@ -16,55 +21,59 @@
     "layouts": {
         "LAYOUT_split_3x6_3_2": {
             "layout": [
-                {"label":"L00", "x":0, "y":0.875},
-                {"label":"L01", "x":1, "y":0.625},
-                {"label":"L02", "x":2, "y":0.375},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0.125},
-                {"label":"R00", "x":9, "y":0.125},
-                {"label":"R01", "x":10, "y":0},
-                {"label":"R02", "x":11, "y":0},
-                {"label":"R03", "x":12, "y":0.375},
-                {"label":"R04", "x":13, "y":0.625},
-                {"label":"R05", "x":14, "y":0.875},
+                {"matrix": [0, 0], "x": 0, "y": 0.875},
+                {"matrix": [0, 1], "x": 1, "y": 0.625},
+                {"matrix": [0, 2], "x": 2, "y": 0.375},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.125},
+
+                {"matrix": [5, 5], "x": 9, "y": 0.125},
+                {"matrix": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0.375},
+                {"matrix": [5, 1], "x": 13, "y": 0.625},
+                {"matrix": [5, 0], "x": 14, "y": 0.875},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.875},
+                {"matrix": [1, 1], "x": 1, "y": 1.625},
+                {"matrix": [1, 2], "x": 2, "y": 1.375},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.125},
+                {"matrix": [3, 1], "x": 6, "y": 1.625},
+
+                {"matrix": [8, 2], "x": 8, "y": 1.625},
+                {"matrix": [6, 5], "x": 9, "y": 1.125},
+                {"matrix": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1.375},
+                {"matrix": [6, 1], "x": 13, "y": 1.625},
+                {"matrix": [6, 0], "x": 14, "y": 1.875},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.875},
+                {"matrix": [2, 1], "x": 1, "y": 2.625},
+                {"matrix": [2, 2], "x": 2, "y": 2.375},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.125},
+                {"matrix": [3, 2], "x": 6, "y": 2.625},
 
-                {"label":"L10", "x":0, "y":1.875},
-                {"label":"L11", "x":1, "y":1.625},
-                {"label":"L12", "x":2, "y":1.375},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1.125},
-                {"label":"L31", "x":6, "y":1.625},
-                {"label":"R33", "x":8, "y":1.625},
-                {"label":"R10", "x":9, "y":1.125},
-                {"label":"R11", "x":10, "y":1},
-                {"label":"R12", "x":11, "y":1},
-                {"label":"R13", "x":12, "y":1.375},
-                {"label":"R14", "x":13, "y":1.625},
-                {"label":"R15", "x":14, "y":1.875},
+                {"matrix": [8, 1], "x": 8, "y": 2.625},
+                {"matrix": [7, 5], "x": 9, "y": 2.125},
+                {"matrix": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2.375},
+                {"matrix": [7, 1], "x": 13, "y": 2.625},
+                {"matrix": [7, 0], "x": 14, "y": 2.875},
 
-                {"label":"L20", "x":0, "y":2.875},
-                {"label":"L21", "x":1, "y":2.625},
-                {"label":"L22", "x":2, "y":2.375},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2.125},
-                {"label":"L32", "x":6, "y":2.625},
-                {"label":"R34", "x":8, "y":2.625},
-                {"label":"R20", "x":9, "y":2.125},
-                {"label":"R21", "x":10, "y":2},
-                {"label":"R22", "x":11, "y":2},
-                {"label":"R23", "x":12, "y":2.375},
-                {"label":"R24", "x":13, "y":2.625},
-                {"label":"R25", "x":14, "y":2.875},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3.125},
+                {"matrix": [3, 5], "x": 6, "y": 3.375},
 
-                {"label":"L33", "x":4, "y":3},
-                {"label":"L34", "x":5, "y":3.125},
-                {"label":"L35", "x":6, "y":3.375},
-                {"label":"R30", "x":8, "y":3.375},
-                {"label":"R31", "x":9, "y":3.125},
-                {"label":"R32", "x":10, "y":3}
+                {"matrix": [8, 5], "x": 8, "y": 3.375},
+                {"matrix": [8, 4], "x": 9, "y": 3.125},
+                {"matrix": [8, 3], "x": 10, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
index 97f94366a8..7349bf2411 100644
--- a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
@@ -82,91 +82,99 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 keyevent_t encoder1_ccw = {
     .key = (keypos_t){.row = 4, .col = 0},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder1_cw = {
     .key = (keypos_t){.row = 4, .col = 1},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder2_ccw = {
     .key = (keypos_t){.row = 4, .col = 2},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder2_cw = {
     .key = (keypos_t){.row = 4, .col = 3},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder3_ccw = {
     .key = (keypos_t){.row = 9, .col = 1},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder3_cw = {
     .key = (keypos_t){.row = 9, .col = 0},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder4_ccw = {
     .key = (keypos_t){.row = 9, .col = 3},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder4_cw = {
     .key = (keypos_t){.row = 9, .col = 2},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 
 void matrix_scan_user(void) {
-    if (IS_PRESSED(encoder1_ccw)) {
+    if (encoder1_ccw.pressed) {
         encoder1_ccw.pressed = false;
-        encoder1_ccw.time = (timer_read() | 1);
+        encoder1_ccw.time = timer_read();
         action_exec(encoder1_ccw);
     }
 
-    if (IS_PRESSED(encoder1_cw)) {
+    if (encoder1_cw.pressed) {
         encoder1_cw.pressed = false;
-        encoder1_cw.time = (timer_read() | 1);
+        encoder1_cw.time = timer_read();
         action_exec(encoder1_cw);
     }
 
-    if (IS_PRESSED(encoder2_ccw)) {
+    if (encoder2_ccw.pressed) {
         encoder2_ccw.pressed = false;
-        encoder2_ccw.time = (timer_read() | 1);
+        encoder2_ccw.time = timer_read();
         action_exec(encoder2_ccw);
     }
 
-    if (IS_PRESSED(encoder2_cw)) {
+    if (encoder2_cw.pressed) {
         encoder2_cw.pressed = false;
-        encoder2_cw.time = (timer_read() | 1);
+        encoder2_cw.time = timer_read();
         action_exec(encoder2_cw);
     }
 
-    if (IS_PRESSED(encoder3_ccw)) {
+    if (encoder3_ccw.pressed) {
         encoder3_ccw.pressed = false;
-        encoder3_ccw.time = (timer_read() | 1);
+        encoder3_ccw.time = timer_read();
         action_exec(encoder3_ccw);
     }
 
-    if (IS_PRESSED(encoder3_cw)) {
+    if (encoder3_cw.pressed) {
         encoder3_cw.pressed = false;
-        encoder3_cw.time = (timer_read() | 1);
+        encoder3_cw.time = timer_read();
         action_exec(encoder3_cw);
     }
 
-    if (IS_PRESSED(encoder4_ccw)) {
+    if (encoder4_ccw.pressed) {
         encoder4_ccw.pressed = false;
-        encoder4_ccw.time = (timer_read() | 1);
+        encoder4_ccw.time = timer_read();
         action_exec(encoder4_ccw);
     }
 
-    if (IS_PRESSED(encoder4_cw)) {
+    if (encoder4_cw.pressed) {
         encoder4_cw.pressed = false;
-        encoder4_cw.time = (timer_read() | 1);
+        encoder4_cw.time = timer_read();
         action_exec(encoder4_cw);
     }
 }
@@ -175,41 +183,41 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) {
         if (clockwise) {
             encoder1_cw.pressed = true;
-            encoder1_cw.time = (timer_read() | 1);
+            encoder1_cw.time = timer_read();
             action_exec(encoder1_cw);
         } else {
             encoder1_ccw.pressed = true;
-            encoder1_ccw.time = (timer_read() | 1);
+            encoder1_ccw.time = timer_read();
             action_exec(encoder1_ccw);
         }
     } else if (index == 1) {
         if (clockwise) {
             encoder2_cw.pressed = true;
-            encoder2_cw.time = (timer_read() | 1);
+            encoder2_cw.time = timer_read();
             action_exec(encoder2_cw);
         } else {
             encoder2_ccw.pressed = true;
-            encoder2_ccw.time = (timer_read() | 1);
+            encoder2_ccw.time = timer_read();
             action_exec(encoder2_ccw);
         }
     } else if (index == 2) {
         if (clockwise) {
             encoder3_cw.pressed = true;
-            encoder3_cw.time = (timer_read() | 1);
+            encoder3_cw.time = timer_read();
             action_exec(encoder3_cw);
         } else {
             encoder3_ccw.pressed = true;
-            encoder3_ccw.time = (timer_read() | 1);
+            encoder3_ccw.time = timer_read();
             action_exec(encoder3_ccw);
         }
     } else if (index == 3) {
         if (clockwise) {
             encoder4_cw.pressed = true;
-            encoder4_cw.time = (timer_read() | 1);
+            encoder4_cw.time = timer_read();
             action_exec(encoder4_cw);
         } else {
             encoder4_ccw.pressed = true;
-            encoder4_ccw.time = (timer_read() | 1);
+            encoder4_ccw.time = timer_read();
             action_exec(encoder4_ccw);
         }
     }
diff --git a/keyboards/dailycraft/wings42/rev2/rev2.c b/keyboards/dailycraft/wings42/rev2/rev2.c
deleted file mode 100644
index 96aa6cd314..0000000000
--- a/keyboards/dailycraft/wings42/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/dailycraft/wings42/rev2/rev2.h b/keyboards/dailycraft/wings42/rev2/rev2.h
deleted file mode 100644
index 4720592264..0000000000
--- a/keyboards/dailycraft/wings42/rev2/rev2.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x6_3_2( \
-    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, L31, R33, R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, L32, R34, R20, R21, R22, R23, R24, R25, \
-                        L33, L34, L35, R30, R31, R32 \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05 }, \
-        { L10, L11, L12, L13, L14, L15 }, \
-        { L20, L21, L22, L23, L24, L25 }, \
-        { KC_NO, L31, L32, L33, L34, L35 }, \
-        { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-        { R05, R04, R03, R02, R01, R00 }, \
-        { R15, R14, R13, R12, R11, R10 }, \
-        { R25, R24, R23, R22, R21, R20 }, \
-        { KC_NO, R34, R33, R32, R31, R30 }, \
-        { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-    }
diff --git a/keyboards/dailycraft/wings42/wings42.c b/keyboards/dailycraft/wings42/wings42.c
deleted file mode 100644
index 824b6cfbb6..0000000000
--- a/keyboards/dailycraft/wings42/wings42.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wings42.h"
diff --git a/keyboards/dailycraft/wings42/wings42.h b/keyboards/dailycraft/wings42/wings42.h
deleted file mode 100644
index d839f04884..0000000000
--- a/keyboards/dailycraft/wings42/wings42.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 yfuku
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_dailycraft_wings42_rev1
-#    include "rev1.h"
-#endif
-#ifdef KEYBOARD_dailycraft_wings42_rev1_extkeys
-#    include "rev1_extkeys.h"
-#endif
-#ifdef KEYBOARD_dailycraft_wings42_rev2
-#    include "rev2.h"
-#endif
-
diff --git a/keyboards/daji/seis_cinco/config.h b/keyboards/daji/seis_cinco/config.h
index 02f3863e4d..d212094077 100644
--- a/keyboards/daji/seis_cinco/config.h
+++ b/keyboards/daji/seis_cinco/config.h
@@ -17,16 +17,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
-*/
-#define MATRIX_ROW_PINS { B2, B10, B11, A9, A6 }
-#define MATRIX_COL_PINS { B1, B0, A7, B14, A8, B15, A0, C15, C14, C13, B5, B4, B3, A15, A10, A14 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/daji/seis_cinco/info.json b/keyboards/daji/seis_cinco/info.json
index 686415247e..3e56106188 100644
--- a/keyboards/daji/seis_cinco/info.json
+++ b/keyboards/daji/seis_cinco/info.json
@@ -8,148 +8,163 @@
         "pid": "0xBF22",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "B14", "A8", "B15", "A0", "C15", "C14", "C13", "B5", "B4", "B3", "A15", "A10", "A14"],
+        "rows": ["B2", "B10", "B11", "A9", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Del", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-                {"label":"Caps", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-                {"label":"LShift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"RShift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-                {"label":"LCtl", "x":0, "y":4, "w":1.5},
-                {"label":"LGui", "x":1.5, "y":4},
-                {"label":"LAlt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"RAlt", "x":11, "y":4, "w":1.5},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"|", "x":13, "y":0},
-                {"label":"~", "x":14, "y":0},
-                {"label":"Del", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"Backspace", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-                {"label":"Caps", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-                {"label":"LShift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"RShift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-                {"label":"LCtl", "x":0, "y":4, "w":1.5},
-                {"label":"LGui", "x":1.5, "y":4},
-                {"label":"LAlt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"RAlt", "x":11, "y":4, "w":1.5},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/daji/seis_cinco/seis_cinco.c b/keyboards/daji/seis_cinco/seis_cinco.c
deleted file mode 100644
index e1417232c0..0000000000
--- a/keyboards/daji/seis_cinco/seis_cinco.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 B. Fletcher
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#include "seis_cinco.h"
diff --git a/keyboards/daji/seis_cinco/seis_cinco.h b/keyboards/daji/seis_cinco/seis_cinco.h
deleted file mode 100644
index 056aa3756b..0000000000
--- a/keyboards/daji/seis_cinco/seis_cinco.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2021 B. Fletcher
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* Default layout with full backspace
- */
-#define LAYOUT_default( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2F, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-  K40, K41, K42,                     K47,                K4B, K4C, K4D,      K4F  \
-) \
-{ \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F}, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F}, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___, K2F}, \
-  {K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F}, \
-  {K40, K41, K42, ___, ___, ___, ___, K47, ___, ___, ___, K4B, K4C, K4D, ___, K4F}  \
-}
-
-/* Default layout with split backspace
- */
-#define LAYOUT_all( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2F, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-  K40, K41, K42,                     K47,                K4B, K4C, K4D,      K4F  \
-) \
-{ \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F}, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___, K2F}, \
-  {K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F}, \
-  {K40, K41, K42, ___, ___, ___, ___, K47, ___, ___, ___, K4B, K4C, K4D, ___, K4F}  \
-}
diff --git a/keyboards/db/db63/config.h b/keyboards/db/db63/config.h
index dcf7368b38..7a7d3584de 100644
--- a/keyboards/db/db63/config.h
+++ b/keyboards/db/db63/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 18
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/db/db63/db63.c b/keyboards/db/db63/db63.c
deleted file mode 100644
index 62ebb2cc69..0000000000
--- a/keyboards/db/db63/db63.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "db63.h"
diff --git a/keyboards/db/db63/info.json b/keyboards/db/db63/info.json
index 9518ef5a42..c32eca3baf 100644
--- a/keyboards/db/db63/info.json
+++ b/keyboards/db/db63/info.json
@@ -8,9 +8,17 @@
         "pid": "0x422D",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "layouts": {
diff --git a/keyboards/db/db63/rules.mk b/keyboards/db/db63/rules.mk
index 03a618b76d..166b3d3ec8 100644
--- a/keyboards/db/db63/rules.mk
+++ b/keyboards/db/db63/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/dc01/arrow/arrow.c b/keyboards/dc01/arrow/arrow.c
deleted file mode 100644
index b3ed4ede76..0000000000
--- a/keyboards/dc01/arrow/arrow.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "arrow.h"
diff --git a/keyboards/dc01/left/left.c b/keyboards/dc01/left/left.c
deleted file mode 100644
index b10121705d..0000000000
--- a/keyboards/dc01/left/left.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "left.h"
diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/info.json
index ab48b9a09c..eab2d0c33f 100644
--- a/keyboards/dc01/numpad/info.json
+++ b/keyboards/dc01/numpad/info.json
@@ -13,10 +13,57 @@
     "community_layouts": ["numpad_5x4", "ortho_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
-            "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
+            ]
         },
         "LAYOUT_ortho_5x4": {
-            "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"00", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/dc01/numpad/numpad.c b/keyboards/dc01/numpad/numpad.c
deleted file mode 100644
index 2599f6320a..0000000000
--- a/keyboards/dc01/numpad/numpad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "numpad.h"
diff --git a/keyboards/dc01/numpad/numpad.h b/keyboards/dc01/numpad/numpad.h
deleted file mode 100644
index 110f893b47..0000000000
--- a/keyboards/dc01/numpad/numpad.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2018 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_numpad_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K13, \
-    K30, K31, K32,      \
-    K40,      K42, K43  \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, XXX }, \
-    { K30, K31, K32, XXX }, \
-    { K40, XXX, K42, K43 }  \
-}
-
-#define LAYOUT_ortho_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43  \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, K33 }, \
-    { K40, K41, K42, K43 }  \
-}
diff --git a/keyboards/dc01/right/right.c b/keyboards/dc01/right/right.c
deleted file mode 100644
index bbb1d568cd..0000000000
--- a/keyboards/dc01/right/right.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "right.h"
diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h
index cbf99d1f5d..692f679d24 100644
--- a/keyboards/dekunukem/duckypad/config.h
+++ b/keyboards/dekunukem/duckypad/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN A10
 #define RGBLED_NUM 15
 #define RGB_MATRIX_LED_COUNT 15
 
diff --git a/keyboards/dekunukem/duckypad/info.json b/keyboards/dekunukem/duckypad/info.json
index a8dbe2e5b5..e5859b718a 100644
--- a/keyboards/dekunukem/duckypad/info.json
+++ b/keyboards/dekunukem/duckypad/info.json
@@ -8,6 +8,12 @@
         "pid": "0x4450",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A10"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "matrix_pins": {
diff --git a/keyboards/dekunukem/duckypad/rules.mk b/keyboards/dekunukem/duckypad/rules.mk
index 3a30a05661..d9bd708a95 100644
--- a/keyboards/dekunukem/duckypad/rules.mk
+++ b/keyboards/dekunukem/duckypad/rules.mk
@@ -11,9 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-WS2812_DRIVER = bitbang
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
index 5de4b65388..886685102e 100644
--- a/keyboards/delikeeb/flatbread60/config.h
+++ b/keyboards/delikeeb/flatbread60/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F6, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 19
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -54,8 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/delikeeb/flatbread60/flatbread60.c b/keyboards/delikeeb/flatbread60/flatbread60.c
deleted file mode 100644
index 0cbc265530..0000000000
--- a/keyboards/delikeeb/flatbread60/flatbread60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 noclew
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "flatbread60.h"
-
diff --git a/keyboards/delikeeb/flatbread60/flatbread60.h b/keyboards/delikeeb/flatbread60/flatbread60.h
deleted file mode 100644
index 3fb8d7a6f1..0000000000
--- a/keyboards/delikeeb/flatbread60/flatbread60.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 noclew
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x12( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \
-    k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, \
-    k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, \
-    k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, \
-    k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 \
-) \
-{ \
-    { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12 }, \
-    { k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24 }, \
-    { k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36 }, \
-    { k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 } \
-}
diff --git a/keyboards/delikeeb/flatbread60/info.json b/keyboards/delikeeb/flatbread60/info.json
index 09f1bcd78f..e43a3458ea 100644
--- a/keyboards/delikeeb/flatbread60/info.json
+++ b/keyboards/delikeeb/flatbread60/info.json
@@ -8,251 +8,83 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
+        "rows": ["F6", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "x": 5,
-                    "y": 1
-                },
-                {
-                    "x": 6,
-                    "y": 1
-                },
-                {
-                    "x": 7,
-                    "y": 1
-                },
-                {
-                    "x": 8,
-                    "y": 1
-                },
-                {
-                    "x": 9,
-                    "y": 1
-                },
-                {
-                    "x": 10,
-                    "y": 1
-                },
-                {
-                    "x": 11,
-                    "y": 1
-                },
-                {
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "x": 5,
-                    "y": 2
-                },
-                {
-                    "x": 6,
-                    "y": 2
-                },
-                {
-                    "x": 7,
-                    "y": 2
-                },
-                {
-                    "x": 8,
-                    "y": 2
-                },
-                {
-                    "x": 9,
-                    "y": 2
-                },
-                {
-                    "x": 10,
-                    "y": 2
-                },
-                {
-                    "x": 11,
-                    "y": 2
-                },
-                {
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "x": 3,
-                    "y": 3
-                },
-                {
-                    "x": 4,
-                    "y": 3
-                },
-                {
-                    "x": 5,
-                    "y": 3
-                },
-                {
-                    "x": 6,
-                    "y": 3
-                },
-                {
-                    "x": 7,
-                    "y": 3
-                },
-                {
-                    "x": 8,
-                    "y": 3
-                },
-                {
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "x": 10,
-                    "y": 3
-                },
-                {
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "x": 1,
-                    "y": 4
-                },
-                {
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "x": 3,
-                    "y": 4
-                },
-                {
-                    "x": 4,
-                    "y": 4
-                },
-                {
-                    "x": 5,
-                    "y": 4
-                },
-                {
-                    "x": 6,
-                    "y": 4
-                },
-                {
-                    "x": 7,
-                    "y": 4
-                },
-                {
-                    "x": 8,
-                    "y": 4
-                },
-                {
-                    "x": 9,
-                    "y": 4
-                },
-                {
-                    "x": 10,
-                    "y": 4
-                },
-                {
-                    "x": 11,
-                    "y": 4
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
index 3708284700..30e1cd93aa 100644
--- a/keyboards/delikeeb/vaguettelite/config.h
+++ b/keyboards/delikeeb/vaguettelite/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, B3, D1, D2, D3, F5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B2, B6, B5, B4, E6, D7, C6, D0, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 9
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 // #    define RGBLIGHT_EFFECT_RGB_TEST
 // #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/delikeeb/vaguettelite/info.json b/keyboards/delikeeb/vaguettelite/info.json
index e976a6a155..7e3623b947 100644
--- a/keyboards/delikeeb/vaguettelite/info.json
+++ b/keyboards/delikeeb/vaguettelite/info.json
@@ -8,12 +8,20 @@
         "pid": "0x0011",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D0", "D4"],
+        "rows": ["F4", "B3", "D1", "D2", "D3", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D5", "pin_b": "B7"},
             {"pin_a": "F1", "pin_b": "F0"}
         ]
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/delikeeb/vaguettelite/vaguettelite.c b/keyboards/delikeeb/vaguettelite/vaguettelite.c
deleted file mode 100644
index a91dae9a3f..0000000000
--- a/keyboards/delikeeb/vaguettelite/vaguettelite.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 noclew
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vaguettelite.h"
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index d8a6d95c9b..7da3d5e24c 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -17,26 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D7, B4, B5, B6 }
-#define MATRIX_COL_PINS { B2, B3, B1, F7, F5, F6, D3, D1, D0, D4, C6, E6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define B7_AUDIO
 
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //#    define RGBLIGHT_EFFECT_RGB_TEST
 //#    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json
index 4434ba95d7..f62481333d 100644
--- a/keyboards/delikeeb/vanana/rev1/info.json
+++ b/keyboards/delikeeb/vanana/rev1/info.json
@@ -3,6 +3,14 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B1", "F7", "F5", "F6", "D3", "D1", "D0", "D4", "C6", "E6"],
+        "rows": ["D2", "D7", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C7", "pin_b": "D5"},
diff --git a/keyboards/delikeeb/vanana/rev1/rev1.c b/keyboards/delikeeb/vanana/rev1/rev1.c
deleted file mode 100644
index 73b5039eb8..0000000000
--- a/keyboards/delikeeb/vanana/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 noclew
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index e28d974b78..7da3d5e24c 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -17,26 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, C6, E6, B4, B5, F5}
-#define MATRIX_COL_PINS { B3, B1, F7, F6, F4, D2, D3, D0, D4, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define B7_AUDIO
 
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //#    define RGBLIGHT_EFFECT_RGB_TEST
 //#    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json
index 589c8c5089..fb2cc4a52c 100644
--- a/keyboards/delikeeb/vanana/rev2/info.json
+++ b/keyboards/delikeeb/vanana/rev2/info.json
@@ -3,6 +3,14 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F4", "D2", "D3", "D0", "D4", "D7"],
+        "rows": ["D1", "C6", "E6", "B4", "B5", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "B2"},
diff --git a/keyboards/delikeeb/vanana/rev2/rev2.c b/keyboards/delikeeb/vanana/rev2/rev2.c
deleted file mode 100644
index 8f2a259921..0000000000
--- a/keyboards/delikeeb/vanana/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 noclew
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/delikeeb/vaneela/config.h b/keyboards/delikeeb/vaneela/config.h
index 510a13bb6b..93fec1ee2d 100644
--- a/keyboards/delikeeb/vaneela/config.h
+++ b/keyboards/delikeeb/vaneela/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F6, F7, B3, B2, B6 }
-#define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/delikeeb/vaneela/info.json b/keyboards/delikeeb/vaneela/info.json
index 4226587650..0ddbf2f162 100644
--- a/keyboards/delikeeb/vaneela/info.json
+++ b/keyboards/delikeeb/vaneela/info.json
@@ -8,75 +8,80 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
+        "rows": ["F6", "F7", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"label":"`", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":":)", "x":11, "y":0, "w":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.5},
 
-                {"label":"TAB", "x":0, "y":1},
-                {"label":"Q", "x":1, "y":1},
-                {"label":"W", "x":2, "y":1},
-                {"label":"E", "x":3, "y":1},
-                {"label":"R", "x":4, "y":1},
-                {"label":"T", "x":5, "y":1},
-                {"label":"Y", "x":6, "y":1},
-                {"label":"U", "x":7, "y":1},
-                {"label":"I", "x":8, "y":1},
-                {"label":"O", "x":9, "y":1},
-                {"label":"P", "x":10, "y":1},
-                {"label":"BS", "x":11, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1, "w": 1.5},
 
-                {"label":"ESC", "x":0, "y":2, "w":1.25},
-                {"label":"A", "x":1.25, "y":2},
-                {"label":"S", "x":2.25, "y":2},
-                {"label":"D", "x":3.25, "y":2},
-                {"label":"F", "x":4.25, "y":2},
-                {"label":"G", "x":5.25, "y":2},
-                {"label":"H", "x":6.25, "y":2},
-                {"label":"J", "x":7.25, "y":2},
-                {"label":"K", "x":8.25, "y":2},
-                {"label":"L", "x":9.25, "y":2},
-                {"label":";", "x":10.25, "y":2},
-                {"label":"ENTER", "x":11.25, "y":2, "w":1.25},
+                {"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": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25},
 
-                {"label":"SHIFT", "x":0, "y":3, "w":1.5},
-                {"label":"Z", "x":1.5, "y":3},
-                {"label":"X", "x":2.5, "y":3},
-                {"label":"C", "x":3.5, "y":3},
-                {"label":"V", "x":4.5, "y":3},
-                {"label":"B", "x":5.5, "y":3},
-                {"label":"N", "x":6.5, "y":3},
-                {"label":"M", "x":7.5, "y":3},
-                {"label":",", "x":8.5, "y":3},
-                {"label":".", "x":9.5, "y":3},
-                {"label":"/", "x":10.5, "y":3},
-                {"label":"SHIFT", "x":11.5, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
 
-                {"label":"CTRL", "x":0, "y":4},
-                {"label":"CTRL", "x":1, "y":4},
-                {"label":"GUI", "x":2, "y":4},
-                {"label":"ALT", "x":3, "y":4},
-                {"label":"LOWER", "x":4, "y":4, "w":1.25},
-                {"label":"SPACE", "x":5.25, "y":4},
-                {"label":"SPACE", "x":6.25, "y":4},
-                {"label":"RAISE", "x":7.25, "y":4, "w":1.25},
-                {"label":"LEFT", "x":8.5, "y":4},
-                {"label":"DOWN", "x":9.5, "y":4},
-                {"label":"UP", "x":10.5, "y":4},
-                {"label":"RIGHT", "x":11.5, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4},
+                {"matrix": [4, 9], "x": 9.5, "y": 4},
+                {"matrix": [4, 10], "x": 10.5, "y": 4},
+                {"matrix": [4, 11], "x": 11.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/delikeeb/vaneela/vaneela.c b/keyboards/delikeeb/vaneela/vaneela.c
deleted file mode 100644
index ca5d513a00..0000000000
--- a/keyboards/delikeeb/vaneela/vaneela.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 noclew
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vaneela.h"
-
diff --git a/keyboards/delikeeb/vaneela/vaneela.h b/keyboards/delikeeb/vaneela/vaneela.h
deleted file mode 100644
index 3fb8d7a6f1..0000000000
--- a/keyboards/delikeeb/vaneela/vaneela.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 noclew
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x12( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \
-    k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, \
-    k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, \
-    k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, \
-    k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 \
-) \
-{ \
-    { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12 }, \
-    { k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24 }, \
-    { k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36 }, \
-    { k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 } \
-}
diff --git a/keyboards/delikeeb/vaneelaex/config.h b/keyboards/delikeeb/vaneelaex/config.h
index aa3f9f338c..93fec1ee2d 100644
--- a/keyboards/delikeeb/vaneelaex/config.h
+++ b/keyboards/delikeeb/vaneelaex/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, B2, B6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B5, B4, E6, D7, C6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/delikeeb/vaneelaex/info.json b/keyboards/delikeeb/vaneelaex/info.json
index fb0b1a87c2..0095254388 100644
--- a/keyboards/delikeeb/vaneelaex/info.json
+++ b/keyboards/delikeeb/vaneelaex/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B5", "B4", "E6", "D7", "C6", "D4"],
+        "rows": ["D3", "D2", "D1", "D0", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/delikeeb/vaneelaex/vaneelaex.c b/keyboards/delikeeb/vaneelaex/vaneelaex.c
deleted file mode 100644
index e82cd5487b..0000000000
--- a/keyboards/delikeeb/vaneelaex/vaneelaex.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 noclew
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vaneelaex.h"
-
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 4d5aa33be9..22b2320f90 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, B6, B2, B3, B1, F5, F6, F7 }
-#define MATRIX_COL_PINS { D3, D2, B5, B4, E6, D7, C6, D4, D0, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 10
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -50,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 // #    define RGBLIGHT_EFFECT_RGB_TEST
 // #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json
index 8301a03813..b251334154 100644
--- a/keyboards/delikeeb/waaffle/rev3/info.json
+++ b/keyboards/delikeeb/waaffle/rev3/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0012",
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["F4", "B6", "B2", "B3", "B1", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B7", "pin_b": "D5"},
@@ -19,13 +27,96 @@
     },
     "layouts": {
         "LAYOUT_ortho_5x16": {
-            "layout":
-            [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":13.25, "y":1}, {"x":14.25, "y":1}, {"x":15.25, "y":1},
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3}, {"x":13.25, "y":3}, {"x":14.25, "y":3}, {"x":15.25, "y":3},
-                {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4.25, "y":4}, {"x":5.25, "y":4}, {"x":6.25, "y":4}, {"x":7.25, "y":4}, {"x":8.25, "y":4}, {"x":9.25, "y":4}, {"x":10.25, "y":4}, {"x":11.25, "y":4}, {"x":12.25, "y":4}, {"x":13.25, "y":4}, {"x":14.25, "y":4}, {"x":15.25, "y":4}
+            "layout": [
+                {"matrix": [7, 5], "x": 0, "y": 0},
+                {"matrix": [6, 5], "x": 1, "y": 0},
+                {"matrix": [5, 5], "x": 2, "y": 0},
+                {"matrix": [7, 0], "x": 3, "y": 0},
+
+                {"matrix": [6, 0], "x": 4.25, "y": 0},
+                {"matrix": [5, 0], "x": 5.25, "y": 0},
+                {"matrix": [0, 0], "x": 6.25, "y": 0},
+                {"matrix": [0, 1], "x": 7.25, "y": 0},
+                {"matrix": [0, 2], "x": 8.25, "y": 0},
+                {"matrix": [0, 3], "x": 9.25, "y": 0},
+                {"matrix": [0, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [0, 7], "x": 13.25, "y": 0},
+                {"matrix": [0, 8], "x": 14.25, "y": 0},
+                {"matrix": [0, 9], "x": 15.25, "y": 0},
+
+                {"matrix": [7, 6], "x": 0, "y": 1},
+                {"matrix": [6, 6], "x": 1, "y": 1},
+                {"matrix": [5, 6], "x": 2, "y": 1},
+                {"matrix": [7, 1], "x": 3, "y": 1},
+
+                {"matrix": [6, 1], "x": 4.25, "y": 1},
+                {"matrix": [5, 1], "x": 5.25, "y": 1},
+                {"matrix": [1, 0], "x": 6.25, "y": 1},
+                {"matrix": [1, 1], "x": 7.25, "y": 1},
+                {"matrix": [1, 2], "x": 8.25, "y": 1},
+                {"matrix": [1, 3], "x": 9.25, "y": 1},
+                {"matrix": [1, 4], "x": 10.25, "y": 1},
+                {"matrix": [1, 5], "x": 11.25, "y": 1},
+                {"matrix": [1, 6], "x": 12.25, "y": 1},
+                {"matrix": [1, 7], "x": 13.25, "y": 1},
+                {"matrix": [1, 8], "x": 14.25, "y": 1},
+                {"matrix": [1, 9], "x": 15.25, "y": 1},
+
+                {"matrix": [7, 7], "x": 0, "y": 2},
+                {"matrix": [6, 7], "x": 1, "y": 2},
+                {"matrix": [5, 7], "x": 2, "y": 2},
+                {"matrix": [7, 2], "x": 3, "y": 2},
+
+                {"matrix": [6, 2], "x": 4.25, "y": 2},
+                {"matrix": [5, 2], "x": 5.25, "y": 2},
+                {"matrix": [2, 0], "x": 6.25, "y": 2},
+                {"matrix": [2, 1], "x": 7.25, "y": 2},
+                {"matrix": [2, 2], "x": 8.25, "y": 2},
+                {"matrix": [2, 3], "x": 9.25, "y": 2},
+                {"matrix": [2, 4], "x": 10.25, "y": 2},
+                {"matrix": [2, 5], "x": 11.25, "y": 2},
+                {"matrix": [2, 6], "x": 12.25, "y": 2},
+                {"matrix": [2, 7], "x": 13.25, "y": 2},
+                {"matrix": [2, 8], "x": 14.25, "y": 2},
+                {"matrix": [2, 9], "x": 15.25, "y": 2},
+
+                {"matrix": [7, 8], "x": 0, "y": 3},
+                {"matrix": [6, 8], "x": 1, "y": 3},
+                {"matrix": [5, 8], "x": 2, "y": 3},
+                {"matrix": [7, 3], "x": 3, "y": 3},
+
+                {"matrix": [6, 3], "x": 4.25, "y": 3},
+                {"matrix": [5, 3], "x": 5.25, "y": 3},
+                {"matrix": [3, 0], "x": 6.25, "y": 3},
+                {"matrix": [3, 1], "x": 7.25, "y": 3},
+                {"matrix": [3, 2], "x": 8.25, "y": 3},
+                {"matrix": [3, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [3, 5], "x": 11.25, "y": 3},
+                {"matrix": [3, 6], "x": 12.25, "y": 3},
+                {"matrix": [3, 7], "x": 13.25, "y": 3},
+                {"matrix": [3, 8], "x": 14.25, "y": 3},
+                {"matrix": [3, 9], "x": 15.25, "y": 3},
+
+                {"matrix": [7, 9], "x": 0, "y": 4},
+                {"matrix": [6, 9], "x": 1, "y": 4},
+                {"matrix": [5, 9], "x": 2, "y": 4},
+                {"matrix": [7, 4], "x": 3, "y": 4},
+
+                {"matrix": [6, 4], "x": 4.25, "y": 4},
+                {"matrix": [5, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 0], "x": 6.25, "y": 4},
+                {"matrix": [4, 1], "x": 7.25, "y": 4},
+                {"matrix": [4, 2], "x": 8.25, "y": 4},
+                {"matrix": [4, 3], "x": 9.25, "y": 4},
+                {"matrix": [4, 4], "x": 10.25, "y": 4},
+                {"matrix": [4, 5], "x": 11.25, "y": 4},
+                {"matrix": [4, 6], "x": 12.25, "y": 4},
+                {"matrix": [4, 7], "x": 13.25, "y": 4},
+                {"matrix": [4, 8], "x": 14.25, "y": 4},
+                {"matrix": [4, 9], "x": 15.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/delikeeb/waaffle/rev3/rev3.c b/keyboards/delikeeb/waaffle/rev3/rev3.c
deleted file mode 100644
index bf7f5a1099..0000000000
--- a/keyboards/delikeeb/waaffle/rev3/rev3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 noclew
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev3.h"
diff --git a/keyboards/delikeeb/waaffle/rev3/rev3.h b/keyboards/delikeeb/waaffle/rev3/rev3.h
deleted file mode 100644
index 8ca245d845..0000000000
--- a/keyboards/delikeeb/waaffle/rev3/rev3.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 noclew
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x16( \
-    k76, k66, k56, k71, k61, k51, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, \
-    k77, k67, k57, k72, k62, k52, k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, \
-    k78, k68, k58, k73, k63, k53, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \
-    k79, k69, k59, k74, k64, k54, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, \
-    k80, k70, k60, k75, k65, k55, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50 \
-) { \
-    { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10 }, \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k20 }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k30 }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40 }, \
-    { k41, k42, k43, k44, k45, k46, k47, k48, k49, k50 }, \
-    { k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 }, \
-    { k61, k62, k63, k64, k65, k66, k67, k68, k69, k70 }, \
-    { k71, k72, k73, k74, k75, k76, k77, k78, k79, k80 } \
-}
diff --git a/keyboards/deltapad/config.h b/keyboards/deltapad/config.h
index d6d4224cf0..a62147158e 100644
--- a/keyboards/deltapad/config.h
+++ b/keyboards/deltapad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D3, D1, D0 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/deltapad/deltapad.c b/keyboards/deltapad/deltapad.c
deleted file mode 100644
index ee9ac17c4a..0000000000
--- a/keyboards/deltapad/deltapad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Richard Snijder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "deltapad.h"
diff --git a/keyboards/deltapad/deltapad.h b/keyboards/deltapad/deltapad.h
deleted file mode 100644
index 8e09c1fc84..0000000000
--- a/keyboards/deltapad/deltapad.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2021 Richard Snijder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x4( \
-  K00, K01, K02, K03, \
-  K10, K11, K12, K13, \
-  K20, K21, K22, K23, \
-  K30, K31, K32, K33  \
-) { \
-  { K00, K01, K02, K03 }, \
-  { K10, K11, K12, K13 }, \
-  { K20, K21, K22, K23 }, \
-  { K30, K31, K32, K33 }  \
-}
-
-#define LAYOUT_numpad_4x4( \
-  K00, K01, K02, K03, \
-  K10, K11, K12,      \
-  K20, K21, K22, K23, \
-     K31,   K32      \
-) { \
-    { K00,   K01, K02, K03 }, \
-    { K10,   K11, K12, KC_NO }, \
-    { K20,   K21, K22, K23 }, \
-    { KC_NO, K31, K32, KC_NO }  \
-}
diff --git a/keyboards/deltapad/info.json b/keyboards/deltapad/info.json
index bef25e6350..1b79bf47a3 100644
--- a/keyboards/deltapad/info.json
+++ b/keyboards/deltapad/info.json
@@ -8,14 +8,56 @@
     "pid": "0x0123",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "E6", "B4", "B5"],
+    "rows": ["D2", "D3", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_ortho_4x4": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3}
+      ]
     },
     "LAYOUT_numpad_4x4": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "y":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, "h": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+        {"matrix": [3, 2], "x": 2, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/deltasplit75/deltasplit75.c b/keyboards/deltasplit75/deltasplit75.c
deleted file mode 100644
index 6a73db4cd6..0000000000
--- a/keyboards/deltasplit75/deltasplit75.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "deltasplit75.h"
\ No newline at end of file
diff --git a/keyboards/deltasplit75/deltasplit75.h b/keyboards/deltasplit75/deltasplit75.h
deleted file mode 100644
index b78d857344..0000000000
--- a/keyboards/deltasplit75/deltasplit75.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_deltasplit75_v2
-#    include "v2.h"
-#endif
diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h
index 785d125b36..4d2439ad3c 100644
--- a/keyboards/deltasplit75/v2/config.h
+++ b/keyboards/deltasplit75/v2/config.h
@@ -17,22 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define MATRIX_COL_PINS { B6, B5, B4, E6, D7, C6, D4, D1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json
index 055ad1e00f..366982d8a5 100644
--- a/keyboards/deltasplit75/v2/info.json
+++ b/keyboards/deltasplit75/v2/info.json
@@ -7,9 +7,17 @@
       "pid": "0x3060",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["B6", "B5", "B4", "E6", "D7", "C6", "D4", "D1"],
+      "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
       "soft_serial_pin": "D0"
     },
+    "ws2812": {
+      "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/deltasplit75/v2/v2.c b/keyboards/deltasplit75/v2/v2.c
deleted file mode 100644
index caf7c6f0f2..0000000000
--- a/keyboards/deltasplit75/v2/v2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "v2.h"
diff --git a/keyboards/deltasplit75/v2/v2.h b/keyboards/deltasplit75/v2/v2.h
index bab6a47cd9..0373a6fe02 100644
--- a/keyboards/deltasplit75/v2/v2.h
+++ b/keyboards/deltasplit75/v2/v2.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "deltasplit75.h"
-
 #include "quantum.h"
 
 //matrix is defined in a weird way here; the layout on both sides are asymmetrical, but the "matrix" is symmetrical but with empty gaps
diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h
index 6b0a73b3c2..a627f3ec6a 100755
--- a/keyboards/demiurge/config.h
+++ b/keyboards/demiurge/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F4, F6, F7, C7 }
-#define MATRIX_COL_PINS { E6, F5, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 21
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -39,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 153
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/demiurge/demiurge.c b/keyboards/demiurge/demiurge.c
deleted file mode 100755
index 4bd588d6e9..0000000000
--- a/keyboards/demiurge/demiurge.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 ojthetiny
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "demiurge.h"
\ No newline at end of file
diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json
index 92b0c7243c..c2596fee85 100644
--- a/keyboards/demiurge/info.json
+++ b/keyboards/demiurge/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6475",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F5", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2"],
+        "rows": ["F0", "F4", "F6", "F7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h
index 8193eae02f..39ea6d6e90 100644
--- a/keyboards/deng/djam/config.h
+++ b/keyboards/deng/djam/config.h
@@ -15,13 +15,7 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F4 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4 }
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN D5
 #define RGB_MATRIX_LED_COUNT 31
 #define RGB_MATRIX_KEYPRESSES
 #define ENABLE_RGB_MATRIX_BREATHING
diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json
index abf18685b2..4a5cd78f19 100644
--- a/keyboards/deng/djam/info.json
+++ b/keyboards/deng/djam/info.json
@@ -8,10 +8,21 @@
         "pid": "0x7325",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "D5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/deng/djam/rules.mk b/keyboards/deng/djam/rules.mk
index 42a6d2bd1b..150b7c690d 100644
--- a/keyboards/deng/djam/rules.mk
+++ b/keyboards/deng/djam/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h
index e80b0d97a4..d80983202f 100644
--- a/keyboards/deng/thirty/config.h
+++ b/keyboards/deng/thirty/config.h
@@ -15,15 +15,8 @@
  */
 #pragma once
 
-
-/* Matrix */
-#define MATRIX_ROW_PINS { B15, A5, A3, A15, B7, B8 }
-#define MATRIX_COL_PINS { B13, B14, B3, A4, A6 }
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN B12
 #define RGB_MATRIX_LED_COUNT 30
 #define RGB_MATRIX_KEYPRESSES
 // #define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json
index 0fda78c76d..1d9b018e6b 100644
--- a/keyboards/deng/thirty/info.json
+++ b/keyboards/deng/thirty/info.json
@@ -8,47 +8,60 @@
         "pid": "0x7342",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B13", "B14", "B3", "A4", "A6"],
+        "rows": ["B15", "A5", "A3", "A15", "B7", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "driver": "software",
         "pin": "B11",
         "levels": 5,
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B12"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
         "LAYOUT_ortho_3x10": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [3, 4], "x": 5, "y": 0 },
-                { "matrix": [3, 3], "x": 6, "y": 0 },
-                { "matrix": [3, 2], "x": 7, "y": 0 },
-                { "matrix": [3, 1], "x": 8, "y": 0 },
-                { "matrix": [3, 0], "x": 9, "y": 0 },
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [1, 3], "x": 3, "y": 1 },
-                { "matrix": [1, 4], "x": 4, "y": 1 },
-                { "matrix": [4, 4], "x": 5, "y": 1 },
-                { "matrix": [4, 3], "x": 6, "y": 1 },
-                { "matrix": [4, 2], "x": 7, "y": 1 },
-                { "matrix": [4, 1], "x": 8, "y": 1 },
-                { "matrix": [4, 0], "x": 9, "y": 1 },
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [2, 4], "x": 4, "y": 2 },
-                { "matrix": [5, 4], "x": 5, "y": 2 },
-                { "matrix": [5, 3], "x": 6, "y": 2 },
-                { "matrix": [5, 2], "x": 7, "y": 2 },
-                { "matrix": [5, 1], "x": 8, "y": 2 },
-                { "matrix": [5, 0], "x": 9, "y": 2 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [3, 4], "x": 5, "y": 0},
+                {"matrix": [3, 3], "x": 6, "y": 0},
+                {"matrix": [3, 2], "x": 7, "y": 0},
+                {"matrix": [3, 1], "x": 8, "y": 0},
+                {"matrix": [3, 0], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [4, 4], "x": 5, "y": 1},
+                {"matrix": [4, 3], "x": 6, "y": 1},
+                {"matrix": [4, 2], "x": 7, "y": 1},
+                {"matrix": [4, 1], "x": 8, "y": 1},
+                {"matrix": [4, 0], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [5, 4], "x": 5, "y": 2},
+                {"matrix": [5, 3], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [5, 1], "x": 8, "y": 2},
+                {"matrix": [5, 0], "x": 9, "y": 2}
             ]
         }
     }
diff --git a/keyboards/deng/thirty/rules.mk b/keyboards/deng/thirty/rules.mk
index 91837f3d45..e8ce9e854b 100644
--- a/keyboards/deng/thirty/rules.mk
+++ b/keyboards/deng/thirty/rules.mk
@@ -15,4 +15,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/deng/thirty/thirty.c b/keyboards/deng/thirty/thirty.c
index 4f4a5c566d..2e582d6833 100644
--- a/keyboards/deng/thirty/thirty.c
+++ b/keyboards/deng/thirty/thirty.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "thirty.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
diff --git a/keyboards/deng/thirty/thirty.h b/keyboards/deng/thirty/thirty.h
deleted file mode 100644
index 49af4b3424..0000000000
--- a/keyboards/deng/thirty/thirty.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2022 Leo Deng (@myst729)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x10( \
-    K00, K01, K02, K03, K04, K34, K33, K32, K31, K30, \
-    K10, K11, K12, K13, K14, K44, K43, K42, K41, K40, \
-    K20, K21, K22, K23, K24, K54, K53, K52, K51, K50  \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, K34 }, \
-    { K40, K41, K42, K43, K44 }, \
-    { K50, K51, K52, K53, K54 }  \
-}
diff --git a/keyboards/dichotomy/dichotomy.c b/keyboards/dichotomy/dichotomy.c
index afd52cc8b3..4301d9b67d 100755
--- a/keyboards/dichotomy/dichotomy.c
+++ b/keyboards/dichotomy/dichotomy.c
@@ -2,7 +2,7 @@
 
 //#include "uart.h"
 
-void pointing_device_task(void){
+bool pointing_device_task(void){
 	/*report_mouse_t currentReport = {};
     uint32_t timeout = 0;
 
@@ -56,7 +56,7 @@ void pointing_device_task(void){
     } else {
 	xprintf("\r\nRequested packet, data 4 was %d",uart_data[4]);
     }*/
-    pointing_device_send();
+    return pointing_device_send();
 }
 
 void led_init(void) {
diff --git a/keyboards/dinofizz/fnrow/v1/config.h b/keyboards/dinofizz/fnrow/v1/config.h
deleted file mode 100644
index 0763c887c8..0000000000
--- a/keyboards/dinofizz/fnrow/v1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Dino Fizzotti 
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { A0, A1 }
-#define MATRIX_COL_PINS {B0, B1, B3, B4, B5, B6, B7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dinofizz/fnrow/v1/info.json b/keyboards/dinofizz/fnrow/v1/info.json
index c031e4c163..a52e887df8 100644
--- a/keyboards/dinofizz/fnrow/v1/info.json
+++ b/keyboards/dinofizz/fnrow/v1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0100",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B3", "B4", "B5", "B6", "B7"],
+    "rows": ["A0", "A1"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F042",
   "bootloader": "stm32-dfu",
   "layouts": {
diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h
index aad4dce535..cfa9c05154 100644
--- a/keyboards/dk60/config.h
+++ b/keyboards/dk60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { B0, B3, B2, B1, D3, D5, B5, B7, C6, C7, D0, D1, D2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dk60/info.json b/keyboards/dk60/info.json
index 5e37593039..c16fb1ad58 100644
--- a/keyboards/dk60/info.json
+++ b/keyboards/dk60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x56C2",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B3", "B2", "B1", "D3", "D5", "B5", "B7", "C6", "C7", "D0", "D1", "D2"],
+        "rows": ["B6", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index 43e53608e9..7ca2b8cded 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -24,17 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 }
-
-// wiring of each half
-#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN B6
-
 #define RGBLED_NUM 7
 
 #ifndef IOS_DEVICE_ENABLE
diff --git a/keyboards/dm9records/ergoinu/ergoinu.c b/keyboards/dm9records/ergoinu/ergoinu.c
deleted file mode 100644
index a01ac0a25c..0000000000
--- a/keyboards/dm9records/ergoinu/ergoinu.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2018 Takuya Urakawa<twitter:@hsgw>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ergoinu.h"
diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json
index 38f18f0cc1..f6896046f9 100644
--- a/keyboards/dm9records/ergoinu/info.json
+++ b/keyboards/dm9records/ergoinu/info.json
@@ -8,9 +8,17 @@
     "pid": "0xEE60",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B4", "E6", "D7", "C6", "D4", "F5", "F4"],
+    "rows": ["F6", "F7", "B1", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
   },
+  "ws2812": {
+    "pin": "B6"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h
index bf9fce0889..e34b4d34ab 100644
--- a/keyboards/dm9records/lain/config.h
+++ b/keyboards/dm9records/lain/config.h
@@ -3,18 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS \
-    { C6, D7, D6, D4 }
-#define MATRIX_COL_PINS \
-    { C7, F7, F6, F5, F4, F1, F0, B3, B2, B1, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* LED Settings */
 #define LED_NUM 3
 #define LED_PINS \
diff --git a/keyboards/dm9records/lain/info.json b/keyboards/dm9records/lain/info.json
index 6ef0d21391..ce4499442d 100644
--- a/keyboards/dm9records/lain/info.json
+++ b/keyboards/dm9records/lain/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE8F4",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "D2", "D3", "D5"],
+        "rows": ["C6", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h
index e808946006..b4b541dbfc 100644
--- a/keyboards/dm9records/plaid/config.h
+++ b/keyboards/dm9records/plaid/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, B5, B3, D4 }
-#define MATRIX_COL_PINS { B0, D7, D6, D5, B2, B1, C0, C1, C2, C3, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json
index f0e3577e5f..cedf1fae5d 100644
--- a/keyboards/dm9records/plaid/info.json
+++ b/keyboards/dm9records/plaid/info.json
@@ -8,110 +8,128 @@
     "pid": "0x27DB",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1", "D0"],
+    "rows": ["B4", "B5", "B3", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega328p",
   "bootloader": "usbasploader",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_plaid_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_plaid_mit": "LAYOUT_planck_mit"
+  },
   "layouts": {
     "LAYOUT_planck_mit": {
       "layout": [
-        { "w": 1, "x": 0, "y": 0 },
-        { "w": 1, "x": 1, "y": 0 },
-        { "w": 1, "x": 2, "y": 0 },
-        { "w": 1, "x": 3, "y": 0 },
-        { "w": 1, "x": 4, "y": 0 },
-        { "w": 1, "x": 5, "y": 0 },
-        { "w": 1, "x": 6, "y": 0 },
-        { "w": 1, "x": 7, "y": 0 },
-        { "w": 1, "x": 8, "y": 0 },
-        { "w": 1, "x": 9, "y": 0 },
-        { "w": 1, "x": 10, "y": 0 },
-        { "w": 1, "x": 11, "y": 0 },
-        { "w": 1, "x": 0, "y": 1 },
-        { "w": 1, "x": 1, "y": 1 },
-        { "w": 1, "x": 2, "y": 1 },
-        { "w": 1, "x": 3, "y": 1 },
-        { "w": 1, "x": 4, "y": 1 },
-        { "w": 1, "x": 5, "y": 1 },
-        { "w": 1, "x": 6, "y": 1 },
-        { "w": 1, "x": 7, "y": 1 },
-        { "w": 1, "x": 8, "y": 1 },
-        { "w": 1, "x": 9, "y": 1 },
-        { "w": 1, "x": 10, "y": 1 },
-        { "w": 1, "x": 11, "y": 1 },
-        { "w": 1, "x": 0, "y": 2 },
-        { "w": 1, "x": 1, "y": 2 },
-        { "w": 1, "x": 2, "y": 2 },
-        { "w": 1, "x": 3, "y": 2 },
-        { "w": 1, "x": 4, "y": 2 },
-        { "w": 1, "x": 5, "y": 2 },
-        { "w": 1, "x": 6, "y": 2 },
-        { "w": 1, "x": 7, "y": 2 },
-        { "w": 1, "x": 8, "y": 2 },
-        { "w": 1, "x": 9, "y": 2 },
-        { "w": 1, "x": 10, "y": 2 },
-        { "w": 1, "x": 11, "y": 2 },
-        { "w": 1, "x": 0, "y": 3 },
-        { "w": 1, "x": 1, "y": 3 },
-        { "w": 1, "x": 2, "y": 3 },
-        { "w": 1, "x": 3, "y": 3 },
-        { "w": 1, "x": 4, "y": 3 },
-        { "w": 2, "x": 5, "y": 3 },
-        { "w": 1, "x": 7, "y": 3 },
-        { "w": 1, "x": 8, "y": 3 },
-        { "w": 1, "x": 9, "y": 3 },
-        { "w": 1, "x": 10, "y": 3 },
-        { "w": 1, "x": 11, "y": 3 } ]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "w": 1, "x": 0, "y": 0 },
-        { "w": 1, "x": 1, "y": 0 },
-        { "w": 1, "x": 2, "y": 0 },
-        { "w": 1, "x": 3, "y": 0 },
-        { "w": 1, "x": 4, "y": 0 },
-        { "w": 1, "x": 5, "y": 0 },
-        { "w": 1, "x": 6, "y": 0 },
-        { "w": 1, "x": 7, "y": 0 },
-        { "w": 1, "x": 8, "y": 0 },
-        { "w": 1, "x": 9, "y": 0 },
-        { "w": 1, "x": 10, "y": 0 },
-        { "w": 1, "x": 11, "y": 0 },
-        { "w": 1, "x": 0, "y": 1 },
-        { "w": 1, "x": 1, "y": 1 },
-        { "w": 1, "x": 2, "y": 1 },
-        { "w": 1, "x": 3, "y": 1 },
-        { "w": 1, "x": 4, "y": 1 },
-        { "w": 1, "x": 5, "y": 1 },
-        { "w": 1, "x": 6, "y": 1 },
-        { "w": 1, "x": 7, "y": 1 },
-        { "w": 1, "x": 8, "y": 1 },
-        { "w": 1, "x": 9, "y": 1 },
-        { "w": 1, "x": 10, "y": 1 },
-        { "w": 1, "x": 11, "y": 1 },
-        { "w": 1, "x": 0, "y": 2 },
-        { "w": 1, "x": 1, "y": 2 },
-        { "w": 1, "x": 2, "y": 2 },
-        { "w": 1, "x": 3, "y": 2 },
-        { "w": 1, "x": 4, "y": 2 },
-        { "w": 1, "x": 5, "y": 2 },
-        { "w": 1, "x": 6, "y": 2 },
-        { "w": 1, "x": 7, "y": 2 },
-        { "w": 1, "x": 8, "y": 2 },
-        { "w": 1, "x": 9, "y": 2 },
-        { "w": 1, "x": 10, "y": 2 },
-        { "w": 1, "x": 11, "y": 2 },
-        { "w": 1, "x": 0, "y": 3 },
-        { "w": 1, "x": 1, "y": 3 },
-        { "w": 1, "x": 2, "y": 3 },
-        { "w": 1, "x": 3, "y": 3 },
-        { "w": 1, "x": 4, "y": 3 },
-        { "w": 1, "x": 5, "y": 3 },
-        { "w": 1, "x": 6, "y": 3 },
-        { "w": 1, "x": 7, "y": 3 },
-        { "w": 1, "x": 8, "y": 3 },
-        { "w": 1, "x": 9, "y": 3 },
-        { "w": 1, "x": 10, "y": 3 },
-        { "w": 1, "x": 11, "y": 3 } ]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/dm9records/plaid/plaid.c b/keyboards/dm9records/plaid/plaid.c
deleted file mode 100644
index 50da81950e..0000000000
--- a/keyboards/dm9records/plaid/plaid.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Takuya Urakawa (dm9records.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "plaid.h"
diff --git a/keyboards/dm9records/plaid/plaid.h b/keyboards/dm9records/plaid/plaid.h
index 2969967884..6687db5522 100644
--- a/keyboards/dm9records/plaid/plaid.h
+++ b/keyboards/dm9records/plaid/plaid.h
@@ -18,35 +18,5 @@
 
 #include "quantum.h"
 
-#define LAYOUT_planck_mit( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_plaid_grid LAYOUT_ortho_4x12
-#define LAYOUT_plaid_mit LAYOUT_planck_mit
-
 #define LED_RED C5
 #define LED_GREEN C4
diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h
index 53f1566252..71400c3cf8 100644
--- a/keyboards/dm9records/tartan/config.h
+++ b/keyboards/dm9records/tartan/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, B5, B3, B0, C0 }
-#define MATRIX_COL_PINS { D7, D6, D5, D4, B1, B2, C1, C2, C3, C5, D1, D0, C4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json
index 24fad8a9ff..e6425edb3d 100644
--- a/keyboards/dm9records/tartan/info.json
+++ b/keyboards/dm9records/tartan/info.json
@@ -8,6 +8,11 @@
     "pid": "0x27DB",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "D6", "D5", "D4", "B1", "B2", "C1", "C2", "C3", "C5", "D1", "D0", "C4"],
+    "rows": ["B4", "B5", "B3", "B0", "C0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega328p",
   "bootloader": "usbasploader",
   "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
@@ -16,7 +21,7 @@
       "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
     },
     "LAYOUT_60_ansi_split_bs": {
-        "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":1}, {"label":"", "x":14, "y":0, "w":1}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+        "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0}, {"label":"", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
     },
       "LAYOUT_60_ansi_split_bs_rshift": {
         "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"BS", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
diff --git a/keyboards/dm9records/tartan/tartan.c b/keyboards/dm9records/tartan/tartan.c
deleted file mode 100644
index b702633cc9..0000000000
--- a/keyboards/dm9records/tartan/tartan.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Takuya Urakawa (dm9records.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "tartan.h"
diff --git a/keyboards/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h
index 1e908ea029..2a1bafaacf 100644
--- a/keyboards/dmqdesign/spin/config.h
+++ b/keyboards/dmqdesign/spin/config.h
@@ -17,17 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-//Matrix is 3x5 instead of 3x4, as the 3 encoders are wired into the matrix
-
-#define MATRIX_ROW_PINS { F0, F1, F4 }
-#define MATRIX_COL_PINS { F5, F6, F7, C7, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-//Data pin for the 3 RGB LEDs
-#define RGB_DI_PIN D3
 //Number of RGB LEDs
 #define RGBLED_NUM 3
 
diff --git a/keyboards/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/info.json
index ff5101f8ea..7fbcf0db3a 100644
--- a/keyboards/dmqdesign/spin/info.json
+++ b/keyboards/dmqdesign/spin/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "C7", "C6"],
+        "rows": ["F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "B5"},
@@ -15,26 +20,33 @@
             {"pin_a": "D6", "pin_b": "D4"}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-            {"x":0, "y":0},
-            {"x":1, "y":0},
-            {"x":2, "y":0},
-            {"x":3.5, "y":0},
-            {"x":0, "y":1},
-            {"x":1, "y":1}, 
-            {"x":2, "y":1},
-            {"x":3.5, "y":1.5},
-            {"x":0, "y":2},
-            {"x":1, "y":2},
-            {"x":2, "y":2},
-            {"x":3.5, "y":3},
-            {"x":0, "y":3}, 
-            {"x":1, "y":3},
-            {"x":2, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [2, 4], "x": 3.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+
+                {"matrix": [1, 4], "x": 3.5, "y": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2},
+                {"matrix": [1, 2], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [0, 4], "x": 3.5, "y": 3},
+                {"matrix": [0, 3], "x": 0, "y": 3},
+                {"matrix": [1, 3], "x": 1, "y": 3},
+                {"matrix": [2, 3], "x": 2, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dmqdesign/spin/spin.c b/keyboards/dmqdesign/spin/spin.c
deleted file mode 100644
index fe3f267d1a..0000000000
--- a/keyboards/dmqdesign/spin/spin.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019-2020 DMQ Design
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "spin.h"
diff --git a/keyboards/dmqdesign/spin/spin.h b/keyboards/dmqdesign/spin/spin.h
deleted file mode 100644
index d60dbe82fb..0000000000
--- a/keyboards/dmqdesign/spin/spin.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2019-2020 DMQ Design
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32 \
-) { \
-    {k00, k10, k20, k30, k23}, \
-    {k01, k11, k21, k31, k13}, \
-    {k02, k12, k22, k32, k03} \
-}
diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h
index 969d620d93..21160e0a8d 100644
--- a/keyboards/do60/config.h
+++ b/keyboards/do60/config.h
@@ -17,27 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, F4, B4, D7, D6, B3, B0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow
- * F5 PIN for DO60's pre-soldered WS2812 LEDs
  */
-#define RGB_DI_PIN F5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/do60/info.json b/keyboards/do60/info.json
index 86d02df61e..9e63293fdb 100644
--- a/keyboards/do60/info.json
+++ b/keyboards/do60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "F4", "B4", "D7", "D6", "B3", "B0"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5",
         "levels": 6
@@ -16,6 +21,9 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_hhkb", "60_ansi_split_bs_rshift"],
diff --git a/keyboards/doio/kb16/kb16.c b/keyboards/doio/kb16/kb16.c
index c0f7f96b9e..34b315a87b 100644
--- a/keyboards/doio/kb16/kb16.c
+++ b/keyboards/doio/kb16/kb16.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kb16.h"
+#include "quantum.h"
 
 // OLED animation
 #include "./lib/logo.h"
diff --git a/keyboards/doio/kb16/kb16.h b/keyboards/doio/kb16/kb16.h
deleted file mode 100644
index 6e6ab2f7f4..0000000000
--- a/keyboards/doio/kb16/kb16.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ┌───┬───┬───┬───�  ┌───� ┌───�
- * │00 │01 │02 │03 │  │04 │ │14 │
- * ├───┼───┼───┼───┤  └───┘ └───┘
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤
- * │20 │21 │22 │23 │     ┌───�
- * ├───┼───┼───┼───┤     │24 │
- * │30 │31 │32 │33 │     └───┘
- * └───┴───┴───┴───┘
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, \
-    K10, K11, K12, K13, K14, \
-    K20, K21, K22, K23, K24, \
-    K30, K31, K32, K33       \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, XXX }  \
-}
diff --git a/keyboards/doio/kb16/lib/bongocat/bongocat.h b/keyboards/doio/kb16/lib/bongocat/bongocat.h
index 65ceabc682..2ffeca1993 100644
--- a/keyboards/doio/kb16/lib/bongocat/bongocat.h
+++ b/keyboards/doio/kb16/lib/bongocat/bongocat.h
@@ -14,4 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 void render_bongocat(void);
diff --git a/keyboards/doio/kb16/lib/layer_status/layer_status.h b/keyboards/doio/kb16/lib/layer_status/layer_status.h
index a367a829d7..2c4b08f25a 100644
--- a/keyboards/doio/kb16/lib/layer_status/layer_status.h
+++ b/keyboards/doio/kb16/lib/layer_status/layer_status.h
@@ -15,4 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 void render_layer_status(void);
diff --git a/keyboards/doio/kb16/lib/logo.h b/keyboards/doio/kb16/lib/logo.h
index 91d1ddce34..bb3ddc446e 100644
--- a/keyboards/doio/kb16/lib/logo.h
+++ b/keyboards/doio/kb16/lib/logo.h
@@ -15,4 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 void render_logo(void);
diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h
index aa066fe393..8739474326 100644
--- a/keyboards/doio/kb16/rev1/config.h
+++ b/keyboards/doio/kb16/rev1/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D5, D4, D3, D2 }
-#define MATRIX_COL_PINS { F5, F4, F1, F0, B7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
@@ -33,7 +25,6 @@
 
 #ifdef RGB_MATRIX_ENABLE
     /* RGB Matrix config */
-    #define RGB_DI_PIN F6
     #define RGB_MATRIX_LED_COUNT 16
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
index d0acdedfb9..f37a58e157 100644
--- a/keyboards/doio/kb16/rev1/info.json
+++ b/keyboards/doio/kb16/rev1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1601",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "F1", "F0", "B7"],
+        "rows": ["D5", "D4", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F7", "pin_b": "E6"},
@@ -15,36 +23,39 @@
             {"pin_a": "D7", "pin_b": "D6"}
         ]
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1!", "x":0, "y":0},
-                {"label":"2@", "x":1, "y":0},
-                {"label":"3#", "x":2, "y":0},
-                {"label":"4$", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"Encoder 1", "x":4.75, "y":0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
 
-                {"label":"5%", "x":0, "y":1},
-                {"label":"6^", "x":1, "y":1},
-                {"label":"7&", "x":2, "y":1},
-                {"label":"8*", "x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label":"Encoder 2", "x":6, "y":0},
+                {"matrix": [1, 4], "x": 6, "y": 0},
 
-                {"label":"9(", "x":0, "y":2},
-                {"label":"0)", "x":1, "y":2},
-                {"label":"\u2191", "x":2, "y":2},
-                {"label":"Enter", "x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"label":"Encoder 3", "x":5.375, "y":2.5},
+                {"matrix": [2, 4], "x": 5.375, "y": 2.5},
 
-                {"label":"Fn", "x":0, "y":3},
-                {"label":"\u2190", "x":1, "y":3},
-                {"label":"\u2193", "x":2, "y":3},
-                {"label":"\u2192", "x":3, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/doio/kb16/rev1/rules.mk b/keyboards/doio/kb16/rev1/rules.mk
index 475b3b9a52..5c5ad3de8c 100644
--- a/keyboards/doio/kb16/rev1/rules.mk
+++ b/keyboards/doio/kb16/rev1/rules.mk
@@ -24,7 +24,6 @@ OLED_DRIVER = SSD1306
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Encoder enabled
 ENCODER_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h
index e7e2791ac8..9580435e5c 100644
--- a/keyboards/doio/kb16/rev2/config.h
+++ b/keyboards/doio/kb16/rev2/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B4, B9, B8 }
-#define MATRIX_COL_PINS { B14, B13, B12, B0, A7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
@@ -40,7 +32,6 @@
 
 #ifdef RGB_MATRIX_ENABLE
     /* RGB Matrix config */
-    #define RGB_DI_PIN A10
     #define RGB_MATRIX_LED_COUNT 16
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
index 8b5eeb45c2..6d11cadaac 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/keyboards/doio/kb16/rev2/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1601",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B0", "A7"],
+        "rows": ["B3", "B4", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B6"},
@@ -15,34 +23,39 @@
             {"pin_a": "A3", "pin_b": "A4"}
         ]
     },
+    "ws2812": {
+        "pin": "A10"
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1!", "x":0, "y":0},
-                {"label":"2@", "x":1, "y":0},
-                {"label":"3#", "x":2, "y":0},
-                {"label":"4$", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"Encoder 1", "x":4.75, "y":0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
 
-                {"label":"5%", "x":0, "y":1},
-                {"label":"6^", "x":1, "y":1},
-                {"label":"7&", "x":2, "y":1},
-                {"label":"8*", "x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label":"Encoder 2", "x":6, "y":0},
+                {"matrix": [1, 4], "x": 6, "y": 0},
 
-                {"label":"9(", "x":0, "y":2},
-                {"label":"0)", "x":1, "y":2},
-                {"label":"\u2191", "x":2, "y":2},
-                {"label":"Enter", "x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"label":"Encoder 3", "x":5.375, "y":2.5},
+                {"matrix": [2, 4], "x": 5.375, "y": 2.5},
 
-                {"label":"Fn", "x":0, "y":3},
-                {"label":"\u2190", "x":1, "y":3},
-                {"label":"\u2193", "x":2, "y":3},
-                {"label":"\u2192", "x":3, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/doio/kb16/rev2/rules.mk b/keyboards/doio/kb16/rev2/rules.mk
index 7fa9b91da0..f931af11e4 100644
--- a/keyboards/doio/kb16/rev2/rules.mk
+++ b/keyboards/doio/kb16/rev2/rules.mk
@@ -1,18 +1,8 @@
 SRC += ./lib/layer_status/layer_status.c
 SRC += ./lib/logo.c
 
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-# Cannot use `BOOTLOADER = stm32duino` due to the need to override
-# `MCU_LDSCRIPT`, therefore all parameters need to be specified here manually.
-OPT_DEFS += -DBOOTLOADER_STM32DUINO
-MCU_LDSCRIPT = STM32F103xB_stm32duino_bootloader
-BOARD = STM32_F103_STM32DUINO
-BOOTLOADER_TYPE = stm32duino
-DFU_ARGS = -d 1EAF:0003 -a 2 -R
-DFU_SUFFIX_ARGS = -v 1EAF -p 0003
+# Configure for 128K flash
+MCU_LDSCRIPT = STM32F103xB
 
 # Build Options
 #   change yes to no to disable
@@ -33,7 +23,6 @@ OLED_DRIVER = SSD1306
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Encoder enabled
 ENCODER_ENABLE = yes
diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h
index 866bd3e1d9..a87532c459 100644
--- a/keyboards/doio/kb30/config.h
+++ b/keyboards/doio/kb30/config.h
@@ -17,11 +17,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B3, B4, B9, B8, A5, A6 }
-#define MATRIX_COL_PINS { B14, B13, B12, B0, A7, A9, A8 }
-#define DIODE_DIRECTION COL2ROW // COL2ROW or ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -41,7 +36,6 @@
 
 #ifdef RGB_MATRIX_ENABLE
     /* RGB Matrix config */
-    #define RGB_DI_PIN A10
     #define RGB_MATRIX_LED_COUNT 36
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json
index 9fe8e83185..3f3fa1c332 100644
--- a/keyboards/doio/kb30/info.json
+++ b/keyboards/doio/kb30/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3001",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B0", "A7", "A9", "A8"],
+        "rows": ["B3", "B4", "B9", "B8", "A5", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B6"},
@@ -15,51 +23,59 @@
             {"pin_a": "A3", "pin_b": "A4", "resolution": 2}
         ]
     },
+    "ws2812": {
+        "pin": "A10"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4.25, "y":0},
-                {"label":"K05", "x":5.25, "y":0},
-                {"label":"K06", "x":6.25, "y":0},
-                
-                {"label":"K10", "x":0, "y":1},
-                {"label":"K11", "x":1, "y":1},
-                {"label":"K12", "x":2, "y":1},
-                {"label":"K13", "x":3, "y":1, "h":2},
-                {"label":"K14", "x":4.25, "y":1},
-                {"label":"K15", "x":5.25, "y":1},
-                {"label":"K16", "x":6.25, "y":1},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 8.25, "y": 2},
+
+                {"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": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [3, 0], "x": 6.25, "y": 2},
 
-                {"label":"Encoder 1", "x":8.25, "y":2},
+                {"matrix": [3, 1], "x": 11, "y": 2},
 
-                {"label":"K20", "x":0, "y":2},
-                {"label":"K21", "x":1, "y":2},
-                {"label":"K22", "x":2, "y":2},
-                {"label":"K23", "x":4.25, "y":2},
-                {"label":"K24", "x":5.25, "y":2},
-                {"label":"K25", "x":6.25, "y":2},
+                {"matrix": [3, 2], "x": 0, "y": 3},
+                {"matrix": [3, 3], "x": 1, "y": 3},
+                {"matrix": [3, 5], "x": 2, "y": 3},
 
-                {"label":"Encoder 2", "x":11, "y":2},
+                {"matrix": [4, 0], "x": 4.25, "y": 3, "h": 2},
+                {"matrix": [4, 1], "x": 5.25, "y": 3},
 
-                {"label":"K30", "x":0, "y":3},
-                {"label":"K31", "x":1, "y":3},
-                {"label":"K32", "x":2, "y":3},
-                {"label":"K33", "x":4.25, "y":3, "h":2},
-                {"label":"K35", "x":5.25, "y":3},
+                {"matrix": [4, 2], "x": 9, "y": 4},
 
-                {"label":"Encoder 3", "x":9, "y":4},
+                {"matrix": [4, 3], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 4], "x": 2, "y": 4},
 
-                {"label":"K40", "x":0, "y":4, "w":2},
-                {"label":"K41", "x":2, "y":4},
-                {"label":"K42", "x":4.25, "y":4},
-                {"label":"K43", "x":5.25, "y":4},
-                {"label":"K44", "x":6.25, "y":4}
+                {"matrix": [5, 4], "x": 4.25, "y": 4},
+                {"matrix": [5, 5], "x": 5.25, "y": 4},
+                {"matrix": [5, 6], "x": 6.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/doio/kb30/kb30.c b/keyboards/doio/kb30/kb30.c
index 3272863ad1..53a4546e06 100644
--- a/keyboards/doio/kb30/kb30.c
+++ b/keyboards/doio/kb30/kb30.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kb30.h"
+#include "quantum.h"
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/doio/kb30/kb30.h b/keyboards/doio/kb30/kb30.h
deleted file mode 100644
index 1a294c9735..0000000000
--- a/keyboards/doio/kb30/kb30.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 DOIO2022 <https://github.com/DOIO2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-	K00, K01, K02, K03, K04, K05, K06, \
-	K10, K11, K12, K13, K14, K15, K16, \
-	K20, K21, K22, K23, K24, K25,      \
-	K30, K31, K32, K33,      K35,      \
-	K40, K41, K42, K43, K44,           \
-	                    K54, K55, K56  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06  }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16  }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   KC_NO}, \
-	{ K30,   K31,   K32,   K33,   KC_NO, K35,   KC_NO}, \
-	{ K40,   K41,   K42,   K43,   K44,   KC_NO, KC_NO}, \
-	{ KC_NO, KC_NO, KC_NO, KC_NO, K54,   K55,   K56 }  \
-}
diff --git a/keyboards/doio/kb30/rules.mk b/keyboards/doio/kb30/rules.mk
index a50872f0d5..b12899890e 100644
--- a/keyboards/doio/kb30/rules.mk
+++ b/keyboards/doio/kb30/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/doio/kb38/config.h b/keyboards/doio/kb38/config.h
index 740f1baea7..ff90cbc8a7 100644
--- a/keyboards/doio/kb38/config.h
+++ b/keyboards/doio/kb38/config.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN F6
 #define RGB_MATRIX_LED_COUNT 44
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json
index 227511295c..352702f814 100644
--- a/keyboards/doio/kb38/info.json
+++ b/keyboards/doio/kb38/info.json
@@ -32,6 +32,9 @@
             {"pin_a": "D6", "pin_b": "D7", "resolution": 2}
         ]
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
diff --git a/keyboards/donutcables/budget96/budget96.c b/keyboards/donutcables/budget96/budget96.c
deleted file mode 100644
index 8c7b894bc4..0000000000
--- a/keyboards/donutcables/budget96/budget96.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "budget96.h"
diff --git a/keyboards/donutcables/budget96/budget96.h b/keyboards/donutcables/budget96/budget96.h
deleted file mode 100644
index 05d2700ce1..0000000000
--- a/keyboards/donutcables/budget96/budget96.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    k50, k52, k53, k54, k55, k60, k6A, k7A, k70, k5B, k5C, k5D, k5E, k1D, k2E, k0D, k76, k78, k79, \
-    k40, k41, k42, k43, k44, k45, k61, k6B, k7B, k71, k4A, k4B, k4C, k4D, k4E, k46, k47, k48, k49, \
-    k30, k31, k32, k33, k34, k35, k62, k6C, k7C, k72, k3A, k3B, k3C, k3D, k36, k37, k38, k39,      \
-    k20, k21, k22, k23, k24, k25, k63, k6D, k7D, k73, k2A, k2B, k2C, k2D, k26, k27, k28, k29,      \
-    k10, k03, k11, k12, k13, k14, k15, k64, k6E, k7E, k74, k1A, k1B, k68, k16, k17, k18, k19,      \
-    k00, k01, k02, k65, k75, k0A, k0B, k66, k67, k69, k06, k08, k09                                \
-) \
-{ \
-    { k00, k01,   k02, k03, KC_NO, KC_NO, k06,   KC_NO, k08,   k09,   k0A,   k0B, KC_NO, k0D, KC_NO }, \
-    { k10, k11,   k12, k13, k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B, KC_NO, k1D, KC_NO }, \
-    { k20, k21,   k22, k23, k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B, k2C,   k2D, k2E },   \
-    { k30, k31,   k32, k33, k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B, k3C,   k3D, KC_NO }, \
-    { k40, k41,   k42, k43, k44,   k45,   k46,   k47,   k48,   k49,   k4A,   k4B, k4C,   k4D, k4E },   \
-    { k50, KC_NO, k52, k53, k54,   k55,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k5B, k5C,   k5D, k5E },   \
-    { k60, k61,   k62, k63, k64,   k65,   k66,   k67,   k68,   k69,   k6A,   k6B, k6C,   k6D, k6E },   \
-    { k70, k71,   k72, k73, k74,   k75,   k76,   KC_NO, k78,   k79,   k7A,   k7B, k7C,   k7D, k7E },   \
-}
-
-#define LAYOUT_96_ansi( \
-    k50, k52, k53, k54, k55, k60, k6A, k7A, k70, k5B, k5C, k5D, k5E, k1D, k2E, k0D, k76, k78, k79, \
-    k40, k41, k42, k43, k44, k45, k61, k6B, k7B, k71, k4A, k4B, k4C, k4E, k46, k47, k48, k49,      \
-    k30, k31, k32, k33, k34, k35, k62, k6C, k7C, k72, k3A, k3B, k3C, k3D, k36, k37, k38, k39,      \
-    k20, k21, k22, k23, k24, k25, k63, k6D, k7D, k73, k2A, k2B, k2D, k26, k27, k28, k29,           \
-    k10,      k11, k12, k13, k14, k15, k64, k6E, k7E, k74, k1A, k1B, k68, k16, k17, k18,           \
-    k00, k01, k02, k65, k75, k0B, k66, k67, k69, k06, k08, k09                                     \
-) \
-{ \
-    { k00, k01,   k02, KC_NO, KC_NO, KC_NO, k06,   KC_NO, k08,   k09,   KC_NO, k0B, KC_NO, k0D,   KC_NO }, \
-    { k10, k11,   k12, k13,   k14,   k15,   k16,   k17,   k18,   KC_NO, k1A,   k1B, KC_NO, k1D,   KC_NO }, \
-    { k20, k21,   k22, k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B, KC_NO, k2D,   k2E },   \
-    { k30, k31,   k32, k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B, k3C,   k3D,   KC_NO }, \
-    { k40, k41,   k42, k43,   k44,   k45,   k46,   k47,   k48,   k49,   k4A,   k4B, k4C,   KC_NO, k4E },   \
-    { k50, KC_NO, k52, k53,   k54,   k55,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k5B, k5C,   k5D,   k5E },   \
-    { k60, k61,   k62, k63,   k64,   k65,   k66,   k67,   k68,   k69,   k6A,   k6B, k6C,   k6D,   k6E },   \
-    { k70, k71,   k72, k73,   k74,   k75,   k76,   KC_NO, k78,   k79,   k7A,   k7B, k7C,   k7D,   k7E },   \
-}
diff --git a/keyboards/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h
index d5bf7a17cb..398b0be3c8 100644
--- a/keyboards/donutcables/budget96/config.h
+++ b/keyboards/donutcables/budget96/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 18
 
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/donutcables/budget96/info.json b/keyboards/donutcables/budget96/info.json
index a8dd3fc32a..59bcf41c42 100644
--- a/keyboards/donutcables/budget96/info.json
+++ b/keyboards/donutcables/budget96/info.json
@@ -8,9 +8,17 @@
         "pid": "0xB960",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1",
         "num_lock": "D0"
@@ -19,11 +27,227 @@
     "bootloader": "bootloadhid",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2, "w":1.5}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}, {"x":0, "y":3, "w":1.75}, {"x":1.75, "y":3}, {"x":2.75, "y":3}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3, "w":1.25}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":17, "y":3}, {"x":18, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"x":2.25, "y":4}, {"x":3.25, "y":4}, {"x":4.25, "y":4}, {"x":5.25, "y":4}, {"x":6.25, "y":4}, {"x":7.25, "y":4}, {"x":8.25, "y":4}, {"x":9.25, "y":4}, {"x":10.25, "y":4}, {"x":11.25, "y":4}, {"x":12.25, "y":4, "w":1.75}, {"x":14, "y":4}, {"x":15, "y":4}, {"x":16, "y":4}, {"x":17, "y":4}, {"x":18, "y":4}, {"x":0, "y":5, "w":1.25}, {"x":1.25, "y":5, "w":1.25}, {"x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"x":10, "y":5}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5}, {"x":14, "y":5}, {"x":15, "y":5}, {"x":16, "y":5}, {"x":17, "y":5}, {"x":18, "y":5}]
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 10], "x": 6, "y": 0},
+                {"matrix": [7, 10], "x": 7, "y": 0},
+                {"matrix": [7, 0], "x": 8, "y": 0},
+                {"matrix": [5, 11], "x": 9, "y": 0},
+                {"matrix": [5, 12], "x": 10, "y": 0},
+                {"matrix": [5, 13], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [2, 14], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [7, 6], "x": 16, "y": 0},
+                {"matrix": [7, 8], "x": 17, "y": 0},
+                {"matrix": [7, 9], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [6, 1], "x": 6, "y": 1},
+                {"matrix": [6, 11], "x": 7, "y": 1},
+                {"matrix": [7, 11], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [4, 10], "x": 10, "y": 1},
+                {"matrix": [4, 11], "x": 11, "y": 1},
+                {"matrix": [4, 12], "x": 12, "y": 1},
+                {"matrix": [4, 13], "x": 13, "y": 1},
+                {"matrix": [4, 14], "x": 14, "y": 1},
+                {"matrix": [4, 6], "x": 15, "y": 1},
+                {"matrix": [4, 7], "x": 16, "y": 1},
+                {"matrix": [4, 8], "x": 17, "y": 1},
+                {"matrix": [4, 9], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 12], "x": 7.5, "y": 2},
+                {"matrix": [7, 12], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 6], "x": 15, "y": 2},
+                {"matrix": [3, 7], "x": 16, "y": 2},
+                {"matrix": [3, 8], "x": 17, "y": 2},
+                {"matrix": [3, 9], "x": 18, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [6, 13], "x": 7.75, "y": 3},
+                {"matrix": [7, 13], "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 12], "x": 12.75, "y": 3},
+                {"matrix": [2, 13], "x": 13.75, "y": 3, "w": 1.25},
+                {"matrix": [2, 6], "x": 15, "y": 3},
+                {"matrix": [2, 7], "x": 16, "y": 3},
+                {"matrix": [2, 8], "x": 17, "y": 3},
+                {"matrix": [2, 9], "x": 18, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [0, 3], "x": 1.25, "y": 4},
+                {"matrix": [1, 1], "x": 2.25, "y": 4},
+                {"matrix": [1, 2], "x": 3.25, "y": 4},
+                {"matrix": [1, 3], "x": 4.25, "y": 4},
+                {"matrix": [1, 4], "x": 5.25, "y": 4},
+                {"matrix": [1, 5], "x": 6.25, "y": 4},
+                {"matrix": [6, 4], "x": 7.25, "y": 4},
+                {"matrix": [6, 14], "x": 8.25, "y": 4},
+                {"matrix": [7, 14], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [1, 10], "x": 11.25, "y": 4},
+                {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 8], "x": 14, "y": 4},
+                {"matrix": [1, 6], "x": 15, "y": 4},
+                {"matrix": [1, 7], "x": 16, "y": 4},
+                {"matrix": [1, 8], "x": 17, "y": 4},
+                {"matrix": [1, 9], "x": 18, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5},
+                {"matrix": [0, 10], "x": 11, "y": 5},
+                {"matrix": [0, 11], "x": 12, "y": 5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 7], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5},
+                {"matrix": [0, 6], "x": 16, "y": 5},
+                {"matrix": [0, 8], "x": 17, "y": 5},
+                {"matrix": [0, 9], "x": 18, "y": 5}
+            ]
         },
-        
         "LAYOUT_96_ansi": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1, "w":2}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2, "w":1.5}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}, {"x":0, "y":3, "w":1.75}, {"x":1.75, "y":3}, {"x":2.75, "y":3}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3, "w":2.25}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":17, "y":3}, {"x":18, "y":3}, {"x":0, "y":4, "w":2.25}, {"x":2.25, "y":4}, {"x":3.25, "y":4}, {"x":4.25, "y":4}, {"x":5.25, "y":4}, {"x":6.25, "y":4}, {"x":7.25, "y":4}, {"x":8.25, "y":4}, {"x":9.25, "y":4}, {"x":10.25, "y":4}, {"x":11.25, "y":4}, {"x":12.25, "y":4, "w":1.75}, {"x":14, "y":4}, {"x":15, "y":4}, {"x":16, "y":4}, {"x":17, "y":4}, {"x":0, "y":5, "w":1.25}, {"x":1.25, "y":5, "w":1.25}, {"x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"x":10, "y":5, "w":1.5}, {"x":11.5, "y":5, "w":1.5}, {"x":13, "y":5}, {"x":14, "y":5}, {"x":15, "y":5}, {"x":16, "y":5}, {"x":17, "y":5}, {"x":18, "y":4, "h":2}]
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 10], "x": 6, "y": 0},
+                {"matrix": [7, 10], "x": 7, "y": 0},
+                {"matrix": [7, 0], "x": 8, "y": 0},
+                {"matrix": [5, 11], "x": 9, "y": 0},
+                {"matrix": [5, 12], "x": 10, "y": 0},
+                {"matrix": [5, 13], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [2, 14], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [7, 6], "x": 16, "y": 0},
+                {"matrix": [7, 8], "x": 17, "y": 0},
+                {"matrix": [7, 9], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [6, 1], "x": 6, "y": 1},
+                {"matrix": [6, 11], "x": 7, "y": 1},
+                {"matrix": [7, 11], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [4, 10], "x": 10, "y": 1},
+                {"matrix": [4, 11], "x": 11, "y": 1},
+                {"matrix": [4, 12], "x": 12, "y": 1},
+                {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [4, 6], "x": 15, "y": 1},
+                {"matrix": [4, 7], "x": 16, "y": 1},
+                {"matrix": [4, 8], "x": 17, "y": 1},
+                {"matrix": [4, 9], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 12], "x": 7.5, "y": 2},
+                {"matrix": [7, 12], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 6], "x": 15, "y": 2},
+                {"matrix": [3, 7], "x": 16, "y": 2},
+                {"matrix": [3, 8], "x": 17, "y": 2},
+                {"matrix": [3, 9], "x": 18, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [6, 13], "x": 7.75, "y": 3},
+                {"matrix": [7, 13], "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [2, 6], "x": 15, "y": 3},
+                {"matrix": [2, 7], "x": 16, "y": 3},
+                {"matrix": [2, 8], "x": 17, "y": 3},
+                {"matrix": [2, 9], "x": 18, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 4},
+                {"matrix": [1, 2], "x": 3.25, "y": 4},
+                {"matrix": [1, 3], "x": 4.25, "y": 4},
+                {"matrix": [1, 4], "x": 5.25, "y": 4},
+                {"matrix": [1, 5], "x": 6.25, "y": 4},
+                {"matrix": [6, 4], "x": 7.25, "y": 4},
+                {"matrix": [6, 14], "x": 8.25, "y": 4},
+                {"matrix": [7, 14], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [1, 10], "x": 11.25, "y": 4},
+                {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 8], "x": 14, "y": 4},
+                {"matrix": [1, 6], "x": 15, "y": 4},
+                {"matrix": [1, 7], "x": 16, "y": 4},
+                {"matrix": [1, 8], "x": 17, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [0, 11], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 7], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5},
+                {"matrix": [0, 6], "x": 16, "y": 5},
+                {"matrix": [0, 8], "x": 17, "y": 5},
+                {"matrix": [0, 9], "x": 18, "y": 4, "h": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/donutcables/budget96/rules.mk b/keyboards/donutcables/budget96/rules.mk
index 03a618b76d..166b3d3ec8 100644
--- a/keyboards/donutcables/budget96/rules.mk
+++ b/keyboards/donutcables/budget96/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/donutcables/scrabblepad/config.h b/keyboards/donutcables/scrabblepad/config.h
index dc6d1fc84a..76f004028f 100644
--- a/keyboards/donutcables/scrabblepad/config.h
+++ b/keyboards/donutcables/scrabblepad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D5, F1, C7, F2, C6, F3, C5, F4, C4, F5, C3, F6, C2, F7, C1 }
-#define MATRIX_COL_PINS { D6, D7, E0, E1, B7, D2, D3, D4, C0, B4, B5, B6, F0, E6, E7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/donutcables/scrabblepad/info.json b/keyboards/donutcables/scrabblepad/info.json
index 0f805c7057..8642865cd9 100644
--- a/keyboards/donutcables/scrabblepad/info.json
+++ b/keyboards/donutcables/scrabblepad/info.json
@@ -8,11 +8,256 @@
     "pid": "0x21D7",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["D6", "D7", "E0", "E1", "B7", "D2", "D3", "D4", "C0", "B4", "B5", "B6", "F0", "E6", "E7"],
+    "rows": ["D5", "F1", "C7", "F2", "C6", "F3", "C5", "F4", "C4", "F5", "C3", "F6", "C2", "F7", "C1"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "at90usb1286",
   "bootloader": "halfkay",
   "layouts": {
       "LAYOUT": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":5}, {"x":4, "y":5}, {"x":5, "y":5}, {"x":6, "y":5}, {"x":7, "y":5}, {"x":8, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5}, {"x":14, "y":5}, {"x":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":6}, {"x":4, "y":6}, {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6}, {"x":8, "y":6}, {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6}, {"x":14, "y":6}, {"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":7}, {"x":4, "y":7}, {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7}, {"x":8, "y":7}, {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7}, {"x":14, "y":7}, {"x":0, "y":8}, {"x":1, "y":8}, {"x":2, "y":8}, {"x":3, "y":8}, {"x":4, "y":8}, {"x":5, "y":8}, {"x":6, "y":8}, {"x":7, "y":8}, {"x":8, "y":8}, {"x":9, "y":8}, {"x":10, "y":8}, {"x":11, "y":8}, {"x":12, "y":8}, {"x":13, "y":8}, {"x":14, "y":8}, {"x":0, "y":9}, {"x":1, "y":9}, {"x":2, "y":9}, {"x":3, "y":9}, {"x":4, "y":9}, {"x":5, "y":9}, {"x":6, "y":9}, {"x":7, "y":9}, {"x":8, "y":9}, {"x":9, "y":9}, {"x":10, "y":9}, {"x":11, "y":9}, {"x":12, "y":9}, {"x":13, "y":9}, {"x":14, "y":9}, {"x":0, "y":10}, {"x":1, "y":10}, {"x":2, "y":10}, {"x":3, "y":10}, {"x":4, "y":10}, {"x":5, "y":10}, {"x":6, "y":10}, {"x":7, "y":10}, {"x":8, "y":10}, {"x":9, "y":10}, {"x":10, "y":10}, {"x":11, "y":10}, {"x":12, "y":10}, {"x":13, "y":10}, {"x":14, "y":10}, {"x":0, "y":11}, {"x":1, "y":11}, {"x":2, "y":11}, {"x":3, "y":11}, {"x":4, "y":11}, {"x":5, "y":11}, {"x":6, "y":11}, {"x":7, "y":11}, {"x":8, "y":11}, {"x":9, "y":11}, {"x":10, "y":11}, {"x":11, "y":11}, {"x":12, "y":11}, {"x":13, "y":11}, {"x":14, "y":11}, {"x":0, "y":12}, {"x":1, "y":12}, {"x":2, "y":12}, {"x":3, "y":12}, {"x":4, "y":12}, {"x":5, "y":12}, {"x":6, "y":12}, {"x":7, "y":12}, {"x":8, "y":12}, {"x":9, "y":12}, {"x":10, "y":12}, {"x":11, "y":12}, {"x":12, "y":12}, {"x":13, "y":12}, {"x":14, "y":12}, {"x":0, "y":13}, {"x":1, "y":13}, {"x":2, "y":13}, {"x":3, "y":13}, {"x":4, "y":13}, {"x":5, "y":13}, {"x":6, "y":13}, {"x":7, "y":13}, {"x":8, "y":13}, {"x":9, "y":13}, {"x":10, "y":13}, {"x":11, "y":13}, {"x":12, "y":13}, {"x":13, "y":13}, {"x":14, "y":13}, {"x":0, "y":14}, {"x":1, "y":14}, {"x":2, "y":14}, {"x":3, "y":14}, {"x":4, "y":14}, {"x":5, "y":14}, {"x":6, "y":14}, {"x":7, "y":14}, {"x":8, "y":14}, {"x":9, "y":14}, {"x":10, "y":14}, {"x":11, "y":14}, {"x":12, "y":14}, {"x":13, "y":14}, {"x":14, "y":14}]
+          "layout": [
+              {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+              {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+              {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+              {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
+              {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
+              {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
+              {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
+              {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0},
+              {"label": "k08", "matrix": [0, 8], "x": 8, "y": 0},
+              {"label": "k09", "matrix": [0, 9], "x": 9, "y": 0},
+              {"label": "k0A", "matrix": [0, 10], "x": 10, "y": 0},
+              {"label": "k0B", "matrix": [0, 11], "x": 11, "y": 0},
+              {"label": "k0C", "matrix": [0, 12], "x": 12, "y": 0},
+              {"label": "k0D", "matrix": [0, 13], "x": 13, "y": 0},
+              {"label": "k0E", "matrix": [0, 14], "x": 14, "y": 0},
+  
+              {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1},
+              {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1},
+              {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1},
+              {"label": "k13", "matrix": [1, 3], "x": 3, "y": 1},
+              {"label": "k14", "matrix": [1, 4], "x": 4, "y": 1},
+              {"label": "k15", "matrix": [1, 5], "x": 5, "y": 1},
+              {"label": "k16", "matrix": [1, 6], "x": 6, "y": 1},
+              {"label": "k17", "matrix": [1, 7], "x": 7, "y": 1},
+              {"label": "k18", "matrix": [1, 8], "x": 8, "y": 1},
+              {"label": "k19", "matrix": [1, 9], "x": 9, "y": 1},
+              {"label": "k1A", "matrix": [1, 10], "x": 10, "y": 1},
+              {"label": "k1B", "matrix": [1, 11], "x": 11, "y": 1},
+              {"label": "k1C", "matrix": [1, 12], "x": 12, "y": 1},
+              {"label": "k1D", "matrix": [1, 13], "x": 13, "y": 1},
+              {"label": "k1E", "matrix": [1, 14], "x": 14, "y": 1},
+  
+              {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2},
+              {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2},
+              {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2},
+              {"label": "k23", "matrix": [2, 3], "x": 3, "y": 2},
+              {"label": "k24", "matrix": [2, 4], "x": 4, "y": 2},
+              {"label": "k25", "matrix": [2, 5], "x": 5, "y": 2},
+              {"label": "k26", "matrix": [2, 6], "x": 6, "y": 2},
+              {"label": "k27", "matrix": [2, 7], "x": 7, "y": 2},
+              {"label": "k28", "matrix": [2, 8], "x": 8, "y": 2},
+              {"label": "k29", "matrix": [2, 9], "x": 9, "y": 2},
+              {"label": "k2A", "matrix": [2, 10], "x": 10, "y": 2},
+              {"label": "k2B", "matrix": [2, 11], "x": 11, "y": 2},
+              {"label": "k2C", "matrix": [2, 12], "x": 12, "y": 2},
+              {"label": "k2D", "matrix": [2, 13], "x": 13, "y": 2},
+              {"label": "k2E", "matrix": [2, 14], "x": 14, "y": 2},
+  
+              {"label": "k30", "matrix": [3, 0], "x": 0, "y": 3},
+              {"label": "k31", "matrix": [3, 1], "x": 1, "y": 3},
+              {"label": "k32", "matrix": [3, 2], "x": 2, "y": 3},
+              {"label": "k33", "matrix": [3, 3], "x": 3, "y": 3},
+              {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3},
+              {"label": "k35", "matrix": [3, 5], "x": 5, "y": 3},
+              {"label": "k36", "matrix": [3, 6], "x": 6, "y": 3},
+              {"label": "k37", "matrix": [3, 7], "x": 7, "y": 3},
+              {"label": "k38", "matrix": [3, 8], "x": 8, "y": 3},
+              {"label": "k39", "matrix": [3, 9], "x": 9, "y": 3},
+              {"label": "k3A", "matrix": [3, 10], "x": 10, "y": 3},
+              {"label": "k3B", "matrix": [3, 11], "x": 11, "y": 3},
+              {"label": "k3C", "matrix": [3, 12], "x": 12, "y": 3},
+              {"label": "k3D", "matrix": [3, 13], "x": 13, "y": 3},
+              {"label": "k3E", "matrix": [3, 14], "x": 14, "y": 3},
+  
+              {"label": "k40", "matrix": [4, 0], "x": 0, "y": 4},
+              {"label": "k41", "matrix": [4, 1], "x": 1, "y": 4},
+              {"label": "k42", "matrix": [4, 2], "x": 2, "y": 4},
+              {"label": "k43", "matrix": [4, 3], "x": 3, "y": 4},
+              {"label": "k44", "matrix": [4, 4], "x": 4, "y": 4},
+              {"label": "k45", "matrix": [4, 5], "x": 5, "y": 4},
+              {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4},
+              {"label": "k47", "matrix": [4, 7], "x": 7, "y": 4},
+              {"label": "k48", "matrix": [4, 8], "x": 8, "y": 4},
+              {"label": "k49", "matrix": [4, 9], "x": 9, "y": 4},
+              {"label": "k4A", "matrix": [4, 10], "x": 10, "y": 4},
+              {"label": "k4B", "matrix": [4, 11], "x": 11, "y": 4},
+              {"label": "k4C", "matrix": [4, 12], "x": 12, "y": 4},
+              {"label": "k4D", "matrix": [4, 13], "x": 13, "y": 4},
+              {"label": "k4E", "matrix": [4, 14], "x": 14, "y": 4},
+  
+              {"label": "k50", "matrix": [5, 0], "x": 0, "y": 5},
+              {"label": "k51", "matrix": [5, 1], "x": 1, "y": 5},
+              {"label": "k52", "matrix": [5, 2], "x": 2, "y": 5},
+              {"label": "k53", "matrix": [5, 3], "x": 3, "y": 5},
+              {"label": "k54", "matrix": [5, 4], "x": 4, "y": 5},
+              {"label": "k55", "matrix": [5, 5], "x": 5, "y": 5},
+              {"label": "k56", "matrix": [5, 6], "x": 6, "y": 5},
+              {"label": "k57", "matrix": [5, 7], "x": 7, "y": 5},
+              {"label": "k58", "matrix": [5, 8], "x": 8, "y": 5},
+              {"label": "k59", "matrix": [5, 9], "x": 9, "y": 5},
+              {"label": "k5A", "matrix": [5, 10], "x": 10, "y": 5},
+              {"label": "k5B", "matrix": [5, 11], "x": 11, "y": 5},
+              {"label": "k5C", "matrix": [5, 12], "x": 12, "y": 5},
+              {"label": "k5D", "matrix": [5, 13], "x": 13, "y": 5},
+              {"label": "k5E", "matrix": [5, 14], "x": 14, "y": 5},
+  
+              {"label": "k60", "matrix": [6, 0], "x": 0, "y": 6},
+              {"label": "k61", "matrix": [6, 1], "x": 1, "y": 6},
+              {"label": "k62", "matrix": [6, 2], "x": 2, "y": 6},
+              {"label": "k63", "matrix": [6, 3], "x": 3, "y": 6},
+              {"label": "k64", "matrix": [6, 4], "x": 4, "y": 6},
+              {"label": "k65", "matrix": [6, 5], "x": 5, "y": 6},
+              {"label": "k66", "matrix": [6, 6], "x": 6, "y": 6},
+              {"label": "k67", "matrix": [6, 7], "x": 7, "y": 6},
+              {"label": "k68", "matrix": [6, 8], "x": 8, "y": 6},
+              {"label": "k69", "matrix": [6, 9], "x": 9, "y": 6},
+              {"label": "k6A", "matrix": [6, 10], "x": 10, "y": 6},
+              {"label": "k6B", "matrix": [6, 11], "x": 11, "y": 6},
+              {"label": "k6C", "matrix": [6, 12], "x": 12, "y": 6},
+              {"label": "k6D", "matrix": [6, 13], "x": 13, "y": 6},
+              {"label": "k6E", "matrix": [6, 14], "x": 14, "y": 6},
+  
+              {"label": "k70", "matrix": [7, 0], "x": 0, "y": 7},
+              {"label": "k71", "matrix": [7, 1], "x": 1, "y": 7},
+              {"label": "k72", "matrix": [7, 2], "x": 2, "y": 7},
+              {"label": "k73", "matrix": [7, 3], "x": 3, "y": 7},
+              {"label": "k74", "matrix": [7, 4], "x": 4, "y": 7},
+              {"label": "k75", "matrix": [7, 5], "x": 5, "y": 7},
+              {"label": "k76", "matrix": [7, 6], "x": 6, "y": 7},
+              {"label": "k77", "matrix": [7, 7], "x": 7, "y": 7},
+              {"label": "k78", "matrix": [7, 8], "x": 8, "y": 7},
+              {"label": "k79", "matrix": [7, 9], "x": 9, "y": 7},
+              {"label": "k7A", "matrix": [7, 10], "x": 10, "y": 7},
+              {"label": "k7B", "matrix": [7, 11], "x": 11, "y": 7},
+              {"label": "k7C", "matrix": [7, 12], "x": 12, "y": 7},
+              {"label": "k7D", "matrix": [7, 13], "x": 13, "y": 7},
+              {"label": "k7E", "matrix": [7, 14], "x": 14, "y": 7},
+  
+              {"label": "k80", "matrix": [8, 0], "x": 0, "y": 8},
+              {"label": "k81", "matrix": [8, 1], "x": 1, "y": 8},
+              {"label": "k82", "matrix": [8, 2], "x": 2, "y": 8},
+              {"label": "k83", "matrix": [8, 3], "x": 3, "y": 8},
+              {"label": "k84", "matrix": [8, 4], "x": 4, "y": 8},
+              {"label": "k85", "matrix": [8, 5], "x": 5, "y": 8},
+              {"label": "k86", "matrix": [8, 6], "x": 6, "y": 8},
+              {"label": "k87", "matrix": [8, 7], "x": 7, "y": 8},
+              {"label": "k88", "matrix": [8, 8], "x": 8, "y": 8},
+              {"label": "k89", "matrix": [8, 9], "x": 9, "y": 8},
+              {"label": "k8A", "matrix": [8, 10], "x": 10, "y": 8},
+              {"label": "k8B", "matrix": [8, 11], "x": 11, "y": 8},
+              {"label": "k8C", "matrix": [8, 12], "x": 12, "y": 8},
+              {"label": "k8D", "matrix": [8, 13], "x": 13, "y": 8},
+              {"label": "k8E", "matrix": [8, 14], "x": 14, "y": 8},
+  
+              {"label": "k90", "matrix": [9, 0], "x": 0, "y": 9},
+              {"label": "k91", "matrix": [9, 1], "x": 1, "y": 9},
+              {"label": "k92", "matrix": [9, 2], "x": 2, "y": 9},
+              {"label": "k93", "matrix": [9, 3], "x": 3, "y": 9},
+              {"label": "k94", "matrix": [9, 4], "x": 4, "y": 9},
+              {"label": "k95", "matrix": [9, 5], "x": 5, "y": 9},
+              {"label": "k96", "matrix": [9, 6], "x": 6, "y": 9},
+              {"label": "k97", "matrix": [9, 7], "x": 7, "y": 9},
+              {"label": "k98", "matrix": [9, 8], "x": 8, "y": 9},
+              {"label": "k99", "matrix": [9, 9], "x": 9, "y": 9},
+              {"label": "k9A", "matrix": [9, 10], "x": 10, "y": 9},
+              {"label": "k9B", "matrix": [9, 11], "x": 11, "y": 9},
+              {"label": "k9C", "matrix": [9, 12], "x": 12, "y": 9},
+              {"label": "k9D", "matrix": [9, 13], "x": 13, "y": 9},
+              {"label": "k9E", "matrix": [9, 14], "x": 14, "y": 9},
+  
+              {"label": "kA0", "matrix": [10, 0], "x": 0, "y": 10},
+              {"label": "kA1", "matrix": [10, 1], "x": 1, "y": 10},
+              {"label": "kA2", "matrix": [10, 2], "x": 2, "y": 10},
+              {"label": "kA3", "matrix": [10, 3], "x": 3, "y": 10},
+              {"label": "kA4", "matrix": [10, 4], "x": 4, "y": 10},
+              {"label": "kA5", "matrix": [10, 5], "x": 5, "y": 10},
+              {"label": "kA6", "matrix": [10, 6], "x": 6, "y": 10},
+              {"label": "kA7", "matrix": [10, 7], "x": 7, "y": 10},
+              {"label": "kA8", "matrix": [10, 8], "x": 8, "y": 10},
+              {"label": "kA9", "matrix": [10, 9], "x": 9, "y": 10},
+              {"label": "kAA", "matrix": [10, 10], "x": 10, "y": 10},
+              {"label": "kAB", "matrix": [10, 11], "x": 11, "y": 10},
+              {"label": "kAC", "matrix": [10, 12], "x": 12, "y": 10},
+              {"label": "kAD", "matrix": [10, 13], "x": 13, "y": 10},
+              {"label": "kAE", "matrix": [10, 14], "x": 14, "y": 10},
+  
+              {"label": "kB0", "matrix": [11, 0], "x": 0, "y": 11},
+              {"label": "kB1", "matrix": [11, 1], "x": 1, "y": 11},
+              {"label": "kB2", "matrix": [11, 2], "x": 2, "y": 11},
+              {"label": "kB3", "matrix": [11, 3], "x": 3, "y": 11},
+              {"label": "kB4", "matrix": [11, 4], "x": 4, "y": 11},
+              {"label": "kB5", "matrix": [11, 5], "x": 5, "y": 11},
+              {"label": "kB6", "matrix": [11, 6], "x": 6, "y": 11},
+              {"label": "kB7", "matrix": [11, 7], "x": 7, "y": 11},
+              {"label": "kB8", "matrix": [11, 8], "x": 8, "y": 11},
+              {"label": "kB9", "matrix": [11, 9], "x": 9, "y": 11},
+              {"label": "kBA", "matrix": [11, 10], "x": 10, "y": 11},
+              {"label": "kBB", "matrix": [11, 11], "x": 11, "y": 11},
+              {"label": "kBC", "matrix": [11, 12], "x": 12, "y": 11},
+              {"label": "kBD", "matrix": [11, 13], "x": 13, "y": 11},
+              {"label": "kBE", "matrix": [11, 14], "x": 14, "y": 11},
+  
+              {"label": "kC0", "matrix": [12, 0], "x": 0, "y": 12},
+              {"label": "kC1", "matrix": [12, 1], "x": 1, "y": 12},
+              {"label": "kC2", "matrix": [12, 2], "x": 2, "y": 12},
+              {"label": "kC3", "matrix": [12, 3], "x": 3, "y": 12},
+              {"label": "kC4", "matrix": [12, 4], "x": 4, "y": 12},
+              {"label": "kC5", "matrix": [12, 5], "x": 5, "y": 12},
+              {"label": "kC6", "matrix": [12, 6], "x": 6, "y": 12},
+              {"label": "kC7", "matrix": [12, 7], "x": 7, "y": 12},
+              {"label": "kC8", "matrix": [12, 8], "x": 8, "y": 12},
+              {"label": "kC9", "matrix": [12, 9], "x": 9, "y": 12},
+              {"label": "kCA", "matrix": [12, 10], "x": 10, "y": 12},
+              {"label": "kCB", "matrix": [12, 11], "x": 11, "y": 12},
+              {"label": "kCC", "matrix": [12, 12], "x": 12, "y": 12},
+              {"label": "kCD", "matrix": [12, 13], "x": 13, "y": 12},
+              {"label": "kCE", "matrix": [12, 14], "x": 14, "y": 12},
+  
+              {"label": "kD0", "matrix": [13, 0], "x": 0, "y": 13},
+              {"label": "kD1", "matrix": [13, 1], "x": 1, "y": 13},
+              {"label": "kD2", "matrix": [13, 2], "x": 2, "y": 13},
+              {"label": "kD3", "matrix": [13, 3], "x": 3, "y": 13},
+              {"label": "kD4", "matrix": [13, 4], "x": 4, "y": 13},
+              {"label": "kD5", "matrix": [13, 5], "x": 5, "y": 13},
+              {"label": "kD6", "matrix": [13, 6], "x": 6, "y": 13},
+              {"label": "kD7", "matrix": [13, 7], "x": 7, "y": 13},
+              {"label": "kD8", "matrix": [13, 8], "x": 8, "y": 13},
+              {"label": "kD9", "matrix": [13, 9], "x": 9, "y": 13},
+              {"label": "kDA", "matrix": [13, 10], "x": 10, "y": 13},
+              {"label": "kDB", "matrix": [13, 11], "x": 11, "y": 13},
+              {"label": "kDC", "matrix": [13, 12], "x": 12, "y": 13},
+              {"label": "kDD", "matrix": [13, 13], "x": 13, "y": 13},
+              {"label": "kDE", "matrix": [13, 14], "x": 14, "y": 13},
+  
+              {"label": "kE0", "matrix": [14, 0], "x": 0, "y": 14},
+              {"label": "kE1", "matrix": [14, 1], "x": 1, "y": 14},
+              {"label": "kE2", "matrix": [14, 2], "x": 2, "y": 14},
+              {"label": "kE3", "matrix": [14, 3], "x": 3, "y": 14},
+              {"label": "kE4", "matrix": [14, 4], "x": 4, "y": 14},
+              {"label": "kE5", "matrix": [14, 5], "x": 5, "y": 14},
+              {"label": "kE6", "matrix": [14, 6], "x": 6, "y": 14},
+              {"label": "kE7", "matrix": [14, 7], "x": 7, "y": 14},
+              {"label": "kE8", "matrix": [14, 8], "x": 8, "y": 14},
+              {"label": "kE9", "matrix": [14, 9], "x": 9, "y": 14},
+              {"label": "kEA", "matrix": [14, 10], "x": 10, "y": 14},
+              {"label": "kEB", "matrix": [14, 11], "x": 11, "y": 14},
+              {"label": "kEC", "matrix": [14, 12], "x": 12, "y": 14},
+              {"label": "kED", "matrix": [14, 13], "x": 13, "y": 14},
+              {"label": "kEE", "matrix": [14, 14], "x": 14, "y": 14}
+          ]
       }
   }
 }
diff --git a/keyboards/donutcables/scrabblepad/scrabblepad.c b/keyboards/donutcables/scrabblepad/scrabblepad.c
deleted file mode 100644
index 88e60fea26..0000000000
--- a/keyboards/donutcables/scrabblepad/scrabblepad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 DonutCables <contact@donutcables.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "scrabblepad.h"
diff --git a/keyboards/donutcables/scrabblepad/scrabblepad.h b/keyboards/donutcables/scrabblepad/scrabblepad.h
deleted file mode 100644
index f27d990eb2..0000000000
--- a/keyboards/donutcables/scrabblepad/scrabblepad.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2021 DonutCables <contact@donutcables.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,  \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E,  \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E,  \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E,  \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E,  \
-    k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E,  \
-    k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E,  \
-    k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E,  \
-    k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E,  \
-    kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE,  \
-    kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE,  \
-    kC0, kC1, kC2, kC3, kC4, kC5, kC6, kC7, kC8, kC9, kCA, kCB, kCC, kCD, kCE,  \
-    kD0, kD1, kD2, kD3, kD4, kD5, kD6, kD7, kD8, kD9, kDA, kDB, kDC, kDD, kDE,  \
-    kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, kE8, kE9, kEA, kEB, kEC, kED, kEE  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, }, \
-    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, }, \
-    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, }, \
-    { kC0, kC1, kC2, kC3, kC4, kC5, kC6, kC7, kC8, kC9, kCA, kCB, kCC, kCD, kCE, }, \
-    { kD0, kD1, kD2, kD3, kD4, kD5, kD6, kD7, kD8, kD9, kDA, kDB, kDC, kDD, kDE, }, \
-    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, kE8, kE9, kEA, kEB, kEC, kED, kEE  } \
-}
diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index d4617a8786..a73678faf2 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -16,20 +16,9 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-
 /* media key slowdown for windows */
 #define TAP_CODE_DELAY 20
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 8    // Number of LEDs
 #endif
diff --git a/keyboards/doodboard/duckboard/duckboard.c b/keyboards/doodboard/duckboard/duckboard.c
deleted file mode 100644
index 853e105ceb..0000000000
--- a/keyboards/doodboard/duckboard/duckboard.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "duckboard.h"
diff --git a/keyboards/doodboard/duckboard/duckboard.h b/keyboards/doodboard/duckboard/duckboard.h
deleted file mode 100644
index c98c9a703a..0000000000
--- a/keyboards/doodboard/duckboard/duckboard.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-         K01, K02, K03, K04, \
-         K11, K12, K13,      \
-         K21, K22, K23, K24, \
-         K31, K32, K33,      \
-    K40, K41, K42, K43, K44  \
-) { \
-    { KC_NO, K01,   K02,   K03,   K04 },   \
-    { KC_NO, K11,   K12,   K13,   KC_NO }, \
-    { KC_NO, K21,   K22,   K23,   K24 },   \
-    { KC_NO, K31,   K32,   K33,   KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44 }    \
-}
diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json
index f2ee7bb80a..367a9b7d72 100644
--- a/keyboards/doodboard/duckboard/info.json
+++ b/keyboards/doodboard/duckboard/info.json
@@ -8,39 +8,47 @@
         "pid": "0xFF44",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F6", "resolution": 2}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
 
-                { "x": 1, "y": 1 },
-                { "x": 2, "y": 1 },
-                { "x": 3, "y": 1 },
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                { "x": 1, "y": 2 },
-                { "x": 2, "y": 2 },
-                { "x": 3, "y": 2 },
-                { "x": 4, "y": 1, "h": 2 },
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 1, "h": 2},
 
-                { "x": 1, "y": 3 },
-                { "x": 2, "y": 3 },
-                { "x": 3, "y": 3 },
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
 
-                { "x": 0, "y": 4 },
-                { "x": 1, "y": 4 },
-                { "x": 2, "y": 4 },
-                { "x": 3, "y": 4 },
-                { "x": 4, "y": 3, "h": 2 }
+                {"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": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/doodboard/duckboard_r2/config.h b/keyboards/doodboard/duckboard_r2/config.h
index d4617a8786..a73678faf2 100644
--- a/keyboards/doodboard/duckboard_r2/config.h
+++ b/keyboards/doodboard/duckboard_r2/config.h
@@ -16,20 +16,9 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-
 /* media key slowdown for windows */
 #define TAP_CODE_DELAY 20
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 8    // Number of LEDs
 #endif
diff --git a/keyboards/doodboard/duckboard_r2/duckboard_r2.c b/keyboards/doodboard/duckboard_r2/duckboard_r2.c
deleted file mode 100644
index 095544b9e3..0000000000
--- a/keyboards/doodboard/duckboard_r2/duckboard_r2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "duckboard_r2.h"
diff --git a/keyboards/doodboard/duckboard_r2/duckboard_r2.h b/keyboards/doodboard/duckboard_r2/duckboard_r2.h
deleted file mode 100644
index 1f3c462da8..0000000000
--- a/keyboards/doodboard/duckboard_r2/duckboard_r2.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-         K01, K02, K03, K04, \
-         K11, K12, K13, K14, \
-         K21, K22, K23, K24, \
-    K30, K31, K32, K33, K34, \
-    K40, K41, K42, K43, K44  \
-) { \
-    { KC_NO, K01,   K02,   K03,   K04 }, \
-    { KC_NO, K11,   K12,   K13,   K14 }, \
-    { KC_NO, K21,   K22,   K23,   K24 }, \
-    { K30,   K31,   K32,   K33,   K34 }, \
-    { K40,   K41,   K42,   K43,   K44 }  \
-}
diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/info.json
index b2de93f477..00d0fc6452 100644
--- a/keyboards/doodboard/duckboard_r2/info.json
+++ b/keyboards/doodboard/duckboard_r2/info.json
@@ -8,11 +8,19 @@
         "pid": "0x6462",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F6", "pin_b": "F5", "resolution": 2}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "bootmagic": {
         "matrix": [0, 1]
     },
@@ -21,32 +29,32 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
 
-                { "x": 1, "y": 1 },
-                { "x": 2, "y": 1 },
-                { "x": 3, "y": 1 },
-                { "x": 4, "y": 1 },
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
 
-                { "x": 1, "y": 2 },
-                { "x": 2, "y": 2 },
-                { "x": 3, "y": 2 },
-                { "x": 4, "y": 2 },
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
 
-                { "x": 0, "y": 3 },
-                { "x": 1, "y": 3 },
-                { "x": 2, "y": 3 },
-                { "x": 3, "y": 3 },
-                { "x": 4, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
 
-                { "x": 0, "y": 4 },
-                { "x": 1, "y": 4 },
-                { "x": 2, "y": 4 },
-                { "x": 3, "y": 4 },
-                { "x": 4, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4}
             ]
         }
     }
diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h
index 7fb78172d4..bc64bd9001 100644
--- a/keyboards/doppelganger/config.h
+++ b/keyboards/doppelganger/config.h
@@ -17,31 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
 #define SPLIT_HAND_PIN D4
 
-#define MATRIX_ROW_PINS { E6, F1, C7, F7, F6 }
-#define MATRIX_COL_PINS { F4, F0, B7, B3, B2, B1, D5, D3, D2 }
-
-#define MATRIX_ROW_PINS_RIGHT { D7, D6, D4, E6, B5 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, F7, C7, C6, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 // #define USE_I2C
 
-#define RGB_DI_PIN B4
 #define RGBLED_NUM 2
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 1, 1 }
diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json
index d576f73d69..831922f945 100644
--- a/keyboards/doppelganger/info.json
+++ b/keyboards/doppelganger/info.json
@@ -8,8 +8,22 @@
         "pid": "0x4447",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F0", "B7", "B3", "B2", "B1", "D5", "D3", "D2"],
+        "rows": ["E6", "F1", "C7", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D1"
+        "soft_serial_pin": "D1",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "F7", "C7", "C6", "B6"],
+                "rows": ["D7", "D6", "D4", "E6", "B5"]
+            }
+        }
+    },
+    "ws2812": {
+        "pin": "B4"
     },
     "bootmagic": {
         "matrix": [0, 2]
diff --git a/keyboards/doro67/multi/config.h b/keyboards/doro67/multi/config.h
deleted file mode 100644
index b91f26f044..0000000000
--- a/keyboards/doro67/multi/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7, F5, F6, F7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/doro67/multi/info.json b/keyboards/doro67/multi/info.json
index b92267d5d9..db8da861c1 100644
--- a/keyboards/doro67/multi/info.json
+++ b/keyboards/doro67/multi/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4D4C",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"],
+    "rows": ["D0", "D1", "D2", "D3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "levels": 7
@@ -21,13 +26,235 @@
   "community_layouts": ["65_ansi_blocker"],
   "layouts": {
     "LAYOUT_65_ansi_blocker": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Del", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 14], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 14], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 14], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [3, 14], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 13], "x": 14, "y": 4},
+        {"matrix": [4, 14], "x": 15, "y": 4}
+      ]
     },
     "LAYOUT_iso": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Del", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 14], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [1, 13], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"matrix": [2, 14], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [3, 14], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 13], "x": 14, "y": 4},
+        {"matrix": [4, 14], "x": 15, "y": 4}
+      ]
     },
     "LAYOUT_multi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"Del", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [4, 8], "x": 14, "y": 0},
+        {"matrix": [0, 14], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 14], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 14], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [3, 14], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+        {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2.25},
+        {"matrix": [4, 9], "x": 10, "y": 4},
+        {"matrix": [4, 10], "x": 11, "y": 4},
+        {"matrix": [4, 11], "x": 12, "y": 4},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 13], "x": 14, "y": 4},
+        {"matrix": [4, 14], "x": 15, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/doro67/multi/multi.c b/keyboards/doro67/multi/multi.c
deleted file mode 100644
index 3ab1f53653..0000000000
--- a/keyboards/doro67/multi/multi.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 ShadeDream
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "multi.h"
diff --git a/keyboards/doro67/multi/multi.h b/keyboards/doro67/multi/multi.h
deleted file mode 100644
index 8ffb673af0..0000000000
--- a/keyboards/doro67/multi/multi.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2019 ShadeDream
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D,      k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, k3E, \
-    k40, k41, k42,                k44,                k49, k4A,      k4C, k4D, k4E  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   k0E   }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   k1E   }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   KC_NO, k2D,   k2E   }, \
-    { k30,   KC_NO, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C,   k3D,   k3E   }, \
-    { k40,   k41,   k42,   KC_NO, k44,   KC_NO, KC_NO, KC_NO, KC_NO, k49,   k4A,   KC_NO, k4C,   k4D,   k4E   }, \
-}
-
-#define LAYOUT_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D,      k2E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, k3E, \
-    k40, k41, k42,                k44,                k49, k4A,      k4C, k4D, k4E  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   k0E   }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   k1E   }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   KC_NO, k2D,   k2E   }, \
-    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C,   k3D,   k3E   }, \
-    { k40,   k41,   k42,   KC_NO, k44,   KC_NO, KC_NO, KC_NO, KC_NO, k49,   k4A,   KC_NO, k4C,   k4D,   k4E   }, \
-}
-
-#define LAYOUT_multi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k48, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D,      k2E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, k3E, \
-    k40, k41, k42,      k43,      k44,      k45,      k49, k4A, k4B, k4C, k4D, k4E  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   k0E   }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   k1E   }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   KC_NO, k2D,   k2E   }, \
-    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C,   k3D,   k3E   }, \
-    { k40,   k41,   k42,   k43,   k44,   k45,   KC_NO, KC_NO, k48,   k49,   k4A,   k4B,   k4C,   k4D,   k4E   }, \
-}
diff --git a/keyboards/doro67/regular/config.h b/keyboards/doro67/regular/config.h
deleted file mode 100644
index b91f26f044..0000000000
--- a/keyboards/doro67/regular/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7, F5, F6, F7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/doro67/regular/info.json b/keyboards/doro67/regular/info.json
index 096e8e30e7..70997d3e1a 100644
--- a/keyboards/doro67/regular/info.json
+++ b/keyboards/doro67/regular/info.json
@@ -7,6 +7,11 @@
         "pid": "0x5245",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"],
+      "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
       "caps_lock": "E6",
       "on_state": 0
@@ -17,73 +22,77 @@
     "layouts": {
       "LAYOUT_65_ansi_blocker": {
         "layout": [
-          {"label":"K00", "x":0, "y":0},
-          {"label":"K01", "x":1, "y":0},
-          {"label":"K02", "x":2, "y":0},
-          {"label":"K03", "x":3, "y":0},
-          {"label":"K04", "x":4, "y":0},
-          {"label":"K05", "x":5, "y":0},
-          {"label":"K06", "x":6, "y":0},
-          {"label":"K07", "x":7, "y":0},
-          {"label":"K08", "x":8, "y":0},
-          {"label":"K09", "x":9, "y":0},
-          {"label":"K0A", "x":10, "y":0},
-          {"label":"K0B", "x":11, "y":0},
-          {"label":"K0C", "x":12, "y":0},
-          {"label":"K0D", "x":13, "y":0, "w":2},
-          {"label":"K0E", "x":15, "y":0},
-          {"label":"K10", "x":0, "y":1, "w":1.5},
-          {"label":"K11", "x":1.5, "y":1},
-          {"label":"K12", "x":2.5, "y":1},
-          {"label":"K13", "x":3.5, "y":1},
-          {"label":"K14", "x":4.5, "y":1},
-          {"label":"K15", "x":5.5, "y":1},
-          {"label":"K16", "x":6.5, "y":1},
-          {"label":"K17", "x":7.5, "y":1},
-          {"label":"K18", "x":8.5, "y":1},
-          {"label":"K19", "x":9.5, "y":1},
-          {"label":"K1A", "x":10.5, "y":1},
-          {"label":"K1B", "x":11.5, "y":1},
-          {"label":"K1C", "x":12.5, "y":1},
-          {"label":"K1D", "x":13.5, "y":1, "w":1.5},
-          {"label":"K1E", "x":15, "y":1},
-          {"label":"K20", "x":0, "y":2, "w":1.75},
-          {"label":"K21", "x":1.75, "y":2},
-          {"label":"K22", "x":2.75, "y":2},
-          {"label":"K23", "x":3.75, "y":2},
-          {"label":"K24", "x":4.75, "y":2},
-          {"label":"K25", "x":5.75, "y":2},
-          {"label":"K26", "x":6.75, "y":2},
-          {"label":"K27", "x":7.75, "y":2},
-          {"label":"K28", "x":8.75, "y":2},
-          {"label":"K29", "x":9.75, "y":2},
-          {"label":"K2A", "x":10.75, "y":2},
-          {"label":"K2B", "x":11.75, "y":2},
-          {"label":"K2D", "x":12.75, "y":2, "w":2.25},
-          {"label":"K2E", "x":15, "y":2},
-          {"label":"K30", "x":0, "y":3, "w":2.25},
-          {"label":"K32", "x":2.25, "y":3},
-          {"label":"K33", "x":3.25, "y":3},
-          {"label":"K34", "x":4.25, "y":3},
-          {"label":"K35", "x":5.25, "y":3},
-          {"label":"K36", "x":6.25, "y":3},
-          {"label":"K37", "x":7.25, "y":3},
-          {"label":"K38", "x":8.25, "y":3},
-          {"label":"K39", "x":9.25, "y":3},
-          {"label":"K3A", "x":10.25, "y":3},
-          {"label":"K3B", "x":11.25, "y":3},
-          {"label":"K3C", "x":12.25, "y":3, "w":1.75},
-          {"label":"K3D", "x":14, "y":3},
-          {"label":"K3E", "x":15, "y":3},
-          {"label":"K40", "x":0, "y":4, "w":1.25},
-          {"label":"K41", "x":1.25, "y":4, "w":1.25},
-          {"label":"K42", "x":2.5, "y":4, "w":1.25},
-          {"label":"K43", "x":3.75, "y":4, "w":6.25},
-          {"label":"K49", "x":10, "y":4, "w":1.25},
-          {"label":"K4A", "x":11.25, "y":4, "w":1.25},
-          {"label":"K4C", "x":13, "y":4},
-          {"label":"K4D", "x":14, "y":4},
-          {"label":"K4E", "x":15, "y":4}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+          {"matrix": [0, 14], "x": 15, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+          {"matrix": [1, 14], "x": 15, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+          {"matrix": [2, 14], "x": 15, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+          {"matrix": [3, 13], "x": 14, "y": 3},
+          {"matrix": [3, 14], "x": 15, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+          {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+          {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 12], "x": 13, "y": 4},
+          {"matrix": [4, 13], "x": 14, "y": 4},
+          {"matrix": [4, 14], "x": 15, "y": 4}
         ]
       }
     }
diff --git a/keyboards/doro67/regular/regular.c b/keyboards/doro67/regular/regular.c
deleted file mode 100644
index c9b0a25b59..0000000000
--- a/keyboards/doro67/regular/regular.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "regular.h"
diff --git a/keyboards/doro67/regular/regular.h b/keyboards/doro67/regular/regular.h
deleted file mode 100644
index e785bba39f..0000000000
--- a/keyboards/doro67/regular/regular.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,                k43,           k49, k4A,      k4C, k4D, k4E  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   k0E   }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   k1E   }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   KC_NO, k2D,   k2E   }, \
-    { k30,   KC_NO, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C,   k3D,   k3E   }, \
-    { k40,   k41,   k42,   k43,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k49,   k4A,   KC_NO, k4C,   k4D,   k4E   }, \
-}
diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h
index 471415402a..cca3e4d26f 100644
--- a/keyboards/doro67/rgb/config.h
+++ b/keyboards/doro67/rgb/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN B7
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 67
 
diff --git a/keyboards/doro67/rgb/info.json b/keyboards/doro67/rgb/info.json
index cf46ac8739..f4a7d40dce 100644
--- a/keyboards/doro67/rgb/info.json
+++ b/keyboards/doro67/rgb/info.json
@@ -8,83 +8,98 @@
         "pid": "0x5247",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
+    "matrix_pins": {
+      "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"],
+      "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
       "caps_lock": "E6",
       "on_state": 0
     },
+    "ws2812": {
+      "pin": "B7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
       "LAYOUT_65_ansi_blocker": {
         "layout": [
-          {"label":"K00", "x":0, "y":0},
-          {"label":"K01", "x":1, "y":0},
-          {"label":"K02", "x":2, "y":0},
-          {"label":"K03", "x":3, "y":0},
-          {"label":"K04", "x":4, "y":0},
-          {"label":"K05", "x":5, "y":0},
-          {"label":"K06", "x":6, "y":0},
-          {"label":"K07", "x":7, "y":0},
-          {"label":"K08", "x":8, "y":0},
-          {"label":"K09", "x":9, "y":0},
-          {"label":"K0A", "x":10, "y":0},
-          {"label":"K0B", "x":11, "y":0},
-          {"label":"K0C", "x":12, "y":0},
-          {"label":"K0D", "x":13, "y":0, "w":2},
-          {"label":"K0E", "x":15, "y":0},
-          {"label":"K10", "x":0, "y":1, "w":1.5},
-          {"label":"K11", "x":1.5, "y":1},
-          {"label":"K12", "x":2.5, "y":1},
-          {"label":"K13", "x":3.5, "y":1},
-          {"label":"K14", "x":4.5, "y":1},
-          {"label":"K15", "x":5.5, "y":1},
-          {"label":"K16", "x":6.5, "y":1},
-          {"label":"K17", "x":7.5, "y":1},
-          {"label":"K18", "x":8.5, "y":1},
-          {"label":"K19", "x":9.5, "y":1},
-          {"label":"K1A", "x":10.5, "y":1},
-          {"label":"K1B", "x":11.5, "y":1},
-          {"label":"K1C", "x":12.5, "y":1},
-          {"label":"K1D", "x":13.5, "y":1, "w":1.5},
-          {"label":"K1E", "x":15, "y":1},
-          {"label":"K20", "x":0, "y":2, "w":1.75},
-          {"label":"K21", "x":1.75, "y":2},
-          {"label":"K22", "x":2.75, "y":2},
-          {"label":"K23", "x":3.75, "y":2},
-          {"label":"K24", "x":4.75, "y":2},
-          {"label":"K25", "x":5.75, "y":2},
-          {"label":"K26", "x":6.75, "y":2},
-          {"label":"K27", "x":7.75, "y":2},
-          {"label":"K28", "x":8.75, "y":2},
-          {"label":"K29", "x":9.75, "y":2},
-          {"label":"K2A", "x":10.75, "y":2},
-          {"label":"K2B", "x":11.75, "y":2},
-          {"label":"K2D", "x":12.75, "y":2, "w":2.25},
-          {"label":"K2E", "x":15, "y":2},
-          {"label":"K30", "x":0, "y":3, "w":2.25},
-          {"label":"K32", "x":2.25, "y":3},
-          {"label":"K33", "x":3.25, "y":3},
-          {"label":"K34", "x":4.25, "y":3},
-          {"label":"K35", "x":5.25, "y":3},
-          {"label":"K36", "x":6.25, "y":3},
-          {"label":"K37", "x":7.25, "y":3},
-          {"label":"K38", "x":8.25, "y":3},
-          {"label":"K39", "x":9.25, "y":3},
-          {"label":"K3A", "x":10.25, "y":3},
-          {"label":"K3B", "x":11.25, "y":3},
-          {"label":"K3C", "x":12.25, "y":3, "w":1.75},
-          {"label":"K3D", "x":14, "y":3},
-          {"label":"K3E", "x":15, "y":3},
-          {"label":"K40", "x":0, "y":4, "w":1.25},
-          {"label":"K41", "x":1.25, "y":4, "w":1.25},
-          {"label":"K42", "x":2.5, "y":4, "w":1.25},
-          {"label":"K43", "x":3.75, "y":4, "w":6.25},
-          {"label":"K49", "x":10, "y":4, "w":1.25},
-          {"label":"K4A", "x":11.25, "y":4, "w":1.25},
-          {"label":"K4C", "x":13, "y":4},
-          {"label":"K4D", "x":14, "y":4},
-          {"label":"K4E", "x":15, "y":4}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+          {"matrix": [0, 14], "x": 15, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+          {"matrix": [1, 14], "x": 15, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+          {"matrix": [2, 14], "x": 15, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+          {"matrix": [3, 13], "x": 14, "y": 3},
+          {"matrix": [3, 14], "x": 15, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+          {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+          {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 12], "x": 13, "y": 4},
+          {"matrix": [4, 13], "x": 14, "y": 4},
+          {"matrix": [4, 14], "x": 15, "y": 4}
         ]
       }
     }
diff --git a/keyboards/doro67/rgb/rgb.c b/keyboards/doro67/rgb/rgb.c
index 794c037dd6..280c1b6774 100644
--- a/keyboards/doro67/rgb/rgb.c
+++ b/keyboards/doro67/rgb/rgb.c
@@ -13,8 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rgb.h"
-#include "rgb_matrix_types.h"
+#include "quantum.h"
 
 led_config_t g_led_config = { {
   {   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14 },
diff --git a/keyboards/doro67/rgb/rgb.h b/keyboards/doro67/rgb/rgb.h
deleted file mode 100644
index e785bba39f..0000000000
--- a/keyboards/doro67/rgb/rgb.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,                k43,           k49, k4A,      k4C, k4D, k4E  \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   k0E   }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   k1E   }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   KC_NO, k2D,   k2E   }, \
-    { k30,   KC_NO, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C,   k3D,   k3E   }, \
-    { k40,   k41,   k42,   k43,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k49,   k4A,   KC_NO, k4C,   k4D,   k4E   }, \
-}
diff --git a/keyboards/doro67/rgb/rules.mk b/keyboards/doro67/rgb/rules.mk
index 7bd80b9503..b400e0a170 100644
--- a/keyboards/doro67/rgb/rules.mk
+++ b/keyboards/doro67/rgb/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h
index 16df72781b..b1518cb5fb 100644
--- a/keyboards/dp60/config.h
+++ b/keyboards/dp60/config.h
@@ -34,7 +34,6 @@
 
 //rgb light setting
 #define RGBLED_NUM      18
-#define RGB_DI_PIN      D7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json
index 605c66bb0d..a0491eabb6 100644
--- a/keyboards/dp60/info.json
+++ b/keyboards/dp60/info.json
@@ -8,6 +8,12 @@
         "pid": "0x00BE",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/dp60/keymaps/indicator/led_driver.c b/keyboards/dp60/keymaps/indicator/led_driver.c
index 2a1ac5a385..677eb8af57 100644
--- a/keyboards/dp60/keymaps/indicator/led_driver.c
+++ b/keyboards/dp60/keymaps/indicator/led_driver.c
@@ -14,11 +14,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#undef RGB_DI_PIN
-#define RGB_DI_PIN RGB_INDICATOR_PIN
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN RGB_INDICATOR_PIN
 #define ws2812_setleds indicator_setleds
 #define ws2812_setleds_pin indicator_setleds_pin
-#include "ws2812.c"
+#include "ws2812_bitbang.c"
 
 void indicator_write(LED_TYPE *start_led, uint8_t num_leds)
 {
diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk
index 491e8e34a7..0aa07f4709 100644
--- a/keyboards/dp60/rules.mk
+++ b/keyboards/dp60/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Use RGB underglow light
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731 # Use RGB matrix
 
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h
index 63c16c1c71..a9f78283d0 100644
--- a/keyboards/draculad/config.h
+++ b/keyboards/draculad/config.h
@@ -17,19 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS {D4, C6, D7, E6}
-#define MATRIX_COL_PINS {F4, F5,F6, F7, B1}
-
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef OLED_ENABLE
   #define OLED_DISPLAY_128X64
   #define OLED_TIMEOUT 30000
 #endif
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
@@ -40,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
 
 #define EE_HANDS
 
diff --git a/keyboards/draculad/draculad.c b/keyboards/draculad/draculad.c
deleted file mode 100644
index 04a83ef2e3..0000000000
--- a/keyboards/draculad/draculad.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 @mangoiv
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "draculad.h"
\ No newline at end of file
diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json
index 83b071e98b..0dfd4c1393 100644
--- a/keyboards/draculad/info.json
+++ b/keyboards/draculad/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1B1E",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B6"},
diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h
index e701420bee..440abdc9f7 100644
--- a/keyboards/draytronics/daisy/config.h
+++ b/keyboards/draytronics/daisy/config.h
@@ -18,23 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B0, C0, C1}
-#define MATRIX_COL_PINS { C2, C3, C4, C5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define TAP_CODE_DELAY 10
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -56,8 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 //Underglow
-#define RGB_DI_PIN D4 // Underglow led pin
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 4
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -75,4 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/draytronics/daisy/daisy.c b/keyboards/draytronics/daisy/daisy.c
deleted file mode 100644
index 149cb3d0c7..0000000000
--- a/keyboards/draytronics/daisy/daisy.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*Copyright 2021 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "daisy.h"
diff --git a/keyboards/draytronics/daisy/daisy.h b/keyboards/draytronics/daisy/daisy.h
deleted file mode 100644
index 2c47989433..0000000000
--- a/keyboards/draytronics/daisy/daisy.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*Copyright 2021 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  K00,           K03, \
-  K10, K11, K12, K13, \
-  K20, K21, K22, K23  \
-) { \
-{ K00, _x_, _x_, K03, }, \
-{ K10, K11, K12, K13, }, \
-{ K20, K21, K22, K23, }, \
-}
diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/info.json
index c847a45650..ae0579b667 100644
--- a/keyboards/draytronics/daisy/info.json
+++ b/keyboards/draytronics/daisy/info.json
@@ -8,12 +8,20 @@
         "pid": "0x4441",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["C2", "C3", "C4", "C5"],
+        "rows": ["B0", "C0", "C1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B2"},
             {"pin_a": "D0", "pin_b": "D1"}
         ]
     },
+    "ws2812": {
+        "pin": "D4"
+    },
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "layout_aliases": {
@@ -22,18 +30,18 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"", "x":0, "y":0},
-                {"label":"", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"", "x":0, "y":1},
-                {"label":"", "x":1, "y":1},
-                {"label":"", "x":2, "y":1},
-                {"label":"", "x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label":"", "x":0, "y":2},
-                {"label":"", "x":1, "y":2},
-                {"label":"", "x":2, "y":2},
-                {"label":"", "x":3, "y":2}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2}
             ]
         }
     }
diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h
index 63619e7148..5c7b6994c9 100644
--- a/keyboards/draytronics/elise/config.h
+++ b/keyboards/draytronics/elise/config.h
@@ -18,31 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B2,B3, B1, F0, F1}
-#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D3, D5}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 // ws2812 options
-#define RGB_DI_PIN D1 // pin the DI on the ws2812 is hooked-up to
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 7
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -60,4 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/draytronics/elise/elise.c b/keyboards/draytronics/elise/elise.c
deleted file mode 100755
index 731202ab6d..0000000000
--- a/keyboards/draytronics/elise/elise.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*Copyright 2021 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "elise.h"
diff --git a/keyboards/draytronics/elise/elise.h b/keyboards/draytronics/elise/elise.h
deleted file mode 100755
index 750d651a23..0000000000
--- a/keyboards/draytronics/elise/elise.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*Copyright 2021 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_ansi_rwkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,           K45,                K49,      K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, _x_, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_ansi_lwkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_ansi_wkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,           K45,                K49,      K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, _x_, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso_rwkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,           K45,                K49,      K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, _x_, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso_lwkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso_wkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,           K45,                K49,      K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, _x_, K4B, K4C, K4D, K4E} \
-}
diff --git a/keyboards/draytronics/elise/info.json b/keyboards/draytronics/elise/info.json
index 9772e6d872..81be5cffd7 100644
--- a/keyboards/draytronics/elise/info.json
+++ b/keyboards/draytronics/elise/info.json
@@ -8,6 +8,14 @@
         "pid": "0x454C",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "D5"],
+        "rows": ["B2", "B3", "B1", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -22,606 +30,606 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_rwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_lwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"#", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_rwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"#", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_lwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"#", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"#", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h
index f352f96b39..8984b05e2c 100644
--- a/keyboards/draytronics/elise_v2/config.h
+++ b/keyboards/draytronics/elise_v2/config.h
@@ -18,31 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B2,B3, B1, F0, F1}
-#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D3, D5}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 // ws2812 options
-#define RGB_DI_PIN D1 // pin the DI on the ws2812 is hooked-up to
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 16
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -60,4 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/draytronics/elise_v2/elise_v2.c b/keyboards/draytronics/elise_v2/elise_v2.c
deleted file mode 100755
index f153d7a341..0000000000
--- a/keyboards/draytronics/elise_v2/elise_v2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*Copyright 2021 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "elise_v2.h"
diff --git a/keyboards/draytronics/elise_v2/elise_v2.h b/keyboards/draytronics/elise_v2/elise_v2.h
deleted file mode 100755
index 750d651a23..0000000000
--- a/keyboards/draytronics/elise_v2/elise_v2.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*Copyright 2021 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_ansi_rwkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,           K45,                K49,      K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, _x_, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_ansi_lwkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_ansi_wkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,           K45,                K49,      K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, _x_, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso_rwkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,           K45,                K49,      K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, _x_, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso_lwkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_iso_wkl( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40,      K42,           K45,                K49,      K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, _x_, K42, _x_, _x_, K45, _x_, _x_, _x_, K49, _x_, K4B, K4C, K4D, K4E} \
-}
diff --git a/keyboards/draytronics/elise_v2/info.json b/keyboards/draytronics/elise_v2/info.json
index d04e1374ed..faef95cbee 100644
--- a/keyboards/draytronics/elise_v2/info.json
+++ b/keyboards/draytronics/elise_v2/info.json
@@ -8,6 +8,14 @@
         "pid": "0x454C",
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "D5"],
+        "rows": ["B2", "B3", "B1", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -22,606 +30,606 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_rwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_lwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"#", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_rwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"#", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_lwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"#", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"10", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"#", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h
index c10d9fe357..4ae200c6a6 100644
--- a/keyboards/draytronics/scarlet/config.h
+++ b/keyboards/draytronics/scarlet/config.h
@@ -18,24 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
-#define MATRIX_COL_PINS { A5, A6, A7, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/info.json
index af0894ce3d..cb84baca06 100644
--- a/keyboards/draytronics/scarlet/info.json
+++ b/keyboards/draytronics/scarlet/info.json
@@ -8,33 +8,38 @@
         "pid": "0x5343",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "C7"],
+        "rows": ["A0", "A1", "A2", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "community_layouts": ["numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"label":"Num Lock", "x":0, "y":0},
-                {"label":"/", "x":1, "y":0},
-                {"label":"*", "x":2, "y":0},
-                {"label":"-", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"+", "x":3, "y":1, "h":2},
+                {"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},
 
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"label":"0", "x":0, "y":4, "w":2},
-                {"label":".", "x":2, "y":4},
-                {"label":"Enter", "x":3, "y":3, "h":2}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/draytronics/scarlet/scarlet.c b/keyboards/draytronics/scarlet/scarlet.c
deleted file mode 100644
index fdcc811d52..0000000000
--- a/keyboards/draytronics/scarlet/scarlet.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*Copyright 2020 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "scarlet.h"
diff --git a/keyboards/draytronics/scarlet/scarlet.h b/keyboards/draytronics/scarlet/scarlet.h
deleted file mode 100644
index d96f198db3..0000000000
--- a/keyboards/draytronics/scarlet/scarlet.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*Copyright 2020 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_5x4( \
-  K00, K01, K02, K03, \
-  K10, K11, K12,      \
-  K20, K21, K22, K13, \
-  K30, K31, K32,      \
-  K40,      K42, K33  \
-) { \
-{ K00, K01, K02, K03, }, \
-{ K10, K11, K12, K13, }, \
-{ K20, K21, K22, KC_NO, }, \
-{ K30, K31, K32, K33, }, \
-{ K40, KC_NO, K42, KC_NO, }, \
-}
diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h
index a7b3056d98..fb8fbcaac5 100644
--- a/keyboards/drewkeys/iskar/config.h
+++ b/keyboards/drewkeys/iskar/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
- //                       0   1   2   3   4   5   6   7   8   9   10  11  12  13  14  15
-#define MATRIX_ROW_PINS { D6, D7, B4, B5, D4 }
-#define MATRIX_COL_PINS { B6, C6, C7, F6, F5, F4, F7, F1, F0, E6, B7, D0, D1, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/drewkeys/iskar/info.json b/keyboards/drewkeys/iskar/info.json
index f3c3896969..5aae75c86c 100644
--- a/keyboards/drewkeys/iskar/info.json
+++ b/keyboards/drewkeys/iskar/info.json
@@ -8,383 +8,388 @@
         "pid": "0x1284",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "F6", "F5", "F4", "F7", "F1", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5"],
+        "rows": ["D6", "D7", "B4", "B5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "Esc 0,0", "x": 0, "y": 0},
-                {"label": "1 0,1", "x": 1, "y": 0},
-                {"label": "2 0,2", "x": 2, "y": 0},
-                {"label": "3 0,3", "x": 3, "y": 0},
-                {"label": "4 0,4", "x": 4, "y": 0},
-                {"label": "5 0,5", "x": 5, "y": 0},
-                {"label": "6 0,6", "x": 6, "y": 0},
-                {"label": "7 0,7", "x": 7, "y": 0},
-                {"label": "8 0,8", "x": 8, "y": 0},
-                {"label": "9 0,9", "x": 9, "y": 0},
-                {"label": "0 0,10", "x": 10, "y": 0},
-                {"label": "- 0,11", "x": 11, "y": 0},
-                {"label": "= 0,12", "x": 12, "y": 0},
-                {"label": "bsp extra 0,13", "x": 13, "y": 0},
-                {"label": "bsp 0,14", "x": 14, "y": 0},
-                {"label": "del 0,15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
-                {"label": "q 1,2", "x": 1.5, "y": 1},
-                {"label": "w 1,3", "x": 2.5, "y": 1},
-                {"label": "e 1,4", "x": 3.5, "y": 1},
-                {"label": "r 1,5", "x": 4.5, "y": 1},
-                {"label": "t 1,6", "x": 5.5, "y": 1},
-                {"label": "y 1,7", "x": 6.5, "y": 1},
-                {"label": "u 1,8", "x": 7.5, "y": 1},
-                {"label": "i 1,9", "x": 8.5, "y": 1},
-                {"label": "o 1,10", "x": 9.5, "y": 1},
-                {"label": "p 1,11", "x": 10.5, "y": 1},
-                {"label": "[ 1,12", "x": 11.5, "y": 1},
-                {"label": "] 1,13", "x": 12.5, "y": 1},
-                {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "home 1,15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
-                {"label": "a 2,2", "x": 1.75, "y": 2},
-                {"label": "s 2,3", "x": 2.75, "y": 2},
-                {"label": "d 2,4", "x": 3.75, "y": 2},
-                {"label": "f 2,5", "x": 4.75, "y": 2},
-                {"label": "g 2,6", "x": 5.75, "y": 2},
-                {"label": "h 2,7", "x": 6.75, "y": 2},
-                {"label": "j 2,8", "x": 7.75, "y": 2},
-                {"label": "k 2,9", "x": 8.75, "y": 2},
-                {"label": "l 2,10", "x": 9.75, "y": 2},
-                {"label": "; 2,11", "x": 10.75, "y": 2},
-                {"label": "' 2,12", "x": 11.75, "y": 2},
-                {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "pg up 2,15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
-                {"label": "z 3,2", "x": 2.25, "y": 3},
-                {"label": "x 3,3", "x": 3.25, "y": 3},
-                {"label": "c 3,4", "x": 4.25, "y": 3},
-                {"label": "v 3,5", "x": 5.25, "y": 3},
-                {"label": "b 3,6", "x": 6.25, "y": 3},
-                {"label": "n 3,7", "x": 7.25, "y": 3},
-                {"label": "m 3,8", "x": 8.25, "y": 3},
-                {"label": ", 3,9", "x": 9.25, "y": 3},
-                {"label": ". 3,10", "x": 10.25, "y": 3},
-                {"label": "/ 3,11", "x": 11.25, "y": 3},
-                {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
-                {"label": "up 3,14", "x": 14, "y": 3},
-                {"label": "pg dn 3,15", "x": 15, "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
-                {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
-                {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "left 4,13", "x": 13, "y": 4},
-                {"label": "down 4,14", "x": 14, "y": 4},
-                {"label": "right 4,15", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-              {"label": "Esc 0,0", "x": 0, "y": 0},
-              {"label": "1 0,1", "x": 1, "y": 0},
-              {"label": "2 0,2", "x": 2, "y": 0},
-              {"label": "3 0,3", "x": 3, "y": 0},
-              {"label": "4 0,4", "x": 4, "y": 0},
-              {"label": "5 0,5", "x": 5, "y": 0},
-              {"label": "6 0,6", "x": 6, "y": 0},
-              {"label": "7 0,7", "x": 7, "y": 0},
-              {"label": "8 0,8", "x": 8, "y": 0},
-              {"label": "9 0,9", "x": 9, "y": 0},
-              {"label": "0 0,10", "x": 10, "y": 0},
-              {"label": "- 0,11", "x": 11, "y": 0},
-              {"label": "= 0,12", "x": 12, "y": 0},
-              {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2},
-              {"label": "del 0,15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
-              {"label": "q 1,2", "x": 1.5, "y": 1},
-              {"label": "w 1,3", "x": 2.5, "y": 1},
-              {"label": "e 1,4", "x": 3.5, "y": 1},
-              {"label": "r 1,5", "x": 4.5, "y": 1},
-              {"label": "t 1,6", "x": 5.5, "y": 1},
-              {"label": "y 1,7", "x": 6.5, "y": 1},
-              {"label": "u 1,8", "x": 7.5, "y": 1},
-              {"label": "i 1,9", "x": 8.5, "y": 1},
-              {"label": "o 1,10", "x": 9.5, "y": 1},
-              {"label": "p 1,11", "x": 10.5, "y": 1},
-              {"label": "[ 1,12", "x": 11.5, "y": 1},
-              {"label": "] 1,13", "x": 12.5, "y": 1},
-              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
-              {"label": "home 1,15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
-              {"label": "a 2,2", "x": 1.75, "y": 2},
-              {"label": "s 2,3", "x": 2.75, "y": 2},
-              {"label": "d 2,4", "x": 3.75, "y": 2},
-              {"label": "f 2,5", "x": 4.75, "y": 2},
-              {"label": "g 2,6", "x": 5.75, "y": 2},
-              {"label": "h 2,7", "x": 6.75, "y": 2},
-              {"label": "j 2,8", "x": 7.75, "y": 2},
-              {"label": "k 2,9", "x": 8.75, "y": 2},
-              {"label": "l 2,10", "x": 9.75, "y": 2},
-              {"label": "; 2,11", "x": 10.75, "y": 2},
-              {"label": "' 2,12", "x": 11.75, "y": 2},
-              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
-              {"label": "pg up 2,15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
-              {"label": "z 3,2", "x": 2.25, "y": 3},
-              {"label": "x 3,3", "x": 3.25, "y": 3},
-              {"label": "c 3,4", "x": 4.25, "y": 3},
-              {"label": "v 3,5", "x": 5.25, "y": 3},
-              {"label": "b 3,6", "x": 6.25, "y": 3},
-              {"label": "n 3,7", "x": 7.25, "y": 3},
-              {"label": "m 3,8", "x": 8.25, "y": 3},
-              {"label": ", 3,9", "x": 9.25, "y": 3},
-              {"label": ". 3,10", "x": 10.25, "y": 3},
-              {"label": "/ 3,11", "x": 11.25, "y": 3},
-              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
-              {"label": "up 3,14", "x": 14, "y": 3},
-              {"label": "pg dn 3,15", "x": 15, "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
-              {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
-              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
-              {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
-              {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
-              {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
-              {"label": "left 4,13", "x": 13, "y": 4},
-              {"label": "down 4,14", "x": 14, "y": 4},
-              {"label": "right 4,15", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-              {"label": "Esc 0,0", "x": 0, "y": 0},
-              {"label": "1 0,1", "x": 1, "y": 0},
-              {"label": "2 0,2", "x": 2, "y": 0},
-              {"label": "3 0,3", "x": 3, "y": 0},
-              {"label": "4 0,4", "x": 4, "y": 0},
-              {"label": "5 0,5", "x": 5, "y": 0},
-              {"label": "6 0,6", "x": 6, "y": 0},
-              {"label": "7 0,7", "x": 7, "y": 0},
-              {"label": "8 0,8", "x": 8, "y": 0},
-              {"label": "9 0,9", "x": 9, "y": 0},
-              {"label": "0 0,10", "x": 10, "y": 0},
-              {"label": "- 0,11", "x": 11, "y": 0},
-              {"label": "= 0,12", "x": 12, "y": 0},
-              {"label": "bsp extra 0,13", "x": 13, "y": 0},
-              {"label": "bsp 0,14", "x": 14, "y": 0},
-              {"label": "del 0,15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
-              {"label": "q 1,2", "x": 1.5, "y": 1},
-              {"label": "w 1,3", "x": 2.5, "y": 1},
-              {"label": "e 1,4", "x": 3.5, "y": 1},
-              {"label": "r 1,5", "x": 4.5, "y": 1},
-              {"label": "t 1,6", "x": 5.5, "y": 1},
-              {"label": "y 1,7", "x": 6.5, "y": 1},
-              {"label": "u 1,8", "x": 7.5, "y": 1},
-              {"label": "i 1,9", "x": 8.5, "y": 1},
-              {"label": "o 1,10", "x": 9.5, "y": 1},
-              {"label": "p 1,11", "x": 10.5, "y": 1},
-              {"label": "[ 1,12", "x": 11.5, "y": 1},
-              {"label": "] 1,13", "x": 12.5, "y": 1},
-              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
-              {"label": "home 1,15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
-              {"label": "a 2,2", "x": 1.75, "y": 2},
-              {"label": "s 2,3", "x": 2.75, "y": 2},
-              {"label": "d 2,4", "x": 3.75, "y": 2},
-              {"label": "f 2,5", "x": 4.75, "y": 2},
-              {"label": "g 2,6", "x": 5.75, "y": 2},
-              {"label": "h 2,7", "x": 6.75, "y": 2},
-              {"label": "j 2,8", "x": 7.75, "y": 2},
-              {"label": "k 2,9", "x": 8.75, "y": 2},
-              {"label": "l 2,10", "x": 9.75, "y": 2},
-              {"label": "; 2,11", "x": 10.75, "y": 2},
-              {"label": "' 2,12", "x": 11.75, "y": 2},
-              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
-              {"label": "pg up 2,15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
-              {"label": "z 3,2", "x": 2.25, "y": 3},
-              {"label": "x 3,3", "x": 3.25, "y": 3},
-              {"label": "c 3,4", "x": 4.25, "y": 3},
-              {"label": "v 3,5", "x": 5.25, "y": 3},
-              {"label": "b 3,6", "x": 6.25, "y": 3},
-              {"label": "n 3,7", "x": 7.25, "y": 3},
-              {"label": "m 3,8", "x": 8.25, "y": 3},
-              {"label": ", 3,9", "x": 9.25, "y": 3},
-              {"label": ". 3,10", "x": 10.25, "y": 3},
-              {"label": "/ 3,11", "x": 11.25, "y": 3},
-              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
-              {"label": "up 3,14", "x": 14, "y": 3},
-              {"label": "pg dn 3,15", "x": 15, "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
-              {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
-              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
-              {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
-              {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
-              {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
-              {"label": "left 4,13", "x": 13, "y": 4},
-              {"label": "down 4,14", "x": 14, "y": 4},
-              {"label": "right 4,15", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_tsangan": {
             "layout": [
-              {"label": "Esc 0,0", "x": 0, "y": 0},
-              {"label": "1 0,1", "x": 1, "y": 0},
-              {"label": "2 0,2", "x": 2, "y": 0},
-              {"label": "3 0,3", "x": 3, "y": 0},
-              {"label": "4 0,4", "x": 4, "y": 0},
-              {"label": "5 0,5", "x": 5, "y": 0},
-              {"label": "6 0,6", "x": 6, "y": 0},
-              {"label": "7 0,7", "x": 7, "y": 0},
-              {"label": "8 0,8", "x": 8, "y": 0},
-              {"label": "9 0,9", "x": 9, "y": 0},
-              {"label": "0 0,10", "x": 10, "y": 0},
-              {"label": "- 0,11", "x": 11, "y": 0},
-              {"label": "= 0,12", "x": 12, "y": 0},
-              {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2},
-              {"label": "del 0,15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
-              {"label": "q 1,2", "x": 1.5, "y": 1},
-              {"label": "w 1,3", "x": 2.5, "y": 1},
-              {"label": "e 1,4", "x": 3.5, "y": 1},
-              {"label": "r 1,5", "x": 4.5, "y": 1},
-              {"label": "t 1,6", "x": 5.5, "y": 1},
-              {"label": "y 1,7", "x": 6.5, "y": 1},
-              {"label": "u 1,8", "x": 7.5, "y": 1},
-              {"label": "i 1,9", "x": 8.5, "y": 1},
-              {"label": "o 1,10", "x": 9.5, "y": 1},
-              {"label": "p 1,11", "x": 10.5, "y": 1},
-              {"label": "[ 1,12", "x": 11.5, "y": 1},
-              {"label": "] 1,13", "x": 12.5, "y": 1},
-              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
-              {"label": "home 1,15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
-              {"label": "a 2,2", "x": 1.75, "y": 2},
-              {"label": "s 2,3", "x": 2.75, "y": 2},
-              {"label": "d 2,4", "x": 3.75, "y": 2},
-              {"label": "f 2,5", "x": 4.75, "y": 2},
-              {"label": "g 2,6", "x": 5.75, "y": 2},
-              {"label": "h 2,7", "x": 6.75, "y": 2},
-              {"label": "j 2,8", "x": 7.75, "y": 2},
-              {"label": "k 2,9", "x": 8.75, "y": 2},
-              {"label": "l 2,10", "x": 9.75, "y": 2},
-              {"label": "; 2,11", "x": 10.75, "y": 2},
-              {"label": "' 2,12", "x": 11.75, "y": 2},
-              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
-              {"label": "pg up 2,15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
-              {"label": "z 3,2", "x": 2.25, "y": 3},
-              {"label": "x 3,3", "x": 3.25, "y": 3},
-              {"label": "c 3,4", "x": 4.25, "y": 3},
-              {"label": "v 3,5", "x": 5.25, "y": 3},
-              {"label": "b 3,6", "x": 6.25, "y": 3},
-              {"label": "n 3,7", "x": 7.25, "y": 3},
-              {"label": "m 3,8", "x": 8.25, "y": 3},
-              {"label": ", 3,9", "x": 9.25, "y": 3},
-              {"label": ". 3,10", "x": 10.25, "y": 3},
-              {"label": "/ 3,11", "x": 11.25, "y": 3},
-              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
-              {"label": "up 3,14", "x": 14, "y": 3},
-              {"label": "pg dn 3,15", "x": 15, "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5},
-              {"label": "win 4,1", "x": 1.5, "y": 4},
-              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5},
-              {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7},
-              {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5},
-              {"label": "left 4,13", "x": 13, "y": 4},
-              {"label": "down 4,14", "x": 14, "y": 4},
-              {"label": "right 4,15", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_tsangan_split_bs": {
             "layout": [
-              {"label": "Esc 0,0", "x": 0, "y": 0},
-              {"label": "1 0,1", "x": 1, "y": 0},
-              {"label": "2 0,2", "x": 2, "y": 0},
-              {"label": "3 0,3", "x": 3, "y": 0},
-              {"label": "4 0,4", "x": 4, "y": 0},
-              {"label": "5 0,5", "x": 5, "y": 0},
-              {"label": "6 0,6", "x": 6, "y": 0},
-              {"label": "7 0,7", "x": 7, "y": 0},
-              {"label": "8 0,8", "x": 8, "y": 0},
-              {"label": "9 0,9", "x": 9, "y": 0},
-              {"label": "0 0,10", "x": 10, "y": 0},
-              {"label": "- 0,11", "x": 11, "y": 0},
-              {"label": "= 0,12", "x": 12, "y": 0},
-              {"label": "bsp extra 0,13", "x": 13, "y": 0},
-              {"label": "bsp 0,14", "x": 14, "y": 0},
-              {"label": "del 0,15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
-              {"label": "q 1,2", "x": 1.5, "y": 1},
-              {"label": "w 1,3", "x": 2.5, "y": 1},
-              {"label": "e 1,4", "x": 3.5, "y": 1},
-              {"label": "r 1,5", "x": 4.5, "y": 1},
-              {"label": "t 1,6", "x": 5.5, "y": 1},
-              {"label": "y 1,7", "x": 6.5, "y": 1},
-              {"label": "u 1,8", "x": 7.5, "y": 1},
-              {"label": "i 1,9", "x": 8.5, "y": 1},
-              {"label": "o 1,10", "x": 9.5, "y": 1},
-              {"label": "p 1,11", "x": 10.5, "y": 1},
-              {"label": "[ 1,12", "x": 11.5, "y": 1},
-              {"label": "] 1,13", "x": 12.5, "y": 1},
-              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
-              {"label": "home 1,15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
-              {"label": "a 2,2", "x": 1.75, "y": 2},
-              {"label": "s 2,3", "x": 2.75, "y": 2},
-              {"label": "d 2,4", "x": 3.75, "y": 2},
-              {"label": "f 2,5", "x": 4.75, "y": 2},
-              {"label": "g 2,6", "x": 5.75, "y": 2},
-              {"label": "h 2,7", "x": 6.75, "y": 2},
-              {"label": "j 2,8", "x": 7.75, "y": 2},
-              {"label": "k 2,9", "x": 8.75, "y": 2},
-              {"label": "l 2,10", "x": 9.75, "y": 2},
-              {"label": "; 2,11", "x": 10.75, "y": 2},
-              {"label": "' 2,12", "x": 11.75, "y": 2},
-              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
-              {"label": "pg up 2,15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
-              {"label": "z 3,2", "x": 2.25, "y": 3},
-              {"label": "x 3,3", "x": 3.25, "y": 3},
-              {"label": "c 3,4", "x": 4.25, "y": 3},
-              {"label": "v 3,5", "x": 5.25, "y": 3},
-              {"label": "b 3,6", "x": 6.25, "y": 3},
-              {"label": "n 3,7", "x": 7.25, "y": 3},
-              {"label": "m 3,8", "x": 8.25, "y": 3},
-              {"label": ", 3,9", "x": 9.25, "y": 3},
-              {"label": ". 3,10", "x": 10.25, "y": 3},
-              {"label": "/ 3,11", "x": 11.25, "y": 3},
-              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
-              {"label": "up 3,14", "x": 14, "y": 3},
-              {"label": "pg dn 3,15", "x": 15, "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5},
-              {"label": "win 4,1", "x": 1.5, "y": 4},
-              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5},
-              {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7},
-              {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5},
-              {"label": "left 4,13", "x": 13, "y": 4},
-              {"label": "down 4,14", "x": 14, "y": 4},
-              {"label": "right 4,15", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/drewkeys/iskar/iskar.c b/keyboards/drewkeys/iskar/iskar.c
deleted file mode 100644
index 32ea7aa2e4..0000000000
--- a/keyboards/drewkeys/iskar/iskar.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Drewkeys
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "iskar.h"
diff --git a/keyboards/drewkeys/iskar/iskar.h b/keyboards/drewkeys/iskar/iskar.h
deleted file mode 100644
index 0ad2601d33..0000000000
--- a/keyboards/drewkeys/iskar/iskar.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Copyright 2021 Drewkeys
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-// Corresponding changes to the layout names and/or definitions must also be made to info.json
-
-/* Standard arrangement / LAYOUT
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
- * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
- * │40  │41  │43  │        46              │4a  │4b  │▓│4d │4e │4f │
- * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
-*/
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
-    k40, k41, k42,                k46,                k4A, k4B,      k4D, k4E,   k4F     \
-) { \
-    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
-    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
-}
-
-/* Standard arrangement / 65 ANSI
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
- * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
- * │40  │41  │43  │        46              │4a  │4b  │ │4d │4e │4f │
- * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
-*/
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,        k0E, k0F,    \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k1E, k1F,    \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,   k3E, k3F,    \
-    k40, k41, k42,                k46,                k4A, k4B,      k4D,   k4E, k4F     \
-) { \
-    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   KC_NO, k0E, k0F }, \
-    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
-}
-
-/* Standard arrangement / 65 ANSI SPLIT
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
- * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
- * │40  │41  │43  │        46              │4a  │4b  │ │4d │4e │4f │
- * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
-*/
-#define LAYOUT_65_ansi_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
-    k40, k41, k42,                k46,                k4A, k4B,      k4D, k4E,   k4F     \
-) { \
-    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
-    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
-}
-
-/* Standard arrangement / 65 TSANGAN
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
- * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
- * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤
- * │40   │41 │43  │        46                   │4b  │ │4d │4e │4f │
- * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘
-*/
-#define LAYOUT_65_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E,  k0F,     \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
-    k40, k41, k42,                k46,                     k4B,      k4D, k4E,   k4F     \
-) { \
-    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   KC_NO, k0E, k0F }, \
-    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E, k4F }  \
-}
-
-/* Standard arrangement / 65 TSANGAN SPLIT
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
- * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
- * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤
- * │40   │41 │43  │        46                   │4b  │ │4d │4e │4f │
- * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘
-*/
-#define LAYOUT_65_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
-    k40, k41, k42,                k46,                     k4B,      k4D, k4E,   k4F     \
-) { \
-    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
-    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E,   k4F }  \
-}
diff --git a/keyboards/drhigsby/bkf/bkf.c b/keyboards/drhigsby/bkf/bkf.c
deleted file mode 100644
index 6df3ed56f6..0000000000
--- a/keyboards/drhigsby/bkf/bkf.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bkf.h"
diff --git a/keyboards/drhigsby/bkf/config.h b/keyboards/drhigsby/bkf/config.h
index e13ed8af9d..44c0166125 100644
--- a/keyboards/drhigsby/bkf/config.h
+++ b/keyboards/drhigsby/bkf/config.h
@@ -15,25 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { B6, B2, D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/drhigsby/bkf/info.json b/keyboards/drhigsby/bkf/info.json
index 49a56a2786..d2a22b3d20 100644
--- a/keyboards/drhigsby/bkf/info.json
+++ b/keyboards/drhigsby/bkf/info.json
@@ -8,6 +8,11 @@
      "pid": "0x0003",
      "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6", "B2", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+    "rows": ["F6", "F7", "B1", "B3"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
       "rotary": [
           {"pin_a": "F4", "pin_b": "F5"}
diff --git a/keyboards/drhigsby/dubba175/config.h b/keyboards/drhigsby/dubba175/config.h
index 5de87b2fa1..7cfb519fe9 100644
--- a/keyboards/drhigsby/dubba175/config.h
+++ b/keyboards/drhigsby/dubba175/config.h
@@ -15,25 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, B3, B2, B5 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/drhigsby/dubba175/dubba175.c b/keyboards/drhigsby/dubba175/dubba175.c
deleted file mode 100644
index 066e772fa2..0000000000
--- a/keyboards/drhigsby/dubba175/dubba175.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 drhigsby
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dubba175.h"
\ No newline at end of file
diff --git a/keyboards/drhigsby/dubba175/info.json b/keyboards/drhigsby/dubba175/info.json
index e9ea824c5f..6e24721cf9 100644
--- a/keyboards/drhigsby/dubba175/info.json
+++ b/keyboards/drhigsby/dubba175/info.json
@@ -8,6 +8,11 @@
      "pid": "0x0420",
      "device_version": "4.2.0"
   },
+  "matrix_pins": {
+     "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B6"],
+     "rows": ["B1", "B3", "B2", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/drhigsby/ogurec/config.h b/keyboards/drhigsby/ogurec/config.h
index b59942ed24..44c0166125 100644
--- a/keyboards/drhigsby/ogurec/config.h
+++ b/keyboards/drhigsby/ogurec/config.h
@@ -15,25 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F6, B6, B2 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, F4, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/drhigsby/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json
index 31e8816a46..3f28e87826 100644
--- a/keyboards/drhigsby/ogurec/info.json
+++ b/keyboards/drhigsby/ogurec/info.json
@@ -8,87 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
+        "rows": ["F6", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_ortho_3x12": {
-            "layout": [
-                {"label":"Q", "x":0, "y":0}, 
-                {"label":"W", "x":1, "y":0}, 
-                {"label":"E", "x":2, "y":0}, 
-                {"label":"R", "x":3, "y":0}, 
-                {"label":"T", "x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"label":"Y", "x":7, "y":0}, 
-                {"label":"U", "x":8, "y":0}, 
-                {"label":"I", "x":9, "y":0}, 
-                {"label":"O", "x":10, "y":0}, 
-                {"label":"P", "x":11, "y":0}, 
-                {"label":"A", "x":0, "y":1}, 
-                {"label":"S", "x":1, "y":1}, 
-                {"label":"D", "x":2, "y":1}, 
-                {"label":"F", "x":3, "y":1}, 
-                {"label":"G", "x":4, "y":1}, 
-                {"x":5, "y":1}, 
-                {"x":6, "y":1}, 
-                {"label":"H", "x":7, "y":1}, 
-                {"label":"J", "x":8, "y":1}, 
-                {"label":"K", "x":9, "y":1}, 
-                {"label":"L", "x":10, "y":1}, 
-                {"label":"\"", "x":11, "y":1}, 
-                {"label":"Z", "x":0, "y":2}, 
-                {"label":"X", "x":1, "y":2}, 
-                {"label":"C", "x":2, "y":2}, 
-                {"label":"V", "x":3, "y":2}, 
-                {"label":"B", "x":4, "y":2}, 
-                {"x":5, "y":2}, 
-                {"x":6, "y":2}, 
-                {"label":"N", "x":7, "y":2}, 
-                {"label":"M", "x":8, "y":2}, 
-                {"label":"<", "x":9, "y":2}, 
-                {"label":">", "x":10, "y":2}, 
-                {"label":"?", "x":11, "y":2}]
-        },
-       
-        "LAYOUT_ortho_3x12_1x2uC": {
-            "layout": [
-                {"label":"Q", "x":0, "y":0}, 
-                {"label":"W", "x":1, "y":0}, 
-                {"label":"E", "x":2, "y":0}, 
-                {"label":"R", "x":3, "y":0}, 
-                {"label":"T", "x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"label":"Y", "x":7, "y":0}, 
-                {"label":"U", "x":8, "y":0}, 
-                {"label":"I", "x":9, "y":0}, 
-                {"label":"O", "x":10, "y":0}, 
-                {"label":"P", "x":11, "y":0}, 
-                {"label":"A", "x":0, "y":1}, 
-                {"label":"S", "x":1, "y":1}, 
-                {"label":"D", "x":2, "y":1}, 
-                {"label":"F", "x":3, "y":1}, 
-                {"label":"G", "x":4, "y":1}, 
-                {"x":5, "y":1}, 
-                {"x":6, "y":1}, 
-                {"label":"H", "x":7, "y":1}, 
-                {"label":"J", "x":8, "y":1}, 
-                {"label":"K", "x":9, "y":1}, 
-                {"label":"L", "x":10, "y":1}, 
-                {"label":"\"", "x":11, "y":1}, 
-                {"label":"Z", "x":0, "y":2}, 
-                {"label":"X", "x":1, "y":2}, 
-                {"label":"C", "x":2, "y":2}, 
-                {"label":"V", "x":3, "y":2}, 
-                {"label":"B", "x":4, "y":2}, 
-                {"x":5, "y":2, "w":2}, 
-                {"label":"N", "x":7, "y":2}, 
-                {"label":"M", "x":8, "y":2}, 
-                {"label":"<", "x":9, "y":2}, 
-                {"label":">", "x":10, "y":2}, 
-                {"label":"?", "x":11, "y":2}]
-        }
-
-    }
+    "bootloader": "caterina"
 }
diff --git a/keyboards/drhigsby/ogurec/keymaps/dack/config.h b/keyboards/drhigsby/ogurec/keymaps/dack/config.h
index af5d55bf6e..cadd53a971 100644
--- a/keyboards/drhigsby/ogurec/keymaps/dack/config.h
+++ b/keyboards/drhigsby/ogurec/keymaps/dack/config.h
@@ -14,6 +14,5 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 230
 #define TAPPING_TERM_PER_KEY
diff --git a/keyboards/drhigsby/ogurec/left_pm/info.json b/keyboards/drhigsby/ogurec/left_pm/info.json
new file mode 100644
index 0000000000..4563c99b1c
--- /dev/null
+++ b/keyboards/drhigsby/ogurec/left_pm/info.json
@@ -0,0 +1,87 @@
+{
+    "layouts": {
+        "LAYOUT_ortho_3x12": {
+            "layout": [
+                {"matrix": [0, 11], "x": 0, "y": 0},
+                {"matrix": [0, 10], "x": 1, "y": 0},
+                {"matrix": [0, 9], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 7], "x": 4, "y": 0},
+                {"matrix": [0, 6], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [0, 3], "x": 8, "y": 0},
+                {"matrix": [0, 2], "x": 9, "y": 0},
+                {"matrix": [0, 1], "x": 10, "y": 0},
+                {"matrix": [0, 0], "x": 11, "y": 0},
+
+                {"matrix": [1, 11], "x": 0, "y": 1},
+                {"matrix": [1, 10], "x": 1, "y": 1},
+                {"matrix": [1, 9], "x": 2, "y": 1},
+                {"matrix": [1, 8], "x": 3, "y": 1},
+                {"matrix": [1, 7], "x": 4, "y": 1},
+                {"matrix": [1, 6], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 4], "x": 7, "y": 1},
+                {"matrix": [1, 3], "x": 8, "y": 1},
+                {"matrix": [1, 2], "x": 9, "y": 1},
+                {"matrix": [1, 1], "x": 10, "y": 1},
+                {"matrix": [1, 0], "x": 11, "y": 1},
+
+                {"matrix": [2, 11], "x": 0, "y": 2},
+                {"matrix": [2, 10], "x": 1, "y": 2},
+                {"matrix": [2, 9], "x": 2, "y": 2},
+                {"matrix": [2, 8], "x": 3, "y": 2},
+                {"matrix": [2, 7], "x": 4, "y": 2},
+                {"matrix": [2, 6], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [2, 3], "x": 8, "y": 2},
+                {"matrix": [2, 2], "x": 9, "y": 2},
+                {"matrix": [2, 1], "x": 10, "y": 2},
+                {"matrix": [2, 0], "x": 11, "y": 2}
+            ]
+        },
+        "LAYOUT_ortho_3x12_1x2uC": {
+            "layout": [
+                {"matrix": [0, 11], "x": 0, "y": 0},
+                {"matrix": [0, 10], "x": 1, "y": 0},
+                {"matrix": [0, 9], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 7], "x": 4, "y": 0},
+                {"matrix": [0, 6], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [0, 3], "x": 8, "y": 0},
+                {"matrix": [0, 2], "x": 9, "y": 0},
+                {"matrix": [0, 1], "x": 10, "y": 0},
+                {"matrix": [0, 0], "x": 11, "y": 0},
+
+                {"matrix": [1, 11], "x": 0, "y": 1},
+                {"matrix": [1, 10], "x": 1, "y": 1},
+                {"matrix": [1, 9], "x": 2, "y": 1},
+                {"matrix": [1, 8], "x": 3, "y": 1},
+                {"matrix": [1, 7], "x": 4, "y": 1},
+                {"matrix": [1, 6], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 4], "x": 7, "y": 1},
+                {"matrix": [1, 3], "x": 8, "y": 1},
+                {"matrix": [1, 2], "x": 9, "y": 1},
+                {"matrix": [1, 1], "x": 10, "y": 1},
+                {"matrix": [1, 0], "x": 11, "y": 1},
+
+                {"matrix": [2, 11], "x": 0, "y": 2},
+                {"matrix": [2, 10], "x": 1, "y": 2},
+                {"matrix": [2, 9], "x": 2, "y": 2},
+                {"matrix": [2, 8], "x": 3, "y": 2},
+                {"matrix": [2, 7], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2, "w": 2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [2, 3], "x": 8, "y": 2},
+                {"matrix": [2, 2], "x": 9, "y": 2},
+                {"matrix": [2, 1], "x": 10, "y": 2},
+                {"matrix": [2, 0], "x": 11, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/drhigsby/ogurec/left_pm/left_pm.h b/keyboards/drhigsby/ogurec/left_pm/left_pm.h
deleted file mode 100644
index ecf87a2a49..0000000000
--- a/keyboards/drhigsby/ogurec/left_pm/left_pm.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "ogurec.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_3x12( \
-    k011, k010, k009, k008, k007, k006, k005, k004, k003, k002, k001, k000, \
-    k111, k110, k109, k108, k107, k106, k105, k104, k103, k102, k101, k100,  \
-    k211, k210, k209, k208, k207, k206, k205, k204, k203, k202, k201, k200    \
-) \
-{ \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 },  \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }    \
-}
-
-#define LAYOUT_ortho_3x12_1x2uC( \
-    k011, k010, k009, k008, k007, k006, k005, k004, k003, k002, k001, k000, \
-    k111, k110, k109, k108, k107, k106, k105, k104, k103, k102, k101, k100,  \
-    k211, k210, k209, k208, k207,    k205,    k204, k203, k202, k201, k200    \
-) \
-{ \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 },  \
-    { k200, k201, k202, k203, k204, k205, KC_NO, k207, k208, k209, k210, k211 }   \
-}
diff --git a/keyboards/drhigsby/ogurec/ogurec.c b/keyboards/drhigsby/ogurec/ogurec.c
deleted file mode 100644
index 6b2efa56b6..0000000000
--- a/keyboards/drhigsby/ogurec/ogurec.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ogurec.h"
diff --git a/keyboards/drhigsby/ogurec/ogurec.h b/keyboards/drhigsby/ogurec/ogurec.h
deleted file mode 100644
index 154d5d6cfe..0000000000
--- a/keyboards/drhigsby/ogurec/ogurec.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_drhigsby_ogurec_left_pm)
-#    include "left_pm.h"
-#elif defined(KEYBOARD_drhigsby_ogurec_right_pm)
-#    include "right_pm.h"
-#endif
diff --git a/keyboards/drhigsby/ogurec/right_pm/info.json b/keyboards/drhigsby/ogurec/right_pm/info.json
new file mode 100644
index 0000000000..8006014ea0
--- /dev/null
+++ b/keyboards/drhigsby/ogurec/right_pm/info.json
@@ -0,0 +1,87 @@
+{
+    "layouts": {
+        "LAYOUT_ortho_3x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2}
+            ]
+        },
+        "LAYOUT_ortho_3x12_1x2uC": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2, "w": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/drhigsby/ogurec/right_pm/right_pm.h b/keyboards/drhigsby/ogurec/right_pm/right_pm.h
deleted file mode 100644
index e413a835bc..0000000000
--- a/keyboards/drhigsby/ogurec/right_pm/right_pm.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "ogurec.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_3x12( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111,  \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211    \
-) \
-{ \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 },  \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }    \
-}
-
-#define LAYOUT_ortho_3x12_1x2uC( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111,  \
-    k200, k201, k202, k203, k204,    k205,    k207, k208, k209, k210, k211    \
-) \
-{ \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 },  \
-    { k200, k201, k202, k203, k204, k205, KC_NO, k207, k208, k209, k210, k211 }   \
-}
diff --git a/keyboards/drhigsby/packrat/config.h b/keyboards/drhigsby/packrat/config.h
index 5700fad7d2..44c0166125 100644
--- a/keyboards/drhigsby/packrat/config.h
+++ b/keyboards/drhigsby/packrat/config.h
@@ -15,25 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F7, B1, B6, B2 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/drhigsby/packrat/info.json b/keyboards/drhigsby/packrat/info.json
index b9f9246701..0525824da3 100644
--- a/keyboards/drhigsby/packrat/info.json
+++ b/keyboards/drhigsby/packrat/info.json
@@ -8,6 +8,11 @@
      "pid": "0x0004",
      "device_version": "0.0.1"
   },
+  "matrix_pins": {
+     "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3"],
+     "rows": ["F7", "B1", "B6", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
        "rotary": [
             {"pin_a": "F5", "pin_b": "F4"}
diff --git a/keyboards/drhigsby/packrat/packrat.c b/keyboards/drhigsby/packrat/packrat.c
index 0f4a479956..dc8f3b41b4 100644
--- a/keyboards/drhigsby/packrat/packrat.c
+++ b/keyboards/drhigsby/packrat/packrat.c
@@ -14,15 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "packrat.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/info.json
index 8fd65c1bd7..a4aba158c1 100644
--- a/keyboards/drop/sense75/info.json
+++ b/keyboards/drop/sense75/info.json
@@ -113,6 +113,7 @@
         }
     },
     "rgb_matrix": {
+        "driver": "IS31FL3733",
         "layout": [
             { "flags": 2, "x": 2, "y": 0 },
             { "flags": 2, "x": 22, "y": 0 },
diff --git a/keyboards/drop/sense75/rules.mk b/keyboards/drop/sense75/rules.mk
index 781ba9b35a..44adba039b 100644
--- a/keyboards/drop/sense75/rules.mk
+++ b/keyboards/drop/sense75/rules.mk
@@ -1,2 +1 @@
 EEPROM_DRIVER = i2c
-RGB_MATRIX_DRIVER = IS31FL3733
diff --git a/keyboards/drop/sense75/sense75.c b/keyboards/drop/sense75/sense75.c
index a8cb28b054..cbc194ee8f 100644
--- a/keyboards/drop/sense75/sense75.c
+++ b/keyboards/drop/sense75/sense75.c
@@ -133,16 +133,3 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     { 1, H_16, G_16, I_16 }
 };
 #endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return false; 
-}
-#endif
diff --git a/keyboards/dtisaac/cg108/cg108.c b/keyboards/dtisaac/cg108/cg108.c
deleted file mode 100644
index c2a7254aa8..0000000000
--- a/keyboards/dtisaac/cg108/cg108.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 DTIsaac
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "cg108.h"
diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h
index fb60cba345..d39c818a73 100644
--- a/keyboards/dtisaac/cg108/config.h
+++ b/keyboards/dtisaac/cg108/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F1, F0, F5, F6, F7, D4, D5, D3, D2, D0 }
-#define MATRIX_COL_PINS { C7, C6, B4, D7, B3, B2, B0, E6, B1, D1, D6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json
index d386e9148a..4da08a7a74 100644
--- a/keyboards/dtisaac/cg108/info.json
+++ b/keyboards/dtisaac/cg108/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4973",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"],
+        "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
     	"caps_lock": "B6",
     	"num_lock": "B5",
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index 12402c7d3f..0ad383a688 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -17,25 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B7, D7, F1, F0 }
-#define MATRIX_COL_PINS { D1, D6, D3, D2, B6, C6, C7, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN D0
 #define RGB_MATRIX_LED_COUNT 42
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json
index 286396776e..b9f02c3470 100644
--- a/keyboards/dtisaac/dosa40rgb/info.json
+++ b/keyboards/dtisaac/dosa40rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x4973",
         "device_version": "0.0.4"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
+        "rows": ["B7", "D7", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "lufa-dfu",
     "layouts": {
@@ -48,12 +59,12 @@
                 {"label":".", "x":9.75, "y":2},
                 {"label":"Shift", "x":10.75, "y":2, "w":1.25},
                 {"label":"Ctrl", "x":0, "y":3, "w":1.25},
-                {"label":"Win", "x":1.25, "y":3, "w":1},
+                {"label":"Win", "x":1.25, "y":3},
                 {"label":"Alt", "x":2.25, "y":3, "w":1.25},
                 {"label":"Space", "x":3.5, "y":3, "w":2.25},
                 {"label":"Space", "x":5.75, "y":3, "w":2.75},
                 {"label":"App", "x":8.5, "y":3, "w":1.25},
-                {"label":"Fn", "x":9.75, "y":3, "w":1},
+                {"label":"Fn", "x":9.75, "y":3},
                 {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}
             ]
         }
diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk
index c3b1c4ef11..5cc9ef68e4 100644
--- a/keyboards/dtisaac/dosa40rgb/rules.mk
+++ b/keyboards/dtisaac/dosa40rgb/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes      # Enable Bluetooth
 BLUETOOTH_DRIVER = BluefruitLE
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LTO_ENABLE = yes
diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h
deleted file mode 100644
index aa0f99f104..0000000000
--- a/keyboards/dtisaac/dtisaac01/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 DTIsaac
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, B4, D2, B2, B1, B3, D4, D6 }
-#define MATRIX_COL_PINS { C7, C6, D0, B5, F0, D7, B0, B7, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/dtisaac/dtisaac01/dtisaac01.c b/keyboards/dtisaac/dtisaac01/dtisaac01.c
deleted file mode 100644
index b11920280f..0000000000
--- a/keyboards/dtisaac/dtisaac01/dtisaac01.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 DTIsaac
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "dtisaac01.h"
diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json
index bbbc5ede5d..1d762fd1db 100644
--- a/keyboards/dtisaac/dtisaac01/info.json
+++ b/keyboards/dtisaac/dtisaac01/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4973",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "D0", "B5", "F0", "D7", "B0", "B7", "D1"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "B4", "D2", "B2", "B1", "B3", "D4", "D6"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "breathing": true
diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h
index fa0c631603..e39099ef56 100644
--- a/keyboards/duck/eagle_viper/v2/config.h
+++ b/keyboards/duck/eagle_viper/v2/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
 #define TAPPING_TERM 200
diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json
index 24821c46e1..1e31d4f0a0 100644
--- a/keyboards/duck/eagle_viper/v2/info.json
+++ b/keyboards/duck/eagle_viper/v2/info.json
@@ -12,6 +12,9 @@
     "bootmagic": {
         "matrix": [4, 10]
     },
+    "ws2812": {
+        "pin": "D6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h
index 22a5b17901..95459e67b1 100644
--- a/keyboards/duck/jetfire/config.h
+++ b/keyboards/duck/jetfire/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define RGB_DI_PIN D6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json
index 50118f3c8e..4df56c164a 100644
--- a/keyboards/duck/jetfire/info.json
+++ b/keyboards/duck/jetfire/info.json
@@ -15,6 +15,9 @@
     "bootmagic": {
         "matrix": [5, 10]
     },
+    "ws2812": {
+        "pin": "D6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h
index 6fcad40634..cb5a419f56 100644
--- a/keyboards/duck/lightsaver/config.h
+++ b/keyboards/duck/lightsaver/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
 #define TAPPING_TERM 200
diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json
index b24ac43b0d..36315c96ef 100644
--- a/keyboards/duck/lightsaver/info.json
+++ b/keyboards/duck/lightsaver/info.json
@@ -15,6 +15,9 @@
   "bootmagic": {
     "matrix": [5, 10]
   },
+  "ws2812": {
+    "pin": "D6"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h
index a11234e6b3..9b557edaba 100644
--- a/keyboards/duck/octagon/v1/config.h
+++ b/keyboards/duck/octagon/v1/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
 #define TAPPING_TERM 200
diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json
index f30d533062..0224a00528 100644
--- a/keyboards/duck/octagon/v1/info.json
+++ b/keyboards/duck/octagon/v1/info.json
@@ -15,96 +15,104 @@
     "bootmagic": {
         "matrix": [5, 10]
     },
+    "ws2812": {
+        "pin": "D6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi"],
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"ScrLk", "x":14, "y":0},
-                {"label":"Pause", "x":15, "y":0},
-                {"label":"~", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"@", "x":2, "y":1},
-                {"label":"#", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":15, "y":3},
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5},
+                {"matrix": [5, 9], "x": 11, "y": 5},
+                {"matrix": [5, 10], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/duck/octagon/v1/v1.c b/keyboards/duck/octagon/v1/v1.c
index 575847f588..dc3b7fc728 100644
--- a/keyboards/duck/octagon/v1/v1.c
+++ b/keyboards/duck/octagon/v1/v1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v1.h"
+#include "quantum.h"
 
 enum BACKLIGHT_AREAS {
   BACKLIGHT_ALPHA    = 0b0000001,
diff --git a/keyboards/duck/octagon/v1/v1.h b/keyboards/duck/octagon/v1/v1.h
deleted file mode 100644
index 9f3d1e369f..0000000000
--- a/keyboards/duck/octagon/v1/v1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2017 MechMerlin <mechmerlin@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_75_ansi( \
-    K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N,      K4P, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N,      K3P, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L,      K2N,      K2P, \
-    K1A,      K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N,      K1P, \
-    K0A, K0B, K0C,                K0G,           K0J, K0K, K0L, K0M, K0N,      K0P  \
-) { \
-  { K5A, K5B, K5C, K5D,   K5E,   K5F, K5G,   K5H,   K5I, K5J, K5K, K5L,   K5M,   K5N, K5O,   K5P }, \
-  { K4A, K4B, K4C, K4D,   K4E,   K4F, K4G,   K4H,   K4I, K4J, K4K, K4L,   K4M,   K4N, KC_NO, K4P }, \
-  { K3A, K3B, K3C, K3D,   K3E,   K3F, K3G,   K3H,   K3I, K3J, K3K, K3L,   K3M,   K3N, KC_NO, K3P }, \
-  { K2A, K2B, K2C, K2D,   K2E,   K2F, K2G,   K2H,   K2I, K2J, K2K, K2L,   KC_NO, K2N, KC_NO, K2P }, \
-  { K1A, K1C, K1D, K1E,   K1F,   K1G, K1H,   K1I,   K1J, K1K, K1L, KC_NO, K1M,   K1N, KC_NO, K1P }, \
-  { K0A, K0B, K0C, KC_NO, KC_NO, K0G, KC_NO, KC_NO, K0J, K0K, K0L, KC_NO, K0M,   K0N, KC_NO, K0P }  \
-}
diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h
index 7fca9239be..2530cedc0f 100644
--- a/keyboards/duck/octagon/v2/config.h
+++ b/keyboards/duck/octagon/v2/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
 #define TAPPING_TERM 200
diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json
index 90b7489737..7f5dbb1579 100644
--- a/keyboards/duck/octagon/v2/info.json
+++ b/keyboards/duck/octagon/v2/info.json
@@ -15,16 +15,201 @@
     "bootmagic": {
         "matrix": [5, 10]
     },
+    "ws2812": {
+        "pin": "D6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi"],
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":1.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 16], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 14], "x": 13.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 12], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
         },
 
         "LAYOUT_75_ansi": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1, "w":2}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2, "w":1.5}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.75}, {"x":1.75, "y":3}, {"x":2.75, "y":3}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3, "w":2.25}, {"x":15, "y":3}, {"x":0, "y":4, "w":2.25}, {"x":2.25, "y":4}, {"x":3.25, "y":4}, {"x":4.25, "y":4}, {"x":5.25, "y":4}, {"x":6.25, "y":4}, {"x":7.25, "y":4}, {"x":8.25, "y":4}, {"x":9.25, "y":4}, {"x":10.25, "y":4}, {"x":11.25, "y":4}, {"x":12.25, "y":4, "w":1.75}, {"x":14, "y":4}, {"x":15, "y":4}, {"x":0, "y":5, "w":1.25}, {"x":1.25, "y":5, "w":1.25}, {"x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"x":10, "y":5}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5}, {"x":14, "y":5}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 16], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 12], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+          ]
         }
     }
 }
diff --git a/keyboards/duck/octagon/v2/v2.c b/keyboards/duck/octagon/v2/v2.c
index 19bef7f877..612df9aa3e 100644
--- a/keyboards/duck/octagon/v2/v2.c
+++ b/keyboards/duck/octagon/v2/v2.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v2.h"
+#include "quantum.h"
 #include "indicator_leds.h"
 
 enum BACKLIGHT_AREAS {
diff --git a/keyboards/duck/octagon/v2/v2.h b/keyboards/duck/octagon/v2/v2.h
deleted file mode 100644
index d60631009c..0000000000
--- a/keyboards/duck/octagon/v2/v2.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2017 MechMerlin <mechmerlin@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O,     K5Q, \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M,      K4O, K4P, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M,      K3O, K3P, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M,      K2O, K2P, \
-    K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K,      K1M, K1N, K1O, K1P, \
-    K0A, K0B, K0C,                               K0J, K0K, K0L, K0M, K0N, K0O, K0P  \
-) { \
-  { K5A, K5B, K5C, K5D,   K5E,   K5F,   K5G,   K5H,   K5I,   K5J,   K5K, K5L,   K5M, K5N,   K5O, KC_NO, K5Q }, \
-  { K4A, K4B, K4C, K4D,   K4E,   K4F,   K4G,   K4H,   K4I,   K4J,   K4K, K4L,   K4M, KC_NO, K4O, K4P,   KC_NO    }, \
-  { K3A, K3B, K3C, K3D,   K3E,   K3F,   K3G,   K3H,   K3I,   K3J,   K3K, K3L,   K3M, KC_NO, K3O, K3P,   KC_NO    }, \
-  { K2A, K2B, K2C, K2D,   K2E,   K2F,   K2G,   K2H,   K2I,   K2J,   K2K, K2L,   K2M, KC_NO, K2O, K2P,   KC_NO    }, \
-  { K1A, K1B, K1C, K1D,   K1E,   K1F,   K1G,   K1H,   K1I,   K1J,   K1K, KC_NO, K1M, K1N,   K1O, K1P,   KC_NO    }, \
-  { K0A, K0B, K0C, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0J,   KC_NO, K0K, K0L,   K0M, K0N,   K0O, K0P,   KC_NO    }  \
-}
-
-#define LAYOUT_75_ansi( \
-    K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O,     K5Q, \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M,      K4O, K4P, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M,      K3O, K3P, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L,           K2O, K2P, \
-    K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K,      K1M, K1N, K1O, K1P, \
-    K0A, K0B, K0C,                               K0J, K0K, K0L, K0M, K0N, K0O, K0P  \
-) { \
-  { K5A, K5B, K5C, K5D,   K5E,   K5F,   K5G,   K5H,   K5I,   K5J,   K5K, K5L,   K5M, K5N,   K5O, KC_NO, K5Q }, \
-  { K4A, K4B, K4C, K4D,   K4E,   K4F,   K4G,   K4H,   K4I,   K4J,   K4K, K4L,   K4M, KC_NO, K4O, K4P,   KC_NO    }, \
-  { K3A, K3B, K3C, K3D,   K3E,   K3F,   K3G,   K3H,   K3I,   K3J,   K3K, K3L,   K3M, KC_NO, K3O, K3P,   KC_NO    }, \
-  { K2A, K2B, K2C, K2D,   K2E,   K2F,   K2G,   K2H,   K2I,   K2J,   K2K, K2L,   KC_NO, KC_NO, K2O, K2P,   KC_NO    }, \
-  { K1A, KC_NO, K1C, K1D,   K1E,   K1F,   K1G,   K1H,   K1I,   K1J,   K1K, KC_NO, K1M, K1N,   K1O, K1P,   KC_NO    }, \
-  { K0A, K0B, K0C, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0J,   KC_NO, K0K, K0L,   K0M, K0N,   K0O, K0P,   KC_NO    }  \
-}
diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h
index eda7aec4ec..e8d87e0719 100644
--- a/keyboards/duck/orion/v3/config.h
+++ b/keyboards/duck/orion/v3/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 18
 
 #define TAPPING_TERM 200
diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json
index 137c731242..588d14003b 100644
--- a/keyboards/duck/orion/v3/info.json
+++ b/keyboards/duck/orion/v3/info.json
@@ -16,12 +16,116 @@
     "bootmagic": {
         "matrix": [4, 10]
     },
+    "ws2812": {
+        "pin": "D6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 17], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/duck/orion/v3/v3.c b/keyboards/duck/orion/v3/v3.c
index 2e8f85a110..87e3cc0f37 100644
--- a/keyboards/duck/orion/v3/v3.c
+++ b/keyboards/duck/orion/v3/v3.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v3.h"
+#include "quantum.h"
 #include "indicator_leds.h"
 
 // Alphas              PB1
diff --git a/keyboards/duck/orion/v3/v3.h b/keyboards/duck/orion/v3/v3.h
deleted file mode 100644
index 70591cf034..0000000000
--- a/keyboards/duck/orion/v3/v3.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2019 MechMerlin <mechmerlin@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_tkl_ansi( \
-    K5A,      K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q,  \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M,      K4R, K4O, K4P, K4Q, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M,      K3N, K3O, K3P, K3Q, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L,           K2N, \
-    K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J,      K1K, K1N, K1P, \
-    K0A, K0B, K0C,                     K0F, K0I,      K0K,      K0M, K0N, K0O, K0P, K0Q \
-) { \
-  { K5A, ___, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, ___ }, \
-  { K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, ___, K4O, K4P, K4Q, K4R }, \
-  { K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, ___ }, \
-  { K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, ___, K2N, ___, ___, ___, ___ }, \
-  { K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, ___, ___, K1N, ___, K1P, ___, ___ }, \
-  { K0A, K0B, K0C, ___, ___, K0F, ___, ___, K0I, ___, K0K, ___, K0M, K0N, K0O, K0P, K0Q, ___ }  \
-}
diff --git a/keyboards/duck/tcv3/config.h b/keyboards/duck/tcv3/config.h
index 4cb83d43fa..13f2d76139 100644
--- a/keyboards/duck/tcv3/config.h
+++ b/keyboards/duck/tcv3/config.h
@@ -34,5 +34,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 17
diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json
index 9b8b20e80e..f1e29d8d99 100644
--- a/keyboards/duck/tcv3/info.json
+++ b/keyboards/duck/tcv3/info.json
@@ -11,6 +11,9 @@
     "bootmagic": {
         "matrix": [5, 10]
     },
+    "ws2812": {
+        "pin": "D6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/duck/tcv3/tcv3.h b/keyboards/duck/tcv3/tcv3.h
index 8e40e94aec..33792d4e6a 100644
--- a/keyboards/duck/tcv3/tcv3.h
+++ b/keyboards/duck/tcv3/tcv3.h
@@ -24,7 +24,7 @@
     K10, K11,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,   K1H, K1I, \
     K20, K21,   K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,      K2G,   K2H, K2I, \
     K30, K31,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      K3G,   K3H, K3I, \
-    K40, K41,   K42, k43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, K4G,  K4H,       \
+    K40, K41,   K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, K4G,  K4H,       \
     K50, K51,   K52, K53, K54,                          K5A,      K5C,      K5E, K5F,  K5G, K5H, K5I   \
 ) { \
   { K00, K01,   K02, XXX, K04, K05, K06, K07, XXX, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, XXX, K0I, K0J }, \
diff --git a/keyboards/ducky/one2mini/1861st/config.h b/keyboards/ducky/one2mini/1861st/config.h
index a50ce96ac3..123779a7ab 100644
--- a/keyboards/ducky/one2mini/1861st/config.h
+++ b/keyboards/ducky/one2mini/1861st/config.h
@@ -17,24 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D11, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { B10, B9, C13, C12, C11, C10, C9, C8, A15, A14, A13, D0, D1, D2, B8 }
 #define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} }
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define FORCE_NKRO
 
 #define GPIO_INPUT_PIN_DELAY (NUC123_HCLK / 6 / 1000000L)
diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json
index 364d803718..151eee80c1 100644
--- a/keyboards/ducky/one2mini/1861st/info.json
+++ b/keyboards/ducky/one2mini/1861st/info.json
@@ -6,69 +6,74 @@
         "pid": "0x0123",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B8"],
+        "rows": ["D11", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "layout_aliases": {
         "LAYOUT_iso": "LAYOUT_60_iso"
     },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1, "label": "ESC" },
-                { "x": 1, "y": 0, "w": 1, "label": "1" },
-                { "x": 2, "y": 0, "w": 1, "label": "2" },
-                { "x": 3, "y": 0, "w": 1, "label": "3" },
-                { "x": 4, "y": 0, "w": 1, "label": "4" },
-                { "x": 5, "y": 0, "w": 1, "label": "5" },
-                { "x": 6, "y": 0, "w": 1, "label": "6" },
-                { "x": 7, "y": 0, "w": 1, "label": "7" },
-                { "x": 8, "y": 0, "w": 1, "label": "8" },
-                { "x": 9, "y": 0, "w": 1, "label": "9" },
-                { "x": 10, "y": 0, "w": 1, "label": "0" },
-                { "x": 11, "y": 0, "w": 1, "label": "DASH" },
-                { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" },
+                { "x": 0, "y": 0, "label": "ESC" },
+                { "x": 1, "y": 0, "label": "1" },
+                { "x": 2, "y": 0, "label": "2" },
+                { "x": 3, "y": 0, "label": "3" },
+                { "x": 4, "y": 0, "label": "4" },
+                { "x": 5, "y": 0, "label": "5" },
+                { "x": 6, "y": 0, "label": "6" },
+                { "x": 7, "y": 0, "label": "7" },
+                { "x": 8, "y": 0, "label": "8" },
+                { "x": 9, "y": 0, "label": "9" },
+                { "x": 10, "y": 0, "label": "0" },
+                { "x": 11, "y": 0, "label": "DASH" },
+                { "x": 12, "y": 0, "label": "EQUALSIGN" },
                 { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
 
                 { "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
-                { "x": 1.5, "y": 1, "w": 1, "label": "Q" },
-                { "x": 2.5, "y": 1, "w": 1, "label": "W" },
-                { "x": 3.5, "y": 1, "w": 1, "label": "E" },
-                { "x": 4.5, "y": 1, "w": 1, "label": "R" },
-                { "x": 5.5, "y": 1, "w": 1, "label": "T" },
-                { "x": 6.5, "y": 1, "w": 1, "label": "Y" },
-                { "x": 7.5, "y": 1, "w": 1, "label": "U" },
-                { "x": 8.5, "y": 1, "w": 1, "label": "I" },
-                { "x": 9.5, "y": 1, "w": 1, "label": "O" },
-                { "x": 10.5, "y": 1, "w": 1, "label": "P" },
-                { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" },
-                { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" },
+                { "x": 1.5, "y": 1, "label": "Q" },
+                { "x": 2.5, "y": 1, "label": "W" },
+                { "x": 3.5, "y": 1, "label": "E" },
+                { "x": 4.5, "y": 1, "label": "R" },
+                { "x": 5.5, "y": 1, "label": "T" },
+                { "x": 6.5, "y": 1, "label": "Y" },
+                { "x": 7.5, "y": 1, "label": "U" },
+                { "x": 8.5, "y": 1, "label": "I" },
+                { "x": 9.5, "y": 1, "label": "O" },
+                { "x": 10.5, "y": 1, "label": "P" },
+                { "x": 11.5, "y": 1, "label": "LBRACKET" },
+                { "x": 12.5, "y": 1, "label": "RBRACKET" },
                 { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" },
 
                 { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
-                { "x": 1.75, "y": 2, "w": 1, "label": "A" },
-                { "x": 2.75, "y": 2, "w": 1, "label": "S" },
-                { "x": 3.75, "y": 2, "w": 1, "label": "D" },
-                { "x": 4.75, "y": 2, "w": 1, "label": "F" },
-                { "x": 5.75, "y": 2, "w": 1, "label": "G" },
-                { "x": 6.75, "y": 2, "w": 1, "label": "H" },
-                { "x": 7.75, "y": 2, "w": 1, "label": "J" },
-                { "x": 8.75, "y": 2, "w": 1, "label": "K" },
-                { "x": 9.75, "y": 2, "w": 1, "label": "L" },
-                { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" },
-                { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" },
-                { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" },
+                { "x": 1.75, "y": 2, "label": "A" },
+                { "x": 2.75, "y": 2, "label": "S" },
+                { "x": 3.75, "y": 2, "label": "D" },
+                { "x": 4.75, "y": 2, "label": "F" },
+                { "x": 5.75, "y": 2, "label": "G" },
+                { "x": 6.75, "y": 2, "label": "H" },
+                { "x": 7.75, "y": 2, "label": "J" },
+                { "x": 8.75, "y": 2, "label": "K" },
+                { "x": 9.75, "y": 2, "label": "L" },
+                { "x": 10.75, "y": 2, "label": "SEMICOLON" },
+                { "x": 11.75, "y": 2, "label": "QUOTE" },
+                { "x": 12.75, "y": 2, "label": "ISOHASH" },
                 { "x": 13.75, "y": 2, "w": 1.25, "label": "ENTER" },
 
                 { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" },
-                { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" },
-                { "x": 2.25, "y": 3, "w": 1, "label": "Z" },
-                { "x": 3.25, "y": 3, "w": 1, "label": "X" },
-                { "x": 4.25, "y": 3, "w": 1, "label": "C" },
-                { "x": 5.25, "y": 3, "w": 1, "label": "V" },
-                { "x": 6.25, "y": 3, "w": 1, "label": "B" },
-                { "x": 7.25, "y": 3, "w": 1, "label": "N" },
-                { "x": 8.25, "y": 3, "w": 1, "label": "M" },
-                { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" },
-                { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" },
-                { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" },
+                { "x": 1.25, "y": 3, "label": "ISOBACKSLASH" },
+                { "x": 2.25, "y": 3, "label": "Z" },
+                { "x": 3.25, "y": 3, "label": "X" },
+                { "x": 4.25, "y": 3, "label": "C" },
+                { "x": 5.25, "y": 3, "label": "V" },
+                { "x": 6.25, "y": 3, "label": "B" },
+                { "x": 7.25, "y": 3, "label": "N" },
+                { "x": 8.25, "y": 3, "label": "M" },
+                { "x": 9.25, "y": 3, "label": "COMMA" },
+                { "x": 10.25, "y": 3, "label": "PERIOD" },
+                { "x": 11.25, "y": 3, "label": "SLASH" },
                 { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
 
                 { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
@@ -84,61 +89,61 @@
 
         "LAYOUT_60_ansi": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1, "label": "ESC" },
-                { "x": 1, "y": 0, "w": 1, "label": "1" },
-                { "x": 2, "y": 0, "w": 1, "label": "2" },
-                { "x": 3, "y": 0, "w": 1, "label": "3" },
-                { "x": 4, "y": 0, "w": 1, "label": "4" },
-                { "x": 5, "y": 0, "w": 1, "label": "5" },
-                { "x": 6, "y": 0, "w": 1, "label": "6" },
-                { "x": 7, "y": 0, "w": 1, "label": "7" },
-                { "x": 8, "y": 0, "w": 1, "label": "8" },
-                { "x": 9, "y": 0, "w": 1, "label": "9" },
-                { "x": 10, "y": 0, "w": 1, "label": "0" },
-                { "x": 11, "y": 0, "w": 1, "label": "DASH" },
-                { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" },
+                { "x": 0, "y": 0, "label": "ESC" },
+                { "x": 1, "y": 0, "label": "1" },
+                { "x": 2, "y": 0, "label": "2" },
+                { "x": 3, "y": 0, "label": "3" },
+                { "x": 4, "y": 0, "label": "4" },
+                { "x": 5, "y": 0, "label": "5" },
+                { "x": 6, "y": 0, "label": "6" },
+                { "x": 7, "y": 0, "label": "7" },
+                { "x": 8, "y": 0, "label": "8" },
+                { "x": 9, "y": 0, "label": "9" },
+                { "x": 10, "y": 0, "label": "0" },
+                { "x": 11, "y": 0, "label": "DASH" },
+                { "x": 12, "y": 0, "label": "EQUALSIGN" },
                 { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
 
                 { "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
-                { "x": 1.5, "y": 1, "w": 1, "label": "Q" },
-                { "x": 2.5, "y": 1, "w": 1, "label": "W" },
-                { "x": 3.5, "y": 1, "w": 1, "label": "E" },
-                { "x": 4.5, "y": 1, "w": 1, "label": "R" },
-                { "x": 5.5, "y": 1, "w": 1, "label": "T" },
-                { "x": 6.5, "y": 1, "w": 1, "label": "Y" },
-                { "x": 7.5, "y": 1, "w": 1, "label": "U" },
-                { "x": 8.5, "y": 1, "w": 1, "label": "I" },
-                { "x": 9.5, "y": 1, "w": 1, "label": "O" },
-                { "x": 10.5, "y": 1, "w": 1, "label": "P" },
-                { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" },
-                { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" },
+                { "x": 1.5, "y": 1, "label": "Q" },
+                { "x": 2.5, "y": 1, "label": "W" },
+                { "x": 3.5, "y": 1, "label": "E" },
+                { "x": 4.5, "y": 1, "label": "R" },
+                { "x": 5.5, "y": 1, "label": "T" },
+                { "x": 6.5, "y": 1, "label": "Y" },
+                { "x": 7.5, "y": 1, "label": "U" },
+                { "x": 8.5, "y": 1, "label": "I" },
+                { "x": 9.5, "y": 1, "label": "O" },
+                { "x": 10.5, "y": 1, "label": "P" },
+                { "x": 11.5, "y": 1, "label": "LBRACKET" },
+                { "x": 12.5, "y": 1, "label": "RBRACKET" },
                 { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" },
 
                 { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
-                { "x": 1.75, "y": 2, "w": 1, "label": "A" },
-                { "x": 2.75, "y": 2, "w": 1, "label": "S" },
-                { "x": 3.75, "y": 2, "w": 1, "label": "D" },
-                { "x": 4.75, "y": 2, "w": 1, "label": "F" },
-                { "x": 5.75, "y": 2, "w": 1, "label": "G" },
-                { "x": 6.75, "y": 2, "w": 1, "label": "H" },
-                { "x": 7.75, "y": 2, "w": 1, "label": "J" },
-                { "x": 8.75, "y": 2, "w": 1, "label": "K" },
-                { "x": 9.75, "y": 2, "w": 1, "label": "L" },
-                { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" },
-                { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" },
+                { "x": 1.75, "y": 2, "label": "A" },
+                { "x": 2.75, "y": 2, "label": "S" },
+                { "x": 3.75, "y": 2, "label": "D" },
+                { "x": 4.75, "y": 2, "label": "F" },
+                { "x": 5.75, "y": 2, "label": "G" },
+                { "x": 6.75, "y": 2, "label": "H" },
+                { "x": 7.75, "y": 2, "label": "J" },
+                { "x": 8.75, "y": 2, "label": "K" },
+                { "x": 9.75, "y": 2, "label": "L" },
+                { "x": 10.75, "y": 2, "label": "SEMICOLON" },
+                { "x": 11.75, "y": 2, "label": "QUOTE" },
                 { "x": 12.75, "y": 2, "w": 2.25, "label": "ENTER" },
 
                 { "x": 0, "y": 3, "w": 2.25, "label": "LSHIFT" },
-                { "x": 2.25, "y": 3, "w": 1, "label": "Z" },
-                { "x": 3.25, "y": 3, "w": 1, "label": "X" },
-                { "x": 4.25, "y": 3, "w": 1, "label": "C" },
-                { "x": 5.25, "y": 3, "w": 1, "label": "V" },
-                { "x": 6.25, "y": 3, "w": 1, "label": "B" },
-                { "x": 7.25, "y": 3, "w": 1, "label": "N" },
-                { "x": 8.25, "y": 3, "w": 1, "label": "M" },
-                { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" },
-                { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" },
-                { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" },
+                { "x": 2.25, "y": 3, "label": "Z" },
+                { "x": 3.25, "y": 3, "label": "X" },
+                { "x": 4.25, "y": 3, "label": "C" },
+                { "x": 5.25, "y": 3, "label": "V" },
+                { "x": 6.25, "y": 3, "label": "B" },
+                { "x": 7.25, "y": 3, "label": "N" },
+                { "x": 8.25, "y": 3, "label": "M" },
+                { "x": 9.25, "y": 3, "label": "COMMA" },
+                { "x": 10.25, "y": 3, "label": "PERIOD" },
+                { "x": 11.25, "y": 3, "label": "SLASH" },
                 { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
 
                 { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
@@ -154,62 +159,62 @@
 
         "LAYOUT_60_iso": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1, "label": "ESC" },
-                { "x": 1, "y": 0, "w": 1, "label": "1" },
-                { "x": 2, "y": 0, "w": 1, "label": "2" },
-                { "x": 3, "y": 0, "w": 1, "label": "3" },
-                { "x": 4, "y": 0, "w": 1, "label": "4" },
-                { "x": 5, "y": 0, "w": 1, "label": "5" },
-                { "x": 6, "y": 0, "w": 1, "label": "6" },
-                { "x": 7, "y": 0, "w": 1, "label": "7" },
-                { "x": 8, "y": 0, "w": 1, "label": "8" },
-                { "x": 9, "y": 0, "w": 1, "label": "9" },
-                { "x": 10, "y": 0, "w": 1, "label": "0" },
-                { "x": 11, "y": 0, "w": 1, "label": "DASH" },
-                { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" },
+                { "x": 0, "y": 0, "label": "ESC" },
+                { "x": 1, "y": 0, "label": "1" },
+                { "x": 2, "y": 0, "label": "2" },
+                { "x": 3, "y": 0, "label": "3" },
+                { "x": 4, "y": 0, "label": "4" },
+                { "x": 5, "y": 0, "label": "5" },
+                { "x": 6, "y": 0, "label": "6" },
+                { "x": 7, "y": 0, "label": "7" },
+                { "x": 8, "y": 0, "label": "8" },
+                { "x": 9, "y": 0, "label": "9" },
+                { "x": 10, "y": 0, "label": "0" },
+                { "x": 11, "y": 0, "label": "DASH" },
+                { "x": 12, "y": 0, "label": "EQUALSIGN" },
                 { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
 
                 { "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
-                { "x": 1.5, "y": 1, "w": 1, "label": "Q" },
-                { "x": 2.5, "y": 1, "w": 1, "label": "W" },
-                { "x": 3.5, "y": 1, "w": 1, "label": "E" },
-                { "x": 4.5, "y": 1, "w": 1, "label": "R" },
-                { "x": 5.5, "y": 1, "w": 1, "label": "T" },
-                { "x": 6.5, "y": 1, "w": 1, "label": "Y" },
-                { "x": 7.5, "y": 1, "w": 1, "label": "U" },
-                { "x": 8.5, "y": 1, "w": 1, "label": "I" },
-                { "x": 9.5, "y": 1, "w": 1, "label": "O" },
-                { "x": 10.5, "y": 1, "w": 1, "label": "P" },
-                { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" },
-                { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" },
+                { "x": 1.5, "y": 1, "label": "Q" },
+                { "x": 2.5, "y": 1, "label": "W" },
+                { "x": 3.5, "y": 1, "label": "E" },
+                { "x": 4.5, "y": 1, "label": "R" },
+                { "x": 5.5, "y": 1, "label": "T" },
+                { "x": 6.5, "y": 1, "label": "Y" },
+                { "x": 7.5, "y": 1, "label": "U" },
+                { "x": 8.5, "y": 1, "label": "I" },
+                { "x": 9.5, "y": 1, "label": "O" },
+                { "x": 10.5, "y": 1, "label": "P" },
+                { "x": 11.5, "y": 1, "label": "LBRACKET" },
+                { "x": 12.5, "y": 1, "label": "RBRACKET" },
 
                 { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
-                { "x": 1.75, "y": 2, "w": 1, "label": "A" },
-                { "x": 2.75, "y": 2, "w": 1, "label": "S" },
-                { "x": 3.75, "y": 2, "w": 1, "label": "D" },
-                { "x": 4.75, "y": 2, "w": 1, "label": "F" },
-                { "x": 5.75, "y": 2, "w": 1, "label": "G" },
-                { "x": 6.75, "y": 2, "w": 1, "label": "H" },
-                { "x": 7.75, "y": 2, "w": 1, "label": "J" },
-                { "x": 8.75, "y": 2, "w": 1, "label": "K" },
-                { "x": 9.75, "y": 2, "w": 1, "label": "L" },
-                { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" },
-                { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" },
-                { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" },
+                { "x": 1.75, "y": 2, "label": "A" },
+                { "x": 2.75, "y": 2, "label": "S" },
+                { "x": 3.75, "y": 2, "label": "D" },
+                { "x": 4.75, "y": 2, "label": "F" },
+                { "x": 5.75, "y": 2, "label": "G" },
+                { "x": 6.75, "y": 2, "label": "H" },
+                { "x": 7.75, "y": 2, "label": "J" },
+                { "x": 8.75, "y": 2, "label": "K" },
+                { "x": 9.75, "y": 2, "label": "L" },
+                { "x": 10.75, "y": 2, "label": "SEMICOLON" },
+                { "x": 11.75, "y": 2, "label": "QUOTE" },
+                { "x": 12.75, "y": 2, "label": "ISOHASH" },
                 { "x": 13.75, "y": 1, "w": 1.25, "h": 2, "label": "ENTER" },
 
                 { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" },
-                { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" },
-                { "x": 2.25, "y": 3, "w": 1, "label": "Z" },
-                { "x": 3.25, "y": 3, "w": 1, "label": "X" },
-                { "x": 4.25, "y": 3, "w": 1, "label": "C" },
-                { "x": 5.25, "y": 3, "w": 1, "label": "V" },
-                { "x": 6.25, "y": 3, "w": 1, "label": "B" },
-                { "x": 7.25, "y": 3, "w": 1, "label": "N" },
-                { "x": 8.25, "y": 3, "w": 1, "label": "M" },
-                { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" },
-                { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" },
-                { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" },
+                { "x": 1.25, "y": 3, "label": "ISOBACKSLASH" },
+                { "x": 2.25, "y": 3, "label": "Z" },
+                { "x": 3.25, "y": 3, "label": "X" },
+                { "x": 4.25, "y": 3, "label": "C" },
+                { "x": 5.25, "y": 3, "label": "V" },
+                { "x": 6.25, "y": 3, "label": "B" },
+                { "x": 7.25, "y": 3, "label": "N" },
+                { "x": 8.25, "y": 3, "label": "M" },
+                { "x": 9.25, "y": 3, "label": "COMMA" },
+                { "x": 10.25, "y": 3, "label": "PERIOD" },
+                { "x": 11.25, "y": 3, "label": "SLASH" },
                 { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
 
                 { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
diff --git a/keyboards/ducky/one2sf/1967st/config.h b/keyboards/ducky/one2sf/1967st/config.h
index 8b29e8c3d4..123779a7ab 100644
--- a/keyboards/ducky/one2sf/1967st/config.h
+++ b/keyboards/ducky/one2sf/1967st/config.h
@@ -17,24 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D11, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { B10, B9, C13, C12, C11, C10, C9, C8, A15, A14, A13, D0, D1, D2,B15,B8 }
 #define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} }
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define FORCE_NKRO
 
 #define GPIO_INPUT_PIN_DELAY (NUC123_HCLK / 6 / 1000000L)
diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json
index 5361dbd4a0..81ce8eb2d5 100644
--- a/keyboards/ducky/one2sf/1967st/info.json
+++ b/keyboards/ducky/one2sf/1967st/info.json
@@ -7,82 +7,87 @@
         "pid": "0x07AF",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B15", "B8"],
+        "rows": ["D11", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1, "label": "ESC" },
-                { "x": 1, "y": 0, "w": 1, "label": "1" },
-                { "x": 2, "y": 0, "w": 1, "label": "2" },
-                { "x": 3, "y": 0, "w": 1, "label": "3" },
-                { "x": 4, "y": 0, "w": 1, "label": "4" },
-                { "x": 5, "y": 0, "w": 1, "label": "5" },
-                { "x": 6, "y": 0, "w": 1, "label": "6" },
-                { "x": 7, "y": 0, "w": 1, "label": "7" },
-                { "x": 8, "y": 0, "w": 1, "label": "8" },
-                { "x": 9, "y": 0, "w": 1, "label": "9" },
-                { "x": 10, "y": 0, "w": 1, "label": "0" },
-                { "x": 11, "y": 0, "w": 1, "label": "DASH" },
-                { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" },
+                { "x": 0, "y": 0, "label": "ESC" },
+                { "x": 1, "y": 0, "label": "1" },
+                { "x": 2, "y": 0, "label": "2" },
+                { "x": 3, "y": 0, "label": "3" },
+                { "x": 4, "y": 0, "label": "4" },
+                { "x": 5, "y": 0, "label": "5" },
+                { "x": 6, "y": 0, "label": "6" },
+                { "x": 7, "y": 0, "label": "7" },
+                { "x": 8, "y": 0, "label": "8" },
+                { "x": 9, "y": 0, "label": "9" },
+                { "x": 10, "y": 0, "label": "0" },
+                { "x": 11, "y": 0, "label": "DASH" },
+                { "x": 12, "y": 0, "label": "EQUALSIGN" },
                 { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
-                { "x": 15.25, "y": 0, "w": 1, "label": "DEL" },
+                { "x": 15.25, "y": 0, "label": "DEL" },
 
                 { "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
-                { "x": 1.5, "y": 1, "w": 1, "label": "Q" },
-                { "x": 2.5, "y": 1, "w": 1, "label": "W" },
-                { "x": 3.5, "y": 1, "w": 1, "label": "E" },
-                { "x": 4.5, "y": 1, "w": 1, "label": "R" },
-                { "x": 5.5, "y": 1, "w": 1, "label": "T" },
-                { "x": 6.5, "y": 1, "w": 1, "label": "Y" },
-                { "x": 7.5, "y": 1, "w": 1, "label": "U" },
-                { "x": 8.5, "y": 1, "w": 1, "label": "I" },
-                { "x": 9.5, "y": 1, "w": 1, "label": "O" },
-                { "x": 10.5, "y": 1, "w": 1, "label": "P" },
-                { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" },
-                { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" },
+                { "x": 1.5, "y": 1, "label": "Q" },
+                { "x": 2.5, "y": 1, "label": "W" },
+                { "x": 3.5, "y": 1, "label": "E" },
+                { "x": 4.5, "y": 1, "label": "R" },
+                { "x": 5.5, "y": 1, "label": "T" },
+                { "x": 6.5, "y": 1, "label": "Y" },
+                { "x": 7.5, "y": 1, "label": "U" },
+                { "x": 8.5, "y": 1, "label": "I" },
+                { "x": 9.5, "y": 1, "label": "O" },
+                { "x": 10.5, "y": 1, "label": "P" },
+                { "x": 11.5, "y": 1, "label": "LBRACKET" },
+                { "x": 12.5, "y": 1, "label": "RBRACKET" },
                 { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" },
-                { "x": 15.25, "y": 1, "w": 1, "label": "PAGEUP" },
+                { "x": 15.25, "y": 1, "label": "PAGEUP" },
 
                 { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
-                { "x": 1.75, "y": 2, "w": 1, "label": "A" },
-                { "x": 2.75, "y": 2, "w": 1, "label": "S" },
-                { "x": 3.75, "y": 2, "w": 1, "label": "D" },
-                { "x": 4.75, "y": 2, "w": 1, "label": "F" },
-                { "x": 5.75, "y": 2, "w": 1, "label": "G" },
-                { "x": 6.75, "y": 2, "w": 1, "label": "H" },
-                { "x": 7.75, "y": 2, "w": 1, "label": "J" },
-                { "x": 8.75, "y": 2, "w": 1, "label": "K" },
-                { "x": 9.75, "y": 2, "w": 1, "label": "L" },
-                { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" },
-                { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" },
-                { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" },
+                { "x": 1.75, "y": 2, "label": "A" },
+                { "x": 2.75, "y": 2, "label": "S" },
+                { "x": 3.75, "y": 2, "label": "D" },
+                { "x": 4.75, "y": 2, "label": "F" },
+                { "x": 5.75, "y": 2, "label": "G" },
+                { "x": 6.75, "y": 2, "label": "H" },
+                { "x": 7.75, "y": 2, "label": "J" },
+                { "x": 8.75, "y": 2, "label": "K" },
+                { "x": 9.75, "y": 2, "label": "L" },
+                { "x": 10.75, "y": 2, "label": "SEMICOLON" },
+                { "x": 11.75, "y": 2, "label": "QUOTE" },
+                { "x": 12.75, "y": 2, "label": "ISOHASH" },
                 { "x": 13.75, "y": 2, "w": 1.25, "label": "ENTER" },
-                { "x": 15.25, "y": 2, "w": 1, "label": "PAGEDOWN" },
+                { "x": 15.25, "y": 2, "label": "PAGEDOWN" },
 
                 { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" },
-                { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" },
-                { "x": 2.25, "y": 3, "w": 1, "label": "Z" },
-                { "x": 3.25, "y": 3, "w": 1, "label": "X" },
-                { "x": 4.25, "y": 3, "w": 1, "label": "C" },
-                { "x": 5.25, "y": 3, "w": 1, "label": "V" },
-                { "x": 6.25, "y": 3, "w": 1, "label": "B" },
-                { "x": 7.25, "y": 3, "w": 1, "label": "N" },
-                { "x": 8.25, "y": 3, "w": 1, "label": "M" },
-                { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" },
-                { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" },
-                { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" },
+                { "x": 1.25, "y": 3, "label": "ISOBACKSLASH" },
+                { "x": 2.25, "y": 3, "label": "Z" },
+                { "x": 3.25, "y": 3, "label": "X" },
+                { "x": 4.25, "y": 3, "label": "C" },
+                { "x": 5.25, "y": 3, "label": "V" },
+                { "x": 6.25, "y": 3, "label": "B" },
+                { "x": 7.25, "y": 3, "label": "N" },
+                { "x": 8.25, "y": 3, "label": "M" },
+                { "x": 9.25, "y": 3, "label": "COMMA" },
+                { "x": 10.25, "y": 3, "label": "PERIOD" },
+                { "x": 11.25, "y": 3, "label": "SLASH" },
                 { "x": 12.25, "y": 3, "w": 2, "label": "RSHIFT" },
-                { "x": 14.25, "y": 3, "w": 1, "label": "UP" },
+                { "x": 14.25, "y": 3, "label": "UP" },
 
                 { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
                 { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" },
                 { "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" },
                 { "x": 3.75, "y": 4, "w": 6.25, "label": "SPACE" },
-                { "x": 10, "y": 4, "w": 1, "label": "RALT" },
-                { "x": 11, "y": 4, "w": 1, "label": "FN" },
+                { "x": 10, "y": 4, "label": "RALT" },
+                { "x": 11, "y": 4, "label": "FN" },
                 { "x": 12, "y": 4, "w": 1.25, "label": "RCTRL" },
-                { "x": 13.25, "y": 4, "w": 1, "label": "LEFT" },
-                { "x": 14.25, "y": 4, "w": 1, "label": "DOWN" },
-                { "x": 15.25, "y": 4, "w": 1, "label": "RIGHT" }
+                { "x": 13.25, "y": 4, "label": "LEFT" },
+                { "x": 14.25, "y": 4, "label": "DOWN" },
+                { "x": 15.25, "y": 4, "label": "RIGHT" }
             ]
         }
     }
diff --git a/keyboards/dumbo/config.h b/keyboards/dumbo/config.h
index da4fb5b410..5a4dcfdd8f 100644
--- a/keyboards/dumbo/config.h
+++ b/keyboards/dumbo/config.h
@@ -14,14 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring
-#define MATRIX_ROW_PINS { D4, D7, E6, B4 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dumbo/dumbo.c b/keyboards/dumbo/dumbo.c
deleted file mode 100644
index a8c34c1c9e..0000000000
--- a/keyboards/dumbo/dumbo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Adam Naldal <adamnaldal@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dumbo.h"
diff --git a/keyboards/dumbo/dumbo.h b/keyboards/dumbo/dumbo.h
deleted file mode 100644
index bd1d02f8ec..0000000000
--- a/keyboards/dumbo/dumbo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 Adam Naldal <adamnaldal@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_split_3x6_4( \
-  L00, L01, L02, L03, L04, L05,              R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,              R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,              R20, R21, R22, R23, R24, R25, \
-                 L30, L31, L32, L33,    R30, R31, R32, R33 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { KC_NO, KC_NO, L30, L31, L32, L33 }, \
-    { R05, R04, R03, R02, R01, R00 }, \
-    { R15, R14, R13, R12, R11, R10 }, \
-    { R25, R24, R23, R22, R21, R20 }, \
-    { KC_NO, KC_NO, R33, R32, R31, R30 } \
-  }
diff --git a/keyboards/dumbo/info.json b/keyboards/dumbo/info.json
index 3fe1a8b4f8..faf59b7ecc 100644
--- a/keyboards/dumbo/info.json
+++ b/keyboards/dumbo/info.json
@@ -8,6 +8,11 @@
         "pid": "0x25E3",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6"],
+        "rows": ["D4", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F4", "pin_b": "F5"},
@@ -30,57 +35,57 @@
     "layouts": {
         "LAYOUT_split_3x6_4": {
             "layout": [
-                {"x":0, "y":1.25},
-                {"x":1, "y":1},
-                {"x":2, "y":0.25},
-                {"x":3, "y":0},
-                {"x":4, "y":0.5},
-                {"x":5, "y":0.75},
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+                {"matrix": [0, 5], "x": 5, "y": 0.75},
 
-                {"x":9.5, "y":0.75},
-                {"x":10.5, "y":0.5},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0.25},
-                {"x":13.5, "y":1},
-                {"x":14.5, "y":1.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 0.75},
+                {"matrix": [4, 4], "x": 10.5, "y": 0.5},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 2], "x": 12.5, "y": 0.25},
+                {"matrix": [4, 1], "x": 13.5, "y": 1},
+                {"matrix": [4, 0], "x": 14.5, "y": 1.25},
 
-                {"x":0, "y":2.25},
-                {"x":1, "y":2},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.75},
 
-                {"x":9.5, "y":1.75},
-                {"x":10.5, "y":1.5},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1.25},
-                {"x":13.5, "y":2},
-                {"x":14.5, "y":2.25},
+                {"matrix": [5, 5], "x": 9.5, "y": 1.75},
+                {"matrix": [5, 4], "x": 10.5, "y": 1.5},
+                {"matrix": [5, 3], "x": 11.5, "y": 1},
+                {"matrix": [5, 2], "x": 12.5, "y": 1.25},
+                {"matrix": [5, 1], "x": 13.5, "y": 2},
+                {"matrix": [5, 0], "x": 14.5, "y": 2.25},
 
-                {"x":0, "y":3.25},
-                {"x":1, "y":3},
-                {"x":2, "y":2.25},
-                {"x":3, "y":2},
-                {"x":4, "y":2.5},
-                {"x":5, "y":2.75},
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+                {"matrix": [2, 5], "x": 5, "y": 2.75},
 
-                {"x":9.5, "y":2.75},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":3},
-                {"x":14.5, "y":3.25},
+                {"matrix": [6, 5], "x": 9.5, "y": 2.75},
+                {"matrix": [6, 4], "x": 10.5, "y": 2.5},
+                {"matrix": [6, 3], "x": 11.5, "y": 2},
+                {"matrix": [6, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [6, 1], "x": 13.5, "y": 3},
+                {"matrix": [6, 0], "x": 14.5, "y": 3.25},
 
-                {"x":3.25, "y":3.75},
-                {"x":4.25, "y":3.75, "h":1.5},
-                {"x":5.25, "y":3.75, "h":1.5},
-                {"x":6.25, "y":4.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.75},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.75, "h": 1.5},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.75, "h": 1.5},
+                {"matrix": [3, 5], "x": 6.25, "y": 4.25},
 
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":3.75, "h":1.5},
-                {"x":10.25, "y":3.75, "h":1.5},
-                {"x":11.25, "y":3.75}
+                {"matrix": [7, 5], "x": 8.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 9.25, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 3], "x": 10.25, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 2], "x": 11.25, "y": 3.75}
             ]
         }
     }
diff --git a/keyboards/dumbo/keymaps/trip-trap/config.h b/keyboards/dumbo/keymaps/trip-trap/config.h
index 7f713e4a3d..15b6ce7c0d 100644
--- a/keyboards/dumbo/keymaps/trip-trap/config.h
+++ b/keyboards/dumbo/keymaps/trip-trap/config.h
@@ -19,9 +19,6 @@
 // Tapping term is ever so slightly lowered from the 200ms default to make layer and mod usage more snappy.
 #define TAPPING_TERM 200
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // If you are using an Elite C rev3 on the slave side, uncomment the lines below:
 // #define SPLIT_USB_DETECT
 // #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/dumbpad/config.h b/keyboards/dumbpad/config.h
index c0fa5ec24a..879046ea07 100644
--- a/keyboards/dumbpad/config.h
+++ b/keyboards/dumbpad/config.h
@@ -16,9 +16,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Column/Row IO definitions */
-#define DIODE_DIRECTION COL2ROW
-
 /* Reduce tapdance required taps from 5 to 2 */
 #define TAPPING_TOGGLE 2
diff --git a/keyboards/dumbpad/v0x/config.h b/keyboards/dumbpad/v0x/config.h
index 2e605318d1..787ff90f35 100644
--- a/keyboards/dumbpad/v0x/config.h
+++ b/keyboards/dumbpad/v0x/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Column/Row IO definitions */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-
 /* Onboard LEDs */
 #define LED_00 B3
 #define LED_01 B1
diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json
index cf6adb3801..84594e01af 100644
--- a/keyboards/dumbpad/v0x/info.json
+++ b/keyboards/dumbpad/v0x/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.7"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D4"}
@@ -15,10 +20,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                                {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
-                                {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
-                                {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dumbpad/v0x/v0x.c b/keyboards/dumbpad/v0x/v0x.c
index a225a2641c..6c89edaa11 100644
--- a/keyboards/dumbpad/v0x/v0x.c
+++ b/keyboards/dumbpad/v0x/v0x.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v0x.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs
diff --git a/keyboards/dumbpad/v0x/v0x.h b/keyboards/dumbpad/v0x/v0x.h
deleted file mode 100644
index 578250f917..0000000000
--- a/keyboards/dumbpad/v0x/v0x.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-             k01, k02, k03, k04, \
-             k11, k12, k13, k14, \
-             k21, k22, k23, k24, \
-        k30, k31, k32, k33, k34 \
-) \
-{ \
-    { KC_NO, k01, k02, k03, k04 }, \
-    { KC_NO, k11, k12, k13, k14 }, \
-    { KC_NO, k21, k22, k23, k24 }, \
-    { k30,   k31, k32, k33, k34 }, \
-}
diff --git a/keyboards/dumbpad/v0x_dualencoder/config.h b/keyboards/dumbpad/v0x_dualencoder/config.h
index 92dd62ea17..787ff90f35 100644
--- a/keyboards/dumbpad/v0x_dualencoder/config.h
+++ b/keyboards/dumbpad/v0x_dualencoder/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Column/Row IO definitions - dualencoder version is true 4x4 */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5 }
-
 /* Onboard LEDs */
 #define LED_00 B3
 #define LED_01 B1
diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json
index 8b6294af5f..a841d9d642 100644
--- a/keyboards/dumbpad/v0x_dualencoder/info.json
+++ b/keyboards/dumbpad/v0x_dualencoder/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.6"
     },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C6", "pin_b": "D4"},
@@ -16,10 +21,25 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1},
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c
index 8f571ca306..6c89edaa11 100644
--- a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c
+++ b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v0x_dualencoder.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs
diff --git a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.h b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.h
deleted file mode 100644
index f38d398857..0000000000
--- a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-	  k00, k01, k02, k03, \
-	  k10, k11, k12, k13, \
-	  k20, k21, k22, k23, \
-	  k30, k31, k32, k33 \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-}
diff --git a/keyboards/dumbpad/v0x_right/config.h b/keyboards/dumbpad/v0x_right/config.h
index cdc8d665dc..bb8b6df9e5 100644
--- a/keyboards/dumbpad/v0x_right/config.h
+++ b/keyboards/dumbpad/v0x_right/config.h
@@ -16,10 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* Column/Row IO definitions */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-
 /* Onboard LEDs */
 #define LED_00 B1
 #define LED_01 B3
diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json
index 437d009dc8..d0530abd7d 100644
--- a/keyboards/dumbpad/v0x_right/info.json
+++ b/keyboards/dumbpad/v0x_right/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.7"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D4", "pin_b": "D0"}
@@ -15,10 +20,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1},
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dumbpad/v0x_right/v0x_right.c b/keyboards/dumbpad/v0x_right/v0x_right.c
index c5c0d670c6..6c89edaa11 100644
--- a/keyboards/dumbpad/v0x_right/v0x_right.c
+++ b/keyboards/dumbpad/v0x_right/v0x_right.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v0x_right.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs
diff --git a/keyboards/dumbpad/v0x_right/v0x_right.h b/keyboards/dumbpad/v0x_right/v0x_right.h
deleted file mode 100644
index 169f391e82..0000000000
--- a/keyboards/dumbpad/v0x_right/v0x_right.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-      k00, k01, k02, k03, \
-      k10, k11, k12, k13, \
-      k20, k21, k22, k23, \
-      k30, k31, k32, k33, k34 \
-) \
-{ \
-    { k00, k01, k02, k03, KC_NO }, \
-    { k10, k11, k12, k13, KC_NO }, \
-    { k20, k21, k22, k23, KC_NO }, \
-    { k30, k31, k32, k33, k34 }, \
-}
diff --git a/keyboards/dumbpad/v1x/config.h b/keyboards/dumbpad/v1x/config.h
index 09adca69e5..3f65e748ab 100644
--- a/keyboards/dumbpad/v1x/config.h
+++ b/keyboards/dumbpad/v1x/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Column/Row IO definitions */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-
 /* Onboard LEDs  */
 #define LED_00 B6
 #define LED_01 B1
diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json
index 8a3d273415..f790bb80ec 100644
--- a/keyboards/dumbpad/v1x/info.json
+++ b/keyboards/dumbpad/v1x/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "D4"}
@@ -15,10 +20,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                                {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
-                                {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
-                                {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dumbpad/v1x/v1x.c b/keyboards/dumbpad/v1x/v1x.c
index 1a1eb1e9c5..f1b1d66c7f 100644
--- a/keyboards/dumbpad/v1x/v1x.c
+++ b/keyboards/dumbpad/v1x/v1x.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v1x.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs
diff --git a/keyboards/dumbpad/v1x/v1x.h b/keyboards/dumbpad/v1x/v1x.h
deleted file mode 100644
index 578250f917..0000000000
--- a/keyboards/dumbpad/v1x/v1x.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-             k01, k02, k03, k04, \
-             k11, k12, k13, k14, \
-             k21, k22, k23, k24, \
-        k30, k31, k32, k33, k34 \
-) \
-{ \
-    { KC_NO, k01, k02, k03, k04 }, \
-    { KC_NO, k11, k12, k13, k14 }, \
-    { KC_NO, k21, k22, k23, k24 }, \
-    { k30,   k31, k32, k33, k34 }, \
-}
diff --git a/keyboards/dumbpad/v1x_dualencoder/config.h b/keyboards/dumbpad/v1x_dualencoder/config.h
index dce94fd8d4..8ce24667ae 100644
--- a/keyboards/dumbpad/v1x_dualencoder/config.h
+++ b/keyboards/dumbpad/v1x_dualencoder/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Column/Row IO definitions */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-
 /* Onboard LEDs */
 #define LED_00 B6
 #define LED_01 B1
diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json
index e51452897a..ad16fa4417 100644
--- a/keyboards/dumbpad/v1x_dualencoder/info.json
+++ b/keyboards/dumbpad/v1x_dualencoder/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "D4"},
@@ -16,10 +21,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                                {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
-                                {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
-                                {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c
index 33a8679985..f1b1d66c7f 100644
--- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c
+++ b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v1x_dualencoder.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs
diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h
deleted file mode 100644
index b8bb84fe5f..0000000000
--- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-	       k01, k02, k03, k04, \
-	       k11, k12, k13, k14, \
-	       k21, k22, k23, k24, \
-	  k30, k31, k32, k33, k34 \
-) \
-{ \
-    { KC_NO, k01, k02, k03, k04 }, \
-    { KC_NO, k11, k12, k13, k14 }, \
-    { KC_NO, k21, k22, k23, k24 }, \
-    {   k30, k31, k32, k33, k34 }, \
-}
diff --git a/keyboards/dumbpad/v1x_oled/config.h b/keyboards/dumbpad/v1x_oled/config.h
index 57fac8225f..1293e85979 100644
--- a/keyboards/dumbpad/v1x_oled/config.h
+++ b/keyboards/dumbpad/v1x_oled/config.h
@@ -13,13 +13,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Column/Row IO definitions */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C6, B1, B3, B2, B6 }
-
-/* Column/Row IO definitions */
-#define DIODE_DIRECTION COL2ROW
-
 /* Reduce tapdance required taps from 5 to 2 */
 #define TAPPING_TOGGLE 2
diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/info.json
index 7576fe2aa5..b4dd15c76b 100644
--- a/keyboards/dumbpad/v1x_oled/info.json
+++ b/keyboards/dumbpad/v1x_oled/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "B1", "B3", "B2", "B6"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"},
@@ -13,10 +18,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                                {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
-                                {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
-                                {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dumbpad/v1x_oled/v1x_oled.c b/keyboards/dumbpad/v1x_oled/v1x_oled.c
index acc9b8bbb1..ef91d4d416 100644
--- a/keyboards/dumbpad/v1x_oled/v1x_oled.c
+++ b/keyboards/dumbpad/v1x_oled/v1x_oled.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v1x_oled.h"
+#include "quantum.h"
 
 #include <stdio.h>
 char wpm_str[10];
diff --git a/keyboards/dumbpad/v1x_oled/v1x_oled.h b/keyboards/dumbpad/v1x_oled/v1x_oled.h
deleted file mode 100644
index b8bb84fe5f..0000000000
--- a/keyboards/dumbpad/v1x_oled/v1x_oled.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-	       k01, k02, k03, k04, \
-	       k11, k12, k13, k14, \
-	       k21, k22, k23, k24, \
-	  k30, k31, k32, k33, k34 \
-) \
-{ \
-    { KC_NO, k01, k02, k03, k04 }, \
-    { KC_NO, k11, k12, k13, k14 }, \
-    { KC_NO, k21, k22, k23, k24 }, \
-    {   k30, k31, k32, k33, k34 }, \
-}
diff --git a/keyboards/dumbpad/v1x_right/config.h b/keyboards/dumbpad/v1x_right/config.h
index 82f308f651..200ce056a7 100644
--- a/keyboards/dumbpad/v1x_right/config.h
+++ b/keyboards/dumbpad/v1x_right/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Column/Row IO definitions */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-
 /* Onboard LEDs - reversed */
 #define LED_00 B3
 #define LED_01 B1
diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json
index 6cef09807b..55b898b701 100644
--- a/keyboards/dumbpad/v1x_right/info.json
+++ b/keyboards/dumbpad/v1x_right/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D4", "pin_b": "B2"}
@@ -15,10 +20,26 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1},
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dumbpad/v1x_right/v1x_right.c b/keyboards/dumbpad/v1x_right/v1x_right.c
index 2a2da68d5c..f1b1d66c7f 100644
--- a/keyboards/dumbpad/v1x_right/v1x_right.c
+++ b/keyboards/dumbpad/v1x_right/v1x_right.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v1x_right.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs
diff --git a/keyboards/dumbpad/v1x_right/v1x_right.h b/keyboards/dumbpad/v1x_right/v1x_right.h
deleted file mode 100644
index 169f391e82..0000000000
--- a/keyboards/dumbpad/v1x_right/v1x_right.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-      k00, k01, k02, k03, \
-      k10, k11, k12, k13, \
-      k20, k21, k22, k23, \
-      k30, k31, k32, k33, k34 \
-) \
-{ \
-    { k00, k01, k02, k03, KC_NO }, \
-    { k10, k11, k12, k13, KC_NO }, \
-    { k20, k21, k22, k23, KC_NO }, \
-    { k30, k31, k32, k33, k34 }, \
-}
diff --git a/keyboards/dumbpad/v3x/config.h b/keyboards/dumbpad/v3x/config.h
index 2c00ba8eef..b8cd4c2788 100644
--- a/keyboards/dumbpad/v3x/config.h
+++ b/keyboards/dumbpad/v3x/config.h
@@ -16,16 +16,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* Column/Row IO definitions */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-
 /* Onboard LEDs  */
 #define LED_00 B1
 #define LED_01 B3
 #define LED_02 B6
 
-#define RGB_DI_PIN D1
 #define RGB_MATRIX_LED_COUNT 16
 
 // Cleanup RGB
diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json
index acdbe2c590..96706d84b6 100644
--- a/keyboards/dumbpad/v3x/info.json
+++ b/keyboards/dumbpad/v3x/info.json
@@ -5,6 +5,14 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "D4"}
@@ -13,15 +21,34 @@
     "bootmagic": {
         "matrix": [3, 0]
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                                {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
-                                {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
-                                {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3}
             ]
         }
     }
diff --git a/keyboards/dumbpad/v3x/rules.mk b/keyboards/dumbpad/v3x/rules.mk
index fb6e41a9c5..11f04a3ade 100644
--- a/keyboards/dumbpad/v3x/rules.mk
+++ b/keyboards/dumbpad/v3x/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/dumbpad/v3x/v3x.c b/keyboards/dumbpad/v3x/v3x.c
index 7af3c4e838..d0acca1947 100644
--- a/keyboards/dumbpad/v3x/v3x.c
+++ b/keyboards/dumbpad/v3x/v3x.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "v3x.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {{// Key Matrix to LED Index
@@ -100,22 +100,3 @@ bool led_update_kb(led_t led_state) {
     writePin(LED_02, !led_state.num_lock);
     return true;
 }
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            // main layer, volume
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-            break;
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/dumbpad/v3x/v3x.h b/keyboards/dumbpad/v3x/v3x.h
deleted file mode 100644
index f939b6a594..0000000000
--- a/keyboards/dumbpad/v3x/v3x.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 imchipwood && deveth0
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT( \
-             k01, k02, k03, k04, \
-             k11, k12, k13, k14, \
-             k21, k22, k23, k24, \
-        k30, k31, k32, k33, k34 \
-) \
-{ \
-    { KC_NO, k01, k02, k03, k04 }, \
-    { KC_NO, k11, k12, k13, k14 }, \
-    { KC_NO, k21, k22, k23, k24 }, \
-    { k30,   k31, k32, k33, k34 }, \
-}
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index 98b7bf0dbd..beb580a588 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -19,9 +19,6 @@
 
 #define WAIT_US_TIMER           GPTD3
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 // Dynamic EEPROM
 // Something sensible or else VIA may crash
 // Users may enable more if they wish
diff --git a/keyboards/durgod/dgk6x/dgk6x.h b/keyboards/durgod/dgk6x/dgk6x.h
index 5a303b461e..3f020d01e0 100644
--- a/keyboards/durgod/dgk6x/dgk6x.h
+++ b/keyboards/durgod/dgk6x/dgk6x.h
@@ -17,12 +17,8 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_durgod_dgk6x_hades
-#   include "hades.h"
-#elif defined KEYBOARD_durgod_dgk6x_venus
+#if defined KEYBOARD_durgod_dgk6x_venus
 #   include "venus.h"
-#elif defined KEYBOARD_durgod_dgk6x_galaxy
-#   include "galaxy.h"
 #endif
 
 /* Function Prototype */
diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h
index 9c2d38d6d9..f68a595cae 100644
--- a/keyboards/durgod/dgk6x/galaxy/config.h
+++ b/keyboards/durgod/dgk6x/galaxy/config.h
@@ -16,14 +16,9 @@
 
 #pragma once
 
-
-/* key matrix rows */
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5 }
-
-/* key matrix columns */
-#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10, C11, C12 }
-
 #ifdef RGB_MATRIX_ENABLE
 #define DRIVER_1_LED_TOTAL 58
 #define DRIVER_2_LED_TOTAL 26
 #endif
+
+#define CAPS_LED 46
diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.c b/keyboards/durgod/dgk6x/galaxy/galaxy.c
index dac96e04f3..9d0d25f823 100644
--- a/keyboards/durgod/dgk6x/galaxy/galaxy.c
+++ b/keyboards/durgod/dgk6x/galaxy/galaxy.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "galaxy.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.h b/keyboards/durgod/dgk6x/galaxy/galaxy.h
deleted file mode 100644
index 3ba96aaf7b..0000000000
--- a/keyboards/durgod/dgk6x/galaxy/galaxy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 Don Kjer 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define CAPS_LED 46
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_75_ansi( \
-      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F, \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,        K1D,  K1E, \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,        K2D,  K2E, \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,              K3D,  K3E, \
-      K40,        K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4C,  K4D,  K4E, \
-      K50,  K51,  K52,                    K56,                    K59,  K5A,  K5B,  K5C,  K5D,  K5E  \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,  K1E,  XXX },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  K2E,  XXX },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  XXX,  K3D,  K3E,  XXX },  \
-    { K40,  XXX,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4C,  K4D,  K4E,  XXX },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  K59,  K5A,  K5B,  K5C,  K5D,  K5E,  XXX },  \
-}
-
diff --git a/keyboards/durgod/dgk6x/galaxy/info.json b/keyboards/durgod/dgk6x/galaxy/info.json
index e7b843f107..4f80ef9d51 100644
--- a/keyboards/durgod/dgk6x/galaxy/info.json
+++ b/keyboards/durgod/dgk6x/galaxy/info.json
@@ -8,99 +8,104 @@
       "pid": "0x6A1A",
       "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C10", "C11", "C12"],
+    "rows": ["A0", "A1", "A2", "A3", "A4", "A5"]
+  },
+  "diode_direction": "ROW2COL",
   "community_layouts": ["75_ansi"],
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1, "y": 0 },
-                { "label": "F2", "x": 2, "y": 0 },
-                { "label": "F3", "x": 3, "y": 0 },
-                { "label": "F4", "x": 4, "y": 0 },
-                { "label": "F5", "x": 5, "y": 0 },
-                { "label": "F6", "x": 6, "y": 0 },
-                { "label": "F7", "x": 7, "y": 0 },
-                { "label": "F8", "x": 8, "y": 0 },
-                { "label": "F9", "x": 9, "y": 0 },
-                { "label": "F10", "x": 10, "y": 0 },
-                { "label": "F11", "x": 11, "y": 0 },
-                { "label": "F12", "x": 12, "y": 0 },
-                { "label": "PrintScreen", "x": 13, "y": 0 },
-                { "label": "ScrollLock", "x": 14, "y": 0 },
-                { "label": "Delete", "x": 15, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "label": "~", "x": 0, "y": 1 },
-                { "label": "!", "x": 1, "y": 1 },
-                { "label": "@", "x": 2, "y": 1 },
-                { "label": "#", "x": 3, "y": 1 },
-                { "label": "$", "x": 4, "y": 1 },
-                { "label": "%", "x": 5, "y": 1 },
-                { "label": "^", "x": 6, "y": 1 },
-                { "label": "&", "x": 7, "y": 1 },
-                { "label": "*", "x": 8, "y": 1 },
-                { "label": "(", "x": 9, "y": 1 },
-                { "label": ")", "x": 10, "y": 1 },
-                { "label": "_", "x": 11, "y": 1 },
-                { "label": "+", "x": 12, "y": 1 },
-                { "label": "Backspace", "x": 13, "y": 1, "w": 2 },
-                { "label": "Home", "x": 15, "y": 1 },
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                { "label": "Tab", "x": 0, "y": 2, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2 },
-                { "label": "W", "x": 2.5, "y": 2 },
-                { "label": "E", "x": 3.5, "y": 2 },
-                { "label": "R", "x": 4.5, "y": 2 },
-                { "label": "T", "x": 5.5, "y": 2 },
-                { "label": "Y", "x": 6.5, "y": 2 },
-                { "label": "U", "x": 7.5, "y": 2 },
-                { "label": "I", "x": 8.5, "y": 2 },
-                { "label": "O", "x": 9.5, "y": 2 },
-                { "label": "P", "x": 10.5, "y": 2 },
-                { "label": "{", "x": 11.5, "y": 2 },
-                { "label": "}", "x": 12.5, "y": 2 },
-                { "label": "|", "x": 13.5, "y": 2, "w": 1.5 },
-                { "label": "End", "x": 15, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "CapsLock", "x": 0, "y": 3, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3 },
-                { "label": "S", "x": 2.75, "y": 3 },
-                { "label": "D", "x": 3.75, "y": 3 },
-                { "label": "F", "x": 4.75, "y": 3 },
-                { "label": "G", "x": 5.75, "y": 3 },
-                { "label": "H", "x": 6.75, "y": 3 },
-                { "label": "J", "x": 7.75, "y": 3 },
-                { "label": "K", "x": 8.75, "y": 3 },
-                { "label": "L", "x": 9.75, "y": 3 },
-                { "label": ":", "x": 10.75, "y": 3 },
-                { "label": "\"", "x": 11.75, "y": 3 },
-                { "label": "Enter", "x": 12.75, "y": 3, "w": 2.25 },
-                { "label": "PgUp", "x": 15, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Shift", "x": 0, "y": 4, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4 },
-                { "label": "X", "x": 3.25, "y": 4 },
-                { "label": "C", "x": 4.25, "y": 4 },
-                { "label": "V", "x": 5.25, "y": 4 },
-                { "label": "B", "x": 6.25, "y": 4 },
-                { "label": "N", "x": 7.25, "y": 4 },
-                { "label": "M", "x": 8.25, "y": 4 },
-                { "label": "<", "x": 9.25, "y": 4 },
-                { "label": ">", "x": 10.25, "y": 4 },
-                { "label": "?", "x": 11.25, "y": 4 },
-                { "label": "Shift", "x": 12.25, "y": 4, "w": 1.75 },
-                { "label": "Up", "x": 14, "y": 4 },
-                { "label": "PgDn", "x": 15, "y": 4 },
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
 
-                { "label": "Ctrl", "x": 0, "y": 5, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5, "w": 1.25 },
-                { "x": 3.75, "y": 5, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5 },
-                { "label": "Fn1", "x": 11, "y": 5 },
-                { "label": "Fn2", "x": 12, "y": 5 },
-                { "label": "Left", "x": 13, "y": 5 },
-                { "label": "Down", "x": 14, "y": 5 },
-                { "label": "Right", "x": 15, "y": 5 }
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5},
+                {"matrix": [5, 10], "x": 11, "y": 5},
+                {"matrix": [5, 11], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/durgod/dgk6x/hades/config.h b/keyboards/durgod/dgk6x/hades/config.h
index ff390f5b2e..47f6da5988 100644
--- a/keyboards/durgod/dgk6x/hades/config.h
+++ b/keyboards/durgod/dgk6x/hades/config.h
@@ -16,14 +16,9 @@
 
 #pragma once
 
-
-/* key matrix rows */
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
-
-/* key matrix columns */
-#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10, C11 }
-
 #ifdef RGB_MATRIX_ENABLE
 #define DRIVER_1_LED_TOTAL 58
 #define DRIVER_2_LED_TOTAL 10
 #endif
+
+#define CAPS_LED 30
diff --git a/keyboards/durgod/dgk6x/hades/hades.c b/keyboards/durgod/dgk6x/hades/hades.c
index 3d39f6d1ec..fb54c95667 100644
--- a/keyboards/durgod/dgk6x/hades/hades.c
+++ b/keyboards/durgod/dgk6x/hades/hades.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hades.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/durgod/dgk6x/hades/hades.h b/keyboards/durgod/dgk6x/hades/hades.h
deleted file mode 100644
index 630f7e92b5..0000000000
--- a/keyboards/durgod/dgk6x/hades/hades.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Jessica Sullivan and Don Kjer 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define CAPS_LED 30
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_65_ansi( \
-      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E, \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,  K1E, \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,        K2D,  K2E, \
-      K30,        K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3D,  K3E, \
-      K40,  K41,  K42,                    K45,              K49,  K4A,  K4B,  K4C,  K4D,  K4E  \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,  K1E },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  XXX,  K2D,  K2E },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  XXX,  K3D,  K3E },  \
-    { K40,  K41,  K42,  XXX,  XXX,  K45,  XXX,  XXX,  XXX,  K49,  K4A,  K4B,  K4C,  K4D,  K4E },  \
-}
-
-
diff --git a/keyboards/durgod/dgk6x/hades/info.json b/keyboards/durgod/dgk6x/hades/info.json
index 2ebd9c8a41..00cfcdc5f0 100644
--- a/keyboards/durgod/dgk6x/hades/info.json
+++ b/keyboards/durgod/dgk6x/hades/info.json
@@ -8,82 +8,87 @@
       "pid": "0x4AD3",
       "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C10", "C11"],
+    "rows": ["A0", "A1", "A2", "A3", "A4"]
+  },
+  "diode_direction": "ROW2COL",
   "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "!", "x": 1, "y": 0 },
-                { "label": "@", "x": 2, "y": 0 },
-                { "label": "#", "x": 3, "y": 0 },
-                { "label": "$", "x": 4, "y": 0 },
-                { "label": "%", "x": 5, "y": 0 },
-                { "label": "^", "x": 6, "y": 0 },
-                { "label": "&", "x": 7, "y": 0 },
-                { "label": "*", "x": 8, "y": 0 },
-                { "label": "(", "x": 9, "y": 0 },
-                { "label": ")", "x": 10, "y": 0 },
-                { "label": "_", "x": 11, "y": 0 },
-                { "label": "+", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Delete", "x": 15, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Home", "x": 15, "y": 1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                { "label": "CapsLock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "PgUp", "x": 15, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 14, "y": 3 },
-                { "label": "PgDn", "x": 15, "y": 3 },
+                {"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},
 
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Fn1", "x": 10, "y": 4 },
-                { "label": "Fn2", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Left", "x": 13, "y": 4 },
-                { "label": "Down", "x": 14, "y": 4 },
-                { "label": "Right", "x": 15, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/durgod/dgk6x/info.json b/keyboards/durgod/dgk6x/info.json
index 90d3d2e5b7..df4c004ab5 100644
--- a/keyboards/durgod/dgk6x/info.json
+++ b/keyboards/durgod/dgk6x/info.json
@@ -4,6 +4,9 @@
         "scroll_lock": "A8",
         "on_state": 0
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
     "processor": "STM32F072", // F070
     "bootloader": "stm32-dfu",
     "board": "DURGOD_STM32_F070"
diff --git a/keyboards/durgod/dgk6x/rules.mk b/keyboards/durgod/dgk6x/rules.mk
index c82ce44bac..1a05a561be 100644
--- a/keyboards/durgod/dgk6x/rules.mk
+++ b/keyboards/durgod/dgk6x/rules.mk
@@ -16,6 +16,5 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 
 DEFAULT_FOLDER=durgod/dgk6x/hades
diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h
index bb3c168f81..ab3f57914e 100644
--- a/keyboards/durgod/dgk6x/venus/config.h
+++ b/keyboards/durgod/dgk6x/venus/config.h
@@ -16,14 +16,9 @@
 
 #pragma once
 
-
-/* key matrix rows */
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
-
-/* key matrix columns */
-#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10 }
-
 #ifdef RGB_MATRIX_ENABLE
 #define DRIVER_1_LED_TOTAL 53
 #define DRIVER_2_LED_TOTAL 8
 #endif
+
+#define CAPS_LED 28
diff --git a/keyboards/durgod/dgk6x/venus/info.json b/keyboards/durgod/dgk6x/venus/info.json
index c7d020bfdf..b7ee00bc8d 100644
--- a/keyboards/durgod/dgk6x/venus/info.json
+++ b/keyboards/durgod/dgk6x/venus/info.json
@@ -8,6 +8,11 @@
       "pid": "0x7EC5",
       "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C10"],
+    "rows": ["A0", "A1", "A2", "A3", "A4"]
+  },
+  "diode_direction": "ROW2COL",
   "community_layouts": ["60_ansi"],
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/durgod/dgk6x/venus/venus.h b/keyboards/durgod/dgk6x/venus/venus.h
index 6103c531dc..7d1635b777 100644
--- a/keyboards/durgod/dgk6x/venus/venus.h
+++ b/keyboards/durgod/dgk6x/venus/venus.h
@@ -17,8 +17,6 @@
 
 #include "quantum.h"
 
-#define CAPS_LED 28
-
 #define XXX KC_NO
 
 // This a shortcut to help you visually see your layout.
diff --git a/keyboards/durgod/k310/base/config.h b/keyboards/durgod/k310/base/config.h
index 20885ecb29..9d84d39156 100644
--- a/keyboards/durgod/k310/base/config.h
+++ b/keyboards/durgod/k310/base/config.h
@@ -20,12 +20,6 @@
 
 #define WAIT_US_TIMER           GPTD3
 
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6, A7 }
-#define MATRIX_COL_PINS { C4, C5, B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C10, C11, C12 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 // Dynamic EEPROM
 // Something sensible or else VIA may crash
 // Users may enable more if they wish
diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/info.json
index 7e5f9aa8d3..6047c40fc0 100644
--- a/keyboards/durgod/k310/base/info.json
+++ b/keyboards/durgod/k310/base/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C10", "C11", "C12"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "C9",
         "num_lock": "C8",
diff --git a/keyboards/durgod/k310/info.json b/keyboards/durgod/k310/info.json
index 30b944f33e..945c529679 100644
--- a/keyboards/durgod/k310/info.json
+++ b/keyboards/durgod/k310/info.json
@@ -12,344 +12,383 @@
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                { "label": "Num Lock", "x": 18.5, "y": 1.5 },
-                { "label": "/", "x": 19.5, "y": 1.5 },
-                { "label": "*", "x": 20.5, "y": 1.5 },
-                { "label": "-", "x": 21.5, "y": 1.5 },
-
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                { "label": "7", "x": 18.5, "y": 2.5 },
-                { "label": "8", "x": 19.5, "y": 2.5 },
-                { "label": "9", "x": 20.5, "y": 2.5 },
-                { "label": "+", "x": 21.5, "y": 2.5, "h": 2 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
-                { "label": "4", "x": 18.5, "y": 3.5 },
-                { "label": "5", "x": 19.5, "y": 3.5 },
-                { "label": "6", "x": 20.5, "y": 3.5 },
-
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.5 },
-                { "label": "1", "x": 18.5, "y": 4.5 },
-                { "label": "2", "x": 19.5, "y": 4.5 },
-                { "label": "3", "x": 20.5, "y": 4.5 },
-                { "label": "Enter", "x": 21.5, "y": 4.5, "h": 2 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                { "label": "\u2192", "x": 17.25, "y": 5.5 },
-                { "label": "0", "x": 18.5, "y": 5.5, "w": 2 },
-                { "label": ".", "x": 20.5, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 10], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 8], "x": 20.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [7, 10], "x": 18.5, "y": 2.5},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [4, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [7, 14], "x": 18.5, "y": 3.5},
+                {"matrix": [7, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [7, 12], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 14], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 13], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 12], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 11], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [7, 15], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [7, 7], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                { "label": "Num Lock", "x": 18.5, "y": 1.5 },
-                { "label": "/", "x": 19.5, "y": 1.5 },
-                { "label": "*", "x": 20.5, "y": 1.5 },
-                { "label": "-", "x": 21.5, "y": 1.5 },
-
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                { "label": "7", "x": 18.5, "y": 2.5 },
-                { "label": "8", "x": 19.5, "y": 2.5 },
-                { "label": "9", "x": 20.5, "y": 2.5 },
-                { "label": "+", "x": 21.5, "y": 2.5, "h": 2 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "#", "x": 12.75, "y": 3.5 },
-                { "label": "Enter", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
-                { "label": "4", "x": 18.5, "y": 3.5 },
-                { "label": "5", "x": 19.5, "y": 3.5 },
-                { "label": "6", "x": 20.5, "y": 3.5 },
-
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "\\", "x": 1.25, "y": 4.5 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.5 },
-                { "label": "1", "x": 18.5, "y": 4.5 },
-                { "label": "2", "x": 19.5, "y": 4.5 },
-                { "label": "3", "x": 20.5, "y": 4.5 },
-                { "label": "Enter", "x": 21.5, "y": 4.5, "h": 2 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                { "label": "\u2192", "x": 17.25, "y": 5.5 },
-                { "label": "0", "x": 18.5, "y": 5.5, "w": 2 },
-                { "label": ".", "x": 20.5, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 10], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 8], "x": 20.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [7, 10], "x": 18.5, "y": 2.5},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [7, 14], "x": 18.5, "y": 3.5},
+                {"matrix": [7, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [7, 12], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 14], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 13], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 12], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 11], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [7, 15], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [7, 7], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                { "label": "Num Lock", "x": 18.5, "y": 1.5 },
-                { "label": "/", "x": 19.5, "y": 1.5 },
-                { "label": "*", "x": 20.5, "y": 1.5 },
-                { "label": "-", "x": 21.5, "y": 1.5 },
-
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                { "label": "7", "x": 18.5, "y": 2.5 },
-                { "label": "8", "x": 19.5, "y": 2.5 },
-                { "label": "9", "x": 20.5, "y": 2.5 },
-                { "label": "+", "x": 21.5, "y": 2.5, "h": 2 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "#", "x": 12.75, "y": 3.5 },
-                { "label": "Enter", "x": 13.75, "y": 3.5, "w": 1.25 },
-                { "label": "4", "x": 18.5, "y": 3.5 },
-                { "label": "5", "x": 19.5, "y": 3.5 },
-                { "label": "6", "x": 20.5, "y": 3.5 },
-
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "\\", "x": 1.25, "y": 4.5 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.5 },
-                { "label": "1", "x": 18.5, "y": 4.5 },
-                { "label": "2", "x": 19.5, "y": 4.5 },
-                { "label": "3", "x": 20.5, "y": 4.5 },
-                { "label": "Enter", "x": 21.5, "y": 4.5, "h": 2 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                { "label": "\u2192", "x": 17.25, "y": 5.5 },
-                { "label": "0", "x": 18.5, "y": 5.5, "w": 2 },
-                { "label": ".", "x": 20.5, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 10], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 8], "x": 20.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [7, 10], "x": 18.5, "y": 2.5},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 14], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [7, 14], "x": 18.5, "y": 3.5},
+                {"matrix": [7, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [7, 12], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 14], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 13], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 12], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 11], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [7, 15], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [7, 7], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/durgod/k310/k310.h b/keyboards/durgod/k310/k310.h
index 94c582a452..ee31903bfa 100644
--- a/keyboards/durgod/k310/k310.h
+++ b/keyboards/durgod/k310/k310.h
@@ -19,65 +19,6 @@
 
 #include "quantum.h"
 
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_fullsize_ansi( \
-      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,                          \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,      K6A, K69, K68, K67, \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,      K3D,  K3E,  K3F,      K7A, K79, K78, K6B, \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,        K4E,                            K7E, K7D, K7C,      \
-      K40,        K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,            K6E, K6D, K6C, K7B, \
-      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F,      K7F,      K77       \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  K2E,  K2F },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  XXX,  K3D,  K3E,  K3F },  \
-    { K40,  XXX,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  XXX,  K4D,  K4E,  K4F },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K67,  K68,  K69,  K6A,  K6B,  K6C,  K6D,  K6E,  K6F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K77,  K78,  K79,  K7A,  K7B,  K7C,  K7D,  K7E,  K7F }   \
-}
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_fullsize_iso( \
-      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,                          \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,      K6A, K69, K68, K67, \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,            K3D,  K3E,  K3F,      K7A, K79, K78, K6B, \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K4E,                            K7E, K7D, K7C,      \
-      K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,            K6E, K6D, K6C, K7B, \
-      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F,      K7F,      K77       \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  XXX,  K2E,  K2F },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D,  K3E,  K3F },  \
-    { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  XXX,  K4D,  K4E,  K4F },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K67,  K68,  K69,  K6A,  K6B,  K6C,  K6D,  K6E,  K6F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K77,  K78,  K79,  K7A,  K7B,  K7C,  K7D,  K7E,  K7F }   \
-}
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_all( \
-      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,                          \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,      K6A, K69, K68, K67, \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,      K3D,  K3E,  K3F,      K7A, K79, K78, K6B, \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K4E,                            K7E, K7D, K7C,      \
-      K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,            K6E, K6D, K6C, K7B, \
-      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F,      K7F,      K77       \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  K2E,  K2F },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D,  K3E,  K3F },  \
-    { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  XXX,  K4D,  K4E,  K4F },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K67,  K68,  K69,  K6A,  K6B,  K6C,  K6D,  K6E,  K6F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K77,  K78,  K79,  K7A,  K7B,  K7C,  K7D,  K7E,  K7F }   \
-}
-
 /* Function Prototype */
 void off_all_leds(void);
 void on_all_leds(void);
diff --git a/keyboards/durgod/k320/base/config.h b/keyboards/durgod/k320/base/config.h
index 3616ab53af..9d84d39156 100644
--- a/keyboards/durgod/k320/base/config.h
+++ b/keyboards/durgod/k320/base/config.h
@@ -20,12 +20,6 @@
 
 #define WAIT_US_TIMER           GPTD3
 
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6 }
-#define MATRIX_COL_PINS { C4, C5, B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C10, C11, C12 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 // Dynamic EEPROM
 // Something sensible or else VIA may crash
 // Users may enable more if they wish
diff --git a/keyboards/durgod/k320/base/info.json b/keyboards/durgod/k320/base/info.json
index 2fe54b1701..134dcdbd63 100644
--- a/keyboards/durgod/k320/base/info.json
+++ b/keyboards/durgod/k320/base/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C10", "C11", "C12"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "C9",
         "scroll_lock": "A8",
diff --git a/keyboards/durgod/k320/info.json b/keyboards/durgod/k320/info.json
index 34f1252703..d22e1ec076 100644
--- a/keyboards/durgod/k320/info.json
+++ b/keyboards/durgod/k320/info.json
@@ -12,293 +12,317 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.5 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                { "label": "\u2192", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [4, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 15], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "#", "x": 12.75, "y": 3.5 },
-                { "label": "Enter", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
-
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "\\", "x": 1.25, "y": 4.5 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.5 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                { "label": "\u2192", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 15], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "#", "x": 12.75, "y": 3.5 },
-                { "label": "Enter", "x": 13.75, "y": 3.5, "w": 1.25 },
-
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "\\", "x": 1.25, "y": 4.5 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.5 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                { "label": "\u2192", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 14], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 15], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/durgod/k320/k320.h b/keyboards/durgod/k320/k320.h
index a595166fa0..ee31903bfa 100644
--- a/keyboards/durgod/k320/k320.h
+++ b/keyboards/durgod/k320/k320.h
@@ -19,62 +19,6 @@
 
 #include "quantum.h"
 
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_tkl_ansi( \
-      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,  \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,  \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,      K3D,  K3E,  K3F,  \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,        K4E,                        \
-      K40,        K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,        \
-      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F   \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  K2E,  K2F },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  XXX,  K3D,  K3E,  K3F },  \
-    { K40,  XXX,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  XXX,  K4D,  K4E,  K4F },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K6F }   \
-}
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_tkl_iso( \
-      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,  \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,  \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,            K3D,  K3E,  K3F,  \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K4E,                        \
-      K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,        \
-      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F   \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  XXX,  K2E,  K2F },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D,  K3E,  K3F },  \
-    { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  XXX,  K4D,  K4E,  K4F },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K6F }   \
-}
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_all( \
-      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,  \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,  \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,      K3D,  K3E,  K3F,  \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K4E,                        \
-      K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,        \
-      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F   \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  K2E,  K2F },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D,  K3E,  K3F },  \
-    { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  XXX,  K4D,  K4E,  K4F },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K6F }   \
-}
-
 /* Function Prototype */
 void off_all_leds(void);
 void on_all_leds(void);
diff --git a/keyboards/dyz/dyz40/dyz40.c b/keyboards/dyz/dyz40/dyz40.c
deleted file mode 100644
index 1ca2cf1082..0000000000
--- a/keyboards/dyz/dyz40/dyz40.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 dayatz
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dyz40.h"
diff --git a/keyboards/dyz/dyz40/dyz40.h b/keyboards/dyz/dyz40/dyz40.h
deleted file mode 100644
index 8a70432196..0000000000
--- a/keyboards/dyz/dyz40/dyz40.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2021 dayatz
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define _X_ KC_NO
-
-/*                                             ┌───────�
- *                                             │0B     │ 2u Backspace
- *                                             └───────┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │
- * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
- * │10  │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B    │
- * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B  │
- * ├─────┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┴────┤
- * │30   │31 │32   │33      │37        │3A   │3B │3C   │
- * └─────┴───┴─────┴────────┴──────────┴─────┴───┴─────┘
- * ┌─────┬─────┬───────────────────────────┬─────┬─────�
- * │30   │31   │36                         │3B   │3C   │ 7u Space
- * └─────┴─────┴───────────────────────────┴─────┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33,           K36, K37,           K3A, K3B, K3C \
-) { \
-    { K00,  K01,  K02,  K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10,  K11,  K12,  K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \
-    { K20,  K21,  K22,  K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _X_ }, \
-    { K30,  K31,  K32,  K33, _X_, _X_, K36, K37, _X_, _X_, K3A, K3B, K3C } \
-}
-
-#define LAYOUT_7u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31,                K36,                     K3B, K3C  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, _X_ }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _X_ }, \
-    { K30, K31, _X_, _X_, _X_, _X_, K36, _X_, _X_, _X_, _X_, K3B, K3C }  \
-}
-
-#define LAYOUT_7u_space_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31,                K36,                     K3B, K3C  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _X_ }, \
-    { K30, K31, _X_, _X_, _X_, _X_, K36, _X_, _X_, _X_, _X_, K3B, K3C }  \
-}
-
-#define LAYOUT_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32,           K33, K37,           K3A, K3B, K3C  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, _X_ }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _X_ }, \
-    { K30, K31, K32, K33, _X_, _X_, _X_, K37, _X_, _X_, K3A, K3B, K3C }  \
-}
-
-#define LAYOUT_split_space_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32,           K33, K37,           K3A, K3B, K3C  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _X_ }, \
-    { K30, K31, K32, K33, _X_, _X_, _X_, K37, _X_, _X_, K3A, K3B, K3C }  \
-}
diff --git a/keyboards/dyz/dyz40/info.json b/keyboards/dyz/dyz40/info.json
index f1a4bc3f16..bb54647fed 100644
--- a/keyboards/dyz/dyz40/info.json
+++ b/keyboards/dyz/dyz40/info.json
@@ -15,7 +15,6 @@
     },
     "rgblight": {
         "led_count": 13,
-        "pin": "B7",
         "hue_steps": 10,
         "saturation_steps": 10,
         "brightness_steps": 10,
@@ -32,6 +31,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "usb": {
         "vid": "0xD772",
         "pid": "0x000B",
@@ -42,255 +44,255 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"[{", "x":11, "y":0},
-                {"label":"]}", "x":12, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":"'\"", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":",<", "x":8.75, "y":2},
-                {"label":".>", "x":9.75, "y":2},
-                {"label":"/?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.5},
-                {"label":"Win", "x":1.5, "y":3},
-                {"label":"Alt", "x":2.5, "y":3, "w":1.5},
-                {"label":"Space", "x":4, "y":3, "w":2.25},
-                {"label":"7uSpace", "x":3, "y":4, "w":7},
-                {"label":"Fn2", "x":6.25, "y":3, "w":2.75},
-                {"label":"Alt", "x":9, "y":3, "w":1.5},
-                {"label":"Win", "x":10.5, "y":3},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.5}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 9, "y": 3, "w": 1.5},
+                {"matrix": [3, 11], "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.5}
             ]
         },
         "LAYOUT_7u_space": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"Bksp", "x":11, "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 2},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":"'\"", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":",<", "x":8.75, "y":2},
-                {"label":".>", "x":9.75, "y":2},
-                {"label":"/?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":3, "w":1.5},
-                {"label":"7uSpace", "x":3, "y":3, "w":7},
-                {"label":"Alt", "x":10, "y":3, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.5}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 3, "y": 3, "w": 7},
+                {"matrix": [3, 11], "x": 10, "y": 3, "w": 1.5},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.5}
             ]
         },
         "LAYOUT_7u_space_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"[{", "x":11, "y":0},
-                {"label":"]}", "x":12, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":"'\"", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":",<", "x":8.75, "y":2},
-                {"label":".>", "x":9.75, "y":2},
-                {"label":"/?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":3, "w":1.5},
-                {"label":"7uSpace", "x":3, "y":3, "w":7},
-                {"label":"Alt", "x":10, "y":3, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.5}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 3, "y": 3, "w": 7},
+                {"matrix": [3, 11], "x": 10, "y": 3, "w": 1.5},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.5}
             ]
         },
         "LAYOUT_split_space": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"Bksp", "x":11, "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 2},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":"'\"", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":",<", "x":8.75, "y":2},
-                {"label":".>", "x":9.75, "y":2},
-                {"label":"/?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.5},
-                {"label":"Win", "x":1.5, "y":3},
-                {"label":"Alt", "x":2.5, "y":3, "w":1.5},
-                {"label":"Space", "x":4, "y":3, "w":2.25},
-                {"label":"Fn", "x":6.25, "y":3, "w":2.75},
-                {"label":"Alt", "x":9, "y":3, "w":1.5},
-                {"label":"Win", "x":10.5, "y":3},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.5}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 9, "y": 3, "w": 1.5},
+                {"matrix": [3, 11], "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.5}
             ]
         },
         "LAYOUT_split_space_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"[{", "x":11, "y":0},
-                {"label":"]}", "x":12, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":"'\"", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":",<", "x":8.75, "y":2},
-                {"label":".>", "x":9.75, "y":2},
-                {"label":"/?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.5},
-                {"label":"Win", "x":1.5, "y":3},
-                {"label":"Alt", "x":2.5, "y":3, "w":1.5},
-                {"label":"Space", "x":4, "y":3, "w":2.25},
-                {"label":"Fn", "x":6.25, "y":3, "w":2.75},
-                {"label":"Alt", "x":9, "y":3, "w":1.5},
-                {"label":"Win", "x":10.5, "y":3},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.5}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 9, "y": 3, "w": 1.5},
+                {"matrix": [3, 11], "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/dyz/dyz60/dyz60.c b/keyboards/dyz/dyz60/dyz60.c
deleted file mode 100644
index b5a2606210..0000000000
--- a/keyboards/dyz/dyz60/dyz60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 dayatz
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dyz60.h"
diff --git a/keyboards/dyz/dyz60/info.json b/keyboards/dyz/dyz60/info.json
index 413e0ac379..d900e74541 100644
--- a/keyboards/dyz/dyz60/info.json
+++ b/keyboards/dyz/dyz60/info.json
@@ -10,7 +10,6 @@
     },
     "rgblight": {
         "led_count": 16,
-        "pin": "B7",
         "hue_steps": 10,
         "saturation_steps": 10,
         "brightness_steps": 10,
@@ -27,6 +26,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "usb": {
         "vid": "0xD772",
         "pid": "0x000A",
diff --git a/keyboards/dyz/dyz60_hs/dyz60_hs.c b/keyboards/dyz/dyz60_hs/dyz60_hs.c
deleted file mode 100644
index c6ec0f20d8..0000000000
--- a/keyboards/dyz/dyz60_hs/dyz60_hs.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 dayatz
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dyz60_hs.h"
diff --git a/keyboards/dyz/dyz60_hs/info.json b/keyboards/dyz/dyz60_hs/info.json
index 77e194c4c7..0000d1bcde 100644
--- a/keyboards/dyz/dyz60_hs/info.json
+++ b/keyboards/dyz/dyz60_hs/info.json
@@ -10,7 +10,6 @@
     },
     "rgblight": {
         "led_count": 16,
-        "pin": "B7",
         "hue_steps": 10,
         "saturation_steps": 10,
         "brightness_steps": 10,
@@ -27,6 +26,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "indicators": {
         "caps_lock": "F1"
     },
diff --git a/keyboards/dyz/dyz_tkl/dyz_tkl.c b/keyboards/dyz/dyz_tkl/dyz_tkl.c
deleted file mode 100644
index cdc23b8664..0000000000
--- a/keyboards/dyz/dyz_tkl/dyz_tkl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 dayatz
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dyz_tkl.h"
diff --git a/keyboards/dyz/dyz_tkl/dyz_tkl.h b/keyboards/dyz/dyz_tkl/dyz_tkl.h
deleted file mode 100644
index e6f140fe7e..0000000000
--- a/keyboards/dyz/dyz_tkl/dyz_tkl.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Copyright 2021 dayatz
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define _X_ KC_NO
-
-/*
- *              ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- *              │00 ││10 │01 │11 │02 ││12 │03 │13 │04 ││14 │05 │06 │16 ││07 ││17 │08 │18 │ F13 Function Row
- *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- *              ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───�┌───┬───┬───�
- *              │00 │   │01 │11 │02 │12 │ │03 │13 │04 │14 │ │05 │06 │16 │07 ││17 │08 │18 │
- *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�      ┌───────�
- *              │20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 ││37 │28 │38 │      │36     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤      └─┬─────┤
- *              │40   │50 │41 │51 │42 │52 │53 │44 │54 │45 │55 │46 │56 │47   ││57 │48 │58 │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘     ┌──┴�67  │ ISO Enter
- *  LShift      │60    │70 │61 │71 │62 │72 │73 │64 │74 │65 │75 │66 │76      │                  │76 │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�       ┌─┴───┴────┤
- * │80      │   │80  │90 │81 │91 │82 │92 │93 │84 │94 │85 │95 │86 │96    │87 │    │88 │       │96        │ 2.75u RShift
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───�   └──────────┘
- *              │A0  │B0  │A1  │B3                      │B5  │A6  │B6  │A7  ││B7 │A8 │B8 │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *              │A0   │B0 │A1   │B3                         │A6   │B6 │A7   │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K06, K16, K07,         K17, K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,    K37, K28, K38, \
-    K40, K50, K41, K51, K42, K52, K53, K44, K54, K45, K55, K46, K56, K47,         K57, K48, K58, \
-    K60, K70, K61, K71, K62, K72, K73, K64, K74, K65, K75, K66, K76, K67,                        \
-    K80, K90, K81, K91, K82, K92, K93, K84, K94, K85, K95, K86, K96, K87,              K88,      \
-    KA0, KB0, KA1,                KB3,                KB5, KA6, KB6, KA7,         KB7, KA8, KB8  \
-) { \
-    { K00,  K01,  K02,  K03, K04, K05, K06, K07, K08 }, \
-    { K10,  K11,  K12,  K13, K14, _X_, K16, K17, K18 }, \
-    { K20,  K21,  K22,  K23, K24, K25, K26, K27, K28 }, \
-    { K30,  K31,  K32,  K33, K34, K35, K36, K37, K38 }, \
-    { K40,  K41,  K42,  _X_, K44, K45, K46, K47, K48 }, \
-    { K50,  K51,  K52,  K53, K54, K55, K56, K57, K58 }, \
-    { K60,  K61,  K62,  _X_, K64, K65, K66, K67, _X_ }, \
-    { K70,  K71,  K72,  K73, K74, K75, K76, _X_, _X_ }, \
-    { K80,  K81,  K82,  _X_, K84, K85, K86, K87, K88 }, \
-    { K90,  K91,  K92,  K93, K94, K95, K96, _X_, _X_ }, \
-    { KA0,  KA1,  _X_,  _X_, _X_, _X_, KA6, KA7, KA8 }, \
-    { KB0,  _X_,  _X_,  KB3, _X_, KB5, KB6, KB7, KB8 } \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K06, K16, K07,    K17, K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,    K37, K28, K38, \
-    K40, K50, K41, K51, K42, K52, K53, K44, K54, K45, K55, K46, K56, K47,    K57, K48, K58, \
-    K60, K70, K61, K71, K62, K72, K73, K64, K74, K65, K75, K66,      K76,                   \
-    K80,      K81, K91, K82, K92, K93, K84, K94, K85, K95, K86,      K96,         K88,      \
-    KA0, KB0, KA1,                KB3,                KB5, KA6, KB6, KA7,    KB7, KA8, KB8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { _X_, K11, K12, K13, K14, _X_, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, _X_, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-    { K40, K41, K42, _X_, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-    { K60, K61, K62, _X_, K64, K65, K66, _X_, _X_ }, \
-    { K70, K71, K72, K73, K74, K75, K76, _X_, _X_ }, \
-    { K80, K81, K82, _X_, K84, K85, K86, _X_, K88 }, \
-    { _X_, K91, K92, K93, K94, K95, K96, _X_, _X_ }, \
-    { KA0, KA1, _X_, _X_, _X_, _X_, KA6, KA7, KA8 }, \
-    { KB0, _X_, _X_, KB3, _X_, KB5, KB6, KB7, KB8 }  \
-}
-
-#define LAYOUT_tkl_f13_ansi( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K06, K16, K07,    K17, K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,    K37, K28, K38, \
-    K40, K50, K41, K51, K42, K52, K53, K44, K54, K45, K55, K46, K56, K47,    K57, K48, K58, \
-    K60, K70, K61, K71, K62, K72, K73, K64, K74, K65, K75, K66,      K76,                   \
-    K80,      K81, K91, K82, K92, K93, K84, K94, K85, K95, K86,      K96,         K88,      \
-    KA0, KB0, KA1,                KB3,                KB5, KA6, KB6, KA7,    KB7, KA8, KB8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, _X_, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, _X_, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-    { K40, K41, K42, _X_, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-    { K60, K61, K62, _X_, K64, K65, K66, _X_, _X_ }, \
-    { K70, K71, K72, K73, K74, K75, K76, _X_, _X_ }, \
-    { K80, K81, K82, _X_, K84, K85, K86, _X_, K88 }, \
-    { _X_, K91, K92, K93, K94, K95, K96, _X_, _X_ }, \
-    { KA0, KA1, _X_, _X_, _X_, _X_, KA6, KA7, KA8 }, \
-    { KB0, _X_, _X_, KB3, _X_, KB5, KB6, KB7, KB8 }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K06, K16, K07,    K17, K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,    K37, K28, K38, \
-    K40, K50, K41, K51, K42, K52, K53, K44, K54, K45, K55, K46, K56,         K57, K48, K58, \
-    K60, K70, K61, K71, K62, K72, K73, K64, K74, K65, K75, K66, K76, K67,                   \
-    K80, K90, K81, K91, K82, K92, K93, K84, K94, K85, K95, K86,      K96,         K88,      \
-    KA0, KB0, KA1,                KB3,                KB5, KA6, KB6, KA7,    KB7, KA8, KB8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { _X_, K11, K12, K13, K14, _X_, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, _X_, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-    { K40, K41, K42, _X_, K44, K45, K46, _X_, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-    { K60, K61, K62, _X_, K64, K65, K66, K67, _X_ }, \
-    { K70, K71, K72, K73, K74, K75, K76, _X_, _X_ }, \
-    { K80, K81, K82, _X_, K84, K85, K86, _X_, K88 }, \
-    { K90, K91, K92, K93, K94, K95, K96, _X_, _X_ }, \
-    { KA0, KA1, _X_, _X_, _X_, _X_, KA6, KA7, KA8 }, \
-    { KB0, _X_, _X_, KB3, _X_, KB5, KB6, KB7, KB8 }  \
-}
-
-#define LAYOUT_tkl_f13_iso( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K06, K16, K07,    K17, K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,    K37, K28, K38, \
-    K40, K50, K41, K51, K42, K52, K53, K44, K54, K45, K55, K46, K56,         K57, K48, K58, \
-    K60, K70, K61, K71, K62, K72, K73, K64, K74, K65, K75, K66, K76, K67,                   \
-    K80, K90, K81, K91, K82, K92, K93, K84, K94, K85, K95, K86,      K96,         K88,      \
-    KA0, KB0, KA1,                KB3,                KB5, KA6, KB6, KA7,    KB7, KA8, KB8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, _X_, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, _X_, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-    { K40, K41, K42, _X_, K44, K45, K46, _X_, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-    { K60, K61, K62, _X_, K64, K65, K66, K67, _X_ }, \
-    { K70, K71, K72, K73, K74, K75, K76, _X_, _X_ }, \
-    { K80, K81, K82, _X_, K84, K85, K86, _X_, K88 }, \
-    { K90, K91, K92, K93, K94, K95, K96, _X_, _X_ }, \
-    { KA0, KA1, _X_, _X_, _X_, _X_, KA6, KA7, KA8 }, \
-    { KB0, _X_, _X_, KB3, _X_, KB5, KB6, KB7, KB8 }  \
-}
diff --git a/keyboards/dyz/dyz_tkl/info.json b/keyboards/dyz/dyz_tkl/info.json
index 734924d407..c44e9b585c 100644
--- a/keyboards/dyz/dyz_tkl/info.json
+++ b/keyboards/dyz/dyz_tkl/info.json
@@ -10,7 +10,6 @@
     },
     "rgblight": {
         "led_count": 25,
-        "pin": "D1",
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -24,6 +23,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "usb": {
         "vid": "0xD772",
         "pid": "0x000C",
@@ -38,491 +40,534 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":3.25, "w":1.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Shift", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/dyz/selka40/info.json b/keyboards/dyz/selka40/info.json
index 7f3d04417c..d60240f9dd 100644
--- a/keyboards/dyz/selka40/info.json
+++ b/keyboards/dyz/selka40/info.json
@@ -10,7 +10,6 @@
     },
     "rgblight": {
         "led_count": 14,
-        "pin": "B4",
         "hue_steps": 10,
         "saturation_steps": 10,
         "brightness_steps": 10,
@@ -27,6 +26,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B4"
+    },
     "usb": {
         "vid": "0xD772",
         "pid": "0x0012",
diff --git a/keyboards/dyz/selka40/selka40.c b/keyboards/dyz/selka40/selka40.c
deleted file mode 100644
index f46aac4b2b..0000000000
--- a/keyboards/dyz/selka40/selka40.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 dayatz
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "selka40.h"
diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json
index a6e7fb0291..0c0078fb5e 100644
--- a/keyboards/dyz/synthesis60/info.json
+++ b/keyboards/dyz/synthesis60/info.json
@@ -25,7 +25,6 @@
     },
     "rgblight": {
         "led_count": 19,
-        "pin": "B7",
         "hue_steps": 10,
         "saturation_steps": 10,
         "brightness_steps": 10,
@@ -42,6 +41,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "usb": {
         "vid": "0xD772",
         "pid": "0x0017",
diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h
index fdac282e3b..98673bdef0 100644
--- a/keyboards/dz60/config.h
+++ b/keyboards/dz60/config.h
@@ -1,24 +1,5 @@
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +15,6 @@
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/dz60/dz60.c b/keyboards/dz60/dz60.c
deleted file mode 100644
index 23db2e4d75..0000000000
--- a/keyboards/dz60/dz60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "dz60.h"
diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json
index 37ba71fcdf..5ef2ccf692 100644
--- a/keyboards/dz60/info.json
+++ b/keyboards/dz60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2260",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 5
@@ -16,6 +21,9 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_ansi_arrow_split_bs_7u_spc", "60_ansi_arrow", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_abnt2", "60_tsangan_hhkb"],
@@ -589,7 +597,7 @@
                 {"x": 1.25, "y": 4, "w": 1.25},
                 {"x": 2.5, "y": 4, "w": 1.25},
                 {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6.00, "y": 4, "w": 1.25},
+                {"x": 6, "y": 4, "w": 1.25},
                 {"x": 7.25, "y": 4, "w": 2.75},
                 {"x": 10, "y": 4, "w": 1.25},
                 {"x": 11.25, "y": 4, "w": 1.25},
@@ -1157,7 +1165,7 @@
                 {"x": 1.25, "y": 4, "w": 1.25},
                 {"x": 2.5, "y": 4, "w": 1.25},
                 {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6.00, "y": 4, "w": 1.25},
+                {"x": 6, "y": 4, "w": 1.25},
                 {"x": 7.25, "y": 4, "w": 2.75},
                 {"x": 10, "y": 4, "w": 1.25},
                 {"x": 11.25, "y": 4, "w": 1.25},
@@ -1592,7 +1600,7 @@
                 {"x": 1.25, "y": 4, "w": 1.25},
                 {"x": 2.5, "y": 4, "w": 1.25},
                 {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6.00, "y": 4, "w": 1.25},
+                {"x": 6, "y": 4, "w": 1.25},
                 {"x": 7.25, "y": 4, "w": 2.75},
                 {"x": 10, "y": 4, "w": 1.25},
                 {"x": 11.25, "y": 4, "w": 1.25},
@@ -1737,7 +1745,7 @@
                 {"x": 1.25, "y": 4, "w": 1.25},
                 {"x": 2.5, "y": 4, "w": 1.25},
                 {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6.00, "y": 4, "w": 1.25},
+                {"x": 6, "y": 4, "w": 1.25},
                 {"x": 7.25, "y": 4, "w": 2.75},
                 {"x": 10, "y": 4},
                 {"x": 11, "y": 4},
diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h
index e93336086c..ba8626e95c 100644
--- a/keyboards/dztech/bocc/config.h
+++ b/keyboards/dztech/bocc/config.h
@@ -15,25 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F0 }
-#define MATRIX_COL_PINS { B5, B6, C6, C7, F7, F6, F5, F4, F1, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,7 +30,6 @@
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json
index 87073419ab..11f157a0a7 100644
--- a/keyboards/dztech/bocc/info.json
+++ b/keyboards/dztech/bocc/info.json
@@ -8,10 +8,18 @@
         "pid": "0x1010",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B0", "B1", "B2", "B3", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h
index e74f584c91..4685510d8b 100644
--- a/keyboards/dztech/duo_s/config.h
+++ b/keyboards/dztech/duo_s/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A15, B3, B4, B5, B11 }
-#define MATRIX_COL_PINS { B12, B13, B14, A8, B9, C13, C14, C15, A1, A2, A3, A4, A5, A6, A7 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,7 +33,7 @@
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
 #define RGBLIGHT_SLEEP
-#endif
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dztech/duo_s/duo_s.c b/keyboards/dztech/duo_s/duo_s.c
deleted file mode 100644
index ca64b1ff56..0000000000
--- a/keyboards/dztech/duo_s/duo_s.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "duo_s.h"
diff --git a/keyboards/dztech/duo_s/duo_s.h b/keyboards/dztech/duo_s/duo_s.h
deleted file mode 100644
index 772a5a25ca..0000000000
--- a/keyboards/dztech/duo_s/duo_s.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"  
-
-#define LAYOUT_65_ansi_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-    K400, K401, K402,             K405,             K408,       K410, K411,       K413, K414  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, K405,  KC_NO, KC_NO, K408,  KC_NO, K410,  K411,  KC_NO, K413,  K414 }  \
-}
diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json
index 54672e21ae..9c61c0303a 100644
--- a/keyboards/dztech/duo_s/info.json
+++ b/keyboards/dztech/duo_s/info.json
@@ -8,12 +8,92 @@
     "pid": "0x1012",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B15"
+  },
+  "matrix_pins": {
+    "cols": ["B12", "B13", "B14", "A8", "B9", "C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5", "A6", "A7"],
+    "rows": ["A15", "B3", "B4", "B5", "B11"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
   "community_layouts": ["65_ansi_blocker"],
   "layouts": {
       "LAYOUT_65_ansi_blocker": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+            {"matrix": [0, 7], "x": 7, "y": 0},
+            {"matrix": [0, 8], "x": 8, "y": 0},
+            {"matrix": [0, 9], "x": 9, "y": 0},
+            {"matrix": [0, 10], "x": 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/dztech/dz60rgb/keymaps/kgreulich/config.h b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
index a5235259ff..6ad73f6edf 100644
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
@@ -20,7 +20,6 @@
 
 #define NO_ACTION_ONESHOT
 #define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // #include "config_led.h"
 // #include "dz60rgb.h"
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
index 4ea0d150ea..90627f894f 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
@@ -66,7 +66,6 @@
 
 #define NO_ACTION_ONESHOT
 #define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // #include "config_led.h"
 // #include "dz60rgb.h"
diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h
index c302214061..d981df82ed 100644
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h
@@ -50,4 +50,3 @@
 
 #define NO_ACTION_ONESHOT
 #define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h
index dded682184..82d7b6d1e1 100644
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -1,21 +1,5 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
-#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json
index d693e44ecb..56a70183f5 100644
--- a/keyboards/dztech/dz60rgb/v1/info.json
+++ b/keyboards/dztech/dz60rgb/v1/info.json
@@ -3,6 +3,14 @@
         "pid": "0x1120",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
+        "rows": ["B1", "B10", "B11", "B14", "B12"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/dztech/dz60rgb/v1/rules.mk b/keyboards/dztech/dz60rgb/v1/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/dztech/dz60rgb/v1/rules.mk
+++ b/keyboards/dztech/dz60rgb/v1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h
index 9cba4b023c..094478f34d 100644
--- a/keyboards/dztech/dz60rgb/v2/config.h
+++ b/keyboards/dztech/dz60rgb/v2/config.h
@@ -1,21 +1,5 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
-#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json
index ddd9fadd3a..0b263d8099 100644
--- a/keyboards/dztech/dz60rgb/v2/info.json
+++ b/keyboards/dztech/dz60rgb/v2/info.json
@@ -3,6 +3,14 @@
         "pid": "0x1121",
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3
diff --git a/keyboards/dztech/dz60rgb/v2/rules.mk b/keyboards/dztech/dz60rgb/v2/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/dztech/dz60rgb/v2/rules.mk
+++ b/keyboards/dztech/dz60rgb/v2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h
index 1f3dc86b62..a753832ed1 100644
--- a/keyboards/dztech/dz60rgb/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb/v2_1/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
-#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json
index 88618d3745..796b1bc4a3 100644
--- a/keyboards/dztech/dz60rgb/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb/v2_1/info.json
@@ -3,6 +3,14 @@
         "pid": "0x1121",
         "device_version": "2.1.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "lufa-ms",
     "debounce": 3
diff --git a/keyboards/dztech/dz60rgb/v2_1/rules.mk b/keyboards/dztech/dz60rgb/v2_1/rules.mk
index 126a0c0d0b..832eb95f50 100644
--- a/keyboards/dztech/dz60rgb/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb/v2_1/rules.mk
@@ -13,7 +13,6 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 LTO_ENABLE = yes
 
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h
index 2f7c1cad19..5405d671a5 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h
@@ -1,21 +1,5 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
-#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json
index 5dcb042f96..77a9e801c6 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json
@@ -3,6 +3,14 @@
         "pid": "0x1220",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
+        "rows": ["B1", "B10", "B11", "B14", "B12"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h
index 5b08f5994c..545aa64eea 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h
@@ -1,21 +1,5 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
-#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json
index 42d21e8931..734d07db31 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json
@@ -3,6 +3,14 @@
         "pid": "0x1221",
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
index 5ea934ec9a..17e0aea48d 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 
 LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
index 8d4766eb81..09e76f52d5 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
-#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
index 4bdb295eca..1d72dc44ee 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
@@ -3,6 +3,14 @@
         "pid": "0x1221",
         "device_version": "2.1.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "lufa-ms",
     "debounce": 3
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
index 78145d796d..a89963c2d4 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
@@ -13,5 +13,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h
index 0381423ee7..cfe82a7323 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -1,21 +1,5 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
-#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json
index 511a797a5c..65bb086dc3 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json
@@ -3,6 +3,14 @@
         "pid": "0x1320",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
+        "rows": ["B1", "B10", "B11", "B14", "B12"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
+++ b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h
index e5f3d86e23..38a1aa2c76 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -1,21 +1,5 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
-#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json
index 3bd3a96b8e..b9a2126e3d 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json
@@ -3,6 +3,14 @@
         "pid": "0x1321",
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
+++ b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index bbc52f701a..5bcfb21cf7 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
-#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
index 4eb2b1eca0..ce830f6b01 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
@@ -3,6 +3,14 @@
         "pid": "0x1321",
         "device_version": "2.1.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "lufa-ms",
     "debounce": 3
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
index 78145d796d..a89963c2d4 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
@@ -13,5 +13,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h
index c212f41c91..43e1b1c609 100644
--- a/keyboards/dztech/dz64rgb/config.h
+++ b/keyboards/dztech/dz64rgb/config.h
@@ -16,11 +16,6 @@
  
 #pragma once
 
-#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
-#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json
index efae138c1e..0b40a23469 100644
--- a/keyboards/dztech/dz64rgb/info.json
+++ b/keyboards/dztech/dz64rgb/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1013",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "lufa-ms",
     "layouts": {
diff --git a/keyboards/dztech/dz64rgb/rules.mk b/keyboards/dztech/dz64rgb/rules.mk
index 04451b76a7..a20c8b449f 100644
--- a/keyboards/dztech/dz64rgb/rules.mk
+++ b/keyboards/dztech/dz64rgb/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
 LAYOUT= 64_ansi
\ No newline at end of file
diff --git a/keyboards/dztech/dz65rgb/dz65rgb.c b/keyboards/dztech/dz65rgb/dz65rgb.c
deleted file mode 100644
index 8340d8fcee..0000000000
--- a/keyboards/dztech/dz65rgb/dz65rgb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#include "dz65rgb.h"
diff --git a/keyboards/dztech/dz65rgb/dz65rgb.h b/keyboards/dztech/dz65rgb/dz65rgb.h
deleted file mode 100644
index 734a1cff3f..0000000000
--- a/keyboards/dztech/dz65rgb/dz65rgb.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef KEYBOARD_dztech_dz65rgb_v1
-    #include "v1.h"
-#endif
-#ifdef KEYBOARD_dztech_dz65rgb_v2
-    #include "v2.h"
-#endif
-#ifdef KEYBOARD_dztech_dz65rgb_v3
-    #include "v3.h"
-#endif
-#include "quantum.h"
diff --git a/keyboards/dztech/dz65rgb/info.json b/keyboards/dztech/dz65rgb/info.json
index f57c879ed7..d3a127251b 100644
--- a/keyboards/dztech/dz65rgb/info.json
+++ b/keyboards/dztech/dz65rgb/info.json
@@ -6,83 +6,5 @@
     "usb": {
         "vid": "0x445A"
     },
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
-            ]
-        }
-    }
+    "community_layouts": ["65_ansi"]
 }
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
index 3870c6aae3..8a7bbd22ec 100644
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
@@ -709,7 +709,7 @@ void leader_end_user(void) {
 
 /**************** DYNAMIC MACRO *********************/
 
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
     onMac = false; /* reset layer bool as dynamic macro clear the keyboard and reset layers. */
     if (!isBlinking && !isRecording) {
         reset_blink_cycle();
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
index 93e6990950..bce34bcfbc 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
@@ -60,7 +60,6 @@
 
 #define NO_ACTION_ONESHOT
 #define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // #include "config_led.h"
 // #include "dz60rgb.h"
diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h
index 005b8096ea..4a84498975 100644
--- a/keyboards/dztech/dz65rgb/v1/config.h
+++ b/keyboards/dztech/dz65rgb/v1/config.h
@@ -15,22 +15,6 @@
  */
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
-#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14, C15 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json
index 9e88a65fe4..19279921a4 100644
--- a/keyboards/dztech/dz65rgb/v1/info.json
+++ b/keyboards/dztech/dz65rgb/v1/info.json
@@ -3,8 +3,94 @@
         "pid": "0x1420",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"],
+        "rows": ["B1", "B10", "B11", "B14", "B12"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
-    "debounce": 3
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 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},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/dztech/dz65rgb/v1/rules.mk b/keyboards/dztech/dz65rgb/v1/rules.mk
index 7d73c4db84..ea646d3d93 100644
--- a/keyboards/dztech/dz65rgb/v1/rules.mk
+++ b/keyboards/dztech/dz65rgb/v1/rules.mk
@@ -11,4 +11,3 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/dztech/dz65rgb/v1/v1.c b/keyboards/dztech/dz65rgb/v1/v1.c
index 0e52a3f911..a3b7bdfb5b 100644
--- a/keyboards/dztech/dz65rgb/v1/v1.c
+++ b/keyboards/dztech/dz65rgb/v1/v1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v1.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/dztech/dz65rgb/v1/v1.h b/keyboards/dztech/dz65rgb/v1/v1.h
deleted file mode 100644
index 1811cefae6..0000000000
--- a/keyboards/dztech/dz65rgb/v1/v1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K45,           K48, K49, K4A, K4B, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, XXX, K4D, K4E }  \
-}
diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h
index dd993ae7a9..04700c84ed 100644
--- a/keyboards/dztech/dz65rgb/v2/config.h
+++ b/keyboards/dztech/dz65rgb/v2/config.h
@@ -15,22 +15,6 @@
  */
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 }
-#define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json
index 502b498e92..b449f4979a 100644
--- a/keyboards/dztech/dz65rgb/v2/info.json
+++ b/keyboards/dztech/dz65rgb/v2/info.json
@@ -3,7 +3,93 @@
         "pid": "0x1421",
         "device_version": "2.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "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
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 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},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/dztech/dz65rgb/v2/rules.mk b/keyboards/dztech/dz65rgb/v2/rules.mk
index 7d73c4db84..ea646d3d93 100644
--- a/keyboards/dztech/dz65rgb/v2/rules.mk
+++ b/keyboards/dztech/dz65rgb/v2/rules.mk
@@ -11,4 +11,3 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/dztech/dz65rgb/v2/v2.c b/keyboards/dztech/dz65rgb/v2/v2.c
index 43629e74da..31599ad4b8 100644
--- a/keyboards/dztech/dz65rgb/v2/v2.c
+++ b/keyboards/dztech/dz65rgb/v2/v2.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v2.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/dztech/dz65rgb/v2/v2.h b/keyboards/dztech/dz65rgb/v2/v2.h
deleted file mode 100644
index ead68e8760..0000000000
--- a/keyboards/dztech/dz65rgb/v2/v2.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K45,           K48, K49, K4A, K4B, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, XXX, K4D, K4E }  \
-}
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index 69a6f5c50f..421ae8277c 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/keyboards/dztech/dz65rgb/v3/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 }
-#define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define USB_SUSPEND_WAKEUP_DELAY 5000
diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json
index 4d46faea48..e4e4dd6581 100644
--- a/keyboards/dztech/dz65rgb/v3/info.json
+++ b/keyboards/dztech/dz65rgb/v3/info.json
@@ -3,6 +3,92 @@
         "pid": "0x1424",
         "device_version": "3.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["F0", "F1", "F4", "E6", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "lufa-ms"
+    "bootloader": "lufa-ms",
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/dztech/dz65rgb/v3/rules.mk b/keyboards/dztech/dz65rgb/v3/rules.mk
index 67366c7a00..bbe22adb0c 100755
--- a/keyboards/dztech/dz65rgb/v3/rules.mk
+++ b/keyboards/dztech/dz65rgb/v3/rules.mk
@@ -13,5 +13,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz65rgb/v3/v3.c b/keyboards/dztech/dz65rgb/v3/v3.c
index 45cc5cb3bd..ceb5c30f3e 100755
--- a/keyboards/dztech/dz65rgb/v3/v3.c
+++ b/keyboards/dztech/dz65rgb/v3/v3.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "v3.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/dztech/dz65rgb/v3/v3.h b/keyboards/dztech/dz65rgb/v3/v3.h
deleted file mode 100755
index a36069d795..0000000000
--- a/keyboards/dztech/dz65rgb/v3/v3.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D, K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/dztech/dz96/config.h b/keyboards/dztech/dz96/config.h
deleted file mode 100644
index b22fdf5013..0000000000
--- a/keyboards/dztech/dz96/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, B3, E6, F0, D5, D4, D6, C7 }
-#define MATRIX_COL_PINS { C6, F1, F4, F5, F6, F7, D7, B4, B5, D0, D1, D2, D3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dztech/dz96/dz96.c b/keyboards/dztech/dz96/dz96.c
deleted file mode 100644
index c83c0a2c4d..0000000000
--- a/keyboards/dztech/dz96/dz96.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "dz96.h"
diff --git a/keyboards/dztech/dz96/dz96.h b/keyboards/dztech/dz96/dz96.h
deleted file mode 100644
index bf84dfc3aa..0000000000
--- a/keyboards/dztech/dz96/dz96.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#pragma once
-
-#include "quantum.h"
-
-//Arrow keys and 1.75u right shift
-#define LAYOUT_default( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09,    K0A, K0B, K0C, K7C, \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18,      K71,    K19, K1A, K1B, K1C, \
-  K20,    K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,   K73,    K29, K2A, K2B, K2C, \
-  K30,     K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37,       K38,    K39, K3A, K3B,      \
-  K40,       K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,     K48, K74,    K49, K4A, K4B, K4C, \
-  K50,  K51,  K52,                K59,              K55, K56, K57, K58, K53, K54,    K5A, K5B       \
-) { \
-  { K00,    K01,    K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C   }, \
-  { K10,    K11,    K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C   }, \
-  { K20,    K21,    K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C   }, \
-  { K30,    K31,    K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  KC_NO }, \
-  { K40,    KC_NO,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4C   }, \
-  { K50,    K51,    K52,  K53,  K54,  K55,  K56,  K57,  K58,  K59,  K5A,  K5B,  KC_NO }, \
-  { K60,    K61,    K62,  K63,  K64,  K65,  K66,  K67,  K68,  K69,  K6A,  K6B,  K6C   }, \
-  { KC_NO,  K71,    K72,  K73,  K74,  K75,  K76,  K77,  K78,  K79,  K7A,  K7B,  K7C   }  \
-}
-
-// Split backspace 1.5u right mods
-#define LAYOUT_split_bs_joined_right( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C,  \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71, K19, K1A, K1B, K1C,  \
-  K20,   K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,  K73,   K29, K2A, K2B, K2C,  \
-  K30,    K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37,     K38,    K39, K3A, K3B,       \
-  K40,     K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,    K48,    K74, K49, K4A, K4B, K4C,  \
-  K50, K51, K52,                K59,                     K55, K57, K58, K53, K54, K5A, K5B        \
-) { \
-  { K00,  K01,    K02,  K03,  K04,  K05,  K06,    K07,  K08,  K09,  K0A,  K0B,  K0C   }, \
-  { K10,  K11,    K12,  K13,  K14,  K15,  K16,    K17,  K18,  K19,  K1A,  K1B,  K1C   }, \
-  { K20,  K21,    K22,  K23,  K24,  K25,  K26,    K27,  K28,  K29,  K2A,  K2B,  K2C   }, \
-  { K30,  K31,    K32,  K33,  K34,  K35,  K36,    K37,  K38,  K39,  K3A,  K3B,  KC_NO }, \
-  { K40,  KC_NO,  K42,  K43,  K44,  K45,  K46,    K47,  K48,  K49,  K4A,  K4B,  K4C   }, \
-  { K50,  K51,    K52,  K53,  K54,  K55,  KC_NO,  K57,  K58,  K59,  K5A,  K5B,  KC_NO }, \
-  { K60,  K61,    K62,  K63,  K64,  K65,  K66,    K67,  K68,  K69,  K6A,  K6B,  K6C   }, \
-  { K70,  K71,    K72,  K73,  K74,  K75,  K76,    K77,  K78,  K79,  K7A,  K7B,  K7C   }, \
-}
-
-// Split numpad (enter, 0), split shifts (right, left), split backspace
-// This layout contains every possible keycode placement
-#define LAYOUT_split_shift_and_bs( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09,    K0A, K0B, K0C, K7C, \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71,    K19, K1A, K1B, K1C, \
-  K20,    K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,   K73,    K29, K2A, K2B, K2C, \
-  K30,     K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37,       K38,    K39, K3A, K3B, K3C, \
-  K40,  K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,     K48, K74,    K49, K4A, K4B, K4C, \
-  K50,  K51,  K52,                K59,              K55, K56, K57, K58, K53, K54,    K5A, K5B, K5C  \
-) { \
-  { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C },  \
-  { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C },  \
-  { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C },  \
-  { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C },  \
-  { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4C },  \
-  { K50,  K51,  K52,  K53,  K54,  K55,  K56,  K57,  K58,  K59,  K5A,  K5B,  K5C },  \
-  { K60,  K61,  K62,  K63,  K64,  K65,  K66,  K67,  K68,  K69,  K6A,  K6B,  K6C },  \
-  { K70,  K71,  K72,  K73,  K74,  K75,  K76,  K77,  K78,  K79,  K7A,  K7B,  K7C },  \
-}
-
-// ISO Layout
-#define LAYOUT_iso( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09,    K0A, K0B, K0C, K7C, \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18,      K71,    K19, K1A, K1B, K1C, \
-  K20,    K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,           K29, K2A, K2B, K2C, \
-  K30,     K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K73,  K38,    K39, K3A, K3B,      \
-  K40,  K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,     K48, K74,    K49, K4A, K4B, K4C, \
-  K50,  K51,  K52,                K59,              K55, K56, K57, K58, K53, K54,    K5A, K5B       \
-) { \
-  { K00,    K01,    K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C   }, \
-  { K10,    K11,    K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C   }, \
-  { K20,    K21,    K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C   }, \
-  { K30,    K31,    K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  KC_NO }, \
-  { K40,    K41,    K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4C   }, \
-  { K50,    K51,    K52,  K53,  K54,  K55,  K56,  K57,  K58,  K59,  K5A,  K5B,  KC_NO }, \
-  { K60,    K61,    K62,  K63,  K64,  K65,  K66,  K67,  K68,  K69,  K6A,  K6B,  K6C   }, \
-  { KC_NO,  K71,    K72,  K73,  K74,  K75,  K76,  K77,  K78,  K79,  K7A,  K7B,  K7C   }  \
-}
diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/info.json
index 1119a8f2ab..47ceaebcd2 100644
--- a/keyboards/dztech/dz96/info.json
+++ b/keyboards/dztech/dz96/info.json
@@ -8,6 +8,11 @@
     "pid": "0xDB96",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C6", "F1", "F4", "F5", "F6", "F7", "D7", "B4", "B5", "D0", "D1", "D2", "D3"],
+    "rows": ["B7", "B3", "E6", "F0", "D5", "D4", "D6", "C7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "levels": 5
@@ -21,449 +26,446 @@
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
-    "LAYOUT_default": {
-      "layout": [
-        {"label":"ESC", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PRINT SCREEN", "x":13, "y":0},
-        {"label":"HOME", "x":14, "y":0},
-        {"label":"END", "x":15, "y":0},
-        {"label":"PAGE UP", "x":16, "y":0},
-        {"label":"PAGE DOWN", "x":17, "y":0},
-        {"label":"DELETE", "x":18, "y":0},
-
-        {"label":"GRAVE", "x":0, "y":1},
-        {"label":"1", "x":1, "y":1},
-        {"label":"2", "x":2, "y":1},
-        {"label":"3", "x":3, "y":1},
-        {"label":"4", "x":4, "y":1},
-        {"label":"5", "x":5, "y":1},
-        {"label":"6", "x":6, "y":1},
-        {"label":"7", "x":7, "y":1},
-        {"label":"8", "x":8, "y":1},
-        {"label":"9", "x":9, "y":1},
-        {"label":"0", "x":10, "y":1},
-        {"label":"MINUS", "x":11, "y":1},
-        {"label":"EQUAL", "x":12, "y":1},
-        {"label":"BACKSPACE", "x":13, "y":1, "w":2},
-        {"label":"NUM LOCK", "x":15, "y":1},
-        {"label":"KEYPAD /", "x":16, "y":1},
-        {"label":"KEYPAD *", "x":17, "y":1},
-        {"label":"KEYPAD -", "x":18, "y":1},
-
-        {"label":"TAB", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"LBRACKET", "x":11.5, "y":2},
-        {"label":"RBRACKET", "x":12.5, "y":2},
-        {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
-        {"label":"KEYPAD 7", "x":15, "y":2},
-        {"label":"KEYPAD 8", "x":16, "y":2},
-        {"label":"KEYPAD 9", "x":17, "y":2},
-        {"label":"KEYPAD +", "x":18, "y":2, "h":2},
-
-        {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":"SEMICOLON", "x":10.75, "y":3},
-        {"label":"QUOTE", "x":11.75, "y":3},
-        {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
-        {"label":"KEYPAD 4", "x":15, "y":3},
-        {"label":"KEYPAD 5", "x":16, "y":3},
-        {"label":"KEYPAD 6", "x":17, "y":3},
+        "LAYOUT_default": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 2], "x": 7, "y": 0},
+                {"matrix": [6, 3], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 10, "y": 0},
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [7, 12], "x": 18, "y": 0},
 
-        {"label":"LSHIFT", "x":0, "y":4, "w":2.25},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":"COMMA", "x":9.25, "y":4},
-        {"label":"PERIOD", "x":10.25, "y":4},
-        {"label":"SLASH", "x":11.25, "y":4},
-        {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
-        {"label":"UP", "x":14, "y":4},
-        {"label":"KEYPAD 1", "x":15, "y":4},
-        {"label":"KEYPAD 2", "x":16, "y":4},
-        {"label":"KEYPAD 3", "x":17, "y":4},
-        {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [6, 4], "x": 5, "y": 1},
+                {"matrix": [6, 5], "x": 6, "y": 1},
+                {"matrix": [6, 6], "x": 7, "y": 1},
+                {"matrix": [6, 7], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [7, 1], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 9], "x": 15, "y": 1},
+                {"matrix": [1, 10], "x": 16, "y": 1},
+                {"matrix": [1, 11], "x": 17, "y": 1},
+                {"matrix": [1, 12], "x": 18, "y": 1},
 
-        {"label":"LCTRL", "x":0, "y":5, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
-        {"label":"LALT", "x":2.5, "y":5, "w":1.25},
-        {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
-        {"label":"RALT", "x":10, "y":5},
-        {"label":"RCTRL", "x":11, "y":5},
-        {"label":"FN", "x":12, "y":5},
-        {"label":"LEFT", "x":13, "y":5},
-        {"label":"DOWN", "x":14, "y":5},
-        {"label":"RIGHT", "x":15, "y":5},
-        {"label":"KEYPAD 0", "x":16, "y":5},
-        {"label":"KEYPAD .", "x":17, "y":5}
-      ]
-    },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [6, 8], "x": 5.5, "y": 2},
+                {"matrix": [6, 9], "x": 6.5, "y": 2},
+                {"matrix": [6, 10], "x": 7.5, "y": 2},
+                {"matrix": [6, 11], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.5, "y": 2},
+                {"matrix": [2, 6], "x": 10.5, "y": 2},
+                {"matrix": [2, 7], "x": 11.5, "y": 2},
+                {"matrix": [2, 8], "x": 12.5, "y": 2},
+                {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 9], "x": 15, "y": 2},
+                {"matrix": [2, 10], "x": 16, "y": 2},
+                {"matrix": [2, 11], "x": 17, "y": 2},
+                {"matrix": [2, 12], "x": 18, "y": 2, "h": 2},
 
-    "LAYOUT_split_bs_joined_right": {
-      "layout": [
-        {"label": "K00", "x": 0, "y": 0},
-        {"label": "K01", "x": 1, "y": 0},
-        {"label": "K02", "x": 2, "y": 0},
-        {"label": "K03", "x": 3, "y": 0},
-        {"label": "K04", "x": 4, "y": 0},
-        {"label": "K60", "x": 5, "y": 0},
-        {"label": "K61", "x": 6, "y": 0},
-        {"label": "K62", "x": 7, "y": 0},
-        {"label": "K63", "x": 8, "y": 0},
-        {"label": "K05", "x": 9, "y": 0},
-        {"label": "K06", "x": 10, "y": 0},
-        {"label": "K07", "x": 11, "y": 0},
-        {"label": "K08", "x": 12, "y": 0},
-        {"label": "K72", "x": 13, "y": 0},
-        {"label": "K09", "x": 14, "y": 0},
-        {"label": "K0A", "x": 15, "y": 0},
-        {"label": "K0B", "x": 16, "y": 0},
-        {"label": "K0C", "x": 17, "y": 0},
-        {"label": "K7C", "x": 18, "y": 0},
+                {"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": [6, 12], "x": 5.75, "y": 3},
+                {"matrix": [7, 5], "x": 6.75, "y": 3},
+                {"matrix": [7, 6], "x": 7.75, "y": 3},
+                {"matrix": [7, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 5], "x": 9.75, "y": 3},
+                {"matrix": [3, 6], "x": 10.75, "y": 3},
+                {"matrix": [3, 7], "x": 11.75, "y": 3},
+                {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 15, "y": 3},
+                {"matrix": [3, 10], "x": 16, "y": 3},
+                {"matrix": [3, 11], "x": 17, "y": 3},
 
-        {"label": "K10", "x": 0, "y": 1},
-        {"label": "K11", "x": 1, "y": 1},
-        {"label": "K12", "x": 2, "y": 1},
-        {"label": "K13", "x": 3, "y": 1},
-        {"label": "K14", "x": 4, "y": 1},
-        {"label": "K64", "x": 5, "y": 1},
-        {"label": "K65", "x": 6, "y": 1},
-        {"label": "K66", "x": 7, "y": 1},
-        {"label": "K67", "x": 8, "y": 1},
-        {"label": "K15", "x": 9, "y": 1},
-        {"label": "K16", "x": 10, "y": 1},
-        {"label": "K17", "x": 11, "y": 1},
-        {"label": "K18", "x": 12, "y": 1},
-        {"label": "K70", "x": 13, "y": 1},
-        {"label": "K71", "x": 14, "y": 1},
-        {"label": "K19", "x": 15, "y": 1},
-        {"label": "K1A", "x": 16, "y": 1},
-        {"label": "K1B", "x": 17, "y": 1},
-        {"label": "K1C", "x": 18, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [7, 8], "x": 5.25, "y": 4},
+                {"matrix": [7, 9], "x": 6.25, "y": 4},
+                {"matrix": [7, 10], "x": 7.25, "y": 4},
+                {"matrix": [7, 11], "x": 8.25, "y": 4},
+                {"matrix": [4, 5], "x": 9.25, "y": 4},
+                {"matrix": [4, 6], "x": 10.25, "y": 4},
+                {"matrix": [4, 7], "x": 11.25, "y": 4},
+                {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 4], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4},
+                {"matrix": [4, 10], "x": 16, "y": 4},
+                {"matrix": [4, 11], "x": 17, "y": 4},
+                {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
 
-        {"label": "K20", "x": 0, "y": 2, "w": 1.5},
-        {"label": "K21", "x": 1.5, "y": 2},
-        {"label": "K22", "x": 2.5, "y": 2},
-        {"label": "K23", "x": 3.5, "y": 2},
-        {"label": "K24", "x": 4.5, "y": 2},
-        {"label": "K68", "x": 5.5, "y": 2},
-        {"label": "K69", "x": 6.5, "y": 2},
-        {"label": "K6A", "x": 7.5, "y": 2},
-        {"label": "K6B", "x": 8.5, "y": 2},
-        {"label": "K25", "x": 9.5, "y": 2},
-        {"label": "K26", "x": 10.5, "y": 2},
-        {"label": "K27", "x": 11.5, "y": 2},
-        {"label": "K28", "x": 12.5, "y": 2},
-        {"label": "K73", "x": 13.5, "y": 2, "w": 1.5},
-        {"label": "K29", "x": 15, "y": 2},
-        {"label": "K2A", "x": 16, "y": 2},
-        {"label": "K2B", "x": 17, "y": 2},
-        {"label": "K2C", "x": 18, "y": 2, "h": 2},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 5], "x": 10, "y": 5},
+                {"matrix": [5, 6], "x": 11, "y": 5},
+                {"matrix": [5, 7], "x": 12, "y": 5},
+                {"matrix": [5, 8], "x": 13, "y": 5},
+                {"matrix": [5, 3], "x": 14, "y": 5},
+                {"matrix": [5, 4], "x": 15, "y": 5},
+                {"matrix": [5, 10], "x": 16, "y": 5},
+                {"matrix": [5, 11], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_split_bs_joined_right": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 2], "x": 7, "y": 0},
+                {"matrix": [6, 3], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 10, "y": 0},
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [7, 12], "x": 18, "y": 0},
 
-        {"label": "K30", "x": 0, "y": 3, "w": 1.75},
-        {"label": "K31", "x": 1.75, "y": 3},
-        {"label": "K32", "x": 2.75, "y": 3},
-        {"label": "K33", "x": 3.75, "y": 3},
-        {"label": "K34", "x": 4.75, "y": 3},
-        {"label": "K6C", "x": 5.75, "y": 3},
-        {"label": "K75", "x": 6.75, "y": 3},
-        {"label": "K76", "x": 7.75, "y": 3},
-        {"label": "K77", "x": 8.75, "y": 3},
-        {"label": "K35", "x": 9.75, "y": 3},
-        {"label": "K36", "x": 10.75, "y": 3},
-        {"label": "K37", "x": 11.75, "y": 3},
-        {"label": "K38", "x": 12.75, "y": 3, "w": 2.25},
-        {"label": "K39", "x": 15, "y": 3},
-        {"label": "K3A", "x": 16, "y": 3},
-        {"label": "K3B", "x": 17, "y": 3},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [6, 4], "x": 5, "y": 1},
+                {"matrix": [6, 5], "x": 6, "y": 1},
+                {"matrix": [6, 6], "x": 7, "y": 1},
+                {"matrix": [6, 7], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [7, 0], "x": 13, "y": 1},
+                {"matrix": [7, 1], "x": 14, "y": 1},
+                {"matrix": [1, 9], "x": 15, "y": 1},
+                {"matrix": [1, 10], "x": 16, "y": 1},
+                {"matrix": [1, 11], "x": 17, "y": 1},
+                {"matrix": [1, 12], "x": 18, "y": 1},
 
-        {"label": "K40", "x": 0, "y": 4, "w": 2.25},
-        {"label": "K42", "x": 2.25, "y": 4},
-        {"label": "K43", "x": 3.25, "y": 4},
-        {"label": "K44", "x": 4.25, "y": 4},
-        {"label": "K78", "x": 5.25, "y": 4},
-        {"label": "K79", "x": 6.25, "y": 4},
-        {"label": "K7A", "x": 7.25, "y": 4},
-        {"label": "K7B", "x": 8.25, "y": 4},
-        {"label": "K45", "x": 9.25, "y": 4},
-        {"label": "K46", "x": 10.25, "y": 4},
-        {"label": "K47", "x": 11.25, "y": 4},
-        {"label": "K48", "x": 12.25, "y": 4, "w": 1.75},
-        {"label": "K74", "x": 14, "y": 4},
-        {"label": "K49", "x": 15, "y": 4},
-        {"label": "K4A", "x": 16, "y": 4},
-        {"label": "K4B", "x": 17, "y": 4},
-        {"label": "K4C", "x": 18, "y": 4, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [6, 8], "x": 5.5, "y": 2},
+                {"matrix": [6, 9], "x": 6.5, "y": 2},
+                {"matrix": [6, 10], "x": 7.5, "y": 2},
+                {"matrix": [6, 11], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.5, "y": 2},
+                {"matrix": [2, 6], "x": 10.5, "y": 2},
+                {"matrix": [2, 7], "x": 11.5, "y": 2},
+                {"matrix": [2, 8], "x": 12.5, "y": 2},
+                {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 9], "x": 15, "y": 2},
+                {"matrix": [2, 10], "x": 16, "y": 2},
+                {"matrix": [2, 11], "x": 17, "y": 2},
+                {"matrix": [2, 12], "x": 18, "y": 2, "h": 2},
 
-        {"label": "K50", "x": 0, "y": 5, "w": 1.25},
-        {"label": "K51", "x": 1.25, "y": 5, "w": 1.25},
-        {"label": "K52", "x": 2.5, "y": 5, "w": 1.25},
-        {"label": "K59", "x": 3.75, "y": 5, "w": 6.25},
-        {"label": "K55", "x": 10, "y": 5, "w": 1.5},
-        {"label": "K57", "x": 11.5, "y": 5, "w": 1.5},
-        {"label": "K58", "x": 13, "y": 5},
-        {"label": "K53", "x": 14, "y": 5},
-        {"label": "K54", "x": 15, "y": 5},
-        {"label": "K5A", "x": 16, "y": 5},
-        {"label": "K5B", "x": 17, "y": 5}
-      ]
-    },
+                {"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": [6, 12], "x": 5.75, "y": 3},
+                {"matrix": [7, 5], "x": 6.75, "y": 3},
+                {"matrix": [7, 6], "x": 7.75, "y": 3},
+                {"matrix": [7, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 5], "x": 9.75, "y": 3},
+                {"matrix": [3, 6], "x": 10.75, "y": 3},
+                {"matrix": [3, 7], "x": 11.75, "y": 3},
+                {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 15, "y": 3},
+                {"matrix": [3, 10], "x": 16, "y": 3},
+                {"matrix": [3, 11], "x": 17, "y": 3},
 
-    "LAYOUT_split_shift_and_bs": {
-      "layout": [
-        {"label":"ESC", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PRINT SCREEN", "x":13, "y":0},
-        {"label":"HOME", "x":14, "y":0},
-        {"label":"END", "x":15, "y":0},
-        {"label":"PAGE UP", "x":16, "y":0},
-        {"label":"PAGE DOWN", "x":17, "y":0},
-        {"label":"DELETE", "x":18, "y":0},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [7, 8], "x": 5.25, "y": 4},
+                {"matrix": [7, 9], "x": 6.25, "y": 4},
+                {"matrix": [7, 10], "x": 7.25, "y": 4},
+                {"matrix": [7, 11], "x": 8.25, "y": 4},
+                {"matrix": [4, 5], "x": 9.25, "y": 4},
+                {"matrix": [4, 6], "x": 10.25, "y": 4},
+                {"matrix": [4, 7], "x": 11.25, "y": 4},
+                {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 4], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4},
+                {"matrix": [4, 10], "x": 16, "y": 4},
+                {"matrix": [4, 11], "x": 17, "y": 4},
+                {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
 
-        {"label":"GRAVE", "x":0, "y":1},
-        {"label":"1", "x":1, "y":1},
-        {"label":"2", "x":2, "y":1},
-        {"label":"3", "x":3, "y":1},
-        {"label":"4", "x":4, "y":1},
-        {"label":"5", "x":5, "y":1},
-        {"label":"6", "x":6, "y":1},
-        {"label":"7", "x":7, "y":1},
-        {"label":"8", "x":8, "y":1},
-        {"label":"9", "x":9, "y":1},
-        {"label":"0", "x":10, "y":1},
-        {"label":"MINUS", "x":11, "y":1},
-        {"label":"EQUAL", "x":12, "y":1},
-        {"label":"BACKSPACE", "x":13, "y":1},
-        {"label":"BACKSPACE", "x":14, "y":1},
-        {"label":"NUM LOCK", "x":15, "y":1},
-        {"label":"KEYPAD /", "x":16, "y":1},
-        {"label":"KEYPAD *", "x":17, "y":1},
-        {"label":"KEYPAD -", "x":18, "y":1},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 5], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 7], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 13, "y": 5},
+                {"matrix": [5, 3], "x": 14, "y": 5},
+                {"matrix": [5, 4], "x": 15, "y": 5},
+                {"matrix": [5, 10], "x": 16, "y": 5},
+                {"matrix": [5, 11], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_split_shift_and_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 2], "x": 7, "y": 0},
+                {"matrix": [6, 3], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 10, "y": 0},
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [7, 12], "x": 18, "y": 0},
 
-        {"label":"TAB", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"LBRACKET", "x":11.5, "y":2},
-        {"label":"RBRACKET", "x":12.5, "y":2},
-        {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
-        {"label":"KEYPAD 7", "x":15, "y":2},
-        {"label":"KEYPAD 8", "x":16, "y":2},
-        {"label":"KEYPAD 9", "x":17, "y":2},
-        {"label":"KEYPAD +", "x":18, "y":2},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [6, 4], "x": 5, "y": 1},
+                {"matrix": [6, 5], "x": 6, "y": 1},
+                {"matrix": [6, 6], "x": 7, "y": 1},
+                {"matrix": [6, 7], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [7, 0], "x": 13, "y": 1},
+                {"matrix": [7, 1], "x": 14, "y": 1},
+                {"matrix": [1, 9], "x": 15, "y": 1},
+                {"matrix": [1, 10], "x": 16, "y": 1},
+                {"matrix": [1, 11], "x": 17, "y": 1},
+                {"matrix": [1, 12], "x": 18, "y": 1},
 
-        {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":"SEMICOLON", "x":10.75, "y":3},
-        {"label":"QUOTE", "x":11.75, "y":3},
-        {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
-        {"label":"KEYPAD 4", "x":15, "y":3},
-        {"label":"KEYPAD 5", "x":16, "y":3},
-        {"label":"KEYPAD 6", "x":17, "y":3},
-        {"label":"KEYPAD +", "x":18, "y":3},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [6, 8], "x": 5.5, "y": 2},
+                {"matrix": [6, 9], "x": 6.5, "y": 2},
+                {"matrix": [6, 10], "x": 7.5, "y": 2},
+                {"matrix": [6, 11], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.5, "y": 2},
+                {"matrix": [2, 6], "x": 10.5, "y": 2},
+                {"matrix": [2, 7], "x": 11.5, "y": 2},
+                {"matrix": [2, 8], "x": 12.5, "y": 2},
+                {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 9], "x": 15, "y": 2},
+                {"matrix": [2, 10], "x": 16, "y": 2},
+                {"matrix": [2, 11], "x": 17, "y": 2},
+                {"matrix": [2, 12], "x": 18, "y": 2},
 
-        {"label":"LSHIFT", "x":0, "y":4, "w":1.25},
-        {"label":"ISO BACKSLASH", "x":1.25, "y":4},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":"COMMA", "x":9.25, "y":4},
-        {"label":"PERIOD", "x":10.25, "y":4},
-        {"label":"SLASH", "x":11.25, "y":4},
-        {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
-        {"label":"UP", "x":14, "y":4},
-        {"label":"KEYPAD 1", "x":15, "y":4},
-        {"label":"KEYPAD 2", "x":16, "y":4},
-        {"label":"KEYPAD 3", "x":17, "y":4},
-        {"label":"KEYPAD ENTER", "x":18, "y":4},
+                {"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": [6, 12], "x": 5.75, "y": 3},
+                {"matrix": [7, 5], "x": 6.75, "y": 3},
+                {"matrix": [7, 6], "x": 7.75, "y": 3},
+                {"matrix": [7, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 5], "x": 9.75, "y": 3},
+                {"matrix": [3, 6], "x": 10.75, "y": 3},
+                {"matrix": [3, 7], "x": 11.75, "y": 3},
+                {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 15, "y": 3},
+                {"matrix": [3, 10], "x": 16, "y": 3},
+                {"matrix": [3, 11], "x": 17, "y": 3},
+                {"matrix": [3, 12], "x": 18, "y": 3},
 
-        {"label":"LCTRL", "x":0, "y":5, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
-        {"label":"LALT", "x":2.5, "y":5, "w":1.25},
-        {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
-        {"label":"RALT", "x":10, "y":5},
-        {"label":"MENU", "x":11, "y":5},
-        {"label":"RCTRL", "x":12, "y":5},
-        {"label":"LEFT", "x":13, "y":5},
-        {"label":"DOWN", "x":14, "y":5},
-        {"label":"RIGHT", "x":15, "y":5},
-        {"label":"KEYPAD 0", "x":16, "y":5},
-        {"label":"KEYPAD .", "x":17, "y":5},
-        {"label":"KEYPAD ENTER", "x":18, "y":5}
-      ]
-    },
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [7, 8], "x": 5.25, "y": 4},
+                {"matrix": [7, 9], "x": 6.25, "y": 4},
+                {"matrix": [7, 10], "x": 7.25, "y": 4},
+                {"matrix": [7, 11], "x": 8.25, "y": 4},
+                {"matrix": [4, 5], "x": 9.25, "y": 4},
+                {"matrix": [4, 6], "x": 10.25, "y": 4},
+                {"matrix": [4, 7], "x": 11.25, "y": 4},
+                {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 4], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4},
+                {"matrix": [4, 10], "x": 16, "y": 4},
+                {"matrix": [4, 11], "x": 17, "y": 4},
+                {"matrix": [4, 12], "x": 18, "y": 4},
 
-    "LAYOUT_iso": {
-      "layout": [
-        {"label":"ESC", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PRINT SCREEN", "x":13, "y":0},
-        {"label":"HOME", "x":14, "y":0},
-        {"label":"END", "x":15, "y":0},
-        {"label":"PAGE UP", "x":16, "y":0},
-        {"label":"PAGE DOWN", "x":17, "y":0},
-        {"label":"DELETE", "x":18, "y":0},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 5], "x": 10, "y": 5},
+                {"matrix": [5, 6], "x": 11, "y": 5},
+                {"matrix": [5, 7], "x": 12, "y": 5},
+                {"matrix": [5, 8], "x": 13, "y": 5},
+                {"matrix": [5, 3], "x": 14, "y": 5},
+                {"matrix": [5, 4], "x": 15, "y": 5},
+                {"matrix": [5, 10], "x": 16, "y": 5},
+                {"matrix": [5, 11], "x": 17, "y": 5},
+                {"matrix": [5, 12], "x": 18, "y": 5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 2], "x": 7, "y": 0},
+                {"matrix": [6, 3], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 10, "y": 0},
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [7, 12], "x": 18, "y": 0},
 
-        {"label":"GRAVE", "x":0, "y":1},
-        {"label":"1", "x":1, "y":1},
-        {"label":"2", "x":2, "y":1},
-        {"label":"3", "x":3, "y":1},
-        {"label":"4", "x":4, "y":1},
-        {"label":"5", "x":5, "y":1},
-        {"label":"6", "x":6, "y":1},
-        {"label":"7", "x":7, "y":1},
-        {"label":"8", "x":8, "y":1},
-        {"label":"9", "x":9, "y":1},
-        {"label":"0", "x":10, "y":1},
-        {"label":"MINUS", "x":11, "y":1},
-        {"label":"EQUAL", "x":12, "y":1},
-        {"label":"BACKSPACE", "x":13, "y":1, "w":2},
-        {"label":"NUM LOCK", "x":15, "y":1},
-        {"label":"KEYPAD /", "x":16, "y":1},
-        {"label":"KEYPAD *", "x":17, "y":1},
-        {"label":"KEYPAD -", "x":18, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [6, 4], "x": 5, "y": 1},
+                {"matrix": [6, 5], "x": 6, "y": 1},
+                {"matrix": [6, 6], "x": 7, "y": 1},
+                {"matrix": [6, 7], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [7, 1], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 9], "x": 15, "y": 1},
+                {"matrix": [1, 10], "x": 16, "y": 1},
+                {"matrix": [1, 11], "x": 17, "y": 1},
+                {"matrix": [1, 12], "x": 18, "y": 1},
 
-        {"label":"TAB", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"LBRACKET", "x":11.5, "y":2},
-        {"label":"RBRACKET", "x":12.5, "y":2},
-        {"label":"KEYPAD 7", "x":15, "y":2},
-        {"label":"KEYPAD 8", "x":16, "y":2},
-        {"label":"KEYPAD 9", "x":17, "y":2},
-        {"label":"KEYPAD +", "x":18, "y":2, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [6, 8], "x": 5.5, "y": 2},
+                {"matrix": [6, 9], "x": 6.5, "y": 2},
+                {"matrix": [6, 10], "x": 7.5, "y": 2},
+                {"matrix": [6, 11], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.5, "y": 2},
+                {"matrix": [2, 6], "x": 10.5, "y": 2},
+                {"matrix": [2, 7], "x": 11.5, "y": 2},
+                {"matrix": [2, 8], "x": 12.5, "y": 2},
+                {"matrix": [2, 9], "x": 15, "y": 2},
+                {"matrix": [2, 10], "x": 16, "y": 2},
+                {"matrix": [2, 11], "x": 17, "y": 2},
+                {"matrix": [2, 12], "x": 18, "y": 2, "h": 2},
 
-        {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":"SEMICOLON", "x":10.75, "y":3},
-        {"label":"QUOTE", "x":11.75, "y":3},
-        {"label":"ISO HASH", "x":12.75, "y":3},
-        {"label":"ENTER", "x":13.75, "y":2, "w":1.25, "h":2},
-        {"label":"KEYPAD 4", "x":15, "y":3},
-        {"label":"KEYPAD 5", "x":16, "y":3},
-        {"label":"KEYPAD 6", "x":17, "y":3},
+                {"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": [6, 12], "x": 5.75, "y": 3},
+                {"matrix": [7, 5], "x": 6.75, "y": 3},
+                {"matrix": [7, 6], "x": 7.75, "y": 3},
+                {"matrix": [7, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 5], "x": 9.75, "y": 3},
+                {"matrix": [3, 6], "x": 10.75, "y": 3},
+                {"matrix": [3, 7], "x": 11.75, "y": 3},
+                {"matrix": [7, 3], "x": 12.75, "y": 3},
+                {"matrix": [3, 8], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 9], "x": 15, "y": 3},
+                {"matrix": [3, 10], "x": 16, "y": 3},
+                {"matrix": [3, 11], "x": 17, "y": 3},
 
-        {"label":"LSHIFT", "x":0, "y":4, "w":1.25},
-        {"label":"ISO BACKSLASH", "x":1.25, "y":4},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":"COMMA", "x":9.25, "y":4},
-        {"label":"PERIOD", "x":10.25, "y":4},
-        {"label":"SLASH", "x":11.25, "y":4},
-        {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
-        {"label":"UP", "x":14, "y":4},
-        {"label":"KEYPAD 1", "x":15, "y":4},
-        {"label":"KEYPAD 2", "x":16, "y":4},
-        {"label":"KEYPAD 3", "x":17, "y":4},
-        {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [7, 8], "x": 5.25, "y": 4},
+                {"matrix": [7, 9], "x": 6.25, "y": 4},
+                {"matrix": [7, 10], "x": 7.25, "y": 4},
+                {"matrix": [7, 11], "x": 8.25, "y": 4},
+                {"matrix": [4, 5], "x": 9.25, "y": 4},
+                {"matrix": [4, 6], "x": 10.25, "y": 4},
+                {"matrix": [4, 7], "x": 11.25, "y": 4},
+                {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 4], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4},
+                {"matrix": [4, 10], "x": 16, "y": 4},
+                {"matrix": [4, 11], "x": 17, "y": 4},
+                {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
 
-        {"label":"LCTRL", "x":0, "y":5, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
-        {"label":"LALT", "x":2.5, "y":5, "w":1.25},
-        {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
-        {"label":"RALT", "x":10, "y":5},
-        {"label":"MENU", "x":11, "y":5},
-        {"label":"RCTRL", "x":12, "y":5},
-        {"label":"LEFT", "x":13, "y":5},
-        {"label":"DOWN", "x":14, "y":5},
-        {"label":"RIGHT", "x":15, "y":5},
-        {"label":"KEYPAD 0", "x":16, "y":5},
-        {"label":"KEYPAD .", "x":17, "y":5}
-      ]
-    }
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 5], "x": 10, "y": 5},
+                {"matrix": [5, 6], "x": 11, "y": 5},
+                {"matrix": [5, 7], "x": 12, "y": 5},
+                {"matrix": [5, 8], "x": 13, "y": 5},
+                {"matrix": [5, 3], "x": 14, "y": 5},
+                {"matrix": [5, 4], "x": 15, "y": 5},
+                {"matrix": [5, 10], "x": 16, "y": 5},
+                {"matrix": [5, 11], "x": 17, "y": 5}
+            ]
+        }
   }
 }
diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h
index c07c913bb9..eb512c52de 100644
--- a/keyboards/dztech/endless80/config.h
+++ b/keyboards/dztech/endless80/config.h
@@ -15,12 +15,6 @@
  */
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, B5 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, C6, C7, F5, F4, F1, F0 }
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +32,3 @@
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
 #define RGBLIGHT_LIMIT_VAL 130 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#endif
diff --git a/keyboards/dztech/endless80/endless80.c b/keyboards/dztech/endless80/endless80.c
deleted file mode 100644
index 27135b54d4..0000000000
--- a/keyboards/dztech/endless80/endless80.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "endless80.h"
\ No newline at end of file
diff --git a/keyboards/dztech/endless80/endless80.h b/keyboards/dztech/endless80/endless80.h
deleted file mode 100644
index 66eab01dd1..0000000000
--- a/keyboards/dztech/endless80/endless80.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#define XXX KC_NO
-#include "quantum.h"
-
-/*
- *              ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- *              │00 │   │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0D │0E │1E │
- *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───┬───�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │2E │3D │3E │
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤      ┌─────�
- *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │4C │4D │4E │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘   ┌──┴�??  │ ISO Enter
- *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C      │                 │?? │    │ (Solderable PCB only)
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───�       └───┴────┘
- * │40      │   │40  │53 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B        │     │5C │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───�
- *              │50  │51  │52  │56                      │57  │58  │59  │5A  │ │5B │5D │5E │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- *               Standard Bottom Row only available on Solderable PCB
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *              │50   │51 │52   │56                         │58   │59 │5A   │ Tsangan/WKL
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,   K0D, K0E, K1E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, K3D, K3E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K4C, K4D, K4E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                  \
-    K40, K53, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4B,        K5C,      \
-    K50, K51, K52,                K56,                K57, K58, K59, K5A,   K5B, K5D, K5E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, K53, XXX, XXX, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,   K0D, K0E, K1E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, K3D, K3E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K4C, K4D, K4E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                  \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4B,        K5C,      \
-    K50, K51, K52,                K56,                K57, K58, K59, K5A,   K5B, K5D, K5E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,   K0D, K0E, K1E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, K3D, K3E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K4C, K4D, K4E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                  \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4B,        K5C,      \
-    K50, K51, K52,                K56,                     K58, K59, K5A,   K5B, K5D, K5E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, K58, K59, K5A, K5B, K5C, K5D, K5E }  \
-}
diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json
index eb80943837..df23b681e8 100644
--- a/keyboards/dztech/endless80/info.json
+++ b/keyboards/dztech/endless80/info.json
@@ -8,300 +8,332 @@
         "pid": "0x1015",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "C6", "C7", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "E6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [1, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [5, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [1, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [5, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"label":"Alt", "x":11, "y":5.5, "w":1.5},
-                {"label":"Menu", "x":12.5, "y":5.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [1, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [5, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json
index b28edb717a..bce81094c2 100644
--- a/keyboards/dztech/tofu/ii/v1/info.json
+++ b/keyboards/dztech/tofu/ii/v1/info.json
@@ -94,72 +94,72 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-                { "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-                { "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-                { "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-                { "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-                { "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-                { "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-                { "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-                { "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
                 { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
-                { "matrix": [0, 14], "w": 1, "x": 15, "y": 0 },
+                { "matrix": [0, 14], "x": 15, "y": 0 },
                 { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-                { "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-                { "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-                { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-                { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-                { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-                { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-                { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-                { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-                { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-                { "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-                { "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
                 { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "matrix": [1, 14], "w": 1, "x": 15, "y": 1 },
+                { "matrix": [1, 14], "x": 15, "y": 1 },
                 { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-                { "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-                { "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-                { "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-                { "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-                { "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-                { "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-                { "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-                { "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-                { "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-                { "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
                 { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
-                { "matrix": [2, 14], "w": 1, "x": 15, "y": 2 },
+                { "matrix": [2, 14], "x": 15, "y": 2 },
                 { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
-                { "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
-                { "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
-                { "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
-                { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
-                { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
-                { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
-                { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
-                { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
-                { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
+                { "matrix": [3, 1], "x": 2.25, "y": 3 },
+                { "matrix": [3, 2], "x": 3.25, "y": 3 },
+                { "matrix": [3, 3], "x": 4.25, "y": 3 },
+                { "matrix": [3, 4], "x": 5.25, "y": 3 },
+                { "matrix": [3, 5], "x": 6.25, "y": 3 },
+                { "matrix": [3, 6], "x": 7.25, "y": 3 },
+                { "matrix": [3, 7], "x": 8.25, "y": 3 },
+                { "matrix": [3, 8], "x": 9.25, "y": 3 },
+                { "matrix": [3, 9], "x": 10.25, "y": 3 },
+                { "matrix": [3, 10], "x": 11.25, "y": 3 },
                 { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 },
-                { "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
                 { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
                 { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
                 { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
                 { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
                 { "matrix": [4, 8], "w": 1.25, "x":10, "y":4 },
                 { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "matrix": [4, 12], "w": 1, "x": 13, "y": 4 },
-                { "matrix": [4, 13], "w": 1, "x": 14, "y": 4 },
-                { "matrix": [4, 14], "w": 1, "x": 15, "y": 4 }
+                { "matrix": [4, 12], "x": 13, "y": 4 },
+                { "matrix": [4, 13], "x": 14, "y": 4 },
+                { "matrix": [4, 14], "x": 15, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/info.json
index a786b8689d..338c040255 100644
--- a/keyboards/dztech/tofu/jr/v1/info.json
+++ b/keyboards/dztech/tofu/jr/v1/info.json
@@ -97,74 +97,74 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-                { "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-                { "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-                { "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-                { "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-                { "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-                { "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-                { "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-                { "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
                 { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
-                { "matrix": [0, 14], "w": 1, "x": 15, "y": 0 },
+                { "matrix": [0, 14], "x": 15, "y": 0 },
                 { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-                { "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-                { "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-                { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-                { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-                { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-                { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-                { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-                { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-                { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-                { "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-                { "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
                 { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "matrix": [1, 14], "w": 1, "x": 15, "y": 1 },
+                { "matrix": [1, 14], "x": 15, "y": 1 },
                 { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-                { "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-                { "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-                { "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-                { "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-                { "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-                { "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-                { "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-                { "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-                { "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-                { "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
                 { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
-                { "matrix": [2, 14], "w": 1, "x": 15, "y": 2 },
+                { "matrix": [2, 14], "x": 15, "y": 2 },
                 { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
-                { "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
-                { "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
-                { "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
-                { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
-                { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
-                { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
-                { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
-                { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
-                { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
+                { "matrix": [3, 1], "x": 2.25, "y": 3 },
+                { "matrix": [3, 2], "x": 3.25, "y": 3 },
+                { "matrix": [3, 3], "x": 4.25, "y": 3 },
+                { "matrix": [3, 4], "x": 5.25, "y": 3 },
+                { "matrix": [3, 5], "x": 6.25, "y": 3 },
+                { "matrix": [3, 6], "x": 7.25, "y": 3 },
+                { "matrix": [3, 7], "x": 8.25, "y": 3 },
+                { "matrix": [3, 8], "x": 9.25, "y": 3 },
+                { "matrix": [3, 9], "x": 10.25, "y": 3 },
+                { "matrix": [3, 10], "x": 11.25, "y": 3 },
                 { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 },
-                { "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
-                { "matrix": [3, 14], "w": 1, "x": 15, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+                { "matrix": [3, 14], "x": 15, "y": 3 },
                 { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
                 { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
                 { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
                 { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
-                { "matrix": [4, 8], "w": 1, "x": 10, "y": 4 },
-                { "matrix": [4, 9], "w": 1, "x": 11, "y": 4 },
-                { "matrix": [4, 10], "w": 1, "x": 12, "y": 4 },
-                { "matrix": [4, 12], "w": 1, "x": 13, "y": 4 },
-                { "matrix": [4, 13], "w": 1, "x": 14, "y": 4 },
-                { "matrix": [4, 14], "w": 1, "x": 15, "y": 4 }
+                { "matrix": [4, 8], "x": 10, "y": 4 },
+                { "matrix": [4, 9], "x": 11, "y": 4 },
+                { "matrix": [4, 10], "x": 12, "y": 4 },
+                { "matrix": [4, 12], "x": 13, "y": 4 },
+                { "matrix": [4, 13], "x": 14, "y": 4 },
+                { "matrix": [4, 14], "x": 15, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/e88/config.h b/keyboards/e88/config.h
index 3b5d16a588..230ff5e311 100644
--- a/keyboards/e88/config.h
+++ b/keyboards/e88/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B7, D7, B4, C6, B5, B6 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D0, D1, D2, D3, B3, B2, B1, E6, D5, D6, D4 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/e88/e88.c b/keyboards/e88/e88.c
deleted file mode 100644
index 336660a0d3..0000000000
--- a/keyboards/e88/e88.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "e88.h"
diff --git a/keyboards/e88/info.json b/keyboards/e88/info.json
index 67b4044a56..90c3762785 100644
--- a/keyboards/e88/info.json
+++ b/keyboards/e88/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0187",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D0", "D1", "D2", "D3", "B3", "B2", "B1", "E6", "D5", "D6", "D4"],
+        "rows": ["B7", "D7", "B4", "C6", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "B7",
         "esc_output": "F0"
diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h
index f4954fcd11..fd41a6969d 100644
--- a/keyboards/ealdin/quadrant/config.h
+++ b/keyboards/ealdin/quadrant/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B2, F7, B3, B6, B1 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 7
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -42,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json
index d8b388c331..eec8bc9579 100644
--- a/keyboards/ealdin/quadrant/info.json
+++ b/keyboards/ealdin/quadrant/info.json
@@ -8,29 +8,407 @@
         "pid": "0x5154",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "F6", "F5", "F4"],
+        "rows": ["B2", "F7", "B3", "B6", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D5", "pin_b": "F1"}
         ]
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x14"],
     "layouts": {
         "LAYOUT_ortho_5x14": {
-                "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
-            },
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1},
+                {"matrix": [3, 1], "x": 1, "y": 1},
+                {"matrix": [3, 2], "x": 2, "y": 1},
+                {"matrix": [3, 3], "x": 3, "y": 1},
+                {"matrix": [3, 4], "x": 4, "y": 1},
+                {"matrix": [3, 5], "x": 5, "y": 1},
+                {"matrix": [3, 6], "x": 6, "y": 1},
+                {"matrix": [3, 7], "x": 7, "y": 1},
+                {"matrix": [3, 8], "x": 8, "y": 1},
+                {"matrix": [3, 9], "x": 9, "y": 1},
+                {"matrix": [3, 10], "x": 10, "y": 1},
+                {"matrix": [3, 11], "x": 11, "y": 1},
+                {"matrix": [3, 12], "x": 12, "y": 1},
+                {"matrix": [3, 13], "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 3},
+                {"matrix": [1, 1], "x": 1, "y": 3},
+                {"matrix": [1, 2], "x": 2, "y": 3},
+                {"matrix": [1, 3], "x": 3, "y": 3},
+                {"matrix": [1, 4], "x": 4, "y": 3},
+                {"matrix": [1, 5], "x": 5, "y": 3},
+                {"matrix": [1, 6], "x": 6, "y": 3},
+                {"matrix": [1, 7], "x": 7, "y": 3},
+                {"matrix": [1, 8], "x": 8, "y": 3},
+                {"matrix": [1, 9], "x": 9, "y": 3},
+                {"matrix": [1, 10], "x": 10, "y": 3},
+                {"matrix": [1, 11], "x": 11, "y": 3},
+                {"matrix": [1, 12], "x": 12, "y": 3},
+                {"matrix": [1, 13], "x": 13, "y": 3},
+
+                {"matrix": [0, 0], "x": 0, "y": 4},
+                {"matrix": [0, 1], "x": 1, "y": 4},
+                {"matrix": [0, 2], "x": 2, "y": 4},
+                {"matrix": [0, 3], "x": 3, "y": 4},
+                {"matrix": [0, 4], "x": 4, "y": 4},
+                {"matrix": [0, 5], "x": 5, "y": 4},
+                {"matrix": [0, 6], "x": 6, "y": 4},
+                {"matrix": [0, 7], "x": 7, "y": 4},
+                {"matrix": [0, 8], "x": 8, "y": 4},
+                {"matrix": [0, 9], "x": 9, "y": 4},
+                {"matrix": [0, 10], "x": 10, "y": 4},
+                {"matrix": [0, 11], "x": 11, "y": 4},
+                {"matrix": [0, 12], "x": 12, "y": 4},
+                {"matrix": [0, 13], "x": 13, "y": 4}
+            ]
+        },
         "LAYOUT_ortho_5x14_1x2uC": {
-                "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4, "w":2}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
-            },
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1},
+                {"matrix": [3, 1], "x": 1, "y": 1},
+                {"matrix": [3, 2], "x": 2, "y": 1},
+                {"matrix": [3, 3], "x": 3, "y": 1},
+                {"matrix": [3, 4], "x": 4, "y": 1},
+                {"matrix": [3, 5], "x": 5, "y": 1},
+                {"matrix": [3, 6], "x": 6, "y": 1},
+                {"matrix": [3, 7], "x": 7, "y": 1},
+                {"matrix": [3, 8], "x": 8, "y": 1},
+                {"matrix": [3, 9], "x": 9, "y": 1},
+                {"matrix": [3, 10], "x": 10, "y": 1},
+                {"matrix": [3, 11], "x": 11, "y": 1},
+                {"matrix": [3, 12], "x": 12, "y": 1},
+                {"matrix": [3, 13], "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 3},
+                {"matrix": [1, 1], "x": 1, "y": 3},
+                {"matrix": [1, 2], "x": 2, "y": 3},
+                {"matrix": [1, 3], "x": 3, "y": 3},
+                {"matrix": [1, 4], "x": 4, "y": 3},
+                {"matrix": [1, 5], "x": 5, "y": 3},
+                {"matrix": [1, 6], "x": 6, "y": 3},
+                {"matrix": [1, 7], "x": 7, "y": 3},
+                {"matrix": [1, 8], "x": 8, "y": 3},
+                {"matrix": [1, 9], "x": 9, "y": 3},
+                {"matrix": [1, 10], "x": 10, "y": 3},
+                {"matrix": [1, 11], "x": 11, "y": 3},
+                {"matrix": [1, 12], "x": 12, "y": 3},
+                {"matrix": [1, 13], "x": 13, "y": 3},
+
+                {"matrix": [0, 0], "x": 0, "y": 4},
+                {"matrix": [0, 1], "x": 1, "y": 4},
+                {"matrix": [0, 2], "x": 2, "y": 4},
+                {"matrix": [0, 3], "x": 3, "y": 4},
+                {"matrix": [0, 4], "x": 4, "y": 4},
+                {"matrix": [0, 5], "x": 5, "y": 4},
+                {"matrix": [0, 7], "x": 6, "y": 4, "w": 2},
+                {"matrix": [0, 8], "x": 8, "y": 4},
+                {"matrix": [0, 9], "x": 9, "y": 4},
+                {"matrix": [0, 10], "x": 10, "y": 4},
+                {"matrix": [0, 11], "x": 11, "y": 4},
+                {"matrix": [0, 12], "x": 12, "y": 4},
+                {"matrix": [0, 13], "x": 13, "y": 4}
+            ]
+        },
         "LAYOUT_ortho_5x14_1x2uL": {
-                "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4, "w":2}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
-            },
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1},
+                {"matrix": [3, 1], "x": 1, "y": 1},
+                {"matrix": [3, 2], "x": 2, "y": 1},
+                {"matrix": [3, 3], "x": 3, "y": 1},
+                {"matrix": [3, 4], "x": 4, "y": 1},
+                {"matrix": [3, 5], "x": 5, "y": 1},
+                {"matrix": [3, 6], "x": 6, "y": 1},
+                {"matrix": [3, 7], "x": 7, "y": 1},
+                {"matrix": [3, 8], "x": 8, "y": 1},
+                {"matrix": [3, 9], "x": 9, "y": 1},
+                {"matrix": [3, 10], "x": 10, "y": 1},
+                {"matrix": [3, 11], "x": 11, "y": 1},
+                {"matrix": [3, 12], "x": 12, "y": 1},
+                {"matrix": [3, 13], "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 3},
+                {"matrix": [1, 1], "x": 1, "y": 3},
+                {"matrix": [1, 2], "x": 2, "y": 3},
+                {"matrix": [1, 3], "x": 3, "y": 3},
+                {"matrix": [1, 4], "x": 4, "y": 3},
+                {"matrix": [1, 5], "x": 5, "y": 3},
+                {"matrix": [1, 6], "x": 6, "y": 3},
+                {"matrix": [1, 7], "x": 7, "y": 3},
+                {"matrix": [1, 8], "x": 8, "y": 3},
+                {"matrix": [1, 9], "x": 9, "y": 3},
+                {"matrix": [1, 10], "x": 10, "y": 3},
+                {"matrix": [1, 11], "x": 11, "y": 3},
+                {"matrix": [1, 12], "x": 12, "y": 3},
+                {"matrix": [1, 13], "x": 13, "y": 3},
+
+                {"matrix": [0, 0], "x": 0, "y": 4},
+                {"matrix": [0, 1], "x": 1, "y": 4},
+                {"matrix": [0, 2], "x": 2, "y": 4},
+                {"matrix": [0, 3], "x": 3, "y": 4},
+                {"matrix": [0, 4], "x": 4, "y": 4},
+                {"matrix": [0, 6], "x": 5, "y": 4, "w": 2},
+                {"matrix": [0, 7], "x": 7, "y": 4},
+                {"matrix": [0, 8], "x": 8, "y": 4},
+                {"matrix": [0, 9], "x": 9, "y": 4},
+                {"matrix": [0, 10], "x": 10, "y": 4},
+                {"matrix": [0, 11], "x": 11, "y": 4},
+                {"matrix": [0, 12], "x": 12, "y": 4},
+                {"matrix": [0, 13], "x": 13, "y": 4}
+            ]
+        },
         "LAYOUT_ortho_5x14_1x2uR": {
-                "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4, "w":2}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
-            },
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1},
+                {"matrix": [3, 1], "x": 1, "y": 1},
+                {"matrix": [3, 2], "x": 2, "y": 1},
+                {"matrix": [3, 3], "x": 3, "y": 1},
+                {"matrix": [3, 4], "x": 4, "y": 1},
+                {"matrix": [3, 5], "x": 5, "y": 1},
+                {"matrix": [3, 6], "x": 6, "y": 1},
+                {"matrix": [3, 7], "x": 7, "y": 1},
+                {"matrix": [3, 8], "x": 8, "y": 1},
+                {"matrix": [3, 9], "x": 9, "y": 1},
+                {"matrix": [3, 10], "x": 10, "y": 1},
+                {"matrix": [3, 11], "x": 11, "y": 1},
+                {"matrix": [3, 12], "x": 12, "y": 1},
+                {"matrix": [3, 13], "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 3},
+                {"matrix": [1, 1], "x": 1, "y": 3},
+                {"matrix": [1, 2], "x": 2, "y": 3},
+                {"matrix": [1, 3], "x": 3, "y": 3},
+                {"matrix": [1, 4], "x": 4, "y": 3},
+                {"matrix": [1, 5], "x": 5, "y": 3},
+                {"matrix": [1, 6], "x": 6, "y": 3},
+                {"matrix": [1, 7], "x": 7, "y": 3},
+                {"matrix": [1, 8], "x": 8, "y": 3},
+                {"matrix": [1, 9], "x": 9, "y": 3},
+                {"matrix": [1, 10], "x": 10, "y": 3},
+                {"matrix": [1, 11], "x": 11, "y": 3},
+                {"matrix": [1, 12], "x": 12, "y": 3},
+                {"matrix": [1, 13], "x": 13, "y": 3},
+
+                {"matrix": [0, 0], "x": 0, "y": 4},
+                {"matrix": [0, 1], "x": 1, "y": 4},
+                {"matrix": [0, 2], "x": 2, "y": 4},
+                {"matrix": [0, 3], "x": 3, "y": 4},
+                {"matrix": [0, 4], "x": 4, "y": 4},
+                {"matrix": [0, 5], "x": 5, "y": 4},
+                {"matrix": [0, 6], "x": 6, "y": 4},
+                {"matrix": [0, 8], "x": 7, "y": 4, "w": 2},
+                {"matrix": [0, 9], "x": 9, "y": 4},
+                {"matrix": [0, 10], "x": 10, "y": 4},
+                {"matrix": [0, 11], "x": 11, "y": 4},
+                {"matrix": [0, 12], "x": 12, "y": 4},
+                {"matrix": [0, 13], "x": 13, "y": 4}
+            ]
+        },
         "LAYOUT_ortho_5x14_2x2u": {
-                "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":2}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
-            }
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1},
+                {"matrix": [3, 1], "x": 1, "y": 1},
+                {"matrix": [3, 2], "x": 2, "y": 1},
+                {"matrix": [3, 3], "x": 3, "y": 1},
+                {"matrix": [3, 4], "x": 4, "y": 1},
+                {"matrix": [3, 5], "x": 5, "y": 1},
+                {"matrix": [3, 6], "x": 6, "y": 1},
+                {"matrix": [3, 7], "x": 7, "y": 1},
+                {"matrix": [3, 8], "x": 8, "y": 1},
+                {"matrix": [3, 9], "x": 9, "y": 1},
+                {"matrix": [3, 10], "x": 10, "y": 1},
+                {"matrix": [3, 11], "x": 11, "y": 1},
+                {"matrix": [3, 12], "x": 12, "y": 1},
+                {"matrix": [3, 13], "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 3},
+                {"matrix": [1, 1], "x": 1, "y": 3},
+                {"matrix": [1, 2], "x": 2, "y": 3},
+                {"matrix": [1, 3], "x": 3, "y": 3},
+                {"matrix": [1, 4], "x": 4, "y": 3},
+                {"matrix": [1, 5], "x": 5, "y": 3},
+                {"matrix": [1, 6], "x": 6, "y": 3},
+                {"matrix": [1, 7], "x": 7, "y": 3},
+                {"matrix": [1, 8], "x": 8, "y": 3},
+                {"matrix": [1, 9], "x": 9, "y": 3},
+                {"matrix": [1, 10], "x": 10, "y": 3},
+                {"matrix": [1, 11], "x": 11, "y": 3},
+                {"matrix": [1, 12], "x": 12, "y": 3},
+                {"matrix": [1, 13], "x": 13, "y": 3},
+
+                {"matrix": [0, 0], "x": 0, "y": 4},
+                {"matrix": [0, 1], "x": 1, "y": 4},
+                {"matrix": [0, 2], "x": 2, "y": 4},
+                {"matrix": [0, 3], "x": 3, "y": 4},
+                {"matrix": [0, 4], "x": 4, "y": 4},
+                {"matrix": [0, 6], "x": 5, "y": 4, "w": 2},
+                {"matrix": [0, 8], "x": 7, "y": 4, "w": 2},
+                {"matrix": [0, 9], "x": 9, "y": 4},
+                {"matrix": [0, 10], "x": 10, "y": 4},
+                {"matrix": [0, 11], "x": 11, "y": 4},
+                {"matrix": [0, 12], "x": 12, "y": 4},
+                {"matrix": [0, 13], "x": 13, "y": 4}
+            ]
+        }
     }
 }
diff --git a/keyboards/ealdin/quadrant/quadrant.c b/keyboards/ealdin/quadrant/quadrant.c
index a5aff62dae..f98cafd750 100644
--- a/keyboards/ealdin/quadrant/quadrant.c
+++ b/keyboards/ealdin/quadrant/quadrant.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "quadrant.h"
+#include "quantum.h"
 
 
 // Rotary encoder functions:
diff --git a/keyboards/ealdin/quadrant/quadrant.h b/keyboards/ealdin/quadrant/quadrant.h
deleted file mode 100644
index 8c6f5215e8..0000000000
--- a/keyboards/ealdin/quadrant/quadrant.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright 2020 Ealdin Keyboards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define ___ KC_NO
-#define LAYOUT_ortho_5x14( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d  \
-) \
-{ \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }  \
-}
-
-#define LAYOUT_ortho_5x14_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
-    k40, k41, k42, k43, k44, k45,   k47,    k48, k49, k4a, k4b, k4c, k4d  \
-) \
-{ \
-    { k40, k41, k42, k43, k44, k45, ___, k47, k48, k49, k4a, k4b, k4c, k4d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }  \
-}
-
-#define LAYOUT_ortho_5x14_1x2uL( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
-    k40, k41, k42, k43, k44,    k46,   k47, k48, k49, k4a, k4b, k4c, k4d  \
-) \
-{ \
-    { k40, k41, k42, k43, k44, __,  k46, k47, k48, k49, k4a, k4b, k4c, k4d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }  \
-}
-
-#define LAYOUT_ortho_5x14_1x2uR( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
-    k40, k41, k42, k43, k44, k45, k46,    k48,   k49, k4a, k4b, k4c, k4d \
-) \
-{ \
-    { k40, k41, k42, k43, k44, k45, k46, ___, k48, k49, k4a, k4b, k4c, k4d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }  \
-}
-
-#define LAYOUT_ortho_5x14_2x2u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
-    k40, k41, k42, k43, k44,    k46,     k48,    k49, k4a, k4b, k4c, k4d \
-) \
-{ \
-    { k40, k41, k42, k43, k44, ___, k46, ___, k48, k49, k4a, k4b, k4c, k4d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }  \
-}
diff --git a/keyboards/earth_rover/config.h b/keyboards/earth_rover/config.h
index 7c5a907467..e03d0cfcbb 100644
--- a/keyboards/earth_rover/config.h
+++ b/keyboards/earth_rover/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/earth_rover/earth_rover.c b/keyboards/earth_rover/earth_rover.c
deleted file mode 100644
index c12eaa8c0e..0000000000
--- a/keyboards/earth_rover/earth_rover.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 k.bigwheel
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "earth_rover.h"
diff --git a/keyboards/earth_rover/earth_rover.h b/keyboards/earth_rover/earth_rover.h
deleted file mode 100644
index a0676beeb2..0000000000
--- a/keyboards/earth_rover/earth_rover.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 k.bigwheel
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-// clang-format off
-#define LAYOUT( \
-    k00, k01, \
-    k10, k12, k13, k14, \
-    k20, k22, k23, k24, \
-    k30, k32, k33, k34 \
-) { \
-    { KC_NO, k00, k01, KC_NO }, \
-    { k10,   k12, k13, k14   }, \
-    { k20,   k22, k23, k24   }, \
-    { k30,   k32, k33, k34   }, \
-}
-// clang-format on
diff --git a/keyboards/earth_rover/info.json b/keyboards/earth_rover/info.json
index 429c9b1cbd..f53eb4d610 100644
--- a/keyboards/earth_rover/info.json
+++ b/keyboards/earth_rover/info.json
@@ -8,28 +8,33 @@
         "pid": "0xEE11",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k10", "x": 1.25, "y": 0},
-                {"label": "k20", "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
 
-                {"label": "k01", "x": 0, "y": 1.25},
-                {"label": "k11", "x": 1.25, "y": 1.25},
-                {"label": "k21", "x": 2.25, "y": 1.25},
-                {"label": "k31", "x": 3.5, "y": 1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
 
-                {"label": "k02", "x": 0, "y": 2.25},
-                {"label": "k12", "x": 1.25, "y": 2.25},
-                {"label": "k22", "x": 2.25, "y": 2.25},
-                {"label": "k32", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
 
-                {"label": "k03", "x": 0, "y": 3.25},
-                {"label": "k13", "x": 1.25, "y": 3.25},
-                {"label": "k23", "x": 2.25, "y": 3.25},
-                {"label": "k33", "x": 3.5, "y": 3.25}
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25}
             ]
         }
     }
diff --git a/keyboards/eason/aeroboard/aeroboard.c b/keyboards/eason/aeroboard/aeroboard.c
deleted file mode 100644
index 091fcf2fac..0000000000
--- a/keyboards/eason/aeroboard/aeroboard.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Eason
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "aeroboard.h"
diff --git a/keyboards/eason/aeroboard/config.h b/keyboards/eason/aeroboard/config.h
index 3c23bce9be..6c9312eafb 100644
--- a/keyboards/eason/aeroboard/config.h
+++ b/keyboards/eason/aeroboard/config.h
@@ -3,10 +3,6 @@
 
 #pragma once
 
-#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5, A4 }
-#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -17,7 +13,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
diff --git a/keyboards/eason/aeroboard/info.json b/keyboards/eason/aeroboard/info.json
index 73ef41d221..5eb135c953 100644
--- a/keyboards/eason/aeroboard/info.json
+++ b/keyboards/eason/aeroboard/info.json
@@ -8,6 +8,15 @@
         "pid": "0x8870",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5", "A4"],
+        "rows": ["B10", "B1", "B0", "A7", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
diff --git a/keyboards/eason/aeroboard/rules.mk b/keyboards/eason/aeroboard/rules.mk
index edc3e666c4..9f38d0d71b 100644
--- a/keyboards/eason/aeroboard/rules.mk
+++ b/keyboards/eason/aeroboard/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/eason/capsule65/capsule65.c b/keyboards/eason/capsule65/capsule65.c
deleted file mode 100644
index c04abea9e4..0000000000
--- a/keyboards/eason/capsule65/capsule65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 EASON <xiaoxuxk@yeah.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "capsule65.h"
diff --git a/keyboards/eason/capsule65/capsule65.h b/keyboards/eason/capsule65/capsule65.h
deleted file mode 100644
index 69b9662b81..0000000000
--- a/keyboards/eason/capsule65/capsule65.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Copyright 2022 EASON XIAOXUXK@YEAH.NET
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�1D  │ ISO Enter
- *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │2F │   │2C │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴┬──┴────┬───┼───┤   └───┴────┘
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B│3C     │3D │3F │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┼───┬───┼───┼───┤
- *              │40  │41  │42  │45                      │49 │4A │4B │4C │4D │4F │
- *              └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- *              ┌────┬────┬────┬────────────────────────┬────┬────�
- *              │40  │41  │42  │45                      │49  │4A  │ Blocker
- *              └────┴────┴────┴────────────────────────┴────┴────┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────�
- *              │40   │41 │42   │45                         │4A   │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                     K4A,      K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                     K4A,      K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                     K4A,      K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                     K4A,      K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
diff --git a/keyboards/eason/capsule65/config.h b/keyboards/eason/capsule65/config.h
index 176ccc1689..cfe3e84fda 100644
--- a/keyboards/eason/capsule65/config.h
+++ b/keyboards/eason/capsule65/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, D1, B7, D0, F5 }
-#define MATRIX_COL_PINS { D5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, E2, B3, B1, B0, B2 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json
index 4c49f6feef..6496a6be71 100644
--- a/keyboards/eason/capsule65/info.json
+++ b/keyboards/eason/capsule65/info.json
@@ -8,9 +8,17 @@
         "pid": "0x6E6E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D2", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "B3", "B1", "B0", "B2"],
+        "rows": ["F4", "D1", "B7", "D0", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F6"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -20,988 +28,992 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "K00 (F4,D5)", "x": 0, "y": 0 },
-                { "label": "K01 (F4,D2)", "x": 1, "y": 0 },
-                { "label": "K02 (F4,D3)", "x": 2, "y": 0 },
-                { "label": "K03 (F4,D4)", "x": 3, "y": 0 },
-                { "label": "K04 (F4,D6)", "x": 4, "y": 0 },
-                { "label": "K05 (F4,D7)", "x": 5, "y": 0 },
-                { "label": "K06 (F4,B4)", "x": 6, "y": 0 },
-                { "label": "K07 (F4,B5)", "x": 7, "y": 0 },
-                { "label": "K08 (F4,B6)", "x": 8, "y": 0 },
-                { "label": "K09 (F4,C6)", "x": 9, "y": 0 },
-                { "label": "K0A (F4,C7)", "x": 10, "y": 0 },
-                { "label": "K0B (F4,E2)", "x": 11, "y": 0 },
-                { "label": "K0C (F4,B3)", "x": 12, "y": 0 },
-                { "label": "K0D (F4,B1)", "x": 13, "y": 0 },
-                { "label": "K0E (F4,B0)", "x": 14, "y": 0 },
-                { "label": "K0F (F4,B2)", "x": 15, "y": 0 },
-                { "label": "K10 (D1,D5)", "x": 0, "y": 1 ,"w":1.5},
-                { "label": "K11 (D1,D2)", "x": 1.5, "y": 1},
-                { "label": "K12 (D1,D3)", "x": 2.5, "y": 1 },
-                { "label": "K13 (D1,D4)", "x": 3.5, "y": 1 },
-                { "label": "K14 (D1,D6)", "x": 4.5, "y": 1 },
-                { "label": "K15 (D1,D7)", "x": 5.5, "y": 1 },
-                { "label": "K16 (D1,B4)", "x": 6.5, "y": 1 },
-                { "label": "K17 (D1,B5)", "x": 7.5, "y": 1 },
-                { "label": "K18 (D1,B6)", "x": 8.5, "y": 1 },
-                { "label": "K19 (D1,C6)", "x": 9.5, "y": 1 },
-                { "label": "K1A (D1,C7)", "x": 10.5, "y": 1 },
-                { "label": "K1B (D1,E2)", "x": 11.5, "y": 1 },
-                { "label": "K1C (D1,B3)", "x": 12.5, "y": 1 },
-                { "label": "K1D (D1,B1)", "x": 13.5, "y": 1 ,"w":1.5},
-                { "label": "K1F (D1,B2)", "x": 15, "y": 1 },
-                { "label": "K20 (B7,D5)", "x": 0, "y": 2,"w":1.75 },
-                { "label": "K21 (B7,D2)", "x": 1.75, "y": 2 },
-                { "label": "K22 (B7,D3)", "x": 2.75, "y": 2 },
-                { "label": "K23 (B7,D4)", "x": 3.75, "y": 2 },
-                { "label": "K24 (B7,D6)", "x": 4.75, "y": 2 },
-                { "label": "K25 (B7,D7)", "x": 5.75, "y": 2 },
-                { "label": "K26 (B7,B4)", "x": 6.75, "y": 2 },
-                { "label": "K27 (B7,B5)", "x": 7.75, "y": 2 },
-                { "label": "K28 (B7,B6)", "x": 8.75, "y": 2 },
-                { "label": "K29 (B7,C6)", "x": 9.75, "y": 2 },
-                { "label": "K2A (B7,C7)", "x": 10.75, "y": 2 },
-                { "label": "K2B (B7,E2)", "x": 11.75, "y": 2 },
-                { "label": "K2C (B7,B3)", "x": 12.75, "y": 2 ,"w":2.25},
-                { "label": "K2F (B7,B2)", "x": 15, "y": 2 },
-                { "label": "K30 (D0,D5)", "x": 0, "y": 3 ,"w":1.25},
-                { "label": "K31 (D0,D2)", "x": 1.25, "y": 3 },
-                { "label": "K32 (D0,D3)", "x": 2.25, "y": 3 },
-                { "label": "K33 (D0,D4)", "x": 3.25, "y": 3 },
-                { "label": "K34 (D0,D6)", "x": 4.25, "y": 3 },
-                { "label": "K35 (D0,D7)", "x": 5.25, "y": 3 },
-                { "label": "K36 (D0,B4)", "x": 6.25, "y": 3 },
-                { "label": "K37 (D0,B5)", "x": 7.25, "y": 3 },
-                { "label": "K38 (D0,B6)", "x": 8.25, "y": 3 },
-                { "label": "K39 (D0,C6)", "x": 9.25, "y": 3 },
-                { "label": "K3A (D0,C7)", "x": 10.25, "y": 3 },
-                { "label": "K3B (D0,E2)", "x": 11.25, "y": 3 },
-                { "label": "K3C (D0,B3)", "x": 12.25, "y": 3 ,"w":1.75 },
-                { "label": "K3D (D0,B1)", "x": 14, "y": 3 },
-                { "label": "K3F (D0,B2)", "x": 15, "y": 3 },
-                { "label": "K40 (F5,D5)", "x": 0, "y": 4 ,"w":1.25},
-                { "label": "K41 (F5,D2)", "x": 1.25, "y": 4 ,"w":1.25},
-                { "label": "K42 (F5,D3)", "x": 2.5, "y": 4 ,"w":1.25},
-                { "label": "K45 (F5,D7)", "x": 3.75, "y": 4,"w":6.25 },
-                { "label": "K49 (F5,C6)", "x": 10, "y": 4 },
-                { "label": "K4A (F5,C7)", "x": 11, "y": 4 },
-                { "label": "K4B (F5,E2)", "x": 12, "y": 4 },
-                { "label": "K4C (F5,B3)", "x": 13, "y": 4 },
-                { "label": "K4D (F5,B1)", "x": 14, "y": 4 },
-                { "label": "K4F (F5,B2)", "x": 15, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4},
-                {"label":"Ctrl", "x":11, "y":4},
-                {"label":"RGB Toggle", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4},
-                {"label":"Ctrl", "x":11, "y":4},
-                {"label":"RGB Toggle", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4},
-                {"label":"Ctrl", "x":11, "y":4},
-                {"label":"RGB Toggle", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4},
-                {"label":"Ctrl", "x":11, "y":4},
-                {"label":"RGB Toggle", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/eason/greatsword80/config.h b/keyboards/eason/greatsword80/config.h
index 73347f77df..9a0ee7ab72 100644
--- a/keyboards/eason/greatsword80/config.h
+++ b/keyboards/eason/greatsword80/config.h
@@ -16,11 +16,5 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6, C7, E2, F7, F6, F5, F4, B0, B1, B2, B3 }
-
-
-#define DIODE_DIRECTION COL2ROW
-
 #define LED_CAPS_LOCK_PIN  F0
 #define LED_PIN_ON_STATE 0
diff --git a/keyboards/eason/greatsword80/info.json b/keyboards/eason/greatsword80/info.json
index 69e4bc7ef2..b3a448ef1b 100644
--- a/keyboards/eason/greatsword80/info.json
+++ b/keyboards/eason/greatsword80/info.json
@@ -8,6 +8,11 @@
         "pid": "0x998F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "F7", "F6", "F5", "F4", "B0", "B1", "B2", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h
index 979424c64a..68f54a8014 100644
--- a/keyboards/ebastler/isometria_75/rev1/config.h
+++ b/keyboards/ebastler/isometria_75/rev1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A15, B4, B5, B6, B7, B8}
-#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10, A13, A14, B9, C13, F0, F1, A0, B2, B10, B11 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Backlight */
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 2
@@ -31,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it.
 
 /* Underglow */
-#define RGB_DI_PIN B3
 #define RGBLED_NUM 17
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json
index 83061d92df..f279d22543 100644
--- a/keyboards/ebastler/isometria_75/rev1/info.json
+++ b/keyboards/ebastler/isometria_75/rev1/info.json
@@ -8,6 +8,15 @@
         "pid": "0x1337",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B3",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A13", "A14", "B9", "C13", "F0", "F1", "A0", "B2", "B10", "B11"],
+        "rows": ["A15", "B4", "B5", "B6", "B7", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
diff --git a/keyboards/ebastler/isometria_75/rev1/rev1.c b/keyboards/ebastler/isometria_75/rev1/rev1.c
deleted file mode 100644
index 8b703dfbd1..0000000000
--- a/keyboards/ebastler/isometria_75/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/ebastler/isometria_75/rev1/rules.mk b/keyboards/ebastler/isometria_75/rev1/rules.mk
index bd6499b239..2fd78a13f1 100644
--- a/keyboards/ebastler/isometria_75/rev1/rules.mk
+++ b/keyboards/ebastler/isometria_75/rev1/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
-WS2812_DRIVER = pwm
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h
index 95c6a44399..b9449c4714 100644
--- a/keyboards/eco/config.h
+++ b/keyboards/eco/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -41,10 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#ifdef SUBPROJECT_rev1
-    #include "rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
-    #include "rev2/config.h"
-#endif
diff --git a/keyboards/eco/eco.c b/keyboards/eco/eco.c
deleted file mode 100644
index 84097652d8..0000000000
--- a/keyboards/eco/eco.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "eco.h"
diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h
deleted file mode 100644
index 885bf982d7..0000000000
--- a/keyboards/eco/eco.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_eco_rev1)
-#    include "rev1.h"
-#elif defined(KEYBOARD_eco_rev2)
-#    include "rev2.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/eco/keymaps/bcat/config.h b/keyboards/eco/keymaps/bcat/config.h
index 2a986f903b..1a3fd81199 100644
--- a/keyboards/eco/keymaps/bcat/config.h
+++ b/keyboards/eco/keymaps/bcat/config.h
@@ -19,7 +19,7 @@
 #define BCAT_ORTHO_LAYERS
 
 /* WS2812B RGB LED strip hand wired to Elite-C. */
-#define RGB_DI_PIN B7
+#define WS2812_DI_PIN B7
 #define RGBLED_NUM 15
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/eco/rev1/config.h b/keyboards/eco/rev1/config.h
deleted file mode 100644
index 1dc94e79b5..0000000000
--- a/keyboards/eco/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../config.h"
-
-/* ECO V1 pin-out */
-#define MATRIX_ROW_PINS { B1, B6, B2, B3 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
diff --git a/keyboards/eco/rev1/info.json b/keyboards/eco/rev1/info.json
index 90ac25f360..c2c42442dd 100644
--- a/keyboards/eco/rev1/info.json
+++ b/keyboards/eco/rev1/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
+        "rows": ["B1", "B6", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/eco/rev1/rev1.c b/keyboards/eco/rev1/rev1.c
deleted file mode 100644
index 84097652d8..0000000000
--- a/keyboards/eco/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "eco.h"
diff --git a/keyboards/eco/rev1/rev1.h b/keyboards/eco/rev1/rev1.h
index a6ceafb815..ea17dc6a55 100644
--- a/keyboards/eco/rev1/rev1.h
+++ b/keyboards/eco/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "../eco.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/eco/rev2/config.h b/keyboards/eco/rev2/config.h
deleted file mode 100644
index 35a2334fc9..0000000000
--- a/keyboards/eco/rev2/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../config.h"
-
-/* ECO V2.1 pin-out */
-#define MATRIX_ROW_PINS { D7, B5, B4, E6 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, B6, B2, B3, B1, F7, F6, F5, F4, D2, D3 }
diff --git a/keyboards/eco/rev2/info.json b/keyboards/eco/rev2/info.json
index e557e4d307..4cc5e0311f 100644
--- a/keyboards/eco/rev2/info.json
+++ b/keyboards/eco/rev2/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.2"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D2", "D3"],
+        "rows": ["D7", "B5", "B4", "E6"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/eco/rev2/rev2.c b/keyboards/eco/rev2/rev2.c
deleted file mode 100644
index 84097652d8..0000000000
--- a/keyboards/eco/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "eco.h"
diff --git a/keyboards/eco/rev2/rev2.h b/keyboards/eco/rev2/rev2.h
index a6ceafb815..ea17dc6a55 100644
--- a/keyboards/eco/rev2/rev2.h
+++ b/keyboards/eco/rev2/rev2.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "../eco.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/edc40/config.h b/keyboards/edc40/config.h
index 01faa55149..55d7cb23a7 100644
--- a/keyboards/edc40/config.h
+++ b/keyboards/edc40/config.h
@@ -15,22 +15,5 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
- #define MATRIX_ROW_PINS { D4, D6, D7, F7 }
- #define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D2, D3, D5, B4, B5 }
-
- #define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN C6
diff --git a/keyboards/edc40/edc40.c b/keyboards/edc40/edc40.c
deleted file mode 100644
index 96746d4f35..0000000000
--- a/keyboards/edc40/edc40.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "edc40.h"
diff --git a/keyboards/edc40/info.json b/keyboards/edc40/info.json
index 43314e1d82..7b77ddc934 100644
--- a/keyboards/edc40/info.json
+++ b/keyboards/edc40/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "B4", "B5"],
+        "rows": ["D4", "D6", "D7", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "C6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/edda/config.h b/keyboards/edda/config.h
index 3e71d942d3..cfdf4e1a54 100644
--- a/keyboards/edda/config.h
+++ b/keyboards/edda/config.h
@@ -13,15 +13,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {F1, F0, E6, B5, B4}
-#define MATRIX_COL_PINS {F4, F5, F6, F7, C7, C6, B6, B3, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 // Indicators
 #define INDICATOR_PIN_0 B2
 #define INDICATOR_PIN_1 B1
diff --git a/keyboards/edda/edda.c b/keyboards/edda/edda.c
index a04f3cc4c1..38d1d5ddab 100644
--- a/keyboards/edda/edda.c
+++ b/keyboards/edda/edda.c
@@ -11,7 +11,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "edda.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
   // Call the keyboard pre init code.
diff --git a/keyboards/edda/edda.h b/keyboards/edda/edda.h
deleted file mode 100644
index d15606b2c2..0000000000
--- a/keyboards/edda/edda.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2021 Martin Arnstad
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define KNO KC_NO
-#define LAYOUT_default LAYOUT_alice_split_bs
-
-#define LAYOUT_alice_split_bs( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-  K10, K11, K12, K13, K14, K15, K16,      K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-  K20, K21, K22, K23, K24, K25, K26,      K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-       K31, K32, K33, K34, K35, K36,      K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,         \
-       K41,      K43, K44,      K46,           K49,      K4B,                K4F \
-) { \
-  {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F  }, \
-  {  K10, K11, K12, K13, K14, K15, K16, KNO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, KNO, K28, K29, K2A, K2B, K2C, K2D, KNO, K2F  }, \
-  {  KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F  }, \
-  {  KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F  }  \
-}
-
-#define LAYOUT_alice( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
-  K10, K11, K12, K13, K14, K15, K16,      K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-  K20, K21, K22, K23, K24, K25, K26,      K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-       K31, K32, K33, K34, K35, K36,      K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,         \
-       K41,      K43, K44,      K46,           K49,      K4B,                K4F \
-) { \
-  {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KNO, K0F  }, \
-  {  K10, K11, K12, K13, K14, K15, K16, KNO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, KNO, K28, K29, K2A, K2B, K2C, K2D, KNO, K2F  }, \
-  {  KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F  }, \
-  {  KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F  }  \
-}
diff --git a/keyboards/edda/info.json b/keyboards/edda/info.json
index 9b3c6c733a..3cf050fb9e 100644
--- a/keyboards/edda/info.json
+++ b/keyboards/edda/info.json
@@ -8,155 +8,177 @@
         "pid": "0x4544",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B3", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["F1", "F0", "E6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_default": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Del", "x":17, "y":0.25},
-                {"label":"Backspace", "x":18, "y":0.25},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 14], "x": 17, "y": 0.25},
+                {"matrix": [0, 15], "x": 18, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "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.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "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": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 15], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 15], "x": 18, "y": 4.25, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Backspace", "x":17, "y":0.25, "w":2},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 15], "x": 17, "y": 0.25, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "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.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "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": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 15], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 15], "x": 18, "y": 4.25, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
index 5d074c2e4a..6677c4587e 100644
--- a/keyboards/edi/hardlight/mk1/config.h
+++ b/keyboards/edi/hardlight/mk1/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, D4, D6, D7, B4 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -43,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*
  * Enable RGB Underlighting
  */
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 15
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json
index 7849eae7ca..d7275dfa70 100644
--- a/keyboards/edi/hardlight/mk1/info.json
+++ b/keyboards/edi/hardlight/mk1/info.json
@@ -6,75 +6,86 @@
         "pid": "0x2401",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"],
+        "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_4x16": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "x": 13, "y": 0 },
-                { "x": 14, "y": 0 },
-                { "x": 15, "y": 0 },
-                { "x": 0, "y": 1 },
-                { "x": 1, "y": 1 },
-                { "x": 2, "y": 1 },
-                { "x": 3, "y": 1 },
-                { "x": 4, "y": 1 },
-                { "x": 5, "y": 1 },
-                { "x": 6, "y": 1 },
-                { "x": 7, "y": 1 },
-                { "x": 8, "y": 1 },
-                { "x": 9, "y": 1 },
-                { "x": 10, "y": 1 },
-                { "x": 11, "y": 1 },
-                { "x": 12, "y": 1 },
-                { "x": 13, "y": 1 },
-                { "x": 14, "y": 1 },
-                { "x": 15, "y": 1 },
-                { "x": 0, "y": 2 },
-                { "x": 1, "y": 2 },
-                { "x": 2, "y": 2 },
-                { "x": 3, "y": 2 },
-                { "x": 4, "y": 2 },
-                { "x": 5, "y": 2 },
-                { "x": 6, "y": 2 },
-                { "x": 7, "y": 2 },
-                { "x": 8, "y": 2 },
-                { "x": 9, "y": 2 },
-                { "x": 10, "y": 2 },
-                { "x": 11, "y": 2 },
-                { "x": 12, "y": 2 },
-                { "x": 13, "y": 2 },
-                { "x": 14, "y": 2 },
-                { "x": 15, "y": 2 },
-                { "x": 0, "y": 3 },
-                { "x": 1, "y": 3 },
-                { "x": 2, "y": 3 },
-                { "x": 3, "y": 3 },
-                { "x": 4, "y": 3 },
-                { "x": 5, "y": 3 },
-                { "x": 6, "y": 3 },
-                { "x": 7, "y": 3 },
-                { "x": 8, "y": 3 },
-                { "x": 9, "y": 3 },
-                { "x": 10, "y": 3 },
-                { "x": 11, "y": 3 },
-                { "x": 12, "y": 3 },
-                { "x": 13, "y": 3 },
-                { "x": 14, "y": 3 },
-                { "x": 15, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1},
+                {"matrix": [2, 7], "x": 14, "y": 1},
+                {"matrix": [3, 7], "x": 15, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [4, 5], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+                {"matrix": [5, 6], "x": 13, "y": 2},
+                {"matrix": [4, 7], "x": 14, "y": 2},
+                {"matrix": [5, 7], "x": 15, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+                {"matrix": [6, 2], "x": 4, "y": 3},
+                {"matrix": [7, 2], "x": 5, "y": 3},
+                {"matrix": [6, 3], "x": 6, "y": 3},
+                {"matrix": [7, 3], "x": 7, "y": 3},
+                {"matrix": [6, 4], "x": 8, "y": 3},
+                {"matrix": [7, 4], "x": 9, "y": 3},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3},
+                {"matrix": [7, 6], "x": 13, "y": 3},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15, "y": 3}
             ]
         }
     }
diff --git a/keyboards/edi/hardlight/mk1/mk1.c b/keyboards/edi/hardlight/mk1/mk1.c
deleted file mode 100644
index 5a1e0bbb19..0000000000
--- a/keyboards/edi/hardlight/mk1/mk1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
- 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "mk1.h"
diff --git a/keyboards/edi/hardlight/mk1/mk1.h b/keyboards/edi/hardlight/mk1/mk1.h
deleted file mode 100644
index e8ef9777a4..0000000000
--- a/keyboards/edi/hardlight/mk1/mk1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
- 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_4x16( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, \
-    K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, \
-    K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, \
-    K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, K61, K62, K63 \
-) \
-{ \
-    { K00, K02, K04, K06, K08, K10, K12, K14 }, \
-    { K01, K03, K05, K07, K09, K11, K13, K15 }, \
-    { K16, K18, K20, K22, K24, K26, K28, K30 }, \
-    { K17, K19, K21, K23, K25, K27, K29, K31 }, \
-    { K32, K34, K36, K38, K40, K42, K44, K46 }, \
-    { K33, K35, K37, K39, K41, K43, K45, K47 }, \
-    { K48, K50, K52, K54, K56, K58, K60, K62 }, \
-    { K49, K51, K53, K55, K57, K59, K61, K63 } \
-}
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index c140a7bad5..3ea34c53ee 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -17,17 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B2, B6, B5, F1, F0, C15, C14, C13 }
-#define MATRIX_ROW_PINS { B10, B11, A14, A15, A3, A0, A2, A1 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* RGB Underglow */
-#define RGB_DI_PIN A10
 #define RGBLED_NUM 32
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json
index aff84f1e32..63ca3aa15d 100644
--- a/keyboards/edi/hardlight/mk2/info.json
+++ b/keyboards/edi/hardlight/mk2/info.json
@@ -6,76 +6,88 @@
         "pid": "0x2408",
         "device_version": "0.0.7"
     },
+    "ws2812": {
+        "pin": "A10",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B6", "B5", "F1", "F0", "C15", "C14", "C13"],
+        "rows": ["B10", "B11", "A14", "A15", "A3", "A0", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["ortho_4x16"],
     "layouts": {
         "LAYOUT_ortho_4x16": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "x": 13, "y": 0 },
-                { "x": 14, "y": 0 },
-                { "x": 15, "y": 0 },
-                { "x": 0, "y": 1 },
-                { "x": 1, "y": 1 },
-                { "x": 2, "y": 1 },
-                { "x": 3, "y": 1 },
-                { "x": 4, "y": 1 },
-                { "x": 5, "y": 1 },
-                { "x": 6, "y": 1 },
-                { "x": 7, "y": 1 },
-                { "x": 8, "y": 1 },
-                { "x": 9, "y": 1 },
-                { "x": 10, "y": 1 },
-                { "x": 11, "y": 1 },
-                { "x": 12, "y": 1 },
-                { "x": 13, "y": 1 },
-                { "x": 14, "y": 1 },
-                { "x": 15, "y": 1 },
-                { "x": 0, "y": 2 },
-                { "x": 1, "y": 2 },
-                { "x": 2, "y": 2 },
-                { "x": 3, "y": 2 },
-                { "x": 4, "y": 2 },
-                { "x": 5, "y": 2 },
-                { "x": 6, "y": 2 },
-                { "x": 7, "y": 2 },
-                { "x": 8, "y": 2 },
-                { "x": 9, "y": 2 },
-                { "x": 10, "y": 2 },
-                { "x": 11, "y": 2 },
-                { "x": 12, "y": 2 },
-                { "x": 13, "y": 2 },
-                { "x": 14, "y": 2 },
-                { "x": 15, "y": 2 },
-                { "x": 0, "y": 3 },
-                { "x": 1, "y": 3 },
-                { "x": 2, "y": 3 },
-                { "x": 3, "y": 3 },
-                { "x": 4, "y": 3 },
-                { "x": 5, "y": 3 },
-                { "x": 6, "y": 3 },
-                { "x": 7, "y": 3 },
-                { "x": 8, "y": 3 },
-                { "x": 9, "y": 3 },
-                { "x": 10, "y": 3 },
-                { "x": 11, "y": 3 },
-                { "x": 12, "y": 3 },
-                { "x": 13, "y": 3 },
-                { "x": 14, "y": 3 },
-                { "x": 15, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1},
+                {"matrix": [2, 7], "x": 14, "y": 1},
+                {"matrix": [3, 7], "x": 15, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [4, 5], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+                {"matrix": [5, 6], "x": 13, "y": 2},
+                {"matrix": [4, 7], "x": 14, "y": 2},
+                {"matrix": [5, 7], "x": 15, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+                {"matrix": [6, 2], "x": 4, "y": 3},
+                {"matrix": [7, 2], "x": 5, "y": 3},
+                {"matrix": [6, 3], "x": 6, "y": 3},
+                {"matrix": [7, 3], "x": 7, "y": 3},
+                {"matrix": [6, 4], "x": 8, "y": 3},
+                {"matrix": [7, 4], "x": 9, "y": 3},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3},
+                {"matrix": [7, 6], "x": 13, "y": 3},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15, "y": 3}
             ]
         }
     }
diff --git a/keyboards/edi/hardlight/mk2/mk2.c b/keyboards/edi/hardlight/mk2/mk2.c
deleted file mode 100644
index ab4414e4d2..0000000000
--- a/keyboards/edi/hardlight/mk2/mk2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
- 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "mk2.h"
diff --git a/keyboards/edi/hardlight/mk2/mk2.h b/keyboards/edi/hardlight/mk2/mk2.h
deleted file mode 100644
index 5065582d65..0000000000
--- a/keyboards/edi/hardlight/mk2/mk2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
- 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x16( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, \
-    K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, \
-    K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, \
-    K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, K61, K62, K63 \
-) \
-{ \
-    { K00, K02, K04, K06, K08, K10, K12, K14 }, \
-    { K01, K03, K05, K07, K09, K11, K13, K15 }, \
-    { K16, K18, K20, K22, K24, K26, K28, K30 }, \
-    { K17, K19, K21, K23, K25, K27, K29, K31 }, \
-    { K32, K34, K36, K38, K40, K42, K44, K46 }, \
-    { K33, K35, K37, K39, K41, K43, K45, K47 }, \
-    { K48, K50, K52, K54, K56, K58, K60, K62 }, \
-    { K49, K51, K53, K55, K57, K59, K61, K63 } \
-}
diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk
index aad4915dd6..69c4b26a9e 100644
--- a/keyboards/edi/hardlight/mk2/rules.mk
+++ b/keyboards/edi/hardlight/mk2/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 VELOCIKEY_ENABLE = yes
 KEY_LOCK_ENABLE = yes
-WS2812_DRIVER = pwm
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h
index df40d532f8..e59dbc15e6 100644
--- a/keyboards/edi/standaside/config.h
+++ b/keyboards/edi/standaside/config.h
@@ -2,24 +2,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D1, F4, F6, F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { F5, D0, D4, C6, D7, E6, B4, B5 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -28,7 +10,6 @@
 /*
  * Enable RGB Underlighting
  */
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/info.json
index 95d3e6d6ee..0c8bb289b0 100644
--- a/keyboards/edi/standaside/info.json
+++ b/keyboards/edi/standaside/info.json
@@ -8,78 +8,86 @@
         "pid": "0x0412",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["D1", "F4", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_4x16": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1},
+                {"matrix": [2, 7], "x": 14, "y": 1},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
-                {"x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [4, 5], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+                {"matrix": [5, 6], "x": 13, "y": 2},
+                {"matrix": [4, 7], "x": 14, "y": 2},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
-                {"x":15, "y":3}
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+                {"matrix": [6, 2], "x": 4, "y": 3},
+                {"matrix": [7, 2], "x": 5, "y": 3},
+                {"matrix": [6, 3], "x": 6, "y": 3},
+                {"matrix": [7, 3], "x": 7, "y": 3},
+                {"matrix": [6, 4], "x": 8, "y": 3},
+                {"matrix": [7, 4], "x": 9, "y": 3},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3},
+                {"matrix": [7, 6], "x": 13, "y": 3},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15, "y": 3}
             ]
         }
     }
diff --git a/keyboards/edi/standaside/standaside.c b/keyboards/edi/standaside/standaside.c
deleted file mode 100644
index 9f445ec044..0000000000
--- a/keyboards/edi/standaside/standaside.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "standaside.h"
diff --git a/keyboards/edi/standaside/standaside.h b/keyboards/edi/standaside/standaside.h
deleted file mode 100644
index 9601f1257c..0000000000
--- a/keyboards/edi/standaside/standaside.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_4x16( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77 } \
-}
diff --git a/keyboards/edinburgh41/config.h b/keyboards/edinburgh41/config.h
index 2f65982579..f37d43dd2f 100644
--- a/keyboards/edinburgh41/config.h
+++ b/keyboards/edinburgh41/config.h
@@ -3,17 +3,8 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1, B3, B2 }
-#define MATRIX_COL_PINS \
-    { D1, D4, C6, D7, E6, B4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // Underglow LED settings
 
-#define RGB_DI_PIN D0
 #define RGBLED_NUM 10
 
 // Thumbstick settings
diff --git a/keyboards/edinburgh41/edinburgh41.c b/keyboards/edinburgh41/edinburgh41.c
deleted file mode 100644
index 28c07d51bb..0000000000
--- a/keyboards/edinburgh41/edinburgh41.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 schwarzer-geiger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "edinburgh41.h"
diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json
index 6a8d8b4bf9..3c75c899fb 100644
--- a/keyboards/edinburgh41/info.json
+++ b/keyboards/edinburgh41/info.json
@@ -10,6 +10,14 @@
         "pid": "0x0000",
         "vid": "0xFEED"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index b335e5c98c..814af857d5 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { D4, C6, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-
-#define DIODE_DIRECTION COL2ROW
-
-
- #define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 36
   #define RGBLIGHT_HUE_STEP 4
   #define RGBLIGHT_SAT_STEP 8
@@ -43,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
- #endif
 
  #ifdef RGB_MATRIX_ENABLE
   #define RGB_MATRIX_LED_COUNT 36
diff --git a/keyboards/eek/eek.c b/keyboards/eek/eek.c
index 372956257a..8e7a19f820 100644
--- a/keyboards/eek/eek.c
+++ b/keyboards/eek/eek.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "eek.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/eek/eek.h b/keyboards/eek/eek.h
deleted file mode 100644
index 4e4133d884..0000000000
--- a/keyboards/eek/eek.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 klackygears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_eek_silk_down)
-#    include "silk_down.h"
-#elif defined(KEYBOARD_eek_silk_up)
-#    include "silk_up.h"
-#endif
diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json
index df7884ce42..d4d5ee39d2 100644
--- a/keyboards/eek/info.json
+++ b/keyboards/eek/info.json
@@ -8,6 +8,17 @@
         "pid": "0x0002",
         "device_version": "0.0.4"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["split_3x5_3"],
@@ -34,7 +45,7 @@
 
                 {"x": 6, "y": 1.5},
                 {"x": 7, "y": 1.38},
-                {"x": 8, "y": 1.0},
+                {"x": 8, "y": 1},
                 {"x": 9, "y": 1.38},
                 {"x": 10, "y": 1.88},
 
diff --git a/keyboards/eek/rules.mk b/keyboards/eek/rules.mk
index d12dc9e031..74ca560427 100644
--- a/keyboards/eek/rules.mk
+++ b/keyboards/eek/rules.mk
@@ -10,5 +10,4 @@ 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_DRIVER = WS2812
 DEFAULT_FOLDER = eek/silk_down
diff --git a/keyboards/eek/silk_down/info.json b/keyboards/eek/silk_down/info.json
new file mode 100644
index 0000000000..3091643e4f
--- /dev/null
+++ b/keyboards/eek/silk_down/info.json
@@ -0,0 +1,51 @@
+{
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.88},
+                {"matrix": [0, 1], "x": 1, "y": 0.38},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.38},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+                {"matrix": [0, 5], "x": 6, "y": 0.5},
+                {"matrix": [0, 6], "x": 7, "y": 0.38},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0.38},
+                {"matrix": [0, 9], "x": 10, "y": 0.88},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.88},
+                {"matrix": [1, 1], "x": 1, "y": 1.38},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.38},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+                {"matrix": [1, 5], "x": 6, "y": 1.5},
+                {"matrix": [1, 6], "x": 7, "y": 1.38},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1.38},
+                {"matrix": [1, 9], "x": 10, "y": 1.88},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.88},
+                {"matrix": [2, 1], "x": 1, "y": 2.38},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.38},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+                {"matrix": [2, 5], "x": 6, "y": 2.5},
+                {"matrix": [2, 6], "x": 7, "y": 2.38},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2.38},
+                {"matrix": [2, 9], "x": 10, "y": 2.88},
+
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.38},
+                {"matrix": [3, 4], "x": 4, "y": 3.5},
+
+                {"matrix": [3, 5], "x": 6, "y": 3.5},
+                {"matrix": [3, 6], "x": 7, "y": 3.38},
+                {"matrix": [3, 7], "x": 8, "y": 3.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/eek/silk_down/silk_down.h b/keyboards/eek/silk_down/silk_down.h
deleted file mode 100644
index c8ececd939..0000000000
--- a/keyboards/eek/silk_down/silk_down.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 klackygears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "eek.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x5_3( \
-    K00, K01, K02, K03, K04,     K05, K06, K07, K08, K09, \
-    K10, K11, K12, K13, K14,     K15, K16, K17, K18, K19, \
-    K20, K21, K22, K23, K24,     K25, K26, K27, K28, K29, \
-              K32, K33, K34,     K35, K36, K37 \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
-    { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \
-}
diff --git a/keyboards/eek/silk_up/info.json b/keyboards/eek/silk_up/info.json
new file mode 100644
index 0000000000..a810549d55
--- /dev/null
+++ b/keyboards/eek/silk_up/info.json
@@ -0,0 +1,51 @@
+{
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 9], "x": 0, "y": 0.88},
+                {"matrix": [0, 8], "x": 1, "y": 0.38},
+                {"matrix": [0, 7], "x": 2, "y": 0},
+                {"matrix": [0, 6], "x": 3, "y": 0.38},
+                {"matrix": [0, 5], "x": 4, "y": 0.5},
+
+                {"matrix": [0, 4], "x": 6, "y": 0.5},
+                {"matrix": [0, 3], "x": 7, "y": 0.38},
+                {"matrix": [0, 2], "x": 8, "y": 0},
+                {"matrix": [0, 1], "x": 9, "y": 0.38},
+                {"matrix": [0, 0], "x": 10, "y": 0.88},
+
+                {"matrix": [1, 9], "x": 0, "y": 1.88},
+                {"matrix": [1, 8], "x": 1, "y": 1.38},
+                {"matrix": [1, 7], "x": 2, "y": 1},
+                {"matrix": [1, 6], "x": 3, "y": 1.38},
+                {"matrix": [1, 5], "x": 4, "y": 1.5},
+
+                {"matrix": [1, 4], "x": 6, "y": 1.5},
+                {"matrix": [1, 3], "x": 7, "y": 1.38},
+                {"matrix": [1, 2], "x": 8, "y": 1},
+                {"matrix": [1, 1], "x": 9, "y": 1.38},
+                {"matrix": [1, 0], "x": 10, "y": 1.88},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.88},
+                {"matrix": [2, 8], "x": 1, "y": 2.38},
+                {"matrix": [2, 7], "x": 2, "y": 2},
+                {"matrix": [2, 6], "x": 3, "y": 2.38},
+                {"matrix": [2, 5], "x": 4, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 6, "y": 2.5},
+                {"matrix": [2, 3], "x": 7, "y": 2.38},
+                {"matrix": [2, 2], "x": 8, "y": 2},
+                {"matrix": [2, 1], "x": 9, "y": 2.38},
+                {"matrix": [2, 0], "x": 10, "y": 2.88},
+
+                {"matrix": [3, 7], "x": 2, "y": 3.25},
+                {"matrix": [3, 6], "x": 3, "y": 3.38},
+                {"matrix": [3, 5], "x": 4, "y": 3.5},
+
+                {"matrix": [3, 4], "x": 6, "y": 3.5},
+                {"matrix": [3, 3], "x": 7, "y": 3.38},
+                {"matrix": [3, 2], "x": 8, "y": 3.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/eek/silk_up/silk_up.h b/keyboards/eek/silk_up/silk_up.h
deleted file mode 100644
index 8b9fe39596..0000000000
--- a/keyboards/eek/silk_up/silk_up.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 klackygears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "eek.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x5_3( \
-    K09, K08, K07, K06, K05,     K04, K03, K02, K01, K00, \
-    K19, K18, K17, K16, K15,     K14, K13, K12, K11, K10, \
-    K29, K28, K27, K26, K25,     K24, K23, K22, K21, K20, \
-              K37, K36, K35,     K34, K33, K32 \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
-    { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \
-}
diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h
index 437059ef0a..46a265902c 100644
--- a/keyboards/efreet/config.h
+++ b/keyboards/efreet/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, D6, D5, D4, D3, D2, D1, C2 }
-#define MATRIX_COL_PINS { B3, B4, B5, B6, B7, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/efreet/efreet.c b/keyboards/efreet/efreet.c
deleted file mode 100644
index 3c52e1cd1a..0000000000
--- a/keyboards/efreet/efreet.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Amber Holly
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "efreet.h"
diff --git a/keyboards/efreet/efreet.h b/keyboards/efreet/efreet.h
deleted file mode 100644
index 4b0c9f552e..0000000000
--- a/keyboards/efreet/efreet.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2019 Amber Holly
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x12( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75 \
-) { \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k50, k51, k52, k53, k54, k55 }, \
-    { k40, k41, k42, k43, k44, k45 }, \
-    { k70, k71, k72, k73, k74, k75 }, \
-    { k60, k61, k62, k63, k64, k65 } \
-}
-
-#define LAYOUT_planck_mit( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \
-    k60, k70, k61, k71, k62,    k72,   k73, k64, k74, k65, k75 \
-) { \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k50, k51, k52, k53, k54, k55 }, \
-    { k40, k41, k42, k43, k44, k45 }, \
-    { k70, k71, k72, k73, k74, k75 }, \
-    { k60, k61, k62, XXX, k64, k65 } \
-}
diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json
index 8a971a9c71..ea2a48be25 100644
--- a/keyboards/efreet/info.json
+++ b/keyboards/efreet/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B4", "B5", "B6", "B7", "C7"],
+        "rows": ["B0", "D6", "D5", "D4", "D3", "D2", "D1", "C2"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D0",
         "breathing": true
@@ -18,111 +23,111 @@
     "layouts": {
         "LAYOUT_planck_mit": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [3, 0], "x": 0, "y": 1},
+                {"matrix": [2, 0], "x": 1, "y": 1},
+                {"matrix": [3, 1], "x": 2, "y": 1},
+                {"matrix": [2, 1], "x": 3, "y": 1},
+                {"matrix": [3, 2], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [3, 3], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+                {"matrix": [3, 4], "x": 8, "y": 1},
+                {"matrix": [2, 4], "x": 9, "y": 1},
+                {"matrix": [3, 5], "x": 10, "y": 1},
+                {"matrix": [2, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [5, 0], "x": 0, "y": 2},
+                {"matrix": [4, 0], "x": 1, "y": 2},
+                {"matrix": [5, 1], "x": 2, "y": 2},
+                {"matrix": [4, 1], "x": 3, "y": 2},
+                {"matrix": [5, 2], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 3], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 4], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 5], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3, "w": 2},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3}
+                {"matrix": [7, 0], "x": 0, "y": 3},
+                {"matrix": [6, 0], "x": 1, "y": 3},
+                {"matrix": [7, 1], "x": 2, "y": 3},
+                {"matrix": [6, 1], "x": 3, "y": 3},
+                {"matrix": [7, 2], "x": 4, "y": 3},
+                {"matrix": [6, 2], "x": 5, "y": 3, "w": 2},
+                {"matrix": [6, 3], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [6, 4], "x": 9, "y": 3},
+                {"matrix": [7, 5], "x": 10, "y": 3},
+                {"matrix": [6, 5], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [3, 0], "x": 0, "y": 1},
+                {"matrix": [2, 0], "x": 1, "y": 1},
+                {"matrix": [3, 1], "x": 2, "y": 1},
+                {"matrix": [2, 1], "x": 3, "y": 1},
+                {"matrix": [3, 2], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [3, 3], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+                {"matrix": [3, 4], "x": 8, "y": 1},
+                {"matrix": [2, 4], "x": 9, "y": 1},
+                {"matrix": [3, 5], "x": 10, "y": 1},
+                {"matrix": [2, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [5, 0], "x": 0, "y": 2},
+                {"matrix": [4, 0], "x": 1, "y": 2},
+                {"matrix": [5, 1], "x": 2, "y": 2},
+                {"matrix": [4, 1], "x": 3, "y": 2},
+                {"matrix": [5, 2], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 3], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 4], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 5], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3}
+                {"matrix": [7, 0], "x": 0, "y": 3},
+                {"matrix": [6, 0], "x": 1, "y": 3},
+                {"matrix": [7, 1], "x": 2, "y": 3},
+                {"matrix": [6, 1], "x": 3, "y": 3},
+                {"matrix": [7, 2], "x": 4, "y": 3},
+                {"matrix": [6, 2], "x": 5, "y": 3},
+                {"matrix": [7, 3], "x": 6, "y": 3},
+                {"matrix": [6, 3], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [6, 4], "x": 9, "y": 3},
+                {"matrix": [7, 5], "x": 10, "y": 3},
+                {"matrix": [6, 5], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
index 457f0a5013..63e6683f8c 100644
--- a/keyboards/ein_60/config.h
+++ b/keyboards/ein_60/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F1, F2, F3, F4 }
-#define MATRIX_COL_PINS { A3, A2, A1, A0, F6, F5, F0, E0, E1, C0, C1, C2, C3 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef OLED_ENABLE
 #    define OLED_DISPLAY_128X64
 #    define OLED_TIMEOUT 450000
@@ -35,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define AUDIO_DAC_SAMPLE_MAX 4095U
 #endif
 
-#define RGB_DI_PIN E7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM         38
 #    define RGBLIGHT_HUE_STEP  4
 #    define RGBLIGHT_SAT_STEP  8
@@ -53,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_COUNT              38
diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json
index 3eaa251d78..0740a9273e 100644
--- a/keyboards/ein_60/info.json
+++ b/keyboards/ein_60/info.json
@@ -8,12 +8,23 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A2", "A1", "A0", "F6", "F5", "F0", "E0", "E1", "C0", "C1", "C2", "C3"],
+        "rows": ["F1", "F2", "F3", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "E3"},
             {"pin_a": "C5", "pin_b": "C4"}
         ]
     },
+    "ws2812": {
+        "pin": "E7"
+    },
     "processor": "at90usb1286",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/ein_60/keymaps/klackygears/config.h b/keyboards/ein_60/keymaps/klackygears/config.h
index d3b1c7b4d9..91c51cb51c 100644
--- a/keyboards/ein_60/keymaps/klackygears/config.h
+++ b/keyboards/ein_60/keymaps/klackygears/config.h
@@ -20,7 +20,6 @@
 
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/ein_60/rules.mk b/keyboards/ein_60/rules.mk
index 869c305184..648a0c38ff 100644
--- a/keyboards/ein_60/rules.mk
+++ b/keyboards/ein_60/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no      # Enable for pretty RGB matrix effects
-RGB_MATRIX_DRIVER = WS2812  # Define RGB Matrix
 ENCODER_ENABLE = yes        # Enables the use of one or more encoders
 OLED_ENABLE = yes           # Enables the use of OLED displays
 OLED_DRIVER = SSD1306
diff --git a/keyboards/ekow/akira/akira.c b/keyboards/ekow/akira/akira.c
deleted file mode 100644
index 420a05e04a..0000000000
--- a/keyboards/ekow/akira/akira.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 eugenepy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "akira.h"
diff --git a/keyboards/ekow/akira/config.h b/keyboards/ekow/akira/config.h
deleted file mode 100644
index 9deabfe903..0000000000
--- a/keyboards/ekow/akira/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2022 eugenepy
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// M60-A PCB default pin-out
-#define MATRIX_ROW_PINS \
-    { B0, B1, B2, B10, B11 }
-#define MATRIX_COL_PINS \
-    { B12, B13, B14, B15, A8, A9, A10, A15, B3, B4, B5, B6, B7, B8, B9 }
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ekow/akira/info.json b/keyboards/ekow/akira/info.json
index f60f319e85..0418dca8c6 100644
--- a/keyboards/ekow/akira/info.json
+++ b/keyboards/ekow/akira/info.json
@@ -8,6 +8,11 @@
         "pid": "0x414B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
+        "rows": ["B0", "B1", "B2", "B10", "B11"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F042",
     "bootloader": "stm32-dfu",
     "debounce": 3,
diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h
index 49ff44755a..a4d471f2c5 100644
--- a/keyboards/elephant42/config.h
+++ b/keyboards/elephant42/config.h
@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS \
-    { F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_SPLIT { 27, 27 }
 #    define RGBLED_NUM 54 // backlight x42 + underglow x12
 #    define RGBLIGHT_HUE_STEP 8
@@ -54,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json
index 161ec776cd..d1218ddb4e 100644
--- a/keyboards/elephant42/info.json
+++ b/keyboards/elephant42/info.json
@@ -8,9 +8,20 @@
         "pid": "0x0721",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
@@ -56,15 +67,15 @@
                 {"label":">", "x":13.5, "y":2.3},
                 {"label":"?", "x":14.5, "y":3.1},
 
-                {"label":"Alt", "x":3.5, "y":4.0},
-                {"label":"Cmd", "x":4.5, "y":4.0},
-                {"label":"Lower", "x":5.5, "y":4.0},
-                {"label":"Shift", "x":6.5, "y":4.0},
+                {"label":"Alt", "x":3.5, "y":4},
+                {"label":"Cmd", "x":4.5, "y":4},
+                {"label":"Lower", "x":5.5, "y":4},
+                {"label":"Shift", "x":6.5, "y":4},
                 
-                {"label":"Del", "x":9.25, "y":4.0},
-                {"label":"Raise", "x":10.25, "y":4.0},
-                {"label":"Enter", "x":11.25, "y":4.0},
-                {"label":"Backspace", "x":12.25, "y":4.0}
+                {"label":"Del", "x":9.25, "y":4},
+                {"label":"Raise", "x":10.25, "y":4},
+                {"label":"Enter", "x":11.25, "y":4},
+                {"label":"Backspace", "x":12.25, "y":4}
             ]
         }
     }
diff --git a/keyboards/elephant42/rules.mk b/keyboards/elephant42/rules.mk
index 66270aae47..db121c92e3 100644
--- a/keyboards/elephant42/rules.mk
+++ b/keyboards/elephant42/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 OLED_ENABLE = yes
diff --git a/keyboards/emajesty/eiri/config.h b/keyboards/emajesty/eiri/config.h
deleted file mode 100644
index c9bb6206d3..0000000000
--- a/keyboards/emajesty/eiri/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2020 EMajesty
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, B5, B2, B6 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/emajesty/eiri/eiri.c b/keyboards/emajesty/eiri/eiri.c
deleted file mode 100644
index 161fc9a967..0000000000
--- a/keyboards/emajesty/eiri/eiri.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 EMajesty
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "eiri.h"
diff --git a/keyboards/emajesty/eiri/info.json b/keyboards/emajesty/eiri/info.json
index 7b654b9ee9..6deb2b93dd 100644
--- a/keyboards/emajesty/eiri/info.json
+++ b/keyboards/emajesty/eiri/info.json
@@ -8,6 +8,11 @@
         "pid": "0x9372",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B4", "B5", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/emery65/config.h b/keyboards/emery65/config.h
index af627558fe..79fdc4275f 100644
--- a/keyboards/emery65/config.h
+++ b/keyboards/emery65/config.h
@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 }
-#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14, B15 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/emery65/info.json b/keyboards/emery65/info.json
index 17141fb49a..0138c78b0a 100644
--- a/keyboards/emery65/info.json
+++ b/keyboards/emery65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4536",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "on_state": 0
diff --git a/keyboards/emi20/config.h b/keyboards/emi20/config.h
deleted file mode 100644
index 237b073721..0000000000
--- a/keyboards/emi20/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2021 Aquacylinder
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B6 }
-#define MATRIX_COL_PINS { C7, C6, B5, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/emi20/emi20.c b/keyboards/emi20/emi20.c
deleted file mode 100644
index a5bcc89d49..0000000000
--- a/keyboards/emi20/emi20.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Aquacylinder
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "emi20.h"
diff --git a/keyboards/emi20/emi20.h b/keyboards/emi20/emi20.h
deleted file mode 100644
index 30d5750e49..0000000000
--- a/keyboards/emi20/emi20.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Aquacylinder 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33, \
-	K40, K41, K42, K43  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ K30,   K31,   K32,   K33 }, \
-	{ K40,   K41,   K42,   K43 }  \
-}
diff --git a/keyboards/emi20/info.json b/keyboards/emi20/info.json
index 093b3e5b45..5e0f694135 100644
--- a/keyboards/emi20/info.json
+++ b/keyboards/emi20/info.json
@@ -8,35 +8,40 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B5", "B4"],
+        "rows": ["F4", "F5", "F6", "F7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_5x4": {
             "layout": [
-                {"label":"K11 (F7,C7)", "x":0, "y":0},
-                {"label":"K21 (F1,C7)", "x":1, "y":0},
-                {"label":"K31 (B2,C7)", "x":2, "y":0},
-                {"label":"K41 (B2,F0)", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"K12 (F1,F0)", "x":0, "y":1},
-                {"label":"K22 (B2,B6)", "x":1, "y":1},
-                {"label":"K32 (F1,B6)", "x":2, "y":1},
-                {"label":"K42 (B2,B3)", "x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label":"K13 (F1,B3)", "x":0, "y":2},
-                {"label":"K23 (B2,C6)", "x":1, "y":2},
-                {"label":"K33 (F1,C6)", "x":2, "y":2},
-                {"label":"K43 (B2,E6)", "x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"label":"K14 (F1,E6)", "x":0, "y":3},
-                {"label":"K24 (B2,D5)", "x":1, "y":3},
-                {"label":"K34 (F1,D5)", "x":2, "y":3},
-                {"label":"K44 (D0,B1)", "x":3, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
 
-                {"label":"K15 (D0,F4)", "x":0, "y":4},
-                {"label":"K25 (F7,D1)", "x":1, "y":4},
-                {"label":"K35 (F7,B3)", "x":2, "y":4},
-                {"label":"K45 (B5,C7)", "x":3, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
             ]
         }
     }
diff --git a/keyboards/emptystring/nqg/config.h b/keyboards/emptystring/nqg/config.h
deleted file mode 100644
index c5462f8acb..0000000000
--- a/keyboards/emptystring/nqg/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2019 Bernard Shih (twitter: @SA_EndlessGame)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS {B6, B2, B3, B1}
-#define MATRIX_COL_PINS {F7, F6, B5, B4, E6, D7, C6, D4, D0, D1}
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/emptystring/nqg/info.json b/keyboards/emptystring/nqg/info.json
index 37c11551f7..76bdb7fbe1 100644
--- a/keyboards/emptystring/nqg/info.json
+++ b/keyboards/emptystring/nqg/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0037",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["B6", "B2", "B3", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/emptystring/nqg/nqg.c b/keyboards/emptystring/nqg/nqg.c
deleted file mode 100644
index 8001a3a11b..0000000000
--- a/keyboards/emptystring/nqg/nqg.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "nqg.h"
diff --git a/keyboards/eniigmakeyboards/ek60/config.h b/keyboards/eniigmakeyboards/ek60/config.h
deleted file mode 100644
index 680933e762..0000000000
--- a/keyboards/eniigmakeyboards/ek60/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 adamws
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B2, B1, B0, F0, B4 }
-#define MATRIX_COL_PINS { F7, C6, F6, B6, F5, F4, B5, F1, E6, D0, D7, D5, D1, D3, D2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eniigmakeyboards/ek60/ek60.c b/keyboards/eniigmakeyboards/ek60/ek60.c
deleted file mode 100644
index 2ce369ec82..0000000000
--- a/keyboards/eniigmakeyboards/ek60/ek60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 adamws
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ek60.h"
-
diff --git a/keyboards/eniigmakeyboards/ek60/info.json b/keyboards/eniigmakeyboards/ek60/info.json
index ded33b156b..7a2932c964 100644
--- a/keyboards/eniigmakeyboards/ek60/info.json
+++ b/keyboards/eniigmakeyboards/ek60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "C6", "F6", "B6", "F5", "F4", "B5", "F1", "E6", "D0", "D7", "D5", "D1", "D3", "D2"],
+        "rows": ["B2", "B1", "B0", "F0", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_iso"],
diff --git a/keyboards/eniigmakeyboards/ek65/config.h b/keyboards/eniigmakeyboards/ek65/config.h
index 3e5c41c95a..5bb07f4631 100644
--- a/keyboards/eniigmakeyboards/ek65/config.h
+++ b/keyboards/eniigmakeyboards/ek65/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, E6, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/eniigmakeyboards/ek65/ek65.c b/keyboards/eniigmakeyboards/ek65/ek65.c
deleted file mode 100644
index 5fbb75dc82..0000000000
--- a/keyboards/eniigmakeyboards/ek65/ek65.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 adamws
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ek65.h"
-
diff --git a/keyboards/eniigmakeyboards/ek65/info.json b/keyboards/eniigmakeyboards/ek65/info.json
index d3a5a799ca..2b1a307b56 100644
--- a/keyboards/eniigmakeyboards/ek65/info.json
+++ b/keyboards/eniigmakeyboards/ek65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "E6", "B2", "B1", "B0"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/eniigmakeyboards/ek87/config.h b/keyboards/eniigmakeyboards/ek87/config.h
index fb7d88fee0..5bb07f4631 100644
--- a/keyboards/eniigmakeyboards/ek87/config.h
+++ b/keyboards/eniigmakeyboards/ek87/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, F0, F1, E6, D3, D2, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/eniigmakeyboards/ek87/ek87.c b/keyboards/eniigmakeyboards/ek87/ek87.c
deleted file mode 100644
index 0101d679d9..0000000000
--- a/keyboards/eniigmakeyboards/ek87/ek87.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 adamws
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ek87.h"
diff --git a/keyboards/eniigmakeyboards/ek87/ek87.h b/keyboards/eniigmakeyboards/ek87/ek87.h
deleted file mode 100644
index 121365d596..0000000000
--- a/keyboards/eniigmakeyboards/ek87/ek87.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Copyright 2020 adamws
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    k00,      k02, k03, k04, k05,      k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d, k4e,      k4g,      \
-    k50, k51,      k53,           k56,                k5a, k5b,      k5d, k5e, k5f, k5g, k5h  \
-) \
-{ \
-  { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \
-  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \
-  { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \
-  { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \
-  { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e, XXX, k4g, XXX }, \
-  { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g, k5h }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k00,      k02, k03, k04, k05,      k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1f, k1g, k1h, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
-         k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,           k4g,      \
-    k50, k51,      k53,           k56,                k5a, k5b,      k5d, k5e, k5f, k5g, k5h  \
-) \
-{ \
-  { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \
-  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX, k1f, k1g, k1h }, \
-  { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \
-  { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \
-  { XXX, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, XXX, k4g, XXX }, \
-  { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g, k5h }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    k00,      k02, k03, k04, k05,      k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1f, k1g, k1h, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
-         k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,           k4g,      \
-    k50, k51,      k53,           k56,                     k5b,      k5d, k5e, k5f, k5g, k5h  \
-) \
-{ \
-  { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \
-  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX, k1f, k1g, k1h }, \
-  { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \
-  { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \
-  { XXX, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, XXX, k4g, XXX }, \
-  { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, XXX, k5b, XXX, k5d, k5e, k5f, k5g, k5h }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    k00,      k02, k03, k04, k05,      k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1f, k1g, k1h, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,           k4g,      \
-    k50, k51,      k53,           k56,                k5a, k5b,      k5d, k5e, k5f, k5g, k5h  \
-) \
-{ \
-  { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \
-  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX, k1f, k1g, k1h }, \
-  { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \
-  { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \
-  { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, XXX, k4g, XXX }, \
-  { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g, k5h }  \
-}
-
-#define LAYOUT_tkl_iso_tsangan( \
-    k00,      k02, k03, k04, k05,      k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1f, k1g, k1h, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,           k4g,      \
-    k50, k51,      k53,           k56,                     k5b,      k5d, k5e, k5f, k5g, k5h  \
-) \
-{ \
-  { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \
-  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX, k1f, k1g, k1h }, \
-  { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \
-  { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \
-  { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, XXX, k4g, XXX }, \
-  { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, XX, k5b, XXX, k5d, k5e, k5f, k5g, k5h }  \
-}
-
-#define LAYOUT_tkl_iso_split_bs( \
-    k00,      k02, k03, k04, k05,      k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,           k4g,      \
-    k50, k51,      k53,           k56,                k5a, k5b,      k5d, k5e, k5f, k5g, k5h  \
-) \
-{ \
-  { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \
-  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \
-  { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \
-  { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \
-  { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, XXX, k4g, XXX }, \
-  { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g, k5h }  \
-}
-
-#define LAYOUT_tkl_iso_split_rshift( \
-    k00,      k02, k03, k04, k05,      k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1f, k1g, k1h, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d, k4e,      k4g,      \
-    k50, k51,      k53,           k56,                k5a, k5b,      k5d, k5e, k5f, k5g, k5h  \
-) \
-{ \
-  { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \
-  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX, k1f, k1g, k1h }, \
-  { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \
-  { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \
-  { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e, XXX, k4g, XXX }, \
-  { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g, k5h }  \
-}
-
-
diff --git a/keyboards/eniigmakeyboards/ek87/info.json b/keyboards/eniigmakeyboards/ek87/info.json
index af5eb06bad..78a4c799fb 100644
--- a/keyboards/eniigmakeyboards/ek87/info.json
+++ b/keyboards/eniigmakeyboards/ek87/info.json
@@ -8,71 +8,748 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "F0", "F1", "E6", "D3", "D2", "D1"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout":[
-		    {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0},
-		    {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25},{"label":"k1e","x":14,"y":1.25},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25},
-		    {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.5,"y":2.25,"w":1.5},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25},
-		    {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25,"w":2.25},
-		    {"label":"k40","x":0,"y":4.25,"w":1.25},{"label":"k41","x":1.25,"y":4.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":1.75},{"label":"k4e","x":14,"y":4.25},{"label":"k4g","x":16.25,"y":4.25},
-		    {"label":"k50","x":0,"y":5.25,"w":1.25},{"label":"k51","x":1.25,"y":5.25,"w":1.25},{"label":"k53","x":2.5,"y":5.25,"w":1.25},{"label":"k56","x":3.75,"y":5.25,"w":6.25},{"label":"k5a","x":10,"y":5.25,"w":1.25},{"label":"k5b","x":11.25,"y":5.25,"w":1.25},{"label":"k5d","x":12.5,"y":5.25,"w":1.25},{"label":"k5e","x":13.75,"y":5.25,"w":1.25},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_ansi": {
-            "layout":[
-		    {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0},
-		    {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25,"w":2},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25},
-		    {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.5,"y":2.25,"w":1.5},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25},
-		    {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25,"w":2.25},
-		    {"label":"k41","x":0,"y":4.25,"w":2.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":2.75},{"label":"k4g","x":16.25,"y":4.25},
-		    {"label":"k50","x":0,"y":5.25,"w":1.25},{"label":"k51","x":1.25,"y":5.25,"w":1.25},{"label":"k53","x":2.5,"y":5.25,"w":1.25},{"label":"k56","x":3.75,"y":5.25,"w":6.25},{"label":"k5a","x":10,"y":5.25,"w":1.25},{"label":"k5b","x":11.25,"y":5.25,"w":1.25},{"label":"k5d","x":12.5,"y":5.25,"w":1.25},{"label":"k5e","x":13.75,"y":5.25,"w":1.25},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 1], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
-            "layout":[
-		    {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0},
-		    {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25,"w":2},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25},
-		    {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.5,"y":2.25,"w":1.5},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25},
-		    {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25,"w":2.25},
-		    {"label":"k41","x":0,"y":4.25,"w":2.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":2.75},{"label":"k4g","x":16.25,"y":4.25},
-		    {"label":"k50","x":0,"y":5.25,"w":1.5},{"label":"k51","x":1.5,"y":5.25},{"label":"k53","x":2.5,"y":5.25,"w":1.5},{"label":"k56","x":4,"y":5.25,"w":7},{"label":"k5b","x":11,"y":5.25,"w":1.5},{"label":"k5d","x":12.5,"y":5.25},{"label":"k5e","x":13.5,"y":5.25,"w":1.5},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 1], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso": {
-            "layout":[
-		    {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0},
-		    {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25,"w":2},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25},
-		    {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.75,"y":2.25,"w":1.25,"h":2},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25},
-		    {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25},
-		    {"label":"k40","x":0,"y":4.25,"w":1.25},{"label":"k41","x":1.24,"y":4.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":2.75},{"label":"k4g","x":16.25,"y":4.25},
-		    {"label":"k50","x":0,"y":5.25,"w":1.25},{"label":"k51","x":1.25,"y":5.25,"w":1.25},{"label":"k53","x":2.5,"y":5.25,"w":1.25},{"label":"k56","x":3.75,"y":5.25,"w":6.25},{"label":"k5a","x":10,"y":5.25,"w":1.25},{"label":"k5b","x":11.25,"y":5.25,"w":1.25},{"label":"k5d","x":12.5,"y":5.25,"w":1.25},{"label":"k5e","x":13.75,"y":5.25,"w":1.25},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}]
-        },
-        "LAYOUT_tkl_iso_tsangan": {
-            "layout":[
-		    {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0},
-		    {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25,"w":2},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25},
-		    {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.75,"y":2.25,"w":1.25,"h":2},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25},
-		    {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25},
-		    {"label":"k40","x":0,"y":4.25,"w":1.25},{"label":"k41","x":1.24,"y":4.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":2.75},{"label":"k4g","x":16.25,"y":4.25},
-		    {"label":"k50","x":0,"y":5.25,"w":1.5},{"label":"k51","x":1.5,"y":5.25},{"label":"k53","x":2.5,"y":5.25,"w":1.5},{"label":"k56","x":4,"y":5.25,"w":7},{"label":"k5b","x":11,"y":5.25,"w":1.5},{"label":"k5d","x":12.5,"y":5.25},{"label":"k5e","x":13.5,"y":5.25,"w":1.5},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.24, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso_split_bs": {
-            "layout":[
-		    {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0},
-		    {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25},{"label":"k1e","x":14,"y":1.25},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25},
-		    {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.75,"y":2.25,"w":1.25,"h":2},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25},
-		    {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25},
-		    {"label":"k40","x":0,"y":4.25,"w":1.25},{"label":"k41","x":1.24,"y":4.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":2.75},{"label":"k4g","x":16.25,"y":4.25},
-		    {"label":"k50","x":0,"y":5.25,"w":1.25},{"label":"k51","x":1.25,"y":5.25,"w":1.25},{"label":"k53","x":2.5,"y":5.25,"w":1.25},{"label":"k56","x":3.75,"y":5.25,"w":6.25},{"label":"k5a","x":10,"y":5.25,"w":1.25},{"label":"k5b","x":11.25,"y":5.25,"w":1.25},{"label":"k5d","x":12.5,"y":5.25,"w":1.25},{"label":"k5e","x":13.75,"y":5.25,"w":1.25},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.24, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso_split_rshift": {
-            "layout":[
-		    {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0},
-		    {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25,"w":2},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25},
-		    {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.75,"y":2.25,"w":1.25,"h":2},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25},
-		    {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25},
-		    {"label":"k40","x":0,"y":4.25,"w":1.25},{"label":"k41","x":1.25,"y":4.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":1.75},{"label":"k4e","x":14,"y":4.25},{"label":"k4g","x":16.25,"y":4.25},
-		    {"label":"k50","x":0,"y":5.25,"w":1.25},{"label":"k51","x":1.25,"y":5.25,"w":1.25},{"label":"k53","x":2.5,"y":5.25,"w":1.25},{"label":"k56","x":3.75,"y":5.25,"w":6.25},{"label":"k5a","x":10,"y":5.25,"w":1.25},{"label":"k5b","x":11.25,"y":5.25,"w":1.25},{"label":"k5d","x":12.5,"y":5.25,"w":1.25},{"label":"k5e","x":13.75,"y":5.25,"w":1.25},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.24, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/ep/40/40.c b/keyboards/ep/40/40.c
deleted file mode 100644
index fad78a7941..0000000000
--- a/keyboards/ep/40/40.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Elliot Powell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "40.h"
diff --git a/keyboards/ep/40/config.h b/keyboards/ep/40/config.h
deleted file mode 100644
index df885b6f25..0000000000
--- a/keyboards/ep/40/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2018 Elliot Powell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C7, C6, B6, B5 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ep/40/info.json b/keyboards/ep/40/info.json
index ca679e0685..e477b31a78 100644
--- a/keyboards/ep/40/info.json
+++ b/keyboards/ep/40/info.json
@@ -7,6 +7,11 @@
         "pid": "0x4040",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["C7", "C6", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ep/96/96.c b/keyboards/ep/96/96.c
deleted file mode 100644
index 70b48aa411..0000000000
--- a/keyboards/ep/96/96.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Elliot Powell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "96.h"
diff --git a/keyboards/ep/96/config.h b/keyboards/ep/96/config.h
index df76a35880..8b29e416c8 100644
--- a/keyboards/ep/96/config.h
+++ b/keyboards/ep/96/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B3, B2, B7, C6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C7, F7, F6, F5, F4, F1, F0, E6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-// #endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ep/96/info.json b/keyboards/ep/96/info.json
index 2721b1bd5e..f4b557f037 100644
--- a/keyboards/ep/96/info.json
+++ b/keyboards/ep/96/info.json
@@ -7,6 +7,11 @@
         "pid": "0x9696",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
+        "rows": ["B0", "B1", "B3", "B2", "B7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ep/comsn/hs68/config.h b/keyboards/ep/comsn/hs68/config.h
index 736fbe5370..a86557f6ce 100644
--- a/keyboards/ep/comsn/hs68/config.h
+++ b/keyboards/ep/comsn/hs68/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-  { B6, B5, B4, D0, F6 }
-#define MATRIX_COL_PINS \
-  { B0, B1, B3, B2, B7, D3, F1, D5, D6, D7, F4, F5, C7, C6, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ep/comsn/hs68/hs68.c b/keyboards/ep/comsn/hs68/hs68.c
deleted file mode 100644
index 16595739c0..0000000000
--- a/keyboards/ep/comsn/hs68/hs68.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Elliot Powell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hs68.h"
diff --git a/keyboards/ep/comsn/hs68/info.json b/keyboards/ep/comsn/hs68/info.json
index 718cbe9d88..0bbfb50062 100644
--- a/keyboards/ep/comsn/hs68/info.json
+++ b/keyboards/ep/comsn/hs68/info.json
@@ -7,6 +7,11 @@
         "pid": "0x6868",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B3", "B2", "B7", "D3", "F1", "D5", "D6", "D7", "F4", "F5", "C7", "C6", "F0"],
+        "rows": ["B6", "B5", "B4", "D0", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ep/comsn/mollydooker/config.h b/keyboards/ep/comsn/mollydooker/config.h
index 573ba5d32a..a00c6cd354 100644
--- a/keyboards/ep/comsn/mollydooker/config.h
+++ b/keyboards/ep/comsn/mollydooker/config.h
@@ -17,33 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-  { F4, F5, F6, F7, D2 }
-#define MATRIX_COL_PINS \
-  { B1, B2, B3, E6, B7, F1, F0, D0, D1, D7, D5, D4, D6, B4, B5, D3, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-// #endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ep/comsn/mollydooker/info.json b/keyboards/ep/comsn/mollydooker/info.json
index 69641b24b8..a1355ce5a1 100644
--- a/keyboards/ep/comsn/mollydooker/info.json
+++ b/keyboards/ep/comsn/mollydooker/info.json
@@ -7,6 +7,14 @@
         "pid": "0x9696",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B3", "E6", "B7", "F1", "F0", "D0", "D1", "D7", "D5", "D4", "D6", "B4", "B5", "D3", "B6", "C6", "C7"],
+        "rows": ["F4", "F5", "F6", "F7", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ep/comsn/mollydooker/mollydooker.c b/keyboards/ep/comsn/mollydooker/mollydooker.c
deleted file mode 100644
index 3657ac9642..0000000000
--- a/keyboards/ep/comsn/mollydooker/mollydooker.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Elliot Powell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mollydooker.h"
diff --git a/keyboards/ep/comsn/tf_longeboye/config.h b/keyboards/ep/comsn/tf_longeboye/config.h
index 655715c361..a86557f6ce 100644
--- a/keyboards/ep/comsn/tf_longeboye/config.h
+++ b/keyboards/ep/comsn/tf_longeboye/config.h
@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-  { B5, B4, D1, D2, D3 }
-#define MATRIX_COL_PINS \
-  { F4, F5, F6, F7, B1, B3, B2, B6, F0, F1, C7, D5, B7, E6, D7, C6, D4, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-// #endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ep/comsn/tf_longeboye/info.json b/keyboards/ep/comsn/tf_longeboye/info.json
index 227cc54a2e..4e34df59ec 100644
--- a/keyboards/ep/comsn/tf_longeboye/info.json
+++ b/keyboards/ep/comsn/tf_longeboye/info.json
@@ -7,6 +7,11 @@
         "pid": "0x9696",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "C7", "D5", "B7", "E6", "D7", "C6", "D4", "D0"],
+        "rows": ["B5", "B4", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c b/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c
deleted file mode 100644
index ee8db1e523..0000000000
--- a/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Elliot Powell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "tf_longeboye.h"
diff --git a/keyboards/epoch80/config.h b/keyboards/epoch80/config.h
deleted file mode 100644
index 686130babb..0000000000
--- a/keyboards/epoch80/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D1, D0, B3, B0, B2, B1 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/epoch80/epoch80.c b/keyboards/epoch80/epoch80.c
deleted file mode 100644
index 43aa6ee8c9..0000000000
--- a/keyboards/epoch80/epoch80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "epoch80.h"
diff --git a/keyboards/epoch80/epoch80.h b/keyboards/epoch80/epoch80.h
deleted file mode 100644
index a21623b1c9..0000000000
--- a/keyboards/epoch80/epoch80.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k314, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413,       k415,       \
-    k500, k501, k502,                   k506,                   k510, k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, k314, ____, ____, }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500, k501, k502,                   k506,                   k510, k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, ____, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi_splitbs( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k314, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500, k501, k502,                   k506,                   k510, k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, k314, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500, k501, k502,                   k506,                         k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, ____, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, ____, k511, k512, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan_splitbs( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k314, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500, k501, k502,                   k506,                         k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, k314, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, ____, k511, k512, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500,       k502,                   k506,                         k511,       k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, ____, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, ____, k502, ____, ____, ____, k506, ____, ____, ____, ____, k511, ____, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl_splitbs( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k314, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500,       k502,                   k506,                         k511,       k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, k314, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, ____, k502, ____, ____, ____, k506, ____, ____, ____, ____, k511, ____, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,       k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k213, k313,                   \
-    k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500, k501, k502,                   k506,                   k510, k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, ____, ____, ____, }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, k513, k514, k515, k516, }  \
-}
diff --git a/keyboards/epoch80/info.json b/keyboards/epoch80/info.json
index d8b83f8882..7a67933c2f 100644
--- a/keyboards/epoch80/info.json
+++ b/keyboards/epoch80/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"],
+        "rows": ["D1", "D0", "B3", "B0", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "E6",
         "scroll_lock": "B7",
@@ -19,729 +24,833 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.5, "y":0},
-                {"x":16.5, "y":0},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5},
-                {"x":14, "y":1.5},
-                {"x":15.5, "y":1.5},
-                {"x":16.5, "y":1.5},
-                {"x":17.5, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.5, "y":2.5},
-                {"x":16.5, "y":2.5},
-                {"x":17.5, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":1.25},
-                {"x":1.25, "y":4.5},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":1.75},
-                {"x":14, "y":4.5},
-                {"x":16.5, "y":4.5},
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.5, "y":5.5},
-                {"x":16.5, "y":5.5},
-                {"x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [3, 14], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.5, "y":0},
-                {"x":16.5, "y":0},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.5, "y":1.5},
-                {"x":16.5, "y":1.5},
-                {"x":17.5, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.5, "y":2.5},
-                {"x":16.5, "y":2.5},
-                {"x":17.5, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.5, "y":4.5},
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.5, "y":5.5},
-                {"x":16.5, "y":5.5},
-                {"x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_splitbs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.5, "y":0},
-                {"x":16.5, "y":0},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5},
-                {"x":14, "y":1.5},
-                {"x":15.5, "y":1.5},
-                {"x":16.5, "y":1.5},
-                {"x":17.5, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.5, "y":2.5},
-                {"x":16.5, "y":2.5},
-                {"x":17.5, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.5, "y":4.5},
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.5, "y":5.5},
-                {"x":16.5, "y":5.5},
-                {"x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [3, 14], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.5, "y":0},
-                {"x":16.5, "y":0},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.5, "y":1.5},
-                {"x":16.5, "y":1.5},
-                {"x":17.5, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.5, "y":2.5},
-                {"x":16.5, "y":2.5},
-                {"x":17.5, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.5, "y":4.5},
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":1.5, "y":5.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":12.5, "y":5.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.5, "y":5.5},
-                {"x":16.5, "y":5.5},
-                {"x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan_splitbs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.5, "y":0},
-                {"x":16.5, "y":0},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5},
-                {"x":14, "y":1.5},
-                {"x":15.5, "y":1.5},
-                {"x":16.5, "y":1.5},
-                {"x":17.5, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.5, "y":2.5},
-                {"x":16.5, "y":2.5},
-                {"x":17.5, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.5, "y":4.5},
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":1.5, "y":5.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":12.5, "y":5.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.5, "y":5.5},
-                {"x":16.5, "y":5.5},
-                {"x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [3, 14], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.5, "y":0},
-                {"x":16.5, "y":0},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.5, "y":1.5},
-                {"x":16.5, "y":1.5},
-                {"x":17.5, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.5, "y":2.5},
-                {"x":16.5, "y":2.5},
-                {"x":17.5, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.5, "y":4.5},
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.5, "y":5.5},
-                {"x":16.5, "y":5.5},
-                {"x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl_splitbs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.5, "y":0},
-                {"x":16.5, "y":0},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5},
-                {"x":14, "y":1.5},
-                {"x":15.5, "y":1.5},
-                {"x":16.5, "y":1.5},
-                {"x":17.5, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.5, "y":2.5},
-                {"x":16.5, "y":2.5},
-                {"x":17.5, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.5, "y":4.5},
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.5, "y":5.5},
-                {"x":16.5, "y":5.5},
-                {"x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [3, 14], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.5, "y":0},
-                {"x":16.5, "y":0},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.5, "y":1.5},
-                {"x":16.5, "y":1.5},
-                {"x":17.5, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.75, "y":2.5, "w":1.25, "h":2},
-                {"x":15.5, "y":2.5},
-                {"x":16.5, "y":2.5},
-                {"x":17.5, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5},
-                {"x":0, "y":4.5, "w":1.25},
-                {"x":1.25, "y":4.5},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.5, "y":4.5},
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.5, "y":5.5},
-                {"x":16.5, "y":5.5},
-                {"x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 17.5, "y": 2.5},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 05aec8e958..3adcd0198b 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -47,7 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE  1
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
@@ -69,7 +68,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_BRIGHTNESS_DEFAULT (LED_BRIGHTNESS_HI)
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index 7b9d9d3bad..3683128234 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -408,7 +408,7 @@ static bool is_on = false;
 static bool is_dynamic_recording = false;
 static uint16_t dynamic_loop_timer;
 
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
     is_dynamic_recording = true;
     dynamic_loop_timer = timer_read();
     ergodox_right_led_1_on();
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h
index 2dbfdbba73..0c23a12969 100644
--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox_ez/ergodox_ez.h
@@ -25,12 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdbool.h>
 #include "i2c_master.h"
 
-#if defined(KEYBOARD_ergodox_ez_glow)
-#    include "glow.h"
-#elif defined(KEYBOARD_ergodox_ez_shine)
-#    include "shine.h"
-#endif
-
 // I2C aliases and register addresses (see "mcp23018.md")
 #define I2C_ADDR        0b0100000
 #define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
@@ -146,152 +140,6 @@ typedef union {
 
 extern keyboard_config_t keyboard_config;
 
-/*
- *   LEFT HAND: LINES 115-122
- *  RIGHT HAND: LINES 124-131
- */
-#define LAYOUT_ergodox(                                         \
-                                                                \
-    k00,k01,k02,k03,k04,k05,k06,                                \
-    k10,k11,k12,k13,k14,k15,k16,                                \
-    k20,k21,k22,k23,k24,k25,                                    \
-    k30,k31,k32,k33,k34,k35,k36,                                \
-    k40,k41,k42,k43,k44,                                        \
-                            k55,k56,                            \
-                                k54,                            \
-                        k53,k52,k51,                            \
-                                                                \
-        k07,k08,k09,k0A,k0B,k0C,k0D,                            \
-        k17,k18,k19,k1A,k1B,k1C,k1D,                            \
-            k28,k29,k2A,k2B,k2C,k2D,                            \
-        k37,k38,k39,k3A,k3B,k3C,k3D,                            \
-                k49,k4A,k4B,k4C,k4D,                            \
-    k57,k58,                                                    \
-    k59,                                                        \
-    k5C,k5B,k5A )                                               \
-                                                                \
-   /* matrix positions */                                       \
-   {                                                            \
-    { k00, k10, k20, k30, k40, KC_NO },   \
-    { k01, k11, k21, k31, k41, k51 },   \
-    { k02, k12, k22, k32, k42, k52 },   \
-    { k03, k13, k23, k33, k43, k53 },   \
-    { k04, k14, k24, k34, k44, k54 },   \
-    { k05, k15, k25, k35, KC_NO, k55 },   \
-    { k06, k16, KC_NO, k36, KC_NO, k56 },   \
-                                                                 \
-    { k07, k17, KC_NO, k37,KC_NO, k57 },   \
-    { k08, k18, k28, k38,KC_NO, k58 },   \
-    { k09, k19, k29, k39, k49, k59 },   \
-    { k0A, k1A, k2A, k3A, k4A, k5A },   \
-    { k0B, k1B, k2B, k3B, k4B, k5B },   \
-    { k0C, k1C, k2C, k3C, k4C, k5C },   \
-    { k0D, k1D, k2D, k3D, k4D, KC_NO }    \
-   }
-
-/*
- *   LEFT HAND: LINES 158-165
- *  RIGHT HAND: LINES 167-174
- */
-#define LAYOUT_ergodox_80(                                      \
-                                                                \
-    k00,k01,k02,k03,k04,k05,k06,                                \
-    k10,k11,k12,k13,k14,k15,k16,                                \
-    k20,k21,k22,k23,k24,k25,                                    \
-    k30,k31,k32,k33,k34,k35,k36,                                \
-    k40,k41,k42,k43,k44,                                        \
-                            k55,k56,                            \
-                        k45,k46,k54,                            \
-                        k53,k52,k51,                            \
-                                                                \
-        k07,k08,k09,k0A,k0B,k0C,k0D,                            \
-        k17,k18,k19,k1A,k1B,k1C,k1D,                            \
-            k28,k29,k2A,k2B,k2C,k2D,                            \
-        k37,k38,k39,k3A,k3B,k3C,k3D,                            \
-                k49,k4A,k4B,k4C,k4D,                            \
-    k57,k58,                                                    \
-    k59,k47,k48,                                                \
-    k5C,k5B,k5A )                                               \
-                                                                \
-   /* matrix positions */                                       \
-   {                                                            \
-    { k00, k10, k20, k30, k40, KC_NO },   \
-    { k01, k11, k21, k31, k41, k51 },   \
-    { k02, k12, k22, k32, k42, k52 },   \
-    { k03, k13, k23, k33, k43, k53 },   \
-    { k04, k14, k24, k34, k44, k54 },   \
-    { k05, k15, k25, k35, k45, k55 },   \
-    { k06, k16, KC_NO, k36, k46, k56 },   \
-                                                                 \
-    { k07, k17, KC_NO, k37, k47, k57 },   \
-    { k08, k18, k28, k38, k48, k58 },   \
-    { k09, k19, k29, k39, k49, k59 },   \
-    { k0A, k1A, k2A, k3A, k4A, k5A },   \
-    { k0B, k1B, k2B, k3B, k4B, k5B },   \
-    { k0C, k1C, k2C, k3C, k4C, k5C },   \
-    { k0D, k1D, k2D, k3D, k4D, KC_NO }    \
-   }
-
-/*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */
-#define LAYOUT_ergodox_pretty(                                           \
-    L00,L01,L02,L03,L04,L05,L06,           R00,R01,R02,R03,R04,R05,R06,  \
-    L10,L11,L12,L13,L14,L15,L16,           R10,R11,R12,R13,R14,R15,R16,  \
-    L20,L21,L22,L23,L24,L25,                   R21,R22,R23,R24,R25,R26,  \
-    L30,L31,L32,L33,L34,L35,L36,           R30,R31,R32,R33,R34,R35,R36,  \
-    L40,L41,L42,L43,L44,                           R42,R43,R44,R45,R46,  \
-                            L55,L56,   R50,R51,                          \
-                                L54,   R52,                              \
-                        L53,L52,L51,   R55,R54,R53 )                     \
-                                          \
-   /* matrix positions */                 \
-    {                                     \
-    { L00, L10, L20, L30, L40, KC_NO },   \
-    { L01, L11, L21, L31, L41, L51 },     \
-    { L02, L12, L22, L32, L42, L52 },     \
-    { L03, L13, L23, L33, L43, L53 },     \
-    { L04, L14, L24, L34, L44, L54 },     \
-    { L05, L15, L25, L35, KC_NO, L55 },   \
-    { L06, L16, KC_NO, L36, KC_NO, L56 }, \
-                                          \
-    { R00, R10, KC_NO, R30,KC_NO, R50 },  \
-    { R01, R11, R21, R31,KC_NO, R51 },    \
-    { R02, R12, R22, R32, R42, R52 },     \
-    { R03, R13, R23, R33, R43, R53 },     \
-    { R04, R14, R24, R34, R44, R54 },     \
-    { R05, R15, R25, R35, R45, R55 },     \
-    { R06, R16, R26, R36, R46, KC_NO }    \
-    }
-
-/*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */
-#define LAYOUT_ergodox_pretty_80(                                        \
-    L00,L01,L02,L03,L04,L05,L06,           R00,R01,R02,R03,R04,R05,R06,  \
-    L10,L11,L12,L13,L14,L15,L16,           R10,R11,R12,R13,R14,R15,R16,  \
-    L20,L21,L22,L23,L24,L25,                   R21,R22,R23,R24,R25,R26,  \
-    L30,L31,L32,L33,L34,L35,L36,           R30,R31,R32,R33,R34,R35,R36,  \
-    L40,L41,L42,L43,L44,                           R42,R43,R44,R45,R46,  \
-                            L55,L56,   R50,R51,                          \
-                        L45,L46,L54,   R52,R40,R41,                      \
-                        L53,L52,L51,   R55,R54,R53 )                     \
-                                          \
-      /* matrix positions */              \
-    {                                     \
-    { L00, L10, L20, L30, L40, KC_NO },   \
-    { L01, L11, L21, L31, L41, L51 },     \
-    { L02, L12, L22, L32, L42, L52 },     \
-    { L03, L13, L23, L33, L43, L53 },     \
-    { L04, L14, L24, L34, L44, L54 },     \
-    { L05, L15, L25, L35, L45, L55 },     \
-    { L06, L16, KC_NO, L36, L46, L56 },   \
-                                          \
-    { R00, R10, KC_NO, R30, R40, R50 },   \
-    { R01, R11, R21, R31, R41, R51 },     \
-    { R02, R12, R22, R32, R42, R52 },     \
-    { R03, R13, R23, R33, R43, R53 },     \
-    { R04, R14, R24, R34, R44, R54 },     \
-    { R05, R15, R25, R35, R45, R55 },     \
-    { R06, R16, R26, R36, R46, KC_NO }    \
-    }
-
 /*  ---- LEFT HAND ----     ---- RIGHT HAND ---- */
 #define LED_LAYOUT_ergodox_pretty(                \
     L01,L02,L03,L04,L05,    R01,R02,R03,R04,R05,  \
diff --git a/keyboards/ergodox_ez/glow/glow.h b/keyboards/ergodox_ez/glow/glow.h
deleted file mode 100644
index da7a6073ef..0000000000
--- a/keyboards/ergodox_ez/glow/glow.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
-Copyright 2015 ZSA Technology Labs Inc (@zsa)
-Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "ergodox_ez.h"
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index cfef842617..5727d11184 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -6,6 +6,12 @@
         "vid": "0x3297",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "debounce": 30,
@@ -13,97 +19,386 @@
     "layouts": {
         "LAYOUT_ergodox": {
             "layout": [
-              {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-              {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-              {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-              {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-                     {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
 
-                                            {"x":6, "y":5}, {"x":7, "y":5},
-                                                            {"x":7, "y":6},
-              {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
+                {"matrix": [4, 5], "x": 7, "y": 6},
+                {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
+                {"matrix": [1, 5], "x": 7, "y": 7},
 
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
 
-                         {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-                {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-                                              {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-                {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-                                                                    {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
 
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
 
-              {"x":9, "y":5}, {"x":10, "y":5},
-              {"x":9, "y":6},
-              {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+                {"matrix": [9, 5], "x": 9, "y": 6},
+                {"matrix": [12, 5], "x": 9, "y": 7},
+                {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+                {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
             ]
         },
         "LAYOUT_ergodox_pretty": {
             "layout": [
-              {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-              {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
 
-              {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-              {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
 
-              {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-              {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
 
-              {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-              {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
 
-                     {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-                                                                    {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
 
-                                            {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
-                                                            {"x":7, "y":6},      {"x":9, "y":6},
-              {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
+
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+
+                {"matrix": [4, 5], "x": 7, "y": 6},
+                {"matrix": [9, 5], "x": 9, "y": 6},
+
+                {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
+                {"matrix": [1, 5], "x": 7, "y": 7},
+
+                {"matrix": [12, 5], "x": 9, "y": 7},
+                {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+                {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
             ]
         },
         "LAYOUT_ergodox_80": {
-          "layout": [
-            {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-            {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-            {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-            {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-                   {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-
-                                          {"x":6, "y":5}, {"x":7, "y":5},
-                          {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6},
-                          {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7},
-
-
-                          {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-                          {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-                                                        {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-                          {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-                                                                              {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
-
-
-            {"x":9, "y":5}, {"x":10, "y":5},
-            {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
-            {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
-          ]
-      },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
+
+                {"matrix": [5, 4], "x": 5, "y": 6},
+                {"matrix": [6, 4], "x": 6, "y": 6},
+                {"matrix": [4, 5], "x": 7, "y": 6},
+
+                {"matrix": [3, 5], "x": 5, "y": 7},
+                {"matrix": [2, 5], "x": 6, "y": 7},
+                {"matrix": [1, 5], "x": 7, "y": 7},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+
+                {"matrix": [9, 5], "x": 9, "y": 6},
+                {"matrix": [7, 4], "x": 10, "y": 6},
+                {"matrix": [8, 4], "x": 11, "y": 6},
+
+                {"matrix": [12, 5], "x": 9, "y": 7},
+                {"matrix": [11, 5], "x": 10, "y": 7},
+                {"matrix": [10, 5], "x": 11, "y": 7}
+            ]
+        },
         "LAYOUT_ergodox_pretty_80": {
-          "layout": [
-            {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-            {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
 
-            {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-            {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
 
-            {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-            {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
 
-            {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-            {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
 
-                   {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-                                                                  {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
 
-                                          {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
-                          {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6},      {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
-                          {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
-          ]
-      }
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
+
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+
+                {"matrix": [5, 4], "x": 5, "y": 6},
+                {"matrix": [6, 4], "x": 6, "y": 6},
+                {"matrix": [4, 5], "x": 7, "y": 6},
+
+                {"matrix": [9, 5], "x": 9, "y": 6},
+                {"matrix": [7, 4], "x": 10, "y": 6},
+                {"matrix": [8, 4], "x": 11, "y": 6},
+
+                {"matrix": [3, 5], "x": 5, "y": 7},
+                {"matrix": [2, 5], "x": 6, "y": 7},
+                {"matrix": [1, 5], "x": 7, "y": 7},
+
+                {"matrix": [12, 5], "x": 9, "y": 7},
+                {"matrix": [11, 5], "x": 10, "y": 7},
+                {"matrix": [10, 5], "x": 11, "y": 7}
+            ]
+        }
     }
 }
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h b/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h
index 11c81f2eba..c03ee70bd5 100755
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h
+++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h
@@ -21,8 +21,6 @@
 
 #undef TAPPING_TOGGLE
 #undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
 
 #define TAPPING_TOGGLE  1
 #define TAPPING_TERM    150
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
index 11c81f2eba..c03ee70bd5 100644
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
@@ -21,8 +21,6 @@
 
 #undef TAPPING_TOGGLE
 #undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
 
 #define TAPPING_TOGGLE  1
 #define TAPPING_TERM    150
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/config.h b/keyboards/ergodox_ez/keymaps/danielo515/config.h
index c69c0dfe57..7428cccc82 100644
--- a/keyboards/ergodox_ez/keymaps/danielo515/config.h
+++ b/keyboards/ergodox_ez/keymaps/danielo515/config.h
@@ -4,7 +4,6 @@
 */
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 200
 
 #define ONESHOT_TAP_TOGGLE 3
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
index 3f8c68ceb7..e90d7184ee 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
@@ -12,8 +12,6 @@
 #undef  DEBOUNCE
 #define DEBOUNCE 15
 
-#undef  IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h b/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h
index 06c50e0a96..232b608be9 100644
--- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h
+++ b/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h
@@ -25,8 +25,6 @@
 // #undef TAPPING_TERM
 // #define TAPPING_TERM 499
 
-/* Turning permissive hold and ignore mod tap interrupt off in order to test the tapping term. */
+/* Turning permissive hold off in order to test the tapping term. */
 #undef PERMISSIVE_HOLD
 #define PERMISSIVE_HOLD
-#undef IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/config.h b/keyboards/ergodox_ez/keymaps/nfriend/config.h
index 36d23c96b7..141d7ac89a 100644
--- a/keyboards/ergodox_ez/keymaps/nfriend/config.h
+++ b/keyboards/ergodox_ez/keymaps/nfriend/config.h
@@ -26,6 +26,4 @@
 
 #define PERMISSIVE_HOLD
 
-#undef IGNORE_MOD_TAP_INTERRUPT
-
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/config.h b/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
index 84c5adfc9e..edd1f130cc 100644
--- a/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
+++ b/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
@@ -5,7 +5,6 @@
 #define RGBLIGHT_SLEEP
 
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
 
 
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index e421ae778d..b51e93061b 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -17,7 +17,6 @@ UNICODE_ENABLE   = no  # Unicode
 SWAP_HANDS_ENABLE= no   # Allow swapping hands of keyboard
 
 RGB_MATRIX_ENABLE = no # enable later
-RGB_MATRIX_DRIVER = IS31FL3731
 DEBOUNCE_TYPE = sym_eager_pr
 
 # project specific files
diff --git a/keyboards/ergodox_ez/shine/shine.h b/keyboards/ergodox_ez/shine/shine.h
deleted file mode 100644
index da7a6073ef..0000000000
--- a/keyboards/ergodox_ez/shine/shine.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
-Copyright 2015 ZSA Technology Labs Inc (@zsa)
-Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "ergodox_ez.h"
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.c b/keyboards/ergodox_stm32/ergodox_stm32.c
index 8419b40f41..2a919506dc 100644
--- a/keyboards/ergodox_stm32/ergodox_stm32.c
+++ b/keyboards/ergodox_stm32/ergodox_stm32.c
@@ -1,5 +1,5 @@
+#include "ergodox_stm32.h"
 #include "i2c_master.h"
-#include QMK_KEYBOARD_H
 
 extern inline void ergodox_board_led_1_on(void);
 extern inline void ergodox_board_led_2_on(void);
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.h b/keyboards/ergodox_stm32/ergodox_stm32.h
index b84b101f38..5a736ad818 100644
--- a/keyboards/ergodox_stm32/ergodox_stm32.h
+++ b/keyboards/ergodox_stm32/ergodox_stm32.h
@@ -35,80 +35,3 @@ extern volatile int mcp23017_status;
 uint8_t init_mcp23017(void);
 
 void ergodox_blink_all_leds(void);
-
-/*
- *   LEFT HAND: LINES 115-122
- *  RIGHT HAND: LINES 124-131
- */
-#define LAYOUT_ergodox(                     \
-                                            \
-    k00, k01, k02, k03, k04, k05, k06,      \
-    k10, k11, k12, k13, k14, k15, k16,      \
-    k20, k21, k22, k23, k24, k25,           \
-    k30, k31, k32, k33, k34, k35, k36,      \
-    k40, k41, k42, k43, k44,                \
-    k55, k56,                               \
-    k54,                                    \
-    k53, k52, k51,                          \
-                                            \
-    k07, k08, k09, k0A, k0B, k0C, k0D,      \
-    k17, k18, k19, k1A, k1B, k1C, k1D,      \
-    k28, k29, k2A, k2B, k2C, k2D,           \
-    k37, k38, k39, k3A, k3B, k3C, k3D,      \
-    k49, k4A, k4B, k4C, k4D,                \
-    k57, k58,                               \
-    k59,                                    \
-    k5C, k5B, k5A)                          \
-                                            \
-  /* matrix positions */                    \
-  {                                         \
-    {k00, k10, k20, k30, k40, KC_NO},       \
-        {k01, k11, k21, k31, k41, k51},     \
-        {k02, k12, k22, k32, k42, k52},     \
-        {k03, k13, k23, k33, k43, k53},     \
-        {k04, k14, k24, k34, k44, k54},     \
-        {k05, k15, k25, k35, KC_NO, k55},   \
-        {k06, k16, KC_NO, k36, KC_NO, k56}, \
-                                            \
-        {k07, k17, KC_NO, k37, KC_NO, k57}, \
-        {k08, k18, k28, k38, KC_NO, k58},   \
-        {k09, k19, k29, k39, k49, k59},     \
-        {k0A, k1A, k2A, k3A, k4A, k5A},     \
-        {k0B, k1B, k2B, k3B, k4B, k5B},     \
-        {k0C, k1C, k2C, k3C, k4C, k5C},     \
-    {                                       \
-      k0D, k1D, k2D, k3D, k4D, KC_NO        \
-    }                                       \
-  }
-
-/*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */
-#define LAYOUT_ergodox_pretty(                                            \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
-    L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26,           \
-    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
-    L40, L41, L42, L43, L44, R42, R43, R44, R45, R46,                     \
-    L55, L56, R50, R51,                                                   \
-    L54, R52,                                                             \
-    L53, L52, L51, R55, R54, R53)                                         \
-                                                                          \
-  /* matrix positions */                                                  \
-  {                                                                       \
-    {L00, L10, L20, L30, L40, KC_NO},                                     \
-        {L01, L11, L21, L31, L41, L51},                                   \
-        {L02, L12, L22, L32, L42, L52},                                   \
-        {L03, L13, L23, L33, L43, L53},                                   \
-        {L04, L14, L24, L34, L44, L54},                                   \
-        {L05, L15, L25, L35, KC_NO, L55},                                 \
-        {L06, L16, KC_NO, L36, KC_NO, L56},                               \
-                                                                          \
-        {R00, R10, KC_NO, R30, KC_NO, R50},                               \
-        {R01, R11, R21, R31, KC_NO, R51},                                 \
-        {R02, R12, R22, R32, R42, R52},                                   \
-        {R03, R13, R23, R33, R43, R53},                                   \
-        {R04, R14, R24, R34, R44, R54},                                   \
-        {R05, R15, R25, R35, R45, R55},                                   \
-    {                                                                     \
-      R06, R16, R26, R36, R46, KC_NO                                      \
-    }                                                                     \
-  }
diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/info.json
index 73e2d7f532..305adc9e12 100644
--- a/keyboards/ergodox_stm32/info.json
+++ b/keyboards/ergodox_stm32/info.json
@@ -8,52 +8,196 @@
         "pid": "0x1308",
         "device_version": "1.0.1"
     },
-    "layouts": {
+"layouts": {
         "LAYOUT_ergodox": {
             "layout": [
-              {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-              {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-              {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-              {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-                     {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
 
-                                            {"x":6, "y":5}, {"x":7, "y":5},
-                                                            {"x":7, "y":6},
-              {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
 
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
 
-                         {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-                {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-                                              {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-                {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-                                                                    {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
 
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
+                {"matrix": [4, 5], "x": 7, "y": 6},
 
-              {"x":9, "y":5}, {"x":10, "y":5},
-              {"x":9, "y":6},
-              {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+                {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
+                {"matrix": [1, 5], "x": 7, "y": 7},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+
+                {"matrix": [9, 5], "x": 9, "y": 6},
+
+                {"matrix": [12, 5], "x": 9, "y": 7},
+
+                {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+                {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
             ]
         },
         "LAYOUT_ergodox_pretty": {
             "layout": [
-              {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-              {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
+
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+
+                {"matrix": [4, 5], "x": 7, "y": 6},
 
-              {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-              {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+                {"matrix": [9, 5], "x": 9, "y": 6},
 
-              {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-              {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+                {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
 
-              {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-              {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+                {"matrix": [1, 5], "x": 7, "y": 7},
 
-                     {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-                                                                    {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [12, 5], "x": 9, "y": 7},
 
-                                            {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
-                                                            {"x":7, "y":6},      {"x":9, "y":6},
-              {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+                {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+                {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
             ]
         }
     }
diff --git a/keyboards/ergodox_stm32/matrix.c b/keyboards/ergodox_stm32/matrix.c
index 2046e39c1f..3eb35cd7bb 100644
--- a/keyboards/ergodox_stm32/matrix.c
+++ b/keyboards/ergodox_stm32/matrix.c
@@ -1,13 +1,10 @@
-#include <stdint.h>
-#include <stdbool.h>
+#include "matrix.h"
 #include <string.h>
-#include <hal.h>
 #include "timer.h"
 #include "wait.h"
-#include "print.h"
-#include "matrix.h"
+#include "debug.h"
 #include "i2c_master.h"
-#include QMK_KEYBOARD_H
+#include "ergodox_stm32.h"
 
 #ifndef DEBOUNCE
 #define DEBOUNCE 10
diff --git a/keyboards/ergoslab/ergoslab.c b/keyboards/ergoslab/ergoslab.c
deleted file mode 100644
index 6f2796c07c..0000000000
--- a/keyboards/ergoslab/ergoslab.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ergoslab.h"
diff --git a/keyboards/ergoslab/ergoslab.h b/keyboards/ergoslab/ergoslab.h
deleted file mode 100644
index 8b02490543..0000000000
--- a/keyboards/ergoslab/ergoslab.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_ergoslab_rev1
-    #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h
index ccb95e9b67..414de0ed15 100644
--- a/keyboards/ergoslab/rev1/config.h
+++ b/keyboards/ergoslab/rev1/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 2    // Number of LEDs
 // FIXME this following line should enable our layer status LEDs to work on both
 // sides without need to wire them into a chain. It doesn't though. Uncommenting
diff --git a/keyboards/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/info.json
index 9133612a18..5f00b666d1 100644
--- a/keyboards/ergoslab/rev1/info.json
+++ b/keyboards/ergoslab/rev1/info.json
@@ -8,9 +8,17 @@
     "pid": "0x5148",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+    "rows": ["D4", "C6", "D7", "E6", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/ergoslab/rev1/rev1.h b/keyboards/ergoslab/rev1/rev1.h
index bf99a17b23..d7fd53a31e 100644
--- a/keyboards/ergoslab/rev1/rev1.h
+++ b/keyboards/ergoslab/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "ergoslab.h"
-
 #include "quantum.h"
 
 #define LAYOUT_ergoslab( \
diff --git a/keyboards/ergotravel/ergotravel.c b/keyboards/ergotravel/ergotravel.c
deleted file mode 100644
index 2ada434c19..0000000000
--- a/keyboards/ergotravel/ergotravel.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ergotravel.h"
diff --git a/keyboards/ergotravel/ergotravel.h b/keyboards/ergotravel/ergotravel.h
deleted file mode 100644
index 314775495b..0000000000
--- a/keyboards/ergotravel/ergotravel.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_ergotravel_rev1
-    #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h
index a24148772b..326a8f8ffe 100644
--- a/keyboards/ergotravel/rev1/config.h
+++ b/keyboards/ergotravel/rev1/config.h
@@ -17,21 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json
index f442549194..7c6ed69ce3 100644
--- a/keyboards/ergotravel/rev1/info.json
+++ b/keyboards/ergotravel/rev1/info.json
@@ -8,9 +8,17 @@
     "pid": "0x4554",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["C6", "D7", "E6", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "bootloader": "caterina",
   "processor": "atmega32u4",
   "layouts": {
diff --git a/keyboards/ergotravel/rev1/rev1.c b/keyboards/ergotravel/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/ergotravel/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/ergotravel/rev1/rev1.h b/keyboards/ergotravel/rev1/rev1.h
index 2973f4d9f3..c241c2d599 100644
--- a/keyboards/ergotravel/rev1/rev1.h
+++ b/keyboards/ergotravel/rev1/rev1.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "ergotravel.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
 #define XXX KC_NO
 
 #define LAYOUT( \
diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h
index 43ed9e6454..d5c2b1438e 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/config.h
+++ b/keyboards/ericrlau/numdiscipline/rev1/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B2, A1, B1, A0, B0 }
-#define MATRIX_COL_PINS { A2, B3, A3, B4, A4, D5, D6, C6, C5, C4, C3, C2, C1, C0, D7, A5, A6, A7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/info.json
index f979293e57..53dc7a59d1 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/info.json
+++ b/keyboards/ericrlau/numdiscipline/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7", "A5", "A6", "A7"],
+        "rows": ["B2", "A1", "B1", "A0", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "layouts": {
diff --git a/keyboards/ericrlau/numdiscipline/rev1/rev1.c b/keyboards/ericrlau/numdiscipline/rev1/rev1.c
deleted file mode 100644
index 9f3a0ba4a4..0000000000
--- a/keyboards/ericrlau/numdiscipline/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Eric Lau
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/esca/getawayvan/config.h b/keyboards/esca/getawayvan/config.h
index 08b356c839..2c76ce9c8d 100644
--- a/keyboards/esca/getawayvan/config.h
+++ b/keyboards/esca/getawayvan/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A4, A13, A10, C13, C14 }
-#define MATRIX_ROW_PINS { A9, A8, A3, A5 }
-#define DIODE_DIRECTION COL2ROW
-
 #define GRAVE_ESC_CTRL_OVERRIDE
 
 #define RGBLIGHT_EFFECT_BREATHING
@@ -34,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 51
 #define RGBLIGHT_HUE_STEP 20
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/esca/getawayvan/getawayvan.c b/keyboards/esca/getawayvan/getawayvan.c
deleted file mode 100644
index ecd2bcf487..0000000000
--- a/keyboards/esca/getawayvan/getawayvan.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Enrique Cabrera
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include "getawayvan.h"
diff --git a/keyboards/esca/getawayvan/info.json b/keyboards/esca/getawayvan/info.json
index c9ed1ff7d5..78294f441a 100644
--- a/keyboards/esca/getawayvan/info.json
+++ b/keyboards/esca/getawayvan/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0401",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A4", "A13", "A10", "C13", "C14"],
+        "rows": ["A9", "A8", "A3", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/esca/getawayvan_f042/config.h b/keyboards/esca/getawayvan_f042/config.h
index 08b356c839..2c76ce9c8d 100644
--- a/keyboards/esca/getawayvan_f042/config.h
+++ b/keyboards/esca/getawayvan_f042/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A4, A13, A10, C13, C14 }
-#define MATRIX_ROW_PINS { A9, A8, A3, A5 }
-#define DIODE_DIRECTION COL2ROW
-
 #define GRAVE_ESC_CTRL_OVERRIDE
 
 #define RGBLIGHT_EFFECT_BREATHING
@@ -34,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 51
 #define RGBLIGHT_HUE_STEP 20
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/esca/getawayvan_f042/getawayvan_f042.c b/keyboards/esca/getawayvan_f042/getawayvan_f042.c
deleted file mode 100644
index 6ee36ae432..0000000000
--- a/keyboards/esca/getawayvan_f042/getawayvan_f042.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Enrique Cabrer
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include "getawayvan_f042.h"
diff --git a/keyboards/esca/getawayvan_f042/info.json b/keyboards/esca/getawayvan_f042/info.json
index d93fe2f1a1..0311159bf0 100644
--- a/keyboards/esca/getawayvan_f042/info.json
+++ b/keyboards/esca/getawayvan_f042/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0401",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A4", "A13", "A10", "C13", "C14"],
+        "rows": ["A9", "A8", "A3", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F042",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index 069eb056bf..6eaf9220c7 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 8
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/eternal_keypad/eternal_keypad.c b/keyboards/eternal_keypad/eternal_keypad.c
deleted file mode 100644
index abaa94a288..0000000000
--- a/keyboards/eternal_keypad/eternal_keypad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 duckyb
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "eternal_keypad.h"
diff --git a/keyboards/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json
index 4ca85c261e..35a5a543a4 100644
--- a/keyboards/eternal_keypad/info.json
+++ b/keyboards/eternal_keypad/info.json
@@ -8,9 +8,17 @@
         "pid": "0xDB00",
         "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",
     "bootmagic": {
         "matrix": [0, 1]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/eu_isolation/config.h b/keyboards/eu_isolation/config.h
index d9a71facd8..de7206efe2 100644
--- a/keyboards/eu_isolation/config.h
+++ b/keyboards/eu_isolation/config.h
@@ -14,14 +14,6 @@
 */ 
 #pragma once
 
-
-/* NIU Mini PCB default pin-out */
-#define MATRIX_ROW_PINS { D2, D3, F1, F0 }
-#define MATRIX_COL_PINS { D0, D1, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/eu_isolation/eu_isolation.c b/keyboards/eu_isolation/eu_isolation.c
deleted file mode 100644
index 9794e34e5c..0000000000
--- a/keyboards/eu_isolation/eu_isolation.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Austin "TuckTuckFloof" Ashmore
-* 
-* This program is free software: you can redistribute it and/or modify 
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation, either version 2 of the License, or 
-* (at your option) any later version. 
-* 
-* This program is distributed in the hope that it will be useful, 
-* but WITHOUT ANY WARRANTY; without even the implied warranty of 
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-* GNU General Public License for more details. 
-* You should have received a copy of the GNU General Public License 
-* along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/ 
-
-#include "eu_isolation.h"
diff --git a/keyboards/eu_isolation/info.json b/keyboards/eu_isolation/info.json
index 60af69d1eb..352b83445d 100644
--- a/keyboards/eu_isolation/info.json
+++ b/keyboards/eu_isolation/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4373",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
+        "rows": ["D2", "D3", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/evancookaudio/sleepingdinosaur/config.h b/keyboards/evancookaudio/sleepingdinosaur/config.h
deleted file mode 100644
index 4f5e2d0ae8..0000000000
--- a/keyboards/evancookaudio/sleepingdinosaur/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 evan cook <evan@evancook.audio>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/
-
-#pragma once
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* key matrix pins */
-
-#define MATRIX_ROW_PINS {D1, D0, D4, C6, D7}
-#define MATRIX_COL_PINS {B3, B1, F7, F6, F5, F4}
diff --git a/keyboards/evancookaudio/sleepingdinosaur/info.json b/keyboards/evancookaudio/sleepingdinosaur/info.json
index bc75243e8b..ddae2a187d 100644
--- a/keyboards/evancookaudio/sleepingdinosaur/info.json
+++ b/keyboards/evancookaudio/sleepingdinosaur/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D1", "D0", "D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.c b/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.c
deleted file mode 100644
index 814275e3f0..0000000000
--- a/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 evan cook <evan@evancook.audio>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
-*/
-#include "sleepingdinosaur.h"
diff --git a/keyboards/evancookaudio/tenpad/config.h b/keyboards/evancookaudio/tenpad/config.h
deleted file mode 100644
index 0d65056fb3..0000000000
--- a/keyboards/evancookaudio/tenpad/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2022 evan cook <evan@evancook.audio>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/
-
-#pragma once
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* key matrix pins */
-
-#define MATRIX_ROW_PINS {D0, D1}
-#define MATRIX_COL_PINS {F4, F5, F6, F7, B1}
-
-
diff --git a/keyboards/evancookaudio/tenpad/info.json b/keyboards/evancookaudio/tenpad/info.json
index 09c48979dd..0a62863488 100644
--- a/keyboards/evancookaudio/tenpad/info.json
+++ b/keyboards/evancookaudio/tenpad/info.json
@@ -8,25 +8,28 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
+        "LAYOUT_ortho_2x5": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
 
-	"LAYOUT_ortho_2x5": {
-        "layout": [
-            { "label": "K01", "x": 0, "y": 0 },
-            { "label": "K02", "x": 1, "y": 0 },
-            { "label": "K03", "x": 2, "y": 0 },
-            { "label": "K04", "x": 3, "y": 0 },
-            { "label": "K05", "x": 4, "y": 0 },
-
-            { "label": "K06", "x": 0, "y": 1 },
-            { "label": "K07", "x": 1, "y": 1 },
-            { "label": "K08", "x": 2, "y": 1 },
-            { "label": "K09", "x": 3, "y": 1 },
-            { "label": "K10", "x": 4, "y": 1 }
-  
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1}
             ]
-	    }   
+        }
     }
 }
diff --git a/keyboards/evancookaudio/tenpad/tenpad.c b/keyboards/evancookaudio/tenpad/tenpad.c
deleted file mode 100644
index abd852baf2..0000000000
--- a/keyboards/evancookaudio/tenpad/tenpad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 evan cook <evan@evancook.audio>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
-*/
-#include "tenpad.h"
diff --git a/keyboards/evancookaudio/tenpad/tenpad.h b/keyboards/evancookaudio/tenpad/tenpad.h
deleted file mode 100644
index c9d6fa62c9..0000000000
--- a/keyboards/evancookaudio/tenpad/tenpad.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 evan cook <evan@evancook.audio>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x5(\
-    k00, k01, k02, k03, k04, \
-    k05, k06, k07, k08, k09 \
-    ) { \
-        {k00, k01, k02, k03, k04},\
-        {k05, k06, k07, k08, k09},\
-    }
diff --git a/keyboards/eve/meteor/config.h b/keyboards/eve/meteor/config.h
deleted file mode 100644
index 7ccb9b93df..0000000000
--- a/keyboards/eve/meteor/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-//                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
-#define MATRIX_ROW_PINS { B5, B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0, D7}
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eve/meteor/info.json b/keyboards/eve/meteor/info.json
index eff9b8bc4f..a00ae77f40 100644
--- a/keyboards/eve/meteor/info.json
+++ b/keyboards/eve/meteor/info.json
@@ -8,9 +8,17 @@
         "pid": "0x4D54",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "D7"],
+        "rows": ["B5", "B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1"
     },
diff --git a/keyboards/eve/meteor/meteor.c b/keyboards/eve/meteor/meteor.c
deleted file mode 100644
index 6bdb117f3a..0000000000
--- a/keyboards/eve/meteor/meteor.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "meteor.h"
diff --git a/keyboards/eve/meteor/rules.mk b/keyboards/eve/meteor/rules.mk
index 4ba2386220..88711b2127 100644
--- a/keyboards/eve/meteor/rules.mk
+++ b/keyboards/eve/meteor/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = no
-WS2812_DRIVER = i2c
diff --git a/keyboards/evil80/config.h b/keyboards/evil80/config.h
index f4a0747037..a559a9698e 100644
--- a/keyboards/evil80/config.h
+++ b/keyboards/evil80/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { F1, F4, F5, F0, B3, B0 }
-#define MATRIX_COL_PINS { B2, D0, D1, D2, D3, D5, D4, D6, D7, B4, B1, C6, C7, E6, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/evil80/evil80.c b/keyboards/evil80/evil80.c
deleted file mode 100644
index 471580fd80..0000000000
--- a/keyboards/evil80/evil80.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "evil80.h"
diff --git a/keyboards/evil80/info.json b/keyboards/evil80/info.json
index 1240ab5d4b..392ee05e25 100644
--- a/keyboards/evil80/info.json
+++ b/keyboards/evil80/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B1", "C6", "C7", "E6", "F6", "F7"],
+        "rows": ["F1", "F4", "F5", "F0", "B3", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5",
         "breathing": true
diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h
index c76fc98986..62e21e0caa 100644
--- a/keyboards/evolv/config.h
+++ b/keyboards/evolv/config.h
@@ -17,16 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A6, A5, A4, A3, A2, A1, A0, C14, F0, C15, B9, B8, B7, B6, B5, B4}
-#define MATRIX_ROW_PINS { B10, B11, A7, B0, B1, B2}
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 16
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/evolv/evolv.c b/keyboards/evolv/evolv.c
index 3f27628946..54f92c9dbc 100644
--- a/keyboards/evolv/evolv.c
+++ b/keyboards/evolv/evolv.c
@@ -16,13 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "evolv.h"
-
-#ifndef MEDIA_KEY_DELAY
-#     define MEDIA_KEY_DELAY 100
-#endif
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, MEDIA_KEY_DELAY);
-    return true;
-}
diff --git a/keyboards/evolv/info.json b/keyboards/evolv/info.json
index 76b428b1cd..097dfb43cb 100644
--- a/keyboards/evolv/info.json
+++ b/keyboards/evolv/info.json
@@ -8,194 +8,239 @@
         "pid": "0x0E75",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "A0", "C14", "F0", "C15", "B9", "B8", "B7", "B6", "B5", "B4"],
+        "rows": ["B10", "B11", "A7", "B0", "B1", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "A15", "resolution": 2}
         ]
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_evolv_ansi": {
             "layout": [
-			{"label":"Esc", "x":0, "y":0.25},
-			{"label":"F1", "x":1.25, "y":0.25},
-			{"label":"F2", "x":2.25, "y":0.25},
-			{"label":"F3", "x":3.25, "y":0.25},
-			{"label":"F4", "x":4.25, "y":0.25},
-			{"label":"F5", "x":5.5, "y":0.25},
-			{"label":"F6", "x":6.5, "y":0.25},
-			{"label":"F7", "x":7.5, "y":0.25},
-			{"label":"F8", "x":8.5, "y":0.25},
-			{"label":"F9", "x":9.75, "y":0.25},
-			{"label":"F10", "x":10.75, "y":0.25},
-			{"label":"F11", "x":11.75, "y":0.25},
-			{"label":"F12", "x":12.75, "y":0.25},
-			{"label":"F13", "x":14, "y":0.25},
-			{"label":"~", "x":0, "y":1.5},
-			{"label":"!", "x":1, "y":1.5},
-			{"label":"@", "x":2, "y":1.5},
-			{"label":"#", "x":3, "y":1.5},
-			{"label":"$", "x":4, "y":1.5},
-			{"label":"%", "x":5, "y":1.5},
-			{"label":"^", "x":6, "y":1.5},
-			{"label":"&", "x":7, "y":1.5},
-			{"label":"*", "x":8, "y":1.5},
-			{"label":"(", "x":9, "y":1.5},
-			{"label":")", "x":10, "y":1.5},
-			{"label":"_", "x":11, "y":1.5},
-			{"label":"+", "x":12, "y":1.5},
-			{"label":"LBksp", "x":13, "y":1.5},
-			{"label":"RBksp", "x":14, "y":1.5},
-			{"label":"Del", "x":15.25, "y":1.5},
-			{"label":"VolUp", "x":17.75, "y":1.5},
-			{"label":"Tab", "x":0, "y":2.5, "w":1.5},
-			{"label":"Q", "x":1.5, "y":2.5},
-			{"label":"W", "x":2.5, "y":2.5},
-			{"label":"E", "x":3.5, "y":2.5},
-			{"label":"R", "x":4.5, "y":2.5},
-			{"label":"T", "x":5.5, "y":2.5},
-			{"label":"Y", "x":6.5, "y":2.5},
-			{"label":"U", "x":7.5, "y":2.5},
-			{"label":"I", "x":8.5, "y":2.5},
-			{"label":"O", "x":9.5, "y":2.5},
-			{"label":"P", "x":10.5, "y":2.5},
-			{"label":"{", "x":11.5, "y":2.5},
-			{"label":"}", "x":12.5, "y":2.5},
-			{"label":"|", "x":13.5, "y":2.5, "w":1.5},
-			{"label":"Page Up", "x":15.25, "y":2.5},
-			{"label":"Prev", "x":16.75, "y":2.5},
-			{"label":"Play", "x":17.75, "y":2.5},
-			{"label":"Next", "x":18.75, "y":2.5},
-			{"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-			{"label":"A", "x":1.75, "y":3.5},
-			{"label":"S", "x":2.75, "y":3.5},
-			{"label":"D", "x":3.75, "y":3.5},
-			{"label":"F", "x":4.75, "y":3.5},
-			{"label":"G", "x":5.75, "y":3.5},
-			{"label":"H", "x":6.75, "y":3.5},
-			{"label":"J", "x":7.75, "y":3.5},
-			{"label":"K", "x":8.75, "y":3.5},
-			{"label":"L", "x":9.75, "y":3.5},
-			{"label":":", "x":10.75, "y":3.5},
-			{"label":"\"", "x":11.75, "y":3.5},
-			{"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-			{"label":"Page Down", "x":15.25, "y":3.5},
-			{"label":"VolDn", "x":17.75, "y":3.5},
-			{"label":"Shift", "x":0, "y":4.5, "w":2.25},
-			{"label":"Z", "x":2.25, "y":4.5},
-			{"label":"X", "x":3.25, "y":4.5},
-			{"label":"C", "x":4.25, "y":4.5},
-			{"label":"V", "x":5.25, "y":4.5},
-			{"label":"B", "x":6.25, "y":4.5},
-			{"label":"N", "x":7.25, "y":4.5},
-			{"label":"M", "x":8.25, "y":4.5},
-			{"label":"<", "x":9.25, "y":4.5},
-			{"label":">", "x":10.25, "y":4.5},
-			{"label":"?", "x":11.25, "y":4.5},
-			{"label":"Shift", "x":12.25, "y":4.5, "w":1.5},
-			{"label":"\u2191", "x":14, "y":4.75},
-			{"label":"Fn", "x":15.25, "y":4.5},
-			{"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-			{"label":"Win", "x":1.5, "y":5.5},
-			{"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-			{"x":4, "y":5.5, "w":6.25},
-			{"label":"Win", "x":10.25, "y":5.5, "w":1.25},
-			{"label":"Alt", "x":11.5, "y":5.5, "w":1.25},
-			{"label":"\u2190", "x":13, "y":5.75},
-			{"label":"\u2193", "x":14, "y":5.75},
-			{"label":"\u2192", "x":15, "y":5.75}]
+                {"x":0, "y":0},
+
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+
+                {"x":14, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+
+                {"x":15.25, "y":1.25},
+
+                {"x":17.75, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+
+                {"x":15.25, "y":2.25},
+
+                {"x":16.75, "y":2.25},
+                {"x":17.75, "y":2.25},
+                {"x":18.75, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":15.25, "y":3.25},
+
+                {"x":17.75, "y":3.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.5},
+
+                {"x":14, "y":4.5},
+
+                {"x":15.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":1.5, "y":5.25},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":6.25},
+                {"x":10.25, "y":5.25, "w":1.25},
+                {"x":11.5, "y":5.25, "w":1.25},
+
+                {"x":13, "y":5.5},
+                {"x":14, "y":5.5},
+                {"x":15, "y":5.5}
+            ]
         },
         "LAYOUT_evolv_iso": {
             "layout": [
-			{"label":"Esc", "x":0, "y":0.25},
-			{"label":"F1", "x":1.25, "y":0.25},
-			{"label":"F2", "x":2.25, "y":0.25},
-			{"label":"F3", "x":3.25, "y":0.25},
-			{"label":"F4", "x":4.25, "y":0.25},
-			{"label":"F5", "x":5.5, "y":0.25},
-			{"label":"F6", "x":6.5, "y":0.25},
-			{"label":"F7", "x":7.5, "y":0.25},
-			{"label":"F8", "x":8.5, "y":0.25},
-			{"label":"F9", "x":9.75, "y":0.25},
-			{"label":"F10", "x":10.75, "y":0.25},
-			{"label":"F11", "x":11.75, "y":0.25},
-			{"label":"F12", "x":12.75, "y":0.25},
-			{"label":"F13", "x":14, "y":0.25},
-			{"label":"~", "x":0, "y":1.5},
-			{"label":"!", "x":1, "y":1.5},
-			{"label":"@", "x":2, "y":1.5},
-			{"label":"#", "x":3, "y":1.5},
-			{"label":"$", "x":4, "y":1.5},
-			{"label":"%", "x":5, "y":1.5},
-			{"label":"^", "x":6, "y":1.5},
-			{"label":"&", "x":7, "y":1.5},
-			{"label":"*", "x":8, "y":1.5},
-			{"label":"(", "x":9, "y":1.5},
-			{"label":")", "x":10, "y":1.5},
-			{"label":"_", "x":11, "y":1.5},
-			{"label":"+", "x":12, "y":1.5},
-			{"label":"LBksp", "x":13, "y":1.5},
-			{"label":"RBksp", "x":14, "y":1.5},
-			{"label":"Del", "x":15.25, "y":1.5},
-			{"label":"VolUp", "x":17.75, "y":1.5},
-			{"label":"Tab", "x":0, "y":2.5, "w":1.5},
-			{"label":"Q", "x":1.5, "y":2.5},
-			{"label":"W", "x":2.5, "y":2.5},
-			{"label":"E", "x":3.5, "y":2.5},
-			{"label":"R", "x":4.5, "y":2.5},
-			{"label":"T", "x":5.5, "y":2.5},
-			{"label":"Y", "x":6.5, "y":2.5},
-			{"label":"U", "x":7.5, "y":2.5},
-			{"label":"I", "x":8.5, "y":2.5},
-			{"label":"O", "x":9.5, "y":2.5},
-			{"label":"P", "x":10.5, "y":2.5},
-			{"label":"{", "x":11.5, "y":2.5},
-			{"label":"}", "x":12.5, "y":2.5},
-			{"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-			{"label":"Page Up", "x":15.25, "y":2.5},
-			{"label":"Prev", "x":16.75, "y":2.5},
-			{"label":"Play", "x":17.75, "y":2.5},
-			{"label":"Next", "x":18.75, "y":2.5},
-			{"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-			{"label":"A", "x":1.75, "y":3.5},
-			{"label":"S", "x":2.75, "y":3.5},
-			{"label":"D", "x":3.75, "y":3.5},
-			{"label":"F", "x":4.75, "y":3.5},
-			{"label":"G", "x":5.75, "y":3.5},
-			{"label":"H", "x":6.75, "y":3.5},
-			{"label":"J", "x":7.75, "y":3.5},
-			{"label":"K", "x":8.75, "y":3.5},
-			{"label":"L", "x":9.75, "y":3.5},
-			{"label":":", "x":10.75, "y":3.5},
-			{"label":"\"", "x":11.75, "y":3.5},
-			{"label":"~", "x":12.75, "y":3.5},
-			{"label":"Page Down", "x":15.25, "y":3.5},
-			{"label":"VolDn", "x":17.75, "y":3.5},
-			{"label":"Shift", "x":0, "y":4.5, "w":1.25},
-			{"label":"|", "x":1.25, "y":4.5},
-			{"label":"Z", "x":2.25, "y":4.5},
-			{"label":"X", "x":3.25, "y":4.5},
-			{"label":"C", "x":4.25, "y":4.5},
-			{"label":"V", "x":5.25, "y":4.5},
-			{"label":"B", "x":6.25, "y":4.5},
-			{"label":"N", "x":7.25, "y":4.5},
-			{"label":"M", "x":8.25, "y":4.5},
-			{"label":"<", "x":9.25, "y":4.5},
-			{"label":">", "x":10.25, "y":4.5},
-			{"label":"?", "x":11.25, "y":4.5},
-			{"label":"Shift", "x":12.25, "y":4.5, "w":1.5},
-			{"label":"\u2191", "x":14, "y":4.75},
-			{"label":"Fn", "x":15.25, "y":4.5},
-			{"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-			{"label":"Win", "x":1.5, "y":5.5},
-			{"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-			{"x":4, "y":5.5, "w":6.25},
-			{"label":"Win", "x":10.25, "y":5.5, "w":1.25},
-			{"label":"Alt", "x":11.5, "y":5.5, "w":1.25},
-			{"label":"\u2190", "x":13, "y":5.75},
-			{"label":"\u2193", "x":14, "y":5.75},
-			{"label":"\u2192", "x":15, "y":5.75}]
+                {"x":0, "y":0},
+
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+
+                {"x":14, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+
+                {"x":15.25, "y":1.25},
+
+                {"x":17.75, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"x":15.25, "y":2.25},
+
+                {"x":16.75, "y":2.25},
+                {"x":17.75, "y":2.25},
+                {"x":18.75, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":15.25, "y":3.25},
+
+                {"x":17.75, "y":3.25},
+
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.5},
+
+                {"x":14, "y":4.5},
+
+                {"x":15.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":1.5, "y":5.25},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":6.25},
+                {"x":10.25, "y":5.25, "w":1.25},
+                {"x":11.5, "y":5.25, "w":1.25},
+
+                {"x":13, "y":5.5},
+                {"x":14, "y":5.5},
+                {"x":15, "y":5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h
index 1098e61379..352b89dad9 100644
--- a/keyboards/evyd13/atom47/rev2/config.h
+++ b/keyboards/evyd13/atom47/rev2/config.h
@@ -17,20 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B1,B2,B3,B7}
-#define MATRIX_COL_PINS {D7,D5,F0,F1,F4,F6,F7,D4,C7,C6,D6,B5,B4}
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D0    // The pin the LED strip is connected to
 #define RGBLED_NUM 1     // Number of LEDs in your strip
diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json
index 9a7ac37f30..445aa8db9b 100644
--- a/keyboards/evyd13/atom47/rev2/info.json
+++ b/keyboards/evyd13/atom47/rev2/info.json
@@ -8,11 +8,19 @@
         "pid": "0x8E66",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "D5", "F0", "F1", "F4", "F6", "F7", "D4", "C7", "C6", "D6", "B5", "B4"],
+        "rows": ["B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 4,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "D0"
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "B7",
         "esc_output": "D7",
@@ -23,59 +31,62 @@
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
     "layouts": {
         "LAYOUT_split_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3, "w":1.75},
-                {"x":6, "y":3, "w":2.75},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/evyd13/atom47/rev2/rev2.c b/keyboards/evyd13/atom47/rev2/rev2.c
deleted file mode 100644
index adb21be368..0000000000
--- a/keyboards/evyd13/atom47/rev2/rev2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "rev2.h"
diff --git a/keyboards/evyd13/atom47/rev2/rev2.h b/keyboards/evyd13/atom47/rev2/rev2.h
deleted file mode 100644
index 4c4949ad08..0000000000
--- a/keyboards/evyd13/atom47/rev2/rev2.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT_all LAYOUT_split_space
-
-#define LAYOUT_split_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,      k2c, \
-  k30, k31, k32, k33, k34,      k36,      k38, k39, k3a,      k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c}, \
-  {k30, k31, k32, k33, k34, XXX, k36, XXX, k38, k39, k3a, XXX, k3c}  \
-}
-
-void matrix_init_user(void);
-void matrix_scan_user(void);
diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h
index 5cee6379ff..5f37dc519b 100644
--- a/keyboards/evyd13/atom47/rev3/config.h
+++ b/keyboards/evyd13/atom47/rev3/config.h
@@ -17,17 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B3,B2,B1,B0}
-#define MATRIX_COL_PINS {B7,F0,F1,F4,F6,D4,D6,D7,B4,B5,C6,C7,F7}
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F5    // The pin the LED strip is connected to
 #define RGBLED_NUM 6     // Number of LEDs in your strip
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json
index 644a095eca..39c5325bae 100644
--- a/keyboards/evyd13/atom47/rev3/info.json
+++ b/keyboards/evyd13/atom47/rev3/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0E6D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "F0", "F1", "F4", "F6", "D4", "D6", "D7", "B4", "B5", "C6", "C7", "F7"],
+        "rows": ["B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "F5"
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "B0",
         "esc_output": "B7",
@@ -24,111 +32,114 @@
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
     "layouts": {
         "LAYOUT_split_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3, "w":1.75},
-                {"x":6, "y":3, "w":2.75},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_full_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "w":6},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 7], "x": 3, "y": 3, "w": 6},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/evyd13/atom47/rev3/rev3.c b/keyboards/evyd13/atom47/rev3/rev3.c
deleted file mode 100644
index 52fa91fbc4..0000000000
--- a/keyboards/evyd13/atom47/rev3/rev3.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "rev3.h"
diff --git a/keyboards/evyd13/atom47/rev3/rev3.h b/keyboards/evyd13/atom47/rev3/rev3.h
deleted file mode 100644
index aa2e53ba22..0000000000
--- a/keyboards/evyd13/atom47/rev3/rev3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT_all LAYOUT_split_space
-
-#define LAYOUT_split_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-  k30, k31, k32, k33,      k35,      k37,      k39, k3a, k3b, k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
-  {k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3a, k3b, k3c}  \
-}
-
-#define LAYOUT_full_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-  k30, k31, k32,                k37,           k39, k3a, k3b, k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
-  {k30, k31, k32, XXX, XXX, XXX, XXX, k37, XXX, k39, k3a, k3b, k3c}  \
-}
diff --git a/keyboards/evyd13/atom47/rev4/config.h b/keyboards/evyd13/atom47/rev4/config.h
deleted file mode 100644
index 52a4bf2ff9..0000000000
--- a/keyboards/evyd13/atom47/rev4/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {D0,C2,C5,C6}
-#define MATRIX_COL_PINS {C4,C7,B7,B6,B5,B2,B1,B0,D6,D5,D4,D3,D2}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json
index 42b8abda54..1e83924bad 100644
--- a/keyboards/evyd13/atom47/rev4/info.json
+++ b/keyboards/evyd13/atom47/rev4/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8446",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C4", "C7", "B7", "B6", "B5", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2"],
+        "rows": ["D0", "C2", "C5", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B4"}
@@ -24,111 +29,114 @@
     },
     "processor": "atmega32u2",
     "bootloader": "qmk-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
     "layouts": {
         "LAYOUT_split_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3, "w":1.75},
-                {"x":6, "y":3, "w":2.75},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_full_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "w":6},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 7], "x": 3, "y": 3, "w": 6},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/evyd13/atom47/rev4/rev4.c b/keyboards/evyd13/atom47/rev4/rev4.c
deleted file mode 100644
index 0ac2a41acc..0000000000
--- a/keyboards/evyd13/atom47/rev4/rev4.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "rev4.h"
diff --git a/keyboards/evyd13/atom47/rev4/rev4.h b/keyboards/evyd13/atom47/rev4/rev4.h
deleted file mode 100644
index aa2e53ba22..0000000000
--- a/keyboards/evyd13/atom47/rev4/rev4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT_all LAYOUT_split_space
-
-#define LAYOUT_split_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-  k30, k31, k32, k33,      k35,      k37,      k39, k3a, k3b, k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
-  {k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3a, k3b, k3c}  \
-}
-
-#define LAYOUT_full_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-  k30, k31, k32,                k37,           k39, k3a, k3b, k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
-  {k30, k31, k32, XXX, XXX, XXX, XXX, k37, XXX, k39, k3a, k3b, k3c}  \
-}
diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h
index e79d7e8a87..ae0151d512 100644
--- a/keyboards/evyd13/atom47/rev5/config.h
+++ b/keyboards/evyd13/atom47/rev5/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS {B1,B2,B3,D4}
-#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,E6,D7,B4,B5,B6,C6,C7}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/info.json
index 847cac0b73..30005a992c 100644
--- a/keyboards/evyd13/atom47/rev5/info.json
+++ b/keyboards/evyd13/atom47/rev5/info.json
@@ -8,61 +8,72 @@
         "pid": "0x92EA",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["B1", "B2", "B3", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
+   "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
     "layouts": {
         "LAYOUT_split_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3, "w":1.75},
-                {"x":6, "y":3, "w":2.75},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/evyd13/atom47/rev5/rev5.c b/keyboards/evyd13/atom47/rev5/rev5.c
index 3336d8cf8b..adec48e6bb 100644
--- a/keyboards/evyd13/atom47/rev5/rev5.c
+++ b/keyboards/evyd13/atom47/rev5/rev5.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "rev5.h"
+#include "quantum.h"
 
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
diff --git a/keyboards/evyd13/atom47/rev5/rev5.h b/keyboards/evyd13/atom47/rev5/rev5.h
deleted file mode 100644
index 874dc285ab..0000000000
--- a/keyboards/evyd13/atom47/rev5/rev5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT_all LAYOUT_split_space
-
-#define LAYOUT_split_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-  k30, k31, k32, k33,      k35,      k37,      k39, k3a, k3b, k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
-  {k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3a, k3b, k3c}  \
-}
diff --git a/keyboards/evyd13/atom47/rev5/rules.mk b/keyboards/evyd13/atom47/rev5/rules.mk
index 3f2f8d3dd7..aad92997d0 100644
--- a/keyboards/evyd13/atom47/rev5/rules.mk
+++ b/keyboards/evyd13/atom47/rev5/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h
index 2f1708d532..230ff5e311 100644
--- a/keyboards/evyd13/eon40/config.h
+++ b/keyboards/evyd13/eon40/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {B7,D5,F5,F6}
-#define MATRIX_COL_PINS {F0,F1,F4,D3,D4,D6,D7,B4,B5,B6,C6,C7}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/eon40/eon40.c b/keyboards/evyd13/eon40/eon40.c
deleted file mode 100644
index 014fca9d40..0000000000
--- a/keyboards/evyd13/eon40/eon40.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "eon40.h"
diff --git a/keyboards/evyd13/eon40/eon40.h b/keyboards/evyd13/eon40/eon40.h
deleted file mode 100644
index 03e680d8bd..0000000000
--- a/keyboards/evyd13/eon40/eon40.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define XXX KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_4x12( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_planck_mit( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12_2x2u( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33,    k34,     k37,    k38, k39, k3a, k3b \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, XXX, XXX, k37, k38, k39, k3a, k3b } \
-}
diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json
index cda0c495a4..fb577ebb29 100644
--- a/keyboards/evyd13/eon40/info.json
+++ b/keyboards/evyd13/eon40/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0140",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+    "rows": ["B7", "D5", "F5", "F6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "E6", "pin_b": "F7"},
@@ -24,13 +29,166 @@
   "community_layouts": ["ortho_4x12", "planck_mit"],
   "layouts": {
     "LAYOUT_ortho_4x12": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
     "LAYOUT_planck_mit": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
     "LAYOUT_ortho_4x12_2x2u": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":6, "y":3, "w":2}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h
index 2660c3ddf2..abfa0fe63d 100644
--- a/keyboards/evyd13/eon65/config.h
+++ b/keyboards/evyd13/eon65/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {D3,D5,B1,B2,B3}
-#define MATRIX_COL_PINS {B0,D2,D4,D6,D7,B4,B5,B6,C6,C7,F7,F6,F5,F4,F1,F0}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
- #define RGB_DI_PIN E6
    #define RGBLED_NUM 10
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/evyd13/eon65/eon65.c b/keyboards/evyd13/eon65/eon65.c
deleted file mode 100644
index cdbe987ebb..0000000000
--- a/keyboards/evyd13/eon65/eon65.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "eon65.h"
diff --git a/keyboards/evyd13/eon65/eon65.h b/keyboards/evyd13/eon65/eon65.h
deleted file mode 100644
index 21cfd06647..0000000000
--- a/keyboards/evyd13/eon65/eon65.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define XXX KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,      \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e,      \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e       \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e, XXX }  \
-}
-
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e, XXX }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,                k49, k4a, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, XXX, k4c, k4d, k4e, XXX }  \
-}
-
-#define LAYOUT_65_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e, XXX }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,                k49, k4a, k4c, k4d, k4e  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, XXX, k4c, k4d, k4e, XXX }  \
-}
diff --git a/keyboards/evyd13/eon65/info.json b/keyboards/evyd13/eon65/info.json
index 9f1a67689f..26ff4e2af3 100644
--- a/keyboards/evyd13/eon65/info.json
+++ b/keyboards/evyd13/eon65/info.json
@@ -8,391 +8,399 @@
         "pid": "0xAEB4",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "D2", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D3", "D5", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi", "65_ansi_blocker", "65_iso", "65_iso_blocker"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":2, "w":1.25},
-                {"x":15, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 15], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/evyd13/eon75/config.h b/keyboards/evyd13/eon75/config.h
index e820ff9ab9..230ff5e311 100644
--- a/keyboards/evyd13/eon75/config.h
+++ b/keyboards/evyd13/eon75/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {D1,D0,D3,D2,D6,D4,D7,B4,B5,B6,C6,C7}
-#define MATRIX_COL_PINS {E6,F0,F1,F4,F5,F6,F7,B3}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/eon75/eon75.c b/keyboards/evyd13/eon75/eon75.c
deleted file mode 100644
index 38620a6362..0000000000
--- a/keyboards/evyd13/eon75/eon75.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "eon75.h"
diff --git a/keyboards/evyd13/eon75/info.json b/keyboards/evyd13/eon75/info.json
index 55d92273b8..b9af34edb6 100644
--- a/keyboards/evyd13/eon75/info.json
+++ b/keyboards/evyd13/eon75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5C62",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3"],
+        "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D5",
         "num_lock": "B7",
diff --git a/keyboards/evyd13/eon87/config.h b/keyboards/evyd13/eon87/config.h
index 0007e510c5..04247c7e73 100644
--- a/keyboards/evyd13/eon87/config.h
+++ b/keyboards/evyd13/eon87/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {B1,B2,B3,D4,D1,D5}
-#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,E6,B7,D3,D2}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
- #define RGB_DI_PIN D0
    #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/evyd13/eon87/eon87.c b/keyboards/evyd13/eon87/eon87.c
deleted file mode 100644
index 83a005225d..0000000000
--- a/keyboards/evyd13/eon87/eon87.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "eon87.h"
diff --git a/keyboards/evyd13/eon87/eon87.h b/keyboards/evyd13/eon87/eon87.h
deleted file mode 100644
index 9e850625eb..0000000000
--- a/keyboards/evyd13/eon87/eon87.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define XXX KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k0d, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
-    k50, k51, k52,      k54,      k56,      k58,      k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX, k4f, XXX }, \
-    { k50, k51, k52, XXX, k54, XXX, k56, XXX, k58, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,                     \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4c,           k4f,      \
-    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, XXX, XXX, k4f, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4c,           k4f,      \
-    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, XXX, XXX, k4f, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
diff --git a/keyboards/evyd13/eon87/info.json b/keyboards/evyd13/eon87/info.json
index 2dcdea0dd8..fc134b502f 100644
--- a/keyboards/evyd13/eon87/info.json
+++ b/keyboards/evyd13/eon87/info.json
@@ -8,318 +8,335 @@
         "pid": "0xAA6B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "E6", "B7", "D3", "D2"],
+        "rows": ["B1", "B2", "B3", "D4", "D1", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["tkl_ansi", "tkl_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25},
-                {"x": 14, "y": 1.25},
-
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 1.75},
-                {"x": 14, "y": 4.25},
-
-                {"x": 16.25, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 2.25},
-                {"x": 6, "y": 5.25, "w": 1.25},
-                {"x": 7.25, "y": 5.25, "w": 2.75},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [0, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 6], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"x": 0, "y": 4.25, "w": 2.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"x": 16.25, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"x": 16.25, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h
index 70d07b9855..dcf77ef1ac 100644
--- a/keyboards/evyd13/eon95/config.h
+++ b/keyboards/evyd13/eon95/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {D1,D0,D3,D2,D6,D4,D7,B4,B5,B6,C6,C7}
-#define MATRIX_COL_PINS {E6,F0,F1,F4,F5,F6,F7,B3,B2,B1}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/eon95/eon95.c b/keyboards/evyd13/eon95/eon95.c
deleted file mode 100644
index 603d84a139..0000000000
--- a/keyboards/evyd13/eon95/eon95.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "eon95.h"
diff --git a/keyboards/evyd13/eon95/info.json b/keyboards/evyd13/eon95/info.json
index e0d2736341..1ec5fd89ed 100644
--- a/keyboards/evyd13/eon95/info.json
+++ b/keyboards/evyd13/eon95/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8A18",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "B1"],
+        "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D5",
         "num_lock": "B7",
diff --git a/keyboards/evyd13/gh80_1800/config.h b/keyboards/evyd13/gh80_1800/config.h
index f60d43a498..4183c7db05 100644
--- a/keyboards/evyd13/gh80_1800/config.h
+++ b/keyboards/evyd13/gh80_1800/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {D5,B4,B5,B6,C6,C7,B0,B2,B1,B3}
-#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,D3,D2,D1,D0,B7}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/gh80_1800/gh80_1800.c b/keyboards/evyd13/gh80_1800/gh80_1800.c
deleted file mode 100644
index 1691b3949e..0000000000
--- a/keyboards/evyd13/gh80_1800/gh80_1800.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "gh80_1800.h"
diff --git a/keyboards/evyd13/gh80_1800/info.json b/keyboards/evyd13/gh80_1800/info.json
index 9bc3349db9..ed843e6d12 100644
--- a/keyboards/evyd13/gh80_1800/info.json
+++ b/keyboards/evyd13/gh80_1800/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8B23",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D3", "D2", "D1", "D0", "B7"],
+        "rows": ["D5", "B4", "B5", "B6", "C6", "C7", "B0", "B2", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D7",
         "num_lock": "D6",
diff --git a/keyboards/evyd13/gh80_3700/config.h b/keyboards/evyd13/gh80_3700/config.h
index 003131ceae..4183c7db05 100644
--- a/keyboards/evyd13/gh80_3700/config.h
+++ b/keyboards/evyd13/gh80_3700/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {B3,C7,C6,B6,B5,B4}
-#define MATRIX_COL_PINS {B0,D7,D6,D4}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/gh80_3700/gh80_3700.c b/keyboards/evyd13/gh80_3700/gh80_3700.c
index 40093f1022..617de50d5d 100644
--- a/keyboards/evyd13/gh80_3700/gh80_3700.c
+++ b/keyboards/evyd13/gh80_3700/gh80_3700.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "gh80_3700.h"
+#include "quantum.h"
 
 void led_init_ports(void) {
   setPinOutput(E6);
diff --git a/keyboards/evyd13/gh80_3700/gh80_3700.h b/keyboards/evyd13/gh80_3700/gh80_3700.h
deleted file mode 100644
index 4a350a9554..0000000000
--- a/keyboards/evyd13/gh80_3700/gh80_3700.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_all LAYOUT_ortho_6x4
-
-#define LAYOUT_ortho_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-    k50, k51, k52, k53  \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 }, \
-    { k50, k51, k52, k53 }  \
-}
-
-#define LAYOUT_numpad_6x4( \
-    k00, k01, k02, k03,    \
-    k10, k11, k12, k13,    \
-    k20, k21, k22,         \
-    k30, k31, k32, k33,    \
-    k40, k41, k42,         \
-    k50,      k52, k53     \
-) \
-{ \
-    { k00, k01, k02, k03 },   \
-    { k10, k11, k12, k13 },   \
-    { k20, k21, k22, KC_NO }, \
-    { k30, k31, k32, k33 },   \
-    { k40, k41, k42, KC_NO }, \
-    { k50, KC_NO, k52, k53 }  \
-}
diff --git a/keyboards/evyd13/gh80_3700/info.json b/keyboards/evyd13/gh80_3700/info.json
index 7ab1267ed9..ac66909e59 100644
--- a/keyboards/evyd13/gh80_3700/info.json
+++ b/keyboards/evyd13/gh80_3700/info.json
@@ -8,6 +8,11 @@
         "pid": "0x633A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "D7", "D6", "D4"],
+        "rows": ["B3", "C7", "C6", "B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F4"}
@@ -16,68 +21,71 @@
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["numpad_6x4", "ortho_6x4"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_ortho_6x4"
+    },
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                
-                {"x":0, "y":5},
-                {"x":1, "y":5},
-                {"x":2, "y":5}, 
-                {"x":3, "y":5},
-                
-                {"x":0, "y":6},
-                {"x":1, "y":6},
-                {"x":2, "y":6},
-                {"x":3, "y":6}
+                {"matrix": [0, 0], "x": 0, "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": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+                {"matrix": [4, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 5},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+                {"matrix": [5, 2], "x": 2, "y": 6},
+                {"matrix": [5, 3], "x": 3, "y": 6}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":3, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
 
-                {"x":0, "y":5},
-                {"x":1, "y":5},
-                {"x":2, "y":5},
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+                {"matrix": [4, 2], "x": 2, "y": 5},
 
-                {"x":0, "y":6, "w":2},
-                {"x":2, "y":6},
-                {"x":3, "y":5, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 6, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 6},
+                {"matrix": [5, 3], "x": 3, "y": 5, "h": 2}
             ]
         }
     }
diff --git a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
index 4c83b485f4..c0a6bf5976 100644
--- a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
+++ b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#define RGB_DI_PIN B2
+#define WS2812_DI_PIN B2
 #define RGBLED_NUM 8
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/evyd13/gud70/config.h b/keyboards/evyd13/gud70/config.h
deleted file mode 100644
index 8482880611..0000000000
--- a/keyboards/evyd13/gud70/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2020 Evelien Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {D7,D6,D4,E6,B7}
-#define MATRIX_COL_PINS {D5,D3,D2,D1,D0,B4,B5,B6,C6,C7,F0,F1,F4,F5,F6,F7}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/evyd13/gud70/info.json b/keyboards/evyd13/gud70/info.json
index 2ce63fa082..a48ec2e097 100644
--- a/keyboards/evyd13/gud70/info.json
+++ b/keyboards/evyd13/gud70/info.json
@@ -8,6 +8,11 @@
         "pid": "0x198B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0", "B4", "B5", "B6", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["D7", "D6", "D4", "E6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B1",
         "num_lock": "B2",
diff --git a/keyboards/evyd13/minitomic/config.h b/keyboards/evyd13/minitomic/config.h
index 6e5b26d022..230ff5e311 100644
--- a/keyboards/evyd13/minitomic/config.h
+++ b/keyboards/evyd13/minitomic/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {B1,B3,D4,D6}
-#define MATRIX_COL_PINS {C6,B6,B5,B4,D7,F0,F1,F4,F5,F6,F7,B7,E6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/minitomic/info.json b/keyboards/evyd13/minitomic/info.json
index 1a58aa135f..1948089272 100644
--- a/keyboards/evyd13/minitomic/info.json
+++ b/keyboards/evyd13/minitomic/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0145",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C6", "B6", "B5", "B4", "D7", "F0", "F1", "F4", "F5", "F6", "F7", "B7", "E6"],
+    "rows": ["B1", "B3", "D4", "D6"]
+  },
+  "diode_direction": "COL2ROW",
   "qmk_lufa_bootloader": {
     "esc_input": "B1",
     "esc_output": "C6",
@@ -21,10 +26,109 @@
   "bootloader": "qmk-dfu",
   "layouts": {
     "LAYOUT_split_space": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":1.75}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":9.25, "y":3, "w":1.25}, {"x":10.5, "y":3, "w":1.25}, {"x":11.75, "y":3, "w":1.25}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 10], "x": 10.25, "y": 1},
+        {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 2.5, "y": 3},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25}
+      ]
     },
     "LAYOUT_full_space": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3, "w":6.25}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":1.25}, {"x":11.75, "y":3, "w":1.25}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 10], "x": 10.25, "y": 1},
+        {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 6], "x": 3.25, "y": 3, "w": 6.25},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25}
+      ]
     }
   }
 }
diff --git a/keyboards/evyd13/minitomic/minitomic.c b/keyboards/evyd13/minitomic/minitomic.c
deleted file mode 100644
index 15f2829648..0000000000
--- a/keyboards/evyd13/minitomic/minitomic.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "minitomic.h"
diff --git a/keyboards/evyd13/minitomic/minitomic.h b/keyboards/evyd13/minitomic/minitomic.h
deleted file mode 100644
index da98ebcf12..0000000000
--- a/keyboards/evyd13/minitomic/minitomic.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define XXX KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,    \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1b,    \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    \
-    k30, k31, k32, k33,      k34,      k36,      k37, k39, k3a, k3b     \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX }, \
-    { k30, k31, k32, k33, k34, XXX, k36, k37, XXX, k39, k3a, k3b, XXX }  \
-}
-
-#define LAYOUT_full_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,    \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1b,    \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    \
-    k30, k31, k32,                k36,                k39, k3a, k3b     \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX }, \
-    { k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, k39, k3a, k3b, XXX }  \
-}
diff --git a/keyboards/evyd13/mx5160/config.h b/keyboards/evyd13/mx5160/config.h
index 408d12cb69..230ff5e311 100644
--- a/keyboards/evyd13/mx5160/config.h
+++ b/keyboards/evyd13/mx5160/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {C6,C7,B5,B6,D7,B4,D4,D6,D5,D3}
-#define MATRIX_COL_PINS {D0,D1,D2,F7,F6,F5,F4,F1,F0,E6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/mx5160/info.json b/keyboards/evyd13/mx5160/info.json
index 4436aefb8f..67345afd68 100644
--- a/keyboards/evyd13/mx5160/info.json
+++ b/keyboards/evyd13/mx5160/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5160",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
+        "rows": ["C6", "C7", "B5", "B6", "D7", "B4", "D4", "D6", "D5", "D3"]
+    },
+    "diode_direction": "ROW2COL",
     "qmk_lufa_bootloader": {
         "esc_input": "D1",
         "esc_output": "C6",
diff --git a/keyboards/evyd13/mx5160/mx5160.c b/keyboards/evyd13/mx5160/mx5160.c
deleted file mode 100644
index 298c44fd49..0000000000
--- a/keyboards/evyd13/mx5160/mx5160.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mx5160.h"
diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h
index 4993142773..f64827d05f 100644
--- a/keyboards/evyd13/nt660/config.h
+++ b/keyboards/evyd13/nt660/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS {B7,E6,F6,F7,C7}
-#define MATRIX_COL_PINS {D6,D7,B4,B5,B6,C6,B0,B1,B2,B3,F0,F1,F4,F5,D4}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json
index ba2503c5ef..7fd9858ef6 100644
--- a/keyboards/evyd13/nt660/info.json
+++ b/keyboards/evyd13/nt660/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1F02",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "B0", "B1", "B2", "B3", "F0", "F1", "F4", "F5", "D4"],
+        "rows": ["B7", "E6", "F6", "F7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "B7",
         "esc_output": "D6",
@@ -22,227 +27,233 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0f", "x":13, "y":0, "w":2},
-                {"label":"k0d", "x":15.5, "y":0},
-
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k1f", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1d", "x":15.5, "y":1},
-
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2c", "x":12.75, "y":2},
-                {"label":"k2f", "x":13.75, "y":2, "w":1.25},
-
-                {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":2.25},
-                {"label":"k3f", "x":14.5, "y":3},
-
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4},
-                {"label":"k42", "x":2.25, "y":4, "w":1.25},
-                {"label":"k46", "x":3.5, "y":4, "w":6.25},
-                {"label":"k49", "x":9.75, "y":4, "w":1.25},
-                {"label":"k4a", "x":11, "y":4, "w":1.25},
-                {"label":"k4b", "x":12.25, "y":4, "w":1.25},
-                {"label":"k4c", "x":13.5, "y":4},
-                {"label":"k4f", "x":14.5, "y":4},
-                {"label":"k4d", "x":15.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4},
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.5, "y": 4}
             ]
         },
         "LAYOUT_66_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15.5, "y":0},
-                
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15.5, "y":1},
-                
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.25},
-                {"label":"\u2191", "x":14.5, "y":3},
-                
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4},
-                {"label":"Alt", "x":2.25, "y":4, "w":1.25},
-                {"x":3.5, "y":4, "w":6.25},
-                {"label":"Alt", "x":9.75, "y":4, "w":1.25},
-                {"label":"Win", "x":11, "y":4, "w":1.25},
-                {"label":"Menu", "x":12.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13.5, "y":4},
-                {"label":"\u2193", "x":14.5, "y":4},
-                {"label":"\u2192", "x":15.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4},
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.5, "y": 4}
             ]
         },
         "LAYOUT_66_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15.5, "y":0},
-                
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15.5, "y":1},
-                
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"|", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"NUBS", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.25},
-                {"label":"\u2191", "x":14.5, "y":3},
-                
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4},
-                {"label":"Alt", "x":2.25, "y":4, "w":1.25},
-                {"x":3.5, "y":4, "w":6.25},
-                {"label":"Alt", "x":9.75, "y":4, "w":1.25},
-                {"label":"Win", "x":11, "y":4, "w":1.25},
-                {"label":"Menu", "x":12.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13.5, "y":4},
-                {"label":"\u2193", "x":14.5, "y":4},
-                {"label":"\u2192", "x":15.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4},
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/evyd13/nt660/nt660.c b/keyboards/evyd13/nt660/nt660.c
deleted file mode 100644
index f89fa579c3..0000000000
--- a/keyboards/evyd13/nt660/nt660.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "nt660.h"
diff --git a/keyboards/evyd13/nt660/nt660.h b/keyboards/evyd13/nt660/nt660.h
deleted file mode 100644
index ce9f98f54a..0000000000
--- a/keyboards/evyd13/nt660/nt660.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
- 
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1f, k1d, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2f,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f,      \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4f, k4d  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1f, k1d}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2f, XXX}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f, XXX}, \
-    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4f, k4d}  \
-}
-#define LAYOUT_66_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1f, k1d, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2f,      \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f,      \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4f, k4d  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1f, k1d}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2f, XXX}, \
-    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f, XXX}, \
-    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4f, k4d}  \
-}
-
-#define LAYOUT_66_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1d, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2f,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f,      \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4f, k4d  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1d}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2f, XXX}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f, XXX}, \
-    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4f, k4d}  \
-}
diff --git a/keyboards/evyd13/nt750/config.h b/keyboards/evyd13/nt750/config.h
index ee44ae05ef..f64827d05f 100644
--- a/keyboards/evyd13/nt750/config.h
+++ b/keyboards/evyd13/nt750/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS {B2,B3,B7,D0,D1,D2}
-#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,D4,E6,B1,B0}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/nt750/info.json b/keyboards/evyd13/nt750/info.json
index 032e31285f..a23e8756aa 100644
--- a/keyboards/evyd13/nt750/info.json
+++ b/keyboards/evyd13/nt750/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3320",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B1", "B0"],
+        "rows": ["B2", "B3", "B7", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D5",
         "on_state": 0
@@ -17,293 +22,317 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6.5, "y":0},
-                {"label":"k07", "x":7.5, "y":0},
-                {"label":"k08", "x":8.5, "y":0},
-                {"label":"k09", "x":9.5, "y":0},
-                {"label":"k0a", "x":11, "y":0},
-                {"label":"k0b", "x":12, "y":0},
-                {"label":"k0c", "x":13, "y":0},
-                {"label":"k0d", "x":14, "y":0},
-                {"label":"k0e", "x":15.25, "y":0},
-                {"label":"k0f", "x":16.25, "y":0},
-                {"label":"k0g", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1.5},
-                {"label":"k11", "x":1, "y":1.5},
-                {"label":"k12", "x":2, "y":1.5},
-                {"label":"k13", "x":3, "y":1.5},
-                {"label":"k14", "x":4, "y":1.5},
-                {"label":"k15", "x":5, "y":1.5},
-                {"label":"k16", "x":6, "y":1.5},
-                {"label":"k17", "x":7, "y":1.5},
-                {"label":"k18", "x":8, "y":1.5},
-                {"label":"k19", "x":9, "y":1.5},
-                {"label":"k1a", "x":10, "y":1.5},
-                {"label":"k1b", "x":11, "y":1.5},
-                {"label":"k1c", "x":12, "y":1.5},
-                {"label":"k1d", "x":13, "y":1.5, "w":2},
-                {"label":"k1e", "x":15.25, "y":1.5},
-                {"label":"k1f", "x":16.25, "y":1.5},
-                {"label":"k1g", "x":17.25, "y":1.5},
-                
-                {"label":"k20", "x":0, "y":2.5, "w":1.5},
-                {"label":"k21", "x":1.5, "y":2.5},
-                {"label":"k22", "x":2.5, "y":2.5},
-                {"label":"k23", "x":3.5, "y":2.5},
-                {"label":"k24", "x":4.5, "y":2.5},
-                {"label":"k25", "x":5.5, "y":2.5},
-                {"label":"k26", "x":6.5, "y":2.5},
-                {"label":"k27", "x":7.5, "y":2.5},
-                {"label":"k28", "x":8.5, "y":2.5},
-                {"label":"k29", "x":9.5, "y":2.5},
-                {"label":"k2a", "x":10.5, "y":2.5},
-                {"label":"k2b", "x":11.5, "y":2.5},
-                {"label":"k2c", "x":12.5, "y":2.5},
-                {"label":"k2d", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"k2e", "x":15.25, "y":2.5},
-                {"label":"k2f", "x":16.25, "y":2.5},
-                {"label":"k2g", "x":17.25, "y":2.5},
-                
-                {"label":"k30", "x":0, "y":3.5, "w":1.75},
-                {"label":"k31", "x":1.75, "y":3.5},
-                {"label":"k32", "x":2.75, "y":3.5},
-                {"label":"k33", "x":3.75, "y":3.5},
-                {"label":"k34", "x":4.75, "y":3.5},
-                {"label":"k35", "x":5.75, "y":3.5},
-                {"label":"k36", "x":6.75, "y":3.5},
-                {"label":"k37", "x":7.75, "y":3.5},
-                {"label":"k38", "x":8.75, "y":3.5},
-                {"label":"k39", "x":9.75, "y":3.5},
-                {"label":"k3a", "x":10.75, "y":3.5},
-                {"label":"k3b", "x":11.75, "y":3.5},
-                {"label":"k3c", "x":12.75, "y":3.5},
-                {"label":"k3d", "x":13.75, "y":3.5, "w":1.25},
-                
-                {"label":"k40", "x":0, "y":4.5, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4.5},
-                {"label":"k42", "x":2.25, "y":4.5},
-                {"label":"k43", "x":3.25, "y":4.5},
-                {"label":"k44", "x":4.25, "y":4.5},
-                {"label":"k45", "x":5.25, "y":4.5},
-                {"label":"k46", "x":6.25, "y":4.5},
-                {"label":"k47", "x":7.25, "y":4.5},
-                {"label":"k48", "x":8.25, "y":4.5},
-                {"label":"k49", "x":9.25, "y":4.5},
-                {"label":"k4a", "x":10.25, "y":4.5},
-                {"label":"k4b", "x":11.25, "y":4.5},
-                {"label":"k4d", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"k4f", "x":16.25, "y":4.5},
-                
-                {"label":"k50", "x":0, "y":5.5, "w":1.25},
-                {"label":"k51", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"k52", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"k56", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"k5a", "x":10, "y":5.5, "w":1.25},
-                {"label":"k5b", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"k5c", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"k5d", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"k5e", "x":15.25, "y":5.5},
-                {"label":"k5f", "x":16.25, "y":5.5},
-                {"label":"k5g", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6.5, "y":0},
-                {"label":"k07", "x":7.5, "y":0},
-                {"label":"k08", "x":8.5, "y":0},
-                {"label":"k09", "x":9.5, "y":0},
-                {"label":"k0a", "x":11, "y":0},
-                {"label":"k0b", "x":12, "y":0},
-                {"label":"k0c", "x":13, "y":0},
-                {"label":"k0d", "x":14, "y":0},
-                {"label":"k0e", "x":15.25, "y":0},
-                {"label":"k0f", "x":16.25, "y":0},
-                {"label":"k0g", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1.5},
-                {"label":"k11", "x":1, "y":1.5},
-                {"label":"k12", "x":2, "y":1.5},
-                {"label":"k13", "x":3, "y":1.5},
-                {"label":"k14", "x":4, "y":1.5},
-                {"label":"k15", "x":5, "y":1.5},
-                {"label":"k16", "x":6, "y":1.5},
-                {"label":"k17", "x":7, "y":1.5},
-                {"label":"k18", "x":8, "y":1.5},
-                {"label":"k19", "x":9, "y":1.5},
-                {"label":"k1a", "x":10, "y":1.5},
-                {"label":"k1b", "x":11, "y":1.5},
-                {"label":"k1c", "x":12, "y":1.5},
-                {"label":"k1d", "x":13, "y":1.5, "w":2},
-                {"label":"k1e", "x":15.25, "y":1.5},
-                {"label":"k1f", "x":16.25, "y":1.5},
-                {"label":"k1g", "x":17.25, "y":1.5},
-                
-                {"label":"k20", "x":0, "y":2.5, "w":1.5},
-                {"label":"k21", "x":1.5, "y":2.5},
-                {"label":"k22", "x":2.5, "y":2.5},
-                {"label":"k23", "x":3.5, "y":2.5},
-                {"label":"k24", "x":4.5, "y":2.5},
-                {"label":"k25", "x":5.5, "y":2.5},
-                {"label":"k26", "x":6.5, "y":2.5},
-                {"label":"k27", "x":7.5, "y":2.5},
-                {"label":"k28", "x":8.5, "y":2.5},
-                {"label":"k29", "x":9.5, "y":2.5},
-                {"label":"k2a", "x":10.5, "y":2.5},
-                {"label":"k2b", "x":11.5, "y":2.5},
-                {"label":"k2c", "x":12.5, "y":2.5},
-                {"label":"k2e", "x":15.25, "y":2.5},
-                {"label":"k2f", "x":16.25, "y":2.5},
-                {"label":"k2g", "x":17.25, "y":2.5},
-                
-                {"label":"k30", "x":0, "y":3.5, "w":1.75},
-                {"label":"k31", "x":1.75, "y":3.5},
-                {"label":"k32", "x":2.75, "y":3.5},
-                {"label":"k33", "x":3.75, "y":3.5},
-                {"label":"k34", "x":4.75, "y":3.5},
-                {"label":"k35", "x":5.75, "y":3.5},
-                {"label":"k36", "x":6.75, "y":3.5},
-                {"label":"k37", "x":7.75, "y":3.5},
-                {"label":"k38", "x":8.75, "y":3.5},
-                {"label":"k39", "x":9.75, "y":3.5},
-                {"label":"k3a", "x":10.75, "y":3.5},
-                {"label":"k3b", "x":11.75, "y":3.5},
-                {"label":"k3c", "x":12.75, "y":3.5},
-                {"label":"k3d", "x":13.75, "y":2.5, "w":1.25, "h":2},
-                
-                {"label":"k40", "x":0, "y":4.5, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4.5},
-                {"label":"k42", "x":2.25, "y":4.5},
-                {"label":"k43", "x":3.25, "y":4.5},
-                {"label":"k44", "x":4.25, "y":4.5},
-                {"label":"k45", "x":5.25, "y":4.5},
-                {"label":"k46", "x":6.25, "y":4.5},
-                {"label":"k47", "x":7.25, "y":4.5},
-                {"label":"k48", "x":8.25, "y":4.5},
-                {"label":"k49", "x":9.25, "y":4.5},
-                {"label":"k4a", "x":10.25, "y":4.5},
-                {"label":"k4b", "x":11.25, "y":4.5},
-                {"label":"k4d", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"k4f", "x":16.25, "y":4.5},
-                
-                {"label":"k50", "x":0, "y":5.5, "w":1.25},
-                {"label":"k51", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"k52", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"k56", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"k5a", "x":10, "y":5.5, "w":1.25},
-                {"label":"k5b", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"k5c", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"k5d", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"k5e", "x":15.25, "y":5.5},
-                {"label":"k5f", "x":16.25, "y":5.5},
-                {"label":"k5g", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6.5, "y":0},
-                {"label":"k07", "x":7.5, "y":0},
-                {"label":"k08", "x":8.5, "y":0},
-                {"label":"k09", "x":9.5, "y":0},
-                {"label":"k0a", "x":11, "y":0},
-                {"label":"k0b", "x":12, "y":0},
-                {"label":"k0c", "x":13, "y":0},
-                {"label":"k0d", "x":14, "y":0},
-                {"label":"k0e", "x":15.25, "y":0},
-                {"label":"k0f", "x":16.25, "y":0},
-                {"label":"k0g", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1.5},
-                {"label":"k11", "x":1, "y":1.5},
-                {"label":"k12", "x":2, "y":1.5},
-                {"label":"k13", "x":3, "y":1.5},
-                {"label":"k14", "x":4, "y":1.5},
-                {"label":"k15", "x":5, "y":1.5},
-                {"label":"k16", "x":6, "y":1.5},
-                {"label":"k17", "x":7, "y":1.5},
-                {"label":"k18", "x":8, "y":1.5},
-                {"label":"k19", "x":9, "y":1.5},
-                {"label":"k1a", "x":10, "y":1.5},
-                {"label":"k1b", "x":11, "y":1.5},
-                {"label":"k1c", "x":12, "y":1.5},
-                {"label":"k1d", "x":13, "y":1.5, "w":2},
-                {"label":"k1e", "x":15.25, "y":1.5},
-                {"label":"k1f", "x":16.25, "y":1.5},
-                {"label":"k1g", "x":17.25, "y":1.5},
-                
-                {"label":"k20", "x":0, "y":2.5, "w":1.5},
-                {"label":"k21", "x":1.5, "y":2.5},
-                {"label":"k22", "x":2.5, "y":2.5},
-                {"label":"k23", "x":3.5, "y":2.5},
-                {"label":"k24", "x":4.5, "y":2.5},
-                {"label":"k25", "x":5.5, "y":2.5},
-                {"label":"k26", "x":6.5, "y":2.5},
-                {"label":"k27", "x":7.5, "y":2.5},
-                {"label":"k28", "x":8.5, "y":2.5},
-                {"label":"k29", "x":9.5, "y":2.5},
-                {"label":"k2a", "x":10.5, "y":2.5},
-                {"label":"k2b", "x":11.5, "y":2.5},
-                {"label":"k2c", "x":12.5, "y":2.5},
-                {"label":"k2d", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"k2e", "x":15.25, "y":2.5},
-                {"label":"k2f", "x":16.25, "y":2.5},
-                {"label":"k2g", "x":17.25, "y":2.5},
-                
-                {"label":"k30", "x":0, "y":3.5, "w":1.75},
-                {"label":"k31", "x":1.75, "y":3.5},
-                {"label":"k32", "x":2.75, "y":3.5},
-                {"label":"k33", "x":3.75, "y":3.5},
-                {"label":"k34", "x":4.75, "y":3.5},
-                {"label":"k35", "x":5.75, "y":3.5},
-                {"label":"k36", "x":6.75, "y":3.5},
-                {"label":"k37", "x":7.75, "y":3.5},
-                {"label":"k38", "x":8.75, "y":3.5},
-                {"label":"k39", "x":9.75, "y":3.5},
-                {"label":"k3a", "x":10.75, "y":3.5},
-                {"label":"k3b", "x":11.75, "y":3.5},
-                {"label":"k3d", "x":12.75, "y":3.5, "w":2.25},
-                
-                {"label":"k40", "x":0, "y":4.5, "w":2.25},
-                {"label":"k42", "x":2.25, "y":4.5},
-                {"label":"k43", "x":3.25, "y":4.5},
-                {"label":"k44", "x":4.25, "y":4.5},
-                {"label":"k45", "x":5.25, "y":4.5},
-                {"label":"k46", "x":6.25, "y":4.5},
-                {"label":"k47", "x":7.25, "y":4.5},
-                {"label":"k48", "x":8.25, "y":4.5},
-                {"label":"k49", "x":9.25, "y":4.5},
-                {"label":"k4a", "x":10.25, "y":4.5},
-                {"label":"k4b", "x":11.25, "y":4.5},
-                {"label":"k4d", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"k4f", "x":16.25, "y":4.5},
-                
-                {"label":"k50", "x":0, "y":5.5, "w":1.25},
-                {"label":"k51", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"k52", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"k56", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"k5a", "x":10, "y":5.5, "w":1.25},
-                {"label":"k5b", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"k5c", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"k5d", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"k5e", "x":15.25, "y":5.5},
-                {"label":"k5f", "x":16.25, "y":5.5},
-                {"label":"k5g", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/evyd13/nt750/nt750.c b/keyboards/evyd13/nt750/nt750.c
deleted file mode 100644
index 6ae67cc368..0000000000
--- a/keyboards/evyd13/nt750/nt750.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "nt750.h"
diff --git a/keyboards/evyd13/nt750/nt750.h b/keyboards/evyd13/nt750/nt750.h
deleted file mode 100644
index 15b6e459b9..0000000000
--- a/keyboards/evyd13/nt750/nt750.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
- 
-#define LAYOUT_all( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,      k4f,      \
-    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) \
-{ \
-    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, k4f, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,                \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,      k4f,      \
-    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) \
-{ \
-    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, k4f, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,      k4f,      \
-    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) \
-{ \
-    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, k4f, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
diff --git a/keyboards/evyd13/nt980/config.h b/keyboards/evyd13/nt980/config.h
index 01bce84e50..f64827d05f 100644
--- a/keyboards/evyd13/nt980/config.h
+++ b/keyboards/evyd13/nt980/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, D1, D0, C6, C7, B5, B6, B4, D7, D4, D6 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, E6, D3, D2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/nt980/info.json b/keyboards/evyd13/nt980/info.json
index 48c65e6f30..fd85004587 100644
--- a/keyboards/evyd13/nt980/info.json
+++ b/keyboards/evyd13/nt980/info.json
@@ -8,6 +8,11 @@
         "pid": "0xAAF8",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D3", "D2"],
+        "rows": ["B0", "B1", "D1", "D0", "C6", "C7", "B5", "B6", "B4", "D7", "D4", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B3",
         "num_lock": "B2",
diff --git a/keyboards/evyd13/nt980/nt980.c b/keyboards/evyd13/nt980/nt980.c
deleted file mode 100644
index e0113f1249..0000000000
--- a/keyboards/evyd13/nt980/nt980.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "nt980.h"
diff --git a/keyboards/evyd13/omrontkl/config.h b/keyboards/evyd13/omrontkl/config.h
index 9246127a30..230ff5e311 100644
--- a/keyboards/evyd13/omrontkl/config.h
+++ b/keyboards/evyd13/omrontkl/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {D0,D1,D2,D3,D4,B7}
-#define MATRIX_COL_PINS {F0,C7,F1,C6,F4,B6,F5,B5,F6,B4,F7,D7,D6,D5,B3,B1,B2}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/omrontkl/info.json b/keyboards/evyd13/omrontkl/info.json
index b76faa7952..78bf0e3133 100644
--- a/keyboards/evyd13/omrontkl/info.json
+++ b/keyboards/evyd13/omrontkl/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEA78",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "C7", "F1", "C6", "F4", "B6", "F5", "B5", "F6", "B4", "F7", "D7", "D6", "D5", "B3", "B1", "B2"],
+        "rows": ["D0", "D1", "D2", "D3", "D4", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/evyd13/omrontkl/omrontkl.c b/keyboards/evyd13/omrontkl/omrontkl.c
deleted file mode 100644
index 26d0344d33..0000000000
--- a/keyboards/evyd13/omrontkl/omrontkl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "omrontkl.h"
diff --git a/keyboards/evyd13/plain60/config.h b/keyboards/evyd13/plain60/config.h
deleted file mode 100644
index d3c3722e9e..0000000000
--- a/keyboards/evyd13/plain60/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2019 Evy Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B4,D7,D6,D4,E6}
-#define MATRIX_COL_PINS {D2,D1,D0,D3,D5,B5,F0,B6,C6,C7,F1,F4,F5,F6,F7}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/plain60/info.json b/keyboards/evyd13/plain60/info.json
index d6a930e9ea..f2e3a55bce 100644
--- a/keyboards/evyd13/plain60/info.json
+++ b/keyboards/evyd13/plain60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0160",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0", "D3", "D5", "B5", "F0", "B6", "C6", "C7", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["B4", "D7", "D6", "D4", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "B4",
         "esc_output": "D2"
diff --git a/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h b/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h
index af01276208..420b2e80a1 100644
--- a/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h
+++ b/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* RGB Underglow */
-#define RGB_DI_PIN B7
+#define WS2812_DI_PIN B7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/evyd13/plain60/keymaps/rgb/config.h b/keyboards/evyd13/plain60/keymaps/rgb/config.h
index 9b05207b42..e34715a773 100644
--- a/keyboards/evyd13/plain60/keymaps/rgb/config.h
+++ b/keyboards/evyd13/plain60/keymaps/rgb/config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define RGB_DI_PIN B0
+#define WS2812_DI_PIN B0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/evyd13/plain60/plain60.c b/keyboards/evyd13/plain60/plain60.c
deleted file mode 100644
index d816064104..0000000000
--- a/keyboards/evyd13/plain60/plain60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "plain60.h"
diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h
index cda625870f..230ff5e311 100644
--- a/keyboards/evyd13/pockettype/config.h
+++ b/keyboards/evyd13/pockettype/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {D3,D1,D7,B5}
-#define MATRIX_COL_PINS {F6,F7,B1,B3,B2,B6,B4,E6,C6,D4,D0,D2}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/info.json
index e515b82b56..30010ad30b 100644
--- a/keyboards/evyd13/pockettype/info.json
+++ b/keyboards/evyd13/pockettype/info.json
@@ -8,12 +8,69 @@
     "pid": "0xFA7D",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "B4", "E6", "C6", "D4", "D0", "D2"],
+    "rows": ["D3", "D1", "D7", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["ortho_4x12"],
   "layouts": {
     "LAYOUT_ortho_4x12": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/evyd13/pockettype/pockettype.c b/keyboards/evyd13/pockettype/pockettype.c
index 06175edf5a..b9aee69496 100644
--- a/keyboards/evyd13/pockettype/pockettype.c
+++ b/keyboards/evyd13/pockettype/pockettype.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "pockettype.h"
+#include "quantum.h"
 
 void led_init_ports(void) {
     // * Enable LED anodes (Vbus pin is replaced by B0 on some boards)
diff --git a/keyboards/evyd13/pockettype/pockettype.h b/keyboards/evyd13/pockettype/pockettype.h
deleted file mode 100644
index 8c103dcc8f..0000000000
--- a/keyboards/evyd13/pockettype/pockettype.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_4x12( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h
index 8ab3d62a1e..78bb3b6f80 100644
--- a/keyboards/evyd13/quackfire/config.h
+++ b/keyboards/evyd13/quackfire/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {D3,F5,F4,F0,B7,B2,E6,B0}
-#define MATRIX_COL_PINS {B3,F1,B1,D5,D2,D1,D0,D4,D6,D7,B4,B5,B6,C6,C7}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/quackfire/info.json b/keyboards/evyd13/quackfire/info.json
index b64616a588..4f2e248aa5 100644
--- a/keyboards/evyd13/quackfire/info.json
+++ b/keyboards/evyd13/quackfire/info.json
@@ -8,6 +8,11 @@
         "pid": "0x87C9",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "F1", "B1", "D5", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["D3", "F5", "F4", "F0", "B7", "B2", "E6", "B0"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "F7",
         "scroll_lock": "F6",
@@ -19,208 +24,217 @@
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["tkl_ansi", "tkl_iso"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_iso"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 13], "x": 2, "y": 0},
+                {"matrix": [0, 11], "x": 3, "y": 0},
+                {"matrix": [4, 11], "x": 4, "y": 0},
+                {"matrix": [3, 11], "x": 5, "y": 0},
+
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 6], "x": 7.5, "y": 0},
+                {"matrix": [4, 5], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 3], "x": 11, "y": 0},
+                {"matrix": [2, 3], "x": 12, "y": 0},
+                {"matrix": [3, 3], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [2, 8], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 14], "x": 0, "y": 1.5},
+                {"matrix": [2, 14], "x": 1, "y": 1.5},
+                {"matrix": [2, 13], "x": 2, "y": 1.5},
+                {"matrix": [2, 11], "x": 3, "y": 1.5},
+                {"matrix": [2, 9], "x": 4, "y": 1.5},
+                {"matrix": [0, 9], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [2, 7], "x": 7, "y": 1.5},
+                {"matrix": [2, 6], "x": 8, "y": 1.5},
+                {"matrix": [2, 5], "x": 9, "y": 1.5},
+                {"matrix": [2, 4], "x": 10, "y": 1.5},
+                {"matrix": [0, 4], "x": 11, "y": 1.5},
+                {"matrix": [0, 6], "x": 12, "y": 1.5},
+                {"matrix": [4, 3], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 2], "x": 15.25, "y": 1.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 1.5},
+                {"matrix": [0, 12], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 14], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 14], "x": 1.5, "y": 2.5},
+                {"matrix": [1, 13], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 11], "x": 3.5, "y": 2.5},
+                {"matrix": [1, 9], "x": 4.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 8.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [1, 4], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [0, 0], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 13], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 14], "x": 1.75, "y": 3.5},
+                {"matrix": [7, 13], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 3.75, "y": 3.5},
+                {"matrix": [7, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 12], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [5, 14], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 3.25, "y": 4.5},
+                {"matrix": [5, 11], "x": 4.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [3, 10], "x": 16.25, "y": 4.5},
+
+                {"matrix": [0, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 10], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 8], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 0], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [6, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [6, 10], "x": 15.25, "y": 5.5},
+                {"matrix": [6, 0], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 2], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"\u00a3", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 13], "x": 2, "y": 0},
+                {"matrix": [0, 11], "x": 3, "y": 0},
+                {"matrix": [4, 11], "x": 4, "y": 0},
+                {"matrix": [3, 11], "x": 5, "y": 0},
+
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 6], "x": 7.5, "y": 0},
+                {"matrix": [4, 5], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 3], "x": 11, "y": 0},
+                {"matrix": [2, 3], "x": 12, "y": 0},
+                {"matrix": [3, 3], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [2, 8], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 14], "x": 0, "y": 1.5},
+                {"matrix": [2, 14], "x": 1, "y": 1.5},
+                {"matrix": [2, 13], "x": 2, "y": 1.5},
+                {"matrix": [2, 11], "x": 3, "y": 1.5},
+                {"matrix": [2, 9], "x": 4, "y": 1.5},
+                {"matrix": [0, 9], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [2, 7], "x": 7, "y": 1.5},
+                {"matrix": [2, 6], "x": 8, "y": 1.5},
+                {"matrix": [2, 5], "x": 9, "y": 1.5},
+                {"matrix": [2, 4], "x": 10, "y": 1.5},
+                {"matrix": [0, 4], "x": 11, "y": 1.5},
+                {"matrix": [0, 6], "x": 12, "y": 1.5},
+                {"matrix": [4, 3], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 2], "x": 15.25, "y": 1.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 1.5},
+                {"matrix": [0, 12], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 14], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 14], "x": 1.5, "y": 2.5},
+                {"matrix": [1, 13], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 11], "x": 3.5, "y": 2.5},
+                {"matrix": [1, 9], "x": 4.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 8.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [1, 4], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+                {"matrix": [0, 0], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 13], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 14], "x": 1.75, "y": 3.5},
+                {"matrix": [7, 13], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 3.75, "y": 3.5},
+                {"matrix": [7, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 12.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 12], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [3, 13], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 14], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 3.25, "y": 4.5},
+                {"matrix": [5, 11], "x": 4.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [3, 10], "x": 16.25, "y": 4.5},
+
+                {"matrix": [0, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 10], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 8], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 0], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [6, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [6, 10], "x": 15.25, "y": 5.5},
+                {"matrix": [6, 0], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 2], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/evyd13/quackfire/quackfire.c b/keyboards/evyd13/quackfire/quackfire.c
deleted file mode 100644
index 634d4187c6..0000000000
--- a/keyboards/evyd13/quackfire/quackfire.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "quackfire.h"
diff --git a/keyboards/evyd13/quackfire/quackfire.h b/keyboards/evyd13/quackfire/quackfire.h
deleted file mode 100644
index 8746f356fd..0000000000
--- a/keyboards/evyd13/quackfire/quackfire.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
- 
-#define LAYOUT_all LAYOUT_tkl_iso
-
-#define LAYOUT_tkl_ansi( \
-    k3e,      k0d, k0b, k4b, k3b, k21, k36, k45, k05, k03, k23, k33, k63,      k28, k18, k11, \
-    k0e, k2e, k2d, k2b, k29, k09, k07, k27, k26, k25, k24, k04, k06, k43,      k02, k0a, k0c, \
-    k4e, k1e, k1d, k1b, k19, k49, k47, k17, k16, k15, k14, k44, k46, k73,      k00, k2a, k2c, \
-    k4d, k7e, k7d, k7b, k79, k39, k37, k77, k76, k75, k74, k34,      k53,                     \
-    k4c,      k5e, k5d, k5b, k59, k69, k67, k57, k56, k55, k64,      k7c,           k3a,      \
-    k01, k4a, k38,                k30,                k68, k71, k65, k51,      k6a, k60, k62  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, XXX, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { XXX, k11, XXX, XXX, k14, k15, k16, k17, k18, k19, XXX, k1b, XXX, k1d, k1e }, \
-    { XXX, k21, XXX, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, XXX, XXX, k33, k34, XXX, k36, k37, k38, k39, k3a, k3b, XXX, XXX, k3e }, \
-    { XXX, XXX, XXX, k43, k44, k45, k46, k47, XXX, k49, k4a, k4b, k4c, k4d, k4e }, \
-    { XXX, k51, XXX, k53, XXX, k55, k56, k57, XXX, k59, XXX, k5b, XXX, k5d, k5e }, \
-    { k60, XXX, k62, k63, k64, k65, XXX, k67, k68, k69, k6a, XXX, XXX, XXX, XXX }, \
-    { XXX, k71, XXX, k73, k74, k75, k76, k77, XXX, k79, XXX, k7b, k7c, k7d, k7e }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    k3e,      k0d, k0b, k4b, k3b, k21, k36, k45, k05, k03, k23, k33, k63,      k28, k18, k11, \
-    k0e, k2e, k2d, k2b, k29, k09, k07, k27, k26, k25, k24, k04, k06, k43,      k02, k0a, k0c, \
-    k4e, k1e, k1d, k1b, k19, k49, k47, k17, k16, k15, k14, k44, k46,           k00, k2a, k2c, \
-    k4d, k7e, k7d, k7b, k79, k39, k37, k77, k76, k75, k74, k34, k73, k53,                     \
-    k4c, k3d, k5e, k5d, k5b, k59, k69, k67, k57, k56, k55, k64,      k7c,           k3a,      \
-    k01, k4a, k38,                k30,                k68, k71, k65, k51,      k6a, k60, k62  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, XXX, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { XXX, k11, XXX, XXX, k14, k15, k16, k17, k18, k19, XXX, k1b, XXX, k1d, k1e }, \
-    { XXX, k21, XXX, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, XXX, XXX, k33, k34, XXX, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
-    { XXX, XXX, XXX, k43, k44, k45, k46, k47, XXX, k49, k4a, k4b, k4c, k4d, k4e }, \
-    { XXX, k51, XXX, k53, XXX, k55, k56, k57, XXX, k59, XXX, k5b, XXX, k5d, k5e }, \
-    { k60, XXX, k62, k63, k64, k65, XXX, k67, k68, k69, k6a, XXX, XXX, XXX, XXX }, \
-    { XXX, k71, XXX, k73, k74, k75, k76, k77, XXX, k79, XXX, k7b, k7c, k7d, k7e }  \
-}
diff --git a/keyboards/evyd13/solheim68/config.h b/keyboards/evyd13/solheim68/config.h
index 29398263f8..82eff7341c 100644
--- a/keyboards/evyd13/solheim68/config.h
+++ b/keyboards/evyd13/solheim68/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {E6,B0,B1,B2,B3}
-#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/solheim68/info.json b/keyboards/evyd13/solheim68/info.json
index b2f831c9ee..b0be1ab422 100644
--- a/keyboards/evyd13/solheim68/info.json
+++ b/keyboards/evyd13/solheim68/info.json
@@ -8,395 +8,420 @@
         "pid": "0x7BFF",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["E6", "B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15.25, "y":1},
-                {"x":16.25, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":2, "w":1.25},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15.25, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":14.25, "y":4},
-                {"x":15.25, "y":4},
-                {"x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [2, 14], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15.25, "y":1},
-                {"x":16.25, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":2.75},
-                {"x":15.25, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":14.25, "y":4},
-                {"x":15.25, "y":4},
-                {"x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15.25, "y":1},
-                {"x":16.25, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":2.75},
-                {"x":15.25, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":14.25, "y":4},
-                {"x":15.25, "y":4},
-                {"x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_ansi_split_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15.25, "y":1},
-                {"x":16.25, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15.25, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":14.25, "y":4},
-                {"x":15.25, "y":4},
-                {"x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_iso_split_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15.25, "y":1},
-                {"x":16.25, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15.25, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":14.25, "y":4},
-                {"x":15.25, "y":4},
-                {"x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/evyd13/solheim68/solheim68.c b/keyboards/evyd13/solheim68/solheim68.c
deleted file mode 100644
index 27f90f4e87..0000000000
--- a/keyboards/evyd13/solheim68/solheim68.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "solheim68.h"
diff --git a/keyboards/evyd13/solheim68/solheim68.h b/keyboards/evyd13/solheim68/solheim68.h
deleted file mode 100644
index 2f6339bd10..0000000000
--- a/keyboards/evyd13/solheim68/solheim68.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright 2020 Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define XXX KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k2e, k0d, k0e, k0f,    \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f,    \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,                  \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e,         \
-    k40, k41, k42,                k46,                k4a, k4b, k4c,      k4d, k4e, k4f     \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f }  \
-}
-
-#define LAYOUT_68_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f,    \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f,    \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,                  \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,      k3e,         \
-    k40, k41, k42,                k46,                k4a, k4b, k4c,      k4d, k4e, k4f     \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, XXX }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f }  \
-}
-
-#define LAYOUT_68_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f,    \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           k1e, k1f,    \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,                  \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,      k3e,         \
-    k40, k41, k42,                k46,                k4a, k4b, k4c,      k4d, k4e, k4f     \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, XXX }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f }  \
-}
-
-#define LAYOUT_68_ansi_split_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f,    \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f,    \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,                  \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e,         \
-    k40, k41, k42,                k46,                k4a, k4b, k4c,      k4d, k4e, k4f     \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f }  \
-}
-
-#define LAYOUT_68_iso_split_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f,    \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           k1e, k1f,    \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,                  \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e,         \
-    k40, k41, k42,                k46,                k4a, k4b, k4c,      k4d, k4e, k4f     \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f }  \
-}
diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h
index ef8948786b..e17b637a1e 100644
--- a/keyboards/evyd13/ta65/config.h
+++ b/keyboards/evyd13/ta65/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B4,D7,D6,D4,B3}
-#define MATRIX_COL_PINS {D2,D1,D0,D3,D5,C7,C6,B6,B5,F0,F1,F4,F5,F6,F7,B0}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -33,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Backlight configuration
  */
-#define RGB_DI_PIN E6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/evyd13/ta65/info.json b/keyboards/evyd13/ta65/info.json
index da501c6756..d1195a597b 100644
--- a/keyboards/evyd13/ta65/info.json
+++ b/keyboards/evyd13/ta65/info.json
@@ -8,11 +8,19 @@
         "pid": "0x7465",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0", "D3", "D5", "C7", "C6", "B6", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "B0"],
+        "rows": ["B4", "D7", "D6", "D4", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B1"}
         ]
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "B4",
         "esc_output": "D2",
@@ -24,365 +32,385 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"|", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"~", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Non-US Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25},
-                {"label":"PgUp", "x":15, "y":2},
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Non-US Backslash", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Win", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 15], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Win", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"|", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"~", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 15], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"\"", "x":2, "y":0},
-                {"label":"\u00a3", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"\u00ac", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"@", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4},
-                {"label":"Win", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_iso_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"\"", "x":2, "y":0},
-                {"label":"\u00a3", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"\u00ac", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"@", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"AltGr", "x":11, "y":4, "w":1.5},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 15], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/evyd13/ta65/ta65.c b/keyboards/evyd13/ta65/ta65.c
deleted file mode 100644
index ca9aafb1b7..0000000000
--- a/keyboards/evyd13/ta65/ta65.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ta65.h"
diff --git a/keyboards/evyd13/ta65/ta65.h b/keyboards/evyd13/ta65/ta65.h
deleted file mode 100644
index 40a763b993..0000000000
--- a/keyboards/evyd13/ta65/ta65.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-// readability
-#define ___ KC_NO
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3d, k3e, \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c,      k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, ___}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
-}
-
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,           k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3d, k3e, \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c,      k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, ___}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, k2e, ___}, \
-    {k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
-}
-
-#define LAYOUT_ansi_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,           k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3d, k3e, \
-    k40, k41, k42,                k46,                k4a,      k4c,      k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, k2e, ___}, \
-    {k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, ___, k4c, k4d, k4e, ___}  \
-}
-
-#define LAYOUT_iso_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3d, k3e, \
-    k40, k41, k42,                k46,                k4a,      k4c,      k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, ___}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, ___, k4c, k4d, k4e, ___}  \
-}
-
-#define LAYOUT_65_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3d, k3e, \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c,      k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, ___}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, ___}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
-}
-
-void matrix_init_user(void);
-void matrix_scan_user(void);
diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/info.json
index 59516f2325..f044efff66 100644
--- a/keyboards/evyd13/wasdat/info.json
+++ b/keyboards/evyd13/wasdat/info.json
@@ -38,576 +38,591 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Num Lock", "x":18.5, "y":1.5},
-                {"label":"/", "x":19.5, "y":1.5},
-                {"label":"*", "x":20.5, "y":1.5},
-                {"label":"-", "x":21.5, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+", "x":21.5, "y":2.5, "h":2},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"1", "x":18.5, "y":4.5},
-                {"label":"2", "x":19.5, "y":4.5},
-                {"label":"3", "x":20.5, "y":4.5},
-                {"label":"Enter", "x":21.5, "y":4.5, "h":2},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5},
-
-                {"label":"0", "x":18.5, "y":5.5, "w":2},
-                {"label":".", "x":20.5, "y":5.5}
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [4, 4], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [3, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 10], "x": 7.5, "y": 0},
+                {"matrix": [3, 14], "x": 8.5, "y": 0},
+                {"matrix": [4, 14], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 13], "x": 11, "y": 0},
+                {"matrix": [2, 13], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [7, 13], "x": 14, "y": 0},
+
+                {"matrix": [2, 3], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 5], "x": 0, "y": 1.5},
+                {"matrix": [2, 5], "x": 1, "y": 1.5},
+                {"matrix": [2, 4], "x": 2, "y": 1.5},
+                {"matrix": [2, 2], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 0], "x": 5, "y": 1.5},
+                {"matrix": [4, 8], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 10], "x": 8, "y": 1.5},
+                {"matrix": [2, 14], "x": 9, "y": 1.5},
+                {"matrix": [2, 15], "x": 10, "y": 1.5},
+                {"matrix": [4, 15], "x": 11, "y": 1.5},
+                {"matrix": [4, 10], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 21.5, "y": 1.5},
+
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 14], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 15], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [5, 9], "x": 18.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 12], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 6], "x": 20.5, "y": 3.5},
+
+                {"matrix": [3, 11], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [1, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 12], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [7, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Num Lock", "x":18.5, "y":1.5},
-                {"label":"/", "x":19.5, "y":1.5},
-                {"label":"*", "x":20.5, "y":1.5},
-                {"label":"-", "x":21.5, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+", "x":21.5, "y":2.5, "h":2},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"1", "x":18.5, "y":4.5},
-                {"label":"2", "x":19.5, "y":4.5},
-                {"label":"3", "x":20.5, "y":4.5},
-                {"label":"Enter", "x":21.5, "y":4.5, "h":2},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5},
-
-                {"label":"0", "x":18.5, "y":5.5, "w":2},
-                {"label":".", "x":20.5, "y":5.5}
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [4, 4], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [3, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 10], "x": 7.5, "y": 0},
+                {"matrix": [3, 14], "x": 8.5, "y": 0},
+                {"matrix": [4, 14], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 13], "x": 11, "y": 0},
+                {"matrix": [2, 13], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [7, 13], "x": 14, "y": 0},
+
+                {"matrix": [2, 3], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 5], "x": 0, "y": 1.5},
+                {"matrix": [2, 5], "x": 1, "y": 1.5},
+                {"matrix": [2, 4], "x": 2, "y": 1.5},
+                {"matrix": [2, 2], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 0], "x": 5, "y": 1.5},
+                {"matrix": [4, 8], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 10], "x": 8, "y": 1.5},
+                {"matrix": [2, 14], "x": 9, "y": 1.5},
+                {"matrix": [2, 15], "x": 10, "y": 1.5},
+                {"matrix": [4, 15], "x": 11, "y": 1.5},
+                {"matrix": [4, 10], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 21.5, "y": 1.5},
+
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 14], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 15], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [5, 9], "x": 18.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 12], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 6], "x": 20.5, "y": 3.5},
+
+                {"matrix": [3, 11], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [6, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [1, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 12], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [7, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"\u00a3", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Num Lock", "x":18.5, "y":1.5},
-                {"label":"/", "x":19.5, "y":1.5},
-                {"label":"*", "x":20.5, "y":1.5},
-                {"label":"-", "x":21.5, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+", "x":21.5, "y":2.5, "h":2},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"1", "x":18.5, "y":4.5},
-                {"label":"2", "x":19.5, "y":4.5},
-                {"label":"3", "x":20.5, "y":4.5},
-                {"label":"Enter", "x":21.5, "y":4.5, "h":2},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5},
-
-                {"label":"0", "x":18.5, "y":5.5, "w":2},
-                {"label":".", "x":20.5, "y":5.5}
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [4, 4], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [3, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 10], "x": 7.5, "y": 0},
+                {"matrix": [3, 14], "x": 8.5, "y": 0},
+                {"matrix": [4, 14], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 13], "x": 11, "y": 0},
+                {"matrix": [2, 13], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [7, 13], "x": 14, "y": 0},
+
+                {"matrix": [2, 3], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 5], "x": 0, "y": 1.5},
+                {"matrix": [2, 5], "x": 1, "y": 1.5},
+                {"matrix": [2, 4], "x": 2, "y": 1.5},
+                {"matrix": [2, 2], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 0], "x": 5, "y": 1.5},
+                {"matrix": [4, 8], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 10], "x": 8, "y": 1.5},
+                {"matrix": [2, 14], "x": 9, "y": 1.5},
+                {"matrix": [2, 15], "x": 10, "y": 1.5},
+                {"matrix": [4, 15], "x": 11, "y": 1.5},
+                {"matrix": [4, 10], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 21.5, "y": 1.5},
+
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 14], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 15], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [5, 9], "x": 18.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 12], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 9], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 6], "x": 20.5, "y": 3.5},
+
+                {"matrix": [3, 11], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [1, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 12], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [7, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [4, 4], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [3, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 10], "x": 7.5, "y": 0},
+                {"matrix": [3, 14], "x": 8.5, "y": 0},
+                {"matrix": [4, 14], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 13], "x": 11, "y": 0},
+                {"matrix": [2, 13], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [7, 13], "x": 14, "y": 0},
+
+                {"matrix": [2, 3], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 5], "x": 0, "y": 1.5},
+                {"matrix": [2, 5], "x": 1, "y": 1.5},
+                {"matrix": [2, 4], "x": 2, "y": 1.5},
+                {"matrix": [2, 2], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 0], "x": 5, "y": 1.5},
+                {"matrix": [4, 8], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 10], "x": 8, "y": 1.5},
+                {"matrix": [2, 14], "x": 9, "y": 1.5},
+                {"matrix": [2, 15], "x": 10, "y": 1.5},
+                {"matrix": [4, 15], "x": 11, "y": 1.5},
+                {"matrix": [4, 10], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 14], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 15], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 11], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [6, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [7, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 7], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"\u00a3", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [4, 4], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [3, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 10], "x": 7.5, "y": 0},
+                {"matrix": [3, 14], "x": 8.5, "y": 0},
+                {"matrix": [4, 14], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 13], "x": 11, "y": 0},
+                {"matrix": [2, 13], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [7, 13], "x": 14, "y": 0},
+
+                {"matrix": [2, 3], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 5], "x": 0, "y": 1.5},
+                {"matrix": [2, 5], "x": 1, "y": 1.5},
+                {"matrix": [2, 4], "x": 2, "y": 1.5},
+                {"matrix": [2, 2], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 0], "x": 5, "y": 1.5},
+                {"matrix": [4, 8], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 10], "x": 8, "y": 1.5},
+                {"matrix": [2, 14], "x": 9, "y": 1.5},
+                {"matrix": [2, 15], "x": 10, "y": 1.5},
+                {"matrix": [4, 15], "x": 11, "y": 1.5},
+                {"matrix": [4, 10], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 14], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 15], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 11], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [7, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 7], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/evyd13/wasdat/wasdat.c b/keyboards/evyd13/wasdat/wasdat.c
deleted file mode 100644
index 6aaa1b8427..0000000000
--- a/keyboards/evyd13/wasdat/wasdat.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "wasdat.h"
diff --git a/keyboards/evyd13/wasdat/wasdat.h b/keyboards/evyd13/wasdat/wasdat.h
deleted file mode 100644
index be0472f398..0000000000
--- a/keyboards/evyd13/wasdat/wasdat.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
-    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46,      K69, K67, K66, K76, \
-    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A, K1D,      K49, K2C, K26,      K59, K57, K56, K5C, \
-    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F,      K6D,                          K39, K37, K36, \
-    K3B, K04, K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C,           K19, K17, K16, K1C, \
-    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77,      K07,      K06 \
-) \
-{ \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, XXX, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, XXX, K5C, XXX, K5E, K5F }, \
-    { K60, K61, K62, XXX, K64, K65, K66, K67, K68, K69, K6A, XXX, XXX, K6D, K6E, XXX }, \
-    { K70, XXX, XXX, K73, XXX, XXX, K76, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
-    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46,      K69, K67, K66, K76, \
-    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A, K1D,      K49, K2C, K26,      K59, K57, K56, K5C, \
-    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F,      K6D,                          K39, K37, K36, \
-    K3B,      K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C,           K19, K17, K16, K1C, \
-    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77,      K07,      K06 \
-) \
-{ \
-    { K00, XXX, K02, K03, XXX, K05, K06, K07, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, XXX, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, XXX, K5C, XXX, K5E, K5F }, \
-    { K60, K61, K62, XXX, K64, K65, K66, K67, K68, K69, K6A, XXX, XXX, K6D, K6E, XXX }, \
-    { K70, XXX, XXX, K73, XXX, XXX, K76, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
-}
-
-#define LAYOUT_fullsize_iso( \
-    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
-    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46,      K69, K67, K66, K76, \
-    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A,           K49, K2C, K26,      K59, K57, K56, K5C, \
-    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F, K1D, K6D,                          K39, K37, K36, \
-    K3B, K04, K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C,           K19, K17, K16, K1C, \
-    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77,      K07,      K06 \
-) \
-{ \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, XXX, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, XXX, K5C, XXX, K5E, K5F }, \
-    { K60, K61, K62, XXX, K64, K65, K66, K67, K68, K69, K6A, XXX, XXX, K6D, K6E, XXX }, \
-    { K70, XXX, XXX, K73, XXX, XXX, K76, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
-    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46, \
-    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A, K1D,      K49, K2C, K26, \
-    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F,      K6D, \
-    K3B,      K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C, \
-    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77 \
-) \
-{ \
-    { K00, XXX, K02, K03, XXX, K05, XXX, XXX, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, XXX, K14, K15, XXX, XXX, K18, XXX, K1A, K1B, XXX, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, XXX, XXX, K38, XXX, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX, K58, XXX, K5A, XXX, XXX, XXX, K5E, K5F }, \
-    { K60, K61, K62, XXX, K64, K65, XXX, XXX, K68, XXX, K6A, XXX, XXX, K6D, K6E, XXX }, \
-    { K70, XXX, XXX, K73, XXX, XXX, XXX, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
-}
-
-#define LAYOUT_tkl_iso( \
-    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
-    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46, \
-    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A,           K49, K2C, K26, \
-    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F, K1D, K6D, \
-    K3B, K04, K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C, \
-    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77 \
-) \
-{ \
-    { K00, XXX, K02, K03, K04, K05, XXX, XXX, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, XXX, K14, K15, XXX, XXX, K18, XXX, K1A, K1B, XXX, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, XXX, XXX, K38, XXX, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX, K58, XXX, K5A, XXX, XXX, XXX, K5E, K5F }, \
-    { K60, K61, K62, XXX, K64, K65, XXX, XXX, K68, XXX, K6A, XXX, XXX, K6D, K6E, XXX }, \
-    { K70, XXX, XXX, K73, XXX, XXX, XXX, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
-}
diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json
index ab15586484..3841f56cbd 100644
--- a/keyboards/evyd13/wasdat_code/info.json
+++ b/keyboards/evyd13/wasdat_code/info.json
@@ -30,455 +30,470 @@
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_fullsize_iso"
+    },
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Num Lock", "x":18.5, "y":1.5},
-                {"label":"/", "x":19.5, "y":1.5},
-                {"label":"*", "x":20.5, "y":1.5},
-                {"label":"-", "x":21.5, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+", "x":21.5, "y":2.5, "h":2},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"1", "x":18.5, "y":4.5},
-                {"label":"2", "x":19.5, "y":4.5},
-                {"label":"3", "x":20.5, "y":4.5},
-                {"label":"Enter", "x":21.5, "y":4.5, "h":2},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5},
-
-                {"label":"0", "x":18.5, "y":5.5, "w":2},
-                {"label":".", "x":20.5, "y":5.5}
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
+
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [7, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [2, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [2, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [2, 6], "x": 20.5, "y": 3.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [1, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"\u00a3", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Num Lock", "x":18.5, "y":1.5},
-                {"label":"/", "x":19.5, "y":1.5},
-                {"label":"*", "x":20.5, "y":1.5},
-                {"label":"-", "x":21.5, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+", "x":21.5, "y":2.5, "h":2},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"1", "x":18.5, "y":4.5},
-                {"label":"2", "x":19.5, "y":4.5},
-                {"label":"3", "x":20.5, "y":4.5},
-                {"label":"Enter", "x":21.5, "y":4.5, "h":2},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5},
-
-                {"label":"0", "x":18.5, "y":5.5, "w":2},
-                {"label":".", "x":20.5, "y":5.5}
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
+
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [7, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 11], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [2, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [2, 6], "x": 20.5, "y": 3.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [1, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
+
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"\u00a3", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
+
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 11], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/evyd13/wasdat_code/wasdat_code.c b/keyboards/evyd13/wasdat_code/wasdat_code.c
deleted file mode 100644
index c1cdadea9e..0000000000
--- a/keyboards/evyd13/wasdat_code/wasdat_code.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "wasdat_code.h"
diff --git a/keyboards/evyd13/wasdat_code/wasdat_code.h b/keyboards/evyd13/wasdat_code/wasdat_code.h
deleted file mode 100644
index b586f4aade..0000000000
--- a/keyboards/evyd13/wasdat_code/wasdat_code.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
- 
-#define LAYOUT_all LAYOUT_fullsize_iso
-
-#define LAYOUT_fullsize_ansi( \
-    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41,                          \
-    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66,      k78, k77, k76, k56, \
-    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c, k1b,      k68, k3e, k36,      k48, k47, k46, k4e, \
-    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d,      k7b,                          k28, k27, k26,      \
-    k29,      k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,           k18, k17, k16, k1e, \
-    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57,      k07,      k06       \
-) \
-{ \
-    { k00, XXX, k02, k03, XXX, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, XXX, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4a, XXX, k4c, k4d, k4e, k4f }, \
-    { k50, XXX, XXX, k53, XXX, XXX, k56, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
-    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
-    { k70, k71, k72, XXX, k74, k75, k76, k77, k78, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
-}
-
-#define LAYOUT_fullsize_iso( \
-    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41,                          \
-    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66,      k78, k77, k76, k56, \
-    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c,           k68, k3e, k36,      k48, k47, k46, k4e, \
-    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d, k1b, k7b,                          k28, k27, k26,      \
-    k29, k04, k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,           k18, k17, k16, k1e, \
-    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57,      k07,      k06       \
-) \
-{ \
-    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, XXX, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4a, XXX, k4c, k4d, k4e, k4f }, \
-    { k50, XXX, XXX, k53, XXX, XXX, k56, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
-    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
-    { k70, k71, k72, XXX, k74, k75, k76, k77, k78, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41, \
-    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66, \
-    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c, k1b,      k68, k3e, k36, \
-    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d,      k7b,                     \
-    k29,      k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,      \
-    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57  \
-) \
-{ \
-    { k00, XXX, k02, k03, XXX, k05, XXX, XXX, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, XXX, k14, k15, XXX, XXX, XXX, k19, k1a, k1b, k1c, k1d, XXX, k1f }, \
-    { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { k40, k41, k42, k43, k44, k45, XXX, XXX, XXX, XXX, k4a, XXX, k4c, k4d, XXX, k4f }, \
-    { k50, XXX, XXX, k53, XXX, XXX, XXX, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
-    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
-    { k70, k71, k72, XXX, k74, k75, XXX, XXX, XXX, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41, \
-    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66, \
-    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c,           k68, k3e, k36, \
-    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d, k1b, k7b,                     \
-    k29, k04, k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,      \
-    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57  \
-) \
-{ \
-    { k00, XXX, k02, k03, k04, k05, XXX, XXX, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, XXX, k14, k15, XXX, XXX, XXX, k19, k1a, k1b, k1c, k1d, XXX, k1f }, \
-    { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { k40, k41, k42, k43, k44, k45, XXX, XXX, XXX, XXX, k4a, XXX, k4c, k4d, XXX, k4f }, \
-    { k50, XXX, XXX, k53, XXX, XXX, XXX, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
-    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
-    { k70, k71, k72, XXX, k74, k75, XXX, XXX, XXX, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
-}
diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h
index 8d41a6a924..1f7440aa20 100644
--- a/keyboards/evyd13/wonderland/config.h
+++ b/keyboards/evyd13/wonderland/config.h
@@ -17,19 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B0,D1,D2,D3,D5}
-#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,E6,C7,C6,B6,B5,B4,D7,D6,D4}
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Backlight configuration
  */
-#define RGB_DI_PIN B7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json
index 9a84e03c0e..621be94232 100644
--- a/keyboards/evyd13/wonderland/info.json
+++ b/keyboards/evyd13/wonderland/info.json
@@ -8,11 +8,19 @@
         "pid": "0xA71C",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "B0",
         "esc_output": "F0",
         "led": "B1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "indicators": {
         "caps_lock": "B2",
         "num_lock": "B1",
@@ -22,144 +30,169 @@
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"k10", "x":0, "y":0},
-                {"label":"k00", "x":1.25, "y":0},
-                {"label":"k01", "x":2.25, "y":0},
-                {"label":"k02", "x":3.25, "y":0},
-                {"label":"k03", "x":4.25, "y":0},
-                {"label":"k04", "x":5.25, "y":0},
-                {"label":"k05", "x":6.25, "y":0},
-                {"label":"k06", "x":7.25, "y":0},
-                {"label":"k07", "x":10.25, "y":0},
-                {"label":"k08", "x":11.25, "y":0},
-                {"label":"k09", "x":12.25, "y":0},
-                {"label":"k0a", "x":13.25, "y":0},
-                {"label":"k0b", "x":14.25, "y":0},
-                {"label":"k0c", "x":15.25, "y":0},
-                {"label":"k0d", "x":16.25, "y":0},
-                {"label":"k0e", "x":17.25, "y":0},
-                {"label":"k20", "x":0, "y":1},
-                {"label":"k11", "x":1.25, "y":1, "w":1.5},
-                {"label":"k12", "x":2.75, "y":1},
-                {"label":"k13", "x":3.75, "y":1},
-                {"label":"k14", "x":4.75, "y":1},
-                {"label":"k15", "x":5.75, "y":1},
-                {"label":"k16", "x":6.75, "y":1},
-                {"label":"k17", "x":9.75, "y":1},
-                {"label":"k18", "x":10.75, "y":1},
-                {"label":"k19", "x":11.75, "y":1},
-                {"label":"k1a", "x":12.75, "y":1},
-                {"label":"k1b", "x":13.75, "y":1},
-                {"label":"k1c", "x":14.75, "y":1},
-                {"label":"k1d", "x":15.75, "y":1},
-                {"label":"k1e", "x":16.75, "y":1, "w":1.5},
-                {"label":"k30", "x":0, "y":2},
-                {"label":"k21", "x":1.25, "y":2, "w":1.75},
-                {"label":"k22", "x":3, "y":2},
-                {"label":"k23", "x":4, "y":2},
-                {"label":"k24", "x":5, "y":2},
-                {"label":"k25", "x":6, "y":2},
-                {"label":"k26", "x":7, "y":2},
-                {"label":"k27", "x":10, "y":2},
-                {"label":"k28", "x":11, "y":2},
-                {"label":"k29", "x":12, "y":2},
-                {"label":"k2a", "x":13, "y":2},
-                {"label":"k2b", "x":14, "y":2},
-                {"label":"k2c", "x":15, "y":2},
-                {"label":"k2e", "x":16, "y":2, "w":2.25},
-                {"label":"k31", "x":1.25, "y":3, "w":2.25},
-                {"label":"k32", "x":3.5, "y":3},
-                {"label":"k33", "x":4.5, "y":3},
-                {"label":"k34", "x":5.5, "y":3},
-                {"label":"k35", "x":6.5, "y":3},
-                {"label":"k36", "x":7.5, "y":3},
-                {"label":"k37", "x":9.5, "y":3},
-                {"label":"k38", "x":10.5, "y":3},
-                {"label":"k39", "x":11.5, "y":3},
-                {"label":"k3a", "x":12.5, "y":3},
-                {"label":"k3b", "x":13.5, "y":3},
-                {"label":"k3c", "x":14.5, "y":3},
-                {"label":"k3d", "x":15.5, "y":3, "w":1.75},
-                {"label":"k3e", "x":17.25, "y":3},
-                {"label":"k41", "x":1.25, "y":4, "w":1.5},
-                {"label":"k43", "x":4.25, "y":4, "w":1.5},
-                {"label":"k45", "x":5.75, "y":4, "w":2},
-                {"label":"k46", "x":7.75, "y":4, "w":1.25},
-                {"label":"k48", "x":9.5, "y":4, "w":2.75},
-                {"label":"k4a", "x":12.25, "y":4, "w":1.5},
-                {"label":"k4e", "x":16.75, "y":4, "w":1.5}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"k10", "x":0, "y":0},
-                {"label":"k00", "x":1.25, "y":0},
-                {"label":"k01", "x":2.25, "y":0},
-                {"label":"k02", "x":3.25, "y":0},
-                {"label":"k03", "x":4.25, "y":0},
-                {"label":"k04", "x":5.25, "y":0},
-                {"label":"k05", "x":6.25, "y":0},
-                {"label":"k06", "x":7.25, "y":0},
-                {"label":"k07", "x":10.25, "y":0},
-                {"label":"k08", "x":11.25, "y":0},
-                {"label":"k09", "x":12.25, "y":0},
-                {"label":"k0a", "x":13.25, "y":0},
-                {"label":"k0b", "x":14.25, "y":0},
-                {"label":"k0c", "x":15.25, "y":0},
-                {"label":"k0e", "x":16.25, "y":0, "w":2},
-                {"label":"k20", "x":0, "y":1},
-                {"label":"k11", "x":1.25, "y":1, "w":1.5},
-                {"label":"k12", "x":2.75, "y":1},
-                {"label":"k13", "x":3.75, "y":1},
-                {"label":"k14", "x":4.75, "y":1},
-                {"label":"k15", "x":5.75, "y":1},
-                {"label":"k16", "x":6.75, "y":1},
-                {"label":"k17", "x":9.75, "y":1},
-                {"label":"k18", "x":10.75, "y":1},
-                {"label":"k19", "x":11.75, "y":1},
-                {"label":"k1a", "x":12.75, "y":1},
-                {"label":"k1b", "x":13.75, "y":1},
-                {"label":"k1c", "x":14.75, "y":1},
-                {"label":"k1d", "x":15.75, "y":1},
-                {"label":"k1e", "x":16.75, "y":1, "w":1.5},
-                {"label":"k30", "x":0, "y":2},
-                {"label":"k21", "x":1.25, "y":2, "w":1.75},
-                {"label":"k22", "x":3, "y":2},
-                {"label":"k23", "x":4, "y":2},
-                {"label":"k24", "x":5, "y":2},
-                {"label":"k25", "x":6, "y":2},
-                {"label":"k26", "x":7, "y":2},
-                {"label":"k27", "x":10, "y":2},
-                {"label":"k28", "x":11, "y":2},
-                {"label":"k29", "x":12, "y":2},
-                {"label":"k2a", "x":13, "y":2},
-                {"label":"k2b", "x":14, "y":2},
-                {"label":"k2c", "x":15, "y":2},
-                {"label":"k2e", "x":16, "y":2, "w":2.25},
-                {"label":"k31", "x":1.25, "y":3, "w":2.25},
-                {"label":"k32", "x":3.5, "y":3},
-                {"label":"k33", "x":4.5, "y":3},
-                {"label":"k34", "x":5.5, "y":3},
-                {"label":"k35", "x":6.5, "y":3},
-                {"label":"k36", "x":7.5, "y":3},
-                {"label":"k37", "x":9.5, "y":3},
-                {"label":"k38", "x":10.5, "y":3},
-                {"label":"k39", "x":11.5, "y":3},
-                {"label":"k3a", "x":12.5, "y":3},
-                {"label":"k3b", "x":13.5, "y":3},
-                {"label":"k3c", "x":14.5, "y":3},
-                {"label":"k3d", "x":15.5, "y":3, "w":1.75},
-                {"label":"k3e", "x":17.25, "y":3},
-                {"label":"k41", "x":1.25, "y":4, "w":1.5},
-                {"label":"k43", "x":4.25, "y":4, "w":1.5},
-                {"label":"k45", "x":5.75, "y":4, "w":2},
-                {"label":"k46", "x":7.75, "y":4, "w":1.25},
-                {"label":"k48", "x":9.5, "y":4, "w":2.75},
-                {"label":"k4a", "x":12.25, "y":4, "w":1.5},
-                {"label":"k4e", "x":16.75, "y":4, "w":1.5}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/evyd13/wonderland/wonderland.c b/keyboards/evyd13/wonderland/wonderland.c
deleted file mode 100644
index f2a53a17a4..0000000000
--- a/keyboards/evyd13/wonderland/wonderland.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "wonderland.h"
diff --git a/keyboards/evyd13/wonderland/wonderland.h b/keyboards/evyd13/wonderland/wonderland.h
deleted file mode 100644
index 13ea147638..0000000000
--- a/keyboards/evyd13/wonderland/wonderland.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-#define LAYOUT_alice_split_bs( \
-    k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-         k41,           k43, k45, k46,      k48, k4a,                     k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e}  \
-}
-
-#define LAYOUT_alice( \
-    k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
-    k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, \
-         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-         k41,           k43, k45, k46,      k48, k4a,                     k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e}  \
-}
-
-#define LAYOUT LAYOUT_alice_split_bs
-
-void matrix_init_user(void);
-void matrix_scan_user(void);
diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h
index ef92b06249..9d31e13dcb 100644
--- a/keyboards/exclusive/e65/config.h
+++ b/keyboards/exclusive/e65/config.h
@@ -16,24 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS \
-    { C6, C7, D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,4 +36,3 @@
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/exclusive/e65/e65.c b/keyboards/exclusive/e65/e65.c
deleted file mode 100644
index feb0e65438..0000000000
--- a/keyboards/exclusive/e65/e65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Brice Figureau
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "e65.h"
diff --git a/keyboards/exclusive/e65/e65.h b/keyboards/exclusive/e65/e65.h
deleted file mode 100644
index 281b52c76e..0000000000
--- a/keyboards/exclusive/e65/e65.h
+++ /dev/null
@@ -1,365 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-
-// layout with all the switches supported by the PCB
-#define LAYOUT_all( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                   K410, K411, K412, K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  K414,  K415 }  \
-}
-
-// Ansi layout with bottom row 1.25,1.25,1,25,6.25,1.5,1.5,<-,v,->
-#define LAYOUT_65_all_noblocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                   K410,       K412, K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_ansi_noblocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                   K410,       K412, K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_ansi_noblocker_splitbs( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                   K410,       K412, K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_iso_noblocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K114, K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                   K410,       K412, K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412, K413,  K414,  K415 }  \
-}
-
-// Ansi layout with bottom row 1.25,1.25,1,25,6.25,1.25,1.25 blocker <-,v,->
-#define LAYOUT_65_all_blocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                   K410, K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                   K410, K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_ansi_blocker_splitbs( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                   K410, K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K114, K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                   K410, K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-// ANSI layout with bottom row 1.5,1.5,7,1.5,1.5,<-,v,->
-#define LAYOUT_65_all_7u_noblocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,                         K406,                   K410,       K412, K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_ansi_7u_noblocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,                         K406,                   K410,       K412, K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412, K413,  K414,  K415 }  \
-}
-
-
-#define LAYOUT_65_ansi_7u_noblocker_splitbs( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,                         K406,                   K410,       K412, K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_iso_7u_noblocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K114, K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,                         K406,                   K410,       K412, K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412, K413,  K414,  K415 }  \
-}
-
-// ANSI layout with bottom row 1.5,1,1.5,7,1.5, blocker, <-,v,->
-#define LAYOUT_65_all_7u_wk( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                         K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, KC_NO, K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_ansi_7u_wk( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                         K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, KC_NO, K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_ansi_7u_wk_splitbs( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                         K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, KC_NO, K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_iso_7u_wk( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K114, K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400, K401,       K403,             K406,                         K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, KC_NO, K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-// layout with bottom row 1.5,blocker,1.5,7,1.5, blocker, <-,v,->
-#define LAYOUT_65_all_7u_wkl( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400,       K402,                   K406,                         K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  KC_NO, K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, KC_NO, K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_ansi_7u_wkl( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-	K400,       K402,                   K406,                         K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  KC_NO, K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, KC_NO, K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_ansi_7u_wkl_splitbs( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-    K400,        K402,                   K406,                         K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  KC_NO, K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, KC_NO, K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_iso_7u_wkl( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K114, K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-    K400,        K402,                   K406,                         K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  KC_NO, K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, KC_NO, K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-// layout with bottom row blocker,1,1.5,7,1.5,1, blocker, <-,v,->
-#define LAYOUT_65_all_7u_hhkb( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-    K400, K401,                         K406,                   K410, K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401, KC_NO,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_ansi_7u_hhkb( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-    K400, K401,                         K406,                   K410, K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401, KC_NO,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_ansi_7u_hhkb_splitbs( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-    K400, K401,                         K406,                   K410, K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401, KC_NO,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-#define LAYOUT_65_iso_7u_hhkb( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K114, K214, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-    K400, K401,                         K406,                   K410, K411,       K413, K414, K415  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-	{ K400,  K401, KC_NO,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  KC_NO, K413,  K414,  K415 }  \
-}
-
-// clang-format on
diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/info.json
index 436faa5f3d..1c48f1e48c 100644
--- a/keyboards/exclusive/e65/info.json
+++ b/keyboards/exclusive/e65/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE605",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 6
@@ -16,66 +21,1894 @@
         "caps_lock": "B6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
-        "LAYOUT_all": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"x":12, "y":4}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
+        "LAYOUT_65_all_7u_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 15], "x": 30, "y": 0},
+
+                {"matrix": [2, 0], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 15], "x": 44, "y": 0},
+
+                {"matrix": [3, 0], "x": 45, "y": 0},
+                {"matrix": [3, 1], "x": 46, "y": 0},
+                {"matrix": [3, 2], "x": 47, "y": 0},
+                {"matrix": [3, 3], "x": 48, "y": 0},
+                {"matrix": [3, 4], "x": 49, "y": 0},
+                {"matrix": [3, 5], "x": 50, "y": 0},
+                {"matrix": [3, 6], "x": 51, "y": 0},
+                {"matrix": [3, 7], "x": 52, "y": 0},
+                {"matrix": [3, 8], "x": 53, "y": 0},
+                {"matrix": [3, 9], "x": 54, "y": 0},
+                {"matrix": [3, 10], "x": 55, "y": 0},
+                {"matrix": [3, 11], "x": 56, "y": 0},
+                {"matrix": [3, 13], "x": 57, "y": 0},
+                {"matrix": [3, 14], "x": 58, "y": 0},
+                {"matrix": [3, 15], "x": 59, "y": 0},
+
+                {"matrix": [4, 0], "x": 60, "y": 0},
+                {"matrix": [4, 1], "x": 61, "y": 0},
+                {"matrix": [4, 6], "x": 62, "y": 0},
+                {"matrix": [4, 10], "x": 63, "y": 0},
+                {"matrix": [4, 11], "x": 64, "y": 0},
+                {"matrix": [4, 13], "x": 65, "y": 0},
+                {"matrix": [4, 14], "x": 66, "y": 0},
+                {"matrix": [4, 15], "x": 67, "y": 0}
+            ]
         },
-        "LAYOUT_65_ansi_noblocker": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Fn", "x":11.5, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
+        "LAYOUT_65_all_7u_noblocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 15], "x": 30, "y": 0},
+
+                {"matrix": [2, 0], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 15], "x": 44, "y": 0},
+
+                {"matrix": [3, 0], "x": 45, "y": 0},
+                {"matrix": [3, 1], "x": 46, "y": 0},
+                {"matrix": [3, 2], "x": 47, "y": 0},
+                {"matrix": [3, 3], "x": 48, "y": 0},
+                {"matrix": [3, 4], "x": 49, "y": 0},
+                {"matrix": [3, 5], "x": 50, "y": 0},
+                {"matrix": [3, 6], "x": 51, "y": 0},
+                {"matrix": [3, 7], "x": 52, "y": 0},
+                {"matrix": [3, 8], "x": 53, "y": 0},
+                {"matrix": [3, 9], "x": 54, "y": 0},
+                {"matrix": [3, 10], "x": 55, "y": 0},
+                {"matrix": [3, 11], "x": 56, "y": 0},
+                {"matrix": [3, 13], "x": 57, "y": 0},
+                {"matrix": [3, 14], "x": 58, "y": 0},
+                {"matrix": [3, 15], "x": 59, "y": 0},
+
+                {"matrix": [4, 0], "x": 60, "y": 0},
+                {"matrix": [4, 1], "x": 61, "y": 0},
+                {"matrix": [4, 6], "x": 62, "y": 0},
+                {"matrix": [4, 10], "x": 63, "y": 0},
+                {"matrix": [4, 12], "x": 64, "y": 0},
+                {"matrix": [4, 13], "x": 65, "y": 0},
+                {"matrix": [4, 14], "x": 66, "y": 0},
+                {"matrix": [4, 15], "x": 67, "y": 0}
+            ]
         },
-        "LAYOUT_65_ansi_noblocker_splitbs": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Fn", "x":11.5, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
+        "LAYOUT_65_all_7u_wk": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 15], "x": 30, "y": 0},
+
+                {"matrix": [2, 0], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 15], "x": 44, "y": 0},
+
+                {"matrix": [3, 0], "x": 45, "y": 0},
+                {"matrix": [3, 1], "x": 46, "y": 0},
+                {"matrix": [3, 2], "x": 47, "y": 0},
+                {"matrix": [3, 3], "x": 48, "y": 0},
+                {"matrix": [3, 4], "x": 49, "y": 0},
+                {"matrix": [3, 5], "x": 50, "y": 0},
+                {"matrix": [3, 6], "x": 51, "y": 0},
+                {"matrix": [3, 7], "x": 52, "y": 0},
+                {"matrix": [3, 8], "x": 53, "y": 0},
+                {"matrix": [3, 9], "x": 54, "y": 0},
+                {"matrix": [3, 10], "x": 55, "y": 0},
+                {"matrix": [3, 11], "x": 56, "y": 0},
+                {"matrix": [3, 13], "x": 57, "y": 0},
+                {"matrix": [3, 14], "x": 58, "y": 0},
+                {"matrix": [3, 15], "x": 59, "y": 0},
+
+                {"matrix": [4, 0], "x": 60, "y": 0},
+                {"matrix": [4, 1], "x": 61, "y": 0},
+                {"matrix": [4, 3], "x": 62, "y": 0},
+                {"matrix": [4, 6], "x": 63, "y": 0},
+                {"matrix": [4, 11], "x": 64, "y": 0},
+                {"matrix": [4, 13], "x": 65, "y": 0},
+                {"matrix": [4, 14], "x": 66, "y": 0},
+                {"matrix": [4, 15], "x": 67, "y": 0}
+            ]
         },
-        "LAYOUT_65_iso_noblocker": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Fn", "x":11.5, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
+        "LAYOUT_65_all_7u_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 15], "x": 30, "y": 0},
+
+                {"matrix": [2, 0], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 15], "x": 44, "y": 0},
+
+                {"matrix": [3, 0], "x": 45, "y": 0},
+                {"matrix": [3, 1], "x": 46, "y": 0},
+                {"matrix": [3, 2], "x": 47, "y": 0},
+                {"matrix": [3, 3], "x": 48, "y": 0},
+                {"matrix": [3, 4], "x": 49, "y": 0},
+                {"matrix": [3, 5], "x": 50, "y": 0},
+                {"matrix": [3, 6], "x": 51, "y": 0},
+                {"matrix": [3, 7], "x": 52, "y": 0},
+                {"matrix": [3, 8], "x": 53, "y": 0},
+                {"matrix": [3, 9], "x": 54, "y": 0},
+                {"matrix": [3, 10], "x": 55, "y": 0},
+                {"matrix": [3, 11], "x": 56, "y": 0},
+                {"matrix": [3, 13], "x": 57, "y": 0},
+                {"matrix": [3, 14], "x": 58, "y": 0},
+                {"matrix": [3, 15], "x": 59, "y": 0},
+
+                {"matrix": [4, 0], "x": 60, "y": 0},
+                {"matrix": [4, 2], "x": 61, "y": 0},
+                {"matrix": [4, 6], "x": 62, "y": 0},
+                {"matrix": [4, 11], "x": 63, "y": 0},
+                {"matrix": [4, 13], "x": 64, "y": 0},
+                {"matrix": [4, 14], "x": 65, "y": 0},
+                {"matrix": [4, 15], "x": 66, "y": 0}
+            ]
         },
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
+        "LAYOUT_65_all_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},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 15], "x": 30, "y": 0},
+
+                {"matrix": [2, 0], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 15], "x": 44, "y": 0},
+
+                {"matrix": [3, 0], "x": 45, "y": 0},
+                {"matrix": [3, 1], "x": 46, "y": 0},
+                {"matrix": [3, 2], "x": 47, "y": 0},
+                {"matrix": [3, 3], "x": 48, "y": 0},
+                {"matrix": [3, 4], "x": 49, "y": 0},
+                {"matrix": [3, 5], "x": 50, "y": 0},
+                {"matrix": [3, 6], "x": 51, "y": 0},
+                {"matrix": [3, 7], "x": 52, "y": 0},
+                {"matrix": [3, 8], "x": 53, "y": 0},
+                {"matrix": [3, 9], "x": 54, "y": 0},
+                {"matrix": [3, 10], "x": 55, "y": 0},
+                {"matrix": [3, 11], "x": 56, "y": 0},
+                {"matrix": [3, 13], "x": 57, "y": 0},
+                {"matrix": [3, 14], "x": 58, "y": 0},
+                {"matrix": [3, 15], "x": 59, "y": 0},
+
+                {"matrix": [4, 0], "x": 60, "y": 0},
+                {"matrix": [4, 1], "x": 61, "y": 0},
+                {"matrix": [4, 3], "x": 62, "y": 0},
+                {"matrix": [4, 6], "x": 63, "y": 0},
+                {"matrix": [4, 10], "x": 64, "y": 0},
+                {"matrix": [4, 11], "x": 65, "y": 0},
+                {"matrix": [4, 13], "x": 66, "y": 0},
+                {"matrix": [4, 14], "x": 67, "y": 0},
+                {"matrix": [4, 15], "x": 68, "y": 0}
+            ]
         },
-        "LAYOUT_65_ansi_blocker_splitbs": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
+        "LAYOUT_65_all_noblocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 15], "x": 30, "y": 0},
+
+                {"matrix": [2, 0], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 15], "x": 44, "y": 0},
+
+                {"matrix": [3, 0], "x": 45, "y": 0},
+                {"matrix": [3, 1], "x": 46, "y": 0},
+                {"matrix": [3, 2], "x": 47, "y": 0},
+                {"matrix": [3, 3], "x": 48, "y": 0},
+                {"matrix": [3, 4], "x": 49, "y": 0},
+                {"matrix": [3, 5], "x": 50, "y": 0},
+                {"matrix": [3, 6], "x": 51, "y": 0},
+                {"matrix": [3, 7], "x": 52, "y": 0},
+                {"matrix": [3, 8], "x": 53, "y": 0},
+                {"matrix": [3, 9], "x": 54, "y": 0},
+                {"matrix": [3, 10], "x": 55, "y": 0},
+                {"matrix": [3, 11], "x": 56, "y": 0},
+                {"matrix": [3, 13], "x": 57, "y": 0},
+                {"matrix": [3, 14], "x": 58, "y": 0},
+                {"matrix": [3, 15], "x": 59, "y": 0},
+
+                {"matrix": [4, 0], "x": 60, "y": 0},
+                {"matrix": [4, 1], "x": 61, "y": 0},
+                {"matrix": [4, 3], "x": 62, "y": 0},
+                {"matrix": [4, 6], "x": 63, "y": 0},
+                {"matrix": [4, 10], "x": 64, "y": 0},
+                {"matrix": [4, 12], "x": 65, "y": 0},
+                {"matrix": [4, 13], "x": 66, "y": 0},
+                {"matrix": [4, 14], "x": 67, "y": 0},
+                {"matrix": [4, 15], "x": 68, "y": 0}
+            ]
         },
-        "LAYOUT_65_iso_blocker": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
+        "LAYOUT_65_ansi_7u_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_7u_hhkb_splitbs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_7u_noblocker": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":7}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Fn", "x":11.5, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_7u_noblocker_splitbs": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":7}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Fn", "x":11.5, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
-        },
-        "LAYOUT_65_iso_7u_noblocker": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":7}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Fn", "x":11.5, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_7u_wk": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_7u_wk_splitbs": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
-        },
-        "LAYOUT_65_iso_7u_wk": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_7u_wkl": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_7u_wkl_splitbs": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
-        "LAYOUT_65_iso_7u_wkl": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
-        "LAYOUT_65_ansi_7u_hhkb": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0.5, "y":4}, {"label":"Alt", "x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":7}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Fn", "x":11.5, "y":4}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
+        "LAYOUT_65_ansi_blocker_splitbs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
-        "LAYOUT_65_ansi_7u_hhkb_splitbs": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0.5, "y":4}, {"label":"Alt", "x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":7}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Fn", "x":11.5, "y":4}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":4}]
+        "LAYOUT_65_ansi_noblocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_noblocker_splitbs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_iso_7u_hhkb": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Page up", "x":15, "y":1}, {"label":"Ctrl", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Page down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"&uarr;", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0.5, "y":4}, {"label":"Alt", "x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":7}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Fn", "x":11.5, "y":4}, {"label":"&larr;", "x":13, "y":4}, {"label":"&darr;", "x":14, "y":4}, {"label":"&rarr;", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_7u_noblocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_7u_wk": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_7u_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_noblocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h
index bf8b3b483a..c6acec2658 100644
--- a/keyboards/exclusive/e6_rgb/config.h
+++ b/keyboards/exclusive/e6_rgb/config.h
@@ -4,15 +4,8 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, F4, F5, F6, D6 }
-#define MATRIX_COL_PINS { D7, B4, B5, B6, C6, C7, F7, F0, B0, B1, D2, D3, B3, B2 }
-#define DIODE_DIRECTION COL2ROW
-
 //rgb light setting
 #define RGBLED_NUM      6
-#define RGB_DI_PIN      B7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/exclusive/e6_rgb/info.json b/keyboards/exclusive/e6_rgb/info.json
index 076ff4a505..37e2a5c0e7 100644
--- a/keyboards/exclusive/e6_rgb/info.json
+++ b/keyboards/exclusive/e6_rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x4536",
         "device_version": "0.6.2"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["D7", "B4", "B5", "B6", "C6", "C7", "F7", "F0", "B0", "B1", "D2", "D3", "B3", "B2"],
+        "rows": ["F1", "F4", "F5", "F6", "D6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/exclusive/e6_rgb/rules.mk b/keyboards/exclusive/e6_rgb/rules.mk
index fb1b6986b2..0bdf20535c 100644
--- a/keyboards/exclusive/e6_rgb/rules.mk
+++ b/keyboards/exclusive/e6_rgb/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no      # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h
index 65bd782b7e..8c0ffda30b 100644
--- a/keyboards/exclusive/e6v2/le/config.h
+++ b/keyboards/exclusive/e6v2/le/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* QMK E6-V2 PCB default pin-out */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,6 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 12
 #define RGBLIGHT_VAL_STEP 12
-#endif
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/info.json
index 10ad0c9383..de3d009057 100644
--- a/keyboards/exclusive/e6v2/le/info.json
+++ b/keyboards/exclusive/e6v2/le/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 2,
@@ -18,6 +23,9 @@
         "caps_lock": "B7",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/exclusive/e6v2/le/le.c b/keyboards/exclusive/e6v2/le/le.c
deleted file mode 100644
index dd973feec5..0000000000
--- a/keyboards/exclusive/e6v2/le/le.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "le.h"
diff --git a/keyboards/exclusive/e6v2/le_bmc/config.h b/keyboards/exclusive/e6v2/le_bmc/config.h
index c9d14bff4d..bb3f00287e 100644
--- a/keyboards/exclusive/e6v2/le_bmc/config.h
+++ b/keyboards/exclusive/e6v2/le_bmc/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-//                        0   1   2   3   4   5   6   7   8   9   A
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, C2, C3, C4, C5, D7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/info.json
index 51afd7c5ad..b219ecd855 100644
--- a/keyboards/exclusive/e6v2/le_bmc/info.json
+++ b/keyboards/exclusive/e6v2/le_bmc/info.json
@@ -7,9 +7,17 @@
         "pid": "0xE62D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "C2", "C3", "C4", "C5", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1"
     },
@@ -17,7 +25,7 @@
     "bootloader": "bootloadhid",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
         },
 
         "LAYOUT_60_ansi": {
diff --git a/keyboards/exclusive/e6v2/le_bmc/le_bmc.c b/keyboards/exclusive/e6v2/le_bmc/le_bmc.c
deleted file mode 100644
index e36cfd645d..0000000000
--- a/keyboards/exclusive/e6v2/le_bmc/le_bmc.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 amnesia0287
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "le_bmc.h"
diff --git a/keyboards/exclusive/e6v2/le_bmc/rules.mk b/keyboards/exclusive/e6v2/le_bmc/rules.mk
index 48cc2acea7..0a7c71a8ee 100644
--- a/keyboards/exclusive/e6v2/le_bmc/rules.mk
+++ b/keyboards/exclusive/e6v2/le_bmc/rules.mk
@@ -8,6 +8,5 @@ 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
-WS2812_DRIVER = i2c
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h
index 88ec4faa04..6e9255bebb 100644
--- a/keyboards/exclusive/e6v2/oe/config.h
+++ b/keyboards/exclusive/e6v2/oe/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* QMK E6-V2 PCB default pin-out */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { C7, C6, B5, B4, D7, D6, D4, F6, F7, F5, F4, F1, F0, B0, B1 }
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,6 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 12
 #define RGBLIGHT_VAL_STEP 12
-#endif
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/exclusive/e6v2/oe/info.json b/keyboards/exclusive/e6v2/oe/info.json
index bfa408c556..cb5b0e95fb 100644
--- a/keyboards/exclusive/e6v2/oe/info.json
+++ b/keyboards/exclusive/e6v2/oe/info.json
@@ -8,12 +8,20 @@
         "pid": "0x6060",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B5", "B4", "D7", "D6", "D4", "F6", "F7", "F5", "F4", "F1", "F0", "B0", "B1"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 5,
         "breathing": true,
         "breathing_period": 3
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/exclusive/e6v2/oe_bmc/config.h b/keyboards/exclusive/e6v2/oe_bmc/config.h
index c9d14bff4d..bb3f00287e 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/config.h
+++ b/keyboards/exclusive/e6v2/oe_bmc/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-//                        0   1   2   3   4   5   6   7   8   9   A
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, C2, C3, C4, C5, D7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json
index 6716f99c98..4cccec757c 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/info.json
+++ b/keyboards/exclusive/e6v2/oe_bmc/info.json
@@ -7,9 +7,17 @@
         "pid": "0xE62B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "C2", "C3", "C4", "C5", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1"
     },
@@ -17,7 +25,7 @@
     "bootloader": "bootloadhid",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
         },
 
         "LAYOUT_60_ansi": {
diff --git a/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c b/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c
deleted file mode 100644
index 10dd1a26ed..0000000000
--- a/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "oe_bmc.h"
diff --git a/keyboards/exclusive/e6v2/oe_bmc/rules.mk b/keyboards/exclusive/e6v2/oe_bmc/rules.mk
index 48cc2acea7..0a7c71a8ee 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/rules.mk
+++ b/keyboards/exclusive/e6v2/oe_bmc/rules.mk
@@ -8,6 +8,5 @@ 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
-WS2812_DRIVER = i2c
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h
index 46944506a1..896eb97b25 100644
--- a/keyboards/exclusive/e7v1/config.h
+++ b/keyboards/exclusive/e7v1/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { B6, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/exclusive/e7v1/e7v1.c b/keyboards/exclusive/e7v1/e7v1.c
deleted file mode 100644
index 880121f4f0..0000000000
--- a/keyboards/exclusive/e7v1/e7v1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "e7v1.h"
diff --git a/keyboards/exclusive/e7v1/e7v1.h b/keyboards/exclusive/e7v1/e7v1.h
deleted file mode 100644
index 2fc7acb3ba..0000000000
--- a/keyboards/exclusive/e7v1/e7v1.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// layout with all the switches supported by the PCB
-#define LAYOUT_all( \
-	K000, K001, K002, K003,       K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,             \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414,       \
-	K500, K501, K502,             K505,                         K510, K511, K512, K513, K514, K515  \
-) { \
-	{ K000,  K001,  K002,  K003,  KC_NO, K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, KC_NO }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  K513,  K514,  K515 }  \
-}
-
-#define LAYOUT_75_ansi( \
-	K000, K001, K002, K003,       K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,             \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414,       \
-	K500, K501, K502,             K505,                         K510,       K512, K513, K514, K515  \
-) { \
-	{ K000,  K001,  K002,  K003,  KC_NO, K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112, KC_NO,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, KC_NO }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, KC_NO, K510,  KC_NO,  K512,  K513,  K514,  K515 }  \
-}
-
-// Ansi layout with a 7u space bar
-#define LAYOUT_75_ansi_7u( \
-	K000, K001, K002, K003,       K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,             \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414,       \
-	K500, K501,                   K505,                         K510,       K512, K513, K514, K515  \
-) { \
-	{ K000,  K001,  K002,  K003,  KC_NO, K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112, KC_NO,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, KC_NO }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414,  KC_NO }, \
-	{ K500,  K501,  KC_NO, KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, KC_NO, K510,  KC_NO,  K512,  K513,  K514,  K515 }  \
-}
-
-// ANSI layout with split backspace
-#define LAYOUT_75_ansi_splitbs( \
-	K000, K001, K002, K003,       K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,             \
-	K400      , K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414,       \
-	K500, K501, K502,             K505,                         K510,       K512, K513, K514, K515  \
-) { \
-	{ K000,  K001,  K002,  K003,  KC_NO, K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, KC_NO }, \
-	{ K400,  KC_NO,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, KC_NO, K510,  KC_NO,  K512,  K513,  K514,  K515 }  \
-}
-
-// ANSI layout with split backspace
-#define LAYOUT_75_ansi_7u_splitbs( \
-	K000, K001, K002, K003,       K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,             \
-	K400      , K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414,       \
-	K500, K501,                   K505,                         K510,       K512, K513, K514, K515  \
-) { \
-	{ K000,  K001,  K002,  K003,  KC_NO, K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, KC_NO }, \
-	{ K400,  KC_NO,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414,  KC_NO }, \
-	{ K500,  K501,  KC_NO,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, KC_NO, K510,  KC_NO,  K512,  K513,  K514,  K515 }  \
-}
-
-#define LAYOUT_75_iso( \
-	K000, K001, K002, K003,       K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K214, K313,       \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414,       \
-	K500, K501, K502,             K505,                         K510,       K512, K513, K514, K515  \
-) { \
-	{ K000,  K001,  K002,  K003,  KC_NO, K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112, KC_NO,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, KC_NO }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, KC_NO, K510,  KC_NO,  K512,  K513,  K514,  K515 }  \
-}
diff --git a/keyboards/exclusive/e7v1/info.json b/keyboards/exclusive/e7v1/info.json
index d014e6d47c..42ec77a9fb 100644
--- a/keyboards/exclusive/e7v1/info.json
+++ b/keyboards/exclusive/e7v1/info.json
@@ -8,10 +8,18 @@
         "pid": "0xE701",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 6
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "indicators": {
         "caps_lock": "F0"
     },
@@ -19,20 +27,554 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"x":13, "y":1.5}, {"label":"Backspace", "x":14, "y":1.5}, {"label":"Page Up", "x":15.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, {"label":"Page down", "x":15.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"Z", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5}, {"label":"Win", "x":11, "y":5.5}, {"x":12, "y":5.5}, {"label":"\u2190", "x":13.25, "y":5.75}, {"label":"\u2193", "x":14.25, "y":5.75}, {"label":"\u2192", "x":15.25, "y":5.75}]
+            "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, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5},
+                {"matrix": [5, 11], "x": 11, "y": 5.5},
+                {"matrix": [5, 12], "x": 12, "y": 5.5},
+
+                {"matrix": [5, 13], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.75}
+            ]
         },
         "LAYOUT_75_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Page Up", "x":15.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, {"label":"Page down", "x":15.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.5}, {"label":"Win", "x":11.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.75}, {"label":"\u2193", "x":14.25, "y":5.75}, {"label":"\u2192", "x":15.25, "y":5.75}]
+            "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, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 13], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.75}
+            ]
         },
         "LAYOUT_75_ansi_7u": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5, "w":2}, {"label":"Page Up", "x":15.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Backspace", "x":13.5, "y":2.5, "w":1.5}, {"label":"Page down", "x":15.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5, "w":1.5}, {"x":3, "y":5.5, "w":7}, {"label":"Alt", "x":10, "y":5.5, "w":1.5}, {"label":"Win", "x":11.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.75}, {"label":"\u2193", "x":14.25, "y":5.75}, {"label":"\u2192", "x":15.25, "y":5.75}]        },
+            "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, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 13], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.75}
+            ]
+        },
         "LAYOUT_75_ansi_7u_splitbs": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"Del", "x":14, "y":1.5}, {"label":"Page Up", "x":15.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Backspace", "x":13.5, "y":2.5, "w":1.5}, {"label":"Page down", "x":15.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5, "w":1.5}, {"x":3, "y":5.5, "w":7}, {"label":"Alt", "x":10, "y":5.5, "w":1.5}, {"label":"Win", "x":11.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.75}, {"label":"\u2193", "x":14.25, "y":5.75}, {"label":"\u2192", "x":15.25, "y":5.75}]
+            "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, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 13], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.75}
+            ]
         },
         "LAYOUT_75_iso": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Page Up", "x":15.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Page down", "x":15.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"Z", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.5}, {"label":"Win", "x":11.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.75}, {"label":"\u2193", "x":14.25, "y":5.75}, {"label":"\u2192", "x":15.25, "y":5.75}]},
+            "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, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"matrix": [2, 14], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 13], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.75}
+            ]
+        },
         "LAYOUT_75_ansi_splitbs": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"Del", "x":14, "y":1.5}, {"label":"Page Up", "x":15.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Backspace", "x":13.5, "y":2.5, "w":1.5}, {"label":"Page down", "x":15.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.5}, {"label":"Win", "x":11.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.75}, {"label":"\u2193", "x":14.25, "y":5.75}, {"label":"\u2192", "x":15.25, "y":5.75}]
+            "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, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 13], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.75}
+            ]
         }
     }
 }
diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h
index 3da5cb8935..04ef2b92d8 100644
--- a/keyboards/exclusive/e7v1se/config.h
+++ b/keyboards/exclusive/e7v1se/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, F0 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D7, D6, D4, B4, B5, B6, C6, C7, F7, F6, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 16
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/exclusive/e7v1se/e7v1se.c b/keyboards/exclusive/e7v1se/e7v1se.c
deleted file mode 100644
index 69248f01d4..0000000000
--- a/keyboards/exclusive/e7v1se/e7v1se.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Bart Riemens
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "e7v1se.h"
diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json
index 9994741f24..f91568a28c 100644
--- a/keyboards/exclusive/e7v1se/info.json
+++ b/keyboards/exclusive/e7v1se/info.json
@@ -8,97 +8,105 @@
         "pid": "0x7051",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0", "D7", "D6", "D4", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "K00", "x": 0, "y": 0, "w": 1 },
-                { "label": "K01", "x": 1.25, "y": 0, "w": 1 },
-                { "label": "K02", "x": 2.25, "y": 0, "w": 1 },
-                { "label": "K03", "x": 3.25, "y": 0, "w": 1 },
-                { "label": "K04", "x": 4.25, "y": 0, "w": 1 },
-                { "label": "K05", "x": 5.5, "y": 0, "w": 1 },
-                { "label": "K06", "x": 6.5, "y": 0, "w": 1 },
-                { "label": "K07", "x": 7.5, "y": 0, "w": 1 },
-                { "label": "K08", "x": 8.5, "y": 0, "w": 1 },
-                { "label": "K09", "x": 9.75, "y": 0, "w": 1 },
-                { "label": "K0a", "x": 10.75, "y": 0, "w": 1 },
-                { "label": "K0b", "x": 11.75, "y": 0, "w": 1 },
-                { "label": "K0c", "x": 12.75, "y": 0, "w": 1 },
-                { "label": "K0e", "x": 14, "y": 0, "w": 1 },
-                { "label": "K0f", "x": 15.25, "y": 0, "w": 1 },
-                { "label": "K10", "x": 0, "y": 1, "w": 1 },
-                { "label": "K11", "x": 1, "y": 1, "w": 1 },
-                { "label": "K12", "x": 2, "y": 1, "w": 1 },
-                { "label": "K13", "x": 3, "y": 1, "w": 1 },
-                { "label": "K14", "x": 4, "y": 1, "w": 1 },
-                { "label": "K15", "x": 5, "y": 1, "w": 1 },
-                { "label": "K16", "x": 6, "y": 1, "w": 1 },
-                { "label": "K17", "x": 7, "y": 1, "w": 1 },
-                { "label": "K18", "x": 8, "y": 1, "w": 1 },
-                { "label": "K19", "x": 9, "y": 1, "w": 1 },
-                { "label": "K1a", "x": 10, "y": 1, "w": 1 },
-                { "label": "K1b", "x": 11, "y": 1, "w": 1 },
-                { "label": "K1c", "x": 12, "y": 1, "w": 1 },
-                { "label": "K1d", "x": 13, "y": 1, "w": 1 },
-                { "label": "K1e", "x": 14, "y": 1, "w": 1 },
-                { "label": "K1f", "x": 15.25, "y": 1, "w": 1 },
+                { "label": "K00", "x": 0, "y": 0 },
+                { "label": "K01", "x": 1.25, "y": 0 },
+                { "label": "K02", "x": 2.25, "y": 0 },
+                { "label": "K03", "x": 3.25, "y": 0 },
+                { "label": "K04", "x": 4.25, "y": 0 },
+                { "label": "K05", "x": 5.5, "y": 0 },
+                { "label": "K06", "x": 6.5, "y": 0 },
+                { "label": "K07", "x": 7.5, "y": 0 },
+                { "label": "K08", "x": 8.5, "y": 0 },
+                { "label": "K09", "x": 9.75, "y": 0 },
+                { "label": "K0a", "x": 10.75, "y": 0 },
+                { "label": "K0b", "x": 11.75, "y": 0 },
+                { "label": "K0c", "x": 12.75, "y": 0 },
+                { "label": "K0e", "x": 14, "y": 0 },
+                { "label": "K0f", "x": 15.25, "y": 0 },
+                { "label": "K10", "x": 0, "y": 1 },
+                { "label": "K11", "x": 1, "y": 1 },
+                { "label": "K12", "x": 2, "y": 1 },
+                { "label": "K13", "x": 3, "y": 1 },
+                { "label": "K14", "x": 4, "y": 1 },
+                { "label": "K15", "x": 5, "y": 1 },
+                { "label": "K16", "x": 6, "y": 1 },
+                { "label": "K17", "x": 7, "y": 1 },
+                { "label": "K18", "x": 8, "y": 1 },
+                { "label": "K19", "x": 9, "y": 1 },
+                { "label": "K1a", "x": 10, "y": 1 },
+                { "label": "K1b", "x": 11, "y": 1 },
+                { "label": "K1c", "x": 12, "y": 1 },
+                { "label": "K1d", "x": 13, "y": 1 },
+                { "label": "K1e", "x": 14, "y": 1 },
+                { "label": "K1f", "x": 15.25, "y": 1 },
                 { "label": "K20", "x": 0, "y": 2, "w": 1.5 },
-                { "label": "K22", "x": 1.5, "y": 2, "w": 1 },
-                { "label": "K23", "x": 2.5, "y": 2, "w": 1 },
-                { "label": "K24", "x": 3.5, "y": 2, "w": 1 },
-                { "label": "K25", "x": 4.5, "y": 2, "w": 1 },
-                { "label": "K26", "x": 5.5, "y": 2, "w": 1 },
-                { "label": "K27", "x": 6.5, "y": 2, "w": 1 },
-                { "label": "K28", "x": 7.5, "y": 2, "w": 1 },
-                { "label": "K29", "x": 8.5, "y": 2, "w": 1 },
-                { "label": "K2a", "x": 9.5, "y": 2, "w": 1 },
-                { "label": "K2b", "x": 10.5, "y": 2, "w": 1 },
-                { "label": "K2c", "x": 11.5, "y": 2, "w": 1 },
-                { "label": "K2d", "x": 12.5, "y": 2, "w": 1 },
+                { "label": "K22", "x": 1.5, "y": 2 },
+                { "label": "K23", "x": 2.5, "y": 2 },
+                { "label": "K24", "x": 3.5, "y": 2 },
+                { "label": "K25", "x": 4.5, "y": 2 },
+                { "label": "K26", "x": 5.5, "y": 2 },
+                { "label": "K27", "x": 6.5, "y": 2 },
+                { "label": "K28", "x": 7.5, "y": 2 },
+                { "label": "K29", "x": 8.5, "y": 2 },
+                { "label": "K2a", "x": 9.5, "y": 2 },
+                { "label": "K2b", "x": 10.5, "y": 2 },
+                { "label": "K2c", "x": 11.5, "y": 2 },
+                { "label": "K2d", "x": 12.5, "y": 2 },
                 { "label": "K2e", "x": 13.5, "y": 2, "w": 1.5 },
-                { "label": "K2f", "x": 15.25, "y": 2, "w": 1 },
+                { "label": "K2f", "x": 15.25, "y": 2 },
                 { "label": "K30", "x": 0, "y": 3, "w": 1.75 },
-                { "label": "K32", "x": 1.75, "y": 3, "w": 1 },
-                { "label": "K33", "x": 2.75, "y": 3, "w": 1 },
-                { "label": "K34", "x": 3.75, "y": 3, "w": 1 },
-                { "label": "K35", "x": 4.75, "y": 3, "w": 1 },
-                { "label": "K36", "x": 5.75, "y": 3, "w": 1 },
-                { "label": "K37", "x": 6.75, "y": 3, "w": 1 },
-                { "label": "K38", "x": 7.75, "y": 3, "w": 1 },
-                { "label": "K39", "x": 8.75, "y": 3, "w": 1 },
-                { "label": "K3a", "x": 9.75, "y": 3, "w": 1 },
-                { "label": "K3b", "x": 10.75, "y": 3, "w": 1 },
-                { "label": "K3c", "x": 11.75, "y": 3, "w": 1 },
+                { "label": "K32", "x": 1.75, "y": 3 },
+                { "label": "K33", "x": 2.75, "y": 3 },
+                { "label": "K34", "x": 3.75, "y": 3 },
+                { "label": "K35", "x": 4.75, "y": 3 },
+                { "label": "K36", "x": 5.75, "y": 3 },
+                { "label": "K37", "x": 6.75, "y": 3 },
+                { "label": "K38", "x": 7.75, "y": 3 },
+                { "label": "K39", "x": 8.75, "y": 3 },
+                { "label": "K3a", "x": 9.75, "y": 3 },
+                { "label": "K3b", "x": 10.75, "y": 3 },
+                { "label": "K3c", "x": 11.75, "y": 3 },
                 { "label": "K3d", "x": 12.75, "y": 3, "w": 2.25 },
                 { "label": "K40", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K41", "x": 1.25, "y": 4, "w": 1 },
-                { "label": "K42", "x": 2.25, "y": 4, "w": 1 },
-                { "label": "K43", "x": 3.25, "y": 4, "w": 1 },
-                { "label": "K44", "x": 4.25, "y": 4, "w": 1 },
-                { "label": "K45", "x": 5.25, "y": 4, "w": 1 },
-                { "label": "K46", "x": 6.25, "y": 4, "w": 1 },
-                { "label": "K47", "x": 7.25, "y": 4, "w": 1 },
-                { "label": "K48", "x": 8.25, "y": 4, "w": 1 },
-                { "label": "K49", "x": 9.25, "y": 4, "w": 1 },
-                { "label": "K4a", "x": 10.25, "y": 4, "w": 1 },
-                { "label": "K4b", "x": 11.25, "y": 4, "w": 1 },
+                { "label": "K41", "x": 1.25, "y": 4 },
+                { "label": "K42", "x": 2.25, "y": 4 },
+                { "label": "K43", "x": 3.25, "y": 4 },
+                { "label": "K44", "x": 4.25, "y": 4 },
+                { "label": "K45", "x": 5.25, "y": 4 },
+                { "label": "K46", "x": 6.25, "y": 4 },
+                { "label": "K47", "x": 7.25, "y": 4 },
+                { "label": "K48", "x": 8.25, "y": 4 },
+                { "label": "K49", "x": 9.25, "y": 4 },
+                { "label": "K4a", "x": 10.25, "y": 4 },
+                { "label": "K4b", "x": 11.25, "y": 4 },
                 { "label": "K4d", "x": 12.25, "y": 4, "w": 1.75 },
-                { "label": "K4e", "x": 14.25, "y": 4.25, "w": 1 },
+                { "label": "K4e", "x": 14.25, "y": 4.25 },
                 { "label": "K50", "x": 0, "y": 5, "w": 1.25 },
                 { "label": "K51", "x": 1.25, "y": 5, "w": 1.25 },
                 { "label": "K52", "x": 2.5, "y": 5, "w": 1.25 },
                 { "label": "K56", "x": 3.75, "y": 5, "w": 6.25 },
                 { "label": "K5a", "x": 10, "y": 5, "w": 1.25 },
                 { "label": "K5b", "x": 11.25, "y": 5, "w": 1.25 },
-                { "label": "K5d", "x": 13.25, "y": 5.25, "w": 1 },
-                { "label": "K5e", "x": 14.25, "y": 5.25, "w": 1 },
-                { "label": "K5f", "x": 15.25, "y": 5.25, "w": 1 }
+                { "label": "K5d", "x": 13.25, "y": 5.25 },
+                { "label": "K5e", "x": 14.25, "y": 5.25 },
+                { "label": "K5f", "x": 15.25, "y": 5.25 }
             ]
         }
     }
diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h
index 8d01fe2faf..06591ce442 100644
--- a/keyboards/exclusive/e85/config.h
+++ b/keyboards/exclusive/e85/config.h
@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-//                         0   1   2   3   4   5   6   7   8   9   A
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 18
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -54,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json
index 0065b2b84c..8db1f0fb01 100644
--- a/keyboards/exclusive/e85/hotswap/info.json
+++ b/keyboards/exclusive/e85/hotswap/info.json
@@ -8,11 +8,19 @@
         "pid": "0xE851",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/info.json
index cda9f689cd..30860de5a7 100644
--- a/keyboards/exclusive/e85/soldered/info.json
+++ b/keyboards/exclusive/e85/soldered/info.json
@@ -8,11 +8,19 @@
         "pid": "0xE852",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h
index 24941ea169..b062e20b68 100644
--- a/keyboards/exent/config.h
+++ b/keyboards/exent/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6 }
-#define MATRIX_COL_PINS { D7, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A1, A0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 18
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/exent/exent.c b/keyboards/exent/exent.c
deleted file mode 100644
index 82066f7e85..0000000000
--- a/keyboards/exent/exent.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "exent.h"
diff --git a/keyboards/exent/exent.h b/keyboards/exent/exent.h
deleted file mode 100644
index bfb11c7384..0000000000
--- a/keyboards/exent/exent.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2019 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k6d, k53, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k52, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k51, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k50, \
-    k40, k41, k42,           k44, k45, k46,      k47, k48, k49, k4b, k4c, k4d \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k40, k41, k42, XXX, k44, k45, k46, k47, k48, k49, XXX, k4b, k4c, k4d }, \
-    { k50, k51, k52, k53, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k6d } \
-}
-
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k53, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k52, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k51, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k50, \
-    k40, k41, k42,                k45,           k47, k48, k49, k4b, k4c, k4d \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, k47, k48, k49, XXX, k4b, k4c, k4d }, \
-    { k50, k51, k52, k53, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_65_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k53, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k52, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k51, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k50, \
-    k40, k41, k42,                k45,           k47, k48, k49, k4b, k4c, k4d \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, k47, k48, k49, XXX, k4b, k4c, k4d }, \
-    { k50, k51, k52, k53, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/exent/info.json b/keyboards/exent/info.json
index 9aa80a4a11..9f0f3e3945 100644
--- a/keyboards/exent/info.json
+++ b/keyboards/exent/info.json
@@ -8,9 +8,17 @@
         "pid": "0x4558",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A1", "A0"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1",
         "num_lock": "D0",
@@ -22,236 +30,236 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [6, 13], "x": 14, "y": 0},
+                {"matrix": [5, 3], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [5, 2], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":2, "w":1.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [5, 1], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [5, 0], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":2.25},
-                {"x":6, "y":4, "w":1.25},
-                {"x":7.25, "y":4, "w":2.75},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"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": [4, 6], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 10, "y": 4},
+                {"matrix": [4, 8], "x": 11, "y": 4},
+                {"matrix": [4, 9], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [5, 3], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [5, 2], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 1], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [5, 0], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"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, 7], "x": 10, "y": 4},
+                {"matrix": [4, 8], "x": 11, "y": 4},
+                {"matrix": [4, 9], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [5, 3], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [5, 2], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [5, 1], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [5, 0], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"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, 7], "x": 10, "y": 4},
+                {"matrix": [4, 8], "x": 11, "y": 4},
+                {"matrix": [4, 9], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/exent/rules.mk b/keyboards/exent/rules.mk
index 4ff1bd90d5..e402cb508c 100644
--- a/keyboards/exent/rules.mk
+++ b/keyboards/exent/rules.mk
@@ -9,4 +9,3 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = i2c
diff --git a/keyboards/eyeohdesigns/babyv/babyv.c b/keyboards/eyeohdesigns/babyv/babyv.c
deleted file mode 100644
index 5a01ea2c91..0000000000
--- a/keyboards/eyeohdesigns/babyv/babyv.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Eye Oh! Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "babyv.h"
diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h
index 6da702919e..9df626ae72 100644
--- a/keyboards/eyeohdesigns/babyv/config.h
+++ b/keyboards/eyeohdesigns/babyv/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B5, D2, D5, D3 }
-#define MATRIX_COL_PINS { D0, D1, B4, D7, D6, D4, B0, B1, B2, F0, F1, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B7
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json
index 2a55943c78..b530951376 100644
--- a/keyboards/eyeohdesigns/babyv/info.json
+++ b/keyboards/eyeohdesigns/babyv/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "B4", "D7", "D6", "D4", "B0", "B1", "B2", "F0", "F1", "F4"],
+        "rows": ["B5", "D2", "D5", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/eyeohdesigns/sprh/config.h b/keyboards/eyeohdesigns/sprh/config.h
deleted file mode 100644
index 31b6d017ce..0000000000
--- a/keyboards/eyeohdesigns/sprh/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Eye Oh Designs
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MATRIX_ROW_PINS { B3, B7, D2, D5, D3 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, C6, B6, B5, B4, D7, D6, F7, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eyeohdesigns/sprh/info.json b/keyboards/eyeohdesigns/sprh/info.json
index bcef81b310..9d4c9cab64 100644
--- a/keyboards/eyeohdesigns/sprh/info.json
+++ b/keyboards/eyeohdesigns/sprh/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "F7", "D4"],
+        "rows": ["B3", "B7", "D2", "D5", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1", "resolution": 2}
diff --git a/keyboards/eyeohdesigns/sprh/sprh.c b/keyboards/eyeohdesigns/sprh/sprh.c
index 903e0c68e2..f73b463d79 100644
--- a/keyboards/eyeohdesigns/sprh/sprh.c
+++ b/keyboards/eyeohdesigns/sprh/sprh.c
@@ -14,17 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "sprh.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/sprh.h b/keyboards/eyeohdesigns/sprh/sprh.h
index 5a367131c5..0b895529d2 100644
--- a/keyboards/eyeohdesigns/sprh/sprh.h
+++ b/keyboards/eyeohdesigns/sprh/sprh.h
@@ -103,11 +103,11 @@
         k40, k41, k42, k44, k45, k46, k48, k49, k4b, k4c, k4d\
 ) \
 { \
-    {k00,   k01, k02, k03, k04,   k05,   k06, k07,   k08, k09, k0a,   k0b, k0c, k0d},\
-    {k10,   k11, k12, k13, k14,   k15,   k16, k17,   k18, k19, k1a,   k1b, k1c, k1d},\
-    {k20,   k21, k22, k23, k24,   k25,   k26, k27,   k28, k29, k2a,   k2b, k2c, k2d},\
-    {KC_NO, k31, k32, k33, k34,   k35,   k36, k37,   k38, k39, k3a,   k3b, k3c, k3d},\
-    {k40,   k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
+    {k00,   k01, k02, k03, k04, k05, k06, k07,   k08, k09, k0a,   k0b, k0c, k0d},\
+    {k10,   k11, k12, k13, k14, k15, k16, k17,   k18, k19, k1a,   k1b, k1c, k1d},\
+    {k20,   k21, k22, k23, k24, k25, k26, k27,   k28, k29, k2a,   k2b, k2c, k2d},\
+    {KC_NO, k31, k32, k33, k34, k35, k36, k37,   k38, k39, k3a,   k3b, k3c, k3d},\
+    {k40,   k41, k42, k43, k44, k45, k46, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
 }
 #define LAYOUT_bd5( \
         k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d,\
diff --git a/keyboards/eyeohdesigns/theboulevard/config.h b/keyboards/eyeohdesigns/theboulevard/config.h
index 081ab50216..6b392b99e1 100644
--- a/keyboards/eyeohdesigns/theboulevard/config.h
+++ b/keyboards/eyeohdesigns/theboulevard/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { F7, B1, E6, F0, F1 }
-#define MATRIX_COL_PINS { B0, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F6
 #define RGBLED_NUM 2
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/info.json
index 0a12742903..f1a09875c5 100644
--- a/keyboards/eyeohdesigns/theboulevard/info.json
+++ b/keyboards/eyeohdesigns/theboulevard/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["F7", "B1", "E6", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
         ]
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/eyeohdesigns/theboulevard/theboulevard.c b/keyboards/eyeohdesigns/theboulevard/theboulevard.c
index a2b40cd9e9..5671425698 100644
--- a/keyboards/eyeohdesigns/theboulevard/theboulevard.c
+++ b/keyboards/eyeohdesigns/theboulevard/theboulevard.c
@@ -15,17 +15,3 @@
  */
 
 #include "theboulevard.h" 
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/ez_maker/directpins/teensy_2/info.json b/keyboards/ez_maker/directpins/teensy_2/info.json
index 648703947f..0a8983d4d7 100644
--- a/keyboards/ez_maker/directpins/teensy_2/info.json
+++ b/keyboards/ez_maker/directpins/teensy_2/info.json
@@ -33,17 +33,17 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"B0", "matrix": [0, 0], "x":0, "y":1},                                                                                                       {"label":"F0", "matrix": [0, 1], "x":4, "y":1},
-                {"label":"B1", "matrix": [1, 0], "x":0, "y":2},                                                                                                       {"label":"F1", "matrix": [1, 1], "x":4, "y":2},
-                {"label":"B2", "matrix": [2, 0], "x":0, "y":3},                                                                                                       {"label":"F4", "matrix": [2, 1], "x":4, "y":3},
-                {"label":"B3", "matrix": [3, 0], "x":0, "y":4},                                                                                                       {"label":"F5", "matrix": [3, 1], "x":4, "y":4},
-                {"label":"B7", "matrix": [4, 0], "x":0, "y":5},                                                                                                       {"label":"F6", "matrix": [4, 1], "x":4, "y":5},
-                {"label":"D0", "matrix": [5, 0], "x":0, "y":6},                                                                                                       {"label":"F7", "matrix": [5, 1], "x":4, "y":6},
-                {"label":"D1", "matrix": [6, 0], "x":0, "y":7},                                                                                                       {"label":"B6", "matrix": [6, 1], "x":4, "y":7},
-                {"label":"D2", "matrix": [7, 0], "x":0, "y":8},                                                                                                       {"label":"B5", "matrix": [7, 1], "x":4, "y":8},
-                {"label":"D3", "matrix": [8, 0], "x":0, "y":9},                                                                                                      {"label":"B4", "matrix": [8, 1], "x":4, "y":9},
-                {"label":"C6", "matrix": [9, 0], "x":0, "y":10},                                                                                                      {"label":"D7", "matrix": [9, 1], "x":4, "y":10},
-                {"label":"C7", "matrix": [10, 0], "x":0, "y":11}, {"label":"D5", "matrix": [11, 0], "x":1, "y":11}, {"label":"D4", "matrix": [11, 1], "x":3, "y":11}, {"label":"D6", "matrix": [10, 1], "x":4, "y":11}
+                {"label":"B0", "matrix": [0, 0], "x":0, "y":0},                                                                                                       {"label":"F0", "matrix": [0, 1], "x":4, "y":0},
+                {"label":"B1", "matrix": [1, 0], "x":0, "y":1},                                                                                                       {"label":"F1", "matrix": [1, 1], "x":4, "y":1},
+                {"label":"B2", "matrix": [2, 0], "x":0, "y":2},                                                                                                       {"label":"F4", "matrix": [2, 1], "x":4, "y":2},
+                {"label":"B3", "matrix": [3, 0], "x":0, "y":3},                                                                                                       {"label":"F5", "matrix": [3, 1], "x":4, "y":3},
+                {"label":"B7", "matrix": [4, 0], "x":0, "y":4},                                                                                                       {"label":"F6", "matrix": [4, 1], "x":4, "y":4},
+                {"label":"D0", "matrix": [5, 0], "x":0, "y":5},                                                                                                       {"label":"F7", "matrix": [5, 1], "x":4, "y":5},
+                {"label":"D1", "matrix": [6, 0], "x":0, "y":6},                                                                                                       {"label":"B6", "matrix": [6, 1], "x":4, "y":6},
+                {"label":"D2", "matrix": [7, 0], "x":0, "y":7},                                                                                                       {"label":"B5", "matrix": [7, 1], "x":4, "y":7},
+                {"label":"D3", "matrix": [8, 0], "x":0, "y":8},                                                                                                       {"label":"B4", "matrix": [8, 1], "x":4, "y":8},
+                {"label":"C6", "matrix": [9, 0], "x":0, "y":9},                                                                                                       {"label":"D7", "matrix": [9, 1], "x":4, "y":9},
+                {"label":"C7", "matrix": [10, 0], "x":0, "y":10}, {"label":"D5", "matrix": [11, 0], "x":1, "y":10}, {"label":"D4", "matrix": [11, 1], "x":3, "y":10}, {"label":"D6", "matrix": [10, 1], "x":4, "y":10}
             ]
         }
     }
diff --git a/keyboards/ez_maker/directpins/teensy_2pp/info.json b/keyboards/ez_maker/directpins/teensy_2pp/info.json
index 5ff5a2e9eb..37781b4155 100644
--- a/keyboards/ez_maker/directpins/teensy_2pp/info.json
+++ b/keyboards/ez_maker/directpins/teensy_2pp/info.json
@@ -40,25 +40,25 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"B7", "matrix": [0, 0], "x":0, "y":1},                                                                                                       {"label":"B6", "matrix": [0, 3], "x":5, "y":1},
-                {"label":"D0", "matrix": [1, 0], "x":0, "y":2},                                                                                                       {"label":"B5", "matrix": [1, 3], "x":5, "y":2},
-                {"label":"D1", "matrix": [2, 0], "x":0, "y":3},                                                                                                       {"label":"B4", "matrix": [2, 3], "x":5, "y":3},
-                {"label":"D2", "matrix": [3, 0], "x":0, "y":4},                                                                                                       {"label":"B3", "matrix": [3, 3], "x":5, "y":4},
-                {"label":"D3", "matrix": [4, 0], "x":0, "y":5},                                                                                                       {"label":"B2", "matrix": [4, 3], "x":5, "y":5},
-                {"label":"D4", "matrix": [5, 0], "x":0, "y":6},   {"label":"E5", "matrix": [5, 1], "x":2, "y":6},   {"label":"E4", "matrix": [5, 2], "x":3, "y":6},   {"label":"B1", "matrix": [5, 3], "x":5, "y":6},
-                {"label":"D5", "matrix": [6, 0], "x":0, "y":7},                                                                                                       {"label":"B0", "matrix": [6, 3], "x":5, "y":7},
-                {"label":"D6", "matrix": [7, 0], "x":0, "y":8},                                                                                                       {"label":"E7", "matrix": [7, 3], "x":5, "y":8},
-                {"label":"D7", "matrix": [8, 0], "x":0, "y":9},                                                                                                       {"label":"E6", "matrix": [8, 3], "x":5, "y":9},
-                {"label":"E0", "matrix": [9, 0], "x":0, "y":10},                                                                                                      
-                {"label":"E1", "matrix": [10, 0], "x":0, "y":11}, 
-                {"label":"C0", "matrix": [11, 0], "x":0, "y":12},                                                                                                     {"label":"F0", "matrix": [11, 3], "x":5, "y":12},
-                {"label":"C1", "matrix": [12, 0], "x":0, "y":13}, {"label":"A4", "matrix": [12, 1], "x":2, "y":13}, {"label":"A0", "matrix": [12, 2], "x":3, "y":13}, {"label":"F1", "matrix": [12, 3], "x":5, "y":13},
-                {"label":"C2", "matrix": [13, 0], "x":0, "y":14}, {"label":"A5", "matrix": [13, 1], "x":2, "y":14}, {"label":"A1", "matrix": [13, 2], "x":3, "y":14}, {"label":"F2", "matrix": [13, 3], "x":5, "y":14},
-                {"label":"C3", "matrix": [14, 0], "x":0, "y":15}, {"label":"A6", "matrix": [14, 1], "x":2, "y":15}, {"label":"A2", "matrix": [14, 2], "x":3, "y":15}, {"label":"F3", "matrix": [14, 3], "x":5, "y":15},
-                {"label":"C4", "matrix": [15, 0], "x":0, "y":16}, {"label":"A7", "matrix": [15, 1], "x":2, "y":16}, {"label":"A3", "matrix": [15, 2], "x":3, "y":16}, {"label":"F4", "matrix": [15, 3], "x":5, "y":16},
-                {"label":"C5", "matrix": [16, 0], "x":0, "y":17},                                                                                                     {"label":"F5", "matrix": [16, 3], "x":5, "y":17},
-                {"label":"C6", "matrix": [17, 0], "x":0, "y":18},                                                                                                     {"label":"F6", "matrix": [17, 3], "x":5, "y":18},
-                {"label":"C7", "matrix": [18, 0], "x":0, "y":19},                                                                                                     {"label":"F7", "matrix": [18, 3], "x":5, "y":19}
+                {"label":"B7", "matrix": [0, 0], "x":0, "y":0},                                                                                                       {"label":"B6", "matrix": [0, 3], "x":5, "y":0},
+                {"label":"D0", "matrix": [1, 0], "x":0, "y":1},                                                                                                       {"label":"B5", "matrix": [1, 3], "x":5, "y":1},
+                {"label":"D1", "matrix": [2, 0], "x":0, "y":2},                                                                                                       {"label":"B4", "matrix": [2, 3], "x":5, "y":2},
+                {"label":"D2", "matrix": [3, 0], "x":0, "y":3},                                                                                                       {"label":"B3", "matrix": [3, 3], "x":5, "y":3},
+                {"label":"D3", "matrix": [4, 0], "x":0, "y":4},                                                                                                       {"label":"B2", "matrix": [4, 3], "x":5, "y":4},
+                {"label":"D4", "matrix": [5, 0], "x":0, "y":5},   {"label":"E5", "matrix": [5, 1], "x":2, "y":5},   {"label":"E4", "matrix": [5, 2], "x":3, "y":5},   {"label":"B1", "matrix": [5, 3], "x":5, "y":5},
+                {"label":"D5", "matrix": [6, 0], "x":0, "y":6},                                                                                                       {"label":"B0", "matrix": [6, 3], "x":5, "y":6},
+                {"label":"D6", "matrix": [7, 0], "x":0, "y":7},                                                                                                       {"label":"E7", "matrix": [7, 3], "x":5, "y":7},
+                {"label":"D7", "matrix": [8, 0], "x":0, "y":8},                                                                                                       {"label":"E6", "matrix": [8, 3], "x":5, "y":8},
+                {"label":"E0", "matrix": [9, 0], "x":0, "y":9},
+                {"label":"E1", "matrix": [10, 0], "x":0, "y":10},
+                {"label":"C0", "matrix": [11, 0], "x":0, "y":11},                                                                                                     {"label":"F0", "matrix": [11, 3], "x":5, "y":11},
+                {"label":"C1", "matrix": [12, 0], "x":0, "y":12}, {"label":"A4", "matrix": [12, 1], "x":2, "y":12}, {"label":"A0", "matrix": [12, 2], "x":3, "y":12}, {"label":"F1", "matrix": [12, 3], "x":5, "y":12},
+                {"label":"C2", "matrix": [13, 0], "x":0, "y":13}, {"label":"A5", "matrix": [13, 1], "x":2, "y":13}, {"label":"A1", "matrix": [13, 2], "x":3, "y":13}, {"label":"F2", "matrix": [13, 3], "x":5, "y":13},
+                {"label":"C3", "matrix": [14, 0], "x":0, "y":14}, {"label":"A6", "matrix": [14, 1], "x":2, "y":14}, {"label":"A2", "matrix": [14, 2], "x":3, "y":14}, {"label":"F3", "matrix": [14, 3], "x":5, "y":14},
+                {"label":"C4", "matrix": [15, 0], "x":0, "y":15}, {"label":"A7", "matrix": [15, 1], "x":2, "y":15}, {"label":"A3", "matrix": [15, 2], "x":3, "y":15}, {"label":"F4", "matrix": [15, 3], "x":5, "y":15},
+                {"label":"C5", "matrix": [16, 0], "x":0, "y":16},                                                                                                     {"label":"F5", "matrix": [16, 3], "x":5, "y":16},
+                {"label":"C6", "matrix": [17, 0], "x":0, "y":17},                                                                                                     {"label":"F6", "matrix": [17, 3], "x":5, "y":17},
+                {"label":"C7", "matrix": [18, 0], "x":0, "y":18},                                                                                                     {"label":"F7", "matrix": [18, 3], "x":5, "y":18}
             ]
         }
     }
diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/info.json
index 7598175554..18fdd7542a 100644
--- a/keyboards/ez_maker/directpins/teensy_32/info.json
+++ b/keyboards/ez_maker/directpins/teensy_32/info.json
@@ -34,19 +34,19 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "0", "matrix": [0, 0], "x": 0, "y": 1 },
-                { "label": "1", "matrix": [1, 0], "x": 0, "y": 2 },
-                { "label": "2", "matrix": [2, 0], "x": 0, "y": 3 },                                                           { "label": "23", "matrix": [2, 2], "x": 3, "y": 3 },
-                { "label": "3", "matrix": [3, 0], "x": 0, "y": 4 },    { "label": "24", "matrix": [3, 1], "x": 2, "y": 4 },   { "label": "22", "matrix": [3, 2], "x": 3, "y": 4 },
-                { "label": "4", "matrix": [4, 0], "x": 0, "y": 5 },    { "label": "25", "matrix": [4, 1], "x": 2, "y": 5 },   { "label": "21", "matrix": [4, 2], "x": 3, "y": 5 },
-                { "label": "5", "matrix": [5, 0], "x": 0, "y": 6 },                                                           { "label": "20", "matrix": [5, 2], "x": 3, "y": 6 },
-                { "label": "6", "matrix": [6, 0], "x": 0, "y": 7 },                                                           { "label": "19", "matrix": [6, 2], "x": 3, "y": 7 },
-                { "label": "7", "matrix": [7, 0], "x": 0, "y": 8 },                                                           { "label": "18", "matrix": [7, 2], "x": 3, "y": 8 },
-                { "label": "8", "matrix": [8, 0], "x": 0, "y": 9 },                                                           { "label": "17", "matrix": [8, 2], "x": 3, "y": 9 },
-                { "label": "9", "matrix": [9, 0], "x": 0, "y": 10 },                                                          { "label": "16", "matrix": [9, 2], "x": 3, "y": 10 },
-                { "label": "10", "matrix": [10, 0], "x": 0, "y": 11 },                                                        { "label": "15", "matrix": [10, 2], "x": 3, "y": 11 },
-                { "label": "11", "matrix": [11, 0], "x": 0, "y": 12 },                                                        { "label": "14", "matrix": [11, 2], "x": 3, "y": 12 },
-                { "label": "12", "matrix": [12, 0], "x": 0, "y": 13 }, { "label": "26", "matrix": [12, 1], "x": 2, "y": 13 }, { "label": "13", "matrix": [12, 2], "x": 3, "y": 13 }
+                { "label": "0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1", "matrix": [1, 0], "x": 0, "y": 1 },
+                { "label": "2", "matrix": [2, 0], "x": 0, "y": 2 },                                                           { "label": "23", "matrix": [2, 2], "x": 3, "y": 2 },
+                { "label": "3", "matrix": [3, 0], "x": 0, "y": 3 },    { "label": "24", "matrix": [3, 1], "x": 2, "y": 3 },   { "label": "22", "matrix": [3, 2], "x": 3, "y": 3 },
+                { "label": "4", "matrix": [4, 0], "x": 0, "y": 4 },    { "label": "25", "matrix": [4, 1], "x": 2, "y": 4 },   { "label": "21", "matrix": [4, 2], "x": 3, "y": 4 },
+                { "label": "5", "matrix": [5, 0], "x": 0, "y": 5 },                                                           { "label": "20", "matrix": [5, 2], "x": 3, "y": 5 },
+                { "label": "6", "matrix": [6, 0], "x": 0, "y": 6 },                                                           { "label": "19", "matrix": [6, 2], "x": 3, "y": 6 },
+                { "label": "7", "matrix": [7, 0], "x": 0, "y": 7 },                                                           { "label": "18", "matrix": [7, 2], "x": 3, "y": 7 },
+                { "label": "8", "matrix": [8, 0], "x": 0, "y": 8 },                                                           { "label": "17", "matrix": [8, 2], "x": 3, "y": 8 },
+                { "label": "9", "matrix": [9, 0], "x": 0, "y": 9 },                                                           { "label": "16", "matrix": [9, 2], "x": 3, "y": 9 },
+                { "label": "10", "matrix": [10, 0], "x": 0, "y": 10 },                                                        { "label": "15", "matrix": [10, 2], "x": 3, "y": 10 },
+                { "label": "11", "matrix": [11, 0], "x": 0, "y": 11 },                                                        { "label": "14", "matrix": [11, 2], "x": 3, "y": 11 },
+                { "label": "12", "matrix": [12, 0], "x": 0, "y": 12 }, { "label": "26", "matrix": [12, 1], "x": 2, "y": 12 }, { "label": "13", "matrix": [12, 2], "x": 3, "y": 12 }
             ]
         }
     }
diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/info.json
index fa43408c1e..4af0768e3c 100644
--- a/keyboards/ez_maker/directpins/teensy_lc/info.json
+++ b/keyboards/ez_maker/directpins/teensy_lc/info.json
@@ -34,19 +34,19 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "0", "matrix": [0, 0], "x": 0, "y": 1 },
-                { "label": "1", "matrix": [1, 0], "x": 0, "y": 2 },
-                { "label": "2", "matrix": [2, 0], "x": 0, "y": 3 },                                                           { "label": "23", "matrix": [2, 2], "x": 3, "y": 3 },
-                { "label": "3", "matrix": [3, 0], "x": 0, "y": 4 },    { "label": "24", "matrix": [3, 1], "x": 2, "y": 4 },   { "label": "22", "matrix": [3, 2], "x": 3, "y": 4 },
-                { "label": "4", "matrix": [4, 0], "x": 0, "y": 5 },    { "label": "25", "matrix": [4, 1], "x": 2, "y": 5 },   { "label": "21", "matrix": [4, 2], "x": 3, "y": 5 },
-                { "label": "5", "matrix": [5, 0], "x": 0, "y": 6 },                                                           { "label": "20", "matrix": [5, 2], "x": 3, "y": 6 },
-                { "label": "6", "matrix": [6, 0], "x": 0, "y": 7 },                                                           { "label": "19", "matrix": [6, 2], "x": 3, "y": 7 },
-                { "label": "7", "matrix": [7, 0], "x": 0, "y": 8 },                                                           { "label": "18", "matrix": [7, 2], "x": 3, "y": 8 },
-                { "label": "8", "matrix": [8, 0], "x": 0, "y": 9 },                                                           { "label": "17", "matrix": [8, 2], "x": 3, "y": 9 },
-                { "label": "9", "matrix": [9, 0], "x": 0, "y": 10 },                                                          { "label": "16", "matrix": [9, 2], "x": 3, "y": 10 },
-                { "label": "10", "matrix": [10, 0], "x": 0, "y": 11 },                                                        { "label": "15", "matrix": [10, 2], "x": 3, "y": 11 },
-                { "label": "11", "matrix": [11, 0], "x": 0, "y": 12 },                                                        { "label": "14", "matrix": [11, 2], "x": 3, "y": 12 },
-                { "label": "12", "matrix": [12, 0], "x": 0, "y": 13 }, { "label": "26", "matrix": [12, 1], "x": 2, "y": 13 }, { "label": "13", "matrix": [12, 2], "x": 3, "y": 13 }
+                { "label": "0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1", "matrix": [1, 0], "x": 0, "y": 1 },
+                { "label": "2", "matrix": [2, 0], "x": 0, "y": 2 },                                                           { "label": "23", "matrix": [2, 2], "x": 3, "y": 2 },
+                { "label": "3", "matrix": [3, 0], "x": 0, "y": 3 },    { "label": "24", "matrix": [3, 1], "x": 2, "y": 3 },   { "label": "22", "matrix": [3, 2], "x": 3, "y": 3 },
+                { "label": "4", "matrix": [4, 0], "x": 0, "y": 4 },    { "label": "25", "matrix": [4, 1], "x": 2, "y": 4 },   { "label": "21", "matrix": [4, 2], "x": 3, "y": 4 },
+                { "label": "5", "matrix": [5, 0], "x": 0, "y": 5 },                                                           { "label": "20", "matrix": [5, 2], "x": 3, "y": 5 },
+                { "label": "6", "matrix": [6, 0], "x": 0, "y": 6 },                                                           { "label": "19", "matrix": [6, 2], "x": 3, "y": 6 },
+                { "label": "7", "matrix": [7, 0], "x": 0, "y": 7 },                                                           { "label": "18", "matrix": [7, 2], "x": 3, "y": 7 },
+                { "label": "8", "matrix": [8, 0], "x": 0, "y": 8 },                                                           { "label": "17", "matrix": [8, 2], "x": 3, "y": 8 },
+                { "label": "9", "matrix": [9, 0], "x": 0, "y": 9 },                                                           { "label": "16", "matrix": [9, 2], "x": 3, "y": 9 },
+                { "label": "10", "matrix": [10, 0], "x": 0, "y": 10 },                                                        { "label": "15", "matrix": [10, 2], "x": 3, "y": 10 },
+                { "label": "11", "matrix": [11, 0], "x": 0, "y": 11 },                                                        { "label": "14", "matrix": [11, 2], "x": 3, "y": 11 },
+                { "label": "12", "matrix": [12, 0], "x": 0, "y": 12 }, { "label": "26", "matrix": [12, 1], "x": 2, "y": 12 }, { "label": "13", "matrix": [12, 2], "x": 3, "y": 12 }
             ]
         }
     }
diff --git a/keyboards/facew/config.h b/keyboards/facew/config.h
index 768b1b3551..ddc21dae30 100644
--- a/keyboards/facew/config.h
+++ b/keyboards/facew/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 16
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/facew/facew.c b/keyboards/facew/facew.c
deleted file mode 100644
index 373dbc6cd6..0000000000
--- a/keyboards/facew/facew.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "facew.h"
diff --git a/keyboards/facew/info.json b/keyboards/facew/info.json
index 6dcc9cb14d..672db4fb95 100644
--- a/keyboards/facew/info.json
+++ b/keyboards/facew/info.json
@@ -8,9 +8,17 @@
     "pid": "0x422D",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1",
     "num_lock": "D0"
diff --git a/keyboards/facew/rules.mk b/keyboards/facew/rules.mk
index 03a618b76d..166b3d3ec8 100644
--- a/keyboards/facew/rules.mk
+++ b/keyboards/facew/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
index fd84faa44d..4e5ad26583 100755
--- a/keyboards/fallacy/config.h
+++ b/keyboards/fallacy/config.h
@@ -15,16 +15,6 @@
  */
 #pragma once
 
-
-/* key matrix pins
- */
-#define MATRIX_ROW_PINS { B1, B2, B3, C6, C7 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, D5, D3 }
-
-/* COL2ROW or ROW2COL
- */
-#define DIODE_DIRECTION COL2ROW
-
 /* IS31FL3731 driver address (for status LEDs)
  * Using the default defines here, but using a custom implementation
  */
@@ -40,7 +30,6 @@
  */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/fallacy/fallacy.c b/keyboards/fallacy/fallacy.c
index 486084098a..05f68a0f99 100755
--- a/keyboards/fallacy/fallacy.c
+++ b/keyboards/fallacy/fallacy.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fallacy.h"
+#include "quantum.h"
 #include "indicators.h"
 
 void matrix_init_kb(void) {
diff --git a/keyboards/fallacy/fallacy.h b/keyboards/fallacy/fallacy.h
deleted file mode 100755
index b77c81fa1a..0000000000
--- a/keyboards/fallacy/fallacy.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2020 B. Fletcher (toraifu) <typefast@kyaa.gg>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* All keys in matrix active: 
- * - Split Backspace
- * - Split Right Shift
- */
-#define LAYOUT_alice_split_bs( \
-    K100,   K000, K001, K002, K003, K004, K005, K006,       K007, K008, K009, K010, K011, K012, K013, K014, \
-    K200,   K101, K102, K103, K104, K105, K106,       K107, K108, K109, K110, K111, K112, K113, K114, \
-    K300,   K201, K202, K203, K204, K205, K206,       K207, K208, K209, K210, K211, K212,       K214, \
-            K301, K302, K303, K304, K305, K306,       K307, K308, K309, K310, K311, K312, K313, K314, \
-            K401,       K403,       K405, K406,             K408,       K410,                   K414  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
-    { KC_NO, K401,  KC_NO, K403,  KC_NO, K405,  K406,  KC_NO, K408,  KC_NO, K410,  KC_NO, KC_NO, KC_NO, K414 }  \
-}
-
-/* Disable position 013 and 314 for:
- * - Full size Backspace
- * - Full size Right Shift
- */
-#define LAYOUT_alice( \
-    K100,   K000, K001, K002, K003, K004, K005, K006,       K007, K008, K009, K010, K011, K012,       K014, \
-    K200,   K101, K102, K103, K104, K105, K106,       K107, K108, K109, K110, K111, K112, K113, K114, \
-    K300,   K201, K202, K203, K204, K205, K206,       K207, K208, K209, K210, K211, K212,       K214, \
-            K301, K302, K303, K304, K305, K306,       K307, K308, K309, K310, K311, K312, K313, K314, \
-            K401,       K403,       K405, K406,             K408,       K410,                   K414  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
-    { KC_NO, K401,  KC_NO, K403,  KC_NO, K405,  K406,  KC_NO, K408,  KC_NO, K410,  KC_NO, KC_NO, KC_NO, K414 }  \
-}
-
-#define LAYOUT_default LAYOUT_alice
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json
index 65007a2ce9..d782d2d0fb 100644
--- a/keyboards/fallacy/info.json
+++ b/keyboards/fallacy/info.json
@@ -7,147 +7,181 @@
         "pid": "0xBFFA",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs",
+        "LAYOUT_default": "LAYOUT_alice"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"~", "x":1.75, "y":0},
-                {"label":"!", "x":2.75, "y":0},
-                {"label":"@", "x":3.75, "y":0},
-                {"label":"#", "x":4.75, "y":0},
-                {"label":"$", "x":5.75, "y":0},
-                {"label":"%", "x":6.75, "y":0},
-                {"label":"^", "x":7.75, "y":0},
-                {"label":"&", "x":10, "y":0},
-                {"label":"*", "x":11, "y":0},
-                {"label":"(", "x":12, "y":0},
-                {"label":")", "x":13, "y":0},
-                {"label":"_", "x":14, "y":0},
-                {"label":"+", "x":15, "y":0},
-                {"label":"|", "x":16, "y":0},
-                {"label":"~", "x":17, "y":0},
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":9.75, "y":1},
-                {"label":"U", "x":10.75, "y":1},
-                {"label":"I", "x":11.75, "y":1},
-                {"label":"O", "x":12.75, "y":1},
-                {"label":"P", "x":13.75, "y":1},
-                {"label":"{", "x":14.75, "y":1},
-                {"label":"}", "x":15.75, "y":1},
-                {"label":"Backspace", "x":16.75, "y":1, "w":1.5},
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Control", "x":1.25, "y":2, "w":1.75},
-                {"label":"A", "x":3, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":":", "x":14.25, "y":2}, 
-                {"label":"\"", "x":15.25, "y":2},
-                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-                {"label":"Shift", "x":1, "y":3, "w":2.25},
-                {"label":"Z", "x":3.25, "y":3},
-                {"label":"X", "x":4.25, "y":3}, 
-                {"label":"C", "x":5.25, "y":3}, 
-                {"label":"V", "x":6.25, "y":3}, 
-                {"label":"B", "x":7.25, "y":3}, 
-                {"label":"B", "x":10, "y":3},
-                {"label":"N", "x":11, "y":3},
-                {"label":"M", "x":12, "y":3},
-                {"label":"<", "x":13, "y":3},
-                {"label":">", "x":14, "y":3},
-                {"label":"?", "x":15, "y":3},
-                {"label":"Shift", "x":16, "y":3, "w":1.75}, 
-                {"label":"Fn1", "x":17.75, "y":3},
-                {"label":"Ctrl", "x":1, "y":4, "w":1.5}, 
-                {"label":"Alt", "x":4, "y":4, "w":1.5},
-                {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
-                {"label":"Fn2", "x":7.75, "y":4}, 
-                {"label":"RSpace", "x":10, "y":4, "w":2.75}, 
-                {"label":"RAlt", "x":12.75, "y":4, "w":1.5}, 
-                {"label":"RCtl", "x":17, "y":4, "w":1.5}
+                {"matrix": [1, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 14], "x": 17, "y": 0},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 15, "y": 3},
+                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"~", "x":1.75, "y":0},
-                {"label":"!", "x":2.75, "y":0},
-                {"label":"@", "x":3.75, "y":0},
-                {"label":"#", "x":4.75, "y":0},
-                {"label":"$", "x":5.75, "y":0},
-                {"label":"%", "x":6.75, "y":0},
-                {"label":"^", "x":7.75, "y":0},
-                {"label":"&", "x":10, "y":0},
-                {"label":"*", "x":11, "y":0},
-                {"label":"(", "x":12, "y":0},
-                {"label":")", "x":13, "y":0},
-                {"label":"_", "x":14, "y":0},
-                {"label":"+", "x":15, "y":0},
-                {"label":"Backspace", "x":16, "y":0, "w":2},
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":9.75, "y":1},
-                {"label":"U", "x":10.75, "y":1},
-                {"label":"I", "x":11.75, "y":1},
-                {"label":"O", "x":12.75, "y":1},
-                {"label":"P", "x":13.75, "y":1},
-                {"label":"{", "x":14.75, "y":1},
-                {"label":"}", "x":15.75, "y":1},
-                {"label":"Backspace", "x":16.75, "y":1, "w":1.5},
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Control", "x":1.25, "y":2, "w":1.75},
-                {"label":"A", "x":3, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":":", "x":14.25, "y":2}, 
-                {"label":"\"", "x":15.25, "y":2},
-                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-                {"label":"Shift", "x":1, "y":3, "w":2.25},
-                {"label":"Z", "x":3.25, "y":3},
-                {"label":"X", "x":4.25, "y":3}, 
-                {"label":"C", "x":5.25, "y":3}, 
-                {"label":"V", "x":6.25, "y":3}, 
-                {"label":"B", "x":7.25, "y":3}, 
-                {"label":"B", "x":10, "y":3},
-                {"label":"N", "x":11, "y":3},
-                {"label":"M", "x":12, "y":3},
-                {"label":"<", "x":13, "y":3},
-                {"label":">", "x":14, "y":3},
-                {"label":"?", "x":15, "y":3},
-                {"label":"Shift", "x":16, "y":3, "w":1.75}, 
-                {"label":"Fn1", "x":17.75, "y":3},
-                {"label":"Ctrl", "x":1, "y":4, "w":1.5}, 
-                {"label":"Alt", "x":4, "y":4, "w":1.5},
-                {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
-                {"label":"Fn2", "x":7.75, "y":4}, 
-                {"label":"RSpace", "x":10, "y":4, "w":2.75}, 
-                {"label":"RAlt", "x":12.75, "y":4, "w":1.5}, 
-                {"label":"RCtl", "x":17, "y":4, "w":1.5}
+                {"matrix": [1, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 15, "y": 3},
+                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/fc660c/keymaps/default_rgb/config.h b/keyboards/fc660c/keymaps/default_rgb/config.h
index 48a7a053cb..23745f3190 100644
--- a/keyboards/fc660c/keymaps/default_rgb/config.h
+++ b/keyboards/fc660c/keymaps/default_rgb/config.h
@@ -20,8 +20,7 @@
 
 /*RGB*/
 /*Repurpose Insert LED */
-#define RGB_DI_PIN B5
- #ifdef RGB_DI_PIN
+#define WS2812_DI_PIN B5
    #define RGBLED_NUM 16
    #define RGBLIGHT_DEFAULT_HUE 127
    #define RGBLIGHT_HUE_STEP 8
@@ -39,4 +38,3 @@
    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
    //#define RGBLIGHT_EFFECT_RGB_TEST
    //#define RGBLIGHT_EFFECT_ALTERNATING
- #endif
diff --git a/keyboards/fc660c/keymaps/via_rgb/config.h b/keyboards/fc660c/keymaps/via_rgb/config.h
index 48a7a053cb..23745f3190 100644
--- a/keyboards/fc660c/keymaps/via_rgb/config.h
+++ b/keyboards/fc660c/keymaps/via_rgb/config.h
@@ -20,8 +20,7 @@
 
 /*RGB*/
 /*Repurpose Insert LED */
-#define RGB_DI_PIN B5
- #ifdef RGB_DI_PIN
+#define WS2812_DI_PIN B5
    #define RGBLED_NUM 16
    #define RGBLIGHT_DEFAULT_HUE 127
    #define RGBLIGHT_HUE_STEP 8
@@ -39,4 +38,3 @@
    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
    //#define RGBLIGHT_EFFECT_RGB_TEST
    //#define RGBLIGHT_EFFECT_ALTERNATING
- #endif
diff --git a/keyboards/fc980c/config.h b/keyboards/fc980c/config.h
index 6356dd64ee..7c0c3b31a6 100644
--- a/keyboards/fc980c/config.h
+++ b/keyboards/fc980c/config.h
@@ -25,11 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 16
 
-// #define MATRIX_ROW_PINS { B0, B2, B4, B5, B6 }
-// #define MATRIX_COL_PINS { F5, B1, F0, F1, F4, B3, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-//#define DIODE_DIRECTION
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/fc980c/matrix.c b/keyboards/fc980c/matrix.c
index f5c3ec08c7..6ea605600d 100644
--- a/keyboards/fc980c/matrix.c
+++ b/keyboards/fc980c/matrix.c
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "matrix.h"
 #include "led.h"
 #include "avr/timer_avr.h"
-// #include QMK_KEYBOARD_H
-
 
 // Timer resolution check
 #if (1000000/TIMER_RAW_FREQ > 20)
diff --git a/keyboards/fearherbs1/blue_team_pad/info.json b/keyboards/fearherbs1/blue_team_pad/info.json
index 8cefdd23b1..37de66b477 100644
--- a/keyboards/fearherbs1/blue_team_pad/info.json
+++ b/keyboards/fearherbs1/blue_team_pad/info.json
@@ -33,28 +33,28 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 2.0 },
-                { "matrix": [1, 1], "x": 1.0, "y": 2.0 },
-                { "matrix": [1, 2], "x": 2.0, "y": 2.0 },
-                { "matrix": [1, 3], "x": 3.0, "y": 2.0 },
-                { "matrix": [1, 4], "x": 4.0, "y": 2.0 },
-                { "matrix": [2, 0], "x": 0.0, "y": 3.0 },
-                { "matrix": [2, 1], "x": 1.0, "y": 3.0 },
-                { "matrix": [2, 2], "x": 2.0, "y": 3.0 },
-                { "matrix": [2, 3], "x": 3.0, "y": 3.0 },
-                { "matrix": [2, 4], "x": 4.0, "y": 3.0 },
-                { "matrix": [3, 0], "x": 0.0, "y": 4.0 },
-                { "matrix": [3, 1], "x": 1.0, "y": 4.0 },
-                { "matrix": [3, 2], "x": 2.0, "y": 4.0 },
-                { "matrix": [3, 3], "x": 3.0, "y": 4.0 },
-                { "matrix": [3, 4], "x": 4.0, "y": 4.0 },
-                { "matrix": [4, 0], "x": 0.0, "y": 5.0 },
-                { "matrix": [4, 1], "x": 1.0, "y": 5.0 },
-                { "matrix": [4, 2], "x": 2.0, "y": 5.0 },
-                { "matrix": [4, 3], "x": 3.0, "y": 5.0 },
-                { "matrix": [4, 4], "x": 4.0, "y": 5.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 2 },
+                { "matrix": [1, 1], "x": 1, "y": 2 },
+                { "matrix": [1, 2], "x": 2, "y": 2 },
+                { "matrix": [1, 3], "x": 3, "y": 2 },
+                { "matrix": [1, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 0], "x": 0, "y": 3 },
+                { "matrix": [2, 1], "x": 1, "y": 3 },
+                { "matrix": [2, 2], "x": 2, "y": 3 },
+                { "matrix": [2, 3], "x": 3, "y": 3 },
+                { "matrix": [2, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 0], "x": 0, "y": 4 },
+                { "matrix": [3, 1], "x": 1, "y": 4 },
+                { "matrix": [3, 2], "x": 2, "y": 4 },
+                { "matrix": [3, 3], "x": 3, "y": 4 },
+                { "matrix": [3, 4], "x": 4, "y": 4 },
+                { "matrix": [4, 0], "x": 0, "y": 5 },
+                { "matrix": [4, 1], "x": 1, "y": 5 },
+                { "matrix": [4, 2], "x": 2, "y": 5 },
+                { "matrix": [4, 3], "x": 3, "y": 5 },
+                { "matrix": [4, 4], "x": 4, "y": 5 }
             ]
         }
     }
diff --git a/keyboards/feels/feels65/config.h b/keyboards/feels/feels65/config.h
deleted file mode 100644
index c102bf22e2..0000000000
--- a/keyboards/feels/feels65/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 Swiftrax <swiftrax@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-/* default pinout */
-#define MATRIX_ROW_PINS { D5, D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6, B0, B1, B2, B3 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/feels/feels65/feels65.c b/keyboards/feels/feels65/feels65.c
deleted file mode 100644
index dc8b7664ab..0000000000
--- a/keyboards/feels/feels65/feels65.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Swiftrax <swiftrax@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "feels65.h"
diff --git a/keyboards/feels/feels65/feels65.h b/keyboards/feels/feels65/feels65.h
deleted file mode 100644
index 21f5ab7188..0000000000
--- a/keyboards/feels/feels65/feels65.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright 2021 Swiftrax <swiftrax@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \
-    k40, k42, k43,                k46,           k4A, k4B,      k4D, k4E, k4F  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    {k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
-    {k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0F, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \
-    k40, k42, k43,                k46,           k4A, k4B,      k4D, k4E, k4F  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX, k0F }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
-    { k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \
-    k40, k42, k43,                k46,           k4A, k4B,      k4D, k4E, k4F  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
-    { k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0F, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2E, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \
-    k40, k42, k43,                k46,           k4A, k4B,      k4D, k4E, k4F  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX, k0F }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
-    { k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2E, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \
-    k40, k42, k43,                k46,           k4A, k4B,      k4D, k4E, k4F  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
-    { k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F }  \
-}
diff --git a/keyboards/feels/feels65/info.json b/keyboards/feels/feels65/info.json
index 3ccc6eca98..efa67dd33a 100644
--- a/keyboards/feels/feels65/info.json
+++ b/keyboards/feels/feels65/info.json
@@ -8,390 +8,395 @@
         "pid": "0xE965",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3"],
+        "rows": ["D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":2, "w":1.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/feker/ik75/config.h b/keyboards/feker/ik75/config.h
index d05ae4f3fe..a9914722fc 100644
--- a/keyboards/feker/ik75/config.h
+++ b/keyboards/feker/ik75/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, B7, D2, D3, D5, D4, D6, D7, B4, B5, B6, E2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/feker/ik75/info.json b/keyboards/feker/ik75/info.json
index 2107909b3e..a7819048e7 100644
--- a/keyboards/feker/ik75/info.json
+++ b/keyboards/feker/ik75/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1226",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "E2"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "C6", "pin_b": "C7", "resolution": 2}
diff --git a/keyboards/feker/ik75/rules.mk b/keyboards/feker/ik75/rules.mk
index 0bce6837a4..e086b6aaf8 100644
--- a/keyboards/feker/ik75/rules.mk
+++ b/keyboards/feker/ik75/rules.mk
@@ -17,7 +17,6 @@ SPACE_CADET_ENABLE = no
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 
 # Encoder enabled
 ENCODER_ENABLE = yes
diff --git a/keyboards/ferris/0_1/0_1.c b/keyboards/ferris/0_1/0_1.c
deleted file mode 100644
index dbdb0b4bdc..0000000000
--- a/keyboards/ferris/0_1/0_1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Pierre Chevalier <pierrechevalier83@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "0_1.h"
diff --git a/keyboards/ferris/0_1/0_1.h b/keyboards/ferris/0_1/0_1.h
deleted file mode 100644
index 2f58831df7..0000000000
--- a/keyboards/ferris/0_1/0_1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright 2020 Pierre Chevalier <pierrechevalier83@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-
-/*              left hand                           right hand      */
-#define LAYOUT_split_3x5_2(\
-    K0_0, K0_1, K0_2, K0_3, K0_4,       K0_5, K0_6, K0_7, K0_8, K0_9,\
-    K1_0, K1_1, K1_2, K1_3, K1_4,       K1_5, K1_6, K1_7, K1_8, K1_9,\
-    K2_0, K2_1, K2_2, K2_3, K2_4,       K2_5, K2_6, K2_7, K2_8, K2_9,\
-                        K3_3, K3_4,   K3_5, K3_6)\
-/* matrix positions */\
-{\
-    {K0_0,  K0_1,  K0_2,  K0_3,  K0_4},\
-    {K1_0,  K1_1,  K1_2,  K1_3,  K1_4},\
-    {K2_0,  K2_1,  K2_2,  K2_3,  K2_4},\
-    {KC_NO, KC_NO, KC_NO, K3_3,  K3_4},\
-	\
-	{K0_5,  K0_6,  K0_7,  K0_8,  K0_9},\
-	{K1_5,  K1_6,  K1_7,  K1_8,  K1_9},\
-	{K2_5,  K2_6,  K2_7,  K2_8,  K2_9},\
-	{K3_5,  K3_6, KC_NO,  KC_NO, KC_NO}\
-}
-
-// clang-format on
-#define LAYOUT LAYOUT_split_3x5_2
diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json
index 0738a0491f..5a65369f61 100644
--- a/keyboards/ferris/0_1/info.json
+++ b/keyboards/ferris/0_1/info.json
@@ -9,50 +9,53 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                {"x": 0, "y": 0.93},
-                {"x": 1, "y": 0.31},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.28},
-                {"x": 4, "y": 0.42},
+                {"matrix": [0, 0], "x": 0, "y": 0.93},
+                {"matrix": [0, 1], "x": 1, "y": 0.31},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.28},
+                {"matrix": [0, 4], "x": 4, "y": 0.42},
 
-                {"x": 7, "y": 0.42},
-                {"x": 8, "y": 0.28},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0.31},
-                {"x": 11, "y": 0.93},
+                {"matrix": [4, 0], "x": 7, "y": 0.42},
+                {"matrix": [4, 1], "x": 8, "y": 0.28},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0.31},
+                {"matrix": [4, 4], "x": 11, "y": 0.93},
 
-                {"x": 0, "y": 1.93},
-                {"x": 1, "y": 1.31},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.28},
-                {"x": 4, "y": 1.42},
+                {"matrix": [1, 0], "x": 0, "y": 1.93},
+                {"matrix": [1, 1], "x": 1, "y": 1.31},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.28},
+                {"matrix": [1, 4], "x": 4, "y": 1.42},
 
-                {"x": 7, "y": 1.42},
-                {"x": 8, "y": 1.28},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1.31},
-                {"x": 11, "y": 1.93},
+                {"matrix": [5, 0], "x": 7, "y": 1.42},
+                {"matrix": [5, 1], "x": 8, "y": 1.28},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 3], "x": 10, "y": 1.31},
+                {"matrix": [5, 4], "x": 11, "y": 1.93},
 
-                {"x": 0, "y": 2.93},
-                {"x": 1, "y": 2.31},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.28},
-                {"x": 4, "y": 2.42},
+                {"matrix": [2, 0], "x": 0, "y": 2.93},
+                {"matrix": [2, 1], "x": 1, "y": 2.31},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.28},
+                {"matrix": [2, 4], "x": 4, "y": 2.42},
 
-                {"x": 7, "y": 2.42},
-                {"x": 8, "y": 2.28},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2.31},
-                {"x": 11, "y": 2.93},
+                {"matrix": [6, 0], "x": 7, "y": 2.42},
+                {"matrix": [6, 1], "x": 8, "y": 2.28},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 3], "x": 10, "y": 2.31},
+                {"matrix": [6, 4], "x": 11, "y": 2.93},
 
-                {"x": 3.5, "y": 3.75},
-                {"x": 4.5, "y": 4},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.75},
+                {"matrix": [3, 4], "x": 4.5, "y": 4},
 
-                {"x": 6.5, "y": 4},
-                {"x": 7.5, "y": 3.75}
+                {"matrix": [7, 0], "x": 6.5, "y": 4},
+                {"matrix": [7, 1], "x": 7.5, "y": 3.75}
             ]
         }
     }
diff --git a/keyboards/ferris/0_1/matrix.c b/keyboards/ferris/0_1/matrix.c
index 0dfb150b6c..154a275d7a 100644
--- a/keyboards/ferris/0_1/matrix.c
+++ b/keyboards/ferris/0_1/matrix.c
@@ -23,7 +23,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * to repeating that information all over the place.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "i2c_master.h"
 
 extern i2c_status_t mcp23017_status;
diff --git a/keyboards/ferris/0_2/0_2.c b/keyboards/ferris/0_2/0_2.c
deleted file mode 100644
index 519961dd38..0000000000
--- a/keyboards/ferris/0_2/0_2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Pierre Chevalier <pierrechevalier83@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "0_2.h"
diff --git a/keyboards/ferris/0_2/0_2.h b/keyboards/ferris/0_2/0_2.h
deleted file mode 100644
index 2f58831df7..0000000000
--- a/keyboards/ferris/0_2/0_2.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright 2020 Pierre Chevalier <pierrechevalier83@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-
-/*              left hand                           right hand      */
-#define LAYOUT_split_3x5_2(\
-    K0_0, K0_1, K0_2, K0_3, K0_4,       K0_5, K0_6, K0_7, K0_8, K0_9,\
-    K1_0, K1_1, K1_2, K1_3, K1_4,       K1_5, K1_6, K1_7, K1_8, K1_9,\
-    K2_0, K2_1, K2_2, K2_3, K2_4,       K2_5, K2_6, K2_7, K2_8, K2_9,\
-                        K3_3, K3_4,   K3_5, K3_6)\
-/* matrix positions */\
-{\
-    {K0_0,  K0_1,  K0_2,  K0_3,  K0_4},\
-    {K1_0,  K1_1,  K1_2,  K1_3,  K1_4},\
-    {K2_0,  K2_1,  K2_2,  K2_3,  K2_4},\
-    {KC_NO, KC_NO, KC_NO, K3_3,  K3_4},\
-	\
-	{K0_5,  K0_6,  K0_7,  K0_8,  K0_9},\
-	{K1_5,  K1_6,  K1_7,  K1_8,  K1_9},\
-	{K2_5,  K2_6,  K2_7,  K2_8,  K2_9},\
-	{K3_5,  K3_6, KC_NO,  KC_NO, KC_NO}\
-}
-
-// clang-format on
-#define LAYOUT LAYOUT_split_3x5_2
diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json
index 5473c33295..28ed4f90e3 100644
--- a/keyboards/ferris/0_2/bling/info.json
+++ b/keyboards/ferris/0_2/bling/info.json
@@ -2,5 +2,8 @@
     "keyboard_name": "Ferris 0.2 - Bling",
     "usb": {
         "pid": "0x0002"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
     }
 }
diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk
index e04c8e4670..aad92997d0 100644
--- a/keyboards/ferris/0_2/bling/rules.mk
+++ b/keyboards/ferris/0_2/bling/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json
index f2b6b4b07b..c6584ecf01 100644
--- a/keyboards/ferris/0_2/info.json
+++ b/keyboards/ferris/0_2/info.json
@@ -7,50 +7,53 @@
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                {"x": 0, "y": 0.93},
-                {"x": 1, "y": 0.31},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.28},
-                {"x": 4, "y": 0.42},
+                {"matrix": [0, 0], "x": 0, "y": 0.93},
+                {"matrix": [0, 1], "x": 1, "y": 0.31},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.28},
+                {"matrix": [0, 4], "x": 4, "y": 0.42},
 
-                {"x": 7, "y": 0.42},
-                {"x": 8, "y": 0.28},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0.31},
-                {"x": 11, "y": 0.93},
+                {"matrix": [4, 0], "x": 7, "y": 0.42},
+                {"matrix": [4, 1], "x": 8, "y": 0.28},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0.31},
+                {"matrix": [4, 4], "x": 11, "y": 0.93},
 
-                {"x": 0, "y": 1.93},
-                {"x": 1, "y": 1.31},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.28},
-                {"x": 4, "y": 1.42},
+                {"matrix": [1, 0], "x": 0, "y": 1.93},
+                {"matrix": [1, 1], "x": 1, "y": 1.31},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.28},
+                {"matrix": [1, 4], "x": 4, "y": 1.42},
 
-                {"x": 7, "y": 1.42},
-                {"x": 8, "y": 1.28},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1.31},
-                {"x": 11, "y": 1.93},
+                {"matrix": [5, 0], "x": 7, "y": 1.42},
+                {"matrix": [5, 1], "x": 8, "y": 1.28},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 3], "x": 10, "y": 1.31},
+                {"matrix": [5, 4], "x": 11, "y": 1.93},
 
-                {"x": 0, "y": 2.93},
-                {"x": 1, "y": 2.31},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.28},
-                {"x": 4, "y": 2.42},
+                {"matrix": [2, 0], "x": 0, "y": 2.93},
+                {"matrix": [2, 1], "x": 1, "y": 2.31},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.28},
+                {"matrix": [2, 4], "x": 4, "y": 2.42},
 
-                {"x": 7, "y": 2.42},
-                {"x": 8, "y": 2.28},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2.31},
-                {"x": 11, "y": 2.93},
+                {"matrix": [6, 0], "x": 7, "y": 2.42},
+                {"matrix": [6, 1], "x": 8, "y": 2.28},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 3], "x": 10, "y": 2.31},
+                {"matrix": [6, 4], "x": 11, "y": 2.93},
 
-                {"x": 3.5, "y": 3.75},
-                {"x": 4.5, "y": 4},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.75},
+                {"matrix": [3, 4], "x": 4.5, "y": 4},
 
-                {"x": 6.5, "y": 4},
-                {"x": 7.5, "y": 3.75}
+                {"matrix": [7, 0], "x": 6.5, "y": 4},
+                {"matrix": [7, 1], "x": 7.5, "y": 3.75}
             ]
         }
     }
diff --git a/keyboards/ferris/0_2/matrix.c b/keyboards/ferris/0_2/matrix.c
index ff0e66d65c..af4b045eb8 100644
--- a/keyboards/ferris/0_2/matrix.c
+++ b/keyboards/ferris/0_2/matrix.c
@@ -23,9 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * to repeating that information all over the place.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "i2c_master.h"
-#include <print.h>
 
 extern i2c_status_t mcp23017_status;
 #define MCP23017_I2C_TIMEOUT 1000
diff --git a/keyboards/ferris/keymaps/bruun-baer/config.h b/keyboards/ferris/keymaps/bruun-baer/config.h
index 5c2377be1e..fce5cb445b 100644
--- a/keyboards/ferris/keymaps/bruun-baer/config.h
+++ b/keyboards/ferris/keymaps/bruun-baer/config.h
@@ -35,5 +35,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Pick good defaults for enabling homerow modifiers
 #define TAPPING_TERM 200
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define QUICK_TAP_TERM 0
diff --git a/keyboards/ferris/keymaps/default/config.h b/keyboards/ferris/keymaps/default/config.h
index b10555bb0d..1a4d15ff42 100644
--- a/keyboards/ferris/keymaps/default/config.h
+++ b/keyboards/ferris/keymaps/default/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Pick good defaults for enabling homerow modifiers
 #define TAPPING_TERM 200
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define QUICK_TAP_TERM 0
 
 // Underglow configuration
diff --git a/keyboards/ferris/keymaps/madhatter/config.h b/keyboards/ferris/keymaps/madhatter/config.h
index 79496ae750..65a14e6622 100644
--- a/keyboards/ferris/keymaps/madhatter/config.h
+++ b/keyboards/ferris/keymaps/madhatter/config.h
@@ -19,4 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Pick good defaults for enabling homerow modifiers
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ferris/keymaps/pierrec83/config.h b/keyboards/ferris/keymaps/pierrec83/config.h
index b10555bb0d..1a4d15ff42 100644
--- a/keyboards/ferris/keymaps/pierrec83/config.h
+++ b/keyboards/ferris/keymaps/pierrec83/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Pick good defaults for enabling homerow modifiers
 #define TAPPING_TERM 200
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define QUICK_TAP_TERM 0
 
 // Underglow configuration
diff --git a/keyboards/ferris/keymaps/via/config.h b/keyboards/ferris/keymaps/via/config.h
index 0d822891d1..4bdd1774a7 100644
--- a/keyboards/ferris/keymaps/via/config.h
+++ b/keyboards/ferris/keymaps/via/config.h
@@ -5,7 +5,6 @@
 
 // Good defaults for home row modifiers
 #define TAPPING_TERM 230
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // Handle master/slave detection on low cost Promicro
 #ifdef __AVR__
diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h
index 6f88b36fe7..23a2f15d99 100644
--- a/keyboards/ffkeebs/puca/config.h
+++ b/keyboards/ffkeebs/puca/config.h
@@ -17,16 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-                    //    0 , 1 , 2 , 3 , 4 , 5
-#define MATRIX_ROW_PINS { B4, E6, D7, B5, C6, F6}
-#define MATRIX_COL_PINS { F7, B1, B3, B2, B6}
-
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGBLIGHT_ENABLE
-    #define RGB_DI_PIN D4
-
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ffkeebs/puca/info.json b/keyboards/ffkeebs/puca/info.json
index 1cf9fd94eb..cc98fed5ef 100644
--- a/keyboards/ffkeebs/puca/info.json
+++ b/keyboards/ffkeebs/puca/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3", "B2", "B6"],
+        "rows": ["B4", "E6", "D7", "B5", "C6", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F4", "pin_b": "F5"}
         ]
     },
+    "ws2812": {
+        "pin": "D4"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layout_aliases": {
diff --git a/keyboards/ffkeebs/puca/puca.c b/keyboards/ffkeebs/puca/puca.c
index 21944a9e5d..9d9f739a6f 100644
--- a/keyboards/ffkeebs/puca/puca.c
+++ b/keyboards/ffkeebs/puca/puca.c
@@ -29,17 +29,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
     return true;
 }
 
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (clockwise) {
-        tap_code_delay(KC_VOLU, 10);  // Right
-    } else {
-        tap_code_delay(KC_VOLD, 10);  // Left
-    }
-    return false;
-}
-
-
 // OLED
 #ifdef OLED_ENABLE
 __attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
diff --git a/keyboards/ffkeebs/siris/config.h b/keyboards/ffkeebs/siris/config.h
deleted file mode 100644
index 3e03a4020e..0000000000
--- a/keyboards/ffkeebs/siris/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { D2, D1, D0, B7, B3, B2, F0, F1, F4, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ffkeebs/siris/info.json b/keyboards/ffkeebs/siris/info.json
index 5da5369b7c..c5449eab0b 100644
--- a/keyboards/ffkeebs/siris/info.json
+++ b/keyboards/ffkeebs/siris/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE96C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0", "B7", "B3", "B2", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["B5", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D5"},
diff --git a/keyboards/ffkeebs/siris/siris.c b/keyboards/ffkeebs/siris/siris.c
deleted file mode 100644
index cfd505773a..0000000000
--- a/keyboards/ffkeebs/siris/siris.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "siris.h"
diff --git a/keyboards/fjlabs/7vhotswap/7vhotswap.c b/keyboards/fjlabs/7vhotswap/7vhotswap.c
deleted file mode 100644
index 60a9dffc43..0000000000
--- a/keyboards/fjlabs/7vhotswap/7vhotswap.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "7vhotswap.h"
diff --git a/keyboards/fjlabs/7vhotswap/7vhotswap.h b/keyboards/fjlabs/7vhotswap/7vhotswap.h
deleted file mode 100644
index 741f7d53af..0000000000
--- a/keyboards/fjlabs/7vhotswap/7vhotswap.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* === All used matrix spots populated === */
-#define LAYOUT_75_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,           \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3E, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,           \
-    K50, K51, K52,           K55,                K59, K5A,      K5C, K5D, K5E       \
-) { \
-    { K00, K01, K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D, KC_NO },  \
-    { K10, K11, K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D, K1E   },  \
-    { K20, K21, K22, K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C,   K2D, K2E   },  \
-    { K30, K31, K32, K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, K3B,   K3C,   K3D, K3E   },  \
-    { K40, K41, K42, K43,   K44,   K45, K46,   K47,   K48,   K49, K4A, K4B,   KC_NO, K4D, KC_NO },  \
-    { K50, K51, K52, KC_NO, KC_NO, K55, KC_NO, KC_NO, KC_NO, K59, K5A, KC_NO, K5C,   K5D, K5E   }   \
-}
diff --git a/keyboards/fjlabs/7vhotswap/config.h b/keyboards/fjlabs/7vhotswap/config.h
index d4ec1bd96e..f66eda9bba 100644
--- a/keyboards/fjlabs/7vhotswap/config.h
+++ b/keyboards/fjlabs/7vhotswap/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *Ã¥
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B0, F4, F1, F7, F6, F5 }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE 
 
 /* Define RGB */
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json
index fa8becc815..6e026ecc58 100644
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ b/keyboards/fjlabs/7vhotswap/info.json
@@ -8,97 +8,107 @@
         "pid": "0x0014",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["B0", "F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_75_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Print Screen", "x":14, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25},
-                {"label":"Back Space", "x":14, "y":1.25},
-                {"label":"Delete", "x":15.25, "y":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Page Up", "x":15.25, "y":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"Page Down", "x":15.25, "y":3.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"\u2191", "x":14.25, "y":4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.5},
-                {"label":"MO(1)", "x":11.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":13.25, "y":5.5},
-                {"label":"\u2193", "x":14.25, "y":5.5},
-                {"label":"\u2192", "x":15.25, "y":5.5}
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/fjlabs/ad65/ad65.c b/keyboards/fjlabs/ad65/ad65.c
deleted file mode 100644
index 5714fa8b3c..0000000000
--- a/keyboards/fjlabs/ad65/ad65.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2021 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "ad65.h"
diff --git a/keyboards/fjlabs/ad65/config.h b/keyboards/fjlabs/ad65/config.h
index d4f1b424d0..084c49212c 100644
--- a/keyboards/fjlabs/ad65/config.h
+++ b/keyboards/fjlabs/ad65/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *Ã¥
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/info.json
index 5b6c320bd3..9f5b52bbfd 100644
--- a/keyboards/fjlabs/ad65/info.json
+++ b/keyboards/fjlabs/ad65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0010",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
diff --git a/keyboards/fjlabs/avalon/avalon.c b/keyboards/fjlabs/avalon/avalon.c
deleted file mode 100644
index 9f6b63e4c8..0000000000
--- a/keyboards/fjlabs/avalon/avalon.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2022 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "avalon.h"
diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h
index fe7128047c..77b127f06e 100644
--- a/keyboards/fjlabs/avalon/config.h
+++ b/keyboards/fjlabs/avalon/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *Ã¥
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
-#define MATRIX_COL_PINS { B0, F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json
index 2590221b60..69f4066f98 100644
--- a/keyboards/fjlabs/avalon/info.json
+++ b/keyboards/fjlabs/avalon/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0015",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
+    "ws2812": {
+        "pin": "D6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/fjlabs/bks65/bks65.c b/keyboards/fjlabs/bks65/bks65.c
deleted file mode 100644
index 4a8637462b..0000000000
--- a/keyboards/fjlabs/bks65/bks65.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <me@homedrop.org>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "bks65.h"
diff --git a/keyboards/fjlabs/bks65/bks65.h b/keyboards/fjlabs/bks65/bks65.h
deleted file mode 100644
index 1e53c540b5..0000000000
--- a/keyboards/fjlabs/bks65/bks65.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 <me@homedrop.org>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* BKS65 Keymap Definitions */
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B, K0C,   K0D,   K0E }, \
-    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B, K1C,   K1D,   K1E }, \
-    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B, K2C,   KC_NO, K2E }, \
-    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, K3B, KC_NO, K3D,   K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C,   K4D,   K4E }  \
-}
diff --git a/keyboards/fjlabs/bks65/config.h b/keyboards/fjlabs/bks65/config.h
index 0739e5a634..3b205ce76f 100644
--- a/keyboards/fjlabs/bks65/config.h
+++ b/keyboards/fjlabs/bks65/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN B0
 #define RGBLED_NUM 24
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/info.json
index 6b4ef9e95f..7b468da941 100644
--- a/keyboards/fjlabs/bks65/info.json
+++ b/keyboards/fjlabs/bks65/info.json
@@ -8,87 +8,95 @@
         "pid": "0x1001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"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},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/fjlabs/bks65solder/bks65solder.c b/keyboards/fjlabs/bks65solder/bks65solder.c
deleted file mode 100644
index 0ebf9000df..0000000000
--- a/keyboards/fjlabs/bks65solder/bks65solder.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <me@homedrop.org>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "bks65solder.h"
diff --git a/keyboards/fjlabs/bks65solder/bks65solder.h b/keyboards/fjlabs/bks65solder/bks65solder.h
deleted file mode 100644
index 36b4ea73e1..0000000000
--- a/keyboards/fjlabs/bks65solder/bks65solder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Copyright 2020 <me@homedrop.org>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* BKS65 Solder Solder Keymap Definitions */
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, K3D, K3E, \
-    K40, K41, K42,           K45, K46, K48,           K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03,   K04,   K05, K06, K07,   K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13,   K14,   K15, K16, K17,   K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23,   K24,   K25, K26, K27,   K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33,   K34,   K35, K36, K37,   K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO, K45, K46, KC_NO, K48, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09, K0A, K0B, K0C, K0D,   K0E }, \
-    { K10, K11,   K12, K13,   K14,   K15,   K16, K17,   K18,   K19, K1A, K1B, K1C, K1D,   K1E }, \
-    { K20, K21,   K22, K23,   K24,   K25,   K26, K27,   K28,   K29, K2A, K2B, K2C, KC_NO, K2E }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39, K3A, K3B, K3C, K3D,   K3E }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D,   K4E }  \
-}
diff --git a/keyboards/fjlabs/bks65solder/config.h b/keyboards/fjlabs/bks65solder/config.h
index 0739e5a634..3b205ce76f 100644
--- a/keyboards/fjlabs/bks65solder/config.h
+++ b/keyboards/fjlabs/bks65solder/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN B0
 #define RGBLED_NUM 24
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/info.json
index 1c20963164..27c3ece3ba 100644
--- a/keyboards/fjlabs/bks65solder/info.json
+++ b/keyboards/fjlabs/bks65solder/info.json
@@ -8,164 +8,172 @@
         "pid": "0x0099",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6, "y": 4, "w": 1.25},
-                {"x": 7.25, "y": 4, "w": 2.75},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/fjlabs/bolsa65/bolsa65.c b/keyboards/fjlabs/bolsa65/bolsa65.c
index 1d094ac8eb..1c65ca1a3d 100644
--- a/keyboards/fjlabs/bolsa65/bolsa65.c
+++ b/keyboards/fjlabs/bolsa65/bolsa65.c
@@ -11,7 +11,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
-#include "bolsa65.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     // Initialize indicator LEDs to output
diff --git a/keyboards/fjlabs/bolsa65/bolsa65.h b/keyboards/fjlabs/bolsa65/bolsa65.h
deleted file mode 100644
index 24325d0f19..0000000000
--- a/keyboards/fjlabs/bolsa65/bolsa65.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 <me@homedrop.org>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* Bolsa65 Keymap Definitions */
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
-    K40, K41, K42,      K44,                     K49, K4A,      K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03,   K04,   K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,   K0E }, \
-    { K10, K11, K12, K13,   K14,   K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D,   K1E }, \
-    { K20, K21, K22, K23,   K24,   K25,   K26,   K27,   K28,   K29, K2A, K2B,   K2C,   KC_NO, K2E }, \
-    { K30, K31, K32, K33,   K34,   K35,   K36,   K37,   K38,   K39, K3A, K3B,   KC_NO, K3D,   K3E }, \
-    { K40, K41, K42, KC_NO, K44,   KC_NO, KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C,   K4D,   K4E }  \
-}
diff --git a/keyboards/fjlabs/bolsa65/config.h b/keyboards/fjlabs/bolsa65/config.h
index 250162df4a..990e5335c3 100644
--- a/keyboards/fjlabs/bolsa65/config.h
+++ b/keyboards/fjlabs/bolsa65/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F1, F0, F6, F5, F4  }
-#define MATRIX_COL_PINS { C7, B1, B2, B3, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/fjlabs/bolsa65/info.json b/keyboards/fjlabs/bolsa65/info.json
index 023cbeb592..2f53b237d2 100644
--- a/keyboards/fjlabs/bolsa65/info.json
+++ b/keyboards/fjlabs/bolsa65/info.json
@@ -8,83 +8,88 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["F1", "F0", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"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},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/fjlabs/kf87/config.h b/keyboards/fjlabs/kf87/config.h
index e5b70cc14c..9d09aa6716 100644
--- a/keyboards/fjlabs/kf87/config.h
+++ b/keyboards/fjlabs/kf87/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *Ã¥
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B4, B5, B6, C0, E1, E0 }
-#define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB */
-#define RGB_DI_PIN C2
 #define RGBLED_NUM 87
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json
index 6f783e6476..308438e0ce 100644
--- a/keyboards/fjlabs/kf87/info.json
+++ b/keyboards/fjlabs/kf87/info.json
@@ -8,107 +8,123 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C4",
         "scroll_lock": "C6"
     },
+    "ws2812": {
+        "pin": "C2"
+    },
     "processor": "at90usb646",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_tkl_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
 
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25, "w": 2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"SQ", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/fjlabs/kf87/kf87.c b/keyboards/fjlabs/kf87/kf87.c
deleted file mode 100644
index 77ddbfe7d5..0000000000
--- a/keyboards/fjlabs/kf87/kf87.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "kf87.h"
diff --git a/keyboards/fjlabs/kf87/kf87.h b/keyboards/fjlabs/kf87/kf87.h
deleted file mode 100644
index 5c17e2025b..0000000000
--- a/keyboards/fjlabs/kf87/kf87.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* === All used matrix spots populated === */
-#define LAYOUT_tkl_all( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,           K4F,      \
-    K50, K51, K52,           K55,                K59, K5A, K5B,      K5D, K5E, K5F, K5G  \
-) { \
-    { K00, KC_NO, K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, K3B,   KC_NO, K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, K41,   K42, K43,   K44,   K45, K46,   K47,   K48,   K49, K4A, KC_NO, K4C,   KC_NO, KC_NO, K4F,   KC_NO }, \
-    { K50, K51,   K52, KC_NO, KC_NO, K55, KC_NO, KC_NO, KC_NO, K59, K5A, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G   } \
-}
diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h
index 4c824ca7b6..5fa5e84acd 100644
--- a/keyboards/fjlabs/kyuu/config.h
+++ b/keyboards/fjlabs/kyuu/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define Badge RGB */
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json
index 50f60e805e..058cb4ea23 100644
--- a/keyboards/fjlabs/kyuu/info.json
+++ b/keyboards/fjlabs/kyuu/info.json
@@ -8,83 +8,91 @@
         "pid": "0x1012",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_65_ansi_blocker_badge": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/fjlabs/kyuu/kyuu.c b/keyboards/fjlabs/kyuu/kyuu.c
deleted file mode 100644
index 9de177c600..0000000000
--- a/keyboards/fjlabs/kyuu/kyuu.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2021 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "kyuu.h"
diff --git a/keyboards/fjlabs/kyuu/kyuu.h b/keyboards/fjlabs/kyuu/kyuu.h
deleted file mode 100644
index 865708eaf5..0000000000
--- a/keyboards/fjlabs/kyuu/kyuu.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* BKS65 Keymap Definitions */
-#define LAYOUT_65_ansi_blocker_badge( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09,   K0A, K0B, K0C, K0D,   K0E }, \
-    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19,   K1A, K1B, K1C, K1D,   K1E }, \
-    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29,   K2A, K2B, K2C, KC_NO, K2E }, \
-    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39,   K3A, K3B, K3C, K3D,   K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D,   K4E }  \
-}
diff --git a/keyboards/fjlabs/ldk65/config.h b/keyboards/fjlabs/ldk65/config.h
index 54fd6cf4a5..990e5335c3 100644
--- a/keyboards/fjlabs/ldk65/config.h
+++ b/keyboards/fjlabs/ldk65/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/info.json
index 4674959220..e8616b291b 100644
--- a/keyboards/fjlabs/ldk65/info.json
+++ b/keyboards/fjlabs/ldk65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
@@ -17,78 +22,78 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"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},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/fjlabs/ldk65/ldk65.c b/keyboards/fjlabs/ldk65/ldk65.c
deleted file mode 100644
index ed4e5bc681..0000000000
--- a/keyboards/fjlabs/ldk65/ldk65.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <me@homedrop.org>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "ldk65.h"
diff --git a/keyboards/fjlabs/ldk65/ldk65.h b/keyboards/fjlabs/ldk65/ldk65.h
deleted file mode 100644
index 1e53c540b5..0000000000
--- a/keyboards/fjlabs/ldk65/ldk65.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 <me@homedrop.org>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* BKS65 Keymap Definitions */
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B, K0C,   K0D,   K0E }, \
-    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B, K1C,   K1D,   K1E }, \
-    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B, K2C,   KC_NO, K2E }, \
-    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, K3B, KC_NO, K3D,   K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C,   K4D,   K4E }  \
-}
diff --git a/keyboards/fjlabs/midway60/config.h b/keyboards/fjlabs/midway60/config.h
index 29edca2dd9..9f45958564 100644
--- a/keyboards/fjlabs/midway60/config.h
+++ b/keyboards/fjlabs/midway60/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/info.json
index de55690bfc..0a9f4d5fdb 100644
--- a/keyboards/fjlabs/midway60/info.json
+++ b/keyboards/fjlabs/midway60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
diff --git a/keyboards/fjlabs/midway60/midway60.c b/keyboards/fjlabs/midway60/midway60.c
deleted file mode 100644
index 10d8088a29..0000000000
--- a/keyboards/fjlabs/midway60/midway60.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "midway60.h"
diff --git a/keyboards/fjlabs/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h
index 708ad1d193..291cc75824 100644
--- a/keyboards/fjlabs/mk61rgbansi/config.h
+++ b/keyboards/fjlabs/mk61rgbansi/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 64
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json
index 649afd6e36..a05a01cb9e 100644
--- a/keyboards/fjlabs/mk61rgbansi/info.json
+++ b/keyboards/fjlabs/mk61rgbansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1011",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.c b/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.c
deleted file mode 100644
index 5bf82ad443..0000000000
--- a/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "mk61rgbansi.h"
diff --git a/keyboards/fjlabs/peaker/config.h b/keyboards/fjlabs/peaker/config.h
index 420a435746..13c17d597d 100644
--- a/keyboards/fjlabs/peaker/config.h
+++ b/keyboards/fjlabs/peaker/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *Ã¥
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B5, B6, C0, E1, E0 }
-#define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/info.json
index fc4bb596f7..2d9e806101 100644
--- a/keyboards/fjlabs/peaker/info.json
+++ b/keyboards/fjlabs/peaker/info.json
@@ -8,88 +8,98 @@
         "pid": "0x0020",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "at90usb646",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_tkl_all": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Back Space", "x":13, "y":0},
-                {"label":"Back Space", "x":14, "y":0},
-                {"label":"Insert", "x":15.25, "y":0},
-                {"label":"Home", "x":16.25, "y":0},
-                {"label":"PgUp", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [1, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [2, 0], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":1},
-                {"label":"End", "x":16.25, "y":1},
-                {"label":"PgDn", "x":17.25, "y":1},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"SQ", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Shift", "x":14, "y":3},
-                {"label":"\u2191", "x":16.25, "y":3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Win", "x":11.25, "y":4, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":4},
-                {"label":"\u2193", "x":16.25, "y":4},
-                {"label":"\u2192", "x":17.25, "y":4}
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/fjlabs/peaker/peaker.c b/keyboards/fjlabs/peaker/peaker.c
deleted file mode 100644
index 2c8830a731..0000000000
--- a/keyboards/fjlabs/peaker/peaker.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2022 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "peaker.h"
diff --git a/keyboards/fjlabs/peaker/peaker.h b/keyboards/fjlabs/peaker/peaker.h
deleted file mode 100644
index a1f53a87d6..0000000000
--- a/keyboards/fjlabs/peaker/peaker.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2022 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* === All used matrix spots populated === */
-#define LAYOUT_tkl_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,                \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D,      K3F,      \
-    K40, K41, K42,           K45,                K49, K4A, K4B,      K4D, K4E, K4F, K4G  \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K21,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C,   K2D,   KC_NO, KC_NO, KC_NO }, \
-    { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, KC_NO, K3C,   K3D,   KC_NO, K3F,   KC_NO }, \
-    { K40, K41,   K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B,   KC_NO, K4D,   K4E,   K4F,   K4G   } \
-}
diff --git a/keyboards/fjlabs/polaris/config.h b/keyboards/fjlabs/polaris/config.h
index ded4e18996..9f45958564 100644
--- a/keyboards/fjlabs/polaris/config.h
+++ b/keyboards/fjlabs/polaris/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/info.json
index 730798ac06..3c1477a1d5 100644
--- a/keyboards/fjlabs/polaris/info.json
+++ b/keyboards/fjlabs/polaris/info.json
@@ -8,6 +8,11 @@
         "pid": "0x9001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
diff --git a/keyboards/fjlabs/polaris/polaris.c b/keyboards/fjlabs/polaris/polaris.c
deleted file mode 100644
index ff9357769c..0000000000
--- a/keyboards/fjlabs/polaris/polaris.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "polaris.h"
diff --git a/keyboards/fjlabs/ready100/config.h b/keyboards/fjlabs/ready100/config.h
index 6294876072..a7d4e33245 100644
--- a/keyboards/fjlabs/ready100/config.h
+++ b/keyboards/fjlabs/ready100/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 64
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/info.json
index b53457010f..30c46c550f 100644
--- a/keyboards/fjlabs/ready100/info.json
+++ b/keyboards/fjlabs/ready100/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/fjlabs/ready100/ready100.c b/keyboards/fjlabs/ready100/ready100.c
deleted file mode 100644
index 6791a75697..0000000000
--- a/keyboards/fjlabs/ready100/ready100.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "ready100.h"
diff --git a/keyboards/fjlabs/sinanju/config.h b/keyboards/fjlabs/sinanju/config.h
index 56bd139ab3..13c17d597d 100644
--- a/keyboards/fjlabs/sinanju/config.h
+++ b/keyboards/fjlabs/sinanju/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/info.json
index 739fb32884..3baa5504bb 100644
--- a/keyboards/fjlabs/sinanju/info.json
+++ b/keyboards/fjlabs/sinanju/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1022",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
diff --git a/keyboards/fjlabs/sinanju/sinanju.c b/keyboards/fjlabs/sinanju/sinanju.c
deleted file mode 100644
index 2c84310ea5..0000000000
--- a/keyboards/fjlabs/sinanju/sinanju.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2022 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "sinanju.h"
diff --git a/keyboards/fjlabs/sinanjuwk/config.h b/keyboards/fjlabs/sinanjuwk/config.h
index 56bd139ab3..13c17d597d 100644
--- a/keyboards/fjlabs/sinanjuwk/config.h
+++ b/keyboards/fjlabs/sinanjuwk/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/info.json
index 3a5fcbec19..c92a647796 100644
--- a/keyboards/fjlabs/sinanjuwk/info.json
+++ b/keyboards/fjlabs/sinanjuwk/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1023",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
diff --git a/keyboards/fjlabs/sinanjuwk/sinanjuwk.c b/keyboards/fjlabs/sinanjuwk/sinanjuwk.c
deleted file mode 100644
index e6af5203ad..0000000000
--- a/keyboards/fjlabs/sinanjuwk/sinanjuwk.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2022 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "sinanjuwk.h"
diff --git a/keyboards/fjlabs/solanis/config.h b/keyboards/fjlabs/solanis/config.h
index 6a022cc81c..abb13aa778 100644
--- a/keyboards/fjlabs/solanis/config.h
+++ b/keyboards/fjlabs/solanis/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *Ã¥
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B4, B5, B6, C0, E1, E0 }
-#define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB */
-#define RGB_DI_PIN B7
 #define RGBLED_NUM 24
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json
index f4df560aed..d645a1fd25 100644
--- a/keyboards/fjlabs/solanis/info.json
+++ b/keyboards/fjlabs/solanis/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0017",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B7"
+    },
     "processor": "at90usb646",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/fjlabs/solanis/solanis.c b/keyboards/fjlabs/solanis/solanis.c
deleted file mode 100644
index 3104ff485e..0000000000
--- a/keyboards/fjlabs/solanis/solanis.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2022 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "solanis.h"
diff --git a/keyboards/fjlabs/swordfish/config.h b/keyboards/fjlabs/swordfish/config.h
index 0940cefc5e..aceaf3cd5b 100644
--- a/keyboards/fjlabs/swordfish/config.h
+++ b/keyboards/fjlabs/swordfish/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *Ã¥
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B0, B1, C7, C6, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B2, B3, B7, B5, B4, D7, D6, D4, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE 
 
 /* Define RGB */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json
index 4d9bffdf2f..98fb7f6f49 100644
--- a/keyboards/fjlabs/swordfish/info.json
+++ b/keyboards/fjlabs/swordfish/info.json
@@ -8,11 +8,94 @@
         "pid": "0x0024",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B2", "B3", "B7", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["B0", "B1", "C7", "C6", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_alice_all": {
-            "layout": [{"x":18.33, "y":0.142}, {"x":2.37, "y":0.27}, {"x":3.37, "y":0.27}, {"x":14.13, "y":0.27}, {"x":15.13, "y":0.27}, {"x":17.13, "y":0.27}, {"x":16.13, "y":0.27}, {"x":18.45, "y":1.142}, {"x":2.24, "y":1.28, "w":1.5}, {"x":3.74, "y":1.28}, {"x":13.75, "y":1.28}, {"x":14.75, "y":1.28}, {"x":15.75, "y":1.28}, {"x":16.75, "y":1.28, "w":1.5}, {"x":18.61, "y":2.142}, {"x":2.1, "y":2.28, "w":1.75}, {"x":3.85, "y":2.28}, {"x":14.16, "y":2.28}, {"x":15.16, "y":2.28}, {"x":16.16, "y":2.28, "w":2.25}, {"x":1.95, "y":3.28, "w":2.25}, {"x":4.2, "y":3.28}, {"x":13.81, "y":3.28}, {"x":14.81, "y":3.28}, {"x":15.81, "y":3.28, "w":1.75}, {"x":17.77, "y":3.48}, {"x":1.95, "y":4.28, "w":1.25}, {"x":3.2, "y":4.28, "w":1.25}, {"x":14.06, "y":4.28, "w":1.25}, {"x":15.31, "y":4.28, "w":1.25}, {"x":16.77, "y":4.475}, {"x":17.77, "y":4.475}, {"x":18.77, "y":4.475}, {"x":0, "y":5.28}, {"x":1, "y":5.28}, {"x":2, "y":5.28}, {"x":3, "y":5.28}, {"x":4, "y":5.28}, {"x":0.5, "y":6.28}, {"x":1.5, "y":6.28}, {"x":2.5, "y":6.28}, {"x":3.5, "y":6.28}, {"x":0.75, "y":7.28}, {"x":1.75, "y":7.28}, {"x":2.75, "y":7.28}, {"x":3.75, "y":7.28}, {"x":1.25, "y":8.28}, {"x":2.25, "y":8.28}, {"x":3.25, "y":8.28}, {"x":4.25, "y":8.28}, {"x":1.25, "y":9.28, "w":1.25}, {"x":2.5, "y":9.28, "w":2.75}, {"x":-4.5, "y":10.08}, {"x":-3.5, "y":10.08}, {"x":-2.5, "y":10.08}, {"x":-1.5, "y":10.08}, {"x":-5.0, "y":11.08}, {"x":-4, "y":11.08}, {"x":-3.0, "y":11.08}, {"x":-2, "y":11.08}, {"x":-4.75, "y":12.08}, {"x":-3.75, "y":12.08}, {"x":-2.75, "y":12.08}, {"x":-1.75, "y":12.08}, {"x":-5.25, "y":13.08}, {"x":-4.25, "y":13.08}, {"x":-3.25, "y":13.08}, {"x":-2.25, "y":13.08}, {"x":-5.25, "y":14.08, "w":2.25}, {"x":-3.0, "y":14.08, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [1, 0], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 13], "x": 13.25, "y": 2},
+                {"matrix": [2, 14], "x": 14.25, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3, "w": 1.5},
+                {"matrix": [4, 0], "x": 15.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 4.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 8, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.75, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.75, "y": 4.25}
+            ]
         }
     }
 }
diff --git a/keyboards/fjlabs/swordfish/swordfish.c b/keyboards/fjlabs/swordfish/swordfish.c
deleted file mode 100644
index a8689fefe8..0000000000
--- a/keyboards/fjlabs/swordfish/swordfish.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2022 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "swordfish.h"
diff --git a/keyboards/fjlabs/swordfish/swordfish.h b/keyboards/fjlabs/swordfish/swordfish.h
deleted file mode 100644
index 0b2e8acc62..0000000000
--- a/keyboards/fjlabs/swordfish/swordfish.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2022 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* === All used matrix spots populated === */
-#define LAYOUT_alice_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      \
-    K50, K51, K52,      K54,  K55,     K57, K58,      K5A, K5B, K5C, K5D, K5E  \
-) { \
-    { K00, K01, K02, K03,   K04,   K05, K06,   K07,   K08,   K09,   K0A, K0B,   K0C,   K0D, K0E   },  \
-    { K10, K11, K12, K13,   K14,   K15, K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D, K1E   },  \
-    { K30, K31, K32, K33,   K34,   K35, K36,   K37,   K38,   K39,   K3A, K3B,   KC_NO, K3D, K3E   },  \
-    { K40, K41, K42, K43,   K44,   K45, K46,   K47,   K48,   K49,   K4A, K4B,   K4C,   K4D, KC_NO },  \
-    { K50, K51, K52, KC_NO, K54,   K55, KC_NO, K57,   K58,   KC_NO, K5A, K5B,   K5C,   K5D, K5E   }   \
-}
diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h
index 708ad1d193..291cc75824 100644
--- a/keyboards/fjlabs/tf60ansi/config.h
+++ b/keyboards/fjlabs/tf60ansi/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 64
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json
index ad1452f7f8..02c089926f 100644
--- a/keyboards/fjlabs/tf60ansi/info.json
+++ b/keyboards/fjlabs/tf60ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/fjlabs/tf60ansi/tf60ansi.c b/keyboards/fjlabs/tf60ansi/tf60ansi.c
deleted file mode 100644
index da31f8eaff..0000000000
--- a/keyboards/fjlabs/tf60ansi/tf60ansi.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "tf60ansi.h"
diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h
index 708ad1d193..291cc75824 100644
--- a/keyboards/fjlabs/tf60v2/config.h
+++ b/keyboards/fjlabs/tf60v2/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 64
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json
index 4604425dca..50f9f8a311 100644
--- a/keyboards/fjlabs/tf60v2/info.json
+++ b/keyboards/fjlabs/tf60v2/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1005",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi_arrow"],
diff --git a/keyboards/fjlabs/tf60v2/tf60v2.c b/keyboards/fjlabs/tf60v2/tf60v2.c
deleted file mode 100644
index 7a73d63901..0000000000
--- a/keyboards/fjlabs/tf60v2/tf60v2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "tf60v2.h"
diff --git a/keyboards/fjlabs/tf65rgbv2/config.h b/keyboards/fjlabs/tf65rgbv2/config.h
index 77441206d7..9e6239f67f 100644
--- a/keyboards/fjlabs/tf65rgbv2/config.h
+++ b/keyboards/fjlabs/tf65rgbv2/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 68
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json
index d7e54e5cf6..77d9b04af5 100644
--- a/keyboards/fjlabs/tf65rgbv2/info.json
+++ b/keyboards/fjlabs/tf65rgbv2/info.json
@@ -8,84 +8,92 @@
         "pid": "0x1007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"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},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-                
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/fjlabs/tf65rgbv2/tf65rgbv2.c b/keyboards/fjlabs/tf65rgbv2/tf65rgbv2.c
deleted file mode 100644
index 637b6d05e8..0000000000
--- a/keyboards/fjlabs/tf65rgbv2/tf65rgbv2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "tf65rgbv2.h"
diff --git a/keyboards/fjlabs/tf65rgbv2/tf65rgbv2.h b/keyboards/fjlabs/tf65rgbv2/tf65rgbv2.h
deleted file mode 100644
index ce435977c1..0000000000
--- a/keyboards/fjlabs/tf65rgbv2/tf65rgbv2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* TF60 ANSI Keymap Definitions */
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D, K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D, K0E }, \
-    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D, K1E }, \
-    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B,   KC_NO, K2D, K2E }, \
-    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, KC_NO, K3C,   K3D, K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, K4B,   K4C,   K4D, K4E }  \
-}
diff --git a/keyboards/flehrad/bigswitch/bigswitch.c b/keyboards/flehrad/bigswitch/bigswitch.c
index 32f9f7fab8..987e816ee9 100644
--- a/keyboards/flehrad/bigswitch/bigswitch.c
+++ b/keyboards/flehrad/bigswitch/bigswitch.c
@@ -14,7 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "bigswitch.h"
+#include "quantum.h"
 
 volatile uint8_t runonce = true;
 static uint16_t my_timer;
diff --git a/keyboards/flehrad/bigswitch/bigswitch.h b/keyboards/flehrad/bigswitch/bigswitch.h
deleted file mode 100644
index c6c2f026d5..0000000000
--- a/keyboards/flehrad/bigswitch/bigswitch.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2018 QMK Contributors
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00 \
-) { \
-    { k00 } \
-}
diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h
index dbc8b329c6..ddf4546bbb 100644
--- a/keyboards/flehrad/bigswitch/config.h
+++ b/keyboards/flehrad/bigswitch/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5 }
-#define MATRIX_COL_PINS { B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     false \
@@ -32,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json
index 851672c35c..095f8284e4 100644
--- a/keyboards/flehrad/bigswitch/info.json
+++ b/keyboards/flehrad/bigswitch/info.json
@@ -7,12 +7,22 @@
         "pid": "0xB195",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B6"],
+        "rows": ["B5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "debounce": 50,
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0, "w":4, "h":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/flehrad/downbubble/config.h b/keyboards/flehrad/downbubble/config.h
index 453544d452..64455593ed 100644
--- a/keyboards/flehrad/downbubble/config.h
+++ b/keyboards/flehrad/downbubble/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F1, F2, F3, F4, F5, F6 }
-#define MATRIX_COL_PINS { F7, C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D6, D5, D4, D3, D2, D1, D0, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/flehrad/downbubble/downbubble.c b/keyboards/flehrad/downbubble/downbubble.c
deleted file mode 100644
index 48be8e4998..0000000000
--- a/keyboards/flehrad/downbubble/downbubble.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "downbubble.h"
diff --git a/keyboards/flehrad/downbubble/downbubble.h b/keyboards/flehrad/downbubble/downbubble.h
deleted file mode 100644
index 0df39dd9ee..0000000000
--- a/keyboards/flehrad/downbubble/downbubble.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright 2018 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_standard( \
-    K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
-    K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,         K116,  K118,  K119,\
-    K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,               K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
-    K30,  K31,  K32,  K33,  K34,  K35,              K36,  K37,  K38,  K29,         K310,  K311,  K312,  K313,  K314,  K315,         K317,              \
-    K40,        K41,  K42,  K43,  K44,  K45,        K46,  K47,  K48,               K410,  K411,  K412,  K413,  K414,         K416,         K418,       \
-    K50,  K51,  K52,  K53,        K54,              K56,        K58,  K49,         K510,         K512,  K513,  K514,  K516,         K517,  K518, K519  \
-) \
-{ \
-    { K00,  K01,  K02,  K03,  K04,  K05,    K06,  KC_NO,  KC_NO,  KC_NO,  K010,  K011,   K012,  K013,  K014,  K015,   K016,   K017,   K018,   K019  }, \
-    { K10,  K11,  K12,  K13,  K14,  K15,    K16,  K17,    K18,    K19,    K110,  K111,   K112,  K113,  K114,  K115,   K116,   KC_NO,  K118,   K119  }, \
-    { K20,  K21,  K22,  K23,  K24,  K25,    K26,  K27,    K28,    K29,    K210,  K211,   K212,  K213,  K214,  K215,   K216,   K217,   K218,   K219  }, \
-    { K30,  K31,  K32,  K33,  K34,  K35,    K36,  K37,    K38,    KC_NO,  K310,  K311,   K312,  K313,  K314,  K315,   KC_NO,  K317,   KC_NO,  KC_NO }, \
-    { K40,  K41,  K42,  K43,  K44,  K45,    K46,  K47,    K48,    K49,    K410,  K411,   K412,  K413,  K414,  KC_NO,  K416,   KC_NO,  K418,   KC_NO }, \
-    { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  KC_NO,  K58,    KC_NO,  K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
-         }
-
-#define LAYOUT_split_bs( \
-    K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
-    K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118,  K119,\
-    K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,               K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
-    K30,  K31,  K32,  K33,  K34,  K35,              K36,  K37,  K38,  K29,         K310,  K311,  K312,  K313,  K314,  K315,         K317,              \
-    K40,        K41,  K42,  K43,  K44,  K45,        K46,  K47,  K48,               K410,  K411,  K412,  K413,  K414,         K416,         K418,       \
-    K50,  K51,  K52,  K53,        K54,              K56,        K58,  K49,         K510,         K512,  K513,  K514,  K516,         K517,  K518,  K519 \
-) \
-{ \
-    { K00,  K01,  K02,  K03,  K04,  K05,    K06,  KC_NO,  KC_NO,  KC_NO,  K010,  K011,   K012,  K013,  K014,  K015,   K016,   K017,   K018,   K019  }, \
-    { K10,  K11,  K12,  K13,  K14,  K15,    K16,  K17,    K18,    K19,    K110,  K111,   K112,  K113,  K114,  K115,   K116,   K117,   K118,   K119  }, \
-    { K20,  K21,  K22,  K23,  K24,  K25,    K26,  K27,    K28,    K29,    K210,  K211,   K212,  K213,  K214,  K215,   K216,   K217,   K218,   K219  }, \
-    { K30,  K31,  K32,  K33,  K34,  K35,    K36,  K37,    K38,    KC_NO,  K310,  K311,   K312,  K313,  K314,  K315,   KC_NO,  K317,   KC_NO,  KC_NO }, \
-    { K40,  K41,  K42,  K43,  K44,  K45,    K46,  K47,    K48,    K49,    K410,  K411,   K412,  K413,  K414,  KC_NO,  K416,   KC_NO,  K418,   KC_NO }, \
-    { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  KC_NO,  K58,    KC_NO,  K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
-         }
-
-#define LAYOUT_split_rshift( \
-    K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
-    K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,         K116,  K118,  K119,\
-    K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,               K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
-    K30,  K31,  K32,  K33,  K34,  K35,              K36,  K37,  K38,  K29,         K310,  K311,  K312,  K313,  K314,  K315,         K317,              \
-    K40,        K41,  K42,  K43,  K44,  K45,        K46,  K47,  K48,               K410,  K411,  K412,  K413,  K414,         K416,  K417,  K418,       \
-    K50,  K51,  K52,  K53,        K54,              K56,        K58,  K49,         K510,         K512,  K513,  K514,  K516,         K517,  K518,  K519 \
-) \
-{ \
-    { K00,  K01,  K02,  K03,  K04,  K05,    K06,  KC_NO,  KC_NO,  KC_NO,  K010,  K011,   K012,  K013,  K014,  K015,   K016,   K017,   K018,   K019  }, \
-    { K10,  K11,  K12,  K13,  K14,  K15,    K16,  K17,    K18,    K19,    K110,  K111,   K112,  K113,  K114,  K115,   K116,   KC_NO,  K118,   K119  }, \
-    { K20,  K21,  K22,  K23,  K24,  K25,    K26,  K27,    K28,    K29,    K210,  K211,   K212,  K213,  K214,  K215,   K216,   K217,   K218,   K219  }, \
-    { K30,  K31,  K32,  K33,  K34,  K35,    K36,  K37,    K38,    KC_NO,  K310,  K311,   K312,  K313,  K314,  K315,   KC_NO,  K317,   KC_NO,  KC_NO }, \
-    { K40,  K41,  K42,  K43,  K44,  K45,    K46,  K47,    K48,    K49,    K410,  K411,   K412,  K413,  K414,  KC_NO,  K416,   K417,   K418,   KC_NO }, \
-    { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  KC_NO,  K58,    KC_NO,  K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
-         }
-
-#define LAYOUT_split_numpad( \
-    K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
-    K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,         K116,  K118,  K119,\
-    K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,  K29,         K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
-    K30,  K31,  K32,  K33,  K34,  K35,              K36,  K37,  K38,  K39,         K310,  K311,  K312,  K313,  K314,  K315,         K317,              \
-    K40,        K41,  K42,  K43,  K44,  K45,        K46,  K47,  K48,  K49,         K410,  K411,  K412,  K413,  K414,         K416,         K418,       \
-    K50,  K51,  K52,  K53,        K54,              K56,  K57,  K58,  K59,         K510,         K512,  K513,  K514,  K516,         K517,  K518,  K519 \
-) \
-{ \
-    { K00,  K01,  K02,  K03,  K04,  K05,    K06,  KC_NO,  KC_NO,  KC_NO,  K010,  K011,   K012,  K013,  K014,  K015,   K016,   K017,   K018,   K019  }, \
-    { K10,  K11,  K12,  K13,  K14,  K15,    K16,  K17,    K18,    K19,    K110,  K111,   K112,  K113,  K114,  K115,   K116,   KC_NO,  K118,   K119  }, \
-    { K20,  K21,  K22,  K23,  K24,  K25,    K26,  K27,    K28,    K29,    K210,  K211,   K212,  K213,  K214,  K215,   K216,   K217,   K218,   K219  }, \
-    { K30,  K31,  K32,  K33,  K34,  K35,    K36,  K37,    K38,    K39,    K310,  K311,   K312,  K313,  K314,  K315,   KC_NO,  K317,   KC_NO,  KC_NO }, \
-    { K40,  K41,  K42,  K43,  K44,  K45,    K46,  K47,    K48,    K49,    K410,  K411,   K412,  K413,  K414,  KC_NO,  K416,   KC_NO,  K418,   KC_NO }, \
-    { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  K57,    K58,    K59,    K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
-         }
-
-#define LAYOUT_all( \
-    K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
-    K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118,  K119,\
-    K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,  K29,         K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
-    K30,  K31,  K32,  K33,  K34,  K35,              K36,  K37,  K38,  K39,         K310,  K311,  K312,  K313,  K314,  K315,         K317,              \
-    K40,        K41,  K42,  K43,  K44,  K45,        K46,  K47,  K48,  K49,         K410,  K411,  K412,  K413,  K414,         K416,  K417,  K418,       \
-    K50,  K51,  K52,  K53,        K54,              K56,  K57,  K58,  K59,         K510,         K512,  K513,  K514,  K516,         K517,  K518,  K519 \
-) \
-{ \
-    { K00,  K01,  K02,  K03,  K04,  K05,    K06,  KC_NO,  KC_NO,  KC_NO,  K010,  K011,   K012,  K013,  K014,  K015,   K016,   K017,  K018,   K019  }, \
-    { K10,  K11,  K12,  K13,  K14,  K15,    K16,  K17,    K18,    K19,    K110,  K111,   K112,  K113,  K114,  K115,   K116,   K117,  K118,   K119  }, \
-    { K20,  K21,  K22,  K23,  K24,  K25,    K26,  K27,    K28,    K29,    K210,  K211,   K212,  K213,  K214,  K215,   K216,   K217,  K218,   K219  }, \
-    { K30,  K31,  K32,  K33,  K34,  K35,    K36,  K37,    K38,    K39,    K310,  K311,   K312,  K313,  K314,  K315,   KC_NO,  K317,  KC_NO,  KC_NO }, \
-    { K40,  K41,  K42,  K43,  K44,  K45,    K46,  K47,    K48,    K49,    K410,  K411,   K412,  K413,  K414,  KC_NO,  K416,   K417,  K418,   KC_NO }, \
-    { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  K57,    K58,    K59,    K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,  K518,   K519  }, \
-         }
diff --git a/keyboards/flehrad/downbubble/info.json b/keyboards/flehrad/downbubble/info.json
index e454726124..fa81b51e42 100644
--- a/keyboards/flehrad/downbubble/info.json
+++ b/keyboards/flehrad/downbubble/info.json
@@ -7,557 +7,642 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2", "D1", "D0", "B7"],
+    "rows": ["F1", "F2", "F3", "F4", "F5", "F6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "at90usb1286",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_standard": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K05", "x":5, "y":0},
-        {"label":"K06", "x":6, "y":0},
-        {"label":"K010", "x":12.75, "y":0},
-        {"label":"K011", "x":13.75, "y":0},
-        {"label":"K012", "x":14.75, "y":0},
-        {"label":"K013", "x":15.75, "y":0},
-        {"label":"K014", "x":16.75, "y":0},
-        {"label":"K015", "x":17.75, "y":0},
-        {"label":"K016", "x":18.75, "y":0},
-        {"label":"K017", "x":19.75, "y":0},
-        {"label":"K018", "x":20.75, "y":0},
-        {"label":"K019", "x":21.75, "y":0},
-        {"label":"K10", "x":0, "y":1},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K14", "x":4, "y":1},
-        {"label":"K15", "x":5, "y":1},
-        {"label":"K16", "x":6, "y":1},
-        {"label":"K17", "x":8.75, "y":1},
-        {"label":"K18", "x":9.75, "y":1},
-        {"label":"K19", "x":10.75, "y":1},
-        {"label":"K110", "x":12.75, "y":1},
-        {"label":"K111", "x":13.75, "y":1},
-        {"label":"K112", "x":14.75, "y":1},
-        {"label":"K113", "x":15.75, "y":1},
-        {"label":"K114", "x":16.75, "y":1},
-        {"label":"K115", "x":17.75, "y":1},
-        {"label":"K116", "x":18.75, "y":1, "w":2},
-        {"label":"K118", "x":20.75, "y":1},
-        {"label":"K119", "x":21.75, "y":1},
-        {"label":"K20", "x":0, "y":2, "w":1.5},
-        {"label":"K21", "x":1.5, "y":2},
-        {"label":"K22", "x":2.5, "y":2},
-        {"label":"K23", "x":3.5, "y":2},
-        {"label":"K24", "x":4.5, "y":2},
-        {"label":"K25", "x":5.5, "y":2},
-        {"label":"K26", "x":7.75, "y":2},
-        {"label":"K17", "x":8.75, "y":2},
-        {"label":"K28", "x":9.75, "y":2},
-        {"label":"K210", "x":12.25, "y":2},
-        {"label":"K211", "x":13.25, "y":2},
-        {"label":"K212", "x":14.25, "y":2},
-        {"label":"K213", "x":15.25, "y":2},
-        {"label":"K214", "x":16.25, "y":2},
-        {"label":"K215", "x":17.25, "y":2},
-        {"label":"K216", "x":18.25, "y":2},
-        {"label":"K217", "x":19.25, "y":2, "w":1.5},
-        {"label":"K218", "x":20.75, "y":2},
-        {"label":"K219", "x":21.75, "y":2},
-        {"label":"K30", "x":0, "y":3, "w":1.75},
-        {"label":"K31", "x":1.75, "y":3},
-        {"label":"K32", "x":2.75, "y":3},
-        {"label":"K33", "x":3.75, "y":3},
-        {"label":"K34", "x":4.75, "y":3},
-        {"label":"K35", "x":5.75, "y":3},
-        {"label":"K36", "x":7.75, "y":3},
-        {"label":"K37", "x":8.75, "y":3},
-        {"label":"K38", "x":9.75, "y":3},
-        {"label":"K29", "x":10.75, "y":2, "h":2},
-        {"label":"K310", "x":12.5, "y":3},
-        {"label":"K311", "x":13.5, "y":3},
-        {"label":"K312", "x":14.5, "y":3},
-        {"label":"K313", "x":15.5, "y":3},
-        {"label":"K314", "x":16.5, "y":3},
-        {"label":"K315", "x":17.5, "y":3},
-        {"label":"K317", "x":18.5, "y":3, "w":2.25},
-        {"label":"K40", "x":0, "y":4, "w":2.25},
-        {"label":"K41", "x":2.25, "y":4},
-        {"label":"K42", "x":3.25, "y":4},
-        {"label":"K43", "x":4.25, "y":4},
-        {"label":"K44", "x":5.25, "y":4},
-        {"label":"K45", "x":6.25, "y":4},
-        {"label":"K46", "x":7.75, "y":4},
-        {"label":"K47", "x":8.75, "y":4},
-        {"label":"K48", "x":9.75, "y":4},
-        {"label":"K410", "x":13, "y":4},
-        {"label":"K411", "x":14, "y":4},
-        {"label":"K412", "x":15, "y":4},
-        {"label":"K413", "x":16, "y":4},
-        {"label":"K414", "x":17, "y":4},
-        {"label":"K416", "x":18, "y":4, "w":2.75},
-        {"label":"K418", "x":20.75, "y":4},
-        {"label":"K50", "x":0, "y":5, "w":1.25},
-        {"label":"K51", "x":1.25, "y":5, "w":1.25},
-        {"label":"K52", "x":2.5, "y":5, "w":1.25},
-        {"label":"K53", "x":3.75, "y":5, "w":1.25},
-        {"label":"K54", "x":5, "y":5, "w":2.25},
-        {"label":"K56", "x":7.75, "y":5, "w":2},
-        {"label":"K58", "x":9.75, "y":5},
-        {"label":"K49", "x":10.75, "y":4, "h":2},
-        {"label":"K510", "x":13, "y":5, "w":2},
-        {"label":"K512", "x":15, "y":5, "w":1.25},
-        {"label":"K513", "x":16.25, "y":5, "w":1.25},
-        {"label":"K514", "x":17.5, "y":5, "w":1.25},
-        {"label":"K516", "x":18.75, "y":5},
-        {"label":"K517", "x":19.75, "y":5},
-        {"label":"K518", "x":20.75, "y":5},
-        {"label":"K519", "x":21.75, "y":5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [0, 10], "x": 12.75, "y": 0},
+        {"matrix": [0, 11], "x": 13.75, "y": 0},
+        {"matrix": [0, 12], "x": 14.75, "y": 0},
+        {"matrix": [0, 13], "x": 15.75, "y": 0},
+        {"matrix": [0, 14], "x": 16.75, "y": 0},
+        {"matrix": [0, 15], "x": 17.75, "y": 0},
+        {"matrix": [0, 16], "x": 18.75, "y": 0},
+        {"matrix": [0, 17], "x": 19.75, "y": 0},
+        {"matrix": [0, 18], "x": 20.75, "y": 0},
+        {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+
+        {"matrix": [1, 7], "x": 8.75, "y": 1},
+        {"matrix": [1, 8], "x": 9.75, "y": 1},
+        {"matrix": [1, 9], "x": 10.75, "y": 1},
+
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1},
+        {"matrix": [1, 15], "x": 17.75, "y": 1},
+        {"matrix": [1, 16], "x": 18.75, "y": 1, "w": 2},
+        {"matrix": [1, 18], "x": 20.75, "y": 1},
+        {"matrix": [1, 19], "x": 21.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [2, 6], "x": 7.75, "y": 2},
+        {"matrix": [2, 7], "x": 8.75, "y": 2},
+        {"matrix": [2, 8], "x": 9.75, "y": 2},
+
+        {"matrix": [2, 10], "x": 12.25, "y": 2},
+        {"matrix": [2, 11], "x": 13.25, "y": 2},
+        {"matrix": [2, 12], "x": 14.25, "y": 2},
+        {"matrix": [2, 13], "x": 15.25, "y": 2},
+        {"matrix": [2, 14], "x": 16.25, "y": 2},
+        {"matrix": [2, 15], "x": 17.25, "y": 2},
+        {"matrix": [2, 16], "x": 18.25, "y": 2},
+        {"matrix": [2, 17], "x": 19.25, "y": 2, "w": 1.5},
+        {"matrix": [2, 18], "x": 20.75, "y": 2},
+        {"matrix": [2, 19], "x": 21.75, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+        {"matrix": [3, 6], "x": 7.75, "y": 3},
+        {"matrix": [3, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 8], "x": 9.75, "y": 3},
+        {"matrix": [2, 9], "x": 10.75, "y": 2, "h": 2},
+
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3},
+        {"matrix": [3, 14], "x": 16.5, "y": 3},
+        {"matrix": [3, 15], "x": 17.5, "y": 3},
+        {"matrix": [3, 17], "x": 18.5, "y": 3, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4},
+        {"matrix": [4, 2], "x": 3.25, "y": 4},
+        {"matrix": [4, 3], "x": 4.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.25, "y": 4},
+        {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+        {"matrix": [4, 6], "x": 7.75, "y": 4},
+        {"matrix": [4, 7], "x": 8.75, "y": 4},
+        {"matrix": [4, 8], "x": 9.75, "y": 4},
+
+        {"matrix": [4, 10], "x": 13, "y": 4},
+        {"matrix": [4, 11], "x": 14, "y": 4},
+        {"matrix": [4, 12], "x": 15, "y": 4},
+        {"matrix": [4, 13], "x": 16, "y": 4},
+        {"matrix": [4, 14], "x": 17, "y": 4},
+        {"matrix": [4, 16], "x": 18, "y": 4, "w": 2.75},
+        {"matrix": [4, 18], "x": 20.75, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+        {"matrix": [5, 4], "x": 5, "y": 5, "w": 2.25},
+
+        {"matrix": [5, 6], "x": 7.75, "y": 5, "w": 2},
+        {"matrix": [5, 8], "x": 9.75, "y": 5},
+        {"matrix": [4, 9], "x": 10.75, "y": 4, "h": 2},
+
+        {"matrix": [5, 10], "x": 13, "y": 5, "w": 2},
+        {"matrix": [5, 12], "x": 15, "y": 5, "w": 1.25},
+        {"matrix": [5, 13], "x": 16.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 14], "x": 17.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 16], "x": 18.75, "y": 5},
+        {"matrix": [5, 17], "x": 19.75, "y": 5},
+        {"matrix": [5, 18], "x": 20.75, "y": 5},
+        {"matrix": [5, 19], "x": 21.75, "y": 5}
       ]
     },
     "LAYOUT_split_bs": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K05", "x":5, "y":0},
-        {"label":"K06", "x":6, "y":0},
-        {"label":"K010", "x":12.75, "y":0},
-        {"label":"K011", "x":13.75, "y":0},
-        {"label":"K012", "x":14.75, "y":0},
-        {"label":"K013", "x":15.75, "y":0},
-        {"label":"K014", "x":16.75, "y":0},
-        {"label":"K015", "x":17.75, "y":0},
-        {"label":"K016", "x":18.75, "y":0},
-        {"label":"K017", "x":19.75, "y":0},
-        {"label":"K018", "x":20.75, "y":0},
-        {"label":"K019", "x":21.75, "y":0},
-        {"label":"K10", "x":0, "y":1},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K14", "x":4, "y":1},
-        {"label":"K15", "x":5, "y":1},
-        {"label":"K16", "x":6, "y":1},
-        {"label":"K17", "x":8.75, "y":1},
-        {"label":"K18", "x":9.75, "y":1},
-        {"label":"K19", "x":10.75, "y":1},
-        {"label":"K110", "x":12.75, "y":1},
-        {"label":"K111", "x":13.75, "y":1},
-        {"label":"K112", "x":14.75, "y":1},
-        {"label":"K113", "x":15.75, "y":1},
-        {"label":"K114", "x":16.75, "y":1},
-        {"label":"K115", "x":17.75, "y":1},
-        {"label":"K116", "x":18.75, "y":1},
-        {"label":"K117", "x":19.75, "y":1},
-        {"label":"K118", "x":20.75, "y":1},
-        {"label":"K119", "x":21.75, "y":1},
-        {"label":"K20", "x":0, "y":2, "w":1.5},
-        {"label":"K21", "x":1.5, "y":2},
-        {"label":"K22", "x":2.5, "y":2},
-        {"label":"K23", "x":3.5, "y":2},
-        {"label":"K24", "x":4.5, "y":2},
-        {"label":"K25", "x":5.5, "y":2},
-        {"label":"K26", "x":7.75, "y":2},
-        {"label":"K17", "x":8.75, "y":2},
-        {"label":"K28", "x":9.75, "y":2},
-        {"label":"K210", "x":12.25, "y":2},
-        {"label":"K211", "x":13.25, "y":2},
-        {"label":"K212", "x":14.25, "y":2},
-        {"label":"K213", "x":15.25, "y":2},
-        {"label":"K214", "x":16.25, "y":2},
-        {"label":"K215", "x":17.25, "y":2},
-        {"label":"K216", "x":18.25, "y":2},
-        {"label":"K217", "x":19.25, "y":2, "w":1.5},
-        {"label":"K218", "x":20.75, "y":2},
-        {"label":"K219", "x":21.75, "y":2},
-        {"label":"K30", "x":0, "y":3, "w":1.75},
-        {"label":"K31", "x":1.75, "y":3},
-        {"label":"K32", "x":2.75, "y":3},
-        {"label":"K33", "x":3.75, "y":3},
-        {"label":"K34", "x":4.75, "y":3},
-        {"label":"K35", "x":5.75, "y":3},
-        {"label":"K36", "x":7.75, "y":3},
-        {"label":"K37", "x":8.75, "y":3},
-        {"label":"K38", "x":9.75, "y":3},
-        {"label":"K29", "x":10.75, "y":2, "h":2},
-        {"label":"K310", "x":12.5, "y":3},
-        {"label":"K311", "x":13.5, "y":3},
-        {"label":"K312", "x":14.5, "y":3},
-        {"label":"K313", "x":15.5, "y":3},
-        {"label":"K314", "x":16.5, "y":3},
-        {"label":"K315", "x":17.5, "y":3},
-        {"label":"K317", "x":18.5, "y":3, "w":2.25},
-        {"label":"K40", "x":0, "y":4, "w":2.25},
-        {"label":"K41", "x":2.25, "y":4},
-        {"label":"K42", "x":3.25, "y":4},
-        {"label":"K43", "x":4.25, "y":4},
-        {"label":"K44", "x":5.25, "y":4},
-        {"label":"K45", "x":6.25, "y":4},
-        {"label":"K46", "x":7.75, "y":4},
-        {"label":"K47", "x":8.75, "y":4},
-        {"label":"K48", "x":9.75, "y":4},
-        {"label":"K410", "x":13, "y":4},
-        {"label":"K411", "x":14, "y":4},
-        {"label":"K412", "x":15, "y":4},
-        {"label":"K413", "x":16, "y":4},
-        {"label":"K414", "x":17, "y":4},
-        {"label":"K416", "x":18, "y":4, "w":2.75},
-        {"label":"K418", "x":20.75, "y":4},
-        {"label":"K50", "x":0, "y":5, "w":1.25},
-        {"label":"K51", "x":1.25, "y":5, "w":1.25},
-        {"label":"K52", "x":2.5, "y":5, "w":1.25},
-        {"label":"K53", "x":3.75, "y":5, "w":1.25},
-        {"label":"K54", "x":5, "y":5, "w":2.25},
-        {"label":"K56", "x":7.75, "y":5, "w":2},
-        {"label":"K58", "x":9.75, "y":5},
-        {"label":"K49", "x":10.75, "y":4, "h":2},
-        {"label":"K510", "x":13, "y":5, "w":2},
-        {"label":"K512", "x":15, "y":5, "w":1.25},
-        {"label":"K513", "x":16.25, "y":5, "w":1.25},
-        {"label":"K514", "x":17.5, "y":5, "w":1.25},
-        {"label":"K516", "x":18.75, "y":5},
-        {"label":"K517", "x":19.75, "y":5},
-        {"label":"K518", "x":20.75, "y":5},
-        {"label":"K519", "x":21.75, "y":5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [0, 10], "x": 12.75, "y": 0},
+        {"matrix": [0, 11], "x": 13.75, "y": 0},
+        {"matrix": [0, 12], "x": 14.75, "y": 0},
+        {"matrix": [0, 13], "x": 15.75, "y": 0},
+        {"matrix": [0, 14], "x": 16.75, "y": 0},
+        {"matrix": [0, 15], "x": 17.75, "y": 0},
+        {"matrix": [0, 16], "x": 18.75, "y": 0},
+        {"matrix": [0, 17], "x": 19.75, "y": 0},
+        {"matrix": [0, 18], "x": 20.75, "y": 0},
+        {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+
+        {"matrix": [1, 7], "x": 8.75, "y": 1},
+        {"matrix": [1, 8], "x": 9.75, "y": 1},
+        {"matrix": [1, 9], "x": 10.75, "y": 1},
+
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1},
+        {"matrix": [1, 15], "x": 17.75, "y": 1},
+        {"matrix": [1, 16], "x": 18.75, "y": 1},
+        {"matrix": [1, 17], "x": 19.75, "y": 1},
+        {"matrix": [1, 18], "x": 20.75, "y": 1},
+        {"matrix": [1, 19], "x": 21.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [2, 6], "x": 7.75, "y": 2},
+        {"matrix": [2, 7], "x": 8.75, "y": 2},
+        {"matrix": [2, 8], "x": 9.75, "y": 2},
+
+        {"matrix": [2, 10], "x": 12.25, "y": 2},
+        {"matrix": [2, 11], "x": 13.25, "y": 2},
+        {"matrix": [2, 12], "x": 14.25, "y": 2},
+        {"matrix": [2, 13], "x": 15.25, "y": 2},
+        {"matrix": [2, 14], "x": 16.25, "y": 2},
+        {"matrix": [2, 15], "x": 17.25, "y": 2},
+        {"matrix": [2, 16], "x": 18.25, "y": 2},
+        {"matrix": [2, 17], "x": 19.25, "y": 2, "w": 1.5},
+        {"matrix": [2, 18], "x": 20.75, "y": 2},
+        {"matrix": [2, 19], "x": 21.75, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+        {"matrix": [3, 6], "x": 7.75, "y": 3},
+        {"matrix": [3, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 8], "x": 9.75, "y": 3},
+        {"matrix": [2, 9], "x": 10.75, "y": 2, "h": 2},
+
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3},
+        {"matrix": [3, 14], "x": 16.5, "y": 3},
+        {"matrix": [3, 15], "x": 17.5, "y": 3},
+        {"matrix": [3, 17], "x": 18.5, "y": 3, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4},
+        {"matrix": [4, 2], "x": 3.25, "y": 4},
+        {"matrix": [4, 3], "x": 4.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.25, "y": 4},
+        {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+        {"matrix": [4, 6], "x": 7.75, "y": 4},
+        {"matrix": [4, 7], "x": 8.75, "y": 4},
+        {"matrix": [4, 8], "x": 9.75, "y": 4},
+
+        {"matrix": [4, 10], "x": 13, "y": 4},
+        {"matrix": [4, 11], "x": 14, "y": 4},
+        {"matrix": [4, 12], "x": 15, "y": 4},
+        {"matrix": [4, 13], "x": 16, "y": 4},
+        {"matrix": [4, 14], "x": 17, "y": 4},
+        {"matrix": [4, 16], "x": 18, "y": 4, "w": 2.75},
+        {"matrix": [4, 18], "x": 20.75, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+        {"matrix": [5, 4], "x": 5, "y": 5, "w": 2.25},
+
+        {"matrix": [5, 6], "x": 7.75, "y": 5, "w": 2},
+        {"matrix": [5, 8], "x": 9.75, "y": 5},
+        {"matrix": [4, 9], "x": 10.75, "y": 4, "h": 2},
+
+        {"matrix": [5, 10], "x": 13, "y": 5, "w": 2},
+        {"matrix": [5, 12], "x": 15, "y": 5, "w": 1.25},
+        {"matrix": [5, 13], "x": 16.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 14], "x": 17.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 16], "x": 18.75, "y": 5},
+        {"matrix": [5, 17], "x": 19.75, "y": 5},
+        {"matrix": [5, 18], "x": 20.75, "y": 5},
+        {"matrix": [5, 19], "x": 21.75, "y": 5}
       ]
     },
     "LAYOUT_split_rshift": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K05", "x":5, "y":0},
-        {"label":"K06", "x":6, "y":0},
-        {"label":"K010", "x":12.75, "y":0},
-        {"label":"K011", "x":13.75, "y":0},
-        {"label":"K012", "x":14.75, "y":0},
-        {"label":"K013", "x":15.75, "y":0},
-        {"label":"K014", "x":16.75, "y":0},
-        {"label":"K015", "x":17.75, "y":0},
-        {"label":"K016", "x":18.75, "y":0},
-        {"label":"K017", "x":19.75, "y":0},
-        {"label":"K018", "x":20.75, "y":0},
-        {"label":"K019", "x":21.75, "y":0},
-        {"label":"K10", "x":0, "y":1},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K14", "x":4, "y":1},
-        {"label":"K15", "x":5, "y":1},
-        {"label":"K16", "x":6, "y":1},
-        {"label":"K17", "x":8.75, "y":1},
-        {"label":"K18", "x":9.75, "y":1},
-        {"label":"K19", "x":10.75, "y":1},
-        {"label":"K110", "x":12.75, "y":1},
-        {"label":"K111", "x":13.75, "y":1},
-        {"label":"K112", "x":14.75, "y":1},
-        {"label":"K113", "x":15.75, "y":1},
-        {"label":"K114", "x":16.75, "y":1},
-        {"label":"K115", "x":17.75, "y":1},
-        {"label":"K116", "x":18.75, "y":1, "w":2},
-        {"label":"K118", "x":20.75, "y":1},
-        {"label":"K119", "x":21.75, "y":1},
-        {"label":"K20", "x":0, "y":2, "w":1.5},
-        {"label":"K21", "x":1.5, "y":2},
-        {"label":"K22", "x":2.5, "y":2},
-        {"label":"K23", "x":3.5, "y":2},
-        {"label":"K24", "x":4.5, "y":2},
-        {"label":"K25", "x":5.5, "y":2},
-        {"label":"K26", "x":7.75, "y":2},
-        {"label":"K17", "x":8.75, "y":2},
-        {"label":"K28", "x":9.75, "y":2},
-        {"label":"K210", "x":12.25, "y":2},
-        {"label":"K211", "x":13.25, "y":2},
-        {"label":"K212", "x":14.25, "y":2},
-        {"label":"K213", "x":15.25, "y":2},
-        {"label":"K214", "x":16.25, "y":2},
-        {"label":"K215", "x":17.25, "y":2},
-        {"label":"K216", "x":18.25, "y":2},
-        {"label":"K217", "x":19.25, "y":2, "w":1.5},
-        {"label":"K218", "x":20.75, "y":2},
-        {"label":"K219", "x":21.75, "y":2},
-        {"label":"K30", "x":0, "y":3, "w":1.75},
-        {"label":"K31", "x":1.75, "y":3},
-        {"label":"K32", "x":2.75, "y":3},
-        {"label":"K33", "x":3.75, "y":3},
-        {"label":"K34", "x":4.75, "y":3},
-        {"label":"K35", "x":5.75, "y":3},
-        {"label":"K36", "x":7.75, "y":3},
-        {"label":"K37", "x":8.75, "y":3},
-        {"label":"K38", "x":9.75, "y":3},
-        {"label":"K29", "x":10.75, "y":2, "h":2},
-        {"label":"K310", "x":12.5, "y":3},
-        {"label":"K311", "x":13.5, "y":3},
-        {"label":"K312", "x":14.5, "y":3},
-        {"label":"K313", "x":15.5, "y":3},
-        {"label":"K314", "x":16.5, "y":3},
-        {"label":"K315", "x":17.5, "y":3},
-        {"label":"K317", "x":18.5, "y":3, "w":2.25},
-        {"label":"K40", "x":0, "y":4, "w":2.25},
-        {"label":"K41", "x":2.25, "y":4},
-        {"label":"K42", "x":3.25, "y":4},
-        {"label":"K43", "x":4.25, "y":4},
-        {"label":"K44", "x":5.25, "y":4},
-        {"label":"K45", "x":6.25, "y":4},
-        {"label":"K46", "x":7.75, "y":4},
-        {"label":"K47", "x":8.75, "y":4},
-        {"label":"K48", "x":9.75, "y":4},
-        {"label":"K410", "x":13, "y":4},
-        {"label":"K411", "x":14, "y":4},
-        {"label":"K412", "x":15, "y":4},
-        {"label":"K413", "x":16, "y":4},
-        {"label":"K414", "x":17, "y":4},
-        {"label":"K416", "x":18, "y":4, "w":1.75},
-        {"label":"K417", "x":19.75, "y":4},
-        {"label":"K418", "x":20.75, "y":4},
-        {"label":"K50", "x":0, "y":5, "w":1.25},
-        {"label":"K51", "x":1.25, "y":5, "w":1.25},
-        {"label":"K52", "x":2.5, "y":5, "w":1.25},
-        {"label":"K53", "x":3.75, "y":5, "w":1.25},
-        {"label":"K54", "x":5, "y":5, "w":2.25},
-        {"label":"K56", "x":7.75, "y":5, "w":2},
-        {"label":"K58", "x":9.75, "y":5},
-        {"label":"K49", "x":10.75, "y":4, "h":2},
-        {"label":"K510", "x":13, "y":5, "w":2},
-        {"label":"K512", "x":15, "y":5, "w":1.25},
-        {"label":"K513", "x":16.25, "y":5, "w":1.25},
-        {"label":"K514", "x":17.5, "y":5, "w":1.25},
-        {"label":"K516", "x":18.75, "y":5},
-        {"label":"K517", "x":19.75, "y":5},
-        {"label":"K518", "x":20.75, "y":5},
-        {"label":"K519", "x":21.75, "y":5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [0, 10], "x": 12.75, "y": 0},
+        {"matrix": [0, 11], "x": 13.75, "y": 0},
+        {"matrix": [0, 12], "x": 14.75, "y": 0},
+        {"matrix": [0, 13], "x": 15.75, "y": 0},
+        {"matrix": [0, 14], "x": 16.75, "y": 0},
+        {"matrix": [0, 15], "x": 17.75, "y": 0},
+        {"matrix": [0, 16], "x": 18.75, "y": 0},
+        {"matrix": [0, 17], "x": 19.75, "y": 0},
+        {"matrix": [0, 18], "x": 20.75, "y": 0},
+        {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+
+        {"matrix": [1, 7], "x": 8.75, "y": 1},
+        {"matrix": [1, 8], "x": 9.75, "y": 1},
+        {"matrix": [1, 9], "x": 10.75, "y": 1},
+
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1},
+        {"matrix": [1, 15], "x": 17.75, "y": 1},
+        {"matrix": [1, 16], "x": 18.75, "y": 1, "w": 2},
+        {"matrix": [1, 18], "x": 20.75, "y": 1},
+        {"matrix": [1, 19], "x": 21.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [2, 6], "x": 7.75, "y": 2},
+        {"matrix": [2, 7], "x": 8.75, "y": 2},
+        {"matrix": [2, 8], "x": 9.75, "y": 2},
+
+        {"matrix": [2, 10], "x": 12.25, "y": 2},
+        {"matrix": [2, 11], "x": 13.25, "y": 2},
+        {"matrix": [2, 12], "x": 14.25, "y": 2},
+        {"matrix": [2, 13], "x": 15.25, "y": 2},
+        {"matrix": [2, 14], "x": 16.25, "y": 2},
+        {"matrix": [2, 15], "x": 17.25, "y": 2},
+        {"matrix": [2, 16], "x": 18.25, "y": 2},
+        {"matrix": [2, 17], "x": 19.25, "y": 2, "w": 1.5},
+        {"matrix": [2, 18], "x": 20.75, "y": 2},
+        {"matrix": [2, 19], "x": 21.75, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+        {"matrix": [3, 6], "x": 7.75, "y": 3},
+        {"matrix": [3, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 8], "x": 9.75, "y": 3},
+        {"matrix": [2, 9], "x": 10.75, "y": 2, "h": 2},
+
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3},
+        {"matrix": [3, 14], "x": 16.5, "y": 3},
+        {"matrix": [3, 15], "x": 17.5, "y": 3},
+        {"matrix": [3, 17], "x": 18.5, "y": 3, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4},
+        {"matrix": [4, 2], "x": 3.25, "y": 4},
+        {"matrix": [4, 3], "x": 4.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.25, "y": 4},
+        {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+        {"matrix": [4, 6], "x": 7.75, "y": 4},
+        {"matrix": [4, 7], "x": 8.75, "y": 4},
+        {"matrix": [4, 8], "x": 9.75, "y": 4},
+
+        {"matrix": [4, 10], "x": 13, "y": 4},
+        {"matrix": [4, 11], "x": 14, "y": 4},
+        {"matrix": [4, 12], "x": 15, "y": 4},
+        {"matrix": [4, 13], "x": 16, "y": 4},
+        {"matrix": [4, 14], "x": 17, "y": 4},
+        {"matrix": [4, 16], "x": 18, "y": 4, "w": 1.75},
+        {"matrix": [4, 17], "x": 19.75, "y": 4},
+        {"matrix": [4, 18], "x": 20.75, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+        {"matrix": [5, 4], "x": 5, "y": 5, "w": 2.25},
+
+        {"matrix": [5, 6], "x": 7.75, "y": 5, "w": 2},
+        {"matrix": [5, 8], "x": 9.75, "y": 5},
+        {"matrix": [4, 9], "x": 10.75, "y": 4, "h": 2},
+
+        {"matrix": [5, 10], "x": 13, "y": 5, "w": 2},
+        {"matrix": [5, 12], "x": 15, "y": 5, "w": 1.25},
+        {"matrix": [5, 13], "x": 16.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 14], "x": 17.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 16], "x": 18.75, "y": 5},
+        {"matrix": [5, 17], "x": 19.75, "y": 5},
+        {"matrix": [5, 18], "x": 20.75, "y": 5},
+        {"matrix": [5, 19], "x": 21.75, "y": 5}
       ]
     },
     "LAYOUT_split_numpad": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K05", "x":5, "y":0},
-        {"label":"K06", "x":6, "y":0},
-        {"label":"K010", "x":12.75, "y":0},
-        {"label":"K011", "x":13.75, "y":0},
-        {"label":"K012", "x":14.75, "y":0},
-        {"label":"K013", "x":15.75, "y":0},
-        {"label":"K014", "x":16.75, "y":0},
-        {"label":"K015", "x":17.75, "y":0},
-        {"label":"K016", "x":18.75, "y":0},
-        {"label":"K017", "x":19.75, "y":0},
-        {"label":"K018", "x":20.75, "y":0},
-        {"label":"K019", "x":21.75, "y":0},
-        {"label":"K10", "x":0, "y":1},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K14", "x":4, "y":1},
-        {"label":"K15", "x":5, "y":1},
-        {"label":"K16", "x":6, "y":1},
-        {"label":"K17", "x":8.75, "y":1},
-        {"label":"K18", "x":9.75, "y":1},
-        {"label":"K19", "x":10.75, "y":1},
-        {"label":"K110", "x":12.75, "y":1},
-        {"label":"K111", "x":13.75, "y":1},
-        {"label":"K112", "x":14.75, "y":1},
-        {"label":"K113", "x":15.75, "y":1},
-        {"label":"K114", "x":16.75, "y":1},
-        {"label":"K115", "x":17.75, "y":1},
-        {"label":"K116", "x":18.75, "y":1, "w":2},
-        {"label":"K118", "x":20.75, "y":1},
-        {"label":"K119", "x":21.75, "y":1},
-        {"label":"K20", "x":0, "y":2, "w":1.5},
-        {"label":"K21", "x":1.5, "y":2},
-        {"label":"K22", "x":2.5, "y":2},
-        {"label":"K23", "x":3.5, "y":2},
-        {"label":"K24", "x":4.5, "y":2},
-        {"label":"K25", "x":5.5, "y":2},
-        {"label":"K26", "x":7.75, "y":2},
-        {"label":"K17", "x":8.75, "y":2},
-        {"label":"K28", "x":9.75, "y":2},
-        {"label":"K29", "x":10.75, "y":2},
-        {"label":"K210", "x":12.25, "y":2},
-        {"label":"K211", "x":13.25, "y":2},
-        {"label":"K212", "x":14.25, "y":2},
-        {"label":"K213", "x":15.25, "y":2},
-        {"label":"K214", "x":16.25, "y":2},
-        {"label":"K215", "x":17.25, "y":2},
-        {"label":"K216", "x":18.25, "y":2},
-        {"label":"K217", "x":19.25, "y":2, "w":1.5},
-        {"label":"K218", "x":20.75, "y":2},
-        {"label":"K219", "x":21.75, "y":2},
-        {"label":"K30", "x":0, "y":3, "w":1.75},
-        {"label":"K31", "x":1.75, "y":3},
-        {"label":"K32", "x":2.75, "y":3},
-        {"label":"K33", "x":3.75, "y":3},
-        {"label":"K34", "x":4.75, "y":3},
-        {"label":"K35", "x":5.75, "y":3},
-        {"label":"K36", "x":7.75, "y":3},
-        {"label":"K37", "x":8.75, "y":3},
-        {"label":"K38", "x":9.75, "y":3},
-        {"label":"K39", "x":10.75, "y":3},
-        {"label":"K310", "x":12.5, "y":3},
-        {"label":"K311", "x":13.5, "y":3},
-        {"label":"K312", "x":14.5, "y":3},
-        {"label":"K313", "x":15.5, "y":3},
-        {"label":"K314", "x":16.5, "y":3},
-        {"label":"K315", "x":17.5, "y":3},
-        {"label":"K317", "x":18.5, "y":3, "w":2.25},
-        {"label":"K40", "x":0, "y":4, "w":2.25},
-        {"label":"K41", "x":2.25, "y":4},
-        {"label":"K42", "x":3.25, "y":4},
-        {"label":"K43", "x":4.25, "y":4},
-        {"label":"K44", "x":5.25, "y":4},
-        {"label":"K45", "x":6.25, "y":4},
-        {"label":"K46", "x":7.75, "y":4},
-        {"label":"K47", "x":8.75, "y":4},
-        {"label":"K48", "x":9.75, "y":4},
-        {"label":"K49", "x":10.75, "y":4},
-        {"label":"K410", "x":13, "y":4},
-        {"label":"K411", "x":14, "y":4},
-        {"label":"K412", "x":15, "y":4},
-        {"label":"K413", "x":16, "y":4},
-        {"label":"K414", "x":17, "y":4},
-        {"label":"K416", "x":18, "y":4, "w":2.75},
-        {"label":"K418", "x":20.75, "y":4},
-        {"label":"K50", "x":0, "y":5, "w":1.25},
-        {"label":"K51", "x":1.25, "y":5, "w":1.25},
-        {"label":"K52", "x":2.5, "y":5, "w":1.25},
-        {"label":"K53", "x":3.75, "y":5, "w":1.25},
-        {"label":"K54", "x":5, "y":5, "w":2.25},
-        {"label":"K56", "x":7.75, "y":5},
-        {"label":"K57", "x":8.75, "y":5},
-        {"label":"K58", "x":9.75, "y":5},
-        {"label":"K59", "x":10.75, "y":5},
-        {"label":"K510", "x":13, "y":5, "w":2},
-        {"label":"K512", "x":15, "y":5, "w":1.25},
-        {"label":"K513", "x":16.25, "y":5, "w":1.25},
-        {"label":"K514", "x":17.5, "y":5, "w":1.25},
-        {"label":"K516", "x":18.75, "y":5},
-        {"label":"K517", "x":19.75, "y":5},
-        {"label":"K518", "x":20.75, "y":5},
-        {"label":"K519", "x":21.75, "y":5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [0, 10], "x": 12.75, "y": 0},
+        {"matrix": [0, 11], "x": 13.75, "y": 0},
+        {"matrix": [0, 12], "x": 14.75, "y": 0},
+        {"matrix": [0, 13], "x": 15.75, "y": 0},
+        {"matrix": [0, 14], "x": 16.75, "y": 0},
+        {"matrix": [0, 15], "x": 17.75, "y": 0},
+        {"matrix": [0, 16], "x": 18.75, "y": 0},
+        {"matrix": [0, 17], "x": 19.75, "y": 0},
+        {"matrix": [0, 18], "x": 20.75, "y": 0},
+        {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+
+        {"matrix": [1, 7], "x": 8.75, "y": 1},
+        {"matrix": [1, 8], "x": 9.75, "y": 1},
+        {"matrix": [1, 9], "x": 10.75, "y": 1},
+
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1},
+        {"matrix": [1, 15], "x": 17.75, "y": 1},
+        {"matrix": [1, 16], "x": 18.75, "y": 1, "w": 2},
+        {"matrix": [1, 18], "x": 20.75, "y": 1},
+        {"matrix": [1, 19], "x": 21.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [2, 6], "x": 7.75, "y": 2},
+        {"matrix": [2, 7], "x": 8.75, "y": 2},
+        {"matrix": [2, 8], "x": 9.75, "y": 2},
+        {"matrix": [2, 9], "x": 10.75, "y": 2},
+
+        {"matrix": [2, 10], "x": 12.25, "y": 2},
+        {"matrix": [2, 11], "x": 13.25, "y": 2},
+        {"matrix": [2, 12], "x": 14.25, "y": 2},
+        {"matrix": [2, 13], "x": 15.25, "y": 2},
+        {"matrix": [2, 14], "x": 16.25, "y": 2},
+        {"matrix": [2, 15], "x": 17.25, "y": 2},
+        {"matrix": [2, 16], "x": 18.25, "y": 2},
+        {"matrix": [2, 17], "x": 19.25, "y": 2, "w": 1.5},
+        {"matrix": [2, 18], "x": 20.75, "y": 2},
+        {"matrix": [2, 19], "x": 21.75, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+        {"matrix": [3, 6], "x": 7.75, "y": 3},
+        {"matrix": [3, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 8], "x": 9.75, "y": 3},
+        {"matrix": [3, 9], "x": 10.75, "y": 3},
+
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3},
+        {"matrix": [3, 14], "x": 16.5, "y": 3},
+        {"matrix": [3, 15], "x": 17.5, "y": 3},
+        {"matrix": [3, 17], "x": 18.5, "y": 3, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4},
+        {"matrix": [4, 2], "x": 3.25, "y": 4},
+        {"matrix": [4, 3], "x": 4.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.25, "y": 4},
+        {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+        {"matrix": [4, 6], "x": 7.75, "y": 4},
+        {"matrix": [4, 7], "x": 8.75, "y": 4},
+        {"matrix": [4, 8], "x": 9.75, "y": 4},
+        {"matrix": [4, 9], "x": 10.75, "y": 4},
+
+        {"matrix": [4, 10], "x": 13, "y": 4},
+        {"matrix": [4, 11], "x": 14, "y": 4},
+        {"matrix": [4, 12], "x": 15, "y": 4},
+        {"matrix": [4, 13], "x": 16, "y": 4},
+        {"matrix": [4, 14], "x": 17, "y": 4},
+        {"matrix": [4, 16], "x": 18, "y": 4, "w": 2.75},
+        {"matrix": [4, 18], "x": 20.75, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+        {"matrix": [5, 4], "x": 5, "y": 5, "w": 2.25},
+
+        {"matrix": [5, 6], "x": 7.75, "y": 5},
+        {"matrix": [5, 7], "x": 8.75, "y": 5},
+        {"matrix": [5, 8], "x": 9.75, "y": 5},
+        {"matrix": [5, 9], "x": 10.75, "y": 5},
+
+        {"matrix": [5, 10], "x": 13, "y": 5, "w": 2},
+        {"matrix": [5, 12], "x": 15, "y": 5, "w": 1.25},
+        {"matrix": [5, 13], "x": 16.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 14], "x": 17.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 16], "x": 18.75, "y": 5},
+        {"matrix": [5, 17], "x": 19.75, "y": 5},
+        {"matrix": [5, 18], "x": 20.75, "y": 5},
+        {"matrix": [5, 19], "x": 21.75, "y": 5}
       ]
     },
     "LAYOUT_all": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K05", "x":5, "y":0},
-        {"label":"K06", "x":6, "y":0},
-        {"label":"K010", "x":12.75, "y":0},
-        {"label":"K011", "x":13.75, "y":0},
-        {"label":"K012", "x":14.75, "y":0},
-        {"label":"K013", "x":15.75, "y":0},
-        {"label":"K014", "x":16.75, "y":0},
-        {"label":"K015", "x":17.75, "y":0},
-        {"label":"K016", "x":18.75, "y":0},
-        {"label":"K017", "x":19.75, "y":0},
-        {"label":"K018", "x":20.75, "y":0},
-        {"label":"K019", "x":21.75, "y":0},
-        {"label":"K10", "x":0, "y":1},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K14", "x":4, "y":1},
-        {"label":"K15", "x":5, "y":1},
-        {"label":"K16", "x":6, "y":1},
-        {"label":"K17", "x":8.75, "y":1},
-        {"label":"K18", "x":9.75, "y":1},
-        {"label":"K19", "x":10.75, "y":1},
-        {"label":"K110", "x":12.75, "y":1},
-        {"label":"K111", "x":13.75, "y":1},
-        {"label":"K112", "x":14.75, "y":1},
-        {"label":"K113", "x":15.75, "y":1},
-        {"label":"K114", "x":16.75, "y":1},
-        {"label":"K115", "x":17.75, "y":1},
-        {"label":"K116", "x":18.75, "y":1},
-        {"label":"K117", "x":19.75, "y":1},
-        {"label":"K118", "x":20.75, "y":1},
-        {"label":"K119", "x":21.75, "y":1},
-        {"label":"K20", "x":0, "y":2, "w":1.5},
-        {"label":"K21", "x":1.5, "y":2},
-        {"label":"K22", "x":2.5, "y":2},
-        {"label":"K23", "x":3.5, "y":2},
-        {"label":"K24", "x":4.5, "y":2},
-        {"label":"K25", "x":5.5, "y":2},
-        {"label":"K26", "x":7.75, "y":2},
-        {"label":"K27", "x":8.75, "y":2},
-        {"label":"K28", "x":9.75, "y":2},
-        {"label":"K29", "x":10.75, "y":2},
-        {"label":"K210", "x":12.25, "y":2},
-        {"label":"K211", "x":13.25, "y":2},
-        {"label":"K212", "x":14.25, "y":2},
-        {"label":"K213", "x":15.25, "y":2},
-        {"label":"K214", "x":16.25, "y":2},
-        {"label":"K215", "x":17.25, "y":2},
-        {"label":"K216", "x":18.25, "y":2},
-        {"label":"K217", "x":19.25, "y":2, "w":1.5},
-        {"label":"K218", "x":20.75, "y":2},
-        {"label":"K219", "x":21.75, "y":2},
-        {"label":"K30", "x":0, "y":3, "w":1.75},
-        {"label":"K31", "x":1.75, "y":3},
-        {"label":"K32", "x":2.75, "y":3},
-        {"label":"K33", "x":3.75, "y":3},
-        {"label":"K34", "x":4.75, "y":3},
-        {"label":"K35", "x":5.75, "y":3},
-        {"label":"K36", "x":7.75, "y":3},
-        {"label":"K37", "x":8.75, "y":3},
-        {"label":"K38", "x":9.75, "y":3},
-        {"label":"K39", "x":10.75, "y":3},
-        {"label":"K310", "x":12.5, "y":3},
-        {"label":"K311", "x":13.5, "y":3},
-        {"label":"K312", "x":14.5, "y":3},
-        {"label":"K313", "x":15.5, "y":3},
-        {"label":"K314", "x":16.5, "y":3},
-        {"label":"K315", "x":17.5, "y":3},
-        {"label":"K317", "x":18.5, "y":3, "w":2.25},
-        {"label":"K40", "x":0, "y":4, "w":2.25},
-        {"label":"K41", "x":2.25, "y":4},
-        {"label":"K42", "x":3.25, "y":4},
-        {"label":"K43", "x":4.25, "y":4},
-        {"label":"K44", "x":5.25, "y":4},
-        {"label":"K45", "x":6.25, "y":4},
-        {"label":"K46", "x":7.75, "y":4},
-        {"label":"K47", "x":8.75, "y":4},
-        {"label":"K48", "x":9.75, "y":4},
-        {"label":"K49", "x":10.75, "y":4},
-        {"label":"K410", "x":13, "y":4},
-        {"label":"K411", "x":14, "y":4},
-        {"label":"K412", "x":15, "y":4},
-        {"label":"K413", "x":16, "y":4},
-        {"label":"K414", "x":17, "y":4},
-        {"label":"K416", "x":18, "y":4, "w":1.75},
-        {"label":"K417", "x":19.75, "y":4},
-        {"label":"K418", "x":20.75, "y":4},
-        {"label":"K50", "x":0, "y":5, "w":1.25},
-        {"label":"K51", "x":1.25, "y":5, "w":1.25},
-        {"label":"K52", "x":2.5, "y":5, "w":1.25},
-        {"label":"K53", "x":3.75, "y":5, "w":1.25},
-        {"label":"K54", "x":5, "y":5, "w":2.25},
-        {"label":"K56", "x":7.75, "y":5},
-        {"label":"K57", "x":8.75, "y":5},
-        {"label":"K58", "x":9.75, "y":5},
-        {"label":"K59", "x":10.75, "y":5},
-        {"label":"K510", "x":13, "y":5, "w":2},
-        {"label":"K512", "x":15, "y":5, "w":1.25},
-        {"label":"K513", "x":16.25, "y":5, "w":1.25},
-        {"label":"K514", "x":17.5, "y":5, "w":1.25},
-        {"label":"K516", "x":18.75, "y":5},
-        {"label":"K517", "x":19.75, "y":5},
-        {"label":"K518", "x":20.75, "y":5},
-        {"label":"K519", "x":21.75, "y":5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [0, 10], "x": 12.75, "y": 0},
+        {"matrix": [0, 11], "x": 13.75, "y": 0},
+        {"matrix": [0, 12], "x": 14.75, "y": 0},
+        {"matrix": [0, 13], "x": 15.75, "y": 0},
+        {"matrix": [0, 14], "x": 16.75, "y": 0},
+        {"matrix": [0, 15], "x": 17.75, "y": 0},
+        {"matrix": [0, 16], "x": 18.75, "y": 0},
+        {"matrix": [0, 17], "x": 19.75, "y": 0},
+        {"matrix": [0, 18], "x": 20.75, "y": 0},
+        {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+
+        {"matrix": [1, 7], "x": 8.75, "y": 1},
+        {"matrix": [1, 8], "x": 9.75, "y": 1},
+        {"matrix": [1, 9], "x": 10.75, "y": 1},
+
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1},
+        {"matrix": [1, 15], "x": 17.75, "y": 1},
+        {"matrix": [1, 16], "x": 18.75, "y": 1},
+        {"matrix": [1, 17], "x": 19.75, "y": 1},
+        {"matrix": [1, 18], "x": 20.75, "y": 1},
+        {"matrix": [1, 19], "x": 21.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [2, 6], "x": 7.75, "y": 2},
+        {"matrix": [2, 7], "x": 8.75, "y": 2},
+        {"matrix": [2, 8], "x": 9.75, "y": 2},
+        {"matrix": [2, 9], "x": 10.75, "y": 2},
+
+        {"matrix": [2, 10], "x": 12.25, "y": 2},
+        {"matrix": [2, 11], "x": 13.25, "y": 2},
+        {"matrix": [2, 12], "x": 14.25, "y": 2},
+        {"matrix": [2, 13], "x": 15.25, "y": 2},
+        {"matrix": [2, 14], "x": 16.25, "y": 2},
+        {"matrix": [2, 15], "x": 17.25, "y": 2},
+        {"matrix": [2, 16], "x": 18.25, "y": 2},
+        {"matrix": [2, 17], "x": 19.25, "y": 2, "w": 1.5},
+        {"matrix": [2, 18], "x": 20.75, "y": 2},
+        {"matrix": [2, 19], "x": 21.75, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+        {"matrix": [3, 6], "x": 7.75, "y": 3},
+        {"matrix": [3, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 8], "x": 9.75, "y": 3},
+        {"matrix": [3, 9], "x": 10.75, "y": 3},
+
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3},
+        {"matrix": [3, 14], "x": 16.5, "y": 3},
+        {"matrix": [3, 15], "x": 17.5, "y": 3},
+        {"matrix": [3, 17], "x": 18.5, "y": 3, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4},
+        {"matrix": [4, 2], "x": 3.25, "y": 4},
+        {"matrix": [4, 3], "x": 4.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.25, "y": 4},
+        {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+        {"matrix": [4, 6], "x": 7.75, "y": 4},
+        {"matrix": [4, 7], "x": 8.75, "y": 4},
+        {"matrix": [4, 8], "x": 9.75, "y": 4},
+        {"matrix": [4, 9], "x": 10.75, "y": 4},
+
+        {"matrix": [4, 10], "x": 13, "y": 4},
+        {"matrix": [4, 11], "x": 14, "y": 4},
+        {"matrix": [4, 12], "x": 15, "y": 4},
+        {"matrix": [4, 13], "x": 16, "y": 4},
+        {"matrix": [4, 14], "x": 17, "y": 4},
+        {"matrix": [4, 16], "x": 18, "y": 4, "w": 1.75},
+        {"matrix": [4, 17], "x": 19.75, "y": 4},
+        {"matrix": [4, 18], "x": 20.75, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+        {"matrix": [5, 4], "x": 5, "y": 5, "w": 2.25},
+
+        {"matrix": [5, 6], "x": 7.75, "y": 5},
+        {"matrix": [5, 7], "x": 8.75, "y": 5},
+        {"matrix": [5, 8], "x": 9.75, "y": 5},
+        {"matrix": [5, 9], "x": 10.75, "y": 5},
+
+        {"matrix": [5, 10], "x": 13, "y": 5, "w": 2},
+        {"matrix": [5, 12], "x": 15, "y": 5, "w": 1.25},
+        {"matrix": [5, 13], "x": 16.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 14], "x": 17.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 16], "x": 18.75, "y": 5},
+        {"matrix": [5, 17], "x": 19.75, "y": 5},
+        {"matrix": [5, 18], "x": 20.75, "y": 5},
+        {"matrix": [5, 19], "x": 21.75, "y": 5}
       ]
     }
   }
diff --git a/keyboards/flehrad/numbrero/config.h b/keyboards/flehrad/numbrero/config.h
index 587cf8f15c..5f36081323 100644
--- a/keyboards/flehrad/numbrero/config.h
+++ b/keyboards/flehrad/numbrero/config.h
@@ -1,32 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F6, B5, B4, E6, F7 }
-#define MATRIX_COL_PINS { D1, D0, D4, F5, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/flehrad/numbrero/info.json b/keyboards/flehrad/numbrero/info.json
index 5f8dde8e8f..192fa793e0 100644
--- a/keyboards/flehrad/numbrero/info.json
+++ b/keyboards/flehrad/numbrero/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D1", "D0", "D4", "F5", "F4"],
+    "rows": ["F6", "B5", "B4", "E6", "F7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layout_aliases": {
diff --git a/keyboards/flehrad/numbrero/numbrero.c b/keyboards/flehrad/numbrero/numbrero.c
deleted file mode 100644
index d3ec36904a..0000000000
--- a/keyboards/flehrad/numbrero/numbrero.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "numbrero.h"
diff --git a/keyboards/flehrad/snagpad/config.h b/keyboards/flehrad/snagpad/config.h
index 4b3eb4b53e..57ae786026 100644
--- a/keyboards/flehrad/snagpad/config.h
+++ b/keyboards/flehrad/snagpad/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -16,20 +8,3 @@
 
 /* prevent stuck modifiers */
 //#define STRICT_LAYER_RELEASE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/flehrad/snagpad/info.json b/keyboards/flehrad/snagpad/info.json
index 74f54c8f55..956482bbea 100644
--- a/keyboards/flehrad/snagpad/info.json
+++ b/keyboards/flehrad/snagpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5350",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7"],
+        "rows": ["D1", "D0", "D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_5x4", "numpad_5x4"],
@@ -15,47 +20,55 @@
 
         "LAYOUT_ortho_5x4": {
             "layout": [
-                {"label":"Num Lock", "x":0, "y":0},
-                {"label":"/", "x":1, "y":0},
-                {"label":"*", "x":2, "y":0},
-                {"label":"-", "x":3, "y":0},
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
-                {"label":"+", "x":3, "y":1},
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"+", "x":3, "y":2},
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3},
-                {"label":"Enter", "x":3, "y":3},
-                {"label":"0", "x":0, "y":4},
-                {"label":"0", "x":1, "y":4},
-                {"label":".", "x":2, "y":4},
-                {"label":"Enter", "x":3, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
             ]
         },
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"label":"Num Lock", "x":0, "y":0},
-                {"label":"/", "x":1, "y":0},
-                {"label":"*", "x":2, "y":0},
-                {"label":"-", "x":3, "y":0},
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"+", "x":3, "y":1, "h":2},
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3},
-                {"label":"0", "x":0, "y":4, "w":2},
-                {"label":".", "x":2, "y":4},
-                {"label":"Enter", "x":3, "y":3, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/flehrad/snagpad/snagpad.c b/keyboards/flehrad/snagpad/snagpad.c
deleted file mode 100644
index ce7e50b387..0000000000
--- a/keyboards/flehrad/snagpad/snagpad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "snagpad.h"
diff --git a/keyboards/flehrad/snagpad/snagpad.h b/keyboards/flehrad/snagpad/snagpad.h
deleted file mode 100644
index f1e5e34e62..0000000000
--- a/keyboards/flehrad/snagpad/snagpad.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }, \
-    { K40,   K41,   K42,   K43 }  \
-}
-#define LAYOUT_numpad_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K13, \
-    K30, K31, K32,      \
-    K40,      K42, K33  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   KC_NO }, \
-    { K30,   K31,   K32,   K33 }, \
-    { K40,   KC_NO, K42,   KC_NO }  \
-}
diff --git a/keyboards/flehrad/tradestation/config.h b/keyboards/flehrad/tradestation/config.h
index 374993cd17..41dafc075d 100644
--- a/keyboards/flehrad/tradestation/config.h
+++ b/keyboards/flehrad/tradestation/config.h
@@ -15,33 +15,8 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, C6, D4, D0 }
-#define MATRIX_COL_PINS { F7, B1, D7, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
- #define RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/flehrad/tradestation/info.json b/keyboards/flehrad/tradestation/info.json
index 6d4d7c17b5..fff21fa7bc 100644
--- a/keyboards/flehrad/tradestation/info.json
+++ b/keyboards/flehrad/tradestation/info.json
@@ -8,50 +8,55 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "D7", "E6"],
+        "rows": ["D1", "C6", "D4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x4"],
     "layouts": {
         "LAYOUT_tradestation": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.125, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.375, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.125, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.375, "y": 0},
 
-                {"x":0, "y":1.1},
-                {"x":1.125, "y":1.1},
-                {"x":2.25, "y":1.1},
-                {"x":3.375, "y":1.1},
+                {"matrix": [1, 0], "x": 0, "y": 1.1},
+                {"matrix": [1, 1], "x": 1.125, "y": 1.1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.1},
+                {"matrix": [1, 3], "x": 3.375, "y": 1.1},
 
-                {"x":0, "y":2.25, "w":2},
-                {"x":2.25, "y":2.25, "w":2},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 2},
 
-                {"x":0, "y":3.5, "w":2},
-                {"x":2.25, "y":3.5, "w":2}
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.5, "w": 2}
             ]
         },
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.125, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.375, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.125, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.375, "y": 0},
 
-                {"x":0, "y":1.1},
-                {"x":1.125, "y":1.1},
-                {"x":2.25, "y":1.1},
-                {"x":3.375, "y":1.1},
+                {"matrix": [1, 0], "x": 0, "y": 1.1},
+                {"matrix": [1, 1], "x": 1.125, "y": 1.1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.1},
+                {"matrix": [1, 3], "x": 3.375, "y": 1.1},
 
-                {"x":0, "y":2.25},
-                {"x":1.125, "y":2.25},
-                {"x":2.25, "y":2.25},
-                {"x":3.375, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.125, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.375, "y": 2.25},
 
-                {"x":0, "y":3.5},
-                {"x":1.125, "y":3.5},
-                {"x":2.25, "y":3.5},
-                {"x":3.375, "y":3.5}
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1.125, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.375, "y": 3.5}
             ]
         }
     }
diff --git a/keyboards/flehrad/tradestation/tradestation.c b/keyboards/flehrad/tradestation/tradestation.c
deleted file mode 100644
index bd572db83f..0000000000
--- a/keyboards/flehrad/tradestation/tradestation.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 flehrad
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "tradestation.h"
diff --git a/keyboards/flehrad/tradestation/tradestation.h b/keyboards/flehrad/tradestation/tradestation.h
deleted file mode 100644
index 8061432596..0000000000
--- a/keyboards/flehrad/tradestation/tradestation.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 flehrad
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }  \
-}
-
-#define LAYOUT_tradestation( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-       K20,      K22,   \
-       K30,      K32    \
-) { \
-    { K00,   K01,   K02,   K03   }, \
-    { K10,   K11,   K12,   K13   }, \
-    { K20,   KC_NO, K22,   KC_NO }, \
-    { K30,   KC_NO, K32,   KC_NO }  \
-}
diff --git a/keyboards/fleuron/config.h b/keyboards/fleuron/config.h
index 36d169b5ae..34197c8578 100644
--- a/keyboards/fleuron/config.h
+++ b/keyboards/fleuron/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C7, B6, B3, B5, B4, D7, D4, D5, D3, D2, D1, D0, B7, B0, B1, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -55,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define RGB_DI_PIN E6     // The pin the LED strip is connected to
 #define RGBLED_NUM 18     // Number of LEDs in your strip
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/fleuron/fleuron.c b/keyboards/fleuron/fleuron.c
deleted file mode 100644
index babdb23c5d..0000000000
--- a/keyboards/fleuron/fleuron.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 James Underwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "fleuron.h"
diff --git a/keyboards/fleuron/fleuron.h b/keyboards/fleuron/fleuron.h
deleted file mode 100644
index 38f6bb38bf..0000000000
--- a/keyboards/fleuron/fleuron.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2018 James Underwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_ortho_6x16( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F } \
-}
-
-#define LAYOUT_fleuron_grid LAYOUT_ortho_6x16
diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json
index 72c744987f..5f98a46967 100644
--- a/keyboards/fleuron/info.json
+++ b/keyboards/fleuron/info.json
@@ -7,107 +7,124 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "B6", "B3", "B5", "B4", "D7", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B0", "B1", "B2"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_fleuron_grid": "LAYOUT_ortho_6x16"
+    },
     "layouts": {
         "LAYOUT_ortho_6x16": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":1, "y":0}, 
-                {"label":"F2", "x":2, "y":0}, 
-                {"label":"F3", "x":3, "y":0}, 
-                {"label":"F4", "x":4, "y":0}, 
-                {"label":"F5", "x":5, "y":0}, 
-                {"label":"F6", "x":6, "y":0}, 
-                {"label":"F7", "x":7, "y":0}, 
-                {"label":"F8", "x":8, "y":0}, 
-                {"label":"F9", "x":9, "y":0}, 
-                {"label":"F10", "x":10, "y":0}, 
-                {"label":"F11", "x":11, "y":0}, 
-                {"label":"F12", "x":12, "y":0}, 
-                {"label":"Home", "x":13, "y":0}, 
-                {"label":"PgUp", "x":14, "y":0}, 
-                {"label":"Bksp", "x":15, "y":0}, 
-                {"label":"`", "x":0, "y":1}, 
-                {"label":"1", "x":1, "y":1}, 
-                {"label":"2", "x":2, "y":1}, 
-                {"label":"3", "x":3, "y":1}, 
-                {"label":"4", "x":4, "y":1}, 
-                {"label":"5", "x":5, "y":1}, 
-                {"label":"6", "x":6, "y":1}, 
-                {"label":"7", "x":7, "y":1}, 
-                {"label":"8", "x":8, "y":1}, 
-                {"label":"9", "x":9, "y":1}, 
-                {"label":"0", "x":10, "y":1}, 
-                {"label":"Bksp", "x":11, "y":1}, 
-                {"label":"Delete", "x":12, "y":1}, 
-                {"label":"End", "x":13, "y":1}, 
-                {"label":"PgDn", "x":14, "y":1}, 
-                {"label":"", "x":15, "y":1}, 
-                {"label":"Tab", "x":0, "y":2}, 
-                {"label":"q", "x":1, "y":2}, 
-                {"label":"w", "x":2, "y":2}, 
-                {"label":"e", "x":3, "y":2}, 
-                {"label":"r", "x":4, "y":2}, 
-                {"label":"t", "x":5, "y":2}, 
-                {"label":"y", "x":6, "y":2}, 
-                {"label":"u", "x":7, "y":2}, 
-                {"label":"i", "x":8, "y":2}, 
-                {"label":"o", "x":9, "y":2}, 
-                {"label":"p", "x":10, "y":2}, 
-                {"label":"\\", "x":11, "y":2}, 
-                {"label":"7", "x":12, "y":2}, 
-                {"label":"8", "x":13, "y":2}, 
-                {"label":"9", "x":14, "y":2}, 
-                {"label":"*", "x":15, "y":2}, 
-                {"label":"Caps Lock", "x":0, "y":3}, 
-                {"label":"a", "x":1, "y":3}, 
-                {"label":"s", "x":2, "y":3}, 
-                {"label":"d", "x":3, "y":3}, 
-                {"label":"f", "x":4, "y":3}, 
-                {"label":"g", "x":5, "y":3}, 
-                {"label":"h", "x":6, "y":3}, 
-                {"label":"j", "x":7, "y":3}, 
-                {"label":"k", "x":8, "y":3}, 
-                {"label":"l", "x":9, "y":3}, 
-                {"label":";", "x":10, "y":3}, 
-                {"label":"'", "x":11, "y":3}, 
-                {"label":"4", "x":12, "y":3}, 
-                {"label":"5", "x":13, "y":3}, 
-                {"label":"6", "x":14, "y":3}, 
-                {"label":"-", "x":15, "y":3}, 
-                {"label":"Shift", "x":0, "y":4}, 
-                {"label":"z", "x":1, "y":4}, 
-                {"label":"x", "x":2, "y":4}, 
-                {"label":"c", "x":3, "y":4}, 
-                {"label":"v", "x":4, "y":4}, 
-                {"label":"b", "x":5, "y":4}, 
-                {"label":"n", "x":6, "y":4}, 
-                {"label":"m", "x":7, "y":4}, 
-                {"label":",", "x":8, "y":4}, 
-                {"label":".", "x":9, "y":4}, 
-                {"label":"/", "x":10, "y":4}, 
-                {"label":"Enter", "x":11, "y":4}, 
-                {"label":"1", "x":12, "y":4}, 
-                {"label":"2", "x":13, "y":4}, 
-                {"label":"3", "x":14, "y":4}, 
-                {"label":"+", "x":15, "y":4}, 
-                {"label":"RGB", "x":0, "y":5}, 
-                {"label":"Ctrl", "x":1, "y":5}, 
-                {"label":"Win", "x":2, "y":5}, 
-                {"label":"Alt", "x":3, "y":5}, 
-                {"label":"Lower", "x":4, "y":5}, 
-                {"label":"Space", "x":5, "y":5}, 
-                {"label":"Space", "x":6, "y":5}, 
-                {"label":"Raise", "x":7, "y":5}, 
-                {"label":"\u2190", "x":8, "y":5}, 
-                {"label":"\u2193", "x":9, "y":5}, 
-                {"label":"\u2191", "x":10, "y":5}, 
-                {"label":"\u2192", "x":11, "y":5}, 
-                {"label":"0", "x":12, "y":5}, 
-                {"label":"00", "x":13, "y":5}, 
-                {"label":".", "x":14, "y":5}, 
-                {"label":"Enter", "x":15, "y":5}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 5},
+                {"matrix": [5, 4], "x": 4, "y": 5},
+                {"matrix": [5, 5], "x": 5, "y": 5},
+                {"matrix": [5, 6], "x": 6, "y": 5},
+                {"matrix": [5, 7], "x": 7, "y": 5},
+                {"matrix": [5, 8], "x": 8, "y": 5},
+                {"matrix": [5, 9], "x": 9, "y": 5},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
         }
     }
 }
diff --git a/keyboards/fluorite/config.h b/keyboards/fluorite/config.h
index 80d16061a4..21c3b72e60 100644
--- a/keyboards/fluorite/config.h
+++ b/keyboards/fluorite/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { D3, D1, D0, D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/fluorite/fluorite.c b/keyboards/fluorite/fluorite.c
deleted file mode 100644
index 7c864fbe7f..0000000000
--- a/keyboards/fluorite/fluorite.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Mafuyu Ihotsuno
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "fluorite.h"
diff --git a/keyboards/fluorite/info.json b/keyboards/fluorite/info.json
index 6a18dd291c..b36190bef1 100644
--- a/keyboards/fluorite/info.json
+++ b/keyboards/fluorite/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/flx/lodestone/config.h b/keyboards/flx/lodestone/config.h
index 97f2434c51..1d22c074e2 100644
--- a/keyboards/flx/lodestone/config.h
+++ b/keyboards/flx/lodestone/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, B7, F0, F1, F4 }
-#define MATRIX_COL_PINS { B2, F5, F6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/flx/lodestone/info.json b/keyboards/flx/lodestone/info.json
index e4b19ca8cd..a7d6a18e86 100644
--- a/keyboards/flx/lodestone/info.json
+++ b/keyboards/flx/lodestone/info.json
@@ -8,370 +8,395 @@
         "pid": "0x4C53",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "F5", "F6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["B3", "B7", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B3,B2)", "x":0, "y":0},
-                {"label":"K01 (B3,F5)", "x":1, "y":0},
-                {"label":"K02 (B3,F6)", "x":2, "y":0},
-                {"label":"K03 (B3,D0)", "x":3, "y":0},
-                {"label":"K04 (B3,D1)", "x":4, "y":0},
-                {"label":"K05 (B3,D2)", "x":5, "y":0},
-                {"label":"K06 (B3,D3)", "x":6, "y":0},
-                {"label":"K07 (B3,D5)", "x":7, "y":0},
-                {"label":"K08 (B3,D4)", "x":8, "y":0},
-                {"label":"K09 (B3,D6)", "x":9, "y":0},
-                {"label":"K0A (B3,D7)", "x":10, "y":0},
-                {"label":"K0B (B3,B4)", "x":11, "y":0},
-                {"label":"K0C (B3,B5)", "x":12, "y":0},
-                {"label":"K0D (B3,B6)", "x":13, "y":0},
-                {"label":"K0E (B3,C6)", "x":14, "y":0},
-                {"label":"K0F (B3,C7)", "x":15, "y":0},
-                {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B7,F5)", "x":1.5, "y":1},
-                {"label":"K12 (B7,F6)", "x":2.5, "y":1},
-                {"label":"K13 (B7,D0)", "x":3.5, "y":1},
-                {"label":"K14 (B7,D1)", "x":4.5, "y":1},
-                {"label":"K15 (B7,D2)", "x":5.5, "y":1},
-                {"label":"K16 (B7,D3)", "x":6.5, "y":1},
-                {"label":"K17 (B7,D5)", "x":7.5, "y":1},
-                {"label":"K18 (B7,D4)", "x":8.5, "y":1},
-                {"label":"K19 (B7,D6)", "x":9.5, "y":1},
-                {"label":"K1A (B7,D7)", "x":10.5, "y":1},
-                {"label":"K1B (B7,B4)", "x":11.5, "y":1},
-                {"label":"K1C (B7,B5)", "x":12.5, "y":1},
-                {"label":"K1D (B7,B6)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (B7,C7)", "x":15, "y":1},
-                {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,D0)", "x":3.75, "y":2},
-                {"label":"K24 (F0,D1)", "x":4.75, "y":2},
-                {"label":"K25 (F0,D2)", "x":5.75, "y":2},
-                {"label":"K26 (F0,D3)", "x":6.75, "y":2},
-                {"label":"K27 (F0,D5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,D4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D6)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D7)", "x":10.75, "y":2},
-                {"label":"K2B (F0,B4)", "x":11.75, "y":2},
-                {"label":"K2C (F0,B5)", "x":12.75, "y":2},
-                {"label":"K2D (F0,B6)", "x":13.75, "y":2, "w":1.25},
-                {"label":"K2F (F0,C7)", "x":15, "y":2},
-                {"label":"K30 (F1,B2)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (F1,F5)", "x":1.25, "y":3},
-                {"label":"K32 (F1,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F1,D0)", "x":3.25, "y":3},
-                {"label":"K34 (F1,D1)", "x":4.25, "y":3},
-                {"label":"K35 (F1,D2)", "x":5.25, "y":3},
-                {"label":"K36 (F1,D3)", "x":6.25, "y":3},
-                {"label":"K37 (F1,D5)", "x":7.25, "y":3},
-                {"label":"K38 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K39 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K3A (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3B (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (F1,C6)", "x":14, "y":3},
-                {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (F4,B6)", "x":13, "y":4},
-                {"label":"K4E (F4,C6)", "x":14, "y":4},
-                {"label":"K4F (F4,C7)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"K00 (B3,B2)", "x":0, "y":0},
-                {"label":"K01 (B3,F5)", "x":1, "y":0},
-                {"label":"K02 (B3,F6)", "x":2, "y":0},
-                {"label":"K03 (B3,D0)", "x":3, "y":0},
-                {"label":"K04 (B3,D1)", "x":4, "y":0},
-                {"label":"K05 (B3,D2)", "x":5, "y":0},
-                {"label":"K06 (B3,D3)", "x":6, "y":0},
-                {"label":"K07 (B3,D5)", "x":7, "y":0},
-                {"label":"K08 (B3,D4)", "x":8, "y":0},
-                {"label":"K09 (B3,D6)", "x":9, "y":0},
-                {"label":"K0A (B3,D7)", "x":10, "y":0},
-                {"label":"K0B (B3,B4)", "x":11, "y":0},
-                {"label":"K0C (B3,B5)", "x":12, "y":0},
-                {"label":"K0D (B3,B6)", "x":13, "y":0, "w":2},
-                {"label":"K0F (B3,C7)", "x":15, "y":0},
-                {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B7,F5)", "x":1.5, "y":1},
-                {"label":"K12 (B7,F6)", "x":2.5, "y":1},
-                {"label":"K13 (B7,D0)", "x":3.5, "y":1},
-                {"label":"K14 (B7,D1)", "x":4.5, "y":1},
-                {"label":"K15 (B7,D2)", "x":5.5, "y":1},
-                {"label":"K16 (B7,D3)", "x":6.5, "y":1},
-                {"label":"K17 (B7,D5)", "x":7.5, "y":1},
-                {"label":"K18 (B7,D4)", "x":8.5, "y":1},
-                {"label":"K19 (B7,D6)", "x":9.5, "y":1},
-                {"label":"K1A (B7,D7)", "x":10.5, "y":1},
-                {"label":"K1B (B7,B4)", "x":11.5, "y":1},
-                {"label":"K1C (B7,B5)", "x":12.5, "y":1},
-                {"label":"K1D (B7,B6)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (B7,C7)", "x":15, "y":1},
-                {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,D0)", "x":3.75, "y":2},
-                {"label":"K24 (F0,D1)", "x":4.75, "y":2},
-                {"label":"K25 (F0,D2)", "x":5.75, "y":2},
-                {"label":"K26 (F0,D3)", "x":6.75, "y":2},
-                {"label":"K27 (F0,D5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,D4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D6)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D7)", "x":10.75, "y":2},
-                {"label":"K2B (F0,B4)", "x":11.75, "y":2},
-                {"label":"K2D (F0,B6)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2F (F0,C7)", "x":15, "y":2},
-                {"label":"K30 (F1,B2)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (F1,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F1,D0)", "x":3.25, "y":3},
-                {"label":"K34 (F1,D1)", "x":4.25, "y":3},
-                {"label":"K35 (F1,D2)", "x":5.25, "y":3},
-                {"label":"K36 (F1,D3)", "x":6.25, "y":3},
-                {"label":"K37 (F1,D5)", "x":7.25, "y":3},
-                {"label":"K38 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K39 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K3A (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3B (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (F1,C6)", "x":14, "y":3},
-                {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (F4,B6)", "x":13, "y":4},
-                {"label":"K4E (F4,C6)", "x":14, "y":4},
-                {"label":"K4F (F4,C7)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"K00 (B3,B2)", "x":0, "y":0},
-                {"label":"K01 (B3,F5)", "x":1, "y":0},
-                {"label":"K02 (B3,F6)", "x":2, "y":0},
-                {"label":"K03 (B3,D0)", "x":3, "y":0},
-                {"label":"K04 (B3,D1)", "x":4, "y":0},
-                {"label":"K05 (B3,D2)", "x":5, "y":0},
-                {"label":"K06 (B3,D3)", "x":6, "y":0},
-                {"label":"K07 (B3,D5)", "x":7, "y":0},
-                {"label":"K08 (B3,D4)", "x":8, "y":0},
-                {"label":"K09 (B3,D6)", "x":9, "y":0},
-                {"label":"K0A (B3,D7)", "x":10, "y":0},
-                {"label":"K0B (B3,B4)", "x":11, "y":0},
-                {"label":"K0C (B3,B5)", "x":12, "y":0},
-                {"label":"K0D (B3,B6)", "x":13, "y":0},
-                {"label":"K0E (B3,C6)", "x":14, "y":0},
-                {"label":"K0F (B3,C7)", "x":15, "y":0},
-                {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B7,F5)", "x":1.5, "y":1},
-                {"label":"K12 (B7,F6)", "x":2.5, "y":1},
-                {"label":"K13 (B7,D0)", "x":3.5, "y":1},
-                {"label":"K14 (B7,D1)", "x":4.5, "y":1},
-                {"label":"K15 (B7,D2)", "x":5.5, "y":1},
-                {"label":"K16 (B7,D3)", "x":6.5, "y":1},
-                {"label":"K17 (B7,D5)", "x":7.5, "y":1},
-                {"label":"K18 (B7,D4)", "x":8.5, "y":1},
-                {"label":"K19 (B7,D6)", "x":9.5, "y":1},
-                {"label":"K1A (B7,D7)", "x":10.5, "y":1},
-                {"label":"K1B (B7,B4)", "x":11.5, "y":1},
-                {"label":"K1C (B7,B5)", "x":12.5, "y":1},
-                {"label":"K1D (B7,B6)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (B7,C7)", "x":15, "y":1},
-                {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,D0)", "x":3.75, "y":2},
-                {"label":"K24 (F0,D1)", "x":4.75, "y":2},
-                {"label":"K25 (F0,D2)", "x":5.75, "y":2},
-                {"label":"K26 (F0,D3)", "x":6.75, "y":2},
-                {"label":"K27 (F0,D5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,D4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D6)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D7)", "x":10.75, "y":2},
-                {"label":"K2B (F0,B4)", "x":11.75, "y":2},
-                {"label":"K2D (F0,B6)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2F (F0,C7)", "x":15, "y":2},
-                {"label":"K30 (F1,B2)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (F1,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F1,D0)", "x":3.25, "y":3},
-                {"label":"K34 (F1,D1)", "x":4.25, "y":3},
-                {"label":"K35 (F1,D2)", "x":5.25, "y":3},
-                {"label":"K36 (F1,D3)", "x":6.25, "y":3},
-                {"label":"K37 (F1,D5)", "x":7.25, "y":3},
-                {"label":"K38 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K39 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K3A (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3B (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (F1,C6)", "x":14, "y":3},
-                {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (F4,B6)", "x":13, "y":4},
-                {"label":"K4E (F4,C6)", "x":14, "y":4},
-                {"label":"K4F (F4,C7)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"K00 (B3,B2)", "x":0, "y":0},
-                {"label":"K01 (B3,F5)", "x":1, "y":0},
-                {"label":"K02 (B3,F6)", "x":2, "y":0},
-                {"label":"K03 (B3,D0)", "x":3, "y":0},
-                {"label":"K04 (B3,D1)", "x":4, "y":0},
-                {"label":"K05 (B3,D2)", "x":5, "y":0},
-                {"label":"K06 (B3,D3)", "x":6, "y":0},
-                {"label":"K07 (B3,D5)", "x":7, "y":0},
-                {"label":"K08 (B3,D4)", "x":8, "y":0},
-                {"label":"K09 (B3,D6)", "x":9, "y":0},
-                {"label":"K0A (B3,D7)", "x":10, "y":0},
-                {"label":"K0B (B3,B4)", "x":11, "y":0},
-                {"label":"K0C (B3,B5)", "x":12, "y":0},
-                {"label":"K0D (B3,B6)", "x":13, "y":0, "w":2},
-                {"label":"K0F (B3,C7)", "x":15, "y":0},
-                {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B7,F5)", "x":1.5, "y":1},
-                {"label":"K12 (B7,F6)", "x":2.5, "y":1},
-                {"label":"K13 (B7,D0)", "x":3.5, "y":1},
-                {"label":"K14 (B7,D1)", "x":4.5, "y":1},
-                {"label":"K15 (B7,D2)", "x":5.5, "y":1},
-                {"label":"K16 (B7,D3)", "x":6.5, "y":1},
-                {"label":"K17 (B7,D5)", "x":7.5, "y":1},
-                {"label":"K18 (B7,D4)", "x":8.5, "y":1},
-                {"label":"K19 (B7,D6)", "x":9.5, "y":1},
-                {"label":"K1A (B7,D7)", "x":10.5, "y":1},
-                {"label":"K1B (B7,B4)", "x":11.5, "y":1},
-                {"label":"K1C (B7,B5)", "x":12.5, "y":1},
-                {"label":"K1F (B7,C7)", "x":15, "y":1},
-                {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,D0)", "x":3.75, "y":2},
-                {"label":"K24 (F0,D1)", "x":4.75, "y":2},
-                {"label":"K25 (F0,D2)", "x":5.75, "y":2},
-                {"label":"K26 (F0,D3)", "x":6.75, "y":2},
-                {"label":"K27 (F0,D5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,D4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D6)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D7)", "x":10.75, "y":2},
-                {"label":"K2B (F0,B4)", "x":11.75, "y":2},
-                {"label":"K2C (F0,B5)", "x":12.75, "y":2},
-                {"label":"K2D (F0,B6)", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K2F (F0,C7)", "x":15, "y":2},
-                {"label":"K30 (F1,B2)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (F1,F5)", "x":1.25, "y":3},
-                {"label":"K32 (F1,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F1,D0)", "x":3.25, "y":3},
-                {"label":"K34 (F1,D1)", "x":4.25, "y":3},
-                {"label":"K35 (F1,D2)", "x":5.25, "y":3},
-                {"label":"K36 (F1,D3)", "x":6.25, "y":3},
-                {"label":"K37 (F1,D5)", "x":7.25, "y":3},
-                {"label":"K38 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K39 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K3A (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3B (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (F1,C6)", "x":14, "y":3},
-                {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (F4,B6)", "x":13, "y":4},
-                {"label":"K4E (F4,C6)", "x":14, "y":4},
-                {"label":"K4F (F4,C7)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"K00 (B3,B2)", "x":0, "y":0},
-                {"label":"K01 (B3,F5)", "x":1, "y":0},
-                {"label":"K02 (B3,F6)", "x":2, "y":0},
-                {"label":"K03 (B3,D0)", "x":3, "y":0},
-                {"label":"K04 (B3,D1)", "x":4, "y":0},
-                {"label":"K05 (B3,D2)", "x":5, "y":0},
-                {"label":"K06 (B3,D3)", "x":6, "y":0},
-                {"label":"K07 (B3,D5)", "x":7, "y":0},
-                {"label":"K08 (B3,D4)", "x":8, "y":0},
-                {"label":"K09 (B3,D6)", "x":9, "y":0},
-                {"label":"K0A (B3,D7)", "x":10, "y":0},
-                {"label":"K0B (B3,B4)", "x":11, "y":0},
-                {"label":"K0C (B3,B5)", "x":12, "y":0},
-                {"label":"K0D (B3,B6)", "x":13, "y":0},
-                {"label":"K0E (B3,C6)", "x":14, "y":0},
-                {"label":"K0F (B3,C7)", "x":15, "y":0},
-                {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B7,F5)", "x":1.5, "y":1},
-                {"label":"K12 (B7,F6)", "x":2.5, "y":1},
-                {"label":"K13 (B7,D0)", "x":3.5, "y":1},
-                {"label":"K14 (B7,D1)", "x":4.5, "y":1},
-                {"label":"K15 (B7,D2)", "x":5.5, "y":1},
-                {"label":"K16 (B7,D3)", "x":6.5, "y":1},
-                {"label":"K17 (B7,D5)", "x":7.5, "y":1},
-                {"label":"K18 (B7,D4)", "x":8.5, "y":1},
-                {"label":"K19 (B7,D6)", "x":9.5, "y":1},
-                {"label":"K1A (B7,D7)", "x":10.5, "y":1},
-                {"label":"K1B (B7,B4)", "x":11.5, "y":1},
-                {"label":"K1C (B7,B5)", "x":12.5, "y":1},
-                {"label":"K1F (B7,C7)", "x":15, "y":1},
-                {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,D0)", "x":3.75, "y":2},
-                {"label":"K24 (F0,D1)", "x":4.75, "y":2},
-                {"label":"K25 (F0,D2)", "x":5.75, "y":2},
-                {"label":"K26 (F0,D3)", "x":6.75, "y":2},
-                {"label":"K27 (F0,D5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,D4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D6)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D7)", "x":10.75, "y":2},
-                {"label":"K2B (F0,B4)", "x":11.75, "y":2},
-                {"label":"K2C (F0,B5)", "x":12.75, "y":2},
-                {"label":"K2D (F0,B6)", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K2F (F0,C7)", "x":15, "y":2},
-                {"label":"K30 (F1,B2)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (F1,F5)", "x":1.25, "y":3},
-                {"label":"K32 (F1,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F1,D0)", "x":3.25, "y":3},
-                {"label":"K34 (F1,D1)", "x":4.25, "y":3},
-                {"label":"K35 (F1,D2)", "x":5.25, "y":3},
-                {"label":"K36 (F1,D3)", "x":6.25, "y":3},
-                {"label":"K37 (F1,D5)", "x":7.25, "y":3},
-                {"label":"K38 (F1,D4)", "x":8.25, "y":3},
-                {"label":"K39 (F1,D6)", "x":9.25, "y":3},
-                {"label":"K3A (F1,D7)", "x":10.25, "y":3},
-                {"label":"K3B (F1,B4)", "x":11.25, "y":3},
-                {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (F1,C6)", "x":14, "y":3},
-                {"label":"K3F (F1,C7)", "x":15, "y":3},
-                {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (F4,B6)", "x":13, "y":4},
-                {"label":"K4E (F4,C6)", "x":14, "y":4},
-                {"label":"K4F (F4,C7)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/flx/lodestone/lodestone.c b/keyboards/flx/lodestone/lodestone.c
deleted file mode 100644
index bb0df70cc7..0000000000
--- a/keyboards/flx/lodestone/lodestone.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Shaun Mitchell (Flex)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "lodestone.h"
diff --git a/keyboards/flx/lodestone/lodestone.h b/keyboards/flx/lodestone/lodestone.h
deleted file mode 100644
index 2e05b67deb..0000000000
--- a/keyboards/flx/lodestone/lodestone.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright 2020 Shaun Mitchell (Flex)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// standard 65% layout ANSI + ISO
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  K1D,   K1F,   \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3E, K3F,   \
-    K40,  K41,  K42,              K46,               K4A,   K4B,     K4D, K4E, K4F    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,     K0D,  K0F,   \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  K1D,   K1F,   \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,  K2F,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3E, K3F,   \
-    K40,  K41,  K42,              K46,               K4A,   K4B,     K4D, K4E, K4F    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  K1D,   K1F,   \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,  K2F,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3E, K3F,   \
-    K40,  K41,  K42,              K46,               K4A,   K4B,     K4D, K4E, K4F    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,     K0D,  K0F,   \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1F,   \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3E, K3F,   \
-    K40,  K41,  K42,              K46,               K4A,   K4B,     K4D, K4E, K4F    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, ___, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1F,   \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3E, K3F,   \
-    K40,  K41,  K42,              K46,               K4A,   K4B,     K4D, K4E, K4F    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, ___, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}
diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h
index f0c8fe016a..963824b82c 100644
--- a/keyboards/flx/virgo/config.h
+++ b/keyboards/flx/virgo/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 0
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -50,4 +32,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
     #define RGBLIGHT_EFFECT_RGB_TEST
     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json
index 3464c98976..3a022fcf37 100644
--- a/keyboards/flx/virgo/info.json
+++ b/keyboards/flx/virgo/info.json
@@ -8,10 +8,18 @@
         "pid": "0x5647",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/flxlb/zplit/config.h b/keyboards/flxlb/zplit/config.h
index 83dcb4fe42..55edfade82 100644
--- a/keyboards/flxlb/zplit/config.h
+++ b/keyboards/flxlb/zplit/config.h
@@ -18,14 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, F5, F4, F1 }
-#define MATRIX_COL_PINS { B2, B3, D6, D7, B4, B5 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 // #define USE_I2C
 #define SPLIT_USB_DETECT
@@ -37,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 16
 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8}
 #define RGBLED_SPLIT { 8, 8 }
diff --git a/keyboards/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json
index 2cfb64b793..544bd4e385 100644
--- a/keyboards/flxlb/zplit/info.json
+++ b/keyboards/flxlb/zplit/info.json
@@ -8,11 +8,19 @@
         "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"}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/flxlb/zplit/zplit.c b/keyboards/flxlb/zplit/zplit.c
deleted file mode 100644
index 25956640a7..0000000000
--- a/keyboards/flxlb/zplit/zplit.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 FluxLab
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#include "zplit.h"
diff --git a/keyboards/flygone60/rev3/config.h b/keyboards/flygone60/rev3/config.h
index 409989896d..339cf3c782 100644
--- a/keyboards/flygone60/rev3/config.h
+++ b/keyboards/flygone60/rev3/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D3, D5, B7, F1}
-#define MATRIX_COL_PINS { F0, E6, B1, B2, B3, B0, D4, D6, D7, B4, B5, B6, C6, C7}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/flygone60/rev3/info.json b/keyboards/flygone60/rev3/info.json
index 782352d293..84590c322b 100644
--- a/keyboards/flygone60/rev3/info.json
+++ b/keyboards/flygone60/rev3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F0", "E6", "B1", "B2", "B3", "B0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["D2", "D3", "D5", "B7", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi_arrow"],
diff --git a/keyboards/flygone60/rev3/rev3.c b/keyboards/flygone60/rev3/rev3.c
deleted file mode 100644
index 0de52610ae..0000000000
--- a/keyboards/flygone60/rev3/rev3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 ShandonCodes
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev3.h"
diff --git a/keyboards/foostan/cornelius/config.h b/keyboards/foostan/cornelius/config.h
index 0083f6cce0..bb5de46d11 100644
--- a/keyboards/foostan/cornelius/config.h
+++ b/keyboards/foostan/cornelius/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, C7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C6, B6, B5, B4, D7, D6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/foostan/cornelius/cornelius.c b/keyboards/foostan/cornelius/cornelius.c
deleted file mode 100644
index 6ff9555d37..0000000000
--- a/keyboards/foostan/cornelius/cornelius.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 foostan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "cornelius.h"
diff --git a/keyboards/foostan/cornelius/info.json b/keyboards/foostan/cornelius/info.json
index 2359940dc6..b5613fe44c 100644
--- a/keyboards/foostan/cornelius/info.json
+++ b/keyboards/foostan/cornelius/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["B0", "B1", "B2", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts":{
diff --git a/keyboards/foostan/cornelius/keymaps/hvp/config.h b/keyboards/foostan/cornelius/keymaps/hvp/config.h
index ea23adfab5..a2a492ff27 100644
--- a/keyboards/foostan/cornelius/keymaps/hvp/config.h
+++ b/keyboards/foostan/cornelius/keymaps/hvp/config.h
@@ -17,4 +17,3 @@
 #pragma once
 #define TAPPING_TERM 200
 #define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/for_science/info.json b/keyboards/for_science/info.json
index 2864385fb0..a1f49342df 100644
--- a/keyboards/for_science/info.json
+++ b/keyboards/for_science/info.json
@@ -29,61 +29,61 @@
     "layouts": {
         "LAYOUT_split_4x5_3": {
             "layout": [
-                { "label": "L00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "L01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "label": "L02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "L03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "label": "L04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "L00", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "L01", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "L02", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "L03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "L04", "matrix": [0, 4], "x": 4, "y": 0 },
 
-                { "label": "R00", "matrix": [5, 0], "w": 1, "x": 6.25, "y": 0 },
-                { "label": "R01", "matrix": [5, 1], "w": 1, "x": 7.25, "y": 0 },
-                { "label": "R02", "matrix": [5, 2], "w": 1, "x": 8.25, "y": 0 },
-                { "label": "R03", "matrix": [5, 3], "w": 1, "x": 9.25, "y": 0 },
-                { "label": "R04", "matrix": [5, 4], "w": 1, "x": 10.25, "y": 0 },
+                { "label": "R00", "matrix": [5, 0], "x": 6.25, "y": 0 },
+                { "label": "R01", "matrix": [5, 1], "x": 7.25, "y": 0 },
+                { "label": "R02", "matrix": [5, 2], "x": 8.25, "y": 0 },
+                { "label": "R03", "matrix": [5, 3], "x": 9.25, "y": 0 },
+                { "label": "R04", "matrix": [5, 4], "x": 10.25, "y": 0 },
 
-                { "label": "L10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
-                { "label": "L11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 },
-                { "label": "L12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
-                { "label": "L13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 },
-                { "label": "L14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 },
+                { "label": "L10", "matrix": [1, 0], "x": 0, "y": 1 },
+                { "label": "L11", "matrix": [1, 1], "x": 1, "y": 1 },
+                { "label": "L12", "matrix": [1, 2], "x": 2, "y": 1 },
+                { "label": "L13", "matrix": [1, 3], "x": 3, "y": 1 },
+                { "label": "L14", "matrix": [1, 4], "x": 4, "y": 1 },
 
-                { "label": "R10", "matrix": [6, 0], "w": 1, "x": 6.25, "y": 1 },
-                { "label": "R11", "matrix": [6, 1], "w": 1, "x": 7.25, "y": 1 },
-                { "label": "R12", "matrix": [6, 2], "w": 1, "x": 8.25, "y": 1 },
-                { "label": "R13", "matrix": [6, 3], "w": 1, "x": 9.25, "y": 1 },
-                { "label": "R14", "matrix": [6, 4], "w": 1, "x": 10.25, "y": 1 },
+                { "label": "R10", "matrix": [6, 0], "x": 6.25, "y": 1 },
+                { "label": "R11", "matrix": [6, 1], "x": 7.25, "y": 1 },
+                { "label": "R12", "matrix": [6, 2], "x": 8.25, "y": 1 },
+                { "label": "R13", "matrix": [6, 3], "x": 9.25, "y": 1 },
+                { "label": "R14", "matrix": [6, 4], "x": 10.25, "y": 1 },
 
-                { "label": "L20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
-                { "label": "L21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
-                { "label": "L22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
-                { "label": "L23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 },
-                { "label": "L24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 },
+                { "label": "L20", "matrix": [2, 0], "x": 0, "y": 2 },
+                { "label": "L21", "matrix": [2, 1], "x": 1, "y": 2 },
+                { "label": "L22", "matrix": [2, 2], "x": 2, "y": 2 },
+                { "label": "L23", "matrix": [2, 3], "x": 3, "y": 2 },
+                { "label": "L24", "matrix": [2, 4], "x": 4, "y": 2 },
 
-                { "label": "R20", "matrix": [7, 0], "w": 1, "x": 6.25, "y": 2 },
-                { "label": "R21", "matrix": [7, 1], "w": 1, "x": 7.25, "y": 2 },
-                { "label": "R22", "matrix": [7, 2], "w": 1, "x": 8.25, "y": 2 },
-                { "label": "R23", "matrix": [7, 3], "w": 1, "x": 9.25, "y": 2 },
-                { "label": "R24", "matrix": [7, 4], "w": 1, "x": 10.25, "y": 2 },
+                { "label": "R20", "matrix": [7, 0], "x": 6.25, "y": 2 },
+                { "label": "R21", "matrix": [7, 1], "x": 7.25, "y": 2 },
+                { "label": "R22", "matrix": [7, 2], "x": 8.25, "y": 2 },
+                { "label": "R23", "matrix": [7, 3], "x": 9.25, "y": 2 },
+                { "label": "R24", "matrix": [7, 4], "x": 10.25, "y": 2 },
 
-                { "label": "L30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
-                { "label": "L31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 },
-                { "label": "L32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 },
-                { "label": "L33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 },
-                { "label": "L34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 },
+                { "label": "L30", "matrix": [3, 0], "x": 0, "y": 3 },
+                { "label": "L31", "matrix": [3, 1], "x": 1, "y": 3 },
+                { "label": "L32", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "label": "L33", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "L34", "matrix": [3, 4], "x": 4, "y": 3 },
 
-                { "label": "R30", "matrix": [8, 0], "w": 1, "x": 6.25, "y": 3 },
-                { "label": "R31", "matrix": [8, 1], "w": 1, "x": 7.25, "y": 3 },
-                { "label": "R32", "matrix": [8, 2], "w": 1, "x": 8.25, "y": 3 },
-                { "label": "R33", "matrix": [8, 3], "w": 1, "x": 9.25, "y": 3 },
-                { "label": "R34", "matrix": [8, 4], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "R30", "matrix": [8, 0], "x": 6.25, "y": 3 },
+                { "label": "R31", "matrix": [8, 1], "x": 7.25, "y": 3 },
+                { "label": "R32", "matrix": [8, 2], "x": 8.25, "y": 3 },
+                { "label": "R33", "matrix": [8, 3], "x": 9.25, "y": 3 },
+                { "label": "R34", "matrix": [8, 4], "x": 10.25, "y": 3 },
 
-                { "label": "LT1", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 },
-                { "label": "LT2", "matrix": [4, 3], "w": 1, "x": 3, "y": 4 },
-                { "label": "LT3", "matrix": [4, 4], "w": 1, "x": 4, "y": 4 },
+                { "label": "LT1", "matrix": [4, 2], "x": 2, "y": 4 },
+                { "label": "LT2", "matrix": [4, 3], "x": 3, "y": 4 },
+                { "label": "LT3", "matrix": [4, 4], "x": 4, "y": 4 },
 
-                { "label": "RT1", "matrix": [9, 0], "w": 1, "x": 6.25, "y": 4 },
-                { "label": "RT2", "matrix": [9, 1], "w": 1, "x": 7.25, "y": 4 },
-                { "label": "RT3", "matrix": [9, 2], "w": 1, "x": 8.25, "y": 4 }
+                { "label": "RT1", "matrix": [9, 0], "x": 6.25, "y": 4 },
+                { "label": "RT2", "matrix": [9, 1], "x": 7.25, "y": 4 },
+                { "label": "RT3", "matrix": [9, 2], "x": 8.25, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/fortitude60/fortitude60.c b/keyboards/fortitude60/fortitude60.c
deleted file mode 100644
index d35b286d11..0000000000
--- a/keyboards/fortitude60/fortitude60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "fortitude60.h"
diff --git a/keyboards/fortitude60/fortitude60.h b/keyboards/fortitude60/fortitude60.h
deleted file mode 100644
index 0ad157f2d2..0000000000
--- a/keyboards/fortitude60/fortitude60.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_fortitude60_rev1
-    #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/fortitude60/keymaps/default/rules.mk b/keyboards/fortitude60/keymaps/default/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/fortitude60/keymaps/default/rules.mk
+++ /dev/null
diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/config.h
index 8bd73e135e..d13ea1c845 100644
--- a/keyboards/fortitude60/rev1/config.h
+++ b/keyboards/fortitude60/rev1/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D3, B7, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, B3, B2, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 //#define EE_HANDS
 
 #define SPLIT_USB_DETECT
@@ -37,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #ifdef RGBLIGHT_ENABLE
-  #define RGB_DI_PIN B5
   #define RGBLED_NUM 18    // Number of LEDs */
 #endif
 /*
diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/info.json
index e2aa377324..21774d1e82 100644
--- a/keyboards/fortitude60/rev1/info.json
+++ b/keyboards/fortitude60/rev1/info.json
@@ -8,10 +8,18 @@
     "pid": "0x1156",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "B3", "B2", "B1"],
+    "rows": ["D1", "D0", "D3", "B7", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5",
     "levels": 9
   },
+  "ws2812": {
+    "pin": "B5"
+  },
   "split": {
     "soft_serial_pin": "D2"
   },
diff --git a/keyboards/fortitude60/rev1/rev1.c b/keyboards/fortitude60/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/fortitude60/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/fortitude60/rev1/rev1.h b/keyboards/fortitude60/rev1/rev1.h
index ed62b2683e..7445cfa906 100644
--- a/keyboards/fortitude60/rev1/rev1.h
+++ b/keyboards/fortitude60/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "fortitude60.h"
-
 #include "quantum.h"
 
 // Standard Keymap
diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h
index 1b8e4a8fd0..41bd1c1ce3 100644
--- a/keyboards/foxlab/key65/hotswap/config.h
+++ b/keyboards/foxlab/key65/hotswap/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D1, D0, D3, B3 }
-#define MATRIX_COL_PINS { F5, F4, F1, F0, B0, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 8
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/foxlab/key65/hotswap/hotswap.c b/keyboards/foxlab/key65/hotswap/hotswap.c
deleted file mode 100644
index 31fb011ad5..0000000000
--- a/keyboards/foxlab/key65/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jumail Mundekkat / MxBlue
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hotswap.h"
diff --git a/keyboards/foxlab/key65/hotswap/info.json b/keyboards/foxlab/key65/hotswap/info.json
index 712897a7f3..96a1f0f3b9 100644
--- a/keyboards/foxlab/key65/hotswap/info.json
+++ b/keyboards/foxlab/key65/hotswap/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "F1", "F0", "B0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D2", "D1", "D0", "D3", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "scroll_lock": "E6",
         "on_state": 0
diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h
index 159e0cff79..23f868d2ac 100644
--- a/keyboards/foxlab/key65/universal/config.h
+++ b/keyboards/foxlab/key65/universal/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, F0, F4, F1 }
-#define MATRIX_COL_PINS { B1, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 6
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/foxlab/key65/universal/info.json b/keyboards/foxlab/key65/universal/info.json
index a886275ff5..ef7c4386c8 100644
--- a/keyboards/foxlab/key65/universal/info.json
+++ b/keyboards/foxlab/key65/universal/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B0"],
+        "rows": ["D0", "D1", "F0", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "scroll_lock": "E6",
         "on_state": 0
@@ -22,295 +30,311 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"K00 (D0,B1)", "x":0, "y":0},
-                {"label":"K01 (D0,F5)", "x":1, "y":0},
-                {"label":"K02 (D0,F6)", "x":2, "y":0},
-                {"label":"K03 (D0,F7)", "x":3, "y":0},
-                {"label":"K04 (D0,C7)", "x":4, "y":0},
-                {"label":"K05 (D0,C6)", "x":5, "y":0},
-                {"label":"K06 (D0,B6)", "x":6, "y":0},
-                {"label":"K07 (D0,B5)", "x":7, "y":0},
-                {"label":"K08 (D0,B4)", "x":8, "y":0},
-                {"label":"K09 (D0,D7)", "x":9, "y":0},
-                {"label":"K0A (D0,D6)", "x":10, "y":0},
-                {"label":"K0B (D0,D4)", "x":11, "y":0},
-                {"label":"K0C (D0,D5)", "x":12, "y":0},
-                {"label":"K0D (D0,D3)", "x":13, "y":0},
-                {"label":"K0E (D0,D2)", "x":14, "y":0},
-                {"label":"K0F (D0,B0)", "x":15, "y":0},
-                {"label":"K10 (D1,B1)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (D1,F5)", "x":1.5, "y":1},
-                {"label":"K12 (D1,F6)", "x":2.5, "y":1},
-                {"label":"K13 (D1,F7)", "x":3.5, "y":1},
-                {"label":"K14 (D1,C7)", "x":4.5, "y":1},
-                {"label":"K15 (D1,C6)", "x":5.5, "y":1},
-                {"label":"K16 (D1,B6)", "x":6.5, "y":1},
-                {"label":"K17 (D1,B5)", "x":7.5, "y":1},
-                {"label":"K18 (D1,B4)", "x":8.5, "y":1},
-                {"label":"K19 (D1,D7)", "x":9.5, "y":1},
-                {"label":"K1A (D1,D6)", "x":10.5, "y":1},
-                {"label":"K1B (D1,D4)", "x":11.5, "y":1},
-                {"label":"K1C (D1,D5)", "x":12.5, "y":1},
-                {"label":"K1D (D1,D3)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (D1,B0)", "x":15, "y":1},
-                {"label":"K20 (F0,B1)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,F7)", "x":3.75, "y":2},
-                {"label":"K24 (F0,C7)", "x":4.75, "y":2},
-                {"label":"K25 (F0,C6)", "x":5.75, "y":2},
-                {"label":"K26 (F0,B6)", "x":6.75, "y":2},
-                {"label":"K27 (F0,B5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,B4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D7)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D6)", "x":10.75, "y":2},
-                {"label":"K2B (F0,D4)", "x":11.75, "y":2},
-                {"label":"K2D (F0,D3)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2F (F0,B0)", "x":15, "y":2},
-                {"label":"K30 (F4,B1)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (F4,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F4,F7)", "x":3.25, "y":3},
-                {"label":"K34 (F4,C7)", "x":4.25, "y":3},
-                {"label":"K35 (F4,C6)", "x":5.25, "y":3},
-                {"label":"K36 (F4,B6)", "x":6.25, "y":3},
-                {"label":"K37 (F4,B5)", "x":7.25, "y":3},
-                {"label":"K38 (F4,B4)", "x":8.25, "y":3},
-                {"label":"K39 (F4,D7)", "x":9.25, "y":3},
-                {"label":"K3A (F4,D6)", "x":10.25, "y":3},
-                {"label":"K3B (F4,D4)", "x":11.25, "y":3},
-                {"label":"K3C (F4,D5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (F4,D3)", "x":14, "y":3},
-                {"label":"K3F (F4,B0)", "x":15, "y":3},
-                {"label":"K40 (F1,B1)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F1,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F1,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (F1,B6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (F1,D6)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F1,D4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (F1,D5)", "x":13, "y":4},
-                {"label":"K4D (F1,D3)", "x":14, "y":4},
-                {"label":"K4F (F1,B0)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                {"label":"K00 (D0,B1)", "x":0, "y":0},
-                {"label":"K01 (D0,F5)", "x":1, "y":0},
-                {"label":"K02 (D0,F6)", "x":2, "y":0},
-                {"label":"K03 (D0,F7)", "x":3, "y":0},
-                {"label":"K04 (D0,C7)", "x":4, "y":0},
-                {"label":"K05 (D0,C6)", "x":5, "y":0},
-                {"label":"K06 (D0,B6)", "x":6, "y":0},
-                {"label":"K07 (D0,B5)", "x":7, "y":0},
-                {"label":"K08 (D0,B4)", "x":8, "y":0},
-                {"label":"K09 (D0,D7)", "x":9, "y":0},
-                {"label":"K0A (D0,D6)", "x":10, "y":0},
-                {"label":"K0B (D0,D4)", "x":11, "y":0},
-                {"label":"K0C (D0,D5)", "x":12, "y":0},
-                {"label":"K0D (D0,D3)", "x":13, "y":0},
-                {"label":"K0E (D0,D2)", "x":14, "y":0},
-                {"label":"K0F (D0,B0)", "x":15, "y":0},
-                {"label":"K10 (D1,B1)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (D1,F5)", "x":1.5, "y":1},
-                {"label":"K12 (D1,F6)", "x":2.5, "y":1},
-                {"label":"K13 (D1,F7)", "x":3.5, "y":1},
-                {"label":"K14 (D1,C7)", "x":4.5, "y":1},
-                {"label":"K15 (D1,C6)", "x":5.5, "y":1},
-                {"label":"K16 (D1,B6)", "x":6.5, "y":1},
-                {"label":"K17 (D1,B5)", "x":7.5, "y":1},
-                {"label":"K18 (D1,B4)", "x":8.5, "y":1},
-                {"label":"K19 (D1,D7)", "x":9.5, "y":1},
-                {"label":"K1A (D1,D6)", "x":10.5, "y":1},
-                {"label":"K1B (D1,D4)", "x":11.5, "y":1},
-                {"label":"K1C (D1,D5)", "x":12.5, "y":1},
-                {"label":"K1D (D1,D3)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (D1,B0)", "x":15, "y":1},
-                {"label":"K20 (F0,B1)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,F7)", "x":3.75, "y":2},
-                {"label":"K24 (F0,C7)", "x":4.75, "y":2},
-                {"label":"K25 (F0,C6)", "x":5.75, "y":2},
-                {"label":"K26 (F0,B6)", "x":6.75, "y":2},
-                {"label":"K27 (F0,B5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,B4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D7)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D6)", "x":10.75, "y":2},
-                {"label":"K2B (F0,D4)", "x":11.75, "y":2},
-                {"label":"K2D (F0,D3)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2F (F0,B0)", "x":15, "y":2},
-                {"label":"K30 (F4,B1)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (F4,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F4,F7)", "x":3.25, "y":3},
-                {"label":"K34 (F4,C7)", "x":4.25, "y":3},
-                {"label":"K35 (F4,C6)", "x":5.25, "y":3},
-                {"label":"K36 (F4,B6)", "x":6.25, "y":3},
-                {"label":"K37 (F4,B5)", "x":7.25, "y":3},
-                {"label":"K38 (F4,B4)", "x":8.25, "y":3},
-                {"label":"K39 (F4,D7)", "x":9.25, "y":3},
-                {"label":"K3A (F4,D6)", "x":10.25, "y":3},
-                {"label":"K3B (F4,D4)", "x":11.25, "y":3},
-                {"label":"K3C (F4,D5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (F4,D3)", "x":14, "y":3},
-                {"label":"K3F (F4,B0)", "x":15, "y":3},
-                {"label":"K40 (F1,B1)", "x":0, "y":4, "w":1.5},
-                {"label":"K41 (F1,F5)", "x":1.5, "y":4},
-                {"label":"K42 (F1,F6)", "x":2.5, "y":4, "w":1.5},
-                {"label":"K46 (F1,B6)", "x":4, "y":4, "w":7},
-                {"label":"K4A (F1,D6)", "x":11, "y":4, "w":1.5},
-                {"label":"K4C (F1,D5)", "x":13, "y":4},
-                {"label":"K4D (F1,D3)", "x":14, "y":4},
-                {"label":"K4F (F1,B0)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_iso_all": {
             "layout": [
-                {"label":"K00 (D0,B1)", "x":0, "y":0},
-                {"label":"K01 (D0,F5)", "x":1, "y":0},
-                {"label":"K02 (D0,F6)", "x":2, "y":0},
-                {"label":"K03 (D0,F7)", "x":3, "y":0},
-                {"label":"K04 (D0,C7)", "x":4, "y":0},
-                {"label":"K05 (D0,C6)", "x":5, "y":0},
-                {"label":"K06 (D0,B6)", "x":6, "y":0},
-                {"label":"K07 (D0,B5)", "x":7, "y":0},
-                {"label":"K08 (D0,B4)", "x":8, "y":0},
-                {"label":"K09 (D0,D7)", "x":9, "y":0},
-                {"label":"K0A (D0,D6)", "x":10, "y":0},
-                {"label":"K0B (D0,D4)", "x":11, "y":0},
-                {"label":"K0C (D0,D5)", "x":12, "y":0},
-                {"label":"K0D (D0,D3)", "x":13, "y":0},
-                {"label":"K0E (D0,D2)", "x":14, "y":0},
-                {"label":"K0F (D0,B0)", "x":15, "y":0},
-                {"label":"K10 (D1,B1)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (D1,F5)", "x":1.5, "y":1},
-                {"label":"K12 (D1,F6)", "x":2.5, "y":1},
-                {"label":"K13 (D1,F7)", "x":3.5, "y":1},
-                {"label":"K14 (D1,C7)", "x":4.5, "y":1},
-                {"label":"K15 (D1,C6)", "x":5.5, "y":1},
-                {"label":"K16 (D1,B6)", "x":6.5, "y":1},
-                {"label":"K17 (D1,B5)", "x":7.5, "y":1},
-                {"label":"K18 (D1,B4)", "x":8.5, "y":1},
-                {"label":"K19 (D1,D7)", "x":9.5, "y":1},
-                {"label":"K1A (D1,D6)", "x":10.5, "y":1},
-                {"label":"K1B (D1,D4)", "x":11.5, "y":1},
-                {"label":"K1C (D1,D5)", "x":12.5, "y":1},
-                {"label":"K1F (D1,B0)", "x":15, "y":1},
-                {"label":"K20 (F0,B1)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,F7)", "x":3.75, "y":2},
-                {"label":"K24 (F0,C7)", "x":4.75, "y":2},
-                {"label":"K25 (F0,C6)", "x":5.75, "y":2},
-                {"label":"K26 (F0,B6)", "x":6.75, "y":2},
-                {"label":"K27 (F0,B5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,B4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D7)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D6)", "x":10.75, "y":2},
-                {"label":"K2B (F0,D4)", "x":11.75, "y":2},
-                {"label":"K1D (D1,D3)", "x":12.75, "y":2},
-                {"label":"K2D (F0,D3)", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K2F (F0,B0)", "x":15, "y":2},
-                {"label":"K30 (F4,B1)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (F4,F5)", "x":1.25, "y":3},
-                {"label":"K32 (F4,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F4,F7)", "x":3.25, "y":3},
-                {"label":"K34 (F4,C7)", "x":4.25, "y":3},
-                {"label":"K35 (F4,C6)", "x":5.25, "y":3},
-                {"label":"K36 (F4,B6)", "x":6.25, "y":3},
-                {"label":"K37 (F4,B5)", "x":7.25, "y":3},
-                {"label":"K38 (F4,B4)", "x":8.25, "y":3},
-                {"label":"K39 (F4,D7)", "x":9.25, "y":3},
-                {"label":"K3A (F4,D6)", "x":10.25, "y":3},
-                {"label":"K3B (F4,D4)", "x":11.25, "y":3},
-                {"label":"K3C (F4,D5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (F4,D3)", "x":14, "y":3},
-                {"label":"K3F (F4,B0)", "x":15, "y":3},
-                {"label":"K40 (F1,B1)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F1,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F1,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K44 (F1,C7)", "x":3.75, "y":4, "w":2.25},
-                {"label":"K46 (F1,B6)", "x":6, "y":4, "w":1.25},
-                {"label":"K48 (F1,B4)", "x":7.25, "y":4, "w":2.75},
-                {"label":"K4A (F1,D6)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F1,D4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (F1,D5)", "x":13, "y":4},
-                {"label":"K4D (F1,D3)", "x":14, "y":4},
-                {"label":"K4F (F1,B0)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (D0,B1)", "x":0, "y":0},
-                {"label":"K01 (D0,F5)", "x":1, "y":0},
-                {"label":"K02 (D0,F6)", "x":2, "y":0},
-                {"label":"K03 (D0,F7)", "x":3, "y":0},
-                {"label":"K04 (D0,C7)", "x":4, "y":0},
-                {"label":"K05 (D0,C6)", "x":5, "y":0},
-                {"label":"K06 (D0,B6)", "x":6, "y":0},
-                {"label":"K07 (D0,B5)", "x":7, "y":0},
-                {"label":"K08 (D0,B4)", "x":8, "y":0},
-                {"label":"K09 (D0,D7)", "x":9, "y":0},
-                {"label":"K0A (D0,D6)", "x":10, "y":0},
-                {"label":"K0B (D0,D4)", "x":11, "y":0},
-                {"label":"K0C (D0,D5)", "x":12, "y":0},
-                {"label":"K0D (D0,D3)", "x":13, "y":0},
-                {"label":"K0E (D0,D2)", "x":14, "y":0},
-                {"label":"K0F (D0,B0)", "x":15, "y":0},
-                {"label":"K10 (D1,B1)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (D1,F5)", "x":1.5, "y":1},
-                {"label":"K12 (D1,F6)", "x":2.5, "y":1},
-                {"label":"K13 (D1,F7)", "x":3.5, "y":1},
-                {"label":"K14 (D1,C7)", "x":4.5, "y":1},
-                {"label":"K15 (D1,C6)", "x":5.5, "y":1},
-                {"label":"K16 (D1,B6)", "x":6.5, "y":1},
-                {"label":"K17 (D1,B5)", "x":7.5, "y":1},
-                {"label":"K18 (D1,B4)", "x":8.5, "y":1},
-                {"label":"K19 (D1,D7)", "x":9.5, "y":1},
-                {"label":"K1A (D1,D6)", "x":10.5, "y":1},
-                {"label":"K1B (D1,D4)", "x":11.5, "y":1},
-                {"label":"K1C (D1,D5)", "x":12.5, "y":1},
-                {"label":"K1D (D1,D3)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (D1,B0)", "x":15, "y":1},
-                {"label":"K20 (F0,B1)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (F0,F5)", "x":1.75, "y":2},
-                {"label":"K22 (F0,F6)", "x":2.75, "y":2},
-                {"label":"K23 (F0,F7)", "x":3.75, "y":2},
-                {"label":"K24 (F0,C7)", "x":4.75, "y":2},
-                {"label":"K25 (F0,C6)", "x":5.75, "y":2},
-                {"label":"K26 (F0,B6)", "x":6.75, "y":2},
-                {"label":"K27 (F0,B5)", "x":7.75, "y":2},
-                {"label":"K28 (F0,B4)", "x":8.75, "y":2},
-                {"label":"K29 (F0,D7)", "x":9.75, "y":2},
-                {"label":"K2A (F0,D6)", "x":10.75, "y":2},
-                {"label":"K2B (F0,D4)", "x":11.75, "y":2},
-                {"label":"K2D (F0,D3)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2F (F0,B0)", "x":15, "y":2},
-                {"label":"K30 (F4,B1)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (F4,F5)", "x":1.25, "y":3},
-                {"label":"K32 (F4,F6)", "x":2.25, "y":3},
-                {"label":"K33 (F4,F7)", "x":3.25, "y":3},
-                {"label":"K34 (F4,C7)", "x":4.25, "y":3},
-                {"label":"K35 (F4,C6)", "x":5.25, "y":3},
-                {"label":"K36 (F4,B6)", "x":6.25, "y":3},
-                {"label":"K37 (F4,B5)", "x":7.25, "y":3},
-                {"label":"K38 (F4,B4)", "x":8.25, "y":3},
-                {"label":"K39 (F4,D7)", "x":9.25, "y":3},
-                {"label":"K3A (F4,D6)", "x":10.25, "y":3},
-                {"label":"K3B (F4,D4)", "x":11.25, "y":3},
-                {"label":"K3C (F4,D5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (F4,D3)", "x":14, "y":3},
-                {"label":"K3F (F4,B0)", "x":15, "y":3},
-                {"label":"K40 (F1,B1)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (F1,F5)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (F1,F6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K44 (F1,C7)", "x":3.75, "y":4, "w":2.25},
-                {"label":"K46 (F1,B6)", "x":6, "y":4, "w":1.25},
-                {"label":"K48 (F1,B4)", "x":7.25, "y":4, "w":2.75},
-                {"label":"K4A (F1,D6)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (F1,D4)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (F1,D5)", "x":13, "y":4},
-                {"label":"K4D (F1,D3)", "x":14, "y":4},
-                {"label":"K4F (F1,B0)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/foxlab/key65/universal/universal.c b/keyboards/foxlab/key65/universal/universal.c
deleted file mode 100644
index 5fa9e8f171..0000000000
--- a/keyboards/foxlab/key65/universal/universal.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jumail Mundekkat / MxBlue
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "universal.h"
diff --git a/keyboards/foxlab/key65/universal/universal.h b/keyboards/foxlab/key65/universal/universal.h
deleted file mode 100644
index 9d92030c81..0000000000
--- a/keyboards/foxlab/key65/universal/universal.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2020 Jumail Mundekkat / MxBlue
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,     K2D,    K2F,   \
-       K30,    K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3D, K3F,   \
-    K40,  K41,  K42,                K46,              K4A,  K4B,     K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, K2F   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, K3F   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   KC_NO, K4F   }, \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,     K2D,    K2F,   \
-       K30,    K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3D, K3F,   \
-    K40,  K41,  K42,                K46,                    K4B,     K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, K2F   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, K3F   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, KC_NO, K4B,   K4C,   K4D,   KC_NO, K4F   }, \
-}
-
-#define LAYOUT_iso_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D,  K2D,  K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3D, K3F,   \
-    K40,  K41,  K42,          K44,  K46,  K48,        K4A,  K4B,     K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, K2F   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, K3F   }, \
-    { K40,   K41,   K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   KC_NO, K4F   }, \
-}
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,     K2D,    K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,   K3D, K3F,   \
-    K40,  K41,  K42,          K44,  K46,  K48,        K4A,  K4B,     K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, K2F   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, K3F   }, \
-    { K40,   K41,   K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   KC_NO, K4F   }, \
-}
diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h
index ee55e167d6..a7b28ae1db 100644
--- a/keyboards/foxlab/leaf60/hotswap/config.h
+++ b/keyboards/foxlab/leaf60/hotswap/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D2, D1, D0, D3, D5 }
-#define MATRIX_COL_PINS { F5, F4, F1, F0, B0, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 8
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,8 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/foxlab/leaf60/hotswap/hotswap.c b/keyboards/foxlab/leaf60/hotswap/hotswap.c
deleted file mode 100644
index e2de4a7e31..0000000000
--- a/keyboards/foxlab/leaf60/hotswap/hotswap.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Fox Lab
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hotswap.h"
diff --git a/keyboards/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/info.json
index 43f287ebca..487bf007eb 100644
--- a/keyboards/foxlab/leaf60/hotswap/info.json
+++ b/keyboards/foxlab/leaf60/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "F1", "F0", "B0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D2", "D1", "D0", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 4,
@@ -17,6 +22,9 @@
         "caps_lock": "E6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h
index d856375a5d..a7b28ae1db 100644
--- a/keyboards/foxlab/leaf60/universal/config.h
+++ b/keyboards/foxlab/leaf60/universal/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, F0, F4, F1 }
-#define MATRIX_COL_PINS { B0, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 8
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/foxlab/leaf60/universal/info.json b/keyboards/foxlab/leaf60/universal/info.json
index c782a6e50f..a14d795573 100644
--- a/keyboards/foxlab/leaf60/universal/info.json
+++ b/keyboards/foxlab/leaf60/universal/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["D0", "D1", "F0", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
@@ -16,6 +21,9 @@
         "caps_lock": "E6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_hhkb"],
diff --git a/keyboards/foxlab/leaf60/universal/universal.c b/keyboards/foxlab/leaf60/universal/universal.c
deleted file mode 100644
index 197e411d70..0000000000
--- a/keyboards/foxlab/leaf60/universal/universal.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Fox Lab
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "universal.h"
diff --git a/keyboards/foxlab/time80/config.h b/keyboards/foxlab/time80/config.h
index 4c41ecf073..615df15ac7 100644
--- a/keyboards/foxlab/time80/config.h
+++ b/keyboards/foxlab/time80/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-//                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
-#define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7, A0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 16
 //#define RGBLIGHT_HUE_STEP 8
 //#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/foxlab/time80/info.json b/keyboards/foxlab/time80/info.json
index f59a287de2..682e70125c 100644
--- a/keyboards/foxlab/time80/info.json
+++ b/keyboards/foxlab/time80/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7", "A0"],
+        "rows": ["B1", "B2", "B3", "B5", "B6", "B7", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "layouts": {
diff --git a/keyboards/foxlab/time80/rules.mk b/keyboards/foxlab/time80/rules.mk
index a3ca698e0b..62a9a9a51a 100644
--- a/keyboards/foxlab/time80/rules.mk
+++ b/keyboards/foxlab/time80/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
diff --git a/keyboards/foxlab/time80/time80.c b/keyboards/foxlab/time80/time80.c
deleted file mode 100644
index d2cf8cef2c..0000000000
--- a/keyboards/foxlab/time80/time80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Lukas Alexander
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "time80.h"
diff --git a/keyboards/foxlab/time80/time80.h b/keyboards/foxlab/time80/time80.h
index f451b32f01..54ac3fb9d7 100644
--- a/keyboards/foxlab/time80/time80.h
+++ b/keyboards/foxlab/time80/time80.h
@@ -34,11 +34,11 @@
    k40, k4D, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4E,                     k4C,      \
    k50,      k51, k52,                k54,                k58, k59, k5A, k5B,           k5E, k5C, k57  \
 ) { \
-  { k00,   KC_NO, k02, k03,   k04, k05,   KC_NO, k07, k08, k09,   k0A,   k0B,   k0C, KC_NO, k0E }, \
-  { k10,   k11,   k12, k13,   k14, k15,   k16,   k17, k18, k19,   k1A,   k1B,   k1C, k1D,   k1E }, \
-  { k20,   k21,   k22, k23,   k24, k25,   k26,   k27, k28, k29,   k2A,   k2B,   k2C, KC_NO, k2E }, \
-  { k30,   k31,   k32, k33,   k34, k35,   k36,   k37, k38, k39,   k3A,   k3B,   k3C, KC_NO, k3E }, \
-  { k40,   k41,   k42, k43,   k44, k45,   k46,   k47, k48, k49,   k4A,   k4B,   k4C, k4D,   k4E }, \
-  { k50,   k51,   k52, KC_NO, k54, KC_NO, KC_NO, k57, k58, k59,   k5A,   k5B,   k5C, KC_NO, k5E }, \
-  { KC_NO, k61,   k62, KC_NO, k64, k65,   k66,   k67, k68, KC_NO, KC_NO, KC_NO, k6C, KC_NO, k6E } \
+  { k00,   k01, k02, k03,   k04, k05,   KC_NO, k07, k08, k09,   k0A,   k0B,   k0C, KC_NO, k0E }, \
+  { k10,   k11, k12, k13,   k14, k15,   k16,   k17, k18, k19,   k1A,   k1B,   k1C, k1D,   k1E }, \
+  { k20,   k21, k22, k23,   k24, k25,   k26,   k27, k28, k29,   k2A,   k2B,   k2C, KC_NO, k2E }, \
+  { k30,   k31, k32, k33,   k34, k35,   k36,   k37, k38, k39,   k3A,   k3B,   k3C, KC_NO, k3E }, \
+  { k40,   k41, k42, k43,   k44, k45,   k46,   k47, k48, k49,   k4A,   k4B,   k4C, k4D,   k4E }, \
+  { k50,   k51, k52, KC_NO, k54, KC_NO, KC_NO, k57, k58, k59,   k5A,   k5B,   k5C, KC_NO, k5E }, \
+  { KC_NO, k61, k62, KC_NO, k64, k65,   k66,   k67, k68, KC_NO, KC_NO, KC_NO, k6C, KC_NO, k6E } \
 }
diff --git a/keyboards/foxlab/time_re/hotswap/config.h b/keyboards/foxlab/time_re/hotswap/config.h
index 9a8820cfd9..83929a1c3d 100644
--- a/keyboards/foxlab/time_re/hotswap/config.h
+++ b/keyboards/foxlab/time_re/hotswap/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0, B3, B0, B2, B1 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 5
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -52,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/foxlab/time_re/hotswap/hotswap.c b/keyboards/foxlab/time_re/hotswap/hotswap.c
deleted file mode 100644
index b3acfe7b4e..0000000000
--- a/keyboards/foxlab/time_re/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 DongXing
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hotswap.h"
-
diff --git a/keyboards/foxlab/time_re/hotswap/info.json b/keyboards/foxlab/time_re/hotswap/info.json
index e955aaf4da..1204298a1b 100644
--- a/keyboards/foxlab/time_re/hotswap/info.json
+++ b/keyboards/foxlab/time_re/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"],
+        "rows": ["D1", "D0", "B3", "B0", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
@@ -15,6 +20,9 @@
         "caps_lock": "E6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/foxlab/time_re/universal/config.h b/keyboards/foxlab/time_re/universal/config.h
index 9a8820cfd9..83929a1c3d 100644
--- a/keyboards/foxlab/time_re/universal/config.h
+++ b/keyboards/foxlab/time_re/universal/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0, B3, B0, B2, B1 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 5
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -52,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/foxlab/time_re/universal/info.json b/keyboards/foxlab/time_re/universal/info.json
index e955aaf4da..4632d8c359 100644
--- a/keyboards/foxlab/time_re/universal/info.json
+++ b/keyboards/foxlab/time_re/universal/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"],
+        "rows": ["D1", "D0", "B3", "B0", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "E6",
         "on_state": 0
diff --git a/keyboards/foxlab/time_re/universal/universal.c b/keyboards/foxlab/time_re/universal/universal.c
deleted file mode 100644
index 286104854b..0000000000
--- a/keyboards/foxlab/time_re/universal/universal.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 DongXing
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "universal.h"
-
diff --git a/keyboards/fr4/southpaw75/config.h b/keyboards/fr4/southpaw75/config.h
index 88d4df0941..bbb0ecc339 100644
--- a/keyboards/fr4/southpaw75/config.h
+++ b/keyboards/fr4/southpaw75/config.h
@@ -16,14 +16,6 @@
  */ 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { B5, F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/fr4/southpaw75/info.json b/keyboards/fr4/southpaw75/info.json
index 466e0edab5..77949825fb 100644
--- a/keyboards/fr4/southpaw75/info.json
+++ b/keyboards/fr4/southpaw75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x350C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/fr4/southpaw75/southpaw75.c b/keyboards/fr4/southpaw75/southpaw75.c
deleted file mode 100644
index c9c6f2d366..0000000000
--- a/keyboards/fr4/southpaw75/southpaw75.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* 
- Copyright 2020 Kelvin Hall 
-  
- This program is free software: you can redistribute it and/or modify 
- it under the terms of the GNU General Public License as published by 
- the Free Software Foundation, either version 2 of the License, or 
- (at your option) any later version. 
-  
- This program is distributed in the hope that it will be useful, 
- but WITHOUT ANY WARRANTY; without even the implied warranty of 
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- GNU General Public License for more details. 
-  
- You should have received a copy of the GNU General Public License 
- along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-#include "southpaw75.h"
diff --git a/keyboards/fr4/unix60/config.h b/keyboards/fr4/unix60/config.h
deleted file mode 100644
index c661d4b038..0000000000
--- a/keyboards/fr4/unix60/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
- /*
- Copyright 2020 Lasse Küchenmeister
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7 }
-#define MATRIX_COL_PINS { E6, B4, B5, F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fr4/unix60/info.json b/keyboards/fr4/unix60/info.json
index 2356702b48..8703ebd5e2 100644
--- a/keyboards/fr4/unix60/info.json
+++ b/keyboards/fr4/unix60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5558",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/fr4/unix60/unix60.c b/keyboards/fr4/unix60/unix60.c
deleted file mode 100644
index 80fd383316..0000000000
--- a/keyboards/fr4/unix60/unix60.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* 
- Copyright 2020 Lasse Küchenmeister
-  
- This program is free software: you can redistribute it and/or modify 
- it under the terms of the GNU General Public License as published by 
- the Free Software Foundation, either version 2 of the License, or 
- (at your option) any later version. 
-  
- This program is distributed in the hope that it will be useful, 
- but WITHOUT ANY WARRANTY; without even the implied warranty of 
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- GNU General Public License for more details. 
-  
- You should have received a copy of the GNU General Public License 
- along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-#include "unix60.h"
diff --git a/keyboards/fractal/config.h b/keyboards/fractal/config.h
index 31c7dd512f..5f36081323 100755
--- a/keyboards/fractal/config.h
+++ b/keyboards/fractal/config.h
@@ -1,33 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { B3, B2, B6, B5, B4, E6, D7, C6, D4, D0, D1, D3 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/fractal/fractal.c b/keyboards/fractal/fractal.c
deleted file mode 100755
index e315c7ab4b..0000000000
--- a/keyboards/fractal/fractal.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "fractal.h"
diff --git a/keyboards/fractal/fractal.h b/keyboards/fractal/fractal.h
deleted file mode 100755
index 0af7c22390..0000000000
--- a/keyboards/fractal/fractal.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \
-  K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411  \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-  { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-  { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-  { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }, \
-  { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411 }  \
-}
-
-#define LAYOUT_preonic_mit( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \
-  K400, K401, K402, K403, K404,    K406,    K407, K408, K409, K410, K411  \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-  { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-  { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-  { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }, \
-  { K400,  K401,  K402,  K403,  K404,  KC_NO, K406,  K407,  K408,  K409,  K410,  K411 }  \
-}
diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json
index 4b98a751e4..0d2ce4aeca 100644
--- a/keyboards/fractal/info.json
+++ b/keyboards/fractal/info.json
@@ -8,15 +8,149 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D3"],
+    "rows": ["B1", "F7", "F6", "F5", "F4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_5x12"],
   "layouts": {
     "LAYOUT_ortho_5x12": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]
-      },
-      "LAYOUT_preonic_mit": {
-        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4, "w":2}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
+        {"matrix": [4, 7], "x": 7, "y": 4},
+        {"matrix": [4, 8], "x": 8, "y": 4},
+        {"matrix": [4, 9], "x": 9, "y": 4},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4}
+      ]
+    },
+    "LAYOUT_preonic_mit": {
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+          {"matrix": [1, 7], "x": 7, "y": 1},
+          {"matrix": [1, 8], "x": 8, "y": 1},
+          {"matrix": [1, 9], "x": 9, "y": 1},
+          {"matrix": [1, 10], "x": 10, "y": 1},
+          {"matrix": [1, 11], "x": 11, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+          {"matrix": [2, 7], "x": 7, "y": 2},
+          {"matrix": [2, 8], "x": 8, "y": 2},
+          {"matrix": [2, 9], "x": 9, "y": 2},
+          {"matrix": [2, 10], "x": 10, "y": 2},
+          {"matrix": [2, 11], "x": 11, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [3, 6], "x": 6, "y": 3},
+          {"matrix": [3, 7], "x": 7, "y": 3},
+          {"matrix": [3, 8], "x": 8, "y": 3},
+          {"matrix": [3, 9], "x": 9, "y": 3},
+          {"matrix": [3, 10], "x": 10, "y": 3},
+          {"matrix": [3, 11], "x": 11, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 4], "x": 4, "y": 4},
+          {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+          {"matrix": [4, 7], "x": 7, "y": 4},
+          {"matrix": [4, 8], "x": 8, "y": 4},
+          {"matrix": [4, 9], "x": 9, "y": 4},
+          {"matrix": [4, 10], "x": 10, "y": 4},
+          {"matrix": [4, 11], "x": 11, "y": 4}
+        ]
+      }
     }
 }
diff --git a/keyboards/free_willy/config.h b/keyboards/free_willy/config.h
deleted file mode 100644
index a855a59c7c..0000000000
--- a/keyboards/free_willy/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 Caleb Lightfoot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/free_willy/free_willy.c b/keyboards/free_willy/free_willy.c
deleted file mode 100644
index 71a912fdc5..0000000000
--- a/keyboards/free_willy/free_willy.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Caleb Lightfoot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "free_willy.h"
diff --git a/keyboards/free_willy/info.json b/keyboards/free_willy/info.json
index 51108e1192..88d2907acd 100644
--- a/keyboards/free_willy/info.json
+++ b/keyboards/free_willy/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4657",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/friedrich/config.h b/keyboards/friedrich/config.h
deleted file mode 100644
index 8d556c120a..0000000000
--- a/keyboards/friedrich/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { F4, F1, F0, F5, D5 }
-#define MATRIX_COL_PINS { F6, F7, E6, B2, B3, D4, D6, D7, B4, C6, B5, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/friedrich/friedrich.c b/keyboards/friedrich/friedrich.c
deleted file mode 100644
index 5c6995202d..0000000000
--- a/keyboards/friedrich/friedrich.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "friedrich.h"
diff --git a/keyboards/friedrich/info.json b/keyboards/friedrich/info.json
index 6f90a896a9..2522d28988 100644
--- a/keyboards/friedrich/info.json
+++ b/keyboards/friedrich/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB4A2",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "E6", "B2", "B3", "D4", "D6", "D7", "B4", "C6", "B5", "B6"],
+        "rows": ["F4", "F1", "F0", "F5", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B1"
     },
diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/info.json
index 9c66e8655d..f639ab9b7a 100644
--- a/keyboards/frobiac/blackbowl/info.json
+++ b/keyboards/frobiac/blackbowl/info.json
@@ -34,51 +34,51 @@
   "layouts": {
     "LAYOUT": {
        "layout": [
-                {"matrix": [5, 3], "label":"K",   "x":0,     "y":1.00},
-                {"matrix": [6, 3], "label":"U",   "x":1,     "y":0.50},
-                {"matrix": [7, 3], "label":"Q",   "x":2,     "y":0.00},
-                {"matrix": [8, 3], "label":".",   "x":3,     "y":0.00},
-                {"matrix": [9, 3], "label":"J",   "x":4,     "y":0.00},
+                {"matrix": [5, 3], "label":"K",   "x":0,     "y":1},
+                {"matrix": [6, 3], "label":"U",   "x":1,     "y":0.5},
+                {"matrix": [7, 3], "label":"Q",   "x":2,     "y":0},
+                {"matrix": [8, 3], "label":".",   "x":3,     "y":0},
+                {"matrix": [9, 3], "label":"J",   "x":4,     "y":0},
 
-                {"matrix": [0, 3], "label":"P",   "x":6,     "y":0.00},
-                {"matrix": [1, 3], "label":"C",   "x":7,     "y":0.00},
-                {"matrix": [2, 3], "label":"L",   "x":8,     "y":0.00},
-                {"matrix": [3, 3], "label":"M",   "x":9,     "y":0.50},
-                {"matrix": [4, 3], "label":"F",   "x":10,    "y":1.00},
+                {"matrix": [0, 3], "label":"P",   "x":6,     "y":0},
+                {"matrix": [1, 3], "label":"C",   "x":7,     "y":0},
+                {"matrix": [2, 3], "label":"L",   "x":8,     "y":0},
+                {"matrix": [3, 3], "label":"M",   "x":9,     "y":0.5},
+                {"matrix": [4, 3], "label":"F",   "x":10,    "y":1},
 
-                {"matrix": [5, 2], "label":"H",   "x":0,     "y":2.00},
-                {"matrix": [6, 2], "label":"I",   "x":1,     "y":1.50},
-                {"matrix": [7, 2], "label":"E",   "x":2,     "y":1.00},
-                {"matrix": [8, 2], "label":"A",   "x":3,     "y":1.00},
-                {"matrix": [9, 2], "label":"O",   "x":4,     "y":1.00},
+                {"matrix": [5, 2], "label":"H",   "x":0,     "y":2},
+                {"matrix": [6, 2], "label":"I",   "x":1,     "y":1.5},
+                {"matrix": [7, 2], "label":"E",   "x":2,     "y":1},
+                {"matrix": [8, 2], "label":"A",   "x":3,     "y":1},
+                {"matrix": [9, 2], "label":"O",   "x":4,     "y":1},
 
-                {"matrix": [0, 2], "label":"D",   "x":6,     "y":1.00},
-                {"matrix": [1, 2], "label":"T",   "x":7,     "y":1.00},
-                {"matrix": [2, 2], "label":"R",   "x":8,     "y":1.00},
-                {"matrix": [3, 2], "label":"N",   "x":9,     "y":1.50},
-                {"matrix": [4, 2], "label":"S",   "x":10,    "y":2.00},
+                {"matrix": [0, 2], "label":"D",   "x":6,     "y":1},
+                {"matrix": [1, 2], "label":"T",   "x":7,     "y":1},
+                {"matrix": [2, 2], "label":"R",   "x":8,     "y":1},
+                {"matrix": [3, 2], "label":"N",   "x":9,     "y":1.5},
+                {"matrix": [4, 2], "label":"S",   "x":10,    "y":2},
 
-                {"matrix": [5, 1], "label":"X",   "x":0,     "y":3.00},
-                {"matrix": [6, 1], "label":"Y",   "x":1,     "y":2.50},
-                {"matrix": [7, 1], "label":"-",   "x":2,     "y":2.00},
-                {"matrix": [8, 1], "label":",",   "x":3,     "y":2.00},
-                {"matrix": [9, 1], "label":"/",   "x":4,     "y":2.00},
+                {"matrix": [5, 1], "label":"X",   "x":0,     "y":3},
+                {"matrix": [6, 1], "label":"Y",   "x":1,     "y":2.5},
+                {"matrix": [7, 1], "label":"-",   "x":2,     "y":2},
+                {"matrix": [8, 1], "label":",",   "x":3,     "y":2},
+                {"matrix": [9, 1], "label":"/",   "x":4,     "y":2},
 
-                {"matrix": [0, 1], "label":"B",   "x":6,     "y":2.00},
-                {"matrix": [1, 1], "label":"G",   "x":7,     "y":2.00},
-                {"matrix": [2, 1], "label":"W",   "x":8,     "y":2.00},
-                {"matrix": [3, 1], "label":"V",   "x":9,     "y":2.50},
-                {"matrix": [4, 1], "label":"Z",   "x":10,    "y":3.00},
+                {"matrix": [0, 1], "label":"B",   "x":6,     "y":2},
+                {"matrix": [1, 1], "label":"G",   "x":7,     "y":2},
+                {"matrix": [2, 1], "label":"W",   "x":8,     "y":2},
+                {"matrix": [3, 1], "label":"V",   "x":9,     "y":2.5},
+                {"matrix": [4, 1], "label":"Z",   "x":10,    "y":3},
 
-                {"matrix": [5, 0], "label":" ",   "x":0,     "y":0.00},
-                {"matrix": [7, 0], "label":"Gui", "x":2,     "y":3.00},
-                {"matrix": [8, 0], "label":"tab", "x":3,     "y":3.00},
-                {"matrix": [9, 0], "label":"spc", "x":4,     "y":3.00},
+                {"matrix": [5, 0], "label":" ",   "x":0,     "y":0},
+                {"matrix": [7, 0], "label":"Gui", "x":2,     "y":3},
+                {"matrix": [8, 0], "label":"tab", "x":3,     "y":3},
+                {"matrix": [9, 0], "label":"spc", "x":4,     "y":3},
 
-                {"matrix": [0, 0], "label":"L2",  "x":6,     "y":3.00},
-                {"matrix": [1, 0], "label":"Sh",  "x":7,     "y":3.00},
-                {"matrix": [2, 0], "label":"L3",  "x":8,     "y":3.00},
-                {"matrix": [4, 0], "label":"Fx",  "x":10,    "y":0.00}
+                {"matrix": [0, 0], "label":"L2",  "x":6,     "y":3},
+                {"matrix": [1, 0], "label":"Sh",  "x":7,     "y":3},
+                {"matrix": [2, 0], "label":"L3",  "x":8,     "y":3},
+                {"matrix": [4, 0], "label":"Fx",  "x":10,    "y":0}
        ]
     }
   }
diff --git a/keyboards/frobiac/blackflat/info.json b/keyboards/frobiac/blackflat/info.json
index 0d99816582..10f5842fa6 100644
--- a/keyboards/frobiac/blackflat/info.json
+++ b/keyboards/frobiac/blackflat/info.json
@@ -34,51 +34,51 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "label":"K",   "x":0,     "y":1.00},
-                {"matrix": [0, 1], "label":"U",   "x":1,     "y":0.50},
-                {"matrix": [0, 2], "label":"Q",   "x":2,     "y":0.00},
-                {"matrix": [0, 3], "label":".",   "x":3,     "y":0.00},
-                {"matrix": [0, 4], "label":"J",   "x":4,     "y":0.00},
+                {"matrix": [0, 0], "label":"K",   "x":0,     "y":1},
+                {"matrix": [0, 1], "label":"U",   "x":1,     "y":0.5},
+                {"matrix": [0, 2], "label":"Q",   "x":2,     "y":0},
+                {"matrix": [0, 3], "label":".",   "x":3,     "y":0},
+                {"matrix": [0, 4], "label":"J",   "x":4,     "y":0},
 
-                {"matrix": [4, 0], "label":"P",   "x":6,     "y":0.00},
-                {"matrix": [4, 1], "label":"C",   "x":7,     "y":0.00},
-                {"matrix": [4, 2], "label":"L",   "x":8,     "y":0.00},
-                {"matrix": [4, 3], "label":"M",   "x":9,     "y":0.50},
-                {"matrix": [4, 4], "label":"F",   "x":10,    "y":1.00},
+                {"matrix": [4, 0], "label":"P",   "x":6,     "y":0},
+                {"matrix": [4, 1], "label":"C",   "x":7,     "y":0},
+                {"matrix": [4, 2], "label":"L",   "x":8,     "y":0},
+                {"matrix": [4, 3], "label":"M",   "x":9,     "y":0.5},
+                {"matrix": [4, 4], "label":"F",   "x":10,    "y":1},
 
-                {"matrix": [1, 0], "label":"H",   "x":0,     "y":2.00},
-                {"matrix": [1, 1], "label":"I",   "x":1,     "y":1.50},
-                {"matrix": [1, 2], "label":"E",   "x":2,     "y":1.00},
-                {"matrix": [1, 3], "label":"A",   "x":3,     "y":1.00},
-                {"matrix": [1, 4], "label":"O",   "x":4,     "y":1.00},
+                {"matrix": [1, 0], "label":"H",   "x":0,     "y":2},
+                {"matrix": [1, 1], "label":"I",   "x":1,     "y":1.5},
+                {"matrix": [1, 2], "label":"E",   "x":2,     "y":1},
+                {"matrix": [1, 3], "label":"A",   "x":3,     "y":1},
+                {"matrix": [1, 4], "label":"O",   "x":4,     "y":1},
 
-                {"matrix": [5, 0], "label":"D",   "x":6,     "y":1.00},
-                {"matrix": [5, 1], "label":"T",   "x":7,     "y":1.00},
-                {"matrix": [5, 2], "label":"R",   "x":8,     "y":1.00},
-                {"matrix": [5, 3], "label":"N",   "x":9,     "y":1.50},
-                {"matrix": [5, 4], "label":"S",   "x":10,    "y":2.00},
+                {"matrix": [5, 0], "label":"D",   "x":6,     "y":1},
+                {"matrix": [5, 1], "label":"T",   "x":7,     "y":1},
+                {"matrix": [5, 2], "label":"R",   "x":8,     "y":1},
+                {"matrix": [5, 3], "label":"N",   "x":9,     "y":1.5},
+                {"matrix": [5, 4], "label":"S",   "x":10,    "y":2},
 
-                {"matrix": [2, 0], "label":"X",   "x":0,     "y":3.00},
-                {"matrix": [2, 1], "label":"Y",   "x":1,     "y":2.50},
-                {"matrix": [2, 2], "label":"-",   "x":2,     "y":2.00},
-                {"matrix": [2, 3], "label":",",   "x":3,     "y":2.00},
-                {"matrix": [2, 4], "label":"/",   "x":4,     "y":2.00},
+                {"matrix": [2, 0], "label":"X",   "x":0,     "y":3},
+                {"matrix": [2, 1], "label":"Y",   "x":1,     "y":2.5},
+                {"matrix": [2, 2], "label":"-",   "x":2,     "y":2},
+                {"matrix": [2, 3], "label":",",   "x":3,     "y":2},
+                {"matrix": [2, 4], "label":"/",   "x":4,     "y":2},
 
-                {"matrix": [6, 0], "label":"B",   "x":6,     "y":2.00},
-                {"matrix": [6, 1], "label":"G",   "x":7,     "y":2.00},
-                {"matrix": [6, 2], "label":"W",   "x":8,     "y":2.00},
-                {"matrix": [6, 3], "label":"V",   "x":9,     "y":2.50},
-                {"matrix": [6, 4], "label":"Z",   "x":10,    "y":3.00},
+                {"matrix": [6, 0], "label":"B",   "x":6,     "y":2},
+                {"matrix": [6, 1], "label":"G",   "x":7,     "y":2},
+                {"matrix": [6, 2], "label":"W",   "x":8,     "y":2},
+                {"matrix": [6, 3], "label":"V",   "x":9,     "y":2.5},
+                {"matrix": [6, 4], "label":"Z",   "x":10,    "y":3},
 
-                {"matrix": [3, 0], "label":"",    "x":0,     "y":0.00},
-                {"matrix": [3, 2], "label":"Gui", "x":2,     "y":3.00},
-                {"matrix": [3, 3], "label":"Tab", "x":3,     "y":3.00},
-                {"matrix": [3, 4], "label":"Spc", "x":4,     "y":3.00},
+                {"matrix": [3, 0], "label":"",    "x":0,     "y":0},
+                {"matrix": [3, 2], "label":"Gui", "x":2,     "y":3},
+                {"matrix": [3, 3], "label":"Tab", "x":3,     "y":3},
+                {"matrix": [3, 4], "label":"Spc", "x":4,     "y":3},
 
-                {"matrix": [7, 0], "label":"L2",  "x":6,     "y":3.00},
-                {"matrix": [7, 1], "label":"Sh",  "x":7,     "y":3.00},
-                {"matrix": [7, 2], "label":"L3",  "x":8,     "y":3.00},
-                {"matrix": [7, 4], "label":"Fx",  "x":10,    "y":0.00}
+                {"matrix": [7, 0], "label":"L2",  "x":6,     "y":3},
+                {"matrix": [7, 1], "label":"Sh",  "x":7,     "y":3},
+                {"matrix": [7, 2], "label":"L3",  "x":8,     "y":3},
+                {"matrix": [7, 4], "label":"Fx",  "x":10,    "y":0}
             ]
         }
     }
diff --git a/keyboards/frobiac/redtilt/info.json b/keyboards/frobiac/redtilt/info.json
index f2f5d27f35..c7702ee3e8 100644
--- a/keyboards/frobiac/redtilt/info.json
+++ b/keyboards/frobiac/redtilt/info.json
@@ -34,59 +34,59 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "label":"",    "x":0,     "y":2.00},
-                {"matrix": [0, 1], "label":"K",   "x":1,     "y":2.00},
-                {"matrix": [0, 2], "label":"U",   "x":2,     "y":1.50},
-                {"matrix": [0, 3], "label":"Q",   "x":3,     "y":1.00},
-                {"matrix": [0, 4], "label":".",   "x":4,     "y":1.00},
-                {"matrix": [0, 5], "label":"J",   "x":5,     "y":1.00},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
 
-                {"matrix": [4, 0], "label":"P",   "x":8,     "y":1.00},
-                {"matrix": [4, 1], "label":"C",   "x":9,     "y":1.00},
-                {"matrix": [4, 2], "label":"L",   "x":10,    "y":1.00},
-                {"matrix": [4, 3], "label":"M",   "x":11,    "y":1.50},
-                {"matrix": [4, 4], "label":"F",   "x":12,    "y":2.00},
-                {"matrix": [4, 5], "label":"",    "x":13,    "y":2.00},
+                {"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.5},
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 5], "x": 12, "y": 0},
 
-                {"matrix": [1, 0], "label":" ",   "x":0,     "y":3.00},
-                {"matrix": [1, 1], "label":"H",   "x":1,     "y":3.00},
-                {"matrix": [1, 2], "label":"I",   "x":2,     "y":2.50},
-                {"matrix": [1, 3], "label":"E",   "x":3,     "y":2.00},
-                {"matrix": [1, 4], "label":"A",   "x":4,     "y":2.00},
-                {"matrix": [1, 5], "label":"O",   "x":5,     "y":2.00},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
 
-                {"matrix": [5, 0], "label":"D",   "x":8,     "y":2.00},
-                {"matrix": [5, 1], "label":"T",   "x":9,     "y":2.00},
-                {"matrix": [5, 2], "label":"R",   "x":10,    "y":2.00},
-                {"matrix": [5, 3], "label":"N",   "x":11,    "y":2.50},
-                {"matrix": [5, 4], "label":"S",   "x":12,    "y":3.00},
-                {"matrix": [5, 5], "label":"",    "x":13,    "y":3.00},
+                {"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.5},
+                {"matrix": [5, 4], "x": 11, "y": 1},
+                {"matrix": [5, 5], "x": 12, "y": 1},
 
-                {"matrix": [2, 0], "label":"",    "x":0,     "y":4.00},
-                {"matrix": [2, 1], "label":"X",   "x":1,     "y":4.00},
-                {"matrix": [2, 2], "label":"Y",   "x":2,     "y":3.50},
-                {"matrix": [2, 3], "label":"-",   "x":3,     "y":3.00},
-                {"matrix": [2, 4], "label":",",   "x":4,     "y":3.00},
-                {"matrix": [2, 5], "label":"/",   "x":5,     "y":3.00},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
 
-                {"matrix": [6, 0], "label":"B",   "x":8,     "y":3.00},
-                {"matrix": [6, 1], "label":"G",   "x":9,     "y":3.00},
-                {"matrix": [6, 2], "label":"W",   "x":10,    "y":3.00},
-                {"matrix": [6, 3], "label":"V",   "x":11,    "y":3.50},
-                {"matrix": [6, 4], "label":"Z",   "x":12,    "y":4.00},
-                {"matrix": [6, 5], "label":"",    "x":13,    "y":4.00},
+                {"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.5},
+                {"matrix": [6, 4], "x": 11, "y": 2},
+                {"matrix": [6, 5], "x": 12, "y": 2},
 
-                {"matrix": [3, 0], "label":"",    "x":0,     "y":1.00},
-                {"matrix": [3, 1], "label":"",    "x":1,     "y":1.00},
-                {"matrix": [3, 3], "label":"Gui", "x":3,     "y":4.00},
-                {"matrix": [3, 4], "label":"Tab", "x":4,     "y":4.00},
-                {"matrix": [3, 5], "label":"Spc", "x":5,     "y":4.00},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
 
-                {"matrix": [7, 0], "label":"L2",  "x":8,     "y":4.00},
-                {"matrix": [7, 1], "label":"Sh",  "x":9,     "y":4.00},
-                {"matrix": [7, 2], "label":"L3",  "x":10,    "y":4.00},
-                {"matrix": [7, 4], "label":"Fx",  "x":12,    "y":1.00},
-                {"matrix": [7, 5], "label":"",    "x":13,    "y":1.00}
+                {"matrix": [7, 0], "x": 7, "y": 3},
+                {"matrix": [7, 1], "x": 8, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 11, "y": 3},
+                {"matrix": [7, 5], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/frooastboard/nano/config.h b/keyboards/frooastboard/nano/config.h
index 1c168e0433..82fab4da29 100644
--- a/keyboards/frooastboard/nano/config.h
+++ b/keyboards/frooastboard/nano/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN B4
 #define RGBLED_NUM 8
 
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json
index fae1349a65..d1a77d256d 100644
--- a/keyboards/frooastboard/nano/info.json
+++ b/keyboards/frooastboard/nano/info.json
@@ -7,26 +7,11 @@
     "layouts": {
         "LAYOUT": {
           "layout": [
-            {
-              "label": "Z",
-              "x": 0,
-              "y": 0
-            },
-            {
-              "label": "X",
-              "x": 1,
-              "y": 0
-            },
-            {
-              "label": "Esc",
-              "x": 0,
-              "y": 1
-            },
-            {
-              "label": "~",
-              "x": 1,
-              "y": 1
-            }
+            {"matrix": [0, 0], "x": 0, "y": 0},
+            {"matrix": [0, 1], "x": 1, "y": 0},
+
+            {"matrix": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1}
           ]
         }
     },
@@ -39,6 +24,9 @@
         "pid": "0x6F21",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "B4"
+    },
     "bootmagic": {
         "matrix": [1, 1]
     },
diff --git a/keyboards/frooastboard/nano/nano.c b/keyboards/frooastboard/nano/nano.c
deleted file mode 100644
index 584176a4e9..0000000000
--- a/keyboards/frooastboard/nano/nano.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021-2022 frooastside
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "nano.h"
diff --git a/keyboards/frooastboard/nano/nano.h b/keyboards/frooastboard/nano/nano.h
deleted file mode 100644
index 76d1a42eac..0000000000
--- a/keyboards/frooastboard/nano/nano.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021-2022 frooastside
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, \
-	K10, K11  \
-) { \
-	{ K00,   K01 }, \
-	{ K10,   K11 }  \
-}
diff --git a/keyboards/frooastboard/walnut/info.json b/keyboards/frooastboard/walnut/info.json
index a57272c765..eca0057eb2 100644
--- a/keyboards/frooastboard/walnut/info.json
+++ b/keyboards/frooastboard/walnut/info.json
@@ -14,6 +14,9 @@
         "mousekey": false,
         "nkro": true
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3737"
+    },
     "build": {
         "lto": true
     },
diff --git a/keyboards/frooastboard/walnut/rules.mk b/keyboards/frooastboard/walnut/rules.mk
index d0bb93e136..c529890fb5 100644
--- a/keyboards/frooastboard/walnut/rules.mk
+++ b/keyboards/frooastboard/walnut/rules.mk
@@ -2,4 +2,3 @@
 #   change yes to no to disable
 #
 RGB_MATRIX_ENABLE = yes         # Enable keyboard RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3737  # Select RGB matrix driver
diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h
index 53f33428df..d13d66431e 100644
--- a/keyboards/ft/mars65/config.h
+++ b/keyboards/ft/mars65/config.h
@@ -3,24 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { C6, C7, D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 24
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -37,7 +19,6 @@
     #define RGBLIGHT_EFFECT_RGB_TEST
     #define RGBLIGHT_EFFECT_ALTERNATING
     #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json
index 1d1dd840d9..fd4a9ac167 100644
--- a/keyboards/ft/mars65/info.json
+++ b/keyboards/ft/mars65/info.json
@@ -8,393 +8,401 @@
     "pid": "0x422F",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6", "F7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
+  "ws2812": {
+    "pin": "E6"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"],
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        {"label":"K00 (B0,C6)", "x":0, "y":0},
-        {"label":"K01 (B0,C7)", "x":1, "y":0},
-        {"label":"K02 (B0,D0)", "x":2, "y":0},
-        {"label":"K03 (B0,D1)", "x":3, "y":0},
-        {"label":"K04 (B0,D2)", "x":4, "y":0},
-        {"label":"K05 (B0,D3)", "x":5, "y":0},
-        {"label":"K06 (B0,D4)", "x":6, "y":0},
-        {"label":"K07 (B0,D5)", "x":7, "y":0},
-        {"label":"K08 (B0,D6)", "x":8, "y":0},
-        {"label":"K09 (B0,D7)", "x":9, "y":0},
-        {"label":"K0A (B0,F0)", "x":10, "y":0},
-        {"label":"K0B (B0,F1)", "x":11, "y":0},
-        {"label":"K0C (B0,F4)", "x":12, "y":0},
-        {"label":"K0D (B0,F5)", "x":13, "y":0},
-        {"label":"K0E (B0,F6)", "x":14, "y":0},
-        {"label":"K0F (B0,F7)", "x":15, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [0, 15], "x": 15, "y": 0},
 
-        {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
-        {"label":"K12 (B1,D0)", "x":1.5, "y":1},
-        {"label":"K13 (B1,D1)", "x":2.5, "y":1},
-        {"label":"K14 (B1,D2)", "x":3.5, "y":1},
-        {"label":"K15 (B1,D3)", "x":4.5, "y":1},
-        {"label":"K16 (B1,D4)", "x":5.5, "y":1},
-        {"label":"K17 (B1,D5)", "x":6.5, "y":1},
-        {"label":"K18 (B1,D6)", "x":7.5, "y":1},
-        {"label":"K19 (B1,D7)", "x":8.5, "y":1},
-        {"label":"K1A (B1,F0)", "x":9.5, "y":1},
-        {"label":"K1B (B1,F1)", "x":10.5, "y":1},
-        {"label":"K1C (B1,F4)", "x":11.5, "y":1},
-        {"label":"K1D (B1,F5)", "x":12.5, "y":1},
-        {"label":"K1E (B1,F6)", "x":13.5, "y":1, "w":1.5},
-        {"label":"K1F (B1,F7)", "x":15, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
 
-        {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
-        {"label":"K22 (B2,D0)", "x":1.75, "y":2},
-        {"label":"K23 (B2,D1)", "x":2.75, "y":2},
-        {"label":"K24 (B2,D2)", "x":3.75, "y":2},
-        {"label":"K25 (B2,D3)", "x":4.75, "y":2},
-        {"label":"K26 (B2,D4)", "x":5.75, "y":2},
-        {"label":"K27 (B2,D5)", "x":6.75, "y":2},
-        {"label":"K28 (B2,D6)", "x":7.75, "y":2},
-        {"label":"K29 (B2,D7)", "x":8.75, "y":2},
-        {"label":"K2A (B2,F0)", "x":9.75, "y":2},
-        {"label":"K2B (B2,F1)", "x":10.75, "y":2},
-        {"label":"K2C (B2,F4)", "x":11.75, "y":2},
-        {"label":"K2E (B2,F6)", "x":12.75, "y":2, "w":2.25},
-        {"label":"K2F (B2,F7)", "x":15, "y":2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
 
-        {"label":"K30 (B3,C6)", "x":0, "y":3, "w":1.25},
-        {"label":"K31 (B3,C7)", "x":1.25, "y":3},
-        {"label":"K32 (B3,D0)", "x":2.25, "y":3},
-        {"label":"K33 (B3,D1)", "x":3.25, "y":3},
-        {"label":"K34 (B3,D2)", "x":4.25, "y":3},
-        {"label":"K35 (B3,D3)", "x":5.25, "y":3},
-        {"label":"K36 (B3,D4)", "x":6.25, "y":3},
-        {"label":"K37 (B3,D5)", "x":7.25, "y":3},
-        {"label":"K38 (B3,D6)", "x":8.25, "y":3},
-        {"label":"K39 (B3,D7)", "x":9.25, "y":3},
-        {"label":"K3A (B3,F0)", "x":10.25, "y":3},
-        {"label":"K3B (B3,F1)", "x":11.25, "y":3},
-        {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
-        {"label":"K3E (B3,F6)", "x":14, "y":3},
-        {"label":"K3F (B3,F7)", "x":15, "y":3},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
 
-        {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
-        {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
-        {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
-        {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
-        {"label":"K4A (B4,F0)", "x":10, "y":4},
-        {"label":"K4B (B4,F1)", "x":11, "y":4},
-        {"label":"K4C (B4,F4)", "x":12, "y":4},
-        {"label":"K4D (B4,F5)", "x":13, "y":4},
-        {"label":"K4E (B4,F6)", "x":14, "y":4},
-        {"label":"K4F (B4,F7)", "x":15, "y":4}
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4},
+        {"matrix": [4, 12], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_65_ansi_blocker": {
       "layout": [
-        {"label":"K00 (B0,C6)", "x":0, "y":0},
-        {"label":"K01 (B0,C7)", "x":1, "y":0},
-        {"label":"K02 (B0,D0)", "x":2, "y":0},
-        {"label":"K03 (B0,D1)", "x":3, "y":0},
-        {"label":"K04 (B0,D2)", "x":4, "y":0},
-        {"label":"K05 (B0,D3)", "x":5, "y":0},
-        {"label":"K06 (B0,D4)", "x":6, "y":0},
-        {"label":"K07 (B0,D5)", "x":7, "y":0},
-        {"label":"K08 (B0,D6)", "x":8, "y":0},
-        {"label":"K09 (B0,D7)", "x":9, "y":0},
-        {"label":"K0A (B0,F0)", "x":10, "y":0},
-        {"label":"K0B (B0,F1)", "x":11, "y":0},
-        {"label":"K0C (B0,F4)", "x":12, "y":0},
-        {"label":"K0D (B0,F5)", "x":13, "y":0, "w":2},
-        {"label":"K0F (B0,F7)", "x":15, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
 
-        {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
-        {"label":"K12 (B1,D0)", "x":1.5, "y":1},
-        {"label":"K13 (B1,D1)", "x":2.5, "y":1},
-        {"label":"K14 (B1,D2)", "x":3.5, "y":1},
-        {"label":"K15 (B1,D3)", "x":4.5, "y":1},
-        {"label":"K16 (B1,D4)", "x":5.5, "y":1},
-        {"label":"K17 (B1,D5)", "x":6.5, "y":1},
-        {"label":"K18 (B1,D6)", "x":7.5, "y":1},
-        {"label":"K19 (B1,D7)", "x":8.5, "y":1},
-        {"label":"K1A (B1,F0)", "x":9.5, "y":1},
-        {"label":"K1B (B1,F1)", "x":10.5, "y":1},
-        {"label":"K1C (B1,F4)", "x":11.5, "y":1},
-        {"label":"K1D (B1,F5)", "x":12.5, "y":1},
-        {"label":"K1E (B1,F6)", "x":13.5, "y":1, "w":1.5},
-        {"label":"K1F (B1,F7)", "x":15, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
 
-        {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
-        {"label":"K22 (B2,D0)", "x":1.75, "y":2},
-        {"label":"K23 (B2,D1)", "x":2.75, "y":2},
-        {"label":"K24 (B2,D2)", "x":3.75, "y":2},
-        {"label":"K25 (B2,D3)", "x":4.75, "y":2},
-        {"label":"K26 (B2,D4)", "x":5.75, "y":2},
-        {"label":"K27 (B2,D5)", "x":6.75, "y":2},
-        {"label":"K28 (B2,D6)", "x":7.75, "y":2},
-        {"label":"K29 (B2,D7)", "x":8.75, "y":2},
-        {"label":"K2A (B2,F0)", "x":9.75, "y":2},
-        {"label":"K2B (B2,F1)", "x":10.75, "y":2},
-        {"label":"K2C (B2,F4)", "x":11.75, "y":2},
-        {"label":"K2E (B2,F6)", "x":12.75, "y":2, "w":2.25},
-        {"label":"K2F (B2,F7)", "x":15, "y":2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
 
-        {"label":"K30 (B3,C6)", "x":0, "y":3, "w":2.25},
-        {"label":"K32 (B3,D0)", "x":2.25, "y":3},
-        {"label":"K33 (B3,D1)", "x":3.25, "y":3},
-        {"label":"K34 (B3,D2)", "x":4.25, "y":3},
-        {"label":"K35 (B3,D3)", "x":5.25, "y":3},
-        {"label":"K36 (B3,D4)", "x":6.25, "y":3},
-        {"label":"K37 (B3,D5)", "x":7.25, "y":3},
-        {"label":"K38 (B3,D6)", "x":8.25, "y":3},
-        {"label":"K39 (B3,D7)", "x":9.25, "y":3},
-        {"label":"K3A (B3,F0)", "x":10.25, "y":3},
-        {"label":"K3B (B3,F1)", "x":11.25, "y":3},
-        {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
-        {"label":"K3E (B3,F6)", "x":14, "y":3},
-        {"label":"K3F (B3,F7)", "x":15, "y":3},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
 
-        {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
-        {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
-        {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
-        {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
-        {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
-        {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
-        {"label":"K4D (B4,F5)", "x":13, "y":4},
-        {"label":"K4E (B4,F6)", "x":14, "y":4},
-        {"label":"K4F (B4,F7)", "x":15, "y":4}
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_65_ansi_blocker_split_bs": {
       "layout": [
-        {"label":"K00 (B0,C6)", "x":0, "y":0},
-        {"label":"K01 (B0,C7)", "x":1, "y":0},
-        {"label":"K02 (B0,D0)", "x":2, "y":0},
-        {"label":"K03 (B0,D1)", "x":3, "y":0},
-        {"label":"K04 (B0,D2)", "x":4, "y":0},
-        {"label":"K05 (B0,D3)", "x":5, "y":0},
-        {"label":"K06 (B0,D4)", "x":6, "y":0},
-        {"label":"K07 (B0,D5)", "x":7, "y":0},
-        {"label":"K08 (B0,D6)", "x":8, "y":0},
-        {"label":"K09 (B0,D7)", "x":9, "y":0},
-        {"label":"K0A (B0,F0)", "x":10, "y":0},
-        {"label":"K0B (B0,F1)", "x":11, "y":0},
-        {"label":"K0C (B0,F4)", "x":12, "y":0},
-        {"label":"K0D (B0,F5)", "x":13, "y":0},
-        {"label":"K0E (B0,F6)", "x":14, "y":0},
-        {"label":"K0F (B0,F7)", "x":15, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [0, 15], "x": 15, "y": 0},
 
-        {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
-        {"label":"K12 (B1,D0)", "x":1.5, "y":1},
-        {"label":"K13 (B1,D1)", "x":2.5, "y":1},
-        {"label":"K14 (B1,D2)", "x":3.5, "y":1},
-        {"label":"K15 (B1,D3)", "x":4.5, "y":1},
-        {"label":"K16 (B1,D4)", "x":5.5, "y":1},
-        {"label":"K17 (B1,D5)", "x":6.5, "y":1},
-        {"label":"K18 (B1,D6)", "x":7.5, "y":1},
-        {"label":"K19 (B1,D7)", "x":8.5, "y":1},
-        {"label":"K1A (B1,F0)", "x":9.5, "y":1},
-        {"label":"K1B (B1,F1)", "x":10.5, "y":1},
-        {"label":"K1C (B1,F4)", "x":11.5, "y":1},
-        {"label":"K1D (B1,F5)", "x":12.5, "y":1},
-        {"label":"K1E (B1,F6)", "x":13.5, "y":1, "w":1.5},
-        {"label":"K1F (B1,F7)", "x":15, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
 
-        {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
-        {"label":"K22 (B2,D0)", "x":1.75, "y":2},
-        {"label":"K23 (B2,D1)", "x":2.75, "y":2},
-        {"label":"K24 (B2,D2)", "x":3.75, "y":2},
-        {"label":"K25 (B2,D3)", "x":4.75, "y":2},
-        {"label":"K26 (B2,D4)", "x":5.75, "y":2},
-        {"label":"K27 (B2,D5)", "x":6.75, "y":2},
-        {"label":"K28 (B2,D6)", "x":7.75, "y":2},
-        {"label":"K29 (B2,D7)", "x":8.75, "y":2},
-        {"label":"K2A (B2,F0)", "x":9.75, "y":2},
-        {"label":"K2B (B2,F1)", "x":10.75, "y":2},
-        {"label":"K2C (B2,F4)", "x":11.75, "y":2},
-        {"label":"K2E (B2,F6)", "x":12.75, "y":2, "w":2.25},
-        {"label":"K2F (B2,F7)", "x":15, "y":2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
 
-        {"label":"K30 (B3,C6)", "x":0, "y":3, "w":2.25},
-        {"label":"K32 (B3,D0)", "x":2.25, "y":3},
-        {"label":"K33 (B3,D1)", "x":3.25, "y":3},
-        {"label":"K34 (B3,D2)", "x":4.25, "y":3},
-        {"label":"K35 (B3,D3)", "x":5.25, "y":3},
-        {"label":"K36 (B3,D4)", "x":6.25, "y":3},
-        {"label":"K37 (B3,D5)", "x":7.25, "y":3},
-        {"label":"K38 (B3,D6)", "x":8.25, "y":3},
-        {"label":"K39 (B3,D7)", "x":9.25, "y":3},
-        {"label":"K3A (B3,F0)", "x":10.25, "y":3},
-        {"label":"K3B (B3,F1)", "x":11.25, "y":3},
-        {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
-        {"label":"K3E (B3,F6)", "x":14, "y":3},
-        {"label":"K3F (B3,F7)", "x":15, "y":3},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
 
-        {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
-        {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
-        {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
-        {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
-        {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
-        {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
-        {"label":"K4D (B4,F5)", "x":13, "y":4},
-        {"label":"K4E (B4,F6)", "x":14, "y":4},
-        {"label":"K4F (B4,F7)", "x":15, "y":4}
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_65_iso_blocker": {
       "layout": [
-        {"label":"K00 (B0,C6)", "x":0, "y":0},
-        {"label":"K01 (B0,C7)", "x":1, "y":0},
-        {"label":"K02 (B0,D0)", "x":2, "y":0},
-        {"label":"K03 (B0,D1)", "x":3, "y":0},
-        {"label":"K04 (B0,D2)", "x":4, "y":0},
-        {"label":"K05 (B0,D3)", "x":5, "y":0},
-        {"label":"K06 (B0,D4)", "x":6, "y":0},
-        {"label":"K07 (B0,D5)", "x":7, "y":0},
-        {"label":"K08 (B0,D6)", "x":8, "y":0},
-        {"label":"K09 (B0,D7)", "x":9, "y":0},
-        {"label":"K0A (B0,F0)", "x":10, "y":0},
-        {"label":"K0B (B0,F1)", "x":11, "y":0},
-        {"label":"K0C (B0,F4)", "x":12, "y":0},
-        {"label":"K0D (B0,F5)", "x":13, "y":0, "w":2},
-        {"label":"K0F (B0,F7)", "x":15, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
 
-        {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
-        {"label":"K12 (B1,D0)", "x":1.5, "y":1},
-        {"label":"K13 (B1,D1)", "x":2.5, "y":1},
-        {"label":"K14 (B1,D2)", "x":3.5, "y":1},
-        {"label":"K15 (B1,D3)", "x":4.5, "y":1},
-        {"label":"K16 (B1,D4)", "x":5.5, "y":1},
-        {"label":"K17 (B1,D5)", "x":6.5, "y":1},
-        {"label":"K18 (B1,D6)", "x":7.5, "y":1},
-        {"label":"K19 (B1,D7)", "x":8.5, "y":1},
-        {"label":"K1A (B1,F0)", "x":9.5, "y":1},
-        {"label":"K1B (B1,F1)", "x":10.5, "y":1},
-        {"label":"K1C (B1,F4)", "x":11.5, "y":1},
-        {"label":"K1D (B1,F5)", "x":12.5, "y":1},
-        {"label":"K1F (B1,F7)", "x":15, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 15], "x": 15, "y": 1},
 
-        {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
-        {"label":"K22 (B2,D0)", "x":1.75, "y":2},
-        {"label":"K23 (B2,D1)", "x":2.75, "y":2},
-        {"label":"K24 (B2,D2)", "x":3.75, "y":2},
-        {"label":"K25 (B2,D3)", "x":4.75, "y":2},
-        {"label":"K26 (B2,D4)", "x":5.75, "y":2},
-        {"label":"K27 (B2,D5)", "x":6.75, "y":2},
-        {"label":"K28 (B2,D6)", "x":7.75, "y":2},
-        {"label":"K29 (B2,D7)", "x":8.75, "y":2},
-        {"label":"K2A (B2,F0)", "x":9.75, "y":2},
-        {"label":"K2B (B2,F1)", "x":10.75, "y":2},
-        {"label":"K2C (B2,F4)", "x":11.75, "y":2},
-        {"label":"K2E (B2,F6)", "x":12.75, "y":2},
-        {"label":"K1E (B1,F6)", "x":13.75, "y":1, "w":1.25, "h":2},
-        {"label":"K2F (B2,F7)", "x":15, "y":2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2},
+        {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"matrix": [2, 15], "x": 15, "y": 2},
 
-        {"label":"K30 (B3,C6)", "x":0, "y":3, "w":1.25},
-        {"label":"K31 (B3,C7)", "x":1.25, "y":3},
-        {"label":"K32 (B3,D0)", "x":2.25, "y":3},
-        {"label":"K33 (B3,D1)", "x":3.25, "y":3},
-        {"label":"K34 (B3,D2)", "x":4.25, "y":3},
-        {"label":"K35 (B3,D3)", "x":5.25, "y":3},
-        {"label":"K36 (B3,D4)", "x":6.25, "y":3},
-        {"label":"K37 (B3,D5)", "x":7.25, "y":3},
-        {"label":"K38 (B3,D6)", "x":8.25, "y":3},
-        {"label":"K39 (B3,D7)", "x":9.25, "y":3},
-        {"label":"K3A (B3,F0)", "x":10.25, "y":3},
-        {"label":"K3B (B3,F1)", "x":11.25, "y":3},
-        {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
-        {"label":"K3E (B3,F6)", "x":14, "y":3},
-        {"label":"K3F (B3,F7)", "x":15, "y":3},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
 
-        {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
-        {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
-        {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
-        {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
-        {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
-        {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
-        {"label":"K4D (B4,F5)", "x":13, "y":4},
-        {"label":"K4E (B4,F6)", "x":14, "y":4},
-        {"label":"K4F (B4,F7)", "x":15, "y":4}
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_65_iso_blocker_split_bs": {
       "layout": [
-        {"label":"K00 (B0,C6)", "x":0, "y":0},
-        {"label":"K01 (B0,C7)", "x":1, "y":0},
-        {"label":"K02 (B0,D0)", "x":2, "y":0},
-        {"label":"K03 (B0,D1)", "x":3, "y":0},
-        {"label":"K04 (B0,D2)", "x":4, "y":0},
-        {"label":"K05 (B0,D3)", "x":5, "y":0},
-        {"label":"K06 (B0,D4)", "x":6, "y":0},
-        {"label":"K07 (B0,D5)", "x":7, "y":0},
-        {"label":"K08 (B0,D6)", "x":8, "y":0},
-        {"label":"K09 (B0,D7)", "x":9, "y":0},
-        {"label":"K0A (B0,F0)", "x":10, "y":0},
-        {"label":"K0B (B0,F1)", "x":11, "y":0},
-        {"label":"K0C (B0,F4)", "x":12, "y":0},
-        {"label":"K0D (B0,F5)", "x":13, "y":0},
-        {"label":"K0E (B0,F6)", "x":14, "y":0},
-        {"label":"K0F (B0,F7)", "x":15, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [0, 15], "x": 15, "y": 0},
 
-        {"label":"K10 (B1,C6)", "x":0, "y":1, "w":1.5},
-        {"label":"K12 (B1,D0)", "x":1.5, "y":1},
-        {"label":"K13 (B1,D1)", "x":2.5, "y":1},
-        {"label":"K14 (B1,D2)", "x":3.5, "y":1},
-        {"label":"K15 (B1,D3)", "x":4.5, "y":1},
-        {"label":"K16 (B1,D4)", "x":5.5, "y":1},
-        {"label":"K17 (B1,D5)", "x":6.5, "y":1},
-        {"label":"K18 (B1,D6)", "x":7.5, "y":1},
-        {"label":"K19 (B1,D7)", "x":8.5, "y":1},
-        {"label":"K1A (B1,F0)", "x":9.5, "y":1},
-        {"label":"K1B (B1,F1)", "x":10.5, "y":1},
-        {"label":"K1C (B1,F4)", "x":11.5, "y":1},
-        {"label":"K1D (B1,F5)", "x":12.5, "y":1},
-        {"label":"K1F (B1,F7)", "x":15, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 15], "x": 15, "y": 1},
 
-        {"label":"K20 (B2,C6)", "x":0, "y":2, "w":1.75},
-        {"label":"K22 (B2,D0)", "x":1.75, "y":2},
-        {"label":"K23 (B2,D1)", "x":2.75, "y":2},
-        {"label":"K24 (B2,D2)", "x":3.75, "y":2},
-        {"label":"K25 (B2,D3)", "x":4.75, "y":2},
-        {"label":"K26 (B2,D4)", "x":5.75, "y":2},
-        {"label":"K27 (B2,D5)", "x":6.75, "y":2},
-        {"label":"K28 (B2,D6)", "x":7.75, "y":2},
-        {"label":"K29 (B2,D7)", "x":8.75, "y":2},
-        {"label":"K2A (B2,F0)", "x":9.75, "y":2},
-        {"label":"K2B (B2,F1)", "x":10.75, "y":2},
-        {"label":"K2C (B2,F4)", "x":11.75, "y":2},
-        {"label":"K2E (B2,F6)", "x":12.75, "y":2},
-        {"label":"K1E (B1,F6)", "x":13.75, "y":1, "w":1.25, "h":2},
-        {"label":"K2F (B2,F7)", "x":15, "y":2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2},
+        {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"matrix": [2, 15], "x": 15, "y": 2},
 
-        {"label":"K30 (B3,C6)", "x":0, "y":3, "w":1.25},
-        {"label":"K31 (B3,C7)", "x":1.25, "y":3},
-        {"label":"K32 (B3,D0)", "x":2.25, "y":3},
-        {"label":"K33 (B3,D1)", "x":3.25, "y":3},
-        {"label":"K34 (B3,D2)", "x":4.25, "y":3},
-        {"label":"K35 (B3,D3)", "x":5.25, "y":3},
-        {"label":"K36 (B3,D4)", "x":6.25, "y":3},
-        {"label":"K37 (B3,D5)", "x":7.25, "y":3},
-        {"label":"K38 (B3,D6)", "x":8.25, "y":3},
-        {"label":"K39 (B3,D7)", "x":9.25, "y":3},
-        {"label":"K3A (B3,F0)", "x":10.25, "y":3},
-        {"label":"K3B (B3,F1)", "x":11.25, "y":3},
-        {"label":"K3D (B3,F5)", "x":12.25, "y":3, "w":1.75},
-        {"label":"K3E (B3,F6)", "x":14, "y":3},
-        {"label":"K3F (B3,F7)", "x":15, "y":3},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
 
-        {"label":"K40 (B4,C6)", "x":0, "y":4, "w":1.25},
-        {"label":"K41 (B4,C7)", "x":1.25, "y":4, "w":1.25},
-        {"label":"K43 (B4,D1)", "x":2.5, "y":4, "w":1.25},
-        {"label":"K46 (B4,D4)", "x":3.75, "y":4, "w":6.25},
-        {"label":"K4A (B4,F0)", "x":10, "y":4, "w":1.25},
-        {"label":"K4B (B4,F1)", "x":11.25, "y":4, "w":1.25},
-        {"label":"K4D (B4,F5)", "x":13, "y":4},
-        {"label":"K4E (B4,F6)", "x":14, "y":4},
-        {"label":"K4F (B4,F7)", "x":15, "y":4}
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     }
   },
diff --git a/keyboards/ft/mars65/mars65.c b/keyboards/ft/mars65/mars65.c
deleted file mode 100644
index d4fbf86d5a..0000000000
--- a/keyboards/ft/mars65/mars65.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2022 wonderbeel (https://github.com/wonderbeel)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "mars65.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
-
diff --git a/keyboards/ft/mars65/mars65.h b/keyboards/ft/mars65/mars65.h
deleted file mode 100644
index 8627ad09bb..0000000000
--- a/keyboards/ft/mars65/mars65.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2022 wonderbeel (https://github.com/wonderbeel)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ANSI
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0D     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └───────┘
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ 
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E      │2F │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │3F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │43  │46                      │4A  │4B  │ │4D │4E │4F │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-
-/* ISO
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0D     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └───────┘
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ 1E  │1F │   
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤   
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │    │2F │   
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤   
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │3F │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │43  │46                      │4A  │4B  │ │4D │4E │4F │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
-    K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
-    K40, K41, K43,                K46,           K4A, K4B,      K4D, K4E, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
-    K40, K41, K43,                K46,           K4A, K4B,      K4D, K4E, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K1E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
-    K40, K41, K43,                K46,           K4A, K4B,      K4D, K4E, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K1E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
-    K40, K41, K43,                K46,           K4A, K4B,      K4D, K4E, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
-
diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h
index 727718e396..116c09d6ac 100644
--- a/keyboards/ft/mars80/config.h
+++ b/keyboards/ft/mars80/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 20
 
-//                        0   1   2   3   4   5   6   7   8   9   A   B   C   D
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json
index ff451d8bcf..c2d0f0a5a6 100644
--- a/keyboards/ft/mars80/info.json
+++ b/keyboards/ft/mars80/info.json
@@ -8,9 +8,17 @@
         "pid": "0x422D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"],
+        "rows": ["B0", "B1", "B2", "B3", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1",
         "scroll_lock": "D6"
@@ -20,11 +28,213 @@
     "community_layouts": ["tkl_ansi", "tkl_iso"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
-        },
+            "layout": [
+                {"matrix": [1, 1], "x": 0, "y": 0},
+
+                {"matrix": [1, 3], "x": 2, "y": 0},
+                {"matrix": [1, 4], "x": 3, "y": 0},
+                {"matrix": [1, 5], "x": 4, "y": 0},
+                {"matrix": [1, 6], "x": 5, "y": 0},
+
+                {"matrix": [1, 8], "x": 6.5, "y": 0},
+                {"matrix": [1, 9], "x": 7.5, "y": 0},
+                {"matrix": [1, 10], "x": 8.5, "y": 0},
+                {"matrix": [1, 11], "x": 9.5, "y": 0},
+
+                {"matrix": [1, 12], "x": 11, "y": 0},
+                {"matrix": [1, 0], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [1, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 2], "x": 15.25, "y": 0},
+                {"matrix": [0, 3], "x": 16.25, "y": 0},
+                {"matrix": [0, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 1], "x": 0, "y": 1.5},
+                {"matrix": [2, 2], "x": 1, "y": 1.5},
+                {"matrix": [2, 3], "x": 2, "y": 1.5},
+                {"matrix": [2, 4], "x": 3, "y": 1.5},
+                {"matrix": [2, 5], "x": 4, "y": 1.5},
+                {"matrix": [2, 6], "x": 5, "y": 1.5},
+                {"matrix": [2, 7], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 9], "x": 8, "y": 1.5},
+                {"matrix": [2, 10], "x": 9, "y": 1.5},
+                {"matrix": [2, 11], "x": 10, "y": 1.5},
+                {"matrix": [2, 12], "x": 11, "y": 1.5},
+                {"matrix": [2, 0], "x": 12, "y": 1.5},
+                {"matrix": [2, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [0, 6], "x": 16.25, "y": 1.5},
+                {"matrix": [0, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [3, 1], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 9.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 12], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [0, 9], "x": 16.25, "y": 2.5},
+                {"matrix": [0, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 1], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [4, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [4, 9], "x": 8.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 9.75, "y": 3.5},
+                {"matrix": [4, 11], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 12], "x": 11.75, "y": 3.5},
+                {"matrix": [4, 0], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [5, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [5, 13], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 2], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [6, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 12], "x": 13.75, "y": 5.5, "w": 1.25},
 
+                {"matrix": [6, 0], "x": 15.25, "y": 5.5},
+                {"matrix": [6, 13], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 8], "x": 17.25, "y": 5.5}
+            ]
+        },
         "LAYOUT_tkl_iso": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
+            "layout": [
+                {"matrix": [1, 1], "x": 0, "y": 0},
+
+                {"matrix": [1, 3], "x": 2, "y": 0},
+                {"matrix": [1, 4], "x": 3, "y": 0},
+                {"matrix": [1, 5], "x": 4, "y": 0},
+                {"matrix": [1, 6], "x": 5, "y": 0},
+
+                {"matrix": [1, 8], "x": 6.5, "y": 0},
+                {"matrix": [1, 9], "x": 7.5, "y": 0},
+                {"matrix": [1, 10], "x": 8.5, "y": 0},
+                {"matrix": [1, 11], "x": 9.5, "y": 0},
+
+                {"matrix": [1, 12], "x": 11, "y": 0},
+                {"matrix": [1, 0], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [1, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 2], "x": 15.25, "y": 0},
+                {"matrix": [0, 3], "x": 16.25, "y": 0},
+                {"matrix": [0, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 1], "x": 0, "y": 1.5},
+                {"matrix": [2, 2], "x": 1, "y": 1.5},
+                {"matrix": [2, 3], "x": 2, "y": 1.5},
+                {"matrix": [2, 4], "x": 3, "y": 1.5},
+                {"matrix": [2, 5], "x": 4, "y": 1.5},
+                {"matrix": [2, 6], "x": 5, "y": 1.5},
+                {"matrix": [2, 7], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 9], "x": 8, "y": 1.5},
+                {"matrix": [2, 10], "x": 9, "y": 1.5},
+                {"matrix": [2, 11], "x": 10, "y": 1.5},
+                {"matrix": [2, 12], "x": 11, "y": 1.5},
+                {"matrix": [2, 0], "x": 12, "y": 1.5},
+                {"matrix": [2, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [0, 6], "x": 16.25, "y": 1.5},
+                {"matrix": [0, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [3, 1], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 9.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 12], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 12.5, "y": 2.5},
+                {"matrix": [0, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [0, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [0, 8], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 1], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 2], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 3], "x": 1.75, "y": 3.5},
+                {"matrix": [4, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 5.75, "y": 3.5},
+                {"matrix": [4, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 9], "x": 7.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [4, 11], "x": 9.75, "y": 3.5},
+                {"matrix": [4, 12], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [4, 0], "x": 12.75, "y": 3.5},
+
+                {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 13], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [5, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [5, 13], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 2], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [6, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [6, 0], "x": 15.25, "y": 5.5},
+                {"matrix": [6, 13], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 8], "x": 17.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/ft/mars80/mars80.c b/keyboards/ft/mars80/mars80.c
deleted file mode 100644
index 5c95d04e35..0000000000
--- a/keyboards/ft/mars80/mars80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mars80.h"
diff --git a/keyboards/ft/mars80/mars80.h b/keyboards/ft/mars80/mars80.h
deleted file mode 100644
index fdeb4f9857..0000000000
--- a/keyboards/ft/mars80/mars80.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_tkl_iso( \
-    k11, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k10, k1D, k12, k02, k03, k00,      \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k20, k2D, k07, k06, k05, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k30, k0D, k09, k08,      \
-    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k3D, k40,                \
-    k51, k4D, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D,                \
-    k61, k62, k63, k65, k69, k6A, k6B, k6C, k60, k6D, k68                                \
-) \
-{ \
-   { k00,   KC_NO, k02, k03, KC_NO, k05, k06,   k07,   k08, k09, KC_NO, KC_NO, KC_NO, k0D   }, \
-   { k10,   k11,   k12, k13, k14,   k15, k16,   KC_NO, k18, k19, k1A,   k1B,   k1C,   k1D   }, \
-   { k20,   k21,   k22, k23, k24,   k25, k26,   k27,   k28, k29, k2A,   k2B,   k2C,   k2D   }, \
-   { k30,   k31,   k32, k33, k34,   k35, k36,   k37,   k38, k39, k3A,   k3B,   k3C,   k3D   }, \
-   { k40,   k41,   k42, k43, k44,   k45, k46,   k47,   k48, k49, k4A,   k4B,   k4C,   k4D   }, \
-   { KC_NO, k51,   k52, k53, k54,   k55, k56,   k57,   k58, k59, k5A,   k5B,   k5C,   k5D   }, \
-   { k60,   k61,   k62, k63, KC_NO, k65, KC_NO, KC_NO, k68, k69, k6A,   k6B,   k6C,   k6D   }, \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k11, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k10, k1D, k12, k02, k03, k00,      \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k20, k2D, k07, k06, k05, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k30, k3D, k0D, k09, k08, \
-    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k40,                     \
-    k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D,                     \
-    k61, k62, k63, k65, k69, k6A, k6B, k6C, k60, k6D, k68                                \
-) \
-{ \
-   { k00,   KC_NO, k02, k03, KC_NO, k05, k06,   k07,   k08, k09, KC_NO, KC_NO, KC_NO, k0D   }, \
-   { k10,   k11,   k12, k13, k14,   k15, k16,   KC_NO, k18, k19, k1A,   k1B,   k1C,   k1D   }, \
-   { k20,   k21,   k22, k23, k24,   k25, k26,   k27,   k28, k29, k2A,   k2B,   k2C,   k2D   }, \
-   { k30,   k31,   k32, k33, k34,   k35, k36,   k37,   k38, k39, k3A,   k3B,   k3C,   k3D   }, \
-   { k40,   k41,   k42, k43, k44,   k45, k46,   k47,   k48, k49, k4A,   k4B,   k4C,   KC_NO }, \
-   { KC_NO, k51,   k52, k53, k54,   k55, k56,   k57,   k58, k59, k5A,   k5B,   k5C,   k5D   }, \
-   { k60,   k61,   k62, k63, KC_NO, k65, KC_NO, KC_NO, k68, k69, k6A,   k6B,   k6C,   k6D   }, \
-}
diff --git a/keyboards/ft/mars80/rules.mk b/keyboards/ft/mars80/rules.mk
index 9a00928ea8..51df0b642e 100644
--- a/keyboards/ft/mars80/rules.mk
+++ b/keyboards/ft/mars80/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/function96/v1/config.h b/keyboards/function96/v1/config.h
deleted file mode 100644
index d138d05a90..0000000000
--- a/keyboards/function96/v1/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Matt3o
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F1, F0, C15, C14, C13, B9 }
-#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B12, A13, A14, A15, B3, B4, B5, B6, B7, B8}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/function96/v1/info.json b/keyboards/function96/v1/info.json
index 0b937baada..a3c177cfd7 100644
--- a/keyboards/function96/v1/info.json
+++ b/keyboards/function96/v1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x672A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B12", "A13", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+        "rows": ["F1", "F0", "C15", "C14", "C13", "B9"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/function96/v1/v1.c b/keyboards/function96/v1/v1.c
deleted file mode 100644
index 03cade9261..0000000000
--- a/keyboards/function96/v1/v1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Matt3o
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v1.h"
diff --git a/keyboards/function96/v2/config.h b/keyboards/function96/v2/config.h
deleted file mode 100644
index 9845b69087..0000000000
--- a/keyboards/function96/v2/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Matt3o
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A9, A8, B15, B14, B13, B12 }
-#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, A14, A15, B3, B4, B5, B6, B7, B8, B9}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/function96/v2/info.json b/keyboards/function96/v2/info.json
index c075304366..88d54b5147 100644
--- a/keyboards/function96/v2/info.json
+++ b/keyboards/function96/v2/info.json
@@ -8,552 +8,580 @@
         "pid": "0x672B",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
+        "rows": ["A9", "A8", "B15", "B14", "B13", "B12"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Del", "x":14, "y":0},
-                {"label":"Prev", "x":15, "y":0},
-                {"label":"Next", "x":16, "y":0},
-                {"label":"Vol -", "x":17, "y":0},
-                {"label":"Vol +", "x":18, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Play", "x":15, "y":1},
-                {"label":"/", "x":16, "y":1},
-                {"label":"*", "x":17, "y":1},
-                {"label":"-", "x":18, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"7", "x":15, "y":2},
-                {"label":"8", "x":16, "y":2},
-                {"label":"9", "x":17, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":3, "w":1.25},
-                {"label":"4", "x":15, "y":3},
-                {"label":"5", "x":16, "y":3},
-                {"label":"6", "x":17, "y":3},
-                {"label":"+", "x":18, "y":2, "h":2},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"1", "x":15, "y":4},
-                {"label":"2", "x":16, "y":4},
-                {"label":"3", "x":17, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":2.25},
-                {"label":"Layer", "x":6, "y":5, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5, "w":2.75},
-                {"label":"Alt", "x":10, "y":5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5, "w":1.25},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5},
-                {"label":"0", "x":16, "y":5},
-                {"label":".", "x":17, "y":5},
-                {"label":"Enter", "x":18, "y":4, "h":2}
+                {"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, 6], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+                {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+                {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+                {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+                {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+                {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+                {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+                {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 3, "w": 1.25},
+                {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+                {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+                {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+                {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+                {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+                {"label": "Layer", "matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+                {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+                {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+                {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_default": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Del", "x":14, "y":0},
-                {"label":"Prev", "x":15, "y":0},
-                {"label":"Next", "x":16, "y":0},
-                {"label":"Vol -", "x":17, "y":0},
-                {"label":"Vol +", "x":18, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Play", "x":15, "y":1},
-                {"label":"/", "x":16, "y":1},
-                {"label":"*", "x":17, "y":1},
-                {"label":"-", "x":18, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"7", "x":15, "y":2},
-                {"label":"8", "x":16, "y":2},
-                {"label":"9", "x":17, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"4", "x":15, "y":3},
-                {"label":"5", "x":16, "y":3},
-                {"label":"6", "x":17, "y":3},
-                {"label":"+", "x":18, "y":2, "h":2},
-
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"1", "x":15, "y":4},
-                {"label":"2", "x":16, "y":4},
-                {"label":"3", "x":17, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"6.25Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5, "w":1.25},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5},
-                {"label":"0", "x":16, "y":5},
-                {"label":".", "x":17, "y":5},
-                {"label":"Enter", "x":18, "y":4, "h":2}
+                {"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, 6], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+                {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+                {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+                {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+                {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+                {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+                {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+                {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+                {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+                {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+                {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "6.25Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+                {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+                {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+                {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_ansi_splitspace": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Del", "x":14, "y":0},
-                {"label":"Prev", "x":15, "y":0},
-                {"label":"Next", "x":16, "y":0},
-                {"label":"Vol -", "x":17, "y":0},
-                {"label":"Vol +", "x":18, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Play", "x":15, "y":1},
-                {"label":"/", "x":16, "y":1},
-                {"label":"*", "x":17, "y":1},
-                {"label":"-", "x":18, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"7", "x":15, "y":2},
-                {"label":"8", "x":16, "y":2},
-                {"label":"9", "x":17, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"4", "x":15, "y":3},
-                {"label":"5", "x":16, "y":3},
-                {"label":"6", "x":17, "y":3},
-                {"label":"+", "x":18, "y":2, "h":2},
-
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"1", "x":15, "y":4},
-                {"label":"2", "x":16, "y":4},
-                {"label":"3", "x":17, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":2.25},
-                {"label":"Layer", "x":6, "y":5, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5, "w":2.75},
-                {"label":"Alt", "x":10, "y":5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5, "w":1.25},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5},
-                {"label":"0", "x":16, "y":5},
-                {"label":".", "x":17, "y":5},
-                {"label":"Enter", "x":18, "y":4, "h":2}
+                {"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, 6], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+                {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+                {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+                {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+                {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+                {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+                {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+                {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+                {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+                {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+                {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+                {"label": "Layer", "matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+                {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+                {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+                {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Del", "x":14, "y":0},
-                {"label":"Prev", "x":15, "y":0},
-                {"label":"Next", "x":16, "y":0},
-                {"label":"Vol -", "x":17, "y":0},
-                {"label":"Vol +", "x":18, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Play", "x":15, "y":1},
-                {"label":"/", "x":16, "y":1},
-                {"label":"*", "x":17, "y":1},
-                {"label":"-", "x":18, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"7", "x":15, "y":2},
-                {"label":"8", "x":16, "y":2},
-                {"label":"9", "x":17, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"4", "x":15, "y":3},
-                {"label":"5", "x":16, "y":3},
-                {"label":"6", "x":17, "y":3},
-                {"label":"+", "x":18, "y":2, "h":2},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"1", "x":15, "y":4},
-                {"label":"2", "x":16, "y":4},
-                {"label":"3", "x":17, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"6.25Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5, "w":1.25},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5},
-                {"label":"0", "x":16, "y":5},
-                {"label":".", "x":17, "y":5},
-                {"label":"Enter", "x":18, "y":4, "h":2}
+                {"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, 6], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+                {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+                {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+                {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+                {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+                {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+                {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+                {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+                {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+                {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+                {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+                {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "6.25Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+                {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+                {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+                {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_iso_splitspace": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Del", "x":14, "y":0},
-                {"label":"Prev", "x":15, "y":0},
-                {"label":"Next", "x":16, "y":0},
-                {"label":"Vol -", "x":17, "y":0},
-                {"label":"Vol +", "x":18, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Play", "x":15, "y":1},
-                {"label":"/", "x":16, "y":1},
-                {"label":"*", "x":17, "y":1},
-                {"label":"-", "x":18, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"7", "x":15, "y":2},
-                {"label":"8", "x":16, "y":2},
-                {"label":"9", "x":17, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"4", "x":15, "y":3},
-                {"label":"5", "x":16, "y":3},
-                {"label":"6", "x":17, "y":3},
-                {"label":"+", "x":18, "y":2, "h":2},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"1", "x":15, "y":4},
-                {"label":"2", "x":16, "y":4},
-                {"label":"3", "x":17, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":2.25},
-                {"label":"Layer", "x":6, "y":5, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5, "w":2.75},
-                {"label":"Alt", "x":10, "y":5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5, "w":1.25},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5},
-                {"label":"0", "x":16, "y":5},
-                {"label":".", "x":17, "y":5},
-                {"label":"Enter", "x":18, "y":4, "h":2}
+                {"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, 6], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+                {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+                {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+                {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+                {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+                {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+                {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+                {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+                {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+                {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+                {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+                {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+                {"label": "Layer", "matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+                {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+                {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+                {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
             ]
         }
     }
diff --git a/keyboards/function96/v2/v2.c b/keyboards/function96/v2/v2.c
deleted file mode 100644
index 0e1ae134d8..0000000000
--- a/keyboards/function96/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Matt3o
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v2.h"
diff --git a/keyboards/function96/v2/v2.h b/keyboards/function96/v2/v2.h
deleted file mode 100644
index 4e93d99b35..0000000000
--- a/keyboards/function96/v2/v2.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2020 Matt3o
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_all( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, K116, K117, K118, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217,      \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318,\
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417,      \
-	K500, K501, K502,       K504,       K506,       K508,       K510, K511, K512,       K514, K515, K516, K517, K518 \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115,  K116,  K117,  K118 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315,  K316,  K317,  K318 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, K504,  KC_NO, K506,  KC_NO, K508,  KC_NO, K510,  K511,  K512,  KC_NO, K514,  K515,  K516,  K517,  K518 }  \
-}
-#define LAYOUT_default( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, K116, K117, K118, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217,      \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, K316, K317, K318,\
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417,      \
-	K500, K501, K502,                   K506,                   K510, K511, K512,       K514, K515, K516, K517, K518\
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115,  K116,  K117,  K118 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315,  K316,  K317,  K318 }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  KC_NO, K514,  K515,  K516,  K517,  K518 }  \
-}
-#define LAYOUT_ansi_splitspace( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, K116, K117, K118, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217,      \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, K316, K317, K318, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417,      \
-	K500, K501, K502,       K504,       K506,       K508,       K510, K511, K512,       K514, K515, K516, K517, K518   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115,  K116,  K117,  K118 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315,  K316,  K317,  K318 }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, K504,  KC_NO, K506,  KC_NO, K508,  KC_NO, K510,  K511,  K512,  KC_NO, K514,  K515,  K516,  K517,  K518 }  \
-}
-#define LAYOUT_iso( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, K116, K117, K118, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, K216, K217,      \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417,      \
-	K500, K501, K502,                   K506,                   K510, K511, K512,       K514, K515, K516, K517, K518   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115,  K116,  K117,  K118 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215,  K216,  K217,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315,  K316,  K317,  K318 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  KC_NO, K514,  K515,  K516,  K517,  K518 }  \
-}
-#define LAYOUT_iso_splitspace( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, K116, K117, K118, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, K216, K217,      \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417,      \
-	K500, K501, K502,       K504,       K506,       K508,       K510, K511, K512,       K514, K515, K516, K517, K518   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115,  K116,  K117,  K118 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215,  K216,  K217,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315,  K316,  K317,  K318 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, K504,  KC_NO, K506,  KC_NO, K508,  KC_NO, K510,  K511,  K512,  KC_NO, K514,  K515,  K516,  K517,  K518 }  \
-}
diff --git a/keyboards/fungo/fungo.c b/keyboards/fungo/fungo.c
deleted file mode 100644
index 1446234b36..0000000000
--- a/keyboards/fungo/fungo.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2022 bojiguard (@bojiguard)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
- #include "fungo.h"
-
diff --git a/keyboards/fungo/fungo.h b/keyboards/fungo/fungo.h
deleted file mode 100644
index dd267c3463..0000000000
--- a/keyboards/fungo/fungo.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 bojiguard (@bojiguard)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_fungo_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/fungo/keymaps/default/config.h b/keyboards/fungo/keymaps/default/config.h
deleted file mode 100644
index c6d778d109..0000000000
--- a/keyboards/fungo/keymaps/default/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* This is the c configuration file for the keymap
- * Copyright 2022 bojiguard (@bojiguard)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-
-
-#define IGNORE_MOD_TAP_INTERRUPT
-
diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h
index 43db4d05ca..187a7809bc 100644
--- a/keyboards/fungo/rev1/config.h
+++ b/keyboards/fungo/rev1/config.h
@@ -19,22 +19,6 @@
 /* select keyboard  master board  - I2C or Serial communication master    */
 #define MASTER_RIGHT
 
-
-// wiring of each half
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2}
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5}
-
-#define MATRIX_COL_PINS_RIGHT {F7, F6, F5, F4, B5, B4, E6}
-#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, D7, D3}    	// TX
-
-
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-
-
 /*************************************/
 /**       public parameter       **/
 /*************************************/
diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
index 12696e8045..ba8b96a060 100644
--- a/keyboards/fungo/rev1/info.json
+++ b/keyboards/fungo/rev1/info.json
@@ -8,8 +8,19 @@
     "pid": "0x1233",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+    "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
-    "soft_serial_pin": "D3"
+    "soft_serial_pin": "D3",
+    "matrix_pins": {
+      "right": {
+        "cols": ["F7", "F6", "F5", "F4", "B5", "B4", "E6"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "D3"]
+      }
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/fungo/rev1/rev1.c b/keyboards/fungo/rev1/rev1.c
deleted file mode 100644
index 5fd3a11049..0000000000
--- a/keyboards/fungo/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 bojiguard (@bojiguard)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
- #include "fungo.h"
diff --git a/keyboards/fungo/rev1/rev1.h b/keyboards/fungo/rev1/rev1.h
index bb5fadcd9a..bcb5ae345f 100644
--- a/keyboards/fungo/rev1/rev1.h
+++ b/keyboards/fungo/rev1/rev1.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "fungo.h"
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/funky40/config.h b/keyboards/funky40/config.h
index 1e7c538fe4..6ee0c16d92 100644
--- a/keyboards/funky40/config.h
+++ b/keyboards/funky40/config.h
@@ -15,14 +15,6 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, C6, B4, B5 }
-#define MATRIX_COL_PINS { D3, F5, F4, F7, B1, B6, B2, B3, D2, F6, E6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/funky40/funky40.c b/keyboards/funky40/funky40.c
deleted file mode 100644
index 1ecc25143d..0000000000
--- a/keyboards/funky40/funky40.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "funky40.h"
diff --git a/keyboards/funky40/info.json b/keyboards/funky40/info.json
index e4ac27a84f..10d70d07a0 100644
--- a/keyboards/funky40/info.json
+++ b/keyboards/funky40/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC4B5",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "F5", "F4", "F7", "B1", "B6", "B2", "B3", "D2", "F6", "E6", "D7"],
+        "rows": ["D4", "C6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/gami_studio/lex60/config.h b/keyboards/gami_studio/lex60/config.h
index 152c1a512b..ba2a345045 100644
--- a/keyboards/gami_studio/lex60/config.h
+++ b/keyboards/gami_studio/lex60/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {D5,D4,B0,D2,D3}
-#define MATRIX_COL_PINS {B7,F7,C7,E6,C6,F0,B6,F1,B5,F4,B4,F5,D7,F6,D6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D1
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json
index 8c1d730787..bd0c2240aa 100644
--- a/keyboards/gami_studio/lex60/info.json
+++ b/keyboards/gami_studio/lex60/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0160",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "F7", "C7", "E6", "C6", "F0", "B6", "F1", "B5", "F4", "B4", "F5", "D7", "F6", "D6"],
+        "rows": ["D5", "D4", "B0", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "D5",
         "esc_output": "B7"
diff --git a/keyboards/gami_studio/lex60/lex60.c b/keyboards/gami_studio/lex60/lex60.c
deleted file mode 100644
index 939d6c5589..0000000000
--- a/keyboards/gami_studio/lex60/lex60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lex60.h"
diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h
index d0415c48f5..a3516ccedb 100644
--- a/keyboards/gboards/butterstick/config.h
+++ b/keyboards/gboards/butterstick/config.h
@@ -4,9 +4,3 @@
 #define VERSION 		"Paula Deen"
 
 #define FORCE_NKRO
-
-#define MATRIX_ROW_PINS { F4, F5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json
index 085d56f91e..465cd940a1 100644
--- a/keyboards/gboards/butterstick/info.json
+++ b/keyboards/gboards/butterstick/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1337",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"],
+        "rows": ["F4", "F5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/gboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h
index 0d5c58df21..39740ac3d3 100644
--- a/keyboards/gboards/butterstick/sten.h
+++ b/keyboards/gboards/butterstick/sten.h
@@ -5,9 +5,10 @@
 //
 // Amen.
 
-#include QMK_KEYBOARD_H
+#pragma once
+
+#include "butterstick.h"
 #include "mousekey.h"
-#include "keymap.h"
 #include "keymap_steno.h"
 #include "wait.h"
 
diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h
index 5b9d5b0ecb..005dd730b8 100644
--- a/keyboards/gboards/engine/engine.h
+++ b/keyboards/gboards/engine/engine.h
@@ -10,15 +10,12 @@
         crap is removed where possible
 */
 
-#include QMK_KEYBOARD_H
 #pragma once
-#include "keymap.h"
+
+#include "quantum.h"
 #include <string.h>
-#include <stdint.h>
 #include <stdio.h>
 #include "config_engine.h"
-#include <avr/pgmspace.h>
-#include "wait.h"
 
 // Maximum values for combos
 #define COMBO_END 0x00
diff --git a/keyboards/gboards/engine/keymap_engine.h b/keyboards/gboards/engine/keymap_engine.h
index 599c1ca3e4..dfed493e21 100644
--- a/keyboards/gboards/engine/keymap_engine.h
+++ b/keyboards/gboards/engine/keymap_engine.h
@@ -7,6 +7,8 @@
  * With this disgusting bodge, you can just edit your .defs and compile!
  */
 
+#pragma once
+
 // Clear all X Macros
 #define PRES BLANK
 #define KEYS BLANK
diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
index 3274a5ab92..ba0078e71b 100644
--- a/keyboards/gboards/ergotaco/config.h
+++ b/keyboards/gboards/ergotaco/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE  1
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c
index ecab74b3a2..daeba1e0a6 100644
--- a/keyboards/gboards/ergotaco/ergotaco.c
+++ b/keyboards/gboards/ergotaco/ergotaco.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "ergotaco.h"
 
 bool i2c_initialized = 0;
 i2c_status_t mcp23018_status = 0x20;
diff --git a/keyboards/gboards/ergotaco/ergotaco.h b/keyboards/gboards/ergotaco/ergotaco.h
index 5a0cd5e8fb..e23fc264f4 100644
--- a/keyboards/gboards/ergotaco/ergotaco.h
+++ b/keyboards/gboards/ergotaco/ergotaco.h
@@ -26,23 +26,3 @@ extern i2c_status_t mcp23018_status;
 
 void init_ergodox(void);
 uint8_t init_mcp23018(void);
-
-/*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */
-#define LAYOUT(                                                          \
-    L00,L01,L02,L03,L04,L05,                   R00,R01,R02,R03,R04,R05)  \
-                                                                         \
-   /* matrix positions */                                                \
-    {			\
-    {R00},     \
-    {R01},     \
-    {R02},     \
-    {R03},     \
-    {R04},     \
-    {R05},     \
-    {L05},     \
-    {L04},     \
-    {L03},     \
-    {L02},     \
-    {L01},     \
-    {L00},     \
-}
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index 163b76db19..1de1f3ab85 100644
--- a/keyboards/gboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/info.json
@@ -13,54 +13,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "x": 0,
-                    "y": 1.25
-                },
-                {
-                    "x": 1,
-                    "y": 0.75
-                },
-                {
-                    "x": 2,
-                    "y": 0.5
-                },
-                {
-                    "x": 3,
-                    "y": 0.25
-                },
-                {
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "x": 5,
-                    "y": 1.75
-                },
-                {
-                    "x": 7,
-                    "y": 1.75
-                },
-                {
-                    "x": 8,
-                    "y": 1
-                },
-                {
-                    "x": 9,
-                    "y": 0.25
-                },
-                {
-                    "x": 10,
-                    "y": 0.5
-                },
-                {
-                    "x": 11,
-                    "y": 0.75
-                },
-                {
-                    "x": 12,
-                    "y": 1.25
-                }
+                {"matrix": [11, 0], "x": 0, "y": 1},
+                {"matrix": [10, 0], "x": 1, "y": 0.5},
+                {"matrix": [9, 0], "x": 2, "y": 0.25},
+                {"matrix": [8, 0], "x": 3, "y": 0},
+                {"matrix": [7, 0], "x": 4, "y": 0.75},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+
+                {"matrix": [0, 0], "x": 7, "y": 1.5},
+                {"matrix": [1, 0], "x": 8, "y": 0.75},
+                {"matrix": [2, 0], "x": 9, "y": 0},
+                {"matrix": [3, 0], "x": 10, "y": 0.25},
+                {"matrix": [4, 0], "x": 11, "y": 0.5},
+                {"matrix": [5, 0], "x": 12, "y": 1}
             ]
         }
     }
diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
index 1bab5e8981..63d4c4f5f3 100644
--- a/keyboards/gboards/ergotaco/matrix.c
+++ b/keyboards/gboards/ergotaco/matrix.c
@@ -17,15 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "matrix.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
 #include "wait.h"
-#include "action_layer.h"
-#include "print.h"
 #include "debug.h"
 #include "util.h"
-#include QMK_KEYBOARD_H
+#include "ergotaco.h"
 
 #ifndef DEBOUNCE
 #   define DEBOUNCE	5
diff --git a/keyboards/gboards/g/config_default.h b/keyboards/gboards/g/config_default.h
index 821c2c4ad5..56dd634d13 100644
--- a/keyboards/gboards/g/config_default.h
+++ b/keyboards/gboards/g/config_default.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "engine.h"
 
 // Configuration options for the engine
diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h
index 547ea09fdd..a78ddc96ff 100644
--- a/keyboards/gboards/g/engine.h
+++ b/keyboards/gboards/g/engine.h
@@ -10,18 +10,12 @@
         crap is removed where possible
 */
 
-#include QMK_KEYBOARD_H
 #pragma once
-#include "keymap.h"
+
+#include "quantum.h"
 #include <string.h>
-#include <stdint.h>
 #include <stdio.h>
 #include "config_engine.h"
-#include <avr/pgmspace.h>
-#include "wait.h"
-#ifdef MOUSEKEY_ENABLE
-#    include "mousekey.h"
-#endif
 
 // Set defaults
 #ifndef IN_CHORD_MASK
diff --git a/keyboards/gboards/g/keymap_combo.h b/keyboards/gboards/g/keymap_combo.h
index 68ea44b1b4..c062a298a5 100644
--- a/keyboards/gboards/g/keymap_combo.h
+++ b/keyboards/gboards/g/keymap_combo.h
@@ -1,3 +1,5 @@
+#pragma once
+
 // Keymap helpers
 // define reference layers per layer.
 #define REF_LAYER_FOR_LAYER(LAYER, REF_LAYER)   \
diff --git a/keyboards/gboards/g/keymap_engine.h b/keyboards/gboards/g/keymap_engine.h
index 055b5941e4..e134472da0 100644
--- a/keyboards/gboards/g/keymap_engine.h
+++ b/keyboards/gboards/g/keymap_engine.h
@@ -6,6 +6,9 @@
  * using a external generator (Like is done for the ASETNIOP base keymaps)
  * With this disgusting bodge, you can just edit your .defs and compile!
  */
+
+#pragma once
+
 #include "g/engine.h"
 
 // Clear all X Macros
diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h
index 858f99208f..3e090f9e57 100644
--- a/keyboards/gboards/georgi/config.h
+++ b/keyboards/gboards/georgi/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define FORCE_NKRO
 #define NO_ACTION_ONESHOT
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* key matrix size */
 #define MATRIX_ROWS 14
@@ -42,7 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE  2
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
index 8866886ce7..dd95b593f1 100644
--- a/keyboards/gboards/georgi/georgi.c
+++ b/keyboards/gboards/georgi/georgi.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "georgi.h"
 
 bool i2c_initialized = 0;
 i2c_status_t mcp23018_status = 0x20;
diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
index bb6ed9dd3e..9b3365d02f 100644
--- a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
@@ -13,7 +13,6 @@
 #include QMK_KEYBOARD_H
 #include "sten.h"
 #include "keymap_steno.h"
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // Steno Layers
 #define FUNCT	( LSD | LK | LP | LH )
diff --git a/keyboards/gboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
index 5ac696fd31..b66b1a194c 100644
--- a/keyboards/gboards/georgi/matrix.c
+++ b/keyboards/gboards/georgi/matrix.c
@@ -17,16 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "matrix.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
 #include "wait.h"
-#include "action_layer.h"
-#include "print.h"
 #include "debug.h"
 #include "util.h"
-#include "keymap_steno.h"
-#include QMK_KEYBOARD_H
+#include "georgi.h"
 
 #ifndef DEBOUNCE
 #   define DEBOUNCE	5
diff --git a/keyboards/gboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h
index 320c49514c..b5aa79893e 100644
--- a/keyboards/gboards/georgi/sten.h
+++ b/keyboards/gboards/georgi/sten.h
@@ -4,10 +4,10 @@
 // the slave and the master. Until we return from main.
 //
 // Amen.
+#pragma once
 
-#include QMK_KEYBOARD_H
+#include "georgi.h"
 #include "mousekey.h"
-#include "keymap.h"
 #include "keymap_steno.h"
 #include "wait.h"
 
diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h
index 2eda942c15..37d4fe8499 100644
--- a/keyboards/gboards/gergo/config.h
+++ b/keyboards/gboards/gergo/config.h
@@ -44,7 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE  1
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/gergo/gergo.c b/keyboards/gboards/gergo/gergo.c
index ba359f8145..da2a3007a8 100644
--- a/keyboards/gboards/gergo/gergo.c
+++ b/keyboards/gboards/gergo/gergo.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "gergo.h"
 
 bool i2c_initialized = 0;
 i2c_status_t mcp23018_status = 0x20;
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
index f38051809d..5aadadbaed 100644
--- a/keyboards/gboards/gergo/info.json
+++ b/keyboards/gboards/gergo/info.json
@@ -100,7 +100,7 @@
                 {
                     "label": "L13",
                     "x": 3.5,
-                    "y": 1.0
+                    "y": 1
                 },
                 {
                     "label": "L14",
@@ -137,7 +137,7 @@
                 {
                     "label": "R13",
                     "x": 15,
-                    "y": 1.0
+                    "y": 1
                 },
                 {
                     "label": "R14",
diff --git a/keyboards/gboards/gergo/keymaps/abstractkb/config.h b/keyboards/gboards/gergo/keymaps/abstractkb/config.h
index bc7b9f7845..d3c17757c8 100644
--- a/keyboards/gboards/gergo/keymaps/abstractkb/config.h
+++ b/keyboards/gboards/gergo/keymaps/abstractkb/config.h
@@ -1,6 +1,4 @@
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
-
 #undef DEBOUNCE
 #define DEBOUNCE    10
diff --git a/keyboards/gboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
index b72e81f6d7..39bafc5e31 100644
--- a/keyboards/gboards/gergo/keymaps/colemak/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
@@ -8,7 +8,6 @@
 
 #include QMK_KEYBOARD_H
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define BASE 0 // default layer
 #define SYMB 1 // symbols
 #define NUMB 2 // numbers/motion
diff --git a/keyboards/gboards/gergo/keymaps/default/config.h b/keyboards/gboards/gergo/keymaps/default/config.h
index 6393d46f14..3f59c932d3 100644
--- a/keyboards/gboards/gergo/keymaps/default/config.h
+++ b/keyboards/gboards/gergo/keymaps/default/config.h
@@ -1,3 +1,2 @@
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/gboards/gergo/keymaps/germ/config.h b/keyboards/gboards/gergo/keymaps/germ/config.h
index 6393d46f14..3f59c932d3 100644
--- a/keyboards/gboards/gergo/keymaps/germ/config.h
+++ b/keyboards/gboards/gergo/keymaps/germ/config.h
@@ -1,3 +1,2 @@
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/gboards/gergo/keymaps/gotham/config.h b/keyboards/gboards/gergo/keymaps/gotham/config.h
index 6393d46f14..3f59c932d3 100644
--- a/keyboards/gboards/gergo/keymaps/gotham/config.h
+++ b/keyboards/gboards/gergo/keymaps/gotham/config.h
@@ -1,3 +1,2 @@
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/gboards/gergo/keymaps/oled/config.h b/keyboards/gboards/gergo/keymaps/oled/config.h
index af960a1eed..327e03d56d 100644
--- a/keyboards/gboards/gergo/keymaps/oled/config.h
+++ b/keyboards/gboards/gergo/keymaps/oled/config.h
@@ -1,4 +1,3 @@
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define OLED_FONT_H "keyboards/gboards/gergo/keymaps/oled/glcdfont.c"
diff --git a/keyboards/gboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
index c352be24e1..8a6b38bf73 100644
--- a/keyboards/gboards/gergo/matrix.c
+++ b/keyboards/gboards/gergo/matrix.c
@@ -17,16 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "matrix.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
 #include "wait.h"
-#include "action_layer.h"
-#include "print.h"
 #include "debug.h"
 #include "util.h"
 #include "debounce.h"
-#include QMK_KEYBOARD_H
+#include "gergo.h"
 
 #ifdef BALLER
 #include <avr/interrupt.h>
diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h
index d733cb3b7a..e6ef1def9e 100644
--- a/keyboards/gboards/gergoplex/config.h
+++ b/keyboards/gboards/gergoplex/config.h
@@ -34,6 +34,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_COL_PINS { F6, F5, F4, F1 }
 #define MATRIX_ROW_PINS { B1, B2, B3, D2, D3 }
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))
diff --git a/keyboards/gboards/gergoplex/gergoplex.h b/keyboards/gboards/gergoplex/gergoplex.h
index eda21d2a94..549228104a 100644
--- a/keyboards/gboards/gergoplex/gergoplex.h
+++ b/keyboards/gboards/gergoplex/gergoplex.h
@@ -35,21 +35,3 @@ extern i2c_status_t mcp23018_status;
 #define OLATA 0x14  // output latch register
 
 uint8_t init_mcp23018(void);
-
-#define LAYOUT_split_3x5_3( \
-    L00, L01, L02, L03, L04,        R00, R01, R02, R03, R04, \
-    L10, L11, L12, L13, L14,        R10, R11, R12, R13, R14, \
-    L20, L21, L22, L23, L24,        R20, R21, R22, R23, R24, \
-                L30, L31, L32,    R30, R31, R32 \
-) { \
-    { L04, L14, L24, XXX }, \
-    { L03, L13, L23, L32 }, \
-    { L02, L12, L22, L31 }, \
-    { L01, L11, L21, L30 }, \
-    { L00, L10, L20, XXX }, \
-    { R00, R10, R20, XXX }, \
-    { R01, R11, R21, R30 }, \
-    { R02, R12, R22, R31 }, \
-    { R03, R13, R23, R32 }, \
-    { R04, R14, R24, XXX } \
-}
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json
index 914832aacf..061f8ff869 100644
--- a/keyboards/gboards/gergoplex/info.json
+++ b/keyboards/gboards/gergoplex/info.json
@@ -14,45 +14,49 @@
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"label":"L00", "x":0, "y":0.25},
-                {"label":"L01", "x":1, "y":0.125},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0.125},
-                {"label":"L04", "x":4, "y":0.375},
-                {"label":"R00", "x":8, "y":0.375},
-                {"label":"R01", "x":9, "y":0.125},
-                {"label":"R02", "x":10, "y":0},
-                {"label":"R03", "x":11, "y":0.125},
-                {"label":"R04", "x":12, "y":0.25},
+                {"matrix": [4, 0], "x": 0, "y": 0.25},
+                {"matrix": [3, 0], "x": 1, "y": 0.125},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [1, 0], "x": 3, "y": 0.125},
+                {"matrix": [0, 0], "x": 4, "y": 0.375},
 
-                {"label":"L10", "x":0, "y":1.25},
-                {"label":"L11", "x":1, "y":1.125},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1.125},
-                {"label":"L14", "x":4, "y":1.375},
-                {"label":"R10", "x":8, "y":1.375},
-                {"label":"R11", "x":9, "y":1.125},
-                {"label":"R12", "x":10, "y":1},
-                {"label":"R13", "x":11, "y":1.125},
-                {"label":"R14", "x":12, "y":1.25},
+                {"matrix": [5, 0], "x": 8, "y": 0.375},
+                {"matrix": [6, 0], "x": 9, "y": 0.125},
+                {"matrix": [7, 0], "x": 10, "y": 0},
+                {"matrix": [8, 0], "x": 11, "y": 0.125},
+                {"matrix": [9, 0], "x": 12, "y": 0.25},
 
-                {"label":"L20", "x":0, "y":2.25},
-                {"label":"L21", "x":1, "y":2.125},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2.125},
-                {"label":"L24", "x":4, "y":2.375},
-                {"label":"R20", "x":8, "y":2.375},
-                {"label":"R21", "x":9, "y":2.125},
-                {"label":"R22", "x":10, "y":2},
-                {"label":"R23", "x":11, "y":2.125},
-                {"label":"R24", "x":12, "y":2.25},
+                {"matrix": [4, 1], "x": 0, "y": 1.25},
+                {"matrix": [3, 1], "x": 1, "y": 1.125},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [1, 1], "x": 3, "y": 1.125},
+                {"matrix": [0, 1], "x": 4, "y": 1.375},
 
-                {"label":"L30", "x":2, "y":3.5},
-                {"label":"L31", "x":3.25, "y":3.625, "w":1.5},
-                {"label":"L32", "x":5, "y":3.125, "h":2},
-                {"label":"R30", "x":7, "y":3.125, "h":2},
-                {"label":"R31", "x":8.25, "y":3.625, "w":1.5},
-                {"label":"R32", "x":10, "y":3.5}
+                {"matrix": [5, 1], "x": 8, "y": 1.375},
+                {"matrix": [6, 1], "x": 9, "y": 1.125},
+                {"matrix": [7, 1], "x": 10, "y": 1},
+                {"matrix": [8, 1], "x": 11, "y": 1.125},
+                {"matrix": [9, 1], "x": 12, "y": 1.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 2.25},
+                {"matrix": [3, 2], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 3, "y": 2.125},
+                {"matrix": [0, 2], "x": 4, "y": 2.375},
+
+                {"matrix": [5, 2], "x": 8, "y": 2.375},
+                {"matrix": [6, 2], "x": 9, "y": 2.125},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [8, 2], "x": 11, "y": 2.125},
+                {"matrix": [9, 2], "x": 12, "y": 2.25},
+
+                {"matrix": [3, 3], "x": 2, "y": 3.5},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5},
+                {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2},
+
+                {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2},
+                {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5},
+                {"matrix": [8, 3], "x": 10, "y": 3.5}
             ]
         }
     }
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index eb01b1ad13..344ccf3fff 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -18,7 +18,6 @@
 
 #define RGBLED_NUM 42
 #define RGB_MATRIX_LED_COUNT 42
-#define RGB_DI_PIN A7
 
 // PWM RGB Underglow Defines
 #define WS2812_PWM_DRIVER PWMD3
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json
index 5bb1cc5ee8..504238b21c 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/info.json
@@ -8,6 +8,13 @@
     "pid": "0xA372",
     "device_version": "0.0.2"
   },
+  "ws2812": {
+    "pin": "A7",
+    "driver": "pwm"
+  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
   "processor": "STM32F072",
   "bootloader": "stm32-dfu",
   "matrix_pins": {
diff --git a/keyboards/geekboards/macropad_v2/rules.mk b/keyboards/geekboards/macropad_v2/rules.mk
index f81c11eb7d..b7807ae418 100644
--- a/keyboards/geekboards/macropad_v2/rules.mk
+++ b/keyboards/geekboards/macropad_v2/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = pwm
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index 0a184388ae..0fea806b6f 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, D4}
-#define MATRIX_COL_PINS { F7, F6, D2, D3}
-
-#define DIODE_DIRECTION COL2ROW
 #define LOCKING_SUPPORT_ENABL
 #define LOCKING_RESYNC_ENABLE
 
diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json
index fdc0463e41..16f3496a13 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/info.json
@@ -8,21 +8,29 @@
         "pid": "0x1319",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "D2", "D3"],
+        "rows": ["B0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "debounce": 3,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1}
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1}
             ]
         }
     }
diff --git a/keyboards/geekboards/tester/rules.mk b/keyboards/geekboards/tester/rules.mk
index e17c577cc4..8ac152f428 100644
--- a/keyboards/geekboards/tester/rules.mk
+++ b/keyboards/geekboards/tester/rules.mk
@@ -10,4 +10,3 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
index f2d2301ec9..05b220250f 100644
--- a/keyboards/geekboards/tester/tester.c
+++ b/keyboards/geekboards/tester/tester.c
@@ -1,4 +1,5 @@
-#include "tester.h"
+#include "quantum.h"
+
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
diff --git a/keyboards/geekboards/tester/tester.h b/keyboards/geekboards/tester/tester.h
deleted file mode 100644
index 28c555f0b6..0000000000
--- a/keyboards/geekboards/tester/tester.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-#include "quantum.h"
-#define LAYOUT( \
-      k00, k01, k02, k03,\
-      k10, k11, k12, k13\
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 } \
-}
diff --git a/keyboards/geistmaschine/geist/geist.c b/keyboards/geistmaschine/geist/geist.c
deleted file mode 100644
index 2f6825e2ee..0000000000
--- a/keyboards/geistmaschine/geist/geist.c
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "quantum.h"
-
-// This will be overridden by encoder map in all default keymaps, but serves as a catch-all for user keymaps that may omit the map.
-#if defined (ENCODER_ENABLE) && !defined (ENCODER_MAP_ENABLE)
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-      return false; /* Don't process further events if user function exists and returns false */
-    }
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/geistmaschine/macropod/macropod.c b/keyboards/geistmaschine/macropod/macropod.c
deleted file mode 100644
index 2f6825e2ee..0000000000
--- a/keyboards/geistmaschine/macropod/macropod.c
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "quantum.h"
-
-// This will be overridden by encoder map in all default keymaps, but serves as a catch-all for user keymaps that may omit the map.
-#if defined (ENCODER_ENABLE) && !defined (ENCODER_MAP_ENABLE)
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-      return false; /* Don't process further events if user function exists and returns false */
-    }
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/generic_panda/panda65_01/config.h b/keyboards/generic_panda/panda65_01/config.h
deleted file mode 100644
index 20163dedc5..0000000000
--- a/keyboards/generic_panda/panda65_01/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 generic_panda
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A9, A8, B15, A6, A4 }
-#define MATRIX_COL_PINS { A3, A10, B7, B6, B5, B4, B3, A15, A14, A2, A1, A0, F1, F0, B10, B11 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/generic_panda/panda65_01/info.json b/keyboards/generic_panda/panda65_01/info.json
index 57fe2ea133..8e8b58b5c0 100644
--- a/keyboards/generic_panda/panda65_01/info.json
+++ b/keyboards/generic_panda/panda65_01/info.json
@@ -8,14 +8,162 @@
         "pid": "0x6501",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A3", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A2", "A1", "A0", "F1", "F0", "B10", "B11"],
+        "rows": ["A9", "A8", "B15", "A6", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_split_bs": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PGup", "x":15, "y":1}, {"label":"Caps", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"LShift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"RShift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"FN", "x":15, "y":3}, {"label":"LControl", "x":0, "y":4, "w":1.5}, {"label":"LAlt", "x":2.25, "y":4, "w":1.5}, {"label":"Space", "x":3.75, "y":4, "w":7}, {"label":"RWin", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_full_bs": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"PGup", "x":15, "y":1}, {"label":"Caps", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PGdn", "x":15, "y":2}, {"label":"LShift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"RShift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"Fn", "x":15, "y":3}, {"label":"LControl", "x":0, "y":4, "w":1.5}, {"label":"LAlt", "x":2.25, "y":4, "w":1.5}, {"label":"Space", "x":3.75, "y":4, "w":7}, {"label":"RWin", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/generic_panda/panda65_01/panda65_01.c b/keyboards/generic_panda/panda65_01/panda65_01.c
deleted file mode 100644
index 15bf577426..0000000000
--- a/keyboards/generic_panda/panda65_01/panda65_01.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 generic_panda
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "panda65_01.h"
diff --git a/keyboards/generic_panda/panda65_01/panda65_01.h b/keyboards/generic_panda/panda65_01/panda65_01.h
deleted file mode 100644
index ced6e9b196..0000000000
--- a/keyboards/generic_panda/panda65_01/panda65_01.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2020 generic_panda
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113,       k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,             k215, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,             k314, k315, \
-    k400,       k402,                   k406,                         k411,       k413, k414, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014,  k015 }, \
-    { k100,  KC_NO, k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  k115 }, \
-    { k200,  KC_NO, k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  k212,  KC_NO, k215 }, \
-    { k300,  KC_NO, KC_NO, k301,  k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k314,  k315 }, \
-    { k400,  KC_NO, KC_NO, k402,  k406,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k411,  KC_NO, k413,  k414,  k415 }  \
-}
-
-#define LAYOUT_full_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,       k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113,       k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,             k215, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,             k314, k315, \
-    k400,       k402,                   k406,                         k411,       k413, k414, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014  k015 },  \
-    { k100,  KC_NO, k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  k115 }, \
-    { k200,  KC_NO, k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  k212,  KC_NO, k215 }, \
-    { k300,  KC_NO, KC_NO, k301,  k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k314,  k315 }, \
-    { k400,  KC_NO, KC_NO, k402,  k406,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k411,  KC_NO, k413,  k414,  k415 }  \
-}
-
diff --git a/keyboards/genone/eclipse_65/config.h b/keyboards/genone/eclipse_65/config.h
deleted file mode 100644
index 9c6056154a..0000000000
--- a/keyboards/genone/eclipse_65/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 GEN ONE LLC 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, B7, B0, B1, B2 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/genone/eclipse_65/eclipse_65.c b/keyboards/genone/eclipse_65/eclipse_65.c
deleted file mode 100644
index eab6d20d2e..0000000000
--- a/keyboards/genone/eclipse_65/eclipse_65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 GEN ONE LLC 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
- #include "eclipse_65.h"
diff --git a/keyboards/genone/eclipse_65/eclipse_65.h b/keyboards/genone/eclipse_65/eclipse_65.h
deleted file mode 100644
index 84d5e5f2e9..0000000000
--- a/keyboards/genone/eclipse_65/eclipse_65.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 GEN ONE LLC 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-
-#define LAYOUT_65_ansi( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,       K312, K313, K314, \
-    K400, K401, K402,                   K406,             K409, K410, K411, K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
-    { K400, K401, K402, ____, ____, ____, K406, ____, ____, K409, K410, K411, K412, K413, K414 }  \
-}
diff --git a/keyboards/genone/eclipse_65/info.json b/keyboards/genone/eclipse_65/info.json
index b17bc2bf68..d97a15616b 100644
--- a/keyboards/genone/eclipse_65/info.json
+++ b/keyboards/genone/eclipse_65/info.json
@@ -8,12 +8,90 @@
     "pid": "0x2222",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
+    "rows": ["B3", "B7", "B0", "B1", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["65_ansi"],
   "layouts": {
       "LAYOUT_65_ansi": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+            {"matrix": [0, 7], "x": 7, "y": 0},
+            {"matrix": [0, 8], "x": 8, "y": 0},
+            {"matrix": [0, 9], "x": 9, "y": 0},
+            {"matrix": [0, 10], "x": 10, "y": 0},
+            {"matrix": [0, 11], "x": 11, "y": 0},
+            {"matrix": [0, 12], "x": 12, "y": 0},
+            {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+            {"matrix": [0, 14], "x": 15, "y": 0},
+
+            {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+            {"matrix": [1, 1], "x": 1.5, "y": 1},
+            {"matrix": [1, 2], "x": 2.5, "y": 1},
+            {"matrix": [1, 3], "x": 3.5, "y": 1},
+            {"matrix": [1, 4], "x": 4.5, "y": 1},
+            {"matrix": [1, 5], "x": 5.5, "y": 1},
+            {"matrix": [1, 6], "x": 6.5, "y": 1},
+            {"matrix": [1, 7], "x": 7.5, "y": 1},
+            {"matrix": [1, 8], "x": 8.5, "y": 1},
+            {"matrix": [1, 9], "x": 9.5, "y": 1},
+            {"matrix": [1, 10], "x": 10.5, "y": 1},
+            {"matrix": [1, 11], "x": 11.5, "y": 1},
+            {"matrix": [1, 12], "x": 12.5, "y": 1},
+            {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+            {"matrix": [1, 14], "x": 15, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+            {"matrix": [2, 1], "x": 1.75, "y": 2},
+            {"matrix": [2, 2], "x": 2.75, "y": 2},
+            {"matrix": [2, 3], "x": 3.75, "y": 2},
+            {"matrix": [2, 4], "x": 4.75, "y": 2},
+            {"matrix": [2, 5], "x": 5.75, "y": 2},
+            {"matrix": [2, 6], "x": 6.75, "y": 2},
+            {"matrix": [2, 7], "x": 7.75, "y": 2},
+            {"matrix": [2, 8], "x": 8.75, "y": 2},
+            {"matrix": [2, 9], "x": 9.75, "y": 2},
+            {"matrix": [2, 10], "x": 10.75, "y": 2},
+            {"matrix": [2, 11], "x": 11.75, "y": 2},
+            {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+            {"matrix": [2, 14], "x": 15, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+            {"matrix": [3, 1], "x": 2.25, "y": 3},
+            {"matrix": [3, 2], "x": 3.25, "y": 3},
+            {"matrix": [3, 3], "x": 4.25, "y": 3},
+            {"matrix": [3, 4], "x": 5.25, "y": 3},
+            {"matrix": [3, 5], "x": 6.25, "y": 3},
+            {"matrix": [3, 6], "x": 7.25, "y": 3},
+            {"matrix": [3, 7], "x": 8.25, "y": 3},
+            {"matrix": [3, 8], "x": 9.25, "y": 3},
+            {"matrix": [3, 9], "x": 10.25, "y": 3},
+            {"matrix": [3, 10], "x": 11.25, "y": 3},
+            {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+            {"matrix": [3, 13], "x": 14, "y": 3},
+            {"matrix": [3, 14], "x": 15, "y": 3},
+
+            {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+            {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+            {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+            {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+            {"matrix": [4, 9], "x": 10, "y": 4},
+            {"matrix": [4, 10], "x": 11, "y": 4},
+            {"matrix": [4, 11], "x": 12, "y": 4},
+            {"matrix": [4, 12], "x": 13, "y": 4},
+            {"matrix": [4, 13], "x": 14, "y": 4},
+            {"matrix": [4, 14], "x": 15, "y": 4}
+          ]
       }
   }
 }
diff --git a/keyboards/genone/g1_65/config.h b/keyboards/genone/g1_65/config.h
deleted file mode 100644
index 95e67a9d12..0000000000
--- a/keyboards/genone/g1_65/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 GEN ONE LLC 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, B7, B0, B1, B2 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
diff --git a/keyboards/genone/g1_65/g1_65.c b/keyboards/genone/g1_65/g1_65.c
deleted file mode 100644
index af2da3de9a..0000000000
--- a/keyboards/genone/g1_65/g1_65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 GEN ONE LLC 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "g1_65.h"
diff --git a/keyboards/genone/g1_65/g1_65.h b/keyboards/genone/g1_65/g1_65.h
deleted file mode 100644
index 633c6e4477..0000000000
--- a/keyboards/genone/g1_65/g1_65.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 GEN ONE LLC 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-
-#define LAYOUT_65_ansi( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,       K312, K313, K314, \
-    K400, K401, K402,                   K406,             K409, K410, K411, K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
-    { K400, K401, K402, ____, ____, ____, K406, ____, ____, K409, K410, K411, K412, K413, K414 }  \
-}
-
diff --git a/keyboards/genone/g1_65/info.json b/keyboards/genone/g1_65/info.json
index da5a1df03a..eed4c85ab5 100644
--- a/keyboards/genone/g1_65/info.json
+++ b/keyboards/genone/g1_65/info.json
@@ -8,12 +8,90 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
+    "rows": ["B3", "B7", "B0", "B1", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["65_ansi"],
   "layouts": {
       "LAYOUT_65_ansi": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+            {"matrix": [0, 7], "x": 7, "y": 0},
+            {"matrix": [0, 8], "x": 8, "y": 0},
+            {"matrix": [0, 9], "x": 9, "y": 0},
+            {"matrix": [0, 10], "x": 10, "y": 0},
+            {"matrix": [0, 11], "x": 11, "y": 0},
+            {"matrix": [0, 12], "x": 12, "y": 0},
+            {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+            {"matrix": [0, 14], "x": 15, "y": 0},
+
+            {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+            {"matrix": [1, 1], "x": 1.5, "y": 1},
+            {"matrix": [1, 2], "x": 2.5, "y": 1},
+            {"matrix": [1, 3], "x": 3.5, "y": 1},
+            {"matrix": [1, 4], "x": 4.5, "y": 1},
+            {"matrix": [1, 5], "x": 5.5, "y": 1},
+            {"matrix": [1, 6], "x": 6.5, "y": 1},
+            {"matrix": [1, 7], "x": 7.5, "y": 1},
+            {"matrix": [1, 8], "x": 8.5, "y": 1},
+            {"matrix": [1, 9], "x": 9.5, "y": 1},
+            {"matrix": [1, 10], "x": 10.5, "y": 1},
+            {"matrix": [1, 11], "x": 11.5, "y": 1},
+            {"matrix": [1, 12], "x": 12.5, "y": 1},
+            {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+            {"matrix": [1, 14], "x": 15, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+            {"matrix": [2, 1], "x": 1.75, "y": 2},
+            {"matrix": [2, 2], "x": 2.75, "y": 2},
+            {"matrix": [2, 3], "x": 3.75, "y": 2},
+            {"matrix": [2, 4], "x": 4.75, "y": 2},
+            {"matrix": [2, 5], "x": 5.75, "y": 2},
+            {"matrix": [2, 6], "x": 6.75, "y": 2},
+            {"matrix": [2, 7], "x": 7.75, "y": 2},
+            {"matrix": [2, 8], "x": 8.75, "y": 2},
+            {"matrix": [2, 9], "x": 9.75, "y": 2},
+            {"matrix": [2, 10], "x": 10.75, "y": 2},
+            {"matrix": [2, 11], "x": 11.75, "y": 2},
+            {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+            {"matrix": [2, 14], "x": 15, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+            {"matrix": [3, 1], "x": 2.25, "y": 3},
+            {"matrix": [3, 2], "x": 3.25, "y": 3},
+            {"matrix": [3, 3], "x": 4.25, "y": 3},
+            {"matrix": [3, 4], "x": 5.25, "y": 3},
+            {"matrix": [3, 5], "x": 6.25, "y": 3},
+            {"matrix": [3, 6], "x": 7.25, "y": 3},
+            {"matrix": [3, 7], "x": 8.25, "y": 3},
+            {"matrix": [3, 8], "x": 9.25, "y": 3},
+            {"matrix": [3, 9], "x": 10.25, "y": 3},
+            {"matrix": [3, 10], "x": 11.25, "y": 3},
+            {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+            {"matrix": [3, 13], "x": 14, "y": 3},
+            {"matrix": [3, 14], "x": 15, "y": 3},
+
+            {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+            {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+            {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+            {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+            {"matrix": [4, 9], "x": 10, "y": 4},
+            {"matrix": [4, 10], "x": 11, "y": 4},
+            {"matrix": [4, 11], "x": 12, "y": 4},
+            {"matrix": [4, 12], "x": 13, "y": 4},
+            {"matrix": [4, 13], "x": 14, "y": 4},
+            {"matrix": [4, 14], "x": 15, "y": 4}
+          ]
       }
   }
 }
diff --git a/keyboards/geonworks/frogmini/fmh/config.h b/keyboards/geonworks/frogmini/fmh/config.h
index 4f62de8d8b..7410a49e59 100644
--- a/keyboards/geonworks/frogmini/fmh/config.h
+++ b/keyboards/geonworks/frogmini/fmh/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-//                        C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13
-#define MATRIX_COL_PINS { C4 , C5 , B0 , C13, C14, C15, B9 , C1 , C2 , C3 , A6 , A5 , A4 , A0 }
-//                        R0 , R1 , R2 , R3 , R4 , R5 , R6
-#define MATRIX_ROW_PINS { A3 , A2 , A1 , B8 , A7 , C0 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define I2C_DRIVER I2CD1
 #define I2C_SCL_PIN B6
 #define I2C_SDA_PIN B7
diff --git a/keyboards/geonworks/frogmini/fmh/fmh.c b/keyboards/geonworks/frogmini/fmh/fmh.c
deleted file mode 100644
index f642a86f44..0000000000
--- a/keyboards/geonworks/frogmini/fmh/fmh.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Gondolindrim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "fmh.h"
diff --git a/keyboards/geonworks/frogmini/fmh/info.json b/keyboards/geonworks/frogmini/fmh/info.json
index 856705b4f1..617c7a4972 100644
--- a/keyboards/geonworks/frogmini/fmh/info.json
+++ b/keyboards/geonworks/frogmini/fmh/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2D28",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "B0", "C13", "C14", "C15", "B9", "C1", "C2", "C3", "A6", "A5", "A4", "A0"],
+        "rows": ["A3", "A2", "A1", "B8", "A7", "C0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
diff --git a/keyboards/geonworks/frogmini/fms/config.h b/keyboards/geonworks/frogmini/fms/config.h
index ad9c202933..6576ee9efe 100644
--- a/keyboards/geonworks/frogmini/fms/config.h
+++ b/keyboards/geonworks/frogmini/fms/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-//                        C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13
-#define MATRIX_COL_PINS { C4 , C5 , B0 , C13, C14, C15, B9 , C1 , C2 , C3 , A6 , A5 , A4 , A0 }
-//                        R0 , R1 , R2 , R3 , R4 , R5 , R6
-#define MATRIX_ROW_PINS { A3 , A2 , A1 , B8 , A7 , C0 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD1
 #define BACKLIGHT_PWM_CHANNEL   3
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/geonworks/frogmini/fms/info.json b/keyboards/geonworks/frogmini/fms/info.json
index 9e51f9226f..5c459d129e 100644
--- a/keyboards/geonworks/frogmini/fms/info.json
+++ b/keyboards/geonworks/frogmini/fms/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2D33",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "B0", "C13", "C14", "C15", "B9", "C1", "C2", "C3", "A6", "A5", "A4", "A0"],
+        "rows": ["A3", "A2", "A1", "B8", "A7", "C0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A10",
         "levels": 20
diff --git a/keyboards/ggkeyboards/genesis/hotswap/config.h b/keyboards/ggkeyboards/genesis/hotswap/config.h
deleted file mode 100644
index b2d8ee9014..0000000000
--- a/keyboards/ggkeyboards/genesis/hotswap/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 Steven Phillips (Spooknik)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { C5, C4, C3, C2, C1, C0 }
-#define MATRIX_COL_PINS \
-    { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ggkeyboards/genesis/hotswap/hotswap.c b/keyboards/ggkeyboards/genesis/hotswap/hotswap.c
deleted file mode 100644
index e27d117d9a..0000000000
--- a/keyboards/ggkeyboards/genesis/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Steven Phillips (Spooknik)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hotswap.h"
diff --git a/keyboards/ggkeyboards/genesis/hotswap/hotswap.h b/keyboards/ggkeyboards/genesis/hotswap/hotswap.h
deleted file mode 100644
index 51dc2e91a1..0000000000
--- a/keyboards/ggkeyboards/genesis/hotswap/hotswap.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Steven Phillips (Spooknik)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT_tkl_ansi( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0F, K0G, K0H,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,       K2F, K2G, K2H,  \
-    K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,     K3F, K3G, K3H,  \
-    K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,                         \
-    K51,       K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C,                K5G,       \
-    K60,  K61,  K63,              K66,                K6A,  K6B,  K6C,  K6D,    K6F, K6G, K6H   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, KC_NO, K0F,   K0G,   K0H   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, K2F,   K2G,   K2H   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, K3F,   K3G,   K3H   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   KC_NO, KC_NO, KC_NO, K5G,   KC_NO }, \
-    { K60,   K61,   KC_NO, K63,   KC_NO, KC_NO, K66,   KC_NO, KC_NO, KC_NO, K6A,   K6B,   K6C,   K6D,   KC_NO, K6F,   K6G,   K6H   } \
-}
diff --git a/keyboards/ggkeyboards/genesis/hotswap/info.json b/keyboards/ggkeyboards/genesis/hotswap/info.json
index 35b52cb9c4..72663cf6d2 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/info.json
+++ b/keyboards/ggkeyboards/genesis/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0xD4D3",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C6", "C7"],
+        "rows": ["C5", "C4", "C3", "C2", "C1", "C0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -17,98 +22,106 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"K00 (C5,F0)", "x":0, "y":0},
-                {"label":"K01 (C5,F1)", "x":2, "y":0},
-                {"label":"K02 (C5,F2)", "x":3, "y":0},
-                {"label":"K03 (C5,F3)", "x":4, "y":0},
-                {"label":"K04 (C5,F4)", "x":5, "y":0},
-                {"label":"K05 (C5,F5)", "x":6.5, "y":0},
-                {"label":"K06 (C5,F6)", "x":7.5, "y":0},
-                {"label":"K07 (C5,F7)", "x":8.5, "y":0},
-                {"label":"K08 (C5,A0)", "x":9.5, "y":0},
-                {"label":"K09 (C5,A1)", "x":11, "y":0},
-                {"label":"K0A (C5,A2)", "x":12, "y":0},
-                {"label":"K0B (C5,A3)", "x":13, "y":0},
-                {"label":"K0C (C5,A4)", "x":14, "y":0},
-                {"label":"K0F (C5,A7)", "x":15.25, "y":0},
-                {"label":"K0G (C5,C6)", "x":16.25, "y":0},
-                {"label":"K0H (C5,C7)", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.5},
 
-                {"label":"K20 (C4,F0)", "x":0, "y":1.5},
-                {"label":"K21 (C4,F1)", "x":1, "y":1.5},
-                {"label":"K22 (C4,F2)", "x":2, "y":1.5},
-                {"label":"K23 (C4,F3)", "x":3, "y":1.5},
-                {"label":"K24 (C4,F4)", "x":4, "y":1.5},
-                {"label":"K25 (C4,F5)", "x":5, "y":1.5},
-                {"label":"K26 (C4,F6)", "x":6, "y":1.5},
-                {"label":"K27 (C4,F7)", "x":7, "y":1.5},
-                {"label":"K28 (C4,A0)", "x":8, "y":1.5},
-                {"label":"K29 (C4,A1)", "x":9, "y":1.5},
-                {"label":"K2A (C4,A2)", "x":10, "y":1.5},
-                {"label":"K2B (C4,A3)", "x":11, "y":1.5},
-                {"label":"K2C (C4,A4)", "x":12, "y":1.5},
-                {"label":"K2D (C4,A5)", "x":13, "y":1.5, "w":2},
-                {"label":"K2F (C4,A7)", "x":15.25, "y":1.5},
-                {"label":"K2G (C4,C6)", "x":16.25, "y":1.5},
-                {"label":"K2H (C4,C7)", "x":17.25, "y":1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"label":"K30 (C3,F0)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K31 (C3,F1)", "x":1.5, "y":2.5},
-                {"label":"K32 (C3,F2)", "x":2.5, "y":2.5},
-                {"label":"K33 (C3,F3)", "x":3.5, "y":2.5},
-                {"label":"K34 (C3,F4)", "x":4.5, "y":2.5},
-                {"label":"K35 (C3,F5)", "x":5.5, "y":2.5},
-                {"label":"K36 (C3,F6)", "x":6.5, "y":2.5},
-                {"label":"K37 (C3,F7)", "x":7.5, "y":2.5},
-                {"label":"K38 (C3,A0)", "x":8.5, "y":2.5},
-                {"label":"K39 (C3,A1)", "x":9.5, "y":2.5},
-                {"label":"K3A (C3,A2)", "x":10.5, "y":2.5},
-                {"label":"K3B (C3,A3)", "x":11.5, "y":2.5},
-                {"label":"K3C (C3,A4)", "x":12.5, "y":2.5},
-                {"label":"K3D (C3,A5)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K3F (C3,A7)", "x":15.25, "y":2.5},
-                {"label":"K3G (C3,C6)", "x":16.25, "y":2.5},
-                {"label":"K3H (C3,C7)", "x":17.25, "y":2.5},
+                {"matrix": [4, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"label":"K40 (C2,F0)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K42 (C2,F2)", "x":1.75, "y":3.5},
-                {"label":"K43 (C2,F3)", "x":2.75, "y":3.5},
-                {"label":"K44 (C2,F4)", "x":3.75, "y":3.5},
-                {"label":"K45 (C2,F5)", "x":4.75, "y":3.5},
-                {"label":"K46 (C2,F6)", "x":5.75, "y":3.5},
-                {"label":"K47 (C2,F7)", "x":6.75, "y":3.5},
-                {"label":"K48 (C2,A0)", "x":7.75, "y":3.5},
-                {"label":"K49 (C2,A1)", "x":8.75, "y":3.5},
-                {"label":"K4A (C2,A2)", "x":9.75, "y":3.5},
-                {"label":"K4B (C2,A3)", "x":10.75, "y":3.5},
-                {"label":"K4C (C2,A4)", "x":11.75, "y":3.5},
-                {"label":"K4D (C2,A5)", "x":12.75, "y":3.5, "w":2.25},
+                {"matrix": [4, 16], "x": 16.25, "y": 4.5},
 
-                {"label":"K51 (C1,F1)", "x":0, "y":4.5, "w":2.25},
-                {"label":"K52 (C1,F2)", "x":2.25, "y":4.5},
-                {"label":"K53 (C1,F3)", "x":3.25, "y":4.5},
-                {"label":"K54 (C1,F4)", "x":4.25, "y":4.5},
-                {"label":"K55 (C1,F5)", "x":5.25, "y":4.5},
-                {"label":"K56 (C1,F6)", "x":6.25, "y":4.5},
-                {"label":"K57 (C1,F7)", "x":7.25, "y":4.5},
-                {"label":"K58 (C1,A0)", "x":8.25, "y":4.5},
-                {"label":"K59 (C1,A1)", "x":9.25, "y":4.5},
-                {"label":"K5A (C1,A2)", "x":10.25, "y":4.5},
-                {"label":"K5B (C1,A3)", "x":11.25, "y":4.5},
-                {"label":"K5C (C1,A4)", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"K5G (C1,C6)", "x":16.25, "y":4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
 
-                {"label":"K60 (C0,F0)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K61 (C0,F1)", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K63 (C0,F3)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K66 (C0,F6)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K6A (C0,A2)", "x":10, "y":5.5, "w":1.25},
-                {"label":"K6B (C0,A3)", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"K6C (C0,A4)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"K6D (C0,A5)", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"K6F (C0,A7)", "x":15.25, "y":5.5},
-                {"label":"K6G (C0,C6)", "x":16.25, "y":5.5},
-                {"label":"K6H (C0,C7)", "x":17.25, "y":5.5}
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/ggkeyboards/genesis/solder/config.h b/keyboards/ggkeyboards/genesis/solder/config.h
deleted file mode 100644
index 6bdd3cc57c..0000000000
--- a/keyboards/ggkeyboards/genesis/solder/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Steven Phillips (Spooknik)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C5, C4, C3, C2, C1, C0 }
-#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ggkeyboards/genesis/solder/info.json b/keyboards/ggkeyboards/genesis/solder/info.json
index ebc309987c..7649b7b04b 100644
--- a/keyboards/ggkeyboards/genesis/solder/info.json
+++ b/keyboards/ggkeyboards/genesis/solder/info.json
@@ -8,6 +8,11 @@
         "pid": "0xD4D2",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C6", "C7"],
+        "rows": ["C5", "C4", "C3", "C2", "C1", "C0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -17,196 +22,212 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (C5,F0)", "x":0, "y":0},
-                {"label":"K01 (C5,F1)", "x":2, "y":0},
-                {"label":"K02 (C5,F2)", "x":3, "y":0},
-                {"label":"K03 (C5,F3)", "x":4, "y":0},
-                {"label":"K04 (C5,F4)", "x":5, "y":0},
-                {"label":"K05 (C5,F5)", "x":6.5, "y":0},
-                {"label":"K06 (C5,F6)", "x":7.5, "y":0},
-                {"label":"K07 (C5,F7)", "x":8.5, "y":0},
-                {"label":"K08 (C5,A0)", "x":9.5, "y":0},
-                {"label":"K09 (C5,A1)", "x":11, "y":0},
-                {"label":"K0A (C5,A2)", "x":12, "y":0},
-                {"label":"K0B (C5,A3)", "x":13, "y":0},
-                {"label":"K0C (C5,A4)", "x":14, "y":0},
-                {"label":"K0E (C5,A6)", "x":15.25, "y":0},
-                {"label":"K0F (C5,A7)", "x":16.25, "y":0},
-                {"label":"K0G (C5,C6)", "x":17.25, "y":0},
-
-                {"label":"K10 (C4,F0)", "x":0, "y":1.5},
-                {"label":"K11 (C4,F1)", "x":1, "y":1.5},
-                {"label":"K12 (C4,F2)", "x":2, "y":1.5},
-                {"label":"K13 (C4,F3)", "x":3, "y":1.5},
-                {"label":"K14 (C4,F4)", "x":4, "y":1.5},
-                {"label":"K15 (C4,F5)", "x":5, "y":1.5},
-                {"label":"K16 (C4,F6)", "x":6, "y":1.5},
-                {"label":"K17 (C4,F7)", "x":7, "y":1.5},
-                {"label":"K18 (C4,A0)", "x":8, "y":1.5},
-                {"label":"K19 (C4,A1)", "x":9, "y":1.5},
-                {"label":"K1A (C4,A2)", "x":10, "y":1.5},
-                {"label":"K1B (C4,A3)", "x":11, "y":1.5},
-                {"label":"K1C (C4,A4)", "x":12, "y":1.5},
-                {"label":"K1D (C4,A5)", "x":13, "y":1.5},
-                {"label":"K0D (C5,A5)", "x":14, "y":1.5},
-                {"label":"K1E (C4,A6)", "x":15.25, "y":1.5},
-                {"label":"K1F (C4,A7)", "x":16.25, "y":1.5},
-                {"label":"K1G (C4,C6)", "x":17.25, "y":1.5},
-
-                {"label":"K20 (C3,F0)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (C3,F1)", "x":1.5, "y":2.5},
-                {"label":"K22 (C3,F2)", "x":2.5, "y":2.5},
-                {"label":"K23 (C3,F3)", "x":3.5, "y":2.5},
-                {"label":"K24 (C3,F4)", "x":4.5, "y":2.5},
-                {"label":"K25 (C3,F5)", "x":5.5, "y":2.5},
-                {"label":"K26 (C3,F6)", "x":6.5, "y":2.5},
-                {"label":"K27 (C3,F7)", "x":7.5, "y":2.5},
-                {"label":"K28 (C3,A0)", "x":8.5, "y":2.5},
-                {"label":"K29 (C3,A1)", "x":9.5, "y":2.5},
-                {"label":"K2A (C3,A2)", "x":10.5, "y":2.5},
-                {"label":"K2B (C3,A3)", "x":11.5, "y":2.5},
-                {"label":"K2C (C3,A4)", "x":12.5, "y":2.5},
-                {"label":"K2D (C3,A5)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K2E (C3,A6)", "x":15.25, "y":2.5},
-                {"label":"K2F (C3,A7)", "x":16.25, "y":2.5},
-                {"label":"K2G (C3,C6)", "x":17.25, "y":2.5},
-
-                {"label":"K30 (C2,F0)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (C2,F1)", "x":1.75, "y":3.5},
-                {"label":"K32 (C2,F2)", "x":2.75, "y":3.5},
-                {"label":"K33 (C2,F3)", "x":3.75, "y":3.5},
-                {"label":"K34 (C2,F4)", "x":4.75, "y":3.5},
-                {"label":"K35 (C2,F5)", "x":5.75, "y":3.5},
-                {"label":"K36 (C2,F6)", "x":6.75, "y":3.5},
-                {"label":"K37 (C2,F7)", "x":7.75, "y":3.5},
-                {"label":"K38 (C2,A0)", "x":8.75, "y":3.5},
-                {"label":"K39 (C2,A1)", "x":9.75, "y":3.5},
-                {"label":"K3A (C2,A2)", "x":10.75, "y":3.5},
-                {"label":"K3B (C2,A3)", "x":11.75, "y":3.5},
-                {"label":"K3D (C2,A5)", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"K40 (C1,F0)", "x":0, "y":4.5, "w":1.25},
-                {"label":"K41 (C1,F1)", "x":1.25, "y":4.5},
-                {"label":"K42 (C1,F2)", "x":2.25, "y":4.5},
-                {"label":"K43 (C1,F3)", "x":3.25, "y":4.5},
-                {"label":"K44 (C1,F4)", "x":4.25, "y":4.5},
-                {"label":"K45 (C1,F5)", "x":5.25, "y":4.5},
-                {"label":"K46 (C1,F6)", "x":6.25, "y":4.5},
-                {"label":"K47 (C1,F7)", "x":7.25, "y":4.5},
-                {"label":"K48 (C1,A0)", "x":8.25, "y":4.5},
-                {"label":"K49 (C1,A1)", "x":9.25, "y":4.5},
-                {"label":"K4A (C1,A2)", "x":10.25, "y":4.5},
-                {"label":"K4B (C1,A3)", "x":11.25, "y":4.5},
-                {"label":"K4C (C1,A4)", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"K4F (C1,A7)", "x":16.25, "y":4.5},
-
-                {"label":"K50 (C0,F0)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K51 (C0,F1)", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K52 (C0,F2)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K56 (C0,F6)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K5A (C0,A2)", "x":10, "y":5.5, "w":1.25},
-                {"label":"K5B (C0,A3)", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"K5C (C0,A4)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"K5D (C0,A5)", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"K5E (C0,A6)", "x":15.25, "y":5.5},
-                {"label":"K5F (C0,A7)", "x":16.25, "y":5.5},
-                {"label":"K5G (C0,C6)", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [0, 13], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"K00 (C5,F0)", "x":0, "y":0},
-                {"label":"K01 (C5,F1)", "x":2, "y":0},
-                {"label":"K02 (C5,F2)", "x":3, "y":0},
-                {"label":"K03 (C5,F3)", "x":4, "y":0},
-                {"label":"K04 (C5,F4)", "x":5, "y":0},
-                {"label":"K05 (C5,F5)", "x":6.5, "y":0},
-                {"label":"K06 (C5,F6)", "x":7.5, "y":0},
-                {"label":"K07 (C5,F7)", "x":8.5, "y":0},
-                {"label":"K08 (C5,A0)", "x":9.5, "y":0},
-                {"label":"K09 (C5,A1)", "x":11, "y":0},
-                {"label":"K0A (C5,A2)", "x":12, "y":0},
-                {"label":"K0B (C5,A3)", "x":13, "y":0},
-                {"label":"K0C (C5,A4)", "x":14, "y":0},
-                {"label":"K0E (C5,A6)", "x":15.25, "y":0},
-                {"label":"K0F (C5,A7)", "x":16.25, "y":0},
-                {"label":"K0G (C5,C6)", "x":17.25, "y":0},
-
-                {"label":"K10 (C4,F0)", "x":0, "y":1.5},
-                {"label":"K11 (C4,F1)", "x":1, "y":1.5},
-                {"label":"K12 (C4,F2)", "x":2, "y":1.5},
-                {"label":"K13 (C4,F3)", "x":3, "y":1.5},
-                {"label":"K14 (C4,F4)", "x":4, "y":1.5},
-                {"label":"K15 (C4,F5)", "x":5, "y":1.5},
-                {"label":"K16 (C4,F6)", "x":6, "y":1.5},
-                {"label":"K17 (C4,F7)", "x":7, "y":1.5},
-                {"label":"K18 (C4,A0)", "x":8, "y":1.5},
-                {"label":"K19 (C4,A1)", "x":9, "y":1.5},
-                {"label":"K1A (C4,A2)", "x":10, "y":1.5},
-                {"label":"K1B (C4,A3)", "x":11, "y":1.5},
-                {"label":"K1C (C4,A4)", "x":12, "y":1.5},
-                {"label":"K1D (C4,A5)", "x":13, "y":1.5, "w":2},
-                {"label":"K1E (C4,A6)", "x":15.25, "y":1.5},
-                {"label":"K1F (C4,A7)", "x":16.25, "y":1.5},
-                {"label":"K1G (C4,C6)", "x":17.25, "y":1.5},
-
-                {"label":"K20 (C3,F0)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (C3,F1)", "x":1.5, "y":2.5},
-                {"label":"K22 (C3,F2)", "x":2.5, "y":2.5},
-                {"label":"K23 (C3,F3)", "x":3.5, "y":2.5},
-                {"label":"K24 (C3,F4)", "x":4.5, "y":2.5},
-                {"label":"K25 (C3,F5)", "x":5.5, "y":2.5},
-                {"label":"K26 (C3,F6)", "x":6.5, "y":2.5},
-                {"label":"K27 (C3,F7)", "x":7.5, "y":2.5},
-                {"label":"K28 (C3,A0)", "x":8.5, "y":2.5},
-                {"label":"K29 (C3,A1)", "x":9.5, "y":2.5},
-                {"label":"K2A (C3,A2)", "x":10.5, "y":2.5},
-                {"label":"K2B (C3,A3)", "x":11.5, "y":2.5},
-                {"label":"K2C (C3,A4)", "x":12.5, "y":2.5},
-                {"label":"K2D (C3,A5)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K2E (C3,A6)", "x":15.25, "y":2.5},
-                {"label":"K2F (C3,A7)", "x":16.25, "y":2.5},
-                {"label":"K2G (C3,C6)", "x":17.25, "y":2.5},
-
-                {"label":"K30 (C2,F0)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (C2,F1)", "x":1.75, "y":3.5},
-                {"label":"K32 (C2,F2)", "x":2.75, "y":3.5},
-                {"label":"K33 (C2,F3)", "x":3.75, "y":3.5},
-                {"label":"K34 (C2,F4)", "x":4.75, "y":3.5},
-                {"label":"K35 (C2,F5)", "x":5.75, "y":3.5},
-                {"label":"K36 (C2,F6)", "x":6.75, "y":3.5},
-                {"label":"K37 (C2,F7)", "x":7.75, "y":3.5},
-                {"label":"K38 (C2,A0)", "x":8.75, "y":3.5},
-                {"label":"K39 (C2,A1)", "x":9.75, "y":3.5},
-                {"label":"K3A (C2,A2)", "x":10.75, "y":3.5},
-                {"label":"K3B (C2,A3)", "x":11.75, "y":3.5},
-                {"label":"K3D (C2,A5)", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"K40 (C1,F0)", "x":0, "y":4.5, "w":2.25},
-                {"label":"K42 (C1,F2)", "x":2.25, "y":4.5},
-                {"label":"K43 (C1,F3)", "x":3.25, "y":4.5},
-                {"label":"K44 (C1,F4)", "x":4.25, "y":4.5},
-                {"label":"K45 (C1,F5)", "x":5.25, "y":4.5},
-                {"label":"K46 (C1,F6)", "x":6.25, "y":4.5},
-                {"label":"K47 (C1,F7)", "x":7.25, "y":4.5},
-                {"label":"K48 (C1,A0)", "x":8.25, "y":4.5},
-                {"label":"K49 (C1,A1)", "x":9.25, "y":4.5},
-                {"label":"K4A (C1,A2)", "x":10.25, "y":4.5},
-                {"label":"K4B (C1,A3)", "x":11.25, "y":4.5},
-                {"label":"K4C (C1,A4)", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"K4F (C1,A7)", "x":16.25, "y":4.5},
-
-                {"label":"K50 (C0,F0)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K51 (C0,F1)", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K52 (C0,F2)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K56 (C0,F6)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K5A (C0,A2)", "x":10, "y":5.5, "w":1.25},
-                {"label":"K5B (C0,A3)", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"K5C (C0,A4)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"K5D (C0,A5)", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"K5E (C0,A6)", "x":15.25, "y":5.5},
-                {"label":"K5F (C0,A7)", "x":16.25, "y":5.5},
-                {"label":"K5G (C0,C6)", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/ggkeyboards/genesis/solder/solder.c b/keyboards/ggkeyboards/genesis/solder/solder.c
deleted file mode 100644
index 6474550515..0000000000
--- a/keyboards/ggkeyboards/genesis/solder/solder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Steven Phillips (Spooknik)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "solder.h"
diff --git a/keyboards/ggkeyboards/genesis/solder/solder.h b/keyboards/ggkeyboards/genesis/solder/solder.h
deleted file mode 100644
index b95da8a592..0000000000
--- a/keyboards/ggkeyboards/genesis/solder/solder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2021 Steven Phillips (Spooknik)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C, K0E, K0F, K0G,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D, K1E, K1F, K1G,   \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,    K2E, K2F, K2G,   \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,                         \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,               K4F,        \
-    K50,  K51,  K52,              K56,                K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO, KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G,   KC_NO }, \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C, K0E, K0F, K0G,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, K1G,   \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,    K2E, K2F, K2G,   \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,                         \
-    K40,       K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,               K4F,        \
-    K50,  K51,  K52,              K56,                K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F,   K0G,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO, KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G,   KC_NO }, \
-}
diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h
index fdeb69cae2..baf09cebb5 100644
--- a/keyboards/gh60/revc/config.h
+++ b/keyboards/gh60/revc/config.h
@@ -17,26 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
- #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-// Rev A
-// #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B5, B4, D7, D6, B3 }
-// Rev B/C
-   #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/gh60/revc/info.json b/keyboards/gh60/revc/info.json
index 052eaea8a3..9db9441171 100644
--- a/keyboards/gh60/revc/info.json
+++ b/keyboards/gh60/revc/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B2",
         "on_state": 0
diff --git a/keyboards/gh60/revc/keymaps/dbroqua/config.h b/keyboards/gh60/revc/keymaps/dbroqua/config.h
index 82775a83a4..a65ca08e65 100644
--- a/keyboards/gh60/revc/keymaps/dbroqua/config.h
+++ b/keyboards/gh60/revc/keymaps/dbroqua/config.h
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN F4
+#define WS2812_DI_PIN F4
 #define RGBLED_NUM 11
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/gh60/revc/keymaps/maxr1998/config.h b/keyboards/gh60/revc/keymaps/maxr1998/config.h
index 3013308bb2..bc926a289f 100644
--- a/keyboards/gh60/revc/keymaps/maxr1998/config.h
+++ b/keyboards/gh60/revc/keymaps/maxr1998/config.h
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
-#define RGB_DI_PIN          F4 // pin the DI on the WS2812B is hooked-up to
+#define WS2812_DI_PIN          F4 // pin the DI on the WS2812B is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
index 4ffa701ab8..cef899ee12 100644
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN F4
+#define WS2812_DI_PIN F4
 #define RGBLED_NUM 8
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/gh60/revc/keymaps/sethbc/rules.mk b/keyboards/gh60/revc/keymaps/sethbc/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/gh60/revc/keymaps/sethbc/rules.mk
+++ /dev/null
diff --git a/keyboards/gh60/revc/revc.c b/keyboards/gh60/revc/revc.c
deleted file mode 100644
index 47dd5410f0..0000000000
--- a/keyboards/gh60/revc/revc.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "revc.h"
diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h
index ce76bc8233..1fbb35b3a2 100644
--- a/keyboards/gh60/satan/config.h
+++ b/keyboards/gh60/satan/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -33,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Underglow configuration
  */
-#define RGB_DI_PIN E2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json
index 88a09cb3f6..76b1af9f06 100644
--- a/keyboards/gh60/satan/info.json
+++ b/keyboards/gh60/satan/info.json
@@ -8,10 +8,18 @@
     "pid": "0x0002",
     "device_version": "0.0.3"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3"],
+    "rows": ["D0", "D1", "D2", "D3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "levels": 4
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "indicators": {
     "caps_lock": "B2",
     "on_state": 0
diff --git a/keyboards/gh60/satan/keymaps/fakb/config.h b/keyboards/gh60/satan/keymaps/fakb/config.h
index f7314a8671..5ca8aa1da5 100644
--- a/keyboards/gh60/satan/keymaps/fakb/config.h
+++ b/keyboards/gh60/satan/keymaps/fakb/config.h
@@ -12,5 +12,5 @@
 #define MOUSEKEY_WHEEL_MAX_SPEED   1
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 255
 
-#undef RGB_DI_PIN
-#define RGB_DI_PIN B2
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN B2
diff --git a/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h b/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
index 27c1372da1..6795cf6c97 100644
--- a/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
+++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../config.h"
 
 // only change
-#undef RGB_DI_PIN 
-#define RGB_DI_PIN B2
+#undef WS2812_DI_PIN 
+#define WS2812_DI_PIN B2
 
 #endif
diff --git a/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
index 30269196f3..75c1632908 100644
--- a/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
+++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
@@ -3,8 +3,8 @@
 #define BACKLIGHT_LEVELS 10
 
 // Underlight configuration
-#undef RGB_DI_PIN
-#define RGB_DI_PIN B2
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN B2
 #undef RGBLED_NUM
 #define RGBLED_NUM 16        // Number of LEDs
 #undef RGBLIGHT_HUE_STEP
diff --git a/keyboards/gh60/satan/satan.c b/keyboards/gh60/satan/satan.c
deleted file mode 100644
index cd65084455..0000000000
--- a/keyboards/gh60/satan/satan.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "satan.h"
diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h
index a7d7231e25..7b5012a4c0 100644
--- a/keyboards/gh60/v1p3/config.h
+++ b/keyboards/gh60/v1p3/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D4, D5, D6, D7, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 10
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -51,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/info.json
index 4806535fd0..afdcf9cd74 100644
--- a/keyboards/gh60/v1p3/info.json
+++ b/keyboards/gh60/v1p3/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B4", "B5"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 15
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_tsangan", "60_hhkb", "64_ansi"],
diff --git a/keyboards/gh60/v1p3/v1p3.c b/keyboards/gh60/v1p3/v1p3.c
deleted file mode 100644
index bf41fb2174..0000000000
--- a/keyboards/gh60/v1p3/v1p3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 noroadsleft
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "v1p3.h"
diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h
index 5befa284fa..5f36081323 100644
--- a/keyboards/gh80_3000/config.h
+++ b/keyboards/gh80_3000/config.h
@@ -1,32 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F1, F0, F5, F6, F7, D4, D5, D3, D2, D0 }
-#define MATRIX_COL_PINS { C7, C6, B4, D7, B3, B2, B0, E6, B1, D1, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/gh80_3000/gh80_3000.c b/keyboards/gh80_3000/gh80_3000.c
deleted file mode 100644
index 0aa785c22d..0000000000
--- a/keyboards/gh80_3000/gh80_3000.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "gh80_3000.h"
diff --git a/keyboards/gh80_3000/gh80_3000.h b/keyboards/gh80_3000/gh80_3000.h
deleted file mode 100644
index 9c58d6fe58..0000000000
--- a/keyboards/gh80_3000/gh80_3000.h
+++ /dev/null
@@ -1,143 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// default keymap: all 117 keys with ANSI Enter
-#define LAYOUT( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,        k04, k05, k06,   k07, k08, k09, k0A, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59, k5A,        k24, k25, k26,   k27, k28, k29, k2A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69,      k6A,                         k87, k88, k89, k8A, \
-    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78, k79, k7A,             k96,        k97, k98, k99, k9A, \
-    kA0, kA1, kA2, kA3,      k84, k85, k86,           k64, k65, k94, k95,        kA4, kA5, kA6,   kA7, kA8, kA9, kAA \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A }, \
-    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA } \
-}
-
-// default ISO keymap: all 117 keys with ISO Enter
-#define LAYOUT_iso( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,        k04, k05, k06,   k07, k08, k09, k0A, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59,             k24, k25, k26,   k27, k28, k29, k2A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69, k5A, k6A,                         k87, k88, k89, k8A, \
-    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78, k79, k7A,             k96,        k97, k98, k99, k9A, \
-    kA0, kA1, kA2, kA3,      k84, k85, k86,           k64, k65, k94, k95,        kA4, kA5, kA6,   kA7, kA8, kA9, kAA \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A }, \
-    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA } \
-}
-
-// Standard ANSI Keyboard
-#define LAYOUT_fullsize_ansi( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59, k5A,   k24, k25, k26,   k27, k28, k29, k8A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69,      k6A,                    k87, k88, k89, \
-    k90,      k92, k93, k70, k71, k72, k73, k75, k76, k77, k78,      k79,        k96,        k97, k98, k99, kAA, \
-    kA0, kA1, kA2,                k85,                k64, k65, k94, k95,   kA4, kA5, kA6,   kA7,      kA9 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \
-    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \
-    { k90, XXX, k92, k93, k94, k95, k96, k97, k98, k99, XXX }, \
-    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \
-}
-
-// Standard ISO Keyboard
-#define LAYOUT_fullsize_iso( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59,        k24, k25, k26,   k27, k28, k29, k8A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69, k5A, k6A,                    k87, k88, k89, \
-    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78,      k79,        k96,        k97, k98, k99, kAA, \
-    kA0, kA1, kA2,                k85,                k64, k65, k94, k95,   kA4, kA5, kA6,   kA7,      kA9 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \
-    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, XXX }, \
-    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \
-}
-
-// Winkeyless ANSI Keyboard
-#define LAYOUT_fullsize_ansi_wkl( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59, k5A,   k24, k25, k26,   k27, k28, k29, k8A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69,      k6A,                    k87, k88, k89, \
-    k90,      k92, k93, k70, k71, k72, k73, k75, k76, k77, k78,      k79,        k96,        k97, k98, k99, kAA, \
-    kA0,      kA2,                     k85,                k65,      k95,   kA4, kA5, kA6,   kA7,      kA9 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, XXX, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \
-    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \
-    { k90, XXX, k92, k93, XXX, k95, k96, k97, k98, k99, XXX }, \
-    { kA0, XXX, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \
-}
-
-// Winkeyless ISO Keyboard
-#define LAYOUT_fullsize_iso_wkl( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59,        k24, k25, k26,   k27, k28, k29, k8A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69, k5A, k6A,                    k87, k88, k89, \
-    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78, k79,             k96,        k97, k98, k99, kAA, \
-    kA0,      kA2,                     k85,                k65,      k95,   kA4, kA5, kA6,   kA7,      kA9 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, XXX, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \
-    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, XXX, k95, k96, k97, k98, k99, XXX }, \
-    { kA0, XXX, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \
-}
diff --git a/keyboards/gh80_3000/info.json b/keyboards/gh80_3000/info.json
index b03ea8f6a3..4d4bca1661 100644
--- a/keyboards/gh80_3000/info.json
+++ b/keyboards/gh80_3000/info.json
@@ -8,32 +8,794 @@
         "pid": "0x3000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"],
+        "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["fullsize_ansi", "fullsize_iso"],
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K007", "x":18.5, "y":0}, {"label":"K008", "x":19.5, "y":0}, {"label":"K009", "x":20.5, "y":0}, {"label":"K010", "x":21.5, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K409", "x":13, "y":1.5}, {"label":"K410", "x":14, "y":1.5}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K510", "x":13.5, "y":2.5, "w":1.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K210", "x":21.5, "y":2.5}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K610", "x":12.75, "y":3.5, "w":2.25}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K810", "x":21.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":1.25}, {"label":"K901", "x":1.25, "y":4.5}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":1.75}, {"label":"K710", "x":14, "y":4.5}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"K910", "x":21.5, "y":4.5}, {"label":"KA00", "x":0, "y":5.5, "w":1.5}, {"label":"KA01", "x":1.5, "y":5.5}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.5}, {"label":"KA03", "x":4, "y":5.5}, {"label":"K804", "x":5, "y":5.5, "w":2}, {"label":"K805", "x":7, "y":5.5}, {"label":"K806", "x":8, "y":5.5, "w":2}, {"label":"K604", "x":10, "y":5.5}, {"label":"K605", "x":11, "y":5.5, "w":1.5}, {"label":"K904", "x":12.5, "y":5.5}, {"label":"K905", "x":13.5, "y":5.5, "w":1.5}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5}, {"label":"KA08", "x":19.5, "y":5.5}, {"label":"KA09", "x":20.5, "y":5.5}, {"label":"KA10", "x":21.5, "y":5.5}]
-        },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-        "LAYOUT_iso": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K007", "x":18.5, "y":0}, {"label":"K008", "x":19.5, "y":0}, {"label":"K009", "x":20.5, "y":0}, {"label":"K010", "x":21.5, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K409", "x":13, "y":1.5}, {"label":"K410", "x":14, "y":1.5}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K210", "x":21.5, "y":2.5}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K510", "x":12.75, "y":3.5}, {"label":"K610", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K810", "x":21.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":1.25}, {"label":"K901", "x":1.25, "y":4.5}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":1.75}, {"label":"K710", "x":14, "y":4.5}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"K910", "x":21.5, "y":4.5}, {"label":"KA00", "x":0, "y":5.5, "w":1.5}, {"label":"KA01", "x":1.5, "y":5.5}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.5}, {"label":"KA03", "x":4, "y":5.5}, {"label":"K804", "x":5, "y":5.5, "w":2}, {"label":"K805", "x":7, "y":5.5}, {"label":"K806", "x":8, "y":5.5, "w":2}, {"label":"K604", "x":10, "y":5.5}, {"label":"K605", "x":11, "y":5.5, "w":1.5}, {"label":"K904", "x":12.5, "y":5.5}, {"label":"K905", "x":13.5, "y":5.5, "w":1.5}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5}, {"label":"KA08", "x":19.5, "y":5.5}, {"label":"KA09", "x":20.5, "y":5.5}, {"label":"KA10", "x":21.5, "y":5.5}]
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 0},
+                {"matrix": [0, 8], "x": 19.5, "y": 0},
+                {"matrix": [0, 9], "x": 20.5, "y": 0},
+                {"matrix": [0, 10], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 9], "x": 13, "y": 1.5},
+                {"matrix": [4, 10], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 21.5, "y": 2.5},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [7, 10], "x": 14, "y": 4.5},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [9, 10], "x": 21.5, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5},
+                {"matrix": [8, 4], "x": 5, "y": 5.5, "w": 2},
+                {"matrix": [8, 5], "x": 7, "y": 5.5},
+                {"matrix": [8, 6], "x": 8, "y": 5.5, "w": 2},
+                {"matrix": [6, 4], "x": 10, "y": 5.5},
+                {"matrix": [6, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [9, 4], "x": 12.5, "y": 5.5},
+                {"matrix": [9, 5], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5},
+                {"matrix": [10, 8], "x": 19.5, "y": 5.5},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 5.5}
+            ]
         },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-        "LAYOUT_fullsize_ansi": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K410", "x":13, "y":1.5, "w":2}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K510", "x":13.5, "y":2.5, "w":1.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K810", "x":21.5, "y":2.5, "h":2}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K610", "x":12.75, "y":3.5, "w":2.25}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":2.25}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":2.75}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"KA10", "x":21.5, "y":4.5, "h":2}, {"label":"KA00", "x":0, "y":5.5, "w":1.25}, {"label":"KA01", "x":1.25, "y":5.5, "w":1.25}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.25}, {"label":"K805", "x":3.75, "y":5.5, "w":6.25}, {"label":"K604", "x":10, "y":5.5, "w":1.25}, {"label":"K605", "x":11.25, "y":5.5, "w":1.25}, {"label":"K904", "x":12.5, "y":5.5, "w":1.25}, {"label":"K905", "x":13.75, "y":5.5, "w":1.25}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5, "w":2}, {"label":"KA09", "x":20.5, "y":5.5}]
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 0},
+                {"matrix": [0, 8], "x": 19.5, "y": 0},
+                {"matrix": [0, 9], "x": 20.5, "y": 0},
+                {"matrix": [0, 10], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 9], "x": 13, "y": 1.5},
+                {"matrix": [4, 10], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 21.5, "y": 2.5},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [7, 10], "x": 14, "y": 4.5},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [9, 10], "x": 21.5, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5},
+                {"matrix": [8, 4], "x": 5, "y": 5.5, "w": 2},
+                {"matrix": [8, 5], "x": 7, "y": 5.5},
+                {"matrix": [8, 6], "x": 8, "y": 5.5, "w": 2},
+                {"matrix": [6, 4], "x": 10, "y": 5.5},
+                {"matrix": [6, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [9, 4], "x": 12.5, "y": 5.5},
+                {"matrix": [9, 5], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5},
+                {"matrix": [10, 8], "x": 19.5, "y": 5.5},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 5.5}
+            ]
         },
+        "LAYOUT_fullsize_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-        "LAYOUT_fullsize_iso": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K410", "x":13, "y":1.5, "w":2}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K810", "x":21.5, "y":2.5, "h":2}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K510", "x":12.75, "y":3.5}, {"label":"K610", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":1.25}, {"label":"K901", "x":1.25, "y":4.5}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":2.75}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"KA10", "x":21.5, "y":4.5, "h":2}, {"label":"KA00", "x":0, "y":5.5, "w":1.25}, {"label":"KA01", "x":1.25, "y":5.5, "w":1.25}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.25}, {"label":"K805", "x":3.75, "y":5.5, "w":6.25}, {"label":"K604", "x":10, "y":5.5, "w":1.25}, {"label":"K605", "x":11.25, "y":5.5, "w":1.25}, {"label":"K904", "x":12.5, "y":5.5, "w":1.25}, {"label":"K905", "x":13.75, "y":5.5, "w":1.25}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5, "w":2}, {"label":"KA09", "x":20.5, "y":5.5}]
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 10], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [6, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5}
+            ]
         },
+        "LAYOUT_fullsize_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-        "LAYOUT_fullsize_ansi_wkl": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K410", "x":13, "y":1.5, "w":2}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K510", "x":13.5, "y":2.5, "w":1.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K810", "x":21.5, "y":2.5, "h":2}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K610", "x":12.75, "y":3.5, "w":2.25}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":2.25}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":2.75}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"KA10", "x":21.5, "y":4.5, "h":2}, {"label":"KA00", "x":0, "y":5.5, "w":1.5}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.5}, {"label":"K805", "x":4, "y":5.5, "w":7}, {"label":"K605", "x":11, "y":5.5, "w":1.5}, {"label":"K905", "x":13.5, "y":5.5, "w":1.5}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5, "w":2}, {"label":"KA09", "x":20.5, "y":5.5}]
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 10], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [6, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5}
+            ]
         },
+        "LAYOUT_fullsize_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 10], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
 
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [8, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [6, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [9, 5], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5}
+            ]
+        },
         "LAYOUT_fullsize_iso_wkl": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K410", "x":13, "y":1.5, "w":2}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K810", "x":21.5, "y":2.5, "h":2}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K510", "x":12.75, "y":3.5}, {"label":"K610", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":1.25}, {"label":"K901", "x":1.25, "y":4.5}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":2.75}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"KA10", "x":21.5, "y":4.5, "h":2}, {"label":"KA00", "x":0, "y":5.5, "w":1.5}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.5}, {"label":"K805", "x":4, "y":5.5, "w":7}, {"label":"K605", "x":11, "y":5.5, "w":1.5}, {"label":"K905", "x":13.5, "y":5.5, "w":1.5}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5, "w":2}, {"label":"KA09", "x":20.5, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 10], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [8, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [6, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [9, 5], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/ghs/jem/info.json b/keyboards/ghs/jem/info.json
index d35f86c4da..44b80ce9a4 100644
--- a/keyboards/ghs/jem/info.json
+++ b/keyboards/ghs/jem/info.json
@@ -28,7 +28,6 @@
     },
     "rgblight": {
         "led_count": 22,
-        "pin": "F4",
         "hue_steps": 10,
         "saturation_steps": 17,
         "brightness_steps": 17,
@@ -43,6 +42,9 @@
             "alternating": true
         }
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h
index 2853b095cc..9cd6e7be5a 100644
--- a/keyboards/ghs/rar/config.h
+++ b/keyboards/ghs/rar/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 17
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -47,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ghs/rar/info.json b/keyboards/ghs/rar/info.json
index 1a8b534e56..e932a3ac3a 100644
--- a/keyboards/ghs/rar/info.json
+++ b/keyboards/ghs/rar/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D1"],
+        "rows": ["B0", "B7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h
index 2a977deced..f058b3afc4 100644
--- a/keyboards/giabalanai/config.h
+++ b/keyboards/giabalanai/config.h
@@ -17,24 +17,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4 }
-#define MATRIX_COL_PINS { B1, F7, F6, F5, F4, B3, B2, B6, D0, D1 }
-#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, D7, E6 }
-#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, C7, B7, F1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
+#define SELECT_SOFT_SERIAL_SPEED 1
+/*Sets the protocol speed when using serial communication*/
+//Speeds:
+//0: about 189kbps (Experimental only)
+//1: about 137kbps (default)
+//2: about 75kbps
+//3: about 39kbps
+//4: about 26kbps
+//5: about 20kbps
 
 // Right side has to be the master since 1, LED data is output from right side, and 2, Audio pin is prepared on right side as a reserve.
 #define MASTER_RIGHT
@@ -42,9 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // for "Generic" Promicro to be detected correctly as lefthand side (slave)
 #define SPLIT_USB_DETECT
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifdef RGBLIGHT_ENABLE
 #   define RGBLED_NUM 123
 
@@ -217,9 +205,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define NO_ACTION_TAPPING
 // NO_ACTION_ONESHOT -388 bytes
 #define NO_ACTION_ONESHOT
-/*
- * Encoder options
- */
-#ifdef ENCODER_ENABLE
-#   define ENCODER_RESOLUTIONS_RIGHT { 4 }
-#endif  // ENCODER_ENABLE
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
index 6b474f7398..f8962415cb 100644
--- a/keyboards/giabalanai/info.json
+++ b/keyboards/giabalanai/info.json
@@ -8,6 +8,14 @@
         "pid": "0xF4B0",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"],
+        "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "features": {
         "midi": true,
         "extrakey": true,
@@ -22,6 +30,9 @@
     "encoder": {
         "rotary": []
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "split": {
         "enabled": true,
         "soft_serial_pin": "D2",
@@ -31,6 +42,12 @@
                     {"pin_a": "B4", "pin_b": "B6"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "C7", "B7", "F1"],
+                "rows": ["D1", "D0", "D4", "C6", "D7", "E6"]
+            }
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/giabalanai/rules.mk b/keyboards/giabalanai/rules.mk
index d0e8dc4f24..90ba252d26 100644
--- a/keyboards/giabalanai/rules.mk
+++ b/keyboards/giabalanai/rules.mk
@@ -5,6 +5,5 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 # RGB_MATRIX_ENABLE is not suitable for giabalanai keyboard on the right side (there are dulpicate keys).
 RGB_MATRIX_ENABLE = no      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-RGB_MATRIX_DRIVER = WS2812  # 2021/01/23 added.
 
 LTO_ENABLE = yes
diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h
index 402c6f17cc..ba683e4fed 100755
--- a/keyboards/gizmo_engineering/gk6/config.h
+++ b/keyboards/gizmo_engineering/gk6/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
-*/
-#define MATRIX_ROW_PINS { B6, B4, D7, D6, D4}
-#define MATRIX_COL_PINS { B5, C6, C7, F7, F6, D5, D3, D2, F1, F4, B7, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 // RGB Matrix
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110111
diff --git a/keyboards/gizmo_engineering/gk6/gk6.c b/keyboards/gizmo_engineering/gk6/gk6.c
index 390213ef26..e28f5d43c7 100755
--- a/keyboards/gizmo_engineering/gk6/gk6.c
+++ b/keyboards/gizmo_engineering/gk6/gk6.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gk6.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/gizmo_engineering/gk6/gk6.h b/keyboards/gizmo_engineering/gk6/gk6.h
deleted file mode 100755
index c774124b62..0000000000
--- a/keyboards/gizmo_engineering/gk6/gk6.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2021 Gizmo Engineering
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_2x2u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43,    k44,      k47,   k48, k49, k4a, k4b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, KC_NO, KC_NO, k47, k48, k49, k4a, k4b }, \
-}
-
-#define LAYOUT_1x2u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44,   k46,    k47, k48, k49, k4a, k4b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, KC_NO, k46, k47, k48, k49, k4a, k4b }, \
-}
-
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b }, \
-}
diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json
index a8c0e5b05d..d738d31d3d 100644
--- a/keyboards/gizmo_engineering/gk6/info.json
+++ b/keyboards/gizmo_engineering/gk6/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "30.3.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "C6", "C7", "F7", "F6", "D5", "D3", "D2", "F1", "F4", "B7", "F5"],
+        "rows": ["B6", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -17,203 +25,203 @@
     "layouts": {
         "LAYOUT_2x2u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4, "w": 2},
-                {"x": 6, "y": 4, "w": 2},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"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": [4, 7], "x": 6, "y": 4, "w": 2},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_1x2u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4, "w": 2},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/gizmo_engineering/gk6/rules.mk b/keyboards/gizmo_engineering/gk6/rules.mk
index c3d99b1e57..c6a142275f 100755
--- a/keyboards/gizmo_engineering/gk6/rules.mk
+++ b/keyboards/gizmo_engineering/gk6/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h
index 9589c7887d..b05a0d33b4 100644
--- a/keyboards/gkeyboard/gkb_m16/config.h
+++ b/keyboards/gkeyboard/gkb_m16/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, D5, D6, D7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 4
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gkeyboard/gkb_m16/gkb_m16.c b/keyboards/gkeyboard/gkb_m16/gkb_m16.c
deleted file mode 100644
index 5a1f7f13e3..0000000000
--- a/keyboards/gkeyboard/gkb_m16/gkb_m16.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 gkeyboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "gkb_m16.h"
diff --git a/keyboards/gkeyboard/gkb_m16/gkb_m16.h b/keyboards/gkeyboard/gkb_m16/gkb_m16.h
deleted file mode 100644
index 8477f4cda3..0000000000
--- a/keyboards/gkeyboard/gkb_m16/gkb_m16.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 gkeyboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x4( \
-	K01, K02, K03, K04, \
-	K11, K12, K13, K14, \
-	K21, K22, K23, K24, \
-	K31, K32, K33, K34 \
-) \
-{ \
-  { K01, K02, K03, K04 }, \
-  { K11, K12, K13, K14 }, \
-  { K21, K22, K23, K24 }, \
-  { K31, K32, K33, K34 } \
-}
diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json
index ca200a1485..ebf5ee8845 100644
--- a/keyboards/gkeyboard/gkb_m16/info.json
+++ b/keyboards/gkeyboard/gkb_m16/info.json
@@ -8,27 +8,38 @@
         "pid": "0x4201",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7"],
+        "rows": ["D4", "D5", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-              {"x":0, "y":0},
-              {"x":1, "y":0},
-              {"x":2, "y":0},
-              {"x":3, "y":0},
-              {"x":0, "y":1},
-              {"x":1, "y":1},
-              {"x":2, "y":1},
-              {"x":3, "y":1},
-              {"x":0, "y":2},
-              {"x":1, "y":2},
-              {"x":2, "y":2},
-              {"x":3, "y":2},
-              {"x":0, "y":3},
-              {"x":1, "y":3},
-              {"x":2, "y":3},
-              {"x":3, "y":3}
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
+
+              {"matrix": [1, 0], "x": 0, "y": 1},
+              {"matrix": [1, 1], "x": 1, "y": 1},
+              {"matrix": [1, 2], "x": 2, "y": 1},
+              {"matrix": [1, 3], "x": 3, "y": 1},
+
+              {"matrix": [2, 0], "x": 0, "y": 2},
+              {"matrix": [2, 1], "x": 1, "y": 2},
+              {"matrix": [2, 2], "x": 2, "y": 2},
+              {"matrix": [2, 3], "x": 3, "y": 2},
+
+              {"matrix": [3, 0], "x": 0, "y": 3},
+              {"matrix": [3, 1], "x": 1, "y": 3},
+              {"matrix": [3, 2], "x": 2, "y": 3},
+              {"matrix": [3, 3], "x": 3, "y": 3}
             ]
           }
         }
diff --git a/keyboards/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h
index e3a0340f19..0691d106b7 100644
--- a/keyboards/gkeyboard/gpad8_2r/config.h
+++ b/keyboards/gkeyboard/gpad8_2r/config.h
@@ -5,7 +5,6 @@
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
 
-#define RGB_DI_PIN GP19
 #define RGB_MATRIX_LED_COUNT 16
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/info.json
index fcc900a35f..4dc9ca9dee 100644
--- a/keyboards/gkeyboard/gpad8_2r/info.json
+++ b/keyboards/gkeyboard/gpad8_2r/info.json
@@ -61,19 +61,23 @@
             { "flags": 2, "x": 196, "y": 60 }
         ]
     },
+    "ws2812": {
+        "pin": "GP19",
+        "driver": "vendor"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "matrix": [2, 0], "x": 0.0, "y": 2.25 },
-                { "matrix": [2, 1], "x": 1.0, "y": 2.25 },
-                { "matrix": [2, 2], "x": 2.0, "y": 2.25 },
-                { "matrix": [2, 3], "x": 3.0, "y": 2.25 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "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": [2, 0], "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2, "y": 2.25 },
+                { "matrix": [2, 3], "x": 3, "y": 2.25 }
             ]
         }
     }
diff --git a/keyboards/gkeyboard/gpad8_2r/rules.mk b/keyboards/gkeyboard/gpad8_2r/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/gkeyboard/gpad8_2r/rules.mk
+++ b/keyboards/gkeyboard/gpad8_2r/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/gl516/a52gl/a52gl.c b/keyboards/gl516/a52gl/a52gl.c
deleted file mode 100644
index 67c27d2d7d..0000000000
--- a/keyboards/gl516/a52gl/a52gl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "a52gl.h"
diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json
index 45b2dd7423..033b1f8464 100644
--- a/keyboards/gl516/a52gl/info.json
+++ b/keyboards/gl516/a52gl/info.json
@@ -61,7 +61,7 @@
                 {"label":"3,5", "x":6.05, "y":3},
                 {"label":"3,6", "x":7.5, "y":3, "w":2.25},
                 {"label":"7,1", "x":9.75, "y":3, "w":1.25},
-                {"label":"7,3", "x":12.0, "y":3},
+                {"label":"7,3", "x":12, "y":3},
                 {"label":"7,4", "x":13.25, "y":3.25},
                 {"label":"7,5", "x":14.25, "y":3.25},
                 {"label":"7,6", "x":15.25, "y":3.25}
diff --git a/keyboards/gl516/j73gl/config.h b/keyboards/gl516/j73gl/config.h
index 8cd2c1fe6c..49205e59d1 100644
--- a/keyboards/gl516/j73gl/config.h
+++ b/keyboards/gl516/j73gl/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifndef RGBLED_NUM
   #define RGBLED_NUM 73
 #endif
diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json
index 42f6d368bb..56bb01dc84 100644
--- a/keyboards/gl516/j73gl/info.json
+++ b/keyboards/gl516/j73gl/info.json
@@ -8,6 +8,9 @@
         "pid": "0xE8D0",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/gl516/n51gl/config.h b/keyboards/gl516/n51gl/config.h
index 276e6f6c6d..cd919a72c4 100644
--- a/keyboards/gl516/n51gl/config.h
+++ b/keyboards/gl516/n51gl/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifndef RGBLED_NUM
   #define RGBLED_NUM 15
 #endif
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
index eaaf6e69dd..bb42d48981 100644
--- a/keyboards/gl516/n51gl/info.json
+++ b/keyboards/gl516/n51gl/info.json
@@ -8,6 +8,9 @@
         "pid": "0xE8CF",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "D7", "pin_b": "E6", "resolution": 3}
diff --git a/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
index 42b2204cf1..81f7b8665f 100644
--- a/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
+++ b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
@@ -111,7 +111,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         key.row = 1;
         key.col = 0;
     }
-    action_exec((keyevent_t){.key = key, .pressed = true, .time = (timer_read() | 1)});
-    action_exec((keyevent_t){.key = key, .pressed = false, .time = (timer_read() | 1)});
+    action_exec(MAKE_KEYEVENT(key.row, key.col, true));
+    action_exec(MAKE_KEYEVENT(key.row, key.col, false));
     return true;
 }
diff --git a/keyboards/gl516/n51gl/keymaps/via/keymap.c b/keyboards/gl516/n51gl/keymaps/via/keymap.c
index a44392124c..cf1aa7d595 100644
--- a/keyboards/gl516/n51gl/keymaps/via/keymap.c
+++ b/keyboards/gl516/n51gl/keymaps/via/keymap.c
@@ -96,7 +96,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         key.row = 1;
         key.col = 0;
     }
-    action_exec((keyevent_t){.key = key, .pressed = true, .time = (timer_read() | 1)});
-    action_exec((keyevent_t){.key = key, .pressed = false, .time = (timer_read() | 1)});
+    action_exec(MAKE_KEYEVENT(key.row, key.col, true));
+    action_exec(MAKE_KEYEVENT(key.row, key.col, false));
     return true;
 }
diff --git a/keyboards/gl516/n51gl/n51gl.c b/keyboards/gl516/n51gl/n51gl.c
deleted file mode 100644
index f13d0cd78e..0000000000
--- a/keyboards/gl516/n51gl/n51gl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "n51gl.h"
diff --git a/keyboards/gl516/xr63gl/xr63gl.c b/keyboards/gl516/xr63gl/xr63gl.c
index 4817f07a92..b2aa43c456 100644
--- a/keyboards/gl516/xr63gl/xr63gl.c
+++ b/keyboards/gl516/xr63gl/xr63gl.c
@@ -1,7 +1,7 @@
 // Copyright 2022 gachiham (@gachiham)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[MATRIX_ROWS] = {
     0b1111111111111110,
diff --git a/keyboards/glenpickle/chimera_ls/chimera_ls.h b/keyboards/glenpickle/chimera_ls/chimera_ls.h
index 7d67d573db..04ef56503f 100644
--- a/keyboards/glenpickle/chimera_ls/chimera_ls.h
+++ b/keyboards/glenpickle/chimera_ls/chimera_ls.h
@@ -41,22 +41,3 @@
 #define set_led_cyan    PORTF = PORTF & ~(1<<LED_R) | (1<<LED_B) | (1<<LED_G)
 #define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)
 */
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_4x12( \
-    k08, k48, k29, k47, k46, k45,     k40, k41, k42, k24, k43, k03, \
-    k09, k19, k37, k36, k35, k39,     k34, k30, k31, k32, k14, k04, \
-    k18, k07, k27, k26, k15, k25,     k20, k10, k21, k22, k02, k13, \
-    k28, k17, k06, k16, k05, k38,     k33, k00, k11, k01, k12, k23 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, XXX, k45, k46, k47, k48, XXX } \
-}
diff --git a/keyboards/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/info.json
index 97a654981c..300b6be928 100644
--- a/keyboards/glenpickle/chimera_ls/info.json
+++ b/keyboards/glenpickle/chimera_ls/info.json
@@ -13,7 +13,59 @@
   "community_layouts": ["ortho_4x12"],
   "layouts": {
     "LAYOUT_ortho_4x12": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+      "layout": [
+        {"matrix": [0, 8], "x": 0, "y": 0},
+        {"matrix": [4, 8], "x": 1, "y": 0},
+        {"matrix": [2, 9], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [4, 6], "x": 4, "y": 0},
+        {"matrix": [4, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 7, "y": 0},
+        {"matrix": [4, 1], "x": 8, "y": 0},
+        {"matrix": [4, 2], "x": 9, "y": 0},
+        {"matrix": [2, 4], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [0, 3], "x": 12, "y": 0},
+
+        {"matrix": [0, 9], "x": 0, "y": 1},
+        {"matrix": [1, 9], "x": 1, "y": 1},
+        {"matrix": [3, 7], "x": 2, "y": 1},
+        {"matrix": [3, 6], "x": 3, "y": 1},
+        {"matrix": [3, 5], "x": 4, "y": 1},
+        {"matrix": [3, 9], "x": 5, "y": 1},
+        {"matrix": [3, 4], "x": 7, "y": 1},
+        {"matrix": [3, 0], "x": 8, "y": 1},
+        {"matrix": [3, 1], "x": 9, "y": 1},
+        {"matrix": [3, 2], "x": 10, "y": 1},
+        {"matrix": [1, 4], "x": 11, "y": 1},
+        {"matrix": [0, 4], "x": 12, "y": 1},
+
+        {"matrix": [1, 8], "x": 0, "y": 2},
+        {"matrix": [0, 7], "x": 1, "y": 2},
+        {"matrix": [2, 7], "x": 2, "y": 2},
+        {"matrix": [2, 6], "x": 3, "y": 2},
+        {"matrix": [1, 5], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 0], "x": 7, "y": 2},
+        {"matrix": [1, 0], "x": 8, "y": 2},
+        {"matrix": [2, 1], "x": 9, "y": 2},
+        {"matrix": [2, 2], "x": 10, "y": 2},
+        {"matrix": [0, 2], "x": 11, "y": 2},
+        {"matrix": [1, 3], "x": 12, "y": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3},
+        {"matrix": [1, 7], "x": 1, "y": 3},
+        {"matrix": [0, 6], "x": 2, "y": 3},
+        {"matrix": [1, 6], "x": 3, "y": 3},
+        {"matrix": [0, 5], "x": 4, "y": 3},
+        {"matrix": [3, 8], "x": 5, "y": 3},
+        {"matrix": [3, 3], "x": 7, "y": 3},
+        {"matrix": [0, 0], "x": 8, "y": 3},
+        {"matrix": [1, 1], "x": 9, "y": 3},
+        {"matrix": [0, 1], "x": 10, "y": 3},
+        {"matrix": [1, 2], "x": 11, "y": 3},
+        {"matrix": [2, 3], "x": 12, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json
index 76e6e89925..4f72e818ed 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5045",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [1, 3]
     },
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk
index ed301944f4..1b4692a621 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk
+++ b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
 RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
 AUDIO_ENABLE = no            # Audio output.
 RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h
index c2483d675f..64febeb948 100644
--- a/keyboards/gmmk/gmmk2/p65/config.h
+++ b/keyboards/gmmk/gmmk2/p65/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { B0, B1, B2, B3, B4, B5, B6, B7, B8 }
-#define MATRIX_COL_PINS \
-    { A0, A1, A2, A3, A4, A8, A9, A10 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json
index 5d5aba914e..1572c34e5f 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p65/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x504A",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [1, 3]
     },
diff --git a/keyboards/gmmk/gmmk2/p65/iso/rules.mk b/keyboards/gmmk/gmmk2/p65/iso/rules.mk
index ed301944f4..1b4692a621 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/rules.mk
+++ b/keyboards/gmmk/gmmk2/p65/iso/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
 RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
 AUDIO_ENABLE = no            # Audio output.
 RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/gmmk/gmmk2/p65/p65.c b/keyboards/gmmk/gmmk2/p65/p65.c
deleted file mode 100644
index d7e06f6488..0000000000
--- a/keyboards/gmmk/gmmk2/p65/p65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "p65.h"
diff --git a/keyboards/gmmk/gmmk2/p65/p65.h b/keyboards/gmmk/gmmk2/p65/p65.h
deleted file mode 100644
index 7a6339c2e0..0000000000
--- a/keyboards/gmmk/gmmk2/p65/p65.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_gmmk_gmmk2_p65_ansi)
-#    include "ansi/ansi.h"
-#elif defined(KEYBOARD_gmmk_gmmk2_p65_iso)
-#    include "iso/iso.h"
-#endif  // GMMK V2 revisions
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json
index f5b05748c7..4ed89902da 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x504B",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "WB32F3G71",
     "bootloader": "wb32-dfu",
     "layouts": {
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
index 4230665e7c..a076e01916 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
+++ b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
 RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
 AUDIO_ENABLE = no            # Audio output.
 RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h
index 19cab78423..16aae9b330 100644
--- a/keyboards/gmmk/gmmk2/p96/config.h
+++ b/keyboards/gmmk/gmmk2/p96/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13 }
-#define MATRIX_COL_PINS \
-    { A0, A1, A2, A3, A4, A8, A9, A10 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json
index a2f377615b..192e274245 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p96/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x505A",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "WB32F3G71",
     "bootloader": "wb32-dfu",
     "layouts": {
diff --git a/keyboards/gmmk/gmmk2/p96/iso/rules.mk b/keyboards/gmmk/gmmk2/p96/iso/rules.mk
index 4230665e7c..a076e01916 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/rules.mk
+++ b/keyboards/gmmk/gmmk2/p96/iso/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
 RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
 AUDIO_ENABLE = no            # Audio output.
 RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/gmmk2/p96/p96.c b/keyboards/gmmk/gmmk2/p96/p96.c
deleted file mode 100644
index 47edcfe1ad..0000000000
--- a/keyboards/gmmk/gmmk2/p96/p96.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "p96.h"
diff --git a/keyboards/gmmk/gmmk2/p96/p96.h b/keyboards/gmmk/gmmk2/p96/p96.h
deleted file mode 100644
index e7b37d6816..0000000000
--- a/keyboards/gmmk/gmmk2/p96/p96.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_gmmk_gmmk2_p96_ansi)
-#    include "ansi/ansi.h"
-#elif defined(KEYBOARD_gmmk_gmmk2_p96_iso)
-#    include "iso/iso.h"
-#endif  // GMMK V2 revisions
diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json
index d5ea534b67..f3020aa3f4 100644
--- a/keyboards/gmmk/numpad/info.json
+++ b/keyboards/gmmk/numpad/info.json
@@ -13,6 +13,9 @@
             {"pin_a": "A2", "pin_b": "A1"}
         ]
     },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
     "processor": "WB32F3G71",
     "bootloader": "wb32-dfu",
     "diode_direction": "ROW2COL",
diff --git a/keyboards/gmmk/numpad/numpad.c b/keyboards/gmmk/numpad/numpad.c
index ed4fed2667..f1a46170fd 100644
--- a/keyboards/gmmk/numpad/numpad.c
+++ b/keyboards/gmmk/numpad/numpad.c
@@ -120,17 +120,3 @@ void keyboard_pre_init_user(void) {
 #    endif
 
 #endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    if (clockwise) {
-        tap_code_delay(KC_VOLU, 10);
-    } else {
-        tap_code_delay(KC_VOLD, 10);
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/gmmk/numpad/rules.mk b/keyboards/gmmk/numpad/rules.mk
index 4d23ffbfaf..5a0d3e34f8 100644
--- a/keyboards/gmmk/numpad/rules.mk
+++ b/keyboards/gmmk/numpad/rules.mk
@@ -15,7 +15,6 @@ KEYBOARD_SHARED_EP = yes
 MIDI_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
 
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index c633d722a0..8188418469 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/keyboards/gmmk/pro/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10 }
-#define MATRIX_COL_PINS \
-    { A0, A1, A2, A3, A4, A8, A9, A10 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/gmmk/pro/pro.c b/keyboards/gmmk/pro/pro.c
deleted file mode 100644
index 6aed1d6e18..0000000000
--- a/keyboards/gmmk/pro/pro.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "pro.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    if (clockwise) {
-        tap_code_delay(KC_VOLU, 10);
-    } else {
-        tap_code_delay(KC_VOLD, 10);
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/gmmk/pro/pro.h b/keyboards/gmmk/pro/pro.h
deleted file mode 100644
index c83d6c99c5..0000000000
--- a/keyboards/gmmk/pro/pro.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_gmmk_pro_rev1_ansi)
-#    include "rev1/ansi/ansi.h"
-#elif defined(KEYBOARD_gmmk_pro_rev1_iso)
-#    include "rev1/iso/iso.h"
-#elif defined(KEYBOARD_gmmk_pro_rev2_ansi)
-#    include "rev2/ansi/ansi.h"
-#elif defined(KEYBOARD_gmmk_pro_rev2_iso)
-#    include "rev2/iso/iso.h"
-#endif  // GMMK Pro revisions
diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.h b/keyboards/gmmk/pro/rev1/ansi/ansi.h
index ab08d66592..9a6ae0f49e 100644
--- a/keyboards/gmmk/pro/rev1/ansi/ansi.h
+++ b/keyboards/gmmk/pro/rev1/ansi/ansi.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "pro.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
index b8a7e94a82..749a2ef47d 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5044",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14"}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
index b595c1b843..ceddf81a77 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
@@ -113,7 +113,7 @@ bool rgb_matrix_indicators_user(void) {
 
 
 // Called on start
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
     dprint("-- Recording Started\n");
     layer_on(_UTILITY);
 }
diff --git a/keyboards/gmmk/pro/rev1/ansi/rules.mk b/keyboards/gmmk/pro/rev1/ansi/rules.mk
index 43949aa054..6d23fe350a 100644
--- a/keyboards/gmmk/pro/rev1/ansi/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 48181ec488..45656419b9 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5044",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14"}
diff --git a/keyboards/gmmk/pro/rev1/iso/iso.h b/keyboards/gmmk/pro/rev1/iso/iso.h
index 353bcbe875..ad3b46cb97 100644
--- a/keyboards/gmmk/pro/rev1/iso/iso.h
+++ b/keyboards/gmmk/pro/rev1/iso/iso.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "pro.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/gmmk/pro/rev1/iso/rules.mk b/keyboards/gmmk/pro/rev1/iso/rules.mk
index 43949aa054..6d23fe350a 100644
--- a/keyboards/gmmk/pro/rev1/iso/rules.mk
+++ b/keyboards/gmmk/pro/rev1/iso/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.h b/keyboards/gmmk/pro/rev2/ansi/ansi.h
index 2f8a28b940..b4a67dfd18 100644
--- a/keyboards/gmmk/pro/rev2/ansi/ansi.h
+++ b/keyboards/gmmk/pro/rev2/ansi/ansi.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "pro.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json
index a8a25f8547..44b68750be 100644
--- a/keyboards/gmmk/pro/rev2/ansi/info.json
+++ b/keyboards/gmmk/pro/rev2/ansi/info.json
@@ -8,6 +8,14 @@
        "pid": "0x5044",
        "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14"}
diff --git a/keyboards/gmmk/pro/rev2/ansi/rules.mk b/keyboards/gmmk/pro/rev2/ansi/rules.mk
index 1672a47804..2f50d82c82 100644
--- a/keyboards/gmmk/pro/rev2/ansi/rules.mk
+++ b/keyboards/gmmk/pro/rev2/ansi/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
index c37ccd53df..12f2365dc8 100644
--- a/keyboards/gmmk/pro/rev2/iso/info.json
+++ b/keyboards/gmmk/pro/rev2/iso/info.json
@@ -8,6 +8,14 @@
        "pid": "0x5044",
        "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14"}
diff --git a/keyboards/gmmk/pro/rev2/iso/iso.h b/keyboards/gmmk/pro/rev2/iso/iso.h
index a5844e10eb..3c1291ff1b 100644
--- a/keyboards/gmmk/pro/rev2/iso/iso.h
+++ b/keyboards/gmmk/pro/rev2/iso/iso.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "pro.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/gmmk/pro/rev2/iso/rules.mk b/keyboards/gmmk/pro/rev2/iso/rules.mk
index 7f154b74c1..db00e4c84c 100644
--- a/keyboards/gmmk/pro/rev2/iso/rules.mk
+++ b/keyboards/gmmk/pro/rev2/iso/rules.mk
@@ -15,6 +15,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gon/nerd60/config.h b/keyboards/gon/nerd60/config.h
index c3762c6388..fa9a83d08e 100644
--- a/keyboards/gon/nerd60/config.h
+++ b/keyboards/gon/nerd60/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-/* matrix pins */
-#define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 }
-#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json
index 097d4d45c0..4b1f158717 100644
--- a/keyboards/gon/nerd60/info.json
+++ b/keyboards/gon/nerd60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3630",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5"],
+        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
diff --git a/keyboards/gon/nerd60/nerd60.c b/keyboards/gon/nerd60/nerd60.c
deleted file mode 100644
index 5022732b80..0000000000
--- a/keyboards/gon/nerd60/nerd60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "nerd60.h"
diff --git a/keyboards/gon/nerdtkl/config.h b/keyboards/gon/nerdtkl/config.h
index 8db20474be..fa9a83d08e 100644
--- a/keyboards/gon/nerdtkl/config.h
+++ b/keyboards/gon/nerdtkl/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-/* matrix pins */
-#define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 }
-#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json
index f9e38f0c89..103c856bf0 100644
--- a/keyboards/gon/nerdtkl/info.json
+++ b/keyboards/gon/nerdtkl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5244",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5", "D1"],
+        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
@@ -19,96 +24,109 @@
     "layouts": {
         "LAYOUT_tkl": {
             "layout": [
-                {"label":"K80", "x":0, "y":0},
-                {"label":"K90", "x":2, "y":0},
-                {"label":"K81", "x":3, "y":0},
-                {"label":"K91", "x":4, "y":0},
-                {"label":"K82", "x":5, "y":0},
-                {"label":"K92", "x":6.5, "y":0},
-                {"label":"K83", "x":7.5, "y":0},
-                {"label":"K93", "x":8.5, "y":0},
-                {"label":"K84", "x":9.5, "y":0},
-                {"label":"K94", "x":11, "y":0},
-                {"label":"K85", "x":12, "y":0},
-                {"label":"K95", "x":13, "y":0},
-                {"label":"K86", "x":14, "y":0},
-                {"label":"K96", "x":15.25, "y":0},
-                {"label":"K88", "x":16.25, "y":0},
-                {"label":"K98", "x":17.25, "y":0},
-                {"label":"K00", "x":0, "y":1.25},
-                {"label":"K10", "x":1, "y":1.25},
-                {"label":"K01", "x":2, "y":1.25},
-                {"label":"K11", "x":3, "y":1.25},
-                {"label":"K02", "x":4, "y":1.25},
-                {"label":"K12", "x":5, "y":1.25},
-                {"label":"K03", "x":6, "y":1.25},
-                {"label":"K13", "x":7, "y":1.25},
-                {"label":"K04", "x":8, "y":1.25},
-                {"label":"K14", "x":9, "y":1.25},
-                {"label":"K05", "x":10, "y":1.25},
-                {"label":"K15", "x":11, "y":1.25},
-                {"label":"K06", "x":12, "y":1.25},
-                {"label":"K16", "x":13, "y":1.25, "w":2},
-                {"label":"K08", "x":15.25, "y":1.25},
-                {"label":"K18", "x":16.25, "y":1.25},
-                {"label":"K48", "x":17.25, "y":1.25},
-                {"label":"K20", "x":0, "y":2.25, "w":1.5},
-                {"label":"K30", "x":1.5, "y":2.25},
-                {"label":"K21", "x":2.5, "y":2.25},
-                {"label":"K31", "x":3.5, "y":2.25},
-                {"label":"K22", "x":4.5, "y":2.25},
-                {"label":"K32", "x":5.5, "y":2.25},
-                {"label":"K23", "x":6.5, "y":2.25},
-                {"label":"K33", "x":7.5, "y":2.25},
-                {"label":"K24", "x":8.5, "y":2.25},
-                {"label":"K34", "x":9.5, "y":2.25},
-                {"label":"K25", "x":10.5, "y":2.25},
-                {"label":"K35", "x":11.5, "y":2.25},
-                {"label":"K26", "x":12.5, "y":2.25},
-                {"label":"K36", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K28", "x":15.25, "y":2.25},
-                {"label":"K38", "x":16.25, "y":2.25},
-                {"label":"K58", "x":17.25, "y":2.25},
-                {"label":"K40", "x":0, "y":3.25, "w":1.75},
-                {"label":"K41", "x":1.75, "y":3.25},
-                {"label":"K51", "x":2.75, "y":3.25},
-                {"label":"K42", "x":3.75, "y":3.25},
-                {"label":"K52", "x":4.75, "y":3.25},
-                {"label":"K43", "x":5.75, "y":3.25},
-                {"label":"K53", "x":6.75, "y":3.25},
-                {"label":"K44", "x":7.75, "y":3.25},
-                {"label":"K54", "x":8.75, "y":3.25},
-                {"label":"K45", "x":9.75, "y":3.25},
-                {"label":"K55", "x":10.75, "y":3.25},
-                {"label":"K46", "x":11.75, "y":3.25},
-                {"label":"K17", "x":12.75, "y":3.25},
-                {"label":"K56", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K70", "x":0, "y":4.25, "w":1.25},
-                {"label":"K97", "x":1.25, "y":4.25},
-                {"label":"K61", "x":2.25, "y":4.25},
-                {"label":"K71", "x":3.25, "y":4.25},
-                {"label":"K62", "x":4.25, "y":4.25},
-                {"label":"K72", "x":5.25, "y":4.25},
-                {"label":"K63", "x":6.25, "y":4.25},
-                {"label":"K73", "x":7.25, "y":4.25},
-                {"label":"K64", "x":8.25, "y":4.25},
-                {"label":"K74", "x":9.25, "y":4.25},
-                {"label":"K65", "x":10.25, "y":4.25},
-                {"label":"K75", "x":11.25, "y":4.25},
-                {"label":"K66", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"K76", "x":14, "y":4.25},
-                {"label":"K68", "x":16.25, "y":4.25},
-                {"label":"K60", "x":0, "y":5.25, "w":1.25},
-                {"label":"K50", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K87", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K07", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"K27", "x":10, "y":5.25, "w":1.25},
-                {"label":"K37", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K47", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K57", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K67", "x":15.25, "y":5.25},
-                {"label":"K77", "x":16.25, "y":5.25},
-                {"label":"K78", "x":17.25, "y":5.25}
+                {"matrix": [8, 0], "x": 0, "y": 0},
+
+                {"matrix": [9, 0], "x": 2, "y": 0},
+                {"matrix": [8, 1], "x": 3, "y": 0},
+                {"matrix": [9, 1], "x": 4, "y": 0},
+                {"matrix": [8, 2], "x": 5, "y": 0},
+
+                {"matrix": [9, 2], "x": 6.5, "y": 0},
+                {"matrix": [8, 3], "x": 7.5, "y": 0},
+                {"matrix": [9, 3], "x": 8.5, "y": 0},
+                {"matrix": [8, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [9, 4], "x": 11, "y": 0},
+                {"matrix": [8, 5], "x": 12, "y": 0},
+                {"matrix": [9, 5], "x": 13, "y": 0},
+                {"matrix": [8, 6], "x": 14, "y": 0},
+
+                {"matrix": [9, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 8], "x": 16.25, "y": 0},
+                {"matrix": [9, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1, "y": 1.25},
+                {"matrix": [0, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 1], "x": 3, "y": 1.25},
+                {"matrix": [0, 2], "x": 4, "y": 1.25},
+                {"matrix": [1, 2], "x": 5, "y": 1.25},
+                {"matrix": [0, 3], "x": 6, "y": 1.25},
+                {"matrix": [1, 3], "x": 7, "y": 1.25},
+                {"matrix": [0, 4], "x": 8, "y": 1.25},
+                {"matrix": [1, 4], "x": 9, "y": 1.25},
+                {"matrix": [0, 5], "x": 10, "y": 1.25},
+                {"matrix": [1, 5], "x": 11, "y": 1.25},
+                {"matrix": [0, 6], "x": 12, "y": 1.25},
+                {"matrix": [1, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [0, 8], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [3, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [3, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [3, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [5, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [5, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [4, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [5, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [4, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [5, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [4, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [5, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [4, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [1, 7], "x": 12.75, "y": 3.25},
+                {"matrix": [5, 6], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 4.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [7, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [7, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [6, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [6, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [6, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [6, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [6, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [7, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/gon/nerdtkl/nerdtkl.c b/keyboards/gon/nerdtkl/nerdtkl.c
deleted file mode 100644
index e221e9e78e..0000000000
--- a/keyboards/gon/nerdtkl/nerdtkl.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "nerdtkl.h"
diff --git a/keyboards/gon/nerdtkl/nerdtkl.h b/keyboards/gon/nerdtkl/nerdtkl.h
deleted file mode 100644
index 9dbc036194..0000000000
--- a/keyboards/gon/nerdtkl/nerdtkl.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_tkl( \
-    K80,      K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86,    K96, K88, K98, \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,    K08, K18, K48, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,    K28, K38, K58, \
-    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K17, K56,                   \
-    K70, K97, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,         K68,      \
-    K60, K50, K87,                K07,                K27, K37, K47, K57,    K67, K77, K78  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \
-    { K80, K81, K82, K83, K84, K85, K86, K87, K88 }, \
-    { K90, K91, K92, K93, K94, K95, K96, K97, K98 } \
-}
diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h
index f660448b46..065010fa52 100644
--- a/keyboards/gopolar/gg86/config.h
+++ b/keyboards/gopolar/gg86/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C6, B6, B5, B4, D7, D6, D4, C7, E6, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
@@ -32,7 +24,6 @@
 
 #ifdef RGB_MATRIX_ENABLE
     /* RGB Matrix config */
-    #define RGB_DI_PIN E2
     #define RGB_MATRIX_LED_COUNT 100
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
     #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
diff --git a/keyboards/gopolar/gg86/gg86.c b/keyboards/gopolar/gg86/gg86.c
index 814ee5ec3e..0ed811c89f 100644
--- a/keyboards/gopolar/gg86/gg86.c
+++ b/keyboards/gopolar/gg86/gg86.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gg86.h"
+#include "quantum.h"
 
 // OLED animation
 #include "lib/logo.h"
diff --git a/keyboards/gopolar/gg86/gg86.h b/keyboards/gopolar/gg86/gg86.h
deleted file mode 100644
index 6922f8dab5..0000000000
--- a/keyboards/gopolar/gg86/gg86.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2021 Gopolar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- * │00 │   │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │     │4F │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───�
- * │50   │51 │52   │55                         │5A   │5B │5C   │ │5E │5F │5G │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_all( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,    K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,   K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                    \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4C,   K4D,       K4F,      \
-    K50,   K51,   K52,                K55,                 K5A,   K5B,   K5C,   K5E, K5F, K5G  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, K0G }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-	{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, XXX, K4F, XXX }, \
-	{ K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, XXX, K5A, K5B, K5C, XXX, K5E, K5F, K5G }, \
-}
-
-/* ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- * │00 │   │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C        │     │4F │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───�
- * │50   │51 │52   │55                         │5A   │5B │5C   │ │5E │5F │5G │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,    K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,   K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                    \
-        K40,   K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4C,            K4F,      \
-    K50,   K51,   K52,                K55,                 K5A,   K5B,   K5C,   K5E, K5F, K5G  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, K0G }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-	{ K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, XXX, K4F, XXX }, \
-	{ K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, XXX, K5A, K5B, K5C, XXX, K5E, K5F, K5G }, \
-}
-
-/* ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- * │00 │   │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     │ │2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�3D  │ └───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C        │     │4F │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───�
- * │50   │51 │52   │55                         │5A   │5B │5C   │ │5E │5F │5G │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_tkl_iso_tsangan( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,    K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                  \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4C,            K4F,      \
-    K50,   K51,   K52,                K55,                 K5A,   K5B,   K5C,   K5E, K5F, K5G  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, K0G }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-	{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, XXX, K4F, XXX }, \
-	{ K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, XXX, K5A, K5B, K5C, XXX, K5E, K5F, K5G }, \
-}
diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json
index dc017f23c4..8886063045 100644
--- a/keyboards/gopolar/gg86/info.json
+++ b/keyboards/gopolar/gg86/info.json
@@ -8,295 +8,330 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.5},
-                {"label":"1!", "x":1, "y":1.5},
-                {"label":"2@", "x":2, "y":1.5},
-                {"label":"3#", "x":3, "y":1.5},
-                {"label":"4$", "x":4, "y":1.5},
-                {"label":"5%", "x":5, "y":1.5},
-                {"label":"6^", "x":6, "y":1.5},
-                {"label":"7&", "x":7, "y":1.5},
-                {"label":"8*", "x":8, "y":1.5},
-                {"label":"9(", "x":9, "y":1.5},
-                {"label":"0)", "x":10, "y":1.5},
-                {"label":"-_", "x":11, "y":1.5},
-                {"label":"=+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[{", "x":11.5, "y":2.5},
-                {"label":"]}", "x":12.5, "y":2.5},
-                {"label":"\\| / ISO Hash", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";:", "x":10.75, "y":3.5},
-                {"label":"'\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",<", "x":9.25, "y":4.5},
-                {"label":".>", "x":10.25, "y":4.5},
-                {"label":"/?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
-                {"label":"Shift", "x":14, "y":4.5},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                {"label":"Space", "x":4, "y":5.5, "w":7},
-                {"label":"Alt", "x":11, "y":5.5, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.5},
-                {"label":"1!", "x":1, "y":1.5},
-                {"label":"2@", "x":2, "y":1.5},
-                {"label":"3#", "x":3, "y":1.5},
-                {"label":"4$", "x":4, "y":1.5},
-                {"label":"5%", "x":5, "y":1.5},
-                {"label":"6^", "x":6, "y":1.5},
-                {"label":"7&", "x":7, "y":1.5},
-                {"label":"8*", "x":8, "y":1.5},
-                {"label":"9(", "x":9, "y":1.5},
-                {"label":"0)", "x":10, "y":1.5},
-                {"label":"-_", "x":11, "y":1.5},
-                {"label":"=+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[{", "x":11.5, "y":2.5},
-                {"label":"]}", "x":12.5, "y":2.5},
-                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";:", "x":10.75, "y":3.5},
-                {"label":"'\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",<", "x":9.25, "y":4.5},
-                {"label":".>", "x":10.25, "y":4.5},
-                {"label":"/?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                {"label":"Space", "x":4, "y":5.5, "w":7},
-                {"label":"Alt", "x":11, "y":5.5, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.5},
-                {"label":"1!", "x":1, "y":1.5},
-                {"label":"2@", "x":2, "y":1.5},
-                {"label":"3#", "x":3, "y":1.5},
-                {"label":"4$", "x":4, "y":1.5},
-                {"label":"5%", "x":5, "y":1.5},
-                {"label":"6^", "x":6, "y":1.5},
-                {"label":"7&", "x":7, "y":1.5},
-                {"label":"8*", "x":8, "y":1.5},
-                {"label":"9(", "x":9, "y":1.5},
-                {"label":"0)", "x":10, "y":1.5},
-                {"label":"-_", "x":11, "y":1.5},
-                {"label":"=+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[{", "x":11.5, "y":2.5},
-                {"label":"]}", "x":12.5, "y":2.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";:", "x":10.75, "y":3.5},
-                {"label":"'\"", "x":11.75, "y":3.5},
-                {"label":"ISO Hash", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",<", "x":9.25, "y":4.5},
-                {"label":".>", "x":10.25, "y":4.5},
-                {"label":"/?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                {"label":"Space", "x":4, "y":5.5, "w":7},
-                {"label":"Alt", "x":11, "y":5.5, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/gopolar/gg86/lib/logo.h b/keyboards/gopolar/gg86/lib/logo.h
index 08ab8ea529..d1197b15f5 100644
--- a/keyboards/gopolar/gg86/lib/logo.h
+++ b/keyboards/gopolar/gg86/lib/logo.h
@@ -14,4 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 void render_logo(void);
diff --git a/keyboards/gopolar/gg86/lib/wave.h b/keyboards/gopolar/gg86/lib/wave.h
index f4e5e5052c..d87525c1d4 100644
--- a/keyboards/gopolar/gg86/lib/wave.h
+++ b/keyboards/gopolar/gg86/lib/wave.h
@@ -15,6 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 extern const unsigned char font[] PROGMEM;
 
 #define ROW_1 OLED_DISPLAY_WIDTH
diff --git a/keyboards/gopolar/gg86/rules.mk b/keyboards/gopolar/gg86/rules.mk
index 24c3d42112..9eef6b6cc4 100644
--- a/keyboards/gopolar/gg86/rules.mk
+++ b/keyboards/gopolar/gg86/rules.mk
@@ -19,7 +19,6 @@ NO_USB_STARTUP_CHECK = yes
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # OLED enabled
 OLED_ENABLE = yes
diff --git a/keyboards/gorthage_truck/config.h b/keyboards/gorthage_truck/config.h
deleted file mode 100644
index 56b84cb427..0000000000
--- a/keyboards/gorthage_truck/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 s8erdude
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, C7, B3, B7, D7}
-#define MATRIX_COL_PINS { F0, F1, F4, F7, D6, E6, B0, B1, B2}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gorthage_truck/gorthage_truck.c b/keyboards/gorthage_truck/gorthage_truck.c
index 2745666916..c6f75d7270 100644
--- a/keyboards/gorthage_truck/gorthage_truck.c
+++ b/keyboards/gorthage_truck/gorthage_truck.c
@@ -15,15 +15,3 @@
  */
 
 #include "gorthage_truck.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/gorthage_truck/info.json b/keyboards/gorthage_truck/info.json
index fe5b37c6b8..7f40f6583f 100644
--- a/keyboards/gorthage_truck/info.json
+++ b/keyboards/gorthage_truck/info.json
@@ -8,6 +8,11 @@
         "pid": "0x58E4",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F7", "D6", "E6", "B0", "B1", "B2"],
+        "rows": ["C6", "B6", "B5", "B4", "C7", "B3", "B7", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F6"}
diff --git a/keyboards/gowla/config.h b/keyboards/gowla/config.h
deleted file mode 100644
index 843389ea2e..0000000000
--- a/keyboards/gowla/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Pin-out */
-#define MATRIX_ROW_PINS { D1, D0, D4 }
-#define MATRIX_COL_PINS { B5, B4, E6 }
-
-/* ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/gowla/gowla.c b/keyboards/gowla/gowla.c
deleted file mode 100644
index 13781bce3c..0000000000
--- a/keyboards/gowla/gowla.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "gowla.h"
diff --git a/keyboards/gowla/gowla.h b/keyboards/gowla/gowla.h
deleted file mode 100644
index fa98c1f403..0000000000
--- a/keyboards/gowla/gowla.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x3( \
-      k00, k01, k02, \
-      k10, k11, k12, \
-      k20, k21, k22  \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 } \
-}
diff --git a/keyboards/gowla/info.json b/keyboards/gowla/info.json
index 8393d1c82d..680ee27e59 100644
--- a/keyboards/gowla/info.json
+++ b/keyboards/gowla/info.json
@@ -8,22 +8,27 @@
         "pid": "0xE9B6",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6"],
+        "rows": ["D1", "D0", "D4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_ortho_3x3": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2}
             ]
         }
     }
diff --git a/keyboards/gray_studio/aero75/aero75.c b/keyboards/gray_studio/aero75/aero75.c
deleted file mode 100644
index f026786c90..0000000000
--- a/keyboards/gray_studio/aero75/aero75.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2022 Yizhen Liu (@edwardslau)
-// SPDX-License-Identifier: GPL-2.0
-#include "aero75.h"
diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h
index 479ca4c744..addd25292b 100644
--- a/keyboards/gray_studio/aero75/config.h
+++ b/keyboards/gray_studio/aero75/config.h
@@ -3,27 +3,8 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { A7, A6, B12, A2, A1, A0 }
-#define MATRIX_COL_PINS { A3, A5, A4, B9, B8, B7, B6, B5, B4, B3, A15, B1, A8, B15, B14, B13 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B10
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#ifdef RGB_DI_PIN 
 #define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -42,7 +23,6 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json
index 37376a90e9..5451c0284c 100644
--- a/keyboards/gray_studio/aero75/info.json
+++ b/keyboards/gray_studio/aero75/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3075",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B10"
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B1", "A8", "B15", "B14", "B13"],
+        "rows": ["A7", "A6", "B12", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
diff --git a/keyboards/gray_studio/apollo80/apollo80.c b/keyboards/gray_studio/apollo80/apollo80.c
deleted file mode 100644
index 842a63f318..0000000000
--- a/keyboards/gray_studio/apollo80/apollo80.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "apollo80.h"
-
-
diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h
index 8d360498a5..f8a03ebf49 100644
--- a/keyboards/gray_studio/apollo80/config.h
+++ b/keyboards/gray_studio/apollo80/config.h
@@ -16,23 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0, B3, B0, B2, B1 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 }
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 22
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -52,5 +35,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_EFFECT_RGB_TEST
     #define RGBLIGHT_EFFECT_ALTERNATING
     #define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json
index 2f090ef342..c764ad6582 100644
--- a/keyboards/gray_studio/apollo80/info.json
+++ b/keyboards/gray_studio/apollo80/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"],
+        "rows": ["D1", "D0", "B3", "B0", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "E6",
         "on_state": 0
diff --git a/keyboards/gray_studio/cod67/cod67.c b/keyboards/gray_studio/cod67/cod67.c
deleted file mode 100644
index 494e06da74..0000000000
--- a/keyboards/gray_studio/cod67/cod67.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "cod67.h"
diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h
index 64b58911e3..2daace057d 100644
--- a/keyboards/gray_studio/cod67/config.h
+++ b/keyboards/gray_studio/cod67/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS { D7, F7, F6, F5, F4, F1, F0, E6, B0, B7, D0, D1, D2, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 20
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json
index 2f8a81d08e..64f95a66a4 100644
--- a/keyboards/gray_studio/cod67/info.json
+++ b/keyboards/gray_studio/cod67/info.json
@@ -8,6 +8,14 @@
     "pid": "0x1000",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B2"
+  },
+  "matrix_pins": {
+    "cols": ["D7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4",
     "on_state": 0
diff --git a/keyboards/gray_studio/hb85/config.h b/keyboards/gray_studio/hb85/config.h
index 20dbdb3f50..41df8a357d 100644
--- a/keyboards/gray_studio/hb85/config.h
+++ b/keyboards/gray_studio/hb85/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/gray_studio/hb85/hb85.c b/keyboards/gray_studio/hb85/hb85.c
deleted file mode 100644
index 964234d6b4..0000000000
--- a/keyboards/gray_studio/hb85/hb85.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>,
-          2019 fcoury <felipe.coury@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "hb85.h"
diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/info.json
index a8b7641a0b..b0b0f11db3 100644
--- a/keyboards/gray_studio/hb85/info.json
+++ b/keyboards/gray_studio/hb85/info.json
@@ -8,9 +8,17 @@
         "pid": "0x2000",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1",
         "num_lock": "D0",
diff --git a/keyboards/gray_studio/hb85/rules.mk b/keyboards/gray_studio/hb85/rules.mk
index 9a00928ea8..51df0b642e 100644
--- a/keyboards/gray_studio/hb85/rules.mk
+++ b/keyboards/gray_studio/hb85/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h
index 17a91e8e47..4cc46acbbb 100644
--- a/keyboards/gray_studio/space65/config.h
+++ b/keyboards/gray_studio/space65/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, F0, F4, F1 }
-#define MATRIX_COL_PINS { B0, B3, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 6
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/info.json
index 0689443af5..8bcd90705a 100644
--- a/keyboards/gray_studio/space65/info.json
+++ b/keyboards/gray_studio/space65/info.json
@@ -8,11 +8,19 @@
         "pid": "0x3000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B3", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["D0", "D1", "F0", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "E6",
         "on_state": 0
@@ -23,234 +31,232 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6, "y": 4, "w": 1.25},
-                {"x": 7.25, "y": 4, "w": 2.75},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"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, 5], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 7], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/gray_studio/space65/space65.c b/keyboards/gray_studio/space65/space65.c
deleted file mode 100644
index d27a1f38c3..0000000000
--- a/keyboards/gray_studio/space65/space65.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "space65.h"
diff --git a/keyboards/gray_studio/space65/space65.h b/keyboards/gray_studio/space65/space65.h
deleted file mode 100644
index 943e9e66c9..0000000000
--- a/keyboards/gray_studio/space65/space65.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D,      k3E, k3F, \
-    k40, k41,      k43,      k45,      k47, k48,      k4A, k4B,      k4D, k4E, k4F  \
-) \
-{ \
-    { k00, k01,   k02,   k03, k04,   k05, k06,   k07, k08, k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
-    { k10, KC_NO, k12,   k13, k14,   k15, k16,   k17, k18, k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20, KC_NO, k22,   k23, k24,   k25, k26,   k27, k28, k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { k30, k31,   k32,   k33, k34,   k35, k36,   k37, k38, k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40, k41,   KC_NO, k43, KC_NO, k45, KC_NO, k47, k48, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0F, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D,      k3E, k3F, \
-    k40, k41,      k43,                k47,           k4A, k4B,      k4D, k4E, k4F  \
-) \
-{ \
-    { k00, k01,   k02,   k03, k04,   k05,   k06,   k07, k08,   k09,   k0A, k0B, k0C,   k0D,   KC_NO, k0F }, \
-    { k10, KC_NO, k12,   k13, k14,   k15,   k16,   k17, k18,   k19,   k1A, k1B, k1C,   k1D,   k1E,   k1F }, \
-    { k20, KC_NO, k22,   k23, k24,   k25,   k26,   k27, k28,   k29,   k2A, k2B, k2C,   k2D,   KC_NO, k2F }, \
-    { k30, KC_NO, k32,   k33, k34,   k35,   k36,   k37, k38,   k39,   k3A, k3B, KC_NO, k3D,   k3E,   k3F }, \
-    { k40, k41,   KC_NO, k43, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D,   k4E,   k4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0D,   K0F,   \
-    K10,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,         K1F,   \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D,   K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,     K3E, K3F,   \
-    K40,  K41,  K43,              K47,                K4A,  K4B,     K4D, K4E, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO, K0F   }, \
-    { K10,   KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, K2F   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   K3E,   K3F   }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, KC_NO, K47,   KC_NO, KC_NO, K4A,   K4B,   KC_NO, K4D,   K4E,   K4F   }, \
-}
diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h
index 0cd753963c..1603a2b3be 100644
--- a/keyboards/gray_studio/space65r3/config.h
+++ b/keyboards/gray_studio/space65r3/config.h
@@ -2,27 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { A6, B12, A2, A0, A1 }
-#define MATRIX_COL_PINS { A3, A5, A4, B9, B8, B7, B6, B5, B4, B3, A15, B0, A8, B15, B14, B13 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B10
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#ifdef RGB_DI_PIN 
 #define RGBLED_NUM 5
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -41,7 +22,6 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/info.json
index b514a2886b..286538e203 100644
--- a/keyboards/gray_studio/space65r3/info.json
+++ b/keyboards/gray_studio/space65r3/info.json
@@ -8,238 +8,244 @@
         "pid":"0x3003",
         "device_version": "0.0.3",
     },
+    "ws2812": {
+        "pin": "B10"
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A8", "B15", "B14", "B13"],
+        "rows": ["A6", "B12", "A2", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "community_layouts": ["65_ansi_blocker", "65_iso_blocker"],
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/gray_studio/space65r3/space65r3.c b/keyboards/gray_studio/space65r3/space65r3.c
deleted file mode 100644
index 8cc0c7ad3e..0000000000
--- a/keyboards/gray_studio/space65r3/space65r3.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2022 Yizhen Liu (@edwardslau)
-// SPDX-License-Identifier: GPL-2.0
-#include "space65r3.h"
diff --git a/keyboards/gray_studio/space65r3/space65r3.h b/keyboards/gray_studio/space65r3/space65r3.h
deleted file mode 100644
index 05ca1b686c..0000000000
--- a/keyboards/gray_studio/space65r3/space65r3.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Yizhen Liu (@edwardslau)
-// SPDX-License-Identifier: GPL-2.0
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D,      k3E, k3F, \
-    k40, k41,      k43,                k47,           k4A, k4B,      k4D, k4E, k4F  \
-) \
-{ \
-    { k00, k01,   k02,   k03, k04,   k05, k06,   k07, k08, k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
-    { k10, KC_NO, k12,   k13, k14,   k15, k16,   k17, k18, k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
-    { k20, KC_NO, k22,   k23, k24,   k25, k26,   k27, k28, k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
-    { k30, k31,   k32,   k33, k34,   k35, k36,   k37, k38, k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
-    { k40, k41,  KC_NO,  k43, KC_NO,KC_NO,KC_NO, k47,KC_NO, KC_NO,k4A, k4B, KC_NO, k4D, k4E,   k4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0F, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D,      k3E, k3F, \
-    k40, k41,      k43,                k47,           k4A, k4B,      k4D, k4E, k4F  \
-) \
-{ \
-    { k00, k01,   k02,   k03, k04,   k05,   k06,   k07, k08,   k09,   k0A, k0B, k0C,   k0D,   KC_NO, k0F }, \
-    { k10, KC_NO, k12,   k13, k14,   k15,   k16,   k17, k18,   k19,   k1A, k1B, k1C,   k1D,   k1E,   k1F }, \
-    { k20, KC_NO, k22,   k23, k24,   k25,   k26,   k27, k28,   k29,   k2A, k2B, k2C,   k2D,   KC_NO, k2F }, \
-    { k30, KC_NO, k32,   k33, k34,   k35,   k36,   k37, k38,   k39,   k3A, k3B, KC_NO, k3D,   k3E,   k3F }, \
-    { k40, k41,   KC_NO, k43, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D,   k4E,   k4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0D,   K0F,   \
-    K10,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,         K1F,   \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D,   K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,     K3E, K3F,   \
-    K40,  K41,  K43,              K47,                K4A,  K4B,     K4D, K4E, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO, K0F   }, \
-    { K10,   KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, K2F   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   K3E,   K3F   }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, KC_NO, K47,   KC_NO, KC_NO, K4A,   K4B,   KC_NO, K4D,   K4E,   K4F   }, \
-}
diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h
index cad954709b..54038d807b 100644
--- a/keyboards/gray_studio/think65/hotswap/config.h
+++ b/keyboards/gray_studio/think65/hotswap/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
-#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 22
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -51,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/gray_studio/think65/hotswap/hotswap.c b/keyboards/gray_studio/think65/hotswap/hotswap.c
deleted file mode 100644
index 60808979c9..0000000000
--- a/keyboards/gray_studio/think65/hotswap/hotswap.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hotswap.h"
diff --git a/keyboards/gray_studio/think65/hotswap/hotswap.h b/keyboards/gray_studio/think65/hotswap/hotswap.h
deleted file mode 100644
index f6087e39e6..0000000000
--- a/keyboards/gray_studio/think65/hotswap/hotswap.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E,      K0F,   \
-    K10,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,    K1F,   \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2F,   \
-    K31,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,     K3E, K3F,   \
-    K40,  K41,  K43,              K46,                K4A,  K4B,     K4D, K4E, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F   }, \
-    { K10,   KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, K2F   }, \
-    { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   K3E,   K3F   }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   KC_NO, K4D,   K4E,   K4F   }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
\ No newline at end of file
diff --git a/keyboards/gray_studio/think65/hotswap/info.json b/keyboards/gray_studio/think65/hotswap/info.json
index 1ec54ad748..10f0710b94 100644
--- a/keyboards/gray_studio/think65/hotswap/info.json
+++ b/keyboards/gray_studio/think65/hotswap/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"],
+        "rows": ["B0", "B1", "B2", "B3", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7",
         "num_lock": "C6",
@@ -20,73 +28,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"K00 (B0,D1)", "x":0, "y":0},
-                {"label":"K01 (B0,D0)", "x":1, "y":0},
-                {"label":"K02 (B0,D2)", "x":2, "y":0},
-                {"label":"K03 (B0,D3)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,D4)", "x":5, "y":0},
-                {"label":"K06 (B0,D6)", "x":6, "y":0},
-                {"label":"K07 (B0,D7)", "x":7, "y":0},
-                {"label":"K08 (B0,B4)", "x":8, "y":0},
-                {"label":"K09 (B0,B5)", "x":9, "y":0},
-                {"label":"K0A (B0,F0)", "x":10, "y":0},
-                {"label":"K0B (B0,F1)", "x":11, "y":0},
-                {"label":"K0C (B0,B6)", "x":12, "y":0},
-                {"label":"K0E (B0,F5)", "x":13, "y":0, "w":2},
-                {"label":"K0F (B0,F6)", "x":15, "y":0},
-                {"label":"K10 (B1,D1)", "x":0, "y":1, "w":1.5},
-                {"label":"K12 (B1,D2)", "x":1.5, "y":1},
-                {"label":"K13 (B1,D3)", "x":2.5, "y":1},
-                {"label":"K14 (B1,D5)", "x":3.5, "y":1},
-                {"label":"K15 (B1,D4)", "x":4.5, "y":1},
-                {"label":"K16 (B1,D6)", "x":5.5, "y":1},
-                {"label":"K17 (B1,D7)", "x":6.5, "y":1},
-                {"label":"K18 (B1,B4)", "x":7.5, "y":1},
-                {"label":"K19 (B1,B5)", "x":8.5, "y":1},
-                {"label":"K1A (B1,F0)", "x":9.5, "y":1},
-                {"label":"K1B (B1,F1)", "x":10.5, "y":1},
-                {"label":"K1C (B1,B6)", "x":11.5, "y":1},
-                {"label":"K1D (B1,F4)", "x":12.5, "y":1},
-                {"label":"K1E (B1,F5)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (B1,F6)", "x":15, "y":1},
-                {"label":"K20 (B2,D1)", "x":0, "y":2, "w":1.75},
-                {"label":"K22 (B2,D2)", "x":1.75, "y":2},
-                {"label":"K23 (B2,D3)", "x":2.75, "y":2},
-                {"label":"K24 (B2,D5)", "x":3.75, "y":2},
-                {"label":"K25 (B2,D4)", "x":4.75, "y":2},
-                {"label":"K26 (B2,D6)", "x":5.75, "y":2},
-                {"label":"K27 (B2,D7)", "x":6.75, "y":2},
-                {"label":"K28 (B2,B4)", "x":7.75, "y":2},
-                {"label":"K29 (B2,B5)", "x":8.75, "y":2},
-                {"label":"K2A (B2,F0)", "x":9.75, "y":2},
-                {"label":"K2B (B2,F1)", "x":10.75, "y":2},
-                {"label":"K2C (B2,B6)", "x":11.75, "y":2},
-                {"label":"K2D (B2,F4)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2F (B2,F6)", "x":15, "y":2},
-                {"label":"K31 (B3,D0)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (B3,D2)", "x":2.25, "y":3},
-                {"label":"K33 (B3,D3)", "x":3.25, "y":3},
-                {"label":"K34 (B3,D5)", "x":4.25, "y":3},
-                {"label":"K35 (B3,D4)", "x":5.25, "y":3},
-                {"label":"K36 (B3,D6)", "x":6.25, "y":3},
-                {"label":"K37 (B3,D7)", "x":7.25, "y":3},
-                {"label":"K38 (B3,B4)", "x":8.25, "y":3},
-                {"label":"K39 (B3,B5)", "x":9.25, "y":3},
-                {"label":"K3A (B3,F0)", "x":10.25, "y":3},
-                {"label":"K3B (B3,F1)", "x":11.25, "y":3},
-                {"label":"K3D (B3,F4)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (B3,F5)", "x":14, "y":3},
-                {"label":"K3F (B3,F6)", "x":15, "y":3},
-                {"label":"K40 (E6,D1)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (E6,D0)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K43 (E6,D3)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (E6,F0)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (E6,F1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (E6,F4)", "x":13, "y":4},
-                {"label":"K4E (E6,F5)", "x":14, "y":4},
-                {"label":"K4F (E6,F6)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h
index b6e0419aa1..54038d807b 100644
--- a/keyboards/gray_studio/think65/solder/config.h
+++ b/keyboards/gray_studio/think65/solder/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
- //                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
-#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 22
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/gray_studio/think65/solder/info.json b/keyboards/gray_studio/think65/solder/info.json
index 5374b4619d..3b7da2920d 100644
--- a/keyboards/gray_studio/think65/solder/info.json
+++ b/keyboards/gray_studio/think65/solder/info.json
@@ -8,222 +8,242 @@
         "pid": "0x4000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"],
+        "rows": ["B0", "B1", "B2", "B3", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"K00 (B0,D1)", "x":0, "y":0},
-                {"label":"K01 (B0,D0)", "x":1, "y":0},
-                {"label":"K02 (B0,D2)", "x":2, "y":0},
-                {"label":"K03 (B0,D3)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,D4)", "x":5, "y":0},
-                {"label":"K06 (B0,D6)", "x":6, "y":0},
-                {"label":"K07 (B0,D7)", "x":7, "y":0},
-                {"label":"K08 (B0,B4)", "x":8, "y":0},
-                {"label":"K09 (B0,B5)", "x":9, "y":0},
-                {"label":"K0A (B0,F0)", "x":10, "y":0},
-                {"label":"K0B (B0,F1)", "x":11, "y":0},
-                {"label":"K0C (B0,B6)", "x":12, "y":0},
-                {"label":"K0E (B0,F5)", "x":13, "y":0, "w":2},
-                {"label":"K0F (B0,F6)", "x":15, "y":0},
-                {"label":"K10 (B1,D1)", "x":0, "y":1, "w":1.5},
-                {"label":"K12 (B1,D2)", "x":1.5, "y":1},
-                {"label":"K13 (B1,D3)", "x":2.5, "y":1},
-                {"label":"K14 (B1,D5)", "x":3.5, "y":1},
-                {"label":"K15 (B1,D4)", "x":4.5, "y":1},
-                {"label":"K16 (B1,D6)", "x":5.5, "y":1},
-                {"label":"K17 (B1,D7)", "x":6.5, "y":1},
-                {"label":"K18 (B1,B4)", "x":7.5, "y":1},
-                {"label":"K19 (B1,B5)", "x":8.5, "y":1},
-                {"label":"K1A (B1,F0)", "x":9.5, "y":1},
-                {"label":"K1B (B1,F1)", "x":10.5, "y":1},
-                {"label":"K1C (B1,B6)", "x":11.5, "y":1},
-                {"label":"K1D (B1,F4)", "x":12.5, "y":1},
-                {"label":"K1E (B1,F5)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (B1,F6)", "x":15, "y":1},
-                {"label":"K20 (B2,D1)", "x":0, "y":2, "w":1.75},
-                {"label":"K22 (B2,D2)", "x":1.75, "y":2},
-                {"label":"K23 (B2,D3)", "x":2.75, "y":2},
-                {"label":"K24 (B2,D5)", "x":3.75, "y":2},
-                {"label":"K25 (B2,D4)", "x":4.75, "y":2},
-                {"label":"K26 (B2,D6)", "x":5.75, "y":2},
-                {"label":"K27 (B2,D7)", "x":6.75, "y":2},
-                {"label":"K28 (B2,B4)", "x":7.75, "y":2},
-                {"label":"K29 (B2,B5)", "x":8.75, "y":2},
-                {"label":"K2A (B2,F0)", "x":9.75, "y":2},
-                {"label":"K2B (B2,F1)", "x":10.75, "y":2},
-                {"label":"K2C (B2,B6)", "x":11.75, "y":2},
-                {"label":"K2D (B2,F4)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2F (B2,F6)", "x":15, "y":2},
-                {"label":"K31 (B3,D0)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (B3,D2)", "x":2.25, "y":3},
-                {"label":"K33 (B3,D3)", "x":3.25, "y":3},
-                {"label":"K34 (B3,D5)", "x":4.25, "y":3},
-                {"label":"K35 (B3,D4)", "x":5.25, "y":3},
-                {"label":"K36 (B3,D6)", "x":6.25, "y":3},
-                {"label":"K37 (B3,D7)", "x":7.25, "y":3},
-                {"label":"K38 (B3,B4)", "x":8.25, "y":3},
-                {"label":"K39 (B3,B5)", "x":9.25, "y":3},
-                {"label":"K3A (B3,F0)", "x":10.25, "y":3},
-                {"label":"K3B (B3,F1)", "x":11.25, "y":3},
-                {"label":"K3D (B3,F4)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (B3,F5)", "x":14, "y":3},
-                {"label":"K3F (B3,F6)", "x":15, "y":3},
-                {"label":"K40 (E6,D1)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (E6,D0)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K43 (E6,D3)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (E6,F0)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (E6,F1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (E6,F4)", "x":13, "y":4},
-                {"label":"K4E (E6,F5)", "x":14, "y":4},
-                {"label":"K4F (E6,F6)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_badge": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0},
-                {"label":"K05", "x":5, "y":0},
-                {"label":"K06", "x":6, "y":0},
-                {"label":"K07", "x":7, "y":0},
-                {"label":"K08", "x":8, "y":0},
-                {"label":"K09", "x":9, "y":0},
-                {"label":"K0A", "x":10, "y":0},
-                {"label":"K0B", "x":11, "y":0},
-                {"label":"K0C", "x":12, "y":0},
-                {"label":"K0D", "x":13, "y":0, "w":2},
-                {"label":"K0F", "x":15, "y":0},
-                {"label":"K10", "x":0, "y":1, "w":1.5},
-                {"label":"K12", "x":1.5, "y":1},
-                {"label":"K13", "x":2.5, "y":1},
-                {"label":"K14", "x":3.5, "y":1},
-                {"label":"K15", "x":4.5, "y":1},
-                {"label":"K16", "x":5.5, "y":1},
-                {"label":"K17", "x":6.5, "y":1},
-                {"label":"K18", "x":7.5, "y":1},
-                {"label":"K19", "x":8.5, "y":1},
-                {"label":"K1A", "x":9.5, "y":1},
-                {"label":"K1B", "x":10.5, "y":1},
-                {"label":"K1C", "x":11.5, "y":1},
-                {"label":"K1D", "x":12.5, "y":1},
-                {"label":"K1F", "x":15, "y":1},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K22", "x":1.75, "y":2},
-                {"label":"K23", "x":2.75, "y":2},
-                {"label":"K24", "x":3.75, "y":2},
-                {"label":"K25", "x":4.75, "y":2},
-                {"label":"K26", "x":5.75, "y":2},
-                {"label":"K27", "x":6.75, "y":2},
-                {"label":"K28", "x":7.75, "y":2},
-                {"label":"K29", "x":8.75, "y":2},
-                {"label":"K2A", "x":9.75, "y":2},
-                {"label":"K2B", "x":10.75, "y":2},
-                {"label":"K2C", "x":11.75, "y":2},
-                {"label":"K1E", "x":12.75, "y":2},
-                {"label":"K2D", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K30", "x":0, "y":3, "w":1.25},
-                {"label":"K31", "x":1.25, "y":3},
-                {"label":"K32", "x":2.25, "y":3},
-                {"label":"K33", "x":3.25, "y":3},
-                {"label":"K34", "x":4.25, "y":3},
-                {"label":"K35", "x":5.25, "y":3},
-                {"label":"K36", "x":6.25, "y":3},
-                {"label":"K37", "x":7.25, "y":3},
-                {"label":"K38", "x":8.25, "y":3},
-                {"label":"K39", "x":9.25, "y":3},
-                {"label":"K3A", "x":10.25, "y":3},
-                {"label":"K3B", "x":11.25, "y":3},
-                {"label":"K3D", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E", "x":14, "y":3},
-                {"label":"K40", "x":0, "y":4, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4, "w":1.25},
-                {"label":"K43", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A", "x":10, "y":4, "w":1.25},
-                {"label":"K4B", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D", "x":13, "y":4},
-                {"label":"K4E", "x":14, "y":4},
-                {"label":"K4F", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,D1)", "x":0, "y":0},
-                {"label":"K01 (B0,D0)", "x":1, "y":0},
-                {"label":"K02 (B0,D2)", "x":2, "y":0},
-                {"label":"K03 (B0,D3)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,D4)", "x":5, "y":0},
-                {"label":"K06 (B0,D6)", "x":6, "y":0},
-                {"label":"K07 (B0,D7)", "x":7, "y":0},
-                {"label":"K08 (B0,B4)", "x":8, "y":0},
-                {"label":"K09 (B0,B5)", "x":9, "y":0},
-                {"label":"K0A (B0,F0)", "x":10, "y":0},
-                {"label":"K0B (B0,F1)", "x":11, "y":0},
-                {"label":"K0C (B0,B6)", "x":12, "y":0},
-                {"label":"K0D (B0,F4)", "x":13, "y":0},
-                {"label":"K0E (B0,F5)", "x":14, "y":0},
-                {"label":"K0F (B0,F6)", "x":15, "y":0},
-                {"label":"K10 (B1,D1)", "x":0, "y":1, "w":1.5},
-                {"label":"K12 (B1,D2)", "x":1.5, "y":1},
-                {"label":"K13 (B1,D3)", "x":2.5, "y":1},
-                {"label":"K14 (B1,D5)", "x":3.5, "y":1},
-                {"label":"K15 (B1,D4)", "x":4.5, "y":1},
-                {"label":"K16 (B1,D6)", "x":5.5, "y":1},
-                {"label":"K17 (B1,D7)", "x":6.5, "y":1},
-                {"label":"K18 (B1,B4)", "x":7.5, "y":1},
-                {"label":"K19 (B1,B5)", "x":8.5, "y":1},
-                {"label":"K1A (B1,F0)", "x":9.5, "y":1},
-                {"label":"K1B (B1,F1)", "x":10.5, "y":1},
-                {"label":"K1C (B1,B6)", "x":11.5, "y":1},
-                {"label":"K1D (B1,F4)", "x":12.5, "y":1},
-                {"label":"K1E (B1,F5)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (B1,F6)", "x":15, "y":1},
-                {"label":"K20 (B2,D1)", "x":0, "y":2, "w":1.75},
-                {"label":"K22 (B2,D2)", "x":1.75, "y":2},
-                {"label":"K23 (B2,D3)", "x":2.75, "y":2},
-                {"label":"K24 (B2,D5)", "x":3.75, "y":2},
-                {"label":"K25 (B2,D4)", "x":4.75, "y":2},
-                {"label":"K26 (B2,D6)", "x":5.75, "y":2},
-                {"label":"K27 (B2,D7)", "x":6.75, "y":2},
-                {"label":"K28 (B2,B4)", "x":7.75, "y":2},
-                {"label":"K29 (B2,B5)", "x":8.75, "y":2},
-                {"label":"K2A (B2,F0)", "x":9.75, "y":2},
-                {"label":"K2B (B2,F1)", "x":10.75, "y":2},
-                {"label":"K2C (B2,B6)", "x":11.75, "y":2},
-                {"label":"K2D (B2,F4)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2F (B2,F6)", "x":15, "y":2},
-                {"label":"K30 (B3,D1)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (B3,D0)", "x":1.25, "y":3},
-                {"label":"K32 (B3,D2)", "x":2.25, "y":3},
-                {"label":"K33 (B3,D3)", "x":3.25, "y":3},
-                {"label":"K34 (B3,D5)", "x":4.25, "y":3},
-                {"label":"K35 (B3,D4)", "x":5.25, "y":3},
-                {"label":"K36 (B3,D6)", "x":6.25, "y":3},
-                {"label":"K37 (B3,D7)", "x":7.25, "y":3},
-                {"label":"K38 (B3,B4)", "x":8.25, "y":3},
-                {"label":"K39 (B3,B5)", "x":9.25, "y":3},
-                {"label":"K3A (B3,F0)", "x":10.25, "y":3},
-                {"label":"K3B (B3,F1)", "x":11.25, "y":3},
-                {"label":"K3D (B3,F4)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3E (B3,F5)", "x":14, "y":3},
-                {"label":"K3F (B3,F6)", "x":15, "y":3},
-                {"label":"K40 (E6,D1)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (E6,D0)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K43 (E6,D3)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (E6,F0)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (E6,F1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (E6,F4)", "x":13, "y":4},
-                {"label":"K4E (E6,F5)", "x":14, "y":4},
-                {"label":"K4F (E6,F6)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/gray_studio/think65/solder/solder.c b/keyboards/gray_studio/think65/solder/solder.c
index 619aa2db8d..f97a005218 100644
--- a/keyboards/gray_studio/think65/solder/solder.c
+++ b/keyboards/gray_studio/think65/solder/solder.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "solder.h"
+#include "quantum.h"
 
 // Optional override functions below.
 // You can leave any or all of these undefined.
diff --git a/keyboards/gray_studio/think65/solder/solder.h b/keyboards/gray_studio/think65/solder/solder.h
deleted file mode 100644
index f38306b2b7..0000000000
--- a/keyboards/gray_studio/think65/solder/solder.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-    K10,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,    K1F,   \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,     K3E, K3F,   \
-    K40,  K41,  K43,              K46,                K4A,  K4B,     K4D, K4E, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \
-    { K10,   KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, K2F   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   K3E,   K3F   }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   KC_NO, K4D,   K4E,   K4F   }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F,   \
-    K10,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,    K1F,   \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2F,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,     K3E, K3F,   \
-    K40,  K41,  K43,              K46,                K4A,  K4B,     K4D, K4E, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO, K0F   }, \
-    { K10,   KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, K2F   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   K3E,   K3F   }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   KC_NO, K4D,   K4E,   K4F   }, \
-}
-
-#define LAYOUT_65_iso_badge( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0D,   K0F,   \
-    K10,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,         K1F,   \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D,          \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,     K3E,        \
-    K40,  K41,  K43,              K46,                K4A,  K4B,     K4D, K4E, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO, K0F   }, \
-    { K10,   KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   K3E,   KC_NO }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   KC_NO, K4D,   K4E,   K4F   }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h
index a5a0733063..7fc3580dca 100644
--- a/keyboards/grid600/press/config.h
+++ b/keyboards/grid600/press/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-
-#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 4
   #define RGBLIGHT_HUE_STEP 10
   #define RGBLIGHT_SAT_STEP 17
@@ -53,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/info.json
index 6fb7c8d5b0..9061f77620 100644
--- a/keyboards/grid600/press/info.json
+++ b/keyboards/grid600/press/info.json
@@ -8,11 +8,24 @@
         "pid": "0x7539",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6"],
+        "rows": ["F0"]
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0}
+            ]
         }
     }
 }
diff --git a/keyboards/grid600/press/press.c b/keyboards/grid600/press/press.c
deleted file mode 100644
index 33935deca4..0000000000
--- a/keyboards/grid600/press/press.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "press.h"
\ No newline at end of file
diff --git a/keyboards/grid600/press/press.h b/keyboards/grid600/press/press.h
deleted file mode 100644
index ca9eac9d19..0000000000
--- a/keyboards/grid600/press/press.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-	K00, K01, K02, K03 \
-) { \
-	{ K00,   K01,   K02,   K03 }  \
-}
diff --git a/keyboards/gummykey/gummykey.c b/keyboards/gummykey/gummykey.c
deleted file mode 100644
index 3669d08057..0000000000
--- a/keyboards/gummykey/gummykey.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2023 Gummor (@gumorr)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "gummykey.h"
diff --git a/keyboards/gummykey/gummykey.h b/keyboards/gummykey/gummykey.h
deleted file mode 100644
index 79d36dc8a5..0000000000
--- a/keyboards/gummykey/gummykey.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2023 Gummor (@gumorr)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_split_4x6_5( \
-    L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \
-    L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \
-	L40, L41, L42, 		L44, L45, R45, R44, 	 R42, R41, R40 \
-) \
-{ \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, ___, L44, L45 }, \
-    { R00, R01, R02, R03, R04, R05 }, \
-    { R10, R11, R12, R13, R14, R15 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { R40, R41, R42, ___, R44, R45 } \
-}
diff --git a/keyboards/gummykey/info.json b/keyboards/gummykey/info.json
index 4f2136f358..6f3758c31a 100644
--- a/keyboards/gummykey/info.json
+++ b/keyboards/gummykey/info.json
@@ -13,77 +13,75 @@
     "diode_direction": "ROW2COL",
     "layouts": {
         "LAYOUT_split_4x6_5": {
-            "layout":
-				[
-					{"x":0.25, "y":0},
-					{"x":1.25, "y":0}, 
-					{"x":2.25, "y":0}, 
-					{"x":3.25, "y":0}, 
-					{"x":4.25, "y":0.125}, 
-					{"x":5.25, "y":0.25}, 
-					
-					{"x":0.25, "y":1}, 
-					{"x":1.25, "y":1}, 
-					{"x":2.25, "y":1}, 
-					{"x":3.25, "y":1}, 					
-					{"x":4.25, "y":1.125}, 
-					{"x":5.25, "y":1.25}, 
-					
-					{"x":0, "y":2, "w":1.25}, 
-					{"x":1.25, "y":2}, 
-					{"x":2.25, "y":2}, 
-					{"x":3.25, "y":2}, 
-					{"x":4.25, "y":2.125}, 
-					{"x":5.25, "y":2.25}, 
-					
-					{"x":0, "y":3, "w":1.25}, 
-					{"x":1.25, "y":3}, 
-					{"x":2.25, "y":3}, 
-					{"x":3.25, "y":3},
-					{"x":4.25, "y":3.125}, 
-					{"x":5.25, "y":3.25}, 
-					
-					{"x":0, "y":4, "w":1.25}, 
-					{"x":1.25, "y":4}, 
-					{"x":2.25, "y":4}, 
-					{"x":3.5, "y":4.25, "w":2.25}, 
-					{"x":6.75, "y":4.25}, 
-					
+            "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},
 
-					{"x":13.25, "y":0},  
-					{"x":12.25, "y":0}, 
-					{"x":11.25, "y":0},
-					{"x":10.25, "y":0}, 
-					{"x":9.25, "y":0.125}, 
-					{"x":8.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},
 
-					{"x":13.25, "y":1}, 					
-					{"x":12.25, "y":1}, 
-					{"x":11.25, "y":1}, 
-					{"x":10.25, "y":1}, 
-					{"x":9.25, "y":1.125},
-					{"x":8.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},
 
-					{"x":13.25, "y":2, "w":1.25}, 
-					{"x":12.25, "y":2}, 
-					{"x":11.25, "y":2}, 
-					{"x":10.25, "y":2}, 					
-					{"x":9.25, "y":2.125}, 
-					{"x":8.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},
 
-					{"x":13.25, "y":3, "w":1.25}, 
-					{"x":12.25, "y":3}, 
-					{"x":11.25, "y":3}, 
-					{"x":10.25, "y":3}, 
-					{"x":9.25, "y":3.125}, 
-					{"x":8.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},
 
-					{"x":13.25, "y":4, "w":1.25}, 
-					{"x":12.25, "y":4}, 
-					{"x":11.25, "y":4}, 
-					{"x":8, "y":4.25, "w":2.25}, 
-					{"x":7, "y":4.25}
-				]
+                {"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/gvalchca/ga150/config.h b/keyboards/gvalchca/ga150/config.h
deleted file mode 100644
index 7678422bc5..0000000000
--- a/keyboards/gvalchca/ga150/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 Kirill Shkuretskiy
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B1,B2,B3,F1,F0}
-#define MATRIX_COL_PINS {E6,B7,D5,D6,D7,B4,B5,B6,C6,C7,F7,F6,F5,F4,D3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gvalchca/ga150/ga150.c b/keyboards/gvalchca/ga150/ga150.c
deleted file mode 100644
index 3f098c4c53..0000000000
--- a/keyboards/gvalchca/ga150/ga150.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 Kirill Shkuretskiy 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "ga150.h"
\ No newline at end of file
diff --git a/keyboards/gvalchca/ga150/info.json b/keyboards/gvalchca/ga150/info.json
index 4e2d65df59..53b4b69a42 100644
--- a/keyboards/gvalchca/ga150/info.json
+++ b/keyboards/gvalchca/ga150/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6135",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B7", "D5", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "D3"],
+        "rows": ["B1", "B2", "B3", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "B1",
         "esc_output": "E6"
diff --git a/keyboards/gvalchca/spaccboard/config.h b/keyboards/gvalchca/spaccboard/config.h
deleted file mode 100644
index 2703cdd688..0000000000
--- a/keyboards/gvalchca/spaccboard/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 Kirill Shkuretskiy
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B1,B2,B3,C7,F0}
-#define MATRIX_COL_PINS {E6,B7,D5,D6,D7,B4,B5,B6,C6,F7,F6,F5,F4,F1,D3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/gvalchca/spaccboard/info.json b/keyboards/gvalchca/spaccboard/info.json
index 435abb01e0..31c752537f 100644
--- a/keyboards/gvalchca/spaccboard/info.json
+++ b/keyboards/gvalchca/spaccboard/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5342",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B7", "D5", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1", "D3"],
+        "rows": ["B1", "B2", "B3", "C7", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "B1",
         "esc_output": "E6"
diff --git a/keyboards/gvalchca/spaccboard/spaccboard.c b/keyboards/gvalchca/spaccboard/spaccboard.c
deleted file mode 100644
index 57d512cc2b..0000000000
--- a/keyboards/gvalchca/spaccboard/spaccboard.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 Kirill Shkuretskiy 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "spaccboard.h"
\ No newline at end of file
diff --git a/keyboards/h0oni/deskpad/config.h b/keyboards/h0oni/deskpad/config.h
index ec6c3b733d..ddcf0ebe4a 100644
--- a/keyboards/h0oni/deskpad/config.h
+++ b/keyboards/h0oni/deskpad/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D7, C6 }
-#define MATRIX_COL_PINS { D0, D4, D1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/h0oni/deskpad/info.json b/keyboards/h0oni/deskpad/info.json
index 2c553313c8..6a8282511b 100644
--- a/keyboards/h0oni/deskpad/info.json
+++ b/keyboards/h0oni/deskpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4450",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D4", "D1"],
+        "rows": ["D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D3"}
diff --git a/keyboards/h0oni/hotduck/config.h b/keyboards/h0oni/hotduck/config.h
index b7c2287300..9891423e3f 100644
--- a/keyboards/h0oni/hotduck/config.h
+++ b/keyboards/h0oni/hotduck/config.h
@@ -16,27 +16,8 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7, F6, F5 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D4, D0, D1, D2, D3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow
- * F4 PIN for pre-soldered WS2812 LEDs
  */
-#define RGB_DI_PIN F4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/h0oni/hotduck/hotduck.c b/keyboards/h0oni/hotduck/hotduck.c
deleted file mode 100644
index a251fb8987..0000000000
--- a/keyboards/h0oni/hotduck/hotduck.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Md Mashur Shalehin, aka h0oni <mashursakib1920@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#include "hotduck.h"
-
diff --git a/keyboards/h0oni/hotduck/info.json b/keyboards/h0oni/hotduck/info.json
index 6ca8cfcde7..d91854494c 100644
--- a/keyboards/h0oni/hotduck/info.json
+++ b/keyboards/h0oni/hotduck/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6844",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
+        "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F4"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/hadron/config.h b/keyboards/hadron/config.h
deleted file mode 100644
index 80379fab18..0000000000
--- a/keyboards/hadron/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-//#define AUDIO_VOICES
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/hadron/hadron.c b/keyboards/hadron/hadron.c
deleted file mode 100644
index fa5065b327..0000000000
--- a/keyboards/hadron/hadron.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "hadron.h"
-
diff --git a/keyboards/hadron/hadron.h b/keyboards/hadron/hadron.h
index 349311270e..7cc3c9702c 100644
--- a/keyboards/hadron/hadron.h
+++ b/keyboards/hadron/hadron.h
@@ -2,14 +2,6 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_hadron_ver0)
-#    include "ver0.h"
-#elif defined(KEYBOARD_hadron_ver2)
-#    include "ver2.h"
-#elif defined(KEYBOARD_hadron_ver3)
-#    include "ver3.h"
-#endif
-
 #define XXX KC_NO
 
 #define LAYOUT( \
diff --git a/keyboards/hadron/ver2/config.h b/keyboards/hadron/ver2/config.h
index 0ed5345cd0..7b7acf32b6 100644
--- a/keyboards/hadron/ver2/config.h
+++ b/keyboards/hadron/ver2/config.h
@@ -16,15 +16,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* Hadron Ver0 PCB default pin-out */
-#define MATRIX_ROW_PINS { D7, E6, B4, B5, B6 }
-#define MATRIX_COL_PINS { F6, F7, D6, C7, F5, F4, F1, F0, D2, D3, D5, B3, B2, B1, B0 }
-
 // configure oled driver for the 128x32 oled
 #define OLED_UPDATE_INTERVAL 33 // ~30fps
 
 /* ws2812 RGB LED*/
-#define RGB_DI_PIN D4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/info.json
index 23af3e77ef..612d3af50a 100644
--- a/keyboards/hadron/ver2/info.json
+++ b/keyboards/hadron/ver2/info.json
@@ -2,6 +2,14 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "D6", "C7", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "B3", "B2", "B1", "B0"],
+        "rows": ["D7", "E6", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D4"
+    },
     "processor": "atmega32u4",
     "bootloader": "halfkay"
 }
diff --git a/keyboards/hadron/ver2/ver2.c b/keyboards/hadron/ver2/ver2.c
index abf21d4256..583ac84a01 100644
--- a/keyboards/hadron/ver2/ver2.c
+++ b/keyboards/hadron/ver2/ver2.c
@@ -1,4 +1,4 @@
-#include "ver2.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_180; }
diff --git a/keyboards/hadron/ver2/ver2.h b/keyboards/hadron/ver2/ver2.h
deleted file mode 100644
index 8127b497f7..0000000000
--- a/keyboards/hadron/ver2/ver2.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "hadron.h"
diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h
index 64d1d41b0f..02e4116bb6 100644
--- a/keyboards/hadron/ver3/config.h
+++ b/keyboards/hadron/ver3/config.h
@@ -17,22 +17,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS { C15, C14, A10, A9, A8 }
-#define MATRIX_COL_PINS { B8,  B2,  B10, A0, A1, A2, B0, A3, B1, A6, A7, B12, C13, B11, B9 }
-
 //Audio
 #undef AUDIO_VOICES
 #undef AUDIO_PIN
@@ -135,7 +119,6 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 10
-#define RGB_DI_PIN B5
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 // #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json
index 2fd5bda881..753a9676ce 100644
--- a/keyboards/hadron/ver3/info.json
+++ b/keyboards/hadron/ver3/info.json
@@ -2,11 +2,22 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B8", "B2", "B10", "A0", "A1", "A2", "B0", "A3", "B1", "A6", "A7", "B12", "C13", "B11", "B9"],
+        "rows": ["C15", "C14", "A10", "A9", "A8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B13", "pin_b": "B14"}
         ]
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C"
diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk
index 5d37686760..5739e57d19 100644
--- a/keyboards/hadron/ver3/rules.mk
+++ b/keyboards/hadron/ver3/rules.mk
@@ -11,7 +11,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
-RGB_MATRIX_DRIVER = WS2812
 HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = DRV2605L
 OLED_ENABLE = yes
diff --git a/keyboards/hadron/ver3/ver3.c b/keyboards/hadron/ver3/ver3.c
index 4c5a2e0c9a..d337fd9681 100644
--- a/keyboards/hadron/ver3/ver3.c
+++ b/keyboards/hadron/ver3/ver3.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "ver3.h"
+#include "quantum.h"
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/hadron/ver3/ver3.h b/keyboards/hadron/ver3/ver3.h
deleted file mode 100644
index 1ad44b871f..0000000000
--- a/keyboards/hadron/ver3/ver3.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2018 ishtob
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "hadron.h"
diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h
index 07d53e4e49..6f237a5352 100644
--- a/keyboards/halfcliff/config.h
+++ b/keyboards/halfcliff/config.h
@@ -25,8 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F5, F6, F7, D7, B5, F5, F6, F7, D7, B5 }
 #define MATRIX_COL_PINS { B4, E6, C6, B6, B2 }
 
- #define RGB_DI_PIN D3
- #ifdef RGB_DI_PIN
    #define RGBLED_NUM 10
    #define RGBLIGHT_SPLIT
    #define RGBLED_SPLIT { 5, 5 }
@@ -35,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- #endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json
index aa97f81a73..6b86e69a1f 100644
--- a/keyboards/halfcliff/info.json
+++ b/keyboards/halfcliff/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/halokeys/elemental75/config.h b/keyboards/halokeys/elemental75/config.h
index 0ecdf933b0..fed1b7c458 100644
--- a/keyboards/halokeys/elemental75/config.h
+++ b/keyboards/halokeys/elemental75/config.h
@@ -15,13 +15,8 @@
   */
 #pragma once
 
-#define MATRIX_ROW_PINS { A2, A3, A4, A5, A6, A7 }
-#define MATRIX_COL_PINS { B2, B1, B0, B10, B11, B13, B14, B15, A8, A9, A14, A15, B3, B4, B7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10 // tap_code function delay for register and unregister
 
-#define RGB_DI_PIN A10
 #define RGBLED_NUM 22
 #define RGBLIGHT_LIMIT_VAL 225 // value set lower than 255 since current draw is too high
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/halokeys/elemental75/info.json b/keyboards/halokeys/elemental75/info.json
index 191b105542..d2434896d7 100644
--- a/keyboards/halokeys/elemental75/info.json
+++ b/keyboards/halokeys/elemental75/info.json
@@ -8,11 +8,19 @@
         "pid": "0xEA75",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0", "B10", "B11", "B13", "B14", "B15", "A8", "A9", "A14", "A15", "B3", "B4", "B7"],
+        "rows": ["A2", "A3", "A4", "A5", "A6", "A7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "B5"}
         ]
     },
+    "ws2812": {
+        "pin": "A10"
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/han60/config.h b/keyboards/han60/config.h
index 3113e76b03..9c95070341 100644
--- a/keyboards/han60/config.h
+++ b/keyboards/han60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D5, D3, D2, D1, D0}
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/han60/han60.c b/keyboards/han60/han60.c
deleted file mode 100644
index 4ba3a50e72..0000000000
--- a/keyboards/han60/han60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 farhandsome
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "han60.h"
diff --git a/keyboards/han60/info.json b/keyboards/han60/info.json
index 5f7cb9cb03..08817c3658 100644
--- a/keyboards/han60/info.json
+++ b/keyboards/han60/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFB60",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/hand88/config.h b/keyboards/hand88/config.h
index 4e5a08de2f..79fdc4275f 100755
--- a/keyboards/hand88/config.h
+++ b/keyboards/hand88/config.h
@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A2, A14, A15, B3, B4, B5 }
-#define MATRIX_COL_PINS { A1, B9, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15, A8 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/hand88/info.json b/keyboards/hand88/info.json
index b0e00e7f30..265b5f15b3 100755
--- a/keyboards/hand88/info.json
+++ b/keyboards/hand88/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/handwired/108key_trackpoint/108key_trackpoint.c b/keyboards/handwired/108key_trackpoint/108key_trackpoint.c
deleted file mode 100644
index 3834f89613..0000000000
--- a/keyboards/handwired/108key_trackpoint/108key_trackpoint.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "108key_trackpoint.h"
diff --git a/keyboards/handwired/108key_trackpoint/config.h b/keyboards/handwired/108key_trackpoint/config.h
index 5887401a3a..8aca85bf26 100644
--- a/keyboards/handwired/108key_trackpoint/config.h
+++ b/keyboards/handwired/108key_trackpoint/config.h
@@ -37,11 +37,5 @@
   #define PS2_USART_RX_VECT       USART1_RX_vect
 #endif
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0, D1, F0, D3, D4, F1, D6, D7, E0, E1, E2, E3, E4, E5, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json
index 54233290e5..e771c4b8aa 100644
--- a/keyboards/handwired/108key_trackpoint/info.json
+++ b/keyboards/handwired/108key_trackpoint/info.json
@@ -8,6 +8,11 @@
     "pid": "0x5678",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "F0", "D3", "D4", "F1", "D6", "D7", "E0", "E1", "E2", "E3", "E4", "E5", "E6"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "at90usb1286",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/handwired/10k/10k.c b/keyboards/handwired/10k/10k.c
deleted file mode 100644
index bd0babd956..0000000000
--- a/keyboards/handwired/10k/10k.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 Nabos <nabos at glargh dot fr>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "10k.h"
-
diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json
index 4b35ab4df9..20ccb509e6 100644
--- a/keyboards/handwired/10k/info.json
+++ b/keyboards/handwired/10k/info.json
@@ -31,16 +31,17 @@
   "layouts": {
     "LAYOUT_split_1x5": {
       "layout": [
-        {"label": "L00", "matrix": [0, 0], "x":0.4295, "y":1.011},
-        {"label": "L01", "matrix": [0, 1], "x":1.445, "y":0.819},
-        {"label": "L02", "matrix": [0, 2], "x":2.5385, "y":0.7555},
-        {"label": "L03", "matrix": [0, 3], "x":3.568, "y":1.3745},
-        {"label": "L04", "matrix": [0, 4], "x":4.2, "y":3.987},
-        {"label": "R00", "matrix": [1, 0], "x":5.2, "y":3.987},
-        {"label": "R01", "matrix": [1, 1], "x":5.832, "y":1.3745},
-        {"label": "R02", "matrix": [1, 2], "x":6.8615, "y":0.7555},
-        {"label": "R03", "matrix": [1, 3], "x":7.955, "y":0.819},
-        {"label": "R04", "matrix": [1, 4], "x":8.9705, "y":1.011}
+        {"matrix": [0, 0], "x":0, "y":0.25},
+        {"matrix": [0, 1], "x":1, "y":0.125},
+        {"matrix": [0, 2], "x":2, "y":0},
+        {"matrix": [0, 3], "x":3, "y":0.5},
+        {"matrix": [0, 4], "x":3.75, "y":2.75},
+
+        {"matrix": [1, 0], "x":5.75, "y":2.75},
+        {"matrix": [1, 1], "x":6.5, "y":0.5},
+        {"matrix": [1, 2], "x":7.5, "y":0},
+        {"matrix": [1, 3], "x":8.5, "y":0.125},
+        {"matrix": [1, 4], "x":9.5, "y":0.25}
       ]
     }
   }
diff --git a/keyboards/handwired/2x5keypad/2x5keypad.h b/keyboards/handwired/2x5keypad/2x5keypad.h
index 6284e83b72..6fcdd2128c 100644
--- a/keyboards/handwired/2x5keypad/2x5keypad.h
+++ b/keyboards/handwired/2x5keypad/2x5keypad.h
@@ -6,16 +6,5 @@
 #define BLUE_LED B5
 #define GREEN_LED B6
 
-
-#define LAYOUT( \
-	K00, K01, K02, K03, K04, \
-	K10, K11, K12, K13, K14  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04 }, \
-	{ K10,   K11,   K12,   K13,   K14 }  \
-}
-
-
-
 void turn_off_leds(void);
 void turn_on_led(pin_t pin);
diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h
index 10e2265749..819f0f640f 100644
--- a/keyboards/handwired/2x5keypad/config.h
+++ b/keyboards/handwired/2x5keypad/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B2 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -16,20 +8,3 @@
 
 /* Tap dancing params */
 #define TAPPING_TERM 250
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/handwired/2x5keypad/info.json b/keyboards/handwired/2x5keypad/info.json
index 7267d48672..1df0ccbdee 100644
--- a/keyboards/handwired/2x5keypad/info.json
+++ b/keyboards/handwired/2x5keypad/info.json
@@ -8,22 +8,27 @@
         "pid": "0x2020",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4"],
+        "rows": ["B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1}
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1}
             ]
         }
     }
diff --git a/keyboards/handwired/3dfoxc/3dfoxc.c b/keyboards/handwired/3dfoxc/3dfoxc.c
deleted file mode 100644
index e83a32d295..0000000000
--- a/keyboards/handwired/3dfoxc/3dfoxc.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 david l goodrich <dlg@dsrw.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "3dfoxc.h"
diff --git a/keyboards/handwired/3dfoxc/config.h b/keyboards/handwired/3dfoxc/config.h
deleted file mode 100644
index 9f08703b6d..0000000000
--- a/keyboards/handwired/3dfoxc/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 david l goodrich <dlg@dsrw.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/3dfoxc/info.json b/keyboards/handwired/3dfoxc/info.json
index dfd4e8d4f0..bafce6ccbf 100644
--- a/keyboards/handwired/3dfoxc/info.json
+++ b/keyboards/handwired/3dfoxc/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["F0", "F1", "C7", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/3dortho14u/rev1/rev1.c b/keyboards/handwired/3dortho14u/rev1/rev1.c
deleted file mode 100644
index 220fd71cfe..0000000000
--- a/keyboards/handwired/3dortho14u/rev1/rev1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Xiao (@xia0)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "rev1.h"
diff --git a/keyboards/handwired/3dortho14u/rev2/rev2.c b/keyboards/handwired/3dortho14u/rev2/rev2.c
deleted file mode 100644
index 545fea9fad..0000000000
--- a/keyboards/handwired/3dortho14u/rev2/rev2.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Xiao (@xia0)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "rev2.h"
diff --git a/keyboards/handwired/3dp660/3dp660.c b/keyboards/handwired/3dp660/3dp660.c
deleted file mode 100644
index 3f655d359f..0000000000
--- a/keyboards/handwired/3dp660/3dp660.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2020  gooberpsycho
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "3dp660.h"
diff --git a/keyboards/handwired/3dp660/3dp660.h b/keyboards/handwired/3dp660/3dp660.h
deleted file mode 100644
index 67288b1fc8..0000000000
--- a/keyboards/handwired/3dp660/3dp660.h
+++ /dev/null
@@ -1,35 +0,0 @@
- /* Copyright 2020 gooberpsycho
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#pragma once
-#include "quantum.h"
-
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_66_ansi( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,    \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,    \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,              \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,      k3C, k3D,         \
-  k40, k41, k42,           k45,                k49, k4A, k4B, k4C, k4D, k4E     \
-) \
-{ \
-  {k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   k0E}, \
-  {k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   k1E}, \
-  {k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C,   KC_NO, KC_NO}, \
-  {k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   KC_NO, k3C,   k3D,   KC_NO}, \
-  {k40,   k41,   k42,   KC_NO, KC_NO, k45,   KC_NO, KC_NO, KC_NO, k49,   k4A,   k4B,   k4C,   k4D,   k4E} \
-}
diff --git a/keyboards/handwired/3dp660/config.h b/keyboards/handwired/3dp660/config.h
index c2effa2e46..f804456960 100644
--- a/keyboards/handwired/3dp660/config.h
+++ b/keyboards/handwired/3dp660/config.h
@@ -20,14 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 400
 
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D2, D3, C6, C7, D5, D4, D7, B4, B5, B6, F7, F6, F5, F4, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/3dp660/info.json b/keyboards/handwired/3dp660/info.json
index bfe19819fe..c3bc103d77 100644
--- a/keyboards/handwired/3dp660/info.json
+++ b/keyboards/handwired/3dp660/info.json
@@ -8,78 +8,88 @@
         "pid": "0x3660",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "layouts": {
         "LAYOUT_66_ansi": {
-
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"BKSP", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15.5, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Del", "x":15.5, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.25},
-                {"label":"Up", "x":14.5, "y":3},
-                {"label":"CTRL", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"MO(1)", "x":11.25, "y":4},
-                {"label":"CTRL", "x":12.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13.5, "y":4},
-                {"label":"Down", "x":14.5, "y":4},
-                {"label":"Right", "x":15.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "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},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4},
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/412_64/412_64.c b/keyboards/handwired/412_64/412_64.c
deleted file mode 100644
index 4a8cc00694..0000000000
--- a/keyboards/handwired/412_64/412_64.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "412_64.h"
diff --git a/keyboards/handwired/412_64/412_64.h b/keyboards/handwired/412_64/412_64.h
deleted file mode 100644
index 9601f1257c..0000000000
--- a/keyboards/handwired/412_64/412_64.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_4x16( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77 } \
-}
diff --git a/keyboards/handwired/412_64/config.h b/keyboards/handwired/412_64/config.h
index 5037639719..7caa265c1a 100644
--- a/keyboards/handwired/412_64/config.h
+++ b/keyboards/handwired/412_64/config.h
@@ -2,23 +2,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, F4, F5, F6, F7, B1, B3, B2 }
-#define MATRIX_COL_PINS { B0, D2, D0, D1, D4, C6, D7, E6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/412_64/info.json b/keyboards/handwired/412_64/info.json
index 2e8ead2950..0468744b1b 100644
--- a/keyboards/handwired/412_64/info.json
+++ b/keyboards/handwired/412_64/info.json
@@ -8,78 +8,83 @@
         "pid": "0x0412",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "D2", "D0", "D1", "D4", "C6", "D7", "E6"],
+        "rows": ["D3", "F4", "F5", "F6", "F7", "B1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_4x16": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1},
+                {"matrix": [2, 7], "x": 14, "y": 1},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
-                {"x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [4, 5], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+                {"matrix": [5, 6], "x": 13, "y": 2},
+                {"matrix": [4, 7], "x": 14, "y": 2},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
-                {"x":15, "y":3}
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+                {"matrix": [6, 2], "x": 4, "y": 3},
+                {"matrix": [7, 2], "x": 5, "y": 3},
+                {"matrix": [6, 3], "x": 6, "y": 3},
+                {"matrix": [7, 3], "x": 7, "y": 3},
+                {"matrix": [6, 4], "x": 8, "y": 3},
+                {"matrix": [7, 4], "x": 9, "y": 3},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3},
+                {"matrix": [7, 6], "x": 13, "y": 3},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15, "y": 3}
             ]
         }
     }
diff --git a/keyboards/handwired/42/config.h b/keyboards/handwired/42/config.h
index 9341a90a76..57a8664649 100644
--- a/keyboards/handwired/42/config.h
+++ b/keyboards/handwired/42/config.h
@@ -1,22 +1,5 @@
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_COL_PINS { F5, F6, F7, F0, F1, F4, B6, B5, D7, C7, D6, B7 }
-#define MATRIX_ROW_PINS { D2, D3, D0, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json
index 16d3af1667..f887edea52 100644
--- a/keyboards/handwired/42/info.json
+++ b/keyboards/handwired/42/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "F0", "F1", "F4", "B6", "B5", "D7", "C7", "D6", "B7"],
+        "rows": ["D2", "D3", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/6key/6key.c b/keyboards/handwired/6key/6key.c
index 22c766a30f..93b9477dce 100644
--- a/keyboards/handwired/6key/6key.c
+++ b/keyboards/handwired/6key/6key.c
@@ -13,7 +13,7 @@
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
-#include "6key.h"
+#include "quantum.h"
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
     if (!dip_switch_update_user(index, active)) { return false; }
diff --git a/keyboards/handwired/6key/6key.h b/keyboards/handwired/6key/6key.h
deleted file mode 100644
index f63abc35d2..0000000000
--- a/keyboards/handwired/6key/6key.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* Copyright 2020 Bratzworth
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-      k00, k01, k02,    \
-      k03, k04, k05     \
-) \
-{ \
-    { k00, k01, k02 },  \
-    { k03, k04, k05 }   \
-}
diff --git a/keyboards/handwired/6key/config.h b/keyboards/handwired/6key/config.h
index 31b6c8888d..0ba89040c7 100644
--- a/keyboards/handwired/6key/config.h
+++ b/keyboards/handwired/6key/config.h
@@ -16,13 +16,5 @@
 
 #pragma once
 
-
-/* pin-out */
-#define MATRIX_ROW_PINS { B4, D0 }
-#define MATRIX_COL_PINS { D3, D2, D1 }
-
 /* dip switch */
 #define DIP_SWITCH_PINS { C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/6key/info.json b/keyboards/handwired/6key/info.json
index 7d7e17b64c..39c26006d6 100644
--- a/keyboards/handwired/6key/info.json
+++ b/keyboards/handwired/6key/info.json
@@ -8,13 +8,23 @@
       "pid": "0x0007",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["D3", "D2", "D1"],
+      "rows": ["B4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
       "LAYOUT": {
         "layout": [
-            {"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0},
-            {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1}
         ]
       }
     }
diff --git a/keyboards/handwired/6macro/6macro.c b/keyboards/handwired/6macro/6macro.c
deleted file mode 100644
index 0a62bedf16..0000000000
--- a/keyboards/handwired/6macro/6macro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 joaofbmaia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "6macro.h"
diff --git a/keyboards/handwired/6macro/6macro.h b/keyboards/handwired/6macro/6macro.h
deleted file mode 100644
index c1d5005128..0000000000
--- a/keyboards/handwired/6macro/6macro.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2019 joaofbmaia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-}
diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
index 0dc61becd3..abbe9f5c9d 100644
--- a/keyboards/handwired/6macro/config.h
+++ b/keyboards/handwired/6macro/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* pinout - DON'T CHANGE */
-#define MATRIX_ROW_PINS { B3, B4 }
-#define MATRIX_COL_PINS { B0, B1, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
 #define RGBLED_NUM 10
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json
index 1d1aac48ad..5bc9833fa5 100644
--- a/keyboards/handwired/6macro/info.json
+++ b/keyboards/handwired/6macro/info.json
@@ -8,11 +8,30 @@
       "pid": "0x0037",
       "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "D2"
+    },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
+    "matrix_pins": {
+      "cols": ["B0", "B1", "B2"],
+      "rows": ["B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
       "LAYOUT": {
-        "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}]
+        "layout": [
+          {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+          {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+          {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+
+          {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1},
+          {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1},
+          {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1}
+        ]
       }
     }
   }
diff --git a/keyboards/handwired/6macro/rules.mk b/keyboards/handwired/6macro/rules.mk
index 8c51d38be3..083cc21a34 100644
--- a/keyboards/handwired/6macro/rules.mk
+++ b/keyboards/handwired/6macro/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no        	# Console for debug
 COMMAND_ENABLE = no        	# Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 RGB_MATRIX_ENABLE = no     # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_DRIVER = WS2812
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 UNICODE_ENABLE = yes        # Unicode
diff --git a/keyboards/handwired/acacia/acacia.c b/keyboards/handwired/acacia/acacia.c
deleted file mode 100644
index 276b23552a..0000000000
--- a/keyboards/handwired/acacia/acacia.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Jens Peter Secher <jpsecher@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "acacia.h"
diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h
index e847297296..6291115158 100644
--- a/keyboards/handwired/aek64/config.h
+++ b/keyboards/handwired/aek64/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// Originally made for a Teensy 2++
-#define MATRIX_COL_PINS { F0, E6, E7, B0, B1, B2, B3, B4, B5, B6, D3, D0, D1, D2 }
-#define MATRIX_ROW_PINS { E0, E1, C0, C1, C2 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Enable the space-cadet options */
 #define RSPC_KEYS KC_RSFT, KC_TRNS, KC_PGUP
 #define RCPC_KEYS KC_RCTL, KC_TRNS, KC_PGDN
diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/info.json
index 471208ca41..4c71a69358 100644
--- a/keyboards/handwired/aek64/info.json
+++ b/keyboards/handwired/aek64/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6464",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "E6", "E7", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "D3", "D0", "D1", "D2"],
+    "rows": ["E0", "E1", "C0", "C1", "C2"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "levels": 5,
diff --git a/keyboards/handwired/aim65/aim65.c b/keyboards/handwired/aim65/aim65.c
deleted file mode 100644
index 6f8ea6ecda..0000000000
--- a/keyboards/handwired/aim65/aim65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Matteo Bonora
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "aim65.h"
diff --git a/keyboards/handwired/aim65/config.h b/keyboards/handwired/aim65/config.h
deleted file mode 100644
index 84e51951a9..0000000000
--- a/keyboards/handwired/aim65/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Matteo Bonora
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D4, D7, E6, B4, B5, B3, B1 }
-#define MATRIX_COL_PINS { D1, C6, B6, B2, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/info.json
index de4263d1cd..9439a11c76 100644
--- a/keyboards/handwired/aim65/info.json
+++ b/keyboards/handwired/aim65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0F34",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "C6", "B6", "B2", "F7", "F6", "F5", "F4"],
+        "rows": ["D0", "D4", "D7", "E6", "B4", "B5", "B3", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0",
         "on_state": 0
diff --git a/keyboards/handwired/alcor_dactyl/config.h b/keyboards/handwired/alcor_dactyl/config.h
index ddf705fc95..cf2dd7aa8c 100644
--- a/keyboards/handwired/alcor_dactyl/config.h
+++ b/keyboards/handwired/alcor_dactyl/config.h
@@ -25,7 +25,6 @@
 #define SERIAL_USART_FULL_DUPLEX
 #define SERIAL_USART_TX_PIN GP10
 #define SERIAL_USART_RX_PIN GP9
-#define RGB_DI_PIN GP16
 #define RGB_MATRIX_LED_COUNT 2
 #define RGB_MATRIX_SPLIT { 1, 1 }
 #define EE_HANDS
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/info.json
index 7bdde8550c..b5a872bfca 100644
--- a/keyboards/handwired/alcor_dactyl/info.json
+++ b/keyboards/handwired/alcor_dactyl/info.json
@@ -33,97 +33,101 @@
             {"x":16.5, "y":0.38}
         ]
     },
+    "ws2812": {
+        "pin": "GP16",
+        "driver": "vendor"
+    },
     "layouts": {
         "LAYOUT":{
             "layout":[
-                {"matrix":[0,0], "x":0, "y":0.375, "w":1.5},
-                {"matrix":[0,1], "x":1.5, "y":0.38},
-                {"matrix":[0,2], "x":2.5, "y":0.125},
-                {"matrix":[0,3], "x":3.5, "y":0.25},
-                {"matrix":[0,4], "x":4.5, "y":0.25},
-                {"matrix":[0,5], "x":5.5, "y":0.25},
-                {"matrix":[0,6], "x":6.5, "y":0.25},
+                {"matrix":[0,0], "x":0, "y":0.25, "w":1.5},
+                {"matrix":[0,1], "x":1.5, "y":0.25},
+                {"matrix":[0,2], "x":2.5, "y":0},
+                {"matrix":[0,3], "x":3.5, "y":0.125},
+                {"matrix":[0,4], "x":4.5, "y":0.125},
+                {"matrix":[0,5], "x":5.5, "y":0.125},
+                {"matrix":[0,6], "x":6.5, "y":0.125},
 
-                {"matrix":[6,6], "x":10.5, "y":0.25},
-                {"matrix":[6,5], "x":11.5, "y":0.25},
-                {"matrix":[6,4], "x":12.5, "y":0.25},
-                {"matrix":[6,3], "x":13.5, "y":0.25},
-                {"matrix":[6,2], "x":14.5, "y":0.13},
-                {"matrix":[6,1], "x":15.5, "y":0.38},
-                {"matrix":[6,0], "x":16.5, "y":0.38, "w":1.5},
+                {"matrix":[6,6], "x":10.5, "y":0.125},
+                {"matrix":[6,5], "x":11.5, "y":0.125},
+                {"matrix":[6,4], "x":12.5, "y":0.125},
+                {"matrix":[6,3], "x":13.5, "y":0.125},
+                {"matrix":[6,2], "x":14.5, "y":0},
+                {"matrix":[6,1], "x":15.5, "y":0.25},
+                {"matrix":[6,0], "x":16.5, "y":0.25, "w":1.5},
 
-                {"matrix":[1,0], "x":0, "y":1.375, "w":1.5},
-                {"matrix":[1,1], "x":1.5, "y":1.375},
-                {"matrix":[1,2], "x":2.5, "y":1.125},
-                {"matrix":[1,3], "x":3.5, "y":1.25},
-                {"matrix":[1,4], "x":4.5, "y":1.25},
-                {"matrix":[1,5], "x":5.5, "y":1.25},
-                {"matrix":[1,6], "x":6.5, "y":1.25},
+                {"matrix":[1,0], "x":0, "y":1.25, "w":1.5},
+                {"matrix":[1,1], "x":1.5, "y":1.25},
+                {"matrix":[1,2], "x":2.5, "y":1},
+                {"matrix":[1,3], "x":3.5, "y":1.125},
+                {"matrix":[1,4], "x":4.5, "y":1.125},
+                {"matrix":[1,5], "x":5.5, "y":1.125},
+                {"matrix":[1,6], "x":6.5, "y":1.125},
 
-                {"matrix":[7,6], "x":10.5, "y":1.25},
-                {"matrix":[7,5], "x":11.5, "y":1.25},
-                {"matrix":[7,4], "x":12.5, "y":1.25},
-                {"matrix":[7,3], "x":13.5, "y":1.25},
-                {"matrix":[7,2], "x":14.5, "y":1.13},
-                {"matrix":[7,1], "x":15.5, "y":1.38},
-                {"matrix":[7,0], "x":16.5, "y":1.38, "w":1.5},
+                {"matrix":[7,6], "x":10.5, "y":1.125},
+                {"matrix":[7,5], "x":11.5, "y":1.125},
+                {"matrix":[7,4], "x":12.5, "y":1.125},
+                {"matrix":[7,3], "x":13.5, "y":1.125},
+                {"matrix":[7,2], "x":14.5, "y":1},
+                {"matrix":[7,1], "x":15.5, "y":1.25},
+                {"matrix":[7,0], "x":16.5, "y":1.25, "w":1.5},
 
-                {"matrix":[2,0], "x":0, "y":2.375, "w":1.5},
-                {"matrix":[2,1], "x":1.5, "y":2.375},
-                {"matrix":[2,2], "x":2.5, "y":2.125},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
+                {"matrix":[2,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},
+                {"matrix":[2,3], "x":3.5, "y":2.125},
+                {"matrix":[2,4], "x":4.5, "y":2.125},
+                {"matrix":[2,5], "x":5.5, "y":2.125},
+                {"matrix":[2,6], "x":6.5, "y":2.125},
 
-                {"matrix":[8,6], "x":10.5, "y":2.25},
-                {"matrix":[8,5], "x":11.5, "y":2.25},
-                {"matrix":[8,4], "x":12.5, "y":2.25},
-                {"matrix":[8,3], "x":13.5, "y":2.25},
-                {"matrix":[8,2], "x":14.5, "y":2.13},
-                {"matrix":[8,1], "x":15.5, "y":2.38},
-                {"matrix":[8,0], "x":16.5, "y":2.38, "w":1.5},
+                {"matrix":[8,6], "x":10.5, "y":2.125},
+                {"matrix":[8,5], "x":11.5, "y":2.125},
+                {"matrix":[8,4], "x":12.5, "y":2.125},
+                {"matrix":[8,3], "x":13.5, "y":2.125},
+                {"matrix":[8,2], "x":14.5, "y":2},
+                {"matrix":[8,1], "x":15.5, "y":2.25},
+                {"matrix":[8,0], "x":16.5, "y":2.25, "w":1.5},
 
-                {"matrix":[3,0], "x":0, "y":3.375, "w":1.5},
-                {"matrix":[3,1], "x":1.5, "y":3.375},
-                {"matrix":[3,2], "x":2.5, "y":3.125},
-                {"matrix":[3,3], "x":3.5, "y":3.25},
-                {"matrix":[3,4], "x":4.5, "y":3.25},
-                {"matrix":[3,5], "x":5.5, "y":3.25},
+                {"matrix":[3,0], "x":0, "y":3.25, "w":1.5},
+                {"matrix":[3,1], "x":1.5, "y":3.25},
+                {"matrix":[3,2], "x":2.5, "y":3},
+                {"matrix":[3,3], "x":3.5, "y":3.125},
+                {"matrix":[3,4], "x":4.5, "y":3.125},
+                {"matrix":[3,5], "x":5.5, "y":3.125},
 
-                {"matrix":[9,5], "x":11.5, "y":3.25},
-                {"matrix":[9,4], "x":12.5, "y":3.25},
-                {"matrix":[9,3], "x":13.5, "y":3.25},
-                {"matrix":[9,2], "x":14.5, "y":3.13},
-                {"matrix":[9,1], "x":15.5, "y":3.38},
-                {"matrix":[9,0], "x":16.5, "y":3.38, "w":1.5},
+                {"matrix":[9,5], "x":11.5, "y":3.125},
+                {"matrix":[9,4], "x":12.5, "y":3.125},
+                {"matrix":[9,3], "x":13.5, "y":3.125},
+                {"matrix":[9,2], "x":14.5, "y":3},
+                {"matrix":[9,1], "x":15.5, "y":3.25},
+                {"matrix":[9,0], "x":16.5, "y":3.25, "w":1.5},
 
-                {"matrix":[4,0], "x":0.5, "y":4.375},
-                {"matrix":[4,1], "x":1.5, "y":4.375},
-                {"matrix":[4,2], "x":2.5, "y":4.125},
-                {"matrix":[4,3], "x":3.5, "y":4.25},
+                {"matrix":[4,0], "x":0.5, "y":4.25},
+                {"matrix":[4,1], "x":1.5, "y":4.25},
+                {"matrix":[4,2], "x":2.5, "y":4},
+                {"matrix":[4,3], "x":3.5, "y":4.125},
 
-                {"matrix":[10,3], "x":13.5, "y":4.25},
-                {"matrix":[10,2], "x":14.5, "y":4.13},
-                {"matrix":[10,1], "x":15.5, "y":4.38},
-                {"matrix":[10,0], "x":16.5, "y":4.38},
+                {"matrix":[10,3], "x":13.5, "y":4.125},
+                {"matrix":[10,2], "x":14.5, "y":4},
+                {"matrix":[10,1], "x":15.5, "y":4.25},
+                {"matrix":[10,0], "x":16.5, "y":4.25},
 
-                {"matrix":[4,4], "x":5, "y":4.5, "h":2},
-                {"matrix":[4,5], "x":6.25, "y":4.5, "h":1.5},
-                {"matrix":[10,5], "x":10.75, "y":4.5, "h":1.5},
-                {"matrix":[10,4], "x":12, "y":4.5, "h":2},
+                {"matrix":[4,4], "x":5, "y":4.375, "h":2},
+                {"matrix":[4,5], "x":6.25, "y":4.375, "h":1.5},
+                {"matrix":[10,5], "x":10.75, "y":4.375, "h":1.5},
+                {"matrix":[10,4], "x":12, "y":4.375, "h":2},
 
-                {"matrix":[5,4], "x":6.25, "y":6.25},
-                {"matrix":[5,5], "x":7.5, "y":6.25},
+                {"matrix":[5,4], "x":6.25, "y":6.125},
+                {"matrix":[5,5], "x":7.5, "y":6.125},
 
-                {"matrix":[11,5], "x":9.5, "y":6.25},
-                {"matrix":[11,4], "x":10.75, "y":6.25},
+                {"matrix":[11,5], "x":9.5, "y":6.125},
+                {"matrix":[11,4], "x":10.75, "y":6.125},
 
-                {"matrix":[5,2], "x":6.25, "y":7.25},
-                {"matrix":[5,3], "x":7.25, "y":7.25},
+                {"matrix":[5,2], "x":6.25, "y":7.125},
+                {"matrix":[5,3], "x":7.25, "y":7.125},
 
-                {"matrix":[11,3], "x":9.75, "y":7.25},
-                {"matrix":[11,2], "x":10.75, "y":7.25}
+                {"matrix":[11,3], "x":9.75, "y":7.125},
+                {"matrix":[11,2], "x":10.75, "y":7.125}
             ]
         }
     }
diff --git a/keyboards/handwired/alcor_dactyl/rules.mk b/keyboards/handwired/alcor_dactyl/rules.mk
index 8fb51ec82d..161ec22b16 100644
--- a/keyboards/handwired/alcor_dactyl/rules.mk
+++ b/keyboards/handwired/alcor_dactyl/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/handwired/amigopunk/amigopunk.c b/keyboards/handwired/amigopunk/amigopunk.c
deleted file mode 100644
index dbb70415ac..0000000000
--- a/keyboards/handwired/amigopunk/amigopunk.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2021 Christiano Haesbaert <haesbaert@haesbaert.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "amigopunk.h"
diff --git a/keyboards/handwired/amigopunk/config.h b/keyboards/handwired/amigopunk/config.h
index 2cbbb3152a..bcdca4920c 100644
--- a/keyboards/handwired/amigopunk/config.h
+++ b/keyboards/handwired/amigopunk/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { C0, C1, C2, C3, C4, C5 }
-#define MATRIX_COL_PINS { B6, B5, B4, B3, B2, B1, B0, E7, E6, F0, F1, F2, F3, F4, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/amigopunk/info.json b/keyboards/handwired/amigopunk/info.json
index e79911a676..c3d96e0771 100644
--- a/keyboards/handwired/amigopunk/info.json
+++ b/keyboards/handwired/amigopunk/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1805",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"],
+        "rows": ["C0", "C1", "C2", "C3", "C4", "C5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "E0", "pin_b": "E1"}
@@ -18,86 +23,92 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (C0,B6)", "x":0, "y":0.25},
-                {"label":"K01 (C0,B5)", "x":1, "y":0.25},
-                {"label":"K02 (C0,B4)", "x":2, "y":0.25},
-                {"label":"K03 (C0,B3)", "x":3, "y":0.25},
-                {"label":"K04 (C0,B2)", "x":4, "y":0.25},
-                {"label":"K05 (C0,B1)", "x":5, "y":0.25},
-                {"label":"K06 (C0,B0)", "x":6, "y":0.25},
-                {"label":"K07 (C0,E7)", "x":7, "y":0.25},
-                {"label":"K08 (C0,E6)", "x":8, "y":0.25},
-                {"label":"K09 (C0,F0)", "x":9, "y":0.25},
-                {"label":"K0A (C0,F1)", "x":10, "y":0.25},
-                {"label":"K0B (C0,F2)", "x":11, "y":0.25},
-                {"label":"K0C (C0,F3)", "x":12, "y":0.25},
-                {"label":"K0D (C0,F4)", "x":13, "y":0.25},
-                {"label":"K0E (C0,F5)", "x":14, "y":0.25},
-                {"label":"K0G (C0,F7)", "x":16, "y":0.25},
-                {"label":"K10 (C1,B6)", "x":0, "y":1.25},
-                {"label":"K11 (C1,B5)", "x":1, "y":1.25},
-                {"label":"K12 (C1,B4)", "x":2, "y":1.25},
-                {"label":"K13 (C1,B3)", "x":3, "y":1.25},
-                {"label":"K14 (C1,B2)", "x":4, "y":1.25},
-                {"label":"K15 (C1,B1)", "x":5, "y":1.25},
-                {"label":"K16 (C1,B0)", "x":6, "y":1.25},
-                {"label":"K17 (C1,E7)", "x":7, "y":1.25},
-                {"label":"K18 (C1,E6)", "x":8, "y":1.25},
-                {"label":"K19 (C1,F0)", "x":9, "y":1.25},
-                {"label":"K1A (C1,F1)", "x":10, "y":1.25},
-                {"label":"K1B (C1,F2)", "x":11, "y":1.25},
-                {"label":"K1C (C1,F3)", "x":12, "y":1.25},
-                {"label":"K1E (C1,F5)", "x":13, "y":1.25, "w":2},
-                {"label":"K1F (C1,F6)", "x":15, "y":1.25},
-                {"label":"K20 (C2,B6)", "x":0, "y":2.25, "w":1.5},
-                {"label":"K22 (C2,B4)", "x":1.5, "y":2.25},
-                {"label":"K23 (C2,B3)", "x":2.5, "y":2.25},
-                {"label":"K24 (C2,B2)", "x":3.5, "y":2.25},
-                {"label":"K25 (C2,B1)", "x":4.5, "y":2.25},
-                {"label":"K26 (C2,B0)", "x":5.5, "y":2.25},
-                {"label":"K27 (C2,E7)", "x":6.5, "y":2.25},
-                {"label":"K28 (C2,E6)", "x":7.5, "y":2.25},
-                {"label":"K29 (C2,F0)", "x":8.5, "y":2.25},
-                {"label":"K2A (C2,F1)", "x":9.5, "y":2.25},
-                {"label":"K2B (C2,F2)", "x":10.5, "y":2.25},
-                {"label":"K2C (C2,F3)", "x":11.5, "y":2.25},
-                {"label":"K2D (C2,F4)", "x":12.5, "y":2.25},
-                {"label":"K2E (C2,F5)", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2F (C2,F6)", "x":15, "y":2.25},
-                {"label":"K30 (C3,B6)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K32 (C3,B4)", "x":1.75, "y":3.25},
-                {"label":"K33 (C3,B3)", "x":2.75, "y":3.25},
-                {"label":"K34 (C3,B2)", "x":3.75, "y":3.25},
-                {"label":"K35 (C3,B1)", "x":4.75, "y":3.25},
-                {"label":"K36 (C3,B0)", "x":5.75, "y":3.25},
-                {"label":"K37 (C3,E7)", "x":6.75, "y":3.25},
-                {"label":"K38 (C3,E6)", "x":7.75, "y":3.25},
-                {"label":"K39 (C3,F0)", "x":8.75, "y":3.25},
-                {"label":"K3A (C3,F1)", "x":9.75, "y":3.25},
-                {"label":"K3B (C3,F2)", "x":10.75, "y":3.25},
-                {"label":"K3C (C3,F3)", "x":11.75, "y":3.25},
-                {"label":"K3D (C3,F4)", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"K41 (C4,B5)", "x":0, "y":4.25, "w":2.25},
-                {"label":"K42 (C4,B4)", "x":2.25, "y":4.25},
-                {"label":"K43 (C4,B3)", "x":3.25, "y":4.25},
-                {"label":"K44 (C4,B2)", "x":4.25, "y":4.25},
-                {"label":"K45 (C4,B1)", "x":5.25, "y":4.25},
-                {"label":"K46 (C4,B0)", "x":6.25, "y":4.25},
-                {"label":"K47 (C4,E7)", "x":7.25, "y":4.25},
-                {"label":"K48 (C4,E6)", "x":8.25, "y":4.25},
-                {"label":"K49 (C4,F0)", "x":9.25, "y":4.25},
-                {"label":"K4A (C4,F1)", "x":10.25, "y":4.25},
-                {"label":"K4B (C4,F2)", "x":11.25, "y":4.25},
-                {"label":"K4D (C4,F4)", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"K4F (C4,F6)", "x":15, "y":4.25},
-                {"label":"K51 (C5,B5)", "x":1, "y":5.25, "w":1.5},
-                {"label":"K53 (C5,B3)", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"K57 (C5,E7)", "x":4, "y":5.25, "w":7},
-                {"label":"K5B (C5,F2)", "x":11, "y":5.25, "w":1.5},
-                {"label":"K5D (C5,F4)", "x":12.5, "y":5.25, "w":1.5},
-                {"label":"K5E (C5,F5)", "x":14, "y":5.25},
-                {"label":"K5F (C5,F6)", "x":15, "y":5.25},
-                {"label":"K5G (C5,F7)", "x":16, "y":5.25}
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":16, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":6, "y":1},
+                {"x":7, "y":1},
+                {"x":8, "y":1},
+                {"x":9, "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+                {"x":13, "y":1, "w":2},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.5},
+                {"x":1.5, "y":2},
+                {"x":2.5, "y":2},
+                {"x":3.5, "y":2},
+                {"x":4.5, "y":2},
+                {"x":5.5, "y":2},
+                {"x":6.5, "y":2},
+                {"x":7.5, "y":2},
+                {"x":8.5, "y":2},
+                {"x":9.5, "y":2},
+                {"x":10.5, "y":2},
+                {"x":11.5, "y":2},
+                {"x":12.5, "y":2},
+                {"x":13.5, "y":2, "w":1.5},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":1.75},
+                {"x":1.75, "y":3},
+                {"x":2.75, "y":3},
+                {"x":3.75, "y":3},
+                {"x":4.75, "y":3},
+                {"x":5.75, "y":3},
+                {"x":6.75, "y":3},
+                {"x":7.75, "y":3},
+                {"x":8.75, "y":3},
+                {"x":9.75, "y":3},
+                {"x":10.75, "y":3},
+                {"x":11.75, "y":3},
+                {"x":12.75, "y":3, "w":2.25},
+
+                {"x":0, "y":4, "w":2.25},
+                {"x":2.25, "y":4},
+                {"x":3.25, "y":4},
+                {"x":4.25, "y":4},
+                {"x":5.25, "y":4},
+                {"x":6.25, "y":4},
+                {"x":7.25, "y":4},
+                {"x":8.25, "y":4},
+                {"x":9.25, "y":4},
+                {"x":10.25, "y":4},
+                {"x":11.25, "y":4},
+                {"x":12.25, "y":4, "w":2.75},
+                {"x":15, "y":4},
+
+                {"x":1, "y":5, "w":1.5},
+                {"x":2.5, "y":5, "w":1.5},
+                {"x":4, "y":5, "w":7},
+                {"x":11, "y":5, "w":1.5},
+                {"x":12.5, "y":5, "w":1.5},
+                {"x":14, "y":5},
+                {"x":15, "y":5},
+                {"x":16, "y":5}
             ]
         }
     }
diff --git a/keyboards/handwired/angel/config.h b/keyboards/handwired/angel/config.h
index a138c0c2d1..3439d8c8c1 100644
--- a/keyboards/handwired/angel/config.h
+++ b/keyboards/handwired/angel/config.h
@@ -17,20 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- */
-#define MATRIX_ROW_PINS { B6, B2, B5, B4 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B3, B1, F7, F6, F5 }
-#define DIODE_DIRECTION COL2ROW
-
 // https://docs.qmk.fm/using-qmk/software-features/tap_hold
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 #define MATRIX_HAS_GHOST
diff --git a/keyboards/handwired/angel/info.json b/keyboards/handwired/angel/info.json
index 004d30d93a..3bf7d83178 100644
--- a/keyboards/handwired/angel/info.json
+++ b/keyboards/handwired/angel/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0805",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B3", "B1", "F7", "F6", "F5"],
+        "rows": ["B6", "B2", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/aplx2/aplx2.c b/keyboards/handwired/aplx2/aplx2.c
deleted file mode 100644
index e3dd174542..0000000000
--- a/keyboards/handwired/aplx2/aplx2.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 April Aplyard <alex.fragiou@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "aplx2.h"
-
diff --git a/keyboards/handwired/aplx2/aplx2.h b/keyboards/handwired/aplx2/aplx2.h
deleted file mode 100644
index a47b064b96..0000000000
--- a/keyboards/handwired/aplx2/aplx2.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2020 April Aplyard <alex.fragiou@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-  K00, K01  \
-) { \
-  { K00 , K01 } \
-}
diff --git a/keyboards/handwired/aplx2/config.h b/keyboards/handwired/aplx2/config.h
deleted file mode 100644
index c140e5bced..0000000000
--- a/keyboards/handwired/aplx2/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 April Aplyard <alex.fragiou@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* pin-out */
-#define MATRIX_ROW_PINS { D1 }
-#define MATRIX_COL_PINS { B5, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
diff --git a/keyboards/handwired/aplx2/info.json b/keyboards/handwired/aplx2/info.json
index dc1dd86e63..d3f7962fe7 100644
--- a/keyboards/handwired/aplx2/info.json
+++ b/keyboards/handwired/aplx2/info.json
@@ -8,13 +8,18 @@
         "pid": "0x0030",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "D3"],
+        "rows": ["D1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0}
             ]
         }
     }
diff --git a/keyboards/handwired/aranck/aranck.c b/keyboards/handwired/aranck/aranck.c
deleted file mode 100644
index 62e36bdb46..0000000000
--- a/keyboards/handwired/aranck/aranck.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Arda Kilicdagi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "aranck.h"
diff --git a/keyboards/handwired/aranck/config.h b/keyboards/handwired/aranck/config.h
index 024ad37c13..6f44c0cbba 100644
--- a/keyboards/handwired/aranck/config.h
+++ b/keyboards/handwired/aranck/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { D3, D2, D1, D0 }
-#define MATRIX_COL_PINS \
-    { C6, D7, E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/aranck/info.json b/keyboards/handwired/aranck/info.json
index dd48558b14..7d2ea6124b 100644
--- a/keyboards/handwired/aranck/info.json
+++ b/keyboards/handwired/aranck/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+    "rows": ["D3", "D2", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["planck_mit"],
diff --git a/keyboards/handwired/aranck/keymaps/turkishish/config.h b/keyboards/handwired/aranck/keymaps/turkishish/config.h
index 69c1beb03c..53cf5bbc0f 100644
--- a/keyboards/handwired/aranck/keymaps/turkishish/config.h
+++ b/keyboards/handwired/aranck/keymaps/turkishish/config.h
@@ -20,5 +20,4 @@
 
 #define RETRO_TAPPING
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
-#define QUICK_TAP_TERM 0
\ No newline at end of file
+#define QUICK_TAP_TERM 0
diff --git a/keyboards/handwired/arrow_pad/arrow_pad.c b/keyboards/handwired/arrow_pad/arrow_pad.c
deleted file mode 100644
index 381934aa88..0000000000
--- a/keyboards/handwired/arrow_pad/arrow_pad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "arrow_pad.h"
\ No newline at end of file
diff --git a/keyboards/handwired/arrow_pad/arrow_pad.h b/keyboards/handwired/arrow_pad/arrow_pad.h
deleted file mode 100644
index 2d677beb5c..0000000000
--- a/keyboards/handwired/arrow_pad/arrow_pad.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#include "matrix.h"
-#include "keymap.h"
-#ifdef BACKLIGHT_ENABLE
-	#include "backlight.h"
-#endif
-#include <avr/io.h>
-#include <stddef.h>
-
-#define XXX KC_NO
-
-// This is the 21-key keypad to 4x6 element matrix mapping
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-    k50, k51, k52, k53 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 }, \
-    { k50, k51, k52, k53 } \
-}
-
-// This is the 21-key keypad to 2x11 element matrix mapping
-#define LAYOUT_pad21( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k04, k05, k06, \
-    k14, k15, k16, k07, \
-    k08, k09, k0A, \
-    k19,      k1A, k17 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19, k1A } \
-}
diff --git a/keyboards/handwired/arrow_pad/config.h b/keyboards/handwired/arrow_pad/config.h
index 6861311460..2ed5b28c87 100644
--- a/keyboards/handwired/arrow_pad/config.h
+++ b/keyboards/handwired/arrow_pad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 #define FORCE_NKRO
 
 /*
diff --git a/keyboards/handwired/arrow_pad/info.json b/keyboards/handwired/arrow_pad/info.json
index 8451637df5..b9d705f3bf 100644
--- a/keyboards/handwired/arrow_pad/info.json
+++ b/keyboards/handwired/arrow_pad/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4096",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3"],
+    "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+  },
+  "diode_direction": "ROW2COL",
   "backlight": {
     "pin": "B7"
   },
@@ -16,55 +21,35 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"KM_ESC", "x":0, "y":0},
-        {"label":"KM_TAB", "x":1, "y":0},
-        {"label":"KM_BSL", "x":2, "y":0},
-        {"label":"KM_ARR", "x":3, "y":0},
-        {"label":"KM_NUM", "x":0, "y":1},
-        {"label":"KM_FSL", "x":1, "y":1},
-        {"label":"KM_AST", "x":2, "y":1},
-        {"label":"KM_MIN", "x":3, "y":1},
-        {"label":"KM___7", "x":0, "y":2},
-        {"label":"KM___8", "x":1, "y":2},
-        {"label":"KM___9", "x":2, "y":2},
-        {"label":"KM_EQU", "x":3, "y":2},
-        {"label":"KM___4", "x":0, "y":3},
-        {"label":"KM___5", "x":1, "y":3},
-        {"label":"KM___6", "x":2, "y":3},
-        {"label":"KM_PLS", "x":3, "y":3},
-        {"label":"KM___1", "x":0, "y":4},
-        {"label":"KM___2", "x":1, "y":4},
-        {"label":"KM___3", "x":2, "y":4},
-        {"label":"___ENT", "x":3, "y":4},
-        {"label":"KM___0", "x":0, "y":5},
-        {"label":"_____0", "x":1, "y":5},
-        {"label":"KM_DOT", "x":2, "y":5},
-        {"label":"KM_ENT", "x":3, "y":5}
-      ]
-    },
-    "LAYOUT_pad21": {
-      "layout": [
-        {"label":"KM_ESC", "x":0, "y":0},
-        {"label":"KM_TAB", "x":1, "y":0},
-        {"label":"KM_BSL", "x":2, "y":0},
-        {"label":"KM_ARR", "x":3, "y":0},
-        {"label":"KM_NUM", "x":0, "y":1},
-        {"label":"KM_FSL", "x":1, "y":1},
-        {"label":"KM_AST", "x":2, "y":1},
-        {"label":"KM_MIN", "x":3, "y":1},
-        {"label":"KM___7", "x":0, "y":2},
-        {"label":"KM___8", "x":1, "y":2},
-        {"label":"KM___9", "x":2, "y":2},
-        {"label":"KM___4", "x":0, "y":3},
-        {"label":"KM___5", "x":1, "y":3},
-        {"label":"KM___6", "x":2, "y":3},
-        {"label":"KM_PLS", "x":3, "y":2, "h":2},
-        {"label":"KM___1", "x":0, "y":4},
-        {"label":"KM___2", "x":1, "y":4},
-        {"label":"KM___3", "x":2, "y":4},
-        {"label":"KM___0", "x":0, "y":5, "w":2},
-        {"label":"KM_DOT", "x":2, "y":5},
-        {"label":"KM_ENT", "x":3, "y":4, "h":2}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+
+        {"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}
       ]
     }
   }
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
index bc940420fe..cf291c00cf 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
@@ -2,6 +2,19 @@
 #include QMK_KEYBOARD_H
 #include "led.h"
 
+// This is the 21-key keypad to 2x11 element matrix mapping
+#define LAYOUT_pad21( \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13, \
+    k04, k05, k06, \
+    k14, k15, k16, k07, \
+    k08, k09, k0A, \
+    k19,      k1A, k17 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19, k1A } \
+}
+
 enum layers {
   LAYER_BASE,
   LAYER_EDIT,
diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h
index 69a24d9038..89532fd32b 100644
--- a/keyboards/handwired/atreus50/config.h
+++ b/keyboards/handwired/atreus50/config.h
@@ -17,21 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { D4, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN C6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json
index 2ef04b31f4..70cb5aa1f2 100644
--- a/keyboards/handwired/atreus50/info.json
+++ b/keyboards/handwired/atreus50/info.json
@@ -8,6 +8,14 @@
     "pid": "0x040D",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "C6"
+  },
+  "matrix_pins": {
+    "cols": ["D4", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+    "rows": ["D3", "D2", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/handwired/axon/axon.c b/keyboards/handwired/axon/axon.c
deleted file mode 100644
index e5d7122138..0000000000
--- a/keyboards/handwired/axon/axon.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Robin Liu
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "axon.h"
diff --git a/keyboards/handwired/axon/axon.h b/keyboards/handwired/axon/axon.h
deleted file mode 100644
index 0d3a5c90b7..0000000000
--- a/keyboards/handwired/axon/axon.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright 2021 Robin Liu
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/*
-* Default layout:
-* 2.75u - 2.25u spacebar
-*/
-#define LAYOUT_default( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	      K301, K302,       K304,       K306,       K308, K309              \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210 }, \
-	{ KC_NO, K301,  K302,  KC_NO, K304,  KC_NO, K306,  KC_NO, K308,  K309,  K310 }  \
-}
-
-/*
-* Spaceswap layout:
-* Electrically identical to default
-* 2.25u - 2.75u spacebar
-*/
-#define LAYOUT_spaceswap( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	      K301, K302,       K304,       K306,       K308, K309              \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210 }, \
-	{ KC_NO, K301,  K302,  KC_NO, K304,  KC_NO, K306,  KC_NO, K308,  K309,  K310 }  \
-}
-
-/*
-* 6.25u spacebar layout:
-* 6.25u spacebar
-*/
-#define LAYOUT_space6p25u( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	      K301, K302,                   K306,             K309              \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210 }, \
-	{ KC_NO, K301,  K302,  KC_NO, KC_NO, KC_NO, K306,  KC_NO, KC_NO, K309,  K310 }  \
-}
-
-/*
-* 7u spacebar layout:
-* 7u spacebar
-*/
-#define LAYOUT_space7u( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
-	      K301,             K304,                         K309              \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210 }, \
-	{ KC_NO, K301,  KC_NO, KC_NO, K304,  KC_NO, KC_NO, KC_NO, KC_NO, K309,  K310 }  \
-}
diff --git a/keyboards/handwired/axon/config.h b/keyboards/handwired/axon/config.h
index a4b2c64c66..dcf26800ca 100644
--- a/keyboards/handwired/axon/config.h
+++ b/keyboards/handwired/axon/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D5, D6, D4, D0 }
-#define MATRIX_COL_PINS { B0, D7, B1, B2, C0, C1, C2, C3, C4, C5, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/axon/info.json b/keyboards/handwired/axon/info.json
index 0bf0deaaf3..0d12e92dbe 100644
--- a/keyboards/handwired/axon/info.json
+++ b/keyboards/handwired/axon/info.json
@@ -8,190 +8,195 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "D7", "B1", "B2", "C0", "C1", "C2", "C3", "C4", "C5", "D1"],
+        "rows": ["D5", "D6", "D4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [3, 10], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.25},
-                {"x": 1.25, "y": 1},
-                {"x": 2.25, "y": 1},
-                {"x": 3.25, "y": 1},
-                {"x": 4.25, "y": 1},
-                {"x": 5.25, "y": 1},
-                {"x": 6.25, "y": 1},
-                {"x": 7.25, "y": 1},
-                {"x": 8.25, "y": 1},
-                {"x": 9.25, "y": 1},
-                {"x": 10.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
 
-                {"x": 1.25, "y": 3, "w": 1.25},
-                {"x": 2.5, "y": 3, "w": 1.25},
-                {"x": 3.75, "y": 3, "w": 2.75},
-                {"x": 6.5, "y": 3, "w": 2.25},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3}
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3}
             ]
         },
         "LAYOUT_spaceswap": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [3, 10], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.25},
-                {"x": 1.25, "y": 1},
-                {"x": 2.25, "y": 1},
-                {"x": 3.25, "y": 1},
-                {"x": 4.25, "y": 1},
-                {"x": 5.25, "y": 1},
-                {"x": 6.25, "y": 1},
-                {"x": 7.25, "y": 1},
-                {"x": 8.25, "y": 1},
-                {"x": 9.25, "y": 1},
-                {"x": 10.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
 
-                {"x": 1.25, "y": 3, "w": 1.25},
-                {"x": 2.5, "y": 3, "w": 1.25},
-                {"x": 3.75, "y": 3, "w": 2.25},
-                {"x": 6, "y": 3, "w": 2.75},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3}
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3}
             ]
         },
         "LAYOUT_space6p25u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [3, 10], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.25},
-                {"x": 1.25, "y": 1},
-                {"x": 2.25, "y": 1},
-                {"x": 3.25, "y": 1},
-                {"x": 4.25, "y": 1},
-                {"x": 5.25, "y": 1},
-                {"x": 6.25, "y": 1},
-                {"x": 7.25, "y": 1},
-                {"x": 8.25, "y": 1},
-                {"x": 9.25, "y": 1},
-                {"x": 10.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
 
-                {"x": 1.25, "y": 3, "w": 1.25},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3, "w": 6.25},
-                {"x": 9.75, "y": 3}
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3}
             ]
         },
         "LAYOUT_space7u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [3, 10], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.25},
-                {"x": 1.25, "y": 1},
-                {"x": 2.25, "y": 1},
-                {"x": 3.25, "y": 1},
-                {"x": 4.25, "y": 1},
-                {"x": 5.25, "y": 1},
-                {"x": 6.25, "y": 1},
-                {"x": 7.25, "y": 1},
-                {"x": 8.25, "y": 1},
-                {"x": 9.25, "y": 1},
-                {"x": 10.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
 
-                {"x": 1.25, "y": 3, "w": 1.25},
-                {"x": 2.5, "y": 3, "w": 7},
-                {"x": 9.5, "y": 3, "w": 1.25}
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 7},
+                {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/handwired/baredev/rev1/rev1.c b/keyboards/handwired/baredev/rev1/rev1.c
deleted file mode 100644
index 809138c9b2..0000000000
--- a/keyboards/handwired/baredev/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Fernando "ManoShu" Rodrigues
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h
index e28cd08a2a..f2eee84a57 100644
--- a/keyboards/handwired/battleship_gamepad/config.h
+++ b/keyboards/handwired/battleship_gamepad/config.h
@@ -16,19 +16,11 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
-
 /* joystick configuration */
 #define JOYSTICK_BUTTON_COUNT 25
 #define JOYSTICK_AXIS_COUNT 2
 #define JOYSTICK_AXIS_RESOLUTION 10
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/info.json
index d4705a5c5f..06ef96ba21 100644
--- a/keyboards/handwired/battleship_gamepad/info.json
+++ b/keyboards/handwired/battleship_gamepad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B6", "B2", "B3", "B1", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h
index 62c3144cc5..2743c75877 100644
--- a/keyboards/handwired/bento/rev1/config.h
+++ b/keyboards/handwired/bento/rev1/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 4
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -34,7 +32,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
index 5f7e673306..778a9a0412 100644
--- a/keyboards/handwired/bento/rev1/info.json
+++ b/keyboards/handwired/bento/rev1/info.json
@@ -8,6 +8,9 @@
     "pid": "0xDAD3",
     "device_version": "1.0.0"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "encoder": {
     "rotary": [
       {"pin_a": "D1", "pin_b": "D0"}
diff --git a/keyboards/handwired/bigmac/bigmac.c b/keyboards/handwired/bigmac/bigmac.c
deleted file mode 100644
index ef2867377d..0000000000
--- a/keyboards/handwired/bigmac/bigmac.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Taylore101
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bigmac.h"
diff --git a/keyboards/handwired/bigmac/config.h b/keyboards/handwired/bigmac/config.h
deleted file mode 100644
index f33849faf7..0000000000
--- a/keyboards/handwired/bigmac/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 Taylore101
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D3, D2, D1, D0, D4, C6, D7, E6, B4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/bigmac/info.json b/keyboards/handwired/bigmac/info.json
index 853bd946ad..13c523245c 100644
--- a/keyboards/handwired/bigmac/info.json
+++ b/keyboards/handwired/bigmac/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1010",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F0", "F1", "C7", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/bolek/bolek.c b/keyboards/handwired/bolek/bolek.c
deleted file mode 100644
index 413f7166c6..0000000000
--- a/keyboards/handwired/bolek/bolek.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Mikołaj Biel
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bolek.h"
diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h
index ec81b3337a..72c76ac580 100644
--- a/keyboards/handwired/bolek/config.h
+++ b/keyboards/handwired/bolek/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6, B5, D3, D2, D1, B4 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, E6, D7, C6, D0, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -56,4 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/handwired/bolek/info.json b/keyboards/handwired/bolek/info.json
index 410ed8b933..e72d4f45fb 100644
--- a/keyboards/handwired/bolek/info.json
+++ b/keyboards/handwired/bolek/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3708",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "E6", "D7", "C6", "D0", "D4"],
+        "rows": ["F4", "F5", "F6", "B5", "D3", "D2", "D1", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/boss566y/redragon_vara/config.h b/keyboards/handwired/boss566y/redragon_vara/config.h
deleted file mode 100644
index d7e3fbe200..0000000000
--- a/keyboards/handwired/boss566y/redragon_vara/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 boss566y
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D1, D2, D3, C6, D5, C7, D4, D7, B4, B5, B6 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/boss566y/redragon_vara/info.json b/keyboards/handwired/boss566y/redragon_vara/info.json
index 697cfac226..a4d0b11b58 100644
--- a/keyboards/handwired/boss566y/redragon_vara/info.json
+++ b/keyboards/handwired/boss566y/redragon_vara/info.json
@@ -8,116 +8,139 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3", "C6", "D5", "C7", "D4", "D7", "B4", "B5", "B6"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "community_layouts": ["fullsize_ansi"],
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"label":"K00 (B0,D1)", "x":0, "y":0},
-                {"label":"K02 (B0,D3)", "x":2, "y":0},
-                {"label":"K03 (B0,C6)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,C7)", "x":5, "y":0},
-                {"label":"K07 (B0,D7)", "x":6.5, "y":0},
-                {"label":"K08 (B0,B4)", "x":7.5, "y":0},
-                {"label":"K09 (B0,B5)", "x":8.5, "y":0},
-                {"label":"K0A (B0,B6)", "x":9.5, "y":0},
-                {"label":"K6A (F0,B6)", "x":11, "y":0},
-                {"label":"K69 (F0,B5)", "x":12, "y":0},
-                {"label":"K68 (F0,B4)", "x":13, "y":0},
-                {"label":"K67 (F0,D7)", "x":14, "y":0},
-                {"label":"K66 (F0,D4)", "x":15.25, "y":0},
-                {"label":"K65 (F0,C7)", "x":16.25, "y":0},
-                {"label":"K64 (F0,D5)", "x":17.25, "y":0},
-                {"label":"K10 (B1,D1)", "x":0, "y":1.5},
-                {"label":"K11 (B1,D2)", "x":1, "y":1.5},
-                {"label":"K12 (B1,D3)", "x":2, "y":1.5},
-                {"label":"K13 (B1,C6)", "x":3, "y":1.5},
-                {"label":"K14 (B1,D5)", "x":4, "y":1.5},
-                {"label":"K15 (B1,C7)", "x":5, "y":1.5},
-                {"label":"K16 (B1,D4)", "x":6, "y":1.5},
-                {"label":"K17 (B1,D7)", "x":7, "y":1.5},
-                {"label":"K18 (B1,B4)", "x":8, "y":1.5},
-                {"label":"K19 (B1,B5)", "x":9, "y":1.5},
-                {"label":"K1A (B1,B6)", "x":10, "y":1.5},
-                {"label":"K7A (F1,B6)", "x":11, "y":1.5},
-                {"label":"K79 (F1,B5)", "x":12, "y":1.5},
-                {"label":"K78 (F1,B4)", "x":13, "y":1.5, "w":2},
-                {"label":"K76 (F1,D4)", "x":15.25, "y":1.5},
-                {"label":"K75 (F1,C7)", "x":16.25, "y":1.5},
-                {"label":"K74 (F1,D5)", "x":17.25, "y":1.5},
-                {"label":"K73 (F1,C6)", "x":18.5, "y":1.5},
-                {"label":"K72 (F1,D3)", "x":19.5, "y":1.5},
-                {"label":"K71 (F1,D2)", "x":20.5, "y":1.5},
-                {"label":"K70 (F1,D1)", "x":21.5, "y":1.5},
-                {"label":"K20 (B2,D1)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (B2,D2)", "x":1.5, "y":2.5},
-                {"label":"K22 (B2,D3)", "x":2.5, "y":2.5},
-                {"label":"K23 (B2,C6)", "x":3.5, "y":2.5},
-                {"label":"K24 (B2,D5)", "x":4.5, "y":2.5},
-                {"label":"K25 (B2,C7)", "x":5.5, "y":2.5},
-                {"label":"K26 (B2,D4)", "x":6.5, "y":2.5},
-                {"label":"K27 (B2,D7)", "x":7.5, "y":2.5},
-                {"label":"K28 (B2,B4)", "x":8.5, "y":2.5},
-                {"label":"K29 (B2,B5)", "x":9.5, "y":2.5},
-                {"label":"K2A (B2,B6)", "x":10.5, "y":2.5},
-                {"label":"K8A (F4,B6)", "x":11.5, "y":2.5},
-                {"label":"K89 (F4,B5)", "x":12.5, "y":2.5},
-                {"label":"K87 (F4,D7)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K86 (F4,D4)", "x":15.25, "y":2.5},
-                {"label":"K85 (F4,C7)", "x":16.25, "y":2.5},
-                {"label":"K84 (F4,D5)", "x":17.25, "y":2.5},
-                {"label":"K83 (F4,C6)", "x":18.5, "y":2.5},
-                {"label":"K82 (F4,D3)", "x":19.5, "y":2.5},
-                {"label":"K81 (F4,D2)", "x":20.5, "y":2.5},
-                {"label":"K90 (F5,D1)", "x":21.5, "y":2.5, "h":2},
-                {"label":"K30 (B3,D1)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (B3,D2)", "x":1.75, "y":3.5},
-                {"label":"K32 (B3,D3)", "x":2.75, "y":3.5},
-                {"label":"K33 (B3,C6)", "x":3.75, "y":3.5},
-                {"label":"K34 (B3,D5)", "x":4.75, "y":3.5},
-                {"label":"K35 (B3,C7)", "x":5.75, "y":3.5},
-                {"label":"K36 (B3,D4)", "x":6.75, "y":3.5},
-                {"label":"K37 (B3,D7)", "x":7.75, "y":3.5},
-                {"label":"K38 (B3,B4)", "x":8.75, "y":3.5},
-                {"label":"K39 (B3,B5)", "x":9.75, "y":3.5},
-                {"label":"K3A (B3,B6)", "x":10.75, "y":3.5},
-                {"label":"K9A (F5,B6)", "x":11.75, "y":3.5},
-                {"label":"K98 (F5,B4)", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K93 (F5,C6)", "x":18.5, "y":3.5},
-                {"label":"K92 (F5,D3)", "x":19.5, "y":3.5},
-                {"label":"K91 (F5,D2)", "x":20.5, "y":3.5},
-                {"label":"K40 (B7,D1)", "x":0, "y":4.5, "w":2.25},
-                {"label":"K42 (B7,D3)", "x":2.25, "y":4.5},
-                {"label":"K43 (B7,C6)", "x":3.25, "y":4.5},
-                {"label":"K44 (B7,D5)", "x":4.25, "y":4.5},
-                {"label":"K45 (B7,C7)", "x":5.25, "y":4.5},
-                {"label":"K46 (B7,D4)", "x":6.25, "y":4.5},
-                {"label":"K47 (B7,D7)", "x":7.25, "y":4.5},
-                {"label":"K48 (B7,B4)", "x":8.25, "y":4.5},
-                {"label":"K49 (B7,B5)", "x":9.25, "y":4.5},
-                {"label":"K4A (B7,B6)", "x":10.25, "y":4.5},
-                {"label":"KAA (F6,B6)", "x":11.25, "y":4.5},
-                {"label":"KA8 (F6,B4)", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"KA5 (F6,C7)", "x":16.25, "y":4.5},
-                {"label":"KA3 (F6,C6)", "x":18.5, "y":4.5},
-                {"label":"KA2 (F6,D3)", "x":19.5, "y":4.5},
-                {"label":"KA1 (F6,D2)", "x":20.5, "y":4.5},
-                {"label":"KB0 (F7,D1)", "x":21.5, "y":4.5, "h":2},
-                {"label":"K50 (D0,D1)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K51 (D0,D2)", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K53 (D0,C6)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K56 (D0,D4)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K5A (D0,B6)", "x":10, "y":5.5, "w":1.25},
-                {"label":"KBA (F7,B6)", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"KB9 (F7,B5)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"KB7 (F7,D7)", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"KB6 (F7,D4)", "x":15.25, "y":5.5},
-                {"label":"KB5 (F7,C7)", "x":16.25, "y":5.5},
-                {"label":"KB4 (F7,D5)", "x":17.25, "y":5.5},
-                {"label":"KB3 (F7,C6)", "x":18.5, "y":5.5, "w":2},
-                {"label":"KB1 (F7,D2)", "x":20.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 10], "x": 11, "y": 0},
+                {"matrix": [6, 9], "x": 12, "y": 0},
+                {"matrix": [6, 8], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 4], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [7, 10], "x": 11, "y": 1.5},
+                {"matrix": [7, 9], "x": 12, "y": 1.5},
+                {"matrix": [7, 8], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+                {"matrix": [7, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [7, 4], "x": 17.25, "y": 1.5},
+
+                {"matrix": [7, 3], "x": 18.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 19.5, "y": 1.5},
+                {"matrix": [7, 1], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 0], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [8, 10], "x": 11.5, "y": 2.5},
+                {"matrix": [8, 9], "x": 12.5, "y": 2.5},
+                {"matrix": [8, 7], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+                {"matrix": [8, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [8, 4], "x": 17.25, "y": 2.5},
+
+                {"matrix": [8, 3], "x": 18.5, "y": 2.5},
+                {"matrix": [8, 2], "x": 19.5, "y": 2.5},
+                {"matrix": [8, 1], "x": 20.5, "y": 2.5},
+                {"matrix": [9, 0], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [9, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [9, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [9, 3], "x": 18.5, "y": 3.5},
+                {"matrix": [9, 2], "x": 19.5, "y": 3.5},
+                {"matrix": [9, 1], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [10, 8], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [10, 5], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 3], "x": 18.5, "y": 4.5},
+                {"matrix": [10, 2], "x": 19.5, "y": 4.5},
+                {"matrix": [10, 1], "x": 20.5, "y": 4.5},
+                {"matrix": [11, 0], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 9], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 6], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [11, 4], "x": 17.25, "y": 5.5},
+
+                {"matrix": [11, 3], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [11, 1], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.c b/keyboards/handwired/boss566y/redragon_vara/redragon_vara.c
deleted file mode 100644
index 18cfcfaa17..0000000000
--- a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 boss566y
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "redragon_vara.h"
diff --git a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h b/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h
deleted file mode 100644
index 3809fa8ce4..0000000000
--- a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 boss566y
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_fullsize_ansi( \
-    K00,      K02, K03, K04, K05,   K07, K08, K09, K0A,    K6A, K69, K68, K67,  K66, K65, K64,                      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K7A, K79, K78,       K76, K75, K74,  K73, K72, K71, K70, \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K8A, K89, K87,     K86, K85, K84,  K83, K82, K81, K90, \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K9A, K98,                         K93, K92, K91,      \
-    K40,       K42, K43, K44, K45, K46, K47, K48, K49, K4A, KAA, KA8,                KA5,       KA3, KA2, KA1, KB0, \
-    K50,  K51,  K53,              K56,                K5A,  KBA,  KB9,  KB7,    KB6, KB5, KB4,  KB3,      KB1       \
-) { \
-    { K00,   KC_NO, K02,   K03,   K04,   K05,   KC_NO, K07,   K08,   K09,   K0A   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A   }, \
-    { K50,   K51,   KC_NO, K53,   KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K64,   K65,   K66,   K67,   K68,   K69,   K6A   }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   KC_NO, K78,   K79,   K7A   }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   KC_NO, K89,   K8A   }, \
-    { K90,   K91,   K92,   K93,   KC_NO, KC_NO, KC_NO, KC_NO, K98,   KC_NO, K9A   }, \
-    { KC_NO, KA1,   KA2,   KA3,   KC_NO, KA5,   KC_NO, KC_NO, KA8,   KC_NO, KAA   }, \
-    { KB0,   KB1,   KC_NO, KB3,   KB4,   KB5,   KB6,   KB7,   KC_NO, KB9,   KBA   }, \
-}
diff --git a/keyboards/handwired/brain/brain.c b/keyboards/handwired/brain/brain.c
deleted file mode 100644
index 2f792f04cf..0000000000
--- a/keyboards/handwired/brain/brain.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "brain.h"
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index 9b7c48da75..7f7a49ed93 100644
--- a/keyboards/handwired/brain/config.h
+++ b/keyboards/handwired/brain/config.h
@@ -23,18 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_USB_DETECT
 
-// wiring of each half
-
-#define MATRIX_COL_PINS \
-    { D1, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1 }
-
-#define MATRIX_COL_PINS_RIGHT \
-    { B5, B4, E6, D7, C6, D4, D1 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* mouse config */
 #define MOUSEKEY_INTERVAL 20
 #define MOUSEKEY_DELAY 0
@@ -54,9 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Enables This makes it easier for fast typists to use dual-function keys */
 #define PERMISSIVE_HOLD
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 28  // Number of LEDs
 
 
@@ -81,5 +66,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 //#define TAPPING_TERM 150
-//#define IGNORE_MOD_TAP_INTERRUPT
 //#define QUICK_TAP_TERM 0
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
index a085da297f..042d38046b 100644
--- a/keyboards/handwired/brain/info.json
+++ b/keyboards/handwired/brain/info.json
@@ -8,13 +8,26 @@
         "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"
+    },
     "split": {
         "soft_serial_pin": "D0",
         "bootmagic": {
             "matrix": [5, 0]
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D1"]
+            }
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/handwired/brain/keymaps/klackygears/config.h b/keyboards/handwired/brain/keymaps/klackygears/config.h
index 5115f01801..b572858448 100644
--- a/keyboards/handwired/brain/keymaps/klackygears/config.h
+++ b/keyboards/handwired/brain/keymaps/klackygears/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/handwired/bstk100/bstk100.c b/keyboards/handwired/bstk100/bstk100.c
deleted file mode 100644
index 004b97004b..0000000000
--- a/keyboards/handwired/bstk100/bstk100.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 FREE WING,Y.Sakamoto
- * http://www.neko.ne.jp/~freewing/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bstk100.h"
diff --git a/keyboards/handwired/bstk100/bstk100.h b/keyboards/handwired/bstk100/bstk100.h
deleted file mode 100644
index 42a6da437f..0000000000
--- a/keyboards/handwired/bstk100/bstk100.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 FREE WING,Y.Sakamoto
- * http://www.neko.ne.jp/~freewing/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, \
-    k34, k03, k02, k13, \
-    k10, k11, k12, k01, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k43 \
-) { \
-    { k00, k01, k02,   k03, KC_NO }, \
-    { k10, k11, k12,   k13, KC_NO }, \
-    { k20, k21, k22,   k23, KC_NO }, \
-    { k30, k31, k32,   k33, k34   }, \
-    { k40, k41, KC_NO, k43, KC_NO }  \
-}
diff --git a/keyboards/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h
index 2a14eca16a..2a30bd3363 100644
--- a/keyboards/handwired/bstk100/config.h
+++ b/keyboards/handwired/bstk100/config.h
@@ -18,23 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/bstk100/info.json b/keyboards/handwired/bstk100/info.json
index 03580c3332..257203511a 100644
--- a/keyboards/handwired/bstk100/info.json
+++ b/keyboards/handwired/bstk100/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB100",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6"],
+        "rows": ["B6", "B2", "B3", "B1", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D5",
         "num_lock": "D4",
@@ -19,31 +24,31 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"label": "k34", "x": 0, "y": 1},
-                {"label": "k03", "x": 1, "y": 1},
-                {"label": "k02", "x": 2, "y": 1},
-                {"label": "k13", "x": 3, "y": 1},
+                {"matrix": [3, 4], "x": 0, "y": 1},
+                {"matrix": [0, 3], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label": "k10", "x": 0, "y": 2},
-                {"label": "k11", "x": 1, "y": 2},
-                {"label": "k12", "x": 2, "y": 2},
-                {"label": "k01", "x": 3, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [0, 1], "x": 3, "y": 2},
 
-                {"label": "k20", "x": 0, "y": 3},
-                {"label": "k21", "x": 1, "y": 3},
-                {"label": "k22", "x": 2, "y": 3},
-                {"label": "k23", "x": 3, "y": 3},
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 3},
 
-                {"label": "k30", "x": 0, "y": 4},
-                {"label": "k31", "x": 1, "y": 4},
-                {"label": "k32", "x": 2, "y": 4},
-                {"label": "k33", "x": 3, "y": 4, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 4, "h": 2},
 
-                {"label": "k40", "x": 0, "y": 5},
-                {"label": "k41", "x": 1, "y": 5},
-                {"label": "k43", "x": 2, "y": 5}
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+                {"matrix": [4, 3], "x": 2, "y": 5}
             ]
         }
     }
diff --git a/keyboards/handwired/cans12er/cans12er.c b/keyboards/handwired/cans12er/cans12er.c
deleted file mode 100644
index e74b6a3026..0000000000
--- a/keyboards/handwired/cans12er/cans12er.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "cans12er.h"
diff --git a/keyboards/handwired/cans12er/cans12er.h b/keyboards/handwired/cans12er/cans12er.h
deleted file mode 100644
index 87a39799ef..0000000000
--- a/keyboards/handwired/cans12er/cans12er.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }  \
-}
diff --git a/keyboards/handwired/cans12er/config.h b/keyboards/handwired/cans12er/config.h
index 74a7679e0b..5f36081323 100644
--- a/keyboards/handwired/cans12er/config.h
+++ b/keyboards/handwired/cans12er/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F7, B1, B3 }
-#define MATRIX_COL_PINS { D0, D4, C6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/cans12er/info.json b/keyboards/handwired/cans12er/info.json
index 37dd424299..c51fad15ee 100644
--- a/keyboards/handwired/cans12er/info.json
+++ b/keyboards/handwired/cans12er/info.json
@@ -8,25 +8,30 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D4", "C6", "D7"],
+        "rows": ["F7", "B1", "B3"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_3x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/carpolly/carpolly.c b/keyboards/handwired/carpolly/carpolly.c
deleted file mode 100644
index 119dfa962b..0000000000
--- a/keyboards/handwired/carpolly/carpolly.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Paul Enrico N. Viola
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "carpolly.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/carpolly/config.h b/keyboards/handwired/carpolly/config.h
deleted file mode 100644
index 4c2410ca98..0000000000
--- a/keyboards/handwired/carpolly/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Paul Enrico N. Viola
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, B6, B5, B4, D7, D6, D4, D5, C7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/carpolly/info.json b/keyboards/handwired/carpolly/info.json
index 482af57cc1..3cac934d6e 100644
--- a/keyboards/handwired/carpolly/info.json
+++ b/keyboards/handwired/carpolly/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0017",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "C7"],
+        "rows": ["B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/chiron/chiron.c b/keyboards/handwired/chiron/chiron.c
deleted file mode 100644
index 997cda6a4d..0000000000
--- a/keyboards/handwired/chiron/chiron.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Mike Hix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "chiron.h"
diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h
index d881fecbaa..677804cbe9 100644
--- a/keyboards/handwired/chiron/config.h
+++ b/keyboards/handwired/chiron/config.h
@@ -17,20 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// Pro Micro Pins          4,  6,  7,  8,  9
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-// Pro Micro Pins         A3, A2, A1, A0, 15, 14, 16
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-
 // Pro Micro Pins      RX1
 #define SPLIT_HAND_PIN D2
 
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 4
diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json
index b1590d8ded..e5c076a77c 100644
--- a/keyboards/handwired/chiron/info.json
+++ b/keyboards/handwired/chiron/info.json
@@ -8,10 +8,18 @@
         "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
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/chiron/keymaps/default/config.h b/keyboards/handwired/chiron/keymaps/default/config.h
index 06c5f586e4..c373743a39 100644
--- a/keyboards/handwired/chiron/keymaps/default/config.h
+++ b/keyboards/handwired/chiron/keymaps/default/config.h
@@ -19,7 +19,6 @@
 #define MASTER_RIGHT
 //#define MASTER_LEFT
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 
 #define TAPPING_TERM 200
diff --git a/keyboards/handwired/chiron/keymaps/default/rules.mk b/keyboards/handwired/chiron/keymaps/default/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/chiron/keymaps/default/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/ck4x4/ck4x4.c b/keyboards/handwired/ck4x4/ck4x4.c
deleted file mode 100644
index 3091ce9c01..0000000000
--- a/keyboards/handwired/ck4x4/ck4x4.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ck4x4.h"
diff --git a/keyboards/handwired/ck4x4/ck4x4.h b/keyboards/handwired/ck4x4/ck4x4.h
deleted file mode 100644
index 33c1b8dd99..0000000000
--- a/keyboards/handwired/ck4x4/ck4x4.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  k00, k01, k02, k03, \
-  k10, k11, k12, k13, \
-  k20, k21, k22, k23, \
-  k30, k31, k32, k33 \
-) {\
-{ k00, k01, k02, k03 }, \
-{ k10, k11, k12, k13 }, \
-{ k20, k21, k22, k23 }, \
-{ k30, k31, k32, k33 }, \
-}
diff --git a/keyboards/handwired/ck4x4/config.h b/keyboards/handwired/ck4x4/config.h
index 0a5d6c5c6a..6a40218df2 100644
--- a/keyboards/handwired/ck4x4/config.h
+++ b/keyboards/handwired/ck4x4/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B7, B8, B9, B10 }
-#define MATRIX_ROW_PINS { B3, B4, B5, B6 }
-#define DIODE_DIRECTION COL2ROW
-
 //LEDS A6, RGB B15
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/handwired/ck4x4/info.json b/keyboards/handwired/ck4x4/info.json
index 17541e918f..8caf00aefd 100644
--- a/keyboards/handwired/ck4x4/info.json
+++ b/keyboards/handwired/ck4x4/info.json
@@ -8,30 +8,35 @@
         "pid": "0x6464",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B8", "B9", "B10"],
+        "rows": ["B3", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/handwired/cmd60/cmd60.c b/keyboards/handwired/cmd60/cmd60.c
deleted file mode 100644
index 20c359e5e9..0000000000
--- a/keyboards/handwired/cmd60/cmd60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "cmd60.h"
diff --git a/keyboards/handwired/cmd60/config.h b/keyboards/handwired/cmd60/config.h
index 6ec23cbd19..b9449c4714 100644
--- a/keyboards/handwired/cmd60/config.h
+++ b/keyboards/handwired/cmd60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, C6, D7, B4, B5, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/cmd60/info.json b/keyboards/handwired/cmd60/info.json
index 635bead900..f3db2960f5 100644
--- a/keyboards/handwired/cmd60/info.json
+++ b/keyboards/handwired/cmd60/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6", "D7", "B4", "B5", "B6"],
+    "rows": ["F0", "F4", "F5", "F6", "F7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/handwired/co60/info.json b/keyboards/handwired/co60/info.json
index 04541098a2..1ea1ac4ad2 100644
--- a/keyboards/handwired/co60/info.json
+++ b/keyboards/handwired/co60/info.json
@@ -9,13 +9,13 @@
   "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"],
   "layouts": {
     "LAYOUT_all": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"LSpace", "x":3.75, "y":4, "w":2.25}, {"label":"Fn", "x":6, "y":4, "w":1.25}, {"label":"RSpace", "x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1}, {"label":"Win", "x":11, "y":4, "w":1}, {"label":"Menu", "x":12, "y":4, "w":1}, {"label":"Ctrl", "x":13, "y":4, "w":1}, {"label":"Fn", "x":14, "y":4, "w":1}]
+      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"LSpace", "x":3.75, "y":4, "w":2.25}, {"label":"Fn", "x":6, "y":4, "w":1.25}, {"label":"RSpace", "x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"label":"Menu", "x":12, "y":4}, {"label":"Ctrl", "x":13, "y":4}, {"label":"Fn", "x":14, "y":4}]
     },
     "LAYOUT_60_ansi": {
       "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"CapsLock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
     },
     "LAYOUT_60_ansi_split_bs_rshift": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0, "w":1}, {"label":"Del", "x":14, "y":0, "w":1}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"CapsLock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3, "w":1}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"CapsLock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
     },
     "LAYOUT_60_iso": {
       "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"£", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"[", "x":11.5, "y":1}, {"label":"]", "x":12.5, "y":1}, {"label":"CapsLock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
diff --git a/keyboards/handwired/co60/rev1/config.h b/keyboards/handwired/co60/rev1/config.h
deleted file mode 100644
index c42a0d5b0c..0000000000
--- a/keyboards/handwired/co60/rev1/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2018 John M Daly <jmdaly@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B2, B5, B4, D7, D6, B3, B0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/co60/rev1/info.json b/keyboards/handwired/co60/rev1/info.json
index 05a7a3a336..6ded2d0cc1 100644
--- a/keyboards/handwired/co60/rev1/info.json
+++ b/keyboards/handwired/co60/rev1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B2", "B5", "B4", "D7", "D6", "B3", "B0"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
diff --git a/keyboards/handwired/co60/rev1/rev1.c b/keyboards/handwired/co60/rev1/rev1.c
deleted file mode 100644
index 6c68c515f4..0000000000
--- a/keyboards/handwired/co60/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 John M Daly
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/handwired/co60/rev6/config.h b/keyboards/handwired/co60/rev6/config.h
index 6f938b06b7..fa1c24a396 100644
--- a/keyboards/handwired/co60/rev6/config.h
+++ b/keyboards/handwired/co60/rev6/config.h
@@ -16,15 +16,6 @@
  */
 #pragma once
 
-
-/* ROWS: Top to bottom, COLS: Left to right
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, A15, A10 }
-#define MATRIX_COL_PINS { A2, A3, A6, B14, B15, A8, A9, A7, B3, B4, C14, C15, C13, B5, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/co60/rev6/info.json b/keyboards/handwired/co60/rev6/info.json
index a189309496..2fd3182583 100644
--- a/keyboards/handwired/co60/rev6/info.json
+++ b/keyboards/handwired/co60/rev6/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "6.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A2", "A3", "A6", "B14", "B15", "A8", "A9", "A7", "B3", "B4", "C14", "C15", "C13", "B5", "B6"],
+        "rows": ["B0", "B1", "B2", "A15", "A10"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B8",
         "breathing": true
diff --git a/keyboards/handwired/co60/rev6/rev6.c b/keyboards/handwired/co60/rev6/rev6.c
deleted file mode 100644
index e2645871a0..0000000000
--- a/keyboards/handwired/co60/rev6/rev6.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 John M Daly <jmdaly@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev6.h"
-
diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h
index 6647698dfb..8cafa3c6f3 100644
--- a/keyboards/handwired/co60/rev7/config.h
+++ b/keyboards/handwired/co60/rev7/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* ROWS: Top to bottom, COLS: Left to right
-*/
-#define MATRIX_ROW_PINS { A8, A2, B13, B2, B10 }
-#define MATRIX_COL_PINS { A10, A9, A3, A4, A5, A6, B0, B1, A15, B3, B4, B5, C13, C14, C15 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -47,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 16
-#define RGB_DI_PIN A7
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/info.json
index 67d54fb0fb..3d520b5284 100644
--- a/keyboards/handwired/co60/rev7/info.json
+++ b/keyboards/handwired/co60/rev7/info.json
@@ -3,10 +3,19 @@
     "usb": {
         "device_version": "7.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A3", "A4", "A5", "A6", "B0", "B1", "A15", "B3", "B4", "B5", "C13", "C14", "C15"],
+        "rows": ["A8", "A2", "B13", "B2", "B10"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B8",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "spi"
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C"
diff --git a/keyboards/handwired/co60/rev7/rev7.c b/keyboards/handwired/co60/rev7/rev7.c
deleted file mode 100644
index 40fd7e6649..0000000000
--- a/keyboards/handwired/co60/rev7/rev7.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 John M Daly <jmdaly@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev7.h"
-
diff --git a/keyboards/handwired/co60/rev7/rules.mk b/keyboards/handwired/co60/rev7/rules.mk
index 4bd09df6a4..3d43c0cadb 100644
--- a/keyboards/handwired/co60/rev7/rules.mk
+++ b/keyboards/handwired/co60/rev7/rules.mk
@@ -1,6 +1,3 @@
-# Use SPI for RGB underglow:
-WS2812_DRIVER = spi
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/handwired/colorlice/colorlice.c b/keyboards/handwired/colorlice/colorlice.c
index 1fd5fddd11..736db8d465 100644
--- a/keyboards/handwired/colorlice/colorlice.c
+++ b/keyboards/handwired/colorlice/colorlice.c
@@ -13,7 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "colorlice.h"
+
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/handwired/colorlice/colorlice.h b/keyboards/handwired/colorlice/colorlice.h
deleted file mode 100644
index dbf31f5680..0000000000
--- a/keyboards/handwired/colorlice/colorlice.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 marhalloweenvt
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_alice_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,      \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      K2e,      \
-    k30, k31, k32, k33, k34, k35,      k37, k38, k39, k3a, k3b, k3c, k3d, k3e,      \
-    k40,      k42, k43, k44,           k47,           k4a,                k4e       \
-) { \
-    { k00,  k01,   k02,   k03,  k04,  k05,   k06,   k07,   k08,  k09,   k0a,  k0b,  k0c,    k0d,    k0e, k0f    }, \
-    { k10,  k11,   k12,   k13,  k14,  k15,   k16,   k17,   k18,  k19,   k1a,  k1b,  k1c,    k1d,    k1e, KC_NO  }, \
-    { k20,  k21,   k22,   k23,  k24,  k25,   k26,   k27,   k28,  k29,   k2a,  k2b,  k2c,    KC_NO,  K2e, KC_NO  }, \
-    { k30,  k31,   k32,   k33,  k34,  k35,   KC_NO, k37,   k38,  k39,   k3a,  k3b,  k3c,    k3d,    k3e, KC_NO  }, \
-    { k40,  KC_NO, k42,   k43,  k44,  KC_NO, KC_NO, k47, KC_NO,  KC_NO, k4a,  KC_NO,KC_NO,  KC_NO,  k4e, KC_NO  }, \
-}
-
-#define LAYOUT LAYOUT_alice_split_bs
diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h
index 4e981b4428..5c52df9ffa 100644
--- a/keyboards/handwired/colorlice/config.h
+++ b/keyboards/handwired/colorlice/config.h
@@ -17,21 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B6, B5, B4, D7, D6, D4, E6, B0, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* RGB LEDs */
-#define RGB_DI_PIN B1
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json
index 9a884c6718..0cba448703 100644
--- a/keyboards/handwired/colorlice/info.json
+++ b/keyboards/handwired/colorlice/info.json
@@ -8,79 +8,104 @@
       "pid": "0x0302",
       "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "B1"
+    },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
+    "matrix_pins": {
+      "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
+      "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
       "LAYOUT_alice_split_bs": {
         "layout": [
-          {"label":"K63", "x":0, "y":0},
-          {"label":"K00", "x":1.25, "y":0},
-          {"label":"K01", "x":2.25, "y":0},
-          {"label":"K02", "x":3.25, "y":0},
-          {"label":"K03", "x":4.25, "y":0},
-          {"label":"K04", "x":5.25, "y":0},
-          {"label":"K05", "x":6.25, "y":0},
-          {"label":"K06", "x":7.25, "y":0},
-          {"label":"K07", "x":10.25, "y":0},
-          {"label":"K08", "x":11.25, "y":0},
-          {"label":"K09", "x":12.25, "y":0},
-          {"label":"K10", "x":13.25, "y":0},
-          {"label":"K11", "x":14.25, "y":0},
-          {"label":"K12", "x":15.25, "y":0},
-          {"label":"K13", "x":16.25, "y":0},
-          {"label":"K14", "x":17.25, "y":0},
-          {"label":"K64", "x":0, "y":1},
-          {"label":"K15", "x":1.25, "y":1, "w":1.5},
-          {"label":"K16", "x":2.75, "y":1},
-          {"label":"K17", "x":3.75, "y":1},
-          {"label":"K18", "x":4.75, "y":1},
-          {"label":"K19", "x":5.75, "y":1},
-          {"label":"K20", "x":6.75, "y":1},
-          {"label":"K21", "x":9.75, "y":1},
-          {"label":"K22", "x":10.75, "y":1},
-          {"label":"K23", "x":11.75, "y":1},
-          {"label":"K24", "x":12.75, "y":1},
-          {"label":"K25", "x":13.75, "y":1},
-          {"label":"K26", "x":14.75, "y":1},
-          {"label":"K27", "x":15.75, "y":1},
-          {"label":"K28", "x":16.75, "y":1, "w":1.5},
-          {"label":"K65", "x":0, "y":2},
-          {"label":"K29", "x":1.25, "y":2, "w":1.75},
-          {"label":"K30", "x":3, "y":2},
-          {"label":"K31", "x":4, "y":2},
-          {"label":"K32", "x":5, "y":2},
-          {"label":"K33", "x":6, "y":2},
-          {"label":"K34", "x":7, "y":2},
-          {"label":"K35", "x":10, "y":2},
-          {"label":"K36", "x":11, "y":2},
-          {"label":"K37", "x":12, "y":2},
-          {"label":"K38", "x":13, "y":2},
-          {"label":"K39", "x":14, "y":2},
-          {"label":"K40", "x":15, "y":2},
-          {"label":"K41", "x":16, "y":2, "w":2.25},
-          {"label":"K42", "x":1.25, "y":3, "w":2.25},
-          {"label":"K43", "x":3.5, "y":3},
-          {"label":"K44", "x":4.5, "y":3},
-          {"label":"K45", "x":5.5, "y":3},
-          {"label":"K46", "x":6.5, "y":3},
-          {"label":"K47", "x":7.5, "y":3},
-          {"label":"K48", "x":9.5, "y":3},
-          {"label":"K49", "x":10.5, "y":3},
-          {"label":"K50", "x":11.5, "y":3},
-          {"label":"K51", "x":12.5, "y":3},
-          {"label":"K52", "x":13.5, "y":3},
-          {"label":"K53", "x":14.5, "y":3},
-          {"label":"K54", "x":15.5, "y":3, "w":1.75},
-          {"label":"K55", "x":17.25, "y":3},
-          {"label":"K56", "x":1.25, "y":4, "w":1.5},
-          {"label":"K57", "x":4.25, "y":4, "w":1.5},
-          {"label":"K58", "x":5.75, "y":4, "w":2},
-          {"label":"K59", "x":7.75, "y":4, "w":1.25},
-          {"label":"K60", "x":9.5, "y":4, "w":2.75},
-          {"label":"K61", "x":12.25, "y":4, "w":1.5},
-          {"label":"K62", "x":16.75, "y":4, "w":1.5}
+          {"label": "K63", "matrix": [0, 0], "x": 0, "y": 0},
+
+          {"label": "K00", "matrix": [0, 1], "x": 1.25, "y": 0},
+          {"label": "K01", "matrix": [0, 2], "x": 2.25, "y": 0},
+          {"label": "K02", "matrix": [0, 3], "x": 3.25, "y": 0},
+          {"label": "K03", "matrix": [0, 4], "x": 4.25, "y": 0},
+          {"label": "K04", "matrix": [0, 5], "x": 5.25, "y": 0},
+          {"label": "K05", "matrix": [0, 6], "x": 6.25, "y": 0},
+          {"label": "K06", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+          {"label": "K07", "matrix": [0, 8], "x": 10.25, "y": 0},
+          {"label": "K08", "matrix": [0, 9], "x": 11.25, "y": 0},
+          {"label": "K09", "matrix": [0, 10], "x": 12.25, "y": 0},
+          {"label": "K10", "matrix": [0, 11], "x": 13.25, "y": 0},
+          {"label": "K11", "matrix": [0, 12], "x": 14.25, "y": 0},
+          {"label": "K12", "matrix": [0, 13], "x": 15.25, "y": 0},
+          {"label": "K13", "matrix": [0, 14], "x": 16.25, "y": 0},
+          {"label": "K14", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+          {"label": "K64", "matrix": [1, 0], "x": 0, "y": 1},
+
+          {"label": "K15", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+          {"label": "K16", "matrix": [1, 2], "x": 2.75, "y": 1},
+          {"label": "K17", "matrix": [1, 3], "x": 3.75, "y": 1},
+          {"label": "K18", "matrix": [1, 4], "x": 4.75, "y": 1},
+          {"label": "K19", "matrix": [1, 5], "x": 5.75, "y": 1},
+          {"label": "K20", "matrix": [1, 6], "x": 6.75, "y": 1},
+
+          {"label": "K21", "matrix": [1, 7], "x": 9.75, "y": 1},
+          {"label": "K22", "matrix": [1, 8], "x": 10.75, "y": 1},
+          {"label": "K23", "matrix": [1, 9], "x": 11.75, "y": 1},
+          {"label": "K24", "matrix": [1, 10], "x": 12.75, "y": 1},
+          {"label": "K25", "matrix": [1, 11], "x": 13.75, "y": 1},
+          {"label": "K26", "matrix": [1, 12], "x": 14.75, "y": 1},
+          {"label": "K27", "matrix": [1, 13], "x": 15.75, "y": 1},
+          {"label": "K28", "matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+          {"label": "K65", "matrix": [2, 0], "x": 0, "y": 2},
+
+          {"label": "K29", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+          {"label": "K30", "matrix": [2, 2], "x": 3, "y": 2},
+          {"label": "K31", "matrix": [2, 3], "x": 4, "y": 2},
+          {"label": "K32", "matrix": [2, 4], "x": 5, "y": 2},
+          {"label": "K33", "matrix": [2, 5], "x": 6, "y": 2},
+          {"label": "K34", "matrix": [2, 6], "x": 7, "y": 2},
+
+          {"label": "K35", "matrix": [2, 7], "x": 10, "y": 2},
+          {"label": "K36", "matrix": [2, 8], "x": 11, "y": 2},
+          {"label": "K37", "matrix": [2, 9], "x": 12, "y": 2},
+          {"label": "K38", "matrix": [2, 10], "x": 13, "y": 2},
+          {"label": "K39", "matrix": [2, 11], "x": 14, "y": 2},
+          {"label": "K40", "matrix": [2, 12], "x": 15, "y": 2},
+          {"label": "K41", "matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+          {"label": "K42", "matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+          {"label": "K43", "matrix": [3, 1], "x": 3.5, "y": 3},
+          {"label": "K44", "matrix": [3, 2], "x": 4.5, "y": 3},
+          {"label": "K45", "matrix": [3, 3], "x": 5.5, "y": 3},
+          {"label": "K46", "matrix": [3, 4], "x": 6.5, "y": 3},
+          {"label": "K47", "matrix": [3, 5], "x": 7.5, "y": 3},
+
+          {"label": "K48", "matrix": [3, 7], "x": 9.5, "y": 3},
+          {"label": "K49", "matrix": [3, 8], "x": 10.5, "y": 3},
+          {"label": "K50", "matrix": [3, 9], "x": 11.5, "y": 3},
+          {"label": "K51", "matrix": [3, 10], "x": 12.5, "y": 3},
+          {"label": "K52", "matrix": [3, 11], "x": 13.5, "y": 3},
+          {"label": "K53", "matrix": [3, 12], "x": 14.5, "y": 3},
+          {"label": "K54", "matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+          {"label": "K55", "matrix": [3, 14], "x": 17.25, "y": 3},
+
+          {"label": "K56", "matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.5},
+          {"label": "K57", "matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5},
+          {"label": "K58", "matrix": [4, 3], "x": 5.75, "y": 4, "w": 2},
+          {"label": "K59", "matrix": [4, 4], "x": 7.75, "y": 4, "w": 1.25},
+          {"label": "K60", "matrix": [4, 7], "x": 9.5, "y": 4, "w": 2.75},
+          {"label": "K61", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+          {"label": "K62", "matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
         ]
       }
     }
-  }
+}
diff --git a/keyboards/handwired/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk
index 972181a4b4..16e007dd34 100644
--- a/keyboards/handwired/colorlice/rules.mk
+++ b/keyboards/handwired/colorlice/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Use link time optimization
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
diff --git a/keyboards/handwired/concertina/64key/64key.c b/keyboards/handwired/concertina/64key/64key.c
deleted file mode 100644
index 31211b0a9a..0000000000
--- a/keyboards/handwired/concertina/64key/64key.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020-2021 Viktor Eikman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "64key.h"
diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h
index 2eb9a4cd67..b315e309ae 100644
--- a/keyboards/handwired/concertina/64key/config.h
+++ b/keyboards/handwired/concertina/64key/config.h
@@ -16,14 +16,7 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
 /* LEDs are not used in the standard 64key configuration. */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 0
 
-#define DIODE_DIRECTION COL2ROW
-
 #define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json
index 39db710673..0e4542af9d 100644
--- a/keyboards/handwired/concertina/64key/info.json
+++ b/keyboards/handwired/concertina/64key/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3632",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/consolekeyboard/18key/18key.c b/keyboards/handwired/consolekeyboard/18key/18key.c
deleted file mode 100644
index 911aaa642d..0000000000
--- a/keyboards/handwired/consolekeyboard/18key/18key.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "18key.h"
diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h
index 59aa11f675..ac16864b09 100644
--- a/keyboards/handwired/consolekeyboard/18key/config.h
+++ b/keyboards/handwired/consolekeyboard/18key/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0 }
-#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 6
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -49,4 +31,3 @@
 //     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json
index 9fb64bcf21..f4b99ed3f7 100644
--- a/keyboards/handwired/consolekeyboard/18key/info.json
+++ b/keyboards/handwired/consolekeyboard/18key/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3332",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"],
+        "rows": ["D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/consolekeyboard/20key/20key.c b/keyboards/handwired/consolekeyboard/20key/20key.c
deleted file mode 100644
index 409d1c16b5..0000000000
--- a/keyboards/handwired/consolekeyboard/20key/20key.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "20key.h"
diff --git a/keyboards/handwired/consolekeyboard/20key/config.h b/keyboards/handwired/consolekeyboard/20key/config.h
index 7d8f67d24e..ac16864b09 100644
--- a/keyboards/handwired/consolekeyboard/20key/config.h
+++ b/keyboards/handwired/consolekeyboard/20key/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0 }
-#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 6
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -49,4 +31,3 @@
 //     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/info.json
index 085815f58a..c62b02259c 100644
--- a/keyboards/handwired/consolekeyboard/20key/info.json
+++ b/keyboards/handwired/consolekeyboard/20key/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3432",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"],
+        "rows": ["D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/consolekeyboard/27key/27key.c b/keyboards/handwired/consolekeyboard/27key/27key.c
deleted file mode 100644
index 06f0bb9a62..0000000000
--- a/keyboards/handwired/consolekeyboard/27key/27key.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "27key.h"
diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h
index 59966bc857..ac16864b09 100644
--- a/keyboards/handwired/consolekeyboard/27key/config.h
+++ b/keyboards/handwired/consolekeyboard/27key/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0, F7}
-#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 6
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -49,4 +31,3 @@
 //     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json
index 37124c0196..854fe37e30 100644
--- a/keyboards/handwired/consolekeyboard/27key/info.json
+++ b/keyboards/handwired/consolekeyboard/27key/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3433",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"],
+        "rows": ["D1", "D0", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/consolekeyboard/30key/30key.c b/keyboards/handwired/consolekeyboard/30key/30key.c
deleted file mode 100644
index 4500206dd3..0000000000
--- a/keyboards/handwired/consolekeyboard/30key/30key.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "30key.h"
diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h
index ba82037cf4..226fee299f 100644
--- a/keyboards/handwired/consolekeyboard/30key/config.h
+++ b/keyboards/handwired/consolekeyboard/30key/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0, F7}
-#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 6
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -49,4 +31,3 @@
 //     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json
index e8f51b2c79..fe08b20b28 100644
--- a/keyboards/handwired/consolekeyboard/30key/info.json
+++ b/keyboards/handwired/consolekeyboard/30key/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3433",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"],
+        "rows": ["D1", "D0", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/croxsplit44/config.h b/keyboards/handwired/croxsplit44/config.h
index b76c323641..5703448756 100644
--- a/keyboards/handwired/croxsplit44/config.h
+++ b/keyboards/handwired/croxsplit44/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D4, D5, D6, D7 }
-#define MATRIX_COL_PINS { B6, B5, B4, D2, C0, C1, F5, F4, F3, F2, F1, F0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C4
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 42
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -40,5 +32,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-#endif
\ No newline at end of file
diff --git a/keyboards/handwired/croxsplit44/croxsplit44.c b/keyboards/handwired/croxsplit44/croxsplit44.c
deleted file mode 100644
index 4dbc7d4cb5..0000000000
--- a/keyboards/handwired/croxsplit44/croxsplit44.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Samux6146
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "croxsplit44.h"
diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json
index 7e5eaca944..817f2fe85a 100644
--- a/keyboards/handwired/croxsplit44/info.json
+++ b/keyboards/handwired/croxsplit44/info.json
@@ -8,55 +8,70 @@
         "pid": "0x6146",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C4"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "B4", "D2", "C0", "C1", "F5", "F4", "F3", "F2", "F1", "F0"],
+        "rows": ["D4", "D5", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (D4,B6)", "x":0.5, "y":1.375},
-                {"label":"K01 (D4,B5)", "x":1.5, "y":1.375},
-                {"label":"K02 (D4,B4)", "x":2.5, "y":1.125},
-                {"label":"K03 (D4,D2)", "x":3.5, "y":1},
-                {"label":"K04 (D4,C0)", "x":4.5, "y":1.125},
-                {"label":"K05 (D4,C1)", "x":5.5, "y":1.25},
-                {"label":"K06 (D4,F5)", "x":13, "y":1.25},
-                {"label":"K07 (D4,F4)", "x":14, "y":1.125},
-                {"label":"K08 (D4,F3)", "x":15, "y":1},
-                {"label":"K09 (D4,F2)", "x":16, "y":1.125},
-                {"label":"K0A (D4,F1)", "x":17, "y":1.375},
-                {"label":"K0B (D4,F0)", "x":18, "y":1.375},
-                {"label":"K10 (D5,B6)", "x":0.5, "y":2.375},
-                {"label":"K11 (D5,B5)", "x":1.5, "y":2.375},
-                {"label":"K12 (D5,B4)", "x":2.5, "y":2.125},
-                {"label":"K13 (D5,D2)", "x":3.5, "y":2},
-                {"label":"K14 (D5,C0)", "x":4.5, "y":2.125},
-                {"label":"K15 (D5,C1)", "x":5.5, "y":2.25},
-                {"label":"K16 (D5,F5)", "x":13, "y":2.25},
-                {"label":"K17 (D5,F4)", "x":14, "y":2.125},
-                {"label":"K18 (D5,F3)", "x":15, "y":2},
-                {"label":"K19 (D5,F2)", "x":16, "y":2.125},
-                {"label":"K1A (D5,F1)", "x":17, "y":2.375},
-                {"label":"K1B (D5,F0)", "x":18, "y":2.375},
-                {"label":"K20 (D6,B6)", "x":0.5, "y":3.375},
-                {"label":"K21 (D6,B5)", "x":1.5, "y":3.375},
-                {"label":"K22 (D6,B4)", "x":2.5, "y":3.125},
-                {"label":"K23 (D6,D2)", "x":3.5, "y":3},
-                {"label":"K24 (D6,C0)", "x":4.5, "y":3.125},
-                {"label":"K25 (D6,C1)", "x":5.5, "y":3.25},
-                {"label":"K26 (D6,F5)", "x":13, "y":3.25},
-                {"label":"K27 (D6,F4)", "x":14, "y":3.125},
-                {"label":"K28 (D6,F3)", "x":15, "y":3},
-                {"label":"K29 (D6,F2)", "x":16, "y":3.125},
-                {"label":"K2A (D6,F1)", "x":17, "y":3.375},
-                {"label":"K2B (D6,F0)", "x":18, "y":3.375},
-                {"label":"K32 (D7,B4)", "x":2.5, "y":4.125},
-                {"label":"K33 (D7,D2)", "x":3.5, "y":4},
-                {"label":"K34 (D7,C0)", "x":4.5, "y":4.5},
-                {"label":"K35 (D7,C1)", "x":5.5, "y":4.75},
-                {"label":"K36 (D7,F5)", "x":12.75, "y":4.75},
-                {"label":"K37 (D7,F4)", "x":13.8, "y":4.375},
-                {"label":"K38 (D7,F3)", "x":15, "y":4},
-                {"label":"K39 (D7,F2)", "x":16, "y":4.125}
+                {"x":0, "y":0.375},
+                {"x":1, "y":0.375},
+                {"x":2, "y":0.125},
+                {"x":3, "y":0},
+                {"x":4, "y":0.125},
+                {"x":5, "y":0.25},
+
+                {"x":7, "y":0.25},
+                {"x":8, "y":0.125},
+                {"x":9, "y":0},
+                {"x":10, "y":0.125},
+                {"x":11, "y":0.375},
+                {"x":12, "y":0.375},
+
+                {"x":0, "y":1.375},
+                {"x":1, "y":1.375},
+                {"x":2, "y":1.125},
+                {"x":3, "y":1},
+                {"x":4, "y":1.125},
+                {"x":5, "y":1.25},
+
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.125},
+                {"x":9, "y":1},
+                {"x":10, "y":1.125},
+                {"x":11, "y":1.375},
+                {"x":12, "y":1.375},
+
+                {"x":0, "y":2.375},
+                {"x":1, "y":2.375},
+                {"x":2, "y":2.125},
+                {"x":3, "y":2},
+                {"x":4, "y":2.125},
+                {"x":5, "y":2.25},
+
+                {"x":7, "y":2.25},
+                {"x":8, "y":2.125},
+                {"x":9, "y":2},
+                {"x":10, "y":2.125},
+                {"x":11, "y":2.375},
+                {"x":12, "y":2.375},
+
+                {"x":2, "y":3.125},
+                {"x":3, "y":3},
+                {"x":4, "y":3.5},
+                {"x":5, "y":3.75},
+
+                {"x":7, "y":3.75},
+                {"x":8, "y":3.5},
+                {"x":9, "y":3},
+                {"x":10, "y":3.125}
             ]
         }
     }
diff --git a/keyboards/handwired/curiosity/config.h b/keyboards/handwired/curiosity/config.h
index bec41310c4..65854bfac7 100644
--- a/keyboards/handwired/curiosity/config.h
+++ b/keyboards/handwired/curiosity/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, F7, F6, F5 }
-#define MATRIX_COL_PINS { D3, D4, F4, C6, D7, E6, B5, B4, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/curiosity/curiosity.c b/keyboards/handwired/curiosity/curiosity.c
deleted file mode 100644
index e0a6e130e7..0000000000
--- a/keyboards/handwired/curiosity/curiosity.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "curiosity.h"
\ No newline at end of file
diff --git a/keyboards/handwired/curiosity/info.json b/keyboards/handwired/curiosity/info.json
index 6e796c4d8c..a9a22fc39c 100644
--- a/keyboards/handwired/curiosity/info.json
+++ b/keyboards/handwired/curiosity/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4355",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D3", "D4", "F4", "C6", "D7", "E6", "B5", "B4", "B1", "B3", "B2", "B6"],
+    "rows": ["D0", "F7", "F6", "F5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h
index a8ecd69985..869f4c9ba7 100644
--- a/keyboards/handwired/cyberstar/config.h
+++ b/keyboards/handwired/cyberstar/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A15, B3, A9, B5, A3 }
-#define MATRIX_COL_PINS { A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15, A8, A10, A14, B8, B9 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
@@ -35,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_CHANNEL 3
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
 
-#define RGB_DI_PIN B4
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/cyberstar/cyberstar.c b/keyboards/handwired/cyberstar/cyberstar.c
deleted file mode 100644
index 1ddabcab0f..0000000000
--- a/keyboards/handwired/cyberstar/cyberstar.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "cyberstar.h"
diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json
index e14b964e21..6e3cb6de3f 100644
--- a/keyboards/handwired/cyberstar/info.json
+++ b/keyboards/handwired/cyberstar/info.json
@@ -8,6 +8,15 @@
         "pid": "0x432A",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B4",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A10", "A14", "B8", "B9"],
+        "rows": ["A15", "B3", "A9", "B5", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/handwired/cyberstar/rules.mk b/keyboards/handwired/cyberstar/rules.mk
index f430af42f4..000ee78e21 100644
--- a/keyboards/handwired/cyberstar/rules.mk
+++ b/keyboards/handwired/cyberstar/rules.mk
@@ -17,5 +17,4 @@ 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
-WS2812_DRIVER = pwm         # Driver for RGB uderglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h
index 23dbfa831c..64364451ff 100644
--- a/keyboards/handwired/d48/config.h
+++ b/keyboards/handwired/d48/config.h
@@ -1,17 +1,7 @@
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { B8, B9, B1, B2, B4 }
-
-#define MATRIX_COL_PINS { A2, B0, A7, A8, A13, A14, B12, B11, B10, B15, B14, B13 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow */
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN A15
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/d48/d48.c b/keyboards/handwired/d48/d48.c
deleted file mode 100644
index 3cc2097bf8..0000000000
--- a/keyboards/handwired/d48/d48.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "d48.h"
diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json
index c607f21937..2c426cd9a5 100644
--- a/keyboards/handwired/d48/info.json
+++ b/keyboards/handwired/d48/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A15"
+    },
+    "matrix_pins": {
+        "cols": ["A2", "B0", "A7", "A8", "A13", "A14", "B12", "B11", "B10", "B15", "B14", "B13"],
+        "rows": ["B8", "B9", "B1", "B2", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "A6"},
diff --git a/keyboards/handwired/d48/taphold.h b/keyboards/handwired/d48/taphold.h
index 3bc5ca0275..2a691aa63f 100644
--- a/keyboards/handwired/d48/taphold.h
+++ b/keyboards/handwired/d48/taphold.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "quantum.h"
 
 typedef enum taphold_mode_t {
diff --git a/keyboards/handwired/dactyl/config.h b/keyboards/handwired/dactyl/config.h
index 61f997b5b4..0b98f64a4f 100644
--- a/keyboards/handwired/dactyl/config.h
+++ b/keyboards/handwired/dactyl/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE  1
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* key combination for command */
 #define IS_COMMAND() ( \
diff --git a/keyboards/handwired/dactyl_left/config.h b/keyboards/handwired/dactyl_left/config.h
index 1e3f256b70..d7658643b7 100644
--- a/keyboards/handwired/dactyl_left/config.h
+++ b/keyboards/handwired/dactyl_left/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS \
-    { D0, B7, B3, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/dactyl_left/dactyl_left.c b/keyboards/handwired/dactyl_left/dactyl_left.c
deleted file mode 100644
index 51a31afbdb..0000000000
--- a/keyboards/handwired/dactyl_left/dactyl_left.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 RedForty
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dactyl_left.h"
diff --git a/keyboards/handwired/dactyl_left/info.json b/keyboards/handwired/dactyl_left/info.json
index 122b5ddf25..e8ce55e001 100644
--- a/keyboards/handwired/dactyl_left/info.json
+++ b/keyboards/handwired/dactyl_left/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "B7", "B3", "B2", "B1", "B0"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "layouts": {
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c
index 2bd1aefadb..5afb908d02 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c
@@ -14,7 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "3x5_3.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
deleted file mode 100644
index 0a03dd9b1f..0000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 @dlford
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_split_3x5_3( \
-    L00, L01, L02, L03, L04,     R00, R01, R02, R03, R04, \
-    L10, L11, L12, L13, L14,     R10, R11, R12, R13, R14, \
-    L20, L21, L22, L23, L24,     R20, R21, R22, R23, R24, \
-              L32, L33, L34,     R30, R31, R32 \
-) { \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { XXX, XXX, L32, L33, L34 }, \
-    { R00, R01, R02, R03, R04 }, \
-    { R10, R11, R12, R13, R14 }, \
-    { R20, R21, R22, R23, R24 }, \
-    { R30, R31, R32, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
index 33f7c9769e..d84e9b6440 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
@@ -16,15 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION ROW2COL
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGB_MATRIX_LED_COUNT 36
 #define RGB_MATRIX_SPLIT { 18, 18 }
 #define RGB_MATRIX_CENTER { 133, 54 }
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
index 7302ced47e..cfe109fb37 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
@@ -8,6 +8,17 @@
         "pid": "0x3536",
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D0"
     },
@@ -17,49 +28,49 @@
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
 
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [4, 0], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 2], "x": 12, "y": 0},
+                {"matrix": [4, 3], "x": 13, "y": 0},
+                {"matrix": [4, 4], "x": 14, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
 
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
+                {"matrix": [5, 0], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1},
+                {"matrix": [5, 3], "x": 13, "y": 1},
+                {"matrix": [5, 4], "x": 14, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
 
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
+                {"matrix": [6, 0], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2},
+                {"matrix": [6, 2], "x": 12, "y": 2},
+                {"matrix": [6, 3], "x": 13, "y": 2},
+                {"matrix": [6, 4], "x": 14, "y": 2},
 
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
 
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3}
+                {"matrix": [7, 0], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 2], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
index b8df581b72..783a2c46b1 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TOGGLE 2 // number of taps to toggle TT
 #define TAPPING_TERM_PER_KEY // milliseconds from tap to hold for mod tap per key
-#define IGNORE_MOD_TAP_INTERRUPT // ignore hold mod if another tap occurs within tapping term
 #define PERMISSIVE_HOLD_PER_KEY // activate mod top hold earlier if another key is pressed AND released per key
 #define QUICK_TAP_TERM_PER_KEY // disable double tap hold key repeat per key
 #undef MOUSEKEY_INTERVAL
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
index 7df7897ae9..bdacde1a85 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
@@ -234,7 +234,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 }
 
 // Dynamic Macro Recording Backlight
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
     is_macro_recording = true;
 }
 
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
index 275ece3219..38ee6f4252 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 # AUDIO_ENABLE = yes          # Audio output
 
 RGB_MATRIX_ENABLE = yes     # Enable WS2812 RGB matrix
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
 
 RGBLIGHT_SUPPORTED = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.c b/keyboards/handwired/dactyl_manuform/4x5/4x5.c
deleted file mode 100644
index 3170eb9399..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/4x5.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x5.h"
diff --git a/keyboards/handwired/dactyl_manuform/4x5/config.h b/keyboards/handwired/dactyl_manuform/4x5/config.h
index 8cb68765ba..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/config.h
@@ -18,14 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json
index 00e052ce3a..ddb96923f4 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3435",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/config.h b/keyboards/handwired/dactyl_manuform/4x5_5/config.h
index d0580b7c21..8904c34114 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/config.h
@@ -3,12 +3,5 @@
 
 #pragma once
 
-
-// Wiring pins
-#define MATRIX_ROW_PINS { F7, B1, B3, B2, B4 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, F6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define EE_HANDS
 #define SPLIT_USB_DETECT
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
index b762c15cf8..e1f8ed4ccd 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3435",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "F6"],
+        "rows": ["F7", "B1", "B3", "B2", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.c b/keyboards/handwired/dactyl_manuform/4x6/4x6.c
deleted file mode 100644
index 5e68c1a9fa..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/4x6.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x6.h"
diff --git a/keyboards/handwired/dactyl_manuform/4x6/config.h b/keyboards/handwired/dactyl_manuform/4x6/config.h
index 64844dd7bf..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/config.h
@@ -18,14 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// row-driven
-#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json
index 5d6bb593ca..61d420c3a5 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3436",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h
index a73cac9ed6..a68c21b215 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h
@@ -9,9 +9,9 @@
 #define SPLIT_HAND_PIN F6
 
 // WS2812 RGB LED strip input and number of LEDs
-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
 #undef RGBLED_NUM
-#define RGB_DI_PIN F4
+#define WS2812_DI_PIN F4
 #define RGBLED_NUM 52
 #define RGBLED_SPLIT {26, 26}
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h
index bfce275567..2db9052799 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h
@@ -7,7 +7,7 @@
 #define USE_I2C
 #define SPLIT_HAND_PIN F6
 
-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
 #undef RGBLED_NUM
 
 #define DEBOUNCE 5
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c
deleted file mode 100644
index a770f5ac40..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x6_5.h"
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
index 64844dd7bf..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
@@ -18,14 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// row-driven
-#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
index e650d4990c..871572c142 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3436",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.c b/keyboards/handwired/dactyl_manuform/5x6/5x6.c
deleted file mode 100644
index 0e9d5481c4..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/5x6.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "5x6.h"
diff --git a/keyboards/handwired/dactyl_manuform/5x6/config.h b/keyboards/handwired/dactyl_manuform/5x6/config.h
index 5abd1a68a2..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/config.h
@@ -18,13 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json
index 28cd7324ba..f5d6f8177d 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3536",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
index fb01f969d3..7eaeceb44a 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE 3
 #define ONESHOT_TAP_TOGGLE 3
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 300
 #ifdef RGBLED_NUM
 #  undef RGBLED_NUM
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
index 44c4234c9b..e97810f8bc 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
@@ -31,8 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_WHEEL_MAX_SPEED   	3
 
 // RGB backlight
-#undef RGB_DI_PIN
-#define RGB_DI_PIN D3
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN D3
 #undef RGBLED_NUM
 #define RGBLED_NUM 30
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
index 5d740986fb..0d3e3d88d2 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 // Rows are doubled-up
 
-#undef RGB_DI_PIN
-#define RGB_DI_PIN F5
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN F5
 
 #undef SOFT_SERIAL_PIN
 #define SOFT_SERIAL_PIN D0
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.c b/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.c
deleted file mode 100644
index 0d1ffd84df..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Jan Christoph Ebersbach
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "5x6_2_5.h"
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h
deleted file mode 100644
index 91cd7800d5..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2020 Jan Christoph Ebersbach
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// left half pro-mirco
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
-
-// // right half adafruit feather
-// #define MATRIX_COL_PINS { F1, F0, B1, B2, B3, D2 }
-// #define MATRIX_ROW_PINS { D6, B7, B6, B5, D7, C6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-// WS2812 RGB LED strip input and number of LEDs
-// #define RGB_DI_PIN D3
-// #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
index f6643ce8c8..aaf843b177 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3536",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0",
         "bootmagic": {
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c
deleted file mode 100644
index e4ad432ccc..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "5x6_5.h"
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/config.h
deleted file mode 100644
index 65c4afbaf8..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// wiring of each half
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-// WS2812 RGB LED strip input and number of LEDs
-// #define RGB_DI_PIN D3
-// #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
index e422a73131..7494e0ecf4 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3536",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0",
         "bootmagic": {
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c
deleted file mode 100644
index dbfb96ce40..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 fgoodwin <fgoodwin@north-tech.net>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "5x6_6.h"
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h
deleted file mode 100644
index 1392cb0b18..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2022 fgoodwin <fgoodwin@north-tech.net>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "quantum.h"
-#pragma once
-
-#define XXX KC_NO
-
-#define LAYOUT_split_5x6_6( \
-    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
-              L42, L43, L44, L45,                          R40, R41, R42, R43, \
-                        L54, L55,                          R50, R51, \
-                        L64, L65,                          R60, R61 \
-) { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { XXX, XXX, L42, L43, L44, L45 }, \
-    { XXX, XXX, XXX, XXX, L54, L55 }, \
-    { XXX, XXX, XXX, XXX, L64, L65 }, \
-\
-    { R00, R01, R02, R03, R04, R05 }, \
-    { R10, R11, R12, R13, R14, R15 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { R40, R41, R42, R43, XXX, XXX }, \
-    { R50, R51, XXX, XXX, XXX, XXX }, \
-    { R60, R61, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/config.h b/keyboards/handwired/dactyl_manuform/5x6_6/config.h
deleted file mode 100644
index 2b99868d19..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_6/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2022 fgoodwin <fgoodwin@north-tech.net>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// wiring of each half
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
\ No newline at end of file
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
index c81ac40fdb..a00a3bda18 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3536",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D3"
     },
@@ -16,83 +21,83 @@
     "layouts": {
         "LAYOUT_split_5x6_6": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
 
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "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},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
 
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
-                {"x": 15, "y": 1},
-                {"x": 16, "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},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
 
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
-                {"x": 15, "y": 2},
-                {"x": 16, "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},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 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},
 
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-                {"x": 16, "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},
 
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
+                {"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},
 
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4},
-                {"x": 7, "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},
 
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
+                {"matrix": [5, 4], "x": 13, "y": 4},
+                {"matrix": [5, 5], "x": 14, "y": 4},
 
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
+                {"matrix": [12, 0], "x": 5, "y": 5},
+                {"matrix": [12, 1], "x": 6, "y": 5},
 
-                {"x": 5, "y": 5},
-                {"x": 6, "y": 5},
-                {"x": 7, "y": 5},
+                {"matrix": [6, 4], "x": 7, "y": 5},
+                {"matrix": [6, 5], "x": 5, "y": 5},
 
-                {"x": 5, "y": 5},
-                {"x": 9, "y": 5},
-                {"x": 10, "y": 5}
+                {"matrix": [13, 0], "x": 9, "y": 5},
+                {"matrix": [13, 1], "x": 10, "y": 5}
             ]
         }
     }
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h
index 44fe0587fc..0b5e296dc8 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h
@@ -5,5 +5,4 @@
 
 
 #define SPLIT_USB_DETECT
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 250
diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.c b/keyboards/handwired/dactyl_manuform/5x7/5x7.c
deleted file mode 100644
index aae28e450c..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/5x7.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "5x7.h"
diff --git a/keyboards/handwired/dactyl_manuform/5x7/config.h b/keyboards/handwired/dactyl_manuform/5x7/config.h
index 38e4b1ab4b..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/config.h
@@ -18,13 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json
index 4eed5d53b4..e5c3b5af86 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3537",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.c b/keyboards/handwired/dactyl_manuform/6x6/6x6.c
deleted file mode 100644
index 7d3524a571..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/6x6.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "6x6.h"
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
index 0f40ee28ac..9639d4ba1d 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS          { B12, B13, B14, B15, A8 , A9, A10}
-#define MATRIX_COL_PINS          { B1, B0, A7, A6, A5, A4}
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 // in col2row col is input, and row is output
 // #define SPLIT_HAND_MATRIX_GRID A10, A4
 // 68kohm
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
index f28579ba5f..0295176c25 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["B12", "B13", "B14", "B15", "A8", "A9", "A10"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "bootmagic": {
             "matrix": [7, 0]
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
index d156461f59..1da1cb9590 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
@@ -16,13 +16,5 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
index 52523980a9..2b542a15da 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
@@ -1,7 +1,15 @@
 {
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c
deleted file mode 100644
index ad213e2b75..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2012 Jun Wako <wakojun@gmail.com>
-// Copyright 2021 Dmitriy Kuminov (@dmik)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "6x6_4.h"
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
index ebf41bd292..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
@@ -18,13 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
index 4e9b444163..2d5dbd2351 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3636",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c
deleted file mode 100644
index a564360b48..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2012 Jun Wako <wakojun@gmail.com>
-// Copyright 2021 Dmitriy Kuminov (@dmik)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "6x6_kinesis.h"
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
index ebf41bd292..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
@@ -18,13 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
index 6c929eb18c..9bf6f6f8bd 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3636",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.c b/keyboards/handwired/dactyl_manuform/6x7/6x7.c
deleted file mode 100644
index eea518da09..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x7/6x7.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Matthew Dews (@matthew-dews)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "6x7.h"
diff --git a/keyboards/handwired/dactyl_manuform/6x7/config.h b/keyboards/handwired/dactyl_manuform/6x7/config.h
index 1cbf1f6545..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x7/config.h
@@ -18,13 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B7 }
-#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json
index b2ea65651e..b289804d36 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x7/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3636",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B7"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c
deleted file mode 100644
index 8d0d95e166..0000000000
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "62key.h"
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
index dd38c6af7d..41af664c25 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
@@ -1,44 +1,9 @@
 #pragma once
 
-
-// MCUs are flipped on each side, relative to the shape of the case,
-// but for ease of mounting, the pinout is not flipped with the controller.
-// The same finger on each hand uses a column connected to the pin with the
-// same silk-screen label on each Pro Micro.
-
-// Pin use:
-//
-//  MCU | Silk | DMOTE
-// -----+------+----------
-//   D3 | TX0  |
-//   D2 | RX1  |
-//   D1 | 2    | LED strip input (dominant half only)
-//   D0 | 3    | Serial interface between halves
-//   D4 | 4    | Outermost pinky-finger column
-//   C6 | 5    | Column
-//   D7 | 6    | Column
-//   E6 | 7    | Column
-//   B4 | 8    | Column
-//   B5 | 9    | Outermost index-finger column
-// -----+------+----------
-//   F4 | A3   |
-//   F5 | A2   |
-//   F6 | A1   | Top row (furthest from user)
-//   F7 | A0   | Row
-//   B1 | 15   | Row
-//   B3 | 14   | Row
-//   B2 | 16   | Row
-//   B6 | 10   | Bottom row (closest to user)
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED, normally used to indicate keyboard state:
 #define RGBLIGHT_EFFECT_KNIGHT
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
 #define RGBLIGHT_EFFECT_CHRISTMAS
 #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-#define RGB_DI_PIN D1
 #define RGBLED_NUM 6           // Used when chaining strips
 #define RGBLED_SPLIT { 3, 3 }  // Used when not chaining strips
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
index d26f06c45b..4d50af4668 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
@@ -10,6 +10,14 @@
         "pid": "0x3632",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "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"
diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h
index dc6f53955c..ab6beb807f 100644
--- a/keyboards/handwired/dactyl_promicro/config.h
+++ b/keyboards/handwired/dactyl_promicro/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* mouse config */
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
@@ -40,9 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Enables This makes it easier for fast typists to use dual-function keys */
 #define PERMISSIVE_HOLD
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c b/keyboards/handwired/dactyl_promicro/dactyl_promicro.c
deleted file mode 100644
index 23f4b13f44..0000000000
--- a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "dactyl_promicro.h"
diff --git a/keyboards/handwired/dactyl_promicro/dactyl_promicro.h b/keyboards/handwired/dactyl_promicro/dactyl_promicro.h
index 61dad7f538..3692a85187 100644
--- a/keyboards/handwired/dactyl_promicro/dactyl_promicro.h
+++ b/keyboards/handwired/dactyl_promicro/dactyl_promicro.h
@@ -2,15 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
-
 #define LAYOUT_6x6(\
     L00, L01, L02, L03, L04, L05,                       R00, R01, R02, R03, R04, R05, \
     L10, L11, L12, L13, L14, L15,                       R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json
index 51451dfcc1..10b7d4364a 100644
--- a/keyboards/handwired/dactyl_promicro/info.json
+++ b/keyboards/handwired/dactyl_promicro/info.json
@@ -8,9 +8,17 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/dactyl_rah/config.h b/keyboards/handwired/dactyl_rah/config.h
index abe8240150..e40f6dfc69 100644
--- a/keyboards/handwired/dactyl_rah/config.h
+++ b/keyboards/handwired/dactyl_rah/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* mouse config */
 #define MOUSEKEY_DELAY          0
 // Lowering MOUSEKEY_INTERVAL raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED (default: 10)
diff --git a/keyboards/handwired/dactyl_rah/dactyl_rah.c b/keyboards/handwired/dactyl_rah/dactyl_rah.c
deleted file mode 100644
index 0058d87992..0000000000
--- a/keyboards/handwired/dactyl_rah/dactyl_rah.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2020 Ralph Azucena <ralphie02@live.com>
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include "dactyl_rah.h"
diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/info.json
index bc21fcee0f..f683a05eda 100644
--- a/keyboards/handwired/dactyl_rah/info.json
+++ b/keyboards/handwired/dactyl_rah/info.json
@@ -8,6 +8,11 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+    "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
diff --git a/keyboards/handwired/daishi/config.h b/keyboards/handwired/daishi/config.h
index 1fefa56fc6..2e6498ab5d 100644
--- a/keyboards/handwired/daishi/config.h
+++ b/keyboards/handwired/daishi/config.h
@@ -17,22 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D6, D7, E0, E1, C0, C1, C2 }
-#define MATRIX_COL_PINS { E6, E7, E3, B0, B1, B2, A6, A5, A4, A3, A2, A1, A0, F7, F6, F5, F4, F3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Set delay for tap_code on rotary encoder */
 #define TAP_CODE_DELAY 10
diff --git a/keyboards/handwired/daishi/daishi.c b/keyboards/handwired/daishi/daishi.c
deleted file mode 100644
index 0442fc0dc5..0000000000
--- a/keyboards/handwired/daishi/daishi.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "daishi.h"
diff --git a/keyboards/handwired/daishi/info.json b/keyboards/handwired/daishi/info.json
index 27671cc28a..7bd1c6dd8d 100644
--- a/keyboards/handwired/daishi/info.json
+++ b/keyboards/handwired/daishi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "E7", "E3", "B0", "B1", "B2", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7", "F6", "F5", "F4", "F3"],
+        "rows": ["D6", "D7", "E0", "E1", "C0", "C1", "C2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F0", "resolution": 2}
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c b/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c
deleted file mode 100644
index 37d67007df..0000000000
--- a/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2022 Commander1024 (@Commander1024)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "quantum.h"
-
-// rotary encoder
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    // Volume control
-    if (clockwise) {
-        tap_code(KC_VOLD);
-    } else {
-        tap_code(KC_VOLU);
-    }
-    return true;
-};
-#endif
diff --git a/keyboards/handwired/ddg_56/config.h b/keyboards/handwired/ddg_56/config.h
deleted file mode 100644
index e46edef395..0000000000
--- a/keyboards/handwired/ddg_56/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B5, B15, B9, B10, A14 }
-#define MATRIX_COL_PINS { A2, B8, B13, B14, B4, B11, B12, A13, A15, A8, A7, A6, B0, B1 }
diff --git a/keyboards/handwired/ddg_56/ddg_56.c b/keyboards/handwired/ddg_56/ddg_56.c
deleted file mode 100644
index 5d24bc74b5..0000000000
--- a/keyboards/handwired/ddg_56/ddg_56.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ddg_56.h"
\ No newline at end of file
diff --git a/keyboards/handwired/ddg_56/ddg_56.h b/keyboards/handwired/ddg_56/ddg_56.h
deleted file mode 100644
index dd0c78bea0..0000000000
--- a/keyboards/handwired/ddg_56/ddg_56.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define LAYOUT( \
-     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,     k0D, k1D, \
-     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,     k2D, k3D, \
-     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
-     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,        k4B, \
-               k41, k42, k43, k44, k45, k46, k47, k48, k49,             k4A, k4C, k4D \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
-    { k30, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \
-}
diff --git a/keyboards/handwired/ddg_56/info.json b/keyboards/handwired/ddg_56/info.json
index f7253711e4..2a0f5df409 100644
--- a/keyboards/handwired/ddg_56/info.json
+++ b/keyboards/handwired/ddg_56/info.json
@@ -8,6 +8,11 @@
     "pid": "0xB195",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["A2", "B8", "B13", "B14", "B4", "B11", "B12", "A13", "A15", "A8", "A7", "A6", "B0", "B1"],
+    "rows": ["B5", "B15", "B9", "B10", "A14"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "A1", "pin_b": "A0"},
@@ -20,11 +25,80 @@
   "layouts": {
       "LAYOUT": {
           "layout": [
-            {"x":0, "y":0.25}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":14, "y":1}, {"x":15, "y":1},
-            {"x":0, "y":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":14, "y":2}, {"x":15, "y":2},
-            {"x":0, "y":2.25}, {"x":1.25, "y":2}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2},
-            {"x":0, "y":3.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3},
-            {"x":14.5, "y":3.25}, {"x":1.3333, "y":4, "w":1.5}, {"x":2.8333, "y":4}, {"x":3.8333, "y":4, "w":1.25}, {"x":5.0833, "y":4}, {"x":6.0833, "y":4, "w":2.25}, {"x":8.3333, "y":4}, {"x":9.3333, "y":4, "w":1.25}, {"x":10.5833, "y":4}, {"x":11.5833, "y":4, "w":1.5}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}]
+            {"matrix": [0, 0], "x": 0, "y": 0.25},
+            {"matrix": [0, 1], "x": 1.25, "y": 0},
+            {"matrix": [0, 2], "x": 2.25, "y": 0},
+            {"matrix": [0, 3], "x": 3.25, "y": 0},
+            {"matrix": [0, 4], "x": 4.25, "y": 0},
+            {"matrix": [0, 5], "x": 5.25, "y": 0},
+            {"matrix": [0, 6], "x": 6.25, "y": 0},
+            {"matrix": [0, 7], "x": 7.25, "y": 0},
+            {"matrix": [0, 8], "x": 8.25, "y": 0},
+            {"matrix": [0, 9], "x": 9.25, "y": 0},
+            {"matrix": [0, 10], "x": 10.25, "y": 0},
+            {"matrix": [0, 11], "x": 11.25, "y": 0},
+            {"matrix": [0, 12], "x": 12.25, "y": 0},
+
+            {"matrix": [0, 13], "x": 14, "y": 1},
+            {"matrix": [1, 13], "x": 15, "y": 1},
+            {"matrix": [1, 0], "x": 0, "y": 1.25},
+            {"matrix": [1, 1], "x": 1.25, "y": 1},
+            {"matrix": [1, 2], "x": 2.25, "y": 1},
+            {"matrix": [1, 3], "x": 3.25, "y": 1},
+            {"matrix": [1, 4], "x": 4.25, "y": 1},
+            {"matrix": [1, 5], "x": 5.25, "y": 1},
+            {"matrix": [1, 6], "x": 6.25, "y": 1},
+            {"matrix": [1, 7], "x": 7.25, "y": 1},
+            {"matrix": [1, 8], "x": 8.25, "y": 1},
+            {"matrix": [1, 9], "x": 9.25, "y": 1},
+            {"matrix": [1, 10], "x": 10.25, "y": 1},
+            {"matrix": [1, 11], "x": 11.25, "y": 1},
+            {"matrix": [1, 12], "x": 12.25, "y": 1},
+
+            {"matrix": [2, 13], "x": 14, "y": 2},
+            {"matrix": [3, 13], "x": 15, "y": 2},
+            {"matrix": [2, 0], "x": 0, "y": 2.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": [2, 6], "x": 6.25, "y": 2},
+            {"matrix": [2, 7], "x": 7.25, "y": 2},
+            {"matrix": [2, 8], "x": 8.25, "y": 2},
+            {"matrix": [2, 9], "x": 9.25, "y": 2},
+            {"matrix": [2, 10], "x": 10.25, "y": 2},
+            {"matrix": [2, 11], "x": 11.25, "y": 2},
+            {"matrix": [2, 12], "x": 12.25, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3.25},
+            {"matrix": [3, 1], "x": 1.25, "y": 3},
+            {"matrix": [3, 2], "x": 2.25, "y": 3},
+            {"matrix": [3, 3], "x": 3.25, "y": 3},
+            {"matrix": [3, 4], "x": 4.25, "y": 3},
+            {"matrix": [3, 5], "x": 5.25, "y": 3},
+            {"matrix": [3, 6], "x": 6.25, "y": 3},
+            {"matrix": [3, 7], "x": 7.25, "y": 3},
+            {"matrix": [3, 8], "x": 8.25, "y": 3},
+            {"matrix": [3, 9], "x": 9.25, "y": 3},
+            {"matrix": [3, 10], "x": 10.25, "y": 3},
+            {"matrix": [3, 11], "x": 11.25, "y": 3},
+            {"matrix": [3, 12], "x": 12.25, "y": 3},
+            {"matrix": [4, 11], "x": 14.5, "y": 3.25},
+
+            {"matrix": [4, 1], "x": 1.3333, "y": 4, "w": 1.5},
+            {"matrix": [4, 2], "x": 2.8333, "y": 4},
+            {"matrix": [4, 3], "x": 3.8333, "y": 4, "w": 1.25},
+            {"matrix": [4, 4], "x": 5.0833, "y": 4},
+            {"matrix": [4, 5], "x": 6.0833, "y": 4, "w": 2.25},
+            {"matrix": [4, 6], "x": 8.3333, "y": 4},
+            {"matrix": [4, 7], "x": 9.3333, "y": 4, "w": 1.25},
+            {"matrix": [4, 8], "x": 10.5833, "y": 4},
+            {"matrix": [4, 9], "x": 11.5833, "y": 4, "w": 1.5},
+            {"matrix": [4, 10], "x": 13.5, "y": 4.25},
+            {"matrix": [4, 12], "x": 14.5, "y": 4.25},
+            {"matrix": [4, 13], "x": 15.5, "y": 4.25}
+          ]
       }
   }
 }
diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json
index 312a0693a9..5c287bcc7e 100644
--- a/keyboards/handwired/dygma/raise/info.json
+++ b/keyboards/handwired/dygma/raise/info.json
@@ -8,6 +8,9 @@
         "pid": "0x2201",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411",
diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
index 362a47d7da..761e075500 100644
--- a/keyboards/handwired/dygma/raise/rules.mk
+++ b/keyboards/handwired/dygma/raise/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 CUSTOM_MATRIX = lite
 
 # TODO(ibash) we don't actually need to enable raw, but there's some side effect
diff --git a/keyboards/handwired/eagleii/config.h b/keyboards/handwired/eagleii/config.h
deleted file mode 100644
index 7ebd3a4a8c..0000000000
--- a/keyboards/handwired/eagleii/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-
-#define MATRIX_ROW_PINS { D0, B5, F1, B2, F7, F6, D4, D7, B4, B7, F5, B0 }
-#define MATRIX_COL_PINS { D2, C6, E6, D5, B3, D3, D1, C7, F0, B6, B1, F4 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/eagleii/eagleii.c b/keyboards/handwired/eagleii/eagleii.c
deleted file mode 100644
index 5abd5b92f9..0000000000
--- a/keyboards/handwired/eagleii/eagleii.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "eagleii.h"
diff --git a/keyboards/handwired/eagleii/info.json b/keyboards/handwired/eagleii/info.json
index 23730b8af6..e84808c71d 100644
--- a/keyboards/handwired/eagleii/info.json
+++ b/keyboards/handwired/eagleii/info.json
@@ -8,6 +8,11 @@
         "pid": "0x9789",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "C6", "E6", "D5", "B3", "D3", "D1", "C7", "F0", "B6", "B1", "F4"],
+        "rows": ["D0", "B5", "F1", "B2", "F7", "F6", "D4", "D7", "B4", "B7", "F5", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/elrgo_s/config.h b/keyboards/handwired/elrgo_s/config.h
deleted file mode 100644
index 40b3f759d8..0000000000
--- a/keyboards/handwired/elrgo_s/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2021 Yaroslav Smirnov <elorenn@bk.ru>
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
-
-#pragma once
-
-
-// Wiring of each half
-#define MATRIX_ROW_PINS { B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-// Reversed sort
-
-#define DIODE_DIRECTION COL2ROW
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/elrgo_s/elrgo_s.c b/keyboards/handwired/elrgo_s/elrgo_s.c
deleted file mode 100644
index 32640da061..0000000000
--- a/keyboards/handwired/elrgo_s/elrgo_s.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Yaroslav Smirnov <elorenn@bk.ru>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */ 
-
-#include "elrgo_s.h"
diff --git a/keyboards/handwired/elrgo_s/elrgo_s.h b/keyboards/handwired/elrgo_s/elrgo_s.h
deleted file mode 100644
index 0fb2b58e51..0000000000
--- a/keyboards/handwired/elrgo_s/elrgo_s.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 Yaroslav Smirnov <elorenn@bk.ru>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT_split_3x6_5(\
-    L00, L01, L02, L03, L04, L05,                       R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,                       R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,                       R20, R21, R22, R23, R24, R25, \
-         L31, L32, L33, L34, L35,                       R30, R31, R32, R33, R34 \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05 }, \
-        { L10, L11, L12, L13, L14, L15 }, \
-        { L20, L21, L22, L23, L24, L25 }, \
-        {KC_NO, L31, L32, L33, L34, L35}, \
-                                          \
-        { R00, R01, R02, R03, R04, R05 }, \
-        { R10, R11, R12, R13, R14, R15 }, \
-        { R20, R21, R22, R23, R24, R25 }, \
-        { R30, R31, R32, R33, R34, KC_NO} \
-}
diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json
index 33e3c7566c..9a43e14c88 100644
--- a/keyboards/handwired/elrgo_s/info.json
+++ b/keyboards/handwired/elrgo_s/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3436",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
@@ -16,52 +21,61 @@
     "layouts": {
         "LAYOUT_split_3x6_5": {
             "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0},
-                {"label":"R00", "x":9, "y":0},
-                {"label":"R01", "x":10, "y":0},
-                {"label":"R02", "x":11, "y":0},
-                {"label":"R03", "x":12, "y":0},
-                {"label":"R04", "x":13, "y":0},
-                {"label":"R05", "x":14, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1},
-                {"label":"R10", "x":9, "y":1},
-                {"label":"R11", "x":10, "y":1},
-                {"label":"R12", "x":11, "y":1},
-                {"label":"R13", "x":12, "y":1},
-                {"label":"R14", "x":13, "y":1},
-                {"label":"R15", "x":14, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2},
-                {"label":"R20", "x":9, "y":2},
-                {"label":"R21", "x":10, "y":2},
-                {"label":"R22", "x":11, "y":2},
-                {"label":"R23", "x":12, "y":2},
-                {"label":"R24", "x":13, "y":2},
-                {"label":"R25", "x":14, "y":2},
-                {"label":"L31", "x":3, "y":3},
-                {"label":"L32", "x":4, "y":3},
-                {"label":"L33", "x":5, "y":3},
-                {"label":"L34", "x":6, "y":3},
-                {"label":"L35", "x":6, "y":2},
-                {"label":"R30", "x":8, "y":2},
-                {"label":"R31", "x":8, "y":3},
-                {"label":"R32", "x":9, "y":3},
-                {"label":"R33", "x":10, "y":3},
-                {"label":"R34", "x":11, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "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/ergocheap/config.h b/keyboards/handwired/ergocheap/config.h
index 61946adcd2..4458922746 100644
--- a/keyboards/handwired/ergocheap/config.h
+++ b/keyboards/handwired/ergocheap/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A8, A9, B14, B12, B13, B15, B3, B11, A4, A5, A6, A7, B0, B1, B10 }
-#define MATRIX_ROW_PINS { B5, B6, B7, B9, B8 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 500
 #define PERMISSIVE_HOLD
 
diff --git a/keyboards/handwired/ergocheap/ergocheap.c b/keyboards/handwired/ergocheap/ergocheap.c
deleted file mode 100644
index ab5cf8a0a7..0000000000
--- a/keyboards/handwired/ergocheap/ergocheap.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2021 xSteins <itsmesteins@gmail.com>
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#include "ergocheap.h"
\ No newline at end of file
diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/info.json
index 959a4299f5..097a4e6278 100644
--- a/keyboards/handwired/ergocheap/info.json
+++ b/keyboards/handwired/ergocheap/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6942",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A8", "A9", "B14", "B12", "B13", "B15", "B3", "B11", "A4", "A5", "A6", "A7", "B0", "B1", "B10"],
+        "rows": ["B5", "B6", "B7", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
diff --git a/keyboards/handwired/evk/v1_3/config.h b/keyboards/handwired/evk/v1_3/config.h
index a43abb351a..1b4e5a6d87 100644
--- a/keyboards/handwired/evk/v1_3/config.h
+++ b/keyboards/handwired/evk/v1_3/config.h
@@ -15,25 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { B0, B1, B2, B3, B7, D0 }
-#define MATRIX_COL_PINS \
-    { D1, D2, D3, C6, C7, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL // the positive current flows into the rows and then out of the columns negative.
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/info.json
index bc6a522003..10564bb2a7 100644
--- a/keyboards/handwired/evk/v1_3/info.json
+++ b/keyboards/handwired/evk/v1_3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D0"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "D4"
     },
diff --git a/keyboards/handwired/fc200rt_qmk/config.h b/keyboards/handwired/fc200rt_qmk/config.h
index 055c910e8b..82fe0166b2 100644
--- a/keyboards/handwired/fc200rt_qmk/config.h
+++ b/keyboards/handwired/fc200rt_qmk/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6, B7, D0, D1 }
-#define MATRIX_COL_PINS { D2, D3, C6, C7, D5, D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.c b/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.c
deleted file mode 100644
index 3e38e5e2fd..0000000000
--- a/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 NaCly
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "fc200rt_qmk.h"
diff --git a/keyboards/handwired/fc200rt_qmk/info.json b/keyboards/handwired/fc200rt_qmk/info.json
index ebbd75ee7e..395b42bcc8 100644
--- a/keyboards/handwired/fc200rt_qmk/info.json
+++ b/keyboards/handwired/fc200rt_qmk/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFFFF",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"],
+        "rows": ["B0", "B1", "B2", "B3", "E6", "B7", "D0", "D1"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "layouts": {
diff --git a/keyboards/handwired/fivethirteen/config.h b/keyboards/handwired/fivethirteen/config.h
index 5f5fef769b..b9449c4714 100644
--- a/keyboards/handwired/fivethirteen/config.h
+++ b/keyboards/handwired/fivethirteen/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F6, F7, B6, B5, B4 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, F0, D0, D1, D2, D3, C6, C7, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/fivethirteen/fivethirteen.c b/keyboards/handwired/fivethirteen/fivethirteen.c
deleted file mode 100644
index 2d71560bf6..0000000000
--- a/keyboards/handwired/fivethirteen/fivethirteen.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "fivethirteen.h"
diff --git a/keyboards/handwired/fivethirteen/info.json b/keyboards/handwired/fivethirteen/info.json
index 0a23ba02a2..66e51571e2 100644
--- a/keyboards/handwired/fivethirteen/info.json
+++ b/keyboards/handwired/fivethirteen/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "F0", "D0", "D1", "D2", "D3", "C6", "C7", "D6", "D7"],
+    "rows": ["F6", "F7", "B6", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/handwired/floorboard/config.h b/keyboards/handwired/floorboard/config.h
index cb020114b2..af56b8a7fe 100644
--- a/keyboards/handwired/floorboard/config.h
+++ b/keyboards/handwired/floorboard/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A2, A1, A0, B8 }
-#define MATRIX_COL_PINS { B7, B6, B5, B4, B3, B2, B1, B9, B0, B15, B14, B13 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/floorboard/floorboard.c b/keyboards/handwired/floorboard/floorboard.c
deleted file mode 100644
index 6317f66acc..0000000000
--- a/keyboards/handwired/floorboard/floorboard.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Kevin Lockwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "floorboard.h"
diff --git a/keyboards/handwired/floorboard/floorboard.h b/keyboards/handwired/floorboard/floorboard.h
deleted file mode 100644
index de7f49c01d..0000000000
--- a/keyboards/handwired/floorboard/floorboard.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 Kevin Lockwood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
diff --git a/keyboards/handwired/floorboard/info.json b/keyboards/handwired/floorboard/info.json
index 226041e40d..262a26afb6 100644
--- a/keyboards/handwired/floorboard/info.json
+++ b/keyboards/handwired/floorboard/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4", "B3", "B2", "B1", "B9", "B0", "B15", "B14", "B13"],
+        "rows": ["A2", "A1", "A0", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
@@ -15,57 +20,57 @@
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/handwired/frankie_macropad/config.h b/keyboards/handwired/frankie_macropad/config.h
index 577b27b372..fb1f9c3715 100644
--- a/keyboards/handwired/frankie_macropad/config.h
+++ b/keyboards/handwired/frankie_macropad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2 }
-#define MATRIX_COL_PINS { B3, B4, B5, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/frankie_macropad/frankie_macropad.c b/keyboards/handwired/frankie_macropad/frankie_macropad.c
deleted file mode 100644
index 5f89811e7a..0000000000
--- a/keyboards/handwired/frankie_macropad/frankie_macropad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Eric Wood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "frankie_macropad.h"
diff --git a/keyboards/handwired/frankie_macropad/frankie_macropad.h b/keyboards/handwired/frankie_macropad/frankie_macropad.h
deleted file mode 100644
index cfd3124ba1..0000000000
--- a/keyboards/handwired/frankie_macropad/frankie_macropad.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Eric Wood
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-              k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23  \
-) { \
-    { ___, ___, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }  \
-}
diff --git a/keyboards/handwired/frankie_macropad/info.json b/keyboards/handwired/frankie_macropad/info.json
index 24fb55f5da..24da71eb8d 100644
--- a/keyboards/handwired/frankie_macropad/info.json
+++ b/keyboards/handwired/frankie_macropad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B4", "B5", "B6"],
+        "rows": ["B0", "B1", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1"},
@@ -22,18 +27,18 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k02", "x": 2, "y": 0},
-                {"label": "k03", "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label": "k10", "x": 0, "y": 1},
-                {"label": "k11", "x": 1, "y": 1},
-                {"label": "k12", "x": 2, "y": 1},
-                {"label": "k13", "x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label": "k20", "x": 0, "y": 2},
-                {"label": "k21", "x": 1, "y": 2},
-                {"label": "k22", "x": 2, "y": 2},
-                {"label": "k23", "x": 3, "y": 2}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h
index b9ebeee96b..fc5d819060 100644
--- a/keyboards/handwired/frenchdev/config.h
+++ b/keyboards/handwired/frenchdev/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE  1
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* key combination for command */
 #define IS_COMMAND() ( \
diff --git a/keyboards/handwired/freoduo/config.h b/keyboards/handwired/freoduo/config.h
index 56a55afd7c..232d5638eb 100644
--- a/keyboards/handwired/freoduo/config.h
+++ b/keyboards/handwired/freoduo/config.h
@@ -15,17 +15,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* wiring of each half */
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B2, B6, F6, B3, B1, F7 }
 #define EE_HANDS
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D4
 #if !defined(RGBLED_NUM)
 #    define RGBLED_NUM 30
 #    define RGBLIGHT_SPLIT
diff --git a/keyboards/handwired/freoduo/freoduo.c b/keyboards/handwired/freoduo/freoduo.c
deleted file mode 100644
index f60e78f43a..0000000000
--- a/keyboards/handwired/freoduo/freoduo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Filip Paryż (@FilipParyz)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "freoduo.h"
diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json
index 12024a8c90..90b34f29d4 100644
--- a/keyboards/handwired/freoduo/info.json
+++ b/keyboards/handwired/freoduo/info.json
@@ -8,9 +8,17 @@
     "pid": "0x0602",
     "device_version": "0.0.1"
 },
+"matrix_pins": {
+    "cols": ["B2", "B6", "F6", "B3", "B1", "F7"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+},
+"diode_direction": "COL2ROW",
 "split": {
     "soft_serial_pin": "D0"
 },
+"ws2812": {
+    "pin": "D4"
+},
 "processor": "atmega32u4",
 "bootloader": "caterina",
 "debounce": 3,
diff --git a/keyboards/handwired/fruity60/config.h b/keyboards/handwired/fruity60/config.h
index c325baca18..091cb7b510 100644
--- a/keyboards/handwired/fruity60/config.h
+++ b/keyboards/handwired/fruity60/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { B6, B5, D7, C6, D0, D1 }
-#define MATRIX_COL_PINS \
-    { F7, F6, F5, F4, F1, F0, D2, D3, B7, D6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/fruity60/fruity60.c b/keyboards/handwired/fruity60/fruity60.c
deleted file mode 100644
index 0640382676..0000000000
--- a/keyboards/handwired/fruity60/fruity60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Yan-Fa Li
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "fruity60.h"
diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json
index 0cffe5b5b2..fdfc177264 100644
--- a/keyboards/handwired/fruity60/info.json
+++ b/keyboards/handwired/fruity60/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB170",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "B7", "D6", "C7"],
+        "rows": ["B6", "B5", "D7", "C6", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["60_tsangan_hhkb"],
diff --git a/keyboards/handwired/gamenum/config.h b/keyboards/handwired/gamenum/config.h
index 95477b88f0..b9449c4714 100644
--- a/keyboards/handwired/gamenum/config.h
+++ b/keyboards/handwired/gamenum/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/gamenum/gamenum.c b/keyboards/handwired/gamenum/gamenum.c
index 8048194bbc..25493d94c3 100644
--- a/keyboards/handwired/gamenum/gamenum.c
+++ b/keyboards/handwired/gamenum/gamenum.c
@@ -1,4 +1,4 @@
-#include "gamenum.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
diff --git a/keyboards/handwired/gamenum/gamenum.h b/keyboards/handwired/gamenum/gamenum.h
deleted file mode 100644
index 48883b1185..0000000000
--- a/keyboards/handwired/gamenum/gamenum.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, \
-    k30, k31, k32, \
-         k41, k42, k43 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, XXX }, \
-    { k30, k31, k32, XXX }, \
-    { XXX, k41, k42, k43 } \
-}
diff --git a/keyboards/handwired/gamenum/info.json b/keyboards/handwired/gamenum/info.json
index daf77d1784..bb12b3b1f7 100644
--- a/keyboards/handwired/gamenum/info.json
+++ b/keyboards/handwired/gamenum/info.json
@@ -8,28 +8,37 @@
     "pid": "0x5678",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "E6", "B4", "B5"],
+    "rows": ["B6", "B2", "B3", "B1", "F7"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"Fn", "x":0, "y":0}, 
-        {"label":"/", "x":1, "y":0}, 
-        {"label":"*", "x":2, "y":0}, 
-        {"label":"-", "x":3, "y":0}, 
-        {"label":"7", "x":0, "y":1}, 
-        {"label":"8", "x":1, "y":1}, 
-        {"label":"9", "x":2, "y":1}, 
-        {"label":"+", "x":3, "y":1, "h":2}, 
-        {"label":"4", "x":0, "y":2}, 
-        {"label":"5", "x":1, "y":2}, 
-        {"label":"6", "x":2, "y":2}, 
-        {"label":"1", "x":0, "y":3}, 
-        {"label":"2", "x":1, "y":3}, 
-        {"label":"3", "x":2, "y":3}, 
-        {"label":"0", "x":0, "y":4, "w":2}, 
-        {"label":".", "x":2, "y":4}, 
-        {"label":"Ent", "x":3, "y":3, "h":2}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+
+        {"matrix": [4, 1], "x": 0, "y": 4, "w": 2},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
       ]
     }
   }
diff --git a/keyboards/handwired/hacked_motospeed/config.h b/keyboards/handwired/hacked_motospeed/config.h
index 2f3caa2b2f..f968fcc0d7 100644
--- a/keyboards/handwired/hacked_motospeed/config.h
+++ b/keyboards/handwired/hacked_motospeed/config.h
@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-//                        WR  XR  YR  ZR  VR  ZL  YL  XL  WL  VL
-#define MATRIX_ROW_PINS { B3, B4, F1, B5, B6, D5, D4, D6, D7, C4}
-
-//                        ER  DR  CR  BR  AR  FR  FL  AL  BL  CL  DL  EL
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F3, F2, E0, E1, C0, C1, C2, C3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 #define MATRIX_HAS_GHOST
 
diff --git a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c b/keyboards/handwired/hacked_motospeed/hacked_motospeed.c
deleted file mode 100644
index f6a394b731..0000000000
--- a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Vladislav Opara <Deckweiss75@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hacked_motospeed.h"
diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json
index 57b66e3bdf..c64931a74b 100644
--- a/keyboards/handwired/hacked_motospeed/info.json
+++ b/keyboards/handwired/hacked_motospeed/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0690",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "F4", "F3", "F2", "E0", "E1", "C0", "C1", "C2", "C3"],
+    "rows": ["B3", "B4", "F1", "B5", "B6", "D5", "D4", "D6", "D7", "C4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h
index 0051981fc1..3999283535 100644
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/config.h
@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { D3, D2, D1, D0 }
-#define MATRIX_COL_PINS \
-    { C6, D7, E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D4
-#ifdef RGB_DI_PIN
 	#define RGBLED_NUM 6
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
@@ -54,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/heisenberg/heisenberg.c b/keyboards/handwired/heisenberg/heisenberg.c
deleted file mode 100644
index 54c8bdae95..0000000000
--- a/keyboards/handwired/heisenberg/heisenberg.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Arda Kilicdagi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "heisenberg.h"
\ No newline at end of file
diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json
index 2ad37b00c6..e92e0f7b4b 100644
--- a/keyboards/handwired/heisenberg/info.json
+++ b/keyboards/handwired/heisenberg/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D4"
+  },
+  "matrix_pins": {
+    "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+    "rows": ["D3", "D2", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["planck_mit"],
diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h
index 69c1beb03c..53cf5bbc0f 100644
--- a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h
+++ b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h
@@ -20,5 +20,4 @@
 
 #define RETRO_TAPPING
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
-#define QUICK_TAP_TERM 0
\ No newline at end of file
+#define QUICK_TAP_TERM 0
diff --git a/keyboards/handwired/hexon38/config.h b/keyboards/handwired/hexon38/config.h
deleted file mode 100644
index 5a75dff220..0000000000
--- a/keyboards/handwired/hexon38/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// see https://github.com/pepaslabs/hexon38
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, F0, B2, F4 }
-#define MATRIX_COL_PINS { C6, D3, D2, D1, D0, B7, F6, F7, B6, B5, B4, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/handwired/hexon38/hexon38.c b/keyboards/handwired/hexon38/hexon38.c
deleted file mode 100644
index d830adef3c..0000000000
--- a/keyboards/handwired/hexon38/hexon38.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// see https://github.com/pepaslabs/hexon38
-
-#include "hexon38.h"
diff --git a/keyboards/handwired/hexon38/info.json b/keyboards/handwired/hexon38/info.json
index a0ea12aae5..2f22eeeaf8 100644
--- a/keyboards/handwired/hexon38/info.json
+++ b/keyboards/handwired/hexon38/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D3", "D2", "D1", "D0", "B7", "F6", "F7", "B6", "B5", "B4", "D7"],
+        "rows": ["B0", "F0", "B2", "F4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "layouts": {
diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h
index 2face5fbed..bfa158713d 100644
--- a/keyboards/handwired/hnah108/config.h
+++ b/keyboards/handwired/hnah108/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, C7, B4, B5, B6, C6 }
-#define MATRIX_COL_PINS { F0, E6, B0, D0, D1, D2, D3, D5, D4, D6, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 30
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/handwired/hnah108/hnah108.c b/keyboards/handwired/hnah108/hnah108.c
index 20cbe941fd..fde7b16564 100644
--- a/keyboards/handwired/hnah108/hnah108.c
+++ b/keyboards/handwired/hnah108/hnah108.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hnah108.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
diff --git a/keyboards/handwired/hnah108/hnah108.h b/keyboards/handwired/hnah108/hnah108.h
deleted file mode 100644
index a11f9fc6d5..0000000000
--- a/keyboards/handwired/hnah108/hnah108.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,   k83, k84, k85,   k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                    k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \
-}
-
-#define LAYOUT_fullsize_iso( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81,        k83, k84, k85,   k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                    k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, XXX, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,   k83, k84, k85,   k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91,      k94,                    k96, k97, k88, \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, XXX, k94, k95, k96, k97, k98, k99, k9A } \
-}
diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json
index 116591fddf..4d7d3e0386 100644
--- a/keyboards/handwired/hnah108/info.json
+++ b/keyboards/handwired/hnah108/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0000",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "E6", "B0", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "C7", "B4", "B5", "B6", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B3"}
@@ -18,346 +26,406 @@
         "levels": 4,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 18.5, "y": 0},
-                {"x": 19.5, "y": 0},
-                {"x": 20.5, "y": 0},
-                {"x": 21.5, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                {"x": 18.5, "y": 1.25},
-                {"x": 19.5, "y": 1.25},
-                {"x": 20.5, "y": 1.25},
-                {"x": 21.5, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-                {"x": 18.5, "y": 2.25},
-                {"x": 19.5, "y": 2.25},
-                {"x": 20.5, "y": 2.25},
-                {"x": 21.5, "y": 2.25, "h": 2},
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 13.75, "y": 3.25, "w": 1.25},
-                {"x": 18.5, "y": 3.25},
-                {"x": 19.5, "y": 3.25},
-                {"x": 20.5, "y": 3.25},
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-                {"x": 16.25, "y": 4.25},
-                {"x": 18.5, "y": 4.25},
-                {"x": 19.5, "y": 4.25},
-                {"x": 20.5, "y": 4.25},
-                {"x": 21.5, "y": 4.25, "h": 2},
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25},
-                {"x": 18.5, "y": 5.25, "w": 2},
-                {"x": 20.5, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [6, 0], "x": 13, "y": 0},
+                {"matrix": [6, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 2], "x": 15.25, "y": 0},
+                {"matrix": [6, 3], "x": 16.25, "y": 0},
+                {"matrix": [6, 4], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 18.5, "y": 0},
+                {"matrix": [6, 6], "x": 19.5, "y": 0},
+                {"matrix": [6, 7], "x": 20.5, "y": 0},
+                {"matrix": [6, 8], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [7, 0], "x": 11, "y": 1.25},
+                {"matrix": [7, 1], "x": 12, "y": 1.25},
+                {"matrix": [7, 2], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 3], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 4], "x": 16.25, "y": 1.25},
+                {"matrix": [7, 5], "x": 17.25, "y": 1.25},
+
+                {"matrix": [7, 6], "x": 18.5, "y": 1.25},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.25},
+                {"matrix": [7, 8], "x": 20.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [8, 3], "x": 15.25, "y": 2.25},
+                {"matrix": [8, 4], "x": 16.25, "y": 2.25},
+                {"matrix": [8, 5], "x": 17.25, "y": 2.25},
+
+                {"matrix": [8, 6], "x": 18.5, "y": 2.25},
+                {"matrix": [8, 7], "x": 19.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 20.5, "y": 2.25},
+                {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 3], "x": 12.75, "y": 3.25},
+                {"matrix": [9, 4], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [9, 6], "x": 18.5, "y": 3.25},
+                {"matrix": [9, 7], "x": 19.5, "y": 3.25},
+                {"matrix": [8, 8], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 0], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 5], "x": 16.25, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 20.5, "y": 4.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.25},
+
+                {"matrix": [9, 10], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [8, 10], "x": 20.5, "y": 5.25}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 18.5, "y": 0},
-                {"x": 19.5, "y": 0},
-                {"x": 20.5, "y": 0},
-                {"x": 21.5, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                {"x": 18.5, "y": 1.25},
-                {"x": 19.5, "y": 1.25},
-                {"x": 20.5, "y": 1.25},
-                {"x": 21.5, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-                {"x": 18.5, "y": 2.25},
-                {"x": 19.5, "y": 2.25},
-                {"x": 20.5, "y": 2.25},
-                {"x": 21.5, "y": 2.25, "h": 2},
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 18.5, "y": 3.25},
-                {"x": 19.5, "y": 3.25},
-                {"x": 20.5, "y": 3.25},
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-                {"x": 16.25, "y": 4.25},
-                {"x": 18.5, "y": 4.25},
-                {"x": 19.5, "y": 4.25},
-                {"x": 20.5, "y": 4.25},
-                {"x": 21.5, "y": 4.25, "h": 2},
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25},
-                {"x": 18.5, "y": 5.25, "w": 2},
-                {"x": 20.5, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [6, 0], "x": 13, "y": 0},
+                {"matrix": [6, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 2], "x": 15.25, "y": 0},
+                {"matrix": [6, 3], "x": 16.25, "y": 0},
+                {"matrix": [6, 4], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 18.5, "y": 0},
+                {"matrix": [6, 6], "x": 19.5, "y": 0},
+                {"matrix": [6, 7], "x": 20.5, "y": 0},
+                {"matrix": [6, 8], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [7, 0], "x": 11, "y": 1.25},
+                {"matrix": [7, 1], "x": 12, "y": 1.25},
+                {"matrix": [7, 2], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 3], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 4], "x": 16.25, "y": 1.25},
+                {"matrix": [7, 5], "x": 17.25, "y": 1.25},
+
+                {"matrix": [7, 6], "x": 18.5, "y": 1.25},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.25},
+                {"matrix": [7, 8], "x": 20.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 4], "x": 15.25, "y": 2.25},
+                {"matrix": [8, 5], "x": 16.25, "y": 2.25},
+                {"matrix": [8, 6], "x": 17.25, "y": 2.25},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.25},
+                {"matrix": [6, 10], "x": 20.5, "y": 2.25},
+                {"matrix": [3, 0], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 4], "x": 12.75, "y": 3.25},
+
+                {"matrix": [9, 6], "x": 18.5, "y": 3.25},
+                {"matrix": [9, 7], "x": 19.5, "y": 3.25},
+                {"matrix": [8, 8], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 0], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 5], "x": 16.25, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 20.5, "y": 4.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.25},
+
+                {"matrix": [9, 10], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [8, 10], "x": 20.5, "y": 5.25}
             ]
         },
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 18.5, "y": 0},
-                {"x": 19.5, "y": 0},
-                {"x": 20.5, "y": 0},
-                {"x": 21.5, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                {"x": 18.5, "y": 1.25},
-                {"x": 19.5, "y": 1.25},
-                {"x": 20.5, "y": 1.25},
-                {"x": 21.5, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-                {"x": 18.5, "y": 2.25},
-                {"x": 19.5, "y": 2.25},
-                {"x": 20.5, "y": 2.25},
-                {"x": 21.5, "y": 2.25, "h": 2},
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25, "w": 2.25},
-                {"x": 18.5, "y": 3.25},
-                {"x": 19.5, "y": 3.25},
-                {"x": 20.5, "y": 3.25},
-                {"x": 0, "y": 4.25, "w": 2.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-                {"x": 16.25, "y": 4.25},
-                {"x": 18.5, "y": 4.25},
-                {"x": 19.5, "y": 4.25},
-                {"x": 20.5, "y": 4.25},
-                {"x": 21.5, "y": 4.25, "h": 2},
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25},
-                {"x": 18.5, "y": 5.25, "w": 2},
-                {"x": 20.5, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [6, 0], "x": 13, "y": 0},
+                {"matrix": [6, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 2], "x": 15.25, "y": 0},
+                {"matrix": [6, 3], "x": 16.25, "y": 0},
+                {"matrix": [6, 4], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 18.5, "y": 0},
+                {"matrix": [6, 6], "x": 19.5, "y": 0},
+                {"matrix": [6, 7], "x": 20.5, "y": 0},
+                {"matrix": [6, 8], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [7, 0], "x": 11, "y": 1.25},
+                {"matrix": [7, 1], "x": 12, "y": 1.25},
+                {"matrix": [7, 2], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 3], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 4], "x": 16.25, "y": 1.25},
+                {"matrix": [7, 5], "x": 17.25, "y": 1.25},
+
+                {"matrix": [7, 6], "x": 18.5, "y": 1.25},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.25},
+                {"matrix": [7, 8], "x": 20.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [8, 3], "x": 15.25, "y": 2.25},
+                {"matrix": [8, 4], "x": 16.25, "y": 2.25},
+                {"matrix": [8, 5], "x": 17.25, "y": 2.25},
+
+                {"matrix": [8, 6], "x": 18.5, "y": 2.25},
+                {"matrix": [8, 7], "x": 19.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 20.5, "y": 2.25},
+                {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 4], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [9, 6], "x": 18.5, "y": 3.25},
+                {"matrix": [9, 7], "x": 19.5, "y": 3.25},
+                {"matrix": [8, 8], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 0], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 5], "x": 16.25, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 20.5, "y": 4.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.25},
+
+                {"matrix": [9, 10], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [8, 10], "x": 20.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/handwired/hnah108/rules.mk b/keyboards/handwired/hnah108/rules.mk
index ae9acc534f..ec5f27bde8 100644
--- a/keyboards/handwired/hnah108/rules.mk
+++ b/keyboards/handwired/hnah108/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/handwired/hnah40/config.h b/keyboards/handwired/hnah40/config.h
index 083450a743..3ebccf9ad2 100644
--- a/keyboards/handwired/hnah40/config.h
+++ b/keyboards/handwired/hnah40/config.h
@@ -16,26 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B4, B5, B3, D4 }
-#define MATRIX_COL_PINS { B0, D7, D6, D5, B2, B1, C0, C1, C2, C3, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/hnah40/hnah40.c b/keyboards/handwired/hnah40/hnah40.c
deleted file mode 100644
index 88c81b7d49..0000000000
--- a/keyboards/handwired/hnah40/hnah40.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hnah40.h"
diff --git a/keyboards/handwired/hnah40/info.json b/keyboards/handwired/hnah40/info.json
index d01cdbd00d..cd94929ea1 100644
--- a/keyboards/handwired/hnah40/info.json
+++ b/keyboards/handwired/hnah40/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1"],
+        "rows": ["B4", "B5", "B3", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "layouts": {
diff --git a/keyboards/handwired/hnah40rgb/config.h b/keyboards/handwired/hnah40rgb/config.h
index d4cf391b6d..7b61de013b 100644
--- a/keyboards/handwired/hnah40rgb/config.h
+++ b/keyboards/handwired/hnah40rgb/config.h
@@ -17,27 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { B7, D7, F1, F0 }
-#define MATRIX_COL_PINS \
-    { D5, D6, D3, D2, B6, C6, C7, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 50
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json
index ab8ec811c3..3eb92ce1ef 100644
--- a/keyboards/handwired/hnah40rgb/info.json
+++ b/keyboards/handwired/hnah40rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
+        "rows": ["B7", "D7", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
@@ -48,12 +59,12 @@
                 {"label":".", "x":9.75, "y":2}, 
                 {"label":"Shift", "x":10.75, "y":2, "w":1.25}, 
                 {"label":"Ctrl", "x":0, "y":3, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":3, "w":1}, 
+                {"label":"Win", "x":1.25, "y":3}, 
                 {"label":"Alt", "x":2.25, "y":3, "w":1.25}, 
                 {"label":"Space", "x":3.5, "y":3, "w":2.25}, 
                 {"label":"Space", "x":5.75, "y":3, "w":2.75},
                 {"label":"App", "x":8.5, "y":3, "w":1.25}, 
-                {"label":"Fn", "x":9.75, "y":3, "w":1}, 
+                {"label":"Fn", "x":9.75, "y":3}, 
                 {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}
             ]
         },
diff --git a/keyboards/handwired/hnah40rgb/rules.mk b/keyboards/handwired/hnah40rgb/rules.mk
index cab4eea965..7c04c86483 100644
--- a/keyboards/handwired/hnah40rgb/rules.mk
+++ b/keyboards/handwired/hnah40rgb/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/handwired/hwpm87/config.h b/keyboards/handwired/hwpm87/config.h
deleted file mode 100644
index 427c62a66b..0000000000
--- a/keyboards/handwired/hwpm87/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2022 CAO THAI DUONG (@KD-MM2)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define DIODE_DIRECTION ROW2COL
- 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B7, F0, F1, D6, C7, B6, F7, F6, F5, F4 }
diff --git a/keyboards/handwired/hwpm87/hwpm87.c b/keyboards/handwired/hwpm87/hwpm87.c
deleted file mode 100644
index 9edc09c971..0000000000
--- a/keyboards/handwired/hwpm87/hwpm87.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 CAO THAI DUONG (@KD-MM2)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "hwpm87.h"
diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json
index 8654ea7561..a719ba5ef2 100644
--- a/keyboards/handwired/hwpm87/info.json
+++ b/keyboards/handwired/hwpm87/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B7", "F0", "F1", "D6", "C7", "B6", "F7", "F6", "F5", "F4"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "D5",
         "on_state": 0
diff --git a/keyboards/handwired/ibm122m/config.h b/keyboards/handwired/ibm122m/config.h
index e8ca31777e..af3de54eb2 100644
--- a/keyboards/handwired/ibm122m/config.h
+++ b/keyboards/handwired/ibm122m/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_COL_PINS { E6, B7, D0, D1, D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2, C3, C4, C5, C7, F1 }
-#define MATRIX_ROW_PINS { F0, B5, B4, B3, B2, B1, B0, E7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/ibm122m/ibm122m.c b/keyboards/handwired/ibm122m/ibm122m.c
deleted file mode 100644
index 7ee099d250..0000000000
--- a/keyboards/handwired/ibm122m/ibm122m.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ibm122m.h"
diff --git a/keyboards/handwired/ibm122m/info.json b/keyboards/handwired/ibm122m/info.json
index aa423f0ece..6a157a8031 100644
--- a/keyboards/handwired/ibm122m/info.json
+++ b/keyboards/handwired/ibm122m/info.json
@@ -7,6 +7,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["E6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C7", "F1"],
+    "rows": ["F0", "B5", "B4", "B3", "B2", "B1", "B0", "E7"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "at90usb1286",
   "bootloader": "halfkay",
   "debounce": 15,
diff --git a/keyboards/handwired/ibm_wheelwriter/config.h b/keyboards/handwired/ibm_wheelwriter/config.h
deleted file mode 100644
index 254f60be74..0000000000
--- a/keyboards/handwired/ibm_wheelwriter/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 andresteare
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, D5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c b/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c
deleted file mode 100644
index eb8e446905..0000000000
--- a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 andresteare
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ibm_wheelwriter.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/ibm_wheelwriter/info.json b/keyboards/handwired/ibm_wheelwriter/info.json
index d75336e0b6..792f6b8aea 100644
--- a/keyboards/handwired/ibm_wheelwriter/info.json
+++ b/keyboards/handwired/ibm_wheelwriter/info.json
@@ -8,77 +8,97 @@
         "pid": "0x5F89",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K22 (B2,F4)", "x":0, "y":1, "w":1.5},
-                {"label":"K24 (B2,F6)", "x":1.75, "y":1},
-                {"label":"K34 (B3,F6)", "x":2.75, "y":1},
-                {"label":"K35 (B3,F7)", "x":3.75, "y":1},
-                {"label":"K36 (B3,B6)", "x":4.75, "y":1},
-                {"label":"K37 (B3,B5)", "x":5.75, "y":1},
-                {"label":"K27 (B2,B5)", "x":6.75, "y":1},
-                {"label":"K28 (B2,B4)", "x":7.75, "y":1},
-                {"label":"K38 (B3,B4)", "x":8.75, "y":1},
-                {"label":"K39 (B3,D7)", "x":9.75, "y":1},
-                {"label":"K3A (B3,D6)", "x":10.75, "y":1},
-                {"label":"K3B (B3,D4)", "x":11.75, "y":1},
-                {"label":"K2B (B2,D4)", "x":12.75, "y":1},
-                {"label":"K29 (B2,D7)", "x":13.75, "y":1},
-                {"label":"K2C (B2,D5)", "x":14.75, "y":1, "w":2},
-                {"label":"K3C (B3,D5)", "x":17, "y":1, "w":1.5},
-                {"label":"K41 (B7,F1)", "x":0, "y":2, "w":1.5},
-                {"label":"K42 (B7,F4)", "x":1.75, "y":2, "w":1.5},
-                {"label":"K44 (B7,F6)", "x":3.25, "y":2},
-                {"label":"K45 (B7,F7)", "x":4.25, "y":2},
-                {"label":"K46 (B7,B6)", "x":5.25, "y":2},
-                {"label":"K47 (B7,B5)", "x":6.25, "y":2},
-                {"label":"K57 (D0,B5)", "x":7.25, "y":2},
-                {"label":"K58 (D0,B4)", "x":8.25, "y":2},
-                {"label":"K48 (B7,B4)", "x":9.25, "y":2},
-                {"label":"K49 (B7,D7)", "x":10.25, "y":2},
-                {"label":"K4A (B7,D6)", "x":11.25, "y":2},
-                {"label":"K4B (B7,D4)", "x":12.25, "y":2},
-                {"label":"K5B (D0,D4)", "x":13.25, "y":2},
-                {"label":"K59 (D0,D7)", "x":14.25, "y":2},
-                {"label":"K6C (D1,D5)", "x":15.5, "y":2, "w":1.25, "h":2},
-                {"label":"K4C (B7,D5)", "x":17, "y":2, "w":1.5},
-                {"label":"K52 (D0,F4)", "x":0, "y":3, "w":1.5},
-                {"label":"K62 (D1,F4)", "x":1.75, "y":3, "w":1.25},
-                {"label":"K14 (B1,F6)", "x":3.5, "y":3},
-                {"label":"K15 (B1,F7)", "x":4.5, "y":3},
-                {"label":"K16 (B1,B6)", "x":5.5, "y":3},
-                {"label":"K17 (B1,B5)", "x":6.5, "y":3},
-                {"label":"K07 (B0,B5)", "x":7.5, "y":3},
-                {"label":"K08 (B0,B4)", "x":8.5, "y":3},
-                {"label":"K18 (B1,B4)", "x":9.5, "y":3},
-                {"label":"K19 (B1,D7)", "x":10.5, "y":3},
-                {"label":"K1A (B1,D6)", "x":11.5, "y":3},
-                {"label":"K1B (B1,D4)", "x":12.5, "y":3},
-                {"label":"K0B (B0,D4)", "x":13.5, "y":3},
-                {"label":"K6B (D1,D4)", "x":14.5, "y":3},
-                {"label":"K1C (B1,D5)", "x":17, "y":3, "w":1.5},
-                {"label":"K12 (B1,F4)", "x":0, "y":4, "w":1.5},
-                {"label":"K73 (D2,F5)", "x":1.75, "y":4, "w":1.25},
-                {"label":"K74 (D2,F6)", "x":3, "y":4},
-                {"label":"K64 (D1,F6)", "x":4, "y":4},
-                {"label":"K65 (D1,F7)", "x":5, "y":4},
-                {"label":"K66 (D1,B6)", "x":6, "y":4},
-                {"label":"K67 (D1,B5)", "x":7, "y":4},
-                {"label":"K77 (D2,B5)", "x":8, "y":4},
-                {"label":"K78 (D2,B4)", "x":9, "y":4},
-                {"label":"K68 (D1,B4)", "x":10, "y":4},
-                {"label":"K69 (D1,D7)", "x":11, "y":4},
-                {"label":"K6A (D1,D6)", "x":12, "y":4},
-                {"label":"K7B (D2,D4)", "x":13, "y":4},
-                {"label":"K61 (D1,F1)", "x":17, "y":4, "w":1.5},
-                {"label":"K01 (B0,F1)", "x":0, "y":5, "w":1.5},
-                {"label":"K70 (D2,F0)", "x":4.25, "y":5, "w":2.75},
-                {"label":"K71 (D2,F1)", "x":7, "y":5, "w":7.25},
-                {"label":"K72 (D2,F4)", "x":15.25, "y":5, "w":1.5},
-                {"label":"K7C (D2,D5)", "x":17, "y":5, "w":1.5}
+                {"x":0, "y":0, "w":1.5},
+
+                {"x":1.75, "y":0},
+                {"x":2.75, "y":0},
+                {"x":3.75, "y":0},
+                {"x":4.75, "y":0},
+                {"x":5.75, "y":0},
+                {"x":6.75, "y":0},
+                {"x":7.75, "y":0},
+                {"x":8.75, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":13.75, "y":0},
+                {"x":14.75, "y":0, "w":2},
+
+                {"x":17, "y":0, "w":1.5},
+
+                {"x":0, "y":1, "w":1.5},
+
+                {"x":1.75, "y":1, "w":1.5},
+                {"x":3.25, "y":1},
+                {"x":4.25, "y":1},
+                {"x":5.25, "y":1},
+                {"x":6.25, "y":1},
+                {"x":7.25, "y":1},
+                {"x":8.25, "y":1},
+                {"x":9.25, "y":1},
+                {"x":10.25, "y":1},
+                {"x":11.25, "y":1},
+                {"x":12.25, "y":1},
+                {"x":13.25, "y":1},
+                {"x":14.25, "y":1},
+                {"x":15.5, "y":1, "w":1.25, "h":2},
+
+                {"x":17, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.5},
+
+                {"x":1.75, "y":2, "w":1.25},
+                {"x":3.5, "y":2},
+                {"x":4.5, "y":2},
+                {"x":5.5, "y":2},
+                {"x":6.5, "y":2},
+                {"x":7.5, "y":2},
+                {"x":8.5, "y":2},
+                {"x":9.5, "y":2},
+                {"x":10.5, "y":2},
+                {"x":11.5, "y":2},
+                {"x":12.5, "y":2},
+                {"x":13.5, "y":2},
+                {"x":14.5, "y":2},
+
+                {"x":17, "y":2, "w":1.5},
+
+                {"x":0, "y":3, "w":1.5},
+
+                {"x":1.75, "y":3, "w":1.25},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+
+                {"x":17, "y":3, "w":1.5},
+
+                {"x":0, "y":4, "w":1.5},
+
+                {"x":4.25, "y":4, "w":2.75},
+                {"x":7, "y":4, "w":7.25},
+
+                {"x":15.25, "y":4, "w":1.5},
+
+                {"x":17, "y":4, "w":1.5}
             ]
         }
     }
diff --git a/keyboards/handwired/jn68m/config.h b/keyboards/handwired/jn68m/config.h
index a0045560a1..e736c430c0 100644
--- a/keyboards/handwired/jn68m/config.h
+++ b/keyboards/handwired/jn68m/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, D5, D3, D2 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/jn68m/info.json b/keyboards/handwired/jn68m/info.json
index 5ea575525a..c7934968dc 100644
--- a/keyboards/handwired/jn68m/info.json
+++ b/keyboards/handwired/jn68m/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1010",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "D1"],
+    "rows": ["B0", "B1", "D5", "D3", "D2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/handwired/jn68m/jn68m.c b/keyboards/handwired/jn68m/jn68m.c
deleted file mode 100644
index 415645f1b4..0000000000
--- a/keyboards/handwired/jn68m/jn68m.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat / MxBlue
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "jn68m.h"
diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h
index 7078ebb31d..5d5233ca99 100644
--- a/keyboards/handwired/jopr/config.h
+++ b/keyboards/handwired/jopr/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D6, D2, D4, D3, D5, D7, C6, B6, F5 }
-#define MATRIX_COL_PINS { B3, B2, B1, B0, F7, E6, F6, B5, C7, B4, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 /* #define LOCKING_SUPPORT_ENABLE */
 
@@ -17,10 +9,7 @@
 #define NO_ACTION_ONESHOT
 #define TAPPING_TOGGLE 3
 
-/*#define RGB_DI_PIN F4*/
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 1
 #define RGBLIGHT_SAT_STEP 1
 #define RGBLIGHT_VAL_STEP 1
-#endif
diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json
index f9bb248aee..0dae7b010c 100644
--- a/keyboards/handwired/jopr/info.json
+++ b/keyboards/handwired/jopr/info.json
@@ -8,6 +8,14 @@
     "pid": "0x1000",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F4"
+  },
+  "matrix_pins": {
+    "cols": ["B3", "B2", "B1", "B0", "F7", "E6", "F6", "B5", "C7", "B4", "D1"],
+    "rows": ["D0", "D6", "D2", "D4", "D3", "D5", "D7", "C6", "B6", "F5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/handwired/jot50/config.h b/keyboards/handwired/jot50/config.h
index 4cb70762fb..5f36081323 100644
--- a/keyboards/handwired/jot50/config.h
+++ b/keyboards/handwired/jot50/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* pro_micro pin-out */
-#define MATRIX_ROW_PINS { D7, E6, B4, B6, B2 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/jot50/info.json b/keyboards/handwired/jot50/info.json
index 1bcf932946..07a369a937 100644
--- a/keyboards/handwired/jot50/info.json
+++ b/keyboards/handwired/jot50/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"],
+        "rows": ["D7", "E6", "B4", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5",
         "breathing": true
@@ -18,70 +23,70 @@
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":7, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4},
-                {"x":10, "y":4},
-                {"x":11, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/jot50/jot50.c b/keyboards/handwired/jot50/jot50.c
deleted file mode 100644
index da04e862e1..0000000000
--- a/keyboards/handwired/jot50/jot50.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jot50.h"
diff --git a/keyboards/handwired/jot50/jot50.h b/keyboards/handwired/jot50/jot50.h
deleted file mode 100644
index b7e67ae61f..0000000000
--- a/keyboards/handwired/jot50/jot50.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT_ortho_5x12( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-	k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-	{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
-}
diff --git a/keyboards/handwired/jotanck/config.h b/keyboards/handwired/jotanck/config.h
index dc185270c1..d78fb4d5bf 100644
--- a/keyboards/handwired/jotanck/config.h
+++ b/keyboards/handwired/jotanck/config.h
@@ -13,21 +13,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
-#pragma once
 
-/* pro_micro pin-out */
-#define MATRIX_ROW_PINS { D7, E6, B6, B2 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, C6 }
+#pragma once
 
 /* leds */
 #define JOTANCK_LEDS
 #define JOTANCK_LED1 B5
 #define JOTANCK_LED2 B4
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/jotanck/info.json b/keyboards/handwired/jotanck/info.json
index f81c2d18f7..0e4966218a 100644
--- a/keyboards/handwired/jotanck/info.json
+++ b/keyboards/handwired/jotanck/info.json
@@ -8,63 +8,68 @@
         "pid": "0x5458",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"],
+        "rows": ["D7", "E6", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x12"],
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":10, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 10, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":10, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 10, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":10, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 10, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":10, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 10, "y": 3}
             ]
         }
     }
diff --git a/keyboards/handwired/jotanck/jotanck.c b/keyboards/handwired/jotanck/jotanck.c
index b20d3e1289..c0b54bb64d 100644
--- a/keyboards/handwired/jotanck/jotanck.c
+++ b/keyboards/handwired/jotanck/jotanck.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "jotanck.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinOutput(JOTANCK_LED1);
diff --git a/keyboards/handwired/jotanck/jotanck.h b/keyboards/handwired/jotanck/jotanck.h
deleted file mode 100644
index 4fa7cd4993..0000000000
--- a/keyboards/handwired/jotanck/jotanck.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2023 jotix <jujodeve@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
diff --git a/keyboards/handwired/jotpad16/config.h b/keyboards/handwired/jotpad16/config.h
index 9a1af0d614..0e9074f2ce 100644
--- a/keyboards/handwired/jotpad16/config.h
+++ b/keyboards/handwired/jotpad16/config.h
@@ -1,18 +1,10 @@
 #pragma once
 
-
-/* pro_micro pin-out */
-#define MATRIX_ROW_PINS { B6, B2, D2, D3 }
-#define MATRIX_COL_PINS { E6, D7, B3, B1 }
-
 /* leds */
 #define JOTPAD16_LEDS
 #define JOTPAD16_LED1 B5
 #define JOTPAD16_LED2 B4
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/jotpad16/info.json b/keyboards/handwired/jotpad16/info.json
index 7ec8f9aa97..289ef636b4 100644
--- a/keyboards/handwired/jotpad16/info.json
+++ b/keyboards/handwired/jotpad16/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "D7", "B3", "B1"],
+        "rows": ["B6", "B2", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "debounce": 0,
@@ -15,25 +20,25 @@
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/handwired/jotpad16/jotpad16.c b/keyboards/handwired/jotpad16/jotpad16.c
index 439cfc7b1e..02b4daafd6 100644
--- a/keyboards/handwired/jotpad16/jotpad16.c
+++ b/keyboards/handwired/jotpad16/jotpad16.c
@@ -1,4 +1,4 @@
-#include "jotpad16.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinOutput(JOTPAD16_LED1);
diff --git a/keyboards/handwired/jotpad16/jotpad16.h b/keyboards/handwired/jotpad16/jotpad16.h
deleted file mode 100644
index 012c9290dd..0000000000
--- a/keyboards/handwired/jotpad16/jotpad16.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_ortho_4x4( \
-	k00, k01, k02, k03, \
-	k10, k11, k12, k13, \
-	k20, k21, k22, k23, \
-	k30, k31, k32, k33 \
-) \
-{ \
-	{ k00, k01, k02, k03 }, \
-	{ k10, k11, k12, k13 }, \
-	{ k20, k21, k22, k23 }, \
-	{ k30, k31, k32, k33 } \
-}
-
diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h b/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h
index 8723c294cb..1a6512052c 100644
--- a/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h
+++ b/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // Define options
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 135
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h
index 8723c294cb..1a6512052c 100644
--- a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h
+++ b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // Define options
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 135
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h b/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h
index 8723c294cb..1a6512052c 100644
--- a/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h
+++ b/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // Define options
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 135
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h b/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h
index 8723c294cb..1a6512052c 100644
--- a/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h
+++ b/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // Define options
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 135
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/jtallbean/split_65/config.h b/keyboards/handwired/jtallbean/split_65/config.h
index 781bff90f3..313fe1940c 100644
--- a/keyboards/handwired/jtallbean/split_65/config.h
+++ b/keyboards/handwired/jtallbean/split_65/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F1, F0, C7, B6 }
-#define MATRIX_COL_PINS { C6, B5, B4, D7, D6, D4, D2, D3, B7 } // B7 is not actually used, but it is needed since # of entries must equal 9
-#define MATRIX_ROW_PINS_RIGHT { E6, F0, F1, F7, D7 }
-#define MATRIX_COL_PINS_RIGHT { B4, B5, B6, C6, C7, D4, D6, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN D5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/info.json
index 6adb995ff7..5c48352c1f 100644
--- a/keyboards/handwired/jtallbean/split_65/info.json
+++ b/keyboards/handwired/jtallbean/split_65/info.json
@@ -8,8 +8,19 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "B7"],
+        "rows": ["F4", "F1", "F0", "C7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "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",
diff --git a/keyboards/handwired/juliet/config.h b/keyboards/handwired/juliet/config.h
index df5d4248ca..4570cdb18e 100644
--- a/keyboards/handwired/juliet/config.h
+++ b/keyboards/handwired/juliet/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
-/*                        0   1   2   3   4   5   6   7   8   9  10  11*/
-#define MATRIX_ROW_PINS { F5, D2, D3, F4 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B1, B3, B2, B6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/juliet/info.json b/keyboards/handwired/juliet/info.json
index 0fc7f4726f..c2acd0ad73 100644
--- a/keyboards/handwired/juliet/info.json
+++ b/keyboards/handwired/juliet/info.json
@@ -8,6 +8,11 @@
          "pid": "0x4069",
          "device_version": "0.0.1"
      },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B1", "B3", "B2", "B6"],
+        "rows": ["F5", "D2", "D3", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/juliet/juliet.c b/keyboards/handwired/juliet/juliet.c
deleted file mode 100644
index fd8a9bf868..0000000000
--- a/keyboards/handwired/juliet/juliet.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 coseyfannitutti
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "juliet.h"
diff --git a/keyboards/handwired/k8split/config.h b/keyboards/handwired/k8split/config.h
deleted file mode 100644
index e8e7ad9411..0000000000
--- a/keyboards/handwired/k8split/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Ckat <ckat@teknik.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D5, D3, D2, D1, D0, B7 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/k8split/info.json b/keyboards/handwired/k8split/info.json
index 900871f88a..4cb7713c7f 100644
--- a/keyboards/handwired/k8split/info.json
+++ b/keyboards/handwired/k8split/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC868",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D5", "D3", "D2", "D1", "D0", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/k8split/k8split.c b/keyboards/handwired/k8split/k8split.c
deleted file mode 100644
index 300a075ae4..0000000000
--- a/keyboards/handwired/k8split/k8split.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Ckat <ckat@teknik.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "k8split.h"
diff --git a/keyboards/handwired/k_numpad17/config.h b/keyboards/handwired/k_numpad17/config.h
index 0fd1452887..9bcc1ca12e 100644
--- a/keyboards/handwired/k_numpad17/config.h
+++ b/keyboards/handwired/k_numpad17/config.h
@@ -20,14 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 400
 
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D1, D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { B2, B1, F6 , F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/k_numpad17/info.json b/keyboards/handwired/k_numpad17/info.json
index 1ea003178b..e0cd79a9c0 100644
--- a/keyboards/handwired/k_numpad17/info.json
+++ b/keyboards/handwired/k_numpad17/info.json
@@ -8,33 +8,38 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "F6", "F4"],
+        "rows": ["D1", "D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 1, "h": 2},
+                {"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},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"x": 0, "y": 4, "w": 2},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 3, "h": 2}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/k_numpad17/k_numpad17.c b/keyboards/handwired/k_numpad17/k_numpad17.c
deleted file mode 100644
index 290a86aac5..0000000000
--- a/keyboards/handwired/k_numpad17/k_numpad17.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "k_numpad17.h"
\ No newline at end of file
diff --git a/keyboards/handwired/k_numpad17/k_numpad17.h b/keyboards/handwired/k_numpad17/k_numpad17.h
deleted file mode 100644
index 1fc99794df..0000000000
--- a/keyboards/handwired/k_numpad17/k_numpad17.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_numpad_5x4( \
-  k00, k01, k02, k03, \
-  k10, k11, k12,      \
-  k20, k21, k22, k13,  \
-  k30, k31, k32,      \
-    k40,    k41, k33  \
-) \
-{ \
-  {k00, k01, k02, k03}, \
-  {k10, k11, k12, k13}, \
-  {k20, k21, k22, KC_NO}, \
-  {k30, k31, k32, k33}, \
-  {k40, KC_NO, k41, KC_NO} \
-}
-
-/*  matrix layout
-   * ,-------------------.
-   * | 00 | 01 | 02 | 03 |
-   * |----|----|----|----|
-   * | 10 | 11 | 12 |    |
-   * |----|----|----| 13 |
-   * | 20 | 21 | 22 |    |
-   * |----|----|----|----|
-   * | 30 | 31 | 32 |    |
-   * |----|----|----| 33 |
-   * |   40    | 41 |    |
-   * `-------------------'
- */
-
-
diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h
index 2366898f05..f952881772 100644
--- a/keyboards/handwired/kbod/config.h
+++ b/keyboards/handwired/kbod/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7, D6 }
-#define MATRIX_COL_PINS { D0, D1, F0, F1, F4, F5, F6, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/kbod/info.json b/keyboards/handwired/kbod/info.json
index 6ce0f46f2c..667e53756e 100644
--- a/keyboards/handwired/kbod/info.json
+++ b/keyboards/handwired/kbod/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0"
     },
diff --git a/keyboards/handwired/kbod/kbod.c b/keyboards/handwired/kbod/kbod.c
deleted file mode 100644
index c229d267b1..0000000000
--- a/keyboards/handwired/kbod/kbod.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kbod.h"
diff --git a/keyboards/handwired/ks63/config.h b/keyboards/handwired/ks63/config.h
index 1a75229c51..f470196e1d 100644
--- a/keyboards/handwired/ks63/config.h
+++ b/keyboards/handwired/ks63/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* mouse config */
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/info.json
index df7bf5c645..8bb32c871d 100644
--- a/keyboards/handwired/ks63/info.json
+++ b/keyboards/handwired/ks63/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3061",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B5", "B4", "E6", "D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/ks63/ks63.c b/keyboards/handwired/ks63/ks63.c
deleted file mode 100644
index bd48359a81..0000000000
--- a/keyboards/handwired/ks63/ks63.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ks63.h"
diff --git a/keyboards/handwired/lagrange/config.h b/keyboards/handwired/lagrange/config.h
index 618862f2e2..5875c7e7c4 100644
--- a/keyboards/handwired/lagrange/config.h
+++ b/keyboards/handwired/lagrange/config.h
@@ -19,12 +19,3 @@
 
 #define EE_HANDS
 #define SPLIT_USB_DETECT
-
-/* pin-out */
-#define MATRIX_ROW_PINS { E6, F1, F0, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B4, B5, D7, B6, C6, D6 }
-#define MATRIX_ROW_PINS_RIGHT { B5, B4, D7, B6, C6, D6, D4 }
-#define MATRIX_COL_PINS_RIGHT { C7, F7, F6, F5, F4, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json
index 7d1179e1f4..1141183e18 100644
--- a/keyboards/handwired/lagrange/info.json
+++ b/keyboards/handwired/lagrange/info.json
@@ -8,6 +8,19 @@
         "pid": "0x2718",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "D7", "B6", "C6", "D6"],
+        "rows": ["E6", "F1", "F0", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "matrix_pins": {
+            "right": {
+                "cols": ["C7", "F7", "F6", "F5", "F4", "F1"],
+                "rows": ["B5", "B4", "D7", "B6", "C6", "D6", "D4"]
+            }
+        }
+    },
     "indicators": {
         "caps_lock": "D1",
         "scroll_lock": "D2"
diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h b/keyboards/handwired/lagrange/keymaps/dpapavas/config.h
index 049ba598a9..0114d6c7f9 100644
--- a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h
+++ b/keyboards/handwired/lagrange/keymaps/dpapavas/config.h
@@ -20,4 +20,3 @@
 #define TAPPING_TERM 175
 #define TAPPING_TERM_PER_KEY
 #define PERMISSIVE_HOLD_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/handwired/leftynumpad/config.h b/keyboards/handwired/leftynumpad/config.h
index 3f59e84459..831b41bcd2 100644
--- a/keyboards/handwired/leftynumpad/config.h
+++ b/keyboards/handwired/leftynumpad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
-#define MATRIX_COL_PINS { E6, B4, B5, B6, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/leftynumpad/info.json b/keyboards/handwired/leftynumpad/info.json
index ffa7915a7d..0a769a43f9 100644
--- a/keyboards/handwired/leftynumpad/info.json
+++ b/keyboards/handwired/leftynumpad/info.json
@@ -8,35 +8,44 @@
         "pid": "0xBEEF",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B5", "B6", "B2"],
+        "rows": ["D1", "D0", "D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 10,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                    {"label":"0,0", "x":0, "y":0},
-                    {"label":"1,0", "x":1, "y":0},
-                    {"label":"2,0", "x":2, "y":0},
-                    {"label":"3,0", "x":3, "y":0},
-                    {"label":"4,0", "x":4, "y":0},
-                    {"label":"0,1", "x":0, "y":1},
-                    {"label":"1,1", "x":1, "y":1},
-                    {"label":"2,1", "x":2, "y":1},
-                    {"label":"3,1", "x":3, "y":1},
-                    {"label":"0,2", "x":0, "y":2},
-                    {"label":"1,2", "x":1, "y":2},
-                    {"label":"2,2", "x":2, "y":2},
-                    {"label":"3,2", "x":3, "y":2},
-                    {"label":"5,1", "x":4, "y":1, "h":2},
-                    {"label":"0,3", "x":0, "y":3},
-                    {"label":"1,3", "x":1, "y":3},
-                    {"label":"2,3", "x":2, "y":3},
-                    {"label":"3,3", "x":3, "y":3},
-                    {"label":"0,4", "x":0, "y":4},
-                    {"label":"1,4", "x":1, "y":4},
-                    {"label":"2,4", "x":2, "y":4},
-                    {"label":"3,4", "x":3, "y":4},
-                    {"label":"4,3", "x":4, "y":3, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "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": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/leftynumpad/leftynumpad.c b/keyboards/handwired/leftynumpad/leftynumpad.c
deleted file mode 100644
index 195ec78289..0000000000
--- a/keyboards/handwired/leftynumpad/leftynumpad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Tom Swartz
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "leftynumpad.h"
diff --git a/keyboards/handwired/leftynumpad/leftynumpad.h b/keyboards/handwired/leftynumpad/leftynumpad.h
deleted file mode 100644
index 7f3ebb8441..0000000000
--- a/keyboards/handwired/leftynumpad/leftynumpad.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 Tom Swartz
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-   K05,  K15,  K25,  K35,  K45,  \
-   K04,  K14,  K24,  K34,        \
-   K03,  K13,  K23,  K33,  K43,  \
-   K02,  K12,  K22,  K32,        \
-   K01,  K11,  K21,  K31,  K41   \
-) \
-{ \
- { K05,  K15,  K25,  K35,  K45 }, \
- { K04,  K14,  K24,  K34       }, \
- { K03,  K13,  K23,  K33,  K43 }, \
- { K02,  K12,  K22,  K32       }, \
- { K01,  K11,  K21,  K31,  K41 }  \
-}
diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h
index f99c65303c..e6499e9111 100644
--- a/keyboards/handwired/lovelive9/config.h
+++ b/keyboards/handwired/lovelive9/config.h
@@ -2,16 +2,6 @@
 
 #pragma once
 
-/* default pin-out */
-#define MATRIX_ROW_PINS { NO_PIN }
-#define MATRIX_COL_PINS { B4, B6, B2, D7, B1, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 9    // Number of LEDs
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json
index be3541c4fd..25dc85704d 100644
--- a/keyboards/handwired/lovelive9/info.json
+++ b/keyboards/handwired/lovelive9/info.json
@@ -8,23 +8,31 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B6", "B2", "D7", "B1", "F7", "F6", "F5", "F4"],
+        "rows": [null]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "breathing_period": 2
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"x": 0, "y": 0},
-              {"x": 0.5, "y": 1.25},
-              {"x": 1.5, "y": 2.5},
-              {"x": 2.75, "y": 3.25},
-              {"x": 4, "y": 3.5},
-              {"x": 5.25, "y": 3.25},
-              {"x": 6.5, "y": 2.5},
-              {"x": 7.5, "y": 1.25},
-              {"x": 8, "y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 0.5, "y": 1.25},
+                {"matrix": [0, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [0, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [0, 4], "x": 4, "y": 3.5},
+                {"matrix": [0, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [0, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [0, 8], "x": 8, "y": 0}
             ]
         }
     }
diff --git a/keyboards/handwired/lovelive9/lovelive9.c b/keyboards/handwired/lovelive9/lovelive9.c
deleted file mode 100644
index c0198a8eaf..0000000000
--- a/keyboards/handwired/lovelive9/lovelive9.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lovelive9.h"
diff --git a/keyboards/handwired/lovelive9/lovelive9.h b/keyboards/handwired/lovelive9/lovelive9.h
deleted file mode 100644
index f6fb1f94cc..0000000000
--- a/keyboards/handwired/lovelive9/lovelive9.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#define LAYOUT( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08 \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08 } \
-}
diff --git a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c b/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c
deleted file mode 100644
index d99d41a49b..0000000000
--- a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Tomek (@m40-dev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "5x5_macropad.h"
\ No newline at end of file
diff --git a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h b/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h
deleted file mode 100644
index 78e485f00e..0000000000
--- a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2022 Tomek (@m40-dev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x5( \
-	K000, K001, K002, K003, K004, \
-	K100, K101, K102, K103, K104, \
-	K200, K201, K202, K203, K204, \
-	K300, K301, K302, K303, K304, \
-	K400, K401, K402, K403, K404 ) { \
-	{ K000,  K001,  K002,  K003, K004 }, \
-	{ K100,  K101,  K102,  K103, K104 }, \
-	{ K200,  K201,  K202,  K203, K204 }, \
-	{ K300,  K301,  K302,  K303, K304 }, \
-	{ K400,  K401,  K402,  K403, K404 } \
-}
diff --git a/keyboards/handwired/m40/5x5_macropad/config.h b/keyboards/handwired/m40/5x5_macropad/config.h
index 2061849845..6770ce638c 100644
--- a/keyboards/handwired/m40/5x5_macropad/config.h
+++ b/keyboards/handwired/m40/5x5_macropad/config.h
@@ -3,23 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json
index 3e9138af27..a6b2ee19de 100644
--- a/keyboards/handwired/m40/5x5_macropad/info.json
+++ b/keyboards/handwired/m40/5x5_macropad/info.json
@@ -8,42 +8,46 @@
     	"pid": "0x0000",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7"],
+        "rows": ["B5", "B4", "E6", "D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_ortho_5x5": {
             "layout": [
-			{"label":"K000", "x":0, "y":0},
-			{"label":"K001", "x":1, "y":0},
-			{"label":"K002", "x":2, "y":0},
-			{"label":"K003", "x":3, "y":0},
-			{"label":"K004", "x":4, "y":0},
-
-			{"label":"K100", "x":0, "y":1},
-			{"label":"K101", "x":1, "y":1},
-			{"label":"K102", "x":2, "y":1},
-			{"label":"K103", "x":3, "y":1},
-			{"label":"K104", "x":4, "y":1},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
 
-			{"label":"K200", "x":0, "y":2},
-			{"label":"K201", "x":1, "y":2},
-			{"label":"K202", "x":2, "y":2},
-			{"label":"K203", "x":3, "y":2},
-			{"label":"K204", "x":4, "y":2},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
 
-			{"label":"K300", "x":0, "y":3},
-			{"label":"K301", "x":1, "y":3},
-			{"label":"K302", "x":2, "y":3},
-			{"label":"K303", "x":3, "y":3},
-			{"label":"K304", "x":4, "y":3},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
 
-			{"label":"K400", "x":0, "y":4},
-			{"label":"K401", "x":1, "y":4},
-			{"label":"K402", "x":2, "y":4},
-			{"label":"K403", "x":3, "y":4},
-			{"label":"K404", "x":4, "y":4}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
 
-			]
-					}
-				}
-			}
\ No newline at end of file
+                {"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}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index 4063b253b6..c9a2077f41 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B9
 #define WS2812_PWM_DRIVER   PWMD4
 #define WS2812_PWM_CHANNEL  4
 #define WS2812_PWM_PAL_MODE 2
@@ -40,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_TARGET_PERIOD 800000
 #define RGBLIGHT_LED_MAP { 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 23, 21, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1  }
 
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 24
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -56,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //#    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/macroboard/f401/config.h b/keyboards/handwired/macroboard/f401/config.h
deleted file mode 100644
index c5ea2ff6a2..0000000000
--- a/keyboards/handwired/macroboard/f401/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2021 Michał Szczepaniak
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { A4, A3, A2, A1, A0  }
-#define MATRIX_COL_PINS { A5, A6, A7, B0, B1, B10 }
diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/info.json
index acd7e83f77..5108d8ce50 100644
--- a/keyboards/handwired/macroboard/f401/info.json
+++ b/keyboards/handwired/macroboard/f401/info.json
@@ -1,4 +1,12 @@
 {
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "B0", "B1", "B10"],
+        "rows": ["A4", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "driver": "pwm"
+    },
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/handwired/macroboard/f401/rules.mk b/keyboards/handwired/macroboard/f401/rules.mk
index 65dc4b89cd..bc0cd6b97f 100644
--- a/keyboards/handwired/macroboard/f401/rules.mk
+++ b/keyboards/handwired/macroboard/f401/rules.mk
@@ -9,6 +9,5 @@ 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
-WS2812_DRIVER = pwm
 AUDIO_ENABLE = no           # Audio output
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/macroboard/f411/config.h b/keyboards/handwired/macroboard/f411/config.h
index c7004fd520..cc951dcefc 100644
--- a/keyboards/handwired/macroboard/f411/config.h
+++ b/keyboards/handwired/macroboard/f411/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A15, B3, B4, B5, B7 }
-#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10 }
-
 #define AUDIO_INIT_DELAY
 #define AUDIO_PIN B10
 #define AUDIO_PWM_DRIVER PWMD2
diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json
index 2517a82403..d7ff61f52b 100644
--- a/keyboards/handwired/macroboard/f411/info.json
+++ b/keyboards/handwired/macroboard/f411/info.json
@@ -1,4 +1,12 @@
 {
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A10"],
+        "rows": ["A15", "B3", "B4", "B5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "driver": "pwm"
+    },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk
index 2c7c409197..cdf33bfea5 100644
--- a/keyboards/handwired/macroboard/f411/rules.mk
+++ b/keyboards/handwired/macroboard/f411/rules.mk
@@ -9,7 +9,6 @@ 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
-WS2812_DRIVER = pwm
 AUDIO_ENABLE = yes           # Audio output
 AUDIO_DRIVER = pwm_hardware
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/macroboard/info.json b/keyboards/handwired/macroboard/info.json
index cb3645f358..66dd82d144 100644
--- a/keyboards/handwired/macroboard/info.json
+++ b/keyboards/handwired/macroboard/info.json
@@ -8,39 +8,46 @@
         "pid": "0x2137",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B9"
+    },
     "layouts": {
         "LAYOUT_ortho_5x6": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0},
-                {"label": "k03", "x": 3, "y": 0},
-                {"label": "k04", "x": 4, "y": 0},
-                {"label": "k05", "x": 5, "y": 0},
-                {"label": "k10", "x": 0, "y": 1},
-                {"label": "k11", "x": 1, "y": 1},
-                {"label": "k12", "x": 2, "y": 1},
-                {"label": "k13", "x": 3, "y": 1},
-                {"label": "k14", "x": 4, "y": 1},
-                {"label": "k15", "x": 5, "y": 1},
-                {"label": "k20", "x": 0, "y": 2},
-                {"label": "k21", "x": 1, "y": 2},
-                {"label": "k22", "x": 2, "y": 2},
-                {"label": "k23", "x": 3, "y": 2},
-                {"label": "k24", "x": 4, "y": 2},
-                {"label": "k25", "x": 5, "y": 2},
-                {"label": "k30", "x": 0, "y": 3},
-                {"label": "k31", "x": 1, "y": 3},
-                {"label": "k32", "x": 2, "y": 3},
-                {"label": "k33", "x": 3, "y": 3},
-                {"label": "k34", "x": 4, "y": 3},
-                {"label": "k35", "x": 5, "y": 3},
-                {"label": "k40", "x": 0, "y": 4},
-                {"label": "k41", "x": 1, "y": 4},
-                {"label": "k42", "x": 2, "y": 4},
-                {"label": "k43", "x": 3, "y": 4},
-                {"label": "k44", "x": 4, "y": 4},
-                {"label": "k45", "x": 5, "y": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/macroboard/macroboard.c b/keyboards/handwired/macroboard/macroboard.c
deleted file mode 100644
index f9d41ff162..0000000000
--- a/keyboards/handwired/macroboard/macroboard.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Michał Szczepaniak
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "macroboard.h"
diff --git a/keyboards/handwired/macroboard/macroboard.h b/keyboards/handwired/macroboard/macroboard.h
deleted file mode 100644
index 9909e63afc..0000000000
--- a/keyboards/handwired/macroboard/macroboard.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 Michał Szczepaniak
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x6( \
-    k00, k01, k02, k03, k04, k05, \
-    k10, k11, k12, k13, k14, k15, \
-    k20, k21, k22, k23, k24, k25, \
-    k30, k31, k32, k33, k34, k35, \
-    k40, k41, k42, k43, k44, k45 \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k40, k41, k42, k43, k44, k45 } \
-}
diff --git a/keyboards/handwired/magicforce61/config.h b/keyboards/handwired/magicforce61/config.h
index 2518265be6..b9449c4714 100644
--- a/keyboards/handwired/magicforce61/config.h
+++ b/keyboards/handwired/magicforce61/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D4 }
-#define MATRIX_COL_PINS { B5, B4, B3, B2, B1, B0, E7, E6, F0, F1, F2, F3, F4, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/magicforce61/info.json b/keyboards/handwired/magicforce61/info.json
index 9652a35ba5..fd457aba7e 100644
--- a/keyboards/handwired/magicforce61/info.json
+++ b/keyboards/handwired/magicforce61/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5"],
+    "rows": ["D0", "D1", "D2", "D3", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "at90usb1286",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/handwired/magicforce61/magicforce61.c b/keyboards/handwired/magicforce61/magicforce61.c
deleted file mode 100644
index 420bbb80f5..0000000000
--- a/keyboards/handwired/magicforce61/magicforce61.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "magicforce61.h"
diff --git a/keyboards/handwired/magicforce68/config.h b/keyboards/handwired/magicforce68/config.h
index b4c67fbbd7..b9449c4714 100644
--- a/keyboards/handwired/magicforce68/config.h
+++ b/keyboards/handwired/magicforce68/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B2, B0, D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B7, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/magicforce68/info.json b/keyboards/handwired/magicforce68/info.json
index c1df42eed8..4656394858 100644
--- a/keyboards/handwired/magicforce68/info.json
+++ b/keyboards/handwired/magicforce68/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B0", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/magicforce68/magicforce68.c b/keyboards/handwired/magicforce68/magicforce68.c
deleted file mode 100644
index 8d74f1438b..0000000000
--- a/keyboards/handwired/magicforce68/magicforce68.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "magicforce68.h"
diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index 608411ef31..10f0d75ea9 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -16,28 +16,11 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D4, C6, D7, E6, B4, B5, B7, D5, C7, F1, F0 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, B0 }
-#define DIODE_DIRECTION COL2ROW
 #define LAYER_STATE_8BIT
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 7
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json
index 16fdc30e26..eba81459ef 100644
--- a/keyboards/handwired/marauder/info.json
+++ b/keyboards/handwired/marauder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B0"],
+        "rows": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/marauder/marauder.c b/keyboards/handwired/marauder/marauder.c
deleted file mode 100644
index c8f8781211..0000000000
--- a/keyboards/handwired/marauder/marauder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 BB-66
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "marauder.h"
diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c
deleted file mode 100644
index 663306a9bb..0000000000
--- a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2023 Maverick0197
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    //if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    //}
-    return false;
-};
-#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/handwired/mechboards_micropad/config.h b/keyboards/handwired/mechboards_micropad/config.h
index ac759e6771..3fd748d182 100644
--- a/keyboards/handwired/mechboards_micropad/config.h
+++ b/keyboards/handwired/mechboards_micropad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6 }
-#define MATRIX_COL_PINS { B2, B3, B1, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/mechboards_micropad/info.json b/keyboards/handwired/mechboards_micropad/info.json
index e5e848fd71..7da646d1fe 100644
--- a/keyboards/handwired/mechboards_micropad/info.json
+++ b/keyboards/handwired/mechboards_micropad/info.json
@@ -8,11 +8,21 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B1", "F7"],
+        "rows": ["B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"1", "x":0, "y":0}, {"label":"2", "x":1, "y":0}, {"label":"3", "x":2, "y":0}, {"label":"4", "x":3, "y":0}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c b/keyboards/handwired/mechboards_micropad/mechboards_micropad.c
deleted file mode 100644
index 662af8815e..0000000000
--- a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mechboards_micropad.h"
diff --git a/keyboards/handwired/mechboards_micropad/mechboards_micropad.h b/keyboards/handwired/mechboards_micropad/mechboards_micropad.h
deleted file mode 100644
index 9839084862..0000000000
--- a/keyboards/handwired/mechboards_micropad/mechboards_micropad.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03 \
-) \
-{ \
-    { k00, k01, k02, k03 } \
-}
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/config.h b/keyboards/handwired/meck_tkl/blackpill_f401/config.h
deleted file mode 100644
index dcf0a27d21..0000000000
--- a/keyboards/handwired/meck_tkl/blackpill_f401/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Gabriel Kim (@gabrielkim13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define MATRIX_ROW_PINS \
-    { B15, A8, A9, B14, A15, B3 }
-#define MATRIX_COL_PINS \
-    { B4, B5, B6, B7, B8, B9, A1, A2, A3, A4, A5, A6, A7, B0, B1, A0, B10 }
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json
index 68df328ac7..eeaa9c392b 100644
--- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
+        "rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C13",
         "on_state": 0
diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h
index 06430fffeb..30221cc216 100644
--- a/keyboards/handwired/meck_tkl/config.h
+++ b/keyboards/handwired/meck_tkl/config.h
@@ -3,21 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/info.json
index a8d6e281e2..8266e704bc 100644
--- a/keyboards/handwired/meck_tkl/info.json
+++ b/keyboards/handwired/meck_tkl/info.json
@@ -11,98 +11,106 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "Print Screen", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                { "label": "`", "x": 0, "y": 1.5 },
-                { "label": "1", "x": 1, "y": 1.5 },
-                { "label": "2", "x": 2, "y": 1.5 },
-                { "label": "3", "x": 3, "y": 1.5 },
-                { "label": "4", "x": 4, "y": 1.5 },
-                { "label": "5", "x": 5, "y": 1.5 },
-                { "label": "6", "x": 6, "y": 1.5 },
-                { "label": "7", "x": 7, "y": 1.5 },
-                { "label": "8", "x": 8, "y": 1.5 },
-                { "label": "9", "x": 9, "y": 1.5 },
-                { "label": "0", "x": 10, "y": 1.5 },
-                { "label": "-", "x": 11, "y": 1.5 },
-                { "label": "=", "x": 12, "y": 1.5 },
-                { "label": "Back Space", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "Page Up", "x": 17.25, "y": 1.5 },
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
 
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "[", "x": 11.5, "y": 2.5 },
-                { "label": "]", "x": 12.5, "y": 2.5 },
-                { "label": "\\", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "Page Down", "x": 17.25, "y": 2.5 },
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
 
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ";", "x": 10.75, "y": 3.5 },
-                { "label": "'", "x": 11.75, "y": 3.5 },
-                { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
 
-                { "label": "Left Shift", "x": 0, "y": 4.5, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": ",", "x": 9.25, "y": 4.5 },
-                { "label": ".", "x": 10.25, "y": 4.5 },
-                { "label": "/", "x": 11.25, "y": 4.5 },
-                { "label": "Right Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "Up", "x": 16.25, "y": 4.5 },
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
 
-                { "label": "Left Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "Left OS", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "Left Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "label": "Space", "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "Right Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "Right Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "Left", "x": 15.25, "y": 5.5 },
-                { "label": "Down", "x": 16.25, "y": 5.5 },
-                { "label": "Right", "x": 17.25, "y": 5.5 }
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/handwired/meck_tkl/meck_tkl.c b/keyboards/handwired/meck_tkl/meck_tkl.c
deleted file mode 100644
index 2668b440ec..0000000000
--- a/keyboards/handwired/meck_tkl/meck_tkl.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 Gabriel Kim (@gabrielkim13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "meck_tkl.h"
diff --git a/keyboards/handwired/meck_tkl/meck_tkl.h b/keyboards/handwired/meck_tkl/meck_tkl.h
deleted file mode 100644
index a7417dbafe..0000000000
--- a/keyboards/handwired/meck_tkl/meck_tkl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2021 Gabriel Kim (@gabrielkim13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- *
- *
- * | Esc |   |  F1 |  F2 |  F3 |  F4 |  |  F5 |  F6 |  F7 |  F8 |  | F9 | F10 | F11 | F12 |  | SLk | Pau | NLk |
- * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  Back  |  | Ins | Hom | PUp |
- * |  Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \  |  | Del | End | PDn |
- * |   Caps  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |   Enter  |
- * |   Shift   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |    Shift     |        |  ^  |
- * | Ctrl | Win  | alt  |               Space                 | alt  |  fn  | Menu | Ctrl |  |  <  |  v  |  >  |
- */
-#define LAYOUT_tkl_ansi( \
-     k00 ,      k01 , k02 , k03 , k04 ,   k05 , k06 , k07 , k08 ,   k09 , k0A , k0B , k0C ,    k0D , k0E , k0F , \
-     k10 , k11 , k12 , k13 , k14 , k15 , k16 , k17 , k18 , k19 , k1A , k1B , k1C ,  k1D   ,    k1E , k1F , k1G , \
-      k20  , k21 , k22 , k23 , k24 , k25 , k26 , k27 , k28 , k29 , k2A , k2B , k2C , k2D  ,    k2E , k2F , k2G , \
-       k30   , k31 , k32 , k33 , k34 , k35 , k36 , k37 , k38 , k39 , k3A , k3B ,    k3C   ,                      \
-         k40    , k41 , k42 , k43 , k44 , k45 , k46 , k47 , k48 , k49 , k4A ,     k4B     ,          k4C ,       \
-      k50 ,  k51 ,  k52 ,                k53                  ,  k54 ,  k55 ,  k56 ,  k57 ,    k58 , k59 , k5A   \
-) { \
-    { k00, KC_NO, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3C, KC_NO, KC_NO, KC_NO }, \
-    { k40, KC_NO, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, KC_NO, k4B, KC_NO, k4C, KC_NO }, \
-    { k50, k51, k52, KC_NO, KC_NO, KC_NO, k53, KC_NO, KC_NO, KC_NO, k54, k55, k56, k57, k58, k59, k5A } \
-}
diff --git a/keyboards/handwired/minorca/config.h b/keyboards/handwired/minorca/config.h
index 2bfa506264..b9449c4714 100644
--- a/keyboards/handwired/minorca/config.h
+++ b/keyboards/handwired/minorca/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* MinOrca PCB default pin-out */
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 }
-#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/minorca/info.json b/keyboards/handwired/minorca/info.json
index b91e59ca67..c7b463f223 100644
--- a/keyboards/handwired/minorca/info.json
+++ b/keyboards/handwired/minorca/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6660",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "layouts": {
diff --git a/keyboards/handwired/minorca/keymaps/rgb/config.h b/keyboards/handwired/minorca/keymaps/rgb/config.h
index 6050bcf11d..4bee6b205d 100644
--- a/keyboards/handwired/minorca/keymaps/rgb/config.h
+++ b/keyboards/handwired/minorca/keymaps/rgb/config.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D5
+#define WS2812_DI_PIN D5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/minorca/minorca.c b/keyboards/handwired/minorca/minorca.c
deleted file mode 100644
index dbae0b0f90..0000000000
--- a/keyboards/handwired/minorca/minorca.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "minorca.h"
diff --git a/keyboards/handwired/misterdeck/info.json b/keyboards/handwired/misterdeck/info.json
index 94fb213025..59062f16dc 100644
--- a/keyboards/handwired/misterdeck/info.json
+++ b/keyboards/handwired/misterdeck/info.json
@@ -18,20 +18,20 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/misterdeck/misterdeck.c b/keyboards/handwired/misterdeck/misterdeck.c
deleted file mode 100644
index ee9cc93b3a..0000000000
--- a/keyboards/handwired/misterdeck/misterdeck.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2021 Chris Broekema (broekema@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "misterdeck.h"
diff --git a/keyboards/handwired/misterdeck/misterdeck.h b/keyboards/handwired/misterdeck/misterdeck.h
deleted file mode 100644
index 324ccb755f..0000000000
--- a/keyboards/handwired/misterdeck/misterdeck.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2021 Chris Broekema (broekema@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 } \
-}
diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/config.h b/keyboards/handwired/ms_sculpt_mobile/astar/config.h
deleted file mode 100644
index aafa6953c7..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/astar/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define MATRIX_ROW_PINS { D7, C6, D4, D0, D1, D3, D2, E2 }
-#define MATRIX_COL_PINS { B4, B5, E6, B7, B6, D6, C7, F7, F6, F4, F5, F1, F0, D5, B0, B1, B2, B3 }
diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/info.json b/keyboards/handwired/ms_sculpt_mobile/astar/info.json
index 6f6786e9ad..9454bcda70 100644
--- a/keyboards/handwired/ms_sculpt_mobile/astar/info.json
+++ b/keyboards/handwired/ms_sculpt_mobile/astar/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B4", "B5", "E6", "B7", "B6", "D6", "C7", "F7", "F6", "F4", "F5", "F1", "F0", "D5", "B0", "B1", "B2", "B3"],
+        "rows": ["D7", "C6", "D4", "D0", "D1", "D3", "D2", "E2"]
+    },
+    "diode_direction": "ROW2COL",
     "keyboard_name": "sculpt mobile astar",
     "processor": "atmega32u4",
     "bootloader": "caterina"
diff --git a/keyboards/handwired/ms_sculpt_mobile/config.h b/keyboards/handwired/ms_sculpt_mobile/config.h
deleted file mode 100644
index 27fba0b887..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.c b/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.c
deleted file mode 100644
index 53773e5d85..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ms_sculpt_mobile.h"
diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h
deleted file mode 100644
index 7a514a76cb..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define MATRIX_ROW_PINS { F7, F6, F4, F5, F3, F2, F1, F0 }
-#define MATRIX_COL_PINS { B7, D0, D1, D2, D3, D4, D5, D6, D7, E0, E1, C1, C0, C3, C2, C5, C4, C7 }
diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json
index 08fc09e4b1..2d500a8ae2 100644
--- a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json
+++ b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json
@@ -1,5 +1,10 @@
 {
     "keyboard_name": "sculpt mobile teensypp",
+    "matrix_pins": {
+        "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C1", "C0", "C3", "C2", "C5", "C4", "C7"],
+        "rows": ["F7", "F6", "F4", "F5", "F3", "F2", "F1", "F0"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "at90usb1286",
     "bootloader": "halfkay"
 }
diff --git a/keyboards/handwired/mutepad/config.h b/keyboards/handwired/mutepad/config.h
index 9ebec0ffef..9dcdd90bb7 100644
--- a/keyboards/handwired/mutepad/config.h
+++ b/keyboards/handwired/mutepad/config.h
@@ -3,27 +3,8 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { F6 }
-#define MATRIX_COL_PINS \
-    { B1, B3, B2, B6 }
-
 #define TAP_CODE_DELAY 10
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/mutepad/info.json b/keyboards/handwired/mutepad/info.json
index 6068f33b9d..b0bcfe4829 100644
--- a/keyboards/handwired/mutepad/info.json
+++ b/keyboards/handwired/mutepad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6"],
+        "rows": ["F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
@@ -18,10 +23,10 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0},
-                {"label": "k03", "x": 3, "y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0}
             ]
         }
     }
diff --git a/keyboards/handwired/mutepad/mutepad.c b/keyboards/handwired/mutepad/mutepad.c
deleted file mode 100644
index 09210c3f4f..0000000000
--- a/keyboards/handwired/mutepad/mutepad.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 JoshwJB (@JoshwJB)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "mutepad.h"
diff --git a/keyboards/handwired/mutepad/mutepad.h b/keyboards/handwired/mutepad/mutepad.h
deleted file mode 100644
index 57c317cb60..0000000000
--- a/keyboards/handwired/mutepad/mutepad.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2022 JoshwJB (@JoshwJB)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT(K00, K01, K02, K03) \
-    {                              \
-        { K00, K01, K02, K03 }     \
-    }
diff --git a/keyboards/handwired/myskeeb/config.h b/keyboards/handwired/myskeeb/config.h
index b88e3f0d48..2e2a2bbcbf 100644
--- a/keyboards/handwired/myskeeb/config.h
+++ b/keyboards/handwired/myskeeb/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-
-// Wiring of Each Half
-#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F6, F7, F5 }
-#define MATRIX_COL_PINS_RIGHT { F5, B3, F7, B1, F6, B2, B6 }
-
 // Comunication and Split Detection
 
 #define SELECT_SOFT_SERIAL_SPEED 1
diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json
index 750645d6f4..a72ceb4fc7 100644
--- a/keyboards/handwired/myskeeb/info.json
+++ b/keyboards/handwired/myskeeb/info.json
@@ -8,8 +8,18 @@
         "pid": "0x6060",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D3"
+        "soft_serial_pin": "D3",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F5", "B3", "F7", "B1", "F6", "B2", "B6"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/handwired/nicekey/config.h b/keyboards/handwired/nicekey/config.h
index f5019df285..4b007cf387 100644
--- a/keyboards/handwired/nicekey/config.h
+++ b/keyboards/handwired/nicekey/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { C6 }
-#define MATRIX_ROW_PINS { B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/nicekey/info.json b/keyboards/handwired/nicekey/info.json
index 24872ad800..066e5b852f 100644
--- a/keyboards/handwired/nicekey/info.json
+++ b/keyboards/handwired/nicekey/info.json
@@ -8,12 +8,17 @@
         "pid": "0x6464",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6"],
+        "rows": ["B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0}
+                {"matrix": [0, 0], "x": 0, "y": 0}
             ]
         }
     }
diff --git a/keyboards/handwired/nicekey/nicekey.c b/keyboards/handwired/nicekey/nicekey.c
deleted file mode 100644
index 9720b0d0cb..0000000000
--- a/keyboards/handwired/nicekey/nicekey.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "nicekey.h"
diff --git a/keyboards/handwired/nicekey/nicekey.h b/keyboards/handwired/nicekey/nicekey.h
deleted file mode 100644
index f008be168e..0000000000
--- a/keyboards/handwired/nicekey/nicekey.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00 \
-) { \
-    { k00 } \
-}
diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h
index 23cc53d3f8..6a4ebbec82 100644
--- a/keyboards/handwired/not_so_minidox/config.h
+++ b/keyboards/handwired/not_so_minidox/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, D4 }
-
 //#define EE_HANDS
 
 #define MASTER_LEFT
diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json
index fa408e6633..dee4d76c50 100644
--- a/keyboards/handwired/not_so_minidox/info.json
+++ b/keyboards/handwired/not_so_minidox/info.json
@@ -8,6 +8,11 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6", "B2", "B3", "B1", "F7", "D4"],
+    "rows": ["D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
diff --git a/keyboards/handwired/not_so_minidox/not_so_minidox.c b/keyboards/handwired/not_so_minidox/not_so_minidox.c
deleted file mode 100644
index 898c9eaca8..0000000000
--- a/keyboards/handwired/not_so_minidox/not_so_minidox.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "not_so_minidox.h"
\ No newline at end of file
diff --git a/keyboards/handwired/novem/config.h b/keyboards/handwired/novem/config.h
index 5758bc41c3..b5a88cb22e 100644
--- a/keyboards/handwired/novem/config.h
+++ b/keyboards/handwired/novem/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B4, B5 }
-#define MATRIX_COL_PINS { B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/novem/info.json b/keyboards/handwired/novem/info.json
index 656863da64..bc70d64ed4 100644
--- a/keyboards/handwired/novem/info.json
+++ b/keyboards/handwired/novem/info.json
@@ -8,20 +8,27 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B6"],
+        "rows": ["E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":0, "y":1},
-                {"label":"k04", "x":1, "y":1},
-                {"label":"k05", "x":2, "y":1},
-                {"label":"k06", "x":0, "y":2},
-                {"label":"k07", "x":1, "y":2},
-                {"label":"k08", "x":2, "y":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/novem/novem.c b/keyboards/handwired/novem/novem.c
deleted file mode 100644
index 967ec828f0..0000000000
--- a/keyboards/handwired/novem/novem.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Jose I. Martinez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "novem.h"
-
diff --git a/keyboards/handwired/novem/novem.h b/keyboards/handwired/novem/novem.h
deleted file mode 100644
index b1040094e0..0000000000
--- a/keyboards/handwired/novem/novem.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 Jose I. Martinez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT( \
-      k00, k01, k02, \
-      k03, k04, k05, \
-      k06, k07, k08  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k03, k04, k05 }, \
-    { k06, k07, k08 }, \
-}
diff --git a/keyboards/handwired/nozbe_macro/config.h b/keyboards/handwired/nozbe_macro/config.h
index 66b0bf2b75..81860eaf4d 100644
--- a/keyboards/handwired/nozbe_macro/config.h
+++ b/keyboards/handwired/nozbe_macro/config.h
@@ -17,16 +17,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B0 }
-#define MATRIX_COL_PINS \
-    { D1, D0, D4, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/nozbe_macro/info.json b/keyboards/handwired/nozbe_macro/info.json
index 162b3a6803..a4b37eec4a 100644
--- a/keyboards/handwired/nozbe_macro/info.json
+++ b/keyboards/handwired/nozbe_macro/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6"],
+        "rows": ["B0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5"
     },
@@ -16,10 +21,10 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0}
             ]
         }
     }
diff --git a/keyboards/handwired/nozbe_macro/nozbe_macro.c b/keyboards/handwired/nozbe_macro/nozbe_macro.c
deleted file mode 100644
index b6d38fec83..0000000000
--- a/keyboards/handwired/nozbe_macro/nozbe_macro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Marcin Leon Omelan (@rozPierog)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "nozbe_macro.h"
diff --git a/keyboards/handwired/nozbe_macro/nozbe_macro.h b/keyboards/handwired/nozbe_macro/nozbe_macro.h
deleted file mode 100644
index 2c2c95091b..0000000000
--- a/keyboards/handwired/nozbe_macro/nozbe_macro.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Marcin Leon Omelan (@rozPierog)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03 \
-) { \
-    { k00, k01, k02, k03 } \
-}
diff --git a/keyboards/handwired/numpad20/config.h b/keyboards/handwired/numpad20/config.h
index 9c2c66732a..b9449c4714 100644
--- a/keyboards/handwired/numpad20/config.h
+++ b/keyboards/handwired/numpad20/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F6, B1, B3, B6, B5 }
-#define MATRIX_COL_PINS { D1, D0, F5, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/numpad20/info.json b/keyboards/handwired/numpad20/info.json
index adc0abec12..5c96b7e5db 100644
--- a/keyboards/handwired/numpad20/info.json
+++ b/keyboards/handwired/numpad20/info.json
@@ -8,31 +8,40 @@
     "pid": "0x0504",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D1", "D0", "F5", "F4"],
+    "rows": ["F6", "B1", "B3", "B6", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K10", "x":0, "y":1},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K20", "x":0, "y":2},
-        {"label":"K21", "x":1, "y":2},
-        {"label":"K22", "x":2, "y":2},
-        {"label":"K23", "x":3, "y":2},
-        {"label":"K30", "x":0, "y":3},
-        {"label":"K31", "x":1, "y":3},
-        {"label":"K32", "x":2, "y":3},
-        {"label":"K33", "x":3, "y":3},
-        {"label":"K40", "x":0, "y":4},
-        {"label":"K41", "x":1, "y":4},
-        {"label":"K42", "x":2, "y":4},
-        {"label":"K43", "x":3, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4}
       ]
     }
   }
diff --git a/keyboards/handwired/numpad20/numpad20.c b/keyboards/handwired/numpad20/numpad20.c
deleted file mode 100644
index 50766b7857..0000000000
--- a/keyboards/handwired/numpad20/numpad20.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "numpad20.h"
diff --git a/keyboards/handwired/numpad20/numpad20.h b/keyboards/handwired/numpad20/numpad20.h
deleted file mode 100644
index 03fdd6d923..0000000000
--- a/keyboards/handwired/numpad20/numpad20.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 } \
-}
diff --git a/keyboards/handwired/obuwunkunubi/spaget/config.h b/keyboards/handwired/obuwunkunubi/spaget/config.h
index 6a7baeba33..55acb93cec 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/config.h
+++ b/keyboards/handwired/obuwunkunubi/spaget/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/obuwunkunubi/spaget/info.json b/keyboards/handwired/obuwunkunubi/spaget/info.json
index 8a205c6794..001705ee72 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/info.json
+++ b/keyboards/handwired/obuwunkunubi/spaget/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6969",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F4"},
@@ -19,30 +24,36 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":3, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":0, "y":2.5},
-                {"x":1, "y":2.5},
-                {"x":2, "y":2.5},
-                {"x":3, "y":2.5},
-                {"x":0, "y":3.5},
-                {"x":1, "y":3.5},
-                {"x":2, "y":3.5},
-                {"x":0, "y":4.5},
-                {"x":1, "y":4.5},
-                {"x":2, "y":4.5},
-                {"x":3, "y":3.5, "h":2},
-                {"x":0, "y":5.5},
-                {"x":1, "y":5.5},
-                {"x":2, "y":5.5},
-                {"x":0, "y":6.5, "w":2},
-                {"x":2, "y":6.5},
-                {"x":3, "y":5.5, "h":2}
-			]
+                {"matrix": [2, 3], "x": 0, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 1], "x": 1, "y": 1.5},
+                {"matrix": [0, 2], "x": 2, "y": 1.5},
+                {"matrix": [0, 3], "x": 3, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 1], "x": 1, "y": 2.5},
+                {"matrix": [1, 2], "x": 2, "y": 2.5},
+                {"matrix": [1, 3], "x": 3, "y": 2.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.5},
+                {"matrix": [2, 1], "x": 1, "y": 3.5},
+                {"matrix": [2, 2], "x": 2, "y": 3.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.5},
+                {"matrix": [3, 1], "x": 1, "y": 4.5},
+                {"matrix": [3, 2], "x": 2, "y": 4.5},
+                {"matrix": [3, 3], "x": 3, "y": 3.5, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.5},
+                {"matrix": [4, 1], "x": 1, "y": 5.5},
+                {"matrix": [4, 2], "x": 2, "y": 5.5},
+
+                {"matrix": [5, 1], "x": 0, "y": 6.5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 6.5},
+                {"matrix": [5, 3], "x": 3, "y": 5.5, "h": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/obuwunkunubi/spaget/spaget.c b/keyboards/handwired/obuwunkunubi/spaget/spaget.c
deleted file mode 100644
index aeb0dc5436..0000000000
--- a/keyboards/handwired/obuwunkunubi/spaget/spaget.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 obuwunkunubi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- #include "spaget.h"
diff --git a/keyboards/handwired/obuwunkunubi/spaget/spaget.h b/keyboards/handwired/obuwunkunubi/spaget/spaget.h
deleted file mode 100644
index 7d4b9e9dff..0000000000
--- a/keyboards/handwired/obuwunkunubi/spaget/spaget.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 obuwunkunubi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
-    K23,           K43, \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22,      \
-	K30, K31, K32, K33, \
-	K40, K41, K42,      \
-	     K51, K52, K53  \
-) { \
-	{ K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, K23 }, \
-	{ K30, K31, K32, K33 }, \
-	{ K40, K41, K42, K43 }, \
-	{ XXX, K51, K52, K53 }  \
-}
diff --git a/keyboards/handwired/oem_ansi_fullsize/config.h b/keyboards/handwired/oem_ansi_fullsize/config.h
index 5f31deab10..8906351de9 100644
--- a/keyboards/handwired/oem_ansi_fullsize/config.h
+++ b/keyboards/handwired/oem_ansi_fullsize/config.h
@@ -17,30 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS \
-    { F5, F4, F3, F2, F1, F0 }
-//    R0  R1  R2  R3  R4  R5
-
-#define MATRIX_COL_PINS \
-    { C3, C2, C1, C0, E1, E0, D7, E6, D5, D4, D3, D2, D1, D0, B7, B0, B1, B2, B3, B4, B5, F6 }
-//    C0  C1  C2  C3  C4  C5  C6  C7  C8  C9  CA  CB  CC  CD  CE  CF  CG  CH  CI  CJ  CK  CL
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/oem_ansi_fullsize/info.json b/keyboards/handwired/oem_ansi_fullsize/info.json
index 57a3a74df9..ac892719ad 100644
--- a/keyboards/handwired/oem_ansi_fullsize/info.json
+++ b/keyboards/handwired/oem_ansi_fullsize/info.json
@@ -8,121 +8,139 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C3", "C2", "C1", "C0", "E1", "E0", "D7", "E6", "D5", "D4", "D3", "D2", "D1", "D0", "B7", "B0", "B1", "B2", "B3", "B4", "B5", "F6"],
+        "rows": ["F5", "F4", "F3", "F2", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "at90usb1286",
     "bootloader": "halfkay",
     "community_layouts": ["fullsize_ansi"],
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"matrix": [0, 0], "label": "ESC", "x":0, "y":0},
-                {"matrix": [0, 2], "label": "F1", "x":2, "y":0},
-                {"matrix": [0, 3], "label": "F2", "x":3, "y":0},
-                {"matrix": [0, 4], "label": "F3", "x":4, "y":0},
-                {"matrix": [0, 5], "label": "F4", "x":5, "y":0},
-                {"matrix": [0, 7], "label": "F5", "x":6.5, "y":0},
-                {"matrix": [0, 8], "label": "F6", "x":7.5, "y":0},
-                {"matrix": [0, 9], "label": "F7", "x":8.5, "y":0},
-                {"matrix": [0, 10], "label": "F8", "x":9.5, "y":0},
-                {"matrix": [0, 11], "label": "F9", "x":11, "y":0},
-                {"matrix": [0, 12], "label": "F10", "x":12, "y":0},
-                {"matrix": [0, 13], "label": "F11", "x":13, "y":0},
-                {"matrix": [0, 14], "label": "F12", "x":14, "y":0},
-                {"matrix": [0, 15], "label": "PSCR", "x":15.25, "y":0},
-                {"matrix": [0, 16], "label": "SLCK", "x":16.25, "y":0},
-                {"matrix": [0, 17], "label": "PAUS", "x":17.25, "y":0},
-                
-                {"matrix": [1, 0], "label": "GRV", "x":0, "y":1.25},
-                {"matrix": [1, 1], "label": "1", "x":1, "y":1.25},
-                {"matrix": [1, 2], "label": "2", "x":2, "y":1.25},
-                {"matrix": [1, 3], "label": "3", "x":3, "y":1.25},
-                {"matrix": [1, 4], "label": "4", "x":4, "y":1.25},
-                {"matrix": [1, 5], "label": "5", "x":5, "y":1.25},
-                {"matrix": [1, 6], "label": "6", "x":6, "y":1.25},
-                {"matrix": [1, 7], "label": "7", "x":7, "y":1.25},
-                {"matrix": [1, 8], "label": "8", "x":8, "y":1.25},
-                {"matrix": [1, 9], "label": "9", "x":9, "y":1.25},
-                {"matrix": [1, 10], "label": "0", "x":10, "y":1.25},
-                {"matrix": [1, 11], "label": "MINS", "x":11, "y":1.25},
-                {"matrix": [1, 12], "label": "EQL", "x":12, "y":1.25},
-                {"matrix": [1, 14], "label": "BSPC", "x":13, "y":1.25, "w":2},
-                {"matrix": [1, 15], "label": "INS", "x":15.25, "y":1.25},
-                {"matrix": [1, 16], "label": "HOME", "x":16.25, "y":1.25},
-                {"matrix": [1, 17], "label": "PGUP", "x":17.25, "y":1.25},
-                {"matrix": [1, 18], "label": "NLCK", "x":18.5, "y":1.25},
-                {"matrix": [1, 19], "label": "PSLS", "x":19.5, "y":1.25},
-                {"matrix": [1, 20], "label": "PAST", "x":20.5, "y":1.25},
-                {"matrix": [1, 21], "label": "PMNS", "x":21.5, "y":1.25},
-                
-                {"matrix": [2, 0], "label": "TAB", "x":0, "y":2.25, "w":1.5},
-                {"matrix": [2, 2], "label": "Q", "x":1.5, "y":2.25},
-                {"matrix": [2, 3], "label": "W", "x":2.5, "y":2.25},
-                {"matrix": [2, 4], "label": "E", "x":3.5, "y":2.25},
-                {"matrix": [2, 5], "label": "R", "x":4.5, "y":2.25},
-                {"matrix": [2, 6], "label": "T", "x":5.5, "y":2.25},
-                {"matrix": [2, 7], "label": "Y", "x":6.5, "y":2.25},
-                {"matrix": [2, 8], "label": "U", "x":7.5, "y":2.25},
-                {"matrix": [2, 9], "label": "I", "x":8.5, "y":2.25},
-                {"matrix": [2, 10], "label": "O", "x":9.5, "y":2.25},
-                {"matrix": [2, 11], "label": "P", "x":10.5, "y":2.25},
-                {"matrix": [2, 12], "label": "LBRC", "x":11.5, "y":2.25},
-                {"matrix": [2, 13], "label": "RBRC", "x":12.5, "y":2.25},
-                {"matrix": [2, 14], "label": "BSLS", "x":13.5, "y":2.25, "w":1.5},
-                {"matrix": [2, 15], "label": "DEL", "x":15.25, "y":2.25},
-                {"matrix": [2, 16], "label": "END", "x":16.25, "y":2.25},
-                {"matrix": [2, 17], "label": "PGDN", "x":17.25, "y":2.25},
-                {"matrix": [2, 18], "label": "P7", "x":18.5, "y":2.25},
-                {"matrix": [2, 19], "label": "P8", "x":19.5, "y":2.25},
-                {"matrix": [2, 20], "label": "P9", "x":20.5, "y":2.25},
-                {"matrix": [2, 21], "label": "PPLS", "x":21.5, "y":2.25, "h": 2},
-                
-                {"matrix": [3, 0], "label": "CAPS", "x":0, "y":3.25, "w":1.75},
-                {"matrix": [3, 2], "label": "A", "x":1.75, "y":3.25},
-                {"matrix": [3, 3], "label": "S", "x":2.75, "y":3.25},
-                {"matrix": [3, 4], "label": "D", "x":3.75, "y":3.25},
-                {"matrix": [3, 5], "label": "F", "x":4.75, "y":3.25},
-                {"matrix": [3, 6], "label": "G", "x":5.75, "y":3.25},
-                {"matrix": [3, 7], "label": "H", "x":6.75, "y":3.25},
-                {"matrix": [3, 8], "label": "J", "x":7.75, "y":3.25},
-                {"matrix": [3, 9], "label": "K", "x":8.75, "y":3.25},
-                {"matrix": [3, 10], "label": "L", "x":9.75, "y":3.25},
-                {"matrix": [3, 11], "label": "SCLN", "x":10.75, "y":3.25},
-                {"matrix": [3, 12], "label": "QUOT", "x":11.75, "y":3.25},
-                {"matrix": [3, 13], "label": "ENT", "x":12.75, "y":3.25, "w":2.25},
-                {"matrix": [3, 18], "label": "P4", "x":18.5, "y":3.25},
-                {"matrix": [3, 19], "label": "P5", "x":19.5, "y":3.25},
-                {"matrix": [3, 20], "label": "P6", "x":20.5, "y":3.25},
-                
-                {"matrix": [4, 1], "label": "LSFT", "x":0, "y":4.25, "w":2.25},
-                {"matrix": [4, 2], "label": "Z", "x":2.25, "y":4.25},
-                {"matrix": [4, 3], "label": "X", "x":3.25, "y":4.25},
-                {"matrix": [4, 4], "label": "C", "x":4.25, "y":4.25},
-                {"matrix": [4, 5], "label": "V", "x":5.25, "y":4.25},
-                {"matrix": [4, 6], "label": "B", "x":6.25, "y":4.25},
-                {"matrix": [4, 7], "label": "N", "x":7.25, "y":4.25},
-                {"matrix": [4, 8], "label": "M", "x":8.25, "y":4.25},
-                {"matrix": [4, 9], "label": "COMM", "x":9.25, "y":4.25},
-                {"matrix": [4, 10], "label": "DOT", "x":10.25, "y":4.25},
-                {"matrix": [4, 11], "label": "SLSH", "x":11.25, "y":4.25},
-                {"matrix": [4, 13], "label": "RSFT", "x":12.25, "y":4.25, "w":2.75},
-                {"matrix": [4, 16], "label": "UP", "x":16.25, "y":4.25},
-                {"matrix": [4, 18], "label": "P1", "x":18.5, "y":4.25},
-                {"matrix": [4, 19], "label": "P2", "x":19.5, "y":4.25},
-                {"matrix": [4, 20], "label": "P3", "x":20.5, "y":4.25},
-                {"matrix": [4, 21], "label": "PENT", "x":21.5, "y":4.25, "h":2},
-                
-                {"matrix": [5, 0], "label": "LCTL", "x":0, "y":5.25, "w":1.25},
-                {"matrix": [5, 1], "label": "LGUI", "x":1.25, "y":5.25, "w":1.25},
-                {"matrix": [5, 3], "label": "LALT", "x":2.5, "y":5.25, "w":1.25},
-                {"matrix": [5, 6], "label": "SPC", "x":3.75, "y":5.25, "w":6.25},
-                {"matrix": [5, 10], "label": "RALT", "x":10, "y":5.25, "w":1.25},
-                {"matrix": [5, 11], "label": "RGUI", "x":11.25, "y":5.25, "w":1.25},
-                {"matrix": [5, 13], "label": "MO(1)", "x":12.5, "y":5.25, "w":1.25},
-                {"matrix": [5, 14], "label": "RCTL", "x":13.75, "y":5.25, "w":1.25},
-                {"matrix": [5, 15], "label": "LEFT", "x":15.25, "y":5.25},
-                {"matrix": [5, 16], "label": "DOWN", "x":16.25, "y":5.25},
-                {"matrix": [5, 17], "label": "RGHT", "x":17.25, "y":5.25},
-                {"matrix": [5, 18], "label": "P0", "x":18.5, "y":5.25, "w":2},
-                {"matrix": [5, 20], "label": "PDOT", "x":20.5, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 19], "x": 19.5, "y": 1.25},
+                {"matrix": [1, 20], "x": 20.5, "y": 1.25},
+                {"matrix": [1, 21], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 19], "x": 19.5, "y": 2.25},
+                {"matrix": [2, 20], "x": 20.5, "y": 2.25},
+                {"matrix": [2, 21], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 19], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 20], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 18], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 19], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 20], "x": 20.5, "y": 4.25},
+                {"matrix": [4, 21], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"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, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+
+                {"matrix": [5, 18], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 20], "x": 20.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.c b/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.c
deleted file mode 100644
index 14004599aa..0000000000
--- a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Cian Johnston
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "oem_ansi_fullsize.h"
diff --git a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.h b/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.h
deleted file mode 100644
index ceb873393c..0000000000
--- a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 Cian Johnston
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* Matrix col/row mapping
- *
- *                                                          10     11   12   13   14     15   16   17     18   19   20   21
- *          C0   C1   C2   C3   C4   C5  C6 C7   C8   C9   CA     CB   CC   CD   CE     CF   CG   CH     CI   CJ   CK   CL
- *         ┌───�     ┌───�┌───�┌───�┌───�  ┌───�┌───�┌───�┌───�  ┌───�┌───�┌───�┌───�  ┌───�┌───�┌───�
- *     R0  │K00│     │K02││K03││K04││K05│  │K07││K08││K09││K0A│  │K0B││K0C││K0D││K0E│  │K0F││K0G││K0H│
- *         └───┘     └───┘└───┘└───┘└───┘  └───┘└───┘└───┘└───┘  └───┘└───┘└───┘└───┘  └───┘└───┘└───┘
- *
- *         ┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───────�  ┌───�┌───�┌───�  ┌───�┌───�┌───�┌───�
- *     R1  │K10││K11││K12││K13││K14││K15││K16││K17││K18││K19││K1A││K1B││K1C││  K1E  │  │K1F││K1G││K1H│  │K1I││K1J││K1K││K1L│
- *         └───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───────┘  └───┘└───┘└───┘  └───┘└───┘└───┘└───┘
- *         ┌─────�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌─────�  ┌───�┌───�┌───�  ┌───�┌───�┌───�┌───�
- *     R2  │ K20 ││K22││K23││K24││K25││K26││K27││K28││K29││K2A││K2B││K2C││K2D││ K2E │  │K2F││K2G││K2H│  │K2I││K2J││K2K││   │
- *         └─────┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└─────┘  └───┘└───┘└───┘  └───┘└───┘└───┘│K2L│
- *         ┌───────�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌────────�                   ┌───�┌───�┌───�│   │
- *     R3  │  K30  ││K32││K33││K34││K35││K36││K37││K38││K39││K3A││K3B││K3C││  K3D   │                   │K3I││K3J││K3K││   │
- *         └───────┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└────────┘                   └───┘└───┘└───┘└───┘
- *         ┌─────────�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───�┌───────────�       ┌───�       ┌───�┌───�┌───�┌───�
- *     R4  │   K41   ││K42││K43││K44││K45││K46││K47││K48││K49││K4A││K4B││    K4D    │       │K4G│       │K4I││K4J││K4K││   │
- *         └─────────┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───────────┘       └───┘       └───┘└───┘└───┘│K4L│
- *         ┌────�┌────�┌────�┌──────────────────────────────�┌────�┌────�┌────�┌────�  ┌───�┌───�┌───�  ┌────────�┌───�│   │
- *     R5  │K50 ││K51 ││K53 ││               K56            ││K5A ││K5B ││K5D ││K5E │  │K5F││K5G││K5H│  │   K5I  ││K5K││   │
- *         └────┘└────┘└────┘└──────────────────────────────┘└────┘└────┘└────┘└────┘  └───┘└───┘└───┘  └────────┘└───┘└───┘
- *
- */
-
-// clang-format off
-#define LAYOUT_fullsize_ansi( \
-    K00,      K02, K03, K04, K05,    K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   K0F, K0G, K0H,                       \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E,      K1F, K1G, K1H,   K1I, K1J, K1K, K1L, \
-    K20,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,     K2F, K2G, K2H,   K2I, K2J, K2K, K2L, \
-    K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                          K3I, K3J, K3K,      \
-    K41,     K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D,                 K4G,        K4I, K4J, K4K, K4L, \
-    K50,  K51,  K53,                 K56,             K5A,  K5B,  K5D,  K5E,   K5F, K5G, K5H,      K5I,   K5K       \
-) { \
-    { K00,   KC_NO, K02,   K03,   K04,   K05,   KC_NO, K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   K0H,   KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E,   K1F,   K1G,   K1H,   K1I,   K1J,   K1K,   K1L   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G,   K2H,   K2I,   K2J,   K2K,   K2L   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO, KC_NO, K3I,   K3J,   K3K,   KC_NO }, \
-    { KC_NO, K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,   KC_NO, KC_NO, K4G,   KC_NO, K4I,   K4J,   K4K,   K4L   }, \
-    { K50,   K51,   KC_NO, K53,   KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   KC_NO, K5D,   K5E,   K5F,   K5G,   K5H,   K5I,   KC_NO, K5K,   KC_NO }, \
-}
-// clang-format on
diff --git a/keyboards/handwired/oem_iso_fullsize/config.h b/keyboards/handwired/oem_iso_fullsize/config.h
deleted file mode 100644
index af6146110d..0000000000
--- a/keyboards/handwired/oem_iso_fullsize/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/** Copyright 2021 andresteare
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C0, B4, F3, F4, F5, F6 }
-#define MATRIX_COL_PINS { C2, C1, E0, D4, D5, A4, A0, B2, B0, E7, E6, D6, B1, B3, D3, D2, B6, F7, F0, F1, F2 }
-
-#define DIODE_DIRECTION ROW2COL
-
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/oem_iso_fullsize/info.json b/keyboards/handwired/oem_iso_fullsize/info.json
index b1c5c50969..266d53ede2 100644
--- a/keyboards/handwired/oem_iso_fullsize/info.json
+++ b/keyboards/handwired/oem_iso_fullsize/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7070",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C2", "C1", "E0", "D4", "D5", "A4", "A0", "B2", "B0", "E7", "E6", "D6", "B1", "B3", "D3", "D2", "B6", "F7", "F0", "F1", "F2"],
+        "rows": ["C0", "B4", "F3", "F4", "F5", "F6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.c b/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.c
deleted file mode 100644
index 62690ef673..0000000000
--- a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 andresteare
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "oem_iso_fullsize.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/onekey/blackpill_f401/config.h b/keyboards/handwired/onekey/blackpill_f401/config.h
index 8000ee77d7..6183ee9819 100644
--- a/keyboards/handwired/onekey/blackpill_f401/config.h
+++ b/keyboards/handwired/onekey/blackpill_f401/config.h
@@ -23,8 +23,6 @@
 
 #define ADC_PIN A0
 
-#define RGB_CI_PIN A2
-
 #define SOLENOID_PIN B12
 #define SOLENOID_PINS { B12, B13, B14, B15 }
 #define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
diff --git a/keyboards/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/info.json
index b79b17b000..69a7ea87a7 100644
--- a/keyboards/handwired/onekey/blackpill_f401/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401/info.json
@@ -8,7 +8,11 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
     }
 }
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h
index 8000ee77d7..6183ee9819 100755
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h
@@ -23,8 +23,6 @@
 
 #define ADC_PIN A0
 
-#define RGB_CI_PIN A2
-
 #define SOLENOID_PIN B12
 #define SOLENOID_PINS { B12, B13, B14, B15 }
 #define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
index 6787be36af..ed9435c740 100644
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
@@ -9,7 +9,11 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
     }
 }
diff --git a/keyboards/handwired/onekey/blackpill_f411/config.h b/keyboards/handwired/onekey/blackpill_f411/config.h
index 8000ee77d7..6183ee9819 100644
--- a/keyboards/handwired/onekey/blackpill_f411/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411/config.h
@@ -23,8 +23,6 @@
 
 #define ADC_PIN A0
 
-#define RGB_CI_PIN A2
-
 #define SOLENOID_PIN B12
 #define SOLENOID_PINS { B12, B13, B14, B15 }
 #define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/info.json
index 19c6cbfed9..5ee8ec3d5e 100644
--- a/keyboards/handwired/onekey/blackpill_f411/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411/info.json
@@ -8,7 +8,11 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
     }
 }
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
index 8000ee77d7..6183ee9819 100755
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
@@ -23,8 +23,6 @@
 
 #define ADC_PIN A0
 
-#define RGB_CI_PIN A2
-
 #define SOLENOID_PIN B12
 #define SOLENOID_PINS { B12, B13, B14, B15 }
 #define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
index 25d33a7dde..8e8b52080a 100644
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
@@ -9,7 +9,11 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
     }
 }
diff --git a/keyboards/handwired/onekey/bluepill/config.h b/keyboards/handwired/onekey/bluepill/config.h
index 7c3512b57b..02cd63ac3f 100644
--- a/keyboards/handwired/onekey/bluepill/config.h
+++ b/keyboards/handwired/onekey/bluepill/config.h
@@ -21,5 +21,3 @@
 #define BACKLIGHT_PWM_CHANNEL 1
 
 #define ADC_PIN A0
-
-#define RGB_CI_PIN A2
diff --git a/keyboards/handwired/onekey/bluepill/info.json b/keyboards/handwired/onekey/bluepill/info.json
index 7bef2db170..5f1fecc95b 100644
--- a/keyboards/handwired/onekey/bluepill/info.json
+++ b/keyboards/handwired/onekey/bluepill/info.json
@@ -8,7 +8,11 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
     }
 }
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/config.h b/keyboards/handwired/onekey/bluepill_f103c6/config.h
index 12f4596e7b..5edcf5a2e1 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/config.h
+++ b/keyboards/handwired/onekey/bluepill_f103c6/config.h
@@ -22,8 +22,6 @@
 
 #define ADC_PIN A0
 
-#define RGB_CI_PIN A2
-
 // This code does not fit into the really small flash of STM32F103x6 together
 // with CONSOLE_ENABLE=yes, and the debugging console is probably more
 // important for the "onekey" testing firmware.  In a real firmware you may be
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json
index 353f074d92..9460b43f5f 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/info.json
+++ b/keyboards/handwired/onekey/bluepill_f103c6/info.json
@@ -9,7 +9,11 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
     }
 }
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
index 208165ab31..8fd4321938 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
+++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
@@ -2,7 +2,7 @@
 # Cannot use `BOOTLOADER = stm32duino` due to the need to override
 # `MCU_LDSCRIPT`, therefore all parameters need to be specified here manually.
 OPT_DEFS += -DBOOTLOADER_STM32DUINO
-MCU_LDSCRIPT = STM32F103x6_stm32duino_bootloader
+MCU_LDSCRIPT = STM32F103x6_stm32duino
 BOOTLOADER_TYPE = stm32duino
 DFU_ARGS = -d 1EAF:0003 -a 2 -R
 DFU_SUFFIX_ARGS = -v 1EAF -p 0003
diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/config.h b/keyboards/handwired/onekey/bluepill_uf2boot/config.h
index 7c3512b57b..02cd63ac3f 100644
--- a/keyboards/handwired/onekey/bluepill_uf2boot/config.h
+++ b/keyboards/handwired/onekey/bluepill_uf2boot/config.h
@@ -21,5 +21,3 @@
 #define BACKLIGHT_PWM_CHANNEL 1
 
 #define ADC_PIN A0
-
-#define RGB_CI_PIN A2
diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/info.json b/keyboards/handwired/onekey/bluepill_uf2boot/info.json
index 1f823ea0d7..65174155b3 100644
--- a/keyboards/handwired/onekey/bluepill_uf2boot/info.json
+++ b/keyboards/handwired/onekey/bluepill_uf2boot/info.json
@@ -9,7 +9,11 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
     }
 }
diff --git a/keyboards/handwired/onekey/elite_c/config.h b/keyboards/handwired/onekey/elite_c/config.h
index 1eb62b4498..1bd5fb6c14 100644
--- a/keyboards/handwired/onekey/elite_c/config.h
+++ b/keyboards/handwired/onekey/elite_c/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-
-#define RGB_CI_PIN B1
-
 #define ADC_PIN F6
 
 #define QMK_WAITING_TEST_BUSY_PIN F6
diff --git a/keyboards/handwired/onekey/elite_c/info.json b/keyboards/handwired/onekey/elite_c/info.json
index 1548561041..b8532cbec0 100644
--- a/keyboards/handwired/onekey/elite_c/info.json
+++ b/keyboards/handwired/onekey/elite_c/info.json
@@ -8,7 +8,11 @@
     "backlight": {
         "pin": "B6"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "F6"
+    },
+    "apa102": {
+        "data_pin": "F6",
+        "clock_pin": "B1"
     }
 }
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/config.h b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
index 11cacfea72..4a65e9a72f 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/config.h
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
@@ -11,7 +11,6 @@
 #define BACKLIGHT_PAL_MODE    2
 
 #define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))
-#define RGB_CI_PIN B8
 
 #define SOLENOID_PIN B12
 #define SOLENOID_PINS { B12, B13, B14, B15 }
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
index 304517d266..dfb57df2b3 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/info.json
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
@@ -9,7 +9,11 @@
     "backlight": {
         "pin": "B8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A0"
+    },
+    "apa102": {
+        "data_pin": "A0",
+        "clock_pin": "B8"
     }
 }
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/config.h b/keyboards/handwired/onekey/evb_wb32fq95/config.h
index 11cacfea72..4a65e9a72f 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/config.h
+++ b/keyboards/handwired/onekey/evb_wb32fq95/config.h
@@ -11,7 +11,6 @@
 #define BACKLIGHT_PAL_MODE    2
 
 #define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))
-#define RGB_CI_PIN B8
 
 #define SOLENOID_PIN B12
 #define SOLENOID_PINS { B12, B13, B14, B15 }
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/info.json
index bbf5139668..8a94f5e8b1 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/info.json
+++ b/keyboards/handwired/onekey/evb_wb32fq95/info.json
@@ -9,7 +9,11 @@
     "backlight": {
         "pin": "B8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A0"
+    },
+    "apa102": {
+        "data_pin": "A0",
+        "clock_pin": "B8"
     }
 }
diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/info.json
index 37ec3cf8c0..5c0c92ef5d 100644
--- a/keyboards/handwired/onekey/kb2040/info.json
+++ b/keyboards/handwired/onekey/kb2040/info.json
@@ -5,7 +5,8 @@
         "cols": ["GP4"],
         "rows": ["GP5"]
     },
-    "rgblight": {
-        "pin": "GP17"
+    "ws2812": {
+        "pin": "GP17",
+        "driver": "vendor"
     }
 }
diff --git a/keyboards/handwired/onekey/kb2040/rules.mk b/keyboards/handwired/onekey/kb2040/rules.mk
index df97352882..a5429ba993 100644
--- a/keyboards/handwired/onekey/kb2040/rules.mk
+++ b/keyboards/handwired/onekey/kb2040/rules.mk
@@ -1,6 +1,4 @@
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 
-WS2812_DRIVER = vendor
-
 OPT_DEFS += -DHAL_USE_I2C=TRUE
diff --git a/keyboards/handwired/onekey/nucleo_f446re/config.h b/keyboards/handwired/onekey/nucleo_f446re/config.h
index 52fe25dc8c..c6c04ed615 100644
--- a/keyboards/handwired/onekey/nucleo_f446re/config.h
+++ b/keyboards/handwired/onekey/nucleo_f446re/config.h
@@ -7,8 +7,6 @@
 #define BACKLIGHT_PWM_CHANNEL 3
 #define BACKLIGHT_PAL_MODE    2
 
-#define RGB_CI_PIN B13
-
 #define ADC_PIN A0
 
 #define SOLENOID_PINS { B12, B13, B14, B15 }
diff --git a/keyboards/handwired/onekey/nucleo_f446re/info.json b/keyboards/handwired/onekey/nucleo_f446re/info.json
index 6b9206f987..26de66e198 100644
--- a/keyboards/handwired/onekey/nucleo_f446re/info.json
+++ b/keyboards/handwired/onekey/nucleo_f446re/info.json
@@ -9,7 +9,11 @@
     "backlight": {
         "pin": "B8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A0"
+    },
+    "apa102": {
+        "data_pin": "A0",
+        "clock_pin": "B13"
     }
 }
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/config.h b/keyboards/handwired/onekey/nucleo_l432kc/config.h
index fcf2c71b47..d344a11094 100644
--- a/keyboards/handwired/onekey/nucleo_l432kc/config.h
+++ b/keyboards/handwired/onekey/nucleo_l432kc/config.h
@@ -7,6 +7,4 @@
 #define BACKLIGHT_PWM_CHANNEL 3
 #define BACKLIGHT_PAL_MODE    2
 
-#define RGB_CI_PIN B13
-
 #define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/info.json b/keyboards/handwired/onekey/nucleo_l432kc/info.json
index a6e6511040..f6af0826fb 100644
--- a/keyboards/handwired/onekey/nucleo_l432kc/info.json
+++ b/keyboards/handwired/onekey/nucleo_l432kc/info.json
@@ -9,7 +9,11 @@
     "backlight": {
         "pin": "B8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A0"
+    },
+    "apa102": {
+        "data_pin": "A0",
+        "clock_pin": "B13"
     }
 }
diff --git a/keyboards/handwired/onekey/promicro/config.h b/keyboards/handwired/onekey/promicro/config.h
index 1eb62b4498..1bd5fb6c14 100644
--- a/keyboards/handwired/onekey/promicro/config.h
+++ b/keyboards/handwired/onekey/promicro/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-
-#define RGB_CI_PIN B1
-
 #define ADC_PIN F6
 
 #define QMK_WAITING_TEST_BUSY_PIN F6
diff --git a/keyboards/handwired/onekey/promicro/info.json b/keyboards/handwired/onekey/promicro/info.json
index efefd8d45c..178e6185de 100644
--- a/keyboards/handwired/onekey/promicro/info.json
+++ b/keyboards/handwired/onekey/promicro/info.json
@@ -8,7 +8,11 @@
     "backlight": {
         "pin": "B6"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "F6"
+    },
+    "apa102": {
+        "data_pin": "F6",
+        "clock_pin": "B1"
     }
 }
diff --git a/keyboards/handwired/onekey/proton_c/config.h b/keyboards/handwired/onekey/proton_c/config.h
index 1f1c528400..49376e474e 100644
--- a/keyboards/handwired/onekey/proton_c/config.h
+++ b/keyboards/handwired/onekey/proton_c/config.h
@@ -21,6 +21,4 @@
 #define BACKLIGHT_PWM_CHANNEL 3
 #define BACKLIGHT_PAL_MODE    2
 
-#define RGB_CI_PIN B13
-
 #define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/proton_c/info.json b/keyboards/handwired/onekey/proton_c/info.json
index 5292d02567..93dbc4c30d 100644
--- a/keyboards/handwired/onekey/proton_c/info.json
+++ b/keyboards/handwired/onekey/proton_c/info.json
@@ -8,7 +8,11 @@
     "backlight": {
         "pin": "B8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A0"
+    },
+    "apa102": {
+        "data_pin": "A0",
+        "clock_pin": "B13"
     }
 }
diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/info.json
index 32bde911bb..40eb896232 100644
--- a/keyboards/handwired/onekey/rp2040/info.json
+++ b/keyboards/handwired/onekey/rp2040/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "GP25"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "GP25"
     }
 }
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/config.h b/keyboards/handwired/onekey/sipeed_longan_nano/config.h
index 71ac29e882..1e39cf3f1d 100644
--- a/keyboards/handwired/onekey/sipeed_longan_nano/config.h
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/config.h
@@ -20,8 +20,6 @@
 #define BACKLIGHT_PWM_DRIVER PWMD5 /* GD32 numbering scheme starts from 0, TIMER4 on GD32 boards is TIMER5 on STM32 boards. */
 #define BACKLIGHT_PWM_CHANNEL 2    /* GD32 numbering scheme starts from 0, Channel 1 on GD32 boards is Channel 2 on STM32 boards. */
 
-#define RGB_CI_PIN B13
-
 #define ADC_PIN A0
 
 #define I2C1_CLOCK_SPEED 1000000 /* GD32VF103 supports fast mode plus. */
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/info.json
index d14928139b..28aa8a2fdc 100644
--- a/keyboards/handwired/onekey/sipeed_longan_nano/info.json
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/info.json
@@ -10,7 +10,11 @@
     "backlight": {
         "pin": "A1"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A2"
+    },
+    "apa102": {
+        "data_pin": "A2",
+        "clock_pin": "B13"
     }
 }
diff --git a/keyboards/handwired/onekey/stm32f0_disco/config.h b/keyboards/handwired/onekey/stm32f0_disco/config.h
index b4665911d4..806eb69df4 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/config.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/config.h
@@ -22,5 +22,3 @@
 #define BACKLIGHT_PAL_MODE    0
 
 #define ADC_PIN A0
-
-#define RGB_CI_PIN B13
diff --git a/keyboards/handwired/onekey/stm32f0_disco/info.json b/keyboards/handwired/onekey/stm32f0_disco/info.json
index c76bd73173..41210a3bbb 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/info.json
+++ b/keyboards/handwired/onekey/stm32f0_disco/info.json
@@ -9,7 +9,11 @@
     "backlight": {
         "pin": "C8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "B15"
+    },
+    "apa102": {
+        "data_pin": "B15",
+        "clock_pin": "B13"
     }
 }
diff --git a/keyboards/handwired/onekey/teensy_2/config.h b/keyboards/handwired/onekey/teensy_2/config.h
index e70df80fc8..432ae9b85c 100644
--- a/keyboards/handwired/onekey/teensy_2/config.h
+++ b/keyboards/handwired/onekey/teensy_2/config.h
@@ -19,7 +19,5 @@
 
 #define ADC_PIN F6
 
-#define RGB_CI_PIN F7
-
 #define QMK_WAITING_TEST_BUSY_PIN F6
 #define QMK_WAITING_TEST_YIELD_PIN F7
diff --git a/keyboards/handwired/onekey/teensy_2/info.json b/keyboards/handwired/onekey/teensy_2/info.json
index 2425168462..d7720a01d3 100644
--- a/keyboards/handwired/onekey/teensy_2/info.json
+++ b/keyboards/handwired/onekey/teensy_2/info.json
@@ -9,7 +9,11 @@
     "backlight": {
         "pin": "B6"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "F6"
+    },
+    "apa102": {
+        "data_pin": "F6",
+        "clock_pin": "F7"
     }
 }
diff --git a/keyboards/handwired/onekey/teensy_2pp/config.h b/keyboards/handwired/onekey/teensy_2pp/config.h
index e70df80fc8..432ae9b85c 100644
--- a/keyboards/handwired/onekey/teensy_2pp/config.h
+++ b/keyboards/handwired/onekey/teensy_2pp/config.h
@@ -19,7 +19,5 @@
 
 #define ADC_PIN F6
 
-#define RGB_CI_PIN F7
-
 #define QMK_WAITING_TEST_BUSY_PIN F6
 #define QMK_WAITING_TEST_YIELD_PIN F7
diff --git a/keyboards/handwired/onekey/teensy_2pp/info.json b/keyboards/handwired/onekey/teensy_2pp/info.json
index ba7281ce1b..f7de463fca 100644
--- a/keyboards/handwired/onekey/teensy_2pp/info.json
+++ b/keyboards/handwired/onekey/teensy_2pp/info.json
@@ -9,7 +9,11 @@
     "backlight": {
         "pin": "B6"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "F6"
+    },
+    "apa102": {
+        "data_pin": "F6",
+        "clock_pin": "F7"
     }
 }
diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/info.json
index e9b37e1c81..d0b6d7f48a 100644
--- a/keyboards/handwired/orbweaver/info.json
+++ b/keyboards/handwired/orbweaver/info.json
@@ -12,6 +12,9 @@
         "mousekey": true,
         "nkro": true
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
     "matrix_pins": {
         "rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"],
         "cols": ["GP12", "GP13", "GP14", "GP15", "GP16"]
diff --git a/keyboards/handwired/orbweaver/rules.mk b/keyboards/handwired/orbweaver/rules.mk
index 07c357daac..01f9d9397a 100644
--- a/keyboards/handwired/orbweaver/rules.mk
+++ b/keyboards/handwired/orbweaver/rules.mk
@@ -1,3 +1,2 @@
 # Add support for 3731 RGB matrix controller
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/handwired/ortho5x13/config.h b/keyboards/handwired/ortho5x13/config.h
index 55782eaff1..b9449c4714 100644
--- a/keyboards/handwired/ortho5x13/config.h
+++ b/keyboards/handwired/ortho5x13/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/ortho5x13/info.json b/keyboards/handwired/ortho5x13/info.json
index 6057d1e092..b15b3fa61b 100644
--- a/keyboards/handwired/ortho5x13/info.json
+++ b/keyboards/handwired/ortho5x13/info.json
@@ -8,6 +8,11 @@
         "pid": "0x050D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D3", "D2", "D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "layouts": {
diff --git a/keyboards/handwired/ortho5x13/ortho5x13.c b/keyboards/handwired/ortho5x13/ortho5x13.c
deleted file mode 100644
index 525e1ba112..0000000000
--- a/keyboards/handwired/ortho5x13/ortho5x13.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ortho5x13.h"
diff --git a/keyboards/handwired/ortho5x13/ortho5x13.h b/keyboards/handwired/ortho5x13/ortho5x13.h
index bd34925a9a..e946bea9c1 100644
--- a/keyboards/handwired/ortho5x13/ortho5x13.h
+++ b/keyboards/handwired/ortho5x13/ortho5x13.h
@@ -13,6 +13,6 @@
   { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
   { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c }, \
   { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c }, \
-  { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b, k3c }, \
+  { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
   { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b, k4c } \
 }
diff --git a/keyboards/handwired/ortho5x14/config.h b/keyboards/handwired/ortho5x14/config.h
index 92f72b4fc7..c37ac42537 100644
--- a/keyboards/handwired/ortho5x14/config.h
+++ b/keyboards/handwired/ortho5x14/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1  }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/ortho5x14/info.json b/keyboards/handwired/ortho5x14/info.json
index 8e657b7675..5faccec8af 100644
--- a/keyboards/handwired/ortho5x14/info.json
+++ b/keyboards/handwired/ortho5x14/info.json
@@ -8,6 +8,11 @@
         "pid": "0x050D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["F0", "F1", "C7", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/ortho5x14/ortho5x14.c b/keyboards/handwired/ortho5x14/ortho5x14.c
deleted file mode 100644
index 0379ab75bd..0000000000
--- a/keyboards/handwired/ortho5x14/ortho5x14.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Richard Nunez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ortho5x14.h"
-
diff --git a/keyboards/handwired/ortho_brass/config.h b/keyboards/handwired/ortho_brass/config.h
deleted file mode 100644
index 3f8e24089b..0000000000
--- a/keyboards/handwired/ortho_brass/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Christoph Jabs (BifbofII)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* Handwired pin-out */
-#define MATRIX_ROW_PINS \
-    { D3, D2, D1, D0 }
-#define MATRIX_COL_PINS \
-    { F4, F7, F5, F1, C7, F0, B1, B0, F6, B6, B2, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json
index c931dc327f..b2280b6204 100644
--- a/keyboards/handwired/ortho_brass/info.json
+++ b/keyboards/handwired/ortho_brass/info.json
@@ -8,117 +8,125 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F1", "C7", "F0", "B1", "B0", "F6", "B6", "B2", "B3"],
+        "rows": ["D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["ortho_4x12"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"k10", "x":0, "y":1},
-                {"label":"k11", "x":1, "y":1},
-                {"label":"k12", "x":2, "y":1},
-                {"label":"k13", "x":3, "y":1},
-                {"label":"k14", "x":4, "y":1},
-                {"label":"k15", "x":5, "y":1},
-                {"label":"k16", "x":6, "y":1},
-                {"label":"k17", "x":7, "y":1},
-                {"label":"k18", "x":8, "y":1},
-                {"label":"k19", "x":9, "y":1},
-                {"label":"k1a", "x":10, "y":1},
-                {"label":"k1b", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"k20", "x":0, "y":2},
-                {"label":"k21", "x":1, "y":2},
-                {"label":"k22", "x":2, "y":2},
-                {"label":"k23", "x":3, "y":2},
-                {"label":"k24", "x":4, "y":2},
-                {"label":"k25", "x":5, "y":2},
-                {"label":"k26", "x":6, "y":2},
-                {"label":"k27", "x":7, "y":2},
-                {"label":"k28", "x":8, "y":2},
-                {"label":"k29", "x":9, "y":2},
-                {"label":"k2a", "x":10, "y":2},
-                {"label":"k2b", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"k30", "x":0, "y":3},
-                {"label":"k31", "x":1, "y":3},
-                {"label":"k32", "x":2, "y":3},
-                {"label":"k33", "x":3, "y":3},
-                {"label":"k34", "x":4, "y":3},
-                {"label":"k35", "x":5, "y":3},
-                {"label":"k36", "x":6, "y":3},
-                {"label":"k37", "x":7, "y":3},
-                {"label":"k38", "x":8, "y":3},
-                {"label":"k39", "x":9, "y":3},
-                {"label":"k3a", "x":10, "y":3},
-                {"label":"k3b", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12_1x2uC": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"k10", "x":0, "y":1},
-                {"label":"k11", "x":1, "y":1},
-                {"label":"k12", "x":2, "y":1},
-                {"label":"k13", "x":3, "y":1},
-                {"label":"k14", "x":4, "y":1},
-                {"label":"k15", "x":5, "y":1},
-                {"label":"k16", "x":6, "y":1},
-                {"label":"k17", "x":7, "y":1},
-                {"label":"k18", "x":8, "y":1},
-                {"label":"k19", "x":9, "y":1},
-                {"label":"k1a", "x":10, "y":1},
-                {"label":"k1b", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"k20", "x":0, "y":2},
-                {"label":"k21", "x":1, "y":2},
-                {"label":"k22", "x":2, "y":2},
-                {"label":"k23", "x":3, "y":2},
-                {"label":"k24", "x":4, "y":2},
-                {"label":"k25", "x":5, "y":2},
-                {"label":"k26", "x":6, "y":2},
-                {"label":"k27", "x":7, "y":2},
-                {"label":"k28", "x":8, "y":2},
-                {"label":"k29", "x":9, "y":2},
-                {"label":"k2a", "x":10, "y":2},
-                {"label":"k2b", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"k30", "x":0, "y":3},
-                {"label":"k31", "x":1, "y":3},
-                {"label":"k32", "x":2, "y":3},
-                {"label":"k33", "x":3, "y":3},
-                {"label":"k34", "x":4, "y":3},
-                {"label":"k35", "x":5, "y":3, "w":2},
-                {"label":"k37", "x":7, "y":3},
-                {"label":"k38", "x":8, "y":3},
-                {"label":"k39", "x":9, "y":3},
-                {"label":"k3a", "x":10, "y":3},
-                {"label":"k3b", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/handwired/ortho_brass/ortho_brass.c b/keyboards/handwired/ortho_brass/ortho_brass.c
index d124bbfca2..d645306afa 100644
--- a/keyboards/handwired/ortho_brass/ortho_brass.c
+++ b/keyboards/handwired/ortho_brass/ortho_brass.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ortho_brass.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/handwired/ortho_brass/ortho_brass.h b/keyboards/handwired/ortho_brass/ortho_brass.h
deleted file mode 100644
index 0bcff0db51..0000000000
--- a/keyboards/handwired/ortho_brass/ortho_brass.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 Christoph Jabs (BifbofII)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
diff --git a/keyboards/handwired/owlet60/config.h b/keyboards/handwired/owlet60/config.h
index 9eff47d07e..bacb8449f2 100644
--- a/keyboards/handwired/owlet60/config.h
+++ b/keyboards/handwired/owlet60/config.h
@@ -40,8 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 8
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -58,7 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json
index 6b84c37e9b..cc607adc71 100644
--- a/keyboards/handwired/owlet60/info.json
+++ b/keyboards/handwired/owlet60/info.json
@@ -8,22 +8,351 @@
         "pid": "0xDA19",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "debounce": 9,
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_owlet60_60_percent_full_bsp": "LAYOUT_alice",
+        "LAYOUT_owlet60_60_percent_split_bsp": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_owlet60_full_bsp": {
-            "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Home", "x":17.75, "y":2}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"End", "x":18, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Left", "x":16, "y":4}, {"label":"Down", "x":17, "y":4}, {"label":"Right", "x":18, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [7, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [6, 7], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+                {"matrix": [4, 7], "x": 18, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [3, 6], "x": 16, "y": 4},
+                {"matrix": [2, 7], "x": 17, "y": 4},
+                {"matrix": [3, 7], "x": 18, "y": 4}
+            ]
         },
         "LAYOUT_owlet60_split_bsp": {
-            "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Home", "x":17.75, "y":2}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"End", "x":18, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Left", "x":16, "y":4}, {"label":"Down", "x":17, "y":4}, {"label":"Right", "x":18, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 7], "x": 16.25, "y": 0},
+                {"matrix": [7, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [6, 7], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+                {"matrix": [4, 7], "x": 18, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [3, 6], "x": 16, "y": 4},
+                {"matrix": [2, 7], "x": 17, "y": 4},
+                {"matrix": [3, 7], "x": 18, "y": 4}
+            ]
         },
         "LAYOUT_alice_split_bs": {
-            "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 7], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
+            ]
         },
         "LAYOUT_alice": {
-            "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0, "w":2}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c
index ad36c99039..b233dd7a52 100644
--- a/keyboards/handwired/owlet60/matrix.c
+++ b/keyboards/handwired/owlet60/matrix.c
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stdint.h>
 #include <stdbool.h>
-#include "owlet60.h"
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
diff --git a/keyboards/handwired/owlet60/owlet60.c b/keyboards/handwired/owlet60/owlet60.c
deleted file mode 100644
index 079beb8e40..0000000000
--- a/keyboards/handwired/owlet60/owlet60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 worthlessowl
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "owlet60.h"
diff --git a/keyboards/handwired/owlet60/owlet60.h b/keyboards/handwired/owlet60/owlet60.h
deleted file mode 100644
index b54c3df0e2..0000000000
--- a/keyboards/handwired/owlet60/owlet60.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Copyright 2019 worthlessowl
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_owlet60_split_bsp( \
-    k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
-    k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, \
-    k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           k2d, \
-         k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e, \
-         k40,      k41,      k42, k43, k44,           k45,          k46,  k47,      k48 \
-) { \
-    { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
-    { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
-    { k52, k31, k33, k35, k27, k39, k3b, k47}, \
-    { k40, k41, k42, k43, k37, k45, k46, k48}, \
-    { k30, k32, k34, k44, k38, k3a, k3c, k3e}, \
-    { k20, k22, k24, k36, k28, k2a, k2c, k2d}, \
-    { k10, k12, k14, k26, k18, k1a, k1c, k1e}, \
-    { k00, k02, k04, k16, k08, k0a, k0c, k0f}, \
-    { k01, k03, k05, k06, k09, k0b, k0d, k0e} \
-}
-
-#define LAYOUT_owlet60_full_bsp( \
-    k50,  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,    k0d,   k0f, \
-    k51,  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, \
-    k52,  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           k2d, \
-          k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e, \
-          k40,      k41,      k42, k43, k44,           k45,          k46,  k47,      k48 \
-) { \
-    { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
-    { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
-    { k52, k31, k33, k35, k27, k39, k3b, k47}, \
-    { k40, k41, k42, k43, k37, k45, k46, k48}, \
-    { k30, k32, k34, k44, k38, k3a, k3c, k3e}, \
-    { k20, k22, k24, k36, k28, k2a, k2c, k2d}, \
-    { k10, k12, k14, k26, k18, k1a, k1c, k1e}, \
-    { k00, k02, k04, k16, k08, k0a, k0c, k0f}, \
-    { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \
-}
-
-#define LAYOUT_alice_split_bs( \
-    k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
-    k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           \
-         k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      \
-         k40,      k41,      k42, k43, k44,           k45,                k47      \
-) { \
-    { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
-    { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
-    { k52, k31, k33, k35, k27, k39, k3b, k47}, \
-    { k40, k41, k42, k43, k37, k45, KC_NO, KC_NO}, \
-    { k30, k32, k34, k44, k38, k3a, k3c, KC_NO}, \
-    { k20, k22, k24, k36, k28, k2a, k2c, KC_NO}, \
-    { k10, k12, k14, k26, k18, k1a, k1c, KC_NO}, \
-    { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \
-    { k01, k03, k05, k06, k09, k0b, k0d, k0e} \
-}
-
-#define LAYOUT_alice( \
-    k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,  \
-    k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,  \
-    k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,       \
-         k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,  \
-         k40,      k41,      k42, k43, k44,           k45,                k47  \
-) { \
-    { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
-    { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
-    { k52, k31, k33, k35, k27, k39, k3b, k47}, \
-    { k40, k41, k42, k43, k37, k45, KC_NO, KC_NO}, \
-    { k30, k32, k34, k44, k38, k3a, k3c, KC_NO}, \
-    { k20, k22, k24, k36, k28, k2a, k2c, KC_NO}, \
-    { k10, k12, k14, k26, k18, k1a, k1c, KC_NO}, \
-    { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \
-    { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \
-}
-
-#define LAYOUT_owlet60_60_percent_split_bsp LAYOUT_alice_split_bs
-#define LAYOUT_owlet60_60_percent_full_bsp LAYOUT_alice
diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h
index a3693706d4..b224411da4 100644
--- a/keyboards/handwired/p65rgb/config.h
+++ b/keyboards/handwired/p65rgb/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, D5 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B0, B1, B2, B3, B7, D0, D1, D2, D3, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B4
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json
index 316fa0f61d..c752501362 100644
--- a/keyboards/handwired/p65rgb/info.json
+++ b/keyboards/handwired/p65rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x75B4",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B4"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D7"],
+        "rows": ["C7", "C6", "B6", "B5", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "C7",
         "esc_output": "E6"
diff --git a/keyboards/handwired/p65rgb/rules.mk b/keyboards/handwired/p65rgb/rules.mk
index b5bcf508c4..5e57c341f1 100644
--- a/keyboards/handwired/p65rgb/rules.mk
+++ b/keyboards/handwired/p65rgb/rules.mk
@@ -10,6 +10,5 @@ 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
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
diff --git a/keyboards/handwired/pilcrow/config.h b/keyboards/handwired/pilcrow/config.h
index 8ae32975fe..b9449c4714 100644
--- a/keyboards/handwired/pilcrow/config.h
+++ b/keyboards/handwired/pilcrow/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B4, F7, B1, B3 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, F5, F6, B6, B2, F4, B5}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/pilcrow/info.json b/keyboards/handwired/pilcrow/info.json
index 2c05b74a36..28bb690c3c 100644
--- a/keyboards/handwired/pilcrow/info.json
+++ b/keyboards/handwired/pilcrow/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D4", "C6", "D7", "E6", "F5", "F6", "B6", "B2", "F4", "B5"],
+    "rows": ["B4", "F7", "B1", "B3"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/handwired/pilcrow/pilcrow.c b/keyboards/handwired/pilcrow/pilcrow.c
deleted file mode 100644
index 03db58bb2c..0000000000
--- a/keyboards/handwired/pilcrow/pilcrow.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "pilcrow.h"
diff --git a/keyboards/handwired/pill60/blackpill_f401/config.h b/keyboards/handwired/pill60/blackpill_f401/config.h
deleted file mode 100644
index 7de8654319..0000000000
--- a/keyboards/handwired/pill60/blackpill_f401/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define MATRIX_COL_PINS \
-    { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 }
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, B13, B5 }
diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/info.json
index acd7e83f77..8d85a2e930 100644
--- a/keyboards/handwired/pill60/blackpill_f401/info.json
+++ b/keyboards/handwired/pill60/blackpill_f401/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
+        "rows": ["B4", "B3", "A15", "B13", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/handwired/pill60/blackpill_f411/config.h b/keyboards/handwired/pill60/blackpill_f411/config.h
deleted file mode 100644
index 7de8654319..0000000000
--- a/keyboards/handwired/pill60/blackpill_f411/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define MATRIX_COL_PINS \
-    { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 }
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, B13, B5 }
diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/info.json
index 2517a82403..4e0935f79c 100644
--- a/keyboards/handwired/pill60/blackpill_f411/info.json
+++ b/keyboards/handwired/pill60/blackpill_f411/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
+        "rows": ["B4", "B3", "A15", "B13", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/handwired/pill60/bluepill/config.h b/keyboards/handwired/pill60/bluepill/config.h
deleted file mode 100644
index 1ba5ff2069..0000000000
--- a/keyboards/handwired/pill60/bluepill/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define MATRIX_COL_PINS \
-    { A8, B11, B10, B15, A10, A1, A2, A3, A4, A5, A6, A7, B0, B1 }
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, B13, B5 }
diff --git a/keyboards/handwired/pill60/bluepill/info.json b/keyboards/handwired/pill60/bluepill/info.json
index cf993be247..028b1d89d8 100644
--- a/keyboards/handwired/pill60/bluepill/info.json
+++ b/keyboards/handwired/pill60/bluepill/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["A8", "B11", "B10", "B15", "A10", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1"],
+        "rows": ["B4", "B3", "A15", "B13", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino"
 }
diff --git a/keyboards/handwired/pill60/config.h b/keyboards/handwired/pill60/config.h
index e96fba1db8..399d0f2212 100644
--- a/keyboards/handwired/pill60/config.h
+++ b/keyboards/handwired/pill60/config.h
@@ -15,8 +15,5 @@
   */
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD5
 #define BACKLIGHT_PWM_CHANNEL   1
diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json
index 5ab526ce67..0c8f353bff 100644
--- a/keyboards/handwired/pill60/info.json
+++ b/keyboards/handwired/pill60/info.json
@@ -22,66 +22,66 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "Enc", "x": 0, "y": 0, "w": 1},
+                {"label": "Enc", "x": 0, "y": 0},
 
-                {"label": "Esc", "x": 0, "y": 1, "w": 1},
-                {"label": "1","x": 1, "y": 1, "w": 1},
-                {"label": "2","x": 2, "y": 1, "w": 1},
-                {"label": "3","x": 3, "y": 1, "w": 1},
-                {"label": "4","x": 4, "y": 1, "w": 1},
-                {"label": "5","x": 5, "y": 1, "w": 1},
-                {"label": "6","x": 6, "y": 1, "w": 1},
-                {"label": "7","x": 7, "y": 1, "w": 1},
-                {"label": "8","x": 8, "y": 1, "w": 1},
-                {"label": "9","x": 9, "y": 1, "w": 1},
-                {"label": "0","x": 10, "y": 1, "w": 1},
-                {"label": "-","x": 11, "y": 1, "w": 1},
-                {"label": "=","x": 12, "y": 1, "w": 1},
-                {"label": "\\","x": 13, "y": 1, "w": 1},
-                {"label": "Del","x": 14, "y": 1, "w": 1},
+                {"label": "Esc", "x": 0, "y": 1},
+                {"label": "1","x": 1, "y": 1},
+                {"label": "2","x": 2, "y": 1},
+                {"label": "3","x": 3, "y": 1},
+                {"label": "4","x": 4, "y": 1},
+                {"label": "5","x": 5, "y": 1},
+                {"label": "6","x": 6, "y": 1},
+                {"label": "7","x": 7, "y": 1},
+                {"label": "8","x": 8, "y": 1},
+                {"label": "9","x": 9, "y": 1},
+                {"label": "0","x": 10, "y": 1},
+                {"label": "-","x": 11, "y": 1},
+                {"label": "=","x": 12, "y": 1},
+                {"label": "\\","x": 13, "y": 1},
+                {"label": "Del","x": 14, "y": 1},
 
                 {"label": "Tab","x": 0, "y": 2, "w": 1.5},
-                {"label": "Q","x": 1.5, "y": 2, "w": 1},
-                {"label": "W","x": 2.5, "y": 2, "w": 1},
-                {"label": "E","x": 3.5, "y": 2, "w": 1},
-                {"label": "R","x": 4.5, "y": 2, "w": 1},
-                {"label": "T","x": 5.5, "y": 2, "w": 1},
-                {"label": "Y","x": 6.5, "y": 2, "w": 1},
-                {"label": "U","x": 7.5, "y": 2, "w": 1},
-                {"label": "I","x": 8.5, "y": 2, "w": 1},
-                {"label": "O","x": 9.5, "y": 2, "w": 1},
-                {"label": "P","x": 10.5, "y": 2, "w": 1},
-                {"label": "[","x": 11.5, "y": 2, "w": 1},
-                {"label": "]","x": 12.5, "y": 2, "w": 1},
+                {"label": "Q","x": 1.5, "y": 2},
+                {"label": "W","x": 2.5, "y": 2},
+                {"label": "E","x": 3.5, "y": 2},
+                {"label": "R","x": 4.5, "y": 2},
+                {"label": "T","x": 5.5, "y": 2},
+                {"label": "Y","x": 6.5, "y": 2},
+                {"label": "U","x": 7.5, "y": 2},
+                {"label": "I","x": 8.5, "y": 2},
+                {"label": "O","x": 9.5, "y": 2},
+                {"label": "P","x": 10.5, "y": 2},
+                {"label": "[","x": 11.5, "y": 2},
+                {"label": "]","x": 12.5, "y": 2},
                 {"label": "Backspace","x": 13.5, "y": 2, "w": 1.5},
 
                 {"label": "Caps","x": 0, "y": 3, "w": 1.75},
-                {"label": "A","x": 1.75, "y": 3, "w": 1},
-                {"label": "S","x": 2.75, "y": 3, "w": 1},
-                {"label": "D","x": 3.75, "y": 3, "w": 1},
-                {"label": "F","x": 4.75, "y": 3, "w": 1},
-                {"label": "G","x": 5.75, "y": 3, "w": 1},
-                {"label": "H","x": 6.75, "y": 3, "w": 1},
-                {"label": "J","x": 7.75, "y": 3, "w": 1},
-                {"label": "K","x": 8.75, "y": 3, "w": 1},
-                {"label": "L","x": 9.75, "y": 3, "w": 1},
-                {"label": ";","x": 10.75, "y": 3, "w": 1},
-                {"label": "'","x": 11.75, "y": 3, "w": 1},
+                {"label": "A","x": 1.75, "y": 3},
+                {"label": "S","x": 2.75, "y": 3},
+                {"label": "D","x": 3.75, "y": 3},
+                {"label": "F","x": 4.75, "y": 3},
+                {"label": "G","x": 5.75, "y": 3},
+                {"label": "H","x": 6.75, "y": 3},
+                {"label": "J","x": 7.75, "y": 3},
+                {"label": "K","x": 8.75, "y": 3},
+                {"label": "L","x": 9.75, "y": 3},
+                {"label": ";","x": 10.75, "y": 3},
+                {"label": "'","x": 11.75, "y": 3},
                 {"label": "Enter","x": 12.75, "y": 3, "w": 2.25},
 
                 {"label": "L Shift","x": 0, "y": 4, "w": 2.25},
-                {"label": "Z","x": 2.25, "y": 4, "w": 1},
-                {"label": "X","x": 3.25, "y": 4, "w": 1},
-                {"label": "C","x": 4.25, "y": 4, "w": 1},
-                {"label": "V","x": 5.25, "y": 4, "w": 1},
-                {"label": "B","x": 6.25, "y": 4, "w": 1},
-                {"label": "N","x": 7.25, "y": 4, "w": 1},
-                {"label": "M","x": 8.25, "y": 4, "w": 1},
-                {"label": ",","x": 9.25, "y": 4, "w": 1},
-                {"label": ".","x": 10.25, "y": 4, "w": 1},
-                {"label": "/","x": 11.25, "y": 4, "w": 1},
+                {"label": "Z","x": 2.25, "y": 4},
+                {"label": "X","x": 3.25, "y": 4},
+                {"label": "C","x": 4.25, "y": 4},
+                {"label": "V","x": 5.25, "y": 4},
+                {"label": "B","x": 6.25, "y": 4},
+                {"label": "N","x": 7.25, "y": 4},
+                {"label": "M","x": 8.25, "y": 4},
+                {"label": ",","x": 9.25, "y": 4},
+                {"label": ".","x": 10.25, "y": 4},
+                {"label": "/","x": 11.25, "y": 4},
                 {"label": "R Shift","x": 12.25, "y": 4, "w": 1.75},
-                {"label": "FN","x": 14, "y": 4, "w": 1},
+                {"label": "FN","x": 14, "y": 4},
 
                 {"label": "L CTRL","x": 0, "y": 5, "w": 1.25},
                 {"label": "L GUI","x": 1.25, "y": 5, "w": 1.25},
diff --git a/keyboards/handwired/pill60/pill60.c b/keyboards/handwired/pill60/pill60.c
deleted file mode 100644
index 928685a92c..0000000000
--- a/keyboards/handwired/pill60/pill60.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2020 Imam Rafii 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */
-#include "pill60.h"
\ No newline at end of file
diff --git a/keyboards/handwired/postageboard/info.json b/keyboards/handwired/postageboard/info.json
index d15d6ef750..2f4e674d59 100644
--- a/keyboards/handwired/postageboard/info.json
+++ b/keyboards/handwired/postageboard/info.json
@@ -10,9 +10,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0}
             ]
         }
     }
diff --git a/keyboards/handwired/postageboard/mini/config.h b/keyboards/handwired/postageboard/mini/config.h
index b9a34e1414..091cb7b510 100644
--- a/keyboards/handwired/postageboard/mini/config.h
+++ b/keyboards/handwired/postageboard/mini/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D5 }
-#define MATRIX_COL_PINS { E6, B3, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/postageboard/mini/info.json b/keyboards/handwired/postageboard/mini/info.json
index 65be217368..b6944f2916 100644
--- a/keyboards/handwired/postageboard/mini/info.json
+++ b/keyboards/handwired/postageboard/mini/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B3", "B7"],
+        "rows": ["D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/handwired/postageboard/mini/mini.c b/keyboards/handwired/postageboard/mini/mini.c
deleted file mode 100644
index 381ad975f0..0000000000
--- a/keyboards/handwired/postageboard/mini/mini.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2019 Yan-Fa Li
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mini.h"
-
diff --git a/keyboards/handwired/postageboard/mini/mini.h b/keyboards/handwired/postageboard/mini/mini.h
deleted file mode 100644
index 28ee58ef13..0000000000
--- a/keyboards/handwired/postageboard/mini/mini.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Yan-Fa Li
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02 \
-) \
-{ \
-    { k00, k01, k02 } \
-}
diff --git a/keyboards/handwired/postageboard/postageboard.c b/keyboards/handwired/postageboard/postageboard.c
deleted file mode 100644
index 005ce313df..0000000000
--- a/keyboards/handwired/postageboard/postageboard.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "postageboard.h"
diff --git a/keyboards/handwired/postageboard/postageboard.h b/keyboards/handwired/postageboard/postageboard.h
deleted file mode 100644
index 5bd9ceee5a..0000000000
--- a/keyboards/handwired/postageboard/postageboard.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Yan-Fa Li
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02 \
-) \
-{ \
-    { k00, k01, k02 } \
-}
diff --git a/keyboards/handwired/postageboard/r1/config.h b/keyboards/handwired/postageboard/r1/config.h
index 68c6dc0281..091cb7b510 100644
--- a/keyboards/handwired/postageboard/r1/config.h
+++ b/keyboards/handwired/postageboard/r1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6 }
-#define MATRIX_COL_PINS { B7, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/postageboard/r1/info.json b/keyboards/handwired/postageboard/r1/info.json
index dab37baf04..a1ea87df86 100644
--- a/keyboards/handwired/postageboard/r1/info.json
+++ b/keyboards/handwired/postageboard/r1/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "C6", "C7"],
+        "rows": ["B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/handwired/postageboard/r1/r1.c b/keyboards/handwired/postageboard/r1/r1.c
deleted file mode 100644
index e87edc145b..0000000000
--- a/keyboards/handwired/postageboard/r1/r1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2019 Yan-Fa Li
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "r1.h"
-
diff --git a/keyboards/handwired/postageboard/r1/r1.h b/keyboards/handwired/postageboard/r1/r1.h
deleted file mode 100644
index 28ee58ef13..0000000000
--- a/keyboards/handwired/postageboard/r1/r1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Yan-Fa Li
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02 \
-) \
-{ \
-    { k00, k01, k02 } \
-}
diff --git a/keyboards/handwired/prime_exl/config.h b/keyboards/handwired/prime_exl/config.h
index c4d0c8a8a2..8f57ec2b91 100644
--- a/keyboards/handwired/prime_exl/config.h
+++ b/keyboards/handwired/prime_exl/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B1, E6, D5, D6, B4, D7, D4, F1, F0, B0 }
-#define MATRIX_COL_PINS { D0, B3, B2, D1, D2, D3, F7, F6, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json
index e1a3955d5d..01516ed006 100644
--- a/keyboards/handwired/prime_exl/info.json
+++ b/keyboards/handwired/prime_exl/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6578",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D0", "B3", "B2", "D1", "D2", "D3", "F7", "F6", "F5"],
+    "rows": ["B1", "E6", "D5", "D6", "B4", "D7", "D4", "F1", "F0", "B0"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "levels": 5
@@ -16,7 +21,7 @@
   "bootloader": "atmel-dfu",
   "layouts": {
       "LAYOUT": {
-          "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":6.5,"y":0,"w":1,"h":1}, {"x":7.5,"y":0,"w":1,"h":1}, {"x":8.5,"y":0,"w":1,"h":1}, {"x":9.5,"y":0,"w":1,"h":1}, {"x":10.5,"y":0,"w":1,"h":1}, {"x":11.5,"y":0,"w":1,"h":1}, {"x":13.75,"y":0,"w":1,"h":1}, {"x":14.75,"y":0,"w":1,"h":1}, {"x":15.75,"y":0,"w":1,"h":1}, {"x":16.75,"y":0,"w":1,"h":1}, {"x":17.75,"y":0,"w":1,"h":1}, {"x":18.75,"y":0,"w":2,"h":1}, {"x":0,"y":1,"w":1,"h":1}, {"x":1,"y":1,"w":1,"h":1}, {"x":2,"y":1,"w":1,"h":1}, {"x":3,"y":1,"w":1,"h":1}, {"x":4,"y":1,"w":1,"h":1}, {"x":5,"y":1,"w":1,"h":1}, {"x":6.5,"y":1,"w":1.25,"h":1}, {"x":7.75,"y":1,"w":1,"h":1}, {"x":8.75,"y":1,"w":1,"h":1}, {"x":9.75,"y":1,"w":1,"h":1}, {"x":10.75,"y":1,"w":1,"h":1}, {"x":11.75,"y":1,"w":1,"h":1}, {"x":14,"y":1,"w":1,"h":1}, {"x":15,"y":1,"w":1,"h":1}, {"x":16,"y":1,"w":1,"h":1}, {"x":17,"y":1,"w":1,"h":1}, {"x":18,"y":1,"w":1,"h":1}, {"x":19,"y":1,"w":1.75,"h":1}, {"x":0,"y":2,"w":1,"h":1}, {"x":1,"y":2,"w":1,"h":1}, {"x":2,"y":2,"w":1,"h":1}, {"x":3,"y":2,"w":1,"h":1}, {"x":4,"y":2,"w":1,"h":1}, {"x":5,"y":2,"w":1,"h":1}, {"x":6.5,"y":2,"w":1.75,"h":1}, {"x":8.25,"y":2,"w":1,"h":1}, {"x":9.25,"y":2,"w":1,"h":1}, {"x":10.25,"y":2,"w":1,"h":1}, {"x":11.25,"y":2,"w":1,"h":1}, {"x":12.25,"y":2,"w":1,"h":1}, {"x":13.5,"y":2,"w":1,"h":1}, {"x":14.5,"y":2,"w":1,"h":1}, {"x":15.5,"y":2,"w":1,"h":1}, {"x":16.5,"y":2,"w":1,"h":1}, {"x":17.5,"y":2,"w":1,"h":1}, {"x":18.5,"y":2,"w":1,"h":1}, {"x":19.5,"y":2,"w":1.25,"h":1}, {"x":0,"y":3,"w":1,"h":1}, {"x":1,"y":3,"w":1,"h":1}, {"x":2,"y":3,"w":1,"h":1}, {"x":3,"y":3,"w":1,"h":1}, {"x":4,"y":3,"w":1,"h":1}, {"x":5,"y":3,"w":1,"h":1}, {"x":6.5,"y":3,"w":1.25,"h":1}, {"x":7.75,"y":3,"w":1.25,"h":1}, {"x":9,"y":3,"w":1,"h":1}, {"x":10,"y":3,"w":1,"h":1}, {"x":11,"y":3,"w":2,"h":1}, {"x":13.5,"y":3,"w":2,"h":1}, {"x":15.5,"y":3,"w":1,"h":1}, {"x":16.5,"y":3,"w":1,"h":1}, {"x":17.5,"y":3,"w":1.5,"h":1}, {"x":19,"y":3,"w":1.5,"h":1}, {"x":0,"y":4,"w":1,"h":1}, {"x":1,"y":4,"w":1,"h":1}, {"x":2,"y":4,"w":1,"h":1}, {"x":3,"y":4,"w":1,"h":1}, {"x":4,"y":4,"w":1,"h":1}, {"x":5,"y":4,"w":1,"h":1}]
+          "layout": [{"x":0,"y":0}, {"x":1,"y":0}, {"x":2,"y":0}, {"x":3,"y":0}, {"x":4,"y":0}, {"x":5,"y":0}, {"x":6.5,"y":0}, {"x":7.5,"y":0}, {"x":8.5,"y":0}, {"x":9.5,"y":0}, {"x":10.5,"y":0}, {"x":11.5,"y":0}, {"x":13.75,"y":0}, {"x":14.75,"y":0}, {"x":15.75,"y":0}, {"x":16.75,"y":0}, {"x":17.75,"y":0}, {"x":18.75,"y":0,"w":2}, {"x":0,"y":1}, {"x":1,"y":1}, {"x":2,"y":1}, {"x":3,"y":1}, {"x":4,"y":1}, {"x":5,"y":1}, {"x":6.5,"y":1,"w":1.25}, {"x":7.75,"y":1}, {"x":8.75,"y":1}, {"x":9.75,"y":1}, {"x":10.75,"y":1}, {"x":11.75,"y":1}, {"x":14,"y":1}, {"x":15,"y":1}, {"x":16,"y":1}, {"x":17,"y":1}, {"x":18,"y":1}, {"x":19,"y":1,"w":1.75}, {"x":0,"y":2}, {"x":1,"y":2}, {"x":2,"y":2}, {"x":3,"y":2}, {"x":4,"y":2}, {"x":5,"y":2}, {"x":6.5,"y":2,"w":1.75}, {"x":8.25,"y":2}, {"x":9.25,"y":2}, {"x":10.25,"y":2}, {"x":11.25,"y":2}, {"x":12.25,"y":2}, {"x":13.5,"y":2}, {"x":14.5,"y":2}, {"x":15.5,"y":2}, {"x":16.5,"y":2}, {"x":17.5,"y":2}, {"x":18.5,"y":2}, {"x":19.5,"y":2,"w":1.25}, {"x":0,"y":3}, {"x":1,"y":3}, {"x":2,"y":3}, {"x":3,"y":3}, {"x":4,"y":3}, {"x":5,"y":3}, {"x":6.5,"y":3,"w":1.25}, {"x":7.75,"y":3,"w":1.25}, {"x":9,"y":3}, {"x":10,"y":3}, {"x":11,"y":3,"w":2}, {"x":13.5,"y":3,"w":2}, {"x":15.5,"y":3}, {"x":16.5,"y":3}, {"x":17.5,"y":3,"w":1.5}, {"x":19,"y":3,"w":1.5}, {"x":0,"y":4}, {"x":1,"y":4}, {"x":2,"y":4}, {"x":3,"y":4}, {"x":4,"y":4}, {"x":5,"y":4}]
       }
   }
 }
diff --git a/keyboards/handwired/prime_exl/prime_exl.c b/keyboards/handwired/prime_exl/prime_exl.c
deleted file mode 100644
index e85991c537..0000000000
--- a/keyboards/handwired/prime_exl/prime_exl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Holten Campbell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "prime_exl.h"
diff --git a/keyboards/handwired/prime_exl_plus/config.h b/keyboards/handwired/prime_exl_plus/config.h
index 935d12bedb..a660e0ddfa 100644
--- a/keyboards/handwired/prime_exl_plus/config.h
+++ b/keyboards/handwired/prime_exl_plus/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D2, D6, B4, F1, E6, F0, F4, B5, D7, D3 }
-#define MATRIX_COL_PINS { F5, F6, F7, C7, C6, B6, B7, B3, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D4
 #define RGBLED_NUM 10
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json
index 0114de4c26..8acde1a159 100644
--- a/keyboards/handwired/prime_exl_plus/info.json
+++ b/keyboards/handwired/prime_exl_plus/info.json
@@ -8,6 +8,14 @@
     "pid": "0x6579",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D4"
+  },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B7", "B3", "D1", "D0"],
+    "rows": ["D2", "D6", "B4", "F1", "E6", "F0", "F4", "B5", "D7", "D3"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/handwired/prkl30/feather/config.h b/keyboards/handwired/prkl30/feather/config.h
index a1b7295e32..bb71df9c64 100644
--- a/keyboards/handwired/prkl30/feather/config.h
+++ b/keyboards/handwired/prkl30/feather/config.h
@@ -15,15 +15,7 @@
  */
 #pragma once
 
-/* PRKL30 feather pinout */
-#define MATRIX_ROW_PINS { F4, F1, F0, D2}
-#define MATRIX_COL_PINS { D3, D1, B7, D6, C7, B6, B5, D7, C6, D0}
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Light Configuration */
-
-#define RGB_DI_PIN D1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/info.json
index 8078ee0481..08c6e107dd 100644
--- a/keyboards/handwired/prkl30/feather/info.json
+++ b/keyboards/handwired/prkl30/feather/info.json
@@ -1,4 +1,12 @@
 {
+    "ws2812": {
+        "pin": "D1"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D1", "B7", "D6", "C7", "B6", "B5", "D7", "C6", "D0"],
+        "rows": ["F4", "F1", "F0", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F7", "pin_b": "F6"}
diff --git a/keyboards/handwired/prkl30/prkl30.c b/keyboards/handwired/prkl30/prkl30.c
deleted file mode 100644
index efec8a3aaa..0000000000
--- a/keyboards/handwired/prkl30/prkl30.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 ErkHal
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "prkl30.h"
diff --git a/keyboards/handwired/prkl30/promicro/config.h b/keyboards/handwired/prkl30/promicro/config.h
index c3767088c7..bb71df9c64 100644
--- a/keyboards/handwired/prkl30/promicro/config.h
+++ b/keyboards/handwired/prkl30/promicro/config.h
@@ -15,15 +15,7 @@
  */
 #pragma once
 
-/* prkl30 default pinout */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { B4, B5, F6, F5, F4, F7, B1, B3, B2, B6}
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Light Configuration */
-
-#define RGB_DI_PIN D1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/prkl30/promicro/info.json b/keyboards/handwired/prkl30/promicro/info.json
index a7ca847765..fcfffc6f02 100644
--- a/keyboards/handwired/prkl30/promicro/info.json
+++ b/keyboards/handwired/prkl30/promicro/info.json
@@ -1,4 +1,12 @@
 {
+    "matrix_pins": {
+        "cols": ["B4", "B5", "F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D2"}
diff --git a/keyboards/handwired/promethium/color.h b/keyboards/handwired/promethium/color.h
index 077242d5f1..2bbfcb83a7 100644
--- a/keyboards/handwired/promethium/color.h
+++ b/keyboards/handwired/promethium/color.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #define COLOR_BLANK       0, 0, 0
 
 #define COLOR_BLACK       0, 0, 0
diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h
index 09a981afe1..342411a6b2 100644
--- a/keyboards/handwired/promethium/config.h
+++ b/keyboards/handwired/promethium/config.h
@@ -154,7 +154,6 @@ enum led_sequence {
     LED_TOTAL
 };
 
-#    define RGB_DI_PIN B5
 #    define RGBSPS_NUM LED_TOTAL
 #endif
 
diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json
index cd5928f4d4..83f2477b3e 100644
--- a/keyboards/handwired/promethium/info.json
+++ b/keyboards/handwired/promethium/info.json
@@ -8,13 +8,16 @@
     "pid": "0x6048",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B5"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k11", "x": 0, "y": 0.50 },
-        { "label": "k12", "x": 1, "y": 0.30 },
+        { "label": "k11", "x": 0, "y": 0.5 },
+        { "label": "k12", "x": 1, "y": 0.3 },
         { "label": "k13", "x": 2, "y": 0.15 },
         { "label": "k14", "x": 3, "y": 0 },
         { "label": "k15", "x": 4, "y": 0.15 },
@@ -23,11 +26,11 @@
         { "label": "k18", "x": 11, "y": 0.15 },
         { "label": "k19", "x": 12, "y": 0 },
         { "label": "k1a", "x": 13, "y": 0.15 },
-        { "label": "k1b", "x": 14, "y": 0.30 },
-        { "label": "k1c", "x": 15, "y": 0.50 },
+        { "label": "k1b", "x": 14, "y": 0.3 },
+        { "label": "k1c", "x": 15, "y": 0.5 },
 
-        { "label": "k21", "x": 0, "y": 1.50 },
-        { "label": "k22", "x": 1, "y": 1.30 },
+        { "label": "k21", "x": 0, "y": 1.5 },
+        { "label": "k22", "x": 1, "y": 1.3 },
         { "label": "k23", "x": 2, "y": 1.15 },
         { "label": "k24", "x": 3, "y": 1 },
         { "label": "k25", "x": 4, "y": 1.15 },
@@ -36,11 +39,11 @@
         { "label": "k28", "x": 11, "y": 1.15 },
         { "label": "k29", "x": 12, "y": 1 },
         { "label": "k2a", "x": 13, "y": 1.15 },
-        { "label": "k2b", "x": 14, "y": 1.30 },
-        { "label": "k2c", "x": 15, "y": 1.50 },
+        { "label": "k2b", "x": 14, "y": 1.3 },
+        { "label": "k2c", "x": 15, "y": 1.5 },
 
-        { "label": "k31", "x": 0, "y": 2.50 },
-        { "label": "k32", "x": 1, "y": 2.30 },
+        { "label": "k31", "x": 0, "y": 2.5 },
+        { "label": "k32", "x": 1, "y": 2.3 },
         { "label": "k33", "x": 2, "y": 2.15 },
         { "label": "k34", "x": 3, "y": 2 },
         { "label": "k35", "x": 4, "y": 2.15 },
@@ -49,11 +52,11 @@
         { "label": "k38", "x": 11, "y": 2.15 },
         { "label": "k39", "x": 12, "y": 2 },
         { "label": "k3a", "x": 13, "y": 2.15 },
-        { "label": "k3b", "x": 14, "y": 2.30 },
-        { "label": "k3c", "x": 15, "y": 2.50 },
+        { "label": "k3b", "x": 14, "y": 2.3 },
+        { "label": "k3c", "x": 15, "y": 2.5 },
 
-        { "label": "k41", "x": 0, "y": 3.50 },
-        { "label": "k42", "x": 1, "y": 3.30 },
+        { "label": "k41", "x": 0, "y": 3.5 },
+        { "label": "k42", "x": 1, "y": 3.3 },
         { "label": "k43", "x": 2, "y": 3.15 },
         { "label": "k44", "x": 3, "y": 3 },
         { "label": "k45", "x": 4, "y": 3.15 },
@@ -62,8 +65,8 @@
         { "label": "k48", "x": 11, "y": 3.15 },
         { "label": "k49", "x": 12, "y": 3 },
         { "label": "k4a", "x": 13, "y": 3.15 },
-        { "label": "k4b", "x": 14, "y": 3.30 },
-        { "label": "k4c", "x": 15, "y": 3.50 },
+        { "label": "k4b", "x": 14, "y": 3.3 },
+        { "label": "k4c", "x": 15, "y": 3.5 },
 
         { "label": "tp1", "x": 6.5, "y": 3.15 },
         { "label": "tp2", "x": 7.5, "y": 3.15 },
diff --git a/keyboards/handwired/promethium/rgbsps.h b/keyboards/handwired/promethium/rgbsps.h
index 72612a7a82..77689344fc 100644
--- a/keyboards/handwired/promethium/rgbsps.h
+++ b/keyboards/handwired/promethium/rgbsps.h
@@ -1,3 +1,5 @@
+#pragma once
+
 void rgbsps_set(uint8_t index, uint8_t r, uint8_t g, uint8_t b);
 void rgbsps_setall(uint8_t r, uint8_t g, uint8_t b);
 void rgbsps_turnoff(void);
diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk
index 038266add8..a0be87690e 100644
--- a/keyboards/handwired/promethium/rules.mk
+++ b/keyboards/handwired/promethium/rules.mk
@@ -19,8 +19,8 @@ PS2_DRIVER = interrupt
 CUSTOM_MATRIX = yes
 BLUETOOTH_ENABLE = yes
 BLUETOOTH_DRIVER = BluefruitLE
+WS2812_DRIVER_REQUIRED = yes
 
-SRC += ws2812.c
 SRC += rgbsps.c
 SRC += analog.c
 SRC += matrix.c
diff --git a/keyboards/handwired/pterodactyl/config.h b/keyboards/handwired/pterodactyl/config.h
index 6ca97d3e73..40aee1e05e 100644
--- a/keyboards/handwired/pterodactyl/config.h
+++ b/keyboards/handwired/pterodactyl/config.h
@@ -39,8 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TOGGLE  1
 
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
diff --git a/keyboards/handwired/pteron/config.h b/keyboards/handwired/pteron/config.h
deleted file mode 100644
index 61e8611e24..0000000000
--- a/keyboards/handwired/pteron/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D7, E6, B4, B5, B6 }
-#define MATRIX_COL_PINS { F4, F6, F5, F7, B1, B3, C6, D4, D0, D1, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/pteron/info.json b/keyboards/handwired/pteron/info.json
index b21d12c9f9..94dbc9dcfc 100644
--- a/keyboards/handwired/pteron/info.json
+++ b/keyboards/handwired/pteron/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"],
+    "rows": ["D7", "E6", "B4", "B5", "B6"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/handwired/pteron/pteron.c b/keyboards/handwired/pteron/pteron.c
deleted file mode 100644
index 972b45aa20..0000000000
--- a/keyboards/handwired/pteron/pteron.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "pteron.h"
diff --git a/keyboards/handwired/pteron38/config.h b/keyboards/handwired/pteron38/config.h
deleted file mode 100644
index f5b0230911..0000000000
--- a/keyboards/handwired/pteron38/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 Fidel Coria
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, B4, B5, B6 }
-#define MATRIX_COL_PINS { F6, F5, F7, B1, B3, C6, D4, D0, D1, D2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/pteron38/info.json b/keyboards/handwired/pteron38/info.json
index a2ea58d57a..6770e467eb 100644
--- a/keyboards/handwired/pteron38/info.json
+++ b/keyboards/handwired/pteron38/info.json
@@ -8,56 +8,61 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2"],
+    "rows": ["E6", "B4", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_split_3x5_4": {
       "layout": [
-        {"label":"K101", "x":1, "y":1.75},
-        {"label":"K102", "x":2, "y":1.25},
-        {"label":"K103", "x":3, "y":1},
-        {"label":"K104", "x":4, "y":1.35},
-        {"label":"K105", "x":5, "y":1.45},
+        {"matrix": [0, 0], "x": 0, "y": 0.75},
+        {"matrix": [0, 1], "x": 1, "y": 0.25},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.35},
+        {"matrix": [0, 4], "x": 4, "y": 0.45},
 
-        {"label":"K106", "x":11, "y":1.45},
-        {"label":"K107", "x":12, "y":1.35},
-        {"label":"K108", "x":13, "y":1},
-        {"label":"K109", "x":14, "y":1.25},
-        {"label":"K110", "x":15, "y":1.75},
+        {"matrix": [0, 5], "x": 10, "y": 0.45},
+        {"matrix": [0, 6], "x": 11, "y": 0.35},
+        {"matrix": [0, 7], "x": 12, "y": 0},
+        {"matrix": [0, 8], "x": 13, "y": 0.25},
+        {"matrix": [0, 9], "x": 14, "y": 0.75},
 
-        {"label":"K201", "x":1, "y":2.75},
-        {"label":"K202", "x":2, "y":2.25},
-        {"label":"K203", "x":3, "y":2},
-        {"label":"K204", "x":4, "y":2.35},
-        {"label":"K205", "x":5, "y":2.45},
+        {"matrix": [1, 0], "x": 0, "y": 1.75},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.35},
+        {"matrix": [1, 4], "x": 4, "y": 1.45},
 
-        {"label":"K206", "x":11, "y":2.45},
-        {"label":"K207", "x":12, "y":2.35},
-        {"label":"K208", "x":13, "y":2},
-        {"label":"K209", "x":14, "y":2.25},
-        {"label":"K210", "x":15, "y":2.75},
+        {"matrix": [1, 5], "x": 10, "y": 1.45},
+        {"matrix": [1, 6], "x": 11, "y": 1.35},
+        {"matrix": [1, 7], "x": 12, "y": 1},
+        {"matrix": [1, 8], "x": 13, "y": 1.25},
+        {"matrix": [1, 9], "x": 14, "y": 1.75},
 
-        {"label":"K301", "x":1, "y":3.75},
-        {"label":"K302", "x":2, "y":3.25},
-        {"label":"K303", "x":3, "y":3},
-        {"label":"K304", "x":4, "y":3.35},
-        {"label":"K305", "x":5, "y":3.45},
+        {"matrix": [2, 0], "x": 0, "y": 2.75},
+        {"matrix": [2, 1], "x": 1, "y": 2.25},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.35},
+        {"matrix": [2, 4], "x": 4, "y": 2.45},
 
-        {"label":"K306", "x":11, "y":3.45},
-        {"label":"K307", "x":12, "y":3.35},
-        {"label":"K308", "x":13, "y":3},
-        {"label":"K309", "x":14, "y":3.25},
-        {"label":"K310", "x":15, "y":3.75},
+        {"matrix": [2, 5], "x": 10, "y": 2.45},
+        {"matrix": [2, 6], "x": 11, "y": 2.35},
+        {"matrix": [2, 7], "x": 12, "y": 2},
+        {"matrix": [2, 8], "x": 13, "y": 2.25},
+        {"matrix": [2, 9], "x": 14, "y": 2.75},
 
-        {"label":"K402", "x":4, "y":4.35},
-        {"label":"K403", "x":5, "y":4.45},
-        {"label":"K404", "x":6, "y":4.65},
-        {"label":"K405", "x":7, "y":4.95},
+        {"matrix": [3, 1], "x": 3, "y": 3.35},
+        {"matrix": [3, 2], "x": 4, "y": 3.45},
+        {"matrix": [3, 3], "x": 5, "y": 3.65},
+        {"matrix": [3, 4], "x": 6, "y": 3.95},
 
-        {"label":"K406", "x":9, "y":4.95},
-        {"label":"K407", "x":10, "y":4.65},
-        {"label":"K408", "x":11, "y":4.45},
-        {"label":"K409", "x":12, "y":4.35}
+        {"matrix": [3, 5], "x": 8, "y": 3.95},
+        {"matrix": [3, 6], "x": 9, "y": 3.65},
+        {"matrix": [3, 7], "x": 10, "y": 3.45},
+        {"matrix": [3, 8], "x": 11, "y": 3.35}
       ]
     }
   }
diff --git a/keyboards/handwired/pteron38/pteron38.c b/keyboards/handwired/pteron38/pteron38.c
deleted file mode 100644
index 62d09ffa55..0000000000
--- a/keyboards/handwired/pteron38/pteron38.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Fidel Coria
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pteron38.h"
diff --git a/keyboards/handwired/pteron38/pteron38.h b/keyboards/handwired/pteron38/pteron38.h
deleted file mode 100644
index 7b9e734cfb..0000000000
--- a/keyboards/handwired/pteron38/pteron38.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 Fidel Coria
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_split_3x5_4( \
-    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
-    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \
-    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, \
-          K402, K403, K404, K405, K406, K407, K408, K409  \
-) { \
-    { K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110 }, \
-    { K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210 }, \
-    { K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310 }, \
-    { KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO }  \
-}
diff --git a/keyboards/handwired/pteron44/config.h b/keyboards/handwired/pteron44/config.h
deleted file mode 100644
index 6429437f97..0000000000
--- a/keyboards/handwired/pteron44/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 Fidel Coria
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, B4, B5, B6 }
-#define MATRIX_COL_PINS { F4, F6, F5, F7, B1, B3, C6, D4, D0, D1, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/pteron44/info.json b/keyboards/handwired/pteron44/info.json
index 23b4ac785a..3f89bef561 100644
--- a/keyboards/handwired/pteron44/info.json
+++ b/keyboards/handwired/pteron44/info.json
@@ -8,62 +8,67 @@
     "pid": "0x542C",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"],
+    "rows": ["E6", "B4", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"K100", "x":0, "y":1.75},
-        {"label":"K101", "x":1, "y":1.75},
-        {"label":"K102", "x":2, "y":1.25},
-        {"label":"K103", "x":3, "y":1},
-        {"label":"K104", "x":4, "y":1.35},
-        {"label":"K105", "x":5, "y":1.45},
+        {"x":0, "y":0.75},
+        {"x":1, "y":0.75},
+        {"x":2, "y":0.25},
+        {"x":3, "y":0},
+        {"x":4, "y":0.35},
+        {"x":5, "y":0.45},
 
-        {"label":"K106", "x":11, "y":1.45},
-        {"label":"K107", "x":12, "y":1.35},
-        {"label":"K108", "x":13, "y":1},
-        {"label":"K109", "x":14, "y":1.25},
-        {"label":"K110", "x":15, "y":1.75},
-        {"label":"K111", "x":16, "y":1.75},
+        {"x":11, "y":0.45},
+        {"x":12, "y":0.35},
+        {"x":13, "y":0},
+        {"x":14, "y":0.25},
+        {"x":15, "y":0.75},
+        {"x":16, "y":0.75},
 
-        {"label":"K200", "x":0, "y":2.75},
-        {"label":"K201", "x":1, "y":2.75},
-        {"label":"K202", "x":2, "y":2.25},
-        {"label":"K203", "x":3, "y":2},
-        {"label":"K204", "x":4, "y":2.35},
-        {"label":"K205", "x":5, "y":2.45},
+        {"x":0, "y":1.75},
+        {"x":1, "y":1.75},
+        {"x":2, "y":1.25},
+        {"x":3, "y":1},
+        {"x":4, "y":1.35},
+        {"x":5, "y":1.45},
 
-        {"label":"K206", "x":11, "y":2.45},
-        {"label":"K207", "x":12, "y":2.35},
-        {"label":"K208", "x":13, "y":2},
-        {"label":"K209", "x":14, "y":2.25},
-        {"label":"K210", "x":15, "y":2.75},
-        {"label":"K211", "x":16, "y":2.75},
+        {"x":11, "y":1.45},
+        {"x":12, "y":1.35},
+        {"x":13, "y":1},
+        {"x":14, "y":1.25},
+        {"x":15, "y":1.75},
+        {"x":16, "y":1.75},
 
-        {"label":"K300", "x":0, "y":3.75},
-        {"label":"K301", "x":1, "y":3.75},
-        {"label":"K302", "x":2, "y":3.25},
-        {"label":"K303", "x":3, "y":3},
-        {"label":"K304", "x":4, "y":3.35},
-        {"label":"K305", "x":5, "y":3.45},
+        {"x":0, "y":2.75},
+        {"x":1, "y":2.75},
+        {"x":2, "y":2.25},
+        {"x":3, "y":2},
+        {"x":4, "y":2.35},
+        {"x":5, "y":2.45},
 
-        {"label":"K306", "x":11, "y":3.45},
-        {"label":"K307", "x":12, "y":3.35},
-        {"label":"K308", "x":13, "y":3},
-        {"label":"K309", "x":14, "y":3.25},
-        {"label":"K310", "x":15, "y":3.75},
-        {"label":"K311", "x":16, "y":3.75},
+        {"x":11, "y":2.45},
+        {"x":12, "y":2.35},
+        {"x":13, "y":2},
+        {"x":14, "y":2.25},
+        {"x":15, "y":2.75},
+        {"x":16, "y":2.75},
 
-        {"label":"K402", "x":4, "y":4.35},
-        {"label":"K403", "x":5, "y":4.45},
-        {"label":"K404", "x":6, "y":4.65},
-        {"label":"K405", "x":7, "y":4.95},
+        {"x":4, "y":3.35},
+        {"x":5, "y":3.45},
+        {"x":6, "y":3.65},
+        {"x":7, "y":3.95},
 
-        {"label":"K406", "x":9, "y":4.95},
-        {"label":"K407", "x":10, "y":4.65},
-        {"label":"K408", "x":11, "y":4.45},
-        {"label":"K409", "x":12, "y":4.35}
+        {"x":9, "y":3.95},
+        {"x":10, "y":3.65},
+        {"x":11, "y":3.45},
+        {"x":12, "y":3.35}
       ]
     }
   }
diff --git a/keyboards/handwired/pteron44/pteron44.c b/keyboards/handwired/pteron44/pteron44.c
deleted file mode 100644
index e6c2ad50b6..0000000000
--- a/keyboards/handwired/pteron44/pteron44.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Fidel Coria
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pteron44.h"
diff --git a/keyboards/handwired/pytest/basic/info.json b/keyboards/handwired/pytest/basic/info.json
index af57447d30..9cabb3e32e 100644
--- a/keyboards/handwired/pytest/basic/info.json
+++ b/keyboards/handwired/pytest/basic/info.json
@@ -2,7 +2,7 @@
     "layouts": {
         "LAYOUT_custom": {
             "layout": [
-                { "label": "KC_Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }
+                { "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 }
             ]
         }
     }
diff --git a/keyboards/handwired/pytest/basic/keymaps/dd_keycodes/keymap.json b/keyboards/handwired/pytest/basic/keymaps/dd_keycodes/keymap.json
new file mode 100644
index 0000000000..a64a65a80a
--- /dev/null
+++ b/keyboards/handwired/pytest/basic/keymaps/dd_keycodes/keymap.json
@@ -0,0 +1,12 @@
+{
+    "keyboard": "handwired/pytest/basic",
+    "keymap": "default_json",
+    "layout": "LAYOUT_ortho_1x1",
+    "layers": [["EXAMPLE_1"]],
+    "keycodes": [
+        { "key": "EXAMPLE_1" }
+    ],
+    "author": "qmk",
+    "notes": "This file is a keymap.json file for handwired/pytest/basic",
+    "version": 1
+}
diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json
index 11442461d4..8f82662058 100644
--- a/keyboards/handwired/pytest/info.json
+++ b/keyboards/handwired/pytest/info.json
@@ -12,7 +12,7 @@
     "layouts": {
         "LAYOUT_ortho_1x1": {
             "layout": [
-                { "w": 1, "x": 0, "y": 0 }
+                { "x": 0, "y": 0 }
             ]
         }
     }
diff --git a/keyboards/handwired/pytest/macro/info.json b/keyboards/handwired/pytest/macro/info.json
index ed052a14a3..914d5edcd6 100644
--- a/keyboards/handwired/pytest/macro/info.json
+++ b/keyboards/handwired/pytest/macro/info.json
@@ -3,7 +3,7 @@
   "layouts": {
     "LAYOUT_custom": {
       "layout": [
-        { "label": "KC_Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }
+        { "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 }
       ]
     }
   }
diff --git a/keyboards/handwired/qc60/config.h b/keyboards/handwired/qc60/config.h
deleted file mode 100644
index 6f70f09bee..0000000000
--- a/keyboards/handwired/qc60/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json
index e36142dea8..735c811451 100644
--- a/keyboards/handwired/qc60/info.json
+++ b/keyboards/handwired/qc60/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0C60",
     "device_version": "1.0.0"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "B1", "B3", "B2", "B6", "B5", "B4"],
+    "rows": ["F4", "F5", "C6", "D7", "E6"]
+  },
+  "diode_direction": "ROW2COL",
   "split": {
     "soft_serial_pin": "D0"
   },
@@ -111,7 +119,7 @@
         {"label":"0", "x":11, "y":0},
         {"label":"-", "x":12, "y":0},
         {"label":"=", "x":13, "y":0},
-        {"label":"Backspace", "x":14, "y":0, "w":2.0},
+        {"label":"Backspace", "x":14, "y":0, "w":2},
 
         {"label":"Tab", "x":0, "y":1, "w":1.5},
         {"label":"Q", "x":1.5, "y":1},
@@ -165,7 +173,7 @@
         {"x":6.5, "y":4, "w":1.25},
 
         {"x":8.75, "y":4, "w":1.25},
-        {"x":10, "y":4, "w":2.0},
+        {"x":10, "y":4, "w":2},
         {"label":"Alt", "x":12, "y":4},
         {"label":"Win", "x":13, "y":4},
         {"label":"Menu", "x":14, "y":4},
diff --git a/keyboards/handwired/qc60/proto/config.h b/keyboards/handwired/qc60/proto/config.h
index 2e7d2f3b9b..a64c4ebeec 100644
--- a/keyboards/handwired/qc60/proto/config.h
+++ b/keyboards/handwired/qc60/proto/config.h
@@ -1,11 +1,4 @@
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, F5, C6, D7, E6 }
-#define MATRIX_COL_PINS { F7, F6, B1, B3, B2, B6, B5, B4 }
-#define DIODE_DIRECTION ROW2COL
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 1    // Number of LEDs
diff --git a/keyboards/handwired/qc60/proto/proto.c b/keyboards/handwired/qc60/proto/proto.c
deleted file mode 100644
index fe08df8599..0000000000
--- a/keyboards/handwired/qc60/proto/proto.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Michael Pio Mayol <mfmayol@up.edu.ph>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "qc60.h"
diff --git a/keyboards/handwired/qc60/proto/proto.h b/keyboards/handwired/qc60/proto/proto.h
index 7e7755d0e2..8ba28c7250 100644
--- a/keyboards/handwired/qc60/proto/proto.h
+++ b/keyboards/handwired/qc60/proto/proto.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "qc60.h"
-
 #include "quantum.h"
 
 // readability
@@ -49,7 +47,7 @@
     {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
     {L30, L31, L32, L33, L34, L35, L36, XXX}, \
     {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
-    {R07, XXX, R05, R04, R03, R02, R01, R00}, \
+    {R07, R06, R05, R04, R03, R02, R01, R00}, \
     {R17, R16, R15, R14, R13, R12, R11, R10}, \
     {R27, R26, R25, R24, R23, R22, R21, XXX}, \
     {R37, R36, R35, R34, R33, R32, R31, XXX}, \
diff --git a/keyboards/handwired/qc60/qc60.c b/keyboards/handwired/qc60/qc60.c
deleted file mode 100644
index dfa77cf086..0000000000
--- a/keyboards/handwired/qc60/qc60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "qc60.h"
diff --git a/keyboards/handwired/qc60/qc60.h b/keyboards/handwired/qc60/qc60.h
deleted file mode 100644
index e26811ae72..0000000000
--- a/keyboards/handwired/qc60/qc60.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_handwired_qc60_proto)
-#    include "proto.h"
-#endif
diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json
index 8699edea43..993bcf407e 100644
--- a/keyboards/handwired/reclined/info.json
+++ b/keyboards/handwired/reclined/info.json
@@ -26,54 +26,57 @@
       "c_macro": true,
       "filename": "keyboards/handwired/reclined/reclined.h",
       "layout": [
-        { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-        { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-        { "label": "k0a", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-        { "label": "k0b", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-        { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
-        { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 },
-        { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
-        { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 },
-        { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 },
-        { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1 },
-        { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1 },
-        { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1 },
-        { "label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1 },
-        { "label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1 },
-        { "label": "k1a", "matrix": [1, 10], "w": 1, "x": 10, "y": 1 },
-        { "label": "k1b", "matrix": [1, 11], "w": 1, "x": 11, "y": 1 },
-        { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
-        { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
-        { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
-        { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 },
-        { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 },
-        { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 },
-        { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 },
-        { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 },
-        { "label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 },
-        { "label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 },
-        { "label": "k2a", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 },
-        { "label": "k2b", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 },
-        { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
-        { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 },
-        { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 },
-        { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 },
-        { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 },
-        { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5, "y": 3 },
-        { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6, "y": 3 },
-        { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3 },
-        { "label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3 },
-        { "label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3 },
-        { "label": "k3a", "matrix": [3, 10], "w": 1, "x": 10, "y": 3 },
-        { "label": "k3b", "matrix": [3, 11], "w": 1, "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/handwired/reclined/keymaps/pdl/rules.mk b/keyboards/handwired/reclined/keymaps/pdl/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/reclined/keymaps/pdl/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/reclined/reclined.c b/keyboards/handwired/reclined/reclined.c
deleted file mode 100644
index ca6da9de6d..0000000000
--- a/keyboards/handwired/reclined/reclined.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Daniel Perrett
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "reclined.h"
\ No newline at end of file
diff --git a/keyboards/handwired/reclined/reclined.h b/keyboards/handwired/reclined/reclined.h
deleted file mode 100644
index 9a665f3a9b..0000000000
--- a/keyboards/handwired/reclined/reclined.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2018 Daniel Perrett
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
diff --git a/keyboards/handwired/retro_refit/config.h b/keyboards/handwired/retro_refit/config.h
index a08c558a1a..3dc99447ee 100644
--- a/keyboards/handwired/retro_refit/config.h
+++ b/keyboards/handwired/retro_refit/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// See note in retro_refit.h for an explanation of how this matrix is wired up
-#define MATRIX_ROW_PINS { D4, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D3, C7, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/retro_refit/info.json b/keyboards/handwired/retro_refit/info.json
index a04b54cf95..cd7e8c1115 100644
--- a/keyboards/handwired/retro_refit/info.json
+++ b/keyboards/handwired/retro_refit/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "D2", "D3", "C7", "D5"],
+    "rows": ["D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/handwired/riblee_f401/config.h b/keyboards/handwired/riblee_f401/config.h
index 2cee851436..09a304e1c7 100644
--- a/keyboards/handwired/riblee_f401/config.h
+++ b/keyboards/handwired/riblee_f401/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 }
-#define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B6, B7, B8, B9 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define MOUSEKEY_INTERVAL 32
 
 #define TAPPING_TERM 175
\ No newline at end of file
diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json
index 94cc2c35f2..7b9b320b98 100644
--- a/keyboards/handwired/riblee_f401/info.json
+++ b/keyboards/handwired/riblee_f401/info.json
@@ -8,6 +8,11 @@
         "pid": "0x002A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
+        "rows": ["A6", "A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "driver": "software",
         "pin": "A0",
@@ -20,70 +25,70 @@
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"x": 0,"y": 0},
-                {"x": 1,"y": 0},
-                {"x": 2,"y": 0},
-                {"x": 3,"y": 0},
-                {"x": 4,"y": 0},
-                {"x": 5,"y": 0},
-                {"x": 6,"y": 0},
-                {"x": 7,"y": 0},
-                {"x": 8,"y": 0},
-                {"x": 9,"y": 0},
-                {"x": 10,"y": 0},
-                {"x": 11,"y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0,"y": 1},
-                {"x": 1,"y": 1},
-                {"x": 2,"y": 1},
-                {"x": 3,"y": 1},
-                {"x": 4,"y": 1},
-                {"x": 5,"y": 1},
-                {"x": 6,"y": 1},
-                {"x": 7,"y": 1},
-                {"x": 8,"y": 1},
-                {"x": 9,"y": 1},
-                {"x": 10,"y": 1},
-                {"x": 11,"y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0,"y": 2},
-                {"x": 1,"y": 2},
-                {"x": 2,"y": 2},
-                {"x": 3,"y": 2},
-                {"x": 4,"y": 2},
-                {"x": 5,"y": 2},
-                {"x": 6,"y": 2},
-                {"x": 7,"y": 2},
-                {"x": 8,"y": 2},
-                {"x": 9,"y": 2},
-                {"x": 10,"y": 2},
-                {"x": 11,"y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0,"y": 3},
-                {"x": 1,"y": 3},
-                {"x": 2,"y": 3},
-                {"x": 3,"y": 3},
-                {"x": 4,"y": 3},
-                {"x": 5,"y": 3},
-                {"x": 6,"y": 3},
-                {"x": 7,"y": 3},
-                {"x": 8,"y": 3},
-                {"x": 9,"y": 3},
-                {"x": 10,"y": 3},
-                {"x": 11,"y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0,"y": 4},
-                {"x": 1,"y": 4},
-                {"x": 2,"y": 4},
-                {"x": 3,"y": 4},
-                {"x": 4,"y": 4},
-                {"x": 5,"y": 4},
-                {"x": 6,"y": 4},
-                {"x": 7,"y": 4},
-                {"x": 8,"y": 4},
-                {"x": 9,"y": 4},
-                {"x": 10,"y": 4},
-                {"x": 11,"y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/riblee_f401/riblee_f401.c b/keyboards/handwired/riblee_f401/riblee_f401.c
deleted file mode 100644
index 65155b373c..0000000000
--- a/keyboards/handwired/riblee_f401/riblee_f401.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Daniel Reibl <janos.daniel.reibl@protonmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "riblee_f401.h"
\ No newline at end of file
diff --git a/keyboards/handwired/riblee_f401/riblee_f401.h b/keyboards/handwired/riblee_f401/riblee_f401.h
deleted file mode 100644
index a1b326aae4..0000000000
--- a/keyboards/handwired/riblee_f401/riblee_f401.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 QMK Community, Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
-}
diff --git a/keyboards/handwired/riblee_f411/config.h b/keyboards/handwired/riblee_f411/config.h
index 395e35d913..425b35f266 100644
--- a/keyboards/handwired/riblee_f411/config.h
+++ b/keyboards/handwired/riblee_f411/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 }
-#define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B14, A0, B8, B9 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define MOUSEKEY_INTERVAL 32
 
 #define TAPPING_TERM 175
diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/info.json
index 4941f56752..d13dfb2291 100644
--- a/keyboards/handwired/riblee_f411/info.json
+++ b/keyboards/handwired/riblee_f411/info.json
@@ -8,6 +8,11 @@
         "pid": "0x002B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B14", "A0", "B8", "B9"],
+        "rows": ["A6", "A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411",
@@ -15,70 +20,70 @@
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"x": 0,"y": 0},
-                {"x": 1,"y": 0},
-                {"x": 2,"y": 0},
-                {"x": 3,"y": 0},
-                {"x": 4,"y": 0},
-                {"x": 5,"y": 0},
-                {"x": 6,"y": 0},
-                {"x": 7,"y": 0},
-                {"x": 8,"y": 0},
-                {"x": 9,"y": 0},
-                {"x": 10,"y": 0},
-                {"x": 11,"y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0,"y": 1},
-                {"x": 1,"y": 1},
-                {"x": 2,"y": 1},
-                {"x": 3,"y": 1},
-                {"x": 4,"y": 1},
-                {"x": 5,"y": 1},
-                {"x": 6,"y": 1},
-                {"x": 7,"y": 1},
-                {"x": 8,"y": 1},
-                {"x": 9,"y": 1},
-                {"x": 10,"y": 1},
-                {"x": 11,"y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0,"y": 2},
-                {"x": 1,"y": 2},
-                {"x": 2,"y": 2},
-                {"x": 3,"y": 2},
-                {"x": 4,"y": 2},
-                {"x": 5,"y": 2},
-                {"x": 6,"y": 2},
-                {"x": 7,"y": 2},
-                {"x": 8,"y": 2},
-                {"x": 9,"y": 2},
-                {"x": 10,"y": 2},
-                {"x": 11,"y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0,"y": 3},
-                {"x": 1,"y": 3},
-                {"x": 2,"y": 3},
-                {"x": 3,"y": 3},
-                {"x": 4,"y": 3},
-                {"x": 5,"y": 3},
-                {"x": 6,"y": 3},
-                {"x": 7,"y": 3},
-                {"x": 8,"y": 3},
-                {"x": 9,"y": 3},
-                {"x": 10,"y": 3},
-                {"x": 11,"y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0,"y": 4},
-                {"x": 1,"y": 4},
-                {"x": 2,"y": 4},
-                {"x": 3,"y": 4},
-                {"x": 4,"y": 4},
-                {"x": 5,"y": 4},
-                {"x": 6,"y": 4},
-                {"x": 7,"y": 4},
-                {"x": 8,"y": 4},
-                {"x": 9,"y": 4},
-                {"x": 10,"y": 4},
-                {"x": 11,"y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/riblee_f411/riblee_f411.c b/keyboards/handwired/riblee_f411/riblee_f411.c
deleted file mode 100644
index 20d3735e88..0000000000
--- a/keyboards/handwired/riblee_f411/riblee_f411.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "riblee_f411.h"
\ No newline at end of file
diff --git a/keyboards/handwired/riblee_f411/riblee_f411.h b/keyboards/handwired/riblee_f411/riblee_f411.h
deleted file mode 100644
index b06173aafd..0000000000
--- a/keyboards/handwired/riblee_f411/riblee_f411.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 QMK Community, Janos Daniel Reibl <janos.daniel.reibl@protonmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
-}
diff --git a/keyboards/handwired/rs60/config.h b/keyboards/handwired/rs60/config.h
index b9bf17a4a0..fb1ac6044d 100644
--- a/keyboards/handwired/rs60/config.h
+++ b/keyboards/handwired/rs60/config.h
@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B6, B4, B2, E6 }
-#define MATRIX_COL_PINS { C6, D4, D0, D1, D2, D3,  F4, F5, F6, F7, B1, B3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     false \
diff --git a/keyboards/handwired/rs60/info.json b/keyboards/handwired/rs60/info.json
index ddd2cff353..214eb64dfc 100644
--- a/keyboards/handwired/rs60/info.json
+++ b/keyboards/handwired/rs60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4260",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D4", "D0", "D1", "D2", "D3", "F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["B5", "B6", "B4", "B2", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "B4",
         "esc_output": "C6",
@@ -19,70 +24,70 @@
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"x": 0,"y": 0},
-                {"x": 1,"y": 0},
-                {"x": 2,"y": 0},
-                {"x": 3,"y": 0},
-                {"x": 4,"y": 0},
-                {"x": 5,"y": 0},
-                {"x": 6,"y": 0},
-                {"x": 7,"y": 0},
-                {"x": 8,"y": 0},
-                {"x": 9,"y": 0},
-                {"x": 10,"y": 0},
-                {"x": 11,"y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0,"y": 1},
-                {"x": 1,"y": 1},
-                {"x": 2,"y": 1},
-                {"x": 3,"y": 1},
-                {"x": 4,"y": 1},
-                {"x": 5,"y": 1},
-                {"x": 6,"y": 1},
-                {"x": 7,"y": 1},
-                {"x": 8,"y": 1},
-                {"x": 9,"y": 1},
-                {"x": 10,"y": 1},
-                {"x": 11,"y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0,"y": 2},
-                {"x": 1,"y": 2},
-                {"x": 2,"y": 2},
-                {"x": 3,"y": 2},
-                {"x": 4,"y": 2},
-                {"x": 5,"y": 2},
-                {"x": 6,"y": 2},
-                {"x": 7,"y": 2},
-                {"x": 8,"y": 2},
-                {"x": 9,"y": 2},
-                {"x": 10,"y": 2},
-                {"x": 11,"y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0,"y": 3},
-                {"x": 1,"y": 3},
-                {"x": 2,"y": 3},
-                {"x": 3,"y": 3},
-                {"x": 4,"y": 3},
-                {"x": 5,"y": 3},
-                {"x": 6,"y": 3},
-                {"x": 7,"y": 3},
-                {"x": 8,"y": 3},
-                {"x": 9,"y": 3},
-                {"x": 10,"y": 3},
-                {"x": 11,"y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0,"y": 4},
-                {"x": 1,"y": 4},
-                {"x": 2,"y": 4},
-                {"x": 3,"y": 4},
-                {"x": 4,"y": 4},
-                {"x": 5,"y": 4},
-                {"x": 6,"y": 4},
-                {"x": 7,"y": 4},
-                {"x": 8,"y": 4},
-                {"x": 9,"y": 4},
-                {"x": 10,"y": 4},
-                {"x": 11,"y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/rs60/rs60.c b/keyboards/handwired/rs60/rs60.c
deleted file mode 100644
index f748740cbe..0000000000
--- a/keyboards/handwired/rs60/rs60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2018 QMK Community
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "rs60.h"
diff --git a/keyboards/handwired/rs60/rs60.h b/keyboards/handwired/rs60/rs60.h
deleted file mode 100644
index 294149729e..0000000000
--- a/keyboards/handwired/rs60/rs60.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2018 QMK Community
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-	k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-	{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
-}
diff --git a/keyboards/handwired/selene/config.h b/keyboards/handwired/selene/config.h
index f0b09a2a7f..7ee210aa84 100644
--- a/keyboards/handwired/selene/config.h
+++ b/keyboards/handwired/selene/config.h
@@ -16,15 +16,7 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B10, B9, B15, B14, B13, B8}
-#define MATRIX_COL_PINS { A9, A10, B11, B7, B6, B5, B4, B3, B2, B1, B0, C14, A4, A5, A6, A7, A8, A15, A13, A14, B12 }
-#define RGB_DI_PIN A3
 #define RGBLED_NUM 50
 
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json
index c798895e86..8c617b015b 100644
--- a/keyboards/handwired/selene/info.json
+++ b/keyboards/handwired/selene/info.json
@@ -8,6 +8,14 @@
   	"pid": "0x0001",
   	"device_version": "0.0.1"
   },
+  "ws2812": {
+  	"pin": "A3"
+  },
+  "matrix_pins": {
+    "cols": ["A9", "A10", "B11", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "C14", "A4", "A5", "A6", "A7", "A8", "A15", "A13", "A14", "B12"],
+    "rows": ["B10", "B9", "B15", "B14", "B13", "B8"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
   "board": "QMK_PROTON_C",
diff --git a/keyboards/handwired/selene/rules.mk b/keyboards/handwired/selene/rules.mk
index 648f79b599..a8a8f03322 100644
--- a/keyboards/handwired/selene/rules.mk
+++ b/keyboards/handwired/selene/rules.mk
@@ -9,5 +9,4 @@ 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
-WS2812_DRIVER = bitbang
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/sick68/config.h b/keyboards/handwired/sick68/config.h
index 018fb3cd48..ee4bc0e70c 100644
--- a/keyboards/handwired/sick68/config.h
+++ b/keyboards/handwired/sick68/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { D3, D2, D1, D0, D4 }
-#define MATRIX_COL_PINS \
-    { C6, D7, E6, B4, B5, B0, D5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/sick68/info.json b/keyboards/handwired/sick68/info.json
index eb99897023..14232fd6c3 100644
--- a/keyboards/handwired/sick68/info.json
+++ b/keyboards/handwired/sick68/info.json
@@ -8,84 +8,89 @@
         "pid": "0x5F00",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5", "B0", "D5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D3", "D2", "D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/sick68/sick68.c b/keyboards/handwired/sick68/sick68.c
deleted file mode 100644
index c1f37824ca..0000000000
--- a/keyboards/handwired/sick68/sick68.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 umbynos
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "sick68.h"
diff --git a/keyboards/handwired/sick68/sick68.h b/keyboards/handwired/sick68/sick68.h
deleted file mode 100644
index f97d3ef944..0000000000
--- a/keyboards/handwired/sick68/sick68.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2020 umbynos
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-// readability
-#define XXX KC_NO
-
-/* SICK68 ANSI layout
- * ,----------------------------------------------------------------.
- * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
- * |----------------------------------------------------------------|
- * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d | 1e |
- * |----------------------------------------------------------------|
- * | 20    | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d    | 2e |
- * |----------------------------------------------------------------|
- * | 30     | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
- * |----------------------------------------------------------------|
- * | 40 | 41 | 42 |          46           | 49| 4a|  4b| 4c| 4d| 4e |
- * `----------------------------------------------------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \
-    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e}  \
-}
diff --git a/keyboards/handwired/sick_pad/config.h b/keyboards/handwired/sick_pad/config.h
index e27980a0eb..ee1c244658 100644
--- a/keyboards/handwired/sick_pad/config.h
+++ b/keyboards/handwired/sick_pad/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B9, B15, B14, B13 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/sick_pad/info.json b/keyboards/handwired/sick_pad/info.json
index 2a5f85ad68..fc1e39eb33 100644
--- a/keyboards/handwired/sick_pad/info.json
+++ b/keyboards/handwired/sick_pad/info.json
@@ -8,6 +8,11 @@
         "pid": "0xDA20",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B9", "B15", "B14", "B13"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
@@ -15,27 +20,27 @@
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":1, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 1, "h": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"x":0, "y":4, "w":2},
-                {"x":2, "y":4},
-                {"x":3, "y":3, "h":2}
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/sick_pad/sick_pad.c b/keyboards/handwired/sick_pad/sick_pad.c
deleted file mode 100644
index 3464545fef..0000000000
--- a/keyboards/handwired/sick_pad/sick_pad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Joel Schneider
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include "sick_pad.h"
diff --git a/keyboards/handwired/sick_pad/sick_pad.h b/keyboards/handwired/sick_pad/sick_pad.h
deleted file mode 100644
index 2fe82388de..0000000000
--- a/keyboards/handwired/sick_pad/sick_pad.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 Joel Schneider
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_5x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12,      \
-	K20, K21, K22, K23, \
-	K30, K31, K32,      \
-	     K41, K42, K43  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   KC_NO }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ K30,   K31,   K32,   KC_NO }, \
-	{ KC_NO, K41,   K42,   K43 }  \
-}
diff --git a/keyboards/handwired/skakunm_dactyl/config.h b/keyboards/handwired/skakunm_dactyl/config.h
index 2e01a71d28..8b04fcdc71 100644
--- a/keyboards/handwired/skakunm_dactyl/config.h
+++ b/keyboards/handwired/skakunm_dactyl/config.h
@@ -4,13 +4,6 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* mouse config */
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
@@ -26,11 +19,6 @@
 /* Enables This makes it easier for fast typists to use dual-function keys */
 #define PERMISSIVE_HOLD
 
-/* ws2812 RGB LED */
-//#define RGB_DI_PIN D3
-
-//#define RGBLED_NUM 12    // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/info.json
index a38c564091..468dbf8494 100644
--- a/keyboards/handwired/skakunm_dactyl/info.json
+++ b/keyboards/handwired/skakunm_dactyl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c b/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c
deleted file mode 100644
index 4105eea751..0000000000
--- a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Marko Skakun <skakun.marko@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "skakunm_dactyl.h"
\ No newline at end of file
diff --git a/keyboards/handwired/slash/config.h b/keyboards/handwired/slash/config.h
index ffa31f3c7a..bde67936ea 100644
--- a/keyboards/handwired/slash/config.h
+++ b/keyboards/handwired/slash/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C7, D6, B7, B6, B5, D7, C6, D0 }
-#define MATRIX_COL_PINS { D2, F0, F1, F4, F5, F6, F7, D3 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/info.json
index b272ff1ed2..ffd76babc1 100644
--- a/keyboards/handwired/slash/info.json
+++ b/keyboards/handwired/slash/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "F0", "F1", "F4", "F5", "F6", "F7", "D3"],
+        "rows": ["C7", "D6", "B7", "B6", "B5", "D7", "C6", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/slash/slash.c b/keyboards/handwired/slash/slash.c
deleted file mode 100644
index 59902b5074..0000000000
--- a/keyboards/handwired/slash/slash.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 4sdftemp
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "slash.h"
diff --git a/keyboards/handwired/snatchpad/config.h b/keyboards/handwired/snatchpad/config.h
index 57d303a983..4dee4933a8 100644
--- a/keyboards/handwired/snatchpad/config.h
+++ b/keyboards/handwired/snatchpad/config.h
@@ -3,23 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboards
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6 }
-#define MATRIX_COL_PINS { B1, B3, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/snatchpad/info.json b/keyboards/handwired/snatchpad/info.json
index a86091abfd..162f5601b5 100644
--- a/keyboards/handwired/snatchpad/info.json
+++ b/keyboards/handwired/snatchpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7370",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2"],
+        "rows": ["F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D2"},
@@ -19,16 +24,16 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
 
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 4, "y": 2}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/snatchpad/snatchpad.c b/keyboards/handwired/snatchpad/snatchpad.c
index 621ba11123..89d32c036b 100644
--- a/keyboards/handwired/snatchpad/snatchpad.c
+++ b/keyboards/handwired/snatchpad/snatchpad.c
@@ -1,7 +1,7 @@
 // Copyright 2022 xia0 (@xia0)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "snatchpad.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/handwired/snatchpad/snatchpad.h b/keyboards/handwired/snatchpad/snatchpad.h
deleted file mode 100644
index 07d6bd2093..0000000000
--- a/keyboards/handwired/snatchpad/snatchpad.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 xia0 (@xia0)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20,      k22  \
-) { \
-    { k00    , k01    , k02 }, \
-    { k10    , k11    , k12 }, \
-    { k20    , KC_NO  , k22 }  \
-}
diff --git a/keyboards/handwired/sono1/config.h b/keyboards/handwired/sono1/config.h
index 9f1a9ae244..c4105bdf5f 100644
--- a/keyboards/handwired/sono1/config.h
+++ b/keyboards/handwired/sono1/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* mechanical locking support. NumLock key on the numpad uses Alps SKCL Lock switch */
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/sono1/stm32f103/config.h b/keyboards/handwired/sono1/stm32f103/config.h
index b961eaffd6..7cd783c0e9 100644
--- a/keyboards/handwired/sono1/stm32f103/config.h
+++ b/keyboards/handwired/sono1/stm32f103/config.h
@@ -17,9 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A5, B3, A9, A10, B13, B14, B15, A8, B7, B8, B9, C13, A15, A0, A1 }
-#define MATRIX_COL_PINS { A4, A3, B11, B10, B1, B0, A7, A6 }
-
 #define LED_CTRL_XFER_PIN B6
 #define LED_KB_LOCK_PIN B12
diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/info.json
index b25392382a..f6e874a77f 100644
--- a/keyboards/handwired/sono1/stm32f103/info.json
+++ b/keyboards/handwired/sono1/stm32f103/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A4", "A3", "B11", "B10", "B1", "B0", "A7", "A6"],
+        "rows": ["A5", "B3", "A9", "A10", "B13", "B14", "B15", "A8", "B7", "B8", "B9", "C13", "A15", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B5",
         "num_lock": "B4",
diff --git a/keyboards/handwired/sono1/t2pp/config.h b/keyboards/handwired/sono1/t2pp/config.h
index 15bea036a2..144031ea7b 100644
--- a/keyboards/handwired/sono1/t2pp/config.h
+++ b/keyboards/handwired/sono1/t2pp/config.h
@@ -17,9 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, D7, B7, D0, D1, D2, D3, D4 }
-#define MATRIX_COL_PINS { C6, C5, C4, C3, C2, C1, C0, E1 }
-
 #define LED_CTRL_XFER_PIN B4
 #define LED_KB_LOCK_PIN B1
diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/info.json
index 3e637c3e94..37ab6723ba 100644
--- a/keyboards/handwired/sono1/t2pp/info.json
+++ b/keyboards/handwired/sono1/t2pp/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1"],
+        "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "D7", "B7", "D0", "D1", "D2", "D3", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B3",
         "num_lock": "B2",
diff --git a/keyboards/handwired/space_oddity/config.h b/keyboards/handwired/space_oddity/config.h
index 708be5389d..400303c8b9 100644
--- a/keyboards/handwired/space_oddity/config.h
+++ b/keyboards/handwired/space_oddity/config.h
@@ -7,32 +7,8 @@
 #define MOUSEKEY_MAX_SPEED 7
 #define MOUSEKEY_WHEEL_DELAY 0
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { B2, B6, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/handwired/space_oddity/info.json b/keyboards/handwired/space_oddity/info.json
index e03c13c3e0..48fe44be74 100644
--- a/keyboards/handwired/space_oddity/info.json
+++ b/keyboards/handwired/space_oddity/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
+    "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/handwired/space_oddity/space_oddity.c b/keyboards/handwired/space_oddity/space_oddity.c
deleted file mode 100644
index 9a9a270a43..0000000000
--- a/keyboards/handwired/space_oddity/space_oddity.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "space_oddity.h"
diff --git a/keyboards/handwired/split65/promicro/config.h b/keyboards/handwired/split65/promicro/config.h
index 7deab0a7db..b92456da98 100644
--- a/keyboards/handwired/split65/promicro/config.h
+++ b/keyboards/handwired/split65/promicro/config.h
@@ -15,14 +15,6 @@
  */
 #pragma once
 
-
-
-#define MATRIX_COL_PINS {F4, F5, F6, F7, B1, B3, B2, B6}
-#define MATRIX_ROW_PINS {D4, C6, D7, E6, B4}
-
-// COL2ROW, ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 #define MATRIX_IO_DELAY 5
 
 #define SELECT_SOFT_SERIAL_SPEED 1
diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json
index 81738c4d47..56d2dcb9ab 100644
--- a/keyboards/handwired/split65/promicro/info.json
+++ b/keyboards/handwired/split65/promicro/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D3"
     },
diff --git a/keyboards/handwired/split65/promicro/promicro.c b/keyboards/handwired/split65/promicro/promicro.c
deleted file mode 100644
index 2f7e1ebab4..0000000000
--- a/keyboards/handwired/split65/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020-2021 PercyJW-2 <joris.wachsmuth@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "promicro.h"
diff --git a/keyboards/handwired/split65/promicro/promicro.h b/keyboards/handwired/split65/promicro/promicro.h
index 204f0b88de..8c4e656cf2 100644
--- a/keyboards/handwired/split65/promicro/promicro.h
+++ b/keyboards/handwired/split65/promicro/promicro.h
@@ -15,7 +15,7 @@
  */
 #pragma once 
 
-#include "split65.h"
+#include "quantum.h"
 
 #define LAYOUT( \
     L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \
diff --git a/keyboards/handwired/split65/split65.c b/keyboards/handwired/split65/split65.c
index 9d0831c025..a32af1f140 100644
--- a/keyboards/handwired/split65/split65.c
+++ b/keyboards/handwired/split65/split65.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "split65.h"
+#include "quantum.h"
 
 // OLED Code inspired by https://github.com/qmk/qmk_firmware/blob/master/keyboards/splitkb/kyria/rev1/rev1.c
 
diff --git a/keyboards/handwired/split65/split65.h b/keyboards/handwired/split65/split65.h
deleted file mode 100644
index 7f60ab0bde..0000000000
--- a/keyboards/handwired/split65/split65.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020-2021 PercyJW-2 <joris.wachsmuth@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_handwired_split65_stm32)
-    #include "stm32.h"
-#elif defined(KEYBOARD_handwired_split65_promicro)
-    #include "promicro.h"
-#endif
diff --git a/keyboards/handwired/split65/stm32/config.h b/keyboards/handwired/split65/stm32/config.h
index 483b897584..020e44f02e 100644
--- a/keyboards/handwired/split65/stm32/config.h
+++ b/keyboards/handwired/split65/stm32/config.h
@@ -21,12 +21,6 @@
 #define AUDIO_PIN_ALT A4
 #define AUDIO_PIN_ALT_AS_NEGATIVE
 
-#define MATRIX_COL_PINS {A2, A1, A0, B8, B13, B14, B15, B9}
-#define MATRIX_ROW_PINS {B5, B4, B3, B2, B1}
-
-// COL2ROW, ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 #define MATRIX_IO_DELAY 5
 
 #define SELECT_SOFT_SERIAL_SPEED 1
diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json
index f497c14c01..e2c0a634f3 100644
--- a/keyboards/handwired/split65/stm32/info.json
+++ b/keyboards/handwired/split65/stm32/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9"],
+        "rows": ["B5", "B4", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "A9"
     },
diff --git a/keyboards/handwired/split65/stm32/stm32.c b/keyboards/handwired/split65/stm32/stm32.c
deleted file mode 100644
index 2fa511206e..0000000000
--- a/keyboards/handwired/split65/stm32/stm32.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020-2021 PercyJW-2 <joris.wachsmuth@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "stm32.h"
diff --git a/keyboards/handwired/split65/stm32/stm32.h b/keyboards/handwired/split65/stm32/stm32.h
index 27f03b3e26..be3dd1639b 100644
--- a/keyboards/handwired/split65/stm32/stm32.h
+++ b/keyboards/handwired/split65/stm32/stm32.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "split65.h"
+#include "quantum.h"
 
 #define LAYOUT( \
     L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \
diff --git a/keyboards/handwired/split89/config.h b/keyboards/handwired/split89/config.h
index 637326617c..042c165a18 100644
--- a/keyboards/handwired/split89/config.h
+++ b/keyboards/handwired/split89/config.h
@@ -16,31 +16,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* Left side matrix */
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { F5, F4, B5, B4, E6, D7, C6, D4, D2, D3 }
-/* Right side matrix */
-#define MATRIX_ROW_PINS_RIGHT { F6, F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS_RIGHT { F5, F4, B5, B4, E6, D7, C6, D4, D2, D3 }
-
 /* this will be tied to high (VCC with a 2k to 10k resistor) on the left keyboard half and tied to low (GND using a wire jumper only) on the right keyboard half.  This allows a user to plug in a USB cable to either side and function correctly with or without a TRS/TRRS cable with a single hex file. */
 #define SPLIT_HAND_PIN D1
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/info.json
index 2cc68544a7..719eb05455 100644
--- a/keyboards/handwired/split89/info.json
+++ b/keyboards/handwired/split89/info.json
@@ -8,8 +8,19 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "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",
diff --git a/keyboards/handwired/splittest/bluepill/config.h b/keyboards/handwired/splittest/bluepill/config.h
index 54b00b88a5..d19bb3dee8 100644
--- a/keyboards/handwired/splittest/bluepill/config.h
+++ b/keyboards/handwired/splittest/bluepill/config.h
@@ -3,11 +3,6 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { B10 }
-#define MATRIX_COL_PINS { B1 }
-
 #define SPLIT_HAND_PIN A7
 
 #if !(defined(USE_SDI1_ON_STANDARD_ROLE_PINS) || defined(USE_SDI1_ON_ALTERNATE_ROLE_PINS) || defined(USE_SDI2))
diff --git a/keyboards/handwired/splittest/bluepill/info.json b/keyboards/handwired/splittest/bluepill/info.json
index cf993be247..17b7f86a6f 100644
--- a/keyboards/handwired/splittest/bluepill/info.json
+++ b/keyboards/handwired/splittest/bluepill/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B1"],
+        "rows": ["B10"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino"
 }
diff --git a/keyboards/handwired/splittest/config.h b/keyboards/handwired/splittest/config.h
index af60e7e0a9..49bc3cbddb 100644
--- a/keyboards/handwired/splittest/config.h
+++ b/keyboards/handwired/splittest/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/splittest/info.json b/keyboards/handwired/splittest/info.json
index 973eebd1f9..efd82d20c4 100644
--- a/keyboards/handwired/splittest/info.json
+++ b/keyboards/handwired/splittest/info.json
@@ -11,8 +11,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0,"y": 0},
-                {"x": 1,"y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1, "y": 0}
             ]
         }
     }
diff --git a/keyboards/handwired/splittest/promicro/config.h b/keyboards/handwired/splittest/promicro/config.h
index 45f005222f..4458ddaffe 100644
--- a/keyboards/handwired/splittest/promicro/config.h
+++ b/keyboards/handwired/splittest/promicro/config.h
@@ -20,10 +20,4 @@
 // use I2C on AVR
 #define USE_I2C
 
-// wiring of each half
-#define MATRIX_ROW_PINS { B3 }
-#define MATRIX_COL_PINS { B6 }
 #define SPLIT_HAND_PIN F6
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
diff --git a/keyboards/handwired/splittest/promicro/info.json b/keyboards/handwired/splittest/promicro/info.json
index ecf716ff97..f376520765 100644
--- a/keyboards/handwired/splittest/promicro/info.json
+++ b/keyboards/handwired/splittest/promicro/info.json
@@ -1,7 +1,15 @@
 {
+    "matrix_pins": {
+        "cols": ["B6"],
+        "rows": ["B3"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/handwired/splittest/splittest.c b/keyboards/handwired/splittest/splittest.c
deleted file mode 100644
index 3c919a565d..0000000000
--- a/keyboards/handwired/splittest/splittest.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "splittest.h"
diff --git a/keyboards/handwired/splittest/splittest.h b/keyboards/handwired/splittest/splittest.h
deleted file mode 100644
index 17b7081a02..0000000000
--- a/keyboards/handwired/splittest/splittest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT(L1, R1) {{L1}, {R1}}
diff --git a/keyboards/handwired/splittest/teensy_2/config.h b/keyboards/handwired/splittest/teensy_2/config.h
index 7b77a5e36b..20672a381f 100644
--- a/keyboards/handwired/splittest/teensy_2/config.h
+++ b/keyboards/handwired/splittest/teensy_2/config.h
@@ -20,13 +20,7 @@
 // use I2C on AVR
 #define USE_I2C
 
-// wiring of each half
-#define MATRIX_ROW_PINS { F5 }
-#define MATRIX_COL_PINS { F7 }
 #define SPLIT_HAND_PIN F0
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 // teensy has vbus detection issues - use usb detection instead
 #define SPLIT_USB_DETECT
diff --git a/keyboards/handwired/splittest/teensy_2/info.json b/keyboards/handwired/splittest/teensy_2/info.json
index a67cb4e2f2..72e9d022b9 100644
--- a/keyboards/handwired/splittest/teensy_2/info.json
+++ b/keyboards/handwired/splittest/teensy_2/info.json
@@ -1,7 +1,15 @@
 {
+    "matrix_pins": {
+        "cols": ["F7"],
+        "rows": ["F5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "halfkay"
 }
diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h
index b52e370419..ffd061fa17 100644
--- a/keyboards/handwired/steamvan/rev1/config.h
+++ b/keyboards/handwired/steamvan/rev1/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* ROWS: Top to bottom, COLS: Left to right
-*/
-#define MATRIX_ROW_PINS { A6, A5, A4, A3 }
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, A10, B9, B6, B5, B4, B3, A15 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -46,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 16
-#define RGB_DI_PIN A7
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json
index ed10d8005b..054f1845ff 100644
--- a/keyboards/handwired/steamvan/rev1/info.json
+++ b/keyboards/handwired/steamvan/rev1/info.json
@@ -8,10 +8,19 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["A9", "A8", "B15", "B14", "B13", "A10", "B9", "B6", "B5", "B4", "B3", "A15"],
+    "rows": ["A6", "A5", "A4", "A3"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B8",
     "breathing": true
   },
+  "ws2812": {
+    "pin": "A7",
+    "driver": "spi"
+  },
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
   "board": "QMK_PROTON_C",
diff --git a/keyboards/handwired/steamvan/rev1/rev1.c b/keyboards/handwired/steamvan/rev1/rev1.c
deleted file mode 100644
index 53f9a400f4..0000000000
--- a/keyboards/handwired/steamvan/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 John M Daly <jmdaly@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
-
diff --git a/keyboards/handwired/steamvan/rev1/rules.mk b/keyboards/handwired/steamvan/rev1/rules.mk
index e6848a7b65..30e27ae8b8 100644
--- a/keyboards/handwired/steamvan/rev1/rules.mk
+++ b/keyboards/handwired/steamvan/rev1/rules.mk
@@ -1,6 +1,3 @@
-# Use SPI for RGB underglow:
-WS2812_DRIVER = spi
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/info.json
index 75d151d5b6..91b6cd39c5 100644
--- a/keyboards/handwired/stef9998/split_5x7/info.json
+++ b/keyboards/handwired/stef9998/split_5x7/info.json
@@ -8,8 +8,19 @@
     "pid": "0x6063",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["B2", "B6", "B1", "B3", "F7", "F5", "F6"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
-    "soft_serial_pin": "D0"
+    "soft_serial_pin": "D0",
+    "matrix_pins": {
+      "right": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["B5", "B4", "E6", "D7", "C6"]
+      }
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
index d8a98f8d40..22d68ab390 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
@@ -28,5 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RCPC_KEYS KC_RCTL,KC_TRNS,KC_RBRC
 
 #define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
index 5b74c3567e..833a245c54 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c
@@ -39,20 +39,20 @@ enum custom_keycodes {
 // Shortcut to make keymap more readable
 #define KC_FN MO(_FN)
 
-bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
+bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case SC_LSPO:
             // Do not force the mod-tap key press to be handled as a modifier
             // if any other key was pressed while the mod-tap key is held down.
-            return false;
+            return true;
 //        case MT(MOD_LSFT,KC_9):
 //            return false;
         case SC_RSPC:
-            return false;
+            return true;
         default:
             // Force the mod-tap key press to be handled as a modifier if any
             // other key was pressed while the mod-tap key is held down.
-            return true;
+            return false;
     }
 }
 
@@ -185,4 +185,4 @@ _______ ,_______ ,RALT_T(KC_S),LCTL_T(KC_D),LSFT_T(KC_F),LT(_SYM,KC_G),_______ ,
     _______ ,_______ ,_______   ,_______   ,_______      ,_______ ,                          _______ ,_______      ,_______   ,_______   ,_______ ,_______
 // └────────┴────────┴──────────┴──────────┴─────────────┴────────┘                         └────────┴─────────────┴──────────┴──────────┴────────┴────────┘
 ),
- */
\ No newline at end of file
+ */
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/config.h b/keyboards/handwired/stef9998/split_5x7/rev1/config.h
deleted file mode 100644
index 2957afc125..0000000000
--- a/keyboards/handwired/stef9998/split_5x7/rev1/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2022 stef9998
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B2, B6, B1, B3, F7, F5, F6 }
-
-#define MATRIX_ROW_PINS_RIGHT { B5, B4, E6, D7, C6 }
-#define MATRIX_COL_PINS_RIGHT { F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
deleted file mode 100644
index cf8e7d9fa3..0000000000
--- a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 stef9998
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "split_5x7.h"
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
index 9ffed66727..828c515484 100644
--- a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
+++ b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#include "split_5x7.h"
+#include "quantum.h"
 
 
 #define LAYOUT( \
diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.c b/keyboards/handwired/stef9998/split_5x7/split_5x7.c
index 5e19d47175..18543078c7 100644
--- a/keyboards/handwired/stef9998/split_5x7/split_5x7.c
+++ b/keyboards/handwired/stef9998/split_5x7/split_5x7.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "split_5x7.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.h b/keyboards/handwired/stef9998/split_5x7/split_5x7.h
deleted file mode 100644
index 55ed1cc98f..0000000000
--- a/keyboards/handwired/stef9998/split_5x7/split_5x7.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#if defined(KEYBOARD_handwired_stef9998_split_5x7_rev1)
-#     include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/handwired/sticc14/config.h b/keyboards/handwired/sticc14/config.h
index 43a17c9e88..b4a9e4014d 100644
--- a/keyboards/handwired/sticc14/config.h
+++ b/keyboards/handwired/sticc14/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1 }
-#define MATRIX_COL_PINS { B6, B2, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/sticc14/info.json b/keyboards/handwired/sticc14/info.json
index 194ac0eeb3..8659152f52 100644
--- a/keyboards/handwired/sticc14/info.json
+++ b/keyboards/handwired/sticc14/info.json
@@ -8,25 +8,34 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K10", "x":0, "y":1},
-                {"label":"K11", "x":1, "y":1},
-                {"label":"K12", "x":2, "y":1},
-                {"label":"K20", "x":0, "y":2},
-                {"label":"K21", "x":1, "y":2},
-                {"label":"K22", "x":2, "y":2},
-                {"label":"K30", "x":0, "y":3},
-                {"label":"K31", "x":1, "y":3},
-                {"label":"K32", "x":2, "y":3},
-                {"label":"K40", "x":0, "y":4, "w":2},
-                {"label":"K41", "x":2, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 1], "x": 2, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/sticc14/sticc14.c b/keyboards/handwired/sticc14/sticc14.c
deleted file mode 100644
index 50c3a4a4b7..0000000000
--- a/keyboards/handwired/sticc14/sticc14.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 ErkHal
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "sticc14.h"
diff --git a/keyboards/handwired/sticc14/sticc14.h b/keyboards/handwired/sticc14/sticc14.h
deleted file mode 100644
index 1a5f51e41a..0000000000
--- a/keyboards/handwired/sticc14/sticc14.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 ErkHal
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-	K00, K01, K02, \
-	K10, K11, K12, \
-	K20, K21, K22, \
-	K30, K31, K32, \
-	K40, K41 \
-) { \
-	{ K00,   K01,	K02 }, \
-	{ K10,   K11,	K12 }, \
-	{ K20,   K21,	K22 }, \
-	{ K30,   K31,	K32 },  \
-	{ K40,	K41} \
-}
diff --git a/keyboards/handwired/swiftrax/astro65/astro65.c b/keyboards/handwired/swiftrax/astro65/astro65.c
deleted file mode 100644
index 57586550bb..0000000000
--- a/keyboards/handwired/swiftrax/astro65/astro65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "astro65.h"
diff --git a/keyboards/handwired/swiftrax/astro65/astro65.h b/keyboards/handwired/swiftrax/astro65/astro65.h
deleted file mode 100644
index 291a71aa44..0000000000
--- a/keyboards/handwired/swiftrax/astro65/astro65.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2020 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXXX KC_NO
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015,\
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115,\
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K215,\
-    K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,             K314, K315,\
-    K400, K401, K402,                   K406,                   K410, K411,       K412, K414, K415 \
-) { \
-    {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015},\
-    {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, XXXX, K115},\
-    {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, XXXX, XXXX, K215},\
-    {K300, XXXX, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, XXXX, K314, K315},\
-    {K400, K401, K402, XXXX, XXXX, XXXX, K406, XXXX, XXXX, XXXX, K410, K411, K412, XXXX, K414, K415} \
-}
diff --git a/keyboards/handwired/swiftrax/astro65/config.h b/keyboards/handwired/swiftrax/astro65/config.h
deleted file mode 100644
index f379fab490..0000000000
--- a/keyboards/handwired/swiftrax/astro65/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-Copyright 2020 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS \
-    { B0, B3, F7, B1, B2 }
-#define MATRIX_COL_PINS \
-    { E6, D5, D3, D4, D6, D7, B4, B5, B6, C6, C7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/swiftrax/astro65/info.json b/keyboards/handwired/swiftrax/astro65/info.json
index fef1bd6999..5137e62c22 100644
--- a/keyboards/handwired/swiftrax/astro65/info.json
+++ b/keyboards/handwired/swiftrax/astro65/info.json
@@ -8,12 +8,90 @@
         "pid": "0xEAEF",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B3", "F7", "B1", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker_split_bs"],
     "layouts": {
         "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2, "w":2.25}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,14", "x":14, "y":3}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/swiftrax/bebol/bebol.c b/keyboards/handwired/swiftrax/bebol/bebol.c
deleted file mode 100644
index 9894f84cb7..0000000000
--- a/keyboards/handwired/swiftrax/bebol/bebol.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "bebol.h"
diff --git a/keyboards/handwired/swiftrax/bebol/config.h b/keyboards/handwired/swiftrax/bebol/config.h
deleted file mode 100644
index 057d1527df..0000000000
--- a/keyboards/handwired/swiftrax/bebol/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B2, B3, F7, F0, B7 }
-#define MATRIX_COL_PINS { B1, D2, D3, F1, F4, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/swiftrax/bebol/info.json b/keyboards/handwired/swiftrax/bebol/info.json
index 29c7f21323..e1b1fcdc64 100644
--- a/keyboards/handwired/swiftrax/bebol/info.json
+++ b/keyboards/handwired/swiftrax/bebol/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEAC4",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "D2", "D3", "F1", "F4", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["B2", "B3", "F7", "F0", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/swiftrax/beegboy/beegboy.c b/keyboards/handwired/swiftrax/beegboy/beegboy.c
deleted file mode 100644
index 6923d50283..0000000000
--- a/keyboards/handwired/swiftrax/beegboy/beegboy.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "beegboy.h"
diff --git a/keyboards/handwired/swiftrax/beegboy/config.h b/keyboards/handwired/swiftrax/beegboy/config.h
index 282a766e55..092f2ba0e9 100644
--- a/keyboards/handwired/swiftrax/beegboy/config.h
+++ b/keyboards/handwired/swiftrax/beegboy/config.h
@@ -17,15 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B1, B0, B3, B2, D0, B7, D2, D1, B5, B4, C6, B6 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D5, D3 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/handwired/swiftrax/beegboy/info.json b/keyboards/handwired/swiftrax/beegboy/info.json
index a52b6e37e7..29fc7dddda 100644
--- a/keyboards/handwired/swiftrax/beegboy/info.json
+++ b/keyboards/handwired/swiftrax/beegboy/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEAC5",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D5", "D3"],
+        "rows": ["B1", "B0", "B3", "B2", "D0", "B7", "D2", "D1", "B5", "B4", "C6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/swiftrax/bumblebee/bumblebee.c b/keyboards/handwired/swiftrax/bumblebee/bumblebee.c
index 1199b90b1f..9c3444955c 100644
--- a/keyboards/handwired/swiftrax/bumblebee/bumblebee.c
+++ b/keyboards/handwired/swiftrax/bumblebee/bumblebee.c
@@ -16,17 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "bumblebee.h"
 
-// Encoder
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise))
-        return false;
-    if (clockwise)
-        tap_code(KC_VOLU);
-    else
-        tap_code(KC_VOLD);
-    return true;
-}
-
 // Initialize all RGB indicators to 'off'
 void keyboard_post_init_kb(void) {
     rgblight_setrgb_at(0, 0, 0, 0); // [..., 0] = top LED
diff --git a/keyboards/handwired/swiftrax/bumblebee/bumblebee.h b/keyboards/handwired/swiftrax/bumblebee/bumblebee.h
index 1ab4c00abc..a451e1273a 100644
--- a/keyboards/handwired/swiftrax/bumblebee/bumblebee.h
+++ b/keyboards/handwired/swiftrax/bumblebee/bumblebee.h
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ) \
  { \
     { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, XXX }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
     { K20, K21, K22, K23, K24, K25, K26, K27 }, \
     { K30, K31, K32, K33, K34, K35, K36, XXX }, \
     { K40, K41, K42, K43, K44, K45, K46, K47 }, \
diff --git a/keyboards/handwired/swiftrax/bumblebee/config.h b/keyboards/handwired/swiftrax/bumblebee/config.h
index c10291a82a..4fe6fb4428 100644
--- a/keyboards/handwired/swiftrax/bumblebee/config.h
+++ b/keyboards/handwired/swiftrax/bumblebee/config.h
@@ -17,16 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C7, D3, D5, D4, D6, D7, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Indicators */
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 3
 
 /* Solenid Pin */
diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json
index 2147a556c2..c96702e68c 100644
--- a/keyboards/handwired/swiftrax/bumblebee/info.json
+++ b/keyboards/handwired/swiftrax/bumblebee/info.json
@@ -8,6 +8,14 @@
         "pid": "0xE881",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "C6", "pin_b": "B6"}
diff --git a/keyboards/handwired/swiftrax/cowfish/config.h b/keyboards/handwired/swiftrax/cowfish/config.h
index 8a947bbea4..092f2ba0e9 100644
--- a/keyboards/handwired/swiftrax/cowfish/config.h
+++ b/keyboards/handwired/swiftrax/cowfish/config.h
@@ -17,14 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D0, D1, B7, E6, D4, D6 }
-#define MATRIX_COL_PINS { B3, B2, B1, F0, F1, F4, F5, F6, F7, B5, B6, B4, C6, D7, C7, D2, D3, D5}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/handwired/swiftrax/cowfish/cowfish.c b/keyboards/handwired/swiftrax/cowfish/cowfish.c
deleted file mode 100644
index 7debc62782..0000000000
--- a/keyboards/handwired/swiftrax/cowfish/cowfish.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "cowfish.h"
diff --git a/keyboards/handwired/swiftrax/cowfish/cowfish.h b/keyboards/handwired/swiftrax/cowfish/cowfish.h
deleted file mode 100644
index 6ae6747f59..0000000000
--- a/keyboards/handwired/swiftrax/cowfish/cowfish.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT_tkl_f13_ansi( \
-    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E,        K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,             K4G, \
-    K50, K51, K52,                K55,                K58, K59, K5B, K5D,        K5F, K5G, K5H \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \
-    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, K59, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \
-}
-
-#define LAYOUT_tkl_f13_ansi_split_bs( \
-    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E,        K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,             K4G, \
-    K50, K51, K52,                K55,                K58, K59, K5B, K5D,        K5F, K5G, K5H \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \
-    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, K59, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E,        K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,             K4G, \
-    K50, K51, K52,                K55,                     K58, K5B, K5D,        K5F, K5G, K5H \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \
-    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, XXX, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan_split_bs( \
-    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E,        K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,             K4G, \
-    K50, K51, K52,                K55,                     K58, K5B, K5D,        K5F, K5G, K5H \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \
-    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, XXX, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \
-}
-
-#define LAYOUT_all LAYOUT_tkl_f13_ansi_split_bs
diff --git a/keyboards/handwired/swiftrax/cowfish/info.json b/keyboards/handwired/swiftrax/cowfish/info.json
index 4de9d07292..5049e12358 100644
--- a/keyboards/handwired/swiftrax/cowfish/info.json
+++ b/keyboards/handwired/swiftrax/cowfish/info.json
@@ -8,431 +8,439 @@
         "pid": "0xEB53",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B1", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B6", "B4", "C6", "D7", "C7", "D2", "D3", "D5"],
+        "rows": ["D0", "D1", "B7", "E6", "D4", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_split_bs"
+    },
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"x":0, "y":0},
-
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-
-                {"x":14, "y":0},
-
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-
-                {"x":14, "y":0},
-
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-
-                {"x":14, "y":0},
-
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 8], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-
-                {"x":14, "y":0},
-
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 8], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/handwired/swiftrax/digicarp65/config.h b/keyboards/handwired/swiftrax/digicarp65/config.h
deleted file mode 100644
index 80b735d0d8..0000000000
--- a/keyboards/handwired/swiftrax/digicarp65/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2022 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B2, B1, F4, F1, F0 }
-#define MATRIX_COL_PINS { F5, C6, F6, F7, C7, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.c b/keyboards/handwired/swiftrax/digicarp65/digicarp65.c
deleted file mode 100644
index 99823a756c..0000000000
--- a/keyboards/handwired/swiftrax/digicarp65/digicarp65.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2022 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "digicarp65.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.h b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
deleted file mode 100644
index ba4a76ea10..0000000000
--- a/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright 2022 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
-    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
-}
-
-#define LAYOUT_65_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
-    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
-}
-
-#define LAYOUT_65_ansi_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
-    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
-}
-
-#define LAYOUT_65_iso_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
-    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
-}
diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/info.json
index 2eef105756..7d8ea44f3b 100644
--- a/keyboards/handwired/swiftrax/digicarp65/info.json
+++ b/keyboards/handwired/swiftrax/digicarp65/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE7F1",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B2", "B1", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B7"}
@@ -19,310 +24,310 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w":2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w":2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/swiftrax/digicarpice/config.h b/keyboards/handwired/swiftrax/digicarpice/config.h
deleted file mode 100644
index 18f75ffe69..0000000000
--- a/keyboards/handwired/swiftrax/digicarpice/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2022 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { F0, D5, D7, D6, D4 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, D3, D2, D1, D0, B7, B3, B2, B1, B0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/swiftrax/digicarpice/digicarpice.c b/keyboards/handwired/swiftrax/digicarpice/digicarpice.c
deleted file mode 100644
index c40a20a1f0..0000000000
--- a/keyboards/handwired/swiftrax/digicarpice/digicarpice.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "digicarpice.h"
diff --git a/keyboards/handwired/swiftrax/digicarpice/digicarpice.h b/keyboards/handwired/swiftrax/digicarpice/digicarpice.h
deleted file mode 100644
index c8baf3e2f8..0000000000
--- a/keyboards/handwired/swiftrax/digicarpice/digicarpice.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2022 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define K_NO KC_NO
-
-#define LAYOUT_unified_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013,  K014,  \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,         K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,          K214,\
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,         K313,       \
-    K400, K401,             K402, K404,       K407, K409,                   K411,   K412, K413, K414  \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K_NO, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K_NO }, \
-    { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413, K414 }  \
-}
-
-#define LAYOUT_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212,  K014,  \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,         K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,          K214,\
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,         K313,       \
-    K400, K401,             K402, K404,       K407, K409,                   K411,   K412, K413, K414  \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K_NO }, \
-    { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413, K414 }  \
-}
diff --git a/keyboards/handwired/swiftrax/digicarpice/info.json b/keyboards/handwired/swiftrax/digicarpice/info.json
index f311c9606d..538a39c14b 100644
--- a/keyboards/handwired/swiftrax/digicarpice/info.json
+++ b/keyboards/handwired/swiftrax/digicarpice/info.json
@@ -8,160 +8,185 @@
         "pid": "0xE79A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"],
+        "rows": ["F0", "D5", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_unified_bs": {
             "layout": [
-                {"label":"0,0", "x":0.42, "y":0},
-                {"label":"0,1", "x":1.42, "y":0},
-                {"label":"0,2", "x":2.55, "y":0},
-                {"label":"0,3", "x":3.55, "y":0},
-                {"label":"0,4", "x":4.55, "y":0},
-                {"label":"0,5", "x":5.55, "y":0},
-                {"label":"0,6", "x":6.55, "y":0},
-                {"label":"0,7", "x":9.55, "y":0},
-                {"label":"0,8", "x":10.55, "y":0},
-                {"label":"0,9", "x":11.55, "y":0},
-                {"label":"0,10", "x":12.55, "y":0},
-                {"label":"0,11", "x":13.68, "y":0},
-                {"label":"0,12", "x":14.68, "y":0},
-                {"label":"0,13", "x":15.68, "y":0, "w":2},
-                {"label":"0,14", "x":17.93, "y":0},
-
-                {"label":"1,0", "w":1.5, "x":0.29, "y":1},
-                {"label":"1,1", "x":1.79, "y":1},
-                {"label":"1,2", "x":3.05, "y":1},
-                {"label":"1,3", "x":4.05, "y":1},
-                {"label":"1,4", "x":5.05, "y":1},
-                {"label":"1,5", "x":6.05, "y":1},
-                {"label":"1,6", "x":9.05, "y":1},
-                {"label":"1,7", "x":10.05, "y":1},
-                {"label":"1,8", "x":11.05, "y":1},
-                {"label":"1,9", "x":12.05, "y":1},
-                {"label":"1,10", "x":13.3, "y":1},
-                {"label":"1,11", "x":14.3, "y":1},
-                {"label":"1,12", "x":15.3, "y":1},
-                {"label":"1,13", "w":1.5, "x":16.3, "y":1},
-                {"label":"1,14", "x":18.05, "y":1},
-
-                {"label":"2,0", "w":1.75, "x":0.15, "y":2},
-                {"label":"2,1", "x":1.9, "y":2},
-                {"label":"2,2", "x":3.3, "y":2},
-                {"label":"2,3", "x":4.3, "y":2},
-                {"label":"2,4", "x":5.3, "y":2},
-                {"label":"2,5", "x":6.3, "y":2},
-                {"label":"2,6", "x":9.3, "y":2},
-                {"label":"2,7", "x":10.3, "y":2},
-                {"label":"2,8", "x":11.3, "y":2},
-                {"label":"2,9", "x":12.3, "y":2},
-                {"label":"2,10", "x":13.71, "y":2},
-                {"label":"2,11", "x":14.71, "y":2},
-                {"label":"2,13", "w":2.25, "x":15.71, "y":2},
-                {"label":"2,14", "x":18.21, "y":2},
-
-                {"label":"3,0", "w":2.25, "x":0, "y":3},
-                {"label":"3,1", "x":2.25, "y":3},
-                {"label":"3,2", "x":3.8, "y":3},
-                {"label":"3,3", "x":4.8, "y":3},
-                {"label":"3,4", "x":5.8, "y":3},
-                {"label":"3,5", "x":6.8, "y":3},
-                {"label":"3,6", "x":8.8, "y":3},
-                {"label":"3,7", "x":9.8, "y":3},
-                {"label":"3,8", "x":10.8, "y":3},
-                {"label":"3,9", "x":11.8, "y":3},
-                {"label":"3,10", "x":13.37, "y":3},
-                {"label":"3,11", "x":14.37, "y":3},
-                {"label":"3,12", "w":1.75, "x":15.37, "y":3},
-                {"label":"3,13", "x":17.37, "y":3.25},
-
-                {"label":"4,0", "w":1.25, "x":0.15, "y":4},
-                {"label":"4,1", "w":1.25, "x":1.4, "y":4},
-                {"label":"4,2", "w":1.25, "x":4.3, "y":4},
-                {"label":"4,4", "w":2.25, "x":5.55, "y":4},
-                {"label":"4,7", "w":2.75, "x":8.8, "y":4},
-                {"label":"4,9", "w":1.25, "x":11.55, "y":4},
-                {"label":"4,11", "w":1.25, "x":14.87, "y":4},
-                {"label":"4,12", "x":16.37, "y":4.25},
-                {"label":"4,13", "x":17.37, "y":4.25},
-                {"label":"4,14", "x":18.37, "y":4.25}
+                {"matrix": [0, 0], "x": 0.42, "y": 0},
+                {"matrix": [0, 1], "x": 1.42, "y": 0},
+                {"matrix": [0, 2], "x": 2.55, "y": 0},
+                {"matrix": [0, 3], "x": 3.55, "y": 0},
+                {"matrix": [0, 4], "x": 4.55, "y": 0},
+                {"matrix": [0, 5], "x": 5.55, "y": 0},
+                {"matrix": [0, 6], "x": 6.55, "y": 0},
+
+                {"matrix": [0, 7], "x": 9.55, "y": 0},
+                {"matrix": [0, 8], "x": 10.55, "y": 0},
+                {"matrix": [0, 9], "x": 11.55, "y": 0},
+                {"matrix": [0, 10], "x": 12.55, "y": 0},
+                {"matrix": [0, 11], "x": 13.68, "y": 0},
+                {"matrix": [0, 12], "x": 14.68, "y": 0},
+                {"matrix": [0, 13], "x": 15.68, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 17.93, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.29, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.79, "y": 1},
+                {"matrix": [1, 2], "x": 3.05, "y": 1},
+                {"matrix": [1, 3], "x": 4.05, "y": 1},
+                {"matrix": [1, 4], "x": 5.05, "y": 1},
+                {"matrix": [1, 5], "x": 6.05, "y": 1},
+
+                {"matrix": [1, 6], "x": 9.05, "y": 1},
+                {"matrix": [1, 7], "x": 10.05, "y": 1},
+                {"matrix": [1, 8], "x": 11.05, "y": 1},
+                {"matrix": [1, 9], "x": 12.05, "y": 1},
+                {"matrix": [1, 10], "x": 13.3, "y": 1},
+                {"matrix": [1, 11], "x": 14.3, "y": 1},
+                {"matrix": [1, 12], "x": 15.3, "y": 1},
+                {"matrix": [1, 13], "x": 16.3, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 18.05, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2},
+                {"matrix": [2, 2], "x": 3.3, "y": 2},
+                {"matrix": [2, 3], "x": 4.3, "y": 2},
+                {"matrix": [2, 4], "x": 5.3, "y": 2},
+                {"matrix": [2, 5], "x": 6.3, "y": 2},
+
+                {"matrix": [2, 6], "x": 9.3, "y": 2},
+                {"matrix": [2, 7], "x": 10.3, "y": 2},
+                {"matrix": [2, 8], "x": 11.3, "y": 2},
+                {"matrix": [2, 9], "x": 12.3, "y": 2},
+                {"matrix": [2, 10], "x": 13.71, "y": 2},
+                {"matrix": [2, 11], "x": 14.71, "y": 2},
+                {"matrix": [2, 13], "x": 15.71, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 18.21, "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.8, "y": 3},
+                {"matrix": [3, 3], "x": 4.8, "y": 3},
+                {"matrix": [3, 4], "x": 5.8, "y": 3},
+                {"matrix": [3, 5], "x": 6.8, "y": 3},
+
+                {"matrix": [3, 6], "x": 8.8, "y": 3},
+                {"matrix": [3, 7], "x": 9.8, "y": 3},
+                {"matrix": [3, 8], "x": 10.8, "y": 3},
+                {"matrix": [3, 9], "x": 11.8, "y": 3},
+                {"matrix": [3, 10], "x": 13.37, "y": 3},
+                {"matrix": [3, 11], "x": 14.37, "y": 3},
+                {"matrix": [3, 12], "x": 15.37, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 17.37, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.15, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.4, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.3, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.55, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 8.8, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.55, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.87, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 16.37, "y": 4.25},
+                {"matrix": [4, 13], "x": 17.37, "y": 4.25},
+                {"matrix": [4, 14], "x": 18.37, "y": 4.25}
             ]
         },
         "LAYOUT_split_bs": {
             "layout": [
-                {"label":"0,0", "x":0.42, "y":0},
-                {"label":"0,1", "x":1.42, "y":0},
-                {"label":"0,2", "x":2.55, "y":0},
-                {"label":"0,3", "x":3.55, "y":0},
-                {"label":"0,4", "x":4.55, "y":0},
-                {"label":"0,5", "x":5.55, "y":0},
-                {"label":"0,6", "x":6.55, "y":0},
-                {"label":"0,7", "x":9.55, "y":0},
-                {"label":"0,8", "x":10.55, "y":0},
-                {"label":"0,9", "x":11.55, "y":0},
-                {"label":"0,10", "x":12.55, "y":0},
-                {"label":"0,11", "x":13.68, "y":0},
-                {"label":"0,12", "x":14.68, "y":0},
-                {"label":"0,13", "x":15.68, "y":0},
-                {"label":"2,12", "x":16.68, "y":0},
-                {"label":"0,14", "x":17.93, "y":0},
-
-                {"label":"1,0", "w":1.5, "x":0.29, "y":1},
-                {"label":"1,1", "x":1.79, "y":1},
-                {"label":"1,2", "x":3.05, "y":1},
-                {"label":"1,3", "x":4.05, "y":1},
-                {"label":"1,4", "x":5.05, "y":1},
-                {"label":"1,5", "x":6.05, "y":1},
-                {"label":"1,6", "x":9.05, "y":1},
-                {"label":"1,7", "x":10.05, "y":1},
-                {"label":"1,8", "x":11.05, "y":1},
-                {"label":"1,9", "x":12.05, "y":1},
-                {"label":"1,10", "x":13.3, "y":1},
-                {"label":"1,11", "x":14.3, "y":1},
-                {"label":"1,12", "x":15.3, "y":1},
-                {"label":"1,13", "w":1.5, "x":16.3, "y":1},
-                {"label":"1,14", "x":18.05, "y":1},
-
-                {"label":"2,0", "w":1.75, "x":0.15, "y":2},
-                {"label":"2,1", "x":1.9, "y":2},
-                {"label":"2,2", "x":3.3, "y":2},
-                {"label":"2,3", "x":4.3, "y":2},
-                {"label":"2,4", "x":5.3, "y":2},
-                {"label":"2,5", "x":6.3, "y":2},
-                {"label":"2,6", "x":9.3, "y":2},
-                {"label":"2,7", "x":10.3, "y":2},
-                {"label":"2,8", "x":11.3, "y":2},
-                {"label":"2,9", "x":12.3, "y":2},
-                {"label":"2,10", "x":13.71, "y":2},
-                {"label":"2,11", "x":14.71, "y":2},
-                {"label":"2,13", "w":2.25, "x":15.71, "y":2},
-                {"label":"2,14", "x":18.21, "y":2},
-
-                {"label":"3,0", "w":2.25, "x":0, "y":3},
-                {"label":"3,1", "x":2.25, "y":3},
-                {"label":"3,2", "x":3.8, "y":3},
-                {"label":"3,3", "x":4.8, "y":3},
-                {"label":"3,4", "x":5.8, "y":3},
-                {"label":"3,5", "x":6.8, "y":3},
-                {"label":"3,6", "x":8.8, "y":3},
-                {"label":"3,7", "x":9.8, "y":3},
-                {"label":"3,8", "x":10.8, "y":3},
-                {"label":"3,9", "x":11.8, "y":3},
-                {"label":"3,10", "x":13.37, "y":3},
-                {"label":"3,11", "x":14.37, "y":3},
-                {"label":"3,12", "w":1.75, "x":15.37, "y":3},
-                {"label":"3,13", "x":17.37, "y":3.25},
-
-                {"label":"4,0", "w":1.25, "x":0.15, "y":4},
-                {"label":"4,1", "w":1.25, "x":1.4, "y":4},
-                {"label":"4,2", "w":1.25, "x":4.3, "y":4},
-                {"label":"4,4", "w":2.25, "x":5.55, "y":4},
-                {"label":"4,7", "w":2.75, "x":8.8, "y":4},
-                {"label":"4,9", "w":1.25, "x":11.55, "y":4},
-                {"label":"4,11", "w":1.25, "x":14.87, "y":4},
-                {"label":"4,12", "x":16.37, "y":4.25},
-                {"label":"4,13", "x":17.37, "y":4.25},
-                {"label":"4,14", "x":18.37, "y":4.25}
+                {"matrix": [0, 0], "x": 0.42, "y": 0},
+                {"matrix": [0, 1], "x": 1.42, "y": 0},
+                {"matrix": [0, 2], "x": 2.55, "y": 0},
+                {"matrix": [0, 3], "x": 3.55, "y": 0},
+                {"matrix": [0, 4], "x": 4.55, "y": 0},
+                {"matrix": [0, 5], "x": 5.55, "y": 0},
+                {"matrix": [0, 6], "x": 6.55, "y": 0},
+
+                {"matrix": [0, 7], "x": 9.55, "y": 0},
+                {"matrix": [0, 8], "x": 10.55, "y": 0},
+                {"matrix": [0, 9], "x": 11.55, "y": 0},
+                {"matrix": [0, 10], "x": 12.55, "y": 0},
+                {"matrix": [0, 11], "x": 13.68, "y": 0},
+                {"matrix": [0, 12], "x": 14.68, "y": 0},
+                {"matrix": [0, 13], "x": 15.68, "y": 0},
+                {"matrix": [2, 12], "x": 16.68, "y": 0},
+
+                {"matrix": [0, 14], "x": 17.93, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.29, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.79, "y": 1},
+                {"matrix": [1, 2], "x": 3.05, "y": 1},
+                {"matrix": [1, 3], "x": 4.05, "y": 1},
+                {"matrix": [1, 4], "x": 5.05, "y": 1},
+                {"matrix": [1, 5], "x": 6.05, "y": 1},
+
+                {"matrix": [1, 6], "x": 9.05, "y": 1},
+                {"matrix": [1, 7], "x": 10.05, "y": 1},
+                {"matrix": [1, 8], "x": 11.05, "y": 1},
+                {"matrix": [1, 9], "x": 12.05, "y": 1},
+                {"matrix": [1, 10], "x": 13.3, "y": 1},
+                {"matrix": [1, 11], "x": 14.3, "y": 1},
+                {"matrix": [1, 12], "x": 15.3, "y": 1},
+                {"matrix": [1, 13], "x": 16.3, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 18.05, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2},
+                {"matrix": [2, 2], "x": 3.3, "y": 2},
+                {"matrix": [2, 3], "x": 4.3, "y": 2},
+                {"matrix": [2, 4], "x": 5.3, "y": 2},
+                {"matrix": [2, 5], "x": 6.3, "y": 2},
+
+                {"matrix": [2, 6], "x": 9.3, "y": 2},
+                {"matrix": [2, 7], "x": 10.3, "y": 2},
+                {"matrix": [2, 8], "x": 11.3, "y": 2},
+                {"matrix": [2, 9], "x": 12.3, "y": 2},
+                {"matrix": [2, 10], "x": 13.71, "y": 2},
+                {"matrix": [2, 11], "x": 14.71, "y": 2},
+                {"matrix": [2, 13], "x": 15.71, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 18.21, "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.8, "y": 3},
+                {"matrix": [3, 3], "x": 4.8, "y": 3},
+                {"matrix": [3, 4], "x": 5.8, "y": 3},
+                {"matrix": [3, 5], "x": 6.8, "y": 3},
+
+                {"matrix": [3, 6], "x": 8.8, "y": 3},
+                {"matrix": [3, 7], "x": 9.8, "y": 3},
+                {"matrix": [3, 8], "x": 10.8, "y": 3},
+                {"matrix": [3, 9], "x": 11.8, "y": 3},
+                {"matrix": [3, 10], "x": 13.37, "y": 3},
+                {"matrix": [3, 11], "x": 14.37, "y": 3},
+                {"matrix": [3, 12], "x": 15.37, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 17.37, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.15, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.4, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.3, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.55, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 8.8, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.55, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.87, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 16.37, "y": 4.25},
+                {"matrix": [4, 13], "x": 17.37, "y": 4.25},
+                {"matrix": [4, 14], "x": 18.37, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/handwired/swiftrax/equator/config.h b/keyboards/handwired/swiftrax/equator/config.h
deleted file mode 100644
index d5df0d1942..0000000000
--- a/keyboards/handwired/swiftrax/equator/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B2, B3, C7, B4, B5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/swiftrax/equator/equator.c b/keyboards/handwired/swiftrax/equator/equator.c
deleted file mode 100644
index b2981689b9..0000000000
--- a/keyboards/handwired/swiftrax/equator/equator.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "equator.h"
diff --git a/keyboards/handwired/swiftrax/equator/equator.h b/keyboards/handwired/swiftrax/equator/equator.h
deleted file mode 100644
index 3f0350ef2b..0000000000
--- a/keyboards/handwired/swiftrax/equator/equator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define K_NO KC_NO
-
-#define LAYOUT_unified_bs_rshift( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K312, \
-    K400, K401,             K402, K404,       K407, K409,                   K411, K412, K413  \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K_NO, K213 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K_NO},  \
-    { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 }  \
-}
-
-#define LAYOUT_split_bs_rshift( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K312, K313, \
-    K400, K401,             K402, K404,       K407, K409,                   K411, K412, K413  \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
-    { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 }  \
-}
diff --git a/keyboards/handwired/swiftrax/equator/info.json b/keyboards/handwired/swiftrax/equator/info.json
index 0e58b5569c..3e53acb40c 100644
--- a/keyboards/handwired/swiftrax/equator/info.json
+++ b/keyboards/handwired/swiftrax/equator/info.json
@@ -8,14 +8,167 @@
         "pid": "0xE984",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B2", "B3", "C7", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_unified_bs_rshift": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0, "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": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "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.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "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": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25}
+            ]
         },
         "LAYOUT_split_bs_rshift": {
-            "layout":[{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Del", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.75}, {"label":"Fn", "x":15.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [2, 12], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "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.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/swiftrax/glacier/config.h b/keyboards/handwired/swiftrax/glacier/config.h
index b83d4cc943..4bff062d6c 100644
--- a/keyboards/handwired/swiftrax/glacier/config.h
+++ b/keyboards/handwired/swiftrax/glacier/config.h
@@ -17,20 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5, B6, E5, E4, D4, D5, D7, D6 }
-#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, D0, D1, D2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
 /* RGB */
-#define RGB_DI_PIN B0
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/handwired/swiftrax/glacier/glacier.c b/keyboards/handwired/swiftrax/glacier/glacier.c
deleted file mode 100644
index a30c69ba87..0000000000
--- a/keyboards/handwired/swiftrax/glacier/glacier.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "glacier.h"
-
diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/info.json
index dc3bae097c..9609101901 100644
--- a/keyboards/handwired/swiftrax/glacier/info.json
+++ b/keyboards/handwired/swiftrax/glacier/info.json
@@ -8,6 +8,14 @@
         "pid": "0xE890",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "D0", "D1", "D2"],
+        "rows": ["B1", "B2", "B3", "B4", "B5", "B6", "E5", "E4", "D4", "D5", "D7", "D6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/swiftrax/joypad/config.h b/keyboards/handwired/swiftrax/joypad/config.h
index 2f54bc0c4e..092f2ba0e9 100644
--- a/keyboards/handwired/swiftrax/joypad/config.h
+++ b/keyboards/handwired/swiftrax/joypad/config.h
@@ -17,14 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { C6, B3, B0, B1, D6, D5 }
-#define MATRIX_COL_PINS { C7, B4, D0, C2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/handwired/swiftrax/joypad/info.json b/keyboards/handwired/swiftrax/joypad/info.json
index bef5225bcd..9506e088f9 100644
--- a/keyboards/handwired/swiftrax/joypad/info.json
+++ b/keyboards/handwired/swiftrax/joypad/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEA68",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "B4", "D0", "C2"],
+        "rows": ["C6", "B3", "B0", "B1", "D6", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C5", "pin_b": "C4"}
@@ -17,7 +22,37 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_6x4": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/swiftrax/joypad/joypad.c b/keyboards/handwired/swiftrax/joypad/joypad.c
deleted file mode 100644
index 60ef822462..0000000000
--- a/keyboards/handwired/swiftrax/joypad/joypad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "joypad.h"
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/joypad/joypad.h b/keyboards/handwired/swiftrax/joypad/joypad.h
deleted file mode 100644
index f2ba34525e..0000000000
--- a/keyboards/handwired/swiftrax/joypad/joypad.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define LAYOUT_ortho_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43, \
-    K50, K51, K52, K53 \
-) { \
-	{K00, K01, K02, K03}, \
-    {K10, K11, K12, K13}, \
-    {K20, K21, K22, K23}, \
-    {K30, K31, K32, K33}, \
-    {K40, K41, K42, K43}, \
-    {K50, K51, K52, K53}  \
-}
diff --git a/keyboards/handwired/swiftrax/koalafications/config.h b/keyboards/handwired/swiftrax/koalafications/config.h
index 442b53a9ba..7435ce54af 100644
--- a/keyboards/handwired/swiftrax/koalafications/config.h
+++ b/keyboards/handwired/swiftrax/koalafications/config.h
@@ -17,14 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B1, B2, E6, F1, F4, F5 }
-#define MATRIX_COL_PINS { F0, D5, D3, D2, B3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/koalafications/info.json b/keyboards/handwired/swiftrax/koalafications/info.json
index dccea0b2b8..0129cc95a4 100644
--- a/keyboards/handwired/swiftrax/koalafications/info.json
+++ b/keyboards/handwired/swiftrax/koalafications/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEA44",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "D5", "D3", "D2", "B3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B1", "B2", "E6", "F1", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/swiftrax/koalafications/koalafications.c b/keyboards/handwired/swiftrax/koalafications/koalafications.c
deleted file mode 100644
index 51a1fdf866..0000000000
--- a/keyboards/handwired/swiftrax/koalafications/koalafications.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "koalafications.h"
diff --git a/keyboards/handwired/swiftrax/nodu/config.h b/keyboards/handwired/swiftrax/nodu/config.h
index e65ed138ad..6726795c45 100644
--- a/keyboards/handwired/swiftrax/nodu/config.h
+++ b/keyboards/handwired/swiftrax/nodu/config.h
@@ -17,14 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B0, B3, F5, F4, F1 }
-#define MATRIX_COL_PINS { F0, B7, C7, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/nodu/info.json b/keyboards/handwired/swiftrax/nodu/info.json
index c73c80f4d5..f0110b33fb 100644
--- a/keyboards/handwired/swiftrax/nodu/info.json
+++ b/keyboards/handwired/swiftrax/nodu/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEA6E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B0", "B3", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/handwired/swiftrax/nodu/nodu.c b/keyboards/handwired/swiftrax/nodu/nodu.c
deleted file mode 100644
index d56df1ead9..0000000000
--- a/keyboards/handwired/swiftrax/nodu/nodu.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "nodu.h"
diff --git a/keyboards/handwired/swiftrax/pandamic/config.h b/keyboards/handwired/swiftrax/pandamic/config.h
index 77daa76c24..092f2ba0e9 100644
--- a/keyboards/handwired/swiftrax/pandamic/config.h
+++ b/keyboards/handwired/swiftrax/pandamic/config.h
@@ -17,14 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D1, D2, B5, B7, D3, D5, D6, D4, D7, B4 }
-#define MATRIX_COL_PINS { B6, C6, C7, F7, F6, F5, F4, F1, F0, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/handwired/swiftrax/pandamic/info.json b/keyboards/handwired/swiftrax/pandamic/info.json
index 60fe2886f5..253e20b715 100644
--- a/keyboards/handwired/swiftrax/pandamic/info.json
+++ b/keyboards/handwired/swiftrax/pandamic/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEB0E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D0"],
+        "rows": ["D1", "D2", "B5", "B7", "D3", "D5", "D6", "D4", "D7", "B4"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "E6", "pin_b": "B0"}
diff --git a/keyboards/handwired/swiftrax/pandamic/pandamic.c b/keyboards/handwired/swiftrax/pandamic/pandamic.c
deleted file mode 100644
index c718a33734..0000000000
--- a/keyboards/handwired/swiftrax/pandamic/pandamic.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "pandamic.h"
diff --git a/keyboards/handwired/swiftrax/the_galleon/config.h b/keyboards/handwired/swiftrax/the_galleon/config.h
index 99d688f065..7f9b0b12d4 100644
--- a/keyboards/handwired/swiftrax/the_galleon/config.h
+++ b/keyboards/handwired/swiftrax/the_galleon/config.h
@@ -17,15 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B1, B0, D2, B7, D5, D3, D6, D4, B4, D7, B6, B5, C7, C6}
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B3, B2 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/handwired/swiftrax/the_galleon/info.json b/keyboards/handwired/swiftrax/the_galleon/info.json
index bd62d9de2d..751ec9eb00 100644
--- a/keyboards/handwired/swiftrax/the_galleon/info.json
+++ b/keyboards/handwired/swiftrax/the_galleon/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEA2D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2"],
+        "rows": ["B1", "B0", "D2", "B7", "D5", "D3", "D6", "D4", "B4", "D7", "B6", "B5", "C7", "C6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/swiftrax/the_galleon/the_galleon.c b/keyboards/handwired/swiftrax/the_galleon/the_galleon.c
deleted file mode 100644
index c7545cea83..0000000000
--- a/keyboards/handwired/swiftrax/the_galleon/the_galleon.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "the_galleon.h"
diff --git a/keyboards/handwired/swiftrax/unsplit/config.h b/keyboards/handwired/swiftrax/unsplit/config.h
deleted file mode 100644
index 702e06abe2..0000000000
--- a/keyboards/handwired/swiftrax/unsplit/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B6, D7, B5, B4  }
-#define MATRIX_COL_PINS { D1, D2, D3, D5, D4, D6, C6, C7, F6, F5, F4, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/swiftrax/unsplit/info.json b/keyboards/handwired/swiftrax/unsplit/info.json
index 619bd652fb..ea28d0d9c5 100644
--- a/keyboards/handwired/swiftrax/unsplit/info.json
+++ b/keyboards/handwired/swiftrax/unsplit/info.json
@@ -8,11 +8,68 @@
         "pid": "0xEAB1",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "C6", "C7", "F6", "F5", "F4", "F1"],
+        "rows": ["B6", "D7", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":3, "y":0.25}, {"x":13, "y":0.25}, {"x":2, "y":0.5}, {"x":4, "y":0.5}, {"x":12, "y":0.5}, {"x":14, "y":0.5}, {"x":5, "y":0.625}, {"x":11, "y":0.625}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":3, "y":1.25}, {"x":13, "y":1.25}, {"x":2, "y":1.5}, {"x":4, "y":1.5}, {"x":12, "y":1.5}, {"x":14, "y":1.5}, {"x":5, "y":1.625}, {"x":11, "y":1.625}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":3, "y":2.25}, {"x":13, "y":2.25}, {"x":2, "y":2.5}, {"x":4, "y":2.5}, {"x":12, "y":2.5}, {"x":14, "y":2.5}, {"x":5, "y":2.625}, {"x":11, "y":2.625}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":2.5, "y":3.5}, {"x":13.5, "y":3.5}, {"x":3.5, "y":3.5}, {"x":12.5, "y":3.5}, {"x":4.5, "y":3.75}, {"x":11.5, "y":3.75}, {"x":5.5, "y":4}, {"x":10.5, "y":4}]
+            "layout": [
+                {"x":0, "y":0.75},
+                {"x":1, "y":0.75},
+                {"x":2, "y":0.25},
+                {"x":3, "y":0},
+                {"x":4, "y":0.25},
+                {"x":5, "y":0.375},
+
+                {"x":11, "y":0.375},
+                {"x":12, "y":0.25},
+                {"x":13, "y":0},
+                {"x":14, "y":0.25},
+                {"x":15, "y":0.75},
+                {"x":16, "y":0.75},
+
+                {"x":0, "y":1.75},
+                {"x":1, "y":1.75},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.375},
+
+                {"x":11, "y":1.375},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1},
+                {"x":14, "y":1.25},
+                {"x":15, "y":1.75},
+                {"x":16, "y":1.75},
+
+                {"x":0, "y":2.75},
+                {"x":1, "y":2.75},
+                {"x":2, "y":2.25},
+                {"x":3, "y":2},
+                {"x":4, "y":2.25},
+                {"x":5, "y":2.375},
+
+                {"x":11, "y":2.375},
+                {"x":12, "y":2.25},
+                {"x":13, "y":2},
+                {"x":14, "y":2.25},
+                {"x":15, "y":2.75},
+                {"x":16, "y":2.75},
+
+                {"x":2.5, "y":3.25},
+                {"x":3.5, "y":3.25},
+                {"x":4.5, "y":3.5},
+                {"x":5.5, "y":3.75},
+
+                {"x":10.5, "y":3.75},
+                {"x":11.5, "y":3.5},
+                {"x":12.5, "y":3.25},
+                {"x":13.5, "y":3.25}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/swiftrax/unsplit/unsplit.c b/keyboards/handwired/swiftrax/unsplit/unsplit.c
deleted file mode 100644
index 41d548c098..0000000000
--- a/keyboards/handwired/swiftrax/unsplit/unsplit.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "unsplit.h"
diff --git a/keyboards/handwired/swiftrax/walter/config.h b/keyboards/handwired/swiftrax/walter/config.h
index 7bfee265ab..5fdda201e0 100644
--- a/keyboards/handwired/swiftrax/walter/config.h
+++ b/keyboards/handwired/swiftrax/walter/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B2, B1, F4, F1, F0 }
-#define MATRIX_COL_PINS { F5, C6, F6, F7, C7, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 24
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json
index 88da47f36b..a52a0470e7 100644
--- a/keyboards/handwired/swiftrax/walter/info.json
+++ b/keyboards/handwired/swiftrax/walter/info.json
@@ -8,6 +8,14 @@
         "pid": "0xE964",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B2", "B1", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B7"}
@@ -18,310 +26,310 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0, "w":2},
-                {"label": "r1_15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "r3_14", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
-                {"label": "r4_02", "x": 2.25, "y": 3},
-                {"label": "r4_03", "x": 3.25, "y": 3},
-                {"label": "r4_04", "x": 4.25, "y": 3},
-                {"label": "r4_05", "x": 5.25, "y": 3},
-                {"label": "r4_06", "x": 6.25, "y": 3},
-                {"label": "r4_07", "x": 7.25, "y": 3},
-                {"label": "r4_08", "x": 8.25, "y": 3},
-                {"label": "r4_09", "x": 9.25, "y": 3},
-                {"label": "r4_10", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4},
-                {"label": "r5_06", "x": 11, "y": 4},
-                {"label": "r5_07", "x": 12, "y": 4},
-                {"label": "r4_08", "x": 13, "y": 4},
-                {"label": "r4_09", "x": 14, "y": 4},
-                {"label": "r4_10", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0, "w":2},
-                {"label": "r1_15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2},
-                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"label": "r3_15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
-                {"label": "r4_02", "x": 1.25, "y": 3},
-                {"label": "r4_03", "x": 2.25, "y": 3},
-                {"label": "r4_04", "x": 3.25, "y": 3},
-                {"label": "r4_05", "x": 4.25, "y": 3},
-                {"label": "r4_06", "x": 5.25, "y": 3},
-                {"label": "r4_07", "x": 6.25, "y": 3},
-                {"label": "r4_08", "x": 7.25, "y": 3},
-                {"label": "r4_09", "x": 8.25, "y": 3},
-                {"label": "r4_10", "x": 9.25, "y": 3},
-                {"label": "r4_11", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4},
-                {"label": "r5_06", "x": 11, "y": 4},
-                {"label": "r5_07", "x": 12, "y": 4},
-                {"label": "r4_08", "x": 13, "y": 4},
-                {"label": "r4_09", "x": 14, "y": 4},
-                {"label": "r4_10", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_splitbs": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0},
-                {"label": "r1_15", "x": 14, "y": 0},
-                {"label": "r1_16", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "r3_14", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
-                {"label": "r4_02", "x": 2.25, "y": 3},
-                {"label": "r4_03", "x": 3.25, "y": 3},
-                {"label": "r4_04", "x": 4.25, "y": 3},
-                {"label": "r4_05", "x": 5.25, "y": 3},
-                {"label": "r4_06", "x": 6.25, "y": 3},
-                {"label": "r4_07", "x": 7.25, "y": 3},
-                {"label": "r4_08", "x": 8.25, "y": 3},
-                {"label": "r4_09", "x": 9.25, "y": 3},
-                {"label": "r4_10", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4},
-                {"label": "r5_06", "x": 11, "y": 4},
-                {"label": "r5_07", "x": 12, "y": 4},
-                {"label": "r4_08", "x": 13, "y": 4},
-                {"label": "r4_09", "x": 14, "y": 4},
-                {"label": "r4_10", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_splitbs": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0},
-                {"label": "r1_15", "x": 14, "y": 0},
-                {"label": "r1_16", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2},
-                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"label": "r3_15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
-                {"label": "r4_02", "x": 1.25, "y": 3},
-                {"label": "r4_03", "x": 2.25, "y": 3},
-                {"label": "r4_04", "x": 3.25, "y": 3},
-                {"label": "r4_05", "x": 4.25, "y": 3},
-                {"label": "r4_06", "x": 5.25, "y": 3},
-                {"label": "r4_07", "x": 6.25, "y": 3},
-                {"label": "r4_08", "x": 7.25, "y": 3},
-                {"label": "r4_09", "x": 8.25, "y": 3},
-                {"label": "r4_10", "x": 9.25, "y": 3},
-                {"label": "r4_11", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4},
-                {"label": "r5_06", "x": 11, "y": 4},
-                {"label": "r5_07", "x": 12, "y": 4},
-                {"label": "r4_08", "x": 13, "y": 4},
-                {"label": "r4_09", "x": 14, "y": 4},
-                {"label": "r4_10", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/swiftrax/walter/walter.c b/keyboards/handwired/swiftrax/walter/walter.c
deleted file mode 100644
index 43d328fa11..0000000000
--- a/keyboards/handwired/swiftrax/walter/walter.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "walter.h"
diff --git a/keyboards/handwired/swiftrax/walter/walter.h b/keyboards/handwired/swiftrax/walter/walter.h
deleted file mode 100644
index a99e24e9a4..0000000000
--- a/keyboards/handwired/swiftrax/walter/walter.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E,   K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E,   K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   K2D,   KC_NO, K2F }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E,   K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C,   K4D,   K4E,   K4F } \
-}
-
-#define LAYOUT_65_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E, K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K2D, K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-    { K30, K31,   K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C,   K4D,   K4E, K4F } \
-}
-
-#define LAYOUT_65_ansi_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C,   K4D,   K4E, K4F } \
-}
-
-#define LAYOUT_65_iso_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K2D, K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-    { K30, K31,   K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C,   K4D,   K4E, K4F } \
-}
diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h
index 25b5d4e018..bc9adddbbd 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h
@@ -1,3 +1,5 @@
+#pragma once
+
 // list of OUTPUT(row) ports
 #define MATRIX_OUT_PORTS (Port_D, MCU_GPIO, D0), (Port_C, MCU_GPIO, C0), (Port_E, MCU_GPIO, E0), (Port_B, MCU_GPIO, B0)
 // list of OUTPUT(row) pins
diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h
index 6abc25b862..bb310f28f9 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #define MATRIX_EXTENSION_74HC157 B2
 // #define MATRIX_EXTENSION_74HC153 B2, B6
 
diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h
index aeea12950d..8b475ddcd6 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #if defined(__AVR__)
 /* -------------------- AVR (Pro Micro) ----------------------- */
 
diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h
index 7c1deda7d5..c92944a48f 100644
--- a/keyboards/handwired/symmetry60/config.h
+++ b/keyboards/handwired/symmetry60/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B6, B5, B4, D7, D6, D4, E6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -50,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/symmetry60/info.json b/keyboards/handwired/symmetry60/info.json
index 850ae03b35..54d58d8b7f 100644
--- a/keyboards/handwired/symmetry60/info.json
+++ b/keyboards/handwired/symmetry60/info.json
@@ -8,83 +8,95 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B1"
+  },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"],
+    "rows": ["D0", "D1", "D2", "D3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["ortho_5x14"],
   "layouts": {
       "LAYOUT_ortho_5x14": {
           "layout": [
-            {"label":"K00", "x":0, "y":0, "w":1.5},
-            {"label":"K01", "x":1.5, "y":0},
-            {"label":"K02", "x":2.5, "y":0},
-            {"label":"K03", "x":3.5, "y":0},
-            {"label":"K04", "x":4.5, "y":0},
-            {"label":"K05", "x":5.5, "y":0},
-            {"label":"K06", "x":6.5, "y":0},
-            {"label":"K07", "x":7.5, "y":0},
-            {"label":"K08", "x":8.5, "y":0},
-            {"label":"K09", "x":9.5, "y":0},
-            {"label":"K0A", "x":10.5, "y":0},
-            {"label":"K0B", "x":11.5, "y":0},
-            {"label":"K0C", "x":12.5, "y":0},
-            {"label":"K0D", "x":13.5, "y":0, "w":1.5},
-            {"label":"K10", "x":0, "y":1, "w":1.5},
-            {"label":"K11", "x":1.5, "y":1},
-            {"label":"K12", "x":2.5, "y":1},
-            {"label":"K13", "x":3.5, "y":1},
-            {"label":"K14", "x":4.5, "y":1},
-            {"label":"K15", "x":5.5, "y":1},
-            {"label":"K16", "x":6.5, "y":1},
-            {"label":"K17", "x":7.5, "y":1},
-            {"label":"K18", "x":8.5, "y":1},
-            {"label":"K19", "x":9.5, "y":1},
-            {"label":"K1A", "x":10.5, "y":1},
-            {"label":"K1B", "x":11.5, "y":1},
-            {"label":"K1C", "x":12.5, "y":1},
-            {"label":"K1D", "x":13.5, "y":1, "w":1.5},
-            {"label":"K20", "x":0, "y":2, "w":1.5},
-            {"label":"K21", "x":1.5, "y":2},
-            {"label":"K22", "x":2.5, "y":2},
-            {"label":"K23", "x":3.5, "y":2},
-            {"label":"K24", "x":4.5, "y":2},
-            {"label":"K25", "x":5.5, "y":2},
-            {"label":"K26", "x":6.5, "y":2},
-            {"label":"K27", "x":7.5, "y":2},
-            {"label":"K28", "x":8.5, "y":2},
-            {"label":"K29", "x":9.5, "y":2},
-            {"label":"K2A", "x":10.5, "y":2},
-            {"label":"K2B", "x":11.5, "y":2},
-            {"label":"K2C", "x":12.5, "y":2},
-            {"label":"K2D", "x":13.5, "y":2, "w":1.5},
-            {"label":"K30", "x":0, "y":3, "w":1.5},
-            {"label":"K31", "x":1.5, "y":3},
-            {"label":"K32", "x":2.5, "y":3},
-            {"label":"K33", "x":3.5, "y":3},
-            {"label":"K34", "x":4.5, "y":3},
-            {"label":"K35", "x":5.5, "y":3},
-            {"label":"K36", "x":6.5, "y":3},
-            {"label":"K37", "x":7.5, "y":3},
-            {"label":"K38", "x":8.5, "y":3},
-            {"label":"K39", "x":9.5, "y":3},
-            {"label":"K3A", "x":10.5, "y":3},
-            {"label":"K3B", "x":11.5, "y":3},
-            {"label":"K3C", "x":12.5, "y":3},
-            {"label":"K3D", "x":13.5, "y":3, "w":1.5},
-            {"label":"K40", "x":0, "y":4, "w":1.5},
-            {"label":"K41", "x":1.5, "y":4},
-            {"label":"K42", "x":2.5, "y":4},
-            {"label":"K43", "x":3.5, "y":4},
-            {"label":"K44", "x":4.5, "y":4},
-            {"label":"K45", "x":5.5, "y":4},
-            {"label":"K46", "x":6.5, "y":4},
-            {"label":"K47", "x":7.5, "y":4},
-            {"label":"K48", "x":8.5, "y":4},
-            {"label":"K49", "x":9.5, "y":4},
-            {"label":"K4A", "x":10.5, "y":4},
-            {"label":"K4B", "x":11.5, "y":4},
-            {"label":"K4C", "x":12.5, "y":4},
-            {"label":"K4D", "x":13.5, "y":4, "w":1.5}
-              ]
-      }
+            {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+            {"matrix": [0, 1], "x": 1.5, "y": 0},
+            {"matrix": [0, 2], "x": 2.5, "y": 0},
+            {"matrix": [0, 3], "x": 3.5, "y": 0},
+            {"matrix": [0, 4], "x": 4.5, "y": 0},
+            {"matrix": [0, 5], "x": 5.5, "y": 0},
+            {"matrix": [0, 6], "x": 6.5, "y": 0},
+            {"matrix": [0, 7], "x": 7.5, "y": 0},
+            {"matrix": [0, 8], "x": 8.5, "y": 0},
+            {"matrix": [0, 9], "x": 9.5, "y": 0},
+            {"matrix": [0, 10], "x": 10.5, "y": 0},
+            {"matrix": [0, 11], "x": 11.5, "y": 0},
+            {"matrix": [0, 12], "x": 12.5, "y": 0},
+            {"matrix": [0, 13], "x": 13.5, "y": 0, "w": 1.5},
+
+            {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+            {"matrix": [1, 1], "x": 1.5, "y": 1},
+            {"matrix": [1, 2], "x": 2.5, "y": 1},
+            {"matrix": [1, 3], "x": 3.5, "y": 1},
+            {"matrix": [1, 4], "x": 4.5, "y": 1},
+            {"matrix": [1, 5], "x": 5.5, "y": 1},
+            {"matrix": [1, 6], "x": 6.5, "y": 1},
+            {"matrix": [1, 7], "x": 7.5, "y": 1},
+            {"matrix": [1, 8], "x": 8.5, "y": 1},
+            {"matrix": [1, 9], "x": 9.5, "y": 1},
+            {"matrix": [1, 10], "x": 10.5, "y": 1},
+            {"matrix": [1, 11], "x": 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.5},
+            {"matrix": [2, 1], "x": 1.5, "y": 2},
+            {"matrix": [2, 2], "x": 2.5, "y": 2},
+            {"matrix": [2, 3], "x": 3.5, "y": 2},
+            {"matrix": [2, 4], "x": 4.5, "y": 2},
+            {"matrix": [2, 5], "x": 5.5, "y": 2},
+            {"matrix": [2, 6], "x": 6.5, "y": 2},
+            {"matrix": [2, 7], "x": 7.5, "y": 2},
+            {"matrix": [2, 8], "x": 8.5, "y": 2},
+            {"matrix": [2, 9], "x": 9.5, "y": 2},
+            {"matrix": [2, 10], "x": 10.5, "y": 2},
+            {"matrix": [2, 11], "x": 11.5, "y": 2},
+            {"matrix": [2, 12], "x": 12.5, "y": 2},
+            {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+
+            {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+            {"matrix": [3, 1], "x": 1.5, "y": 3},
+            {"matrix": [3, 2], "x": 2.5, "y": 3},
+            {"matrix": [3, 3], "x": 3.5, "y": 3},
+            {"matrix": [3, 4], "x": 4.5, "y": 3},
+            {"matrix": [3, 5], "x": 5.5, "y": 3},
+            {"matrix": [3, 6], "x": 6.5, "y": 3},
+            {"matrix": [3, 7], "x": 7.5, "y": 3},
+            {"matrix": [3, 8], "x": 8.5, "y": 3},
+            {"matrix": [3, 9], "x": 9.5, "y": 3},
+            {"matrix": [3, 10], "x": 10.5, "y": 3},
+            {"matrix": [3, 11], "x": 11.5, "y": 3},
+            {"matrix": [3, 12], "x": 12.5, "y": 3},
+            {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.5},
+
+            {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+            {"matrix": [4, 1], "x": 1.5, "y": 4},
+            {"matrix": [4, 2], "x": 2.5, "y": 4},
+            {"matrix": [4, 3], "x": 3.5, "y": 4},
+            {"matrix": [4, 4], "x": 4.5, "y": 4},
+            {"matrix": [4, 5], "x": 5.5, "y": 4},
+            {"matrix": [4, 6], "x": 6.5, "y": 4},
+            {"matrix": [4, 7], "x": 7.5, "y": 4},
+            {"matrix": [4, 8], "x": 8.5, "y": 4},
+            {"matrix": [4, 9], "x": 9.5, "y": 4},
+            {"matrix": [4, 10], "x": 10.5, "y": 4},
+            {"matrix": [4, 11], "x": 11.5, "y": 4},
+            {"matrix": [4, 12], "x": 12.5, "y": 4},
+            {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+          ]
+    }
   }
 }
diff --git a/keyboards/handwired/symmetry60/symmetry60.c b/keyboards/handwired/symmetry60/symmetry60.c
deleted file mode 100644
index 70828297c7..0000000000
--- a/keyboards/handwired/symmetry60/symmetry60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 marhalloweenvt
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "symmetry60.h"
diff --git a/keyboards/handwired/symmetry60/symmetry60.h b/keyboards/handwired/symmetry60/symmetry60.h
deleted file mode 100644
index 138e5bb234..0000000000
--- a/keyboards/handwired/symmetry60/symmetry60.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 marhalloweenvt
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x14( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D }, \
-}
-
diff --git a/keyboards/handwired/t111/config.h b/keyboards/handwired/t111/config.h
deleted file mode 100644
index c5f41e5e05..0000000000
--- a/keyboards/handwired/t111/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright 2020 DmNosachev
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { A15, B6, B5, B4, B3, B9, B8, B7 }
-/*                         0    1   2   3   4   5   6   7*/
-#define MATRIX_COL_PINS { B15, B11, B10, B1, B0, A10, A9, A7, A6, A5, A4, A8, B13, B14 }
-/*                         0    1    2    3   4   5    6   7   8   9   A   B   C    D*/
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/t111/info.json b/keyboards/handwired/t111/info.json
index 0b5c104618..f232a0ea33 100644
--- a/keyboards/handwired/t111/info.json
+++ b/keyboards/handwired/t111/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6FAA",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B15", "B11", "B10", "B1", "B0", "A10", "A9", "A7", "A6", "A5", "A4", "A8", "B13", "B14"],
+        "rows": ["A15", "B6", "B5", "B4", "B3", "B9", "B8", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
diff --git a/keyboards/handwired/t111/t111.c b/keyboards/handwired/t111/t111.c
deleted file mode 100644
index f61e34240e..0000000000
--- a/keyboards/handwired/t111/t111.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "t111.h"
diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h
index 71a51554f2..40fbd33f9d 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/config.h
@@ -17,26 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C6, D4, D0}
-#define MATRIX_COL_PINS { D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBW
-#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 1
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -53,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json
index f2a8bcc1f9..da74d9b80a 100644
--- a/keyboards/handwired/tennie/info.json
+++ b/keyboards/handwired/tennie/info.json
@@ -8,11 +8,32 @@
         "pid": "0x1313",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5"],
+        "rows": ["C6", "D4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0.5, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0.5, "y":2}, {"x":1.5, "y":2}, {"x":2.5, "y":2}]
+            "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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/tennie/tennie.c b/keyboards/handwired/tennie/tennie.c
index 508430ba06..0b257e0a06 100644
--- a/keyboards/handwired/tennie/tennie.c
+++ b/keyboards/handwired/tennie/tennie.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "tennie.h"
+#include "quantum.h"
 
 void matrix_post_init(void) {
 	rgblight_enable_noeeprom();
diff --git a/keyboards/handwired/tennie/tennie.h b/keyboards/handwired/tennie/tennie.h
deleted file mode 100644
index 8ab0d04c52..0000000000
--- a/keyboards/handwired/tennie/tennie.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2018 Jack Hildebrandt
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-         K00, K01, K02,    \
-      K10,  K11, K12, K13, \
-         K20, K21, K22     \
-) \
-{ \
-    { K00, K01, K02, KC_NO }, \
-    { K10, K11, K12, K13   }, \
-    { K20, K21, K22, KC_NO }, \
-}
diff --git a/keyboards/handwired/terminus_mini/config.h b/keyboards/handwired/terminus_mini/config.h
index 63e11e97af..50ee7eac61 100644
--- a/keyboards/handwired/terminus_mini/config.h
+++ b/keyboards/handwired/terminus_mini/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B5, B4, D7, D6 }
-#define MATRIX_COL_PINS { B0, D0, D5, B6, D4, C7, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 //define tapping-toggle count
 #define TAPPING_TOGGLE 1
 
diff --git a/keyboards/handwired/terminus_mini/info.json b/keyboards/handwired/terminus_mini/info.json
index c059e9af7e..bb8214b97d 100644
--- a/keyboards/handwired/terminus_mini/info.json
+++ b/keyboards/handwired/terminus_mini/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "D0", "D5", "B6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+    "rows": ["B5", "B4", "D7", "D6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/handwired/terminus_mini/terminus_mini.c b/keyboards/handwired/terminus_mini/terminus_mini.c
deleted file mode 100644
index 295fa4c5a7..0000000000
--- a/keyboards/handwired/terminus_mini/terminus_mini.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 James Morgan <ja.morgan1@outlook.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "terminus_mini.h"
diff --git a/keyboards/handwired/trackpoint/config.h b/keyboards/handwired/trackpoint/config.h
index e42a53eeb8..8d4e88d3cb 100644
--- a/keyboards/handwired/trackpoint/config.h
+++ b/keyboards/handwired/trackpoint/config.h
@@ -37,11 +37,5 @@
     #define PS2_USART_RX_VECT       USART1_RX_vect
 #endif
 
-#define MATRIX_COL_PINS { F1, F4, F5 }
-#define MATRIX_ROW_PINS { F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/info.json
index b0c0848ca6..92098b09c6 100644
--- a/keyboards/handwired/trackpoint/info.json
+++ b/keyboards/handwired/trackpoint/info.json
@@ -8,14 +8,19 @@
         "pid": "0x5678",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5"],
+        "rows": ["F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0,"y": 0},
-                {"x": 1,"y": 0},
-                {"x": 2,"y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0}
             ]
         }
     }
diff --git a/keyboards/handwired/trackpoint/trackpoint.c b/keyboards/handwired/trackpoint/trackpoint.c
deleted file mode 100644
index e1b144241c..0000000000
--- a/keyboards/handwired/trackpoint/trackpoint.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "trackpoint.h"
diff --git a/keyboards/handwired/trackpoint/trackpoint.h b/keyboards/handwired/trackpoint/trackpoint.h
deleted file mode 100644
index a26000d521..0000000000
--- a/keyboards/handwired/trackpoint/trackpoint.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  k00, k01, k02  \
-) \
-{ \
-  { k00, k01, k02} \
-}
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h
index 66b5880785..ee06096909 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #include "tractyl_manuform.h"
-#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
index f602a26b42..a1cbfedc0c 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
@@ -18,15 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5 }
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN       E7
 #define RGB_MATRIX_LED_COUNT 62
 #define RGB_MATRIX_SPLIT { 32, 30 }
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index ab4b08c8eb..4d0f97fb42 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -6,12 +6,23 @@
         "pid": "0x3537",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
+        "rows": ["A0", "A1", "A2", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D3",
         "bootmagic": {
             "matrix": [4, 5]
         }
     },
+    "ws2812": {
+        "pin": "E7"
+    },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
index 8c9bf430d8..aabe18457a 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
-
 
 POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h
index 10b8767056..bec356066a 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h
@@ -18,20 +18,6 @@
 
 #include "tractyl_manuform.h"
 
-#if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_f411)
-#    include "f411.h"
-#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_f303)
-#    include "f303.h"
-#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_teensy2pp)
-#    include "teensy2pp.h"
-#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_elite_c)
-#    include "elite_c.h"
-#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_arduinomicro)
-#    include "arduinomicro.h"
-#endif
-
-#include "quantum.h"
-
 #define ___ KC_NO
 
 // clang-format off
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h
deleted file mode 100644
index 525b0378b4..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "5x6_right.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h
index 902f292b10..f77cc8f309 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h
@@ -18,16 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-// left
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
-// right
-#define MATRIX_COL_PINS_RIGHT { D6, D7, B4, D3, C6, C7 }
-#define MATRIX_ROW_PINS_RIGHT { D4, B7, F7, B6, B5, F6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 //#undef USE_I2C
 #define MASTER_RIGHT
 
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json
index e58e87b2dd..eebc5d5546 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json
@@ -1,7 +1,18 @@
 {
     "keyboard_name": "Tractyl Manuform(5x6) Arduino Micro (r)/ Pro Micro (l)",
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D6", "D7", "B4", "D3", "C6", "C7"],
+                "rows": ["D4", "B7", "F7", "B6", "B5", "F6"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
index 8eff4ae0df..194874b5cf 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define DIODE_DIRECTION             COL2ROW
-
 #define ROTATIONAL_TRANSFORM_ANGLE  -25
 #define POINTING_DEVICE_INVERT_X
 
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
index c52610e9d3..428ecf02d7 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
@@ -18,16 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_COL_PINS \
-    { D4, D7, E6, B4, B5, B7 }
-#define MATRIX_ROW_PINS \
-    { F7, F6, F5, F4, F1, F0 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN      D3
 #define RGBLED_NUM      20
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT \
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h
deleted file mode 100644
index 525b0378b4..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "5x6_right.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
index dabab602dd..ae256b4e5d 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
@@ -1,5 +1,10 @@
 {
     "keyboard_name": "Tractyl Manuform (5x6) Elite-C",
+    "matrix_pins": {
+        "cols": ["D4", "D7", "E6", "B4", "B5", "B7"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D5", "pin_b": "C7"}
@@ -8,6 +13,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
index d10cb0bd8b..2d05b71c92 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -18,22 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_COL_PINS \
-    { B0, B1, B2, B3, B4, B5 }
-#define MATRIX_ROW_PINS \
-    { B10, B11, B12, A14, A13, A15 }
-// B2 used for BOOT1, has internal pull down?
-// A9 has internal pull-down
-// A11 and A12 are used for USB sense.  DO NOT USE.
-
-#define DIODE_DIRECTION     COL2ROW
-
 // #define USB_VBUS_PIN        B10
 #define SPLIT_HAND_PIN      C14  // high = left, low = right
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN          A6
 #define WS2812_PWM_DRIVER   PWMD3  // default: PWMD2
 #define WS2812_PWM_CHANNEL  1      // default: 2
 #define WS2812_PWM_PAL_MODE 2      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c b/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c
deleted file mode 100644
index d094801938..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "f303.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h
deleted file mode 100644
index 525b0378b4..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "5x6_right.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
index bed70941bf..0e0e020ddf 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
@@ -1,5 +1,14 @@
 {
     "keyboard_name": "Tractyl Manuform (5x6) Proton-C",
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B4", "B5"],
+        "rows": ["B10", "B11", "B12", "A14", "A13", "A15"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "A6",
+        "driver": "pwm"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A7", "pin_b": "A8"}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
index 7abe7f4ca2..3959814c8d 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
@@ -2,6 +2,5 @@
 CONSOLE_ENABLE     = yes
 
 EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 AUDIO_DRIVER  = dac_additive
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 227863aaa5..2ab49de9fa 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -18,19 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_COL_PINS \
-    { A15, B3, B4, B5, B6, B7 }
-#define MATRIX_ROW_PINS \
-    { B12, B13, B14, B15, A8, A10 }
-
-#define DIODE_DIRECTION     COL2ROW
-
 // #define USB_VBUS_PIN        B10 // doesn't seem to work for me on one of my controllers... */
 #define SPLIT_HAND_PIN      C14  // high = left, low = right
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN          A1
 #define WS2812_PWM_DRIVER   PWMD2  // default: PWMD2
 #define WS2812_PWM_CHANNEL  2      // default: 2
 #define WS2812_PWM_PAL_MODE 1      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
index 09f1b57008..b073cb3c60 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "f411.h"
+#include "5x6_right.h"
 
 void keyboard_pre_init_sub(void) { setPinInputHigh(A0); }
 
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h
deleted file mode 100644
index 525b0378b4..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "5x6_right.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
index 0791e50ebf..671e3746c6 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
@@ -1,5 +1,14 @@
 {
     "keyboard_name": "Tractyl Manuform (5x6) BlackPill",
+    "matrix_pins": {
+        "cols": ["A15", "B3", "B4", "B5", "B6", "B7"],
+        "rows": ["B12", "B13", "B14", "B15", "A8", "A10"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A13", "pin_b": "A14"}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
index 4b8fe43b84..cd07b8d49f 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
@@ -3,7 +3,6 @@ CONSOLE_ENABLE     = yes
 MOUSE_SHARED_EP    = yes
 
 EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 AUDIO_DRIVER  = pwm_hardware
 
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
index 51ff0d3123..c917e37b4c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
@@ -18,16 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_COL_PINS \
-    { C0, C1, C2, C3, C4, C5 }
-#define MATRIX_ROW_PINS \
-    { F7, F6, F5, F4, F3, F2 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN      E7
 #define RGBLED_NUM      20
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT \
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
index 7f60ae0edc..9b65179678 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
@@ -1,5 +1,10 @@
 {
     "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++",
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
+        "rows": ["F7", "F6", "F5", "F4", "F3", "F2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D5", "pin_b": "D4"}
@@ -8,6 +13,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "E7"
+    },
     "processor": "at90usb1286",
     "bootloader": "halfkay"
 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h
deleted file mode 100644
index 525b0378b4..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "5x6_right.h"
diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h
index bd0d306dc3..8ac92c300c 100644
--- a/keyboards/handwired/traveller/config.h
+++ b/keyboards/handwired/traveller/config.h
@@ -17,32 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D3, D2 }
-#define MATRIX_COL_PINS { B5, D6, B7, B6, F6, B1, B3, F7, B4, E6, D7, C6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 1
 #    define RGBLIGHT_HUE_STEP 10
 #    define RGBLIGHT_SAT_STEP 17
 #    define RGBLIGHT_VAL_STEP 17
 //#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json
index ee064ad0cc..b6598be8e8 100644
--- a/keyboards/handwired/traveller/info.json
+++ b/keyboards/handwired/traveller/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B2"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "D6", "B7", "B6", "F6", "B1", "B3", "F7", "B4", "E6", "D7", "C6", "D4"],
+        "rows": ["D0", "D1", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h
index 5782f0e058..838776b5eb 100644
--- a/keyboards/handwired/tritium_numpad/config.h
+++ b/keyboards/handwired/tritium_numpad/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F6, B1, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -33,8 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Underlight configuration
  */
-
-#define RGB_DI_PIN D2
 #define RGBLED_NUM 4     // Number of LEDs
 
 /*
diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json
index b2ca85264e..e6c9010bfd 100644
--- a/keyboards/handwired/tritium_numpad/info.json
+++ b/keyboards/handwired/tritium_numpad/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.3"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F6", "B1", "B2"],
+    "rows": ["D1", "D0", "D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "levels": 4
@@ -16,18 +21,106 @@
     "num_lock": "D5",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "D2"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["numpad_6x4", "ortho_6x4"],
   "layouts": {
     "LAYOUT_numpad_6x4": {
-      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k23", "x":3, "y":2, "h":2}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k50", "x":0, "y":5, "w":2}, {"label":"k52", "x":2, "y":5}, {"label":"k43", "x":3, "y":4, "h":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+        {"matrix": [5, 2], "x": 2, "y": 5},
+        {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
+      ]
     },
 	"LAYOUT_nontra_6x4": {
-      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k23", "x":3, "y":2, "h":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k43", "x":3, "y":4, "h":2}, {"label":"k50", "x":0, "y":5}, {"label":"k51", "x":1, "y":5}, {"label":"k52", "x":2, "y":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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [3, 0], "x": 3, "y": 2, "h": 2},
+
+        {"matrix": [3, 1], "x": 0, "y": 3},
+        {"matrix": [3, 2], "x": 1, "y": 3},
+        {"matrix": [2, 3], "x": 2, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [5, 0], "x": 3, "y": 4, "h": 2},
+
+        {"matrix": [5, 1], "x": 0, "y": 5},
+        {"matrix": [5, 2], "x": 1, "y": 5},
+        {"matrix": [4, 3], "x": 2, "y": 5}
+      ]
     },
     "LAYOUT_ortho_6x4": {
-      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k23", "x":3, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k33", "x":3, "y":3}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k43", "x":3, "y":4}, {"label":"k50", "x":0, "y":5}, {"label":"k51", "x":1, "y":5}, {"label":"k52", "x":2, "y":5}, {"label":"k53", "x":3, "y":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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+
+        {"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}
+      ]
     }
   }
 }
diff --git a/keyboards/handwired/tritium_numpad/tritium_numpad.c b/keyboards/handwired/tritium_numpad/tritium_numpad.c
deleted file mode 100644
index c9f86eda7e..0000000000
--- a/keyboards/handwired/tritium_numpad/tritium_numpad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tritium_numpad.h"
diff --git a/keyboards/handwired/tritium_numpad/tritium_numpad.h b/keyboards/handwired/tritium_numpad/tritium_numpad.h
deleted file mode 100644
index 8d2e783296..0000000000
--- a/keyboards/handwired/tritium_numpad/tritium_numpad.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-/*  matrix layout
-   * ,-------------------.
-   * | 00 | 01 | 02 | 03 |
-   * |----|----|----|----|
-   * | 10 | 11 | 12 | 13 |
-   * |----|----|----|----|
-   * | 20 | 21 | 22 |    |
-   * |----|----|----| 23 |
-   * | 30 | 31 | 32 |    |
-   * |----|----|----|----|
-   * | 40 | 41 | 42 |    |
-   * |----|----|----| 43 |
-   * |   50    | 52 |    |
-   * `-------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_numpad_6x4( \
-  k00, k01, k02, k03, \
-  k10, k11, k12, k13, \
-  k20, k21, k22,      \
-  k30, k31, k32, k23, \
-  k40, k41, k42,      \
-     k50,   k52, k43  \
-) \
-{ \
-  {k00, k01, k02, k03}, \
-  {k10, k11, k12, k13}, \
-  {k20, k21, k22, k23}, \
-  {k30, k31, k32, XXX}, \
-  {k40, k41, k42, k43}, \
-  {k50, XXX, k52, XXX} \
-}
-
-/*  matrix layout
-   * ,-------------------.
-   * | 00 | 01 | 02 | 03 |
-   * |----|----|----|----|
-   * | 10 | 11 | 12 | 13 |
-   * |----|----|----|----|
-   * | 20 | 21 | 22 |    |
-   * |----|----|----| 23 |
-   * | 30 | 31 | 32 |    |
-   * |----|----|----|----|
-   * | 40 | 41 | 42 |    |
-   * |----|----|----| 43 |
-   * | 50 | 51 | 52 |    |
-   * `-------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_nontra_6x4( \
-  k00, k01, k02, k03, \
-  k10, k11, k12, k13, \
-  k20, k21, k22,      \
-  k30, k31, k32, k23, \
-  k40, k41, k42,      \
-  k50, k51, k52, k43  \
-) \
-{ \
-  {k00, k01, k02, k03}, \
-  {k10, k11, k12, k13}, \
-  {k20, k21, k22, k23}, \
-  {k30, k31, k32, xxx}, \
-  {k40, k41, k42, k43}, \
-  {k50, k51, k52, xxx} \
-}
-
-#define LAYOUT_ortho_6x4( \
-  k00, k01, k02, k03, \
-  k10, k11, k12, k13, \
-  k20, k21, k22, k23, \
-  k30, k31, k32, k33, \
-  k40, k41, k42, k43, \
-  k50, k51, k52, k53  \
-) \
-{ \
-  {k00, k01, k02, k03}, \
-  {k10, k11, k12, k13}, \
-  {k20, k21, k22, k23}, \
-  {k30, k31, k32, k33}, \
-  {k40, k41, k42, k43}, \
-  {k50, k51, k52, k53} \
-}
-
-void keyboard_pre_init_user(void);
-void matrix_scan_user(void);
-
diff --git a/keyboards/handwired/tsubasa/config.h b/keyboards/handwired/tsubasa/config.h
index 6bfe335593..40f43d94c2 100644
--- a/keyboards/handwired/tsubasa/config.h
+++ b/keyboards/handwired/tsubasa/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #define MASTER_RIGHT
 
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 12
 #    define RGBLIGHT_SPLIT
 #    define RGBLED_SPLIT {6, 6}
@@ -30,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#endif
 
 #define SPLIT_WPM_ENABLE
 #define SPLIT_LAYER_STATE_ENABLE
diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/info.json
index 1e5ba1eb8e..c78a1532a7 100644
--- a/keyboards/handwired/tsubasa/info.json
+++ b/keyboards/handwired/tsubasa/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0000",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "matrix_pins": {
         "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
         "rows": ["C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/handwired/tsubasa/tsubasa.c b/keyboards/handwired/tsubasa/tsubasa.c
index 5ae19c185a..78d27b57a8 100644
--- a/keyboards/handwired/tsubasa/tsubasa.c
+++ b/keyboards/handwired/tsubasa/tsubasa.c
@@ -16,20 +16,6 @@
 
 #include "tsubasa.h"
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
-
 #ifdef OLED_ENABLE
 static void render_scrl(void) {
     static const char PROGMEM raw_scrl[] = {
diff --git a/keyboards/handwired/twadlee/tp69/config.h b/keyboards/handwired/twadlee/tp69/config.h
index 7c1079397a..390c13b55c 100644
--- a/keyboards/handwired/twadlee/tp69/config.h
+++ b/keyboards/handwired/twadlee/tp69/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- */
-/*                        19  17  16  15  14   2   8   6   7   9 */
-#define MATRIX_ROW_PINS { B2, B1, B0, C0, D1, D0, D3, D4, D2, C3 }
-/*                        20  21  18    0    1   3   4   5 */
-#define MATRIX_COL_PINS { D5, D6, A4, B16, B17, A1, A2, D7 }
-
-/* for trackpoint: C1 (22)  C2 (23) */
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/info.json
index a06580eadd..75c11c44c2 100644
--- a/keyboards/handwired/twadlee/tp69/info.json
+++ b/keyboards/handwired/twadlee/tp69/info.json
@@ -8,6 +8,11 @@
         "pid": "0xCACA",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D6", "A4", "B16", "B17", "A1", "A2", "D7"],
+        "rows": ["B2", "B1", "B0", "C0", "D1", "D0", "D3", "D4", "D2", "C3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "MKL26Z64",
     "bootloader": "halfkay",
     "layouts": {
diff --git a/keyboards/handwired/twadlee/tp69/tp69.c b/keyboards/handwired/twadlee/tp69/tp69.c
deleted file mode 100644
index f4454c3bda..0000000000
--- a/keyboards/handwired/twadlee/tp69/tp69.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Tracy Wadleigh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "tp69.h"
diff --git a/keyboards/handwired/twig/twig50/config.h b/keyboards/handwired/twig/twig50/config.h
index 59a6a26c44..25236b2a2f 100644
--- a/keyboards/handwired/twig/twig50/config.h
+++ b/keyboards/handwired/twig/twig50/config.h
@@ -3,12 +3,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B7, B6, B5, B4 }
-#define MATRIX_COL_PINS { A2, A1, A0, B8 , B13, B14, B15, B9, B10, B11, B3, B2, B1, B0}
-
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 150
 
 #define FORCE_NKRO
diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json
index aae4bfa531..a6a6c2e1a3 100644
--- a/keyboards/handwired/twig/twig50/info.json
+++ b/keyboards/handwired/twig/twig50/info.json
@@ -8,6 +8,11 @@
       "pid": "0x6060",
       "device_version": "0.2.1"
     },
+    "matrix_pins": {
+      "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9", "B10", "B11", "B3", "B2", "B1", "B0"],
+      "rows": ["B7", "B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/handwired/twig/twig50/twig50.c b/keyboards/handwired/twig/twig50/twig50.c
deleted file mode 100644
index 7c4c8572f8..0000000000
--- a/keyboards/handwired/twig/twig50/twig50.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Takeshi Noda (nodatk@gmail.com)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "twig50.h"
diff --git a/keyboards/handwired/unicomp_mini_m/config.h b/keyboards/handwired/unicomp_mini_m/config.h
index f48e5ae696..fc62f69c4b 100644
--- a/keyboards/handwired/unicomp_mini_m/config.h
+++ b/keyboards/handwired/unicomp_mini_m/config.h
@@ -17,22 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, E6, E7, B0, B1 }
-#define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, B7, D5, D4, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* The Mini M has no diodes */
 #define MATRIX_HAS_GHOST
diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/info.json
index 7216203ba8..9dd8d59b59 100644
--- a/keyboards/handwired/unicomp_mini_m/info.json
+++ b/keyboards/handwired/unicomp_mini_m/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "B7", "D5", "D4", "D3", "D2"],
+        "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "B5",
         "num_lock": "B6",
diff --git a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.c b/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.c
deleted file mode 100644
index e8249df251..0000000000
--- a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 stevendlander
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "unicomp_mini_m.h"
diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h
index c6674b53f7..de1208a7ec 100644
--- a/keyboards/handwired/unk/rev1/config.h
+++ b/keyboards/handwired/unk/rev1/config.h
@@ -20,24 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MASTER_LEFT // Comment this line for the right half firmware
 
-// wiring of each half
-#define MATRIX_ROW_PINS { F5, B1, F6, B3, F7 }
-#define MATRIX_COL_PINS { B2, B6, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS_RIGHT { C6, D7, B4, E6, D4 }
-#define MATRIX_COL_PINS_RIGHT { B1, B3, B2, B6, F7, B5, F6, F5 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json
index bb6031cfd0..da8c72203f 100644
--- a/keyboards/handwired/unk/rev1/info.json
+++ b/keyboards/handwired/unk/rev1/info.json
@@ -8,8 +8,22 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B6", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "B1", "F6", "B3", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["B1", "B3", "B2", "B6", "F7", "B5", "F6", "F5"],
+                "rows": ["C6", "D7", "B4", "E6", "D4"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/handwired/unk/rev1/rev1.c b/keyboards/handwired/unk/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/handwired/unk/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/handwired/unk/rev1/rev1.h b/keyboards/handwired/unk/rev1/rev1.h
index 3d20e3e9fc..7f3992eebc 100644
--- a/keyboards/handwired/unk/rev1/rev1.h
+++ b/keyboards/handwired/unk/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "unk.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/handwired/unk/unk.c b/keyboards/handwired/unk/unk.c
deleted file mode 100644
index 5764d560b6..0000000000
--- a/keyboards/handwired/unk/unk.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "unk.h"
diff --git a/keyboards/handwired/unk/unk.h b/keyboards/handwired/unk/unk.h
deleted file mode 100644
index baad77573c..0000000000
--- a/keyboards/handwired/unk/unk.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#include "rev1.h"
diff --git a/keyboards/handwired/uthol/config.h b/keyboards/handwired/uthol/config.h
deleted file mode 100644
index 5e6816b6b0..0000000000
--- a/keyboards/handwired/uthol/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/uthol/info.json b/keyboards/handwired/uthol/info.json
index 1b195973a3..7270e23172 100644
--- a/keyboards/handwired/uthol/info.json
+++ b/keyboards/handwired/uthol/info.json
@@ -12,243 +12,69 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "x": 5,
-                    "y": 1
-                },
-                {
-                    "x": 6,
-                    "y": 1
-                },
-                {
-                    "x": 7,
-                    "y": 1
-                },
-                {
-                    "x": 8,
-                    "y": 1
-                },
-                {
-                    "x": 9,
-                    "y": 1
-                },
-                {
-                    "x": 10,
-                    "y": 1
-                },
-                {
-                    "x": 11,
-                    "y": 1
-                },
-                {
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "x": 5,
-                    "y": 2
-                },
-                {
-                    "x": 6,
-                    "y": 2
-                },
-                {
-                    "x": 7,
-                    "y": 2
-                },
-                {
-                    "x": 8,
-                    "y": 2
-                },
-                {
-                    "x": 9,
-                    "y": 2
-                },
-                {
-                    "x": 10,
-                    "y": 2
-                },
-                {
-                    "x": 11,
-                    "y": 2
-                },
-                {
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "x": 3,
-                    "y": 3
-                },
-                {
-                    "x": 4,
-                    "y": 3
-                },
-                {
-                    "x": 5,
-                    "y": 3
-                },
-                {
-                    "x": 6,
-                    "y": 3
-                },
-                {
-                    "x": 7,
-                    "y": 3
-                },
-                {
-                    "x": 8,
-                    "y": 3
-                },
-                {
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "x": 10,
-                    "y": 3
-                },
-                {
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "x": 1,
-                    "y": 4
-                },
-                {
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "x": 3,
-                    "y": 4
-                },
-                {
-                    "x": 4,
-                    "y": 4
-                },
-                {
-                    "x": 5,
-                    "y": 4,
-                    "w": 2
-                },
-                {
-                    "x": 7,
-                    "y": 4
-                },
-                {
-                    "x": 8,
-                    "y": 4
-                },
-                {
-                    "x": 9,
-                    "y": 4
-                },
-                {
-                    "x": 10,
-                    "y": 4
-                },
-                {
-                    "x": 11,
-                    "y": 4
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/uthol/rev1/config.h b/keyboards/handwired/uthol/rev1/config.h
deleted file mode 100644
index b5e17a0fe3..0000000000
--- a/keyboards/handwired/uthol/rev1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* Uthol PCB default pin-out */
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
-#define MATRIX_COL_PINS { D3, B6, B2, B3, B1, F7, F6, F5, F4, B5, B4, D2 }
diff --git a/keyboards/handwired/uthol/rev1/info.json b/keyboards/handwired/uthol/rev1/info.json
index 1a0047080a..02802966b2 100644
--- a/keyboards/handwired/uthol/rev1/info.json
+++ b/keyboards/handwired/uthol/rev1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B5", "B4", "D2"],
+        "rows": ["D1", "D0", "D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h
index dd132283c3..bf9b590421 100644
--- a/keyboards/handwired/uthol/rev2/config.h
+++ b/keyboards/handwired/uthol/rev2/config.h
@@ -17,12 +17,6 @@
 
 #pragma once
 
-
-/* Uthol PCB default pin-out */
-#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, B5, B4, B6, B2, B3 }
-
 //RGB Stuff
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 39
 #define RGBLIGHT_DEFAULT_HUE 201
diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json
index 95112123d5..7c46269579 100644
--- a/keyboards/handwired/uthol/rev2/info.json
+++ b/keyboards/handwired/uthol/rev2/info.json
@@ -3,6 +3,14 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "B5", "B4", "B6", "B2", "B3"],
+        "rows": ["B1", "F7", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index 1e6b532e2a..dd7ef6a5a9 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-/* key matrix size */
-// A11 and A12 dont work. They are reserved for USB. B2 is reserved for BOOT1
-#define MATRIX_COL_PINS \
-    { B1, B10, B9, B8, B5, B4, B3, A15, B15, B14, B13, B12 }
-#define MATRIX_ROW_PINS \
-    { A4, A3, A2, A1, A0 }
-
 // OLED config
 #define OLED_DISPLAY_128X64
 #define OLED_DISPLAY_WIDTH 128
@@ -43,7 +35,6 @@
 #define PERMISSIVE_HOLD
 
 // RGB Stuff
-#define RGB_DI_PIN B0
 #define RGBLED_NUM 39
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json
index b5d099b27a..5ba12dc846 100644
--- a/keyboards/handwired/uthol/rev3/info.json
+++ b/keyboards/handwired/uthol/rev3/info.json
@@ -3,6 +3,14 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B10", "B9", "B8", "B5", "B4", "B3", "A15", "B15", "B14", "B13", "B12"],
+        "rows": ["A4", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
diff --git a/keyboards/handwired/uthol/rev3/rev3.c b/keyboards/handwired/uthol/rev3/rev3.c
deleted file mode 100644
index 6c06387ee8..0000000000
--- a/keyboards/handwired/uthol/rev3/rev3.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
diff --git a/keyboards/handwired/uthol/uthol.c b/keyboards/handwired/uthol/uthol.c
deleted file mode 100644
index 2b02e899d4..0000000000
--- a/keyboards/handwired/uthol/uthol.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "uthol.h"
diff --git a/keyboards/handwired/uthol/uthol.h b/keyboards/handwired/uthol/uthol.h
deleted file mode 100644
index 3e1cbdc72b..0000000000
--- a/keyboards/handwired/uthol/uthol.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/**************************************************
-** Include headers specific to keyboard revision **
-**************************************************/
-#if defined(KEYBOARD_uthol_rev1)
-#    include "rev1.h"
-#elif defined(KEYBOARD_uthol_rev2)
-#    include "rev2.h"
-#elif defined(KEYBOARD_uthol_rev2)
-#    include "rev3.h"
-#endif
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
-}
diff --git a/keyboards/handwired/videowriter/config.h b/keyboards/handwired/videowriter/config.h
index b519d82153..d1f1e1b0bf 100644
--- a/keyboards/handwired/videowriter/config.h
+++ b/keyboards/handwired/videowriter/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, C6, D1, D0, D4, D2, D3, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/videowriter/info.json b/keyboards/handwired/videowriter/info.json
index 329085fe85..bc04ac2b8a 100644
--- a/keyboards/handwired/videowriter/info.json
+++ b/keyboards/handwired/videowriter/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5657",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "C6", "D1", "D0", "D4", "D2", "D3", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [1, 7]
     },
diff --git a/keyboards/handwired/videowriter/videowriter.c b/keyboards/handwired/videowriter/videowriter.c
deleted file mode 100644
index 5f0f3d7122..0000000000
--- a/keyboards/handwired/videowriter/videowriter.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "videowriter.h"
diff --git a/keyboards/handwired/wabi/config.h b/keyboards/handwired/wabi/config.h
index 69da1bc47c..274c715a93 100644
--- a/keyboards/handwired/wabi/config.h
+++ b/keyboards/handwired/wabi/config.h
@@ -14,25 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on
-diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { D5, F5, F6, F7, B0 }
-#define MATRIX_COL_PINS { F4, F1, F0, E6, B3, B7, D0, D1, D2, D3, D4, D6, D7, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/wabi/info.json b/keyboards/handwired/wabi/info.json
index a93666554d..1baea8b6ac 100644
--- a/keyboards/handwired/wabi/info.json
+++ b/keyboards/handwired/wabi/info.json
@@ -8,10 +8,86 @@
         "pid": "0xB07D",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B5"],
+        "rows": ["D5", "F5", "F6", "F7", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1", "x":2.25, "y":0}, {"label":"2", "x":3.25, "y":0}, {"label":"3", "x":4.25, "y":0}, {"label":"4", "x":5.25, "y":0}, {"label":"5", "x":6.25, "y":0}, {"label":"6", "x":8.75, "y":0}, {"label":"7", "x":9.75, "y":0}, {"label":"8", "x":10.75, "y":0}, {"label":"9", "x":11.75, "y":0}, {"label":"0", "x":12.75, "y":0}, {"label":"-", "x":13.75, "y":0}, {"label":"=", "x":14.75, "y":0}, {"label":"Backspace", "x":15.75, "y":0, "w":2}, {"label":"Tab", "x":0.75, "y":1, "w":1.5}, {"label":"Q", "x":2.25, "y":1}, {"label":"W", "x":3.25, "y":1}, {"label":"E", "x":4.25, "y":1}, {"label":"R", "x":5.25, "y":1}, {"label":"T", "x":6.25, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"[", "x":13.75, "y":1}, {"label":"]", "x":14.75, "y":1}, {"label":"\\", "x":15.75, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.5, "y":2, "w":1.75}, {"label":"A", "x":2.25, "y":2}, {"label":"S", "x":3.25, "y":2}, {"label":"D", "x":4.25, "y":2}, {"label":"F", "x":5.25, "y":2}, {"label":"G", "x":6.25, "y":2}, {"label":"H", "x":8.75, "y":2}, {"label":"J", "x":9.75, "y":2}, {"label":"K", "x":10.75, "y":2}, {"label":"L", "x":11.75, "y":2}, {"label":";", "x":12.75, "y":2}, {"label":"'", "x":13.75, "y":2}, {"label":"Enter", "x":14.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":",", "x":10.75, "y":3}, {"label":".", "x":11.75, "y":3}, {"label":"/", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":2.75}, {"label":"Up", "x":16.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":4, "y":4, "w":1.25}, {"label":"Space", "x":5.25, "y":4}, {"label":"Page Down", "x":6.25, "y":4, "w":1.25}, {"label":"Enter", "x":8.5, "y":4, "w":1.25}, {"label":"Space", "x":9.75, "y":4}, {"label":"Backspace", "x":10.75, "y":4, "w":1.25}, {"label":"Left", "x":15.5, "y":4}, {"label":"Down", "x":16.5, "y":4}, {"label":"Right", "x":17.5, "y":4}]        }
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 8.75, "y": 0},
+                {"matrix": [0, 7], "x": 9.75, "y": 0},
+                {"matrix": [0, 8], "x": 10.75, "y": 0},
+                {"matrix": [0, 9], "x": 11.75, "y": 0},
+                {"matrix": [0, 10], "x": 12.75, "y": 0},
+                {"matrix": [0, 11], "x": 13.75, "y": 0},
+                {"matrix": [0, 12], "x": 14.75, "y": 0},
+                {"matrix": [0, 13], "x": 15.75, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2.25, "y": 1},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.25, "y": 1},
+                {"matrix": [1, 4], "x": 5.25, "y": 1},
+                {"matrix": [1, 5], "x": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 8.75, "y": 1},
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 2.25, "y": 2},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 8.75, "y": 2},
+                {"matrix": [2, 7], "x": 9.75, "y": 2},
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 12], "x": 14.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": 8.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 13], "x": 16.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 8.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 9.75, "y": 4},
+                {"matrix": [4, 8], "x": 10.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 15.5, "y": 4},
+                {"matrix": [4, 12], "x": 16.5, "y": 4},
+                {"matrix": [4, 13], "x": 17.5, "y": 4}
+            ]
+        }
     }
 }
diff --git a/keyboards/handwired/wabi/wabi.c b/keyboards/handwired/wabi/wabi.c
deleted file mode 100644
index a0d0ccbf7b..0000000000
--- a/keyboards/handwired/wabi/wabi.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-Copyright 2020 Ross Montsinger
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "wabi.h"
diff --git a/keyboards/handwired/wabi/wabi.h b/keyboards/handwired/wabi/wabi.h
deleted file mode 100644
index 87b679efad..0000000000
--- a/keyboards/handwired/wabi/wabi.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 Ross Montsinger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
-    K40, K41,      K43, K44, K45, K46, K47, K48,           K4B, K4C, K4D \
-    ) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D }, \
-  { K40, K41, K41, K43, K44, K45, K46, K47, K48, K48, K48, K4B, K4C, K4D } \
-}
diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/info.json
index aac770596f..c35abf4556 100644
--- a/keyboards/handwired/wakizashi40/info.json
+++ b/keyboards/handwired/wakizashi40/info.json
@@ -35,44 +35,44 @@
     "LAYOUT_all": {
       "layout": [
         { "label": "TAB", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0 },
-        { "label": "Q", "matrix": [0, 2], "w": 1, "x": 1.5, "y": 0 },
-        { "label": "W", "matrix": [0, 3], "w": 1, "x": 2.5, "y": 0 },
-        { "label": "E", "matrix": [0, 4], "w": 1, "x": 3.5, "y": 0 },
-        { "label": "R", "matrix": [0, 5], "w": 1, "x": 4.5, "y": 0 },
-        { "label": "T", "matrix": [0, 6], "w": 1, "x": 5.5, "y": 0 },
-        { "label": "Y", "matrix": [0, 7], "w": 1, "x": 6.5, "y": 0 },
-        { "label": "U", "matrix": [0, 8], "w": 1, "x": 7.5, "y": 0 },
-        { "label": "I", "matrix": [0, 9], "w": 1, "x": 8.5, "y": 0 },
-        { "label": "O", "matrix": [0, 10], "w": 1, "x": 9.5, "y": 0 },
-        { "label": "P", "matrix": [0, 11], "w": 1, "x": 10.5, "y": 0 },
+        { "label": "Q", "matrix": [0, 2], "x": 1.5, "y": 0 },
+        { "label": "W", "matrix": [0, 3], "x": 2.5, "y": 0 },
+        { "label": "E", "matrix": [0, 4], "x": 3.5, "y": 0 },
+        { "label": "R", "matrix": [0, 5], "x": 4.5, "y": 0 },
+        { "label": "T", "matrix": [0, 6], "x": 5.5, "y": 0 },
+        { "label": "Y", "matrix": [0, 7], "x": 6.5, "y": 0 },
+        { "label": "U", "matrix": [0, 8], "x": 7.5, "y": 0 },
+        { "label": "I", "matrix": [0, 9], "x": 8.5, "y": 0 },
+        { "label": "O", "matrix": [0, 10], "x": 9.5, "y": 0 },
+        { "label": "P", "matrix": [0, 11], "x": 10.5, "y": 0 },
         { "label": "BACKSPACE", "matrix": [0, 12], "w": 1.5, "x": 11.5, "y": 0 },
 
         { "label": "CAPSLOCK", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
-        { "label": "A", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
-        { "label": "S", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
-        { "label": "D", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
-        { "label": "F", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
-        { "label": "G", "matrix": [1, 5], "w": 1, "x": 5.75, "y": 1 },
-        { "label": "H", "matrix": [1, 7], "w": 1, "x": 6.75, "y": 1 },
-        { "label": "J", "matrix": [1, 8], "w": 1, "x": 7.75, "y": 1 },
-        { "label": "K", "matrix": [1, 9], "w": 1, "x": 8.75, "y": 1 },
-        { "label": "L", "matrix": [1, 10], "w": 1, "x": 9.75, "y": 1 },
-        { "label": "SEMICOLON", "matrix": [1, 11], "w": 1, "x": 10.75, "y": 1 },
+        { "label": "A", "matrix": [1, 1], "x": 1.25, "y": 1 },
+        { "label": "S", "matrix": [1, 2], "x": 2.25, "y": 1 },
+        { "label": "D", "matrix": [1, 3], "x": 3.25, "y": 1 },
+        { "label": "F", "matrix": [1, 4], "x": 4.25, "y": 1 },
+        { "label": "G", "matrix": [1, 5], "x": 5.75, "y": 1 },
+        { "label": "H", "matrix": [1, 7], "x": 6.75, "y": 1 },
+        { "label": "J", "matrix": [1, 8], "x": 7.75, "y": 1 },
+        { "label": "K", "matrix": [1, 9], "x": 8.75, "y": 1 },
+        { "label": "L", "matrix": [1, 10], "x": 9.75, "y": 1 },
+        { "label": "SEMICOLON", "matrix": [1, 11], "x": 10.75, "y": 1 },
         { "label": "ENTER", "matrix": [1, 12], "w": 1.25, "x": 11.75, "y": 1 },
 
-        { "label": "LSHIFT", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
-        { "label": "Z", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
-        { "label": "X", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
-        { "label": "C", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 },
-        { "label": "V", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 },
-        { "label": "B", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 },
-        { "label": "ESCAPE", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 },
-        { "label": "N", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 },
-        { "label": "M", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 },
-        { "label": "COMMA", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 },
-        { "label": "PERIOD", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 },
-        { "label": "SLASH", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 },
-        { "label": "RSHIFT", "matrix": [2, 12], "w": 1, "x": 12, "y": 2 },
+        { "label": "LSHIFT", "matrix": [2, 0], "x": 0, "y": 2 },
+        { "label": "Z", "matrix": [2, 1], "x": 1, "y": 2 },
+        { "label": "X", "matrix": [2, 2], "x": 2, "y": 2 },
+        { "label": "C", "matrix": [2, 3], "x": 3, "y": 2 },
+        { "label": "V", "matrix": [2, 4], "x": 4, "y": 2 },
+        { "label": "B", "matrix": [2, 5], "x": 5, "y": 2 },
+        { "label": "ESCAPE", "matrix": [2, 6], "x": 6, "y": 2 },
+        { "label": "N", "matrix": [2, 7], "x": 7, "y": 2 },
+        { "label": "M", "matrix": [2, 8], "x": 8, "y": 2 },
+        { "label": "COMMA", "matrix": [2, 9], "x": 9, "y": 2 },
+        { "label": "PERIOD", "matrix": [2, 10], "x": 10, "y": 2 },
+        { "label": "SLASH", "matrix": [2, 11], "x": 11, "y": 2 },
+        { "label": "RSHIFT", "matrix": [2, 12], "x": 12, "y": 2 },
 
         { "label": "LCTRL", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
         { "label": "LWIN", "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3 },
diff --git a/keyboards/handwired/woodpad/config.h b/keyboards/handwired/woodpad/config.h
index 4609f67ea7..9113106abf 100644
--- a/keyboards/handwired/woodpad/config.h
+++ b/keyboards/handwired/woodpad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
-#define MATRIX_COL_PINS { B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/woodpad/info.json b/keyboards/handwired/woodpad/info.json
index c31bca5e09..f3394897fc 100644
--- a/keyboards/handwired/woodpad/info.json
+++ b/keyboards/handwired/woodpad/info.json
@@ -8,36 +8,41 @@
         "pid": "0x6069",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6"],
+        "rows": ["D1", "D0", "D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_5x4"],
     "layouts": {
         "LAYOUT_ortho_5x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/woodpad/woodpad.h b/keyboards/handwired/woodpad/woodpad.h
index 078e56cdfb..152c6c3b2b 100644
--- a/keyboards/handwired/woodpad/woodpad.h
+++ b/keyboards/handwired/woodpad/woodpad.h
@@ -20,25 +20,3 @@
 
 extern void numlock_led_on(void);
 extern void numlock_led_off(void);
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 } \
-}
diff --git a/keyboards/handwired/wulkan/config.h b/keyboards/handwired/wulkan/config.h
index 36d848fc8b..1c801d7e3c 100644
--- a/keyboards/handwired/wulkan/config.h
+++ b/keyboards/handwired/wulkan/config.h
@@ -1,9 +1,3 @@
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B8, A0, A1, A2 }
-#define MATRIX_COL_PINS { B13, B14, B15, B9, B7, B6, B5, B4, B3, B2, B1, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define FORCE_NKRO
diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/info.json
index 09907a556b..02c7ef1d5c 100644
--- a/keyboards/handwired/wulkan/info.json
+++ b/keyboards/handwired/wulkan/info.json
@@ -8,13 +8,73 @@
       "pid": "0x6060",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["B13", "B14", "B15", "B9", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"],
+      "rows": ["B8", "A0", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
     "community_layouts": ["ortho_4x12"],
+    "layout_aliases": {
+      "LAYOUT": "LAYOUT_ortho_4x12"
+    },
     "layouts": {
       "LAYOUT_ortho_4x12": {
-        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+          {"matrix": [1, 7], "x": 7, "y": 1},
+          {"matrix": [1, 8], "x": 8, "y": 1},
+          {"matrix": [1, 9], "x": 9, "y": 1},
+          {"matrix": [1, 10], "x": 10, "y": 1},
+          {"matrix": [1, 11], "x": 11, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+          {"matrix": [2, 7], "x": 7, "y": 2},
+          {"matrix": [2, 8], "x": 8, "y": 2},
+          {"matrix": [2, 9], "x": 9, "y": 2},
+          {"matrix": [2, 10], "x": 10, "y": 2},
+          {"matrix": [2, 11], "x": 11, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [3, 6], "x": 6, "y": 3},
+          {"matrix": [3, 7], "x": 7, "y": 3},
+          {"matrix": [3, 8], "x": 8, "y": 3},
+          {"matrix": [3, 9], "x": 9, "y": 3},
+          {"matrix": [3, 10], "x": 10, "y": 3},
+          {"matrix": [3, 11], "x": 11, "y": 3}
+        ]
       }
     }
   }
diff --git a/keyboards/handwired/wulkan/wulkan.c b/keyboards/handwired/wulkan/wulkan.c
deleted file mode 100644
index 72024175d2..0000000000
--- a/keyboards/handwired/wulkan/wulkan.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "wulkan.h"
diff --git a/keyboards/handwired/wulkan/wulkan.h b/keyboards/handwired/wulkan/wulkan.h
deleted file mode 100644
index cb4882ac95..0000000000
--- a/keyboards/handwired/wulkan/wulkan.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }  \
-}
-
-
-#define LAYOUT LAYOUT_ortho_4x12
diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h
index 7019bf461f..72e031c8de 100644
--- a/keyboards/handwired/xealous/config.h
+++ b/keyboards/handwired/xealous/config.h
@@ -27,9 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate.
 #define FORCE_NKRO
 
-#define DIODE_DIRECTION COL2ROW
-
-
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN C6
   #define STARTUP_SONG SONG(STARTUP_SOUND)
diff --git a/keyboards/handwired/xealous/rev1/config.h b/keyboards/handwired/xealous/rev1/config.h
index 17497c5ccd..49be10cce4 100644
--- a/keyboards/handwired/xealous/rev1/config.h
+++ b/keyboards/handwired/xealous/rev1/config.h
@@ -18,28 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-// Ascii art of pro micro. Pin names PD3, PD2, etc.
-//Usage| Name | Label      Label| Name | Usage
-//                   PORT          
-//     | PD3    TX0        RAW       |
-//     | PD2    RX1        GND       |SerGnd
-//     |        GND        RESET     |
-//     |        GND        VCC       |SerVCc
-//     | PD1    2          A3    PF4 | Col7
-//Ser  | PD0    3          A2    PF5 | Col6
-//Row4 | PD4    4          A1    PF6 | Col5
-//AUDIO| PC6    5          A0    PF7 | Col4
-//Row3 | PD7    6          15    PB1 | Col3
-//Row2 | PE6    7          14    PB3 | Col2
-//Row1 | PB4    8          13    PB2 | Col1
-//Row0 | PB5    9          10    PB6 | Col0
-
-// Note reservation of C6 for audio
-#define MATRIX_ROW_PINS { B5, B4, E6, D7, D4 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -55,5 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
-
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/info.json
index c470e72a16..20840f3826 100644
--- a/keyboards/handwired/xealous/rev1/info.json
+++ b/keyboards/handwired/xealous/rev1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x5141",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+    "rows": ["B5", "B4", "E6", "D7", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
@@ -27,7 +32,7 @@
         {"label":"0", "x":10, "y":0},
         {"label":"-", "x":11, "y":0},
         {"label":"=", "x":12, "y":0},
-        {"label":"Backspace", "x":13, "y":0, "w":2.0},
+        {"label":"Backspace", "x":13, "y":0, "w":2},
 
         {"label":"Tab", "x":0, "y":1, "w":1.5},
         {"label":"Q", "x":1.5, "y":1},
diff --git a/keyboards/handwired/xealous/rev1/rev1.c b/keyboards/handwired/xealous/rev1/rev1.c
deleted file mode 100644
index ad9f298c19..0000000000
--- a/keyboards/handwired/xealous/rev1/rev1.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "quantum.h"
-#include "rev1.h"
diff --git a/keyboards/handwired/z150/config.h b/keyboards/handwired/z150/config.h
index 8fc91281ca..7a054266ea 100644
--- a/keyboards/handwired/z150/config.h
+++ b/keyboards/handwired/z150/config.h
@@ -17,17 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B13, B14, B15, A8, A9, A3, A10, A1, A2, A15, A0 }
-#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4 }
-
 #define NUM_LOCK_LED_PIN B5
 #define SCROLL_LOCK_LED_PIN B4
 #define CAPS_LOCK_LED_PIN B3
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/z150/info.json b/keyboards/handwired/z150/info.json
index 72796b314e..6b93b73e20 100644
--- a/keyboards/handwired/z150/info.json
+++ b/keyboards/handwired/z150/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["B13", "B14", "B15", "A8", "A9", "A3", "A10", "A1", "A2", "A15", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
diff --git a/keyboards/handwired/zergo/config.h b/keyboards/handwired/zergo/config.h
deleted file mode 100644
index 63666aa09f..0000000000
--- a/keyboards/handwired/zergo/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 E.Zelianin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, D7, C3, D6, D5, D4 }
-#define MATRIX_COL_PINS { C7, C6, C5, C4, C2, C1, B7, D3, D2, B6, B5, B4, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/zergo/info.json b/keyboards/handwired/zergo/info.json
index 7b9776134c..6a472c3302 100644
--- a/keyboards/handwired/zergo/info.json
+++ b/keyboards/handwired/zergo/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB92B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "C5", "C4", "C2", "C1", "B7", "D3", "D2", "B6", "B5", "B4", "B3", "B2"],
+        "rows": ["B1", "D7", "C3", "D6", "D5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "at90usb1286",
     "bootloader": "halfkay",
     "layouts": {
diff --git a/keyboards/handwired/zergo/zergo.c b/keyboards/handwired/zergo/zergo.c
deleted file mode 100644
index 8b283d126c..0000000000
--- a/keyboards/handwired/zergo/zergo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 E.Zelianin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "zergo.h"
diff --git a/keyboards/hardlineworks/otd_plus/config.h b/keyboards/hardlineworks/otd_plus/config.h
index 4eda6eb306..5f36081323 100644
--- a/keyboards/hardlineworks/otd_plus/config.h
+++ b/keyboards/hardlineworks/otd_plus/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D2, D4, D1, E6, F5, C6, B6, F6, F0, D0, D6, D3 }
-#define MATRIX_COL_PINS { B3, B2, B1, B7, B0, F1, D7, F7, C7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/hardlineworks/otd_plus/info.json b/keyboards/hardlineworks/otd_plus/info.json
index 2a9f5c28d7..6dcb95fa50 100644
--- a/keyboards/hardlineworks/otd_plus/info.json
+++ b/keyboards/hardlineworks/otd_plus/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0087",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B1", "B7", "B0", "F1", "D7", "F7", "C7"],
+        "rows": ["D2", "D4", "D1", "E6", "F5", "C6", "B6", "F6", "F0", "D0", "D6", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F4",
         "scroll_lock": "D5"
@@ -17,96 +22,103 @@
     "layouts": {
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-      
-                {"label" : "Esc", "x":0, "y":0},
-                {"label" : "F1", "x":2, "y":0},
-                {"label" : "F2", "x":3, "y":0},
-                {"label" : "F3", "x":4, "y":0},
-                {"label" : "F4", "x":5, "y":0},
-                {"label" : "F5", "x":6.5, "y":0},
-                {"label" : "F6", "x":7.5, "y":0},
-                {"label" : "F7", "x":8.5, "y":0},
-                {"label" : "F8", "x":9.5, "y":0},
-                {"label" : "F9", "x":11, "y":0},
-                {"label" : "F10", "x":12, "y":0},
-                {"label" : "F11", "x":13, "y":0},
-                {"label" : "F12", "x":14, "y":0},
-                {"label" : "Print screen", "x":15.25, "y":0},
-                {"label" : "Scroll lock", "x":16.25, "y":0},
-                {"label" : "Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [11, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [11, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [11, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [11, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [11, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [11, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [10, 0], "x": 1, "y": 1.25},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [10, 1], "x": 3, "y": 1.25},
+                {"matrix": [1, 2], "x": 4, "y": 1.25},
+                {"matrix": [10, 2], "x": 5, "y": 1.25},
+                {"matrix": [1, 3], "x": 6, "y": 1.25},
+                {"matrix": [10, 3], "x": 7, "y": 1.25},
+                {"matrix": [1, 4], "x": 8, "y": 1.25},
+                {"matrix": [10, 4], "x": 9, "y": 1.25},
+                {"matrix": [1, 5], "x": 10, "y": 1.25},
+                {"matrix": [10, 5], "x": 11, "y": 1.25},
+                {"matrix": [1, 6], "x": 12, "y": 1.25},
+                {"matrix": [10, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [9, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [9, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [9, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [9, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [9, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [8, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [7, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [7, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [6, 2], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 5.25, "w": 1.5},
 
-                {"label" : "`", "x":0, "y":1.25},
-                {"label" : "1", "x":1, "y":1.25},
-                {"label" : "2", "x":2, "y":1.25},
-                {"label" : "3", "x":3, "y":1.25},
-                {"label" : "4", "x":4, "y":1.25},
-                {"label" : "5", "x":5, "y":1.25},
-                {"label" : "6", "x":6, "y":1.25},
-                {"label" : "7", "x":7, "y":1.25},
-                {"label" : "8", "x":8, "y":1.25},
-                {"label" : "9", "x":9, "y":1.25},
-                {"label" : "0", "x":10, "y":1.25},
-                {"label" : "-", "x":11, "y":1.25},
-                {"label" : "=", "x":12, "y":1.25},
-                {"label" : "Backspace", "x":13, "y":1.25, "w":2},
-                {"label" : "Insert", "x":15.25, "y":1.25},
-                {"label" : "Home", "x":16.25, "y":1.25},
-                {"label" : "Page up", "x":17.25, "y":1.25},
-    
-                {"label" : "Tab", "x":0, "y":2.25, "w":1.5},
-                {"label" : "Q", "x":1.5, "y":2.25},
-                {"label" : "W", "x":2.5, "y":2.25},
-                {"label" : "E", "x":3.5, "y":2.25},
-                {"label" : "R", "x":4.5, "y":2.25},
-                {"label" : "T", "x":5.5, "y":2.25},
-                {"label" : "Y", "x":6.5, "y":2.25},
-                {"label" : "U", "x":7.5, "y":2.25},
-                {"label" : "I", "x":8.5, "y":2.25},
-                {"label" : "O", "x":9.5, "y":2.25},
-                {"label" : "P", "x":10.5, "y":2.25},
-                {"label" : "[", "x":11.5, "y":2.25},
-                {"label" : "]", "x":12.5, "y":2.25},
-                {"label" : "|", "x":13.5, "y":2.25, "w":1.5},
-                {"label" : "Delete", "x":15.25, "y":2.25},
-                {"label" : "End", "x":16.25, "y":2.25},
-                {"label" : "Page down", "x":17.25, "y":2.25},
-       
-                {"label" : "Caps lock", "x":0, "y":3.25, "w":1.75},
-                {"label" : "A", "x":1.75, "y":3.25},
-                {"label" : "S", "x":2.75, "y":3.25},
-                {"label" : "D", "x":3.75, "y":3.25},
-                {"label" : "F", "x":4.75, "y":3.25},
-                {"label" : "G", "x":5.75, "y":3.25},
-                {"label" : "H", "x":6.75, "y":3.25},
-                {"label" : "J", "x":7.75, "y":3.25},
-                {"label" : "K", "x":8.75, "y":3.25},
-                {"label" : "L", "x":9.75, "y":3.25},
-                {"label" : ";", "x":10.75, "y":3.25},
-                {"label" : "'", "x":11.75, "y":3.25},
-                {"label" : "Enter", "x":12.75, "y":3.25, "w":2.25},
-    
-                {"label" : "Shift", "x":0, "y":4.25, "w":2.25},
-                {"label" : "Z", "x":2.25, "y":4.25},
-                {"label" : "X", "x":3.25, "y":4.25},
-                {"label" : "C", "x":4.25, "y":4.25},
-                {"label" : "V", "x":5.25, "y":4.25},
-                {"label" : "B", "x":6.25, "y":4.25},
-                {"label" : "N", "x":7.25, "y":4.25},
-                {"label" : "M", "x":8.25, "y":4.25},
-                {"label" : ",", "x":9.25, "y":4.25},
-                {"label" : ".", "x":10.25, "y":4.25},
-                {"label" : "/", "x":11.25, "y":4.25},
-                {"label" : "Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label" : "Up", "x":16.25, "y":4.25},
-       
-                {"label" : "Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label" : "Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label" : "Space", "x":4, "y":5.25, "w":7},
-                {"label" : "Alt", "x":11, "y":5.25, "w":1.5},
-                {"label" : "Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label" : "Left", "x":15.25, "y":5.25 },
-                {"label" : "Down", "x":16.25, "y":5.25 },
-                {"label" : "Right", "x":17.25, "y":5.25 }                                                        
+                {"matrix": [6, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/hardlineworks/otd_plus/otd_plus.c b/keyboards/hardlineworks/otd_plus/otd_plus.c
deleted file mode 100644
index 29d395d287..0000000000
--- a/keyboards/hardlineworks/otd_plus/otd_plus.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "otd_plus.h"
diff --git a/keyboards/hardlineworks/otd_plus/otd_plus.h b/keyboards/hardlineworks/otd_plus/otd_plus.h
deleted file mode 100644
index f523cfff29..0000000000
--- a/keyboards/hardlineworks/otd_plus/otd_plus.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_tkl_ansi_wkl( \
-     K00,      K01, KB1, K02, KB2, K03, KB3, K04, KB4, KB5, K06, KB6, K07,  KB7, K08, KB8, \
-     K10, KA0, K11, KA1, K12, KA2, K13, KA3, K14, KA4, K15, KA5, K16, KA6,  KA7, K18, KA8, \
-     K20, K90, K21, K91, K22, K92, K23, K93, K24, K94, K25, K95, K26, K96,  K97, K28, K98, \
-     K30, K80, K31, K81, K32, K82, K33, K83, K34, K84, K35, K85,      K86, \
-     K40, K70, K41, K71, K42, K72, K43, K73, K44, K74, K45,      K46,            K48, \
-     K50,      K51,           K62,                          K55,      K56,  K67, K58, K68  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   KC_NO, K06,   K07,   K08,   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO, K18,   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO, K28,   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   KC_NO, KC_NO, KC_NO, }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   KC_NO, K48,   }, \
-    { K50,   K51,   KC_NO, KC_NO, KC_NO, K55,   K56,   KC_NO, K58,   }, \
-    { KC_NO, KC_NO, K62,   KC_NO, KC_NO, KC_NO, KC_NO, K67,   K68,   }, \
-    { K70,   K71,   K72,   K73,   K74,   KC_NO, KC_NO, KC_NO, KC_NO, }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   KC_NO, KC_NO, }, \
-    { K90,   K91,   K92,   K93,   K94,   K95,   K96,   K97,   K98,   }, \
-    { KA0,   KA1,   KA2,   KA3,   KA4,   KA5,   KA6,   KA7,   KA8,   }, \
-    { KC_NO, KB1,   KB2,   KB3,   KB4,   KB5,   KB6,   KB7,   KB8,   }, \
-}
diff --git a/keyboards/hardwareabstraction/handwire/handwire.c b/keyboards/hardwareabstraction/handwire/handwire.c
index c61e4c7626..4981e703e4 100644
--- a/keyboards/hardwareabstraction/handwire/handwire.c
+++ b/keyboards/hardwareabstraction/handwire/handwire.c
@@ -1,7 +1,8 @@
 // Copyright 2022 Andy Tsai (@atsai)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
+
 static uint16_t buzzer_timer = 0;
 static uint8_t buzzer_dwell = 15;
 static uint8_t buzzer_dwell_change = 1;
diff --git a/keyboards/hazel/bad_wings/keymaps/default/config.h b/keyboards/hazel/bad_wings/keymaps/default/config.h
index bd395ec9e5..2d9e21274f 100644
--- a/keyboards/hazel/bad_wings/keymaps/default/config.h
+++ b/keyboards/hazel/bad_wings/keymaps/default/config.h
@@ -5,12 +5,11 @@
 
 #define TAPPING_TERM 200
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM_PER_KEY
 #define ONESHOT_TAP_TOGGLE 10
 #define ONESHOT_TIMEOUT 500
 #define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
 #define CIRQUE_PINNACLE_TAP_ENABLE
-#define CIRQUE_PINNACLE_POSITION_MODE  CIRQUE_PINNACLE_ABSOLUTE_MODE 
-#define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE 
\ No newline at end of file
+#define CIRQUE_PINNACLE_POSITION_MODE  CIRQUE_PINNACLE_ABSOLUTE_MODE
+#define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE
diff --git a/keyboards/heliar/wm1_hotswap/config.h b/keyboards/heliar/wm1_hotswap/config.h
deleted file mode 100644
index 410d9732ef..0000000000
--- a/keyboards/heliar/wm1_hotswap/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 HELIAR MK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D5, D3, B3, F0, E6 }
-#define MATRIX_COL_PINS { D2, B0, B1, B2, D1, D0, C7, C6, B6, B5, B4, F4, F5, F6, F1 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/heliar/wm1_hotswap/info.json b/keyboards/heliar/wm1_hotswap/info.json
index 361325953d..77bf189dab 100644
--- a/keyboards/heliar/wm1_hotswap/info.json
+++ b/keyboards/heliar/wm1_hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0xD070",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "B0", "B1", "B2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "F4", "F5", "F6", "F1"],
+        "rows": ["D5", "D3", "B3", "F0", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
diff --git a/keyboards/heliotrope/config.h b/keyboards/heliotrope/config.h
index 0c9708ab73..15d1d77276 100644
--- a/keyboards/heliotrope/config.h
+++ b/keyboards/heliotrope/config.h
@@ -19,7 +19,6 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-    #define RGB_DI_PIN A4                               // The pin connected to the data pin of the LEDs    
     #define RGB_MATRIX_LED_COUNT 61                     // The number of LEDs connected
     
     #define RGB_MATRIX_KEYPRESSES                       // reacts to keypresses
diff --git a/keyboards/heliotrope/info.json b/keyboards/heliotrope/info.json
index 0bac228567..88998edd65 100644
--- a/keyboards/heliotrope/info.json
+++ b/keyboards/heliotrope/info.json
@@ -24,6 +24,9 @@
         "pid": "0x4466",
         "vid": "0x3141"
     },
+    "ws2812": {
+        "pin": "A4"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
diff --git a/keyboards/helix/helix.c b/keyboards/helix/helix.c
deleted file mode 100644
index 539abd5349..0000000000
--- a/keyboards/helix/helix.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "helix.h"
diff --git a/keyboards/helix/helix.h b/keyboards/helix/helix.h
deleted file mode 100644
index b900d975d2..0000000000
--- a/keyboards/helix/helix.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_helix_rev1
-    #include "rev1.h"
-#endif
-#ifdef KEYBOARD_helix_rev2
-    #include "rev2.h"
-#endif
-#ifdef KEYBOARD_helix_rev3_5rows
-    #include "rev3_5rows.h"
-#endif
-#ifdef KEYBOARD_helix_rev3_4rows
-    #include "rev3_4rows.h"
-#endif
-#ifdef KEYBOARD_helix_pico
-    #include "pico.h"
-#endif
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index 77048b5a0f..cf4e9f4ffe 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -48,9 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define AUDIO_PIN B5
 #endif
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 //#define RGBLED_NUM 12    // Number of LEDs. see ./keymaps/default/config.h
 
 // Helix keyboard RGB LED support
diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json
index 51c5e3c9e3..0b4c933ffa 100644
--- a/keyboards/helix/pico/info.json
+++ b/keyboards/helix/pico/info.json
@@ -11,6 +11,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/helix/pico/pico.c b/keyboards/helix/pico/pico.c
index 4cd1953632..cc98fe8f61 100644
--- a/keyboards/helix/pico/pico.c
+++ b/keyboards/helix/pico/pico.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "helix.h"
+#include "pico.h"
 
 // Each keymap.c should use is_keyboard_master() instead of 'is_master'.
 // But keep 'is_master' for a while for backwards compatibility
diff --git a/keyboards/helix/pico/pico.h b/keyboards/helix/pico/pico.h
index 3e51d54d84..e555691583 100644
--- a/keyboards/helix/pico/pico.h
+++ b/keyboards/helix/pico/pico.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "helix.h"
+#include "quantum.h"
 
 // Each keymap.c should use is_keyboard_master() instead of 'is_master', 'has_usb()'.
 // But keep 'is_master' for a while for backwards compatibility
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index b4103d407c..491675d45d 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -54,9 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 //#define RGBLED_NUM 12    // Number of LEDs. see ./keymaps/default/config.h
 
 // Helix keyboard RGB LED support
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json
index 0ffce4f17a..3924af33aa 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/rev2/info.json
@@ -11,6 +11,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/config.h b/keyboards/helix/rev2/keymaps/edvorakjp/config.h
index 6854249be0..0dff4b59ca 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/config.h
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/config.h
@@ -5,7 +5,6 @@
 #undef QUICK_TAP_TERM
 #undef TAPPING_TERM
 #define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // If you need more program area, try select and reduce rgblight modes to use.
 
diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c
index 2bbe9a28e2..ded22bbe93 100644
--- a/keyboards/helix/rev2/rev2.c
+++ b/keyboards/helix/rev2/rev2.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "helix.h"
+#include "rev2.h"
 
 // Each keymap.c should use is_keyboard_master() instead of 'is_master'.
 // But keep 'is_master' for a while for backwards compatibility
diff --git a/keyboards/helix/rev2/rev2.h b/keyboards/helix/rev2/rev2.h
index fccbaf1ac4..dd1d74a298 100644
--- a/keyboards/helix/rev2/rev2.h
+++ b/keyboards/helix/rev2/rev2.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "helix.h"
+#include "quantum.h"
 
 bool is_mac_mode(void);
 void set_mac_mode_kb(bool macmode);
diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index 97b4ed3f48..9af8d14d10 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -46,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Dip switch on matrix grid */
 #define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} }
 
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 50 // Number of LEDs
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json
index 45945f8871..db9d760692 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0004",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
   "encoder": {
     "rotary": [
       {"pin_a": "B6", "pin_b": "B5"}
@@ -16,6 +19,9 @@
   "split": {
     "soft_serial_pin": "D2"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/helix/rev3_4rows/rev3_4rows.c b/keyboards/helix/rev3_4rows/rev3_4rows.c
index 704f915510..ff61027a96 100644
--- a/keyboards/helix/rev3_4rows/rev3_4rows.c
+++ b/keyboards/helix/rev3_4rows/rev3_4rows.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "helix.h"
+#include "rev3_4rows.h"
 
 bool is_mac_mode(void) {
     return keymap_config.swap_lalt_lgui == false;
diff --git a/keyboards/helix/rev3_4rows/rules.mk b/keyboards/helix/rev3_4rows/rules.mk
index f29deaf586..23b73845f0 100644
--- a/keyboards/helix/rev3_4rows/rules.mk
+++ b/keyboards/helix/rev3_4rows/rules.mk
@@ -2,7 +2,6 @@ EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index a047bd7d87..4f7ca7480c 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -46,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Dip switch on matrix grid */
 #define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} }
 
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 64 // Number of LEDs
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index 9709708d68..abd4f64ab1 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0003",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
   "encoder": {
     "rotary": [
       {"pin_a": "B6", "pin_b": "B5"}
@@ -16,6 +19,9 @@
   "split": {
     "soft_serial_pin": "D2"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c
index 704f915510..28fa314a7b 100644
--- a/keyboards/helix/rev3_5rows/rev3_5rows.c
+++ b/keyboards/helix/rev3_5rows/rev3_5rows.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "helix.h"
+#include "rev3_5rows.h"
 
 bool is_mac_mode(void) {
     return keymap_config.swap_lalt_lgui == false;
diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk
index f29deaf586..23b73845f0 100644
--- a/keyboards/helix/rev3_5rows/rules.mk
+++ b/keyboards/helix/rev3_5rows/rules.mk
@@ -2,7 +2,6 @@ EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/hfdkb/ac001/ac001.c b/keyboards/hfdkb/ac001/ac001.c
index a977f9c80d..83dbdeb628 100644
--- a/keyboards/hfdkb/ac001/ac001.c
+++ b/keyboards/hfdkb/ac001/ac001.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ac001.h"
+#include "quantum.h"
 /*
     3---------------2
     |       |       |
diff --git a/keyboards/hfdkb/ac001/ac001.h b/keyboards/hfdkb/ac001/ac001.h
deleted file mode 100644
index 0758584ee8..0000000000
--- a/keyboards/hfdkb/ac001/ac001.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright (C) 2022 jonylee@hfd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K000, K001, K002,  K003, K004  \
-) { \
-	{ K000, K001, K002,  K003, K004 } \
-}
-// clang-format on
diff --git a/keyboards/hfdkb/ac001/config.h b/keyboards/hfdkb/ac001/config.h
index a03f9066a9..ee03dd1e17 100644
--- a/keyboards/hfdkb/ac001/config.h
+++ b/keyboards/hfdkb/ac001/config.h
@@ -18,17 +18,9 @@
 
 #define FORCE_NKRO
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B15}
-#define MATRIX_COL_PINS { A5, A6, A7, C4, C5}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 #define TAP_CODE_DELAY 5
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN A1
 #define RGB_MATRIX_LED_COUNT 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/info.json
index 2e1011b7f6..d46deb9d0d 100644
--- a/keyboards/hfdkb/ac001/info.json
+++ b/keyboards/hfdkb/ac001/info.json
@@ -8,16 +8,28 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "C4", "C5"],
+        "rows": ["B15"]
+    },
+    "diode_direction": "ROW2COL",
+    "ws2812": {
+        "pin": "A1"
+    },
     "processor": "WB32FQ95",
     "bootloader": "wb32-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-            {"label":"~", "x":0, "y":0},
-            {"label":"!", "x":1, "y":0},
-            {"label":"3", "x":2, "y":0},
-            {"label":"4", "x":3, "y":0},
-            {"label":"@", "x":4, "y":0}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0}
+            ]
         }
     }
 }
diff --git a/keyboards/hfdkb/ac001/rules.mk b/keyboards/hfdkb/ac001/rules.mk
index cf3008c6e4..81b7e82c3f 100644
--- a/keyboards/hfdkb/ac001/rules.mk
+++ b/keyboards/hfdkb/ac001/rules.mk
@@ -10,6 +10,5 @@ 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
-RGB_MATRIX_DRIVER = WS2812
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/hfdkb/keyboard_sw/k83/info.json b/keyboards/hfdkb/keyboard_sw/k83/info.json
index 6810aff30f..efdea0336c 100644
--- a/keyboards/hfdkb/keyboard_sw/k83/info.json
+++ b/keyboards/hfdkb/keyboard_sw/k83/info.json
@@ -7,6 +7,9 @@
         "pid": "0x0007",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
     "processor": "WB32FQ95",
     "bootloader": "wb32-dfu",
     "matrix_pins": {
diff --git a/keyboards/hfdkb/keyboard_sw/k83/rules.mk b/keyboards/hfdkb/keyboard_sw/k83/rules.mk
index 176dd64c1c..756d0c0719 100644
--- a/keyboards/hfdkb/keyboard_sw/k83/rules.mk
+++ b/keyboards/hfdkb/keyboard_sw/k83/rules.mk
@@ -14,7 +14,6 @@ AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes		# DPI Switch
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
 #RGB_MATRIX_CUSTOM_USER = yes #Add turnoff LED
diff --git a/keyboards/hhkb/ansi/ansi.c b/keyboards/hhkb/ansi/ansi.c
deleted file mode 100644
index cefc4e0690..0000000000
--- a/keyboards/hhkb/ansi/ansi.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ansi.h"
\ No newline at end of file
diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h
index e0d2bce0f1..8d281f2604 100644
--- a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h
+++ b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h
@@ -17,8 +17,4 @@
 //#define TAPPING_TOGGLE  1
 // TAPPING_TERM is set in config.h this defaults to 200
 
-// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when
-// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
-
 #endif
diff --git a/keyboards/hhkb/ansi/keymaps/brett/config.h b/keyboards/hhkb/ansi/keymaps/brett/config.h
index 8f769d603f..0711122d74 100644
--- a/keyboards/hhkb/ansi/keymaps/brett/config.h
+++ b/keyboards/hhkb/ansi/keymaps/brett/config.h
@@ -12,6 +12,3 @@
 #define LSPO_MOD KC_LSFT
 #define RSPC_MOD KC_RSFT
 
-// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when
-// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/hhkb/jp/jp.c b/keyboards/hhkb/jp/jp.c
deleted file mode 100644
index f1f1388c77..0000000000
--- a/keyboards/hhkb/jp/jp.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jp.h"
\ No newline at end of file
diff --git a/keyboards/hhkb/rn42/suart.h b/keyboards/hhkb/rn42/suart.h
index 7d92be0692..40e40648c7 100644
--- a/keyboards/hhkb/rn42/suart.h
+++ b/keyboards/hhkb/rn42/suart.h
@@ -1,8 +1,5 @@
-#ifndef SUART
-#define SUART
+#pragma once
 
 void xmit(uint8_t);
 uint8_t rcvr(void);
 uint8_t recv(void);
-
-#endif	/* SUART */
diff --git a/keyboards/hhkb_lite_2/config.h b/keyboards/hhkb_lite_2/config.h
deleted file mode 100644
index 8e2163885b..0000000000
--- a/keyboards/hhkb_lite_2/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, F4, F1, F0, B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { F6, F7, B6, B5, B4, D7, D6, D4, D5, C7, C6, D3, D2, D1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hhkb_lite_2/hhkb_lite_2.c b/keyboards/hhkb_lite_2/hhkb_lite_2.c
deleted file mode 100644
index d0eaf250d6..0000000000
--- a/keyboards/hhkb_lite_2/hhkb_lite_2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "hhkb_lite_2.h"
diff --git a/keyboards/hhkb_lite_2/info.json b/keyboards/hhkb_lite_2/info.json
index 1051663c30..cb3b308055 100644
--- a/keyboards/hhkb_lite_2/info.json
+++ b/keyboards/hhkb_lite_2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x88B2",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "C7", "C6", "D3", "D2", "D1"],
+        "rows": ["F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [5, 9]
     },
diff --git a/keyboards/hidtech/bastyl/bastyl.c b/keyboards/hidtech/bastyl/bastyl.c
deleted file mode 100644
index 637af1ffed..0000000000
--- a/keyboards/hidtech/bastyl/bastyl.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 
- * Copyright 2020 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2020 Anthony MARIN <anthony@hidtech.ca>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bastyl.h"
diff --git a/keyboards/hidtech/bastyl/config.h b/keyboards/hidtech/bastyl/config.h
index 64bd94c007..48ac76c74b 100644
--- a/keyboards/hidtech/bastyl/config.h
+++ b/keyboards/hidtech/bastyl/config.h
@@ -18,10 +18,6 @@
 
 #pragma once
 
-#define DIODE_DIRECTION ROW2COL
-#define MATRIX_ROW_PINS { D7, B5, F7, F6, B6 }
-#define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 }
-#define RGB_DI_PIN D2
 #define RGBLED_NUM 38
 #define RGBLIGHT_SPLIT
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json
index 26b3d13ddd..794d7cc183 100644
--- a/keyboards/hidtech/bastyl/info.json
+++ b/keyboards/hidtech/bastyl/info.json
@@ -8,9 +8,17 @@
         "pid": "0x1827",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
+        "rows": ["D7", "B5", "F7", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/hidtech/bastyl/keymaps/xyverz/config.h b/keyboards/hidtech/bastyl/keymaps/xyverz/config.h
index 335f968e2a..4fa185e956 100644
--- a/keyboards/hidtech/bastyl/keymaps/xyverz/config.h
+++ b/keyboards/hidtech/bastyl/keymaps/xyverz/config.h
@@ -28,6 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 300
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define LEADER_PER_KEY_TIMING
 #define LEADER_TIMEOUT 300
\ No newline at end of file
diff --git a/keyboards/hifumi/config.h b/keyboards/hifumi/config.h
index 4f7e1e89ec..5331556a41 100644
--- a/keyboards/hifumi/config.h
+++ b/keyboards/hifumi/config.h
@@ -16,23 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6 }
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 6
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_HUE_STEP 5
diff --git a/keyboards/hifumi/hifumi.h b/keyboards/hifumi/hifumi.h
deleted file mode 100644
index 389ce206e0..0000000000
--- a/keyboards/hifumi/hifumi.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2019 zk-phi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12 \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 } \
-}
diff --git a/keyboards/hifumi/info.json b/keyboards/hifumi/info.json
index f345bf7f3c..a4aeccf83a 100644
--- a/keyboards/hifumi/info.json
+++ b/keyboards/hifumi/info.json
@@ -8,11 +8,27 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6"],
+    "rows": ["D4", "C6"]
+  },
+  "diode_direction": "COL2ROW",
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-        "layout": [{"label":"F5", "x":0, "y":0}, {"label":"Up", "x":1, "y":0}, {"label":"PrSc", "x":2, "y":0}, {"label":"Left", "x":0, "y":1}, {"label":"Down", "x":1, "y":1}, {"label":"Right", "x":2, "y":1}]
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0},
+            {"matrix": [0, 1], "x": 1, "y": 0},
+            {"matrix": [0, 2], "x": 2, "y": 0},
+
+            {"matrix": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1}
+        ]
     }
   }
 }
diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json
index f18bd158cc..24ed9aa668 100644
--- a/keyboards/hillside/46/0_1/info.json
+++ b/keyboards/hillside/46/0_1/info.json
@@ -37,10 +37,12 @@
 
     "rgblight": {
         "led_count": 4,
-        "pin": "D3",
         "split": true,
         "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8
+    },
+    "ws2812": {
+        "pin": "D3"
     }
 }
diff --git a/keyboards/hillside/48/0_1/0_1.c b/keyboards/hillside/48/0_1/0_1.c
deleted file mode 100644
index 34659eb424..0000000000
--- a/keyboards/hillside/48/0_1/0_1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Michael McCoyd (@mmccoyd)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "0_1.h"
diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json
index aa03a7a4f9..27f26a1d80 100644
--- a/keyboards/hillside/48/0_1/info.json
+++ b/keyboards/hillside/48/0_1/info.json
@@ -38,10 +38,12 @@
 
     "rgblight": {
         "led_count": 5,
-        "pin": "D3",
         "split": true,
         "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8
+    },
+    "ws2812": {
+        "pin": "D3"
     }
 }
diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json
index e803ed52be..de6c4e0a80 100644
--- a/keyboards/hillside/52/0_1/info.json
+++ b/keyboards/hillside/52/0_1/info.json
@@ -37,10 +37,12 @@
 
     "rgblight": {
         "led_count": 5,
-        "pin": "D3",
         "split": true,
         "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8
+    },
+    "ws2812": {
+        "pin": "D3"
     }
 }
diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h
index 7037db7735..b7094a0212 100644
--- a/keyboards/hineybush/h08_ocelot/config.h
+++ b/keyboards/hineybush/h08_ocelot/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, B6 }
-#define MATRIX_COL_PINS { F4, C7, D0, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 7
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h08_ocelot/h08_ocelot.c b/keyboards/hineybush/h08_ocelot/h08_ocelot.c
deleted file mode 100644
index e00bd9ecb5..0000000000
--- a/keyboards/hineybush/h08_ocelot/h08_ocelot.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "h08_ocelot.h"
diff --git a/keyboards/hineybush/h08_ocelot/h08_ocelot.h b/keyboards/hineybush/h08_ocelot/h08_ocelot.h
deleted file mode 100644
index 92bded4558..0000000000
--- a/keyboards/hineybush/h08_ocelot/h08_ocelot.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13  \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }  \
-}
-
diff --git a/keyboards/hineybush/h08_ocelot/info.json b/keyboards/hineybush/h08_ocelot/info.json
index d7e395285b..4305081010 100644
--- a/keyboards/hineybush/h08_ocelot/info.json
+++ b/keyboards/hineybush/h08_ocelot/info.json
@@ -8,11 +8,29 @@
         "pid": "0xE8E9",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "C7", "D0", "D1"],
+        "rows": ["B4", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1}
+            ]
         }
     }
 }
diff --git a/keyboards/hineybush/h10/config.h b/keyboards/hineybush/h10/config.h
index 2fc1c25eb6..994b108d8e 100644
--- a/keyboards/hineybush/h10/config.h
+++ b/keyboards/hineybush/h10/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, C6, B6, B5, B4, D7 }
-#define MATRIX_COL_PINS { F0, C7, B1, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/hineybush/h10/h10.c b/keyboards/hineybush/h10/h10.c
index 8c149c1451..81f5bdfbf2 100644
--- a/keyboards/hineybush/h10/h10.c
+++ b/keyboards/hineybush/h10/h10.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "h10.h"
+#include "quantum.h"
 
 // Optional override functions below.
 // You can leave any or all of these undefined.
diff --git a/keyboards/hineybush/h10/h10.h b/keyboards/hineybush/h10/h10.h
deleted file mode 100644
index 33010cb368..0000000000
--- a/keyboards/hineybush/h10/h10.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright 2020 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_6x4(    \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-    k50, k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43}, \
-    {k50, k51, k52, k53}  \
-}
-
-#define LAYOUT_numpad_6x4(  \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, KC_NO}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, KC_NO}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_plus(  \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, KC_NO}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_zero(  \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-    k50, k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, KC_NO}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, KC_NO}, \
-    {k50, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_enter(  \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, KC_NO}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_enter_plus(  \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_zero_plus(  \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-    k50, k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, KC_NO}, \
-    {k50, k51, k52, k53}  \
-}
diff --git a/keyboards/hineybush/h10/info.json b/keyboards/hineybush/h10/info.json
index e59ba7f3e4..295b34da10 100644
--- a/keyboards/hineybush/h10/info.json
+++ b/keyboards/hineybush/h10/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEBD8",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "C7", "B1", "B2"],
+        "rows": ["B0", "C6", "B6", "B5", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
@@ -18,222 +23,222 @@
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 2.25, "h": 2},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_split_plus": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_split_zero": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 2.25, "h": 2},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_split_enter": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 2.25, "h": 2},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_split_enter_plus": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_split_zero_plus": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h
index ca8f344793..c9c59d1942 100644
--- a/keyboards/hineybush/h60/config.h
+++ b/keyboards/hineybush/h60/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B6, B5, B4, D7, E6 }
-#define MATRIX_COL_PINS { B3, D0, D1, D2, D3, D5, D6, C7, F0, F1, F4, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B0
- #ifdef RGB_DI_PIN
    #define RGBLED_NUM 16
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -53,7 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //   #define RGBLIGHT_EFFECT_RGB_TEST
 //   #define RGBLIGHT_EFFECT_ALTERNATING
- #endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h60/info.json b/keyboards/hineybush/h60/info.json
index eece82f5f2..e88411115f 100644
--- a/keyboards/hineybush/h60/info.json
+++ b/keyboards/hineybush/h60/info.json
@@ -8,10 +8,18 @@
         "pid": "0xEBBE",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "D0", "D1", "D2", "D3", "D5", "D6", "C7", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["B6", "B5", "B4", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 12
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb"],
diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h
index 925f0498ca..3fb9460932 100644
--- a/keyboards/hineybush/h65/config.h
+++ b/keyboards/hineybush/h65/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, D6, D4, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, B0, B1, B2, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 17
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h65/h65.c b/keyboards/hineybush/h65/h65.c
deleted file mode 100644
index 76467ef91b..0000000000
--- a/keyboards/hineybush/h65/h65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "h65.h"
diff --git a/keyboards/hineybush/h65/h65.h b/keyboards/hineybush/h65/h65.h
deleted file mode 100644
index 986c071a45..0000000000
--- a/keyboards/hineybush/h65/h65.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright 2021 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │1E │    │0E     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │2E │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�2D  │ ISO Enter
- *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │3E │   │2C │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │4E │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴┬──┴─┬─┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- *              │40  │41  │42  │43        │46  │48      │49  │4A  │ │4B │4C │4D │ 2.75u/1.25u/2.25u Split Space
- *              └────┴────┴────┴──────────┴────┴────────┴────┴────┘ └───┴───┴───┘
- *              ┌────┬────┬────┬────────┬────┬──────────┬────┬────�
- *              │40  │41  │42  │43      │46  │48        │49  │4A  │ 2.25u/1.25u/2.75u Split Space
- *              └────┴────┴────┴────────┴────┴──────────┴────┴────┘
- *              ┌────┬────┬────┬────────────────────────┬────┬────�
- *              │40  │41  │42  │46                      │49  │4A  │ Standard
- *              └────┴────┴────┴────────────────────────┴────┴────┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────�
- *              │40   │41 │42   │46                         │4A   │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k3E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,           k43, k46, k48,      k49, k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, k43, ___, ___, k46, ___, k48, k49, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k3E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,           k49, k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, k2E }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k3E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,           k49, k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, k2E }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k3E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,                k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, k2E }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k3E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,                k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, k2E }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k3E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,           k49, k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k3E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,           k49, k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k3E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,                k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k3E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,                k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, k4E }  \
-}
diff --git a/keyboards/hineybush/h65/info.json b/keyboards/hineybush/h65/info.json
index e1bebb560c..dba8541b99 100644
--- a/keyboards/hineybush/h65/info.json
+++ b/keyboards/hineybush/h65/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE9E4",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "B0", "B1", "B2", "B3"],
+        "rows": ["D7", "D6", "D4", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
@@ -15,692 +20,695 @@
     "indicators": {
         "caps_lock": "E6"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker", "65_iso_blocker_split_bs"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25},
-                {"label":"End", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":2.75},
-                {"label":"Space", "x":6.5, "y":4, "w":1.25},
-                {"label":"Space", "x":7.75, "y":4, "w":2.25},
-                {"label":"GUI", "x":10, "y":4, "w":1.25},
-                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2193", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h
index 925f0498ca..3fb9460932 100644
--- a/keyboards/hineybush/h65_hotswap/config.h
+++ b/keyboards/hineybush/h65_hotswap/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, D6, D4, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, B0, B1, B2, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 17
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h65_hotswap/h65_hotswap.c b/keyboards/hineybush/h65_hotswap/h65_hotswap.c
deleted file mode 100644
index df5e56bf0b..0000000000
--- a/keyboards/hineybush/h65_hotswap/h65_hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "h65_hotswap.h"
diff --git a/keyboards/hineybush/h65_hotswap/h65_hotswap.h b/keyboards/hineybush/h65_hotswap/h65_hotswap.h
deleted file mode 100644
index d2149e5215..0000000000
--- a/keyboards/hineybush/h65_hotswap/h65_hotswap.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright 2021 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�      ┌───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │1E │      │0E     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      └─┬─────┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │2E │        │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤     ┌──┴�2D  │ ISO Enter
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │3E │     │2C │    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤     └───┴────┘
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │4E │
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │44      │46  │47        │49  │4A  │ │4B │4C │4D │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
- * ┌────┬────┬────┬────────────────────────┬────┬────�
- * │40  │41  │42  │46                      │49  │4A  │ Standard
- * └────┴────┴────┴────────────────────────┴────┴────┘
- */
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k3E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,           k44, k46, k47,      k49, k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, k44, ___, k46, k47, ___, k49, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k3E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,           k49, k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, k2E }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k3E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,           k49, k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, k2E }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k3E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,           k49, k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, k4E }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k2E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k3E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k4E, \
-    k40, k41, k42,                k46,           k49, k4A,      k4B, k4C, k4D  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, k4E }  \
-}
diff --git a/keyboards/hineybush/h65_hotswap/info.json b/keyboards/hineybush/h65_hotswap/info.json
index 9eebb77345..a4c09e02da 100644
--- a/keyboards/hineybush/h65_hotswap/info.json
+++ b/keyboards/hineybush/h65_hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE8B7",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "B0", "B1", "B2", "B3"],
+        "rows": ["D7", "D6", "D4", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
@@ -15,6 +20,9 @@
     "indicators": {
         "caps_lock": "E6"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -24,386 +32,386 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 14], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Home", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25},
-                {"label":"End", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [3, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":2.75},
-                {"label":"Space", "x":6.5, "y":4, "w":1.25},
-                {"label":"Space", "x":7.75, "y":4, "w":2.25},
-                {"label":"GUI", "x":10, "y":4, "w":1.25},
-                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"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.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Home", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"End", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"GUI", "x":10, "y":4, "w":1.25},
-                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 14], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Home", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"End", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"GUI", "x":10, "y":4, "w":1.25},
-                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Home", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"End", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"GUI", "x":10, "y":4, "w":1.25},
-                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 14], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Home", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"End", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"GUI", "x":10, "y":4, "w":1.25},
-                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h
index e8e84f1117..55c1faf44f 100644
--- a/keyboards/hineybush/h660s/config.h
+++ b/keyboards/hineybush/h660s/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, E6, B3, D3, D2 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h660s/h660s.c b/keyboards/hineybush/h660s/h660s.c
index e8e50048b1..0e774b9c57 100644
--- a/keyboards/hineybush/h660s/h660s.c
+++ b/keyboards/hineybush/h660s/h660s.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "h660s.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {  // EEPROM is getting reset!
   rgblight_enable(); // Enable RGB by default
diff --git a/keyboards/hineybush/h660s/h660s.h b/keyboards/hineybush/h660s/h660s.h
deleted file mode 100644
index 32099d4b74..0000000000
--- a/keyboards/hineybush/h660s/h660s.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright 2020 Josh Hinnebusch
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113,     k014, \
-    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,                 \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
-    k400, k401, k402,       k407,                    k409, k410, k411,                k412, k413, k414  \
-) { \
-    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
-    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
-    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,KC_NO}, \
-    {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
-    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414}  \
-}
-
-#define LAYOUT_66_ansi( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,    k013,        k014, \
-    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k313,                 \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
-    k400, k401, k402,       k407,                   k409, k410, k411,                k412, k413, k414  \
-) { \
-    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
-    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, KC_NO,k114}, \
-    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \
-    {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
-    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414}  \
-}
-
-#define LAYOUT_66_ansi_split_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113,     k014, \
-    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k313,                 \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
-    k400, k401, k402,       k407,                    k409, k410, k411,                k412, k413, k414  \
-) { \
-    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
-    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
-    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \
-    {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
-    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414}  \
-}
-
-#define LAYOUT_66_ansi_rwkl( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,    k013,        k014, \
-    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k313,                 \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
-    k400, k401, k402,       k407,                         k410, k411,                 k412, k413, k414  \
-) { \
-    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
-    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,KC_NO, k114}, \
-    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \
-    {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
-    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414}  \
-}
-
-#define LAYOUT_66_ansi_rwkl_split_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113,     k014, \
-    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k313,                 \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
-    k400, k401, k402,       k407,                         k410, k411,                 k412, k413, k414  \
-) { \
-    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
-    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
-    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \
-    {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
-    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414}  \
-}
-
-#define LAYOUT_66_iso( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,    k013,        k014, \
-    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,               k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,                 \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
-    k400, k401, k402,       k407,                    k409, k410, k411,                k412, k413, k414  \
-) { \
-    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
-    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,KC_NO, k114}, \
-    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
-    {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
-    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414}  \
-}
-
-#define LAYOUT_66_iso_split_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113,     k014, \
-    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,               k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,                 \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
-    k400, k401, k402,       k407,                    k409, k410, k411,                k412, k413, k414  \
-) { \
-    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
-    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
-    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
-    {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
-    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414}  \
-}
-
-#define LAYOUT_66_iso_rwkl( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,    k013,        k014, \
-    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,               k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,                 \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
-    k400, k401, k402,       k407,                         k410, k411,                 k412, k413, k414  \
-) { \
-    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
-    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,KC_NO, k114}, \
-    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
-    {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
-    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414}  \
-}
-
-#define LAYOUT_66_iso_rwkl_split_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113,     k014, \
-    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,               k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,                 \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
-    k400, k401, k402,       k407,                         k410, k411,                 k412, k413, k414  \
-) { \
-    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
-    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
-    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
-    {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
-    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414}  \
-}
diff --git a/keyboards/hineybush/h660s/info.json b/keyboards/hineybush/h660s/info.json
index d773651ee6..c6f8275add 100644
--- a/keyboards/hineybush/h660s/info.json
+++ b/keyboards/hineybush/h660s/info.json
@@ -8,639 +8,724 @@
         "pid": "0xEB1B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["B1", "E6", "B3", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_66_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 16.25, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 16.25, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
-
-                {"x": 15.25, "y": 3.25},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25},
-                {"x": 16.25, "y": 4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [3, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
             ]
         },
         "LAYOUT_66_ansi_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 16.25, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 16.25, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
-
-                {"x": 15.25, "y": 3.25},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25},
-                {"x": 16.25, "y": 4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [3, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
             ]
         },
         "LAYOUT_66_ansi_rwkl": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 16.25, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 16.25, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
-
-                {"x": 15.25, "y": 3.25},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4, "w": 1.25},
-                {"x": 3.5, "y": 4, "w": 7},
-                {"x": 10.5, "y": 4, "w": 1.25},
-                {"x": 12.75, "y": 4, "w": 1.25},
-
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25},
-                {"x": 16.25, "y": 4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [3, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "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, 7], "x": 3.5, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
             ]
         },
         "LAYOUT_66_ansi_rwkl_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 16.25, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 16.25, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
-
-                {"x": 15.25, "y": 3.25},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4, "w": 1.25},
-                {"x": 3.5, "y": 4, "w": 7},
-                {"x": 10.5, "y": 4, "w": 1.25},
-                {"x": 12.75, "y": 4, "w": 1.25},
-
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25},
-                {"x": 16.25, "y": 4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [3, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "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, 7], "x": 3.5, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
             ]
         },
         "LAYOUT_66_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 16.25, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 16.25, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
-
-                {"x": 15.25, "y": 3.25},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25},
-                {"x": 16.25, "y": 4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [3, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
             ]
         },
         "LAYOUT_66_iso_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 16.25, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 16.25, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
-
-                {"x": 15.25, "y": 3.25},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25},
-                {"x": 16.25, "y": 4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [3, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
             ]
         },
         "LAYOUT_66_iso_rwkl": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 16.25, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 16.25, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
-
-                {"x": 15.25, "y": 3.25},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4, "w": 1.25},
-                {"x": 3.5, "y": 4, "w": 7},
-                {"x": 10.5, "y": 4, "w": 1.25},
-                {"x": 12.75, "y": 4, "w": 1.25},
-
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25},
-                {"x": 16.25, "y": 4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [3, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.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, 7], "x": 3.5, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
             ]
         },
         "LAYOUT_66_iso_rwkl_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 16.25, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 16.25, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
-
-                {"x": 15.25, "y": 3.25},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4, "w": 1.25},
-                {"x": 3.5, "y": 4, "w": 7},
-                {"x": 10.5, "y": 4, "w": 1.25},
-                {"x": 12.75, "y": 4, "w": 1.25},
-
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25},
-                {"x": 16.25, "y": 4.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [3, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.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, 7], "x": 3.5, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 16, "y": 0},
+                {"matrix": [1, 1], "x": 17, "y": 0},
+                {"matrix": [1, 2], "x": 18, "y": 0},
+                {"matrix": [1, 3], "x": 19, "y": 0},
+                {"matrix": [1, 4], "x": 20, "y": 0},
+                {"matrix": [1, 5], "x": 21, "y": 0},
+                {"matrix": [1, 6], "x": 22, "y": 0},
+                {"matrix": [1, 7], "x": 23, "y": 0},
+                {"matrix": [1, 8], "x": 24, "y": 0},
+                {"matrix": [1, 9], "x": 25, "y": 0},
+                {"matrix": [1, 10], "x": 26, "y": 0},
+                {"matrix": [1, 11], "x": 27, "y": 0},
+                {"matrix": [1, 12], "x": 28, "y": 0},
+                {"matrix": [2, 13], "x": 29, "y": 0},
+                {"matrix": [1, 14], "x": 30, "y": 0},
+
+                {"matrix": [2, 0], "x": 31, "y": 0},
+                {"matrix": [2, 1], "x": 32, "y": 0},
+                {"matrix": [2, 2], "x": 33, "y": 0},
+                {"matrix": [2, 3], "x": 34, "y": 0},
+                {"matrix": [2, 4], "x": 35, "y": 0},
+                {"matrix": [2, 5], "x": 36, "y": 0},
+                {"matrix": [2, 6], "x": 37, "y": 0},
+                {"matrix": [2, 7], "x": 38, "y": 0},
+                {"matrix": [2, 8], "x": 39, "y": 0},
+                {"matrix": [2, 9], "x": 40, "y": 0},
+                {"matrix": [2, 10], "x": 41, "y": 0},
+                {"matrix": [2, 11], "x": 42, "y": 0},
+                {"matrix": [2, 12], "x": 43, "y": 0},
+                {"matrix": [3, 13], "x": 44, "y": 0},
+
+                {"matrix": [3, 0], "x": 45, "y": 0},
+                {"matrix": [3, 1], "x": 46, "y": 0},
+                {"matrix": [3, 2], "x": 47, "y": 0},
+                {"matrix": [3, 3], "x": 48, "y": 0},
+                {"matrix": [3, 4], "x": 49, "y": 0},
+                {"matrix": [3, 5], "x": 50, "y": 0},
+                {"matrix": [3, 6], "x": 51, "y": 0},
+                {"matrix": [3, 7], "x": 52, "y": 0},
+                {"matrix": [3, 8], "x": 53, "y": 0},
+                {"matrix": [3, 9], "x": 54, "y": 0},
+                {"matrix": [3, 10], "x": 55, "y": 0},
+                {"matrix": [3, 11], "x": 56, "y": 0},
+                {"matrix": [3, 12], "x": 57, "y": 0},
+                {"matrix": [3, 14], "x": 58, "y": 0},
+
+                {"matrix": [4, 0], "x": 59, "y": 0},
+                {"matrix": [4, 1], "x": 60, "y": 0},
+                {"matrix": [4, 2], "x": 61, "y": 0},
+                {"matrix": [4, 7], "x": 62, "y": 0},
+                {"matrix": [4, 9], "x": 63, "y": 0},
+                {"matrix": [4, 10], "x": 64, "y": 0},
+                {"matrix": [4, 11], "x": 65, "y": 0},
+                {"matrix": [4, 12], "x": 66, "y": 0},
+                {"matrix": [4, 13], "x": 67, "y": 0},
+                {"matrix": [4, 14], "x": 68, "y": 0}
             ]
         }
     }
diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h
index 55b920a2b9..083b7c29f5 100644
--- a/keyboards/hineybush/h75_singa/config.h
+++ b/keyboards/hineybush/h75_singa/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, D0, D1, D2, D6 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, B2, D4, D5, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 22
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
- #endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/h75_singa/info.json b/keyboards/hineybush/h75_singa/info.json
index 94e8d256fd..c8dba88dfb 100644
--- a/keyboards/hineybush/h75_singa/info.json
+++ b/keyboards/hineybush/h75_singa/info.json
@@ -8,10 +8,18 @@
         "pid": "0xEC9A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B2", "D4", "D5", "D3"],
+        "rows": ["B0", "B1", "D0", "D1", "D2", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/hineybush/h87_g2/info.json b/keyboards/hineybush/h87_g2/info.json
index 2868e6cffb..df5b3e7799 100644
--- a/keyboards/hineybush/h87_g2/info.json
+++ b/keyboards/hineybush/h87_g2/info.json
@@ -26,40 +26,40 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "F1", "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "label": "F2", "matrix": [0, 2], "x": 3.0, "y": 0.0 },
-                { "label": "F3", "matrix": [0, 3], "x": 4.0, "y": 0.0 },
-                { "label": "F4", "matrix": [0, 4], "x": 5.0, "y": 0.0 },
-                { "label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0.0 },
-                { "label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0.0 },
-                { "label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0.0 },
-                { "label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0.0 },
-                { "label": "F9", "matrix": [0, 9], "x": 11.0, "y": 0.0 },
-                { "label": "F10", "matrix": [0, 10], "x": 12.0, "y": 0.0 },
-                { "label": "F11", "matrix": [0, 11], "x": 13.0, "y": 0.0 },
-                { "label": "F12", "matrix": [0, 12], "x": 14.0, "y": 0.0 },
-                { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0.0 },
-                { "label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0.0 },
-                { "label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0.0 },
-                { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "Backspace", "matrix": [1, 14], "w": 2.0, "x": 13.0, "y": 1.25 },
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "F2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "F3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "F4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "F9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "F10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "F11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "F12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "PrtSc", "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": "!", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": ")", "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, 14], "w": 2, "x": 13, "y": 1.25 },
                 { "label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25 },
                 { "label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25 },
                 { "label": "PgUp", "matrix": [2, 16], "x": 17.25, "y": 1.25 },
-                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "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 },
@@ -76,7 +76,7 @@
                 { "label": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
                 { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25 },
                 { "label": "PgDn", "matrix": [4, 16], "x": 17.25, "y": 2.25 },
-                { "label": "Caps", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "Caps", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "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 },
@@ -89,7 +89,7 @@
                 { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "label": "Apos", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0.0, "y": 4.25 },
+                { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "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 },
@@ -102,11 +102,11 @@
                 { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25 },
                 { "label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25 },
-                { "label": "Ctrl", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "label": "Ctrl", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "label": "Alt", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "matrix": [5, 6], "w": 7.0, "x": 4.0, "y": 5.25 },
-                { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 11, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 11], "x": 12.5, "y": 5.25 },
                 { "label": "Ctrl", "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h
index f267f09020..80a861a23e 100644
--- a/keyboards/hineybush/h87a/config.h
+++ b/keyboards/hineybush/h87a/config.h
@@ -17,29 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, D0, D1, B5, B6, D7, B4, D6, D4 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -56,4 +38,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
-#endif
diff --git a/keyboards/hineybush/h87a/h87a.c b/keyboards/hineybush/h87a/h87a.c
index 37c1725693..bf4213a200 100644
--- a/keyboards/hineybush/h87a/h87a.c
+++ b/keyboards/hineybush/h87a/h87a.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "h87a.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
diff --git a/keyboards/hineybush/h87a/h87a.h b/keyboards/hineybush/h87a/h87a.h
deleted file mode 100644
index 437199b23e..0000000000
--- a/keyboards/hineybush/h87a/h87a.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2018 Josh Hinnebusch
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_all(\
-	K000,       K001, K011, K002, K012,    K003, K013, K004, K014,    K015, K006, K016, K007,    K017, K008, K018,  \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027,    K037, K028, K038,  \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056,          K057, K048, K058,  \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K066, K076,                             \
- 	K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K086, K096,                K088,        \
-	K100, K110, K101,                   K113,                   K105, K115, K106, K116,          K117, K108, K118   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008 }, \
-	{ KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088 }, \
-	{ K090,  K091,  K092,  K093,  K094,  K095,  K096,  KC_NO, KC_NO }, \
-	{ K100,  K101,  KC_NO, KC_NO, KC_NO, K105,  K106,  KC_NO, K108 }, \
-	{ K110,  KC_NO, KC_NO, K113,  KC_NO, K115,  K116,  K117,  K118 }  \
-}
-
-
-#define LAYOUT_tkl_ansi(\
-	K000,       K001, K011, K002, K012,    K003, K013, K004, K014,    K015, K006, K016, K007,    K017, K008, K018,  \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K027,          K037, K028, K038,  \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056,          K057, K048, K058,  \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075,  K076,                                  \
- 	K080,     K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,      K086,                   K088,        \
-	K100, K110, K101,                   K113,                   K105, K115, K106, K116,          K117, K108, K118   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008 }, \
-	{ KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035, KC_NO,  K037,  K038 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065, KC_NO,  KC_NO, KC_NO }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088 }, \
-	{KC_NO,  K091,  K092,  K093,  K094,  K095, KC_NO,  KC_NO, KC_NO }, \
-	{ K100,  K101,  KC_NO, KC_NO, KC_NO, K105,  K106,  KC_NO, K108 }, \
-	{ K110,  KC_NO, KC_NO, K113,  KC_NO, K115,  K116,  K117,  K118 }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl(\
-	K000,       K001, K011, K002, K012,    K003, K013, K004, K014,    K015, K006, K016, K007,    K017, K008, K018,  \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K027,          K037, K028, K038,  \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056,          K057, K048, K058,  \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075,  K076,                                  \
- 	K080,     K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,      K086,                   K088,        \
-	K100,       K101,                   K113,                         K115,       K116,          K117, K108, K118   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008 }, \
-	{ KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035, KC_NO,  K037,  K038 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065, KC_NO,  KC_NO, KC_NO }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088 }, \
-	{KC_NO,  K091,  K092,  K093,  K094,  K095, KC_NO,  KC_NO, KC_NO }, \
-	{ K100,  K101,  KC_NO, KC_NO, KC_NO,KC_NO, KC_NO,  KC_NO, K108 }, \
-	{KC_NO,  KC_NO, KC_NO, K113,  KC_NO, K115,  K116,  K117,  K118 }  \
-}
-
diff --git a/keyboards/hineybush/h87a/info.json b/keyboards/hineybush/h87a/info.json
index db1fd91d13..a10dc4a773 100644
--- a/keyboards/hineybush/h87a/info.json
+++ b/keyboards/hineybush/h87a/info.json
@@ -8,21 +8,332 @@
         "pid": "0xECE9",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D2"],
+        "rows": ["B0", "B1", "B2", "B3", "D0", "D1", "B5", "B6", "D7", "B4", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"x":13, "y":1.5}, {"label":"Bksp", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
-        },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5},
+                {"matrix": [2, 7], "x": 14, "y": 1.5},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.5},
 
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.5},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.5}
+            ]
+        },
         "LAYOUT_tkl_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Bksp", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [2, 7], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.5}
+            ]
         },
         "LAYOUT_tkl_ansi_wkl": {
-           "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Bksp", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
-       }
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [2, 7], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h
index 9a75238cb3..0eb28d50c1 100644
--- a/keyboards/hineybush/h88/config.h
+++ b/keyboards/hineybush/h88/config.h
@@ -17,30 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, D0, D1, B5, B6, D7, B4, D6, D4 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -56,4 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
-#endif
diff --git a/keyboards/hineybush/h88/h88.c b/keyboards/hineybush/h88/h88.c
index b88722db62..9abeccd1d5 100644
--- a/keyboards/hineybush/h88/h88.c
+++ b/keyboards/hineybush/h88/h88.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "h88.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
diff --git a/keyboards/hineybush/h88/h88.h b/keyboards/hineybush/h88/h88.h
deleted file mode 100644
index f701529d18..0000000000
--- a/keyboards/hineybush/h88/h88.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2019 Josh Hinnebusch
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_all(\
-	K000, K010, K001, K011, K002, K012,    K003, K013, K004, K014,    K015, K006, K016, K007,    K017, K008, K018,  \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027,    K037, K028, K038,  \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056,          K057, K048, K058,  \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K066, K076,                             \
- 	K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K086, K096,                K088,        \
-	K100, K110, K101,                   K113,                   K105, K115, K106, K116,          K117, K108, K118   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088 }, \
-	{ K090,  K091,  K092,  K093,  K094,  K095,  K096,  KC_NO, KC_NO }, \
-	{ K100,  K101,  KC_NO, KC_NO, KC_NO, K105,  K106,  KC_NO, K108 }, \
-	{ K110,  KC_NO, KC_NO, K113,  KC_NO, K115,  K116,  K117,  K118 }  \
-}
-
-
-#define LAYOUT_tkl_ansi(\
-	K000, K010, K001, K011, K002, K012,    K003, K013, K004, K014,    K015, K006, K016, K007,    K017, K008, K018,  \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K027,          K037, K028, K038,  \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056,          K057, K048, K058,  \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075,  K076,                                  \
- 	K080,     K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,      K086,                   K088,        \
-	K100, K110, K101,                   K113,                   K105, K115, K106, K116,          K117, K108, K118   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035, KC_NO,  K037,  K038 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065, KC_NO,  KC_NO, KC_NO }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088 }, \
-	{KC_NO,  K091,  K092,  K093,  K094,  K095, KC_NO,  KC_NO, KC_NO }, \
-	{ K100,  K101,  KC_NO, KC_NO, KC_NO, K105,  K106,  KC_NO, K108 }, \
-	{ K110,  KC_NO, KC_NO, K113,  KC_NO, K115,  K116,  K117,  K118 }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl(\
-	K000, K010, K001, K011, K002, K012,    K003, K013, K004, K014,    K015, K006, K016, K007,    K017, K008, K018,  \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K027,          K037, K028, K038,  \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056,          K057, K048, K058,  \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075,  K076,                                  \
- 	K080,     K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,      K086,                   K088,        \
-	K100,       K101,                   K113,                         K115,       K116,          K117, K108, K118   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035, KC_NO,  K037,  K038 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065, KC_NO,  KC_NO, KC_NO }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088 }, \
-	{KC_NO,  K091,  K092,  K093,  K094,  K095, KC_NO,  KC_NO, KC_NO }, \
-	{ K100,  K101,  KC_NO, KC_NO, KC_NO,KC_NO, KC_NO,  KC_NO, K108 }, \
-	{KC_NO,  KC_NO, KC_NO, K113,  KC_NO, K115,  K116,  K117,  K118 }  \
-}
-
diff --git a/keyboards/hineybush/h88/info.json b/keyboards/hineybush/h88/info.json
index bd362c74b5..7c78582c76 100644
--- a/keyboards/hineybush/h88/info.json
+++ b/keyboards/hineybush/h88/info.json
@@ -8,21 +8,338 @@
         "pid": "0xECA2",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D2"],
+        "rows": ["B0", "B1", "B2", "B3", "D0", "D1", "B5", "B6", "D7", "B4", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25}, {"label":"Bksp", "x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"label":"Enter", "x":13.75, "y":3.25, "w":1.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
-        },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
 
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
         "LAYOUT_tkl_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Bksp", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [2, 7], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_ansi_wkl": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Bksp", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
-       }
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [2, 7], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+            ]
+        }
     }
 }
diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h
index e0eed7f414..5fe30d87e5 100644
--- a/keyboards/hineybush/hbcp/config.h
+++ b/keyboards/hineybush/hbcp/config.h
@@ -38,8 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //EITHERWAY is supported through a custom matrix
 //#define DIODE_DIRECTION EITHERWAY
 
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 27
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -57,8 +55,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/info.json
index 0e31272ed4..72364cce8b 100644
--- a/keyboards/hineybush/hbcp/info.json
+++ b/keyboards/hineybush/hbcp/info.json
@@ -12,6 +12,9 @@
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/hineybush/hineyg80/config.h b/keyboards/hineybush/hineyg80/config.h
index acf19753f5..5f36081323 100644
--- a/keyboards/hineybush/hineyg80/config.h
+++ b/keyboards/hineybush/hineyg80/config.h
@@ -1,32 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B2, B3, D0, B1, D2, D1, D5, D3, D6, D4, B4, D7 }
-#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, B7, B0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/hineybush/hineyg80/hineyg80.c b/keyboards/hineybush/hineyg80/hineyg80.c
deleted file mode 100644
index a56e46e9de..0000000000
--- a/keyboards/hineybush/hineyg80/hineyg80.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Josh Hinnebusch
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hineyg80.h"
diff --git a/keyboards/hineybush/hineyg80/info.json b/keyboards/hineybush/hineyg80/info.json
index dcc3aa5f29..2df90c7957 100644
--- a/keyboards/hineybush/hineyg80/info.json
+++ b/keyboards/hineybush/hineyg80/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B7", "B0"],
+        "rows": ["B2", "B3", "D0", "B1", "D2", "D1", "D5", "D3", "D6", "D4", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "num_lock": "C6",
diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h
index ee7b90de23..91a587046a 100644
--- a/keyboards/hineybush/physix/config.h
+++ b/keyboards/hineybush/physix/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, C7, C6 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B3, B2, B1, B0, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 26
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
- #endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/physix/info.json b/keyboards/hineybush/physix/info.json
index b611de62e4..191621ff47 100644
--- a/keyboards/hineybush/physix/info.json
+++ b/keyboards/hineybush/physix/info.json
@@ -8,303 +8,359 @@
         "pid": "0xEC81",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "B1", "B0", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D0", "D1", "D2", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"~", "x":16.25, "y":0.25},
-                {"label":"Back", "x":17.25, "y":0.25},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2},
-                {"x":11, "y":4.25},
-                {"label":"Right Alt", "x":12, "y":4.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"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.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 12], "x": 16.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 17.25, "y": 0.25},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"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.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": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"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.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 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": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2},
+                {"matrix": [4, 8], "x": 11, "y": 4.25},
+                {"matrix": [4, 9], "x": 12, "y": 4.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_split_bksp_275_rspace": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"~", "x":16.25, "y":0.25},
-                {"label":"Back", "x":17.25, "y":0.25},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2.75},
-                {"label":"Right Alt", "x":11.75, "y":4.25, "w":1.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"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.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 12], "x": 16.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 17.25, "y": 0.25},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"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.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": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"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.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 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": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_full_bksp_275_rspace": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"Back", "x":16.25, "y":0.25, "w":2},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2.75},
-                {"label":"Right Alt", "x":11.75, "y":4.25, "w":1.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"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.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 16.25, "y": 0.25, "w": 2},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"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.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": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"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.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 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": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_full_bksp_200_rspace": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"Back", "x":16.25, "y":0.25, "w":2},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2},
-                {"x":11, "y":4.25},
-                {"label":"Right Alt", "x":12, "y":4.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"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.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 16.25, "y": 0.25, "w": 2},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"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.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": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"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.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 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": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2},
+                {"matrix": [4, 8], "x": 11, "y": 4.25},
+                {"matrix": [4, 9], "x": 12, "y": 4.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/hineybush/physix/physix.c b/keyboards/hineybush/physix/physix.c
index 99614aeb78..c118b30d2e 100644
--- a/keyboards/hineybush/physix/physix.c
+++ b/keyboards/hineybush/physix/physix.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "physix.h"
+#include "quantum.h"
 
 // Optional override functions below.
 // You can leave any or all of these undefined.
diff --git a/keyboards/hineybush/physix/physix.h b/keyboards/hineybush/physix/physix.h
deleted file mode 100644
index c081a53806..0000000000
--- a/keyboards/hineybush/physix/physix.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright 2019 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,       k408, k409,       k410, k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, k012, k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,k408, k409 ,k410, k411, k412, k413, KC_NO}  \
-}
-
-#define LAYOUT_split_bksp_275_rspace( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,       k409,       k410,       k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, k012, k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,KC_NO,k409 ,k410, k411, k412, k413, KC_NO}  \
-}
-
-#define LAYOUT_full_bksp_275_rspace( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011,       k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,             k409, k410, k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, KC_NO,k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,KC_NO,k409 ,k410, k411, k412, k413, KC_NO}  \
-}
-
-#define LAYOUT_full_bksp_200_rspace( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011,       k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,       k408, k409, k410, k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, KC_NO,k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,k408, k409 ,k410, k411, k412, k413, KC_NO}  \
-}
diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h
index c11c6431ce..9a1c6fa284 100644
--- a/keyboards/hineybush/sm68/config.h
+++ b/keyboards/hineybush/sm68/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B2, B1, B0, D4, D1 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 16
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
    #define RGBLIGHT_EFFECT_RGB_TEST
    #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hineybush/sm68/info.json b/keyboards/hineybush/sm68/info.json
index 642e7b5e07..6029c4faf9 100644
--- a/keyboards/hineybush/sm68/info.json
+++ b/keyboards/hineybush/sm68/info.json
@@ -8,14 +8,179 @@
         "pid": "0xEC9F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D3", "D2"],
+        "rows": ["B2", "B1", "B0", "D4", "D1"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_68_ansi_split_bs_rshift": {
-                "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Insert", "x":15.5, "y":0}, {"x":16.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.5, "y":1}, {"x":16.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"\u2191", "x":15.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"\u2190", "x":14.5, "y":4}, {"label":"\u2193", "x":15.5, "y":4}, {"label":"\u2192", "x":16.5, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.5, "y": 4},
+                {"matrix": [4, 15], "x": 16.5, "y": 4}
+            ]
         },
         "LAYOUT_68_ansi_split_rshift": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15.5, "y":1}, {"x":16.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"\u2191", "x":15.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"\u2190", "x":14.5, "y":4}, {"label":"\u2193", "x":15.5, "y":4}, {"label":"\u2192", "x":16.5, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.5, "y": 4},
+                {"matrix": [4, 15], "x": 16.5, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/hineybush/sm68/sm68.c b/keyboards/hineybush/sm68/sm68.c
deleted file mode 100644
index 54fd8ab0a3..0000000000
--- a/keyboards/hineybush/sm68/sm68.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "sm68.h"
diff --git a/keyboards/hineybush/sm68/sm68.h b/keyboards/hineybush/sm68/sm68.h
deleted file mode 100644
index 23270d4a3b..0000000000
--- a/keyboards/hineybush/sm68/sm68.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2019 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-// split backspace
-#define LAYOUT_68_ansi_split_bs_rshift( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113,   k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213,         k114, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,                           \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,               k314,       \
-    k400, k401, k402,       k404,              k408, k409, k410,                          k413, k414, k415  \
-) \
-{ \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015  }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115  }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, KC_NO,KC_NO}, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, KC_NO,k314, KC_NO}, \
-    { k400, k401, k402, KC_NO,k404,KC_NO, KC_NO,KC_NO,k408, k409, k410, KC_NO, KC_NO,k413,k414, k415}  \
-}
-
-// full backspace
-#define LAYOUT_68_ansi_split_rshift( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,       k113,   k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213,         k114, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,                           \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,               k314,       \
-    k400, k401, k402,       k404,              k408, k409, k410,                          k413, k414, k415  \
-) \
-{ \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,KC_NO, k014, k015  }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115  }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, KC_NO,KC_NO}, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, KC_NO,k314, KC_NO}, \
-    { k400, k401, k402, KC_NO,k404,KC_NO, KC_NO,KC_NO,k408, k409, k410, KC_NO,KC_NO,k413, k414, k415}  \
-}
diff --git a/keyboards/hnahkb/freyr/config.h b/keyboards/hnahkb/freyr/config.h
index 1903af4ff1..9f9d81bea9 100644
--- a/keyboards/hnahkb/freyr/config.h
+++ b/keyboards/hnahkb/freyr/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, B2, B1, B0, E6, F0, D2, D5, F4, F1 }
-#define MATRIX_COL_PINS { B4, D7, D6, D4, B5, C7, C6, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/hnahkb/freyr/freyr.c b/keyboards/hnahkb/freyr/freyr.c
deleted file mode 100644
index a856521e7f..0000000000
--- a/keyboards/hnahkb/freyr/freyr.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "freyr.h"
diff --git a/keyboards/hnahkb/freyr/freyr.h b/keyboards/hnahkb/freyr/freyr.h
deleted file mode 100644
index ce41dfd255..0000000000
--- a/keyboards/hnahkb/freyr/freyr.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73, k74,   k75, k76, k67, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82, k83,        k78, k77, k68, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94, k85, k93,             k79, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,        k58, k59, k69 \
-) { \
-    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79 }, \
-    { k80, k81, k82, k83, k84, k85, XXX, XXX, XXX, XXX }, \
-    { k90, k91, k92, k93, k94, k95, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,   k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73,   k75, k76, k67, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82, k83,   k78, k77, k68, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91,      k84, \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,      k93,        k79, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k69 \
-) { \
-    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79 }, \
-    { k80, k81, k82, k83, k84, XXX, XXX, XXX, XXX, XXX }, \
-    { k90, k91, XXX, k93, k94, k95, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_tkl_iso( \
-    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,   k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73,   k75, k76, k67, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,        k78, k77, k68, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,      k93,        k79, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k69 \
-) { \
-    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79 }, \
-    { k80, k81, k82, XXX, k84, XXX, XXX, XXX, XXX, XXX }, \
-    { k90, k91, k92, k93, k94, k95, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/hnahkb/freyr/info.json b/keyboards/hnahkb/freyr/info.json
index 7c946bd78a..0bc3c9a9c6 100644
--- a/keyboards/hnahkb/freyr/info.json
+++ b/keyboards/hnahkb/freyr/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1895",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "C6", "F5", "F6", "F7"],
+        "rows": ["D3", "B2", "B1", "B0", "E6", "F0", "D2", "D5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "breathing": true
@@ -23,319 +28,319 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25},
-                {"x": 14, "y": 1.25},
-
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25},
-                {"x": 13.25, "y": 4.25, "w": 1.75},
-
-                {"x": 16.25, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [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.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25},
+                {"matrix": [7, 4], "x": 14, "y": 1.25},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [7, 9], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"x": 0, "y": 4.25, "w": 2.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"x": 16.25, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [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.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [7, 9], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"x": 16.25, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [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.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [7, 9], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h
index 34c3aafab4..3589952afb 100644
--- a/keyboards/hnahkb/stella/config.h
+++ b/keyboards/hnahkb/stella/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, B2, B1, B0, E6, F0, D2, D5, F4, F1 }
-#define MATRIX_COL_PINS { B4, D7, D6, D4, B5, C7, C6, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 14
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/hnahkb/stella/info.json b/keyboards/hnahkb/stella/info.json
index 593dc47771..0c002b22c4 100644
--- a/keyboards/hnahkb/stella/info.json
+++ b/keyboards/hnahkb/stella/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0AB7",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "C6", "F5", "F6", "F7"],
+        "rows": ["D3", "B2", "B1", "B0", "E6", "F0", "D2", "D5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "breathing": true
@@ -17,325 +22,328 @@
         "scroll_lock": "B7",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi", "tkl_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25},
-                {"x": 14, "y": 1.25},
-
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25},
-                {"x": 13.25, "y": 4.25, "w": 1.75},
-
-                {"x": 16.25, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [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.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25},
+                {"matrix": [7, 4], "x": 14, "y": 1.25},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [7, 9], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"x": 0, "y": 4.25, "w": 2.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"x": 16.25, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [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.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [7, 9], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"x": 16.25, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [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.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [7, 9], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/hnahkb/stella/stella.c b/keyboards/hnahkb/stella/stella.c
deleted file mode 100644
index 5eb55b3668..0000000000
--- a/keyboards/hnahkb/stella/stella.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "stella.h"
diff --git a/keyboards/hnahkb/stella/stella.h b/keyboards/hnahkb/stella/stella.h
deleted file mode 100644
index ce41dfd255..0000000000
--- a/keyboards/hnahkb/stella/stella.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73, k74,   k75, k76, k67, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82, k83,        k78, k77, k68, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94, k85, k93,             k79, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,        k58, k59, k69 \
-) { \
-    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79 }, \
-    { k80, k81, k82, k83, k84, k85, XXX, XXX, XXX, XXX }, \
-    { k90, k91, k92, k93, k94, k95, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,   k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73,   k75, k76, k67, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82, k83,   k78, k77, k68, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91,      k84, \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,      k93,        k79, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k69 \
-) { \
-    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79 }, \
-    { k80, k81, k82, k83, k84, XXX, XXX, XXX, XXX, XXX }, \
-    { k90, k91, XXX, k93, k94, k95, XXX, XXX, XXX, XXX } \
-}
-
-#define LAYOUT_tkl_iso( \
-    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,   k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73,   k75, k76, k67, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,        k78, k77, k68, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,      k93,        k79, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k69 \
-) { \
-    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79 }, \
-    { k80, k81, k82, XXX, k84, XXX, XXX, XXX, XXX, XXX }, \
-    { k90, k91, k92, k93, k94, k95, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h
index 8436f5df25..7f4d268cf4 100644
--- a/keyboards/hnahkb/vn66/config.h
+++ b/keyboards/hnahkb/vn66/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B2, B3, D2, F7 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, C6, C7, B5, B4, D7, D6, D4, D5, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 20
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hnahkb/vn66/info.json b/keyboards/hnahkb/vn66/info.json
index b35cabd1a1..aca0104810 100644
--- a/keyboards/hnahkb/vn66/info.json
+++ b/keyboards/hnahkb/vn66/info.json
@@ -8,6 +8,11 @@
         "pid": "0xCA2C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "F1", "F0", "C6", "C7", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "D2", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "B7", "resolution": 2}
@@ -22,247 +27,249 @@
         "caps_lock": "E6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["66_ansi", "66_iso"],
+        "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_66_ansi",
+        "LAYOUT_iso": "LAYOUT_66_iso"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [4, 13], "x": 14, "y": 0},
+                {"matrix": [4, 12], "x": 15.25, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 11], "x": 15.25, "y": 1},
 
-                {"x": 15.25, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
 
-                {"x": 14.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, 4], "x": 3.5, "y": 4, "w": 6},
+                {"matrix": [4, 5], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 10.75, "y": 4},
+                {"matrix": [4, 7], "x": 11.75, "y": 4, "w": 1.25},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4, "w": 1.25},
-                {"x": 3.5, "y": 4, "w": 6},
-                {"x": 9.5, "y": 4, "w": 1.25},
-                {"x": 10.75, "y": 4},
-                {"x": 11.75, "y": 4, "w": 1.25},
-
-                {"x": 13.25, "y": 4.25},
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25}
+                {"matrix": [4, 8], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25}
             ]
         },
         "LAYOUT_66_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x": 15.25, "y": 0},
+                {"matrix": [4, 12], "x": 15.25, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 15.25, "y": 1},
+                {"matrix": [4, 11], "x": 15.25, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 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},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
 
-                {"x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4, "w": 1.25},
-                {"x": 3.5, "y": 4, "w": 6},
-                {"x": 9.5, "y": 4, "w": 1.25},
-                {"x": 10.75, "y": 4},
-                {"x": 11.75, "y": 4, "w": 1.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, 4], "x": 3.5, "y": 4, "w": 6},
+                {"matrix": [4, 5], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 10.75, "y": 4},
+                {"matrix": [4, 7], "x": 11.75, "y": 4, "w": 1.25},
 
-                {"x": 13.25, "y": 4.25},
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25}
+                {"matrix": [4, 8], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25}
             ]
         },
         "LAYOUT_66_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-
-                {"x": 15.25, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-
-                {"x": 15.25, "y": 1},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [4, 12], "x": 15.25, "y": 0},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [4, 11], "x": 15.25, "y": 1},
 
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
 
-                {"x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4, "w": 1.25},
-                {"x": 3.5, "y": 4, "w": 6},
-                {"x": 9.5, "y": 4, "w": 1.25},
-                {"x": 10.75, "y": 4},
-                {"x": 11.75, "y": 4, "w": 1.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, 4], "x": 3.5, "y": 4, "w": 6},
+                {"matrix": [4, 5], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 10.75, "y": 4},
+                {"matrix": [4, 7], "x": 11.75, "y": 4, "w": 1.25},
 
-                {"x": 13.25, "y": 4.25},
-                {"x": 14.25, "y": 4.25},
-                {"x": 15.25, "y": 4.25}
+                {"matrix": [4, 8], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/hnahkb/vn66/vn66.c b/keyboards/hnahkb/vn66/vn66.c
deleted file mode 100644
index 5631359040..0000000000
--- a/keyboards/hnahkb/vn66/vn66.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vn66.h"
diff --git a/keyboards/hnahkb/vn66/vn66.h b/keyboards/hnahkb/vn66/vn66.h
deleted file mode 100644
index c8a356fdba..0000000000
--- a/keyboards/hnahkb/vn66/vn66.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4D, k4C, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k4B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, \
-    k40, k41, k42,                k44,                k45, k46, k47, k48, k49, k4A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
-    { k40, k41, k42, XXX, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \
-}
-
-#define LAYOUT_66_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4C, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k4B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, \
-    k40, k41, k42,                k44,                k45, k46, k47, k48, k49, k4A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
-    { k40, k41, k42, XXX, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX } \
-}
-
-#define LAYOUT_66_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k4C, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k4B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, \
-    k40, k41, k42,                k44,                k45, k46, k47, k48, k49, k4A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
-    { k40, k41, k42, XXX, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX } \
-}
-
-#define LAYOUT_ansi LAYOUT_66_ansi
-#define LAYOUT_iso LAYOUT_66_iso
diff --git a/keyboards/holyswitch/southpaw75/config.h b/keyboards/holyswitch/southpaw75/config.h
deleted file mode 100644
index 01cf1b8144..0000000000
--- a/keyboards/holyswitch/southpaw75/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2020 drewguy
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-//                         0   1   2   3   4   5   6   7   8
-#define MATRIX_ROW_PINS { B2, F0, C6, D4, D3, F1, D2, B5, D5 }
-#define MATRIX_COL_PINS { B6, F7, F6, F5, F4, D0, D1, D7, B4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/holyswitch/southpaw75/info.json b/keyboards/holyswitch/southpaw75/info.json
index 6171d8a41a..d2db4689ae 100644
--- a/keyboards/holyswitch/southpaw75/info.json
+++ b/keyboards/holyswitch/southpaw75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5350",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "F7", "F6", "F5", "F4", "D0", "D1", "D7", "B4"],
+        "rows": ["B2", "F0", "C6", "D4", "D3", "F1", "D2", "B5", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/holyswitch/southpaw75/southpaw75.c b/keyboards/holyswitch/southpaw75/southpaw75.c
deleted file mode 100644
index 9024602277..0000000000
--- a/keyboards/holyswitch/southpaw75/southpaw75.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "southpaw75.h"
diff --git a/keyboards/horizon/config.h b/keyboards/horizon/config.h
index 3505042e3a..24264fee6c 100644
--- a/keyboards/horizon/config.h
+++ b/keyboards/horizon/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D3, D2, D1, F4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7, C6, D4, D0 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/horizon/horizon.c b/keyboards/horizon/horizon.c
deleted file mode 100644
index 08360325ec..0000000000
--- a/keyboards/horizon/horizon.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Steven Karrmann
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "horizon.h"
diff --git a/keyboards/horizon/info.json b/keyboards/horizon/info.json
index d6b919338f..3198bcf28f 100644
--- a/keyboards/horizon/info.json
+++ b/keyboards/horizon/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0"],
+    "rows": ["D3", "D2", "D1", "F4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/horrortroll/caticorn/caticorn.c b/keyboards/horrortroll/caticorn/caticorn.c
deleted file mode 100644
index b416eefdde..0000000000
--- a/keyboards/horrortroll/caticorn/caticorn.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "caticorn.h"
diff --git a/keyboards/horrortroll/caticorn/caticorn.h b/keyboards/horrortroll/caticorn/caticorn.h
deleted file mode 100644
index 87e1202dec..0000000000
--- a/keyboards/horrortroll/caticorn/caticorn.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_horrortroll_caticorn_rev1_hotswap)
-    #include "hotswap.h"
-#elif defined(KEYBOARD_horrortroll_caticorn_rev1_solder)
-    #include "solder.h"
-#endif
diff --git a/keyboards/horrortroll/caticorn/config.h b/keyboards/horrortroll/caticorn/config.h
deleted file mode 100644
index ad43bb2b3d..0000000000
--- a/keyboards/horrortroll/caticorn/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { GP7, GP0, GP8, GP25, GP11, GP12 }
-#define MATRIX_COL_PINS \
-    { GP6, GP5, GP4, GP3, GP2, GP1, GP20, GP21, GP16, GP17, GP18, GP19, GP15, GP14, GP13, GP10, GP9 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/hotswap.h b/keyboards/horrortroll/caticorn/rev1/hotswap/hotswap.h
deleted file mode 100644
index e3c2584f14..0000000000
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/hotswap.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_f13_ansi( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
-       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
-    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
index f336f57a52..d53b92ee8f 100644
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
@@ -8,105 +8,119 @@
         "pid": "0x6002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP20", "GP21", "GP16", "GP17", "GP18", "GP19", "GP15", "GP14", "GP13", "GP10", "GP9"],
+        "rows": ["GP7", "GP0", "GP8", "GP25", "GP11", "GP12"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "RP2040",
     "bootloader": "rp2040",
     "community_layouts": ["tkl_f13_ansi"],
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
 
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/info.json b/keyboards/horrortroll/caticorn/rev1/solder/info.json
index 4eb4941102..30fb0f0eee 100644
--- a/keyboards/horrortroll/caticorn/rev1/solder/info.json
+++ b/keyboards/horrortroll/caticorn/rev1/solder/info.json
@@ -8,1668 +8,1818 @@
         "pid": "0x6001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP20", "GP21", "GP16", "GP17", "GP18", "GP19", "GP15", "GP14", "GP13", "GP10", "GP9"],
+        "rows": ["GP7", "GP0", "GP8", "GP25", "GP11", "GP12"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "RP2040",
     "bootloader": "rp2040",
     "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", "tkl_f13_ansi_tsangan", "tkl_f13_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift", "tkl_f13_iso", "tkl_f13_iso_split_bs_rshift", "tkl_f13_iso_tsangan", "tkl_f13_iso_tsangan_split_bs_rshift"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"International 3", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 14], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"International 3", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 14], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"International 3", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 14], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"International 3", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 14], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"International 3", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 14], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"ISO Hash", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"International 3", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"ISO Hash", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 14], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"ISO Hash", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"International 3", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"ISO Hash", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 14], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"ISO Hash", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"International 3", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"ISO Hash", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 14], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"ISO Hash", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"International 3", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"ISO Hash", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 14], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/solder.h b/keyboards/horrortroll/caticorn/rev1/solder/solder.h
deleted file mode 100644
index a43282df50..0000000000
--- a/keyboards/horrortroll/caticorn/rev1/solder/solder.h
+++ /dev/null
@@ -1,582 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-
-#define LAYOUT_all( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
-    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───�┌───┬───┬───�
- * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
-       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
-    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───�┌───┬───┬───�
- * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_ansi_split_bs_rshift( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
-       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
-    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───�┌───┬───┬───�
- * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
-       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
-    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───�┌───┬───┬───�
- * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_ansi_tsangan_split_bs_rshift( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
-       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
-    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_f13_ansi( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
-       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
-    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
-       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
-    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
-       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
-    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,  K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                   \
-       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
-    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───�┌───┬───┬───�
- * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�3D  │└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_iso( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
-    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───�┌───┬───┬───�
- * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�3D  │└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_iso_split_bs_rshift( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
-    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───�┌───┬───┬───�
- * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�3D  │└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_iso_tsangan( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
-    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───�┌───┬───┬───�
- * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�3D  │└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_iso_tsangan_split_bs_rshift( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
-    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�3D  │└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_f13_iso( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
-    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�3D  │└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_f13_iso_split_bs_rshift( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
-    K50,  K51,  K52,               K56,               K5A,  K5B,  K5C,  K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�3D  │└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │    │4F │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_f13_iso_tsangan( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,   K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,     K4D,           K4F,      \
-    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-/*
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │3E │1D ││1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │     ││2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�3D  │└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │2D │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │    │4F │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5B   │5C │5D   ││5E │5F │5G │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-
-#define LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,  K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K3E, K1D, K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                 \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4D,   K4E,      K4F,      \
-    K50,   K51, K52,                  K56,                  K5B,   K5C, K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/black_e65.c b/keyboards/horrortroll/chinese_pcb/black_e65/black_e65.c
deleted file mode 100644
index 968d0da903..0000000000
--- a/keyboards/horrortroll/chinese_pcb/black_e65/black_e65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "black_e65.h"
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/black_e65.h b/keyboards/horrortroll/chinese_pcb/black_e65/black_e65.h
deleted file mode 100644
index a28f3fed2b..0000000000
--- a/keyboards/horrortroll/chinese_pcb/black_e65/black_e65.h
+++ /dev/null
@@ -1,858 +0,0 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- * │40  │41  │42  │46                      │48 │49 │4A │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,  K41,  K42,               K46,               K48, K49, K4A, K4B, K4C, K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │40  │41  │42  │46                      │48   │4A   │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_65_all_noblocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,  K41,  K42,               K46,               K48,   K4A,    K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │40  │41  │42  │46                      │48   │4A   │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_noblocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,  K41,  K42,               K46,               K48,   K4A,    K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │40  │41  │42  │46                      │48   │4A   │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_noblocker_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,  K41,  K42,               K46,               K48,   K4A,    K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │40  │41  │42  │46                      │48   │4A   │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_noblocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,  K41,  K42,               K46,               K48,   K4A,    K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │40  │41  │42  │46                      │48   │4A   │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_noblocker_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,  K41,  K42,               K46,               K48,   K4A,    K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │48  │49  │ │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_all_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,  K41,  K42,               K46,               K48,  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │48  │49  │ │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,  K41,  K42,               K46,               K48,  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │48  │49  │ │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_blocker_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,  K41,  K42,               K46,               K48,  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │48  │49  │ │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,  K41,  K42,               K46,               K48,  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │48  │49  │ │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_blocker_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,  K41,  K42,               K46,               K48,  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, K48, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │40   │41   │46                         │48   │4A   │4B │4C │4D │
- * └─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_65_all_7u_noblocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,   K41,                  K46,                 K48,   K4A,    K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├─────┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │40   │41   │46                         │48   │4A   │4B │4C │4D │
- * └─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_7u_noblocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,   K41,                  K46,                 K48,   K4A,    K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├─────┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │40   │41   │46                         │48   │4A   │4B │4C │4D │
- * └─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_7u_noblocker_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,   K41,                  K46,                 K48,   K4A,    K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │40   │41   │46                         │48   │4A   │4B │4C │4D │
- * └─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_7u_noblocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,   K41,                  K46,                 K48,   K4A,    K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │40   │41   │46                         │48   │4A   │4B │4C │4D │
- * └─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_7u_noblocker_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,   K41,                  K46,                 K48,   K4A,    K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, K46, XXX, K48, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │40   │41 │42   │46                         │49   │ │4B │4C │4D │
- * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_all_7u_wk( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,   K41, K42,                  K46,                  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │40   │41 │42   │46                         │49   │ │4B │4C │4D │
- * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_7u_wk( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,   K41, K42,                  K46,                  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │40   │41 │42   │46                         │49   │ │4B │4C │4D │
- * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_7u_wk_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,   K41, K42,                  K46,                  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │40   │41 │42   │46                         │49   │ │4B │4C │4D │
- * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_7u_wk( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,   K41, K42,                  K46,                  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │40   │41 │42   │46                         │49   │ │4B │4C │4D │
- * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_7u_wk_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,   K41, K42,                  K46,                  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │40   │   │42   │46                         │49   │ │4B │4C │4D │
- * └─────┘   └─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_all_7u_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,        K42,                  K46,                  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, XXX, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │40   │   │42   │46                         │49   │ │4B │4C │4D │
- * └─────┘   └─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_7u_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,        K42,                  K46,                  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, XXX, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │40   │   │42   │46                         │49   │ │4B │4C │4D │
- * └─────┘   └─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_7u_wkl_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,        K42,                  K46,                  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, XXX, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │40   │   │42   │46                         │49   │ │4B │4C │4D │
- * └─────┘   └─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_7u_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,        K42,                  K46,                  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, XXX, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │40   │   │42   │46                         │49   │ │4B │4C │4D │
- * └─────┘   └─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_7u_wkl_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-    K40,        K42,                  K46,                  K49,     K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, XXX, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * └─┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─┬───┼───┼───┤
- *   │40 │41   │46                         │48   │49 │ │4B │4C │4D │
- *   └───┴─────┴───────────────────────────┴─────┴───┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_all_7u_hhkb( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-      K40, K41,                  K46,                  K48,   K49,   K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, K46, XXX, K48, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * └─┬───┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─┬───┼───┼───┤
- *   │40 │41   │46                         │48   │49 │ │4B │4C │4D │
- *   └───┴─────┴───────────────────────────┴─────┴───┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_7u_hhkb( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-      K40, K41,                  K46,                  K48,   K49,   K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, K46, XXX, K48, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * └─┬───┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─┬───┼───┼───┤
- *   │40 │41   │46                         │48   │49 │ │4B │4C │4D │
- *   └───┴─────┴───────────────────────────┴─────┴───┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_7u_hhkb_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K2C,  K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K1D,    K2E, \
-       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-      K40, K41,                  K46,                  K48,   K49,   K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, K46, XXX, K48, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * └─┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─┬───┼───┼───┤
- *   │40 │41   │46                         │48   │49 │ │4B │4C │4D │
- *   └───┴─────┴───────────────────────────┴─────┴───┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_7u_hhkb( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,   K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-      K40, K41,                  K46,                  K48,   K49,   K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, K46, XXX, K48, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�1D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * └─┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─┬───┼───┼───┤
- *   │40 │41   │46                         │48   │49 │ │4B │4C │4D │
- *   └───┴─────┴───────────────────────────┴─────┴───┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_iso_7u_hhkb_splitbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E, \
-      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,  K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,   K3D, K3E, \
-      K40, K41,                  K46,                  K48,   K49,   K4B, K4C, K4D  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, K46, XXX, K48, K49, XXX, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
index 9e040808d2..3b5cf84cbd 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
@@ -16,20 +16,11 @@
 
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
 #ifdef RGBLIGHT_ENABLE
     /* RGB Lighting config */
-    #define RGB_DI_PIN E2
     #define RGBLED_NUM 24
 
     /* RGB Lighting effect */
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
index 24fae0c08a..11b53d695c 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 6
@@ -15,2346 +20,2349 @@
     "indicators": {
         "caps_lock": "C7"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_noblocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_noblocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_noblocker_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_noblocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_noblocker_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_7u_noblocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_7u_noblocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_7u_noblocker_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_7u_noblocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_7u_noblocker_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_7u_wk": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_7u_wk": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_7u_wk_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_7u_wk": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_7u_wk_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_7u_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_7u_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_7u_wkl_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_7u_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_7u_wkl_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_7u_hhkb": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0.5, "y":4},
-                {"label":"Win", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_7u_hhkb": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0.5, "y":4},
-                {"label":"Win", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_7u_hhkb_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0.5, "y":4},
-                {"label":"Win", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_7u_hhkb": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0.5, "y":4},
-                {"label":"Win", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_7u_hhkb_splitbs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"`~", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"ISO Hash", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Fn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0.5, "y":4},
-                {"label":"Win", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Fn", "x":11.5, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
index fde006a091..266cc0ea78 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { B7, B3, B2, F6, F7 }
-#define MATRIX_COL_PINS { B1, B0, B5, B6, C6, C7, E2, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
@@ -34,9 +26,6 @@
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
-    /* RGB Matrix config */
-    #define RGB_DI_PIN E6
-
     /* RGB Matrix effect */
     #define ENABLE_RGB_MATRIX_ALPHAS_MODS
     #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
index 3129a4af5d..98a35e7483 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "devil68_pro.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.h
deleted file mode 100644
index 0c83132f57..0000000000
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │0F │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │2F │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │3F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- * │40  │41  │43  │46                      │4A │4B │4C │4D │4E │4F │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,     K0F, \
-     K10,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E,    K1F, \
-      K20,   K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,    K2D,      K2F, \
-       K31,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,     K3E, K3F, \
-    K40,  K41,  K43,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F }  \
-}
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
index 96168dd67e..0a4f93e10d 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
@@ -8,83 +8,94 @@
         "pid": "0x7001",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "B5", "B6", "C6", "C7", "E2", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B7", "B3", "B2", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"`~", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk b/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk
index e3a981b634..138bf78056 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
index 07e9591b24..cae7c8b11a 100644
--- a/keyboards/horrortroll/handwired_k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { C12, C10, A10, A8, C8, C9 }
-#define MATRIX_COL_PINS { B15,  C6,  C7, A3, A1, C3, C1, B14, B13, A9, B3, B4, A0, C11, C4, C0, C2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
@@ -60,9 +52,6 @@
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
     #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 
-    /* RGB Matrix config */
-    #define RGB_DI_PIN C14
-
     /* RGB Matrix effect */
     #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
     #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
diff --git a/keyboards/horrortroll/handwired_k552/handwired_k552.c b/keyboards/horrortroll/handwired_k552/handwired_k552.c
index f4ce6d4c86..c6181d178e 100644
--- a/keyboards/horrortroll/handwired_k552/handwired_k552.c
+++ b/keyboards/horrortroll/handwired_k552/handwired_k552.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "handwired_k552.h"
+#include "quantum.h"
 
 // OLED animation
 #include "lib/logo.h"
diff --git a/keyboards/horrortroll/handwired_k552/handwired_k552.h b/keyboards/horrortroll/handwired_k552/handwired_k552.h
deleted file mode 100644
index 7811c0e82e..0000000000
--- a/keyboards/horrortroll/handwired_k552/handwired_k552.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- * │00 │   │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │     │4F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───�
- * │50  │51  │52  │53                      │54  │55  │56  │58  │ │5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,    K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,   K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                    \
-       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,           K4F,      \
-    K50,  K51,  K52,                K53,                K54,  K55,  K56,  K58,  K5E, K5F, K5G  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, K53, K54, K55, K56, XXX, K58, XXX, XXX, XXX, XXX, XXX, K5E, K5F, K5G }, \
-}
diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
index 150973eaf0..2d97949c82 100644
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/info.json
@@ -8,102 +8,121 @@
         "pid": "0x5104",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C14"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B15", "C6", "C7", "A3", "A1", "C3", "C1", "B14", "B13", "A9", "B3", "B4", "A0", "C11", "C4", "C0", "C2"],
+        "rows": ["C12", "C10", "A10", "A8", "C8", "C9"]
+    },
+    "diode_direction": "ROW2COL",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
 
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 13.75, "y": 5.25, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"App", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/horrortroll/handwired_k552/lib/bongocat.h b/keyboards/horrortroll/handwired_k552/lib/bongocat.h
index 65ceabc682..2ffeca1993 100644
--- a/keyboards/horrortroll/handwired_k552/lib/bongocat.h
+++ b/keyboards/horrortroll/handwired_k552/lib/bongocat.h
@@ -14,4 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 void render_bongocat(void);
diff --git a/keyboards/horrortroll/handwired_k552/lib/galaxy.h b/keyboards/horrortroll/handwired_k552/lib/galaxy.h
index 54ce2ad90a..3173278eff 100644
--- a/keyboards/horrortroll/handwired_k552/lib/galaxy.h
+++ b/keyboards/horrortroll/handwired_k552/lib/galaxy.h
@@ -14,4 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 void render_galaxy(void);
diff --git a/keyboards/horrortroll/handwired_k552/lib/logo.h b/keyboards/horrortroll/handwired_k552/lib/logo.h
index 5a917ae820..ba53e55476 100644
--- a/keyboards/horrortroll/handwired_k552/lib/logo.h
+++ b/keyboards/horrortroll/handwired_k552/lib/logo.h
@@ -14,4 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 void render_logo(void);
diff --git a/keyboards/horrortroll/handwired_k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk
index 9f0cc2d7a0..2d1a6e93ca 100644
--- a/keyboards/horrortroll/handwired_k552/rules.mk
+++ b/keyboards/horrortroll/handwired_k552/rules.mk
@@ -31,7 +31,6 @@ OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # OLED enabled
 OLED_ENABLE = yes
diff --git a/keyboards/horrortroll/lemon40/config.h b/keyboards/horrortroll/lemon40/config.h
index e40642946b..14ae995d43 100644
--- a/keyboards/horrortroll/lemon40/config.h
+++ b/keyboards/horrortroll/lemon40/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D7, E6, B4, B5, D4, C6, D2, D3 }
-#define MATRIX_COL_PINS { F5, F6, B1, B3, B2, B6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
@@ -31,7 +23,6 @@
 #ifdef RGBLIGHT_ENABLE
    
     /* RGB light pin */
-    #define RGB_DI_PIN F4
     #define RGBLED_NUM 15
 
     /* RGB light effect */
diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json
index 40e6f70ccd..1413fd2add 100644
--- a/keyboards/horrortroll/lemon40/info.json
+++ b/keyboards/horrortroll/lemon40/info.json
@@ -8,6 +8,14 @@
         "pid": "0x2434",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "B1", "B3", "B2", "B6", "F7"],
+        "rows": ["D7", "E6", "B4", "B5", "D4", "C6", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/horrortroll/lemon40/lib/bongocat.h b/keyboards/horrortroll/lemon40/lib/bongocat.h
index 65ceabc682..2ffeca1993 100644
--- a/keyboards/horrortroll/lemon40/lib/bongocat.h
+++ b/keyboards/horrortroll/lemon40/lib/bongocat.h
@@ -14,4 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 void render_bongocat(void);
diff --git a/keyboards/horrortroll/paws60/config.h b/keyboards/horrortroll/paws60/config.h
index c969810df0..5d9f1d9dc6 100644
--- a/keyboards/horrortroll/paws60/config.h
+++ b/keyboards/horrortroll/paws60/config.h
@@ -16,13 +16,5 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
diff --git a/keyboards/horrortroll/paws60/info.json b/keyboards/horrortroll/paws60/info.json
index f9b81dfc96..7391972d8b 100644
--- a/keyboards/horrortroll/paws60/info.json
+++ b/keyboards/horrortroll/paws60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [3, 6]
     },
diff --git a/keyboards/horrortroll/paws60/paws60.c b/keyboards/horrortroll/paws60/paws60.c
deleted file mode 100644
index 8734d75070..0000000000
--- a/keyboards/horrortroll/paws60/paws60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "paws60.h"
diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h
index ee7b25cf6f..56eda36984 100644
--- a/keyboards/hotdox/config.h
+++ b/keyboards/hotdox/config.h
@@ -14,7 +14,6 @@
 #define TAPPING_TOGGLE  1
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hotdox/hotdox.h b/keyboards/hotdox/hotdox.h
index 348ec6b291..b933344439 100644
--- a/keyboards/hotdox/hotdox.h
+++ b/keyboards/hotdox/hotdox.h
@@ -69,116 +69,3 @@ inline void ergodox_right_led_set(uint8_t l, uint8_t n) {}
 inline void ergodox_led_all_set(uint8_t n)              {}
 
 void ergodox_blink_all_leds(void);
-
-/*
- *   LEFT HAND: LINES 76-83
- *  RIGHT HAND: LINES 85-92
- */
-#define LAYOUT_ergodox(                                         \
-                                                                \
-    k00,k01,k02,k03,k04,k05,k06,                                \
-    k10,k11,k12,k13,k14,k15,k16,                                \
-    k20,k21,k22,k23,k24,k25,                                    \
-    k30,k31,k32,k33,k34,k35,k36,                                \
-    k40,k41,k42,k43,k44,                                        \
-                            k55,k56,                            \
-                                k54,                            \
-                        k51,k52,k53,                            \
-                                                                \
-        k07,k08,k09,k0A,k0B,k0C,k0D,                            \
-        k17,k18,k19,k1A,k1B,k1C,k1D,                            \
-            k28,k29,k2A,k2B,k2C,k2D,                            \
-        k37,k38,k39,k3A,k3B,k3C,k3D,                            \
-                k49,k4A,k4B,k4C,k4D,                            \
-    k57,k58,                                                    \
-    k59,                                                        \
-    k5A,k5B,k5C )                                               \
-                                                                \
-   /* matrix positions */                                       \
-   {                                                            \
-    { k00,   k01, k02, k03, k04, k05,   k06,      k07,   k08,   k09, k0A, k0B, k0C, k0D    }, \
-    { k10,   k11, k12, k13, k14, k15,   k16,      k17,   k18,   k19, k1A, k1B, k1C, k1D    }, \
-    { k20,   k21, k22, k23, k24, k25,   KC_NO,    KC_NO, k28,   k29, k2A, k2B, k2C, k2D    }, \
-    { k30,   k31, k32, k33, k34, k35,   k36,      k37,   k38,   k39, k3A, k3B, k3C, k3D    }, \
-    { k40,   k41, k42, k43, k44, KC_NO, KC_NO,    KC_NO, KC_NO, k49, k4A, k4B, k4C, k4D    }, \
-    { KC_NO, k51, k52, k53, k54, k55,   k56,      k57,   k58,   k59, k5A, k5B, k5C, KC_NO  }  \
-   }
-
-/*
- *   LEFT HAND: LINES 110-117
- *  RIGHT HAND: LINES 119-126
- */
-#define LAYOUT_ergodox_80(                                      \
-                                                                \
-    k00,k01,k02,k03,k04,k05,k06,                                \
-    k10,k11,k12,k13,k14,k15,k16,                                \
-    k20,k21,k22,k23,k24,k25,                                    \
-    k30,k31,k32,k33,k34,k35,k36,                                \
-    k40,k41,k42,k43,k44,                                        \
-                            k55,k56,                            \
-                        k45,k46,k54,                            \
-                        k53,k52,k51,                            \
-                                                                \
-        k07,k08,k09,k0A,k0B,k0C,k0D,                            \
-        k17,k18,k19,k1A,k1B,k1C,k1D,                            \
-            k28,k29,k2A,k2B,k2C,k2D,                            \
-        k37,k38,k39,k3A,k3B,k3C,k3D,                            \
-                k49,k4A,k4B,k4C,k4D,                            \
-    k57,k58,                                                    \
-    k59,k47,k48,                                                \
-    k5A,k5B,k5C )                                               \
-                                                                \
-   /* matrix positions */                                       \
-   {                                                            \
-    { k00,   k01, k02, k03, k04, k05, k06,      k07,   k08, k09, k0A, k0B, k0C, k0D    }, \
-    { k10,   k11, k12, k13, k14, k15, k16,      k17,   k18, k19, k1A, k1B, k1C, k1D    }, \
-    { k20,   k21, k22, k23, k24, k25, KC_NO,    KC_NO, k28, k29, k2A, k2B, k2C, k2D    }, \
-    { k30,   k31, k32, k33, k34, k35, k36,      k37,   k38, k39, k3A, k3B, k3C, k3D    }, \
-    { k40,   k41, k42, k43, k44, k45, k45,      k47,   k48, k49, k4A, k4B, k4C, k4D    }, \
-    { KC_NO, k51, k52, k53, k54, k55, k56,      k57,   k58, k59, k5A, k5B, k5C, KC_NO  }  \
-   }
-
-/*  ---------- LEFT HAND -----------       ---------- RIGHT HAND ---------- */
-#define LAYOUT_ergodox_pretty(                                                  \
-                                                                                \
-    L00,L01,L02,L03,L04,L05,L06,               R00,R01,R02,R03,R04,R05,R06,     \
-    L10,L11,L12,L13,L14,L15,L16,               R10,R11,R12,R13,R14,R15,R16,     \
-    L20,L21,L22,L23,L24,L25,                       R21,R22,R23,R24,R25,R26,     \
-    L30,L31,L32,L33,L34,L35,L36,               R30,R31,R32,R33,R34,R35,R36,     \
-    L40,L41,L42,L43,L44,                               R42,R43,R44,R45,R46,     \
-                            L55,L56,       R50,R51,                             \
-                                L54,       R52,                                 \
-                        L51,L52,L53,       R53,R54,R55 )                        \
-                                                                                \
-   /* matrix positions */                                                       \
-   {                                                                            \
-    {   L00,L01,L02,L03,L04,L05,L06,            R00,R01,R02,R03,R04,R05,R06  }, \
-    {   L10,L11,L12,L13,L14,L15,L16,            R10,R11,R12,R13,R14,R15,R16  }, \
-    {   L20,L21,L22,L23,L24,L25,KC_NO,        KC_NO,R21,R22,R23,R24,R25,R26  }, \
-    {   L30,L31,L32,L33,L34,L35,L36,            R30,R31,R32,R33,R34,R35,R36  }, \
-    { L40,L41,L42,L43,L44,KC_NO,KC_NO,    KC_NO,KC_NO,R42,R43,R44,R45,R46    }, \
-    { KC_NO,L51,L52,L53,L54,L55,L56,          R50,R51,R52,R53,R54,R55,KC_NO  }  \
-   }
-
-/*  ---------- LEFT HAND -----------       ---------- RIGHT HAND ---------- */
-#define LAYOUT_ergodox_pretty_80(                                              \
-                                                                               \
-    L00,L01,L02,L03,L04,L05,L06,               R00,R01,R02,R03,R04,R05,R06,    \
-    L10,L11,L12,L13,L14,L15,L16,               R10,R11,R12,R13,R14,R15,R16,    \
-    L20,L21,L22,L23,L24,L25,                       R21,R22,R23,R24,R25,R26,    \
-    L30,L31,L32,L33,L34,L35,L36,               R30,R31,R32,R33,R34,R35,R36,    \
-    L40,L41,L42,L43,L44,                               R42,R43,R44,R45,R46,    \
-                            L55,L56,       R50,R51,                            \
-                        L45,L46,L54,       R52,R40,R41,                        \
-                        L51,L52,L53,       R53,R54,R55 )                       \
-                                                                               \
-   /* matrix positions */                                                      \
-   {                                                                           \
-    {   L00,L01,L02,L03,L04,L05,L06,          R00,R01,R02,R03,R04,R05,R06   }, \
-    {   L10,L11,L12,L13,L14,L15,L16,          R10,R11,R12,R13,R14,R15,R16   }, \
-    {   L20,L21,L22,L23,L24,L25,KC_NO,      KC_NO,R21,R22,R23,R24,R25,R26   }, \
-    {   L30,L31,L32,L33,L34,L35,L36,          R30,R31,R32,R33,R34,R35,R36   }, \
-    {   L40,L41,L42,L43,L44,L45,L46,          R40,R41,R42,R43,R44,R45,R46   }, \
-    { KC_NO,L51,L52,L53,L54,L55,L56,          R50,R51,R52,R53,R54,R55,KC_NO }  \
-   }
-
diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/info.json
index 2e2352b7ee..51c0465899 100644
--- a/keyboards/hotdox/info.json
+++ b/keyboards/hotdox/info.json
@@ -14,103 +14,386 @@
     "bootloader": "atmel-dfu",
     "community_layouts": ["ergodox"],
     "layouts": {
-      "LAYOUT_ergodox": {
+    "LAYOUT_ergodox": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
 
-          "layout": [
-            {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-            {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-            {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-            {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-                   {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
 
-                                          {"x":6, "y":5}, {"x":7, "y":5},
-                                                          {"x":7, "y":6},
-            {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
 
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
 
-                       {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-              {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-                                            {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-              {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-                                                                  {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
 
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
 
-            {"x":9, "y":5}, {"x":10, "y":5},
-            {"x":9, "y":6},
-            {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
-          ]
-      },
-      "LAYOUT_ergodox_pretty": {
-          "layout": [
-            {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-            {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 1], "x": 5, "y": 6, "h": 2},
+        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
 
-            {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-            {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+        {"matrix": [5, 3], "x": 7, "y": 7},
 
-            {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-            {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
 
-            {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-            {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
 
-                   {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-                                                                  {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
 
-                                          {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
-                                                          {"x":7, "y":6},      {"x":9, "y":6},
-            {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
-          ]
-      },
-      "LAYOUT_ergodox_80": {
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
 
-        "layout": [
-          {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-          {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-          {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-          {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-                 {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
 
-                                        {"x":6, "y":5}, {"x":7, "y":5},
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
 
-                        {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6},
-                        {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7},
+        {"matrix": [5, 9], "x": 9, "y": 6},
 
+        {"matrix": [5, 10], "x": 9, "y": 7},
 
-                        {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-                        {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-                                                      {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-                        {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-                                                                            {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+        {"matrix": [5, 11], "x": 10, "y": 6, "h": 2},
+        {"matrix": [5, 12], "x": 11, "y": 6, "h": 2}
+      ]
+    },
+    "LAYOUT_ergodox_pretty": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
 
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
 
-          {"x":9, "y":5}, {"x":10, "y":5},
-          {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
-          {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
-        ]
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
+
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 9], "x": 9, "y": 6},
+        {"matrix": [5, 1], "x": 5, "y": 6, "h": 2},
+        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
+
+        {"matrix": [5, 3], "x": 7, "y": 7},
+        {"matrix": [5, 10], "x": 9, "y": 7},
+
+        {"matrix": [5, 11], "x": 10, "y": 6, "h": 2},
+        {"matrix": [5, 12], "x": 11, "y": 6, "h": 2}
+      ]
     },
-      "LAYOUT_ergodox_pretty_80": {
+    "LAYOUT_ergodox_80": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
+        {"matrix": [4, 5], "x": 5, "y": 6},
+        {"matrix": [4, 6], "x": 6, "y": 6},
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 3], "x": 5, "y": 7},
+        {"matrix": [5, 2], "x": 6, "y": 7},
+        {"matrix": [5, 1], "x": 7, "y": 7},
+
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
+
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
+
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
+
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
+
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
+
+        {"matrix": [5, 9], "x": 9, "y": 6},
+        {"matrix": [4, 7], "x": 10, "y": 6},
+        {"matrix": [4, 8], "x": 11, "y": 6},
+
+        {"matrix": [5, 10], "x": 9, "y": 7},
+        {"matrix": [5, 11], "x": 10, "y": 7},
+        {"matrix": [5, 12], "x": 11, "y": 7}
+      ]
+    },
+    "LAYOUT_ergodox_pretty_80": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
 
-        "layout": [
-          {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-          {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
 
-          {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-          {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
 
-          {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-          {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
 
-          {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-          {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
 
-                 {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-                                                                {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+        {"matrix": [4, 5], "x": 5, "y": 6},
+        {"matrix": [4, 6], "x": 6, "y": 6},
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 9], "x": 9, "y": 6},
+        {"matrix": [4, 7], "x": 10, "y": 6},
+        {"matrix": [4, 8], "x": 11, "y": 6},
 
-                                        {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
-                        {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6},      {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
-                        {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
-        ]
+        {"matrix": [5, 1], "x": 5, "y": 7},
+        {"matrix": [5, 2], "x": 6, "y": 7},
+        {"matrix": [5, 3], "x": 7, "y": 7},
+        {"matrix": [5, 10], "x": 9, "y": 7},
+        {"matrix": [5, 11], "x": 10, "y": 7},
+        {"matrix": [5, 12], "x": 11, "y": 7}
+      ]
     }
   }
 }
diff --git a/keyboards/hotdox76v2/config.h b/keyboards/hotdox76v2/config.h
index bb7a6324d3..f469aa475f 100644
--- a/keyboards/hotdox76v2/config.h
+++ b/keyboards/hotdox76v2/config.h
@@ -23,7 +23,6 @@
 #define RGB_MATRIX_SPLIT \
     { 43, 43 }
 
-#define RGB_DI_PIN D3
 #define RGB_MATRIX_LED_COUNT 86
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
diff --git a/keyboards/hotdox76v2/hotdox76v2.c b/keyboards/hotdox76v2/hotdox76v2.c
index 1465e96138..57ed81b128 100644
--- a/keyboards/hotdox76v2/hotdox76v2.c
+++ b/keyboards/hotdox76v2/hotdox76v2.c
@@ -2,7 +2,7 @@
 // Copyright 2022 Drashna Jael're (@Drashna Jael're)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "hotdox76v2.h"
 #include <string.h>
 #include <transactions.h>
 #include "oled_font_lib/logo2.h"
diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/info.json
index 70c62212f1..de958c87d1 100644
--- a/keyboards/hotdox76v2/info.json
+++ b/keyboards/hotdox76v2/info.json
@@ -15,6 +15,9 @@
         "oled": true,
         "rgb_matrix": true
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6"],
         "rows": ["D6", "D7", "B4", "B5", "B6", "C6"]
@@ -23,6 +26,9 @@
         "enabled": true,
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "url": "https://github.com/Oh-My-Mechanical-Keyboard",
     "usb": {
@@ -37,187 +43,187 @@
         "LAYOUT_ergodox": {
             "layout": [
                 { "label": "L00", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 0.375 },
-                { "label": "L01", "matrix": [5, 1], "w": 1, "x": 1.5, "y": 0.375 },
-                { "label": "L02", "matrix": [5, 2], "w": 1, "x": 2.5, "y": 0.125 },
-                { "label": "L03", "matrix": [5, 3], "w": 1, "x": 3.5, "y": 0 },
-                { "label": "L04", "matrix": [5, 4], "w": 1, "x": 4.5, "y": 0.125 },
-                { "label": "L05", "matrix": [5, 5], "w": 1, "x": 5.5, "y": 0.25 },
-                { "label": "L06", "matrix": [5, 6], "w": 1, "x": 6.5, "y": 0.25 },
+                { "label": "L01", "matrix": [5, 1], "x": 1.5, "y": 0.375 },
+                { "label": "L02", "matrix": [5, 2], "x": 2.5, "y": 0.125 },
+                { "label": "L03", "matrix": [5, 3], "x": 3.5, "y": 0 },
+                { "label": "L04", "matrix": [5, 4], "x": 4.5, "y": 0.125 },
+                { "label": "L05", "matrix": [5, 5], "x": 5.5, "y": 0.25 },
+                { "label": "L06", "matrix": [5, 6], "x": 6.5, "y": 0.25 },
 
                 { "label": "L10", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 1.375 },
-                { "label": "L11", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 1.375 },
-                { "label": "L12", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 1.125 },
-                { "label": "L13", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 1 },
-                { "label": "L14", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 1.125 },
-                { "label": "L15", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 1.25 },
-                { "label": "L16", "matrix": [4, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
+                { "label": "L11", "matrix": [4, 1], "x": 1.5, "y": 1.375 },
+                { "label": "L12", "matrix": [4, 2], "x": 2.5, "y": 1.125 },
+                { "label": "L13", "matrix": [4, 3], "x": 3.5, "y": 1 },
+                { "label": "L14", "matrix": [4, 4], "x": 4.5, "y": 1.125 },
+                { "label": "L15", "matrix": [4, 5], "x": 5.5, "y": 1.25 },
+                { "label": "L16", "matrix": [4, 6], "x": 6.5, "y": 1.25, "h": 1.5 },
 
                 { "label": "L20", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 2.375 },
-                { "label": "L21", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 2.375 },
-                { "label": "L22", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 2.125 },
-                { "label": "L23", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 2 },
-                { "label": "L24", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 2.125 },
-                { "label": "L25", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 2.25 },
+                { "label": "L21", "matrix": [3, 1], "x": 1.5, "y": 2.375 },
+                { "label": "L22", "matrix": [3, 2], "x": 2.5, "y": 2.125 },
+                { "label": "L23", "matrix": [3, 3], "x": 3.5, "y": 2 },
+                { "label": "L24", "matrix": [3, 4], "x": 4.5, "y": 2.125 },
+                { "label": "L25", "matrix": [3, 5], "x": 5.5, "y": 2.25 },
 
                 { "label": "L30", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 3.375 },
-                { "label": "L31", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 3.375 },
-                { "label": "L32", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 3.125 },
-                { "label": "L33", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 3 },
-                { "label": "L34", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 3.125 },
-                { "label": "L35", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 3.25 },
-                { "label": "L36", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
-
-                { "label": "L40", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 4.375 },
-                { "label": "L41", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 4.375 },
-                { "label": "L42", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 4.125 },
-                { "label": "L43", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 4 },
-                { "label": "L44", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 4.125 },
-
-                { "label": "L55", "matrix": [0, 5], "w": 1, "x": 6, "y": 5 },
-                { "label": "L56", "matrix": [0, 6], "w": 1, "x": 7, "y": 5 },
-                { "label": "L54", "matrix": [0, 4], "w": 1, "x": 7, "y": 6 },
-                { "label": "L53", "matrix": [0, 3], "w": 1, "x": 5, "y": 6, "h": 2 },
-                { "label": "L52", "matrix": [0, 2], "w": 1, "x": 6, "y": 6, "h": 2 },
-                { "label": "L51", "matrix": [0, 1], "w": 1, "x": 7, "y": 7 },
-
-                { "label": "R06", "matrix": [11, 6], "w": 1, "x": 9.5, "y": 0.25 },
-                { "label": "R05", "matrix": [11, 5], "w": 1, "x": 10.5, "y": 0.25 },
-                { "label": "R04", "matrix": [11, 4], "w": 1, "x": 11.5, "y": 0.125 },
-                { "label": "R03", "matrix": [11, 3], "w": 1, "x": 12.5, "y": 0 },
-                { "label": "R02", "matrix": [11, 2], "w": 1, "x": 13.5, "y": 0.125 },
-                { "label": "R01", "matrix": [11, 1], "w": 1, "x": 14.5, "y": 0.375 },
+                { "label": "L31", "matrix": [2, 1], "x": 1.5, "y": 3.375 },
+                { "label": "L32", "matrix": [2, 2], "x": 2.5, "y": 3.125 },
+                { "label": "L33", "matrix": [2, 3], "x": 3.5, "y": 3 },
+                { "label": "L34", "matrix": [2, 4], "x": 4.5, "y": 3.125 },
+                { "label": "L35", "matrix": [2, 5], "x": 5.5, "y": 3.25 },
+                { "label": "L36", "matrix": [2, 6], "x": 6.5, "y": 2.75, "h": 1.5 },
+
+                { "label": "L40", "matrix": [1, 0], "x": 0.5, "y": 4.375 },
+                { "label": "L41", "matrix": [1, 1], "x": 1.5, "y": 4.375 },
+                { "label": "L42", "matrix": [1, 2], "x": 2.5, "y": 4.125 },
+                { "label": "L43", "matrix": [1, 3], "x": 3.5, "y": 4 },
+                { "label": "L44", "matrix": [1, 4], "x": 4.5, "y": 4.125 },
+
+                { "label": "L55", "matrix": [0, 5], "x": 6, "y": 5 },
+                { "label": "L56", "matrix": [0, 6], "x": 7, "y": 5 },
+                { "label": "L54", "matrix": [0, 4], "x": 7, "y": 6 },
+                { "label": "L53", "matrix": [0, 3], "x": 5, "y": 6, "h": 2 },
+                { "label": "L52", "matrix": [0, 2], "x": 6, "y": 6, "h": 2 },
+                { "label": "L51", "matrix": [0, 1], "x": 7, "y": 7 },
+
+                { "label": "R06", "matrix": [11, 6], "x": 9.5, "y": 0.25 },
+                { "label": "R05", "matrix": [11, 5], "x": 10.5, "y": 0.25 },
+                { "label": "R04", "matrix": [11, 4], "x": 11.5, "y": 0.125 },
+                { "label": "R03", "matrix": [11, 3], "x": 12.5, "y": 0 },
+                { "label": "R02", "matrix": [11, 2], "x": 13.5, "y": 0.125 },
+                { "label": "R01", "matrix": [11, 1], "x": 14.5, "y": 0.375 },
                 { "label": "R00", "matrix": [11, 0], "w": 1.5, "x": 15.5, "y": 0.375 },
 
-                { "label": "R16", "matrix": [10, 6], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
-                { "label": "R15", "matrix": [10, 5], "w": 1, "x": 10.5, "y": 1.25 },
-                { "label": "R14", "matrix": [10, 4], "w": 1, "x": 11.5, "y": 1.125 },
-                { "label": "R13", "matrix": [10, 3], "w": 1, "x": 12.5, "y": 1 },
-                { "label": "R12", "matrix": [10, 2], "w": 1, "x": 13.5, "y": 1.125 },
-                { "label": "R11", "matrix": [10, 1], "w": 1, "x": 14.5, "y": 1.375 },
+                { "label": "R16", "matrix": [10, 6], "x": 9.5, "y": 1.25, "h": 1.5 },
+                { "label": "R15", "matrix": [10, 5], "x": 10.5, "y": 1.25 },
+                { "label": "R14", "matrix": [10, 4], "x": 11.5, "y": 1.125 },
+                { "label": "R13", "matrix": [10, 3], "x": 12.5, "y": 1 },
+                { "label": "R12", "matrix": [10, 2], "x": 13.5, "y": 1.125 },
+                { "label": "R11", "matrix": [10, 1], "x": 14.5, "y": 1.375 },
                 { "label": "R10", "matrix": [10, 0], "w": 1.5, "x": 15.5, "y": 1.375 },
 
-                { "label": "R25", "matrix": [9, 5], "w": 1, "x": 10.5, "y": 2.25 },
-                { "label": "R24", "matrix": [9, 4], "w": 1, "x": 11.5, "y": 2.125 },
-                { "label": "R23", "matrix": [9, 3], "w": 1, "x": 12.5, "y": 2 },
-                { "label": "R22", "matrix": [9, 2], "w": 1, "x": 13.5, "y": 2.125 },
-                { "label": "R21", "matrix": [9, 1], "w": 1, "x": 14.5, "y": 2.375 },
+                { "label": "R25", "matrix": [9, 5], "x": 10.5, "y": 2.25 },
+                { "label": "R24", "matrix": [9, 4], "x": 11.5, "y": 2.125 },
+                { "label": "R23", "matrix": [9, 3], "x": 12.5, "y": 2 },
+                { "label": "R22", "matrix": [9, 2], "x": 13.5, "y": 2.125 },
+                { "label": "R21", "matrix": [9, 1], "x": 14.5, "y": 2.375 },
                 { "label": "R20", "matrix": [9, 0], "w": 1.5, "x": 15.5, "y": 2.375 },
 
-                { "label": "R36", "matrix": [8, 6], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
-                { "label": "R35", "matrix": [8, 5], "w": 1, "x": 10.5, "y": 3.25 },
-                { "label": "R34", "matrix": [8, 4], "w": 1, "x": 11.5, "y": 3.125 },
-                { "label": "R33", "matrix": [8, 3], "w": 1, "x": 12.5, "y": 3 },
-                { "label": "R32", "matrix": [8, 2], "w": 1, "x": 13.5, "y": 3.125 },
-                { "label": "R31", "matrix": [8, 1], "w": 1, "x": 14.5, "y": 3.375 },
+                { "label": "R36", "matrix": [8, 6], "x": 9.5, "y": 2.75, "h": 1.5 },
+                { "label": "R35", "matrix": [8, 5], "x": 10.5, "y": 3.25 },
+                { "label": "R34", "matrix": [8, 4], "x": 11.5, "y": 3.125 },
+                { "label": "R33", "matrix": [8, 3], "x": 12.5, "y": 3 },
+                { "label": "R32", "matrix": [8, 2], "x": 13.5, "y": 3.125 },
+                { "label": "R31", "matrix": [8, 1], "x": 14.5, "y": 3.375 },
                 { "label": "R30", "matrix": [8, 0], "w": 1.5, "x": 15.5, "y": 3.375 },
 
-                { "label": "R44", "matrix": [7, 4], "w": 1, "x": 11.5, "y": 4.125 },
-                { "label": "R43", "matrix": [7, 3], "w": 1, "x": 12.5, "y": 4 },
-                { "label": "R42", "matrix": [7, 2], "w": 1, "x": 13.5, "y": 4.125 },
-                { "label": "R41", "matrix": [7, 1], "w": 1, "x": 14.5, "y": 4.375 },
-                { "label": "R40", "matrix": [7, 0], "w": 1, "x": 15.5, "y": 4.375 },
-
-                { "label": "R56", "matrix": [6, 6], "w": 1, "x": 9, "y": 5 },
-                { "label": "R55", "matrix": [6, 5], "w": 1, "x": 10, "y": 5 },
-                { "label": "R54", "matrix": [6, 4], "w": 1, "x": 9, "y": 6 },
-                { "label": "R51", "matrix": [6, 1], "w": 1, "x": 9, "y": 7 },
-                { "label": "R52", "matrix": [6, 2], "w": 1, "x": 11, "y": 6, "h": 2 },
-                { "label": "R53", "matrix": [6, 3], "w": 1, "x": 10, "y": 6, "h": 2 }
+                { "label": "R44", "matrix": [7, 4], "x": 11.5, "y": 4.125 },
+                { "label": "R43", "matrix": [7, 3], "x": 12.5, "y": 4 },
+                { "label": "R42", "matrix": [7, 2], "x": 13.5, "y": 4.125 },
+                { "label": "R41", "matrix": [7, 1], "x": 14.5, "y": 4.375 },
+                { "label": "R40", "matrix": [7, 0], "x": 15.5, "y": 4.375 },
+
+                { "label": "R56", "matrix": [6, 6], "x": 9, "y": 5 },
+                { "label": "R55", "matrix": [6, 5], "x": 10, "y": 5 },
+                { "label": "R54", "matrix": [6, 4], "x": 9, "y": 6 },
+                { "label": "R51", "matrix": [6, 1], "x": 9, "y": 7 },
+                { "label": "R52", "matrix": [6, 2], "x": 11, "y": 6, "h": 2 },
+                { "label": "R53", "matrix": [6, 3], "x": 10, "y": 6, "h": 2 }
             ]
         },
         "LAYOUT_ergodox_pretty": {
             "layout": [
                 { "label": "L00", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 0.375 },
-                { "label": "L01", "matrix": [5, 1], "w": 1, "x": 1.5, "y": 0.375 },
-                { "label": "L02", "matrix": [5, 2], "w": 1, "x": 2.5, "y": 0.125 },
-                { "label": "L03", "matrix": [5, 3], "w": 1, "x": 3.5, "y": 0 },
-                { "label": "L04", "matrix": [5, 4], "w": 1, "x": 4.5, "y": 0.125 },
-                { "label": "L05", "matrix": [5, 5], "w": 1, "x": 5.5, "y": 0.25 },
-                { "label": "L06", "matrix": [5, 6], "w": 1, "x": 6.5, "y": 0.25 },
-
-                { "label": "R06", "matrix": [11, 6], "w": 1, "x": 9.5, "y": 0.25 },
-                { "label": "R05", "matrix": [11, 5], "w": 1, "x": 10.5, "y": 0.25 },
-                { "label": "R04", "matrix": [11, 4], "w": 1, "x": 11.5, "y": 0.125 },
-                { "label": "R03", "matrix": [11, 3], "w": 1, "x": 12.5, "y": 0 },
-                { "label": "R02", "matrix": [11, 2], "w": 1, "x": 13.5, "y": 0.125 },
-                { "label": "R01", "matrix": [11, 1], "w": 1, "x": 14.5, "y": 0.375 },
+                { "label": "L01", "matrix": [5, 1], "x": 1.5, "y": 0.375 },
+                { "label": "L02", "matrix": [5, 2], "x": 2.5, "y": 0.125 },
+                { "label": "L03", "matrix": [5, 3], "x": 3.5, "y": 0 },
+                { "label": "L04", "matrix": [5, 4], "x": 4.5, "y": 0.125 },
+                { "label": "L05", "matrix": [5, 5], "x": 5.5, "y": 0.25 },
+                { "label": "L06", "matrix": [5, 6], "x": 6.5, "y": 0.25 },
+
+                { "label": "R06", "matrix": [11, 6], "x": 9.5, "y": 0.25 },
+                { "label": "R05", "matrix": [11, 5], "x": 10.5, "y": 0.25 },
+                { "label": "R04", "matrix": [11, 4], "x": 11.5, "y": 0.125 },
+                { "label": "R03", "matrix": [11, 3], "x": 12.5, "y": 0 },
+                { "label": "R02", "matrix": [11, 2], "x": 13.5, "y": 0.125 },
+                { "label": "R01", "matrix": [11, 1], "x": 14.5, "y": 0.375 },
                 { "label": "R00", "matrix": [11, 0], "w": 1.5, "x": 15.5, "y": 0.375 },
 
                 { "label": "L10", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 1.375 },
-                { "label": "L11", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 1.375 },
-                { "label": "L12", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 1.125 },
-                { "label": "L13", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 1 },
-                { "label": "L14", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 1.125 },
-                { "label": "L15", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 1.25 },
-                { "label": "L16", "matrix": [4, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
-
-                { "label": "R16", "matrix": [10, 6], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
-                { "label": "R15", "matrix": [10, 5], "w": 1, "x": 10.5, "y": 1.25 },
-                { "label": "R14", "matrix": [10, 4], "w": 1, "x": 11.5, "y": 1.125 },
-                { "label": "R13", "matrix": [10, 3], "w": 1, "x": 12.5, "y": 1 },
-                { "label": "R12", "matrix": [10, 2], "w": 1, "x": 13.5, "y": 1.125 },
-                { "label": "R11", "matrix": [10, 1], "w": 1, "x": 14.5, "y": 1.375 },
+                { "label": "L11", "matrix": [4, 1], "x": 1.5, "y": 1.375 },
+                { "label": "L12", "matrix": [4, 2], "x": 2.5, "y": 1.125 },
+                { "label": "L13", "matrix": [4, 3], "x": 3.5, "y": 1 },
+                { "label": "L14", "matrix": [4, 4], "x": 4.5, "y": 1.125 },
+                { "label": "L15", "matrix": [4, 5], "x": 5.5, "y": 1.25 },
+                { "label": "L16", "matrix": [4, 6], "x": 6.5, "y": 1.25, "h": 1.5 },
+
+                { "label": "R16", "matrix": [10, 6], "x": 9.5, "y": 1.25, "h": 1.5 },
+                { "label": "R15", "matrix": [10, 5], "x": 10.5, "y": 1.25 },
+                { "label": "R14", "matrix": [10, 4], "x": 11.5, "y": 1.125 },
+                { "label": "R13", "matrix": [10, 3], "x": 12.5, "y": 1 },
+                { "label": "R12", "matrix": [10, 2], "x": 13.5, "y": 1.125 },
+                { "label": "R11", "matrix": [10, 1], "x": 14.5, "y": 1.375 },
                 { "label": "R10", "matrix": [10, 0], "w": 1.5, "x": 15.5, "y": 1.375 },
 
                 { "label": "L20", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 2.375 },
-                { "label": "L21", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 2.375 },
-                { "label": "L22", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 2.125 },
-                { "label": "L23", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 2 },
-                { "label": "L24", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 2.125 },
-                { "label": "L25", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 2.25 },
-
-                { "label": "R25", "matrix": [9, 5], "w": 1, "x": 10.5, "y": 2.25 },
-                { "label": "R24", "matrix": [9, 4], "w": 1, "x": 11.5, "y": 2.125 },
-                { "label": "R23", "matrix": [9, 3], "w": 1, "x": 12.5, "y": 2 },
-                { "label": "R22", "matrix": [9, 2], "w": 1, "x": 13.5, "y": 2.125 },
-                { "label": "R21", "matrix": [9, 1], "w": 1, "x": 14.5, "y": 2.375 },
+                { "label": "L21", "matrix": [3, 1], "x": 1.5, "y": 2.375 },
+                { "label": "L22", "matrix": [3, 2], "x": 2.5, "y": 2.125 },
+                { "label": "L23", "matrix": [3, 3], "x": 3.5, "y": 2 },
+                { "label": "L24", "matrix": [3, 4], "x": 4.5, "y": 2.125 },
+                { "label": "L25", "matrix": [3, 5], "x": 5.5, "y": 2.25 },
+
+                { "label": "R25", "matrix": [9, 5], "x": 10.5, "y": 2.25 },
+                { "label": "R24", "matrix": [9, 4], "x": 11.5, "y": 2.125 },
+                { "label": "R23", "matrix": [9, 3], "x": 12.5, "y": 2 },
+                { "label": "R22", "matrix": [9, 2], "x": 13.5, "y": 2.125 },
+                { "label": "R21", "matrix": [9, 1], "x": 14.5, "y": 2.375 },
                 { "label": "R20", "matrix": [9, 0], "w": 1.5, "x": 15.5, "y": 2.375 },
 
                 { "label": "L30", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 3.375 },
-                { "label": "L31", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 3.375 },
-                { "label": "L32", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 3.125 },
-                { "label": "L33", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 3 },
-                { "label": "L34", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 3.125 },
-                { "label": "L35", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 3.25 },
-                { "label": "L36", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
-
-                { "label": "R36", "matrix": [8, 6], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
-                { "label": "R35", "matrix": [8, 5], "w": 1, "x": 10.5, "y": 3.25 },
-                { "label": "R34", "matrix": [8, 4], "w": 1, "x": 11.5, "y": 3.125 },
-                { "label": "R33", "matrix": [8, 3], "w": 1, "x": 12.5, "y": 3 },
-                { "label": "R32", "matrix": [8, 2], "w": 1, "x": 13.5, "y": 3.125 },
-                { "label": "R31", "matrix": [8, 1], "w": 1, "x": 14.5, "y": 3.375 },
+                { "label": "L31", "matrix": [2, 1], "x": 1.5, "y": 3.375 },
+                { "label": "L32", "matrix": [2, 2], "x": 2.5, "y": 3.125 },
+                { "label": "L33", "matrix": [2, 3], "x": 3.5, "y": 3 },
+                { "label": "L34", "matrix": [2, 4], "x": 4.5, "y": 3.125 },
+                { "label": "L35", "matrix": [2, 5], "x": 5.5, "y": 3.25 },
+                { "label": "L36", "matrix": [2, 6], "x": 6.5, "y": 2.75, "h": 1.5 },
+
+                { "label": "R36", "matrix": [8, 6], "x": 9.5, "y": 2.75, "h": 1.5 },
+                { "label": "R35", "matrix": [8, 5], "x": 10.5, "y": 3.25 },
+                { "label": "R34", "matrix": [8, 4], "x": 11.5, "y": 3.125 },
+                { "label": "R33", "matrix": [8, 3], "x": 12.5, "y": 3 },
+                { "label": "R32", "matrix": [8, 2], "x": 13.5, "y": 3.125 },
+                { "label": "R31", "matrix": [8, 1], "x": 14.5, "y": 3.375 },
                 { "label": "R30", "matrix": [8, 0], "w": 1.5, "x": 15.5, "y": 3.375 },
 
-                { "label": "L40", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 4.375 },
-                { "label": "L41", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 4.375 },
-                { "label": "L42", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 4.125 },
-                { "label": "L43", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 4 },
-                { "label": "L44", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 4.125 },
+                { "label": "L40", "matrix": [1, 0], "x": 0.5, "y": 4.375 },
+                { "label": "L41", "matrix": [1, 1], "x": 1.5, "y": 4.375 },
+                { "label": "L42", "matrix": [1, 2], "x": 2.5, "y": 4.125 },
+                { "label": "L43", "matrix": [1, 3], "x": 3.5, "y": 4 },
+                { "label": "L44", "matrix": [1, 4], "x": 4.5, "y": 4.125 },
 
-                { "label": "R44", "matrix": [7, 4], "w": 1, "x": 11.5, "y": 4.125 },
-                { "label": "R43", "matrix": [7, 3], "w": 1, "x": 12.5, "y": 4 },
-                { "label": "R42", "matrix": [7, 2], "w": 1, "x": 13.5, "y": 4.125 },
-                { "label": "R41", "matrix": [7, 1], "w": 1, "x": 14.5, "y": 4.375 },
-                { "label": "R40", "matrix": [7, 0], "w": 1, "x": 15.5, "y": 4.375 },
+                { "label": "R44", "matrix": [7, 4], "x": 11.5, "y": 4.125 },
+                { "label": "R43", "matrix": [7, 3], "x": 12.5, "y": 4 },
+                { "label": "R42", "matrix": [7, 2], "x": 13.5, "y": 4.125 },
+                { "label": "R41", "matrix": [7, 1], "x": 14.5, "y": 4.375 },
+                { "label": "R40", "matrix": [7, 0], "x": 15.5, "y": 4.375 },
 
-                { "label": "L55", "matrix": [0, 5], "w": 1, "x": 6, "y": 5 },
-                { "label": "L56", "matrix": [0, 6], "w": 1, "x": 7, "y": 5 },
+                { "label": "L55", "matrix": [0, 5], "x": 6, "y": 5 },
+                { "label": "L56", "matrix": [0, 6], "x": 7, "y": 5 },
 
-                { "label": "R56", "matrix": [6, 6], "w": 1, "x": 9, "y": 5 },
-                { "label": "R55", "matrix": [6, 5], "w": 1, "x": 10, "y": 5 },
+                { "label": "R56", "matrix": [6, 6], "x": 9, "y": 5 },
+                { "label": "R55", "matrix": [6, 5], "x": 10, "y": 5 },
 
-                { "label": "L54", "matrix": [0, 4], "w": 1, "x": 7, "y": 6 },
+                { "label": "L54", "matrix": [0, 4], "x": 7, "y": 6 },
 
-                { "label": "R54", "matrix": [6, 4], "w": 1, "x": 9, "y": 6 },
+                { "label": "R54", "matrix": [6, 4], "x": 9, "y": 6 },
 
-                { "label": "L53", "matrix": [0, 3], "w": 1, "x": 5, "y": 6,"h": 2 },
-                { "label": "L52", "matrix": [0, 2], "w": 1, "x": 6, "y": 6,"h": 2 },
-                { "label": "L51", "matrix": [0, 1], "w": 1, "x": 7, "y": 7 },
+                { "label": "L53", "matrix": [0, 3], "x": 5, "y": 6,"h": 2 },
+                { "label": "L52", "matrix": [0, 2], "x": 6, "y": 6,"h": 2 },
+                { "label": "L51", "matrix": [0, 1], "x": 7, "y": 7 },
 
-                { "label": "R51", "matrix": [6, 1], "w": 1, "x": 9, "y": 7 },
-                { "label": "R52", "matrix": [6, 2], "w": 1, "x": 11, "y": 6, "h": 2 },
-                { "label": "R53", "matrix": [6, 3], "w": 1, "x": 10, "y": 6, "h": 2 }
+                { "label": "R51", "matrix": [6, 1], "x": 9, "y": 7 },
+                { "label": "R52", "matrix": [6, 2], "x": 11, "y": 6, "h": 2 },
+                { "label": "R53", "matrix": [6, 3], "x": 10, "y": 6, "h": 2 }
             ]
         }
     }
diff --git a/keyboards/hotdox76v2/rules.mk b/keyboards/hotdox76v2/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/hotdox76v2/rules.mk
+++ b/keyboards/hotdox76v2/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/hp69/config.h b/keyboards/hp69/config.h
index d51682491d..cb64849d06 100644
--- a/keyboards/hp69/config.h
+++ b/keyboards/hp69/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, B7, A10, B9 ,A9}
-#define MATRIX_COL_PINS { B12, B15, B10, B13, B14, B11, B8, A0, A1, B5, B0, B2, B6, B1, B4}
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN A3
 #define RGBLED_NUM 20
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/hp69/hp69.c b/keyboards/hp69/hp69.c
deleted file mode 100644
index d9a78e3d83..0000000000
--- a/keyboards/hp69/hp69.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Ananya Kirti
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hp69.h"
diff --git a/keyboards/hp69/info.json b/keyboards/hp69/info.json
index d411fae52b..2bcf69f19e 100644
--- a/keyboards/hp69/info.json
+++ b/keyboards/hp69/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0001",
         "device_version": "0.1.1"
     },
+    "matrix_pins": {
+        "cols": ["B12", "B15", "B10", "B13", "B14", "B11", "B8", "A0", "A1", "B5", "B0", "B2", "B6", "B1", "B4"],
+        "rows": ["B3", "B7", "A10", "B9", "A9"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A6",
         "scroll_lock": "A7"
     },
+    "ws2812": {
+        "pin": "A3"
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/hs60/v1/config.h b/keyboards/hs60/v1/config.h
index 36db915bd7..62c800b9bc 100644
--- a/keyboards/hs60/v1/config.h
+++ b/keyboards/hs60/v1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { F1, F4, F5, E6, F0, B7, D2, D3, D5, D4, D6, D7, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json
index 33e1d46b08..09290faa73 100644
--- a/keyboards/hs60/v1/info.json
+++ b/keyboards/hs60/v1/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0257",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
+  "matrix_pins": {
+    "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+    "rows": ["B0", "B1", "B2", "B3", "F7"]
+  },
+  "diode_direction": "COL2ROW",
   "qmk_lufa_bootloader": {
     "esc_input": "B2",
     "esc_output": "B5"
diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/rules.mk
index 91c36443cd..7aa0a5ae51 100644
--- a/keyboards/hs60/v1/rules.mk
+++ b/keyboards/hs60/v1/rules.mk
@@ -15,7 +15,6 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3731
 RAW_ENABLE = yes
 
 # Experimental features for zealcmd please do no enable
diff --git a/keyboards/hs60/v2/ansi/config.h b/keyboards/hs60/v2/ansi/config.h
index d32f8288ff..614b44d4d4 100644
--- a/keyboards/hs60/v2/ansi/config.h
+++ b/keyboards/hs60/v2/ansi/config.h
@@ -20,13 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define HS60_ANSI
 
-#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3 }
-// To enable debugger set A13 A14 -> A5 A6
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Backlight options */
 
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/info.json
index cf96570800..f492c08553 100644
--- a/keyboards/hs60/v2/ansi/info.json
+++ b/keyboards/hs60/v2/ansi/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4854",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
+    "rows": ["B3", "B4", "B5", "A8", "A4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
   "board": "QMK_PROTON_C",
diff --git a/keyboards/hs60/v2/hhkb/config.h b/keyboards/hs60/v2/hhkb/config.h
index 7e9c0d02a7..e834616068 100644
--- a/keyboards/hs60/v2/hhkb/config.h
+++ b/keyboards/hs60/v2/hhkb/config.h
@@ -20,13 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define HS60_HHKB
 
-#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3 }
-// To enable debugger set A13 A14 -> A5 A6
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Backlight options */
 
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/info.json
index 10fb020eb7..ae6588b2e7 100644
--- a/keyboards/hs60/v2/hhkb/info.json
+++ b/keyboards/hs60/v2/hhkb/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4855",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
+    "rows": ["B3", "B4", "B5", "A8", "A4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
   "board": "QMK_PROTON_C",
diff --git a/keyboards/hs60/v2/iso/config.h b/keyboards/hs60/v2/iso/config.h
index 505ed47802..7421f1bf12 100644
--- a/keyboards/hs60/v2/iso/config.h
+++ b/keyboards/hs60/v2/iso/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3 }
-// To enable debugger set A13 A14 -> A5 A6
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Backlight options */
 
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/info.json
index 771c44bd69..5b67d85e99 100644
--- a/keyboards/hs60/v2/iso/info.json
+++ b/keyboards/hs60/v2/iso/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4853",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
+    "rows": ["B3", "B4", "B5", "A8", "A4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
   "board": "QMK_PROTON_C",
diff --git a/keyboards/hub16/config.h b/keyboards/hub16/config.h
index 8eb865e9b3..aec0c87bb5 100755
--- a/keyboards/hub16/config.h
+++ b/keyboards/hub16/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define RGB_DI_PIN D1
 #define RGBLED_NUM 11
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/hub16/hub16.c b/keyboards/hub16/hub16.c
deleted file mode 100755
index e18ba55269..0000000000
--- a/keyboards/hub16/hub16.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Josh Johnson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hub16.h"
\ No newline at end of file
diff --git a/keyboards/hub16/hub16.h b/keyboards/hub16/hub16.h
deleted file mode 100755
index 36830bf5c0..0000000000
--- a/keyboards/hub16/hub16.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 Josh Johnson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-       k40,     k41,    \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33  \
-) { \
-    { k00, k01, k02, k03, }, \
-    { k10, k11, k12, k13, }, \
-    { k20, k21, k22, k23, }, \
-    { k30, k31, k32, k33, }, \
-    { k40, k41, ___, ___, }  \
-}
-
diff --git a/keyboards/hub16/info.json b/keyboards/hub16/info.json
index 0da7c129eb..4d8161d28d 100644
--- a/keyboards/hub16/info.json
+++ b/keyboards/hub16/info.json
@@ -14,30 +14,37 @@
             {"pin_a": "B5", "pin_b": "B4"}
         ]
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "debounce": 20,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Mute", "x":0.5, "y":0},
-                {"label":"Play / Pause", "x":2.5, "y":0},
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
-                {"label":"*", "x":3, "y":1},
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"-", "x":3, "y":2},
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3},
-                {"label":"+", "x":3, "y":3},
-                {"label":"MO(1)", "x":0, "y":4},
-                {"label":"0", "x":1, "y":4},
-                {"label":".", "x":2, "y":4},
-                {"label":"N.ENT", "x":3, "y":4}
+                {"matrix": [4, 0], "x": 0.5, "y": 0},
+                {"matrix": [4, 1], "x": 2.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [0, 3], "x": 3, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 4}
             ]
         }
     }
diff --git a/keyboards/hub20/config.h b/keyboards/hub20/config.h
index 41a98ac983..5fc99ecbf5 100644
--- a/keyboards/hub20/config.h
+++ b/keyboards/hub20/config.h
@@ -18,19 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A13, B14, A10, A0, A2, A1 }
-#define MATRIX_COL_PINS { A6, A7, B7, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 27
 
 #define RGB_MATRIX_LED_COUNT 27
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 27
-#endif
 
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/hub20/info.json b/keyboards/hub20/info.json
index 10ec779fdf..991c4ebc46 100644
--- a/keyboards/hub20/info.json
+++ b/keyboards/hub20/info.json
@@ -8,12 +8,23 @@
       "pid": "0x4414",
       "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
+    "matrix_pins": {
+      "cols": ["A6", "A7", "B7", "B6"],
+      "rows": ["A13", "B14", "A10", "A0", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "B12", "pin_b": "B13"},
         {"pin_a": "A8", "pin_b": "A9"}
       ]
     },
+    "ws2812": {
+      "pin": "B15"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/hub20/rules.mk b/keyboards/hub20/rules.mk
index 2dd9c5acc6..081ea9225a 100644
--- a/keyboards/hub20/rules.mk
+++ b/keyboards/hub20/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/hubble/config.h b/keyboards/hubble/config.h
index b084d0ea31..ad5e772c74 100644
--- a/keyboards/hubble/config.h
+++ b/keyboards/hubble/config.h
@@ -5,7 +5,6 @@
 
 
 /* rgb */
-#define RGB_DI_PIN D2
 #define RGBLED_NUM 7
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/hubble/info.json b/keyboards/hubble/info.json
index 2677927194..3d06f3c9f7 100644
--- a/keyboards/hubble/info.json
+++ b/keyboards/hubble/info.json
@@ -14,6 +14,9 @@
         "rgblight": true,
         "velocikey": true
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "matrix_pins": {
         "cols": ["F5", "F6", "B4", "E6", "D7", "C6", "D4", "D0"],
         "rows": ["D1", "F4", "F7", "B5", "B1", "B3", "B6", "B2"]
diff --git a/keyboards/huytbt/h50/config.h b/keyboards/huytbt/h50/config.h
deleted file mode 100644
index ca7d4dbaca..0000000000
--- a/keyboards/huytbt/h50/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2022 Huy Ta (@huytbt)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- */
-#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D7, E6, B4, B5, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/huytbt/h50/h50.c b/keyboards/huytbt/h50/h50.c
deleted file mode 100644
index bb80f14583..0000000000
--- a/keyboards/huytbt/h50/h50.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Huy Ta (@huytbt)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "h50.h"
diff --git a/keyboards/huytbt/h50/info.json b/keyboards/huytbt/h50/info.json
index 166d367b48..052c5a0b20 100644
--- a/keyboards/huytbt/h50/info.json
+++ b/keyboards/huytbt/h50/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0002",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "B4", "B5", "D2", "D3"],
+    "rows": ["D1", "D0", "D4", "C6"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "D5"
   },
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
index e87eb4f3c3..74015bf03e 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
@@ -1,8 +1,13 @@
 {
     "keyboard_name": "IBM Model M (4th generation)",
     "manufacturer": "IBM/Purdea Andrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "maintainer": "purdeaandrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", 
+    "maintainer": "purdeaandrei", 
+    "usb": {
+        "vid": "0x16C0",
+        "pid": "0x27DB",
+        "device_version": "0.0.1"
+    },
     "indicators": {
         "caps_lock": "C11",
         "num_lock": "C12",
diff --git a/keyboards/ibnuda/alicia_cook/alicia_cook.c b/keyboards/ibnuda/alicia_cook/alicia_cook.c
deleted file mode 100644
index 39f17e4a7d..0000000000
--- a/keyboards/ibnuda/alicia_cook/alicia_cook.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ibnu D. Aji
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "alicia_cook.h"
diff --git a/keyboards/ibnuda/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h
deleted file mode 100644
index c414e3254c..0000000000
--- a/keyboards/ibnuda/alicia_cook/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 Ibnu D. Aji
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D3, F4, F5 }
-#define MATRIX_COL_PINS { B5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json
index 9e34484de5..137c6bc7de 100644
--- a/keyboards/ibnuda/alicia_cook/info.json
+++ b/keyboards/ibnuda/alicia_cook/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6955",
     "device_version": "8.9.9"
   },
+  "matrix_pins": {
+    "cols": ["B5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
+    "rows": ["D2", "D3", "F4", "F5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
index fc9cdfe786..ccfd50638b 100644
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
+++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
@@ -17,7 +17,6 @@
 
 #define COMBO_TERM  50
 #define COMBO_COUNT 50
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM 175
 #define TAPPING_TERM 175
diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h
index bf563918c9..dc525a111d 100644
--- a/keyboards/ibnuda/gurindam/config.h
+++ b/keyboards/ibnuda/gurindam/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4, D0, D1, D2}
-#define MATRIX_COL_PINS { F6, F5, F4, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 10
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/ibnuda/gurindam/gurindam.c b/keyboards/ibnuda/gurindam/gurindam.c
deleted file mode 100644
index bdca0269c2..0000000000
--- a/keyboards/ibnuda/gurindam/gurindam.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Ibnu D. Aji
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "gurindam.h"
diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json
index 7b3c71aa88..f8acee360f 100644
--- a/keyboards/ibnuda/gurindam/info.json
+++ b/keyboards/ibnuda/gurindam/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6974",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/ibnuda/squiggle/keymaps/default/config.h b/keyboards/ibnuda/squiggle/keymaps/default/config.h
index 88c4203d8b..6411ba8c66 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/default/config.h
@@ -2,5 +2,4 @@
 
 #define COMBO_TERM 100
 #define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/config.h b/keyboards/ibnuda/squiggle/keymaps/default38/config.h
index 9b7c369dda..fa95320e90 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default38/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/default38/config.h
@@ -21,5 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define COMBO_TERM 100
 #define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
index 1c8cff4bb6..65eec1d7f8 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
@@ -18,5 +18,4 @@
 
 #define COMBO_TERM 100
 #define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
index 88c4203d8b..6411ba8c66 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
@@ -2,5 +2,4 @@
 
 #define COMBO_TERM 100
 #define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
index 5b97451890..9920602ab8 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
@@ -2,7 +2,6 @@
 
 #define COMBO_TERM 100
 #define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 
 #define LEADER_TIMEOUT 300
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h
index 88c4203d8b..6411ba8c66 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/config.h
@@ -2,5 +2,4 @@
 
 #define COMBO_TERM 100
 #define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h
index f943c2c053..10887bdf18 100644
--- a/keyboards/ibnuda/squiggle/rev1/config.h
+++ b/keyboards/ibnuda/squiggle/rev1/config.h
@@ -1,19 +1,3 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define MASTER_LEFT
diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
index 7f48b11c76..c5f15104f6 100644
--- a/keyboards/ibnuda/squiggle/rev1/info.json
+++ b/keyboards/ibnuda/squiggle/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6969",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
@@ -17,143 +22,290 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"q", "x":0, "y":0.9},
-                {"label":"w", "x":1, "y":0.2},
-                {"label":"e", "x":2, "y":0},
-                {"label":"r", "x":3, "y":0.1},
-                {"label":"t", "x":4, "y":0.15},
-
-                {"label":"y", "x":5, "y":0.15},
-                {"label":"u", "x":6, "y":0.1},
-                {"label":"i", "x":7, "y":0},
-                {"label":"o", "x":8, "y":0.2},
-                {"label":"p", "x":9, "y":0.9},
-
-                {"label":"a", "x":0, "y":1.9},
-                {"label":"s", "x":1, "y":1.2},
-                {"label":"d", "x":2, "y":1},
-                {"label":"f", "x":3, "y":1.1},
-                {"label":"g", "x":4, "y":1.15},
-
-                {"label":"h", "x":5, "y":1.15},
-                {"label":"j", "x":6, "y":1.1},
-                {"label":"k", "x":7, "y":1},
-                {"label":"l", "x":8, "y":1.2},
-                {"label":"'", "x":9, "y":1.9},
-
-                {"label":"z", "x":0, "y":2.9},
-                {"label":"x", "x":1, "y":2.2},
-                {"label":"c", "x":2, "y":2},
-                {"label":"v", "x":3, "y":2.1},
-                {"label":"b", "x":4, "y":2.15},
-
-                {"label":"n", "x":5, "y":2.15},
-                {"label":"m", "x":6, "y":2.1},
-                {"label":",", "x":7, "y":2},
-                {"label":".", "x":8, "y":2.2},
-                {"label":"/", "x":9, "y":2.9},
-
-                {"label":"bspc/lwr", "x":3, "y":3.6, "h":2},
-                {"label":"esc/sft", "x":4, "y":3.65, "h":2},
-
-                {"label":"ent/alt", "x":5, "y":3.65, "h":2},
-                {"label":"spc/ris", "x":6, "y":3.6, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2}
+            ]
+        },
+        "LAYOUT_complicated": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.6},
+                {"matrix": [3, 4], "x": 4, "y": 3.65},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65},
+                {"matrix": [7, 3], "x": 6, "y": 3.6},
+
+                {"matrix": [3, 1], "x": 3, "y": 4.6},
+                {"matrix": [3, 2], "x": 4, "y": 4.65},
+
+                {"matrix": [7, 2], "x": 5, "y": 4.65},
+                {"matrix": [7, 1], "x": 6, "y": 4.6}
+            ]
+        },
+        "LAYOUT_full": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [4, 4], "x": 5, "y": 0},
+                {"matrix": [4, 3], "x": 6, "y": 0},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0},
+                {"matrix": [4, 0], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 10, "y": 0},
+                {"matrix": [1, 1], "x": 11, "y": 0},
+                {"matrix": [1, 2], "x": 12, "y": 0},
+                {"matrix": [1, 3], "x": 13, "y": 0},
+                {"matrix": [1, 4], "x": 14, "y": 0},
+
+                {"matrix": [5, 4], "x": 15, "y": 0},
+                {"matrix": [5, 3], "x": 16, "y": 0},
+                {"matrix": [5, 2], "x": 17, "y": 0},
+                {"matrix": [5, 1], "x": 18, "y": 0},
+                {"matrix": [5, 0], "x": 19, "y": 0},
+
+                {"matrix": [2, 0], "x": 20, "y": 0},
+                {"matrix": [2, 1], "x": 21, "y": 0},
+                {"matrix": [2, 2], "x": 22, "y": 0},
+                {"matrix": [2, 3], "x": 23, "y": 0},
+                {"matrix": [2, 4], "x": 24, "y": 0},
+
+                {"matrix": [6, 4], "x": 25, "y": 0},
+                {"matrix": [6, 3], "x": 26, "y": 0},
+                {"matrix": [6, 2], "x": 27, "y": 0},
+                {"matrix": [6, 1], "x": 28, "y": 0},
+                {"matrix": [6, 0], "x": 29, "y": 0},
+
+                {"matrix": [3, 0], "x": 30, "y": 0},
+                {"matrix": [3, 1], "x": 31, "y": 0},
+                {"matrix": [3, 2], "x": 32, "y": 0},
+                {"matrix": [3, 3], "x": 33, "y": 0},
+                {"matrix": [3, 4], "x": 34, "y": 0},
+
+                {"matrix": [7, 4], "x": 35, "y": 0},
+                {"matrix": [7, 3], "x": 36, "y": 0},
+                {"matrix": [7, 2], "x": 37, "y": 0},
+                {"matrix": [7, 1], "x": 38, "y": 0},
+                {"matrix": [7, 0], "x": 39, "y": 0}
+            ]
+        },
+        "LAYOUT_reversed": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [0, 2], "x": 7, "y": 0},
+                {"matrix": [0, 1], "x": 8, "y": 0},
+                {"matrix": [0, 0], "x": 9, "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, 4], "x": 15, "y": 0},
+                {"matrix": [1, 3], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 1], "x": 18, "y": 0},
+                {"matrix": [1, 0], "x": 19, "y": 0},
+
+                {"matrix": [6, 0], "x": 20, "y": 0},
+                {"matrix": [6, 1], "x": 21, "y": 0},
+                {"matrix": [6, 2], "x": 22, "y": 0},
+                {"matrix": [6, 3], "x": 23, "y": 0},
+                {"matrix": [6, 4], "x": 24, "y": 0},
+
+                {"matrix": [2, 4], "x": 25, "y": 0},
+                {"matrix": [2, 3], "x": 26, "y": 0},
+                {"matrix": [2, 2], "x": 27, "y": 0},
+                {"matrix": [2, 1], "x": 28, "y": 0},
+                {"matrix": [2, 0], "x": 29, "y": 0},
+
+                {"matrix": [7, 3], "x": 30, "y": 0},
+                {"matrix": [7, 4], "x": 31, "y": 0},
+
+                {"matrix": [3, 4], "x": 32, "y": 0},
+                {"matrix": [3, 3], "x": 33, "y": 0}
             ]
         },
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"label":"q", "x":0, "y":0.9},
-                {"label":"w", "x":1, "y":0.2},
-                {"label":"e", "x":2, "y":0},
-                {"label":"r", "x":3, "y":0.1},
-                {"label":"t", "x":4, "y":0.15},
-
-                {"label":"y", "x":5, "y":0.15},
-                {"label":"u", "x":6, "y":0.1},
-                {"label":"i", "x":7, "y":0},
-                {"label":"o", "x":8, "y":0.2},
-                {"label":"p", "x":9, "y":0.9},
-
-                {"label":"a", "x":0, "y":1.9},
-                {"label":"s", "x":1, "y":1.2},
-                {"label":"d", "x":2, "y":1},
-                {"label":"f", "x":3, "y":1.1},
-                {"label":"g", "x":4, "y":1.15},
-
-                {"label":"h", "x":5, "y":1.15},
-                {"label":"j", "x":6, "y":1.1},
-                {"label":"k", "x":7, "y":1},
-                {"label":"l", "x":8, "y":1.2},
-                {"label":"'", "x":9, "y":1.9},
-
-                {"label":"z", "x":0, "y":2.9},
-                {"label":"x", "x":1, "y":2.2},
-                {"label":"c", "x":2, "y":2},
-                {"label":"v", "x":3, "y":2.1},
-                {"label":"b", "x":4, "y":2.15},
-
-                {"label":"n", "x":5, "y":2.15},
-                {"label":"m", "x":6, "y":2.1},
-                {"label":",", "x":7, "y":2},
-                {"label":".", "x":8, "y":2.2},
-                {"label":"/", "x":9, "y":2.9},
-
-                {"label":"lower", "x":2, "y":3.6, "h":1.25},
-                {"label":"bspc", "x":3, "y":3.6, "h":2},
-                {"label":"esc/sft", "x":4, "y":3.65, "h":2},
-
-                {"label":"ent/alt", "x":5, "y":3.65, "h":2},
-                {"label":"spc", "x":6, "y":3.6, "h":2},
-                {"label":"raise", "x":7, "y":3.6, "h":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 2], "x": 2, "y": 3.6, "h": 1.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2},
+                {"matrix": [7, 2], "x": 7, "y": 3.6, "h": 1.25}
             ]
         },
-        "LAYOUT_complicated": {
+        "LAYOUT_thumbrow": {
             "layout": [
-                {"label":"q", "x":0, "y":0.9},
-                {"label":"w", "x":1, "y":0.2},
-                {"label":"e", "x":2, "y":0},
-                {"label":"r", "x":3, "y":0.1},
-                {"label":"t", "x":4, "y":0.15},
-
-                {"label":"y", "x":5, "y":0.15},
-                {"label":"u", "x":6, "y":0.1},
-                {"label":"i", "x":7, "y":0},
-                {"label":"o", "x":8, "y":0.2},
-                {"label":"p", "x":9, "y":0.9},
-
-                {"label":"a", "x":0, "y":1.9},
-                {"label":"s", "x":1, "y":1.2},
-                {"label":"d", "x":2, "y":1},
-                {"label":"f", "x":3, "y":1.1},
-                {"label":"g", "x":4, "y":1.15},
-
-                {"label":"h", "x":5, "y":1.15},
-                {"label":"j", "x":6, "y":1.1},
-                {"label":"k", "x":7, "y":1},
-                {"label":"l", "x":8, "y":1.2},
-                {"label":"'", "x":9, "y":1.9},
-
-                {"label":"z", "x":0, "y":2.9},
-                {"label":"x", "x":1, "y":2.2},
-                {"label":"c", "x":2, "y":2},
-                {"label":"v", "x":3, "y":2.1},
-                {"label":"b", "x":4, "y":2.15},
-
-                {"label":"n", "x":5, "y":2.15},
-                {"label":"m", "x":6, "y":2.1},
-                {"label":",", "x":7, "y":2},
-                {"label":".", "x":8, "y":2.2},
-                {"label":"/", "x":9, "y":2.9},
-
-                {"label":"bspc", "x":3, "y":3.6, "h":1},
-                {"label":"esc/sft", "x":4, "y":3.65, "h":1},
-                {"label":"ent/alt", "x":5, "y":3.65, "h":1},
-                {"label":"spc", "x":6, "y":3.6, "h":1},
-
-                {"label":"lower", "x":3, "y":4.6, "h":1},
-                {"label":"gui", "x":4, "y":4.65, "h":1},
-                {"label":"tab", "x":5, "y":4.65, "h":1},
-                {"label":"raise", "x":6, "y":4.6, "h":1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [4, 4], "x": 5, "y": 0},
+                {"matrix": [4, 3], "x": 6, "y": 0},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0},
+                {"matrix": [4, 0], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 10, "y": 0},
+                {"matrix": [1, 1], "x": 11, "y": 0},
+                {"matrix": [1, 2], "x": 12, "y": 0},
+                {"matrix": [1, 3], "x": 13, "y": 0},
+                {"matrix": [1, 4], "x": 14, "y": 0},
+
+                {"matrix": [5, 4], "x": 15, "y": 0},
+                {"matrix": [5, 3], "x": 16, "y": 0},
+                {"matrix": [5, 2], "x": 17, "y": 0},
+                {"matrix": [5, 1], "x": 18, "y": 0},
+                {"matrix": [5, 0], "x": 19, "y": 0},
+
+                {"matrix": [2, 0], "x": 20, "y": 0},
+                {"matrix": [2, 1], "x": 21, "y": 0},
+                {"matrix": [2, 2], "x": 22, "y": 0},
+                {"matrix": [2, 3], "x": 23, "y": 0},
+                {"matrix": [2, 4], "x": 24, "y": 0},
+
+                {"matrix": [6, 4], "x": 25, "y": 0},
+                {"matrix": [6, 3], "x": 26, "y": 0},
+                {"matrix": [6, 2], "x": 27, "y": 0},
+                {"matrix": [6, 1], "x": 28, "y": 0},
+                {"matrix": [6, 0], "x": 29, "y": 0},
+
+                {"matrix": [3, 1], "x": 30, "y": 0},
+                {"matrix": [3, 2], "x": 31, "y": 0},
+                {"matrix": [3, 3], "x": 32, "y": 0},
+                {"matrix": [3, 4], "x": 33, "y": 0},
+
+                {"matrix": [7, 4], "x": 34, "y": 0},
+                {"matrix": [7, 3], "x": 35, "y": 0},
+                {"matrix": [7, 2], "x": 36, "y": 0},
+                {"matrix": [7, 1], "x": 37, "y": 0}
             ]
         }
     }
diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.c b/keyboards/ibnuda/squiggle/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/ibnuda/squiggle/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h
deleted file mode 100644
index 73cb7abd2f..0000000000
--- a/keyboards/ibnuda/squiggle/rev1/rev1.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#pragma once
-
-#include "squiggle.h"
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-  L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
-  L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
-  L20, L21, L22, L23, L24,           R20, R21, R22, R23, R24, \
-                 L33, L34,           R30, R31                 \
-) \
-{ \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { ___, ___, ___, L33, L34 }, \
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { ___, ___, ___, R31, R30 }, \
-}
-
-#define LAYOUT_reversed( \
-  R04, R03, R02, R01, R00,           L04, L03, L02, L01, L00, \
-  R14, R13, R12, R11, R10,           L14, L13, L12, L11, L10, \
-  R24, R23, R22, R21, R20,           L24, L23, L22, L21, L20, \
-                 R31, R30,           L34, L33                 \
-) \
-{ \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { ___, ___, ___, L33, L34 }, \
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { ___, ___, ___, R31, R30 }, \
-}
-
-#define LAYOUT_split_3x5_3(\
-  L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
-  L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
-  L20, L21, L22, L23, L24,           R20, R21, R22, R23, R24, \
-            L32, L33, L34,           R30, R31, R32            \
-) \
-{ \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { ___, ___, L32, L33, L34 }, \
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { ___, ___, R32, R31, R30 }, \
-}
-
-#define LAYOUT_complicated(\
-  L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
-  L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
-  L20, L21, L22, L23, L24,           R20, R21, R22, R23, R24, \
-                 L33, L34,           R30, R31,                \
-                 L31, L32,           R32, R33                 \
-) \
-{ \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { ___, L31, L32, L33, L34 }, \
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { ___, R33, R32, R31, R30 }, \
-}
-
-#define LAYOUT_thumbrow(\
-  L00, L01, L02, L03, L04,                     R00, R01, R02, R03, R04, \
-  L10, L11, L12, L13, L14,                     R10, R11, R12, R13, R14, \
-  L20, L21, L22, L23, L24,                     R20, R21, R22, R23, R24, \
-                 L31, L32, L33, L34, R30, R31, R32, R33                 \
-) \
-{ \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { ___, L31, L32, L33, L34 }, \
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { ___, R33, R32, R31, R30 }, \
-}
-
-#define LAYOUT_full(\
-  L00, L01, L02, L03, L04,                     R00, R01, R02, R03, R04, \
-  L10, L11, L12, L13, L14,                     R10, R11, R12, R13, R14, \
-  L20, L21, L22, L23, L24,                     R20, R21, R22, R23, R24, \
-            L30, L31, L32, L33, L34, R30, R31, R32, R33, R34            \
-) \
-{ \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { L30, L31, L32, L33, L34 }, \
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { R34, R33, R32, R31, R30 }, \
-}
-
diff --git a/keyboards/ibnuda/squiggle/squiggle.c b/keyboards/ibnuda/squiggle/squiggle.c
deleted file mode 100644
index 7c73aabf51..0000000000
--- a/keyboards/ibnuda/squiggle/squiggle.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Ibnu D. Aji
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "squiggle.h"
diff --git a/keyboards/ibnuda/squiggle/squiggle.h b/keyboards/ibnuda/squiggle/squiggle.h
deleted file mode 100644
index 4ed95e707c..0000000000
--- a/keyboards/ibnuda/squiggle/squiggle.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Ibnu D. Aji
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef KEYBOARD_ibnuda_squiggle_rev1
-    #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/idb/idb_60/config.h b/keyboards/idb/idb_60/config.h
index 90077d2361..baf09cebb5 100644
--- a/keyboards/idb/idb_60/config.h
+++ b/keyboards/idb/idb_60/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C2, D0, D1, D2, D3, D4, D5, D6, B0, B1 }
-#define MATRIX_COL_PINS { B2, B3, B4, C6, B6, B7, C7, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/idb/idb_60/info.json b/keyboards/idb/idb_60/info.json
index 1114abd5bd..44ddcdcf34 100644
--- a/keyboards/idb/idb_60/info.json
+++ b/keyboards/idb/idb_60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B4", "C6", "B6", "B7", "C7", "B5"],
+        "rows": ["C2", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "B0", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -239,7 +244,7 @@
                 {"label":"0)", "x":10, "y":0},
                 {"label":"-_", "x":11, "y":0},
                 {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2.0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
 
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
@@ -306,7 +311,7 @@
                 {"label":"0)", "x":10, "y":0},
                 {"label":"-_", "x":11, "y":0},
                 {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2.0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
 
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
@@ -446,7 +451,7 @@
                 {"label":"0)", "x":10, "y":0},
                 {"label":"-_", "x":11, "y":0},
                 {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2.0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
 
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
diff --git a/keyboards/idobao/id42/config.h b/keyboards/idobao/id42/config.h
index b588cc2bf0..6f43a71054 100755
--- a/keyboards/idobao/id42/config.h
+++ b/keyboards/idobao/id42/config.h
@@ -17,7 +17,6 @@
 /* LED Matrix & Animations */
 #ifdef RGB_MATRIX_ENABLE
 
-    #define RGB_DI_PIN B3
     #define RGB_MATRIX_LED_COUNT 42
 
     #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json
index 16670715f3..ea37dd3322 100644
--- a/keyboards/idobao/id42/info.json
+++ b/keyboards/idobao/id42/info.json
@@ -14,6 +14,12 @@
         "backlight": false,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"],
         "rows": ["D5", "C6", "B6", "E6"]
diff --git a/keyboards/idobao/id42/rules.mk b/keyboards/idobao/id42/rules.mk
index eab741fd0a..58e39b17a5 100755
--- a/keyboards/idobao/id42/rules.mk
+++ b/keyboards/idobao/id42/rules.mk
@@ -2,4 +2,3 @@
 # ** settings are data driven & stored in `info.json` **
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id61/config.h b/keyboards/idobao/id61/config.h
index d2a803a1e4..5513787c4e 100644
--- a/keyboards/idobao/id61/config.h
+++ b/keyboards/idobao/id61/config.h
@@ -8,10 +8,8 @@
  * RGB Matrix stuff
  * ---------------- */
 
-#define RGB_DI_PIN F0
-
 // RGB Matrix config
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
 
     #ifndef ID61_DISABLE_UNDERGLOW
         #define RGB_MATRIX_LED_COUNT 71
diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json
index 62b6f03f52..9fa2719e8c 100644
--- a/keyboards/idobao/id61/info.json
+++ b/keyboards/idobao/id61/info.json
@@ -14,6 +14,12 @@
         "backlight": false,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"],
         "rows": ["B0", "B1", "B2", "B3", "F7"]
diff --git a/keyboards/idobao/id61/rules.mk b/keyboards/idobao/id61/rules.mk
index d034fbb12f..ed51a57621 100644
--- a/keyboards/idobao/id61/rules.mk
+++ b/keyboards/idobao/id61/rules.mk
@@ -3,4 +3,3 @@
 # ** settings are data driven & stored in `info.json` **
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id63/config.h b/keyboards/idobao/id63/config.h
index 13a4068822..214fb6ba6d 100644
--- a/keyboards/idobao/id63/config.h
+++ b/keyboards/idobao/id63/config.h
@@ -10,10 +10,8 @@
  * RGB Matrix stuff
  * ---------------- */
 
-#define RGB_DI_PIN B7
-
 // RGB Matrix config
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
 
     /* Denwir case is solid back. Please disable underglow at compile with compile command line:
      *
diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/info.json
index 0d05c05eb3..234f3e84ac 100644
--- a/keyboards/idobao/id63/info.json
+++ b/keyboards/idobao/id63/info.json
@@ -14,6 +14,12 @@
         "backlight": false,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["C7", "F6", "F5", "F4", "F1", "B3", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
         "rows": ["B0", "B1", "B2", "E6", "F7"]
diff --git a/keyboards/idobao/id63/rules.mk b/keyboards/idobao/id63/rules.mk
index eab741fd0a..58e39b17a5 100644
--- a/keyboards/idobao/id63/rules.mk
+++ b/keyboards/idobao/id63/rules.mk
@@ -2,4 +2,3 @@
 # ** settings are data driven & stored in `info.json` **
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id67/config.h b/keyboards/idobao/id67/config.h
index 6e6b15e076..7834bd33bb 100644
--- a/keyboards/idobao/id67/config.h
+++ b/keyboards/idobao/id67/config.h
@@ -5,9 +5,6 @@
 
 #pragma once
 
-
-#define RGB_DI_PIN F0
-
 // RGB Matrix config
 #if defined(RGB_MATRIX_ENABLE)
     #ifndef ID67_DISABLE_UNDERGLOW
diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json
index 34cec9b931..f21a9ecd67 100644
--- a/keyboards/idobao/id67/info.json
+++ b/keyboards/idobao/id67/info.json
@@ -14,6 +14,12 @@
         "backlight": false,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
         "rows": ["B0", "B1", "B2", "B3", "F7"]
diff --git a/keyboards/idobao/id67/rules.mk b/keyboards/idobao/id67/rules.mk
index ce58b87be5..4341508fde 100644
--- a/keyboards/idobao/id67/rules.mk
+++ b/keyboards/idobao/id67/rules.mk
@@ -2,4 +2,3 @@
 #   change yes to no to disable
 #
 RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix feature
-RGB_MATRIX_DRIVER = WS2812 	# ID67 uses WS2812 driver
diff --git a/keyboards/idobao/id75/keymaps/egstad/config.h b/keyboards/idobao/id75/keymaps/egstad/config.h
index c0227431fb..7e1868813f 100644
--- a/keyboards/idobao/id75/keymaps/egstad/config.h
+++ b/keyboards/idobao/id75/keymaps/egstad/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 #define RGBLIGHT_SLEEP
 
 
diff --git a/keyboards/idobao/id75/keymaps/gkbd_75/config.h b/keyboards/idobao/id75/keymaps/gkbd_75/config.h
index 7813d776e5..d969bd88a2 100644
--- a/keyboards/idobao/id75/keymaps/gkbd_75/config.h
+++ b/keyboards/idobao/id75/keymaps/gkbd_75/config.h
@@ -17,5 +17,4 @@
 #pragma once
 
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
diff --git a/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h b/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h
index e8fc39faad..3e8dcc7570 100644
--- a/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h
+++ b/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h
@@ -17,4 +17,3 @@
 #pragma once
 
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h
index 54f0fc0c7c..2174e39bd2 100644
--- a/keyboards/idobao/id75/v1/config.h
+++ b/keyboards/idobao/id75/v1/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B3, C7, B6, C6 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
     #define RGBLIGHT_EFFECT_ALTERNATING
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_CHRISTMAS
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json
index a192072701..1407d02c80 100644
--- a/keyboards/idobao/id75/v1/info.json
+++ b/keyboards/idobao/id75/v1/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0075",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"],
+    "rows": ["B0", "B3", "C7", "B6", "C6"]
+  },
+  "ws2812": {
+    "pin": "F0"
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "breathing": true
@@ -17,7 +25,87 @@
   "community_layouts": ["ortho_5x15"],
   "layouts": {
       "LAYOUT_ortho_5x15": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":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": [0, 6], "x": 6, "y": 0},
+            {"matrix": [0, 7], "x": 7, "y": 0},
+            {"matrix": [0, 8], "x": 8, "y": 0},
+            {"matrix": [0, 9], "x": 9, "y": 0},
+            {"matrix": [0, 10], "x": 10, "y": 0},
+            {"matrix": [0, 11], "x": 11, "y": 0},
+            {"matrix": [0, 12], "x": 12, "y": 0},
+            {"matrix": [0, 13], "x": 13, "y": 0},
+            {"matrix": [0, 14], "x": 14, "y": 0},
+
+            {"matrix": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1},
+            {"matrix": [1, 3], "x": 3, "y": 1},
+            {"matrix": [1, 4], "x": 4, "y": 1},
+            {"matrix": [1, 5], "x": 5, "y": 1},
+            {"matrix": [1, 6], "x": 6, "y": 1},
+            {"matrix": [1, 7], "x": 7, "y": 1},
+            {"matrix": [1, 8], "x": 8, "y": 1},
+            {"matrix": [1, 9], "x": 9, "y": 1},
+            {"matrix": [1, 10], "x": 10, "y": 1},
+            {"matrix": [1, 11], "x": 11, "y": 1},
+            {"matrix": [1, 12], "x": 12, "y": 1},
+            {"matrix": [1, 13], "x": 13, "y": 1},
+            {"matrix": [1, 14], "x": 14, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1, "y": 2},
+            {"matrix": [2, 2], "x": 2, "y": 2},
+            {"matrix": [2, 3], "x": 3, "y": 2},
+            {"matrix": [2, 4], "x": 4, "y": 2},
+            {"matrix": [2, 5], "x": 5, "y": 2},
+            {"matrix": [2, 6], "x": 6, "y": 2},
+            {"matrix": [2, 7], "x": 7, "y": 2},
+            {"matrix": [2, 8], "x": 8, "y": 2},
+            {"matrix": [2, 9], "x": 9, "y": 2},
+            {"matrix": [2, 10], "x": 10, "y": 2},
+            {"matrix": [2, 11], "x": 11, "y": 2},
+            {"matrix": [2, 12], "x": 12, "y": 2},
+            {"matrix": [2, 13], "x": 13, "y": 2},
+            {"matrix": [2, 14], "x": 14, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3},
+            {"matrix": [3, 3], "x": 3, "y": 3},
+            {"matrix": [3, 4], "x": 4, "y": 3},
+            {"matrix": [3, 5], "x": 5, "y": 3},
+            {"matrix": [3, 6], "x": 6, "y": 3},
+            {"matrix": [3, 7], "x": 7, "y": 3},
+            {"matrix": [3, 8], "x": 8, "y": 3},
+            {"matrix": [3, 9], "x": 9, "y": 3},
+            {"matrix": [3, 10], "x": 10, "y": 3},
+            {"matrix": [3, 11], "x": 11, "y": 3},
+            {"matrix": [3, 12], "x": 12, "y": 3},
+            {"matrix": [3, 13], "x": 13, "y": 3},
+            {"matrix": [3, 14], "x": 14, "y": 3},
+
+            {"matrix": [4, 0], "x": 0, "y": 4},
+            {"matrix": [4, 1], "x": 1, "y": 4},
+            {"matrix": [4, 2], "x": 2, "y": 4},
+            {"matrix": [4, 3], "x": 3, "y": 4},
+            {"matrix": [4, 4], "x": 4, "y": 4},
+            {"matrix": [4, 5], "x": 5, "y": 4},
+            {"matrix": [4, 6], "x": 6, "y": 4},
+            {"matrix": [4, 7], "x": 7, "y": 4},
+            {"matrix": [4, 8], "x": 8, "y": 4},
+            {"matrix": [4, 9], "x": 9, "y": 4},
+            {"matrix": [4, 10], "x": 10, "y": 4},
+            {"matrix": [4, 11], "x": 11, "y": 4},
+            {"matrix": [4, 12], "x": 12, "y": 4},
+            {"matrix": [4, 13], "x": 13, "y": 4},
+            {"matrix": [4, 14], "x": 14, "y": 4}
+          ]
       }
   }
 }
diff --git a/keyboards/idobao/id75/v1/v1.c b/keyboards/idobao/id75/v1/v1.c
deleted file mode 100644
index 992a292616..0000000000
--- a/keyboards/idobao/id75/v1/v1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "v1.h"
diff --git a/keyboards/idobao/id75/v1/v1.h b/keyboards/idobao/id75/v1/v1.h
deleted file mode 100644
index 9643a1efd3..0000000000
--- a/keyboards/idobao/id75/v1/v1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x15( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E } \
-}
diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h
index d44e54d32c..54d74c8da5 100644
--- a/keyboards/idobao/id75/v2/config.h
+++ b/keyboards/idobao/id75/v2/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B3, C7, B6, C6 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#undef RGB_DI_PIN
-#define RGB_DI_PIN F0
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_COUNT 85 /* 10 Bottom 75 top*/
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json
index 558cbda3c8..5275c54dbb 100644
--- a/keyboards/idobao/id75/v2/info.json
+++ b/keyboards/idobao/id75/v2/info.json
@@ -8,91 +8,102 @@
         "pid": "0x0075",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["B0", "B3", "C7", "B6", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x15"],
     "layouts": {
         "LAYOUT_ortho_5x15": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":7, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/idobao/id75/v2/rules.mk b/keyboards/idobao/id75/v2/rules.mk
index a29a20b766..38f5eb554b 100644
--- a/keyboards/idobao/id75/v2/rules.mk
+++ b/keyboards/idobao/id75/v2/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Use link time optimization
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id75/v2/v2.c b/keyboards/idobao/id75/v2/v2.c
index f65a9e3362..55d58d92e1 100644
--- a/keyboards/idobao/id75/v2/v2.c
+++ b/keyboards/idobao/id75/v2/v2.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v2.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/idobao/id75/v2/v2.h b/keyboards/idobao/id75/v2/v2.h
deleted file mode 100644
index 9643a1efd3..0000000000
--- a/keyboards/idobao/id75/v2/v2.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x15( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E } \
-}
diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h
index d3eb71dc92..aa409bc487 100644
--- a/keyboards/idobao/id80/v2/config.h
+++ b/keyboards/idobao/id80/v2/config.h
@@ -17,39 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- * The matrix description in the vendor-supplied JSON file for kbfirmware.com
- * had 9 columns:
- *     { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
- * and 12 rows:
- *     { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
- * However, the row 6 was completely empty, and the pin F0 was not actually
- * routed anywhere on the PCB, therefore this row was removed to save some
- * resources (the EEPROM space for dynamic keymaps is especially scarce).
- *
- * After doing the above change, the matrix was transposed (rows and columns
- * were swapped), because a matrix with the COL2ROW layout can be scanned much
- * more efficiently than a matrix with the ROW2COL layout (depending on various
- * optimizations, the difference in scan rate can be over 2 times).  Because of
- * this, the "columns" in the matrix layout now mostly correspond to physical
- * rows, and the "rows" have mostly vertical physical orientation.
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, E6, F1, F4, F5, F6, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 20       /* 16 underglow LEDs, 4 top LEDs */
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -67,4 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_EFFECT_SNAKE
     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
     #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json
index 89b64f3951..247c3cb113 100644
--- a/keyboards/idobao/id80/v2/info.json
+++ b/keyboards/idobao/id80/v2/info.json
@@ -6,10 +6,18 @@
         "vid": "0x6964",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "C7",
         "on_state": 0
diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h
index bdabde0782..afe880fa8a 100644
--- a/keyboards/idobao/id80/v3/ansi/config.h
+++ b/keyboards/idobao/id80/v3/ansi/config.h
@@ -7,10 +7,8 @@
  * RGB Matrix stuff
  * ---------------- */
 
-#define RGB_DI_PIN E2
-
 // RGB Matrix config
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
 
     #define RGB_MATRIX_LED_COUNT 94
 
diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
index 9797c60dfe..7788a941f4 100644
--- a/keyboards/idobao/id80/v3/ansi/info.json
+++ b/keyboards/idobao/id80/v3/ansi/info.json
@@ -14,6 +14,9 @@
         "backlight": false,
         "rgblight": false
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"],
         "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"]
@@ -25,6 +28,9 @@
         "pid": "0x0380",
         "device_version": "3.0.0"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "bootmagic": {
         "matrix": [0, 5]
     },
diff --git a/keyboards/idobao/id80/v3/ansi/rules.mk b/keyboards/idobao/id80/v3/ansi/rules.mk
index eab741fd0a..58e39b17a5 100644
--- a/keyboards/idobao/id80/v3/ansi/rules.mk
+++ b/keyboards/idobao/id80/v3/ansi/rules.mk
@@ -2,4 +2,3 @@
 # ** settings are data driven & stored in `info.json` **
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h
index 2f4ebd7744..9b7459de6c 100644
--- a/keyboards/idobao/id87/v1/config.h
+++ b/keyboards/idobao/id87/v1/config.h
@@ -14,27 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
-
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLIGHT_EFFECT_ALTERNATING
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_CHRISTMAS
@@ -50,4 +29,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json
index ca39654575..2a7b4a9bf9 100644
--- a/keyboards/idobao/id87/v1/info.json
+++ b/keyboards/idobao/id87/v1/info.json
@@ -8,105 +8,126 @@
         "pid": "0x0087",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6"
     },
     "indicators": {
         "caps_lock": "C7"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"=", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[", "x":11.5, "y":2.5},
-                {"label":"]", "x":12.5, "y":2.5},
-                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":"'", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"LT(1, KC_APP)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [6, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 7], "x": 11, "y": 0},
+                {"matrix": [6, 5], "x": 12, "y": 0},
+                {"matrix": [6, 4], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 0},
+                {"matrix": [6, 2], "x": 16.25, "y": 0},
+                {"matrix": [6, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [7, 8], "x": 9, "y": 1.5},
+                {"matrix": [7, 0], "x": 10, "y": 1.5},
+                {"matrix": [7, 7], "x": 11, "y": 1.5},
+                {"matrix": [7, 5], "x": 12, "y": 1.5},
+                {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+                {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+                {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+                {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+                {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+                {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+                {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+                {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 1], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/idobao/id87/v1/v1.c b/keyboards/idobao/id87/v1/v1.c
deleted file mode 100644
index 59dc3daab4..0000000000
--- a/keyboards/idobao/id87/v1/v1.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-Copyright 2020 Tybera
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "v1.h"
diff --git a/keyboards/idobao/id87/v1/v1.h b/keyboards/idobao/id87/v1/v1.h
deleted file mode 100644
index 1a75d95755..0000000000
--- a/keyboards/idobao/id87/v1/v1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2020 Tybera
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K68,    K67, K65, K64, K63,  K66, K62, K61,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,       K76, K72, K71,  \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83,     K86, K82, K81,  \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93,                         \
-    K40,       K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                K92,       \
-    K50,  K51,  K52,              K56,                K58,  K57,  K54,  K53,    KA6, KA2, KA1   \
-) { \
-    { K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   KC_NO, K56,   K57,   K58   }, \
-    { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68   }, \
-    { K70,   K71,   K72,   K73,   KC_NO, K75,   K76,   K77,   K78   }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \
-    { KC_NO, KC_NO, K92,   K93,   KC_NO, K95,   KC_NO, K97,   K98   }, \
-    { KC_NO, KA1,   KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8   }, \
-}
-
-
diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h
index 02b62fc61f..17b63471fa 100644
--- a/keyboards/idobao/id87/v2/config.h
+++ b/keyboards/idobao/id87/v2/config.h
@@ -8,8 +8,6 @@
  * RGB Matrix stuff
  * ---------------- */
 
-#define RGB_DI_PIN E2
-
 // RGB Matrix config
 #if defined(RGB_MATRIX_ENABLE)
 
diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json
index 6272c02d96..d51e39215b 100644
--- a/keyboards/idobao/id87/v2/info.json
+++ b/keyboards/idobao/id87/v2/info.json
@@ -14,6 +14,12 @@
         "backlight": false,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
         "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
diff --git a/keyboards/idobao/id87/v2/rules.mk b/keyboards/idobao/id87/v2/rules.mk
index eab741fd0a..58e39b17a5 100644
--- a/keyboards/idobao/id87/v2/rules.mk
+++ b/keyboards/idobao/id87/v2/rules.mk
@@ -2,4 +2,3 @@
 # ** settings are data driven & stored in `info.json` **
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h
index 7f48dc7752..a857f49125 100644
--- a/keyboards/idobao/id96/config.h
+++ b/keyboards/idobao/id96/config.h
@@ -18,22 +18,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,4 +38,3 @@
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/idobao/id96/id96.c b/keyboards/idobao/id96/id96.c
deleted file mode 100644
index 1bb863f1ff..0000000000
--- a/keyboards/idobao/id96/id96.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * This file is part of the QMK Firmware distribution (https://github.com/qmk/qmk_firmware).
- * Copyright 2018-2021 "kaylanm" <http://github.com/kaylanm> [Melody96]
- *                     Vino Rodrigues <http://github.com/vinorodrigues> [ID96]
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "id96.h"
diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json
index 2046283d8e..f9a1a003f4 100644
--- a/keyboards/idobao/id96/info.json
+++ b/keyboards/idobao/id96/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0096",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 7,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "C7",
         "num_lock": "C6",
diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h
index 5c612855fb..87ed689f66 100644
--- a/keyboards/idobao/montex/v1/config.h
+++ b/keyboards/idobao/montex/v1/config.h
@@ -16,22 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
     #define RGBLIGHT_EFFECT_ALTERNATING
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_CHRISTMAS
@@ -47,4 +37,3 @@
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json
index 725ddc0c4d..666ffbdf89 100644
--- a/keyboards/idobao/montex/v1/info.json
+++ b/keyboards/idobao/montex/v1/info.json
@@ -8,46 +8,54 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0"],
+        "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_numpad_6x5": {
             "layout": [
-                { "label": "0,0", "x": 0, "y": 0},
-                { "label": "0,1", "x": 1, "y": 0},
-                { "label": "0,2", "x": 2, "y": 0},
-                { "label": "0,3", "x": 3, "y": 0},
-                { "label": "0,4", "x": 4, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
 
-                { "label": "1,0", "x": 0, "y": 1.25},
-                { "label": "1,1", "x": 1, "y": 1.25},
-                { "label": "1,2", "x": 2, "y": 1.25},
-                { "label": "1,3", "x": 3, "y": 1.25},
-                { "label": "1,4", "x": 4, "y": 1.25},
+                {"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},
 
-                { "label": "2,0", "x": 0, "y": 2.25},
-                { "label": "2,1", "x": 1, "y": 2.25},
-                { "label": "2,2", "x": 2, "y": 2.25},
-                { "label": "2,3", "x": 3, "y": 2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
 
-                { "label": "3,0", "x": 0, "y": 3.25},
-                { "label": "3,1", "x": 1, "y": 3.25},
-                { "label": "3,2", "x": 2, "y": 3.25},
-                { "label": "3,3", "x": 3, "y": 3.25},
-                { "label": "3,4", "x": 4, "y": 2.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+                {"matrix": [2, 4], "x": 4, "y": 2.25, "h": 2},
 
-                { "label": "4,0", "x": 0, "y": 4.25},
-                { "label": "4,1", "x": 1, "y": 4.25},
-                { "label": "4,2", "x": 2, "y": 4.25},
-                { "label": "4,3", "x": 3, "y": 4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
 
-                { "label": "5,0", "x": 0, "y": 5.25},
-                { "label": "5,1", "x": 1, "y": 5.25, "w": 2},
-                { "label": "5,2", "x": 3, "y": 5.25},
-                { "label": "5,3", "x": 4, "y": 4.25, "h": 2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 3, "y": 5.25},
+                {"matrix": [5, 3], "x": 4, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/idobao/montex/v1/v1.c b/keyboards/idobao/montex/v1/v1.c
deleted file mode 100644
index e927383097..0000000000
--- a/keyboards/idobao/montex/v1/v1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 NachoxMacho
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
-*/
-
-#include "v1.h"
diff --git a/keyboards/idobao/montex/v1/v1.h b/keyboards/idobao/montex/v1/v1.h
deleted file mode 100644
index d57097fa88..0000000000
--- a/keyboards/idobao/montex/v1/v1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 NachoxMacho
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_6x5( \
-	K00, K01, K02, K03, K04, \
-	K10, K11, K12, K13, K14, \
-	K20, K21, K22, K23,      \
-	K30, K31, K32, K33, K34, \
-	K40, K41, K42, K43,      \
-	K50, K51,      K52, K53  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04 }, \
-	{ K10,   K11,   K12,   K13,   K14 }, \
-	{ K20,   K21,   K22,   K23,   K34 }, \
-	{ K30,   K31,   K32,   K33,   KC_NO }, \
-	{ K40,   K41,   K42,   K43,   KC_NO }, \
-	{ K50,   K51,   K52,   K53,   KC_NO }  \
-}
diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h
index a3b2a5ef92..789479de05 100755
--- a/keyboards/idobao/montex/v1rgb/config.h
+++ b/keyboards/idobao/montex/v1rgb/config.h
@@ -3,24 +3,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- */
-#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN B1
-
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
 
     // The number of LEDs connected
     #define RGB_MATRIX_LED_COUNT 31
diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json
index 75add6a896..5980cab117 100755
--- a/keyboards/idobao/montex/v1rgb/info.json
+++ b/keyboards/idobao/montex/v1rgb/info.json
@@ -6,39 +6,55 @@
         "pid": "0x0127",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0"],
+        "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
+    },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["numpad_6x5"],
     "layouts": {
         "LAYOUT_numpad_6x5": {
             "layout": [
-                { "label": "K00 (D4,D5)", "x": 0, "y": 0 },
-                { "label": "K01 (D4,D3)", "x": 1, "y": 0 },
-                { "label": "K02 (D4,D2)", "x": 2, "y": 0 },
-                { "label": "K03 (D4,D1)", "x": 3, "y": 0 },
-                { "label": "K04 (D4,D0)", "x": 4, "y": 0 },
-                { "label": "K10 (D6,D5)", "x": 0, "y": 1 },
-                { "label": "K11 (D6,D3)", "x": 1, "y": 1 },
-                { "label": "K12 (D6,D2)", "x": 2, "y": 1 },
-                { "label": "K13 (D6,D1)", "x": 3, "y": 1 },
-                { "label": "K14 (D6,D0)", "x": 4, "y": 1 },
-                { "label": "K20 (D7,D5)", "x": 0, "y": 2 },
-                { "label": "K21 (D7,D3)", "x": 1, "y": 2 },
-                { "label": "K22 (D7,D2)", "x": 2, "y": 2 },
-                { "label": "K23 (D7,D1)", "x": 3, "y": 2 },
-                { "label": "K24 (D7,D0)", "x": 4, "y": 2, "h": 2 },
-                { "label": "K30 (B4,D5)", "x": 0, "y": 3 },
-                { "label": "K31 (B4,D3)", "x": 1, "y": 3 },
-                { "label": "K32 (B4,D2)", "x": 2, "y": 3 },
-                { "label": "K33 (B4,D1)", "x": 3, "y": 3 },
-                { "label": "K40 (B5,D5)", "x": 0, "y": 4 },
-                { "label": "K41 (B5,D3)", "x": 1, "y": 4 },
-                { "label": "K42 (B5,D2)", "x": 2, "y": 4 },
-                { "label": "K43 (B5,D1)", "x": 3, "y": 4 },
-                { "label": "K53 (C6,D1)", "x": 4, "y": 4, "h": 2 },
-                { "label": "K50 (C6,D5)", "x": 0, "y": 5 },
-                { "label": "K51 (C6,D3)", "x": 1, "y": 5, "w": 2 },
-                { "label": "K52 (C6,D2)", "x": 3, "y": 5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [5, 3], "x": 4, "y": 4, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 3, "y": 5}
             ]
         }
     }
diff --git a/keyboards/idobao/montex/v1rgb/rules.mk b/keyboards/idobao/montex/v1rgb/rules.mk
index 9a1656f5d6..88f044a7ec 100755
--- a/keyboards/idobao/montex/v1rgb/rules.mk
+++ b/keyboards/idobao/montex/v1rgb/rules.mk
@@ -10,4 +10,3 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.c b/keyboards/idobao/montex/v1rgb/v1rgb.c
index 3d2a847c00..b70067cfcf 100755
--- a/keyboards/idobao/montex/v1rgb/v1rgb.c
+++ b/keyboards/idobao/montex/v1rgb/v1rgb.c
@@ -1,7 +1,7 @@
 // Copyright 2022 peepeetee (@peepeetee)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "v1rgb.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.h b/keyboards/idobao/montex/v1rgb/v1rgb.h
deleted file mode 100755
index e069771c6f..0000000000
--- a/keyboards/idobao/montex/v1rgb/v1rgb.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_numpad_6x5( \
-    K00, K01, K02, K03, K04, \
-    K10, K11, K12, K13, K14, \
-    K20, K21, K22, K23, K24, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43, K53, \
-    K50, K51,      K52  \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, ___ }, \
-    { K40, K41, K42, K43, ___ }, \
-    { K50, K51, K52, K53, ___ }, \
-}
diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h
index 47e51e9268..a7cd0d6114 100755
--- a/keyboards/idobao/montex/v2/config.h
+++ b/keyboards/idobao/montex/v2/config.h
@@ -3,11 +3,7 @@
 
 #pragma once
 
-
-/* LED Matrix & Animations */
-#define RGB_DI_PIN B1
-
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
+#if defined(RGB_MATRIX_ENABLE)
     #ifndef ID27_DISABLE_UNDERGLOW
         #define RGB_MATRIX_LED_COUNT 31  // The number of LEDs connected
     #else
diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json
index 55b330609f..5add3c6c2f 100755
--- a/keyboards/idobao/montex/v2/info.json
+++ b/keyboards/idobao/montex/v2/info.json
@@ -14,6 +14,12 @@
         "backlight": false,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["D5", "D3", "D2", "D1", "D0"],
         "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
diff --git a/keyboards/idobao/montex/v2/rules.mk b/keyboards/idobao/montex/v2/rules.mk
index 205f56d5fd..d249ac15a7 100755
--- a/keyboards/idobao/montex/v2/rules.mk
+++ b/keyboards/idobao/montex/v2/rules.mk
@@ -2,4 +2,3 @@
 # ** settings are data driven & stored in `info.json` **
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idyllic/tinny50_rgb/config.h b/keyboards/idyllic/tinny50_rgb/config.h
index 1cc4a1db93..15e1a6ff5c 100644
--- a/keyboards/idyllic/tinny50_rgb/config.h
+++ b/keyboards/idyllic/tinny50_rgb/config.h
@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DYNAMIC_KEYMAP_LAYER_COUNT 6
 
 #ifdef RGB_MATRIX_ENABLE
-/* The pin connected to the data pin of the LEDs */
-#define RGB_DI_PIN GP10
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS * 7/8
 
diff --git a/keyboards/idyllic/tinny50_rgb/info.json b/keyboards/idyllic/tinny50_rgb/info.json
index 0f759e044b..dcac3b712b 100644
--- a/keyboards/idyllic/tinny50_rgb/info.json
+++ b/keyboards/idyllic/tinny50_rgb/info.json
@@ -29,34 +29,38 @@
     "rgb_matrix": {
         "driver": "WS2812"
     },
+    "ws2812": {
+        "pin": "GP10",
+        "driver": "vendor"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "matrix": [2, 0], "w": 1.25, "x": 0.0, "y": 2.25 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "matrix": [2, 0], "w": 1.25, "x": 0, "y": 2.25 },
                 { "matrix": [2, 1], "x": 1.25, "y": 2.25 },
                 { "matrix": [2, 2], "x": 2.25, "y": 2.25 },
                 { "matrix": [2, 3], "x": 3.25, "y": 2.25 },
@@ -67,7 +71,7 @@
                 { "matrix": [2, 8], "x": 8.25, "y": 2.25 },
                 { "matrix": [2, 9], "x": 9.25, "y": 2.25 },
                 { "matrix": [2, 11], "w": 1.75, "x": 10.25, "y": 2.25 },
-                { "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "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 },
@@ -77,8 +81,8 @@
                 { "matrix": [3, 7], "x": 7.75, "y": 3.25 },
                 { "matrix": [3, 8], "x": 8.75, "y": 3.25 },
                 { "matrix": [3, 10], "w": 1.25, "x": 9.75, "y": 3.25 },
-                { "matrix": [3, 11], "x": 11.0, "y": 3.25 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "matrix": [3, 11], "x": 11, "y": 3.25 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "matrix": [4, 1], "x": 1.25, "y": 4.25 },
                 { "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "matrix": [4, 5], "w": 6.25, "x": 3.25, "y": 4.25 },
diff --git a/keyboards/idyllic/tinny50_rgb/rules.mk b/keyboards/idyllic/tinny50_rgb/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/idyllic/tinny50_rgb/rules.mk
+++ b/keyboards/idyllic/tinny50_rgb/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/illuminati/is0/config.h b/keyboards/illuminati/is0/config.h
index f7f6409149..50001e978c 100644
--- a/keyboards/illuminati/is0/config.h
+++ b/keyboards/illuminati/is0/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D2 }
-#define MATRIX_COL_PINS { D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/illuminati/is0/info.json b/keyboards/illuminati/is0/info.json
index 1d201e3535..061f2e1049 100644
--- a/keyboards/illuminati/is0/info.json
+++ b/keyboards/illuminati/is0/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0012",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0"],
+        "rows": ["D2"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5,
@@ -17,7 +22,9 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0.25, "y":0, "w":1.25, "h":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0, "w": 1.25, "h": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/illuminati/is0/is0.c b/keyboards/illuminati/is0/is0.c
deleted file mode 100644
index 770a47f0ed..0000000000
--- a/keyboards/illuminati/is0/is0.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "is0.h"
diff --git a/keyboards/illuminati/is0/is0.h b/keyboards/illuminati/is0/is0.h
deleted file mode 100644
index a9fae5b40e..0000000000
--- a/keyboards/illuminati/is0/is0.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K0 \
-) \
-{ \
-    { K0 } \
-}
diff --git a/keyboards/illusion/rosa/config.h b/keyboards/illusion/rosa/config.h
index b83ebd140a..7b9007c1f6 100644
--- a/keyboards/illusion/rosa/config.h
+++ b/keyboards/illusion/rosa/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D1, D4, F0, B0, B1 }
-#define MATRIX_COL_PINS { D0, D2, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/illusion/rosa/info.json b/keyboards/illusion/rosa/info.json
index bb533bfb2f..4432fbca49 100644
--- a/keyboards/illusion/rosa/info.json
+++ b/keyboards/illusion/rosa/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6952",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D2", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["D1", "D4", "F0", "B0", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B3",
         "on_state": 0
diff --git a/keyboards/illusion/rosa/rosa.c b/keyboards/illusion/rosa/rosa.c
deleted file mode 100644
index 54619e1ce7..0000000000
--- a/keyboards/illusion/rosa/rosa.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Brandon Lee
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "rosa.h"
diff --git a/keyboards/ilumkb/primus75/config.h b/keyboards/ilumkb/primus75/config.h
index 5e8abdf2e0..0e5e8b9d25 100644
--- a/keyboards/ilumkb/primus75/config.h
+++ b/keyboards/ilumkb/primus75/config.h
@@ -15,14 +15,6 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, B7 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, F5, D4, B1, B0, B5, B4, D7, D6, B3, F4, F6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/ilumkb/primus75/info.json b/keyboards/ilumkb/primus75/info.json
index 9b665dda74..7f447ff1ae 100644
--- a/keyboards/ilumkb/primus75/info.json
+++ b/keyboards/ilumkb/primus75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1014",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 5
diff --git a/keyboards/ilumkb/primus75/primus75.c b/keyboards/ilumkb/primus75/primus75.c
deleted file mode 100644
index 49d76a0a88..0000000000
--- a/keyboards/ilumkb/primus75/primus75.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 dztech
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "primus75.h"
diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h
index 6c6326b3cd..151eba96c9 100644
--- a/keyboards/ilumkb/simpler61/config.h
+++ b/keyboards/ilumkb/simpler61/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/info.json
index 867152f295..8b2d379a38 100644
--- a/keyboards/ilumkb/simpler61/info.json
+++ b/keyboards/ilumkb/simpler61/info.json
@@ -8,6 +8,14 @@
         "pid": "0xC361",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
+        "rows": ["F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
diff --git a/keyboards/ilumkb/simpler61/rules.mk b/keyboards/ilumkb/simpler61/rules.mk
index df3e43eac7..c2f7c0e093 100644
--- a/keyboards/ilumkb/simpler61/rules.mk
+++ b/keyboards/ilumkb/simpler61/rules.mk
@@ -11,4 +11,3 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h
index f6fcafb749..5554f56bd1 100644
--- a/keyboards/ilumkb/simpler64/config.h
+++ b/keyboards/ilumkb/simpler64/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/info.json
index 15d17d3540..b13b3fbf3c 100644
--- a/keyboards/ilumkb/simpler64/info.json
+++ b/keyboards/ilumkb/simpler64/info.json
@@ -8,6 +8,14 @@
         "pid": "0xC364",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
+        "rows": ["F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
diff --git a/keyboards/ilumkb/simpler64/rules.mk b/keyboards/ilumkb/simpler64/rules.mk
index df3e43eac7..c2f7c0e093 100644
--- a/keyboards/ilumkb/simpler64/rules.mk
+++ b/keyboards/ilumkb/simpler64/rules.mk
@@ -11,4 +11,3 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/ilumkb/volcano660/config.h b/keyboards/ilumkb/volcano660/config.h
index c63b26264e..fdd1846753 100644
--- a/keyboards/ilumkb/volcano660/config.h
+++ b/keyboards/ilumkb/volcano660/config.h
@@ -15,23 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B6 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D3, D5, D4, D6, D7, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ilumkb/volcano660/info.json b/keyboards/ilumkb/volcano660/info.json
index 9e5ec18b67..3a725c01e8 100644
--- a/keyboards/ilumkb/volcano660/info.json
+++ b/keyboards/ilumkb/volcano660/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["B0", "B1", "B2", "B3", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h
index 4ef09efc37..6b7e3970f5 100644
--- a/keyboards/inett_studio/sqx/hotswap/config.h
+++ b/keyboards/inett_studio/sqx/hotswap/config.h
@@ -18,11 +18,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F4, B7, D6}
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, F7, F6, F5, E6, B0, D2, D4, D5, D3 }
-#define DIODE_DIRECTION ROW2COL
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -38,7 +33,6 @@
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 128
 #define RGBLED_NUM          18
-#define RGB_DI_PIN          D7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/info.json
index 1d9014bdbd..02934bcf7c 100644
--- a/keyboards/inett_studio/sqx/hotswap/info.json
+++ b/keyboards/inett_studio/sqx/hotswap/info.json
@@ -8,6 +8,17 @@
         "pid": "0x5336",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"],
+        "rows": ["F0", "F1", "F4", "B7", "D6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_tsangan_hhkb"],
diff --git a/keyboards/inett_studio/sqx/hotswap/rules.mk b/keyboards/inett_studio/sqx/hotswap/rules.mk
index bb431dcb1d..9495ef556a 100644
--- a/keyboards/inett_studio/sqx/hotswap/rules.mk
+++ b/keyboards/inett_studio/sqx/hotswap/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
 AUDIO_ENABLE = no           # Audio output
 
 LTO_ENABLE = yes            # Reducing firmware size
diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h
index be6d4a8e65..11549b9ad9 100644
--- a/keyboards/inett_studio/sqx/universal/config.h
+++ b/keyboards/inett_studio/sqx/universal/config.h
@@ -18,11 +18,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F4, B7, D6}
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, F7, F6, F5, E6, B0, D2, D4, D5, D3 }
-#define DIODE_DIRECTION ROW2COL
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -38,7 +33,6 @@
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 128
 #define RGBLED_NUM          18
-#define RGB_DI_PIN          D7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/inett_studio/sqx/universal/info.json b/keyboards/inett_studio/sqx/universal/info.json
index 7da0598d91..5f3c728046 100644
--- a/keyboards/inett_studio/sqx/universal/info.json
+++ b/keyboards/inett_studio/sqx/universal/info.json
@@ -8,6 +8,17 @@
         "pid": "0x5336",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"],
+        "rows": ["F0", "F1", "F4", "B7", "D6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
diff --git a/keyboards/inett_studio/sqx/universal/rules.mk b/keyboards/inett_studio/sqx/universal/rules.mk
index 15a127480a..0b20413480 100644
--- a/keyboards/inett_studio/sqx/universal/rules.mk
+++ b/keyboards/inett_studio/sqx/universal/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
 
 LTO_ENABLE = yes            # Reducing firmware size
diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json
index 7030086a5c..d9259d5f32 100644
--- a/keyboards/ingrained/info.json
+++ b/keyboards/ingrained/info.json
@@ -14,266 +14,103 @@
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
-                {
-                    "label": "Esc",
-                    "x": 0,
-                    "y": 0.3
-                },
-                {
-                    "label": "Q",
-                    "x": 1,
-                    "y": 0.3
-                },
-                {
-                    "label": "W",
-                    "x": 2,
-                    "y": 0.1
-                },
-                {
-                    "label": "E",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "R",
-                    "x": 4,
-                    "y": 0.1
-                },
-                {
-                    "label": "T",
-                    "x": 5,
-                    "y": 0.2
-                },
-                {
-                    "label": "Y",
-                    "x": 9,
-                    "y": 0.2
-                },
-                {
-                    "label": "U",
-                    "x": 10,
-                    "y": 0.1
-                },
-                {
-                    "label": "I",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "O",
-                    "x": 12,
-                    "y": 0.1
-                },
-                {
-                    "label": "P",
-                    "x": 13,
-                    "y": 0.3
-                },
-                {
-                    "label": "Back Space",
-                    "x": 14,
-                    "y": 0.3
-                },
-                {
-                    "label": "Tab",
-                    "x": 0,
-                    "y": 1.3
-                },
-                {
-                    "label": "A",
-                    "x": 1,
-                    "y": 1.3
-                },
-                {
-                    "label": "S",
-                    "x": 2,
-                    "y": 1.1
-                },
-                {
-                    "label": "D",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "label": "F",
-                    "x": 4,
-                    "y": 1.1
-                },
-                {
-                    "label": "G",
-                    "x": 5,
-                    "y": 1.2
-                },
-                {
-                    "label": "H",
-                    "x": 9,
-                    "y": 1.2
-                },
-                {
-                    "label": "J",
-                    "x": 10,
-                    "y": 1.1
-                },
-                {
-                    "label": "K",
-                    "x": 11,
-                    "y": 1
-                },
-                {
-                    "label": "L",
-                    "x": 12,
-                    "y": 1.1
-                },
-                {
-                    "label": ";",
-                    "x": 13,
-                    "y": 1.3
-                },
-                {
-                    "label": "'",
-                    "x": 14,
-                    "y": 1.3
-                },
-                {
-                    "label": "Shift",
-                    "x": 0,
-                    "y": 2.3
-                },
-                {
-                    "label": "Z",
-                    "x": 1,
-                    "y": 2.3
-                },
-                {
-                    "label": "X",
-                    "x": 2,
-                    "y": 2.1
-                },
-                {
-                    "label": "C",
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "label": "V",
-                    "x": 4,
-                    "y": 2.1
-                },
-                {
-                    "label": "B",
-                    "x": 5,
-                    "y": 2.2
-                },
-                {
-                    "label": "N",
-                    "x": 9,
-                    "y": 2.2
-                },
-                {
-                    "label": "M",
-                    "x": 10,
-                    "y": 2.1
-                },
-                {
-                    "label": ",",
-                    "x": 11,
-                    "y": 2
-                },
-                {
-                    "label": ".",
-                    "x": 12,
-                    "y": 2.1
-                },
-                {
-                    "label": "/",
-                    "x": 13,
-                    "y": 2.3
-                },
-                {
-                    "label": "Shift",
-                    "x": 14,
-                    "y": 2.3
-                },
-                {
-                    "label": "GUI",
-                    "x": 4,
-                    "y": 3.7
-                },
-                {
-                    "label": "Lower",
-                    "x": 5,
-                    "y": 3.7
-                },
-                {
-                    "label": "Space",
-                    "x": 6,
-                    "y": 3.2,
-                    "h": 1.5
-                },
-                {
-                    "label": "Enter",
-                    "x": 8,
-                    "y": 3.2,
-                    "h": 1.5
-                },
-                {
-                    "label": "Raise",
-                    "x": 9,
-                    "y": 3.7
-                },
-                {
-                    "label": "Alt",
-                    "x": 10,
-                    "y": 3.7
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0.3},
+                {"matrix": [0, 1], "x": 1, "y": 0.3},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.2},
+
+                {"matrix": [4, 5], "x": 9, "y": 0.2},
+                {"matrix": [4, 4], "x": 10, "y": 0.1},
+                {"matrix": [4, 3], "x": 11, "y": 0},
+                {"matrix": [4, 2], "x": 12, "y": 0.1},
+                {"matrix": [4, 1], "x": 13, "y": 0.3},
+                {"matrix": [4, 0], "x": 14, "y": 0.3},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.3},
+                {"matrix": [1, 1], "x": 1, "y": 1.3},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.2},
+
+                {"matrix": [5, 5], "x": 9, "y": 1.2},
+                {"matrix": [5, 4], "x": 10, "y": 1.1},
+                {"matrix": [5, 3], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1.1},
+                {"matrix": [5, 1], "x": 13, "y": 1.3},
+                {"matrix": [5, 0], "x": 14, "y": 1.3},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.3},
+                {"matrix": [2, 1], "x": 1, "y": 2.3},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.2},
+
+                {"matrix": [6, 5], "x": 9, "y": 2.2},
+                {"matrix": [6, 4], "x": 10, "y": 2.1},
+                {"matrix": [6, 3], "x": 11, "y": 2},
+                {"matrix": [6, 2], "x": 12, "y": 2.1},
+                {"matrix": [6, 1], "x": 13, "y": 2.3},
+                {"matrix": [6, 0], "x": 14, "y": 2.3},
+
+                {"matrix": [3, 3], "x": 4, "y": 3.7},
+                {"matrix": [3, 4], "x": 5, "y": 3.7},
+                {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
+
+                {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
+                {"matrix": [7, 4], "x": 9, "y": 3.7},
+                {"matrix": [7, 3], "x": 10, "y": 3.7}
             ]
         },
         "LAYOUT_split_3x5_3": {
-          "layout": [
-            {"label":"Q", "x":0, "y":0.3},
-            {"label":"W", "x":1, "y":0.1},
-            {"label":"E", "x":2, "y":0},
-            {"label":"R", "x":3, "y":0.1},
-            {"label":"T", "x":4, "y":0.2},
+            "layout": [
+                {"matrix": [0, 1], "x": 0, "y": 0.3},
+                {"matrix": [0, 2], "x": 1, "y": 0.1},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0.1},
+                {"matrix": [0, 5], "x": 4, "y": 0.2},
 
-            {"label":"Y", "x":8, "y":0.2},
-            {"label":"U", "x":9, "y":0.1},
-            {"label":"I", "x":10, "y":0},
-            {"label":"O", "x":11, "y":0.1},
-            {"label":"P", "x":12, "y":0.3},
+                {"matrix": [4, 5], "x": 8, "y": 0.2},
+                {"matrix": [4, 4], "x": 9, "y": 0.1},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0.1},
+                {"matrix": [4, 1], "x": 12, "y": 0.3},
 
-            {"label":"A", "x":0, "y":1.3},
-            {"label":"S", "x":1, "y":1.1},
-            {"label":"D", "x":2, "y":1},
-            {"label":"F", "x":3, "y":1.1},
-            {"label":"G", "x":4, "y":1.2},
+                {"matrix": [1, 1], "x": 0, "y": 1.3},
+                {"matrix": [1, 2], "x": 1, "y": 1.1},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1.1},
+                {"matrix": [1, 5], "x": 4, "y": 1.2},
 
-            {"label":"H", "x":8, "y":1.2},
-            {"label":"J", "x":9, "y":1.1},
-            {"label":"K", "x":10, "y":1},
-            {"label":"L", "x":11, "y":1.1},
-            {"label":";", "x":12, "y":1.3},
+                {"matrix": [5, 5], "x": 8, "y": 1.2},
+                {"matrix": [5, 4], "x": 9, "y": 1.1},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1.1},
+                {"matrix": [5, 1], "x": 12, "y": 1.3},
 
-            {"label":"Z", "x":0, "y":2.3},
-            {"label":"X", "x":1, "y":2.1},
-            {"label":"C", "x":2, "y":2},
-            {"label":"V", "x":3, "y":2.1},
-            {"label":"B", "x":4, "y":2.2},
+                {"matrix": [2, 1], "x": 0, "y": 2.3},
+                {"matrix": [2, 2], "x": 1, "y": 2.1},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2.1},
+                {"matrix": [2, 5], "x": 4, "y": 2.2},
 
-            {"label":"N", "x":8, "y":2.2},
-            {"label":"M", "x":9, "y":2.1},
-            {"label":",", "x":10, "y":2},
-            {"label":".", "x":11, "y":2.1},
-            {"label":"/", "x":12, "y":2.3},
+                {"matrix": [6, 5], "x": 8, "y": 2.2},
+                {"matrix": [6, 4], "x": 9, "y": 2.1},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2.1},
+                {"matrix": [6, 1], "x": 12, "y": 2.3},
 
-            {"label":"GUI", "x":3, "y":3.7},
-            {"label":"Lower", "x":4, "y":3.7},
-            {"label":"Space", "x":5, "y":3.2, "h":1.5},
+                {"matrix": [3, 3], "x": 3, "y": 3.7},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
+                {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
 
-            {"label":"Enter", "x":7, "y":3.2, "h":1.5},
-            {"label":"Raise", "x":8, "y":3.7},
-            {"label":"Alt", "x":9, "y":3.7}
-          ]
+                {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 3.7},
+                {"matrix": [7, 3], "x": 9, "y": 3.7}
+            ]
         }
     }
 }
diff --git a/keyboards/ingrained/ingrained.c b/keyboards/ingrained/ingrained.c
deleted file mode 100644
index 80aa82f840..0000000000
--- a/keyboards/ingrained/ingrained.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 s8erdude (@jpuerto96)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "ingrained.h"
diff --git a/keyboards/ingrained/ingrained.h b/keyboards/ingrained/ingrained.h
deleted file mode 100644
index d2e3055951..0000000000
--- a/keyboards/ingrained/ingrained.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2021 s8erdude (@jpuerto96)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define XXX KC_NO
-
-#define LAYOUT_split_3x6_3( \
-    k00, k01, k02, k03, k04, k05,	k011, k010, k09, k08, k07, k06,\
-    k10, k11, k12, k13, k14, k15,	k111, k110, k19, k18, k17, k16,\
-    k20, k21, k22, k23, k24, k25,	k211, k210, k29, k28, k27, k26,\
-                   k33, k34, k35,	k311, k310, k39\
-) { \
-    { k00, k01, k02, k03, k04, k05 },\
-    { k10, k11, k12, k13, k14, k15 },\
-    { k20, k21, k22, k23, k24, k25 },\
-    { XXX, XXX, XXX, k33, k34, k35 },\
-    { k06, k07, k08, k09, k010, k011 },\
-    { k16, k17, k18, k19, k110, k111 },\
-    { k26, k27, k28, k29, k210, k211 },\
-    { XXX, XXX, XXX, k39, k310, k311 }\
-}
-#define LAYOUT_split_3x5_3( \
-    k01, k02, k03, k04, k05,	k011, k010, k09, k08, k07,\
-    k11, k12, k13, k14, k15,	k111, k110, k19, k18, k17,\
-    k21, k22, k23, k24, k25,	k211, k210, k29, k28, k27,\
-                   k33, k34, k35,	k311, k310, k39\
-) { \
-    { XXX, k01, k02, k03, k04, k05 },\
-    { XXX, k11, k12, k13, k14, k15 },\
-    { XXX, k21, k22, k23, k24, k25 },\
-    { XXX, XXX, XXX, k33, k34, k35 },\
-    { XXX, k07, k08, k09, k010, k011 },\
-    { XXX, k17, k18, k19, k110, k111 },\
-    { XXX, k27, k28, k29, k210, k211 },\
-    { XXX, XXX, XXX, k39, k310, k311 }\
-}
diff --git a/keyboards/ingrained/matrix.c b/keyboards/ingrained/matrix.c
index 0dfb150b6c..154a275d7a 100644
--- a/keyboards/ingrained/matrix.c
+++ b/keyboards/ingrained/matrix.c
@@ -23,7 +23,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * to repeating that information all over the place.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "i2c_master.h"
 
 extern i2c_status_t mcp23017_status;
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index fdadcd5642..6d642e5d45 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE  1
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
@@ -39,13 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
 )
 
-// For some reason, the rows are colums in the schematic, and vice versa
-#define MATRIX_ROW_PINS { B2, B3, B18, B19, C0, C9, C10, C11, D0 }
-#define MATRIX_COL_PINS { D1, D4, D5, D6, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Serial config (for communication between halves) */
 #define SERIAL_USART_DRIVER SD1  // Only true for the master half
 #define SERIAL_USART_CONFIG { (SERIAL_USART_SPEED), } // Only field is speed
diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
index fbe1bdb77f..b8f0d4ae13 100644
--- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
+++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "ergodox_infinity.h"
 #include <ch.h>
 #include <hal.h>
 #include <string.h>
diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.h b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
index b9636b69be..99826529ed 100644
--- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
+++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
@@ -80,74 +80,3 @@ inline void ergodox_led_all_set(uint8_t n) {
 }
 
 void ergodox_infinity_lcd_color(uint16_t r, uint16_t g, uint16_t b);
-
-#define XXX KC_NO
-
-#define LAYOUT_ergodox( \
-    A80, A70, A60, A50, A40, A30, A20, \
-    A81, A71, A61, A51, A41, A31, A21, \
-    A82, A72, A62, A52, A42, A32, \
-    A83, A73, A63, A53, A43, A33, A23, \
-    A84, A74, A64, A54, A44, \
-                                  A13, A03, \
-                                       A04, \
-                             A34, A24, A14, \
-\
-         B20, B30, B40, B50, B60, B70, B80, \
-         B21, B31, B41, B51, B61, B71, B81, \
-              B32, B42, B52, B62, B72, B82, \
-         B23, B33, B43, B53, B63, B73, B83, \
-                   B44, B54, B64, B74, B84, \
-    B03, B13, \
-    B04, \
-    B14, B24, B34 \
-) { \
-    { XXX, XXX, XXX, A03, A04 }, \
-    { XXX, XXX, XXX, A13, A14 }, \
-    { A20, A21, XXX, A23, A24 }, \
-    { A30, A31, A32, A33, A34 }, \
-    { A40, A41, A42, A43, A44 }, \
-    { A50, A51, A52, A53, A54 }, \
-    { A60, A61, A62, A63, A64 }, \
-    { A70, A71, A72, A73, A74 }, \
-    { A80, A81, A82, A83, A84 }, \
-    { XXX, XXX, XXX, B03, B04 }, \
-    { XXX, XXX, XXX, B13, B14 }, \
-    { B20, B21, XXX, B23, B24 }, \
-    { B30, B31, B32, B33, B34 }, \
-    { B40, B41, B42, B43, B44 }, \
-    { B50, B51, B52, B53, B54 }, \
-    { B60, B61, B62, B63, B64 }, \
-    { B70, B71, B72, B73, B74 }, \
-    { B80, B81, B82, B83, B84 } \
-}
-
-#define LAYOUT_ergodox_pretty( \
-    A80, A70, A60, A50, A40, A30, A20,               B20, B30, B40, B50, B60, B70, B80, \
-    A81, A71, A61, A51, A41, A31, A21,               B21, B31, B41, B51, B61, B71, B81, \
-    A82, A72, A62, A52, A42, A32,                         B32, B42, B52, B62, B72, B82, \
-    A83, A73, A63, A53, A43, A33, A23,               B23, B33, B43, B53, B63, B73, B83, \
-    A84, A74, A64, A54, A44,                                   B44, B54, B64, B74, B84, \
-                                  A13, A03,     B03, B13, \
-                                       A04,     B04, \
-                             A34, A24, A14,     B14, B24, B34 \
-) { \
-    { XXX, XXX, XXX, A03, A04 }, \
-    { XXX, XXX, XXX, A13, A14 }, \
-    { A20, A21, XXX, A23, A24 }, \
-    { A30, A31, A32, A33, A34 }, \
-    { A40, A41, A42, A43, A44 }, \
-    { A50, A51, A52, A53, A54 }, \
-    { A60, A61, A62, A63, A64 }, \
-    { A70, A71, A72, A73, A74 }, \
-    { A80, A81, A82, A83, A84 }, \
-    { XXX, XXX, XXX, B03, B04 }, \
-    { XXX, XXX, XXX, B13, B14 }, \
-    { B20, B21, XXX, B23, B24 }, \
-    { B30, B31, B32, B33, B34 }, \
-    { B40, B41, B42, B43, B44 }, \
-    { B50, B51, B52, B53, B54 }, \
-    { B60, B61, B62, B63, B64 }, \
-    { B70, B71, B72, B73, B74 }, \
-    { B80, B81, B82, B83, B84 } \
-}
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index 635355d490..ca6aa92b5d 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -6,57 +6,206 @@
         "pid": "0xB04D",
         "device_version": "0.0.1"
     },
+    "led_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D4", "D5", "D6", "D7"],
+        "rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "MK20DX256",
     "bootloader": "kiibohd",
     "board": "IC_TEENSY_3_1",
     "community_layouts": ["ergodox"],
     "layouts": {
-      "LAYOUT_ergodox": {
-        "layout": [
-          {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-          {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-          {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-          {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-                 {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-
-                                        {"x":6, "y":5}, {"x":7, "y":5},
-                                                        {"x":7, "y":6},
-          {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
-
-
-                     {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-            {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-                                          {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-            {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-                                                                {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
-
-
-          {"x":9, "y":5}, {"x":10, "y":5},
-          {"x":9, "y":6},
-          {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
-        ]
-    },
-    "LAYOUT_ergodox_pretty": {
-        "layout": [
-          {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-          {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+        "LAYOUT_ergodox": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [5, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [1, 3], "x": 6, "y": 5},
+                {"matrix": [0, 3], "x": 7, "y": 5},
+
+                {"matrix": [0, 4], "x": 7, "y": 6},
+                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [1, 4], "x": 7, "y": 7},
+
+                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [14, 0], "x": 12.5, "y": 0},
+                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [14, 1], "x": 12.5, "y": 1},
+                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [14, 2], "x": 12.5, "y": 2},
+                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [14, 3], "x": 12.5, "y": 3},
+                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [14, 4], "x": 12.5, "y": 4},
+                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [9, 3], "x": 9, "y": 5},
+                {"matrix": [10, 3], "x": 10, "y": 5},
+
+                {"matrix": [9, 4], "x": 9, "y": 6},
+
+                {"matrix": [10, 4], "x": 9, "y": 7},
+
+                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
+                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
+            ]
+        },
+        "LAYOUT_ergodox_pretty": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [14, 0], "x": 12.5, "y": 0},
+                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [14, 1], "x": 12.5, "y": 1},
+                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [14, 2], "x": 12.5, "y": 2},
+                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [14, 3], "x": 12.5, "y": 3},
+                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
 
-          {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-          {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [5, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [14, 4], "x": 12.5, "y": 4},
+                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
 
-          {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-          {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+                {"matrix": [1, 3], "x": 6, "y": 5},
+                {"matrix": [0, 3], "x": 7, "y": 5},
+                {"matrix": [9, 3], "x": 9, "y": 5},
+                {"matrix": [10, 3], "x": 10, "y": 5},
 
-          {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-          {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+                {"matrix": [0, 4], "x": 7, "y": 6},
+                {"matrix": [9, 4], "x": 9, "y": 6},
+                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
 
-                 {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-                                                                {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [1, 4], "x": 7, "y": 7},
+                {"matrix": [10, 4], "x": 9, "y": 7},
 
-                                        {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
-                                                        {"x":7, "y":6},      {"x":9, "y":6},
-          {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
-        ]
+                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
+                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
index d5ed0a8e9e..3fef45f887 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
@@ -6,7 +6,6 @@
 #define COMBO_TERM 20
 #define COMBO_COUNT 1
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 
 #undef MOUSEKEY_DELAY
diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk
index 88bd6b0041..4f1b0c0188 100644
--- a/keyboards/input_club/ergodox_infinity/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/rules.mk
@@ -19,4 +19,3 @@ SERIAL_DRIVER = usart
 ST7565_ENABLE = yes
 
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/input_club/infinity60/config.h b/keyboards/input_club/infinity60/config.h
deleted file mode 100644
index c4ec6a4a7d..0000000000
--- a/keyboards/input_club/infinity60/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/input_club/infinity60/infinity60.c b/keyboards/input_club/infinity60/infinity60.c
deleted file mode 100644
index 73751140ea..0000000000
--- a/keyboards/input_club/infinity60/infinity60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "infinity60.h"
diff --git a/keyboards/input_club/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h
deleted file mode 100644
index 301003e8b9..0000000000
--- a/keyboards/input_club/infinity60/led/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 }
-#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 }
diff --git a/keyboards/input_club/infinity60/led/info.json b/keyboards/input_club/infinity60/led/info.json
new file mode 100644
index 0000000000..7a9b924a71
--- /dev/null
+++ b/keyboards/input_club/infinity60/led/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0"],
+        "rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/input_club/infinity60/rev1/config.h b/keyboards/input_club/infinity60/rev1/config.h
deleted file mode 100644
index 1207dffc78..0000000000
--- a/keyboards/input_club/infinity60/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B16, B17, C4, C5, D0 }
-
-
diff --git a/keyboards/input_club/infinity60/rev1/info.json b/keyboards/input_club/infinity60/rev1/info.json
new file mode 100644
index 0000000000..a5afb37751
--- /dev/null
+++ b/keyboards/input_club/infinity60/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B16", "B17", "C4", "C5", "D0"],
+        "rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h
index aa7dca86d3..2a4c7d057c 100644
--- a/keyboards/input_club/k_type/config.h
+++ b/keyboards/input_club/k_type/config.h
@@ -18,22 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D5, D6, D7, C1, C2, C3, C4, C5, C6, C7 }
-#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, D0, D1, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
  */
diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json
index 60522333d7..7279c8a933 100644
--- a/keyboards/input_club/k_type/info.json
+++ b/keyboards/input_club/k_type/info.json
@@ -8,6 +8,14 @@
         "pid": "0xB04D",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "D0", "D1", "D4"],
+        "rows": ["D5", "D6", "D7", "C1", "C2", "C3", "C4", "C5", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "MK20DX256",
     "bootloader": "kiibohd",
     "board": "IC_TEENSY_3_1",
@@ -15,103 +23,106 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [1, 0], "x": 12, "y": 0},
+                {"matrix": [1, 1], "x": 13, "y": 0},
+                {"matrix": [1, 2], "x": 14, "y": 0},
 
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
+                {"matrix": [1, 3], "x": 15.25, "y": 0},
+                {"matrix": [1, 4], "x": 16.25, "y": 0},
+                {"matrix": [1, 5], "x": 17.25, "y": 0},
 
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [2, 1], "x": 5, "y": 1.5},
+                {"matrix": [2, 2], "x": 6, "y": 1.5},
+                {"matrix": [2, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [2, 5], "x": 9, "y": 1.5},
+                {"matrix": [2, 6], "x": 10, "y": 1.5},
+                {"matrix": [2, 7], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [3, 0], "x": 13, "y": 1.5, "w": 2},
 
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
+                {"matrix": [3, 2], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 3], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 4], "x": 17.25, "y": 1.5},
 
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 6], "x": 1.5, "y": 2.5},
+                {"matrix": [3, 7], "x": 2.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 3.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 4.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
 
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
+                {"matrix": [5, 0], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 1], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 2], "x": 17.25, "y": 2.5},
 
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [5, 3], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 4], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 4.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 5.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [6, 8], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"x": 16.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 16.25, "y": 4.5},
 
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 4], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 5], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 6], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 7], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [8, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 9], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 0], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 13.75, "y": 5.5, "w": 1.25},
 
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [9, 2], "x": 15.25, "y": 5.5},
+                {"matrix": [9, 3], "x": 16.25, "y": 5.5},
+                {"matrix": [9, 4], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/input_club/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c
index 1a38a939f2..23a3895408 100644
--- a/keyboards/input_club/k_type/k_type.c
+++ b/keyboards/input_club/k_type/k_type.c
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "k_type.h"
-
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/input_club/k_type/k_type.h b/keyboards/input_club/k_type/k_type.h
deleted file mode 100644
index 077c013066..0000000000
--- a/keyboards/input_club/k_type/k_type.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2017 Input Club
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_tkl_ansi( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,      k13, k14, k15, \
-    k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30,      k32, k33, k34, \
-    k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48,      k50, k51, k52, \
-    k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64,      k66, \
-    k68,      k70, k71, k72, k73, k74, k75, k76, k77, k78, k79,      k81,           k83, \
-    k84, k85, k86,                k87,                k88, k89, k90, k91,      k92, k93, k94 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { k60, k61, k62, k63, k64, XXX, k66, XXX, k68, XXX }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79 }, \
-    { XXX, k81, XXX, k83, k84, k85, k86, k87, k88, k89 }, \
-    { k90, k91, k92, k93, k94, XXX, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/input_club/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk
index 3e5006cd5a..450eb9a023 100644
--- a/keyboards/input_club/k_type/rules.mk
+++ b/keyboards/input_club/k_type/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 
 # RGB options
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = custom
 
 # Additional files for RGB lighting
 SRC += k_type-rgbdriver.c
diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h
index 7567d0ef50..067b7f4e59 100644
--- a/keyboards/input_club/whitefox/config.h
+++ b/keyboards/input_club/whitefox/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D4, D5, D6, D7, C1, C2 }
-#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, C10, C11 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define LED_BRIGHTNESS_LO 100
 #define LED_BRIGHTNESS_HI 255
 
diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json
index 0cd34f8312..02dd975752 100644
--- a/keyboards/input_club/whitefox/info.json
+++ b/keyboards/input_club/whitefox/info.json
@@ -7,545 +7,560 @@
         "pid": "0xB04D",
         "device_version": "0.0.1"
     },
+    "led_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "C10", "C11"],
+        "rows": ["D0", "D1", "D4", "D5", "D6", "D7", "C1", "C2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "MK20DX256",
     "bootloader": "kiibohd",
     "board": "IC_TEENSY_3_1",
     "community_layouts": ["65_ansi", "65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso", "65_iso_blocker", "65_iso_blocker_split_bs"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all",
+        "LAYOUT_aria": "LAYOUT_65_ansi_blocker",
+        "LAYOUT_iso": "LAYOUT_65_iso",
+        "LAYOUT_truefox": "LAYOUT_65_ansi_blocker_split_bs",
+        "LAYOUT_vanilla": "LAYOUT_65_ansi"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [1, 1], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [1, 3], "x": 12, "y": 0},
+                {"matrix": [1, 4], "x": 13, "y": 0},
+                {"matrix": [1, 5], "x": 14, "y": 0},
+                {"matrix": [1, 6], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 8], "x": 1.5, "y": 1},
+                {"matrix": [2, 0], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [2, 4], "x": 6.5, "y": 1},
+                {"matrix": [2, 5], "x": 7.5, "y": 1},
+                {"matrix": [2, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 7], "x": 9.5, "y": 1},
+                {"matrix": [2, 8], "x": 10.5, "y": 1},
+                {"matrix": [3, 0], "x": 11.5, "y": 1},
+                {"matrix": [3, 1], "x": 12.5, "y": 1},
+                {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 3], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2, "w": 1.25},
-                {"x": 15, "y": 2},
+                {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 5], "x": 1.75, "y": 2},
+                {"matrix": [3, 6], "x": 2.75, "y": 2},
+                {"matrix": [3, 7], "x": 3.75, "y": 2},
+                {"matrix": [3, 8], "x": 4.75, "y": 2},
+                {"matrix": [4, 0], "x": 5.75, "y": 2},
+                {"matrix": [4, 1], "x": 6.75, "y": 2},
+                {"matrix": [4, 2], "x": 7.75, "y": 2},
+                {"matrix": [4, 3], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 8], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [5, 0], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 3},
+                {"matrix": [5, 3], "x": 2.25, "y": 3},
+                {"matrix": [5, 4], "x": 3.25, "y": 3},
+                {"matrix": [5, 5], "x": 4.25, "y": 3},
+                {"matrix": [5, 6], "x": 5.25, "y": 3},
+                {"matrix": [5, 7], "x": 6.25, "y": 3},
+                {"matrix": [5, 8], "x": 7.25, "y": 3},
+                {"matrix": [6, 0], "x": 8.25, "y": 3},
+                {"matrix": [6, 1], "x": 9.25, "y": 3},
+                {"matrix": [6, 2], "x": 10.25, "y": 3},
+                {"matrix": [6, 3], "x": 11.25, "y": 3},
+                {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 5], "x": 14, "y": 3},
+                {"matrix": [6, 6], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [7, 2], "x": 10, "y": 4},
+                {"matrix": [7, 3], "x": 11, "y": 4},
+                {"matrix": [7, 4], "x": 12, "y": 4},
+                {"matrix": [7, 5], "x": 13, "y": 4},
+                {"matrix": [7, 6], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [1, 1], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [1, 3], "x": 12, "y": 0},
+                {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 6], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 8], "x": 1.5, "y": 1},
+                {"matrix": [2, 0], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [2, 4], "x": 6.5, "y": 1},
+                {"matrix": [2, 5], "x": 7.5, "y": 1},
+                {"matrix": [2, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 7], "x": 9.5, "y": 1},
+                {"matrix": [2, 8], "x": 10.5, "y": 1},
+                {"matrix": [3, 0], "x": 11.5, "y": 1},
+                {"matrix": [3, 1], "x": 12.5, "y": 1},
+                {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 3], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 5], "x": 1.75, "y": 2},
+                {"matrix": [3, 6], "x": 2.75, "y": 2},
+                {"matrix": [3, 7], "x": 3.75, "y": 2},
+                {"matrix": [3, 8], "x": 4.75, "y": 2},
+                {"matrix": [4, 0], "x": 5.75, "y": 2},
+                {"matrix": [4, 1], "x": 6.75, "y": 2},
+                {"matrix": [4, 2], "x": 7.75, "y": 2},
+                {"matrix": [4, 3], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [4, 8], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 0], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [5, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [5, 3], "x": 2.25, "y": 3},
+                {"matrix": [5, 4], "x": 3.25, "y": 3},
+                {"matrix": [5, 5], "x": 4.25, "y": 3},
+                {"matrix": [5, 6], "x": 5.25, "y": 3},
+                {"matrix": [5, 7], "x": 6.25, "y": 3},
+                {"matrix": [5, 8], "x": 7.25, "y": 3},
+                {"matrix": [6, 0], "x": 8.25, "y": 3},
+                {"matrix": [6, 1], "x": 9.25, "y": 3},
+                {"matrix": [6, 2], "x": 10.25, "y": 3},
+                {"matrix": [6, 3], "x": 11.25, "y": 3},
+                {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 5], "x": 14, "y": 3},
+                {"matrix": [6, 6], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [7, 2], "x": 10, "y": 4},
+                {"matrix": [7, 3], "x": 11, "y": 4},
+                {"matrix": [7, 4], "x": 12, "y": 4},
+                {"matrix": [7, 5], "x": 13, "y": 4},
+                {"matrix": [7, 6], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [1, 1], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [1, 3], "x": 12, "y": 0},
+                {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 6], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 8], "x": 1.5, "y": 1},
+                {"matrix": [2, 0], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [2, 4], "x": 6.5, "y": 1},
+                {"matrix": [2, 5], "x": 7.5, "y": 1},
+                {"matrix": [2, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 7], "x": 9.5, "y": 1},
+                {"matrix": [2, 8], "x": 10.5, "y": 1},
+                {"matrix": [3, 0], "x": 11.5, "y": 1},
+                {"matrix": [3, 1], "x": 12.5, "y": 1},
+                {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 3], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 5], "x": 1.75, "y": 2},
+                {"matrix": [3, 6], "x": 2.75, "y": 2},
+                {"matrix": [3, 7], "x": 3.75, "y": 2},
+                {"matrix": [3, 8], "x": 4.75, "y": 2},
+                {"matrix": [4, 0], "x": 5.75, "y": 2},
+                {"matrix": [4, 1], "x": 6.75, "y": 2},
+                {"matrix": [4, 2], "x": 7.75, "y": 2},
+                {"matrix": [4, 3], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [4, 8], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 0], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [5, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [5, 3], "x": 2.25, "y": 3},
+                {"matrix": [5, 4], "x": 3.25, "y": 3},
+                {"matrix": [5, 5], "x": 4.25, "y": 3},
+                {"matrix": [5, 6], "x": 5.25, "y": 3},
+                {"matrix": [5, 7], "x": 6.25, "y": 3},
+                {"matrix": [5, 8], "x": 7.25, "y": 3},
+                {"matrix": [6, 0], "x": 8.25, "y": 3},
+                {"matrix": [6, 1], "x": 9.25, "y": 3},
+                {"matrix": [6, 2], "x": 10.25, "y": 3},
+                {"matrix": [6, 3], "x": 11.25, "y": 3},
+                {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 5], "x": 14, "y": 3},
+                {"matrix": [6, 6], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [7, 2], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [7, 3], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 5], "x": 13, "y": 4},
+                {"matrix": [7, 6], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [1, 1], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [1, 3], "x": 12, "y": 0},
+                {"matrix": [1, 4], "x": 13, "y": 0},
+                {"matrix": [1, 5], "x": 14, "y": 0},
+                {"matrix": [1, 6], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 8], "x": 1.5, "y": 1},
+                {"matrix": [2, 0], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [2, 4], "x": 6.5, "y": 1},
+                {"matrix": [2, 5], "x": 7.5, "y": 1},
+                {"matrix": [2, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 7], "x": 9.5, "y": 1},
+                {"matrix": [2, 8], "x": 10.5, "y": 1},
+                {"matrix": [3, 0], "x": 11.5, "y": 1},
+                {"matrix": [3, 1], "x": 12.5, "y": 1},
+                {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 3], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 5], "x": 1.75, "y": 2},
+                {"matrix": [3, 6], "x": 2.75, "y": 2},
+                {"matrix": [3, 7], "x": 3.75, "y": 2},
+                {"matrix": [3, 8], "x": 4.75, "y": 2},
+                {"matrix": [4, 0], "x": 5.75, "y": 2},
+                {"matrix": [4, 1], "x": 6.75, "y": 2},
+                {"matrix": [4, 2], "x": 7.75, "y": 2},
+                {"matrix": [4, 3], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [4, 8], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 0], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [5, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [5, 3], "x": 2.25, "y": 3},
+                {"matrix": [5, 4], "x": 3.25, "y": 3},
+                {"matrix": [5, 5], "x": 4.25, "y": 3},
+                {"matrix": [5, 6], "x": 5.25, "y": 3},
+                {"matrix": [5, 7], "x": 6.25, "y": 3},
+                {"matrix": [5, 8], "x": 7.25, "y": 3},
+                {"matrix": [6, 0], "x": 8.25, "y": 3},
+                {"matrix": [6, 1], "x": 9.25, "y": 3},
+                {"matrix": [6, 2], "x": 10.25, "y": 3},
+                {"matrix": [6, 3], "x": 11.25, "y": 3},
+                {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 5], "x": 14, "y": 3},
+                {"matrix": [6, 6], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [7, 2], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [7, 3], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 5], "x": 13, "y": 4},
+                {"matrix": [7, 6], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [1, 1], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [1, 3], "x": 12, "y": 0},
+                {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 6], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 8], "x": 1.5, "y": 1},
+                {"matrix": [2, 0], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [2, 4], "x": 6.5, "y": 1},
+                {"matrix": [2, 5], "x": 7.5, "y": 1},
+                {"matrix": [2, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 7], "x": 9.5, "y": 1},
+                {"matrix": [2, 8], "x": 10.5, "y": 1},
+                {"matrix": [3, 0], "x": 11.5, "y": 1},
+                {"matrix": [3, 1], "x": 12.5, "y": 1},
+                {"matrix": [3, 3], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"x": 15, "y": 2},
+                {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 5], "x": 1.75, "y": 2},
+                {"matrix": [3, 6], "x": 2.75, "y": 2},
+                {"matrix": [3, 7], "x": 3.75, "y": 2},
+                {"matrix": [3, 8], "x": 4.75, "y": 2},
+                {"matrix": [4, 0], "x": 5.75, "y": 2},
+                {"matrix": [4, 1], "x": 6.75, "y": 2},
+                {"matrix": [4, 2], "x": 7.75, "y": 2},
+                {"matrix": [4, 3], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 8], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [5, 0], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 3},
+                {"matrix": [5, 3], "x": 2.25, "y": 3},
+                {"matrix": [5, 4], "x": 3.25, "y": 3},
+                {"matrix": [5, 5], "x": 4.25, "y": 3},
+                {"matrix": [5, 6], "x": 5.25, "y": 3},
+                {"matrix": [5, 7], "x": 6.25, "y": 3},
+                {"matrix": [5, 8], "x": 7.25, "y": 3},
+                {"matrix": [6, 0], "x": 8.25, "y": 3},
+                {"matrix": [6, 1], "x": 9.25, "y": 3},
+                {"matrix": [6, 2], "x": 10.25, "y": 3},
+                {"matrix": [6, 3], "x": 11.25, "y": 3},
+                {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 5], "x": 14, "y": 3},
+                {"matrix": [6, 6], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [7, 2], "x": 10, "y": 4},
+                {"matrix": [7, 3], "x": 11, "y": 4},
+                {"matrix": [7, 4], "x": 12, "y": 4},
+                {"matrix": [7, 5], "x": 13, "y": 4},
+                {"matrix": [7, 6], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [1, 1], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [1, 3], "x": 12, "y": 0},
+                {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 6], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 8], "x": 1.5, "y": 1},
+                {"matrix": [2, 0], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [2, 4], "x": 6.5, "y": 1},
+                {"matrix": [2, 5], "x": 7.5, "y": 1},
+                {"matrix": [2, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 7], "x": 9.5, "y": 1},
+                {"matrix": [2, 8], "x": 10.5, "y": 1},
+                {"matrix": [3, 0], "x": 11.5, "y": 1},
+                {"matrix": [3, 1], "x": 12.5, "y": 1},
+                {"matrix": [3, 3], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"x": 15, "y": 2},
+                {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 5], "x": 1.75, "y": 2},
+                {"matrix": [3, 6], "x": 2.75, "y": 2},
+                {"matrix": [3, 7], "x": 3.75, "y": 2},
+                {"matrix": [3, 8], "x": 4.75, "y": 2},
+                {"matrix": [4, 0], "x": 5.75, "y": 2},
+                {"matrix": [4, 1], "x": 6.75, "y": 2},
+                {"matrix": [4, 2], "x": 7.75, "y": 2},
+                {"matrix": [4, 3], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 8], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [5, 0], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y" :3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 3},
+                {"matrix": [5, 3], "x": 2.25, "y": 3},
+                {"matrix": [5, 4], "x": 3.25, "y": 3},
+                {"matrix": [5, 5], "x": 4.25, "y": 3},
+                {"matrix": [5, 6], "x": 5.25, "y": 3},
+                {"matrix": [5, 7], "x": 6.25, "y": 3},
+                {"matrix": [5, 8], "x": 7.25, "y": 3},
+                {"matrix": [6, 0], "x": 8.25, "y": 3},
+                {"matrix": [6, 1], "x": 9.25, "y": 3},
+                {"matrix": [6, 2], "x": 10.25, "y": 3},
+                {"matrix": [6, 3], "x": 11.25, "y": 3},
+                {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 5], "x": 14, "y": 3},
+                {"matrix": [6, 6], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [7, 2], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [7, 3], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 5], "x": 13, "y": 4},
+                {"matrix": [7, 6], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [1, 1], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [1, 3], "x": 12, "y": 0},
+                {"matrix": [1, 4], "x": 13, "y": 0},
+                {"matrix": [1, 5], "x": 14, "y": 0},
+                {"matrix": [1, 6], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 8], "x": 1.5, "y": 1},
+                {"matrix": [2, 0], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [2, 4], "x": 6.5, "y": 1},
+                {"matrix": [2, 5], "x": 7.5, "y": 1},
+                {"matrix": [2, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 7], "x": 9.5, "y": 1},
+                {"matrix": [2, 8], "x": 10.5, "y": 1},
+                {"matrix": [3, 0], "x": 11.5, "y": 1},
+                {"matrix": [3, 1], "x": 12.5, "y": 1},
+                {"matrix": [3, 3], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"x": 15, "y": 2},
+                {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 5], "x": 1.75, "y": 2},
+                {"matrix": [3, 6], "x": 2.75, "y": 2},
+                {"matrix": [3, 7], "x": 3.75, "y": 2},
+                {"matrix": [3, 8], "x": 4.75, "y": 2},
+                {"matrix": [4, 0], "x": 5.75, "y": 2},
+                {"matrix": [4, 1], "x": 6.75, "y": 2},
+                {"matrix": [4, 2], "x": 7.75, "y": 2},
+                {"matrix": [4, 3], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 8], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [5, 0], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y" :3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 3},
+                {"matrix": [5, 3], "x": 2.25, "y": 3},
+                {"matrix": [5, 4], "x": 3.25, "y": 3},
+                {"matrix": [5, 5], "x": 4.25, "y": 3},
+                {"matrix": [5, 6], "x": 5.25, "y": 3},
+                {"matrix": [5, 7], "x": 6.25, "y": 3},
+                {"matrix": [5, 8], "x": 7.25, "y": 3},
+                {"matrix": [6, 0], "x": 8.25, "y": 3},
+                {"matrix": [6, 1], "x": 9.25, "y": 3},
+                {"matrix": [6, 2], "x": 10.25, "y": 3},
+                {"matrix": [6, 3], "x": 11.25, "y": 3},
+                {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 5], "x": 14, "y": 3},
+                {"matrix": [6, 6], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [7, 2], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [7, 3], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 5], "x": 13, "y": 4},
+                {"matrix": [7, 6], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/input_club/whitefox/rules.mk b/keyboards/input_club/whitefox/rules.mk
index 2a45fc02dd..9b9b2ed739 100644
--- a/keyboards/input_club/whitefox/rules.mk
+++ b/keyboards/input_club/whitefox/rules.mk
@@ -11,7 +11,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = IS31FL3731
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/input_club/whitefox/whitefox.c b/keyboards/input_club/whitefox/whitefox.c
index 168eccbb12..4aa12586f3 100644
--- a/keyboards/input_club/whitefox/whitefox.c
+++ b/keyboards/input_club/whitefox/whitefox.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "whitefox.h"
+#include "quantum.h"
 
 #ifdef LED_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
diff --git a/keyboards/input_club/whitefox/whitefox.h b/keyboards/input_club/whitefox/whitefox.h
deleted file mode 100644
index 7e6648e5e7..0000000000
--- a/keyboards/input_club/whitefox/whitefox.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-Copyright 2014 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┼───┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- * │    │    │    │                        │   │   │   │   │   │   │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k14, k15, k16, \
-    k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, k32, k33, \
-    k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46, k47, k48, k50, \
-    k51, k52, k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \
-    k67, k68, k70,                k71,           k72, k73, k74, k75, k76, k77 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, XXX } \
-}
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- * │    │    │    │                        │   │   │   │   │   │   │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k15, k16, \
-    k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, k32, k33, \
-    k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46,      k48, k50, \
-    k51,      k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \
-    k67, k68, k70,                k71,           k72, k73, k74, k75, k76, k77 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, XXX, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, XXX, k48 }, \
-    { k50, k51, XXX, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, XXX } \
-}
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │    │    │    │                        │    │    │ │   │   │   │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k15, k16, \
-    k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, k32, k33, \
-    k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46,      k48, k50, \
-    k51,      k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \
-    k67, k68, k70,                k71,                k72, k73, k75, k76, k77 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, XXX, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, XXX, k48 }, \
-    { k50, k51, XXX, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, XXX } \
-}
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │    │    │    │                        │    │    │ │   │   │   │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k14, k15, k16, \
-    k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, k32, k33, \
-    k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46,      k48, k50, \
-    k51,      k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \
-    k67, k68, k70,                k71,                k72, k73, k75, k76, k77 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, XXX, k48 }, \
-    { k50, k51, XXX, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, XXX } \
-}
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- * │    │    │    │                        │   │   │   │   │   │   │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_65_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k15, k16, \
-    k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31,      k33, \
-    k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46, k47, k48, k50, \
-    k51, k52, k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \
-    k67, k68, k70,                k71,           k72, k73, k74, k75, k76, k77 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, XXX, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, XXX, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, XXX } \
-}
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │    │    │    │                        │    │    │ │   │   │   │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k15, k16, \
-    k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31,      k33, \
-    k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46, k47, k48, k50, \
-    k51, k52, k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \
-    k67, k68, k70,                k71,                k72, k73, k75, k76, k77 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, XXX, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, XXX, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, XXX } \
-}
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │    │    │    │                        │    │    │ │   │   │   │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k14, k15, k16, \
-    k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31,      k33, \
-    k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, k46, k47, k48, k50, \
-    k51, k52, k53, k54, k55, k56, k57, k58, k60, k61, k62, k63, k64, k65, k66, \
-    k67, k68, k70,                k71,                k72, k73, k75, k76, k77 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, XXX, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, XXX } \
-}
-
-#define LAYOUT LAYOUT_all
-#define LAYOUT_aria LAYOUT_65_ansi_blocker
-#define LAYOUT_iso LAYOUT_65_iso
-#define LAYOUT_truefox LAYOUT_65_ansi_blocker_split_bs
-#define LAYOUT_vanilla LAYOUT_65_ansi
diff --git a/keyboards/io_mini1800/config.h b/keyboards/io_mini1800/config.h
deleted file mode 100644
index 95251ca8f8..0000000000
--- a/keyboards/io_mini1800/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2022 s8erdude (@jpuerto96)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D6, D7, B4, B5, D4, E6, B3, D2, D5, D3 }
-#define MATRIX_COL_PINS { D1, D0, B7, B2, F0, F1, F7, F6, F4, F5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/io_mini1800/info.json b/keyboards/io_mini1800/info.json
index 05b346d793..270da1ea50 100644
--- a/keyboards/io_mini1800/info.json
+++ b/keyboards/io_mini1800/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "B7", "B2", "F0", "F1", "F7", "F6", "F4", "F5"],
+        "rows": ["D6", "D7", "B4", "B5", "D4", "E6", "B3", "D2", "D5", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "B1"}
diff --git a/keyboards/io_mini1800/io_mini1800.c b/keyboards/io_mini1800/io_mini1800.c
index aa500c469a..7f148a3927 100644
--- a/keyboards/io_mini1800/io_mini1800.c
+++ b/keyboards/io_mini1800/io_mini1800.c
@@ -2,17 +2,3 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "io_mini1800.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h
index eefaa897a1..7163def47d 100644
--- a/keyboards/irene/config.h
+++ b/keyboards/irene/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, F0, C7, B4, B7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, C6, B6, B5, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 23
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json
index 792106563f..cce2ab7316 100644
--- a/keyboards/irene/info.json
+++ b/keyboards/irene/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B0", "F0", "C7", "B4", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/iriskeyboards/config.h b/keyboards/iriskeyboards/config.h
index 5616f96083..d813c012ef 100644
--- a/keyboards/iriskeyboards/config.h
+++ b/keyboards/iriskeyboards/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-//                         0   1   2   3   4   5   6   7   8   9   A   B   C   D
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/iriskeyboards/info.json b/keyboards/iriskeyboards/info.json
index 860d9f21b7..19516e8d6e 100644
--- a/keyboards/iriskeyboards/info.json
+++ b/keyboards/iriskeyboards/info.json
@@ -8,6 +8,11 @@
       "pid": "0x3031",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["F0", "F1", "F4", "F5", "F6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
+      "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/iriskeyboards/iriskeyboards.c b/keyboards/iriskeyboards/iriskeyboards.c
deleted file mode 100644
index bee4488664..0000000000
--- a/keyboards/iriskeyboards/iriskeyboards.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 SonOfAres
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "iriskeyboards.h"
diff --git a/keyboards/iron180/config.h b/keyboards/iron180/config.h
index b47b2ccf50..f2d3a3c36f 100644
--- a/keyboards/iron180/config.h
+++ b/keyboards/iron180/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B7 , B6 , B5 , B4 , B3 , A10, A9 , A8 , B15, B14, B13, B12, B11, B2 , A4 , B1 , A3 }
-#define MATRIX_ROW_PINS { B9 , B8 , A15, B0 , A7 , A5 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/iron180/info.json b/keyboards/iron180/info.json
index 3c7798508f..e408e5321c 100644
--- a/keyboards/iron180/info.json
+++ b/keyboards/iron180/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1180",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"],
+        "rows": ["B9", "B8", "A15", "B0", "A7", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 20,
diff --git a/keyboards/j80/config.h b/keyboards/j80/config.h
deleted file mode 100644
index 47eac652c5..0000000000
--- a/keyboards/j80/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2019 JER
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, A0 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/j80/info.json b/keyboards/j80/info.json
index c57e9e3e2a..99096d88ba 100644
--- a/keyboards/j80/info.json
+++ b/keyboards/j80/info.json
@@ -8,6 +8,11 @@
     "pid": "0x422D",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "A0"],
+    "rows": ["B1", "B2", "B3", "B5", "B6", "B7", "B0"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
@@ -19,392 +24,522 @@
   "processor": "atmega32a",
   "bootloader": "bootloadhid",
   "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [0, 0], "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": [0, 7], "x": 5, "y": 0},
+        {"matrix": [0, 8], "x": 6, "y": 0},
+        {"matrix": [0, 9], "x": 7, "y": 0},
+        {"matrix": [0, 10], "x": 8, "y": 0},
+        {"matrix": [0, 11], "x": 9, "y": 0},
+        {"matrix": [0, 13], "x": 10, "y": 0},
+        {"matrix": [0, 12], "x": 11, "y": 0},
+        {"matrix": [0, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [6, 2], "x": 14, "y": 0},
+        {"matrix": [6, 13], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 16, "y": 0},
+        {"matrix": [1, 1], "x": 17, "y": 0},
+        {"matrix": [1, 2], "x": 18, "y": 0},
+        {"matrix": [1, 3], "x": 19, "y": 0},
+        {"matrix": [1, 4], "x": 20, "y": 0},
+        {"matrix": [1, 5], "x": 21, "y": 0},
+        {"matrix": [1, 6], "x": 22, "y": 0},
+        {"matrix": [1, 7], "x": 23, "y": 0},
+        {"matrix": [1, 8], "x": 24, "y": 0},
+        {"matrix": [1, 9], "x": 25, "y": 0},
+        {"matrix": [1, 10], "x": 26, "y": 0},
+        {"matrix": [1, 11], "x": 27, "y": 0},
+        {"matrix": [1, 13], "x": 28, "y": 0},
+        {"matrix": [1, 12], "x": 29, "y": 0},
+        {"matrix": [6, 6], "x": 30, "y": 0},
+        {"matrix": [6, 5], "x": 31, "y": 0},
+        {"matrix": [6, 4], "x": 32, "y": 0},
+
+        {"matrix": [2, 0], "x": 33, "y": 0},
+        {"matrix": [2, 1], "x": 34, "y": 0},
+        {"matrix": [2, 2], "x": 35, "y": 0},
+        {"matrix": [2, 3], "x": 36, "y": 0},
+        {"matrix": [2, 4], "x": 37, "y": 0},
+        {"matrix": [2, 5], "x": 38, "y": 0},
+        {"matrix": [2, 6], "x": 39, "y": 0},
+        {"matrix": [2, 7], "x": 40, "y": 0},
+        {"matrix": [2, 8], "x": 41, "y": 0},
+        {"matrix": [2, 9], "x": 42, "y": 0},
+        {"matrix": [2, 10], "x": 43, "y": 0},
+        {"matrix": [2, 11], "x": 44, "y": 0},
+        {"matrix": [2, 13], "x": 45, "y": 0},
+        {"matrix": [2, 12], "x": 46, "y": 0},
+        {"matrix": [6, 12], "x": 47, "y": 0},
+        {"matrix": [6, 8], "x": 48, "y": 0},
+        {"matrix": [6, 7], "x": 49, "y": 0},
+
+        {"matrix": [3, 0], "x": 50, "y": 0},
+        {"matrix": [3, 1], "x": 51, "y": 0},
+        {"matrix": [3, 2], "x": 52, "y": 0},
+        {"matrix": [3, 3], "x": 53, "y": 0},
+        {"matrix": [3, 4], "x": 54, "y": 0},
+        {"matrix": [3, 5], "x": 55, "y": 0},
+        {"matrix": [3, 6], "x": 56, "y": 0},
+        {"matrix": [3, 7], "x": 57, "y": 0},
+        {"matrix": [3, 8], "x": 58, "y": 0},
+        {"matrix": [3, 9], "x": 59, "y": 0},
+        {"matrix": [3, 10], "x": 60, "y": 0},
+        {"matrix": [3, 11], "x": 61, "y": 0},
+        {"matrix": [3, 13], "x": 62, "y": 0},
+
+        {"matrix": [4, 0], "x": 63, "y": 0},
+        {"matrix": [3, 12], "x": 64, "y": 0},
+        {"matrix": [4, 1], "x": 65, "y": 0},
+        {"matrix": [4, 2], "x": 66, "y": 0},
+        {"matrix": [4, 3], "x": 67, "y": 0},
+        {"matrix": [4, 4], "x": 68, "y": 0},
+        {"matrix": [4, 5], "x": 69, "y": 0},
+        {"matrix": [4, 6], "x": 70, "y": 0},
+        {"matrix": [4, 7], "x": 71, "y": 0},
+        {"matrix": [4, 8], "x": 72, "y": 0},
+        {"matrix": [4, 9], "x": 73, "y": 0},
+        {"matrix": [4, 10], "x": 74, "y": 0},
+        {"matrix": [4, 11], "x": 75, "y": 0},
+        {"matrix": [4, 13], "x": 76, "y": 0},
+        {"matrix": [4, 12], "x": 77, "y": 0},
+
+        {"matrix": [5, 0], "x": 78, "y": 0},
+        {"matrix": [5, 1], "x": 79, "y": 0},
+        {"matrix": [5, 2], "x": 80, "y": 0},
+        {"matrix": [5, 4], "x": 81, "y": 0},
+        {"matrix": [5, 8], "x": 82, "y": 0},
+        {"matrix": [5, 9], "x": 83, "y": 0},
+        {"matrix": [5, 10], "x": 84, "y": 0},
+        {"matrix": [5, 11], "x": 85, "y": 0},
+        {"matrix": [5, 13], "x": 86, "y": 0},
+        {"matrix": [5, 12], "x": 87, "y": 0},
+        {"matrix": [5, 7], "x": 88, "y": 0}
+      ]
+    },
     "LAYOUT_tkl_ansi": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6.5, "y":0},
-        {"x":7.5, "y":0},
-        {"x":8.5, "y":0},
-        {"x":9.5, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0},
-        {"x":14, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-
-        {"x":0, "y":1.25},
-        {"x":1, "y":1.25},
-        {"x":2, "y":1.25},
-        {"x":3, "y":1.25},
-        {"x":4, "y":1.25},
-        {"x":5, "y":1.25},
-        {"x":6, "y":1.25},
-        {"x":7, "y":1.25},
-        {"x":8, "y":1.25},
-        {"x":9, "y":1.25},
-        {"x":10, "y":1.25},
-        {"x":11, "y":1.25},
-        {"x":12, "y":1.25},
-        {"x":13, "y":1.25, "w":2},
-        {"x":15.25, "y":1.25},
-        {"x":16.25, "y":1.25},
-        {"x":17.25, "y":1.25},
-
-        {"x":0, "y":2.25, "w":1.5},
-        {"x":1.5, "y":2.25},
-        {"x":2.5, "y":2.25},
-        {"x":3.5, "y":2.25},
-        {"x":4.5, "y":2.25},
-        {"x":5.5, "y":2.25},
-        {"x":6.5, "y":2.25},
-        {"x":7.5, "y":2.25},
-        {"x":8.5, "y":2.25},
-        {"x":9.5, "y":2.25},
-        {"x":10.5, "y":2.25},
-        {"x":11.5, "y":2.25},
-        {"x":12.5, "y":2.25},
-        {"x":13.5, "y":2.25, "w":1.5},
-        {"x":15.25, "y":2.25},
-        {"x":16.25, "y":2.25},
-        {"x":17.25, "y":2.25},
-
-        {"x":0, "y":3.25, "w":1.75},
-        {"x":1.75, "y":3.25},
-        {"x":2.75, "y":3.25},
-        {"x":3.75, "y":3.25},
-        {"x":4.75, "y":3.25},
-        {"x":5.75, "y":3.25},
-        {"x":6.75, "y":3.25},
-        {"x":7.75, "y":3.25},
-        {"x":8.75, "y":3.25},
-        {"x":9.75, "y":3.25},
-        {"x":10.75, "y":3.25},
-        {"x":11.75, "y":3.25},
-        {"x":12.75, "y":3.25, "w":2.25},
-
-        {"x":0, "y":4.25, "w":2.25},
-        {"x":2.25, "y":4.25},
-        {"x":3.25, "y":4.25},
-        {"x":4.25, "y":4.25},
-        {"x":5.25, "y":4.25},
-        {"x":6.25, "y":4.25},
-        {"x":7.25, "y":4.25},
-        {"x":8.25, "y":4.25},
-        {"x":9.25, "y":4.25},
-        {"x":10.25, "y":4.25},
-        {"x":11.25, "y":4.25},
-        {"x":12.25, "y":4.25, "w":2.75},
-        {"x":16.25, "y":4.25},
-
-        {"x":0, "y":5.25, "w":1.25},
-        {"x":1.25, "y":5.25, "w":1.25},
-        {"x":2.5, "y":5.25, "w":1.25},
-        {"x":3.75, "y":5.25, "w":6.25},
-        {"x":10, "y":5.25, "w":1.25},
-        {"x":11.25, "y":5.25, "w":1.25},
-        {"x":12.5, "y":5.25, "w":1.25},
-        {"x":13.75, "y":5.25, "w":1.25},
-        {"x":15.25, "y":5.25},
-        {"x":16.25, "y":5.25},
-        {"x":17.25, "y":5.25}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [0, 8], "x": 7.5, "y": 0},
+        {"matrix": [0, 9], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 13], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [6, 1], "x": 15.25, "y": 0},
+        {"matrix": [6, 2], "x": 16.25, "y": 0},
+        {"matrix": [6, 13], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 13], "x": 12, "y": 1.25},
+        {"matrix": [1, 12], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+        {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+        {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 2.25},
+        {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+        {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 7], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_ansi_split_rshift": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6.5, "y":0},
-        {"x":7.5, "y":0},
-        {"x":8.5, "y":0},
-        {"x":9.5, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0},
-        {"x":14, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-
-        {"x":0, "y":1.25},
-        {"x":1, "y":1.25},
-        {"x":2, "y":1.25},
-        {"x":3, "y":1.25},
-        {"x":4, "y":1.25},
-        {"x":5, "y":1.25},
-        {"x":6, "y":1.25},
-        {"x":7, "y":1.25},
-        {"x":8, "y":1.25},
-        {"x":9, "y":1.25},
-        {"x":10, "y":1.25},
-        {"x":11, "y":1.25},
-        {"x":12, "y":1.25},
-        {"x":13, "y":1.25, "w":2},
-        {"x":15.25, "y":1.25},
-        {"x":16.25, "y":1.25},
-        {"x":17.25, "y":1.25},
-
-        {"x":0, "y":2.25, "w":1.5},
-        {"x":1.5, "y":2.25},
-        {"x":2.5, "y":2.25},
-        {"x":3.5, "y":2.25},
-        {"x":4.5, "y":2.25},
-        {"x":5.5, "y":2.25},
-        {"x":6.5, "y":2.25},
-        {"x":7.5, "y":2.25},
-        {"x":8.5, "y":2.25},
-        {"x":9.5, "y":2.25},
-        {"x":10.5, "y":2.25},
-        {"x":11.5, "y":2.25},
-        {"x":12.5, "y":2.25},
-        {"x":13.5, "y":2.25, "w":1.5},
-        {"x":15.25, "y":2.25},
-        {"x":16.25, "y":2.25},
-        {"x":17.25, "y":2.25},
-
-        {"x":0, "y":3.25, "w":1.75},
-        {"x":1.75, "y":3.25},
-        {"x":2.75, "y":3.25},
-        {"x":3.75, "y":3.25},
-        {"x":4.75, "y":3.25},
-        {"x":5.75, "y":3.25},
-        {"x":6.75, "y":3.25},
-        {"x":7.75, "y":3.25},
-        {"x":8.75, "y":3.25},
-        {"x":9.75, "y":3.25},
-        {"x":10.75, "y":3.25},
-        {"x":11.75, "y":3.25},
-        {"x":12.75, "y":3.25, "w":2.25},
-
-        {"x":0, "y":4.25, "w":2.25},
-        {"x":2.25, "y":4.25},
-        {"x":3.25, "y":4.25},
-        {"x":4.25, "y":4.25},
-        {"x":5.25, "y":4.25},
-        {"x":6.25, "y":4.25},
-        {"x":7.25, "y":4.25},
-        {"x":8.25, "y":4.25},
-        {"x":9.25, "y":4.25},
-        {"x":10.25, "y":4.25},
-        {"x":11.25, "y":4.25},
-        {"x":12.25, "y":4.25, "w":1.75},
-        {"x":14, "y":4.25},
-        {"x":16.25, "y":4.25},
-
-        {"x":0, "y":5.25, "w":1.25},
-        {"x":1.25, "y":5.25, "w":1.25},
-        {"x":2.5, "y":5.25, "w":1.25},
-        {"x":3.75, "y":5.25, "w":6.25},
-        {"x":10, "y":5.25, "w":1.25},
-        {"x":11.25, "y":5.25, "w":1.25},
-        {"x":12.5, "y":5.25, "w":1.25},
-        {"x":13.75, "y":5.25, "w":1.25},
-        {"x":15.25, "y":5.25},
-        {"x":16.25, "y":5.25},
-        {"x":17.25, "y":5.25}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [0, 8], "x": 7.5, "y": 0},
+        {"matrix": [0, 9], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 13], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [6, 1], "x": 15.25, "y": 0},
+        {"matrix": [6, 2], "x": 16.25, "y": 0},
+        {"matrix": [6, 13], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 13], "x": 12, "y": 1.25},
+        {"matrix": [1, 12], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+        {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+        {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 2.25},
+        {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+        {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 7], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_iso": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6.5, "y":0},
-        {"x":7.5, "y":0},
-        {"x":8.5, "y":0},
-        {"x":9.5, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0},
-        {"x":14, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-
-        {"x":0, "y":1.25},
-        {"x":1, "y":1.25},
-        {"x":2, "y":1.25},
-        {"x":3, "y":1.25},
-        {"x":4, "y":1.25},
-        {"x":5, "y":1.25},
-        {"x":6, "y":1.25},
-        {"x":7, "y":1.25},
-        {"x":8, "y":1.25},
-        {"x":9, "y":1.25},
-        {"x":10, "y":1.25},
-        {"x":11, "y":1.25},
-        {"x":12, "y":1.25},
-        {"x":13, "y":1.25, "w":2},
-        {"x":15.25, "y":1.25},
-        {"x":16.25, "y":1.25},
-        {"x":17.25, "y":1.25},
-
-        {"x":0, "y":2.25, "w":1.5},
-        {"x":1.5, "y":2.25},
-        {"x":2.5, "y":2.25},
-        {"x":3.5, "y":2.25},
-        {"x":4.5, "y":2.25},
-        {"x":5.5, "y":2.25},
-        {"x":6.5, "y":2.25},
-        {"x":7.5, "y":2.25},
-        {"x":8.5, "y":2.25},
-        {"x":9.5, "y":2.25},
-        {"x":10.5, "y":2.25},
-        {"x":11.5, "y":2.25},
-        {"x":12.5, "y":2.25},
-        {"x":15.25, "y":2.25},
-        {"x":16.25, "y":2.25},
-        {"x":17.25, "y":2.25},
-
-        {"x":0, "y":3.25, "w":1.75},
-        {"x":1.75, "y":3.25},
-        {"x":2.75, "y":3.25},
-        {"x":3.75, "y":3.25},
-        {"x":4.75, "y":3.25},
-        {"x":5.75, "y":3.25},
-        {"x":6.75, "y":3.25},
-        {"x":7.75, "y":3.25},
-        {"x":8.75, "y":3.25},
-        {"x":9.75, "y":3.25},
-        {"x":10.75, "y":3.25},
-        {"x":11.75, "y":3.25},
-        {"x":12.75, "y":3.25},
-        {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
-        {"x":0, "y":4.25, "w":1.25},
-        {"x":1.25, "y":4.25},
-        {"x":2.25, "y":4.25},
-        {"x":3.25, "y":4.25},
-        {"x":4.25, "y":4.25},
-        {"x":5.25, "y":4.25},
-        {"x":6.25, "y":4.25},
-        {"x":7.25, "y":4.25},
-        {"x":8.25, "y":4.25},
-        {"x":9.25, "y":4.25},
-        {"x":10.25, "y":4.25},
-        {"x":11.25, "y":4.25},
-        {"x":12.25, "y":4.25, "w":2.75},
-        {"x":16.25, "y":4.25},
-
-        {"x":0, "y":5.25, "w":1.25},
-        {"x":1.25, "y":5.25, "w":1.25},
-        {"x":2.5, "y":5.25, "w":1.25},
-        {"x":3.75, "y":5.25, "w":6.25},
-        {"x":10, "y":5.25, "w":1.25},
-        {"x":11.25, "y":5.25, "w":1.25},
-        {"x":12.5, "y":5.25, "w":1.25},
-        {"x":13.75, "y":5.25, "w":1.25},
-        {"x":15.25, "y":5.25},
-        {"x":16.25, "y":5.25},
-        {"x":17.25, "y":5.25}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [0, 8], "x": 7.5, "y": 0},
+        {"matrix": [0, 9], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 13], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [6, 1], "x": 15.25, "y": 0},
+        {"matrix": [6, 2], "x": 16.25, "y": 0},
+        {"matrix": [6, 13], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 13], "x": 12, "y": 1.25},
+        {"matrix": [1, 12], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+        {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+        {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 2.25},
+        {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+        {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [2, 12], "x": 12.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [3, 12], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 7], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_iso_split_rshift": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6.5, "y":0},
-        {"x":7.5, "y":0},
-        {"x":8.5, "y":0},
-        {"x":9.5, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0},
-        {"x":14, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-
-        {"x":0, "y":1.25},
-        {"x":1, "y":1.25},
-        {"x":2, "y":1.25},
-        {"x":3, "y":1.25},
-        {"x":4, "y":1.25},
-        {"x":5, "y":1.25},
-        {"x":6, "y":1.25},
-        {"x":7, "y":1.25},
-        {"x":8, "y":1.25},
-        {"x":9, "y":1.25},
-        {"x":10, "y":1.25},
-        {"x":11, "y":1.25},
-        {"x":12, "y":1.25},
-        {"x":13, "y":1.25, "w":2},
-        {"x":15.25, "y":1.25},
-        {"x":16.25, "y":1.25},
-        {"x":17.25, "y":1.25},
-
-        {"x":0, "y":2.25, "w":1.5},
-        {"x":1.5, "y":2.25},
-        {"x":2.5, "y":2.25},
-        {"x":3.5, "y":2.25},
-        {"x":4.5, "y":2.25},
-        {"x":5.5, "y":2.25},
-        {"x":6.5, "y":2.25},
-        {"x":7.5, "y":2.25},
-        {"x":8.5, "y":2.25},
-        {"x":9.5, "y":2.25},
-        {"x":10.5, "y":2.25},
-        {"x":11.5, "y":2.25},
-        {"x":12.5, "y":2.25},
-        {"x":15.25, "y":2.25},
-        {"x":16.25, "y":2.25},
-        {"x":17.25, "y":2.25},
-
-        {"x":0, "y":3.25, "w":1.75},
-        {"x":1.75, "y":3.25},
-        {"x":2.75, "y":3.25},
-        {"x":3.75, "y":3.25},
-        {"x":4.75, "y":3.25},
-        {"x":5.75, "y":3.25},
-        {"x":6.75, "y":3.25},
-        {"x":7.75, "y":3.25},
-        {"x":8.75, "y":3.25},
-        {"x":9.75, "y":3.25},
-        {"x":10.75, "y":3.25},
-        {"x":11.75, "y":3.25},
-        {"x":12.75, "y":3.25},
-        {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
-        {"x":0, "y":4.25, "w":1.25},
-        {"x":1.25, "y":4.25},
-        {"x":2.25, "y":4.25},
-        {"x":3.25, "y":4.25},
-        {"x":4.25, "y":4.25},
-        {"x":5.25, "y":4.25},
-        {"x":6.25, "y":4.25},
-        {"x":7.25, "y":4.25},
-        {"x":8.25, "y":4.25},
-        {"x":9.25, "y":4.25},
-        {"x":10.25, "y":4.25},
-        {"x":11.25, "y":4.25},
-        {"x":12.25, "y":4.25, "w":1.75},
-        {"x":14, "y":4.25},
-        {"x":16.25, "y":4.25},
-
-        {"x":0, "y":5.25, "w":1.25},
-        {"x":1.25, "y":5.25, "w":1.25},
-        {"x":2.5, "y":5.25, "w":1.25},
-        {"x":3.75, "y":5.25, "w":6.25},
-        {"x":10, "y":5.25, "w":1.25},
-        {"x":11.25, "y":5.25, "w":1.25},
-        {"x":12.5, "y":5.25, "w":1.25},
-        {"x":13.75, "y":5.25, "w":1.25},
-        {"x":15.25, "y":5.25},
-        {"x":16.25, "y":5.25},
-        {"x":17.25, "y":5.25}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [0, 8], "x": 7.5, "y": 0},
+        {"matrix": [0, 9], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 13], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [6, 1], "x": 15.25, "y": 0},
+        {"matrix": [6, 2], "x": 16.25, "y": 0},
+        {"matrix": [6, 13], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 13], "x": 12, "y": 1.25},
+        {"matrix": [1, 12], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+        {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+        {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 2.25},
+        {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+        {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [2, 12], "x": 12.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [3, 12], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 7], "x": 17.25, "y": 5.25}
       ]
     }
   }
diff --git a/keyboards/j80/j80.c b/keyboards/j80/j80.c
deleted file mode 100644
index fd49e913e0..0000000000
--- a/keyboards/j80/j80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 JER
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "j80.h"
diff --git a/keyboards/j80/j80.h b/keyboards/j80/j80.h
deleted file mode 100644
index a528c70c7d..0000000000
--- a/keyboards/j80/j80.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright 2019 JER
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
- #define LAYOUT_all( \
-   k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
-   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
-   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2C, k6C, k68, k67, \
-   k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
-   k40, k3C, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4C, \
-   k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57 \
- ){ \
-   { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C, k0D }, \
-   { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C, k1D }, \
-   { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C, k2D }, \
-   { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  k3C, k3D }, \
-   { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C, k4D }, \
-   { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C, k5D }, \
-   { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C, k6D }, \
- }
-
- #define LAYOUT_tkl_iso( \
-   k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
-   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
-   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k6C, k68, k67, \
-   k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k2C, k3D, \
-   k40, k3C, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, \
-   k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
- ){ \
-   { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C, k0D  }, \
-   { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C, k1D  }, \
-   { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C, k2D  }, \
-   { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  k3C, k3D  }, \
-   { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C, ____ }, \
-   { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C, k5D  }, \
-   { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C, k6D  }, \
- }
-
-#define LAYOUT_tkl_iso_split_rshift( \
-  k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k6C, k68, k67, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k2C, k3D, \
-  k40, k3C, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4C, \
-  k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
-){ \
-  { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C, k0D }, \
-  { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C, k1D }, \
-  { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C, k2D }, \
-  { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  k3C, k3D }, \
-  { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C, k4D }, \
-  { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C, k5D }, \
-  { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C, k6D }, \
-}
-
-#define LAYOUT_tkl_ansi( \
-  k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2C, k6C, k68, k67, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
-  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, \
-  k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
-){ \
-  { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C,  k0D  }, \
-  { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C,  k1D  }, \
-  { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C,  k2D  }, \
-  { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  ____, k3D  }, \
-  { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C,  ____ }, \
-  { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C,  k5D  }, \
-  { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C,  k6D  }, \
-}
-
-#define LAYOUT_tkl_ansi_split_rshift( \
-  k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2C, k6C, k68, k67, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
-  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4C, \
-  k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
-){ \
-  { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C,  k0D }, \
-  { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C,  k1D }, \
-  { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C,  k2D }, \
-  { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  ____, k3D }, \
-  { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C,  k4D }, \
-  { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C,  k5D }, \
-  { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C,  k6D }, \
-}
diff --git a/keyboards/jacky_studio/bear_65/bear_65.c b/keyboards/jacky_studio/bear_65/bear_65.c
deleted file mode 100644
index a2ae572b82..0000000000
--- a/keyboards/jacky_studio/bear_65/bear_65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bear_65.h"
diff --git a/keyboards/jacky_studio/bear_65/bear_65.h b/keyboards/jacky_studio/bear_65/bear_65.h
deleted file mode 100644
index be8a14a86f..0000000000
--- a/keyboards/jacky_studio/bear_65/bear_65.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_jacky_studio_bear_65_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_jacky_studio_bear_65_rev2)
-    #include "rev2.h"
-#endif
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index 0caf635045..2303086f2e 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -3,31 +3,12 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_DEFAULT_VAL 50
 #define RGBLIGHT_EFFECT_BREATHING
@@ -46,5 +27,3 @@
 #define RGBLIGHT_VAL_STEP 8
 /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #define RGBLIGHT_SLEEP
-
-#endif
diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json
index ed5768bf32..8bc527606f 100644
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ b/keyboards/jacky_studio/bear_65/rev1/info.json
@@ -10,9 +10,20 @@
         "pid": "0x000A",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "C7",
         "on_state": 0
diff --git a/keyboards/jacky_studio/bear_65/rev1/rev1.h b/keyboards/jacky_studio/bear_65/rev1/rev1.h
index 901efe70b7..872436fcd4 100644
--- a/keyboards/jacky_studio/bear_65/rev1/rev1.h
+++ b/keyboards/jacky_studio/bear_65/rev1/rev1.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "bear_65.h"
+#include "quantum.h"
 
 #define LAYOUT_all( \
       K31, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   K4E, \
diff --git a/keyboards/jacky_studio/bear_65/rev1/rules.mk b/keyboards/jacky_studio/bear_65/rev1/rules.mk
index 5d90baa2af..7e03810942 100644
--- a/keyboards/jacky_studio/bear_65/rev1/rules.mk
+++ b/keyboards/jacky_studio/bear_65/rev1/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Use LTO flags to reduce firmware size
 
 RGB_MATRIX_ENABLE = no		# Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812	# RGB matrix driver support
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
index 147dc2ade4..c6565255ed 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -10,9 +10,20 @@
         "pid": "0x0428",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "C7",
         "on_state": 0
diff --git a/keyboards/jacky_studio/bear_65/rev2/rev2.h b/keyboards/jacky_studio/bear_65/rev2/rev2.h
index 31cc430504..61f5a9d6fe 100644
--- a/keyboards/jacky_studio/bear_65/rev2/rev2.h
+++ b/keyboards/jacky_studio/bear_65/rev2/rev2.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "bear_65.h"
+#include "quantum.h"
 
 #define LAYOUT_wk_full( \
       K31, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   K4E, \
diff --git a/keyboards/jacky_studio/bear_65/rev2/rules.mk b/keyboards/jacky_studio/bear_65/rev2/rules.mk
index 5d90baa2af..7e03810942 100644
--- a/keyboards/jacky_studio/bear_65/rev2/rules.mk
+++ b/keyboards/jacky_studio/bear_65/rev2/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Use LTO flags to reduce firmware size
 
 RGB_MATRIX_ENABLE = no		# Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812	# RGB matrix driver support
diff --git a/keyboards/jacky_studio/piggy60/info.json b/keyboards/jacky_studio/piggy60/info.json
index a3c7f5eb41..a77368e94d 100644
--- a/keyboards/jacky_studio/piggy60/info.json
+++ b/keyboards/jacky_studio/piggy60/info.json
@@ -1,60 +1,10 @@
 {
     "manufacturer": "Jacky",
-    "keyboard_name": "Piggy60",
     "maintainer": "qmk",
-    "bootloader": "atmel-dfu",
-    "build": {
-        "lto": true
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "caps_word": true,
-        "debug": false,
-        "extrakey": true,
-        "mousekey": true,
-        "rgblight": true,
-        "nkro": true
-    },
-     "matrix_pins": {
-        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"],
-        "rows": ["D0", "D1", "D2", "D3", "D5"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://www.notion.so/Piggy-60-Everything-You-Should-Know-7308d056551d4edabdbcc95748e9dabc",
     "usb": {
-        "device_version": "1.0.0",
-        "vid": "0xA13B",
-        "pid": "0x1001"
-    },
-    "indicators": {
-        "caps_lock": "F4",
-        "on_state": 0
-    },
-    "rgblight": {
-        "led_count": 14,
-        "pin": "E2",
-        "animations": {
-            "alternating": true,
-            "breathing": true,
-            "christmas": true,
-            "knight": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "rgb_test": true,
-            "snake": true,
-            "static_gradient": true,
-            "twinkle": true
-        },
-        "sleep": true,
-        "max_brightness": 255
-    },
-    "tapping": {
-        "tap_keycode_delay": 10,
-        "tap_capslock_delay": 10,
-        "term": 170
+        "vid": "0xA13B"
     },
+    "url": "https://www.notion.so/Piggy-60-Everything-You-Should-Know-7308d056551d4edabdbcc95748e9dabc",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/jacky_studio/piggy60/readme.md b/keyboards/jacky_studio/piggy60/readme.md
index bae776deba..79564977ec 100644
--- a/keyboards/jacky_studio/piggy60/readme.md
+++ b/keyboards/jacky_studio/piggy60/readme.md
@@ -5,17 +5,21 @@
 A gasket-mounted 60% in the style of the S7 Elephant.
 
 * Keyboard Maintainer: [The QMK Community](https://github.com/qmk)
-* Hardware Supported: Piggy60 PCB "rev1" (atmega32u4)
-  * **Make sure your PCB uses an `atmega32u4` before flashing!** A PCB that uses an `APM32F103CBT6` with `uf2boot` has been shipped with some extras purchases and to replace some defective units. Flashing that PCB with "rev1" firmware may result in a non-functional PCB which can only be recovered using a hardware programmer (e.g. an ST-Link V2)
-* Hardware Availability: Group Buy took place between 2021-05-22 1600 UTC and 2021-05-25 1600 UTC on [https://jackylab.com/](https://jackylab.com/).
+* Hardware Supported:
+  * Piggy60 PCB rev 1 (atmega32u4, atmel-dfu)
+  * Piggy60 PCB rev 2 (APM32F103CBT6, uf2boot)
+  **Check your PCB before flashing!** Loading rev1 firmware on a rev2 PCB may result in a non-functional PCB which can only be recovered using a hardware programmer (e.g. an ST-Link V2)
+* Hardware Availability: Group Buy took place between 2021-05-22 1600 UTC and 2021-05-25 1600 UTC on [https://jackylab.com/](https://jackylab.com/). Rev 2 PCBs were provided during extras sales and as replacements.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jacky_studio/piggy60:default
+    make jacky_studio/piggy60/rev1:default
+    make jacky_studio/piggy60/rev2:default
 
 Flashing example for this keyboard:
 
-    make jacky_studio/piggy60:default:flash
+    make jacky_studio/piggy60/rev1:default:flash
+    make jacky_studio/piggy60/rev2:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
@@ -23,6 +27,15 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 Enter the bootloader in 3 ways:
 
-* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving.
-* **Physical reset**: Short the set of vertical holes on the third row, to the right of Caps Lock. These can be reached with tweezers after the board has been assembled.
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear EEPROM/emulated EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**:
+  - Rev 1: Short the set of vertical holes on the third row, to the right of Caps Lock. These can be reached with tweezers after the board has been assembled.
+  - Rev 2: Near the MCU there are two square pads with a circle in the middle. This is an unpopulated footprint for a reset button. Short these two pads twice in quick succession.
 * **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymaps, but you may assign this key in any keymaps you create.
+
+## Flashing
+
+After entering the bootloader through one of the three methods above:
+
+- Rev 1: The keyboard will appear as an Atmel DFU device. It can be flashed using the QMK CLI or QMK Toolbox.
+- Rev 2: The keyboard will appear as a USB mass storage device named `MT.KEY`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
diff --git a/keyboards/jacky_studio/piggy60/hotswap/info.json b/keyboards/jacky_studio/piggy60/rev1/hotswap/info.json
index 8b10920700..8b10920700 100644
--- a/keyboards/jacky_studio/piggy60/hotswap/info.json
+++ b/keyboards/jacky_studio/piggy60/rev1/hotswap/info.json
diff --git a/keyboards/jacky_studio/piggy60/hotswap/rules.mk b/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk
index 6e7633bfe0..6e7633bfe0 100644
--- a/keyboards/jacky_studio/piggy60/hotswap/rules.mk
+++ b/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk
diff --git a/keyboards/jacky_studio/piggy60/rev1/info.json b/keyboards/jacky_studio/piggy60/rev1/info.json
new file mode 100644
index 0000000000..8f3ebcf347
--- /dev/null
+++ b/keyboards/jacky_studio/piggy60/rev1/info.json
@@ -0,0 +1,47 @@
+{
+    "keyboard_name": "Piggy60 rev1",
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    },
+     "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "processor": "atmega32u4",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1001"
+    },
+    "features": {
+        "bootmagic": true,
+        "caps_word": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "F4",
+        "on_state": 0
+    },
+    "rgblight": {
+        "led_count": 14,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "E2"
+    }
+}
diff --git a/keyboards/jacky_studio/piggy60/rev1/rules.mk b/keyboards/jacky_studio/piggy60/rev1/rules.mk
new file mode 100644
index 0000000000..873e9334ed
--- /dev/null
+++ b/keyboards/jacky_studio/piggy60/rev1/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = jacky_studio/piggy60/rev1/solder
diff --git a/keyboards/jacky_studio/piggy60/solder/info.json b/keyboards/jacky_studio/piggy60/rev1/solder/info.json
index 6a4cacb0fc..6a4cacb0fc 100644
--- a/keyboards/jacky_studio/piggy60/solder/info.json
+++ b/keyboards/jacky_studio/piggy60/rev1/solder/info.json
diff --git a/keyboards/jacky_studio/piggy60/solder/rules.mk b/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk
index 6e7633bfe0..6e7633bfe0 100644
--- a/keyboards/jacky_studio/piggy60/solder/rules.mk
+++ b/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk
diff --git a/keyboards/jacky_studio/piggy60/rev2/board.h b/keyboards/jacky_studio/piggy60/rev2/board.h
new file mode 100644
index 0000000000..e474f8ab33
--- /dev/null
+++ b/keyboards/jacky_studio/piggy60/rev2/board.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
diff --git a/keyboards/jacky_studio/piggy60/rev2/config.h b/keyboards/jacky_studio/piggy60/rev2/config.h
new file mode 100644
index 0000000000..fa884d5f18
--- /dev/null
+++ b/keyboards/jacky_studio/piggy60/rev2/config.h
@@ -0,0 +1,29 @@
+/* Copyright 2022 MT
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define RGB_MATRIX_LED_COUNT 14
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define WS2812_PWM_DRIVER PWMD4
+#define WS2812_PWM_CHANNEL 4
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_DMA_CHANNEL 7
diff --git a/keyboards/jacky_studio/piggy60/rev2/halconf.h b/keyboards/jacky_studio/piggy60/rev2/halconf.h
new file mode 100644
index 0000000000..612ce4fc4a
--- /dev/null
+++ b/keyboards/jacky_studio/piggy60/rev2/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/jacky_studio/piggy60/rev2/info.json b/keyboards/jacky_studio/piggy60/rev2/info.json
new file mode 100644
index 0000000000..91b28898ec
--- /dev/null
+++ b/keyboards/jacky_studio/piggy60/rev2/info.json
@@ -0,0 +1,283 @@
+{
+    "board": "STM32_F103_STM32DUINO",
+    "bootloader": "uf2boot",
+    "diode_direction": "ROW2COL",
+    "community_layouts": ["60_hhkb", "60_tsangan_hhkb"],
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "B3",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A6", "A5", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15"],
+        "rows": ["A7", "B0", "B1", "B2", "B10"]
+    },
+    "processor": "STM32F103",
+    "ws2812": {
+        "pin": "B9",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true
+        },
+        "layout": [
+            { "flags": 2, "x": 0, "y": 63 },
+            { "flags": 2, "x": 45, "y": 63 },
+            { "flags": 2, "x": 90, "y": 63 },
+            { "flags": 2, "x": 135, "y": 63 },
+            { "flags": 2, "x": 180, "y": 63 },
+            { "flags": 2, "x": 223, "y": 63 },
+            { "flags": 2, "x": 160, "y": 32 },
+            { "flags": 2, "x": 223, "y": 0 },
+            { "flags": 2, "x": 180, "y": 0 },
+            { "flags": 2, "x": 135, "y": 0 },
+            { "flags": 2, "x": 90, "y": 0 },
+            { "flags": 2, "x": 45, "y": 0 },
+            { "flags": 2, "x": 0, "y": 0 },
+            { "flags": 2, "x": 32, "y": 32 }
+        ]
+    },
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x1002"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "|\\", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Control", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "GUI", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "GUI", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/jacky_studio/piggy60/rev2/mcuconf.h b/keyboards/jacky_studio/piggy60/rev2/mcuconf.h
new file mode 100644
index 0000000000..0d3de3dad5
--- /dev/null
+++ b/keyboards/jacky_studio/piggy60/rev2/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
diff --git a/keyboards/jacky_studio/piggy60/rev2/rules.mk b/keyboards/jacky_studio/piggy60/rev2/rules.mk
new file mode 100644
index 0000000000..47220e8853
--- /dev/null
+++ b/keyboards/jacky_studio/piggy60/rev2/rules.mk
@@ -0,0 +1,8 @@
+# Configure for 128K flash
+MCU_LDSCRIPT = STM32F103xB
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/jacky_studio/piggy60/rules.mk b/keyboards/jacky_studio/piggy60/rules.mk
index 530e6598df..873e9334ed 100644
--- a/keyboards/jacky_studio/piggy60/rules.mk
+++ b/keyboards/jacky_studio/piggy60/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = jacky_studio/piggy60/solder
+DEFAULT_FOLDER = jacky_studio/piggy60/rev1/solder
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h
index d7a8bf543b..e2d6aed274 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B6, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -47,7 +31,6 @@
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json
index f2e51f63ac..e024b49bdb 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/rev1.c b/keyboards/jacky_studio/s7_elephant/rev1/rev1.c
deleted file mode 100644
index 0477a9ef5f..0000000000
--- a/keyboards/jacky_studio/s7_elephant/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h
index 1a6e9cea9e..5c6eeaf844 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- *
- *                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F   */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0, E6 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif // RGB_DI_PIN
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json
index 639b5a3897..148086c0e6 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0008",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 15
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/rev2.c b/keyboards/jacky_studio/s7_elephant/rev2/rev2.c
deleted file mode 100644
index 1cc3fd53f0..0000000000
--- a/keyboards/jacky_studio/s7_elephant/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/jadookb/jkb2/config.h b/keyboards/jadookb/jkb2/config.h
deleted file mode 100644
index 0c4b365932..0000000000
--- a/keyboards/jadookb/jkb2/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
- /* Copyright 2021 Wizard-GG
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define MATRIX_ROW_PINS { B1 }
-#define MATRIX_COL_PINS { B3 ,B2}
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/jadookb/jkb2/info.json b/keyboards/jadookb/jkb2/info.json
index 0a72e6b7bc..764efa8767 100644
--- a/keyboards/jadookb/jkb2/info.json
+++ b/keyboards/jadookb/jkb2/info.json
@@ -8,11 +8,19 @@
     "pid": "0x3225",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B3", "B2"],
+    "rows": ["B1"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
-      "layout": [ {"label":"z","x": 0, "y": 0 }, {"label":"x","x": 1, "y": 0 }]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0}
+      ]
     }
   }
 }
diff --git a/keyboards/jadookb/jkb2/jkb2.c b/keyboards/jadookb/jkb2/jkb2.c
deleted file mode 100644
index 3ac90e97eb..0000000000
--- a/keyboards/jadookb/jkb2/jkb2.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2021 Wizard-GG
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "jkb2.h"
diff --git a/keyboards/jadookb/jkb2/jkb2.h b/keyboards/jadookb/jkb2/jkb2.h
deleted file mode 100644
index 1bddef45de..0000000000
--- a/keyboards/jadookb/jkb2/jkb2.h
+++ /dev/null
@@ -1,25 +0,0 @@
- /* Copyright 2021 Wizard-GG
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K01, K02 \
-) \
-{ \
- { K01, K02 }, \
-}
diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
index 00bc0c3488..a54e1e1fd3 100644
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-
 #define RGB_MATRIX_LED_COUNT 67
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json
index 60908bda8e..e235e7bc41 100644
--- a/keyboards/jadookb/jkb65/info.json
+++ b/keyboards/jadookb/jkb65/info.json
@@ -6,6 +6,12 @@
         "vid": "0x4A4B",
         "pid": "0xEF6A"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -14,7 +20,79 @@
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"~", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Menu", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 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, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/jadookb/jkb65/jkb65.c b/keyboards/jadookb/jkb65/jkb65.c
index 1ce62e241a..0e76162b5a 100644
--- a/keyboards/jadookb/jkb65/jkb65.c
+++ b/keyboards/jadookb/jkb65/jkb65.c
@@ -14,7 +14,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
-#include "jkb65.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/jadookb/jkb65/jkb65.h b/keyboards/jadookb/jkb65/jkb65.h
deleted file mode 100644
index 97f65bf4da..0000000000
--- a/keyboards/jadookb/jkb65/jkb65.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Wizard-GG 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E,      K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,        K2F,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D, K3F,   \
-    K40,  K41,  K42,              K46,                K4A,  K4B,     K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, K2F   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, K3F   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   KC_NO, K4F   }, \
-}
-
diff --git a/keyboards/jadookb/jkb65/r1/config.h b/keyboards/jadookb/jkb65/r1/config.h
deleted file mode 100644
index 78f13414c9..0000000000
--- a/keyboards/jadookb/jkb65/r1/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
- /* Copyright 2022 Wizad-GG
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-  
-#pragma once
-
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 }
\ No newline at end of file
diff --git a/keyboards/jadookb/jkb65/r1/info.json b/keyboards/jadookb/jkb65/r1/info.json
index 4bfe3aa763..9cf153f928 100644
--- a/keyboards/jadookb/jkb65/r1/info.json
+++ b/keyboards/jadookb/jkb65/r1/info.json
@@ -1,5 +1,10 @@
 {
     "keyboard_name": "JKB65 RGB R1",
+    "matrix_pins": {
+        "cols": ["F6", "B1", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "B3", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "usb": {
         "device_version": "0.0.1"
     }
diff --git a/keyboards/jadookb/jkb65/r2/config.h b/keyboards/jadookb/jkb65/r2/config.h
deleted file mode 100644
index 5db93f75cb..0000000000
--- a/keyboards/jadookb/jkb65/r2/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
- /* Copyright 2022 Wizad-GG
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-  
-#pragma once
-
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6,B0,F1,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,D0 }
\ No newline at end of file
diff --git a/keyboards/jadookb/jkb65/r2/info.json b/keyboards/jadookb/jkb65/r2/info.json
index 8a23a21d5f..909efbd665 100644
--- a/keyboards/jadookb/jkb65/r2/info.json
+++ b/keyboards/jadookb/jkb65/r2/info.json
@@ -2,5 +2,10 @@
     "keyboard_name": "JKB65 RGB R2",
     "usb": {
         "device_version": "0.0.2"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/jadookb/jkb65/rules.mk b/keyboards/jadookb/jkb65/rules.mk
index 14493320b2..9098dae1ca 100644
--- a/keyboards/jadookb/jkb65/rules.mk
+++ b/keyboards/jadookb/jkb65/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 
 DEFAULT_FOLDER = jadookb/jkb65/r1
diff --git a/keyboards/jae/j01/config.h b/keyboards/jae/j01/config.h
index 8afbaabca0..6b5c1ab3f9 100644
--- a/keyboards/jae/j01/config.h
+++ b/keyboards/jae/j01/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS {B2, B1, B3, B0, D0}
-#define MATRIX_COL_PINS {D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/jae/j01/info.json b/keyboards/jae/j01/info.json
index 6f0b5d485d..74bcf21b47 100644
--- a/keyboards/jae/j01/info.json
+++ b/keyboards/jae/j01/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0143",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
+        "rows": ["B2", "B1", "B3", "B0", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 4,
diff --git a/keyboards/jagdpietr/drakon/config.h b/keyboards/jagdpietr/drakon/config.h
index 163236c90c..96c32b09f2 100644
--- a/keyboards/jagdpietr/drakon/config.h
+++ b/keyboards/jagdpietr/drakon/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C7, B5, B6, B0, B1, F1 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, C6, B2, B3, B7, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/jagdpietr/drakon/drakon.c b/keyboards/jagdpietr/drakon/drakon.c
index 65d9503055..59b7a4fba5 100644
--- a/keyboards/jagdpietr/drakon/drakon.c
+++ b/keyboards/jagdpietr/drakon/drakon.c
@@ -18,16 +18,6 @@
 
 char wpm_str[10];
 
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    return true;
-}
-
 #ifdef OLED_ENABLE
 
 // Defines names for use in layer keycodes and the keymap
diff --git a/keyboards/jagdpietr/drakon/info.json b/keyboards/jagdpietr/drakon/info.json
index 3aab789199..9c28b21336 100644
--- a/keyboards/jagdpietr/drakon/info.json
+++ b/keyboards/jagdpietr/drakon/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7776",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C6", "B2", "B3", "B7", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["C7", "B5", "B6", "B0", "B1", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "F0"}
diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h
index 62501a05d1..6abe1d446d 100644
--- a/keyboards/jc65/v32a/config.h
+++ b/keyboards/jc65/v32a/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json
index b9693c8e72..b864754a8c 100644
--- a/keyboards/jc65/v32a/info.json
+++ b/keyboards/jc65/v32a/info.json
@@ -8,9 +8,17 @@
     "pid": "0x5679",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1"
   },
diff --git a/keyboards/jc65/v32a/rules.mk b/keyboards/jc65/v32a/rules.mk
index 25437c442c..6b0cec85a4 100644
--- a/keyboards/jc65/v32a/rules.mk
+++ b/keyboards/jc65/v32a/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/jc65/v32a/v32a.c b/keyboards/jc65/v32a/v32a.c
deleted file mode 100644
index aa7233ba2a..0000000000
--- a/keyboards/jc65/v32a/v32a.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "v32a.h"
diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h
index eca08d7d92..35107f1518 100644
--- a/keyboards/jc65/v32u4/config.h
+++ b/keyboards/jc65/v32u4/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* QMK JC65 PCB default pin-out */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4, F5 }
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,6 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json
index e20dccdbfa..0d278b55ae 100644
--- a/keyboards/jc65/v32u4/info.json
+++ b/keyboards/jc65/v32u4/info.json
@@ -8,9 +8,17 @@
     "pid": "0x6060",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F5"],
+    "rows": ["D0", "D1", "D2", "D3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6"
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "indicators": {
     "caps_lock": "B2",
     "on_state": 0
diff --git a/keyboards/jc65/v32u4/keymaps/coth/rules.mk b/keyboards/jc65/v32u4/keymaps/coth/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/jc65/v32u4/keymaps/coth/rules.mk
+++ /dev/null
diff --git a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/rules.mk b/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/rules.mk
+++ /dev/null
diff --git a/keyboards/jc65/v32u4/keymaps/na7thana/rules.mk b/keyboards/jc65/v32u4/keymaps/na7thana/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/jc65/v32u4/keymaps/na7thana/rules.mk
+++ /dev/null
diff --git a/keyboards/jc65/v32u4/v32u4.c b/keyboards/jc65/v32u4/v32u4.c
deleted file mode 100644
index a6837268e1..0000000000
--- a/keyboards/jc65/v32u4/v32u4.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "v32u4.h"
diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h
index 11a868ab3e..cec546538a 100644
--- a/keyboards/jd40/config.h
+++ b/keyboards/jd40/config.h
@@ -17,29 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F5, B4 }
-#define MATRIX_COL_PINS { F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/jd40/info.json b/keyboards/jd40/info.json
index 9bb96326d3..215e32f5d0 100644
--- a/keyboards/jd40/info.json
+++ b/keyboards/jd40/info.json
@@ -8,6 +8,14 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2"],
+    "rows": ["F0", "F1", "F5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/jd40/jd40.c b/keyboards/jd40/jd40.c
deleted file mode 100644
index 1b68ddd4f3..0000000000
--- a/keyboards/jd40/jd40.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jd40.h"
diff --git a/keyboards/jd40/keymaps/vanagon/rules.mk b/keyboards/jd40/keymaps/vanagon/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/jd40/keymaps/vanagon/rules.mk
+++ /dev/null
diff --git a/keyboards/jd45/config.h b/keyboards/jd45/config.h
index 25153db750..9b7700e013 100644
--- a/keyboards/jd45/config.h
+++ b/keyboards/jd45/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { F0, F1, F5, B4 }
-#define MATRIX_COL_PINS { F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2, B0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/jd45/info.json b/keyboards/jd45/info.json
index 725431c672..c401d179eb 100644
--- a/keyboards/jd45/info.json
+++ b/keyboards/jd45/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2", "B0"],
+    "rows": ["F0", "F1", "F5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
diff --git a/keyboards/jd45/jd45.c b/keyboards/jd45/jd45.c
deleted file mode 100644
index 00c5810479..0000000000
--- a/keyboards/jd45/jd45.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jd45.h"
\ No newline at end of file
diff --git a/keyboards/jels/jels60/config.h b/keyboards/jels/jels60/config.h
index b03ceffba8..d78952f261 100644
--- a/keyboards/jels/jels60/config.h
+++ b/keyboards/jels/jels60/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/*Define Matrix Pins */
-#define MATRIX_ROW_PINS {B3, D2, F0, F4, F1}
-#define MATRIX_COL_PINS {E6, C7, B4, D7, D6, D4, D5, D3, F5, F6, F7, C6, B6, B5}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/jels/jels60/info.json b/keyboards/jels/jels60/info.json
index 3d3b59ca7e..7f3edd4843 100644
--- a/keyboards/jels/jels60/info.json
+++ b/keyboards/jels/jels60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "C7", "B4", "D7", "D6", "D4", "D5", "D3", "F5", "F6", "F7", "C6", "B6", "B5"],
+        "rows": ["B3", "D2", "F0", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7"
     },
@@ -16,340 +21,359 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "ESC", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Bksp", "x": 13, "y": 0 },
-                { "label": "~", "x": 14, "y": 0 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "|", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14, "y": 3 },
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 2.75 },
-                { "x": 6.5, "y": 4, "w": 1 },
-                { "x": 7.5, "y": 4, "w": 2.5 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4},
+                {"matrix": [4, 9], "x": 7.5, "y": 4, "w": 2.5},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                { "label": "ESC", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_split_space": {
             "layout": [
-                { "label": "ESC", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Bksp", "x": 13, "y": 0 },
-                { "label": "~", "x": 14, "y": 0 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "|", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14, "y": 3 },
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
-                { "label": "Win", "x": 1.5, "y": 4, "w": 1 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
-                { "x": 4, "y": 4, "w": 2.75 },
-                { "x": 6.75, "y": 4, "w": 1.5 },
-                { "x": 8.25, "y": 4, "w": 2.75 },
-                { "label": "Alt", "x": 11, "y": 4, "w": 1.5 },
-                { "label": "Win", "x": 12.5, "y": 4, "w": 1 },
-                { "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 8.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_tsangan_split_bs": {
             "layout": [
-                { "label": "ESC", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Bksp", "x": 13, "y": 0 },
-                { "label": "~", "x": 14, "y": 0 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14, "y": 3 },
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
-                { "label": "Win", "x": 1.5, "y": 4, "w": 1 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
-                { "x": 4, "y": 4, "w": 7 },
-                { "label": "Alt", "x": 11, "y": 4, "w": 1.5 },
-                { "label": "Win", "x": 12.5, "y": 4, "w": 1 },
-                { "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_iso": {
-         "layout": [
-                { "label": "ESC", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h":2 },
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "|", "x": 12.75, "y": 2 },
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "|", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 13], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 6], "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/jels/jels60/jels60.c b/keyboards/jels/jels60/jels60.c
deleted file mode 100644
index 6e8fd58da8..0000000000
--- a/keyboards/jels/jels60/jels60.c
+++ /dev/null
@@ -1,21 +0,0 @@
- /* Copyright 2022 Joah Nelson (Jels)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation,   either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "jels60.h"
-
-
-
-
diff --git a/keyboards/jels/jels60/jels60.h b/keyboards/jels/jels60/jels60.h
deleted file mode 100644
index f8bc296e1a..0000000000
--- a/keyboards/jels/jels60/jels60.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  copyright 2022 Joah Nelson (Jels)
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 2 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERAHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-
-#define LAYOUT_all( \
-    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, K1x13,  \
-    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13,         \
-    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,                \
-    K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
-    K4x0, K4x1, K4x2,       K4x4,       K4x6,             K4x9, K4x10, K4x11, K4x12, K4x13          \
-){ \
-    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
-    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K1x13}, \
-    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
-    {K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
-    {K4x0, K4x1, K4x2, ____, K4x4, ____, K4x6, ____, ____, K4x9, K4x10, K4x11, K4x12, K4x13}  \
-}
-
-#define LAYOUT_ansi( \
-    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, \
-    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13, \
-    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,        \
-    K3x0,       K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12,        \
-    K4x0, K4x1, K4x2,             K4x6,                         K4x10, K4x11, K4x12, K4x13  \
-){ \
-    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
-    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, ____ }, \
-    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
-    {K3x0, ____, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, ____ }, \
-    {K4x0, K4x1, K4x2, ____, ____, ____, K4x6, ____, ____, ____, K4x10, K4x11, K4x12, K4x13}  \
-}
-
-#define LAYOUT_split_space( \
-    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, K1x13,  \
-    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13,         \
-    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,                \
-    K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
-    K4x0, K4x1, K4x2,       K4x4,       K4x6,             K4x9,        K4x11, K4x12, K4x13          \
-){ \
-    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
-    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K1x13}, \
-    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
-    {K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
-    {K4x0, K4x1, K4x2, ____, K4x4, ____, K4x6, ____, ____, K4x9,  ____, K4x11, K4x12, K4x13}  \
-}
-
-#define LAYOUT_tsangan_split_bs( \
-    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, K1x13,  \
-    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13,         \
-    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,                \
-    K3x0,       K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
-    K4x0, K4x1, K4x2,              K4x6,                        K4x10,        K4x12, K4x13          \
-){ \
-    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
-    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K1x13}, \
-    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
-    {K3x0, ____, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
-    {K4x0, K4x1, K4x2, ____, ____, ____, K4x6, ____, ____, ____, K4x10,  ____, K4x12, K4x13}  \
-}
-
-#define LAYOUT_iso( \
-    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13,         \
-    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x12,         \
-    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x13,                \
-    K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
-    K4x0, K4x1, K4x2,              K4x6,                        K4x10,        K4x12, K4x13          \
-){ \
-    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
-    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, ____ }, \
-    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
-    {K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
-    {K4x0, K4x1, K4x2, ____, ____, ____, K4x6, ____, ____, ____, K4x10,  ____, K4x12, K4x13}  \
-}
-
-
-
diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h
index b655834c02..9ba31d626d 100644
--- a/keyboards/jels/jels88/config.h
+++ b/keyboards/jels/jels88/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-
-/*Define Matrix Pins */
-#define MATRIX_ROW_PINS \
-    { B3, B2, D1, D0, E6, B0, F0, F1, B5, B4, D7, D6 }
-#define MATRIX_COL_PINS \
-    { C7, C6, F7, F6, F5, F4, B1, D2, D3 }
-
-/* ws2812b RGB LEDs */
-#define RGB_DI_PIN B6
-
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 20  // Number of LEDs
 #define RGBLIGHT_SLEEP
@@ -43,9 +33,6 @@
 #define RGBLIGHT_LIMIT_VAL 225  // keep PCB under 500mA
 #endif
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json
index fed2fe9f4c..568b363360 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0088",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "F7", "F6", "F5", "F4", "B1", "D2", "D3"],
+        "rows": ["B3", "B2", "D1", "D0", "E6", "B0", "F0", "F1", "B5", "B4", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [1, 0]
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
@@ -269,7 +277,7 @@
                 { "label": "L", "x": 9.75, "y": 3.25 },
                 { "label": ":", "x": 10.75, "y": 3.25 },
                 { "label": "\"", "x": 11.75, "y": 3.25 },
-                { "label": "|", "x": 12.75, "y": 3.25, "w": 1 },
+                { "label": "|", "x": 12.75, "y": 3.25 },
                 { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
                 { "label": "|", "x": 1.25, "y": 4.25 },
                 { "label": "Z", "x": 2.25, "y": 4.25 },
diff --git a/keyboards/jian/handwired/config.h b/keyboards/jian/handwired/config.h
deleted file mode 100644
index d968a5bf93..0000000000
--- a/keyboards/jian/handwired/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-#define DIODE_DIRECTION COL2ROW
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D3, D2, B5, B6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 }
diff --git a/keyboards/jian/handwired/handwired.c b/keyboards/jian/handwired/handwired.c
index 2c14518299..f803394c74 100644
--- a/keyboards/jian/handwired/handwired.c
+++ b/keyboards/jian/handwired/handwired.c
@@ -1,4 +1,4 @@
-#include "handwired.h"
+#include "quantum.h"
 
 const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
   {{13, 0}, {12, 0}, {11, 0}, {10, 0}, {9, 0}, {8, 0}, {7, 0}, {6, 0}, {5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
diff --git a/keyboards/jian/handwired/handwired.h b/keyboards/jian/handwired/handwired.h
deleted file mode 100644
index 9b388b94ae..0000000000
--- a/keyboards/jian/handwired/handwired.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "jian.h"
-
-#define XXX KC_NO
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05, L06,    R06, R05, R04, R03, R02, R01, R00, \
-       L11, L12, L13, L14, L15, L16,    R16, R15, R14, R13, R12, R11, \
-       L21, L22, L23, L24, L25, L26,    R26, R25, R24, R23, R22, R21, \
-                      L34, L35, L36,    R36, R35, R34 \
-) \
-{ \
-  {L00, L01, L02, L03, L04, L05, L06,   R06, R05, R04, R03, R02, R01, R00}, \
-  {XXX, L11, L12, L13, L14, L15, L16,   R16, R15, R14, R13, R12, R11, XXX}, \
-  {XXX, L21, L22, L23, L24, L25, L26,   R26, R25, R24, R23, R22, R21, XXX}, \
-  {XXX, XXX, XXX, XXX, L34, L35, L36,   R36, R35, R34, XXX, XXX, XXX, XXX} \
-}
-
-#define LAYOUT_symmetric( \
-  K00, K01, K02, K03, K04, K05, K06, \
-       K11, K12, K13, K14, K15, K16, \
-       K21, K22, K23, K24, K25, K26, \
-                      K34, K35, K36 \
-) \
-{ \
-  {K00, K01, K02, K03, K04, K05, K06,   K06, K05, K04, K03, K02, K01, K00}, \
-  {XXX, K11, K12, K13, K14, K15, K16,   K16, K15, K14, K13, K12, K11, XXX}, \
-  {XXX, K21, K22, K23, K24, K25, K26,   K26, K25, K24, K23, K22, K21, XXX}, \
-  {XXX, XXX, XXX, XXX, K34, K35, K36,   K36, K35, K34, XXX, XXX, XXX, XXX} \
-}
diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/info.json
index 712c3d9b01..dc68963b6b 100644
--- a/keyboards/jian/handwired/info.json
+++ b/keyboards/jian/handwired/info.json
@@ -3,6 +3,68 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["D3", "D2", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.625},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.375},
+
+                {"matrix": [0, 7], "x": 10, "y": 0.375},
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.625},
+                {"matrix": [0, 12], "x": 15, "y": 0.75},
+                {"matrix": [0, 13], "x": 16, "y": 1.5},
+
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.625},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.375},
+
+                {"matrix": [1, 7], "x": 10, "y": 1.375},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1},
+                {"matrix": [1, 10], "x": 13, "y": 1.25},
+                {"matrix": [1, 11], "x": 14, "y": 1.625},
+                {"matrix": [1, 12], "x": 15, "y": 1.75},
+
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.625},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.375},
+
+                {"matrix": [2, 7], "x": 10, "y": 2.375},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.625},
+                {"matrix": [2, 12], "x": 15, "y": 2.75},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.375},
+                {"matrix": [3, 6], "x": 7, "y": 3.5},
+
+                {"matrix": [3, 7], "x": 9, "y": 3.5},
+                {"matrix": [3, 8], "x": 10, "y": 3.375},
+                {"matrix": [3, 9], "x": 11, "y": 3.25}
+            ]
+        }
+    }
 }
diff --git a/keyboards/jian/info.json b/keyboards/jian/info.json
index 2e59944921..f0b0261dc9 100644
--- a/keyboards/jian/info.json
+++ b/keyboards/jian/info.json
@@ -5,65 +5,5 @@
     "usb": {
         "vid": "0xC0DE",
         "pid": "0x1337"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                { "label": "Super", "x": 0,  "y": 1.5   },
-                { "label": "~",     "x": 1,  "y": 0.75  },
-                { "label": "Q",     "x": 2,  "y": 0.625 },
-                { "label": "W",     "x": 3,  "y": 0.25  },
-                { "label": "E",     "x": 4,  "y": 0     },
-                { "label": "R",     "x": 5,  "y": 0.25  },
-                { "label": "T",     "x": 6,  "y": 0.375 },
-
-                { "label": "Y",     "x": 10, "y": 0.375 },
-                { "label": "U",     "x": 11, "y": 0.25  },
-                { "label": "I",     "x": 12, "y": 0     },
-                { "label": "O",     "x": 13, "y": 0.25  },
-                { "label": "P",     "x": 14, "y": 0.625 },
-                { "label": "{[",    "x": 15, "y": 0.75  },
-                { "label": "}]",    "x": 16, "y": 1.5   },
-
-
-                { "label": "Ctrl",  "x": 1,  "y": 1.75  },
-                { "label": "A",     "x": 2,  "y": 1.625 },
-                { "label": "S",     "x": 3,  "y": 1.25  },
-                { "label": "D",     "x": 4,  "y": 1     },
-                { "label": "F",     "x": 5,  "y": 1.25  },
-                { "label": "G",     "x": 6,  "y": 1.375 },
-
-                { "label": "H",     "x": 10, "y": 1.375 },
-                { "label": "J",     "x": 11, "y": 1.25  },
-                { "label": "K",     "x": 12, "y": 1     },
-                { "label": "L",     "x": 13, "y": 1.25  },
-                { "label": ":;",    "x": 14, "y": 1.625 },
-                { "label": "\"'",   "x": 15, "y": 1.75  },
-
-
-                { "label": "Alt",   "x": 1,  "y": 2.75  },
-                { "label": "Z",     "x": 2,  "y": 2.625 },
-                { "label": "X",     "x": 3,  "y": 2.25  },
-                { "label": "C",     "x": 4,  "y": 2     },
-                { "label": "V",     "x": 5,  "y": 2.25  },
-                { "label": "B",     "x": 6,  "y": 2.375 },
-
-                { "label": "N",     "x": 10, "y": 2.375 },
-                { "label": "M",     "x": 11, "y": 2.25  },
-                { "label": "<,",    "x": 12, "y": 2     },
-                { "label": ">.",    "x": 13, "y": 2.25  },
-                { "label": "?/",    "x": 14, "y": 2.625 },
-                { "label": "|\\",   "x": 15, "y": 2.75  },
-
-
-                { "label": "Tab",   "x": 5,  "y": 3.25  },
-                { "label": "Spc",   "x": 6,  "y": 3.375 },
-                { "label": "Enter", "x": 7,  "y": 3.5   },
-
-                { "label": "Esc",   "x": 9,  "y": 3.5   },
-                { "label": "Bscp",  "x": 10, "y": 3.375 },
-                { "label": "Del",   "x": 11, "y": 3.25  }
-            ]
-        }
     }
 }
diff --git a/keyboards/jian/jian.c b/keyboards/jian/jian.c
deleted file mode 100644
index e85b8554f0..0000000000
--- a/keyboards/jian/jian.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jian.h"
diff --git a/keyboards/jian/jian.h b/keyboards/jian/jian.h
deleted file mode 100644
index d09d056e9b..0000000000
--- a/keyboards/jian/jian.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_jian_handwired
-  #include "handwired.h"
-#endif
-
-#ifdef KEYBOARD_jian_rev1
-  #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_jian_rev2
-#include "rev2.h"
-#endif
-
-#ifdef KEYBOARD_jian_nsrev2
-  #include "nsrev2.h"
-#endif
diff --git a/keyboards/jian/keymaps/advanced/config.h b/keyboards/jian/keymaps/advanced/config.h
index 85b41c86d8..1a033d8311 100644
--- a/keyboards/jian/keymaps/advanced/config.h
+++ b/keyboards/jian/keymaps/advanced/config.h
@@ -22,6 +22,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define AUTO_SHIFT_TIMEOUT 150
 //#define NO_AUTO_SHIFT_NUMERIC
 //#define AUTO_SHIFT_MODIFIERS
-#define IGNORE_MOD_TAP_INTERRUPT
 #define ALT_LAYOUTS_ENABLE
 //#define TRAINING_HALFES_LOCK
diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index 6b308a4820..a825e061b5 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -211,18 +211,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                       _______, _______, _______,      _______, _______, _______
 ),
 
-[_ADJUST] = LAYOUT_symmetric(
-  QK_BOOT, DB_TOGG, AS_UP,   CH_WMN,  CH_CMK,  CH_QWE,  CH_DVK,
-           AS_RPT,  AS_TOGG, XXXXXXX, XXXXXXX, QWERTY,  PLOVER,
-           BL_ADJ,  AS_DOWN, XXXXXXX, XXXXXXX, ISO,     THUMB_ALT,
-                                      _______, SW_TG,   _______
+[_ADJUST] = LAYOUT(
+  QK_BOOT, DB_TOGG, AS_UP,   CH_WMN,  CH_CMK,  CH_QWE,  CH_DVK,       CH_DVK,  CH_QWE,  CH_CMK,  CH_WMN,  AS_UP,   DB_TOGG, QK_BOOT,
+           AS_RPT,  AS_TOGG, XXXXXXX, XXXXXXX, QWERTY,  PLOVER,       PLOVER,  QWERTY,  XXXXXXX, XXXXXXX, AS_TOGG, AS_RPT,
+           BL_ADJ,  AS_DOWN, XXXXXXX, XXXXXXX, ISO,     THUMB_ALT, THUMB_ALT,  ISO,     XXXXXXX, XXXXXXX, AS_DOWN, BL_ADJ,
+                                      _______, SW_TG,   _______,      _______, SW_TG,   _______
 ),
 #if defined(RGBLIGHT) | defined(BACKLIGHT_ENABLE)
-[_BCKLT_ADJ] = LAYOUT_symmetric(
-  XXXXXXX, XXXXXXX, XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,
-           XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
-           BL_ADJ,  BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
-                                      _______, _______, _______
+[_BCKLT_ADJ] = LAYOUT(
+  XXXXXXX, XXXXXXX, XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,      RGB_HUI, RGB_HUD, RGB_VAI, BL_UP,   XXXXXXX, XXXXXXX, XXXXXXX,
+           XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,      RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+           BL_ADJ,  BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,      RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, BL_ADJ,
+                                      _______, _______, _______,      _______, _______, _______
 ),
 #endif // defined(RGBLIGHT) | defined(BACKLIGHT_ENABLE)
 #ifdef TRAINING_HALFES_LOCK
diff --git a/keyboards/jian/keymaps/default/config.h b/keyboards/jian/keymaps/default/config.h
index 4d9cb17cac..314836a54d 100644
--- a/keyboards/jian/keymaps/default/config.h
+++ b/keyboards/jian/keymaps/default/config.h
@@ -18,5 +18,3 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
-
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/jian/keymaps/default/keymap.c b/keyboards/jian/keymaps/default/keymap.c
index 3948dd119f..4d0de652f1 100644
--- a/keyboards/jian/keymaps/default/keymap.c
+++ b/keyboards/jian/keymaps/default/keymap.c
@@ -71,19 +71,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                               _______, _______, _______,      _______, _______, _______
 ),
 
-[_ADJUST] = LAYOUT_symmetric(
-  QK_BOOT, DB_TOGG,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-           XXXXXXX,        WORKMAN, COLEMAK, DVORAK,  QWERTY,  XXXXXXX,
-           TG(_BCKLT_ADJ), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                             _______, SW_TG,   _______
+[_ADJUST] = LAYOUT(
+  QK_BOOT, DB_TOGG,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG,        QK_BOOT,
+           XXXXXXX,        WORKMAN, COLEMAK, DVORAK,  QWERTY,  XXXXXXX,      XXXXXXX, QWERTY,  DVORAK,  COLEMAK, WORKMAN, XXXXXXX,
+           TG(_BCKLT_ADJ), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(_BCKLT_ADJ),
+                                             _______, SW_TG,   _______,      _______, SW_TG,   _______
 ),
 
 #if defined(RGBLIGHT) || defined(BACKLIGHT_ENABLE)
-[_BCKLT_ADJ] = LAYOUT_symmetric(
-  XXXXXXX, XXXXXXX,        XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,
-           XXXXXXX,        XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
-           TG(_BCKLT_ADJ), BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
-                                             _______, _______, _______
+[_BCKLT_ADJ] = LAYOUT(
+  XXXXXXX, XXXXXXX,        XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,      RGB_HUI, RGB_HUD, RGB_VAI, BL_UP,   XXXXXXX, XXXXXXX,        XXXXXXX,
+           XXXXXXX,        XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,      RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+           TG(_BCKLT_ADJ), BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,      RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, TG(_BCKLT_ADJ),
+                                             _______, _______, _______,      _______, _______, _______
 )
 #endif // defined(RGBLIGHT) || defined(BACKLIGHT_ENABLE)
 
diff --git a/keyboards/jian/keymaps/left_hand/config.h b/keyboards/jian/keymaps/left_hand/config.h
index 4d9cb17cac..cae66a5c3a 100644
--- a/keyboards/jian/keymaps/left_hand/config.h
+++ b/keyboards/jian/keymaps/left_hand/config.h
@@ -19,4 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/jian/keymaps/left_hand/keymap.c b/keyboards/jian/keymaps/left_hand/keymap.c
index 5f6b93bc6e..3f67215b8b 100644
--- a/keyboards/jian/keymaps/left_hand/keymap.c
+++ b/keyboards/jian/keymaps/left_hand/keymap.c
@@ -26,46 +26,46 @@ enum jian_layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_DFLT_L] = LAYOUT_symmetric_left(
-  KC_LSFT, LGUI_T(KC_GRV), KC_Q, KC_W, KC_E,                 KC_R,                KC_T,
-           KC_LCTL,        KC_A, KC_S, KC_D,                 KC_F,                KC_G,
-           KC_LALT,        KC_Z, KC_X, KC_C,                 KC_V,                KC_B,
-                                       LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT)
+[_DFLT_L] = LAYOUT(
+  KC_LSFT, LGUI_T(KC_GRV), KC_Q, KC_W, KC_E,                 KC_R,                KC_T,                     KC_T,                KC_R,                KC_E,                 KC_W,    KC_Q,    LGUI_T(KC_GRV), KC_LSFT,
+           KC_LCTL,        KC_A, KC_S, KC_D,                 KC_F,                KC_G,                     KC_G,                KC_F,                KC_D,                 KC_S,    KC_A,    KC_LCTL,
+           KC_LALT,        KC_Z, KC_X, KC_C,                 KC_V,                KC_B,                     KC_B,                KC_V,                KC_C,                 KC_X,    KC_Z,    KC_LALT,
+                                       LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT),      LT(_LOWR_L, KC_ENT), LT(_DFLT_R, KC_SPC), LT(_RAIS_L, KC_BSPC),
 ),
-[_DFLT_R] = LAYOUT_symmetric_right(
-  KC_Y,                KC_U,    KC_I,               KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-  KC_H,                KC_J,    KC_K,               KC_L,    KC_SCLN, KC_QUOT,
-  KC_N,                KC_M,    KC_COMM,            KC_DOT,  KC_SLSH, KC_BSLS,
-  LT(_LOWR_R, KC_ESC), _______, LT(_RAIS_R, KC_DEL)
+[_DFLT_R] = LAYOUT(
+  KC_RBRC, KC_LBRC, KC_P,    KC_O,    KC_I,                KC_U,    KC_Y,                     KC_Y,                KC_U,    KC_I,               KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+           KC_QUOT, KC_SCLN, KC_L,    KC_K,                KC_J,    KC_H,                     KC_H,                KC_J,    KC_K,               KC_L,    KC_SCLN, KC_QUOT,
+           KC_BSLS, KC_SLSH, KC_DOT,  KC_COMM,             KC_M,    KC_N,                     KC_N,                KC_M,    KC_COMM,            KC_DOT,  KC_SLSH, KC_BSLS,
+                                      LT(_RAIS_R, KC_DEL), _______, LT(_LOWR_R, KC_ESC),      LT(_LOWR_R, KC_ESC), _______, LT(_RAIS_R, KC_DEL)
 ),
-[_RAIS_L] = LAYOUT_symmetric_left(
-  _______, LGUI_T(KC_CAPS), KC_SCRL, KC_HOME, KC_PSCR, KC_PGUP,              KC_VOLU,
-           LCTL_T(KC_APP),  KC_INS,  KC_LEFT, KC_UP,   KC_RGHT,              KC_MUTE,
-           _______,         KC_PAUS, KC_END,  KC_DOWN, KC_PGDN,              KC_VOLD,
-                                              _______, LT(_RAIS_R, KC_TAB) , LT(_ADJUST, KC_ESC)
+[_RAIS_L] = LAYOUT(
+  _______, LGUI_T(KC_CAPS), KC_SCRL, KC_HOME, KC_PSCR, KC_PGUP,              KC_VOLU,                  KC_VOLU,             KC_PGUP,             KC_PSCR, KC_HOME, KC_SCRL, LGUI_T(KC_CAPS), _______,
+           LCTL_T(KC_APP),  KC_INS,  KC_LEFT, KC_UP,   KC_RGHT,              KC_MUTE,                  KC_MUTE,             KC_RGHT,             KC_UP,   KC_LEFT, KC_INS,  LGUI_T(KC_APP),
+           _______,         KC_PAUS, KC_END,  KC_DOWN, KC_PGDN,              KC_VOLD,                  KC_VOLD,             KC_PGDN,             KC_DOWN, KC_END,  KC_PAUS, _______,
+                                              _______, LT(_RAIS_R, KC_TAB) , LT(_ADJUST, KC_ESC),      LT(_ADJUST, KC_ESC), LT(_RAIS_R, KC_TAB), _______
 ),
-[_RAIS_R] = LAYOUT_symmetric_left(
-  KC_RSFT, KC_RGUI, XXXXXXX, KC_F7, KC_F8,               KC_F9,   KC_F10,
-           KC_RCTL, XXXXXXX, KC_F4, KC_F5,               KC_F6,   KC_F11,
-           KC_LALT, XXXXXXX, KC_F1, KC_F2,               KC_F3,   KC_F12,
-                                    LT(_ADJUST, KC_DEL), _______, _______
+[_RAIS_R] = LAYOUT(
+  KC_RSFT, KC_RGUI, XXXXXXX, KC_F7, KC_F8,               KC_F9,   KC_F10,       KC_F10,  KC_F9,   KC_F8,               KC_F7,   XXXXXXX, KC_RGUI, KC_RSFT,
+           KC_RCTL, XXXXXXX, KC_F4, KC_F5,               KC_F6,   KC_F11,       KC_F11,  KC_F6,   KC_F5,               KC_F4,   XXXXXXX, KC_RCTL,
+           KC_LALT, XXXXXXX, KC_F1, KC_F2,               KC_F3,   KC_F12,       KC_F12,  KC_F3,   KC_F2,               KC_F1,   XXXXXXX, KC_LALT,
+                                    LT(_ADJUST, KC_DEL), _______, _______,      _______, _______, LT(_ADJUST, KC_DEL)
 ),
-[_LOWR_L] = LAYOUT_symmetric_left(
-  _______, _______, XXXXXXX, KC_7, KC_8,                KC_9,                KC_0,
-           _______, KC_GRV,  KC_4, KC_5,                KC_6,                KC_MINS,
-           _______, KC_0,    KC_1, KC_2,                KC_3,                KC_EQL,
-                                   LT(_ADJUST, KC_DEL), LT(_LOWR_R, KC_TAB), _______
+[_LOWR_L] = LAYOUT(
+  _______, _______, XXXXXXX, KC_7, KC_8,                KC_9,                KC_0,         KC_0,    KC_9,                KC_8,                KC_7,    XXXXXXX, _______, _______,
+           _______, KC_GRV,  KC_4, KC_5,                KC_6,                KC_MINS,      KC_MINS, KC_6,                KC_5,                KC_4,    KC_GRV,  _______,
+           _______, KC_0,    KC_1, KC_2,                KC_3,                KC_EQL,       KC_EQL,  KC_3,                KC_2,                KC_1,    KC_0,    _______,
+                                   LT(_ADJUST, KC_DEL), LT(_LOWR_R, KC_TAB), _______,      _______, LT(_LOWR_R, KC_TAB), LT(_ADJUST, KC_DEL)
 ),
-[_LOWR_R] = LAYOUT_symmetric_left(
- _______, _______, XXXXXXX, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-          _______, KC_TILD, KC_DLR,  KC_PERC, KC_CIRC, KC_UNDS,
-          _______, KC_LPRN, KC_EXLM, KC_AT,   KC_HASH, KC_PLUS,
-                                     _______, _______, LT(_ADJUST, KC_ESC)
+[_LOWR_R] = LAYOUT(
+ _______, _______, XXXXXXX, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,                  KC_RPRN,             KC_LPRN, KC_ASTR, KC_AMPR, XXXXXXX, _______, _______,
+          _______, KC_TILD, KC_DLR,  KC_PERC, KC_CIRC, KC_UNDS,                  KC_UNDS,             KC_CIRC, KC_PERC, KC_DLR,  KC_TILD, _______,
+          _______, KC_LPRN, KC_EXLM, KC_AT,   KC_HASH, KC_PLUS,                  KC_PLUS,             KC_HASH, KC_AT,   KC_EXLM, KC_LPRN, _______,
+                                     _______, _______, LT(_ADJUST, KC_ESC),      LT(_ADJUST, KC_ESC), _______, _______
 ),
-[_ADJUST] = LAYOUT_symmetric_left(
-  QK_BOOT, DB_TOGG, XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,
-           XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
-           XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
-                                      _______, _______, _______
+[_ADJUST] = LAYOUT(
+  QK_BOOT, DB_TOGG, XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,      RGB_HUI, RGB_HUD, RGB_VAI, BL_UP,   XXXXXXX, DB_TOGG, QK_BOOT,
+           XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,      RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+           XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,      RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, XXXXXXX,
+                                      _______, _______, _______,      _______, _______, _______
 )
 };
diff --git a/keyboards/jian/keymaps/via/config.h b/keyboards/jian/keymaps/via/config.h
index 4d9cb17cac..cae66a5c3a 100644
--- a/keyboards/jian/keymaps/via/config.h
+++ b/keyboards/jian/keymaps/via/config.h
@@ -19,4 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/jian/keymaps/via/keymap.c b/keyboards/jian/keymaps/via/keymap.c
index 3d6c7507ba..281cbc64eb 100644
--- a/keyboards/jian/keymaps/via/keymap.c
+++ b/keyboards/jian/keymaps/via/keymap.c
@@ -19,10 +19,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            _______,         KC_P0,   KC_P1,   KC_P2,   KC_P3,   KC_PCMM,      KC_VOLD, KC_END,  KC_DOWN, KC_PGDN, KC_PAUS, _______,
                                         _______, _______, LT(3, KC_ENT),      LT(3, KC_ESC), _______, _______
 ),
-[3] = LAYOUT_symmetric(
-  QK_BOOT, DB_TOGG, XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,
-           XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
-           XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
-                                      _______, SH_TOGG, _______
+[3] = LAYOUT(
+  QK_BOOT, DB_TOGG, XXXXXXX, BL_UP,   RGB_VAI, RGB_HUD, RGB_HUI,      RGB_HUI, RGB_HUD, RGB_VAI, BL_UP,   XXXXXXX, DB_TOGG, QK_BOOT,
+           XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,      RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+           XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,      RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, XXXXXXX,
+                                      _______, SH_TOGG, _______,      _______, SH_TOGG, _______
 )
 };
diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h
index 3e2fa93f31..5bd79d3ce0 100644
--- a/keyboards/jian/nsrev2/config.h
+++ b/keyboards/jian/nsrev2/config.h
@@ -17,18 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, F5, B1, B3, D1, D0, D7, E6 }
-#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 }
-
 #define PHYSICAL_LEDS_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D4
 #define RGBLIGHT_TIMER
 #define RGBLED_NUM 7    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json
index 74121b2fda..955fc517de 100644
--- a/keyboards/jian/nsrev2/info.json
+++ b/keyboards/jian/nsrev2/info.json
@@ -3,15 +3,80 @@
     "usb": {
         "device_version": "2.1.0"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "B4", "F6", "F7", "B2"],
+        "rows": ["F4", "F5", "B1", "B3", "D1", "D0", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "C6",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "D4"
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "B1",
         "esc_output": "D3"
     },
     "processor": "atmega32u4",
-    "bootloader": "qmk-dfu"
+    "bootloader": "qmk-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 0], "x": 1, "y": 0.75},
+                {"matrix": [0, 1], "x": 2, "y": 0.625},
+                {"matrix": [1, 2], "x": 3, "y": 0.25},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0.25},
+                {"matrix": [0, 4], "x": 6, "y": 0.375},
+
+                {"matrix": [4, 4], "x": 10, "y": 0.375},
+                {"matrix": [4, 3], "x": 11, "y": 0.25},
+                {"matrix": [4, 2], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0.25},
+                {"matrix": [4, 1], "x": 14, "y": 0.625},
+                {"matrix": [4, 0], "x": 15, "y": 0.75},
+                {"matrix": [6, 0], "x": 16, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 1, "y": 1.75},
+                {"matrix": [1, 1], "x": 2, "y": 1.625},
+                {"matrix": [2, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [0, 5], "x": 6, "y": 1.375},
+
+                {"matrix": [4, 5], "x": 10, "y": 1.375},
+                {"matrix": [5, 4], "x": 11, "y": 1.25},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [6, 2], "x": 13, "y": 1.25},
+                {"matrix": [5, 1], "x": 14, "y": 1.625},
+                {"matrix": [5, 0], "x": 15, "y": 1.75},
+
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [3, 2], "x": 2, "y": 2.625},
+                {"matrix": [3, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [1, 5], "x": 6, "y": 2.375},
+
+                {"matrix": [5, 5], "x": 10, "y": 2.375},
+                {"matrix": [6, 4], "x": 11, "y": 2.25},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2.25},
+                {"matrix": [7, 2], "x": 14, "y": 2.625},
+                {"matrix": [6, 1], "x": 15, "y": 2.75},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.375},
+                {"matrix": [3, 5], "x": 7, "y": 3.5},
+
+                {"matrix": [7, 5], "x": 9, "y": 3.5},
+                {"matrix": [6, 5], "x": 10, "y": 3.375},
+                {"matrix": [7, 4], "x": 11, "y": 3.25}
+            ]
+        }
+    }
 }
diff --git a/keyboards/jian/nsrev2/nsrev2.c b/keyboards/jian/nsrev2/nsrev2.c
index 48827416f1..1b65d4f016 100644
--- a/keyboards/jian/nsrev2/nsrev2.c
+++ b/keyboards/jian/nsrev2/nsrev2.c
@@ -1,4 +1,4 @@
-#include "nsrev2.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/jian/nsrev2/nsrev2.h b/keyboards/jian/nsrev2/nsrev2.h
deleted file mode 100644
index 9dfb7240b1..0000000000
--- a/keyboards/jian/nsrev2/nsrev2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include "jian.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-  L20, L00, L01, L12, L02, L03, L04,    R04, R03, R02, R12, R01, R00, R20, \
-       L10, L11, L22, L13, L14, L05,    R05, R14, R13, R22, R11, R10, \
-       L21, L32, L33, L23, L24, L15,    R15, R24, R23, R33, R32, R21, \
-                      L34, L25, L35,    R35, R25, R34 \
-) \
-{ \
-  {L00, L01, L02, L03, L04, L05 }, \
-  {L10, L11, L12, L13, L14, L15 }, \
-  {L20, L21, L22, L23, L24, L25 }, \
-  {XXX, XXX, L32, L33, L34, L35 }, \
-  {R00, R01, R02, R03, R04, R05 }, \
-  {R10, R11, R12, R13, R14, R15 }, \
-  {R20, R21, R22, R23, R24, R25 }, \
-  {XXX, XXX, R32, R33, R34, R35 }  \
-}
-
-#define LAYOUT_symmetric( \
-  K20, K00, K01, K12, K02, K03, K04, \
-       K10, K11, K22, K13, K14, K05, \
-       K21, K32, K33, K23, K24, K15, \
-                      K34, K25, K35  \
-) \
-{ \
-  {K00, K01, K02, K03, K04, K05 }, \
-  {K10, K11, K12, K13, K14, K15 }, \
-  {K20, K21, K22, K23, K24, K25 }, \
-  {XXX, XXX, K32, K33, K34, K35 }, \
-  {K00, K01, K02, K03, K04, K05 }, \
-  {K10, K11, K12, K13, K14, K15 }, \
-  {K20, K21, K22, K23, K24, K25 }, \
-  {XXX, XXX, K32, K33, K34, K35 }  \
-}
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
index 083b235a2e..11b99cc739 100644
--- a/keyboards/jian/rev1/config.h
+++ b/keyboards/jian/rev1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D3, D2, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
 #define USE_I2C
 
 /* Select hand configuration */
@@ -79,7 +72,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif // SCROLL_NMOSFET
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D4
 #define RGBLIGHT_TIMER
 #define RGBLED_NUM 7    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json
index fc65cb13b8..af1ae29d0d 100644
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/info.json
@@ -3,10 +3,75 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D3", "D2", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "D4"
+    },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.625},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.375},
+
+                {"matrix": [4, 6], "x": 10, "y": 0.375},
+                {"matrix": [4, 5], "x": 11, "y": 0.25},
+                {"matrix": [4, 4], "x": 12, "y": 0},
+                {"matrix": [4, 3], "x": 13, "y": 0.25},
+                {"matrix": [4, 2], "x": 14, "y": 0.625},
+                {"matrix": [4, 1], "x": 15, "y": 0.75},
+                {"matrix": [4, 0], "x": 16, "y": 1.5},
+
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.625},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.375},
+
+                {"matrix": [5, 6], "x": 10, "y": 1.375},
+                {"matrix": [5, 5], "x": 11, "y": 1.25},
+                {"matrix": [5, 4], "x": 12, "y": 1},
+                {"matrix": [5, 3], "x": 13, "y": 1.25},
+                {"matrix": [5, 2], "x": 14, "y": 1.625},
+                {"matrix": [5, 1], "x": 15, "y": 1.75},
+
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.625},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.375},
+
+                {"matrix": [6, 6], "x": 10, "y": 2.375},
+                {"matrix": [6, 5], "x": 11, "y": 2.25},
+                {"matrix": [6, 4], "x": 12, "y": 2},
+                {"matrix": [6, 3], "x": 13, "y": 2.25},
+                {"matrix": [6, 2], "x": 14, "y": 2.625},
+                {"matrix": [6, 1], "x": 15, "y": 2.75},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.375},
+                {"matrix": [3, 6], "x": 7, "y": 3.5},
+
+                {"matrix": [7, 6], "x": 9, "y": 3.5},
+                {"matrix": [7, 5], "x": 10, "y": 3.375},
+                {"matrix": [7, 4], "x": 11, "y": 3.25}
+            ]
+        }
+    }
 }
diff --git a/keyboards/jian/rev1/rev1.h b/keyboards/jian/rev1/rev1.h
index ee55de6287..8f42184bdf 100644
--- a/keyboards/jian/rev1/rev1.h
+++ b/keyboards/jian/rev1/rev1.h
@@ -1,43 +1,9 @@
 #pragma once
 
-#include "jian.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05, L06,    R06, R05, R04, R03, R02, R01, R00, \
-       L11, L12, L13, L14, L15, L16,    R16, R15, R14, R13, R12, R11, \
-       L21, L22, L23, L24, L25, L26,    R26, R25, R24, R23, R22, R21, \
-                      L34, L35, L36,    R36, R35, R34 \
-) \
-{ \
-  {L00, L01, L02, L03, L04, L05, L06}, \
-  {XXX, L11, L12, L13, L14, L15, L16}, \
-  {XXX, L21, L22, L23, L24, L25, L26}, \
-  {XXX, XXX, XXX, XXX, L34, L35, L36}, \
-  {R00, R01, R02, R03, R04, R05, R06}, \
-  {XXX, R11, R12, R13, R14, R15, R16}, \
-  {XXX, R21, R22, R23, R24, R25, R26}, \
-  {XXX, XXX, XXX, XXX, R34, R35, R36} \
-}
-
-#define LAYOUT_symmetric( \
-  K00, K01, K02, K03, K04, K05, K06, \
-       K11, K12, K13, K14, K15, K16, \
-       K21, K22, K23, K24, K25, K26, \
-                      K34, K35, K36 \
-) \
-{ \
-  {K00, K01, K02, K03, K04, K05, K06}, \
-  {XXX, K11, K12, K13, K14, K15, K16}, \
-  {XXX, K21, K22, K23, K24, K25, K26}, \
-  {XXX, XXX, XXX, XXX, K34, K35, K36}, \
-  {K00, K01, K02, K03, K04, K05, K06}, \
-  {XXX, K11, K12, K13, K14, K15, K16}, \
-  {XXX, K21, K22, K23, K24, K25, K26}, \
-  {XXX, XXX, XXX, XXX, K34, K35, K36} \
-}
-
 #ifdef DIPS_ENABLE
 #define LAYOUT_dips( \
   DL0, DL1, DL2, DL3, DL4, DL5, \
diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h
index 37e8f0458d..147c2cf147 100644
--- a/keyboards/jian/rev2/config.h
+++ b/keyboards/jian/rev2/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, F5, B1, B3 }
-#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 }
-
 //#define EE_HANDS
 #define SPLIT_HAND_PIN E6
 
@@ -31,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IOS_DEVICE_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D4
 #define RGBLIGHT_TIMER
 #define RGBLED_NUM 7    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json
index 642bf83efc..7fecaed1f0 100644
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/info.json
@@ -3,10 +3,18 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "B4", "F6", "F7", "B2"],
+        "rows": ["F4", "F5", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "C6",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "D4"
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "B1",
         "esc_output": "D3"
@@ -15,5 +23,62 @@
         "soft_serial_pin": "D1"
     },
     "processor": "atmega32u4",
-    "bootloader": "qmk-dfu"
+    "bootloader": "qmk-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 0], "x": 1, "y": 0.75},
+                {"matrix": [0, 1], "x": 2, "y": 0.625},
+                {"matrix": [1, 2], "x": 3, "y": 0.25},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0.25},
+                {"matrix": [0, 4], "x": 6, "y": 0.375},
+
+                {"matrix": [4, 4], "x": 10, "y": 0.375},
+                {"matrix": [4, 3], "x": 11, "y": 0.25},
+                {"matrix": [4, 2], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0.25},
+                {"matrix": [4, 1], "x": 14, "y": 0.625},
+                {"matrix": [4, 0], "x": 15, "y": 0.75},
+                {"matrix": [6, 0], "x": 16, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 1, "y": 1.75},
+                {"matrix": [1, 1], "x": 2, "y": 1.625},
+                {"matrix": [2, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [0, 5], "x": 6, "y": 1.375},
+
+                {"matrix": [4, 5], "x": 10, "y": 1.375},
+                {"matrix": [5, 4], "x": 11, "y": 1.25},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [6, 2], "x": 13, "y": 1.25},
+                {"matrix": [5, 1], "x": 14, "y": 1.625},
+                {"matrix": [5, 0], "x": 15, "y": 1.75},
+
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [3, 2], "x": 2, "y": 2.625},
+                {"matrix": [3, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [1, 5], "x": 6, "y": 2.375},
+
+                {"matrix": [5, 5], "x": 10, "y": 2.375},
+                {"matrix": [6, 4], "x": 11, "y": 2.25},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2.25},
+                {"matrix": [7, 2], "x": 14, "y": 2.625},
+                {"matrix": [6, 1], "x": 15, "y": 2.75},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.375},
+                {"matrix": [3, 5], "x": 7, "y": 3.5},
+
+                {"matrix": [7, 5], "x": 9, "y": 3.5},
+                {"matrix": [6, 5], "x": 10, "y": 3.375},
+                {"matrix": [7, 4], "x": 11, "y": 3.25}
+            ]
+        }
+    }
 }
diff --git a/keyboards/jian/rev2/rev2.c b/keyboards/jian/rev2/rev2.c
index b18676af38..1b65d4f016 100644
--- a/keyboards/jian/rev2/rev2.c
+++ b/keyboards/jian/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "rev2.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/jian/rev2/rev2.h b/keyboards/jian/rev2/rev2.h
deleted file mode 100644
index d71fc8495d..0000000000
--- a/keyboards/jian/rev2/rev2.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "jian.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-  L20, L00, L01, L12, L02, L03, L04,    R04, R03, R02, R12, R01, R00, R20, \
-       L10, L11, L22, L13, L14, L05,    R05, R14, R13, R22, R11, R10, \
-       L21, L32, L33, L23, L24, L15,    R15, R24, R23, R33, R32, R21, \
-                      L34, L25, L35,    R35, R25, R34 \
-) \
-{ \
-  {L00, L01, L02, L03, L04, L05 }, \
-  {L10, L11, L12, L13, L14, L15 }, \
-  {L20, L21, L22, L23, L24, L25 }, \
-  {XXX, XXX, L32, L33, L34, L35 }, \
-  {R00, R01, R02, R03, R04, R05 }, \
-  {R10, R11, R12, R13, R14, R15 }, \
-  {R20, R21, R22, R23, R24, R25 }, \
-  {XXX, XXX, R32, R33, R34, R35 }  \
-}
-
-#define LAYOUT_symmetric( \
-  K20, K00, K01, K12, K02, K03, K04, \
-       K10, K11, K22, K13, K14, K05, \
-       K21, K32, K33, K23, K24, K15, \
-                      K34, K25, K35  \
-) \
-{ \
-  {K00, K01, K02, K03, K04, K05 }, \
-  {K10, K11, K12, K13, K14, K15 }, \
-  {K20, K21, K22, K23, K24, K25 }, \
-  {XXX, XXX, K32, K33, K34, K35 }, \
-  {K00, K01, K02, K03, K04, K05 }, \
-  {K10, K11, K12, K13, K14, K15 }, \
-  {K20, K21, K22, K23, K24, K25 }, \
-  {XXX, XXX, K32, K33, K34, K35 }  \
-}
-
-#define LAYOUT_symmetric_left LAYOUT_symmetric
-
-#define LAYOUT_symmetric_right( \
-  K04, K03, K02, K12, K01, K00, K20, \
-  K05, K14, K13, K22, K11, K10, \
-  K15, K24, K23, K33, K32, K21, \
-  K35, K25, K34  \
-) \
-{ \
-  {K00, K01, K02, K03, K04, K05 }, \
-  {K10, K11, K12, K13, K14, K15 }, \
-  {K20, K21, K22, K23, K24, K25 }, \
-  {XXX, XXX, K32, K33, K34, K35 }, \
-  {K00, K01, K02, K03, K04, K05 }, \
-  {K10, K11, K12, K13, K14, K15 }, \
-  {K20, K21, K22, K23, K24, K25 }, \
-  {XXX, XXX, K32, K33, K34, K35 }  \
-}
diff --git a/keyboards/jiran/config.h b/keyboards/jiran/config.h
index 39ed4bb0c7..16a45b256b 100644
--- a/keyboards/jiran/config.h
+++ b/keyboards/jiran/config.h
@@ -17,13 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { B4, B5, F4, F5, F6 }
-#define MATRIX_COL_PINS { D3, D2, D4, C6, D7, E6 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define MASTER_LEFT
diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json
index 9f04243278..de64ba20a0 100644
--- a/keyboards/jiran/info.json
+++ b/keyboards/jiran/info.json
@@ -8,6 +8,11 @@
          "pid": "0x3735",
          "device_version": "3.0.0"
      },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D4", "C6", "D7", "E6"],
+        "rows": ["B4", "B5", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
      "split": {
         "soft_serial_pin": "D1"
      },
@@ -16,62 +21,71 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-            {"label":"Esc", "x":1, "y":0.88},
-            {"label":"1", "x":2, "y":0.75},
-            {"label":"2", "x":3, "y":0.38},
-            {"label":"3", "x":4, "y":0.13},
-            {"label":"4", "x":5, "y":0.38},
-            {"label":"5", "x":6, "y":0.5},
-            {"label":"6", "x":11.75, "y":0.5},
-            {"label":"7", "x":12.75, "y":0.38},
-            {"label":"8", "x":13.75, "y":0.13},
-            {"label":"9", "x":14.75, "y":0.38},
-            {"label":"0", "x":15.75, "y":0.75},
-            {"label":"_", "x":16.75, "y":0.88},
-            {"label":"Win", "x":0, "y":2.63},
-            {"label":"Tab", "x":1, "y":1.88},
-            {"label":"Q", "x":2, "y":1.75},
-            {"label":"W", "x":3, "y":1.38},
-            {"label":"E", "x":4, "y":1.13},
-            {"label":"R", "x":5, "y":1.38},
-            {"label":"T", "x":6, "y":1.5},
-            {"label":"Y", "x":11.75, "y":1.5},
-            {"label":"U", "x":12.75, "y":1.38},
-            {"label":"I", "x":13.75, "y":1.13},
-            {"label":"O", "x":14.75, "y":1.38},
-            {"label":"P", "x":15.75, "y":1.75},
-            {"label":"{", "x":16.75, "y":1.88},
-            {"label":"}", "x":17.75, "y":2.63},
-            {"label":"Shift", "x":1, "y":2.88},
-            {"label":"A", "x":2, "y":2.75},
-            {"label":"S", "x":3, "y":2.38},
-            {"label":"D", "x":4, "y":2.13},
-            {"label":"F", "x":5, "y":2.38},
-            {"label":"G", "x":6, "y":2.5},
-            {"label":"H", "x":11.75, "y":2.5},
-            {"label":"J", "x":12.75, "y":2.38},
-            {"label":"K", "x":13.75, "y":2.13},
-            {"label":"L", "x":14.75, "y":2.38},
-            {"label":":", "x":15.75, "y":2.75},
-            {"label":"\"", "x":16.75, "y":2.88},
-            {"label":"Ctrl", "x":1, "y":3.88},
-            {"label":"Z", "x":2, "y":3.75},
-            {"label":"X", "x":3, "y":3.38},
-            {"label":"C", "x":4, "y":3.13},
-            {"label":"V", "x":5, "y":3.38},
-            {"label":"B", "x":6, "y":3.5},
-            {"label":"N", "x":11.75, "y":3.5},
-            {"label":"M", "x":12.75, "y":3.38},
-            {"label":"<", "x":13.75, "y":3.13},
-            {"label":">", "x":14.75, "y":3.38},
-            {"label":"?", "x":15.75, "y":3.75},
-            {"label":"|", "x":16.75, "y":3.88},
-            {"label":"Fn", "x":5, "y":4.38},
-            {"label":"Space", "x":6, "y":4.5},
-            {"label":"Alt", "x":7, "y":4.63},
-            {"label":"Enter", "x":10.75, "y":4.63},
-            {"label":"Back", "x":11.75, "y":4.5},
-            {"label":"Fn", "x":12.75, "y":4.38}
+                {"x":1, "y":0.75},
+                {"x":2, "y":0.62},
+                {"x":3, "y":0.25},
+                {"x":4, "y":0},
+                {"x":5, "y":0.25},
+                {"x":6, "y":0.37},
+
+                {"x":11.75, "y":0.37},
+                {"x":12.75, "y":0.25},
+                {"x":13.75, "y":0},
+                {"x":14.75, "y":0.25},
+                {"x":15.75, "y":0.62},
+                {"x":16.75, "y":0.75},
+
+                {"x":0, "y":2.5},
+                {"x":1, "y":1.75},
+                {"x":2, "y":1.62},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.37},
+
+                {"x":11.75, "y":1.37},
+                {"x":12.75, "y":1.25},
+                {"x":13.75, "y":1},
+                {"x":14.75, "y":1.25},
+                {"x":15.75, "y":1.62},
+                {"x":16.75, "y":1.75},
+                {"x":17.75, "y":2.5},
+
+                {"x":1, "y":2.75},
+                {"x":2, "y":2.62},
+                {"x":3, "y":2.25},
+                {"x":4, "y":2},
+                {"x":5, "y":2.25},
+                {"x":6, "y":2.37},
+
+                {"x":11.75, "y":2.37},
+                {"x":12.75, "y":2.25},
+                {"x":13.75, "y":2},
+                {"x":14.75, "y":2.25},
+                {"x":15.75, "y":2.62},
+                {"x":16.75, "y":2.75},
+
+                {"x":1, "y":3.75},
+                {"x":2, "y":3.62},
+                {"x":3, "y":3.25},
+                {"x":4, "y":3},
+                {"x":5, "y":3.25},
+                {"x":6, "y":3.37},
+
+                {"x":11.75, "y":3.37},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":3},
+                {"x":14.75, "y":3.25},
+                {"x":15.75, "y":3.62},
+                {"x":16.75, "y":3.75},
+
+                {"x":5, "y":4.25},
+                {"x":6, "y":4.37},
+                {"x":7, "y":4.5},
+
+                {"x":10.75, "y":4.5},
+                {"x":11.75, "y":4.37},
+                {"x":12.75, "y":4.25}
             ]
         }
     }
diff --git a/keyboards/jiran/jiran.c b/keyboards/jiran/jiran.c
deleted file mode 100644
index 71a8504c5b..0000000000
--- a/keyboards/jiran/jiran.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jiran.h"
diff --git a/keyboards/jiran/jiran.h b/keyboards/jiran/jiran.h
deleted file mode 100644
index c8ae32b135..0000000000
--- a/keyboards/jiran/jiran.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_jiran_rev1
-  #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_jiran_rev2
-#include "rev2.h"
-#endif
diff --git a/keyboards/jiran/rev1/rev1.c b/keyboards/jiran/rev1/rev1.c
deleted file mode 100644
index 9aedcc130a..0000000000
--- a/keyboards/jiran/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
\ No newline at end of file
diff --git a/keyboards/jiran/rev1/rev1.h b/keyboards/jiran/rev1/rev1.h
index 6d5ea99dac..d243bd366b 100644
--- a/keyboards/jiran/rev1/rev1.h
+++ b/keyboards/jiran/rev1/rev1.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "jiran.h"
 #include "quantum.h"
 
 
diff --git a/keyboards/jiran/rev2/config.h b/keyboards/jiran/rev2/config.h
index 0dd0f63195..d810f3e395 100644
--- a/keyboards/jiran/rev2/config.h
+++ b/keyboards/jiran/rev2/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN B6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/jiran/rev2/info.json b/keyboards/jiran/rev2/info.json
new file mode 100644
index 0000000000..fd406420c6
--- /dev/null
+++ b/keyboards/jiran/rev2/info.json
@@ -0,0 +1,5 @@
+{
+   "ws2812": {
+       "pin": "B6"
+   }
+}
diff --git a/keyboards/jiran/rev2/rev2.c b/keyboards/jiran/rev2/rev2.c
deleted file mode 100644
index b1af81707d..0000000000
--- a/keyboards/jiran/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev2.h"
diff --git a/keyboards/jiran/rev2/rev2.h b/keyboards/jiran/rev2/rev2.h
index 616497b3ca..01ffe1a48e 100644
--- a/keyboards/jiran/rev2/rev2.h
+++ b/keyboards/jiran/rev2/rev2.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "jiran.h"
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/jkdlab/binary_monkey/binary_monkey.c b/keyboards/jkdlab/binary_monkey/binary_monkey.c
deleted file mode 100644
index bdbcac18ee..0000000000
--- a/keyboards/jkdlab/binary_monkey/binary_monkey.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2021 JKDLAB. <jkdlab.co@gmail.com>
- * Copyright 2021 Jaehee <ljh34210329@gmail.com>
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see https://www.gnu.org/licenses/.
- */
- 
-#include "binary_monkey.h"
diff --git a/keyboards/jkdlab/binary_monkey/binary_monkey.h b/keyboards/jkdlab/binary_monkey/binary_monkey.h
deleted file mode 100644
index 598886b781..0000000000
--- a/keyboards/jkdlab/binary_monkey/binary_monkey.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2021 JKDLAB. <jkdlab.co@gmail.com>
- * Copyright 2021 Jaehee <ljh34210329@gmail.com>
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see https://www.gnu.org/licenses/.
- */
- 
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, \
-       K10 \
-) { \
-    { K10, K00, K01 } \
-}
diff --git a/keyboards/jkdlab/binary_monkey/config.h b/keyboards/jkdlab/binary_monkey/config.h
index 4967594b55..3b83277d42 100644
--- a/keyboards/jkdlab/binary_monkey/config.h
+++ b/keyboards/jkdlab/binary_monkey/config.h
@@ -18,10 +18,4 @@
  
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D0 }
-#define MATRIX_COL_PINS { D1, D2, D3 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/info.json
index c5422097ab..43ba146854 100644
--- a/keyboards/jkdlab/binary_monkey/info.json
+++ b/keyboards/jkdlab/binary_monkey/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0101",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3"],
+        "rows": ["D0"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [0, 2]
     },
@@ -16,9 +21,10 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "0", "x": 0, "y": 0},
-                {"label": "1", "x": 1, "y": 0},
-                {"label": "ENTER", "x": 0, "y": 1, "w" : 2}
+                {"matrix": [0, 1], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1, "w": 2}
             ]
         }
     }
diff --git a/keyboards/jkeys_design/gentleman65/config.h b/keyboards/jkeys_design/gentleman65/config.h
index f8280340e8..1b66b1bb25 100644
--- a/keyboards/jkeys_design/gentleman65/config.h
+++ b/keyboards/jkeys_design/gentleman65/config.h
@@ -18,15 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, D1, F7, F1 }
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, D5, C7, F0, B2, B1, B3, B0, B7, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
 #define RGBLED_NUM 14
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/jkeys_design/gentleman65/gentleman65.c b/keyboards/jkeys_design/gentleman65/gentleman65.c
index 9e9baa011e..8d2af0e150 100644
--- a/keyboards/jkeys_design/gentleman65/gentleman65.c
+++ b/keyboards/jkeys_design/gentleman65/gentleman65.c
@@ -16,15 +16,3 @@
  */
 
 #include "gentleman65.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code_delay(KC_AUDIO_VOL_UP, 10);
-        } else {
-            tap_code_delay(KC_AUDIO_VOL_DOWN, 10);
-        }
-    }
-    return true;
-}
\ No newline at end of file
diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json
index fff5b9b752..5c14817597 100644
--- a/keyboards/jkeys_design/gentleman65/info.json
+++ b/keyboards/jkeys_design/gentleman65/info.json
@@ -8,6 +8,17 @@
         "pid": "0x2020",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "B2", "B1", "B3", "B0", "B7", "D0"],
+        "rows": ["D3", "D2", "D1", "F7", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F6", "pin_b": "F5"}
diff --git a/keyboards/jkeys_design/gentleman65/rules.mk b/keyboards/jkeys_design/gentleman65/rules.mk
index cb8a7d75f1..f81996d702 100644
--- a/keyboards/jkeys_design/gentleman65/rules.mk
+++ b/keyboards/jkeys_design/gentleman65/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h
index c80b64ef10..1b66b1bb25 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/config.h
+++ b/keyboards/jkeys_design/gentleman65_se_s/config.h
@@ -18,15 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, B7, B2, B3, D4, D6, D7, C7, C6, B6, B5, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 14
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.c b/keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.c
index 1b6133cf2a..2649707215 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.c
+++ b/keyboards/jkeys_design/gentleman65_se_s/gentleman65_se_s.c
@@ -16,17 +16,3 @@
  */
 
 #include "gentleman65_se_s.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code_delay(KC_AUDIO_VOL_UP, 10);
-        } else {
-            tap_code_delay(KC_AUDIO_VOL_DOWN, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json
index 2415eb5c18..cb993de950 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/info.json
+++ b/keyboards/jkeys_design/gentleman65_se_s/info.json
@@ -8,6 +8,17 @@
         "pid": "0x2322",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "D4", "D6", "D7", "C7", "C6", "B6", "B5", "B4"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "B1"}
diff --git a/keyboards/jkeys_design/gentleman65_se_s/rules.mk b/keyboards/jkeys_design/gentleman65_se_s/rules.mk
index cb8a7d75f1..f81996d702 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/rules.mk
+++ b/keyboards/jkeys_design/gentleman65_se_s/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/jm60/config.h b/keyboards/jm60/config.h
index ca28364f72..4b007cf387 100644
--- a/keyboards/jm60/config.h
+++ b/keyboards/jm60/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B11, B10, B2, B1, B0 }
-#define MATRIX_COL_PINS { A15, C10, C11, C12, D2, B3, B4, B5, B6, B7, B8, B9, A2, A3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/jm60/info.json b/keyboards/jm60/info.json
index 1dbb4c31d9..a39bf9b4b4 100644
--- a/keyboards/jm60/info.json
+++ b/keyboards/jm60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6464",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A15", "C10", "C11", "C12", "D2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A2", "A3"],
+        "rows": ["B11", "B10", "B2", "B1", "B0"]
+    },
+    "diode_direction": "ROW2COL",
     "community_layouts": ["60_ansi"],
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/jolofsor/denial75/config.h b/keyboards/jolofsor/denial75/config.h
index abca51f3fa..02f94c8bd5 100644
--- a/keyboards/jolofsor/denial75/config.h
+++ b/keyboards/jolofsor/denial75/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { F7, C7, C6, B5, B4, D7, D6, D4, E6, B1, B2, B3, B7, D0, D1, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -32,7 +25,6 @@
 
 /* RGB Definitions */
 
-#define RGB_DI_PIN D2
 #define RGBLED_NUM 84
 #define RGBLIGHT_MAX_LAYERS 32
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json
index 5bf9c1eda2..c0381a5f84 100644
--- a/keyboards/jolofsor/denial75/info.json
+++ b/keyboards/jolofsor/denial75/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "C7", "C6", "B5", "B4", "D7", "D6", "D4", "E6", "B1", "B2", "B3", "B7", "D0", "D1", "D3"],
+        "rows": ["B0", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "on_state": 0
diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h
index fc1ae1ff77..9b93ea9e3c 100644
--- a/keyboards/jones/v03/config.h
+++ b/keyboards/jones/v03/config.h
@@ -48,8 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define AUDIO_CLICKY
 #endif
 
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 6 // Left(4) + Right(2)
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -69,7 +67,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // #define RGBLIGHT_EFFECT_STATIC_GRADIENT
   // #define RGBLIGHT_EFFECT_RGB_TEST
   // #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json
index 388c0fb9ef..ca87554f1f 100644
--- a/keyboards/jones/v03/info.json
+++ b/keyboards/jones/v03/info.json
@@ -14,6 +14,9 @@
       {"pin_a": "B3", "pin_b": "B2"}
     ]
   },
+  "ws2812": {
+    "pin": "B7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/jones/v03/v03.c b/keyboards/jones/v03/v03.c
deleted file mode 100644
index 9bc63fe961..0000000000
--- a/keyboards/jones/v03/v03.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Takeshi Nishio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v03.h"
diff --git a/keyboards/jones/v03/v03.h b/keyboards/jones/v03/v03.h
index 6584f6cbc2..38f894c5dd 100644
--- a/keyboards/jones/v03/v03.h
+++ b/keyboards/jones/v03/v03.h
@@ -43,14 +43,14 @@ FULL 11x11 ROUND-ROBIN MATRIX for Reference
  */
 #define LAYOUT_all( \
     k17, k27, k37, k47, k57, k67, k76, k86, k96, ka6, kb6, k81, k91, ka1, kb1, \
-    k18,   k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, K92,    ka2, kb2, \
+    k18,   k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, k92,    ka2, kb2, \
     k19,   k39, k49, k59, k69, k79, k89, k98, ka8, kb8, k83, k93,    ka3, kb3, \
     k1a,      k3a, k4a, k5a, k6a, k7a, k8a, k9a, ka9, kb9, k84, k94, ka4, kb4, \
     k1b, k2b, k3b, k4b,      k6b,      k8b,      k9b, kab, k85, k95, ka5, kb5  \
 ) \
 { \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k81,   k91,   ka1,   kb1 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82,   KC_NO, ka2,   kb2 }, \
+    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82,   k92,   ka2,   kb2 }, \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k83,   k93,   ka3,   kb3 }, \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k84,   k94,   ka4,   kb4 }, \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k85,   k95,   ka5,   kb5 }, \
diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h
index 548b98e675..f7183265d8 100644
--- a/keyboards/jones/v03_1/config.h
+++ b/keyboards/jones/v03_1/config.h
@@ -48,8 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define AUDIO_CLICKY
 #endif
 
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 14 // Left(4) + Right(2) + Under(8)
   #define RGBLIGHT_LED_MAP {0,1,2,3,13,12,4,5,6,7,8,9,10,11} // Left --> Right --> Under
   #define RGBLIGHT_HUE_STEP 8
@@ -70,7 +68,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // #define RGBLIGHT_EFFECT_STATIC_GRADIENT
   // #define RGBLIGHT_EFFECT_RGB_TEST
   // #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json
index 45e7b8022f..96b10e8ac1 100644
--- a/keyboards/jones/v03_1/info.json
+++ b/keyboards/jones/v03_1/info.json
@@ -14,6 +14,9 @@
       {"pin_a": "B3", "pin_b": "B2"}
     ]
   },
+  "ws2812": {
+    "pin": "F0"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h
index 1936d5d256..92801acea7 100644
--- a/keyboards/jones/v1/config.h
+++ b/keyboards/jones/v1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// Same pins for Round-Robin matrix.
-#define MATRIX_ROW_PINS { B3, B2, E6, D6, D4, B0, B1, B7, B4, D7 }
-#define MATRIX_COL_PINS { B3, B2, E6, D6, D4, B0, B1, B7, B4, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Audio */
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN C6
@@ -32,8 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 /* RGBLIGHT */
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 4 // Left(2) + Right(2)
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -42,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   /*== Lighting Layers ==*/
   #define RGBLIGHT_LAYERS
   #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
-#endif
 
 /* External EEPROM */
 // Use 24LC64 EEPROM
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json
index 37f0b70087..be2d9e64c9 100644
--- a/keyboards/jones/v1/info.json
+++ b/keyboards/jones/v1/info.json
@@ -8,6 +8,14 @@
     "pid": "0x175A",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"],
+    "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"]
+  },
+  "ws2812": {
+    "pin": "F1"
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "F5", "pin_b": "F4"},
diff --git a/keyboards/jones/v1/keymaps/via/keymap.c b/keyboards/jones/v1/keymaps/via/keymap.c
index 31a182733a..3b41c40174 100644
--- a/keyboards/jones/v1/keymaps/via/keymap.c
+++ b/keyboards/jones/v1/keymaps/via/keymap.c
@@ -178,7 +178,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -190,7 +191,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
@@ -212,7 +214,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 //------------------------------------------------------------------------------
 void keyboard_post_init_user(void) {
 debug_enable=true;
-#ifdef RGB_DI_PIN
   #ifdef RGBLIGHT_LAYERS
     // Enable the LED layers.
     rgblight_layers = my_rgb_layers;
@@ -220,6 +221,5 @@ debug_enable=true;
     // prevent RGB light overrides layer indicator.
     layer_state_set(default_layer_state);
   #endif
-#endif
 
 }
diff --git a/keyboards/jorne/jorne.c b/keyboards/jorne/jorne.c
index fec24d476c..d00fc2f8fc 100644
--- a/keyboards/jorne/jorne.c
+++ b/keyboards/jorne/jorne.c
@@ -1,6 +1,6 @@
 // Copyright 2021 Joric (@joric)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include "jorne.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 static void render_logo(void) {
diff --git a/keyboards/jorne/jorne.h b/keyboards/jorne/jorne.h
deleted file mode 100644
index 7c2478c563..0000000000
--- a/keyboards/jorne/jorne.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Joric (@joric)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#ifdef KEYBOARD_jorne_rev1
-#    include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h
index 7e0ef17113..73e2d8219b 100644
--- a/keyboards/jorne/rev1/config.h
+++ b/keyboards/jorne/rev1/config.h
@@ -2,13 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
 #define RGBLED_SPLIT { 28, 28 }
 #define RGBLED_NUM 56
 
diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json
index 85df8cc709..7076f980cf 100644
--- a/keyboards/jorne/rev1/info.json
+++ b/keyboards/jorne/rev1/info.json
@@ -8,243 +8,73 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "label": "GUI",
-                    "x": 0,
-                    "y": 2.13
-                },
-                {
-                    "label": "~",
-                    "x": 1,
-                    "y": 1.38
-                },
-                {
-                    "label": "Q",
-                    "x": 2,
-                    "y": 1.38
-                },
-                {
-                    "label": "W",
-                    "x": 3,
-                    "y": 1.13
-                },
-                {
-                    "label": "E",
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 5,
-                    "y": 1.13
-                },
-                {
-                    "label": "T",
-                    "x": 6,
-                    "y": 1.25
-                },
+                {"x": 0, "y": 1.125},
+                {"x": 1, "y": 0.375},
+                {"x": 2, "y": 0.375},
+                {"x": 3, "y": 0.125},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0.125},
+                {"x": 6, "y": 0.25},
+
+                {"x": 10.5, "y": 0.25},
+                {"x": 11.5, "y": 0.125},
+                {"x": 12.5, "y": 0},
+                {"x": 13.5, "y": 0.125},
+                {"x": 14.5, "y": 0.375},
+                {"x": 15.5, "y": 0.375},
+                {"x": 16.5, "y": 1.125},
 
-                {
-                    "label": "Y",
-                    "x": 10.5,
-                    "y": 1.25
-                },
-                {
-                    "label": "U",
-                    "x": 11.5,
-                    "y": 1.125
-                },
-                {
-                    "label": "I",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 13.5,
-                    "y": 1.125
-                },
-                {
-                    "label": "P",
-                    "x": 14.5,
-                    "y": 1.375
-                },
-                {
-                    "label": "{[",
-                    "x": 15.5,
-                    "y": 1.375
-                },
-                {
-                    "label": "}]",
-                    "x": 16.5,
-                    "y": 2.13
-                },
+                {"x": 1, "y": 1.375},
+                {"x": 2, "y": 1.375},
+                {"x": 3, "y": 1.125},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1.125},
+                {"x": 6, "y": 1.25},
 
-                {
-                    "label": "Ctrl",
-                    "x": 1,
-                    "y": 2.38
-                },
-                {
-                    "label": "A",
-                    "x": 2,
-                    "y": 2.38
-                },
-                {
-                    "label": "S",
-                    "x": 3,
-                    "y": 2.13
-                },
-                {
-                    "label": "D",
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 5,
-                    "y": 2.13
-                },
-                {
-                    "label": "G",
-                    "x": 6,
-                    "y": 2.25
-                },
+                {"x": 10.5, "y": 1.25},
+                {"x": 11.5, "y": 1.125},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1.125},
+                {"x": 14.5, "y": 1.375},
+                {"x": 15.5, "y": 1.375},
 
-                {
-                    "label": "H",
-                    "x": 10.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "J",
-                    "x": 11.5,
-                    "y": 2.13
-                },
-                {
-                    "label": "K",
-                    "x": 12.5,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 13.5,
-                    "y": 2.125
-                },
-                {
-                    "label": ":;",
-                    "x": 14.5,
-                    "y": 2.375
-                },                
-                {
-                    "label": "\"'",
-                    "x": 15.5,
-                    "y": 2.375
-                },
-                
-                {
-                    "label": "Alt",
-                    "x": 1,
-                    "y": 3.38
-                },
-                {
-                    "label": "Z",
-                    "x": 2,
-                    "y": 3.38
-                },
-                {
-                    "label": "X",
-                    "x": 3,
-                    "y": 3.13
-                },
-                {
-                    "label": "C",
-                    "x": 4,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5,
-                    "y": 3.13
-                },
-                {
-                    "label": "B",
-                    "x": 6,
-                    "y": 3.25
-                },
+                {"x": 1, "y": 2.375},
+                {"x": 2, "y": 2.375},
+                {"x": 3, "y": 2.125},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2.125},
+                {"x": 6, "y": 2.25},
 
-                {
-                    "label": "N",
-                    "x": 10.5,
-                    "y": 3.25
-                },
-                {
-                    "label": "M",
-                    "x": 11.5,
-                    "y": 3.13
-                },
-                {
-                    "label": "<,",
-                    "x": 12.5,
-                    "y": 3
-                },
-                {
-                    "label": ">.",
-                    "x": 13.5,
-                    "y": 3.13
-                },
-                {
-                    "label": "?/",
-                    "x": 14.5,
-                    "y": 3.38
-                },
-                {
-                    "label": "|\\",
-                    "x": 15.5,
-                    "y": 3.38
-                },
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.125},
+                {"x": 12.5, "y": 2},
+                {"x": 13.5, "y": 2.125},
+                {"x": 14.5, "y": 2.375},
+                {"x": 15.5, "y": 2.375},
 
-                {
-                    "label": "Rise",
-                    "x": 5,
-                    "y": 5
-                },
-                {
-                    "label": "Space",
-                    "x": 6,
-                    "y": 5
-                },
-                {
-                    "label": "Lower",
-                    "x": 7,
-                    "y": 4.5,
-                    "h": 1.5
-                },
+                {"x": 5, "y": 4},
+                {"x": 6, "y": 4},
+                {"x": 7, "y": 3.5, "h": 1.5},
 
-                {
-                    "label": "Lower",
-                    "x": 9.5,
-                    "y": 4.5,
-                    "h": 1.5
-                },
-                {
-                    "label": "Bcs",
-                    "x": 10.5,
-                    "y": 5
-                },
-                {
-                    "label": "Rise",
-                    "x": 11.5,
-                    "y": 5
-                }
+                {"x": 9.5, "y": 3.5, "h": 1.5},
+                {"x": 10.5, "y": 4},
+                {"x": 11.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/jorne/rev1/rev1.c b/keyboards/jorne/rev1/rev1.c
deleted file mode 100644
index f120ef87f8..0000000000
--- a/keyboards/jorne/rev1/rev1.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2021 Joric (@joric)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "rev1.h"
diff --git a/keyboards/jorne/rev1/rev1.h b/keyboards/jorne/rev1/rev1.h
index af4ef8e3b3..0158032e5e 100644
--- a/keyboards/jorne/rev1/rev1.h
+++ b/keyboards/jorne/rev1/rev1.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "jorne.h"
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *
diff --git a/keyboards/junco/info.json b/keyboards/junco/info.json
index 72e0d5c92a..fb5c391d6a 100644
--- a/keyboards/junco/info.json
+++ b/keyboards/junco/info.json
@@ -8,6 +8,13 @@
         "pid": "0x4A13",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "GP15",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040",
     "layouts": {
diff --git a/keyboards/junco/rev1/config.h b/keyboards/junco/rev1/config.h
index d9c0556cdf..95731fde01 100644
--- a/keyboards/junco/rev1/config.h
+++ b/keyboards/junco/rev1/config.h
@@ -19,7 +19,6 @@
 /* RGB Stuff */
 #ifdef RGB_MATRIX_ENABLE
 
-#    define RGB_DI_PIN GP15 // Pin for RGB logic
 #    define RGB_MATRIX_LED_COUNT 74
 #    define RGB_MATRIX_SPLIT \
         { 37, 37 } // 37 LEDs on each side
diff --git a/keyboards/junco/rev1/rules.mk b/keyboards/junco/rev1/rules.mk
index feb836dbe1..e69de29bb2 100644
--- a/keyboards/junco/rev1/rules.mk
+++ b/keyboards/junco/rev1/rules.mk
@@ -1,3 +0,0 @@
-# RGB Stuff
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = vendor
diff --git a/keyboards/k34/config.h b/keyboards/k34/config.h
deleted file mode 100644
index 0a7bded944..0000000000
--- a/keyboards/k34/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2021 jp_smasher (@jp_smasher)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, B2, E6, B4 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, F5, F6, F7, B1, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/k34/info.json b/keyboards/k34/info.json
index d6e1ee19aa..a7553afc4b 100644
--- a/keyboards/k34/info.json
+++ b/keyboards/k34/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["F4", "B2", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/k34/k34.c b/keyboards/k34/k34.c
deleted file mode 100644
index 0dffa61ffd..0000000000
--- a/keyboards/k34/k34.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 jp_smasher (@jp_smasher)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "k34.h"
diff --git a/keyboards/k34/keymaps/default/config.h b/keyboards/k34/keymaps/default/config.h
index 803471e550..c86bbebdc7 100644
--- a/keyboards/k34/keymaps/default/config.h
+++ b/keyboards/k34/keymaps/default/config.h
@@ -20,5 +20,4 @@
 
 // mod taps for home row mods
 #define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
 
diff --git a/keyboards/kabedon/kabedon78s/config.h b/keyboards/kabedon/kabedon78s/config.h
index bd6afd6e53..37a897c479 100644
--- a/keyboards/kabedon/kabedon78s/config.h
+++ b/keyboards/kabedon/kabedon78s/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS {D0,D2,F7,B1,B0,D6}
-#define MATRIX_COL_PINS {F5,F4,F6,C6,B6,B4,D3,D1,D4,F1,B3,D5,F0,C7,D7,B5,B2,E6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 20
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -42,4 +32,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json
index 7ca4605cef..3d99357320 100644
--- a/keyboards/kabedon/kabedon78s/info.json
+++ b/keyboards/kabedon/kabedon78s/info.json
@@ -8,6 +8,14 @@
     	"pid": "0x3738",
     	"device_version": "0.0.1"
     },
+    "ws2812": {
+    	"pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "F6", "C6", "B6", "B4", "D3", "D1", "D4", "F1", "B3", "D5", "F0", "C7", "D7", "B5", "B2", "E6"],
+        "rows": ["D0", "D2", "F7", "B1", "B0", "D6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kabedon/kabedon78s/kabedon78s.c b/keyboards/kabedon/kabedon78s/kabedon78s.c
deleted file mode 100644
index dc60ea752e..0000000000
--- a/keyboards/kabedon/kabedon78s/kabedon78s.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-  
-#include "kabedon78s.h"
diff --git a/keyboards/kabedon/kabedon78s/kabedon78s.h b/keyboards/kabedon/kabedon78s/kabedon78s.h
index 72752920b7..64709a9bf4 100644
--- a/keyboards/kabedon/kabedon78s/kabedon78s.h
+++ b/keyboards/kabedon/kabedon78s/kabedon78s.h
@@ -10,7 +10,7 @@
         KE06,   KE00, KE01, KE02, KE03, KE04, KE05,         KE07, KE08, KE09, KE10, KE11, KE12, KE13,         KE14, KE15, KE16, KE17, \
         KF06,   KF00, KF01, KF02, KF03,    KF04,               KF08,    KF09, KF10, KF11, KF12, KF13,            KF14,   KF16        \
 ) { \
-  { KA00, KA01, KA02, KA03, KA04, KA05,KC_NO, KA07, KA08, KA09, KA10, KA11, KA12, KB13, KA14, KA15, KA16, KA17}, \
+  { KA00, KA01, KA02, KA03, KA04, KA05,KC_NO, KA07, KA08, KA09, KA10, KA11, KA12, KA13, KA14, KA15, KA16, KA17}, \
   { KB00, KB01, KB02, KB03, KB04, KB05, KB06, KB07, KB08, KB09, KB10, KB11, KB12, KB13, KB14, KB15, KB16, KB17}, \
   { KC00, KC01, KC02, KC03, KC04, KC05, KC06, KC07, KC08, KC09, KC10, KC11, KC12, KC13, KC14, KC15, KC16, KC17}, \
   { KD00, KD01, KD02, KD03, KD04, KD05, KD06, KD07, KD08, KD09, KD10, KD11, KD12, KD13, KD14, KD15, KD16,KC_NO}, \
diff --git a/keyboards/kabedon/kabedon980/config.h b/keyboards/kabedon/kabedon980/config.h
index 0b182a8d57..a028845956 100644
--- a/keyboards/kabedon/kabedon980/config.h
+++ b/keyboards/kabedon/kabedon980/config.h
@@ -17,16 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS {D0,D2,F7,B1,B0,D6,C7,D7,B5,B2}
-#define MATRIX_COL_PINS {F5,F4,F6,C6,B6,B4,D3,D1,D4,F1,B3,D5,F0}
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
 
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 20
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -42,4 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json
index fc0384f649..5c49682917 100644
--- a/keyboards/kabedon/kabedon980/info.json
+++ b/keyboards/kabedon/kabedon980/info.json
@@ -8,6 +8,14 @@
     	"pid": "0x3938",
     	"device_version": "0.0.1"
     },
+    "ws2812": {
+    	"pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "F6", "C6", "B6", "B4", "D3", "D1", "D4", "F1", "B3", "D5", "F0"],
+        "rows": ["D0", "D2", "F7", "B1", "B0", "D6", "C7", "D7", "B5", "B2"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
@@ -22,10 +30,10 @@
 			{"label":"F6", "x":7.3, "y":0}, 
 			{"label":"F7", "x":8.3, "y":0}, 
 			{"label":"F8", "x":9.3, "y":0}, 
-			{"label":"F9", "x":11.0, "y":0}, 
-			{"label":"F10", "x":12.0, "y":0}, 
-			{"label":"F11", "x":13.0, "y":0}, 
-			{"label":"F12", "x":14.0, "y":0}, 
+			{"label":"F9", "x":11, "y":0}, 
+			{"label":"F10", "x":12, "y":0}, 
+			{"label":"F11", "x":13, "y":0}, 
+			{"label":"F12", "x":14, "y":0}, 
 			{"label":"DELETE", "x":15.3, "y":0}, 
 			{"label":"HOME", "x":16.3, "y":0}, 
 			{"label":"PGUP", "x":17.3, "y":0}, 
diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h
index b2156c4ada..8988d940e1 100644
--- a/keyboards/kabedon/kabedon98e/config.h
+++ b/keyboards/kabedon/kabedon98e/config.h
@@ -15,14 +15,8 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS {A4,B10,B2,B1,B0,B15,B13,B14,B12,A10,A9,A8}
-#define MATRIX_COL_PINS {A0,B7,B8,B6,A3,A2,A1,B9,A7,A5,A6}
-#define DIODE_DIRECTION ROW2COL
-
 #define FORCE_NKRO
 
-#define RGB_DI_PIN B4
 #define RGBLED_NUM 24
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json
index def8f72612..929fd1a439 100644
--- a/keyboards/kabedon/kabedon98e/info.json
+++ b/keyboards/kabedon/kabedon98e/info.json
@@ -8,6 +8,15 @@
         "pid": "0x3935",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "B4",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "B7", "B8", "B6", "A3", "A2", "A1", "B9", "A7", "A5", "A6"],
+        "rows": ["A4", "B10", "B2", "B1", "B0", "B15", "B13", "B14", "B12", "A10", "A9", "A8"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B5"},
@@ -31,13 +40,13 @@
                 {"label":"F6", "x":7.333, "y":0.5},
                 {"label":"F7", "x":8.333, "y":0.5},
                 {"label":"F8", "x":9.333, "y":0.5},
-                {"label":"F9", "x":11.0, "y":0.5},
-                {"label":"F10", "x":12.0, "y":0.5},
-                {"label":"F11", "x":13.0, "y":0.5},
-                {"label":"F12", "x":14.0, "y":0.5},
+                {"label":"F9", "x":11, "y":0.5},
+                {"label":"F10", "x":12, "y":0.5},
+                {"label":"F11", "x":13, "y":0.5},
+                {"label":"F12", "x":14, "y":0.5},
                 {"label":"Delete", "x":15.5, "y":0.5},
                 {"label":"Home", "x":16.9, "y":0, "w":0.6, "h":0.5},
-                {"label":"Insert", "x":17.0, "y":0.5},
+                {"label":"Insert", "x":17, "y":0.5},
                 {"label":"End", "x":17.5, "y":0, "w":0.6, "h":0.5},
                 {"label":"PgUp", "x":18.4, "y":0, "w":0.6, "h":0.5},
                 {"label":"Mute", "x":18.5, "y":0.5},
diff --git a/keyboards/kabedon/kabedon98e/kabedon98e.c b/keyboards/kabedon/kabedon98e/kabedon98e.c
index 7ca156eab9..6984790006 100644
--- a/keyboards/kabedon/kabedon98e/kabedon98e.c
+++ b/keyboards/kabedon/kabedon98e/kabedon98e.c
@@ -25,7 +25,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -37,7 +38,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/kabedon/kabedon98e/rules.mk b/keyboards/kabedon/kabedon98e/rules.mk
index 091969b61b..7e8534dae5 100644
--- a/keyboards/kabedon/kabedon98e/rules.mk
+++ b/keyboards/kabedon/kabedon98e/rules.mk
@@ -10,5 +10,4 @@ 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
-WS2812_DRIVER = pwm
 ENCODER_ENABLE = yes
diff --git a/keyboards/kagizaraya/chidori/chidori.c b/keyboards/kagizaraya/chidori/chidori.c
deleted file mode 100644
index 229982724e..0000000000
--- a/keyboards/kagizaraya/chidori/chidori.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "chidori.h"
diff --git a/keyboards/kagizaraya/chidori/config.h b/keyboards/kagizaraya/chidori/config.h
index 4a90a41d9d..51f8958e20 100644
--- a/keyboards/kagizaraya/chidori/config.h
+++ b/keyboards/kagizaraya/chidori/config.h
@@ -22,26 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 6
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*
-#define MATRIX_ROW_PINS \
-    { D0, D5 }
-#define MATRIX_COL_PINS \
-    { F1, F0, B0 }
-*/
-
-/* COL2ROW, ROW2COL*/
-// #define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h
index 9b0ba0a609..9b42731f84 100644
--- a/keyboards/kagizaraya/halberd/config.h
+++ b/keyboards/kagizaraya/halberd/config.h
@@ -16,25 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D6, D4, D5, E6 }
-#define MATRIX_COL_PINS { D7, B4, C7, C6, B6, B5, F7, F6, F5, F4, F1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kagizaraya/halberd/halberd.c b/keyboards/kagizaraya/halberd/halberd.c
deleted file mode 100644
index 8ce55ca3e5..0000000000
--- a/keyboards/kagizaraya/halberd/halberd.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "halberd.h"
diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/info.json
index 43ab1df6e9..b6540cc780 100644
--- a/keyboards/kagizaraya/halberd/info.json
+++ b/keyboards/kagizaraya/halberd/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["D7", "B4", "C7", "C6", "B6", "B5", "F7", "F6", "F5", "F4", "F1"],
+        "rows": ["D6", "D4", "D5", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
index 481d3400dd..96e9669046 100644
--- a/keyboards/kagizaraya/scythe/config.h
+++ b/keyboards/kagizaraya/scythe/config.h
@@ -16,26 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, D5 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_SPLIT 1
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -50,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
index acab68f80b..a4731bae00 100644
--- a/keyboards/kagizaraya/scythe/info.json
+++ b/keyboards/kagizaraya/scythe/info.json
@@ -8,12 +8,20 @@
         "pid": "0x3941",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["F7", "F6", "F5", "F4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kagizaraya/scythe/scythe.c b/keyboards/kagizaraya/scythe/scythe.c
deleted file mode 100644
index c1f95e2f70..0000000000
--- a/keyboards/kagizaraya/scythe/scythe.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "scythe.h"
diff --git a/keyboards/kakunpc/angel17/alpha/alpha.c b/keyboards/kakunpc/angel17/alpha/alpha.c
deleted file mode 100644
index 1c2936e157..0000000000
--- a/keyboards/kakunpc/angel17/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "alpha.h"
diff --git a/keyboards/kakunpc/angel17/alpha/alpha.h b/keyboards/kakunpc/angel17/alpha/alpha.h
deleted file mode 100644
index 5b8600a206..0000000000
--- a/keyboards/kakunpc/angel17/alpha/alpha.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_numpad_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, \
-    k20, k21, k22, k13, \
-    k30, k31, k32, \
-    k40, k41, k33 \
-) \
-{ \
-    { k00, k10, k20, k31, k41 }, \
-    { k02, k12, k22, k33, KC_NO }, \
-    { k01, k11, k21, k32, KC_NO }, \
-    { k03, k13, k30, k40, KC_NO }, \
-}
diff --git a/keyboards/kakunpc/angel17/alpha/config.h b/keyboards/kakunpc/angel17/alpha/config.h
index abe10572df..f79d812475 100644
--- a/keyboards/kakunpc/angel17/alpha/config.h
+++ b/keyboards/kakunpc/angel17/alpha/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kakunpc/angel17/alpha/info.json b/keyboards/kakunpc/angel17/alpha/info.json
new file mode 100644
index 0000000000..8e0df61513
--- /dev/null
+++ b/keyboards/kakunpc/angel17/alpha/info.json
@@ -0,0 +1,34 @@
+{
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT_numpad_5x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [2, 0], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+
+                {"matrix": [0, 2], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3},
+                {"matrix": [0, 3], "x": 1, "y": 3},
+                {"matrix": [2, 3], "x": 2, "y": 3},
+
+                {"matrix": [3, 3], "x": 0, "y": 4, "w": 2},
+                {"matrix": [0, 4], "x": 2, "y": 4},
+                {"matrix": [1, 3], "x": 3, "y": 3, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/angel17/info.json b/keyboards/kakunpc/angel17/info.json
index da7b1d688e..a8a4f2c148 100644
--- a/keyboards/kakunpc/angel17/info.json
+++ b/keyboards/kakunpc/angel17/info.json
@@ -10,32 +10,5 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
-    "community_layouts": ["numpad_5x4"],
-    "layouts": {
-        "LAYOUT_numpad_5x4": {
-            "layout": [
-                {"label":"Num Lock", "x":0, "y":0},
-                {"label":"/", "x":1, "y":0},
-                {"label":"*", "x":2, "y":0},
-                {"label":"-", "x":3, "y":0},
-
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
-
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"+", "x":3, "y":1, "h":2},
-
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3},
-
-                {"label":"0", "x":0, "y":4, "w":2},
-                {"label":".", "x":2, "y":4},
-                {"label":"Enter", "x":3, "y":3, "h":2}
-            ]
-        }
-    }
+    "community_layouts": ["numpad_5x4"]
 }
diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h
index 0c2a432d5f..f3471e71e4 100644
--- a/keyboards/kakunpc/angel17/rev1/config.h
+++ b/keyboards/kakunpc/angel17/rev1/config.h
@@ -17,32 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 17
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/angel17/rev1/info.json b/keyboards/kakunpc/angel17/rev1/info.json
new file mode 100644
index 0000000000..9454cc5ffd
--- /dev/null
+++ b/keyboards/kakunpc/angel17/rev1/info.json
@@ -0,0 +1,37 @@
+{
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT_numpad_5x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [2, 0], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+
+                {"matrix": [0, 2], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3},
+                {"matrix": [0, 3], "x": 1, "y": 3},
+                {"matrix": [2, 3], "x": 2, "y": 3},
+
+                {"matrix": [3, 3], "x": 0, "y": 4, "w": 2},
+                {"matrix": [0, 4], "x": 2, "y": 4},
+                {"matrix": [1, 3], "x": 3, "y": 3, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/angel17/rev1/rev1.c b/keyboards/kakunpc/angel17/rev1/rev1.c
deleted file mode 100644
index 40ff30e620..0000000000
--- a/keyboards/kakunpc/angel17/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/kakunpc/angel17/rev1/rev1.h b/keyboards/kakunpc/angel17/rev1/rev1.h
deleted file mode 100644
index 5b8600a206..0000000000
--- a/keyboards/kakunpc/angel17/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_numpad_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, \
-    k20, k21, k22, k13, \
-    k30, k31, k32, \
-    k40, k41, k33 \
-) \
-{ \
-    { k00, k10, k20, k31, k41 }, \
-    { k02, k12, k22, k33, KC_NO }, \
-    { k01, k11, k21, k32, KC_NO }, \
-    { k03, k13, k30, k40, KC_NO }, \
-}
diff --git a/keyboards/kakunpc/angel64/alpha/alpha.c b/keyboards/kakunpc/angel64/alpha/alpha.c
deleted file mode 100644
index 1c2936e157..0000000000
--- a/keyboards/kakunpc/angel64/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "alpha.h"
diff --git a/keyboards/kakunpc/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h
index 39d8fcf0cd..b4d1467a6b 100644
--- a/keyboards/kakunpc/angel64/alpha/config.h
+++ b/keyboards/kakunpc/angel64/alpha/config.h
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 64
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -47,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/info.json
index 0fe4f0f5ab..fd2fbb736b 100644
--- a/keyboards/kakunpc/angel64/alpha/info.json
+++ b/keyboards/kakunpc/angel64/alpha/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0A64",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kakunpc/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h
index 39d8fcf0cd..b4d1467a6b 100644
--- a/keyboards/kakunpc/angel64/rev1/config.h
+++ b/keyboards/kakunpc/angel64/rev1/config.h
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 64
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -47,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/angel64/rev1/info.json b/keyboards/kakunpc/angel64/rev1/info.json
index 77d034baeb..c30614b640 100644
--- a/keyboards/kakunpc/angel64/rev1/info.json
+++ b/keyboards/kakunpc/angel64/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0A64",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kakunpc/angel64/rev1/rev1.c b/keyboards/kakunpc/angel64/rev1/rev1.c
deleted file mode 100644
index 40ff30e620..0000000000
--- a/keyboards/kakunpc/angel64/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/kakunpc/business_card/alpha/alpha.c b/keyboards/kakunpc/business_card/alpha/alpha.c
deleted file mode 100644
index 1c2936e157..0000000000
--- a/keyboards/kakunpc/business_card/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "alpha.h"
diff --git a/keyboards/kakunpc/business_card/alpha/alpha.h b/keyboards/kakunpc/business_card/alpha/alpha.h
deleted file mode 100644
index 9807576899..0000000000
--- a/keyboards/kakunpc/business_card/alpha/alpha.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12   \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-}
diff --git a/keyboards/kakunpc/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h
index 93130b4f99..719781fad5 100644
--- a/keyboards/kakunpc/business_card/alpha/config.h
+++ b/keyboards/kakunpc/business_card/alpha/config.h
@@ -17,32 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B2, B6 }
-#define MATRIX_COL_PINS { E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 6
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json
index 3cbeeef196..17fda49030 100644
--- a/keyboards/kakunpc/business_card/alpha/info.json
+++ b/keyboards/kakunpc/business_card/alpha/info.json
@@ -8,17 +8,26 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B5"],
+        "rows": ["B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1", "x":0, "y":0},
-                {"label":"2", "x":1, "y":0},
-                {"label":"3", "x":2, "y":0},
-                {"label":"4", "x":0, "y":1},
-                {"label":"5", "x":1, "y":1},
-                {"label":"6", "x":2, "y":1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
             ]
         }
     }
diff --git a/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
index ff2381020a..dec4c0dd7b 100644
--- a/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
+++ b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-// place overrides here
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -28,4 +26,3 @@
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kakunpc/business_card/beta/beta.c b/keyboards/kakunpc/business_card/beta/beta.c
deleted file mode 100644
index 7a9aa1b9bd..0000000000
--- a/keyboards/kakunpc/business_card/beta/beta.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "beta.h"
diff --git a/keyboards/kakunpc/business_card/beta/beta.h b/keyboards/kakunpc/business_card/beta/beta.h
deleted file mode 100644
index 21a334e8a9..0000000000
--- a/keyboards/kakunpc/business_card/beta/beta.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01,  \
-    k10, k11,  \
-    k20, k21   \
-) \
-{ \
-    { k21, k20 }, \
-    { k11, k10 }, \
-    { k01, k00 }, \
-}
diff --git a/keyboards/kakunpc/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h
index 405e4daefb..719781fad5 100644
--- a/keyboards/kakunpc/business_card/beta/config.h
+++ b/keyboards/kakunpc/business_card/beta/config.h
@@ -17,32 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, B2, B6 }
-#define MATRIX_COL_PINS { B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 6
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json
index 1dab5c4d3a..9886b2aa6c 100644
--- a/keyboards/kakunpc/business_card/beta/info.json
+++ b/keyboards/kakunpc/business_card/beta/info.json
@@ -8,17 +8,27 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5"],
+        "rows": ["B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1", "x":0, "y":0},
-                {"label":"2", "x":1, "y":0},
-                {"label":"3", "x":0, "y":1},
-                {"label":"4", "x":1, "y":1},
-                {"label":"5", "x":0, "y":2},
-                {"label":"6", "x":1, "y":2}
+                {"matrix": [2, 1], "x": 0, "y": 0},
+                {"matrix": [2, 0], "x": 1, "y": 0},
+
+                {"matrix": [1, 1], "x": 0, "y": 1},
+                {"matrix": [1, 0], "x": 1, "y": 1},
+
+                {"matrix": [0, 1], "x": 0, "y": 2},
+                {"matrix": [0, 0], "x": 1, "y": 2}
             ]
         }
     }
diff --git a/keyboards/kakunpc/business_card/beta/keymaps/default/config.h b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
index fb0c1ab3a3..dec4c0dd7b 100644
--- a/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
+++ b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-// place overrides here
-
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -29,4 +26,3 @@
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kakunpc/business_card/business_card.c b/keyboards/kakunpc/business_card/business_card.c
deleted file mode 100644
index 01beb28220..0000000000
--- a/keyboards/kakunpc/business_card/business_card.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "business_card.h"
diff --git a/keyboards/kakunpc/business_card/business_card.h b/keyboards/kakunpc/business_card/business_card.h
deleted file mode 100644
index 125c3080d6..0000000000
--- a/keyboards/kakunpc/business_card/business_card.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#ifdef KEYBOARD_kakunpc_business_card_alpha
-    #include "alpha.h"
-#endif
-#ifdef KEYBOARD_kakunpc_business_card_beta
-    #include "beta.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/kakunpc/choc_taro/choc_taro.c b/keyboards/kakunpc/choc_taro/choc_taro.c
deleted file mode 100644
index 2a835b2bd8..0000000000
--- a/keyboards/kakunpc/choc_taro/choc_taro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "choc_taro.h"
diff --git a/keyboards/kakunpc/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h
index efc247b38b..3cdc282329 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/config.h
+++ b/keyboards/kakunpc/rabbit_capture_plan/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #define RGBLED_SPLIT {32, 37}
 #    define RGBLED_NUM 69
 #    define RGBLIGHT_HUE_STEP 8
@@ -53,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json
index 7c7157bdf4..02ac7d54b7 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/info.json
+++ b/keyboards/kakunpc/rabbit_capture_plan/info.json
@@ -8,6 +8,14 @@
         "pid": "0xEB59",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
@@ -16,303 +24,79 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "x": 0.66,
-                    "y": 0
-                },
-                {
-                    "x": 1.6600000000000001,
-                    "y": 0
-                },
-                {
-                    "x": 2.97,
-                    "y": 0
-                },
-                {
-                    "x": 3.97,
-                    "y": 0
-                },
-                {
-                    "x": 4.97,
-                    "y": 0
-                },
-                {
-                    "x": 5.97,
-                    "y": 0
-                },
-                {
-                    "x": 6.97,
-                    "y": 0
-                },
-                {
-                    "x": 9.87,
-                    "y": 0
-                },
-                {
-                    "x": 10.87,
-                    "y": 0
-                },
-                {
-                    "x": 11.87,
-                    "y": 0
-                },
-                {
-                    "x": 12.87,
-                    "y": 0
-                },
-                {
-                    "x": 14.32,
-                    "y": 0
-                },
-                {
-                    "x": 15.32,
-                    "y": 0
-                },
-                {
-                    "x": 16.32,
-                    "y": 0
-                },
-                {
-                    "x": 17.32,
-                    "y": 0
-                },
-
-
-
-                {
-                    "x": 0.53,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "x": 2.03,
-                    "y": 1
-                },
-                {
-                    "x": 3.47,
-                    "y": 1
-                },
-                {
-                    "x": 4.47,
-                    "y": 1
-                },
-                {
-                    "x": 5.47,
-                    "y": 1
-                },
-                {
-                    "x": 6.47,
-                    "y": 1
-                },
-                {
-                    "x": 7.47,
-                    "y": 1
-                },
-                {
-                    "x": 9.37,
-                    "y": 1
-                },
-                {
-                    "x": 10.37,
-                    "y": 1
-                },
-                {
-                    "x": 11.37,
-                    "y": 1
-                },
-                {
-                    "x": 12.37,
-                    "y": 1
-                },
-                {
-                    "x": 13.97,
-                    "y": 1
-                },
-                {
-                    "x": 14.97,
-                    "y": 1
-                },
-                {
-                    "x": 15.97,
-                    "y": 1
-                },
-                {
-                    "x": 16.97,
-                    "y": 1,
-                    "w": 1.5
-                },
-
-
-
-                {
-                    "x": 0.39,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "x": 2.14,
-                    "y": 2
-                },
-                {
-                    "x": 3.72,
-                    "y": 2
-                },
-                {
-                    "x": 4.72,
-                    "y": 2
-                },
-                {
-                    "x": 5.72,
-                    "y": 2
-                },
-                {
-                    "x": 6.72,
-                    "y": 2
-                },
-                {
-                    "x": 7.72,
-                    "y": 2
-                },
-                {
-                    "x": 9.62,
-                    "y": 2
-                },
-                {
-                    "x": 10.62,
-                    "y": 2
-                },
-                {
-                    "x": 11.62,
-                    "y": 2
-                },
-                {
-                    "x": 12.62,
-                    "y": 2
-                },
-                {
-                    "x": 14.34,
-                    "y": 2
-                },
-                {
-                    "x": 15.34,
-                    "y": 2
-                },
-                {
-                    "x": 16.34,
-                    "y": 2,
-                    "w": 2.25
-                },
-
-
+                {"x": 0.41, "y": 0},
+                {"x": 1.41, "y": 0},
+                {"x": 2.72, "y": 0},
+                {"x": 3.72, "y": 0},
+                {"x": 4.72, "y": 0},
+                {"x": 5.72, "y": 0},
+                {"x": 6.72, "y": 0},
+                {"x": 9.62, "y": 0},
+                {"x": 10.62, "y": 0},
+                {"x": 11.62, "y": 0},
+                {"x": 12.62, "y": 0},
+                {"x": 14.07, "y": 0},
+                {"x": 15.07, "y": 0},
+                {"x": 16.07, "y": 0},
+                {"x": 17.07, "y": 0},
 
-                {
-                    "x": 0.25,
-                    "y": 3,
-                    "w": 2.25
-                },
-                {
-                    "x": 2.5,
-                    "y": 3
-                },
-                {
-                    "x": 4.22,
-                    "y": 3
-                },
-                {
-                    "x": 5.22,
-                    "y": 3
-                },
-                {
-                    "x": 6.22,
-                    "y": 3
-                },
-                {
-                    "x": 7.22,
-                    "y": 3
-                },
-                {
-                    "x": 9.12,
-                    "y": 3
-                },
-                {
-                    "x": 10.12,
-                    "y": 3
-                },
-                {
-                    "x": 11.12,
-                    "y": 3
-                },
-                {
-                    "x": 12.12,
-                    "y": 3
-                },
-                {
-                    "x": 13.97,
-                    "y": 3
-                },
-                {
-                    "x": 14.97,
-                    "y": 3
-                },
-                {
-                    "x": 15.97,
-                    "y": 3
-                },
-                {
-                    "x": 16.97,
-                    "y": 3
-                },
-                {
-                    "x": 18.25,
-                    "y": 3.25
-                },
+                {"x": 0.28, "y": 1, "w": 1.5},
+                {"x": 1.78, "y": 1},
+                {"x": 3.22, "y": 1},
+                {"x": 4.22, "y": 1},
+                {"x": 5.22, "y": 1},
+                {"x": 6.22, "y": 1},
+                {"x": 7.22, "y": 1},
+                {"x": 9.12, "y": 1},
+                {"x": 10.12, "y": 1},
+                {"x": 11.12, "y": 1},
+                {"x": 12.12, "y": 1},
+                {"x": 13.72, "y": 1},
+                {"x": 14.72, "y": 1},
+                {"x": 15.72, "y": 1},
+                {"x": 16.72, "y": 1, "w": 1.5},
 
+                {"x": 0.14, "y": 2, "w": 1.75},
+                {"x": 1.89, "y": 2},
+                {"x": 3.47, "y": 2},
+                {"x": 4.47, "y": 2},
+                {"x": 5.47, "y": 2},
+                {"x": 6.47, "y": 2},
+                {"x": 7.47, "y": 2},
+                {"x": 9.37, "y": 2},
+                {"x": 10.37, "y": 2},
+                {"x": 11.37, "y": 2},
+                {"x": 12.37, "y": 2},
+                {"x": 14.09, "y": 2},
+                {"x": 15.09, "y": 2},
+                {"x": 16.09, "y": 2, "w": 2.25},
 
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.97, "y": 3},
+                {"x": 4.97, "y": 3},
+                {"x": 5.97, "y": 3},
+                {"x": 6.97, "y": 3},
+                {"x": 8.87, "y": 3},
+                {"x": 9.87, "y": 3},
+                {"x": 10.87, "y": 3},
+                {"x": 11.87, "y": 3},
+                {"x": 13.72, "y": 3},
+                {"x": 14.72, "y": 3},
+                {"x": 15.72, "y": 3},
+                {"x": 16.72, "y": 3},
+                {"x": 18, "y": 3.25},
 
-                {
-                    "x": 0.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 1.75,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 4.72,
-                    "y": 4
-                },
-                {
-                    "x": 5.72,
-                    "y": 4,
-                    "w": 2
-                },
-                {
-                    "x": 7.72,
-                    "y": 4
-                },
-                {
-                    "x": 9.6,
-                    "y": 4,
-                    "w": 2.75
-                },
-                {
-                    "x": 12.35,
-                    "y": 4
-                },
-                {
-                    "x": 17.25,
-                    "y": 4.25
-                },
-                {
-                    "x": 18.25,
-                    "y": 4.25
-                },
-                {
-                    "x": 19.25,
-                    "y": 4.25
-                }
+                {"x": 0.25, "y": 4, "w": 1.25},
+                {"x": 1.5, "y": 4, "w": 1.25},
+                {"x": 4.47, "y": 4},
+                {"x": 5.47, "y": 4, "w": 2},
+                {"x": 7.47, "y": 4},
+                {"x": 9.35, "y": 4, "w": 2.75},
+                {"x": 12.1, "y": 4},
+                {"x": 17, "y": 4.25},
+                {"x": 18, "y": 4.25},
+                {"x": 19, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c b/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c
deleted file mode 100644
index 7a45e61f35..0000000000
--- a/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rabbit_capture_plan.h"
diff --git a/keyboards/kakunpc/suihankey/alpha/alpha.c b/keyboards/kakunpc/suihankey/alpha/alpha.c
deleted file mode 100644
index 1c2936e157..0000000000
--- a/keyboards/kakunpc/suihankey/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "alpha.h"
diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
index a2fcf4c628..09038071c2 100644
--- a/keyboards/kakunpc/suihankey/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/alpha/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 18
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json
index 76c31631ff..2f60036d35 100644
--- a/keyboards/kakunpc/suihankey/alpha/info.json
+++ b/keyboards/kakunpc/suihankey/alpha/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h
index 9c2bb19be8..09038071c2 100644
--- a/keyboards/kakunpc/suihankey/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/rev1/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 18
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json
index 76c31631ff..b2a6c36716 100644
--- a/keyboards/kakunpc/suihankey/rev1/info.json
+++ b/keyboards/kakunpc/suihankey/rev1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kakunpc/suihankey/rev1/rev1.c b/keyboards/kakunpc/suihankey/rev1/rev1.c
deleted file mode 100644
index 40ff30e620..0000000000
--- a/keyboards/kakunpc/suihankey/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/kakunpc/suihankey/split/alpha/alpha.c b/keyboards/kakunpc/suihankey/split/alpha/alpha.c
deleted file mode 100644
index 1c2936e157..0000000000
--- a/keyboards/kakunpc/suihankey/split/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "alpha.h"
diff --git a/keyboards/kakunpc/suihankey/split/alpha/alpha.h b/keyboards/kakunpc/suihankey/split/alpha/alpha.h
deleted file mode 100644
index ba93405ecc..0000000000
--- a/keyboards/kakunpc/suihankey/split/alpha/alpha.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the Leys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x5_3( \
-    L00, L01, L02, L03, L04,            R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14,            R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24,            R24, R23, R22, R21, R20, \
-              L30, L31, L32,            R32, R31, R30   \
-) \
-{ \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { L30, L31, L32  }, \
-    { R00, R01, R02, R03, R04 }, \
-    { R10, R11, R12, R13, R14 }, \
-    { R20, R21, R22, R23, R24 }, \
-    { R30, R31, R32  }, \
-}
-
-#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
index f8fd8a6b5f..09befa3a58 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/split/alpha/config.h
@@ -17,35 +17,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
 #define USE_I2C
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN D2
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 18
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/info.json
new file mode 100644
index 0000000000..72aaf72967
--- /dev/null
+++ b/keyboards/kakunpc/suihankey/split/alpha/info.json
@@ -0,0 +1,62 @@
+{
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_3"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.125},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.125},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+                {"matrix": [4, 4], "x": 8.2, "y": 0.25},
+                {"matrix": [4, 3], "x": 9.2, "y": 0.125},
+                {"matrix": [4, 2], "x": 10.2, "y": 0},
+                {"matrix": [4, 1], "x": 11.2, "y": 0.125},
+                {"matrix": [4, 0], "x": 12.2, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.125},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+                {"matrix": [5, 4], "x": 8.2, "y": 1.25},
+                {"matrix": [5, 3], "x": 9.2, "y": 1.125},
+                {"matrix": [5, 2], "x": 10.2, "y": 1},
+                {"matrix": [5, 1], "x": 11.2, "y": 1.125},
+                {"matrix": [5, 0], "x": 12.2, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.125},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [6, 4], "x": 8.2, "y": 2.25},
+                {"matrix": [6, 3], "x": 9.2, "y": 2.125},
+                {"matrix": [6, 2], "x": 10.2, "y": 2},
+                {"matrix": [6, 1], "x": 11.2, "y": 2.125},
+                {"matrix": [6, 0], "x": 12.2, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 3.4, "y": 3.25},
+                {"matrix": [3, 1], "x": 4.4, "y": 3.55},
+                {"matrix": [3, 2], "x": 5.4, "y": 3.85},
+
+                {"matrix": [7, 2], "x": 6.8, "y": 3.85},
+                {"matrix": [7, 1], "x": 7.8, "y": 3.55},
+                {"matrix": [7, 0], "x": 8.8, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json
index 4cab8c48f2..8f624aeb6c 100644
--- a/keyboards/kakunpc/suihankey/split/info.json
+++ b/keyboards/kakunpc/suihankey/split/info.json
@@ -13,54 +13,5 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"x": 0, "y": 0.375},
-                {"x": 1, "y": 0.125},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.125},
-                {"x": 4, "y": 0.25},
-
-                {"x": 8.2, "y": 0.25},
-                {"x": 9.2, "y": 0.125},
-                {"x": 10.2, "y": 0},
-                {"x": 11.2, "y": 0.125},
-                {"x": 12.2, "y": 0.375},
-
-                {"x": 0, "y": 1.375},
-                {"x": 1, "y": 1.125},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.125},
-                {"x": 4, "y": 1.25},
-
-                {"x": 8.2, "y": 1.25},
-                {"x": 9.2, "y": 1.125},
-                {"x": 10.2, "y": 1},
-                {"x": 11.2, "y": 1.125},
-                {"x": 12.2, "y": 1.375},
-
-                {"x": 0, "y": 2.375},
-                {"x": 1, "y": 2.125},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.125},
-                {"x": 4, "y": 2.25},
-
-                {"x": 8.2, "y": 2.25},
-                {"x": 9.2, "y": 2.125},
-                {"x": 10.2, "y": 2},
-                {"x": 11.2, "y": 2.125},
-                {"x": 12.2, "y": 2.375},
-
-                {"x": 3.4, "y": 3.25},
-                {"x": 4.4, "y": 3.55},
-                {"x": 5.4, "y": 3.85},
-
-                {"x": 6.8, "y": 3.85},
-                {"x": 7.8, "y": 3.55},
-                {"x": 8.8, "y": 3.25}
-            ]
-        }
-    }
+    "community_layouts": ["split_3x5_3"]
 }
diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
index c05fe6d365..1398e13f82 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/split/rev1/config.h
@@ -17,28 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7 }
 #define USE_I2C
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN D2
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 18
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -55,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json
new file mode 100644
index 0000000000..2c414b3116
--- /dev/null
+++ b/keyboards/kakunpc/suihankey/split/rev1/info.json
@@ -0,0 +1,62 @@
+{
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_3"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [1, 0], "x": 1, "y": 0.125},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0.125},
+                {"matrix": [4, 0], "x": 4, "y": 0.25},
+
+                {"matrix": [9, 0], "x": 8.2, "y": 0.25},
+                {"matrix": [8, 0], "x": 9.2, "y": 0.125},
+                {"matrix": [7, 0], "x": 10.2, "y": 0},
+                {"matrix": [6, 0], "x": 11.2, "y": 0.125},
+                {"matrix": [5, 0], "x": 12.2, "y": 0.375},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1.125},
+                {"matrix": [4, 1], "x": 4, "y": 1.25},
+
+                {"matrix": [9, 1], "x": 8.2, "y": 1.25},
+                {"matrix": [8, 1], "x": 9.2, "y": 1.125},
+                {"matrix": [7, 1], "x": 10.2, "y": 1},
+                {"matrix": [6, 1], "x": 11.2, "y": 1.125},
+                {"matrix": [5, 1], "x": 12.2, "y": 1.375},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375},
+                {"matrix": [1, 2], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [3, 2], "x": 3, "y": 2.125},
+                {"matrix": [4, 2], "x": 4, "y": 2.25},
+
+                {"matrix": [9, 2], "x": 8.2, "y": 2.25},
+                {"matrix": [8, 2], "x": 9.2, "y": 2.125},
+                {"matrix": [7, 2], "x": 10.2, "y": 2},
+                {"matrix": [6, 2], "x": 11.2, "y": 2.125},
+                {"matrix": [5, 2], "x": 12.2, "y": 2.375},
+
+                {"matrix": [0, 3], "x": 3.4, "y": 3.25},
+                {"matrix": [1, 3], "x": 4.4, "y": 3.55},
+                {"matrix": [2, 3], "x": 5.4, "y": 3.85},
+
+                {"matrix": [7, 3], "x": 6.8, "y": 3.85},
+                {"matrix": [6, 3], "x": 7.8, "y": 3.55},
+                {"matrix": [5, 3], "x": 8.8, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/suihankey/split/rev1/rev1.c b/keyboards/kakunpc/suihankey/split/rev1/rev1.c
deleted file mode 100644
index 40ff30e620..0000000000
--- a/keyboards/kakunpc/suihankey/split/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/kakunpc/suihankey/split/rev1/rev1.h b/keyboards/kakunpc/suihankey/split/rev1/rev1.h
deleted file mode 100644
index 98618ba712..0000000000
--- a/keyboards/kakunpc/suihankey/split/rev1/rev1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the Leys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x5_3( \
-    L00, L01, L02, L03, L04,            R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14,            R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24,            R24, R23, R22, R21, R20, \
-              L30, L31, L32,            R32, R31, R30   \
-) \
-{ \
-    { L00, L10, L20, L30 }, \
-    { L01, L11, L21, L31 }, \
-    { L02, L12, L22, L32 }, \
-    { L03, L13, L23, KC_NO }, \
-    { L04, L14, L24, KC_NO }, \
-    { R00, R10, R20, R30 }, \
-    { R01, R11, R21, R31 }, \
-    { R02, R12, R22, R32 }, \
-    { R03, R13, R23, KC_NO }, \
-    { R04, R14, R24, KC_NO }, \
-}
-
-#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/kakunpc/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h
index fe05231b6f..6b9c95516d 100644
--- a/keyboards/kakunpc/thedogkeyboard/config.h
+++ b/keyboards/kakunpc/thedogkeyboard/config.h
@@ -35,15 +35,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 }
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 111
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 50 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/info.json
index 26b320083c..f511fbc77e 100644
--- a/keyboards/kakunpc/thedogkeyboard/info.json
+++ b/keyboards/kakunpc/thedogkeyboard/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c b/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c
deleted file mode 100644
index a1808324c8..0000000000
--- a/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "thedogkeyboard.h"
diff --git a/keyboards/kamigakushi/info.json b/keyboards/kamigakushi/info.json
index 9358b0a79a..dc7b54ad54 100644
--- a/keyboards/kamigakushi/info.json
+++ b/keyboards/kamigakushi/info.json
@@ -18,7 +18,6 @@
         "on_state": 1
     },
     "rgblight": {
-        "pin": "GP25",
         "led_count": 2,
         "hue_steps": 8,
         "saturation_steps": 8,
@@ -37,6 +36,10 @@
         "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "GP25",
+        "driver": "vendor"
+    },
     "matrix_pins": {
         "cols": ["GP28", "GP5", "GP4", "GP3", "GP2", "GP1", "GP0", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7" ],
         "rows": ["GP24", "GP29", "GP6", "GP15", "GP16"]
diff --git a/keyboards/kamigakushi/rules.mk b/keyboards/kamigakushi/rules.mk
index 027b21b5fe..24f0fb91d3 100644
--- a/keyboards/kamigakushi/rules.mk
+++ b/keyboards/kamigakushi/rules.mk
@@ -1,3 +1,2 @@
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
 OLED_DRIVER = SSD1306
\ No newline at end of file
diff --git a/keyboards/kapcave/arya/arya.c b/keyboards/kapcave/arya/arya.c
deleted file mode 100644
index af5d19be4f..0000000000
--- a/keyboards/kapcave/arya/arya.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "arya.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return true;
-}
diff --git a/keyboards/kapcave/arya/arya.h b/keyboards/kapcave/arya/arya.h
deleted file mode 100644
index 38e4afaf05..0000000000
--- a/keyboards/kapcave/arya/arya.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-  K81,   K36, K37, K46, K47, K56, K57, K66,      K67, K76, K77, K06, K07, K17, K26, K27, \
-  K80,   K34, K35, K44, K45, K54, K55,      K64, K65, K75, K05, K15, K16, K25, K24,      \
-  K82,   K32, K33, K43, K52, K53, K63,      K73, K74, K03, K04, K13, K14,      K23,      \
-         K31, K41, K42, K51, K61, K62,      K71, K72, K01, K02, K11, K12, K21, K22,      \
-         K30,      K40,      K50, K60,           K00,      K10,                K20       \
-) \
-{ \
-  { K00  , K01  , K02  , K03  , K04  , K05  , K06  , K07 }, \
-  { K10  , K11  , K12  , K13  , K14  , K15  , K16  , K17 }, \
-  { K20  , K21  , K22  , K23  , K24  , K25  , K26  , K27 }, \
-  { K30  , K31  , K32  , K33  , K34  , K35  , K36  , K37 }, \
-  { K40  , K41  , K42  , K43  , K44  , K45  , K46  , K47 }, \
-  { K50  , K51  , K52  , K53  , K54  , K55  , K56  , K57 }, \
-  { K60  , K61  , K62  , K63  , K64  , K65  , K66  , K67 }, \
-  { KC_NO  , K71  , K72  , K73  , K74  , K75  , K76  , K77 }, \
-  { K80  , K81  , K82  , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}  \
-}
diff --git a/keyboards/kapcave/arya/config.h b/keyboards/kapcave/arya/config.h
index dd197f2338..282b98a978 100644
--- a/keyboards/kapcave/arya/config.h
+++ b/keyboards/kapcave/arya/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B0, B5, B4, B2, C13, F1, F0, A14}
-#define MATRIX_ROW_PINS { B8, A13, B1, A15, B9, B10, B11, A0, A8 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json
index 54a1513f90..0bfc8cec3f 100644
--- a/keyboards/kapcave/arya/info.json
+++ b/keyboards/kapcave/arya/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4152",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B5", "B4", "B2", "C13", "F1", "F0", "A14"],
+        "rows": ["B8", "A13", "B1", "A15", "B9", "B10", "B11", "A0", "A8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B12", "pin_b": "B13", "resolution": 2},
@@ -21,76 +26,80 @@
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"x":0.4, "y":0},
-                {"x":1.55, "y":0.1},
-                {"x":2.55, "y":0.1},
-                {"x":3.55, "y":0},
-                {"x":4.55, "y":0.1},
-                {"x":5.55, "y":0.1},
-                {"x":6.55, "y":0.1},
-                {"x":7.55, "y":0.1},
-                {"x":9.75, "y":0.1},
-                {"x":10.75, "y":0.1},
-                {"x":11.75, "y":0.1},
-                {"x":12.75, "y":0.1},
-                {"x":13.75, "y":0},
-                {"x":14.75, "y":0.1},
-                {"x":15.75, "y":0.1},
-                {"x":16.75, "y":0.1},
+                {"matrix": [8, 1], "x": 0.4, "y": 0},
+                {"matrix": [3, 6], "x": 1.55, "y": 0.1},
+                {"matrix": [3, 7], "x": 2.55, "y": 0.1},
+                {"matrix": [4, 6], "x": 3.55, "y": 0},
+                {"matrix": [4, 7], "x": 4.55, "y": 0.1},
+                {"matrix": [5, 6], "x": 5.55, "y": 0.1},
+                {"matrix": [5, 7], "x": 6.55, "y": 0.1},
+                {"matrix": [6, 6], "x": 7.55, "y": 0.1},
+
+                {"matrix": [6, 7], "x": 9.75, "y": 0.1},
+                {"matrix": [7, 6], "x": 10.75, "y": 0.1},
+                {"matrix": [7, 7], "x": 11.75, "y": 0.1},
+                {"matrix": [0, 6], "x": 12.75, "y": 0.1},
+                {"matrix": [0, 7], "x": 13.75, "y": 0},
+                {"matrix": [1, 7], "x": 14.75, "y": 0.1},
+                {"matrix": [2, 6], "x": 15.75, "y": 0.1},
+                {"matrix": [2, 7], "x": 16.75, "y": 0.1},
+
+                {"matrix": [8, 0], "x": 0.2, "y": 1},
+                {"matrix": [3, 4], "x": 1.35, "y": 1.1, "w": 1.5},
+                {"matrix": [3, 5], "x": 2.85, "y": 1.1},
+                {"matrix": [4, 4], "x": 3.85, "y": 1.1},
+                {"matrix": [4, 5], "x": 4.85, "y": 1.1},
+                {"matrix": [5, 4], "x": 5.85, "y": 1.1},
+                {"matrix": [5, 5], "x": 6.85, "y": 1.1},
+
+                {"matrix": [6, 4], "x": 9.45, "y": 1.1},
+                {"matrix": [6, 5], "x": 10.45, "y": 1.1},
+                {"matrix": [7, 5], "x": 11.45, "y": 1.1},
+                {"matrix": [0, 5], "x": 12.45, "y": 1.1},
+                {"matrix": [1, 5], "x": 13.45, "y": 1.1},
+                {"matrix": [1, 6], "x": 14.45, "y": 1.1},
+                {"matrix": [2, 5], "x": 15.45, "y": 1.1},
+                {"matrix": [2, 4], "x": 16.45, "y": 1.1, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2},
+                {"matrix": [3, 2], "x": 1.15, "y": 2.1, "w": 1.75},
+                {"matrix": [3, 3], "x": 2.9, "y": 2.1},
+                {"matrix": [4, 3], "x": 3.9, "y": 2.1},
+                {"matrix": [5, 2], "x": 4.9, "y": 2.1},
+                {"matrix": [5, 3], "x": 5.9, "y": 2.1},
+                {"matrix": [6, 3], "x": 6.9, "y": 2.1},
 
-                {"x":0.2, "y":1.0},
-                {"x":1.35, "y":1.1, "w":1.5},
-                {"x":2.85, "y":1.1},
-                {"x":3.85, "y":1.1},
-                {"x":4.85, "y":1.1},
-                {"x":5.85, "y":1.1},
-                {"x":6.85, "y":1.1},
-                {"x":9.45, "y":1.1},
-                {"x":10.45, "y":1.1},
-                {"x":11.45, "y":1.1},
-                {"x":12.45, "y":1.1},
-                {"x":13.45, "y":1.1},
-                {"x":14.45, "y":1.1},
-                {"x":15.45, "y":1.1},
-                {"x":16.45, "y":1.1, "w":1.5},
+                {"matrix": [7, 3], "x": 9.9, "y": 2.1},
+                {"matrix": [7, 4], "x": 10.9, "y": 2.1},
+                {"matrix": [0, 3], "x": 11.9, "y": 2.1},
+                {"matrix": [0, 4], "x": 12.9, "y": 2.1},
+                {"matrix": [1, 3], "x": 13.9, "y": 2.1},
+                {"matrix": [1, 4], "x": 14.9, "y": 2.1},
+                {"matrix": [2, 3], "x": 15.9, "y": 2.1, "w": 2.25},
 
-                {"x":0, "y":2.0},
-                {"x":1.15, "y":2.1, "w":1.75},
-                {"x":2.9, "y":2.1},
-                {"x":3.9, "y":2.1},
-                {"x":4.9, "y":2.1},
-                {"x":5.9, "y":2.1},
-                {"x":6.9, "y":2.1},
-                {"x":9.9, "y":2.1},
-                {"x":10.9, "y":2.1},
-                {"x":11.9, "y":2.1},
-                {"x":12.9, "y":2.1},
-                {"x":13.9, "y":2.1},
-                {"x":14.9, "y":2.1},
-                {"x":15.9, "y":2.1, "w":2.25},
+                {"matrix": [3, 1], "x": 0.95, "y": 3.1, "w": 2.25},
+                {"matrix": [4, 1], "x": 3.2, "y": 3.1},
+                {"matrix": [4, 2], "x": 4.2, "y": 3.1},
+                {"matrix": [5, 1], "x": 5.2, "y": 3.1},
+                {"matrix": [6, 1], "x": 6.2, "y": 3.1},
+                {"matrix": [6, 2], "x": 7.2, "y": 3.1},
 
-                {"x":0.95, "y":3.1, "w":2.25},
-                {"x":3.2, "y":3.1},
-                {"x":4.2, "y":3.1},
-                {"x":5.2, "y":3.1},
-                {"x":6.2, "y":3.1},
-                {"x":7.2, "y":3.1},
-                {"x":9.6, "y":3.1},
-                {"x":10.6, "y":3.1},
-                {"x":11.6, "y":3.1},
-                {"x":12.6, "y":3.1},
-                {"x":13.6, "y":3.1},
-                {"x":14.6, "y":3.1},
-                {"x":15.6, "y":3.1, "w":1.75},
-                {"x":17.35, "y":3.1},
+                {"matrix": [7, 1], "x": 9.6, "y": 3.1},
+                {"matrix": [7, 2], "x": 10.6, "y": 3.1},
+                {"matrix": [0, 1], "x": 11.6, "y": 3.1},
+                {"matrix": [0, 2], "x": 12.6, "y": 3.1},
+                {"matrix": [1, 1], "x": 13.6, "y": 3.1},
+                {"matrix": [1, 2], "x": 14.6, "y": 3.1},
+                {"matrix": [2, 1], "x": 15.6, "y": 3.1, "w": 1.75},
+                {"matrix": [2, 2], "x": 17.35, "y": 3.1},
 
-                {"x":0.95, "y":4.1, "w":1.5},
-                {"x":3.85, "y":4.1, "w":1.5},
-                {"x":5.35, "y":4.1, "w":2},
-                {"x":7.35, "y":4.1, "w":1.25},
-                {"x":9.6, "y":4.1, "w":2.75},
-                {"x":12.35, "y":4.1, "w":1.5},
-                {"x":16.65, "y":4.1, "w":1.5}
+                {"matrix": [3, 0], "x": 0.95, "y": 4.1, "w": 1.5},
+                {"matrix": [4, 0], "x": 3.85, "y": 4.1, "w": 1.5},
+                {"matrix": [5, 0], "x": 5.35, "y": 4.1, "w": 2},
+                {"matrix": [6, 0], "x": 7.35, "y": 4.1, "w": 1.25},
+                {"matrix": [0, 0], "x": 9.6, "y": 4.1, "w": 2.75},
+                {"matrix": [1, 0], "x": 12.35, "y": 4.1, "w": 1.5},
+                {"matrix": [2, 0], "x": 16.65, "y": 4.1, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/kapcave/gskt00/config.h b/keyboards/kapcave/gskt00/config.h
index 30a5aa6db2..dfeb9c44d1 100755
--- a/keyboards/kapcave/gskt00/config.h
+++ b/keyboards/kapcave/gskt00/config.h
@@ -16,14 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, D1, D2, D4, D6, F7, B0, F4 }
-#define MATRIX_COL_PINS { F6, D7, F5, C7, B4, C6, B6, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/kapcave/gskt00/gskt00.c b/keyboards/kapcave/gskt00/gskt00.c
deleted file mode 100755
index c2c2d823f9..0000000000
--- a/keyboards/kapcave/gskt00/gskt00.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "gskt00.h"
-
diff --git a/keyboards/kapcave/gskt00/gskt00.h b/keyboards/kapcave/gskt00/gskt00.h
index d0ac51acd7..120e021ce3 100755
--- a/keyboards/kapcave/gskt00/gskt00.h
+++ b/keyboards/kapcave/gskt00/gskt00.h
@@ -46,7 +46,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     k30, k40, k50,           k60,                     k00, k10,      k20 \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
     { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \
     { k30, k31, k32, k33, k34, k35, k36, k37 }, \
     { k40, k41, k42, k43, k44, k45, k46, k47 }, \
diff --git a/keyboards/kapcave/gskt00/info.json b/keyboards/kapcave/gskt00/info.json
index 94b0159176..a66772ef93 100644
--- a/keyboards/kapcave/gskt00/info.json
+++ b/keyboards/kapcave/gskt00/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6061",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F6", "D7", "F5", "C7", "B4", "C6", "B6", "B5"],
+    "rows": ["F1", "D1", "D2", "D4", "D6", "F7", "B0", "F4"]
+  },
+  "diode_direction": "COL2ROW",
   "bootmagic": {
     "matrix": [3, 6]
   },
diff --git a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h
index 2db5749cb5..64135cabcd 100644
--- a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h
+++ b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h
@@ -19,8 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A { D5 }
 #define ENCODERS_PAD_B { D3 }
 
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN D0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,5 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 12
-#endif
-
diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h
index 58fd5aff24..93d67ee100 100755
--- a/keyboards/kapcave/paladin64/config.h
+++ b/keyboards/kapcave/paladin64/config.h
@@ -72,21 +72,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #endif
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, B0, D3 }
-#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -101,4 +92,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 12
-#endif
diff --git a/keyboards/kapcave/paladin64/info.json b/keyboards/kapcave/paladin64/info.json
index f64fdc2a65..e280220217 100644
--- a/keyboards/kapcave/paladin64/info.json
+++ b/keyboards/kapcave/paladin64/info.json
@@ -8,6 +8,14 @@
       "pid": "0x5036",
       "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "D0"
+    },
+    "matrix_pins": {
+      "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "D1"],
+      "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "B0", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
       "matrix": [3, 6]
     },
diff --git a/keyboards/kapcave/paladin64/paladin64.c b/keyboards/kapcave/paladin64/paladin64.c
deleted file mode 100755
index 88dd1fdff2..0000000000
--- a/keyboards/kapcave/paladin64/paladin64.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "paladin64.h"
-
diff --git a/keyboards/kapcave/paladinpad/config.h b/keyboards/kapcave/paladinpad/config.h
deleted file mode 100644
index 9676459af2..0000000000
--- a/keyboards/kapcave/paladinpad/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kapcave/paladinpad/info.json b/keyboards/kapcave/paladinpad/info.json
index fcc6ba4941..245ef7066a 100644
--- a/keyboards/kapcave/paladinpad/info.json
+++ b/keyboards/kapcave/paladinpad/info.json
@@ -13,77 +13,81 @@
   "layouts": {
       "LAYOUT_ortho_5x4": {
           "layout": [
-              {"x":0, "y":0},
-              {"x":1, "y":0},
-              {"x":2, "y":0},
-              {"x":3, "y":0},
-              {"x":0, "y":1},
-              {"x":1, "y":1},
-              {"x":2, "y":1},
-              {"x":3, "y":1},
-              {"x":0, "y":2},
-              {"x":1, "y":2},
-              {"x":2, "y":2},
-              {"x":3, "y":2},
-              {"x":0, "y":3},
-              {"x":1, "y":3},
-              {"x":2, "y":3},
-              {"x":3, "y":3},
-              {"x":0, "y":4},
-              {"x":1, "y":4},
-              {"x":2, "y":4},
-              {"x":3, "y":4}
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
+
+              {"matrix": [1, 0], "x": 0, "y": 1},
+              {"matrix": [1, 1], "x": 1, "y": 1},
+              {"matrix": [1, 2], "x": 2, "y": 1},
+              {"matrix": [1, 3], "x": 3, "y": 1},
+
+              {"matrix": [2, 0], "x": 0, "y": 2},
+              {"matrix": [2, 1], "x": 1, "y": 2},
+              {"matrix": [2, 2], "x": 2, "y": 2},
+              {"matrix": [2, 3], "x": 3, "y": 2},
+
+              {"matrix": [3, 0], "x": 0, "y": 3},
+              {"matrix": [3, 1], "x": 1, "y": 3},
+              {"matrix": [3, 2], "x": 2, "y": 3},
+              {"matrix": [4, 3], "x": 3, "y": 3},
+
+              {"matrix": [4, 0], "x": 0, "y": 4},
+              {"matrix": [4, 2], "x": 1, "y": 4},
+              {"matrix": [4, 1], "x": 2, "y": 4},
+              {"matrix": [3, 3], "x": 3, "y": 4}
           ]
       },
       "LAYOUT_numpad_aek": {
           "layout": [
-              {"x":0, "y":0},
-              {"x":1, "y":0},
-              {"x":2, "y":0},
-              {"x":3, "y":0},
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
 
-              {"x":0, "y":1},
-              {"x":1, "y":1},
-              {"x":2, "y":1},
-              {"x":3, "y":1},
+              {"matrix": [1, 0], "x": 0, "y": 1},
+              {"matrix": [1, 1], "x": 1, "y": 1},
+              {"matrix": [1, 2], "x": 2, "y": 1},
+              {"matrix": [1, 3], "x": 3, "y": 1},
 
-              {"x":0, "y":2},
-              {"x":1, "y":2},
-              {"x":2, "y":2},
-              {"x":3, "y":2},
+              {"matrix": [2, 0], "x": 0, "y": 2},
+              {"matrix": [2, 1], "x": 1, "y": 2},
+              {"matrix": [2, 2], "x": 2, "y": 2},
+              {"matrix": [2, 3], "x": 3, "y": 2},
 
-              {"x":0, "y":3},
-              {"x":1, "y":3},
-              {"x":2, "y":3},
+              {"matrix": [3, 0], "x": 0, "y": 3},
+              {"matrix": [3, 1], "x": 1, "y": 3},
+              {"matrix": [3, 2], "x": 2, "y": 3},
 
-              {"x":0, "y":4, "w":2},
-              {"x":2, "y":4},
-              {"x":3, "y":3, "h":2}
+              {"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}
           ]
       },
       "LAYOUT_numpad_5x4": {
         "layout": [
-              {"x":0, "y":0},
-              {"x":1, "y":0},
-              {"x":2, "y":0},
-              {"x":3, "y":0},
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
 
-              {"x":0, "y":1},
-              {"x":1, "y":1},
-              {"x":2, "y":1},
+              {"matrix": [1, 0], "x": 0, "y": 1},
+              {"matrix": [1, 1], "x": 1, "y": 1},
+              {"matrix": [1, 2], "x": 2, "y": 1},
 
-              {"x":0, "y":2},
-              {"x":1, "y":2},
-              {"x":2, "y":2},
-              {"x":3, "y":1, "h":2},
+              {"matrix": [2, 0], "x": 0, "y": 2},
+              {"matrix": [2, 1], "x": 1, "y": 2},
+              {"matrix": [2, 2], "x": 2, "y": 2},
+              {"matrix": [2, 3], "x": 3, "y": 1, "h": 2},
 
-              {"x":0, "y":3},
-              {"x":1, "y":3},
-              {"x":2, "y":3},
+              {"matrix": [3, 0], "x": 0, "y": 3},
+              {"matrix": [3, 1], "x": 1, "y": 3},
+              {"matrix": [3, 2], "x": 2, "y": 3},
 
-              {"x":0, "y":4, "w":2},
-              {"x":2, "y":4},
-              {"x":3, "y":3, "h":2}
+              {"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/kapcave/paladinpad/paladinpad.c b/keyboards/kapcave/paladinpad/paladinpad.c
deleted file mode 100644
index 063e49c872..0000000000
--- a/keyboards/kapcave/paladinpad/paladinpad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "paladinpad.h"
diff --git a/keyboards/kapcave/paladinpad/paladinpad.h b/keyboards/kapcave/paladinpad/paladinpad.h
deleted file mode 100644
index 54b320c424..0000000000
--- a/keyboards/kapcave/paladinpad/paladinpad.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-/*
- * ┌─────┬─────┬─────┬─────�
- * │Num1 │ Eq  │Slsh │Star │
- * ├─────┼─────┼─────┼─────┤
- * │  7  │  8  │  9  │     │
- * ├─────┼─────┼─────┤Plus │
- * │  4  │  5  │  6  │     │
- * ├─────┼─────┼─────┼─────┤
- * │  1  │  2  │  3  │     │
- * ├─────┴─────┼─────┤ Ent │
- * │     0     │  .  │     │
- * └───────────┴─────┴─────┘
- */
-
-#define LAYOUT_numpad_5x4( \
-	K_NUM1, K_SLSH, K_STAR, K_MINUS, \
-    K_7, K_8, K_9, \
-    K_4, K_5, K_6, K_PLUS, \
-    K_1, K_2, K_3, \
-         K_0, K_DOT, K_ENT   \
-) { \
-	{ K_NUM1, K_SLSH, K_STAR, K_MINUS }, \
-    { K_7, K_8, K_9, KC_NO }, \
-    { K_4, K_5, K_6, K_PLUS }, \
-    { K_1, K_2, K_3, K_ENT }, \
-    { K_0, K_DOT, KC_NO, KC_NO }  \
-}
-
-/*
- * ┌─────┬─────┬─────┬─────�
- * │Num1 │Eql  │Slsh │Star │
- * ├─────┼─────┼─────┼─────┤
- * │  7  │  8  │  9  │Minus│
- * ├─────┼─────┼─────┼─────┤
- * │  4  │  5  │  6  │Plus │
- * ├─────┼─────┼─────┼─────┤
- * │  1  │  2  │  3  │     │
- * ├─────┼─────┼─────┤ Ent │
- * │  0  │ 10  │  .  │     │
- * └─────┴─────┴─────┴─────┘
- */
-
-#define LAYOUT_numpad_aek( \
-	K_NUM1, K_EQ1, K_SLSH1, K_STAR1, \
-    K_7, K_8, K_9, K_MINUS1, \
-    K_4, K_5, K_6, K_PLUS, \
-    K_1, K_2, K_3, \
-         K_0, K_DOT1, K_ENT   \
-) { \
-	{ K_NUM1, K_EQ1, K_SLSH1, K_STAR1 }, \
-    { K_7, K_8, K_9, K_MINUS1 }, \
-    { K_4, K_5, K_6, K_PLUS }, \
-    { K_1, K_2, K_3, K_ENT }, \
-    { K_0, K_DOT1, KC_NO, KC_NO }  \
-}
-
-/*
- * ┌─────┬─────┬─────┬─────�
- * │Num1 │ Eq  │Slsh │Star │
- * ├─────┼─────┼─────┼─────┤
- * │  7  │  8  │  9  │Minus│
- * ├─────┼─────┼─────┼─────┤
- * │  4  │  5  │  6  │Plus │
- * ├─────┼─────┼─────┼─────┤
- * │  1  │  2  │  3  │ 11  │
- * ├─────┼─────┼─────┼─────┤
- * │  0  │ 10  │  .  │ Ent │
- * └─────┴─────┴─────┴─────┘
- */
-
-#define LAYOUT_ortho_5x4( \
-	K_NUM1, K_EQ1, K_SLSH1, K_STAR1, \
-    K_7, K_8, K_9, K_MINUS1, \
-    K_4, K_5, K_6, K_PLUS, \
-    K_1, K_2, K_3, K_11, \
-    K_0, K_10, K_DOT1, K_ENT   \
-) { \
-	{ K_NUM1, K_EQ1, K_SLSH1, K_STAR1 }, \
-    { K_7, K_8, K_9, K_MINUS1 }, \
-    { K_4, K_5, K_6, K_PLUS }, \
-    { K_1, K_2, K_3, K_ENT }, \
-    { K_0, K_DOT1, K_10, K_11 }  \
-}
diff --git a/keyboards/kapcave/paladinpad/rev1/config.h b/keyboards/kapcave/paladinpad/rev1/config.h
index 959d80429c..386e4b0a0c 100644
--- a/keyboards/kapcave/paladinpad/rev1/config.h
+++ b/keyboards/kapcave/paladinpad/rev1/config.h
@@ -16,14 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C7, B6, B4, D7, D6 }
-#define MATRIX_COL_PINS { D4, D5, D3, B7 }
-
-#define RGB_DI_PIN D0
-
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 12
-#endif
diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/info.json
index 90ac25f360..0fec9260a9 100644
--- a/keyboards/kapcave/paladinpad/rev1/info.json
+++ b/keyboards/kapcave/paladinpad/rev1/info.json
@@ -1,5 +1,13 @@
 {
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "D5", "D3", "B7"],
+        "rows": ["C7", "B6", "B4", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/kapcave/paladinpad/rev2/config.h b/keyboards/kapcave/paladinpad/rev2/config.h
index 3c769a530a..239a873384 100644
--- a/keyboards/kapcave/paladinpad/rev2/config.h
+++ b/keyboards/kapcave/paladinpad/rev2/config.h
@@ -16,16 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F6, D7, B4, D6 }
-#define MATRIX_COL_PINS { F7, F5, D3, B7 }
-
 #define AUDIO_PIN C6
 
-#define RGB_DI_PIN D0
-
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,5 +32,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 12
-#endif
-
diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/info.json
index e557e4d307..699cdde82d 100644
--- a/keyboards/kapcave/paladinpad/rev2/info.json
+++ b/keyboards/kapcave/paladinpad/rev2/info.json
@@ -1,5 +1,13 @@
 {
     "usb": {
         "device_version": "0.0.2"
-    }
+    },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F5", "D3", "B7"],
+        "rows": ["F4", "F6", "D7", "B4", "D6"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/kapl/kapl.c b/keyboards/kapl/kapl.c
deleted file mode 100644
index 165900e142..0000000000
--- a/keyboards/kapl/kapl.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2022 Alexander Lozyuk (@keyzog)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "kapl.h"
diff --git a/keyboards/kapl/kapl.h b/keyboards/kapl/kapl.h
deleted file mode 100644
index 019e3267d4..0000000000
--- a/keyboards/kapl/kapl.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2022 Alexander Lozyuk (@keyzog)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-#include "quantum.h"
-
-#ifdef KEYBOARD_kapl_rev1
-#   include "rev1.h"
-#endif
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
index b99ab977a8..387e26aa73 100644
--- a/keyboards/kapl/rev1/config.h
+++ b/keyboards/kapl/rev1/config.h
@@ -2,18 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Select hand configuration */
 #define MASTER_LEFT
 
-
-#define RGB_DI_PIN D4
 #define RGBLED_NUM 88
 #define RGBLED_SPLIT { 44, 44 }
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
index 483bc655c0..9c5891d119 100644
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@@ -8,6 +8,17 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D4"
+  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
   },
@@ -49,14 +60,14 @@
               {"label":"L20", "x":0, "y":2.38},
               {"label":"L21", "x":1, "y":2.38},
               {"label":"L22", "x":2, "y":2.13},
-              {"label":"L23", "x":3, "y":2.0},
+              {"label":"L23", "x":3, "y":2},
               {"label":"L24", "x":4, "y":2.13},
               {"label":"L25", "x":5, "y":2.25},
               {"label":"L26", "x":6, "y":2.35},
               {"label":"R20", "x":8.67, "y":2.35},
               {"label":"R21", "x":9.67, "y":2.25},
               {"label":"R22", "x":10.67, "y":2.13},
-              {"label":"R23", "x":11.67, "y":2.0},
+              {"label":"R23", "x":11.67, "y":2},
               {"label":"R24", "x":12.67, "y":2.13},
               {"label":"R25", "x":13.67, "y":2.38},
               {"label":"R26", "x":14.67, "y":2.38},
@@ -64,14 +75,14 @@
               {"label":"L30", "x":0, "y":3.38},
               {"label":"L31", "x":1, "y":3.38},
               {"label":"L32", "x":2, "y":3.13},
-              {"label":"L33", "x":3, "y":3.0},
+              {"label":"L33", "x":3, "y":3},
               {"label":"L34", "x":4, "y":3.13},
               {"label":"L35", "x":5, "y":3.25},
               {"label":"L36", "x":6, "y":3.35},
               {"label":"R30", "x":8.67, "y":3.35},
               {"label":"R31", "x":9.67, "y":3.25},
               {"label":"R32", "x":10.67, "y":3.13},
-              {"label":"R33", "x":11.67, "y":3.0},
+              {"label":"R33", "x":11.67, "y":3},
               {"label":"R34", "x":12.67, "y":3.13},
               {"label":"R35", "x":13.67, "y":3.38},
               {"label":"R36", "x":14.67, "y":3.38},
@@ -79,14 +90,14 @@
               {"label":"L40", "x":0, "y":4.38},
               {"label":"L41", "x":1, "y":4.38},
               {"label":"L42", "x":2, "y":4.13},
-              {"label":"L43", "x":3, "y":4.0},
+              {"label":"L43", "x":3, "y":4},
               {"label":"L44", "x":4, "y":4.13},
               {"label":"L45", "x":5.35, "y":4.92},
               {"label":"L46", "x":6.35, "y":4.45, "h":1.5},
               {"label":"R40", "x":8.02, "y":4.45, "h":1.5},
               {"label":"R41", "x":9.02, "y":4.92},
               {"label":"R42", "x":10.67, "y":4.13},
-              {"label":"R43", "x":11.67, "y":4.0},
+              {"label":"R43", "x":11.67, "y":4},
               {"label":"R44", "x":12.67, "y":4.13},
               {"label":"R45", "x":13.67, "y":4.38},
               {"label":"R46", "x":14.67, "y":4.38}
diff --git a/keyboards/kapl/rev1/rev1.c b/keyboards/kapl/rev1/rev1.c
index b51021307e..e0e32cf5e8 100644
--- a/keyboards/kapl/rev1/rev1.c
+++ b/keyboards/kapl/rev1/rev1.c
@@ -1,6 +1,6 @@
 // Copyright 2022 Alexander Lozyuk (@keyzog)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include "kapl.h"
+#include "rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kapl/rev1/rev1.h b/keyboards/kapl/rev1/rev1.h
index 68649a7991..686ff89e92 100644
--- a/keyboards/kapl/rev1/rev1.h
+++ b/keyboards/kapl/rev1/rev1.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "kapl.h"
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *
diff --git a/keyboards/kapl/rev1/rules.mk b/keyboards/kapl/rev1/rules.mk
index e3a4137694..95bef6d3a7 100644
--- a/keyboards/kapl/rev1/rules.mk
+++ b/keyboards/kapl/rev1/rules.mk
@@ -1,5 +1,4 @@
 # Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LTO_ENABLE = yes
diff --git a/keyboards/karlb/kbic65/info.json b/keyboards/karlb/kbic65/info.json
index e37b1ce987..b1a79083bd 100644
--- a/keyboards/karlb/kbic65/info.json
+++ b/keyboards/karlb/kbic65/info.json
@@ -41,692 +41,692 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"BkSp1", "x":13, "y":0},
-                {"label":"BkSp2", "x":14, "y":0},
-                {"label":"Home", "x":15.5, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15.5, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"ISO |", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"↑", "x":14.25, "y":3.25},
-                {"label":"End", "x":15.5, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4},
-                {"label":"Win", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"�", "x":13.25, "y":4.25},
-                {"label":"↓", "x":14.25, "y":4.25},
-                {"label":"→", "x":15.25, "y":4.25}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 2], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 3], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 4], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 1], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 2], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 3], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 3},
+                {"matrix": [7, 1], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 2], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 3], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 4], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 6], "x": 14.25, "y": 3.25},
+                {"matrix": [5, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4},
+                {"matrix": [8, 6], "x": 12, "y": 4},
+                {"matrix": [8, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [7, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [6, 7], "x": 15.25, "y": 4.25}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"\"", "x":2, "y":0},
-                {"label":"£", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"BackSpace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15.5, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"@", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15.5, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"↑", "x":14.25, "y":3.25},
-                {"label":"End", "x":15.5, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4},
-                {"label":"Win", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"�", "x":13.25, "y":4.25},
-                {"label":"↓", "x":14.25, "y":4.25},
-                {"label":"→", "x":15.25, "y":4.25}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 2], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 3], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 4], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 1], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 2], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 3], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2},
+                {"matrix": [2, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 3},
+                {"matrix": [7, 1], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 2], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 3], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 4], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 6], "x": 14.25, "y": 3.25},
+                {"matrix": [5, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4},
+                {"matrix": [8, 6], "x": 12, "y": 4},
+                {"matrix": [8, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [7, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [6, 7], "x": 15.25, "y": 4.25}
             ]
         },
         "LAYOUT_65_iso_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"\"", "x":2, "y":0},
-                {"label":"£", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"BkSp1", "x":13, "y":0},
-                {"label":"BkSp2", "x":14, "y":0},
-                {"label":"Home", "x":15.5, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"@", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15.5, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"↑", "x":14.25, "y":3.25},
-                {"label":"End", "x":15.5, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4},
-                {"label":"Win", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"�", "x":13.25, "y":4.25},
-                {"label":"↓", "x":14.25, "y":4.25},
-                {"label":"→", "x":15.25, "y":4.25}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 2], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 3], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 4], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 1], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 2], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 3], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2},
+                {"matrix": [2, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 3},
+                {"matrix": [7, 1], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 2], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 3], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 4], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 6], "x": 14.25, "y": 3.25},
+                {"matrix": [5, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4},
+                {"matrix": [8, 6], "x": 12, "y": 4},
+                {"matrix": [8, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [7, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [6, 7], "x": 15.25, "y": 4.25}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"\"", "x":2, "y":0},
-                {"label":"£", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"BackSpace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15.5, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"@", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15.5, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"↑", "x":14.25, "y":3.25},
-                {"label":"End", "x":15.5, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"�", "x":13.25, "y":4.25},
-                {"label":"↓", "x":14.25, "y":4.25},
-                {"label":"→", "x":15.25, "y":4.25}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 2], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 3], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 4], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 1], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 2], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 3], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2},
+                {"matrix": [2, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 3},
+                {"matrix": [7, 1], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 2], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 3], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 4], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 6], "x": 14.25, "y": 3.25},
+                {"matrix": [5, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [7, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [6, 7], "x": 15.25, "y": 4.25}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"\"", "x":2, "y":0},
-                {"label":"£", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"BkSp1", "x":13, "y":0},
-                {"label":"BkSp2", "x":14, "y":0},
-                {"label":"Home", "x":15.5, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"@", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15.5, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"↑", "x":14.25, "y":3.25},
-                {"label":"End", "x":15.5, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"�", "x":13.25, "y":4.25},
-                {"label":"↓", "x":14.25, "y":4.25},
-                {"label":"→", "x":15.25, "y":4.25}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 2], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 3], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 4], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 1], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 2], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 3], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2},
+                {"matrix": [2, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 3},
+                {"matrix": [7, 1], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 2], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 3], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 4], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 6], "x": 14.25, "y": 3.25},
+                {"matrix": [5, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [7, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [6, 7], "x": 15.25, "y": 4.25}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"BackSpace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15.5, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15.5, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"↑", "x":14.25, "y":3.25},
-                {"label":"End", "x":15.5, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4},
-                {"label":"Win", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"�", "x":13.25, "y":4.25},
-                {"label":"↓", "x":14.25, "y":4.25},
-                {"label":"→", "x":15.25, "y":4.25}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 2], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 3], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 4], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 1], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 2], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 3], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 1], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 2], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 3], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 4], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 6], "x": 14.25, "y": 3.25},
+                {"matrix": [5, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4},
+                {"matrix": [8, 6], "x": 12, "y": 4},
+                {"matrix": [8, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [7, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [6, 7], "x": 15.25, "y": 4.25}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"BkSp1", "x":13, "y":0},
-                {"label":"BkSp2", "x":14, "y":0},
-                {"label":"Home", "x":15.5, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15.5, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"↑", "x":14.25, "y":3.25},
-                {"label":"End", "x":15.5, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4},
-                {"label":"Win", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"�", "x":13.25, "y":4.25},
-                {"label":"↓", "x":14.25, "y":4.25},
-                {"label":"→", "x":15.25, "y":4.25}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 2], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 3], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 4], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 1], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 2], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 3], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 1], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 2], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 3], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 4], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 6], "x": 14.25, "y": 3.25},
+                {"matrix": [5, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4},
+                {"matrix": [8, 6], "x": 12, "y": 4},
+                {"matrix": [8, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [7, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [6, 7], "x": 15.25, "y": 4.25}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"BackSpace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15.5, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15.5, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"↑", "x":14.25, "y":3.25},
-                {"label":"End", "x":15.5, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"�", "x":13.25, "y":4.25},
-                {"label":"↓", "x":14.25, "y":4.25},
-                {"label":"→", "x":15.25, "y":4.25}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 2], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 3], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 4], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 1], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 2], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 3], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 1], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 2], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 3], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 4], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 6], "x": 14.25, "y": 3.25},
+                {"matrix": [5, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [7, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [6, 7], "x": 15.25, "y": 4.25}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"BkSp1", "x":13, "y":0},
-                {"label":"BkSp2", "x":14, "y":0},
-                {"label":"Home", "x":15.5, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15.5, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"↑", "x":14.25, "y":3.25},
-                {"label":"End", "x":15.5, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"�", "x":13.25, "y":4.25},
-                {"label":"↓", "x":14.25, "y":4.25},
-                {"label":"→", "x":15.25, "y":4.25}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 2], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 3], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 4], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15.5, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 1], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 2], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 3], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 1], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 2], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 3], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 4], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 6], "x": 14.25, "y": 3.25},
+                {"matrix": [5, 7], "x": 15.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [7, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [6, 7], "x": 15.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/karlb/kbic65/kbic65.c b/keyboards/karlb/kbic65/kbic65.c
deleted file mode 100644
index 910c2a6c72..0000000000
--- a/keyboards/karlb/kbic65/kbic65.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 Karl Berggren <@bkarl>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "kbic65.h"
diff --git a/keyboards/karlb/kbic65/kbic65.h b/keyboards/karlb/kbic65/kbic65.h
deleted file mode 100644
index 697072b550..0000000000
--- a/keyboards/karlb/kbic65/kbic65.h
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright 2021 Karl Berggren <@bkarl>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───�    ┌───────�
- *              │10 │00 │11 │01 │12 │02 │13 │03 │14 │04 │15 │05 │16 │06 │17 │ │07 │    │06     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┤    └─┬─────┤
- *              │30   │20 │31 │21 │32 │22 │33 │23 │34 │24 │35 │25 │36 │26   │ │37 │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤   ┌──┴�26  │ ISO Enter
- *  LShift      │50    │40 │51 │41 │52 │42 │53 │43 │54 │44 │55 │45 │56      │ │47 │   │56 │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤   └───┴────┘
- * │70      │   │70  │60 │71 │61 │72 │62 │73 │63 │74 │64 │75 │65 │76    │┌───�│57 │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│66 │└───┘
- *              │80  │81  │82  │83                      │84 │85 │86 │┌───┼───┼───�
- *              └────┴────┴────┴────────────────────────┴───┴───┴───┘│87 │77 │67 │
- *                                                                   └───┴───┴───┘
- *                              K83+K84 can be 6.25u/1u or 6u/1.25u
- *              ┌────┬────┬────┬────────────────────────┬────┬────�
- *              │80  │81  │82  │83                      │84  │85  │ 65% with Blocker
- *              └────┴────┴────┴────────────────────────┴────┴────┘
- */
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_all( \
-         K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K17, K07, \
-         K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K26,      K37, \
-         K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56,           K47, \
-         K70, K60, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76,      K66, K57, \
-         K80, K81, K82,                K83,                K84, K85, K86, K87, K77, K67  \
-) { \
-        {K00, K01, K02, K03, K04, K05, K06, K07}, \
-        {K10, K11, K12, K13, K14, K15, K16, K17}, \
-        {K20, K21, K22, K23, K24, K25, K26, ___}, \
-        {K30, K31, K32, K33, K34, K35, K36, K37}, \
-        {K40, K41, K42, K43, K44, K45, ___, K47}, \
-        {K50, K51, K52, K53, K54, K55, K56, K57}, \
-        {K60, K61, K62, K63, K64, K65, K66, K67}, \
-        {K70, K71, K72, K73, K74, K75, K76, K77}, \
-        {K80, K81, K82, K83, K84, K85, K86, K87} \
-}
-
-#define LAYOUT_65_iso( \
-         K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16,   K06,    K07, \
-         K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36,           K37, \
-         K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K26,      K47, \
-         K70, K60, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76,      K66, K57, \
-         K80, K81, K82,                K83,                K84, K85, K86, K87, K77, K67  \
-) { \
-        {K00, K01, K02, K03, K04, K05, K06, K07}, \
-        {K10, K11, K12, K13, K14, K15, K16, ___}, \
-        {K20, K21, K22, K23, K24, K25, K26, ___}, \
-        {K30, K31, K32, K33, K34, K35, K36, K37}, \
-        {K40, K41, K42, K43, K44, K45, ___, K47}, \
-        {K50, K51, K52, K53, K54, K55, K56, K57}, \
-        {K60, K61, K62, K63, K64, K65, K66, K67}, \
-        {K70, K71, K72, K73, K74, K75, K76, K77}, \
-        {K80, K81, K82, K83, K84, K85, K86, K87} \
-}
-
-#define LAYOUT_65_iso_split_bs( \
-         K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K17, K07, \
-         K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36,           K37, \
-         K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K26,      K47, \
-         K70, K60, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76,      K66, K57, \
-         K80, K81, K82,                K83,                K84, K85, K86, K87, K77, K67  \
-) { \
-        {K00, K01, K02, K03, K04, K05, K06, K07}, \
-        {K10, K11, K12, K13, K14, K15, K16, K17}, \
-        {K20, K21, K22, K23, K24, K25, K26, ___}, \
-        {K30, K31, K32, K33, K34, K35, K36, K37}, \
-        {K40, K41, K42, K43, K44, K45, ___, K47}, \
-        {K50, K51, K52, K53, K54, K55, K56, K57}, \
-        {K60, K61, K62, K63, K64, K65, K66, K67}, \
-        {K70, K71, K72, K73, K74, K75, K76, K77}, \
-        {K80, K81, K82, K83, K84, K85, K86, K87} \
-}
-
-#define LAYOUT_65_iso_blocker( \
-         K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16,   K06,    K07, \
-         K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36,           K37, \
-         K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K26,      K47, \
-         K70, K60, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76,      K66, K57, \
-         K80, K81, K82,                K83,                K84, K85,      K87, K77, K67  \
-) { \
-        {K00, K01, K02, K03, K04, K05, K06, K07}, \
-        {K10, K11, K12, K13, K14, K15, K16, ___}, \
-        {K20, K21, K22, K23, K24, K25, K26, ___}, \
-        {K30, K31, K32, K33, K34, K35, K36, K37}, \
-        {K40, K41, K42, K43, K44, K45, ___, K47}, \
-        {K50, K51, K52, K53, K54, K55, K56, K57}, \
-        {K60, K61, K62, K63, K64, K65, K66, K67}, \
-        {K70, K71, K72, K73, K74, K75, K76, K77}, \
-        {K80, K81, K82, K83, K84, K85, ___, K87} \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-         K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K17, K07, \
-         K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36,           K37, \
-         K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K26,      K47, \
-         K70, K60, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76,      K66, K57, \
-         K80, K81, K82,                K83,                K84, K85,      K87, K77, K67  \
-) { \
-        {K00, K01, K02, K03, K04, K05, K06, K07}, \
-        {K10, K11, K12, K13, K14, K15, K16, K17}, \
-        {K20, K21, K22, K23, K24, K25, K26, ___}, \
-        {K30, K31, K32, K33, K34, K35, K36, K37}, \
-        {K40, K41, K42, K43, K44, K45, ___, K47}, \
-        {K50, K51, K52, K53, K54, K55, K56, K57}, \
-        {K60, K61, K62, K63, K64, K65, K66, K67}, \
-        {K70, K71, K72, K73, K74, K75, K76, K77}, \
-        {K80, K81, K82, K83, K84, K85, ___, K87} \
-}
-
-#define LAYOUT_65_ansi( \
-         K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16,   K06,    K07, \
-         K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K26,      K37, \
-         K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45,      K56,      K47, \
-         K70,      K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76,      K66, K57, \
-         K80, K81, K82,                K83,                K84, K85, K86, K87, K77, K67  \
-) { \
-        {K00, K01, K02, K03, K04, K05, K06, K07}, \
-        {K10, K11, K12, K13, K14, K15, K16, ___}, \
-        {K20, K21, K22, K23, K24, K25, K26, ___}, \
-        {K30, K31, K32, K33, K34, K35, K36, K37}, \
-        {K40, K41, K42, K43, K44, K45, ___, K47}, \
-        {K50, K51, K52, K53, K54, K55, K56, K57}, \
-        {___, K61, K62, K63, K64, K65, K66, K67}, \
-        {K70, K71, K72, K73, K74, K75, K76, K77}, \
-        {K80, K81, K82, K83, K84, K85, K86, K87} \
-}
-
-#define LAYOUT_65_ansi_split_bs( \
-         K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K17, K07, \
-         K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K26,      K37, \
-         K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45,      K56,      K47, \
-         K70,      K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76,      K66, K57, \
-         K80, K81, K82,                K83,                K84, K85, K86, K87, K77, K67  \
-) { \
-        {K00, K01, K02, K03, K04, K05, K06, K07}, \
-        {K10, K11, K12, K13, K14, K15, K16, K17}, \
-        {K20, K21, K22, K23, K24, K25, K26, ___}, \
-        {K30, K31, K32, K33, K34, K35, K36, K37}, \
-        {K40, K41, K42, K43, K44, K45, ___, K47}, \
-        {K50, K51, K52, K53, K54, K55, K56, K57}, \
-        {___, K61, K62, K63, K64, K65, K66, K67}, \
-        {K70, K71, K72, K73, K74, K75, K76, K77}, \
-        {K80, K81, K82, K83, K84, K85, K86, K87} \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-         K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16,   K06,    K07, \
-         K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K26,      K37, \
-         K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45,      K56,      K47, \
-         K70,      K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76,      K66, K57, \
-         K80, K81, K82,                K83,                K84, K85,      K87, K77, K67  \
-) { \
-        {K00, K01, K02, K03, K04, K05, K06, K07}, \
-        {K10, K11, K12, K13, K14, K15, K16, ___}, \
-        {K20, K21, K22, K23, K24, K25, K26, ___}, \
-        {K30, K31, K32, K33, K34, K35, K36, K37}, \
-        {K40, K41, K42, K43, K44, K45, ___, K47}, \
-        {K50, K51, K52, K53, K54, K55, K56, K57}, \
-        {___, K61, K62, K63, K64, K65, K66, K67}, \
-        {K70, K71, K72, K73, K74, K75, K76, K77}, \
-        {K80, K81, K82, K83, K84, K85, ___, K87} \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-         K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K17, K07, \
-         K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K26,      K37, \
-         K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45,      K56,      K47, \
-         K70,      K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76,      K66, K57, \
-         K80, K81, K82,                K83,                K84, K85,      K87, K77, K67  \
-) { \
-        {K00, K01, K02, K03, K04, K05, K06, K07}, \
-        {K10, K11, K12, K13, K14, K15, K16, K17}, \
-        {K20, K21, K22, K23, K24, K25, K26, ___}, \
-        {K30, K31, K32, K33, K34, K35, K36, K37}, \
-        {K40, K41, K42, K43, K44, K45, ___, K47}, \
-        {K50, K51, K52, K53, K54, K55, K56, K57}, \
-        {___, K61, K62, K63, K64, K65, K66, K67}, \
-        {K70, K71, K72, K73, K74, K75, K76, K77}, \
-        {K80, K81, K82, K83, K84, K85, ___, K87} \
-}
diff --git a/keyboards/karn/keymaps/colemak/config.h b/keyboards/karn/keymaps/colemak/config.h
index 71eb08ed1e..22d190164b 100644
--- a/keyboards/karn/keymaps/colemak/config.h
+++ b/keyboards/karn/keymaps/colemak/config.h
@@ -3,11 +3,6 @@
 
 #pragma once
 
-// Equivalent to zmk behavior-hold-tap tap-preferred flavor
-// Do not force the mod-tap key press to be handled as a modifier
-// if any other key was pressed while the mod-tap key is held down.
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
-
 // Equivalent to zmk behavior-hold-tap hold-preferred flavor
 #define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
 
diff --git a/keyboards/karn/keymaps/colemak/keymap.c b/keyboards/karn/keymaps/colemak/keymap.c
index dbe78c0dad..63b34f785e 100644
--- a/keyboards/karn/keymaps/colemak/keymap.c
+++ b/keyboards/karn/keymaps/colemak/keymap.c
@@ -27,37 +27,6 @@ bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
     }
 }
 
-bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case CTL_T(KC_X):
-            return true;
-        case ALT_T(KC_C):
-            return true;
-        case CMD_T(KC_V):
-            return true;
-        case CMD_T(KC_M):
-            return true;
-        case ALT_T(KC_COMM):
-            return true;
-        case CTL_T(KC_DOT):
-            return true;
-        case KC_X:
-            return true;
-        case KC_C:
-            return true;
-        case KC_V:
-            return true;
-        case KC_M:
-            return true;
-        case KC_COMM:
-            return true;
-        case KC_DOT:
-            return true;
-        default:
-            return false;
-    }
-}
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
@@ -93,4 +62,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                         _______, _______, _______,  _______, _______, _______
     )
 };
-
diff --git a/keyboards/kb58/config.h b/keyboards/kb58/config.h
index 44a674620d..da9f91c5f5 100644
--- a/keyboards/kb58/config.h
+++ b/keyboards/kb58/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, B6, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, D7, D4, D0 }
-#define MATRIX_ROW_PINS_RIGHT { F7, B5, B3, B2, B6 }
-#define MATRIX_COL_PINS_RIGHT { F6, B1, E6, D7, C6, D4, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kb58/info.json b/keyboards/kb58/info.json
index 6ba7d24197..8ae75ee34b 100644
--- a/keyboards/kb58/info.json
+++ b/keyboards/kb58/info.json
@@ -8,8 +8,19 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "D7", "D4", "D0"],
+        "rows": ["F4", "B6", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F6", "B1", "E6", "D7", "C6", "D4", "D0"],
+                "rows": ["F7", "B5", "B3", "B2", "B6"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/kb58/kb58.c b/keyboards/kb58/kb58.c
deleted file mode 100644
index 5d189fa321..0000000000
--- a/keyboards/kb58/kb58.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 beanaccle
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kb58.h"
diff --git a/keyboards/kb_elmo/67mk_e/67mk_e.c b/keyboards/kb_elmo/67mk_e/67mk_e.c
deleted file mode 100644
index 31254fe962..0000000000
--- a/keyboards/kb_elmo/67mk_e/67mk_e.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "67mk_e.h"
diff --git a/keyboards/kb_elmo/67mk_e/67mk_e.h b/keyboards/kb_elmo/67mk_e/67mk_e.h
deleted file mode 100644
index 5cf13408a9..0000000000
--- a/keyboards/kb_elmo/67mk_e/67mk_e.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_all( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,    k213,    k215, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
-    k400, k401, k402,                   k406,                   k411, k412, k413, k414, k415  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
-    { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,    k213,    k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
-    k400, k401, k402,                   k406,                   k411, k412, k413, k414, k415  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, ____, k015 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
-    { k300, ____, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
-    { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,    k213,    k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
-    k400, k401, k402,                   k406,                   k411, k412, k413, k414, k415  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
-    { k300, ____, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
-    { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,    k213,    k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
-    k400, k401, k402,                   k406,                         k412, k413, k414, k415  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, ____, k015 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
-    { k300, ____, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
-    { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, ____, k412, k413, k414, k415 }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k113, k213, k215, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
-    k400, k401, k402,                   k406,                   k411, k412, k413, k414, k415  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, ____, k015 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
-    { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k113, k213, k215, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
-    k400, k401, k402,                   k406,                   k411, k412, k413, k414, k415  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
-    { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 }  \
-}
diff --git a/keyboards/kb_elmo/67mk_e/config.h b/keyboards/kb_elmo/67mk_e/config.h
deleted file mode 100644
index a67fb68992..0000000000
--- a/keyboards/kb_elmo/67mk_e/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D7, B4, D6, D5, B0 }
-#define MATRIX_COL_PINS { B3, B2, B1, D4, D2, D3, C7, C6, B5, B6, F7, F6, F5, F0, F1, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/67mk_e/info.json b/keyboards/kb_elmo/67mk_e/info.json
index b1a69ac79b..9ca2831a11 100644
--- a/keyboards/kb_elmo/67mk_e/info.json
+++ b/keyboards/kb_elmo/67mk_e/info.json
@@ -8,6 +8,11 @@
         "pid": "0xD03E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B1", "D4", "D2", "D3", "C7", "C6", "B5", "B6", "F7", "F6", "F5", "F0", "F1", "F4"],
+        "rows": ["D7", "B4", "D6", "D5", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7"
     },
@@ -17,433 +22,457 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [1, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [1, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [1, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [1, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [1, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [1, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kb_elmo/aek2_usb/aek2_usb.c b/keyboards/kb_elmo/aek2_usb/aek2_usb.c
deleted file mode 100644
index 6ce5d21df7..0000000000
--- a/keyboards/kb_elmo/aek2_usb/aek2_usb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "aek2_usb.h"
diff --git a/keyboards/kb_elmo/aek2_usb/config.h b/keyboards/kb_elmo/aek2_usb/config.h
index 2861c4a904..92630de5b4 100644
--- a/keyboards/kb_elmo/aek2_usb/config.h
+++ b/keyboards/kb_elmo/aek2_usb/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { D5, C1, C4, D0, C3, C2, B3, B4 }
-#define MATRIX_COL_PINS { A1, A0, A2, A3, A4, A5, A6, A7, C7, C6, C5, C0, D6, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json
index 457762992b..a74553ba11 100644
--- a/keyboards/kb_elmo/aek2_usb/info.json
+++ b/keyboards/kb_elmo/aek2_usb/info.json
@@ -8,6 +8,11 @@
         "pid": "0xDB52",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "A0", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C0", "D6", "D1"],
+        "rows": ["D5", "C1", "C4", "D0", "C3", "C2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B1",
         "num_lock": "B2",
diff --git a/keyboards/kb_elmo/elmopad/config.h b/keyboards/kb_elmo/elmopad/config.h
deleted file mode 100644
index 92d08abe00..0000000000
--- a/keyboards/kb_elmo/elmopad/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2020 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { C5, C4, B2, B1, D7, B0 }
-#define MATRIX_COL_PINS { C0, C1, C2, C3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/elmopad/elmopad.c b/keyboards/kb_elmo/elmopad/elmopad.c
deleted file mode 100644
index bb905ed7e1..0000000000
--- a/keyboards/kb_elmo/elmopad/elmopad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "elmopad.h"
diff --git a/keyboards/kb_elmo/elmopad/elmopad.h b/keyboards/kb_elmo/elmopad/elmopad.h
deleted file mode 100644
index 413910a9d4..0000000000
--- a/keyboards/kb_elmo/elmopad/elmopad.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_numpad_6x4( \
-    k00, k01, k02, k03, \
-    k04, k05, k06, k07, \
-    k08, k09, k10,      \
-    k12, k13, k14, k15, \
-    k16, k17, k18,      \
-    k20,      k22, k23  \
-) { \
-    {k00,   k01,   k02,   k03   }, \
-    {k04,   k05,   k06,   k07   }, \
-    {k08,   k09,   k10,   KC_NO }, \
-    {k12,   k13,   k14,   k15   }, \
-    {k16,   k17,   k18,   KC_NO }, \
-    {k20,   KC_NO, k22,   k23   }  \
-}
diff --git a/keyboards/kb_elmo/elmopad/info.json b/keyboards/kb_elmo/elmopad/info.json
index a4e3e090e5..600daf3099 100644
--- a/keyboards/kb_elmo/elmopad/info.json
+++ b/keyboards/kb_elmo/elmopad/info.json
@@ -8,33 +8,43 @@
         "pid": "0x8B35",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3"],
+        "rows": ["C5", "C4", "B2", "B1", "D7", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "community_layouts": ["numpad_6x4"],
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x":0, "y":0}, 
-                {"x":1, "y":0}, 
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":0, "y":1}, 
-                {"x":1, "y":1}, 
-                {"x":2, "y":1}, 
-                {"x":3, "y":1}, 
-                {"x":0, "y":2}, 
-                {"x":1, "y":2}, 
-                {"x":2, "y":2}, 
-                {"x":0, "y":3}, 
-                {"x":1, "y":3}, 
-                {"x":2, "y":3}, 
-                {"x":3, "y":2, "h":2}, 
-                {"x":0, "y":4}, 
-                {"x":1, "y":4}, 
-                {"x":2, "y":4}, 
-                {"x":0, "y":5, "w":2}, 
-                {"x":2, "y":5},
-                {"x":3, "y":4, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 4, "h": 2}
             ]
         }
     }
diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h
index 4aeb5eaa00..0299a8ab1f 100644
--- a/keyboards/kb_elmo/isolation/config.h
+++ b/keyboards/kb_elmo/isolation/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* RGB backlight */
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 3
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -35,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json
index 6d108299d0..6b7f531eda 100644
--- a/keyboards/kb_elmo/isolation/info.json
+++ b/keyboards/kb_elmo/isolation/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4EE6",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B2"
+    },
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "matrix_pins": {
diff --git a/keyboards/kb_elmo/m0110a_usb/config.h b/keyboards/kb_elmo/m0110a_usb/config.h
index 792264af55..fd067c7fb7 100644
--- a/keyboards/kb_elmo/m0110a_usb/config.h
+++ b/keyboards/kb_elmo/m0110a_usb/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, D5 }
-#define MATRIX_COL_PINS { D7, C0, C1, C2, C3, D1, B4, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kb_elmo/m0110a_usb/info.json b/keyboards/kb_elmo/m0110a_usb/info.json
index 0663e62789..2e147e4325 100644
--- a/keyboards/kb_elmo/m0110a_usb/info.json
+++ b/keyboards/kb_elmo/m0110a_usb/info.json
@@ -8,6 +8,11 @@
         "pid": "0xDB4B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "C0", "C1", "C2", "C3", "D1", "B4", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+        "rows": ["B0", "B1", "B2", "B3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "layouts": {
diff --git a/keyboards/kb_elmo/m0110a_usb/m0110a_usb.c b/keyboards/kb_elmo/m0110a_usb/m0110a_usb.c
deleted file mode 100644
index 9711eca53e..0000000000
--- a/keyboards/kb_elmo/m0110a_usb/m0110a_usb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "m0110a_usb.h"
diff --git a/keyboards/kb_elmo/m0116_usb/config.h b/keyboards/kb_elmo/m0116_usb/config.h
index 5b8de9b54f..fd067c7fb7 100644
--- a/keyboards/kb_elmo/m0116_usb/config.h
+++ b/keyboards/kb_elmo/m0116_usb/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B1, A0, B2, A2, A1 }
-#define MATRIX_COL_PINS { D6, D5, D1, D0, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/info.json
index e01f965731..e0e1b23423 100644
--- a/keyboards/kb_elmo/m0116_usb/info.json
+++ b/keyboards/kb_elmo/m0116_usb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8F7E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D5", "D1", "D0", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3"],
+        "rows": ["B1", "A0", "B2", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [4, 5]
     },
diff --git a/keyboards/kb_elmo/m0116_usb/m0116_usb.c b/keyboards/kb_elmo/m0116_usb/m0116_usb.c
deleted file mode 100644
index 823e2abd0a..0000000000
--- a/keyboards/kb_elmo/m0116_usb/m0116_usb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "m0116_usb.h"
diff --git a/keyboards/kb_elmo/noah_avr/config.h b/keyboards/kb_elmo/noah_avr/config.h
index 8b59b3abd4..08501c982b 100644
--- a/keyboards/kb_elmo/noah_avr/config.h
+++ b/keyboards/kb_elmo/noah_avr/config.h
@@ -17,16 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B4, B6, D7, D5, D0 }
-#define MATRIX_COL_PINS { D1, D2, D3, D4, C6, C7, F7, F6, F5, F4, F0, F1, B3, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB */
-#define RGB_DI_PIN B5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kb_elmo/noah_avr/info.json b/keyboards/kb_elmo/noah_avr/info.json
index 151eda35b4..8db5edb6b6 100644
--- a/keyboards/kb_elmo/noah_avr/info.json
+++ b/keyboards/kb_elmo/noah_avr/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1DB0",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3", "D4", "C6", "C7", "F7", "F6", "F5", "F4", "F0", "F1", "B3", "B2", "B1", "B0"],
+        "rows": ["B4", "B6", "D7", "D5", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D6"
     },
@@ -22,383 +30,383 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kb_elmo/noah_avr/noah_avr.c b/keyboards/kb_elmo/noah_avr/noah_avr.c
deleted file mode 100644
index 6245bb6358..0000000000
--- a/keyboards/kb_elmo/noah_avr/noah_avr.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "noah_avr.h"
diff --git a/keyboards/kb_elmo/noah_avr/noah_avr.h b/keyboards/kb_elmo/noah_avr/noah_avr.h
deleted file mode 100644
index 66a85afa61..0000000000
--- a/keyboards/kb_elmo/noah_avr/noah_avr.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�      ┌───────�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │      │0D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      └─┬─────┤
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤     ┌──┴�2D  │ ISO Enter
- *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │     │1D │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤     └───┴────┘
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3F │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- *              │40  │41  │42  │46                      │4B  │4C  │ │4D │4E │4F │
- *              └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────�
- *              │40   │41 │42   │46                         │4C   │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
-    k40, k41, k42,                k46,           k4B, k4C,      k4D, k4E, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, ___, k4B, k4C, k4D, k4E, k4F }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
-    k40, k41, k42,                k46,           k4B, k4C,      k4D, k4E, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, ___, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___, k2F }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, ___, k4B, k4C, k4D, k4E, k4F }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
-    k40, k41, k42,                k46,           k4B, k4C,      k4D, k4E, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___, k2F }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, ___, k4B, k4C, k4D, k4E, k4F }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
-    k40, k41, k42,                k46,           k4B, k4C,      k4D, k4E, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, ___, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, ___, k4B, k4C, k4D, k4E, k4F }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
-    k40, k41, k42,                k46,           k4B, k4C,      k4D, k4E, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, ___, k4B, k4C, k4D, k4E, k4F }  \
-}
diff --git a/keyboards/kb_elmo/qez/config.h b/keyboards/kb_elmo/qez/config.h
deleted file mode 100644
index 131da19b8f..0000000000
--- a/keyboards/kb_elmo/qez/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { C6, C4, B1, B0 }
-#define MATRIX_COL_PINS { C7, B7, B6, B5, B4, B3, D6, D5, D4, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/qez/info.json b/keyboards/kb_elmo/qez/info.json
index ee52b8311b..a93c918479 100644
--- a/keyboards/kb_elmo/qez/info.json
+++ b/keyboards/kb_elmo/qez/info.json
@@ -8,6 +8,11 @@
         "pid": "0x675F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "B7", "B6", "B5", "B4", "B3", "D6", "D5", "D4", "D3"],
+        "rows": ["C6", "C4", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C5"
     },
@@ -16,121 +21,130 @@
     "layouts": {
         "LAYOUT_split_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0, "w":1.25},
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2, "w":1.5},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "w":2.25},
-                {"x":5.25, "y":3, "w":2},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 5.25, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3}
             ]
         },
         "LAYOUT_triple_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0, "w":1.25},
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2, "w":1.5},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3, "w":2.5},
-                {"x":4.5, "y":3, "w":1.5},
-                {"x":6, "y":3, "w":2.25},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 2, "y": 3, "w": 2.5},
+                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3}
             ]
         },
         "LAYOUT_full_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0, "w":1.25},
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2, "w":1.5},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3, "w":6.25},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 5], "x": 2, "y": 3, "w": 6.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/kb_elmo/qez/qez.c b/keyboards/kb_elmo/qez/qez.c
deleted file mode 100644
index 68808fad8e..0000000000
--- a/keyboards/kb_elmo/qez/qez.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "qez.h"
diff --git a/keyboards/kb_elmo/qez/qez.h b/keyboards/kb_elmo/qez/qez.h
deleted file mode 100644
index 0a3e2c0a7e..0000000000
--- a/keyboards/kb_elmo/qez/qez.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_split_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-    k20,    k22, k23, k24, k25, k26, k27, k28,   k29, \
-    k21, k31, k32,    k33,     k36,    k37, k38, k39  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { ___, k31, k32, k33, ___, ___, k36, k37, k38, k39 }  \
-}
-
-#define LAYOUT_triple_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-    k20,    k22, k23, k24, k25, k26, k27, k28,   k29, \
-    k21, k31,     k33,     k35,    k36,     k38, k39  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { ___, k31, ___, k33, ___, k35, k36, ___, k38, k39 }  \
-}
-
-#define LAYOUT_full_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-    k20,    k22, k23, k24, k25, k26, k27, k28,   k29, \
-    k21, k31,              k35,             k38, k39  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { ___, k31, ___, ___, ___, k35, ___, ___, k38, k39 }  \
-}
diff --git a/keyboards/kb_elmo/sesame/config.h b/keyboards/kb_elmo/sesame/config.h
index e4bbb7ce3d..6c6fc4208f 100644
--- a/keyboards/kb_elmo/sesame/config.h
+++ b/keyboards/kb_elmo/sesame/config.h
@@ -17,15 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { C4, C5, C6, C7, A7 }
-#define MATRIX_COL_PINS { D1, D5, D6, D7, C0, C1, C2, C3, A6, A5, A4, A3, A2, A1, A0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Workaround for https://github.com/qmk/qmk_firmware/issues/11389 */
 #define IGNORE_ATOMIC_BLOCK
diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/info.json
index 18060301f6..ef10a72599 100644
--- a/keyboards/kb_elmo/sesame/info.json
+++ b/keyboards/kb_elmo/sesame/info.json
@@ -8,287 +8,340 @@
     "pid": "0xE2BD",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D1", "D5", "D6", "D7", "C0", "C1", "C2", "C3", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+    "rows": ["C4", "C5", "C6", "C7", "A7"]
+  },
+  "diode_direction": "COL2ROW",
   "bootmagic": {
     "matrix": [0, 1]
   },
   "processor": "atmega32a",
   "bootloader": "usbasploader",
   "community_layouts": ["alice", "alice_split_bs"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_alice",
+    "LAYOUT_all": "LAYOUT_alice_split_bs"
+  },
   "layouts": {
     "LAYOUT_alice": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0, "w": 2},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":1.75},
-        {"x":17.25, "y":3},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 8], "x": 10.25, "y": 0},
+        {"matrix": [0, 9], "x": 11.25, "y": 0},
+        {"matrix": [0, 10], "x": 12.25, "y": 0},
+        {"matrix": [0, 11], "x": 13.25, "y": 0},
+        {"matrix": [0, 12], "x": 14.25, "y": 0},
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
       ]
     },
     "LAYOUT_alice_split_bs": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":1.75},
-        {"x":17.25, "y":3},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 8], "x": 10.25, "y": 0},
+        {"matrix": [0, 9], "x": 11.25, "y": 0},
+        {"matrix": [0, 10], "x": 12.25, "y": 0},
+        {"matrix": [0, 11], "x": 13.25, "y": 0},
+        {"matrix": [0, 12], "x": 14.25, "y": 0},
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [2, 13], "x": 16.25, "y": 0},
+        {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
       ]
     },
     "LAYOUT_long_rshift": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0, "w":2},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":2.75},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 8], "x": 10.25, "y": 0},
+        {"matrix": [0, 9], "x": 11.25, "y": 0},
+        {"matrix": [0, 10], "x": 12.25, "y": 0},
+        {"matrix": [0, 11], "x": 13.25, "y": 0},
+        {"matrix": [0, 12], "x": 14.25, "y": 0},
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
       ]
     },
     "LAYOUT_split_bs": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1.25, "y":0},
-        {"x":2.25, "y":0},
-        {"x":3.25, "y":0},
-        {"x":4.25, "y":0},
-        {"x":5.25, "y":0},
-        {"x":6.25, "y":0},
-        {"x":7.25, "y":0},
-        {"x":10.25, "y":0},
-        {"x":11.25, "y":0},
-        {"x":12.25, "y":0},
-        {"x":13.25, "y":0},
-        {"x":14.25, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-        {"x":17.25, "y":0},
-        {"x":0, "y":1},
-        {"x":1.25, "y":1, "w":1.5},
-        {"x":2.75, "y":1},
-        {"x":3.75, "y":1},
-        {"x":4.75, "y":1},
-        {"x":5.75, "y":1},
-        {"x":6.75, "y":1},
-        {"x":9.75, "y":1},
-        {"x":10.75, "y":1},
-        {"x":11.75, "y":1},
-        {"x":12.75, "y":1},
-        {"x":13.75, "y":1},
-        {"x":14.75, "y":1},
-        {"x":15.75, "y":1},
-        {"x":16.75, "y":1, "w":1.5},
-        {"x":0, "y":2},
-        {"x":1.25, "y":2, "w":1.75},
-        {"x":3, "y":2},
-        {"x":4, "y":2},
-        {"x":5, "y":2},
-        {"x":6, "y":2},
-        {"x":7, "y":2},
-        {"x":10, "y":2},
-        {"x":11, "y":2},
-        {"x":12, "y":2},
-        {"x":13, "y":2},
-        {"x":14, "y":2},
-        {"x":15, "y":2},
-        {"x":16, "y":2, "w":2.25},
-        {"x":1.25, "y":3, "w":2.25},
-        {"x":3.5, "y":3},
-        {"x":4.5, "y":3},
-        {"x":5.5, "y":3},
-        {"x":6.5, "y":3},
-        {"x":7.5, "y":3},
-        {"x":9.5, "y":3},
-        {"x":10.5, "y":3},
-        {"x":11.5, "y":3},
-        {"x":12.5, "y":3},
-        {"x":13.5, "y":3},
-        {"x":14.5, "y":3},
-        {"x":15.5, "y":3, "w":2.75},
-        {"x":1.25, "y":4, "w":1.5},
-        {"x":4.25, "y":4, "w":1.5},
-        {"x":5.75, "y":4, "w":2},
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9.5, "y":4, "w":2.75},
-        {"x":12.25, "y":4, "w":1.5},
-        {"x":16.75, "y":4, "w":1.5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 8], "x": 10.25, "y": 0},
+        {"matrix": [0, 9], "x": 11.25, "y": 0},
+        {"matrix": [0, 10], "x": 12.25, "y": 0},
+        {"matrix": [0, 11], "x": 13.25, "y": 0},
+        {"matrix": [0, 12], "x": 14.25, "y": 0},
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [2, 13], "x": 16.25, "y": 0},
+        {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
       ]
     }
   }
diff --git a/keyboards/kb_elmo/sesame/sesame.c b/keyboards/kb_elmo/sesame/sesame.c
deleted file mode 100644
index 4ca3d08f04..0000000000
--- a/keyboards/kb_elmo/sesame/sesame.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "sesame.h"
diff --git a/keyboards/kb_elmo/sesame/sesame.h b/keyboards/kb_elmo/sesame/sesame.h
deleted file mode 100644
index d596619c3a..0000000000
--- a/keyboards/kb_elmo/sesame/sesame.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_alice( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
-    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \
-         k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, \
-         k59,      k60,      k61, k62,      k63,      k64,           k65       \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13,   k14   }, \
-    { k15,   k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29   }, \
-    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   KC_NO, k44   }, \
-    { KC_NO, k45,   k46,   k47,   k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58   }, \
-    { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \
-}
-
-#define LAYOUT_alice_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k43, k14, \
-    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \
-         k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, \
-         k59,      k60,      k61, k62,      k63,      k64,           k65       \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13,   k14   }, \
-    { k15,   k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29   }, \
-    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44   }, \
-    { KC_NO, k45,   k46,   k47,   k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58   }, \
-    { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \
-}
-
-#define LAYOUT_long_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
-    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \
-         k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57,      \
-         k59,      k60,      k61, k62,      k63,      k64,           k65       \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13,   k14   }, \
-    { k15,   k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29   }, \
-    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   KC_NO, k44   }, \
-    { KC_NO, k45,   k46,   k47,   k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   KC_NO }, \
-    { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \
-}
-
-#define LAYOUT_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k43, k14, \
-    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \
-         k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57,      \
-         k59,      k60,      k61, k62,      k63,      k64,           k65       \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13,   k14   }, \
-    { k15,   k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29   }, \
-    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44   }, \
-    { KC_NO, k45,   k46,   k47,   k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   KC_NO }, \
-    { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \
-}
-
-#define LAYOUT LAYOUT_alice
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/kb_elmo/twelvekey/config.h b/keyboards/kb_elmo/twelvekey/config.h
deleted file mode 100644
index 19bd22c473..0000000000
--- a/keyboards/kb_elmo/twelvekey/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D1, C4, D7 }
-#define MATRIX_COL_PINS { C5, D0, B0, D6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/twelvekey/info.json b/keyboards/kb_elmo/twelvekey/info.json
index 0dfc233ff5..94e94ab874 100644
--- a/keyboards/kb_elmo/twelvekey/info.json
+++ b/keyboards/kb_elmo/twelvekey/info.json
@@ -8,6 +8,11 @@
         "pid": "0x9879",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C5", "D0", "B0", "D6"],
+        "rows": ["D1", "C4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B1",
         "levels": 8,
@@ -17,18 +22,21 @@
     "bootloader": "usbasploader",
     "layouts": {
         "LAYOUT_ortho_3x4": {
-            "layout": [{"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2}
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2}
             ]
         }
     }
diff --git a/keyboards/kb_elmo/twelvekey/twelvekey.c b/keyboards/kb_elmo/twelvekey/twelvekey.c
deleted file mode 100644
index 2a33acd92e..0000000000
--- a/keyboards/kb_elmo/twelvekey/twelvekey.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "twelvekey.h"
diff --git a/keyboards/kb_elmo/twelvekey/twelvekey.h b/keyboards/kb_elmo/twelvekey/twelvekey.h
deleted file mode 100644
index 3c4d884269..0000000000
--- a/keyboards/kb_elmo/twelvekey/twelvekey.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_3x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23  \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }  \
-}
diff --git a/keyboards/kb_elmo/vertex/config.h b/keyboards/kb_elmo/vertex/config.h
deleted file mode 100644
index 693a1f56f1..0000000000
--- a/keyboards/kb_elmo/vertex/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D2, D4, B7, C6 }
-#define MATRIX_COL_PINS { C4, C7, D3, D5, B6, D6, B5, B0, B4, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kb_elmo/vertex/info.json b/keyboards/kb_elmo/vertex/info.json
index 571dcb674c..ec022d5363 100644
--- a/keyboards/kb_elmo/vertex/info.json
+++ b/keyboards/kb_elmo/vertex/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6B47",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C4", "C7", "D3", "D5", "B6", "D6", "B5", "B0", "B4", "B1", "B3", "B2"],
+        "rows": ["D2", "D4", "B7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kb_elmo/vertex/vertex.c b/keyboards/kb_elmo/vertex/vertex.c
deleted file mode 100644
index 26467196f1..0000000000
--- a/keyboards/kb_elmo/vertex/vertex.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vertex.h"
diff --git a/keyboards/kbdclack/kaishi65/config.h b/keyboards/kbdclack/kaishi65/config.h
index 6f2f30f13a..39765a5bf7 100644
--- a/keyboards/kbdclack/kaishi65/config.h
+++ b/keyboards/kbdclack/kaishi65/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, B0, F0, F1 }
-#define MATRIX_COL_PINS { B2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kbdclack/kaishi65/info.json b/keyboards/kbdclack/kaishi65/info.json
index cad279ec3d..69c440f0be 100644
--- a/keyboards/kbdclack/kaishi65/info.json
+++ b/keyboards/kbdclack/kaishi65/info.json
@@ -8,12 +8,90 @@
         "pid": "0x1A81",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3"],
+        "rows": ["D0", "D1", "B0", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Del", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Pg up", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"up", "x":14, "y":3}, {"label":"Pg dn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"left", "x":13, "y":4}, {"label":"down", "x":14, "y":4}, {"label":"right", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/kbdclack/kaishi65/kaishi65.c b/keyboards/kbdclack/kaishi65/kaishi65.c
deleted file mode 100644
index 97f608f468..0000000000
--- a/keyboards/kbdclack/kaishi65/kaishi65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 KBDClack
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kaishi65.h"
diff --git a/keyboards/kbdclack/kaishi65/kaishi65.h b/keyboards/kbdclack/kaishi65/kaishi65.h
deleted file mode 100644
index 6343608324..0000000000
--- a/keyboards/kbdclack/kaishi65/kaishi65.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 KBDClack
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define _x_ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_65_ansi( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
-) \
-{ \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h
index bc3241eb93..ee3574ac9c 100644
--- a/keyboards/kbdfans/baguette66/rgb/config.h
+++ b/keyboards/kbdfans/baguette66/rgb/config.h
@@ -16,17 +16,9 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, B6 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-/* disable these deprecated features by default */
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 66
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json
index d179a751d8..40e02c9515 100644
--- a/keyboards/kbdfans/baguette66/rgb/info.json
+++ b/keyboards/kbdfans/baguette66/rgb/info.json
@@ -7,6 +7,17 @@
         "pid": "0x0106",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"],
+        "rows": ["F0", "F1", "F4", "F5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kbdfans/baguette66/rgb/rules.mk b/keyboards/kbdfans/baguette66/rgb/rules.mk
index 2972c82a31..c9c55ceed1 100644
--- a/keyboards/kbdfans/baguette66/rgb/rules.mk
+++ b/keyboards/kbdfans/baguette66/rgb/rules.mk
@@ -11,4 +11,3 @@ 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
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/kbdfans/baguette66/soldered/config.h b/keyboards/kbdfans/baguette66/soldered/config.h
index 7a226de04b..707393a197 100644
--- a/keyboards/kbdfans/baguette66/soldered/config.h
+++ b/keyboards/kbdfans/baguette66/soldered/config.h
@@ -16,12 +16,5 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, B6 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-/* disable these deprecated features by default */
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/baguette66/soldered/info.json b/keyboards/kbdfans/baguette66/soldered/info.json
index 29492bb959..f24123f258 100644
--- a/keyboards/kbdfans/baguette66/soldered/info.json
+++ b/keyboards/kbdfans/baguette66/soldered/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0107",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"],
+        "rows": ["F0", "F1", "F4", "F5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7",
         "on_state": 0
diff --git a/keyboards/kbdfans/baguette66/soldered/soldered.c b/keyboards/kbdfans/baguette66/soldered/soldered.c
deleted file mode 100644
index f2848c1b32..0000000000
--- a/keyboards/kbdfans/baguette66/soldered/soldered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DZTECH <moyi4681@Live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "soldered.h"
diff --git a/keyboards/kbdfans/bella/rgb/config.h b/keyboards/kbdfans/bella/rgb/config.h
index 35991ba9a9..c8114dc57b 100644
--- a/keyboards/kbdfans/bella/rgb/config.h
+++ b/keyboards/kbdfans/bella/rgb/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, B6 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D2, D3, D5, D4, D6, D7, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kbdfans/bella/rgb/info.json b/keyboards/kbdfans/bella/rgb/info.json
index 0a4763d0bd..818283adc1 100644
--- a/keyboards/kbdfans/bella/rgb/info.json
+++ b/keyboards/kbdfans/bella/rgb/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0008",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kbdfans/bella/rgb/rules.mk b/keyboards/kbdfans/bella/rgb/rules.mk
index d65c419c55..d4493d25e0 100644
--- a/keyboards/kbdfans/bella/rgb/rules.mk
+++ b/keyboards/kbdfans/bella/rgb/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 
 LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/bella/rgb_iso/config.h b/keyboards/kbdfans/bella/rgb_iso/config.h
index 75015318ba..8dea9c2164 100644
--- a/keyboards/kbdfans/bella/rgb_iso/config.h
+++ b/keyboards/kbdfans/bella/rgb_iso/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, B6 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D2, D3, D5, D4, D6, D7, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kbdfans/bella/rgb_iso/info.json b/keyboards/kbdfans/bella/rgb_iso/info.json
index c1ba9a023c..aa5202c1d4 100644
--- a/keyboards/kbdfans/bella/rgb_iso/info.json
+++ b/keyboards/kbdfans/bella/rgb_iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0009",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kbdfans/bella/rgb_iso/rules.mk b/keyboards/kbdfans/bella/rgb_iso/rules.mk
index d65c419c55..d4493d25e0 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rules.mk
+++ b/keyboards/kbdfans/bella/rgb_iso/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 
 LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/bella/soldered/config.h b/keyboards/kbdfans/bella/soldered/config.h
index cd44097127..0c6f580f59 100755
--- a/keyboards/kbdfans/bella/soldered/config.h
+++ b/keyboards/kbdfans/bella/soldered/config.h
@@ -15,10 +15,5 @@
  */
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, D1, B6 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D2, D3, D5, D4, D6, D7, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kbdfans/bella/soldered/info.json b/keyboards/kbdfans/bella/soldered/info.json
index a98dfd3712..d5a3580434 100644
--- a/keyboards/kbdfans/bella/soldered/info.json
+++ b/keyboards/kbdfans/bella/soldered/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["B0", "B1", "B2", "B3", "D1", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
diff --git a/keyboards/kbdfans/boop65/rgb/config.h b/keyboards/kbdfans/boop65/rgb/config.h
index f3845df234..c1955ac84f 100644
--- a/keyboards/kbdfans/boop65/rgb/config.h
+++ b/keyboards/kbdfans/boop65/rgb/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 }
-#define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/kbdfans/boop65/rgb/info.json b/keyboards/kbdfans/boop65/rgb/info.json
index 16ed9b7963..db7c70a981 100644
--- a/keyboards/kbdfans/boop65/rgb/info.json
+++ b/keyboards/kbdfans/boop65/rgb/info.json
@@ -8,11 +8,91 @@
     "pid": "0x1000",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "IS31FL3741"
+  },
+ "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",
   "layouts": {
       "LAYOUT_65_ansi_blocker": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+            {"matrix": [0, 7], "x": 7, "y": 0},
+            {"matrix": [0, 8], "x": 8, "y": 0},
+            {"matrix": [0, 9], "x": 9, "y": 0},
+            {"matrix": [0, 10], "x": 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}
+          ]
       }
   }
 }
\ No newline at end of file
diff --git a/keyboards/kbdfans/boop65/rgb/rgb.c b/keyboards/kbdfans/boop65/rgb/rgb.c
index 19645b6b83..985f877e85 100644
--- a/keyboards/kbdfans/boop65/rgb/rgb.c
+++ b/keyboards/kbdfans/boop65/rgb/rgb.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rgb.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/kbdfans/boop65/rgb/rgb.h b/keyboards/kbdfans/boop65/rgb/rgb.h
deleted file mode 100644
index 16fa7c1b87..0000000000
--- a/keyboards/kbdfans/boop65/rgb/rgb.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Dztech <moyi4681@Live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define XXX KC_NO
-#include "quantum.h"
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
-    K40, K41, K42,           K45,           K48,      K4A, K4B,      K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, XXX, K4A, K4B, XXX, K4D, K4E }  \
-}
diff --git a/keyboards/kbdfans/boop65/rgb/rules.mk b/keyboards/kbdfans/boop65/rgb/rules.mk
index 2e8325c39d..65ec78fd37 100644
--- a/keyboards/kbdfans/boop65/rgb/rules.mk
+++ b/keyboards/kbdfans/boop65/rgb/rules.mk
@@ -11,4 +11,3 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h
index 680ae93a7b..29f510620b 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/config.h
+++ b/keyboards/kbdfans/bounce/75/hotswap/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -42,5 +33,5 @@
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
 #define RGBLIGHT_SLEEP
-#endif
+
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
\ No newline at end of file
diff --git a/keyboards/kbdfans/bounce/75/hotswap/hotswap.c b/keyboards/kbdfans/bounce/75/hotswap/hotswap.c
deleted file mode 100644
index 702a9b096d..0000000000
--- a/keyboards/kbdfans/bounce/75/hotswap/hotswap.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 DZTECH <moyi4681@Live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hotswap.h"
\ No newline at end of file
diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json
index fd47cfdd7f..9bd8aa1c27 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/info.json
+++ b/keyboards/kbdfans/bounce/75/hotswap/info.json
@@ -7,10 +7,18 @@
         "pid": "0x7001",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h
index 3e8cea1f74..29f510620b 100644
--- a/keyboards/kbdfans/bounce/75/soldered/config.h
+++ b/keyboards/kbdfans/bounce/75/soldered/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -42,5 +33,5 @@
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
 #define RGBLIGHT_SLEEP
-#endif
+
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
\ No newline at end of file
diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json
index e4ee498ee7..cb202cd173 100644
--- a/keyboards/kbdfans/bounce/75/soldered/info.json
+++ b/keyboards/kbdfans/bounce/75/soldered/info.json
@@ -8,10 +8,18 @@
         "pid": "0x7000",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kbdfans/bounce/75/soldered/soldered.c b/keyboards/kbdfans/bounce/75/soldered/soldered.c
deleted file mode 100644
index a24bc9a36c..0000000000
--- a/keyboards/kbdfans/bounce/75/soldered/soldered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DZTECH <moyi4681@Live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "soldered.h"
\ No newline at end of file
diff --git a/keyboards/kbdfans/bounce/pad/config.h b/keyboards/kbdfans/bounce/pad/config.h
index 84271aed5f..0aae477dc1 100644
--- a/keyboards/kbdfans/bounce/pad/config.h
+++ b/keyboards/kbdfans/bounce/pad/config.h
@@ -16,9 +16,5 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { C7, B7, B6, B0, B1, B2 }
-#define MATRIX_COL_PINS { B5, B4, D0, C2 }
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kbdfans/bounce/pad/info.json b/keyboards/kbdfans/bounce/pad/info.json
index 894bd0ed70..e75747f2ea 100644
--- a/keyboards/kbdfans/bounce/pad/info.json
+++ b/keyboards/kbdfans/bounce/pad/info.json
@@ -7,6 +7,11 @@
         "pid": "0x7002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "D0", "C2"],
+        "rows": ["C7", "B7", "B6", "B0", "B1", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "num_lock": "C6"
     },
@@ -16,32 +21,32 @@
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Ctrl", "x":1, "y":0},
-                {"label":"Alt", "x":2, "y":0},
-                {"label":"Backspace", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"Num Lock", "x":0, "y":1.25},
-                {"label":"/", "x":1, "y":1.25},
-                {"label":"*", "x":2, "y":1.25},
-                {"label":"-", "x":3, "y":1.25},
+                {"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},
 
-                {"label":"7", "x":0, "y":2.25},
-                {"label":"8", "x":1, "y":2.25},
-                {"label":"9", "x":2, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
 
-                {"label":"4", "x":0, "y":3.25},
-                {"label":"5", "x":1, "y":3.25},
-                {"label":"6", "x":2, "y":3.25},
-                {"label":"+", "x":3, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
 
-                {"label":"1", "x":0, "y":4.25},
-                {"label":"2", "x":1, "y":4.25},
-                {"label":"3", "x":2, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
 
-                {"label":"0", "x":0, "y":5.25, "w":2},
-                {"label":".", "x":2, "y":5.25},
-                {"label":"Enter", "x":3, "y":4.25, "h":2}
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/kbdfans/bounce/pad/pad.c b/keyboards/kbdfans/bounce/pad/pad.c
deleted file mode 100644
index 18c18838ca..0000000000
--- a/keyboards/kbdfans/bounce/pad/pad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 DZTECH <moyi4681@Live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "pad.h"
\ No newline at end of file
diff --git a/keyboards/kbdfans/bounce/pad/pad.h b/keyboards/kbdfans/bounce/pad/pad.h
deleted file mode 100644
index a4bf9af55b..0000000000
--- a/keyboards/kbdfans/bounce/pad/pad.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 DZTECH <moyi4681@Live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, \
-         K51, K52, K53  \
-) \
-{ \
-    { K00,  K01, K02, K03 }, \
-    { K10,  K11, K12, K13 }, \
-    { K20,  K21, K22, KC_NO }, \
-    { K30,  K31, K32, K33 }, \
-    { K40,  K41, K42, KC_NO }, \
-    { KC_NO,K51, K52, K53 } \
-}
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index 0fd9b10373..b18438ab4e 100644
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B7, B3, E6, F0, D5, D4, D6, C7 }
-#define MATRIX_COL_PINS { C6, F1, F4, F5, F6, F7, D7, B4, B5, D0, D1, D2, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json
index 9333221c57..217eebe92e 100644
--- a/keyboards/kbdfans/kbd19x/info.json
+++ b/keyboards/kbdfans/kbd19x/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0191",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "F1", "F4", "F5", "F6", "F7", "D7", "B4", "B5", "D0", "D1", "D2", "D3"],
+        "rows": ["B7", "B3", "E6", "F0", "D5", "D4", "D6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6"
     },
@@ -17,6 +22,9 @@
         "scroll_lock": "B1",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kbdfans/kbd19x/kbd19x.c b/keyboards/kbdfans/kbd19x/kbd19x.c
deleted file mode 100644
index bdaf1a507a..0000000000
--- a/keyboards/kbdfans/kbd19x/kbd19x.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2018 Jeff Shufelt <jshuf@puppyfish.com> @jshuf
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "kbd19x.h"
diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h
index fd338e9214..d08ecf7f98 100644
--- a/keyboards/kbdfans/kbd4x/config.h
+++ b/keyboards/kbdfans/kbd4x/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B3, B1, B0, D5, B7, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json
index e8e7168ccc..21d1428f0d 100644
--- a/keyboards/kbdfans/kbd4x/info.json
+++ b/keyboards/kbdfans/kbd4x/info.json
@@ -8,115 +8,129 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x12", "planck_mit"],
     "layouts": {
         "LAYOUT_planck_mit": {
             "layout": [
-              {"label":"ESC", "x":0, "y":0},
-              {"label":"Q", "x":1, "y":0},
-              {"label":"W", "x":2, "y":0},
-              {"label":"E", "x":3, "y":0},
-              {"label":"R", "x":4, "y":0},
-              {"label":"T", "x":5, "y":0},
-              {"label":"Y", "x":6, "y":0},
-              {"label":"U", "x":7, "y":0},
-              {"label":"I", "x":8, "y":0},
-              {"label":"O", "x":9, "y":0},
-              {"label":"P", "x":10, "y":0},
-              {"label":"BKSP", "x":11, "y":0},
-              {"label":"TAB", "x":0, "y":1},
-              {"label":"A", "x":1, "y":1},
-              {"label":"S", "x":2, "y":1},
-              {"label":"D", "x":3, "y":1},
-              {"label":"F", "x":4, "y":1},
-              {"label":"G", "x":5, "y":1},
-              {"label":"H", "x":6, "y":1},
-              {"label":"J", "x":7, "y":1},
-              {"label":"K", "x":8, "y":1},
-              {"label":"L", "x":9, "y":1},
-              {"label":";", "x":10, "y":1},
-              {"label":"'", "x":11, "y":1},
-              {"label":"SHIFT", "x":0, "y":2},
-              {"label":"Z", "x":1, "y":2},
-              {"label":"X", "x":2, "y":2},
-              {"label":"C", "x":3, "y":2},
-              {"label":"V", "x":4, "y":2},
-              {"label":"B", "x":5, "y":2},
-              {"label":"N", "x":6, "y":2},
-              {"label":"M", "x":7, "y":2},
-              {"label":",", "x":8, "y":2},
-              {"label":".", "x":9, "y":2},
-              {"label":"UP", "x":10, "y":2},
-              {"label":"ENTER", "x":11, "y":2},
-              {"label":"LCTRL", "x":0, "y":3},
-              {"label":"LGUI", "x":1, "y":3},
-              {"label":"1", "x":2, "y":3},
-              {"label":"2", "x":3, "y":3},
-              {"label":"3", "x":4, "y":3},
-              {"label":"SPACE", "x":5, "y":3, "w":2},
-              {"label":"MO(1)", "x":7, "y":3},
-              {"label":"/", "x":8, "y":3},
-              {"label":"LEFT", "x":9, "y":3},
-              {"label":"DOWN", "x":10, "y":3},
-              {"label":"RIGHT", "x":11, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12": {
             "layout": [
-              {"label":"ESC", "x":0, "y":0},
-              {"label":"Q", "x":1, "y":0},
-              {"label":"W", "x":2, "y":0},
-              {"label":"E", "x":3, "y":0},
-              {"label":"R", "x":4, "y":0},
-              {"label":"T", "x":5, "y":0},
-              {"label":"Y", "x":6, "y":0},
-              {"label":"U", "x":7, "y":0},
-              {"label":"I", "x":8, "y":0},
-              {"label":"O", "x":9, "y":0},
-              {"label":"P", "x":10, "y":0},
-              {"label":"BKSP", "x":11, "y":0},
-              {"label":"TAB", "x":0, "y":1},
-              {"label":"A", "x":1, "y":1},
-              {"label":"S", "x":2, "y":1},
-              {"label":"D", "x":3, "y":1},
-              {"label":"F", "x":4, "y":1},
-              {"label":"G", "x":5, "y":1},
-              {"label":"H", "x":6, "y":1},
-              {"label":"J", "x":7, "y":1},
-              {"label":"K", "x":8, "y":1},
-              {"label":"L", "x":9, "y":1},
-              {"label":";", "x":10, "y":1},
-              {"label":"'", "x":11, "y":1},
-              {"label":"SHIFT", "x":0, "y":2},
-              {"label":"Z", "x":1, "y":2},
-              {"label":"X", "x":2, "y":2},
-              {"label":"C", "x":3, "y":2},
-              {"label":"V", "x":4, "y":2},
-              {"label":"B", "x":5, "y":2},
-              {"label":"N", "x":6, "y":2},
-              {"label":"M", "x":7, "y":2},
-              {"label":",", "x":8, "y":2},
-              {"label":".", "x":9, "y":2},
-              {"label":"UP", "x":10, "y":2},
-              {"label":"ENTER", "x":11, "y":2},
-              {"label":"LCTRL", "x":0, "y":3},
-              {"label":"LGUI", "x":1, "y":3},
-              {"label":"1", "x":2, "y":3},
-              {"label":"2", "x":3, "y":3},
-              {"label":"3", "x":4, "y":3},
-              {"label":"SPACE", "x":5, "y":3},
-              {"label":"MO(2)", "x":6, "y":3},
-              {"label":"MO(1)", "x":7, "y":3},
-              {"label":"/", "x":8, "y":3},
-              {"label":"LEFT", "x":9, "y":3},
-              {"label":"DOWN", "x":10, "y":3},
-              {"label":"RIGHT", "x":11, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd4x/kbd4x.c b/keyboards/kbdfans/kbd4x/kbd4x.c
deleted file mode 100644
index c7e5797932..0000000000
--- a/keyboards/kbdfans/kbd4x/kbd4x.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 sevenseacat
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "kbd4x.h"
diff --git a/keyboards/kbdfans/kbd4x/kbd4x.h b/keyboards/kbdfans/kbd4x/kbd4x.h
deleted file mode 100644
index 9e7e2ba220..0000000000
--- a/keyboards/kbdfans/kbd4x/kbd4x.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2018 sevenseacat
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_planck_mit( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b  \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06,   k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16,   k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26,   k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b }  \
-}
-
-// The PCB does support a grid layout, but the case does not.
-#define LAYOUT_ortho_4x12( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }  \
-}
diff --git a/keyboards/kbdfans/kbd66/config.h b/keyboards/kbdfans/kbd66/config.h
index 3c24eaa645..61533b7909 100644
--- a/keyboards/kbdfans/kbd66/config.h
+++ b/keyboards/kbdfans/kbd66/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, F0, F1, D4 } // From qmkeyboard.cn
-#define MATRIX_COL_PINS { C6, C7, E2, F5, F6, F4, D3, D2, D5, D0, D1, B4, D7, D6, E6, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kbdfans/kbd66/info.json b/keyboards/kbdfans/kbd66/info.json
index c3824412b9..b89ff1fb73 100644
--- a/keyboards/kbdfans/kbd66/info.json
+++ b/keyboards/kbdfans/kbd66/info.json
@@ -8,6 +8,11 @@
     "pid": "0xBD66",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C6", "C7", "E2", "F5", "F6", "F4", "D3", "D2", "D5", "D0", "D1", "B4", "D7", "D6", "E6", "B3"],
+    "rows": ["B0", "B1", "F0", "F1", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "breathing": true
diff --git a/keyboards/kbdfans/kbd66/kbd66.c b/keyboards/kbdfans/kbd66/kbd66.c
deleted file mode 100644
index c4f56c1717..0000000000
--- a/keyboards/kbdfans/kbd66/kbd66.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Alex Peters
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "kbd66.h"
diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h
index d509761fee..c71b396ecd 100644
--- a/keyboards/kbdfans/kbd67/hotswap/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
-#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, E6, D1, D0, D2, D3, D5, D6, D7, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B4
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 8
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -54,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
   #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd67/hotswap/hotswap.c b/keyboards/kbdfans/kbd67/hotswap/hotswap.c
deleted file mode 100644
index 60808979c9..0000000000
--- a/keyboards/kbdfans/kbd67/hotswap/hotswap.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hotswap.h"
diff --git a/keyboards/kbdfans/kbd67/hotswap/hotswap.h b/keyboards/kbdfans/kbd67/hotswap/hotswap.h
deleted file mode 100644
index ba6c1686fa..0000000000
--- a/keyboards/kbdfans/kbd67/hotswap/hotswap.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D, K3E,      \
-    K40, K41, K42,           K45,                K49, K4A,      K4B, K4D, K4E       \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E},             \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E},             \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E},             \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, K3C, K3D, K3E},           \
-    { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D, K4E}, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs LAYOUT
diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json
index e81600b117..6ab178520e 100644
--- a/keyboards/kbdfans/kbd67/hotswap/info.json
+++ b/keyboards/kbdfans/kbd67/hotswap/info.json
@@ -8,16 +8,96 @@
         "pid": "0x6065",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7", "C6"],
+        "rows": ["B3", "B2", "B1", "B0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B4"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker_split_bs"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs"
+    },
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2C", "matrix": [2, 12], "x": 14, "y": 0},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K31", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K45", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/config.h b/keyboards/kbdfans/kbd67/mkii_soldered/config.h
index 1061f94bc2..8309a11eb8 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/config.h
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/info.json b/keyboards/kbdfans/kbd67/mkii_soldered/info.json
index b439b97736..46f55727f8 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/info.json
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0013",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["B3", "D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
@@ -17,361 +22,386 @@
     "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"],
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"~", "x":0, "y":0}, 
-                {"label":"!", "x":1, "y":0}, 
-                {"label":"@", "x":2, "y":0}, 
-                {"label":"#", "x":3, "y":0}, 
-                {"label":"$", "x":4, "y":0}, 
-                {"label":"%", "x":5, "y":0}, 
-                {"label":"^", "x":6, "y":0}, 
-                {"label":"&", "x":7, "y":0}, 
-                {"label":"*", "x":8, "y":0}, 
-                {"label":"(", "x":9, "y":0}, 
-                {"label":")", "x":10, "y":0}, 
-                {"label":"_", "x":11, "y":0}, 
-                {"label":"+", "x":12, "y":0}, 
-                {"label":"Back Space", "x":13, "y":0}, 
-                {"label":"Delete", "x":14, "y":0}, 
-                {"label":"Home", "x":15, "y":0}, 
-                {"label":"Tab", "x":0, "y":1, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":1}, 
-                {"label":"W", "x":2.5, "y":1}, 
-                {"label":"E", "x":3.5, "y":1}, 
-                {"label":"R", "x":4.5, "y":1}, 
-                {"label":"T", "x":5.5, "y":1}, 
-                {"label":"Y", "x":6.5, "y":1}, 
-                {"label":"U", "x":7.5, "y":1}, 
-                {"label":"I", "x":8.5, "y":1}, 
-                {"label":"O", "x":9.5, "y":1}, 
-                {"label":"P", "x":10.5, "y":1}, 
-                {"label":"{", "x":11.5, "y":1}, 
-                {"label":"}", "x":12.5, "y":1}, 
-                {"label":"|", "x":13.5, "y":1, "w":1.5}, 
-                {"label":"End", "x":15, "y":1}, 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":2}, 
-                {"label":"S", "x":2.75, "y":2}, 
-                {"label":"D", "x":3.75, "y":2}, 
-                {"label":"F", "x":4.75, "y":2}, 
-                {"label":"G", "x":5.75, "y":2}, 
-                {"label":"H", "x":6.75, "y":2}, 
-                {"label":"J", "x":7.75, "y":2}, 
-                {"label":"K", "x":8.75, "y":2}, 
-                {"label":"L", "x":9.75, "y":2}, 
-                {"label":":", "x":10.75, "y":2}, 
-                {"label":"\"", "x":11.75, "y":2}, 
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 
-                {"label":"PgUp", "x":15, "y":2}, 
-                {"label":"Shift", "x":0, "y":3, "w":1.25}, 
-                {"label":"Hi", "x":1.25, "y":3}, 
-                {"label":"Z", "x":2.25, "y":3}, 
-                {"label":"X", "x":3.25, "y":3}, 
-                {"label":"C", "x":4.25, "y":3}, 
-                {"label":"V", "x":5.25, "y":3}, 
-                {"label":"B", "x":6.25, "y":3}, 
-                {"label":"N", "x":7.25, "y":3}, 
-                {"label":"M", "x":8.25, "y":3}, 
-                {"label":"<", "x":9.25, "y":3}, 
-                {"label":">", "x":10.25, "y":3}, 
-                {"label":"?", "x":11.25, "y":3}, 
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 
-                {"label":"&uarr;", "x":14, "y":3}, 
-                {"label":"PgDn", "x":15, "y":3}, 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":4, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"label":"Alt", "x":10, "y":4, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":4, "w":1.25}, 
-                {"label":"&larr;", "x":13, "y":4}, 
-                {"label":"&darr;", "x":14, "y":4}, 
-                {"label":"&rarr;", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [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": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 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, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4, "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}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, 
-                {"label":"!", "x":1, "y":0}, 
-                {"label":"@", "x":2, "y":0}, 
-                {"label":"#", "x":3, "y":0}, 
-                {"label":"$", "x":4, "y":0}, 
-                {"label":"%", "x":5, "y":0}, 
-                {"label":"^", "x":6, "y":0}, 
-                {"label":"&", "x":7, "y":0}, 
-                {"label":"*", "x":8, "y":0}, 
-                {"label":"(", "x":9, "y":0}, 
-                {"label":")", "x":10, "y":0}, 
-                {"label":"_", "x":11, "y":0}, 
-                {"label":"+", "x":12, "y":0}, 
-                {"label":"Backspace", "x":13, "y":0, "w":2}, 
-                {"label":"Home", "x":15, "y":0}, 
-                {"label":"Tab", "x":0, "y":1, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":1}, 
-                {"label":"W", "x":2.5, "y":1}, 
-                {"label":"E", "x":3.5, "y":1}, 
-                {"label":"R", "x":4.5, "y":1}, 
-                {"label":"T", "x":5.5, "y":1}, 
-                {"label":"Y", "x":6.5, "y":1}, 
-                {"label":"U", "x":7.5, "y":1}, 
-                {"label":"I", "x":8.5, "y":1}, 
-                {"label":"O", "x":9.5, "y":1}, 
-                {"label":"P", "x":10.5, "y":1}, 
-                {"label":"{", "x":11.5, "y":1}, 
-                {"label":"}", "x":12.5, "y":1}, 
-                {"label":"|", "x":13.5, "y":1, "w":1.5}, 
-                {"label":"End", "x":15, "y":1}, 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":2}, 
-                {"label":"S", "x":2.75, "y":2}, 
-                {"label":"D", "x":3.75, "y":2}, 
-                {"label":"F", "x":4.75, "y":2}, 
-                {"label":"G", "x":5.75, "y":2}, 
-                {"label":"H", "x":6.75, "y":2}, 
-                {"label":"J", "x":7.75, "y":2}, 
-                {"label":"K", "x":8.75, "y":2}, 
-                {"label":"L", "x":9.75, "y":2}, 
-                {"label":":", "x":10.75, "y":2}, 
-                {"label":"\"", "x":11.75, "y":2}, 
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 
-                {"label":"PgUp", "x":15, "y":2}, 
-                {"label":"Shift", "x":0, "y":3, "w":2.25}, 
-                {"label":"Z", "x":2.25, "y":3}, 
-                {"label":"X", "x":3.25, "y":3}, 
-                {"label":"C", "x":4.25, "y":3}, 
-                {"label":"V", "x":5.25, "y":3}, 
-                {"label":"B", "x":6.25, "y":3}, 
-                {"label":"N", "x":7.25, "y":3}, 
-                {"label":"M", "x":8.25, "y":3}, 
-                {"label":"<", "x":9.25, "y":3}, 
-                {"label":">", "x":10.25, "y":3}, 
-                {"label":"?", "x":11.25, "y":3}, 
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 
-                {"label":"\u2191", "x":14, "y":3}, 
-                {"label":"PgDn", "x":15, "y":3}, 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":4, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":4, "w":1.25}, 
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, 
-                {"label":"\u2190", "x":13, "y":4}, 
-                {"label":"\u2193", "x":14, "y":4}, 
-                {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, 
-                {"label":"!", "x":1, "y":0}, 
-                {"label":"@", "x":2, "y":0}, 
-                {"label":"#", "x":3, "y":0}, 
-                {"label":"$", "x":4, "y":0}, 
-                {"label":"%", "x":5, "y":0}, 
-                {"label":"^", "x":6, "y":0}, 
-                {"label":"&", "x":7, "y":0}, 
-                {"label":"*", "x":8, "y":0}, 
-                {"label":"(", "x":9, "y":0}, 
-                {"label":")", "x":10, "y":0}, 
-                {"label":"_", "x":11, "y":0}, 
-                {"label":"+", "x":12, "y":0}, 
-                {"label":"Backspace", "x":13, "y":0, "w":2}, 
-                {"label":"Home", "x":15, "y":0}, 
-                {"label":"Tab", "x":0, "y":1, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":1}, 
-                {"label":"W", "x":2.5, "y":1}, 
-                {"label":"E", "x":3.5, "y":1}, 
-                {"label":"R", "x":4.5, "y":1}, 
-                {"label":"T", "x":5.5, "y":1}, 
-                {"label":"Y", "x":6.5, "y":1}, 
-                {"label":"U", "x":7.5, "y":1}, 
-                {"label":"I", "x":8.5, "y":1}, 
-                {"label":"O", "x":9.5, "y":1}, 
-                {"label":"P", "x":10.5, "y":1}, 
-                {"label":"{", "x":11.5, "y":1}, 
-                {"label":"}", "x":12.5, "y":1}, 
-                {"label":"End", "x":15, "y":1}, 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":2}, 
-                {"label":"S", "x":2.75, "y":2}, 
-                {"label":"D", "x":3.75, "y":2}, 
-                {"label":"F", "x":4.75, "y":2}, 
-                {"label":"G", "x":5.75, "y":2}, 
-                {"label":"H", "x":6.75, "y":2}, 
-                {"label":"J", "x":7.75, "y":2}, 
-                {"label":"K", "x":8.75, "y":2}, 
-                {"label":"L", "x":9.75, "y":2}, 
-                {"label":":", "x":10.75, "y":2}, 
-                {"label":"\"", "x":11.75, "y":2}, 
-                {"label":"~", "x":12.75, "y":2}, 
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, 
-                {"label":"PgUp", "x":15, "y":2}, 
-                {"label":"Shift", "x":0, "y":3, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":3}, 
-                {"label":"Z", "x":2.25, "y":3}, 
-                {"label":"X", "x":3.25, "y":3}, 
-                {"label":"C", "x":4.25, "y":3}, 
-                {"label":"V", "x":5.25, "y":3}, 
-                {"label":"B", "x":6.25, "y":3}, 
-                {"label":"N", "x":7.25, "y":3}, 
-                {"label":"M", "x":8.25, "y":3}, 
-                {"label":"<", "x":9.25, "y":3}, 
-                {"label":">", "x":10.25, "y":3}, 
-                {"label":"?", "x":11.25, "y":3}, 
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 
-                {"label":"\u2191", "x":14, "y":3}, 
-                {"label":"PgDn", "x":15, "y":3}, 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":4, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":4, "w":1.25}, 
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, 
-                {"label":"\u2190", "x":13, "y":4}, 
-                {"label":"\u2193", "x":14, "y":4}, 
-                {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "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}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, 
-                {"label":"!", "x":1, "y":0}, 
-                {"label":"@", "x":2, "y":0}, 
-                {"label":"#", "x":3, "y":0}, 
-                {"label":"$", "x":4, "y":0}, 
-                {"label":"%", "x":5, "y":0}, 
-                {"label":"^", "x":6, "y":0}, 
-                {"label":"&", "x":7, "y":0}, 
-                {"label":"*", "x":8, "y":0}, 
-                {"label":"(", "x":9, "y":0}, 
-                {"label":")", "x":10, "y":0}, 
-                {"label":"_", "x":11, "y":0}, 
-                {"label":"+", "x":12, "y":0}, 
-                {"label":"|", "x":13, "y":0}, 
-                {"label":"Del", "x":14, "y":0}, 
-                {"label":"Home", "x":15, "y":0}, 
-                {"label":"Tab", "x":0, "y":1, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":1}, 
-                {"label":"W", "x":2.5, "y":1}, 
-                {"label":"E", "x":3.5, "y":1}, 
-                {"label":"R", "x":4.5, "y":1}, 
-                {"label":"T", "x":5.5, "y":1}, 
-                {"label":"Y", "x":6.5, "y":1}, 
-                {"label":"U", "x":7.5, "y":1}, 
-                {"label":"I", "x":8.5, "y":1}, 
-                {"label":"O", "x":9.5, "y":1}, 
-                {"label":"P", "x":10.5, "y":1}, 
-                {"label":"{", "x":11.5, "y":1}, 
-                {"label":"}", "x":12.5, "y":1}, 
-                {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, 
-                {"label":"End", "x":15, "y":1}, 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":2}, 
-                {"label":"S", "x":2.75, "y":2}, 
-                {"label":"D", "x":3.75, "y":2}, 
-                {"label":"F", "x":4.75, "y":2}, 
-                {"label":"G", "x":5.75, "y":2}, 
-                {"label":"H", "x":6.75, "y":2}, 
-                {"label":"J", "x":7.75, "y":2}, 
-                {"label":"K", "x":8.75, "y":2}, 
-                {"label":"L", "x":9.75, "y":2}, 
-                {"label":":", "x":10.75, "y":2}, 
-                {"label":"\"", "x":11.75, "y":2}, 
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 
-                {"label":"PgUp", "x":15, "y":2}, 
-                {"label":"Shift", "x":0, "y":3, "w":2.25}, 
-                {"label":"Z", "x":2.25, "y":3}, 
-                {"label":"X", "x":3.25, "y":3}, 
-                {"label":"C", "x":4.25, "y":3}, 
-                {"label":"V", "x":5.25, "y":3}, 
-                {"label":"B", "x":6.25, "y":3}, 
-                {"label":"N", "x":7.25, "y":3}, 
-                {"label":"M", "x":8.25, "y":3}, 
-                {"label":"<", "x":9.25, "y":3}, 
-                {"label":">", "x":10.25, "y":3}, 
-                {"label":"?", "x":11.25, "y":3}, 
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 
-                {"label":"\u2191", "x":14, "y":3}, 
-                {"label":"PgDn", "x":15, "y":3}, 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":4, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":4, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":4, "w":1.25}, 
-                {"label":"\u2190", "x":13, "y":4}, 
-                {"label":"\u2193", "x":14, "y":4}, 
-                {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [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, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, 
-                {"label":"!", "x":1, "y":0}, 
-                {"label":"@", "x":2, "y":0}, 
-                {"label":"#", "x":3, "y":0}, 
-                {"label":"$", "x":4, "y":0}, 
-                {"label":"%", "x":5, "y":0}, 
-                {"label":"^", "x":6, "y":0}, 
-                {"label":"&", "x":7, "y":0}, 
-                {"label":"*", "x":8, "y":0}, 
-                {"label":"(", "x":9, "y":0}, 
-                {"label":")", "x":10, "y":0}, 
-                {"label":"_", "x":11, "y":0}, 
-                {"label":"+", "x":12, "y":0}, 
-                {"label":"|", "x":13, "y":0}, 
-                {"label":"Del", "x":14, "y":0}, 
-                {"label":"Home", "x":15, "y":0}, 
-                {"label":"Tab", "x":0, "y":1, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":1}, 
-                {"label":"W", "x":2.5, "y":1}, 
-                {"label":"E", "x":3.5, "y":1}, 
-                {"label":"R", "x":4.5, "y":1}, 
-                {"label":"T", "x":5.5, "y":1}, 
-                {"label":"Y", "x":6.5, "y":1}, 
-                {"label":"U", "x":7.5, "y":1}, 
-                {"label":"I", "x":8.5, "y":1}, 
-                {"label":"O", "x":9.5, "y":1}, 
-                {"label":"P", "x":10.5, "y":1}, 
-                {"label":"{", "x":11.5, "y":1}, 
-                {"label":"}", "x":12.5, "y":1}, 
-                {"label":"End", "x":15, "y":1}, 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":2}, 
-                {"label":"S", "x":2.75, "y":2}, 
-                {"label":"D", "x":3.75, "y":2}, 
-                {"label":"F", "x":4.75, "y":2}, 
-                {"label":"G", "x":5.75, "y":2}, 
-                {"label":"H", "x":6.75, "y":2}, 
-                {"label":"J", "x":7.75, "y":2}, 
-                {"label":"K", "x":8.75, "y":2}, 
-                {"label":"L", "x":9.75, "y":2}, 
-                {"label":":", "x":10.75, "y":2}, 
-                {"label":"\"", "x":11.75, "y":2}, 
-                {"label":"~", "x":12.75, "y":2}, 
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, 
-                {"label":"PgUp", "x":15, "y":2}, 
-                {"label":"Shift", "x":0, "y":3, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":3}, 
-                {"label":"Z", "x":2.25, "y":3}, 
-                {"label":"X", "x":3.25, "y":3}, 
-                {"label":"C", "x":4.25, "y":3}, 
-                {"label":"V", "x":5.25, "y":3}, 
-                {"label":"B", "x":6.25, "y":3}, 
-                {"label":"N", "x":7.25, "y":3}, 
-                {"label":"M", "x":8.25, "y":3}, 
-                {"label":"<", "x":9.25, "y":3}, 
-                {"label":">", "x":10.25, "y":3}, 
-                {"label":"?", "x":11.25, "y":3}, 
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 
-                {"label":"\u2191", "x":14, "y":3}, 
-                {"label":"PgDn", "x":15, "y":3}, 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":4, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":4, "w":1.25}, 
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, 
-                {"label":"\u2190", "x":13, "y":4}, 
-                {"label":"\u2193", "x":14, "y":4}, 
-                {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "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/mkii_soldered/mkii_soldered.c b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c
deleted file mode 100644
index b685fa824a..0000000000
--- a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mkii_soldered.h"
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h
deleted file mode 100644
index 48268d0be7..0000000000
--- a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"  
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,       K214, \
-	K300, K404, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-	K400, K401, K402,       K403,       K405,       K407,       K409, K410,       K411, K413, K414  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  KC_NO, K407,  KC_NO, K409,  K410,  K411,  KC_NO, K413,  K414 }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,       K214, \
-    K300,       K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-    K400, K401, K402,                   K405,                   K409, K410,       K411, K413, K414  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, K405,  KC_NO, KC_NO, KC_NO, K409,  K410,  K411,  KC_NO, K413,  K414 }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,       K214, \
-    K300,       K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-    K400, K401, K402,                   K405,                   K409, K410,       K411, K413, K414  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, K405,  KC_NO, KC_NO, KC_NO, K409,  K410,  K411,  KC_NO, K413,  K414 }  \
-}
-
-
-#define LAYOUT_65_iso_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,             K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K213,       K214, \
-    K300, K404, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-    K400, K401, K402,                   K405,                   K409, K410,       K411, K413, K414  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113, K114 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213, K214 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \
-    { K400,  K401,  K402,  KC_NO, K404,  K405,  KC_NO, KC_NO, KC_NO, K409,  K410,  K411,  KC_NO, K413,  K414 }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,             K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K213,       K214, \
-    K300, K404, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-    K400, K401, K402,                   K405,                   K409, K410,       K411, K413, K414  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013, K014 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113, K114 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213, K214 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313, K314 }, \
-    { K400,  K401,  K402,  KC_NO, K404,  K405,  KC_NO, KC_NO, KC_NO, K409,  K410,  K411,  KC_NO, K413, K414 }  \
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/info.json b/keyboards/kbdfans/kbd67/mkiirgb/info.json
index 84542224e9..896f0385d1 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/info.json
@@ -5,10 +5,5 @@
   "usb": {
     "vid": "0x4B42"
   },
-  "community_layouts": ["65_ansi_blocker"],
-  "layouts": {
-      "LAYOUT_65_ansi_blocker": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
-      }
-  }
+  "community_layouts": ["65_ansi_blocker"]
 }
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
deleted file mode 100644
index 7a105ae549..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mkiirgb.h"
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h
deleted file mode 100644
index dadc230626..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#if defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v1)
-    #include "v1.h"
-#elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v2)
-    #include "v2.h"
-#elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v3)
-    #include "v3.h"
-#elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v4)
-    #include "v4.h"	
-#endif
-#include "quantum.h"
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
index 4933e9dfef..f2ee16dac2 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
-#define MATRIX_COL_PINS {A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14, C15 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
index 703797f89e..733d68cc59 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
@@ -4,8 +4,93 @@
         "pid": "0x1224",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"],
+        "rows": ["B1", "B10", "B11", "B14", "B12"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
-    "debounce": 3
+    "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/v1/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
index cd78765d76..8e872c17ff 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
@@ -10,4 +10,3 @@ COMMAND_ENABLE = no                # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no
 RGB_MATRIX_ENABLE = yes            # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
index 594d1fee23..336526eb11 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "v1.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.h b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.h
deleted file mode 100644
index 96b5fef5ef..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define XXX KC_NO
-#include "quantum.h"
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
-    K40, K41, K42,           K45,           K48,      K4A, K4B,      K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, XXX, K4A, K4B, XXX, K4D, K4E }  \
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
index 7bb0e8d3be..cf7f488280 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#define MATRIX_ROW_PINS {F0, F1, F4, E6, C6 }
-#define MATRIX_COL_PINS {F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2}
-#define DIODE_DIRECTION COL2ROW
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
index ac7d892196..441c543913 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
@@ -4,7 +4,92 @@
         "pid": "0x1225",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "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
+    "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
index 39afa4b348..05b460b165 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk
@@ -10,5 +10,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3731
 NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
index 9bfcb47d96..3bb336c0a2 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "v2.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.h b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.h
deleted file mode 100644
index 96b5fef5ef..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define XXX KC_NO
-#include "quantum.h"
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
-    K40, K41, K42,           K45,           K48,      K4A, K4B,      K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, XXX, K4A, K4B, XXX, K4D, K4E }  \
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
index 8e7abe1fa6..e291fa6368 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 }
-#define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define USB_SUSPEND_WAKEUP_DELAY 5000
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
index 75971d682d..378ffa7845 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
@@ -4,6 +4,91 @@
         "pid": "0x1226",
         "device_version": "0.0.3"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["F0", "F1", "F4", "E6", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "lufa-ms"
+    "bootloader": "lufa-ms",
+    "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/v3/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk
index 67366c7a00..bbe22adb0c 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk
@@ -13,5 +13,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 542551b3a3..4329893ac1 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "v3.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.h
deleted file mode 100755
index 7b3c387fe3..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#pragma once
-#define XXX KC_NO
-#include "quantum.h"
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
-    K40, K41, K42,           K45,           K48,      K4A, K4B,      K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, XXX, K4A, K4B, XXX, K4D, K4E }  \
-}
-
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index a5dfcb76fe..8b79d929d6 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -16,16 +16,8 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B1, F1, B2, B3, C6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, B0, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 68
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
index 36ed264dad..f7d5ab552f 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
@@ -4,6 +4,94 @@
         "pid": "0x1227",
         "device_version": "0.0.4"
     },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B1", "F1", "B2", "B3", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "lufa-ms"
+    "bootloader": "lufa-ms",
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk
index 653cd377ab..c552dae7c7 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c b/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
index c39d01f3b9..24ccaea968 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "v4.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.h
deleted file mode 100644
index da507403d3..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@Live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define XXX KC_NO
-#include "quantum.h"
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, k2C,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B,      K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, k2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, XXX, K4D, K4E }  \
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
index 7ee1b5ee30..ede122f3f2 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -16,16 +16,8 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B1, F1, B2, B3, C6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, B0, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
-#define RGB_DI_PIN C7
 #define RGB_MATRIX_LED_COUNT 68
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
index e9f206395e..4c7d09aa8e 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
@@ -8,84 +8,95 @@
         "pid": "0x0105",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B1", "F1", "B2", "B3", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "lufa-ms",
     "community_layouts": ["65_iso_blocker"],
     "layouts": {
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"`\u00ac", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Page Up", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"Page Down", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"AltGr", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
index 37c2bcae45..432c871dba 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mkiirgb_iso.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h
deleted file mode 100644
index 3c0e90abc8..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define XXX KC_NO
-#include "quantum.h"
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2E, \
-    K30, K43, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K45,           K49, K4A,      K4B, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, K41, K42, K43, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, XXX, K4D, K4E }  \
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
index 699a9f9384..5cd6062134 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
@@ -13,4 +13,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index 0980b80ed3..c1b23fe4db 100644
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 20
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -53,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json
index f4e5ca006d..c8e08a0157 100644
--- a/keyboards/kbdfans/kbd67/rev1/info.json
+++ b/keyboards/kbdfans/kbd67/rev1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6066",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F5"],
+    "rows": ["D0", "D1", "D2", "D3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "breathing": true
@@ -16,16 +21,168 @@
     "caps_lock": "B2",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["65_ansi"],
   "layouts": {
       "LAYOUT_all": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+              {"matrix": [0, 7], "x": 7, "y": 0},
+              {"matrix": [0, 8], "x": 8, "y": 0},
+              {"matrix": [0, 9], "x": 9, "y": 0},
+              {"matrix": [0, 10], "x": 10, "y": 0},
+              {"matrix": [0, 11], "x": 11, "y": 0},
+              {"matrix": [0, 12], "x": 12, "y": 0},
+              {"matrix": [0, 13], "x": 13, "y": 0},
+              {"matrix": [0, 14], "x": 14, "y": 0},
+              {"matrix": [0, 15], "x": 15, "y": 0},
+
+              {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+              {"matrix": [1, 2], "x": 1.5, "y": 1},
+              {"matrix": [1, 3], "x": 2.5, "y": 1},
+              {"matrix": [1, 4], "x": 3.5, "y": 1},
+              {"matrix": [1, 5], "x": 4.5, "y": 1},
+              {"matrix": [1, 6], "x": 5.5, "y": 1},
+              {"matrix": [1, 7], "x": 6.5, "y": 1},
+              {"matrix": [1, 8], "x": 7.5, "y": 1},
+              {"matrix": [1, 9], "x": 8.5, "y": 1},
+              {"matrix": [1, 10], "x": 9.5, "y": 1},
+              {"matrix": [1, 11], "x": 10.5, "y": 1},
+              {"matrix": [1, 12], "x": 11.5, "y": 1},
+              {"matrix": [1, 13], "x": 12.5, "y": 1},
+              {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+              {"matrix": [1, 15], "x": 15, "y": 1},
+
+              {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+              {"matrix": [2, 2], "x": 1.75, "y": 2},
+              {"matrix": [2, 3], "x": 2.75, "y": 2},
+              {"matrix": [2, 4], "x": 3.75, "y": 2},
+              {"matrix": [2, 5], "x": 4.75, "y": 2},
+              {"matrix": [2, 6], "x": 5.75, "y": 2},
+              {"matrix": [2, 7], "x": 6.75, "y": 2},
+              {"matrix": [2, 8], "x": 7.75, "y": 2},
+              {"matrix": [2, 9], "x": 8.75, "y": 2},
+              {"matrix": [2, 10], "x": 9.75, "y": 2},
+              {"matrix": [2, 11], "x": 10.75, "y": 2},
+              {"matrix": [2, 12], "x": 11.75, "y": 2},
+              {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+              {"matrix": [2, 15], "x": 15, "y": 2},
+
+              {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+              {"matrix": [3, 1], "x": 1.25, "y": 3},
+              {"matrix": [3, 2], "x": 2.25, "y": 3},
+              {"matrix": [3, 3], "x": 3.25, "y": 3},
+              {"matrix": [3, 4], "x": 4.25, "y": 3},
+              {"matrix": [3, 5], "x": 5.25, "y": 3},
+              {"matrix": [3, 6], "x": 6.25, "y": 3},
+              {"matrix": [3, 7], "x": 7.25, "y": 3},
+              {"matrix": [3, 8], "x": 8.25, "y": 3},
+              {"matrix": [3, 9], "x": 9.25, "y": 3},
+              {"matrix": [3, 10], "x": 10.25, "y": 3},
+              {"matrix": [3, 11], "x": 11.25, "y": 3},
+              {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+              {"matrix": [3, 14], "x": 14, "y": 3},
+              {"matrix": [3, 15], "x": 15, "y": 3},
 
+              {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+              {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+              {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+              {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+              {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+              {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+              {"matrix": [4, 10], "x": 10, "y": 4},
+              {"matrix": [4, 11], "x": 11, "y": 4},
+              {"matrix": [4, 12], "x": 12, "y": 4},
+              {"matrix": [4, 13], "x": 13, "y": 4},
+              {"matrix": [4, 14], "x": 14, "y": 4},
+              {"matrix": [4, 15], "x": 15, "y": 4}
+          ]
+      },
       "LAYOUT_65_ansi": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+              {"matrix": [0, 7], "x": 7, "y": 0},
+              {"matrix": [0, 8], "x": 8, "y": 0},
+              {"matrix": [0, 9], "x": 9, "y": 0},
+              {"matrix": [0, 10], "x": 10, "y": 0},
+              {"matrix": [0, 11], "x": 11, "y": 0},
+              {"matrix": [0, 12], "x": 12, "y": 0},
+              {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+              {"matrix": [0, 15], "x": 15, "y": 0},
+
+              {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+              {"matrix": [1, 2], "x": 1.5, "y": 1},
+              {"matrix": [1, 3], "x": 2.5, "y": 1},
+              {"matrix": [1, 4], "x": 3.5, "y": 1},
+              {"matrix": [1, 5], "x": 4.5, "y": 1},
+              {"matrix": [1, 6], "x": 5.5, "y": 1},
+              {"matrix": [1, 7], "x": 6.5, "y": 1},
+              {"matrix": [1, 8], "x": 7.5, "y": 1},
+              {"matrix": [1, 9], "x": 8.5, "y": 1},
+              {"matrix": [1, 10], "x": 9.5, "y": 1},
+              {"matrix": [1, 11], "x": 10.5, "y": 1},
+              {"matrix": [1, 12], "x": 11.5, "y": 1},
+              {"matrix": [1, 13], "x": 12.5, "y": 1},
+              {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+              {"matrix": [1, 15], "x": 15, "y": 1},
+
+              {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+              {"matrix": [2, 2], "x": 1.75, "y": 2},
+              {"matrix": [2, 3], "x": 2.75, "y": 2},
+              {"matrix": [2, 4], "x": 3.75, "y": 2},
+              {"matrix": [2, 5], "x": 4.75, "y": 2},
+              {"matrix": [2, 6], "x": 5.75, "y": 2},
+              {"matrix": [2, 7], "x": 6.75, "y": 2},
+              {"matrix": [2, 8], "x": 7.75, "y": 2},
+              {"matrix": [2, 9], "x": 8.75, "y": 2},
+              {"matrix": [2, 10], "x": 9.75, "y": 2},
+              {"matrix": [2, 11], "x": 10.75, "y": 2},
+              {"matrix": [2, 12], "x": 11.75, "y": 2},
+              {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+              {"matrix": [2, 15], "x": 15, "y": 2},
+
+              {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+              {"matrix": [3, 2], "x": 2.25, "y": 3},
+              {"matrix": [3, 3], "x": 3.25, "y": 3},
+              {"matrix": [3, 4], "x": 4.25, "y": 3},
+              {"matrix": [3, 5], "x": 5.25, "y": 3},
+              {"matrix": [3, 6], "x": 6.25, "y": 3},
+              {"matrix": [3, 7], "x": 7.25, "y": 3},
+              {"matrix": [3, 8], "x": 8.25, "y": 3},
+              {"matrix": [3, 9], "x": 9.25, "y": 3},
+              {"matrix": [3, 10], "x": 10.25, "y": 3},
+              {"matrix": [3, 11], "x": 11.25, "y": 3},
+              {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+              {"matrix": [3, 14], "x": 14, "y": 3},
+              {"matrix": [3, 15], "x": 15, "y": 3},
+
+              {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+              {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+              {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+              {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+              {"matrix": [4, 10], "x": 10, "y": 4},
+              {"matrix": [4, 11], "x": 11, "y": 4},
+              {"matrix": [4, 12], "x": 12, "y": 4},
+              {"matrix": [4, 13], "x": 13, "y": 4},
+              {"matrix": [4, 14], "x": 14, "y": 4},
+              {"matrix": [4, 15], "x": 15, "y": 4}
+          ]
       }
   }
 }
diff --git a/keyboards/kbdfans/kbd67/rev1/rev1.c b/keyboards/kbdfans/kbd67/rev1/rev1.c
deleted file mode 100644
index 489e856837..0000000000
--- a/keyboards/kbdfans/kbd67/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/kbdfans/kbd67/rev1/rev1.h b/keyboards/kbdfans/kbd67/rev1/rev1.h
deleted file mode 100644
index f27a00191a..0000000000
--- a/keyboards/kbdfans/kbd67/rev1/rev1.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43, K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01,   K02,   K03, K04, K05,   K06, K07,   K08, K09,   K0A, K0B, K0C,   K0D, K0E,   K0F }, \
-    { K10, KC_NO, K12,   K13, K14, K15,   K16, K17,   K18, K19,   K1A, K1B, K1C,   K1D, K1E,   K1F }, \
-    { K20, KC_NO, K22,   K23, K24, K25,   K26, K27,   K28, K29,   K2A, K2B, K2C,   K2D, KC_NO, K2F }, \
-    { K30, K31,   K32,   K33, K34, K35,   K36, K37,   K38, K39,   K3A, K3B, KC_NO, K3D, K3E,   K3F }, \
-    { K40, K41,   KC_NO, K43, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C,   K4D, K4E,   K4F }, \
-}
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E,   K0F }, \
-    { K10, KC_NO, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E,   K1F }, \
-    { K20, KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   K2D,   KC_NO, K2F }, \
-    { K30, KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E,   K3F }, \
-    { K40, K41,   KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C,   K4D,   K4E,   K4F }, \
-}
-
diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h
index 89bb76ca9f..9e8ab831eb 100644
--- a/keyboards/kbdfans/kbd67/rev2/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B7, D0, F0, F1, F4 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D1, D2, D3, D6, D7, B4, B6, C6, C7, F7, F6, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -42,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 240
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json
index b148eff402..b360acf4fc 100644
--- a/keyboards/kbdfans/kbd67/rev2/info.json
+++ b/keyboards/kbdfans/kbd67/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6067",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D1", "D2", "D3", "D6", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5"],
+        "rows": ["B7", "D0", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5"
     },
@@ -15,6 +20,9 @@
         "caps_lock": "D4",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -25,770 +33,774 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":2.75},
-                {"x":6.5, "y":4, "w":1.25},
-                {"x":7.75, "y":4, "w":2.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_rwkl_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.5},
-                {"x":11.5, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_split_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":2.25},
-                {"x":6, "y":4, "w":1.25},
-                {"x":7.25, "y":4, "w":2.75},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 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": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":2.25},
-                {"x":6, "y":4, "w":1.25},
-                {"x":7.25, "y":4, "w":2.75},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 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": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
index 234a44ae70..9a72f85030 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
@@ -11,6 +11,4 @@
 #define RETRO_TAPPING
 
 /* turn off RGB when computer sleeps */
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_SLEEP
-#endif
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/rev2/rev2.c b/keyboards/kbdfans/kbd67/rev2/rev2.c
deleted file mode 100644
index 803d923b92..0000000000
--- a/keyboards/kbdfans/kbd67/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev2.h"
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/rev2/rev2.h b/keyboards/kbdfans/kbd67/rev2/rev2.h
deleted file mode 100644
index ce2ddfab05..0000000000
--- a/keyboards/kbdfans/kbd67/rev2/rev2.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0E     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- *              │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�2D  │ ISO Enter
- *  LShift      │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │2F │   │1E │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │3F │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- *              │40  │41  │43  │44      │46  │48        │4A │4B │4C │4D │4E │4F │
- *              └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘
- *              ┌───────────────────┴───────────────────�┌────┴──────�
- *              ┌────┬────┬────┬────────────────────────�┌─────┬─────�
- *     Standard │40  │41  │43  │46                      ││4A   │4C   │ RWKL (2x 1.5u)
- *              └────┴────┴────┴────────────────────────┘└─────┴─────┘
- *              ┌─────┬─────┬───────────────────────────�┌────┬────�
- *          WKL │40   │41   │46                         ││4A  │4B  │ Blocker (2x 1.25u)
- *              └─────┴─────┴───────────────────────────┘└────┴────┘
- */
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43, K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
-    { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F }, \
-    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
-    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F }, \
-    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
-    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2D,      K2F, \
-    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
-    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
-    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_rwkl_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2D,      K2F, \
-    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
-    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, ___, K4B, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
-    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F }, \
-    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
-    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43, K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F }, \
-    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
-    { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F }, \
-}
-
-
-#define LAYOUT_65_ansi_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43, K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F }, \
-    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
-    { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F }, \
-}
diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h
index 823f3c6f35..d29b1e494a 100644
--- a/keyboards/kbdfans/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 12
 #define RGBLIGHT_VAL_STEP 12
 #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json
index 1aa4481830..97868ebe1d 100644
--- a/keyboards/kbdfans/kbd6x/info.json
+++ b/keyboards/kbdfans/kbd6x/info.json
@@ -8,10 +8,18 @@
         "pid": "0x3658",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"],
+        "rows": ["B3", "B2", "B1", "B0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "indicators": {
         "caps_lock": "B6"
     },
diff --git a/keyboards/kbdfans/kbd6x/kbd6x.c b/keyboards/kbdfans/kbd6x/kbd6x.c
deleted file mode 100644
index 3797822d4a..0000000000
--- a/keyboards/kbdfans/kbd6x/kbd6x.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "kbd6x.h"
diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index 7b630434d4..38d9bacad9 100644
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -3,22 +3,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, B7 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, F5, D4, B1, B0, B5, B4, D7, D6, B3, F4, F6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,5 +25,3 @@
 #define RGBLIGHT_VAL_STEP 8
 /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #define RGBLIGHT_SLEEP
-
-#endif
diff --git a/keyboards/kbdfans/kbd75/kbd75.c b/keyboards/kbdfans/kbd75/kbd75.c
deleted file mode 100644
index 1a1bffa360..0000000000
--- a/keyboards/kbdfans/kbd75/kbd75.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2017 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "kbd75.h"
diff --git a/keyboards/kbdfans/kbd75/kbd75.h b/keyboards/kbdfans/kbd75/kbd75.h
deleted file mode 100644
index a2c5d9e4c3..0000000000
--- a/keyboards/kbdfans/kbd75/kbd75.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2017-2019 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_kbdfans_kbd75_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_kbdfans_kbd75_rev2)
-    #include "rev2.h"
-#endif
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h b/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h
index f93cd66bfb..e42b60811c 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h
@@ -11,9 +11,7 @@
 #define RETRO_TAPPING
 
 /* turn off RGB when computer sleeps */
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_SLEEP
-#endif
 
 #ifdef BACKLIGHT_LEVELS
 #undef BACKLIGHT_LEVELS
diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json
index e1cc9ee7bc..ab56fc90d1 100644
--- a/keyboards/kbdfans/kbd75/rev1/info.json
+++ b/keyboards/kbdfans/kbd75/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 5
@@ -16,6 +21,9 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -25,654 +33,654 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1},
-                {"label":"Backspace", "x":14, "y":1},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":2.25},
-                {"label":"Space", "x":6, "y":5, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5, "w":2.75},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+                {"matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+                {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Scroll Lock", "x":14, "y":0},
-                {"label":"Pause", "x":15, "y":0},
-
-                {"label":"`", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"-", "x":11, "y":1},
-                {"label":"=", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"[", "x":11.5, "y":2},
-                {"label":"]", "x":12.5, "y":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":";", "x":10.75, "y":3},
-                {"label":"'", "x":11.75, "y":3},
-                {"label":"ISO #", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":",", "x":9.25, "y":4},
-                {"label":".", "x":10.25, "y":4},
-                {"label":"/", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"Up", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"Left", "x":13, "y":5},
-                {"label":"Down", "x":14, "y":5},
-                {"label":"Right", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_ansi_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":5, "w":1.5},
-                {"label":"Space", "x":3, "y":5, "w":7},
-                {"label":"Alt", "x":10, "y":5, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_iso_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":5, "w":1.5},
-                {"label":"Space", "x":3, "y":5, "w":7},
-                {"label":"AltGr", "x":10, "y":5, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_ansi_rwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_iso_rwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd75/rev1/rev1.c b/keyboards/kbdfans/kbd75/rev1/rev1.c
deleted file mode 100644
index e7ba9f3722..0000000000
--- a/keyboards/kbdfans/kbd75/rev1/rev1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2019-2020 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "rev1.h"
diff --git a/keyboards/kbdfans/kbd75/rev1/rev1.h b/keyboards/kbdfans/kbd75/rev1/rev1.h
deleted file mode 100644
index ac7b38ed02..0000000000
--- a/keyboards/kbdfans/kbd75/rev1/rev1.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2018-2021 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "kbd75.h"
-
-#define ___ KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │
- *              ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤      ┌───────�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │      │1E     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      └─┬─────┤
- *              │20   │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E   │2F │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤     ┌──┴�3D  │ ISO Enter
- *  LShift      │30    │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D      │3F │     │2E │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   ┌─┴───┴────┤
- * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │4F │   │4D        │ 2.75u RShift
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤   └──────────┘
- *              │50  │51  │53  │54      │56  │58        │5A │5B │5C │5D │5E │5F │
- *              └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘
- *              ┌────┬────┬────┬────────────────────────┬───┬───┬───�
- *              │50  │51  │53  │56                      │5A │5B │5C │ Standard Spacebar
- *              └────┴────┴────┴────────────────────────┴───┴───┴───┘
- *              ┌────┬────┬────┬────────────────────────┬─────┬─────�
- *              │50  │51  │53  │56                      │5A   │5C   │ Right-Side Winkeyless
- *              └────┴────┴────┴────────────────────────┴─────┴─────┘
- *              ┌─────┬─────┬───────────────────────────┬─────┬─────�
- *              │50   │51   │56                         │5A   │5C   │ Winkeyless
- *              └─────┴─────┴───────────────────────────┴─────┴─────┘
- */
-
-// LAYOUT for all possible switch positions on a KBD75 rev 1
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53, K54,      K56,      K58,      K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, K54, ___, K56, ___, K58, ___, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-
-/* Standard bottom row
- * ┌────┬────┬────┬────────────────────────┬───┬───┬───┬───┬───┬───�
- * │1.25│1.25│1.25│6.25U                   │1U │1U │1U │1U │1U │1U │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- */
-
-#define LAYOUT_75_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53,           K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_75_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K2E, K3D, K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53,           K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-/* Full Winkeyless (WKL)
- * ┌─────┬─────┬───────────────────────────┬─────┬─────┬───┬───┬───�
- * │1.5  │1.5  │7U                         │1.5U │1.5U │1U │1U │1U │
- * └─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_75_ansi_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,                     K56,                K5A,      K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, ___, ___, ___, K56, ___, ___, ___, K5A, ___, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_75_iso_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K3D, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K2E,      K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,                     K56,                K5A,      K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, ___, ___, ___, K56, ___, ___, ___, K5A, ___, K5C, K5D, K5E, K5F }  \
-}
-
-/* Right-Side Winkeyless (RWKL)
- * ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┬───┬───�
- * │1.25│1.25│1.25│6.25U                   │1.5U │1.5U │1U │1U │1U │
- * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_75_ansi_rwkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53,           K56,                K5A,      K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, ___, ___, K56, ___, ___, ___, K5A, ___, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_75_iso_rwkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K3D, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K2E,      K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53,           K56,                K5A,      K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, ___, ___, K56, ___, ___, ___, K5A, ___, K5C, K5D, K5E, K5F }  \
-}
diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json
index a5436f05ac..11eb19b729 100644
--- a/keyboards/kbdfans/kbd75/rev2/info.json
+++ b/keyboards/kbdfans/kbd75/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6061",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 5
@@ -16,6 +21,9 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -25,752 +33,752 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1},
-                {"label":"Backspace", "x":14, "y":1},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":2.25},
-                {"label":"Space", "x":6, "y":5, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5, "w":2.75},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+                {"matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+                {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Scroll Lock", "x":14, "y":0},
-                {"label":"Pause", "x":15, "y":0},
-
-                {"label":"`", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"-", "x":11, "y":1},
-                {"label":"=", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"[", "x":11.5, "y":2},
-                {"label":"]", "x":12.5, "y":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":";", "x":10.75, "y":3},
-                {"label":"'", "x":11.75, "y":3},
-                {"label":"ISO #", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":", ", "x":9.25, "y":4},
-                {"label":".", "x":10.25, "y":4},
-                {"label":"/", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"Up", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"Left", "x":13, "y":5},
-                {"label":"Down", "x":14, "y":5},
-                {"label":"Right", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_ansi_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":5, "w":1.5},
-                {"label":"Space", "x":3, "y":5, "w":7},
-                {"label":"Alt", "x":10, "y":5, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_iso_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":5, "w":1.5},
-                {"label":"Space", "x":3, "y":5, "w":7},
-                {"label":"AltGr", "x":10, "y":5, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_ansi_rwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_iso_rwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"Page Up", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_numpad": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"~", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"@", "x":2, "y":1},
-                {"label":"#", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"label":"Home", "x":13, "y":1},
-                {"label":"_", "x":14, "y":1},
-                {"label":"+", "x":15, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"|", "x":11.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":13, "y":2},
-                {"label":"{", "x":14, "y":2},
-                {"label":"}", "x":15, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":"Enter", "x":10.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":13, "y":3},
-                {"label":":", "x":14, "y":3},
-                {"label":"\"", "x":15, "y":3},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"?", "x":9.25, "y":4},
-                {"label":"Shift", "x":10.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":12, "y":4},
-                {"label":"End", "x":13, "y":4},
-                {"label":"<", "x":14, "y":4},
-                {"label":">", "x":15, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"x":3.75, "y":5, "w":1.25},
-                {"x":5, "y":5, "w":2.25},
-                {"x":7.25, "y":5, "w":1.75},
-                {"x":9, "y":5},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"\u2190", "x":11, "y":5},
-                {"label":"\u2193", "x":12, "y":5},
-                {"label":"\u2192", "x":13, "y":5},
-                {"label":"Fn", "x":14, "y":5},
-                {"label":"Ctrl", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 5, "y": 5, "w": 2.25},
+                {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 9], "x": 9, "y": 5},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd75/rev2/rev2.c b/keyboards/kbdfans/kbd75/rev2/rev2.c
deleted file mode 100644
index 352d837437..0000000000
--- a/keyboards/kbdfans/kbd75/rev2/rev2.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2019-2020 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "rev2.h"
diff --git a/keyboards/kbdfans/kbd75/rev2/rev2.h b/keyboards/kbdfans/kbd75/rev2/rev2.h
deleted file mode 100644
index f37be40094..0000000000
--- a/keyboards/kbdfans/kbd75/rev2/rev2.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright 2018-2021 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "kbd75.h"
-
-#define ___ KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │
- *              ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤      ┌───────�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │      │1E     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      └─┬─────┤
- *              │20   │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E   │2F │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤     ┌──┴�3D  │ ISO Enter
- *  LShift      │30    │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D      │3F │     │2E │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   ┌─┴───┴────┤
- * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │4F │   │4D        │ 2.75u RShift
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤   └──────────┘
- *              │50  │51  │53  │54      │56  │58        │5A │5B │5C │5D │5E │5F │
- *              └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘
- *              ┌────┬────┬────┬────────────────────────┬───┬───┬───�
- *              │50  │51  │53  │56                      │5A │5B │5C │ Standard Spacebar
- *              └────┴────┴────┴────────────────────────┴───┴───┴───┘
- *              ┌────┬────┬────┬────────────────────────┬─────┬─────�
- *              │50  │51  │53  │56                      │5A   │5C   │ Right-Side Winkeyless
- *              └────┴────┴────┴────────────────────────┴─────┴─────┘
- *              ┌─────┬─────┬───────────────────────────┬─────┬─────�
- *              │50   │51   │56                         │5A   │5C   │ Winkeyless
- *              └─────┴─────┴───────────────────────────┴─────┴─────┘
- */
-
-// LAYOUT for all possible switch positions on a KBD75 rev 2
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53, K54,      K56,      K58,      K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, K54, ___, K56, ___, K58, ___, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-
-/* Standard bottom row
- * ┌────┬────┬────┬────────────────────────┬───┬───┬───┬───┬───┬───�
- * │1.25│1.25│1.25│6.25U                   │1U │1U │1U │1U │1U │1U │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- */
-
-#define LAYOUT_75_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53,           K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_75_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K2E, K3D, K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53,           K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-/* Full Winkeyless (WKL)
- * ┌─────┬─────┬───────────────────────────┬─────┬─────┬───┬───┬───�
- * │1.5  │1.5  │7U                         │1.5U │1.5U │1U │1U │1U │
- * └─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_75_ansi_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,                     K56,                K5A,      K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, ___, ___, ___, K56, ___, ___, ___, K5A, ___, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_75_iso_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K3D, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K2E,      K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,                     K56,                K5A,      K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, ___, ___, ___, K56, ___, ___, ___, K5A, ___, K5C, K5D, K5E, K5F }  \
-}
-
-/* Right-Side Winkeyless (RWKL)
- * ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┬───┬───�
- * │1.25│1.25│1.25│6.25U                   │1.5U │1.5U │1U │1U │1U │
- * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_75_ansi_rwkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53,           K56,                K5A,      K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, ___, ___, K56, ___, ___, ___, K5A, ___, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_75_iso_rwkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K3D, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K2E,      K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53,           K56,                K5A,      K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, ___, ___, K56, ___, ___, ___, K5A, ___, K5C, K5D, K5E, K5F }  \
-}
-
-
-/* The KBD75 rev1 and rev2 PCBs have the same matrix, but only the rev2
- * supports the numpad layout. I own a rev1, so I don't know what the numpad
- * layout's matrix is entirely.
- *
- *                                                                - @noroadsleft
- *
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │
- *              ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤    ┌───────�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │    │??     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┤    └─┬─────┤
- *              │20   │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C   │2D │2E │2F │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤   ┌──┴�??  │ ISO Enter
- *  LShift      │30    │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B      │3C │3D │3F │   │?? │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┤   └───┴────┘
- * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A    │4B │4D │4E │4F │
- * └────────┘   ├────┼───┴┬──┴─┬─┴──┬┴───┴───┼───┴──┬┴──┬┴──┬───┼───┼───┼───┼───┤
- *              │50  │51  │53  │54  │56      │58    │59 │5A │5B │5C │5D │5E │5F │
- *              └────┴────┴────┴────┴────────┴──────┴───┴───┴───┴───┴───┴───┴───┘
- */
-
-// LAYOUT for all possible switch positions on a KBD75 rev 2
-#define LAYOUT_numpad( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53, K54,      K56,      K58, K59, K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, K54, ___, K56, ___, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h
index d4e1e40ea0..c6e7db6bcd 100644
--- a/keyboards/kbdfans/kbd75hs/config.h
+++ b/keyboards/kbdfans/kbd75hs/config.h
@@ -16,17 +16,8 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define FORCE_NKRO
 
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -44,5 +35,5 @@
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
 #define RGBLIGHT_SLEEP
-#endif
+
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json
index 9af7103b3b..452caa9aa8 100644
--- a/keyboards/kbdfans/kbd75hs/info.json
+++ b/keyboards/kbdfans/kbd75hs/info.json
@@ -7,15 +7,113 @@
         "pid": "0x6062",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C6"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi"],
     "layouts": {
         "LAYOUT_75_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [3, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5},
+                {"matrix": [5, 9], "x": 11, "y": 5},
+                {"matrix": [5, 10], "x": 12, "y": 5},
+                {"matrix": [5, 11], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd75hs/kbd75hs.c b/keyboards/kbdfans/kbd75hs/kbd75hs.c
deleted file mode 100644
index e22c267575..0000000000
--- a/keyboards/kbdfans/kbd75hs/kbd75hs.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@Live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kbd75hs.h"
diff --git a/keyboards/kbdfans/kbd75hs/kbd75hs.h b/keyboards/kbdfans/kbd75hs/kbd75hs.h
deleted file mode 100644
index 60fa472996..0000000000
--- a/keyboards/kbdfans/kbd75hs/kbd75hs.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@Live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-#define XXX KC_NO
-
-#define LAYOUT_75_ansi( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K312, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414, \
-	K500, K501, K502,             K505,             K508, K509, K510, K511,       K513, K514  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, K508,  K509,  K510,  K511,  KC_NO, K513,  K514 }  \
-}
diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h
index ace45e8245..6d1273875d 100644
--- a/keyboards/kbdfans/kbd75rgb/config.h
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@@ -16,17 +16,9 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, B0, B1, B2, C6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, E6, B3, B7, D0, D1, D2, D3, D5, D4, D6, D7}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 84
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json
index 63ce9ebf36..231f13f412 100644
--- a/keyboards/kbdfans/kbd75rgb/info.json
+++ b/keyboards/kbdfans/kbd75rgb/info.json
@@ -8,101 +8,112 @@
         "pid": "0x6063",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
+        "rows": ["F0", "F1", "B0", "B1", "B2", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "lufa-ms",
     "community_layouts": ["75_ansi"],
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
-                {"label": "Esc", "x":0, "y":0},
-                {"label": "F1", "x":1, "y":0},
-                {"label": "F2", "x":2, "y":0},
-                {"label": "F3", "x":3, "y":0},
-                {"label": "F4", "x":4, "y":0},
-                {"label": "F5", "x":5, "y":0},
-                {"label": "F6", "x":6, "y":0},
-                {"label": "F7", "x":7, "y":0},
-                {"label": "F8", "x":8, "y":0},
-                {"label": "F9", "x":9, "y":0},
-                {"label": "F10", "x":10, "y":0},
-                {"label": "F11", "x":11, "y":0},
-                {"label": "F12", "x":12, "y":0},
-                {"label": "PrintScr", "x":13, "y":0},
-                {"label": "Ins", "x":14, "y":0},
-                {"label": "Home", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [3, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label": "`~", "x":0, "y":1},
-                {"label": "1!", "x":1, "y":1},
-                {"label": "2@", "x":2, "y":1},
-                {"label": "3#", "x":3, "y":1},
-                {"label": "4$", "x":4, "y":1},
-                {"label": "5%", "x":5, "y":1},
-                {"label": "6^", "x":6, "y":1},
-                {"label": "7&", "x":7, "y":1},
-                {"label": "8*", "x":8, "y":1},
-                {"label": "9(", "x":9, "y":1},
-                {"label": "0)", "x":10, "y":1},
-                {"label": "-_", "x":11, "y":1},
-                {"label": "+=", "x":12, "y":1},
-                {"label": "Backspace", "x":13, "y":1, "w":2},
-                {"label": "End", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label": "Tab", "x":0, "y":2, "w":1.5},
-                {"label": "Q", "x":1.5, "y":2},
-                {"label": "W", "x":2.5, "y":2},
-                {"label": "E", "x":3.5, "y":2},
-                {"label": "R", "x":4.5, "y":2},
-                {"label": "T", "x":5.5, "y":2},
-                {"label": "Y", "x":6.5, "y":2},
-                {"label": "U", "x":7.5, "y":2},
-                {"label": "I", "x":8.5, "y":2},
-                {"label": "O", "x":9.5, "y":2},
-                {"label": "P", "x":10.5, "y":2},
-                {"label": "[{", "x":11.5, "y":2},
-                {"label": "]}", "x":12.5, "y":2},
-                {"label": "\\|", "x":13.5, "y":2, "w":1.5},
-                {"label": "Pg Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label": "Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label": "A", "x":1.75, "y":3},
-                {"label": "S", "x":2.75, "y":3},
-                {"label": "D", "x":3.75, "y":3},
-                {"label": "F", "x":4.75, "y":3},
-                {"label": "G", "x":5.75, "y":3},
-                {"label": "H", "x":6.75, "y":3},
-                {"label": "J", "x":7.75, "y":3},
-                {"label": "K", "x":8.75, "y":3},
-                {"label": "L", "x":9.75, "y":3},
-                {"label": ";:", "x":10.75, "y":3},
-                {"label": "\"'", "x":11.75, "y":3},
-                {"label": "Enter", "x":12.75, "y":3, "w":2.25},
-                {"label": "Pg Dn", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label": "Shift", "x":0, "y":4, "w":2.25},
-                {"label": "Z", "x":2.25, "y":4},
-                {"label": "X", "x":3.25, "y":4},
-                {"label": "C", "x":4.25, "y":4},
-                {"label": "V", "x":5.25, "y":4},
-                {"label": "B", "x":6.25, "y":4},
-                {"label": "N", "x":7.25, "y":4},
-                {"label": "M", "x":8.25, "y":4},
-                {"label": ",<", "x":9.25, "y":4},
-                {"label": ".>", "x":10.25, "y":4},
-                {"label": "/?", "x":11.25, "y":4},
-                {"label": "Shift", "x":12.25, "y":4, "w":1.75},
-                {"label": "Up", "x":14, "y":4},
-                {"label": "Del", "x":15, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
 
-                {"label": "Ctrl", "x":0, "y":5, "w":1.25},
-                {"label": "GUI", "x":1.25, "y":5, "w":1.25},
-                {"label": "Alt", "x":2.5, "y":5, "w":1.25},
-                {"label": "Space", "x":3.75, "y":5, "w":6.25},
-                {"label": "Alt", "x":10, "y":5},
-                {"label": "GUI", "x":11, "y":5},
-                {"label": "Ctrl", "x":12, "y":5},
-                {"label": "Left", "x":13, "y":5},
-                {"label": "Down", "x":14, "y":5},
-                {"label": "Right", "x":15, "y":5}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5},
+                {"matrix": [5, 9], "x": 11, "y": 5},
+                {"matrix": [5, 10], "x": 12, "y": 5},
+                {"matrix": [5, 11], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd75rgb/kbd75rgb.c b/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
index cd0f656974..8e39dad6d2 100644
--- a/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
+++ b/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kbd75rgb.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kbdfans/kbd75rgb/kbd75rgb.h b/keyboards/kbdfans/kbd75rgb/kbd75rgb.h
deleted file mode 100644
index 88ff6ef9f6..0000000000
--- a/keyboards/kbdfans/kbd75rgb/kbd75rgb.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@Live.cn>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define XXX KC_NO
-#include "quantum.h"
-#define LAYOUT_75_ansi( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K312, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414, \
-	K500, K501, K502,             K505,             K508, K509, K510, K511,       K513, K514  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, K508,  K509,  K510,  K511,  KC_NO, K513,  K514 }  \
-}
diff --git a/keyboards/kbdfans/kbd75rgb/rules.mk b/keyboards/kbdfans/kbd75rgb/rules.mk
index d8e620b77d..bc6cd404cc 100644
--- a/keyboards/kbdfans/kbd75rgb/rules.mk
+++ b/keyboards/kbdfans/kbd75rgb/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h
index 26f5030f4d..655b83f0e3 100644
--- a/keyboards/kbdfans/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { E6, B7, D4, F0, D6, D7 }
-#define MATRIX_COL_PINS { D1, D0, F7, F6, F5, D5, D3, D2, C7, C6, B5, F4, F1, B4, B0  }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json
index 400e29bb3f..eeda61ac35 100644
--- a/keyboards/kbdfans/kbd8x/info.json
+++ b/keyboards/kbdfans/kbd8x/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"],
+    "rows": ["E6", "B7", "D4", "F0", "D6", "D7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "breathing": true
@@ -17,15 +22,222 @@
     "num_lock": "B1",
     "scroll_lock": "B2"
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
-      "LAYOUT_all": {
-        "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
-      },
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [3, 13], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5},
+        {"matrix": [1, 14], "x": 14, "y": 1.5},
+
+        {"matrix": [5, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 1.5},
+        {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 13], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 10], "x": 17.25, "y": 5.5}
+      ]
+    },
+    "LAYOUT_tkl_ansi": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [3, 13], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [5, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 1.5},
+        {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 13], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
 
-      "LAYOUT_tkl_ansi": {
-          "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
-      }
+        {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 10], "x": 17.25, "y": 5.5}
+      ]
+    }
   }
 }
diff --git a/keyboards/kbdfans/kbd8x/kbd8x.c b/keyboards/kbdfans/kbd8x/kbd8x.c
deleted file mode 100644
index c19981dbc4..0000000000
--- a/keyboards/kbdfans/kbd8x/kbd8x.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2017 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kbd8x.h"
diff --git a/keyboards/kbdfans/kbd8x/kbd8x.h b/keyboards/kbdfans/kbd8x/kbd8x.h
index 4433722c5a..a0a1ac7390 100644
--- a/keyboards/kbdfans/kbd8x/kbd8x.h
+++ b/keyboards/kbdfans/kbd8x/kbd8x.h
@@ -27,42 +27,3 @@ inline void num_led_off(void)     { writePinLow(LED_NUM_LOCK_PIN); }
 
 inline void scroll_led_on(void)   { writePinHigh(LED_SCROLL_LOCK_PIN); }
 inline void scroll_led_off(void)  { writePinLow(LED_SCROLL_LOCK_PIN); }
-
-// LAYOUT depicting all possible switch positions.
-// LAYOUT_all supports ISO, split backspace and split left/right shift.
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K3D,           \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K5B, K5C, K3E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K5D, K5E,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                          \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E,                \
-    K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A                                     \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }  \
-}
-
-// LAYOUT depicting only switch positions for a standard TKL ANSI keyboard.
-// TODO: Double check location of backspace key for 2u layout (It's either K1D or K1C).
-#define LAYOUT_tkl_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K3D,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K5B, K5C, K3E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K5D, K5E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                     \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E,                \
-    K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A                                \
-) \
-{ \
-    { K00, K01,   K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E }, \
-    { K10, K11,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E }, \
-    { K20, K21,   K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E }, \
-    { K30, K31,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,   K3E }, \
-    { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, K4E }, \
-    { K50, K51,   K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D,   K5E }  \
-}
-
diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h
index c11821425f..d2a014a204 100644
--- a/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/keyboards/kbdfans/kbd8x_mk2/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 20
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json
index 5fb4c7c089..2f284ea937 100644
--- a/keyboards/kbdfans/kbd8x_mk2/info.json
+++ b/keyboards/kbdfans/kbd8x_mk2/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "indicators": {
         "caps_lock": "E6",
         "scroll_lock": "B2",
@@ -23,279 +31,318 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25},
-                {"label":"Delete", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.25},
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.25},
-                {"label":"Down", "x":16.25, "y":5.25},
-                {"label":"Right", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"\u00ac", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"\"", "x":2, "y":1.25},
-                {"label":"\u00a3", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"@", "x":11.75, "y":3.25},
-                {"label":"~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.25},
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.25},
-                {"label":"Down", "x":16.25, "y":5.25},
-                {"label":"Right", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [5, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c b/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c
deleted file mode 100644
index 0a36e3109d..0000000000
--- a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "kbd8x_mk2.h"
diff --git a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.h b/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.h
deleted file mode 100644
index 75e340375c..0000000000
--- a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"  
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K000,       K001, K011, K002, K012,    K003, K013, K004, K014,    K005, K015, K006, K016,    K007, K017, K008, \
-	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K066,    K027, K037, K028, \
-	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046,       K056,    K047, K057, K048, \
-	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075,             K076,                      \
-	K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,     K086,  K096,          K097,        \
-	K100, K110, K101,                   K103,                         K105, K115, K106, K116,    K107, K117, K108  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008  }, \
-	{ KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  KC_NO }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028  }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  KC_NO }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048  }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  KC_NO }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, KC_NO }, \
-	{ K090,  K091,  K092,  K093,  K094,  K095,  K096,  K097,  KC_NO }, \
-	{ K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  K107,  K108  }, \
-	{ K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  KC_NO }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K000,       K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016,    K007, K017, K008, \
-    K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036,    K027, K037, K028, \
-    K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056,    K047, K057, K048, \
-    K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075,       K076,                      \
-    K080,       K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,       K086,          K097,       \
-    K100, K110, K101,                   K103,                   K105, K115, K106, K116,    K107, K117, K108  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008  }, \
-    { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  KC_NO }, \
-    { K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028  }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  KC_NO }, \
-    { K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048  }, \
-    { K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  KC_NO, KC_NO, KC_NO }, \
-    { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-    { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, KC_NO }, \
-    { KC_NO, K091,  K092,  K093,  K094,  K095,  KC_NO, K097,  KC_NO }, \
-    { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  K107,  K108  }, \
-    { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  KC_NO }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    K000,       K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016,    K007, K017, K008, \
-    K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036,    K027, K037, K028, \
-    K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046,          K047, K057, K048, \
-    K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K056, K076,                      \
-    K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,       K086,          K097,       \
-    K100, K110, K101,                   K103,                   K105, K115, K106, K116,    K107, K117, K108  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008  }, \
-    { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  KC_NO }, \
-    { K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028  }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  KC_NO }, \
-    { K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048  }, \
-    { K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  KC_NO, KC_NO, KC_NO }, \
-    { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-    { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, KC_NO }, \
-    { K090,  K091,  K092,  K093,  K094,  K095,  KC_NO, K097,  KC_NO }, \
-    { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  K107,  K108  }, \
-    { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  KC_NO }  \
-}
diff --git a/keyboards/kbdfans/kbdmini/config.h b/keyboards/kbdfans/kbdmini/config.h
index e77b074f5a..a3e8408094 100644
--- a/keyboards/kbdfans/kbdmini/config.h
+++ b/keyboards/kbdfans/kbdmini/config.h
@@ -1,22 +1,5 @@
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B7, E6, F5, F4 }
-#define MATRIX_COL_PINS { B3, B2, B1, B0, F1, F0, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kbdfans/kbdmini/info.json b/keyboards/kbdfans/kbdmini/info.json
index 0ed41d99f0..b329a4ec56 100644
--- a/keyboards/kbdfans/kbdmini/info.json
+++ b/keyboards/kbdfans/kbdmini/info.json
@@ -8,6 +8,14 @@
         "pid": "0x2001",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B1", "B0", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B7", "E6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
diff --git a/keyboards/kbdfans/kbdmini/rules.mk b/keyboards/kbdfans/kbdmini/rules.mk
index daa102eb3f..4a443969ff 100644
--- a/keyboards/kbdfans/kbdmini/rules.mk
+++ b/keyboards/kbdfans/kbdmini/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h
index acd78533ee..a3a9a993df 100644
--- a/keyboards/kbdfans/kbdpad/mk1/config.h
+++ b/keyboards/kbdfans/kbdpad/mk1/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json
index 97d4c827a1..3527370e4c 100644
--- a/keyboards/kbdfans/kbdpad/mk1/info.json
+++ b/keyboards/kbdfans/kbdpad/mk1/info.json
@@ -8,10 +8,18 @@
         "pid": "0x422D",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4",
         "breathing": true
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "num_lock": "D0"
     },
@@ -21,93 +29,93 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 1.25},
+                {"matrix": [4, 1], "x": 1, "y": 1.25},
+                {"matrix": [4, 2], "x": 2, "y": 1.25},
+                {"matrix": [4, 3], "x": 3, "y": 1.25},
 
-                {"x":0, "y":2.25},
-                {"x":1, "y":2.25},
-                {"x":2, "y":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 2.25},
+                {"matrix": [3, 1], "x": 1, "y": 2.25},
+                {"matrix": [3, 2], "x": 2, "y": 2.25},
 
-                {"x":0, "y":3.25},
-                {"x":1, "y":3.25},
-                {"x":2, "y":3.25},
-                {"x":3, "y":2.25, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2, "y": 3.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
 
-                {"x":0, "y":4.25},
-                {"x":1, "y":4.25},
-                {"x":2, "y":4.25},
+                {"matrix": [1, 0], "x": 0, "y": 4.25},
+                {"matrix": [1, 1], "x": 1, "y": 4.25},
+                {"matrix": [1, 2], "x": 2, "y": 4.25},
 
-                {"x":0, "y":5.25, "w":2},
-                {"x":2, "y":5.25},
-                {"x":3, "y":4.25, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [0, 2], "x": 2, "y": 5.25},
+                {"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 1.25},
+                {"matrix": [4, 1], "x": 1, "y": 1.25},
+                {"matrix": [4, 2], "x": 2, "y": 1.25},
+                {"matrix": [4, 3], "x": 3, "y": 1.25},
 
-                {"x":0, "y":2.25},
-                {"x":1, "y":2.25},
-                {"x":2, "y":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 2.25},
+                {"matrix": [3, 1], "x": 1, "y": 2.25},
+                {"matrix": [3, 2], "x": 2, "y": 2.25},
 
-                {"x":0, "y":3.25},
-                {"x":1, "y":3.25},
-                {"x":2, "y":3.25},
-                {"x":3, "y":2.25, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2, "y": 3.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
 
-                {"x":0, "y":4.25},
-                {"x":1, "y":4.25},
-                {"x":2, "y":4.25},
+                {"matrix": [1, 0], "x": 0, "y": 4.25},
+                {"matrix": [1, 1], "x": 1, "y": 4.25},
+                {"matrix": [1, 2], "x": 2, "y": 4.25},
 
-                {"x":0, "y":5.25, "w":2},
-                {"x":2, "y":5.25},
-                {"x":3, "y":4.25, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [0, 2], "x": 2, "y": 5.25},
+                {"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 1.25},
+                {"matrix": [4, 1], "x": 1, "y": 1.25},
+                {"matrix": [4, 2], "x": 2, "y": 1.25},
+                {"matrix": [4, 3], "x": 3, "y": 1.25},
 
-                {"x":0, "y":2.25},
-                {"x":1, "y":2.25},
-                {"x":2, "y":2.25},
-                {"x":3, "y":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 2.25},
+                {"matrix": [3, 1], "x": 1, "y": 2.25},
+                {"matrix": [3, 2], "x": 2, "y": 2.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25},
 
-                {"x":0, "y":3.25},
-                {"x":1, "y":3.25},
-                {"x":2, "y":3.25},
-                {"x":3, "y":3.25},
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2, "y": 3.25},
+                {"matrix": [2, 3], "x": 3, "y": 3.25},
 
-                {"x":0, "y":4.25},
-                {"x":1, "y":4.25},
-                {"x":2, "y":4.25},
-                {"x":3, "y":4.25},
+                {"matrix": [1, 0], "x": 0, "y": 4.25},
+                {"matrix": [1, 1], "x": 1, "y": 4.25},
+                {"matrix": [1, 2], "x": 2, "y": 4.25},
+                {"matrix": [1, 3], "x": 3, "y": 4.25},
 
-                {"x":0, "y":5.25},
-                {"x":1, "y":5.25},
-                {"x":2, "y":5.25},
-                {"x":3, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 5.25},
+                {"matrix": [0, 1], "x": 1, "y": 5.25},
+                {"matrix": [0, 2], "x": 2, "y": 5.25},
+                {"matrix": [0, 3], "x": 3, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbdpad/mk1/mk1.c b/keyboards/kbdfans/kbdpad/mk1/mk1.c
deleted file mode 100644
index 5635b0a589..0000000000
--- a/keyboards/kbdfans/kbdpad/mk1/mk1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mk1.h"
diff --git a/keyboards/kbdfans/kbdpad/mk1/mk1.h b/keyboards/kbdfans/kbdpad/mk1/mk1.h
deleted file mode 100644
index 36b0287278..0000000000
--- a/keyboards/kbdfans/kbdpad/mk1/mk1.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// This is a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT( \
-              k52, k53, \
-    k40, k41, k42, k43, \
-    k30, k31, k32, \
-    k20, k21, k22, k23, \
-    k10, k11, k12, \
-    k00,      k02, k03 \
-) { \
-    { k00,   KC_NO, k02, k03   }, \
-    { k10,   k11,   k12, KC_NO }, \
-    { k20,   k21,   k22, k23   }, \
-    { k30,   k31,   k32, KC_NO }, \
-    { k40,   k41,   k42, k43   }, \
-    { KC_NO, KC_NO, k52, k53   } \
-}
-
-#define LAYOUT_numpad_6x4( \
-    k50, k51, k52, k53, \
-    k40, k41, k42, k43, \
-    k30, k31, k32, \
-    k20, k21, k22, k23, \
-    k10, k11, k12, \
-    k00,      k02, k03 \
-) { \
-    { k00, KC_NO, k02, k03   }, \
-    { k10, k11,   k12, KC_NO }, \
-    { k20, k21,   k22, k23   }, \
-    { k30, k31,   k32, KC_NO }, \
-    { k40, k41,   k42, k43   }, \
-    { k50, k51,   k52, k53   } \
-}
-
-#define LAYOUT_ortho_6x4( \
-    k50, k51, k52, k53, \
-    k40, k41, k42, k43, \
-    k30, k31, k32, k33, \
-    k20, k21, k22, k23, \
-    k10, k11, k12, k13, \
-    k00, k01, k02, k03 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 }, \
-    { k50, k51, k52, k53 } \
-}
diff --git a/keyboards/kbdfans/kbdpad/mk1/rules.mk b/keyboards/kbdfans/kbdpad/mk1/rules.mk
index 98e6c70143..ae7a0b4e16 100644
--- a/keyboards/kbdfans/kbdpad/mk1/rules.mk
+++ b/keyboards/kbdfans/kbdpad/mk1/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = no
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = no  # PCB has underglow LEDs, but case doesn't let them show.
-WS2812_DRIVER = i2c
diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
index ffc9d00e5f..caaf4ef9b1 100644
--- a/keyboards/kbdfans/kbdpad/mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, D1, D2, C6, C7, B6 }
-#define MATRIX_COL_PINS { C4, C5, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 16
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json
index 54657e5c12..8279ac4e81 100644
--- a/keyboards/kbdfans/kbdpad/mk2/info.json
+++ b/keyboards/kbdfans/kbdpad/mk2/info.json
@@ -8,11 +8,19 @@
     	"pid": "0x0006",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "B3", "B2"],
+        "rows": ["D3", "D1", "D2", "C6", "C7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
     	"pin": "B7",
     	"levels": 5,
     	"breathing": true
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "indicators": {
     	"num_lock": "B4",
     	"on_state": 0
@@ -21,33 +29,68 @@
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_6x4"],
     "layouts": {
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.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, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
+            ]
+        },
         "LAYOUT_ortho_6x4": {
             "layout": [
-				{"x":0, "y":0},
-				{"x":1, "y":0},
-				{"x":2, "y":0},
-				{"x":3, "y":0},
-				{"x":0, "y":1.25},
-				{"x":1, "y":1.25},
-				{"x":2, "y":1.25},
-				{"x":3, "y":1.25},
-				{"x":0, "y":2.25},
-				{"x":1, "y":2.25},
-				{"x":2, "y":2.25},
-				{"x":3, "y":2.25},
-				{"x":0, "y":3.25},
-				{"x":1, "y":3.25},
-				{"x":2, "y":3.25},
-				{"x":3, "y":3.25},
-				{"x":0, "y":4.25},
-				{"x":1, "y":4.25},
-				{"x":2, "y":4.25},
-				{"x":3, "y":4.25},
-				{"x":0, "y":5.25},
-				{"x":1, "y":5.25},
-				{"x":2, "y":5.25},
-				{"x":3, "y":5.25}
-			]
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/kbdfans/kbdpad/mk2/mk2.c b/keyboards/kbdfans/kbdpad/mk2/mk2.c
deleted file mode 100644
index 2449724126..0000000000
--- a/keyboards/kbdfans/kbdpad/mk2/mk2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mk2.h"
diff --git a/keyboards/kbdfans/kbdpad/mk2/mk2.h b/keyboards/kbdfans/kbdpad/mk2/mk2.h
deleted file mode 100644
index 0dfa995fe2..0000000000
--- a/keyboards/kbdfans/kbdpad/mk2/mk2.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43, \
-    K50, K51, K52, K53  \
-) \
-{ \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, K33 }, \
-    { K40, K41, K42, K43 }, \
-    { K50, K51, K52, K53 }  \
-}
-
-#define LAYOUT_numpad_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, \
-    K50,      K52, K53  \
-) \
-{ \
-    { K00, K01,   K02, K03 }, \
-    { K10, K11,   K12, K13 }, \
-    { K20, K21,   K22, KC_NO }, \
-    { K30, K31,   K32, K33 }, \
-    { K40, K41,   K42, KC_NO }, \
-    { K50, KC_NO, K52, K53 } \
-}
diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/info.json
index a22c82c681..b42a70c9ab 100644
--- a/keyboards/kbdfans/kbdpad/mk3/info.json
+++ b/keyboards/kbdfans/kbdpad/mk3/info.json
@@ -46,7 +46,7 @@
         ],
         "max_brightness": 128
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "F5"
     },
     "usb": {
@@ -57,27 +57,27 @@
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
-                { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 },
-                { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
-                { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 },
-                { "label": "K20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
-                { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
-                { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
-                { "label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
-                { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 },
-                { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 },
-                { "h": 2, "label": "K23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 },
-                { "label": "K40", "matrix": [4, 0], "w": 1, "x": 0, "y": 4 },
-                { "label": "K41", "matrix": [4, 1], "w": 1, "x": 1, "y": 4 },
-                { "label": "K42", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 },
+                { "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
+                { "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
+                { "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
+                { "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
+                { "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
+                { "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
+                { "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
+                { "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
+                { "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
+                { "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "h": 2, "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
+                { "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 },
+                { "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
+                { "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
                 { "label": "K50", "matrix": [5, 0], "w": 2, "x": 0, "y": 5 },
-                { "label": "K52", "matrix": [5, 2], "w": 1, "x": 2, "y": 5 },
-                { "h": 2, "label": "K43", "matrix": [4, 3], "w": 1, "x": 3, "y": 4 }
+                { "label": "K52", "matrix": [5, 2], "x": 2, "y": 5 },
+                { "h": 2, "label": "K43", "matrix": [4, 3], "x": 3, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/kbdfans/maja/config.h b/keyboards/kbdfans/maja/config.h
index 634888be6f..8f15d2619f 100755
--- a/keyboards/kbdfans/maja/config.h
+++ b/keyboards/kbdfans/maja/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, B6, B5, B4, D7 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, B0, B1, B2, B3, B7, D2, D3, D5 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/info.json
index cc1dadcf91..9df60b9bfa 100644
--- a/keyboards/kbdfans/maja/info.json
+++ b/keyboards/kbdfans/maja/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6068",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "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,
diff --git a/keyboards/kbdfans/maja/rules.mk b/keyboards/kbdfans/maja/rules.mk
index ba5c2a94f7..d0606ec4dd 100755
--- a/keyboards/kbdfans/maja/rules.mk
+++ b/keyboards/kbdfans/maja/rules.mk
@@ -10,5 +10,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3731
 NO_USB_STARTUP_CHECK = no   # Disable initialization only when usb is plugged in
diff --git a/keyboards/kbdfans/maja_soldered/config.h b/keyboards/kbdfans/maja_soldered/config.h
index bf315f1ee3..fef6bf1e5b 100755
--- a/keyboards/kbdfans/maja_soldered/config.h
+++ b/keyboards/kbdfans/maja_soldered/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, B6, D6, B4, D7 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, B0, B1, B2, B3, B7, D2, D3, D5 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/kbdfans/maja_soldered/info.json b/keyboards/kbdfans/maja_soldered/info.json
index b59d3eae39..b4bc430b3f 100644
--- a/keyboards/kbdfans/maja_soldered/info.json
+++ b/keyboards/kbdfans/maja_soldered/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h
index bb78066a43..fb154031a0 100644
--- a/keyboards/kbdfans/niu_mini/config.h
+++ b/keyboards/kbdfans/niu_mini/config.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* NIU Mini PCB default pin-out */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B3, B1, B0, D5, B7, C7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -47,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json
index f381993ad3..f41f1105b2 100644
--- a/keyboards/kbdfans/niu_mini/info.json
+++ b/keyboards/kbdfans/niu_mini/info.json
@@ -8,116 +8,133 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 4
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x12", "planck_mit"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
 
         "LAYOUT_planck_mit": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3, "w":2},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h b/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
index cfcda1bf7d..437907759d 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
+++ b/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
@@ -7,9 +7,7 @@
 #define PRODUCT         "Qt3.14"
 
 /* turn off RGB when computer sleeps */
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_SLEEP
-#endif
 
 /* send tap key if no layer key was used even after tap delay */
 #define TAPPING_TERM 50
diff --git a/keyboards/kbdfans/niu_mini/niu_mini.c b/keyboards/kbdfans/niu_mini/niu_mini.c
index cd9c0cdfed..02b2ca6590 100644
--- a/keyboards/kbdfans/niu_mini/niu_mini.c
+++ b/keyboards/kbdfans/niu_mini/niu_mini.c
@@ -1,4 +1,4 @@
-#include "niu_mini.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/kbdfans/niu_mini/niu_mini.h b/keyboards/kbdfans/niu_mini/niu_mini.h
deleted file mode 100644
index b815219123..0000000000
--- a/keyboards/kbdfans/niu_mini/niu_mini.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_planck_mit( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06,   k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16,   k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26,   k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
index 12c5e539da..54794e66be 100644
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ b/keyboards/kbdfans/odin/rgb/config.h
@@ -16,14 +16,8 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
-#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 104
 #define RGB_MATRIX_LED_COUNT 104
-#define RGB_DI_PIN B15
 
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json
index 1de7004739..026458452c 100644
--- a/keyboards/kbdfans/odin/rgb/info.json
+++ b/keyboards/kbdfans/odin/rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x0102",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"],
+        "rows": ["A10", "A9", "A8", "B14", "B13", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/kbdfans/odin/rgb/rules.mk b/keyboards/kbdfans/odin/rgb/rules.mk
index 38a6bb6887..b7807ae418 100644
--- a/keyboards/kbdfans/odin/rgb/rules.mk
+++ b/keyboards/kbdfans/odin/rgb/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h
index dcda05b8d0..6fa6d5651b 100644
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
-#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -40,5 +33,5 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 180
 #define RGBLIGHT_SLEEP
-#endif
+
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json
index 7189d537fe..b073fc9fb7 100644
--- a/keyboards/kbdfans/odin/soldered/info.json
+++ b/keyboards/kbdfans/odin/soldered/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0101",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"],
+        "rows": ["A10", "A9", "A8", "B14", "B13", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B10",
         "num_lock": "B9",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "debounce": 15,
diff --git a/keyboards/kbdfans/odin/soldered/soldered.c b/keyboards/kbdfans/odin/soldered/soldered.c
deleted file mode 100644
index ddf024efd3..0000000000
--- a/keyboards/kbdfans/odin/soldered/soldered.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "soldered.h"
\ No newline at end of file
diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h
index 5ed85f0b91..fe645e42a3 100644
--- a/keyboards/kbdfans/odin/v2/config.h
+++ b/keyboards/kbdfans/odin/v2/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
-#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B15
-
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 4
     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,4 +31,3 @@
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 180
     #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json
index 29a96330f6..4fc091358b 100644
--- a/keyboards/kbdfans/odin/v2/info.json
+++ b/keyboards/kbdfans/odin/v2/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0101",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"],
+        "rows": ["A10", "A9", "A8", "B14", "B13", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B10",
         "num_lock": "B9",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/kbdfans/odin/v2/v2.c b/keyboards/kbdfans/odin/v2/v2.c
deleted file mode 100644
index 42cbbc301a..0000000000
--- a/keyboards/kbdfans/odin/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 lexbrugman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v2.h"
diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/info.json
index 850cfb1dc2..d5a2e7ce76 100644
--- a/keyboards/kbdfans/odinmini/info.json
+++ b/keyboards/kbdfans/odinmini/info.json
@@ -41,10 +41,13 @@
         "hue_steps": 8,
         "led_count": 4,
         "max_brightness": 180,
-        "pin": "GP12",
         "saturation_steps": 8,
         "sleep": true
     },
+    "ws2812": {
+        "pin": "GP12",
+        "driver": "vendor"
+    },
     "usb": {
         "device_version": "0.0.1",
         "pid": "0x6073",
@@ -54,88 +57,88 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
                 { "label": "Backspace", "matrix": [2, 13], "w": 2, "x": 13, "y": 0 },
-                { "label": "Insert", "matrix": [0, 13], "w": 1, "x": 15.25, "y": 0 },
-                { "label": "Num Lock", "matrix": [0, 14], "w": 1, "x": 16.5, "y": 0 },
-                { "label": "/", "matrix": [0, 15], "w": 1, "x": 17.5, "y": 0 },
-                { "label": "*", "matrix": [0, 16], "w": 1, "x": 18.5, "y": 0 },
-                { "label": "-", "matrix": [0, 17], "w": 1, "x": 19.5, "y": 0 },
+                { "label": "Insert", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "Num Lock", "matrix": [0, 14], "x": 16.5, "y": 0 },
+                { "label": "/", "matrix": [0, 15], "x": 17.5, "y": 0 },
+                { "label": "*", "matrix": [0, 16], "x": 18.5, "y": 0 },
+                { "label": "-", "matrix": [0, 17], "x": 19.5, "y": 0 },
                 { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
                 { "label": "|", "matrix": [3, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "Delete", "matrix": [1, 13], "w": 1, "x": 15.25, "y": 1 },
-                { "label": "7", "matrix": [1, 14], "w": 1, "x": 16.5, "y": 1 },
-                { "label": "8", "matrix": [1, 15], "w": 1, "x": 17.5, "y": 1 },
-                { "label": "9", "matrix": [1, 16], "w": 1, "x": 18.5, "y": 1 },
-                { "h": 2, "label": "+", "matrix": [1, 17], "w": 1, "x": 19.5, "y": 1 },
+                { "label": "Delete", "matrix": [1, 13], "x": 15.25, "y": 1 },
+                { "label": "7", "matrix": [1, 14], "x": 16.5, "y": 1 },
+                { "label": "8", "matrix": [1, 15], "x": 17.5, "y": 1 },
+                { "label": "9", "matrix": [1, 16], "x": 18.5, "y": 1 },
+                { "h": 2, "label": "+", "matrix": [1, 17], "x": 19.5, "y": 1 },
                 { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
                 { "label": "Enter", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "4", "matrix": [2, 14], "w": 1, "x": 16.5, "y": 2 },
-                { "label": "5", "matrix": [2, 15], "w": 1, "x": 17.5, "y": 2 },
-                { "label": "6", "matrix": [2, 16], "w": 1, "x": 18.5, "y": 2 },
+                { "label": "4", "matrix": [2, 14], "x": 16.5, "y": 2 },
+                { "label": "5", "matrix": [2, 15], "x": 17.5, "y": 2 },
+                { "label": "6", "matrix": [2, 16], "x": 18.5, "y": 2 },
                 { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label": "Z", "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
-                { "label": "<", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
-                { "label": ">", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
-                { "label": "?", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 8], "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 9], "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 10], "x": 11.25, "y": 3 },
                 { "label": "Shift", "matrix": [3, 11], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "1", "matrix": [3, 12], "w": 1, "x": 16.5, "y": 3 },
-                { "label": "2", "matrix": [3, 14], "w": 1, "x": 17.5, "y": 3 },
-                { "label": "3", "matrix": [3, 15], "w": 1, "x": 18.5, "y": 3 },
-                { "h": 2, "label": "Enter", "matrix": [3, 16], "w": 1, "x": 19.5, "y": 3 },
-                { "label": "\u2191", "matrix": [3, 17], "w": 1, "x": 15.25, "y": 3.25 },
+                { "label": "1", "matrix": [3, 12], "x": 16.5, "y": 3 },
+                { "label": "2", "matrix": [3, 14], "x": 17.5, "y": 3 },
+                { "label": "3", "matrix": [3, 15], "x": 18.5, "y": 3 },
+                { "h": 2, "label": "Enter", "matrix": [3, 16], "x": 19.5, "y": 3 },
+                { "label": "\u2191", "matrix": [3, 17], "x": 15.25, "y": 3.25 },
                 { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
                 { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
                 { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
                 { "label": "k45", "matrix": [4, 5], "w": 7, "x": 3.75, "y": 4 },
                 { "label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 10.75, "y": 4 },
                 { "label": "Menu", "matrix": [4, 9], "w": 1.5, "x": 12.25, "y": 4 },
-                { "label": "0", "matrix": [4, 10], "w": 1, "x": 17.5, "y": 4 },
-                { "label": ".", "matrix": [4, 11], "w": 1, "x": 18.5, "y": 4 },
-                { "label": "\u2190", "matrix": [4, 12], "w": 1, "x": 14.25, "y": 4.25 },
-                { "label": "\u2193", "matrix": [4, 14], "w": 1, "x": 15.25, "y": 4.25 },
-                { "label": "\u2192", "matrix": [4, 15], "w": 1, "x": 16.25, "y": 4.25 }
+                { "label": "0", "matrix": [4, 10], "x": 17.5, "y": 4 },
+                { "label": ".", "matrix": [4, 11], "x": 18.5, "y": 4 },
+                { "label": "\u2190", "matrix": [4, 12], "x": 14.25, "y": 4.25 },
+                { "label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4.25 },
+                { "label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4.25 }
             ]
         }
     }
diff --git a/keyboards/kbdfans/odinmini/rules.mk b/keyboards/kbdfans/odinmini/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/kbdfans/odinmini/rules.mk
+++ b/keyboards/kbdfans/odinmini/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h
index 9b72111b60..a8e7f41e17 100644
--- a/keyboards/kbdfans/phaseone/config.h
+++ b/keyboards/kbdfans/phaseone/config.h
@@ -16,17 +16,10 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, C6, C7, F7, F6, F5, F4, F1, E6, B7, D0, D1, D2, D3, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -44,5 +37,5 @@
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
 #define RGBLIGHT_SLEEP
-#endif
+
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
\ No newline at end of file
diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json
index 57cf6a1c62..0b4bf2e19f 100644
--- a/keyboards/kbdfans/phaseone/info.json
+++ b/keyboards/kbdfans/phaseone/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0103",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "E6", "B7", "D0", "D1", "D2", "D3", "D5"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D6",
         "num_lock": "D7",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -21,679 +29,679 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Ctrl", "x":10, "y":4, "w":1.25},
-                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [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": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Ctrl", "x":10, "y":4, "w":1.25},
-                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Ctrl", "x":10, "y":4, "w":1.25},
-                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Ctrl", "x":10, "y":4, "w":1.25},
-                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Ctrl", "x":10, "y":4, "w":1.25},
-                {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan_wkl_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"Home", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kbdfans/phaseone/phaseone.c b/keyboards/kbdfans/phaseone/phaseone.c
index f83d14c1b3..ded75ac8ed 100644
--- a/keyboards/kbdfans/phaseone/phaseone.c
+++ b/keyboards/kbdfans/phaseone/phaseone.c
@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  
-#include "phaseone.h"
+#include "quantum.h"
+
 void keyboard_pre_init_kb(void) {
     setPinOutput(D4);
 }
diff --git a/keyboards/kbdfans/phaseone/phaseone.h b/keyboards/kbdfans/phaseone/phaseone.h
deleted file mode 100644
index 85182a79b2..0000000000
--- a/keyboards/kbdfans/phaseone/phaseone.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Copyright 2022 Dztech
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2C │0E │    │0D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�2D  │ ISO Enter
- *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │1D │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- *              │40  │41  │42  │46                      │4A  │4B  │ │4C │4D │4E │
- *              └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────�
- *              │40   │   │42   │46                         │4B   │ Tsangan WKL
- *              └─────┘   └─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01,   K02,   K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A,   K0B, K0C,   K0D, K0E}, \
-    { K10, K11,   K12,   K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B, K1C,   K1D, K1E}, \
-    { K20, K21,   K22,   K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B, K2C,   K2D, K2E}, \
-    { K30, K31,   K32,   K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B, K3C,   K3D, K3E}, \
-    { K40, K41,   K42,   KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A,   K4B, K4C,   K4D, K4E}, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,      K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01,   K02,   K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A,   K0B, K0C,   K0D, K0E}, \
-    { K10, K11,   K12,   K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B, K1C,   K1D, K1E}, \
-    { K20, K21,   K22,   K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B, KC_NO, K2D, K2E}, \
-    { K30, KC_NO, K32,   K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B, K3C,   K3D, K3E}, \
-    { K40, K41,   K42,   KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A,   K4B, K4C,   K4D, K4E}, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00, K01,   K02,   K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A,   K0B, K0C,   K0D, K0E}, \
-    { K10, K11,   K12,   K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B, K1C,   K1D, K1E}, \
-    { K20, K21,   K22,   K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B, K2C,   K2D, K2E}, \
-    { K30, KC_NO, K32,   K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B, K3C,   K3D, K3E}, \
-    { K40, K41,   K42,   KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A,   K4B, K4C,   K4D, K4E}, \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,      K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40,      K42,                K46,                     K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01,   K02,   K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A,   K0B, K0C,   K0D, K0E}, \
-    { K10, K11,   K12,   K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B, K1C,   K1D, K1E}, \
-    { K20, K21,   K22,   K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B, KC_NO, K2D, K2E}, \
-    { K30, KC_NO, K32,   K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B, K3C,   K3D, K3E}, \
-    { K40, KC_NO, K42,   KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, KC_NO, K4B, K4C,   K4D, K4E}, \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,      K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40,      K42,                K46,                     K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01,   K02,   K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A,   K0B, K0C,   K0D, K0E}, \
-    { K10, K11,   K12,   K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B, K1C,   K1D, K1E}, \
-    { K20, K21,   K22,   K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B, K2C,   K2D, K2E}, \
-    { K30, KC_NO, K32,   K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B, K3C,   K3D, K3E}, \
-    { K40, KC_NO, K42,   KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, KC_NO, K4B, K4C,   K4D, K4E}, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01,   K02,   K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A,   K0B, K0C,   K0D, K0E}, \
-    { K10, K11,   K12,   K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B, K1C,   K1D, K1E}, \
-    { K20, K21,   K22,   K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B, KC_NO, K2D, K2E}, \
-    { K30, K31,   K32,   K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B, K3C,   K3D, K3E}, \
-    { K40, K41,   K42,   KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A,   K4B, K4C,   K4D, K4E}, \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00, K01,   K02,   K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A,   K0B, K0C,   K0D, K0E}, \
-    { K10, K11,   K12,   K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B, K1C,   K1D, K1E}, \
-    { K20, K21,   K22,   K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B, K2C,   K2D, K2E}, \
-    { K30, K31,   K32,   K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B, K3C,   K3D, K3E}, \
-    { K40, K41,   K42,   KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A,   K4B, K4C,   K4D, K4E}, \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40,      K42,                K46,                     K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01,   K02,   K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A,   K0B, K0C,   K0D, K0E}, \
-    { K10, K11,   K12,   K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B, K1C,   K1D, K1E}, \
-    { K20, K21,   K22,   K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B, KC_NO, K2D, K2E}, \
-    { K30, K31,   K32,   K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B, K3C,   K3D, K3E}, \
-    { K40, KC_NO, K42,   KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, KC_NO, K4B, K4C,   K4D, K4E}, \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan_wkl_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40,      K42,                K46,                     K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01,   K02,   K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A,   K0B, K0C,   K0D, K0E}, \
-    { K10, K11,   K12,   K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B, K1C,   K1D, K1E}, \
-    { K20, K21,   K22,   K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B, K2C,   K2D, K2E}, \
-    { K30, K31,   K32,   K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B, K3C,   K3D, K3E}, \
-    { K40, KC_NO, K42,   KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, KC_NO, K4B, K4C,   K4D, K4E}, \
-}
diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h
index 5db8d5ee57..b2ffcbfd27 100644
--- a/keyboards/kbdfans/tiger80/config.h
+++ b/keyboards/kbdfans/tiger80/config.h
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json
index 738fc06d78..1f23e0860e 100644
--- a/keyboards/kbdfans/tiger80/info.json
+++ b/keyboards/kbdfans/tiger80/info.json
@@ -3,7 +3,6 @@
     "keyboard_name": "Tiger80",
     "maintainer": "kbdfans",
     "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
     "features": {
         "audio": false,
         "backlight": false,
@@ -15,21 +14,21 @@
         "nkro": true,
         "rgblight": true
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D3", "D5", "D4", "D6", "D7", "B5", "B6", "C6", "E2", "D0"],
+        "rows": ["B0", "E6", "B1", "B4", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7",
         "on_state": 1,
         "scroll_lock": "B2"
     },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D3", "D5", "D4", "D6", "D7", "B5", "B6", "C6", "E2", "D0"],
-        "rows": ["B0", "E6", "B1", "B4", "D1", "D2"]
-    },
     "processor": "atmega32u4",
     "rgblight": {
         "brightness_steps": 10,
         "hue_steps": 10,
         "led_count": 20,
-        "pin": "B3",
         "saturation_steps": 10,
         "sleep": true,
         "animations": {
@@ -45,6 +44,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "url": "",
     "usb": {
         "device_version": "0.0.1",
diff --git a/keyboards/kbnordic/nordic60/rev_a/config.h b/keyboards/kbnordic/nordic60/rev_a/config.h
index 1ccdd6d1d8..5298868bcf 100644
--- a/keyboards/kbnordic/nordic60/rev_a/config.h
+++ b/keyboards/kbnordic/nordic60/rev_a/config.h
@@ -16,16 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5}
-#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 16
 
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/kbnordic/nordic60/rev_a/info.json b/keyboards/kbnordic/nordic60/rev_a/info.json
index 8019c480bd..6332fcb02f 100644
--- a/keyboards/kbnordic/nordic60/rev_a/info.json
+++ b/keyboards/kbnordic/nordic60/rev_a/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
+        "rows": ["C2", "D0", "B0", "D6", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kbnordic/nordic60/rev_a/rev_a.c b/keyboards/kbnordic/nordic60/rev_a/rev_a.c
deleted file mode 100644
index 7c92220811..0000000000
--- a/keyboards/kbnordic/nordic60/rev_a/rev_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "rev_a.h"
diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h
index fa74b02663..ff58f5a208 100644
--- a/keyboards/kc60/config.h
+++ b/keyboards/kc60/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, F6, F7, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F5
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kc60/info.json b/keyboards/kc60/info.json
index 7783ffee54..4e10acaf9e 100644
--- a/keyboards/kc60/info.json
+++ b/keyboards/kc60/info.json
@@ -8,11 +8,19 @@
         "pid": "0x6FFC",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "F6", "F7", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "F5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/kc60se/config.h b/keyboards/kc60se/config.h
deleted file mode 100644
index 2640ba6397..0000000000
--- a/keyboards/kc60se/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2017 Blake C. Lewis
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* * Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kc60se/info.json b/keyboards/kc60se/info.json
index 8779172a97..a785cde305 100644
--- a/keyboards/kc60se/info.json
+++ b/keyboards/kc60se/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "F5",
         "levels": 6
diff --git a/keyboards/kc60se/kc60se.c b/keyboards/kc60se/kc60se.c
index e484d74db8..7aa0ef9d77 100644
--- a/keyboards/kc60se/kc60se.c
+++ b/keyboards/kc60se/kc60se.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "kc60se.h"
 
 void matrix_init_kb(void){
     setPinOutput(B2);
diff --git a/keyboards/keaboard/rev1/config.h b/keyboards/keaboard/rev1/config.h
deleted file mode 100644
index 941b25a2d7..0000000000
--- a/keyboards/keaboard/rev1/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2023 Keith Wade <https://github.com/keawade>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
diff --git a/keyboards/keebformom/config.h b/keyboards/keebformom/config.h
index 0b6b140682..c71d25efd8 100644
--- a/keyboards/keebformom/config.h
+++ b/keyboards/keebformom/config.h
@@ -16,25 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/* KFM PCB default pin-out */
-#define MATRIX_ROW_PINS { F5, F6, F7, B1 }
-#define MATRIX_COL_PINS { B3, B2, D1, D0, D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 40
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -44,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/keebformom/info.json b/keyboards/keebformom/info.json
index 5d9c9b6515..9ddf1af1de 100644
--- a/keyboards/keebformom/info.json
+++ b/keyboards/keebformom/info.json
@@ -8,52 +8,62 @@
         "pid": "0x14E2",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_ortho_4x10": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3}
-                
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3}
             ]
         }
     }
diff --git a/keyboards/keebformom/keebformom.c b/keyboards/keebformom/keebformom.c
deleted file mode 100644
index 18de3af9ef..0000000000
--- a/keyboards/keebformom/keebformom.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Sandipratama <https://github.com/nendezkombet>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "keebformom.h"
\ No newline at end of file
diff --git a/keyboards/keebformom/keebformom.h b/keyboards/keebformom/keebformom.h
deleted file mode 100644
index 88830e8aef..0000000000
--- a/keyboards/keebformom/keebformom.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2022 Sandipratama <https://github.com/nendezkombet>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x10( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,   \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,   \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,   \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39    \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,  }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,  }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,  }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39   }  \
-}
diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h
index 590cce19c5..0eaff206f0 100644
--- a/keyboards/keebio/bamfk1/config.h
+++ b/keyboards/keebio/bamfk1/config.h
@@ -11,8 +11,6 @@
 #define ENCODERS_CW_KEY  { { 1, 1 }, { 3, 1 } }
 #define ENCODERS_CCW_KEY { { 0, 1 }, { 2, 1 } }
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -28,7 +26,6 @@
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json
index c647eec514..d070398c65 100644
--- a/keyboards/keebio/bamfk1/info.json
+++ b/keyboards/keebio/bamfk1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1111",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C7", "pin_b": "B5"},
diff --git a/keyboards/keebio/bamfk4/bamfk4.c b/keyboards/keebio/bamfk4/bamfk4.c
index 6a382bfaf6..52fe61e39e 100644
--- a/keyboards/keebio/bamfk4/bamfk4.c
+++ b/keyboards/keebio/bamfk4/bamfk4.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Danny Nguyen (@nooges)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "bamfk4.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/keebio/bamfk4/bamfk4.h b/keyboards/keebio/bamfk4/bamfk4.h
deleted file mode 100644
index 0bdc2f602f..0000000000
--- a/keyboards/keebio/bamfk4/bamfk4.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2022 Danny Nguyen (@nooges)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03 \
-) { \
-    { k00, k01, k02, k03 }, \
-}
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h
index 8d60a33d48..80c50f13da 100644
--- a/keyboards/keebio/bamfk4/config.h
+++ b/keyboards/keebio/bamfk4/config.h
@@ -3,18 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { F0 }
-#define MATRIX_COL_PINS { E6, D5, B6, B7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 32
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -79,7 +67,6 @@
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
 //#    endif
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json
index 5559d586e9..ff29f68504 100644
--- a/keyboards/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -8,15 +8,26 @@
         "pid": "0x1114",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B6", "B7"],
+        "rows": ["F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 2, "h": 2},
-                {"x": 2, "y": 0, "w": 2, "h": 2},
-                {"x": 4, "y": 0, "w": 2, "h": 2},
-                {"x": 6, "y": 0, "w": 2, "h": 2}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 2, "h": 2},
+                {"matrix": [0, 1], "x": 2, "y": 0, "w": 2, "h": 2},
+                {"matrix": [0, 2], "x": 4, "y": 0, "w": 2, "h": 2},
+                {"matrix": [0, 3], "x": 6, "y": 0, "w": 2, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keebio/bamfk4/rules.mk b/keyboards/keebio/bamfk4/rules.mk
index a236a21bde..73f76344df 100644
--- a/keyboards/keebio/bamfk4/rules.mk
+++ b/keyboards/keebio/bamfk4/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no          # Audio output
 ENCODER_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h
index fbd33490d6..43a6e7f5f2 100644
--- a/keyboards/keebio/bdn9/rev1/config.h
+++ b/keyboards/keebio/bdn9/rev1/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 4
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -35,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/bdn9/rev1/info.json b/keyboards/keebio/bdn9/rev1/info.json
index 8e7b01b794..4a346fd564 100644
--- a/keyboards/keebio/bdn9/rev1/info.json
+++ b/keyboards/keebio/bdn9/rev1/info.json
@@ -15,6 +15,9 @@
         "pin": "B5",
         "levels": 7
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {
diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h
index ee2065f176..193715119a 100644
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/config.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAP_CODE_DELAY 10
 
-#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 11
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -91,7 +89,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    endif
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/info.json
index c23acbc27f..5a33976f83 100644
--- a/keyboards/keebio/bdn9/rev2/info.json
+++ b/keyboards/keebio/bdn9/rev2/info.json
@@ -4,6 +4,12 @@
         "pid": "0x2133",
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A8", "pin_b": "A4"},
diff --git a/keyboards/keebio/bdn9/rev2/rules.mk b/keyboards/keebio/bdn9/rev2/rules.mk
index a692875bb5..de8fd9fc26 100644
--- a/keyboards/keebio/bdn9/rev2/rules.mk
+++ b/keyboards/keebio/bdn9/rev2/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keebio/bfo9000/bfo9000.c b/keyboards/keebio/bfo9000/bfo9000.c
deleted file mode 100644
index 2ae778e32b..0000000000
--- a/keyboards/keebio/bfo9000/bfo9000.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "bfo9000.h"
diff --git a/keyboards/keebio/bfo9000/config.h b/keyboards/keebio/bfo9000/config.h
index 684674d7af..48fd0aaf0c 100644
--- a/keyboards/keebio/bfo9000/config.h
+++ b/keyboards/keebio/bfo9000/config.h
@@ -18,20 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D3, D2, D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN B4
 #define RGBLED_NUM 20    // Number of LEDs
 #define RGBLED_SPLIT { 10, 10 }
 
diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json
index 432857124c..d9dde626f2 100644
--- a/keyboards/keebio/bfo9000/info.json
+++ b/keyboards/keebio/bfo9000/info.json
@@ -8,9 +8,17 @@
       "pid": "0x1169",
       "device_version": "1.0.0"
     },
+    "matrix_pins": {
+      "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+      "rows": ["D3", "D2", "D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+      "pin": "B4"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
index 8290ffd799..9538405eb2 100644
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 150
 #define TAPPING_TOGGLE 2
 
diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
index 8290ffd799..9538405eb2 100644
--- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 150
 #define TAPPING_TOGGLE 2
 
diff --git a/keyboards/keebio/bigswitchseat/bigswitchseat.c b/keyboards/keebio/bigswitchseat/bigswitchseat.c
deleted file mode 100644
index a322fdad62..0000000000
--- a/keyboards/keebio/bigswitchseat/bigswitchseat.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 Danny Nguyen (@nooges)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "bigswitchseat.h"
diff --git a/keyboards/keebio/bigswitchseat/bigswitchseat.h b/keyboards/keebio/bigswitchseat/bigswitchseat.h
deleted file mode 100644
index 3f66c6bc3b..0000000000
--- a/keyboards/keebio/bigswitchseat/bigswitchseat.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2021 Danny Nguyen (@nooges)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00 \
-) { \
-    { k00 }  \
-}
diff --git a/keyboards/keebio/bigswitchseat/config.h b/keyboards/keebio/bigswitchseat/config.h
index c14aa4bd8d..6d03529f68 100644
--- a/keyboards/keebio/bigswitchseat/config.h
+++ b/keyboards/keebio/bigswitchseat/config.h
@@ -3,15 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-
-#define MATRIX_ROW_PINS { E6 }
-#define MATRIX_COL_PINS { F0 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebio/bigswitchseat/info.json b/keyboards/keebio/bigswitchseat/info.json
index df0cb6d9e8..f2fe9771ed 100644
--- a/keyboards/keebio/bigswitchseat/info.json
+++ b/keyboards/keebio/bigswitchseat/info.json
@@ -8,11 +8,18 @@
         "pid": "0x1011",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0"],
+        "rows": ["E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x": 0, "y": 0, "w": 4, "h": 4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/keebio/chocopad/chocopad.c b/keyboards/keebio/chocopad/chocopad.c
index 523e0626a9..b52c8608ca 100644
--- a/keyboards/keebio/chocopad/chocopad.c
+++ b/keyboards/keebio/chocopad/chocopad.c
@@ -1,4 +1,4 @@
-#include "chocopad.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/chocopad/chocopad.h b/keyboards/keebio/chocopad/chocopad.h
deleted file mode 100644
index 43e94a093d..0000000000
--- a/keyboards/keebio/chocopad/chocopad.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x4( \
-    A1, A2, A3, A4, \
-    B1, B2, B3, B4, \
-    C1, C2, C3, C4, \
-    D1, D2, D3, D4 \
-) { \
-    { A1, A2, A3, A4 }, \
-    { B1, B2, B3, B4 }, \
-    { C1, C2, C3, C4 }, \
-    { D1, D2, D3, D4 } \
-}
diff --git a/keyboards/keebio/chocopad/config.h b/keyboards/keebio/chocopad/config.h
index 6d28712e8c..14c93278a6 100644
--- a/keyboards/keebio/chocopad/config.h
+++ b/keyboards/keebio/chocopad/config.h
@@ -1,20 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D7, E6, B3, B2 }
-#define MATRIX_COL_PINS { D2, D4, F6, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -28,6 +19,4 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 4
diff --git a/keyboards/keebio/chocopad/info.json b/keyboards/keebio/chocopad/info.json
index 9b047cc4fc..44d846da74 100644
--- a/keyboards/keebio/chocopad/info.json
+++ b/keyboards/keebio/chocopad/info.json
@@ -8,16 +8,44 @@
     "pid": "0x1144",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["D2", "D4", "F6", "F5"],
+    "rows": ["D7", "E6", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5",
     "levels": 6
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_4x4"],
   "layouts": {
     "LAYOUT_ortho_4x4": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/keebio/convolution/convolution.c b/keyboards/keebio/convolution/convolution.c
index 884f3e7e5b..fc726e277a 100644
--- a/keyboards/keebio/convolution/convolution.c
+++ b/keyboards/keebio/convolution/convolution.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "convolution.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/keebio/convolution/convolution.h b/keyboards/keebio/convolution/convolution.h
deleted file mode 100644
index fcf299b815..0000000000
--- a/keyboards/keebio/convolution/convolution.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_convolution_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/convolution/info.json b/keyboards/keebio/convolution/info.json
index 64e78bdc02..5e05d70ace 100644
--- a/keyboards/keebio/convolution/info.json
+++ b/keyboards/keebio/convolution/info.json
@@ -14,265 +14,5 @@
         "unicode": false,
         "backlight": false
     },
-    "layout_aliases": {"LAYOUT": "LAYOUT_all"},
-    "layouts": {
-        "LAYOUT_65xt": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2.25, "y": 0},
-                {"x": 3.25, "y": 0},
-                {"x": 4.25, "y": 0},
-                {"x": 5.25, "y": 0},
-                {"x": 6.25, "y": 0},
-                {"x": 7.25, "y": 0},
-                {"x": 8.25, "y": 0},
-                {"x": 9.25, "y": 0},
-                {"x": 10.25, "y": 0},
-                {"x": 11.25, "y": 0},
-                {"x": 12.25, "y": 0},
-                {"x": 13.25, "y": 0},
-                {"x": 14.25, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2.25, "y": 1, "w": 1.5},
-                {"x": 3.75, "y": 1},
-                {"x": 4.75, "y": 1},
-                {"x": 5.75, "y": 1},
-                {"x": 6.75, "y": 1},
-                {"x": 7.75, "y": 1},
-                {"x": 8.75, "y": 1},
-                {"x": 9.75, "y": 1},
-                {"x": 10.75, "y": 1},
-                {"x": 11.75, "y": 1},
-                {"x": 12.75, "y": 1},
-                {"x": 13.75, "y": 1},
-                {"x": 14.75, "y": 1},
-                {"x": 15.75, "y": 1, "w": 1.5},
-                {"x": 17.25, "y": 1},
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2.25, "y": 2, "w": 1.75},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
-                {"x": 15, "y": 2, "w": 2.25},
-                {"x": 17.25, "y": 2},
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2.25, "y": 3, "w": 2.25},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3},
-                {"x": 14.5, "y": 3, "w": 1.75},
-                {"x": 16.25, "y": 3},
-                {"x": 17.25, "y": 3},
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2.25, "y": 4, "w": 1.25},
-                {"x": 3.5, "y": 4, "w": 1.25},
-                {"x": 4.75, "y": 4, "w": 1.25},
-                {"x": 6, "y": 4, "w": 1.25},
-                {"x": 7.25, "y": 4, "w": 2.25},
-                {"x": 9.5, "y": 4, "w": 2.75},
-                {"x": 12.25, "y": 4},
-                {"x": 13.25, "y": 4},
-                {"x": 14.25, "y": 4},
-                {"x": 15.25, "y": 4},
-                {"x": 16.25, "y": 4},
-                {"x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_65xt_iso": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2.25, "y": 0},
-                {"x": 3.25, "y": 0},
-                {"x": 4.25, "y": 0},
-                {"x": 5.25, "y": 0},
-                {"x": 6.25, "y": 0},
-                {"x": 7.25, "y": 0},
-                {"x": 8.25, "y": 0},
-                {"x": 9.25, "y": 0},
-                {"x": 10.25, "y": 0},
-                {"x": 11.25, "y": 0},
-                {"x": 12.25, "y": 0},
-                {"x": 13.25, "y": 0},
-                {"x": 14.25, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2.25, "y": 1, "w": 1.5},
-                {"x": 3.75, "y": 1},
-                {"x": 4.75, "y": 1},
-                {"x": 5.75, "y": 1},
-                {"x": 6.75, "y": 1},
-                {"x": 7.75, "y": 1},
-                {"x": 8.75, "y": 1},
-                {"x": 9.75, "y": 1},
-                {"x": 10.75, "y": 1},
-                {"x": 11.75, "y": 1},
-                {"x": 12.75, "y": 1},
-                {"x": 13.75, "y": 1},
-                {"x": 14.75, "y": 1},
-                {"x": 17.25, "y": 1},
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2.25, "y": 2, "w": 1.75},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 1, "w": 1.25, "h": 2},
-                {"x": 17.25, "y": 2},
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2.25, "y": 3, "w": 1.25},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3},
-                {"x": 14.5, "y": 3, "w": 1.75},
-                {"x": 16.25, "y": 3},
-                {"x": 17.25, "y": 3},
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2.25, "y": 4, "w": 1.25},
-                {"x": 3.5, "y": 4, "w": 1.25},
-                {"x": 4.75, "y": 4, "w": 1.25},
-                {"x": 6, "y": 4, "w": 1.25},
-                {"x": 7.25, "y": 4, "w": 2.25},
-                {"x": 9.5, "y": 4, "w": 2.75},
-                {"x": 12.25, "y": 4},
-                {"x": 13.25, "y": 4},
-                {"x": 14.25, "y": 4},
-                {"x": 15.25, "y": 4},
-                {"x": 16.25, "y": 4},
-                {"x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2.25, "y": 0},
-                {"x": 3.25, "y": 0},
-                {"x": 4.25, "y": 0},
-                {"x": 5.25, "y": 0},
-                {"x": 6.25, "y": 0},
-                {"x": 7.25, "y": 0},
-                {"x": 8.25, "y": 0},
-                {"x": 9.25, "y": 0},
-                {"x": 10.25, "y": 0},
-                {"x": 11.25, "y": 0},
-                {"x": 12.25, "y": 0},
-                {"x": 13.25, "y": 0},
-                {"x": 14.25, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2.25, "y": 1, "w": 1.5},
-                {"x": 3.75, "y": 1},
-                {"x": 4.75, "y": 1},
-                {"x": 5.75, "y": 1},
-                {"x": 6.75, "y": 1},
-                {"x": 7.75, "y": 1},
-                {"x": 8.75, "y": 1},
-                {"x": 9.75, "y": 1},
-                {"x": 10.75, "y": 1},
-                {"x": 11.75, "y": 1},
-                {"x": 12.75, "y": 1},
-                {"x": 13.75, "y": 1},
-                {"x": 14.75, "y": 1},
-                {"x": 15.75, "y": 1, "w": 1.5},
-                {"x": 17.25, "y": 1},
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2.25, "y": 2, "w": 1.75},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2, "w": 1.25},
-                {"x": 17.25, "y": 2},
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2.25, "y": 3, "w": 1.25},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3},
-                {"x": 14.5, "y": 3, "w": 1.75},
-                {"x": 16.25, "y": 3},
-                {"x": 17.25, "y": 3},
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2.25, "y": 4, "w": 1.25},
-                {"x": 3.5, "y": 4, "w": 1.25},
-                {"x": 4.75, "y": 4, "w": 1.25},
-                {"x": 6, "y": 4, "w": 1.25},
-                {"x": 7.25, "y": 4, "w": 2.25},
-                {"x": 9.5, "y": 4, "w": 2.75},
-                {"x": 12.25, "y": 4},
-                {"x": 13.25, "y": 4},
-                {"x": 14.25, "y": 4},
-                {"x": 15.25, "y": 4},
-                {"x": 16.25, "y": 4},
-                {"x": 17.25, "y": 4}
-            ]
-        }
-    }
+    "layout_aliases": {"LAYOUT": "LAYOUT_all"}
 }
diff --git a/keyboards/keebio/convolution/rev1/config.h b/keyboards/keebio/convolution/rev1/config.h
index 35a7d5b00d..b46ba583d7 100644
--- a/keyboards/keebio/convolution/rev1/config.h
+++ b/keyboards/keebio/convolution/rev1/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // RGB Matrix
-#define RGB_DI_PIN GP26
 #define RGB_MATRIX_LED_COUNT 16
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/info.json
index f68dc39158..9a5d4f7f63 100644
--- a/keyboards/keebio/convolution/rev1/info.json
+++ b/keyboards/keebio/convolution/rev1/info.json
@@ -24,6 +24,10 @@
             {"pin_a": "GP14", "pin_b": "GP15" }
         ]
     },
+    "ws2812": {
+        "pin": "GP26",
+        "driver": "vendor"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
@@ -44,5 +48,292 @@
             { "flags": 2, "x": 43,  "y": 51 },
             { "flags": 2, "x": 12,  "y": 51 }
         ]
+    },
+    "layouts": {
+        "LAYOUT_65xt": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [5, 8], "x": 9.25, "y": 0},
+                {"matrix": [5, 7], "x": 10.25, "y": 0},
+                {"matrix": [5, 6], "x": 11.25, "y": 0},
+                {"matrix": [5, 5], "x": 12.25, "y": 0},
+                {"matrix": [5, 4], "x": 13.25, "y": 0},
+                {"matrix": [5, 3], "x": 14.25, "y": 0},
+                {"matrix": [5, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 1], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [6, 8], "x": 9.75, "y": 1},
+                {"matrix": [6, 7], "x": 10.75, "y": 1},
+                {"matrix": [6, 6], "x": 11.75, "y": 1},
+                {"matrix": [6, 5], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 3], "x": 14.75, "y": 1},
+                {"matrix": [6, 2], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 0], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [7, 8], "x": 10, "y": 2},
+                {"matrix": [7, 7], "x": 11, "y": 2},
+                {"matrix": [7, 6], "x": 12, "y": 2},
+                {"matrix": [7, 5], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 2], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [7, 0], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [8, 8], "x": 9.5, "y": 3},
+                {"matrix": [8, 7], "x": 10.5, "y": 3},
+                {"matrix": [8, 6], "x": 11.5, "y": 3},
+                {"matrix": [8, 5], "x": 12.5, "y": 3},
+                {"matrix": [8, 4], "x": 13.5, "y": 3},
+                {"matrix": [8, 3], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 2], "x": 16.25, "y": 3},
+                {"matrix": [8, 0], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.25},
+                {"matrix": [9, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 6], "x": 12.25, "y": 4},
+                {"matrix": [9, 5], "x": 13.25, "y": 4},
+                {"matrix": [9, 4], "x": 14.25, "y": 4},
+                {"matrix": [9, 3], "x": 15.25, "y": 4},
+                {"matrix": [9, 2], "x": 16.25, "y": 4},
+                {"matrix": [9, 0], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65xt_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [5, 8], "x": 9.25, "y": 0},
+                {"matrix": [5, 7], "x": 10.25, "y": 0},
+                {"matrix": [5, 6], "x": 11.25, "y": 0},
+                {"matrix": [5, 5], "x": 12.25, "y": 0},
+                {"matrix": [5, 4], "x": 13.25, "y": 0},
+                {"matrix": [5, 3], "x": 14.25, "y": 0},
+                {"matrix": [5, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 1], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [6, 8], "x": 9.75, "y": 1},
+                {"matrix": [6, 7], "x": 10.75, "y": 1},
+                {"matrix": [6, 6], "x": 11.75, "y": 1},
+                {"matrix": [6, 5], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 3], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [7, 8], "x": 10, "y": 2},
+                {"matrix": [7, 7], "x": 11, "y": 2},
+                {"matrix": [7, 6], "x": 12, "y": 2},
+                {"matrix": [7, 5], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 3], "x": 15, "y": 2},
+                {"matrix": [7, 2], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 0], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [8, 8], "x": 9.5, "y": 3},
+                {"matrix": [8, 7], "x": 10.5, "y": 3},
+                {"matrix": [8, 6], "x": 11.5, "y": 3},
+                {"matrix": [8, 5], "x": 12.5, "y": 3},
+                {"matrix": [8, 4], "x": 13.5, "y": 3},
+                {"matrix": [8, 3], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 2], "x": 16.25, "y": 3},
+                {"matrix": [8, 0], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.25},
+                {"matrix": [9, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 6], "x": 12.25, "y": 4},
+                {"matrix": [9, 5], "x": 13.25, "y": 4},
+                {"matrix": [9, 4], "x": 14.25, "y": 4},
+                {"matrix": [9, 3], "x": 15.25, "y": 4},
+                {"matrix": [9, 2], "x": 16.25, "y": 4},
+                {"matrix": [9, 0], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [5, 8], "x": 9.25, "y": 0},
+                {"matrix": [5, 7], "x": 10.25, "y": 0},
+                {"matrix": [5, 6], "x": 11.25, "y": 0},
+                {"matrix": [5, 5], "x": 12.25, "y": 0},
+                {"matrix": [5, 4], "x": 13.25, "y": 0},
+                {"matrix": [5, 3], "x": 14.25, "y": 0},
+                {"matrix": [5, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 1], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [6, 8], "x": 9.75, "y": 1},
+                {"matrix": [6, 7], "x": 10.75, "y": 1},
+                {"matrix": [6, 6], "x": 11.75, "y": 1},
+                {"matrix": [6, 5], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 3], "x": 14.75, "y": 1},
+                {"matrix": [6, 2], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 0], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [7, 8], "x": 10, "y": 2},
+                {"matrix": [7, 7], "x": 11, "y": 2},
+                {"matrix": [7, 6], "x": 12, "y": 2},
+                {"matrix": [7, 5], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 3], "x": 15, "y": 2},
+                {"matrix": [7, 2], "x": 16, "y": 2, "w": 1.25},
+                {"matrix": [7, 0], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [8, 8], "x": 9.5, "y": 3},
+                {"matrix": [8, 7], "x": 10.5, "y": 3},
+                {"matrix": [8, 6], "x": 11.5, "y": 3},
+                {"matrix": [8, 5], "x": 12.5, "y": 3},
+                {"matrix": [8, 4], "x": 13.5, "y": 3},
+                {"matrix": [8, 3], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 2], "x": 16.25, "y": 3},
+                {"matrix": [8, 0], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.25},
+                {"matrix": [9, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 6], "x": 12.25, "y": 4},
+                {"matrix": [9, 5], "x": 13.25, "y": 4},
+                {"matrix": [9, 4], "x": 14.25, "y": 4},
+                {"matrix": [9, 3], "x": 15.25, "y": 4},
+                {"matrix": [9, 2], "x": 16.25, "y": 4},
+                {"matrix": [9, 0], "x": 17.25, "y": 4}
+            ]
+        }
     }
 }
diff --git a/keyboards/keebio/convolution/rev1/rev1.h b/keyboards/keebio/convolution/rev1/rev1.h
deleted file mode 100644
index c50074c3f3..0000000000
--- a/keyboards/keebio/convolution/rev1/rev1.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2022 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "convolution.h"
-#include "quantum.h"
-
-#define LAYOUT_65xt( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA9, RA8, RA7, RA6, RA5, RA4, RA3, RA2, RA1, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9,      RB9, RB8, RB7, RB6, RB5, RB4, RB3,      RB1, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9,      RC9, RC8, RC7, RC6, RC5,      RC3,      RC1, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD9, RD8, RD7, RD6, RD5, RD4, RD3,      RD1, \
-  LE1, LE2, LE3, LE4, LE5, LE6,           LE9,      RE9,      RE7, RE6, RE5, RE4, RE3,      RE1 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9 }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9 }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, KC_NO, LE9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, KC_NO, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, KC_NO, RC3, KC_NO, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, KC_NO, RD3, RD4, RD5, RD6, RD7, RD8, RD9 }, \
-    { RE1, KC_NO, RE3, RE4, RE5, RE6, RE7, KC_NO, RE9 } \
-  }
-
-#define LAYOUT_65xt_iso( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA9, RA8, RA7, RA6, RA5, RA4, RA3, RA2, RA1, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9,      RB9, RB8, RB7, RB6, RB5, RB4,           RB1, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9,      RC9, RC8, RC7, RC6, RC5, RC4, RC3,      RC1, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD9, RD8, RD7, RD6, RD5, RD4, RD3,      RD1, \
-  LE1, LE2, LE3, LE4, LE5, LE6,           LE9,      RE9,      RE7, RE6, RE5, RE4, RE3,      RE1 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9 }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9 }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, KC_NO, LE9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, KC_NO, KC_NO, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, KC_NO, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, KC_NO, RD3, RD4, RD5, RD6, RD7, RD8, RD9 }, \
-    { RE1, KC_NO, RE3, RE4, RE5, RE6, RE7, KC_NO, RE9 } \
-  }
-
-#define LAYOUT_all( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA9, RA8, RA7, RA6, RA5, RA4, RA3, RA2, RA1, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9,      RB9, RB8, RB7, RB6, RB5, RB4, RB3,      RB1, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9,      RC9, RC8, RC7, RC6, RC5, RC4, RC3,      RC1, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD9, RD8, RD7, RD6, RD5, RD4, RD3,      RD1, \
-  LE1, LE2, LE3, LE4, LE5, LE6,           LE9,      RE9,      RE7, RE6, RE5, RE4, RE3,      RE1 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9 }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9 }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, KC_NO, LE9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, KC_NO, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, KC_NO, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, KC_NO, RD3, RD4, RD5, RD6, RD7, RD8, RD9 }, \
-    { RE1, KC_NO, RE3, RE4, RE5, RE6, RE7, KC_NO, RE9 } \
-  }
diff --git a/keyboards/keebio/convolution/rev1/rules.mk b/keyboards/keebio/convolution/rev1/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/keebio/convolution/rev1/rules.mk
+++ b/keyboards/keebio/convolution/rev1/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h
index c10fe13a30..b2727f1ab2 100644
--- a/keyboards/keebio/dilly/config.h
+++ b/keyboards/keebio/dilly/config.h
@@ -1,20 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D7, E6, B4, B1, B3, B2 }
-#define MATRIX_COL_PINS { D2, D4, C6, F6, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -28,7 +19,5 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
-#define RGB_DI_PIN D3
 
 #define RGBLED_NUM 10
diff --git a/keyboards/keebio/dilly/dilly.c b/keyboards/keebio/dilly/dilly.c
index 558968542f..231a828f07 100644
--- a/keyboards/keebio/dilly/dilly.c
+++ b/keyboards/keebio/dilly/dilly.c
@@ -1,4 +1,4 @@
-#include "dilly.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/dilly/dilly.h b/keyboards/keebio/dilly/dilly.h
deleted file mode 100644
index e0f13bae5e..0000000000
--- a/keyboards/keebio/dilly/dilly.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x10( \
-    k00, k01, k02, k03, k04, k34, k33, k32, k31, k30, \
-    k10, k11, k12, k13, k14, k44, k43, k42, k41, k40, \
-    k20, k21, k22, k23, k24, k54, k53, k52, k51, k50 \
-) { \
-    { k00, k01, k02, k03, k04 }, \
-    { k10, k11, k12, k13, k14 }, \
-    { k20, k21, k22, k23, k24 }, \
-    { k30, k31, k32, k33, k34 }, \
-    { k40, k41, k42, k43, k44 }, \
-    { k50, k51, k52, k53, k54 } \
-}
diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/info.json
index f69290454a..29322a8044 100644
--- a/keyboards/keebio/dilly/info.json
+++ b/keyboards/keebio/dilly/info.json
@@ -8,15 +8,56 @@
     "pid": "0x113A",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["D2", "D4", "C6", "F6", "F5"],
+    "rows": ["D7", "E6", "B4", "B1", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_3x10"],
   "layouts": {
     "LAYOUT_ortho_3x10": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [3, 4], "x": 5, "y": 0},
+        {"matrix": [3, 3], "x": 6, "y": 0},
+        {"matrix": [3, 2], "x": 7, "y": 0},
+        {"matrix": [3, 1], "x": 8, "y": 0},
+        {"matrix": [3, 0], "x": 9, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [4, 4], "x": 5, "y": 1},
+        {"matrix": [4, 3], "x": 6, "y": 1},
+        {"matrix": [4, 2], "x": 7, "y": 1},
+        {"matrix": [4, 1], "x": 8, "y": 1},
+        {"matrix": [4, 0], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [5, 4], "x": 5, "y": 2},
+        {"matrix": [5, 3], "x": 6, "y": 2},
+        {"matrix": [5, 2], "x": 7, "y": 2},
+        {"matrix": [5, 1], "x": 8, "y": 2},
+        {"matrix": [5, 0], "x": 9, "y": 2}
+      ]
     }
   }
 }
diff --git a/keyboards/keebio/dsp40/dsp40.c b/keyboards/keebio/dsp40/dsp40.c
deleted file mode 100644
index 745cd386d4..0000000000
--- a/keyboards/keebio/dsp40/dsp40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "dsp40.h"
diff --git a/keyboards/keebio/dsp40/dsp40.h b/keyboards/keebio/dsp40/dsp40.h
deleted file mode 100644
index ec5e5fbbcb..0000000000
--- a/keyboards/keebio/dsp40/dsp40.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#ifdef KEYBOARD_keebio_dsp40_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h
index 0f69303ca8..3d715a473b 100644
--- a/keyboards/keebio/dsp40/rev1/config.h
+++ b/keyboards/keebio/dsp40/rev1/config.h
@@ -16,20 +16,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B9, A9, A8, B15 }
-#define MATRIX_COL_PINS { B10, B2, A3, A4, B7, B6, A10, C13, C14, C15, F0, F1 }
-
 #define TAP_CODE_DELAY 10
-#define DIODE_DIRECTION COL2ROW
 
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 4
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -46,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/info.json
index c5ce2f5a17..efb1bc9551 100644
--- a/keyboards/keebio/dsp40/rev1/info.json
+++ b/keyboards/keebio/dsp40/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x144C",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B2", "A3", "A4", "B7", "B6", "A10", "C13", "C14", "C15", "F0", "F1"],
+        "rows": ["B9", "A9", "A8", "B15"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A1", "pin_b": "A2"}
@@ -17,105 +22,117 @@
         "pin": "A6",
         "levels": 7
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_40_staggered": "LAYOUT"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "Q", "x": 1, "y": 0 },
-                { "label": "W", "x": 2, "y": 0 },
-                { "label": "E", "x": 3, "y": 0 },
-                { "label": "R", "x": 4, "y": 0 },
-                { "label": "T", "x": 5, "y": 0 },
-                { "label": "Y", "x": 6, "y": 0 },
-                { "label": "U", "x": 7, "y": 0 },
-                { "label": "I", "x": 8, "y": 0 },
-                { "label": "O", "x": 9, "y": 0 },
-                { "label": "P", "x": 10, "y": 0 },
-                { "label": "Back<br>Space", "x": 11, "y": 0 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
-                { "label": "A", "x": 1.25, "y": 1 },
-                { "label": "S", "x": 2.25, "y": 1 },
-                { "label": "D", "x": 3.25, "y": 1 },
-                { "label": "F", "x": 4.25, "y": 1 },
-                { "label": "G", "x": 5.25, "y": 1 },
-                { "label": "H", "x": 6.25, "y": 1 },
-                { "label": "J", "x": 7.25, "y": 1 },
-                { "label": "K", "x": 8.25, "y": 1 },
-                { "label": "L", "x": 9.25, "y": 1 },
-                { "label": "Enter", "x": 10.25, "y": 1, "w": 1.75 },
-                { "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "Z", "x": 1.75, "y": 2 },
-                { "label": "X", "x": 2.75, "y": 2 },
-                { "label": "C", "x": 3.75, "y": 2 },
-                { "label": "V", "x": 4.75, "y": 2 },
-                { "label": "B", "x": 5.75, "y": 2 },
-                { "label": "N", "x": 6.75, "y": 2 },
-                { "label": "M", "x": 7.75, "y": 2 },
-                { "label": "<", "x": 8.75, "y": 2 },
-                { "label": "Shift", "x": 9.75, "y": 2, "w": 1.25 },
-                { "label": "Fn", "x": 11, "y": 2 },
-                { "label": "Hyper", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "Super", "x": 1.25, "y": 3 },
-                { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 },
-                { "x": 3.5, "y": 3, "w": 2.25 },
-                { "x": 5.75, "y": 3, "w": 2.75 },
-                { "label": "Super", "x": 8.5, "y": 3, "w": 1.25 },
-                { "label": "Meta", "x": 9.75, "y": 3 },
-                { "label": "Super", "x": 10.75, "y": 3, "w": 1.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_ortho_4x12": {
             "layout": [
-                { "label": "Tab", "x": 0, "y": 0 },
-                { "label": "Q", "x": 1, "y": 0 },
-                { "label": "W", "x": 2, "y": 0 },
-                { "label": "E", "x": 3, "y": 0 },
-                { "label": "R", "x": 4, "y": 0 },
-                { "label": "T", "x": 5, "y": 0 },
-                { "label": "Y", "x": 6, "y": 0 },
-                { "label": "U", "x": 7, "y": 0 },
-                { "label": "I", "x": 8, "y": 0 },
-                { "label": "O", "x": 9, "y": 0 },
-                { "label": "P", "x": 10, "y": 0 },
-                { "label": "Back Space", "x": 11, "y": 0 },
-                { "label": "Esc", "x": 0, "y": 1 },
-                { "label": "A", "x": 1, "y": 1 },
-                { "label": "S", "x": 2, "y": 1 },
-                { "label": "D", "x": 3, "y": 1 },
-                { "label": "F", "x": 4, "y": 1 },
-                { "label": "G", "x": 5, "y": 1 },
-                { "label": "H", "x": 6, "y": 1 },
-                { "label": "J", "x": 7, "y": 1 },
-                { "label": "K", "x": 8, "y": 1 },
-                { "label": "L", "x": 9, "y": 1 },
-                { "label": ";", "x": 10, "y": 1 },
-                { "label": "'", "x": 11, "y": 1 },
-                { "label": "Shift", "x": 0, "y": 2 },
-                { "label": "Z", "x": 1, "y": 2 },
-                { "label": "X", "x": 2, "y": 2 },
-                { "label": "C", "x": 3, "y": 2 },
-                { "label": "V", "x": 4, "y": 2 },
-                { "label": "B", "x": 5, "y": 2 },
-                { "label": "N", "x": 6, "y": 2 },
-                { "label": "M", "x": 7, "y": 2 },
-                { "label": ",", "x": 8, "y": 2 },
-                { "label": ".", "x": 9, "y": 2 },
-                { "label": "/", "x": 10, "y": 2 },
-                { "label": "Enter", "x": 11, "y": 2 },
-                { "x": 0, "y": 3 },
-                { "label": "Ctrl", "x": 1, "y": 3 },
-                { "label": "Alt", "x": 2, "y": 3 },
-                { "label": "Super", "x": 3, "y": 3 },
-                { "label": "Lower", "x": 4, "y": 3 },
-                { "label": "Space", "x": 5, "y": 3 },
-                { "label": "Space", "x": 6, "y": 3 },
-                { "label": "Raise", "x": 7, "y": 3 },
-                { "label": "Left", "x": 8, "y": 3 },
-                { "label": "Down", "x": 9, "y": 3 },
-                { "label": "Up", "x": 10, "y": 3 },
-                { "label": "Right", "x": 11, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/keebio/dsp40/rev1/rev1.c b/keyboards/keebio/dsp40/rev1/rev1.c
index 41187b90b6..091cfc1523 100644
--- a/keyboards/keebio/dsp40/rev1/rev1.c
+++ b/keyboards/keebio/dsp40/rev1/rev1.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "rev1.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
@@ -24,15 +24,3 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return false;
-}
diff --git a/keyboards/keebio/dsp40/rev1/rev1.h b/keyboards/keebio/dsp40/rev1/rev1.h
deleted file mode 100644
index f03792175e..0000000000
--- a/keyboards/keebio/dsp40/rev1/rev1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "dsp40.h"
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-    KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12, \
-    KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KB11, KB12, \
-    KC1, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12, \
-    KD1, KD2, KD3, KD4, KD5, KD6, KD7, KD8, KD9, KD10, KD11, KD12 \
-) \
-{ \
-    { KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12 }, \
-    { KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KB11, KB12 }, \
-    { KC1, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12 }, \
-    { KD1, KD2, KD3, KD4, KD5, KD6, KD7, KD8, KD9, KD10, KD11, KD12 } \
-}
-
-#define LAYOUT( \
-    KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12, \
-    KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10,       KB12, \
-         KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12, \
-    KD1, KD2, KD3,      KD5,           KD8,      KD10, KD11, KD12 \
-) \
-{ \
-    { KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12 }, \
-    { KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KC_NO, KB12 }, \
-    { KC_NO, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12 }, \
-    { KD1, KD2, KD3, KC_NO, KD5, KC_NO, KC_NO, KD8, KC_NO, KD10, KD11, KD12 } \
-}
-
-#define LAYOUT_40_staggered LAYOUT
diff --git a/keyboards/keebio/encoder_actions.c b/keyboards/keebio/encoder_actions.c
index ead941469a..b02881de5f 100644
--- a/keyboards/keebio/encoder_actions.c
+++ b/keyboards/keebio/encoder_actions.c
@@ -28,7 +28,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -40,7 +41,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h
index c9f49ad1fb..f5867889de 100644
--- a/keyboards/keebio/ergodicity/config.h
+++ b/keyboards/keebio/ergodicity/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, C7, B6, B4 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D7, D6, D4, D3, D2, D1, D0, B7, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 12
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json
index 94203340ce..ca3b20c1e0 100644
--- a/keyboards/keebio/ergodicity/info.json
+++ b/keyboards/keebio/ergodicity/info.json
@@ -8,11 +8,19 @@
         "pid": "0x125F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B3"],
+        "rows": ["B0", "B1", "C7", "B6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5",
         "levels": 7,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/keebio/foldkb/foldkb.c b/keyboards/keebio/foldkb/foldkb.c
deleted file mode 100644
index 97641bf992..0000000000
--- a/keyboards/keebio/foldkb/foldkb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "foldkb.h"
diff --git a/keyboards/keebio/foldkb/foldkb.h b/keyboards/keebio/foldkb/foldkb.h
deleted file mode 100644
index bd02a4ef9d..0000000000
--- a/keyboards/keebio/foldkb/foldkb.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_foldkb_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/foldkb/rev1/config.h b/keyboards/keebio/foldkb/rev1/config.h
index 3b10809fb6..30154273b7 100644
--- a/keyboards/keebio/foldkb/rev1/config.h
+++ b/keyboards/keebio/foldkb/rev1/config.h
@@ -16,10 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5 }
 #define SPLIT_HAND_PIN F7
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -28,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json
index 00dffdc401..dba0395842 100644
--- a/keyboards/keebio/foldkb/rev1/info.json
+++ b/keyboards/keebio/foldkb/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1258",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5"],
+        "rows": ["B1", "B2", "C7", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F6"}
@@ -19,6 +24,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/keebio/foldkb/rev1/rev1.c b/keyboards/keebio/foldkb/rev1/rev1.c
index a0dfb31b52..efb9fd53fc 100644
--- a/keyboards/keebio/foldkb/rev1/rev1.c
+++ b/keyboards/keebio/foldkb/rev1/rev1.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "foldkb.h"
+#include "rev1.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/foldkb/rev1/rev1.h b/keyboards/keebio/foldkb/rev1/rev1.h
index d07152538a..7349258f66 100644
--- a/keyboards/keebio/foldkb/rev1/rev1.h
+++ b/keyboards/keebio/foldkb/rev1/rev1.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "foldkb.h"
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h
index a9af99d29d..904658ff8a 100644
--- a/keyboards/keebio/fourier/config.h
+++ b/keyboards/keebio/fourier/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, D7, E6, B4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Split Defines */
 #define SPLIT_HAND_PIN D2
 
@@ -34,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/fourier/fourier.c b/keyboards/keebio/fourier/fourier.c
deleted file mode 100644
index 1bd47f98bc..0000000000
--- a/keyboards/keebio/fourier/fourier.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "fourier.h"
diff --git a/keyboards/keebio/fourier/fourier.h b/keyboards/keebio/fourier/fourier.h
index b99dd57c2e..1bc5e1653c 100644
--- a/keyboards/keebio/fourier/fourier.h
+++ b/keyboards/keebio/fourier/fourier.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#ifdef KEYBOARD_fourier_rev1
-    #include "rev1.h"
-#endif
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json
index 9633cb3e93..48b04f122e 100644
--- a/keyboards/keebio/fourier/info.json
+++ b/keyboards/keebio/fourier/info.json
@@ -8,6 +8,11 @@
         "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",
@@ -17,6 +22,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/keebio/iris/iris.c b/keyboards/keebio/iris/iris.c
deleted file mode 100644
index fb28b3a6d6..0000000000
--- a/keyboards/keebio/iris/iris.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "iris.h"
diff --git a/keyboards/keebio/iris/iris.h b/keyboards/keebio/iris/iris.h
deleted file mode 100644
index b7be3fc59e..0000000000
--- a/keyboards/keebio/iris/iris.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_keebio_iris_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_keebio_iris_rev1_led)
-    #include "rev1_led.h"
-#elif defined(KEYBOARD_keebio_iris_rev2)
-    #include "rev2.h"
-#elif defined(KEYBOARD_keebio_iris_rev3)
-    #include "rev3.h"
-#elif defined(KEYBOARD_keebio_iris_rev4)
-    #include "rev4.h"
-#elif defined(KEYBOARD_keebio_iris_rev5)
-    #include "rev5.h"
-#elif defined(KEYBOARD_keebio_iris_rev6)
-    #include "rev6.h"
-#elif defined(KEYBOARD_keebio_iris_rev6a)
-    #include "rev6a.h"
-#elif defined(KEYBOARD_keebio_iris_rev6b)
-    #include "rev6b.h"
-#elif defined(KEYBOARD_keebio_iris_rev7)
-    #include "rev7.h"
-#endif
-
-#include "quantum.h"
-#include "via.h"
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/config.h b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
index 864cedae98..d5caa23369 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/config.h
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
@@ -8,7 +8,6 @@
 
 #define SWAP_SCLN
 #define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
diff --git a/keyboards/keebio/iris/keymaps/emp/config.h b/keyboards/keebio/iris/keymaps/emp/config.h
index 9f1982935a..0aa25a88bc 100644
--- a/keyboards/keebio/iris/keymaps/emp/config.h
+++ b/keyboards/keebio/iris/keymaps/emp/config.h
@@ -50,12 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #undef PERMISSIVE_HOLD
 
-/* IGNORE_MOD_TAP_INTERRUPT
- * when on: rolling tap-hold keys taps all keys
- * when off: rolling tap-hold keys modifies keys
-*/
-#undef IGNORE_MOD_TAP_INTERRUPT
-
 /* TAPPING_TERM x (ms)
  * how long before a tap becomes a hold. if set above 500, a key tapped during
  * the tapping term will turn it into a hold too
diff --git a/keyboards/keebio/iris/keymaps/fluffactually/config.h b/keyboards/keebio/iris/keymaps/fluffactually/config.h
index fd3ebfd94b..44c4fbd1e5 100644
--- a/keyboards/keebio/iris/keymaps/fluffactually/config.h
+++ b/keyboards/keebio/iris/keymaps/fluffactually/config.h
@@ -19,6 +19,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define USE_I2C
 #define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 175
 
diff --git a/keyboards/keebio/iris/keymaps/khitsule/config.h b/keyboards/keebio/iris/keymaps/khitsule/config.h
index 62760cce35..22b4d6eac7 100644
--- a/keyboards/keebio/iris/keymaps/khitsule/config.h
+++ b/keyboards/keebio/iris/keymaps/khitsule/config.h
@@ -19,6 +19,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define USE_I2C
 #define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #undef RGBLED_NUM
diff --git a/keyboards/keebio/iris/keymaps/mattly/rules.mk b/keyboards/keebio/iris/keymaps/mattly/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/keebio/iris/keymaps/mattly/rules.mk
+++ /dev/null
diff --git a/keyboards/keebio/iris/keymaps/radlinskii/config.h b/keyboards/keebio/iris/keymaps/radlinskii/config.h
index 359dda7b61..c2ea15af87 100644
--- a/keyboards/keebio/iris/keymaps/radlinskii/config.h
+++ b/keyboards/keebio/iris/keymaps/radlinskii/config.h
@@ -8,7 +8,6 @@
 
 #define TAPPING_TOGGLE 1 // tap just once for TT() to toggle the layer
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define RGBLIGHT_LAYERS
 
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/config.h b/keyboards/keebio/iris/keymaps/sq5rix/config.h
index 8c576917e8..59004bfa8a 100644
--- a/keyboards/keebio/iris/keymaps/sq5rix/config.h
+++ b/keyboards/keebio/iris/keymaps/sq5rix/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #define EE_HANDS
 #define TAPPING_TERM 164
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 #define RGBLIGHT_LAYERS
 #define ENCODER_RESOLUTION 4
diff --git a/keyboards/keebio/iris/keymaps/two_knob/config.h b/keyboards/keebio/iris/keymaps/two_knob/config.h
index 37ffb20a2f..83b0fcfc44 100644
--- a/keyboards/keebio/iris/keymaps/two_knob/config.h
+++ b/keyboards/keebio/iris/keymaps/two_knob/config.h
@@ -13,9 +13,6 @@
 /* If you're setting colors per key, this is required. */
 #define SPLIT_LAYER_STATE_ENABLE
 
-/* If you type too fast, it confuses the Mod key combos. This resolves it: */
-#define IGNORE_MOD_TAP_INTERRUPT
-
 /* Set tapdance speed */
 #define TAPPING_TERM 210
 
diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index 436c47ccac..7fd5c0ff95 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
@@ -17,20 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json
index 736b6006b9..0fa11194c1 100644
--- a/keyboards/keebio/iris/rev1/info.json
+++ b/keyboards/keebio/iris/rev1/info.json
@@ -4,6 +4,11 @@
         "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": {
         "pin": "D2",
         "levels": 5
@@ -11,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/keebio/iris/rev1/rev1.h b/keyboards/keebio/iris/rev1/rev1.h
index 19df105c2e..d94716242c 100644
--- a/keyboards/keebio/iris/rev1/rev1.h
+++ b/keyboards/keebio/iris/rev1/rev1.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "iris.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
     L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
     L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index 3bd96004be..7fd5c0ff95 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
@@ -17,20 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json
index e5d71a70b0..1d51067d52 100644
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ b/keyboards/keebio/iris/rev1_led/info.json
@@ -4,6 +4,11 @@
         "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
@@ -11,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/keebio/iris/rev1_led/rev1_led.h b/keyboards/keebio/iris/rev1_led/rev1_led.h
index 19df105c2e..d94716242c 100644
--- a/keyboards/keebio/iris/rev1_led/rev1_led.h
+++ b/keyboards/keebio/iris/rev1_led/rev1_led.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "iris.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
     L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
     L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index 71a5e3ad01..59867e6ef9 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
@@ -17,20 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, D2, D4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLED_SPLIT { 6, 6 }
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json
index 7ac3883bb5..447c1cfddf 100644
--- a/keyboards/keebio/iris/rev2/info.json
+++ b/keyboards/keebio/iris/rev2/info.json
@@ -4,6 +4,11 @@
         "pid": "0x2256",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "E6", "B4", "D2", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5",
         "levels": 5
@@ -11,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/keebio/iris/rev2/rev2.h b/keyboards/keebio/iris/rev2/rev2.h
index 19df105c2e..d94716242c 100644
--- a/keyboards/keebio/iris/rev2/rev2.h
+++ b/keyboards/keebio/iris/rev2/rev2.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "iris.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
     L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
     L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index 932daf4396..c7a7222fdc 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -17,21 +17,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D2, D3, D5, D7, D6 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, D4, B4 }
 #define SPLIT_HAND_PIN F0
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLED_SPLIT { 6, 6 }
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index 0fc9aa4832..ecee0bc87e 100644
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -4,6 +4,11 @@
         "pid": "0x3256",
         "device_version": "3.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "D4", "B4"],
+        "rows": ["D2", "D3", "D5", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B7"}
@@ -13,6 +18,9 @@
         "pin": "B6",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "D2",
         "esc_output": "F1",
diff --git a/keyboards/keebio/iris/rev3/rev3.h b/keyboards/keebio/iris/rev3/rev3.h
index a968c47ed6..c808c4bef3 100644
--- a/keyboards/keebio/iris/rev3/rev3.h
+++ b/keyboards/keebio/iris/rev3/rev3.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "iris.h"
 #include "quantum.h"
 
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
     L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
     L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index d1e542d774..eaeca3a4b9 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -17,23 +17,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, F6, F7 }
-#define MATRIX_COL_PINS { F1, F4, D3, D2, B7, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 }
-#define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 }
 #define SPLIT_HAND_PIN D5
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLED_SPLIT { 6, 6 }
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index a0689c0ed4..db7dd32ae5 100644
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -4,6 +4,11 @@
         "pid": "0x4256",
         "device_version": "4.0.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"}
@@ -13,6 +18,9 @@
         "pin": "B5",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "D6"
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "B1",
         "esc_output": "F1",
@@ -27,6 +35,12 @@
                     {"pin_a": "F7", "pin_b": "F6"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D7", "D3", "B7", "F0", "B3"],
+                "rows": ["B1", "B2", "D2", "F1", "F4"]
+            }
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/keebio/iris/rev4/rev4.h b/keyboards/keebio/iris/rev4/rev4.h
index 06e515ebc6..0e99bd501a 100644
--- a/keyboards/keebio/iris/rev4/rev4.h
+++ b/keyboards/keebio/iris/rev4/rev4.h
@@ -1,16 +1,7 @@
 #pragma once
 
-#include "iris.h"
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
     LA1, LA2, LA3, LA4, LA5, LA6,           RA6, RA5, RA4, RA3, RA2, RA1, \
     LB1, LB2, LB3, LB4, LB5, LB6,           RB6, RB5, RB4, RB3, RB2, RB1, \
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index 2444970342..12ff3a2a4d 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -17,20 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, F6, F7 }
-#define MATRIX_COL_PINS { F1, F4, D3, D2, B7, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 }
-#define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 }
 #define SPLIT_HAND_PIN D5
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_DEFAULT_LEVEL 3
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLED_SPLIT { 6, 6 }
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
index 8279cdcc2b..92bea8d83f 100644
--- a/keyboards/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@@ -4,6 +4,11 @@
         "pid": "0x5256",
         "device_version": "5.0.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"}
@@ -13,6 +18,9 @@
         "pin": "B5",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "D6"
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "B1",
         "esc_output": "F1",
@@ -27,6 +35,12 @@
                     {"pin_a": "F7", "pin_b": "F6"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D7", "D3", "B7", "F0", "B3"],
+                "rows": ["B1", "B2", "D2", "F1", "F4"]
+            }
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/keebio/iris/rev5/rev5.h b/keyboards/keebio/iris/rev5/rev5.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev5/rev5.h
+++ b/keyboards/keebio/iris/rev5/rev5.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "iris.h"
 #include "quantum.h"
 
 
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 0c6b1e38f8..3d30d023ac 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -17,19 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
-#define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
-#define MATRIX_ROW_PINS_RIGHT { B1, F0, F5, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
 #define SPLIT_HAND_PIN D5
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 68
 #    define RGBLED_SPLIT { 34, 34 }
 #    define RGBLIGHT_HUE_STEP 8
@@ -96,4 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
 #    endif
-#endif
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index 8470624a31..54e3736ffc 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -4,13 +4,30 @@
         "pid": "0x6256",
         "device_version": "6.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
+        "rows": ["B1", "F0", "F5", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B2"}
         ]
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
+                "rows": ["B1", "F0", "F5", "B4", "B5"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
diff --git a/keyboards/keebio/iris/rev6/rev6.h b/keyboards/keebio/iris/rev6/rev6.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev6/rev6.h
+++ b/keyboards/keebio/iris/rev6/rev6.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "iris.h"
 #include "quantum.h"
 
 
diff --git a/keyboards/keebio/iris/rev6/rules.mk b/keyboards/keebio/iris/rev6/rules.mk
index 5dcf2c2b7c..5cdaba9bce 100644
--- a/keyboards/keebio/iris/rev6/rules.mk
+++ b/keyboards/keebio/iris/rev6/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index dd05a6ec3b..4031dac790 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -17,19 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
-#define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
-#define MATRIX_ROW_PINS_RIGHT { B1, F0, F5, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
 #define SPLIT_HAND_PIN D5
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 68
 #    define RGBLED_SPLIT { 34, 34 }
 #    define RGBLIGHT_HUE_STEP 8
@@ -96,4 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
 //#    endif
-#endif
diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json
index 027a79f512..c44b7c4a0a 100644
--- a/keyboards/keebio/iris/rev6a/info.json
+++ b/keyboards/keebio/iris/rev6a/info.json
@@ -4,13 +4,30 @@
         "pid": "0x6356",
         "device_version": "6.1.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
+        "rows": ["B1", "F0", "F5", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B2"}
         ]
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
+                "rows": ["B1", "F0", "F5", "B4", "B5"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
diff --git a/keyboards/keebio/iris/rev6a/rev6a.h b/keyboards/keebio/iris/rev6a/rev6a.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev6a/rev6a.h
+++ b/keyboards/keebio/iris/rev6a/rev6a.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "iris.h"
 #include "quantum.h"
 
 
diff --git a/keyboards/keebio/iris/rev6a/rules.mk b/keyboards/keebio/iris/rev6a/rules.mk
index 5dcf2c2b7c..5cdaba9bce 100644
--- a/keyboards/keebio/iris/rev6a/rules.mk
+++ b/keyboards/keebio/iris/rev6a/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index dd05a6ec3b..4031dac790 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -17,19 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
-#define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
-#define MATRIX_ROW_PINS_RIGHT { B1, F0, F5, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
 #define SPLIT_HAND_PIN D5
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 68
 #    define RGBLED_SPLIT { 34, 34 }
 #    define RGBLIGHT_HUE_STEP 8
@@ -96,4 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
 //#    endif
-#endif
diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json
index b8d1f076a4..f59bc09462 100644
--- a/keyboards/keebio/iris/rev6b/info.json
+++ b/keyboards/keebio/iris/rev6b/info.json
@@ -4,13 +4,30 @@
         "pid": "0x6456",
         "device_version": "6.2.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
+        "rows": ["B1", "F0", "F5", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B2"}
         ]
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
+                "rows": ["B1", "F0", "F5", "B4", "B5"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
diff --git a/keyboards/keebio/iris/rev6b/rev6b.h b/keyboards/keebio/iris/rev6b/rev6b.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev6b/rev6b.h
+++ b/keyboards/keebio/iris/rev6b/rev6b.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "iris.h"
 #include "quantum.h"
 
 
diff --git a/keyboards/keebio/iris/rev6b/rules.mk b/keyboards/keebio/iris/rev6b/rules.mk
index 5dcf2c2b7c..5cdaba9bce 100644
--- a/keyboards/keebio/iris/rev6b/rules.mk
+++ b/keyboards/keebio/iris/rev6b/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 906b65b0b2..0ccdc1d748 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -17,19 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
-#define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
-#define MATRIX_ROW_PINS_RIGHT { B1, F0, F5, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
 #define SPLIT_HAND_PIN D5
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 68
 #    define RGBLED_SPLIT { 34, 34 }
 #    define RGBLIGHT_HUE_STEP 8
@@ -96,5 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
 //#    endif
-#endif
-
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index 086f8907a9..530a91f09a 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -4,14 +4,31 @@
         "pid": "0x7256",
         "device_version": "7.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
+        "rows": ["B1", "F0", "F5", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B2"},
             {"pin_a": "F6", "pin_b": "F7"}
         ]
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
+                "rows": ["B1", "F0", "F5", "B4", "B5"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
diff --git a/keyboards/keebio/iris/rev7/rev7.h b/keyboards/keebio/iris/rev7/rev7.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev7/rev7.h
+++ b/keyboards/keebio/iris/rev7/rev7.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "iris.h"
 #include "quantum.h"
 
 
diff --git a/keyboards/keebio/iris/rev7/rules.mk b/keyboards/keebio/iris/rev7/rules.mk
index 5dcf2c2b7c..5cdaba9bce 100644
--- a/keyboards/keebio/iris/rev7/rules.mk
+++ b/keyboards/keebio/iris/rev7/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/kbo5000/kbo5000.c b/keyboards/keebio/kbo5000/kbo5000.c
deleted file mode 100644
index c46093537e..0000000000
--- a/keyboards/keebio/kbo5000/kbo5000.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kbo5000.h"
diff --git a/keyboards/keebio/kbo5000/kbo5000.h b/keyboards/keebio/kbo5000/kbo5000.h
deleted file mode 100644
index 33f1998eb0..0000000000
--- a/keyboards/keebio/kbo5000/kbo5000.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_kbo5000_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/kbo5000/rev1/config.h b/keyboards/keebio/kbo5000/rev1/config.h
index 4e6f11cd38..f02c15c4a7 100644
--- a/keyboards/keebio/kbo5000/rev1/config.h
+++ b/keyboards/keebio/kbo5000/rev1/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7, B0 }
-#define MATRIX_COL_PINS { F4, NO_PIN, F0, B7, B3, D2, D3, D5, D4, NO_PIN }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7, B0 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, D2, D3, B7, B1 }
 #define SPLIT_HAND_PIN F7
 
 #define CAPS_LOCK_LED_PIN B6
@@ -34,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
index f8e1c046c7..ee8c9313c9 100644
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x136A",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", null, "F0", "B7", "B3", "D2", "D3", "D5", "D4", null],
+        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F6"}
@@ -16,6 +21,9 @@
     "backlight": {
         "pin": "B5"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "split": {
         "soft_serial_pin": "D0",
         "encoder": {
@@ -25,6 +33,12 @@
                     {"pin_a": "C7", "pin_b": "C6"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "D2", "D3", "B7", "B1"],
+                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
+            }
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/keebio/kbo5000/rev1/rev1.c b/keyboards/keebio/kbo5000/rev1/rev1.c
index 904c85242b..f0f4ae730d 100644
--- a/keyboards/keebio/kbo5000/rev1/rev1.c
+++ b/keyboards/keebio/kbo5000/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "kbo5000.h"
+#include "rev1.h"
 #include "split_util.h"
 
 void matrix_init_kb(void) {
diff --git a/keyboards/keebio/kbo5000/rev1/rev1.h b/keyboards/keebio/kbo5000/rev1/rev1.h
index 63239d3463..56d827871c 100644
--- a/keyboards/keebio/kbo5000/rev1/rev1.h
+++ b/keyboards/keebio/kbo5000/rev1/rev1.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "kbo5000.h"
 #include "quantum.h"
 
 #define LAYOUT_ansi( \
diff --git a/keyboards/keebio/laplace/config.h b/keyboards/keebio/laplace/config.h
index 455aacc2e7..93ef4c9130 100644
--- a/keyboards/keebio/laplace/config.h
+++ b/keyboards/keebio/laplace/config.h
@@ -17,13 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS {D3, F4, D2, F5, D7, B4, C6, E6}
-#define MATRIX_COL_PINS {D1, F6, F7, B1, B3, B2, B6}
-
 /* WS2812 RGB LED */
-#define RGB_DI_PIN D4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -36,7 +30,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 14
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 200
diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/info.json
index 21312f64f3..7af53b4489 100644
--- a/keyboards/keebio/laplace/info.json
+++ b/keyboards/keebio/laplace/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1147",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D3", "F4", "D2", "F5", "D7", "B4", "C6", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/keebio/laplace/laplace.c b/keyboards/keebio/laplace/laplace.c
deleted file mode 100644
index dcf32aee69..0000000000
--- a/keyboards/keebio/laplace/laplace.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "laplace.h"
diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json
index 2bf92724bb..d7cbab9f45 100644
--- a/keyboards/keebio/levinson/info.json
+++ b/keyboards/keebio/levinson/info.json
@@ -8,10 +8,5 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
-  "community_layouts": ["ortho_4x12"],
-  "layouts": {
-    "LAYOUT": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
-    }
-  }
+  "community_layouts": ["ortho_4x12"]
 }
diff --git a/keyboards/keebio/levinson/levinson.c b/keyboards/keebio/levinson/levinson.c
index b361640bcf..6f1a050e80 100644
--- a/keyboards/keebio/levinson/levinson.c
+++ b/keyboards/keebio/levinson/levinson.c
@@ -1,4 +1,4 @@
-#include "levinson.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/keebio/levinson/levinson.h b/keyboards/keebio/levinson/levinson.h
deleted file mode 100644
index fd022ab518..0000000000
--- a/keyboards/keebio/levinson/levinson.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_levinson_rev1
-    #include "rev1.h"
-#elif KEYBOARD_keebio_levinson_rev2
-    #include "rev2.h"
-#elif KEYBOARD_keebio_levinson_rev3
-    #include "rev3.h"
-#endif
diff --git a/keyboards/keebio/levinson/rev1/config.h b/keyboards/keebio/levinson/rev1/config.h
index c64d1a9e9e..b1922fb9c3 100644
--- a/keyboards/keebio/levinson/rev1/config.h
+++ b/keyboards/keebio/levinson/rev1/config.h
@@ -19,18 +19,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLED_SPLIT { 6, 6 }
diff --git a/keyboards/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/info.json
index 05416bd138..ad795db098 100644
--- a/keyboards/keebio/levinson/rev1/info.json
+++ b/keyboards/keebio/levinson/rev1/info.json
@@ -7,8 +7,21 @@
         "pid": "0x1146",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "C6",
         "levels": 7
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+    "LAYOUT": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
     }
+  }
 }
diff --git a/keyboards/keebio/levinson/rev1/rev1.c b/keyboards/keebio/levinson/rev1/rev1.c
deleted file mode 100644
index 72df88710a..0000000000
--- a/keyboards/keebio/levinson/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "levinson.h"
diff --git a/keyboards/keebio/levinson/rev1/rev1.h b/keyboards/keebio/levinson/rev1/rev1.h
index 1c555b6775..14db8b445b 100644
--- a/keyboards/keebio/levinson/rev1/rev1.h
+++ b/keyboards/keebio/levinson/rev1/rev1.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "levinson.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/keebio/levinson/rev2/config.h b/keyboards/keebio/levinson/rev2/config.h
index 88c38bc9ab..b1922fb9c3 100644
--- a/keyboards/keebio/levinson/rev2/config.h
+++ b/keyboards/keebio/levinson/rev2/config.h
@@ -19,18 +19,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLED_SPLIT { 6, 6 }
diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/info.json
index dbd0901737..fb6fd084c7 100644
--- a/keyboards/keebio/levinson/rev2/info.json
+++ b/keyboards/keebio/levinson/rev2/info.json
@@ -7,8 +7,21 @@
         "pid": "0x2146",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5",
         "levels": 7
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+    "LAYOUT": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
     }
+  }
 }
diff --git a/keyboards/keebio/levinson/rev2/rev2.c b/keyboards/keebio/levinson/rev2/rev2.c
index b569fbd9fb..8fb49f97b3 100644
--- a/keyboards/keebio/levinson/rev2/rev2.c
+++ b/keyboards/keebio/levinson/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "levinson.h"
+#include "rev2.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/levinson/rev2/rev2.h b/keyboards/keebio/levinson/rev2/rev2.h
index 1c555b6775..14db8b445b 100644
--- a/keyboards/keebio/levinson/rev2/rev2.h
+++ b/keyboards/keebio/levinson/rev2/rev2.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "levinson.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/keebio/levinson/rev3/config.h b/keyboards/keebio/levinson/rev3/config.h
index be2be855d0..d2e19703c1 100644
--- a/keyboards/keebio/levinson/rev3/config.h
+++ b/keyboards/keebio/levinson/rev3/config.h
@@ -19,21 +19,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, E6, B4, B5 }
-#define MATRIX_COL_PINS { D3, F4, F7, B1, B3, B2 }
-#define MATRIX_ROW_PINS_RIGHT { D4, B2, B3, B1 }
-#define MATRIX_COL_PINS_RIGHT { F4, F7, D3, B5, B4, E6 }
 #define SPLIT_HAND_PIN D2
 
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D7
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLED_SPLIT { 6, 6 }
diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json
index 8cc3fa9fb9..e5e479ba7a 100644
--- a/keyboards/keebio/levinson/rev3/info.json
+++ b/keyboards/keebio/levinson/rev3/info.json
@@ -1,14 +1,92 @@
 {
     "keyboard_name": "Levinson Rev. 3",
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F7", "D3", "B5", "B4", "E6"],
+                "rows": ["D4", "B2", "B3", "B1"]
+            }
+        }
     },
     "usb": {
         "pid": "0x3146",
         "device_version": "3.0.0"
     },
+    "matrix_pins": {
+        "cols": ["D3", "F4", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 7
+    },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [4, 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/keebio/levinson/rev3/rev3.c b/keyboards/keebio/levinson/rev3/rev3.c
index b569fbd9fb..76fb136c03 100644
--- a/keyboards/keebio/levinson/rev3/rev3.c
+++ b/keyboards/keebio/levinson/rev3/rev3.c
@@ -1,4 +1,4 @@
-#include "levinson.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/levinson/rev3/rev3.h b/keyboards/keebio/levinson/rev3/rev3.h
deleted file mode 100644
index da7349d2e7..0000000000
--- a/keyboards/keebio/levinson/rev3/rev3.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "levinson.h"
-
-#include "quantum.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT( \
-	L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-	L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-	L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-	L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-		{ R05, R04, R03, R02, R01, R00 }, \
-		{ R15, R14, R13, R12, R11, R10 }, \
-		{ R25, R24, R23, R22, R21, R20 }, \
-		{ R35, R34, R33, R32, R31, R30 } \
-	}
-
-#define LAYOUT_ortho_4x12 LAYOUT
diff --git a/keyboards/keebio/nyquist/info.json b/keyboards/keebio/nyquist/info.json
index 8d872e8e0c..9a544f3382 100644
--- a/keyboards/keebio/nyquist/info.json
+++ b/keyboards/keebio/nyquist/info.json
@@ -4,13 +4,5 @@
   "usb": {
     "vid": "0xCB10"
   },
-  "community_layouts": ["ortho_5x12", "ortho_4x12"],
-  "layouts": {
-    "LAYOUT": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}]
-    },
-    "LAYOUT_ortho_4x12": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
-    }
-  }
+  "community_layouts": ["ortho_5x12", "ortho_4x12"]
 }
diff --git a/keyboards/keebio/nyquist/nyquist.c b/keyboards/keebio/nyquist/nyquist.c
deleted file mode 100644
index 2face09d42..0000000000
--- a/keyboards/keebio/nyquist/nyquist.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "nyquist.h"
diff --git a/keyboards/keebio/nyquist/nyquist.h b/keyboards/keebio/nyquist/nyquist.h
deleted file mode 100644
index 63d7680f06..0000000000
--- a/keyboards/keebio/nyquist/nyquist.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_keebio_nyquist_rev1
-    #include "rev1.h"
-#endif
-#ifdef KEYBOARD_keebio_nyquist_rev2
-    #include "rev2.h"
-#endif
-#ifdef KEYBOARD_keebio_nyquist_rev3
-    #include "rev3.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/keebio/nyquist/rev1/config.h b/keyboards/keebio/nyquist/rev1/config.h
index 7a1aeedb88..ab1c967e70 100644
--- a/keyboards/keebio/nyquist/rev1/config.h
+++ b/keyboards/keebio/nyquist/rev1/config.h
@@ -17,20 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
 #define RGBLED_SPLIT { 6, 6 }
 
diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json
index 768687f5c9..975fff8569 100644
--- a/keyboards/keebio/nyquist/rev1/info.json
+++ b/keyboards/keebio/nyquist/rev1/info.json
@@ -4,9 +4,25 @@
         "pid": "0x1156",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+    "LAYOUT": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}]
+    },
+    "LAYOUT_ortho_4x12": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+    }
+  }
 }
diff --git a/keyboards/keebio/nyquist/rev1/rev1.c b/keyboards/keebio/nyquist/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/keebio/nyquist/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/keebio/nyquist/rev1/rev1.h b/keyboards/keebio/nyquist/rev1/rev1.h
index 5896a826cc..7bbfb34e4f 100644
--- a/keyboards/keebio/nyquist/rev1/rev1.h
+++ b/keyboards/keebio/nyquist/rev1/rev1.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "nyquist.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/keebio/nyquist/rev2/config.h b/keyboards/keebio/nyquist/rev2/config.h
index 267faf45d9..ab1c967e70 100644
--- a/keyboards/keebio/nyquist/rev2/config.h
+++ b/keyboards/keebio/nyquist/rev2/config.h
@@ -17,20 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { D2, F5, F6, F7, B1, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
 #define RGBLED_SPLIT { 6, 6 }
 
diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json
index b47bb7511b..489ee6bd29 100644
--- a/keyboards/keebio/nyquist/rev2/info.json
+++ b/keyboards/keebio/nyquist/rev2/info.json
@@ -4,13 +4,29 @@
         "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
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+    "LAYOUT": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}]
+    },
+    "LAYOUT_ortho_4x12": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+    }
+  }
 }
diff --git a/keyboards/keebio/nyquist/rev2/rev2.h b/keyboards/keebio/nyquist/rev2/rev2.h
index 5896a826cc..7bbfb34e4f 100644
--- a/keyboards/keebio/nyquist/rev2/rev2.h
+++ b/keyboards/keebio/nyquist/rev2/rev2.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "nyquist.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/keebio/nyquist/rev3/config.h b/keyboards/keebio/nyquist/rev3/config.h
index 697205027d..7b014e4fc5 100644
--- a/keyboards/keebio/nyquist/rev3/config.h
+++ b/keyboards/keebio/nyquist/rev3/config.h
@@ -17,21 +17,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { F0, F5, D7, F6, F7 }
-#define MATRIX_COL_PINS { F1, F4, B7, D2, D3, D4 }
 #define SPLIT_HAND_PIN D5
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN B4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json
index e7bd8635ae..eb17350d63 100644
--- a/keyboards/keebio/nyquist/rev3/info.json
+++ b/keyboards/keebio/nyquist/rev3/info.json
@@ -4,6 +4,11 @@
         "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
@@ -11,6 +16,146 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "B4"
+    },
     "processor": "atmega32u4",
-    "bootloader": "qmk-dfu"
+    "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/rev3.c b/keyboards/keebio/nyquist/rev3/rev3.c
index c464270517..76fb136c03 100644
--- a/keyboards/keebio/nyquist/rev3/rev3.c
+++ b/keyboards/keebio/nyquist/rev3/rev3.c
@@ -1,4 +1,4 @@
-#include "rev3.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/nyquist/rev3/rev3.h b/keyboards/keebio/nyquist/rev3/rev3.h
deleted file mode 100644
index e365c0e417..0000000000
--- a/keyboards/keebio/nyquist/rev3/rev3.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include "nyquist.h"
-#include "quantum.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT( \
-	L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-	L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-	L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-	L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
-    L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-		{ L40, L41, L42, L43, L44, L45 }, \
-		{ R00, R01, R02, R03, R04, R05 }, \
-		{ R10, R11, R12, R13, R14, R15 }, \
-		{ R20, R21, R22, R23, R24, R25 }, \
-		{ R30, R31, R32, R33, R34, R35 }, \
-		{ R40, R41, R42, R43, R44, R45 } \
-	}
-
-#define LAYOUT_ortho_4x12( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-    ) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-		{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-		{ R00, R01, R02, R03, R04, R05 }, \
-		{ R10, R11, R12, R13, R14, R15 }, \
-		{ R20, R21, R22, R23, R24, R25 }, \
-		{ R30, R31, R32, R33, R34, R35 }, \
-		{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-	}
-
-#define LAYOUT_ortho_5x12 LAYOUT
diff --git a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h b/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
index 8a35b6f197..1751a65b2e 100644
--- a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
@@ -25,4 +25,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // https://docs.qmk.fm/#/tap_hold?id=tap-hold-configuration-options
 #define TAPPING_TERM 120
 //#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
index 82ace2ef68..3e2c097853 100644
--- a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 500
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 #define FORCE_NKRO
 #define RETRO_TAPPING
diff --git a/keyboards/keebio/quefrency/quefrency.c b/keyboards/keebio/quefrency/quefrency.c
deleted file mode 100644
index d713a0ff3a..0000000000
--- a/keyboards/keebio/quefrency/quefrency.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "quefrency.h"
diff --git a/keyboards/keebio/quefrency/quefrency.h b/keyboards/keebio/quefrency/quefrency.h
deleted file mode 100644
index 434f674bce..0000000000
--- a/keyboards/keebio/quefrency/quefrency.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_quefrency_rev2
-    #include "rev2.h"
-#endif
-#ifdef KEYBOARD_keebio_quefrency_rev3
-    #include "rev3.h"
-#endif
-#ifdef KEYBOARD_keebio_quefrency_rev4
-    #include "rev4.h"
-#endif
-#ifdef KEYBOARD_keebio_quefrency_rev5
-    #include "rev5.h"
-#endif
diff --git a/keyboards/keebio/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h
index 882997de51..83fcd1fe0a 100644
--- a/keyboards/keebio/quefrency/rev1/config.h
+++ b/keyboards/keebio/quefrency/rev1/config.h
@@ -18,22 +18,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, D4, D7, E6, B4, C6 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6, B5 }
-#define MATRIX_ROW_PINS_RIGHT { F4, D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { F5, F6, F7, B1, B3, B2, B6, C6 }
 #define SPLIT_HAND_PIN D2
 
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json
index 6c40e387ac..7fb5ca8153 100644
--- a/keyboards/keebio/quefrency/rev1/info.json
+++ b/keyboards/keebio/quefrency/rev1/info.json
@@ -8,8 +8,22 @@
         "pid": "0x1257",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+        "rows": ["F4", "D4", "D7", "E6", "B4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "C6"],
+                "rows": ["F4", "D4", "D7", "E6", "B4", "B5"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h
index 63f1408cda..e7774432df 100644
--- a/keyboards/keebio/quefrency/rev2/config.h
+++ b/keyboards/keebio/quefrency/rev2/config.h
@@ -18,18 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 }
 #define SPLIT_HAND_PIN F7
 
 #define CAPS_LOCK_LED_PIN B6
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json
index 508e2431b9..d73c1af308 100644
--- a/keyboards/keebio/quefrency/rev2/info.json
+++ b/keyboards/keebio/quefrency/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2257",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+        "rows": ["B1", "B2", "C7", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F6"}
@@ -16,6 +21,9 @@
     "backlight": {
         "pin": "B5"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "split": {
         "soft_serial_pin": "D0",
         "encoder": {
@@ -24,6 +32,12 @@
                     {"pin_a": "D6", "pin_b": "D4"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+                "rows": ["B3", "B2", "B6", "B4", "D7"]
+            }
         }
     },
     "processor": "atmega32u4",
@@ -34,829 +48,804 @@
     "layouts": {
         "LAYOUT_60": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Left", "x": 13, "y": 4 },
-                { "label": "Down", "x": 14, "y": 4 },
-                { "label": "Right", "x": 15, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-                { "label": "Home", "x": 16, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
-                { "label": "End", "x": 16, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
-                { "label": "Page Up", "x": 16, "y": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-                { "label": "Page Down", "x": 16, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Win", "x": 13, "y": 4 },
-                { "label": "Left", "x": 14, "y": 4 },
-                { "label": "Down", "x": 15, "y": 4 },
-                { "label": "Right", "x": 16, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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": [6, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
             ]
         },
         "LAYOUT_60_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Left", "x": 15.25, "y": 4 },
-                { "label": "Down", "x": 16.25, "y": 4 },
-                { "label": "Right", "x": 17.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_65_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "NUHS", "x": 13.75, "y": 2 },
-                { "label": "Enter", "x": 14.75, "y": 1, "w": 1.25, "h": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Left", "x": 13, "y": 4 },
-                { "label": "Down", "x": 14, "y": 4 },
-                { "label": "Right", "x": 15, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 3},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-                { "label": "Home", "x": 16, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "End", "x": 16, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "NUHS", "x": 13.75, "y": 2 },
-                { "label": "Enter", "x": 14.75, "y": 1, "w": 1.25, "h": 2 },
-                { "label": "Page Up", "x": 16, "y": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-                { "label": "Page Down", "x": 16, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Win", "x": 13, "y": 4 },
-                { "label": "Left", "x": 14, "y": 4 },
-                { "label": "Down", "x": 15, "y": 4 },
-                { "label": "Right", "x": 16, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 3},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
             ]
         },
         "LAYOUT_60_iso_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 1, "w": 1.25, "h": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 3.5, "y": 3 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Left", "x": 15.25, "y": 4 },
-                { "label": "Down", "x": 16.25, "y": 4 },
-                { "label": "Right", "x": 17.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_65_iso_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 1, "w": 1.25, "h": 2 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 3.5, "y": 3 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 2, "w": 1.25 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 3.5, "y": 3 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4 },
-                { "label": "Space", "x": 8.25, "y": 4, "w": 1.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, "w": 1.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keebio/quefrency/rev2/rev2.c b/keyboards/keebio/quefrency/rev2/rev2.c
index 4e3e75a21f..a3bc2ca1ef 100644
--- a/keyboards/keebio/quefrency/rev2/rev2.c
+++ b/keyboards/keebio/quefrency/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "quefrency.h"
+#include "quantum.h"
 #include "split_util.h"
 
 void matrix_init_kb(void) {
diff --git a/keyboards/keebio/quefrency/rev2/rev2.h b/keyboards/keebio/quefrency/rev2/rev2.h
deleted file mode 100644
index 2f57ac489f..0000000000
--- a/keyboards/keebio/quefrency/rev2/rev2.h
+++ /dev/null
@@ -1,192 +0,0 @@
-#pragma once
-
-#include "quefrency.h"
-#include "quantum.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT_60( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_60_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_60_iso( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65_iso( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_60_iso_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65_iso_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_all( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
diff --git a/keyboards/keebio/quefrency/rev3/config.h b/keyboards/keebio/quefrency/rev3/config.h
index 63f1408cda..e7774432df 100644
--- a/keyboards/keebio/quefrency/rev3/config.h
+++ b/keyboards/keebio/quefrency/rev3/config.h
@@ -18,18 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 }
 #define SPLIT_HAND_PIN F7
 
 #define CAPS_LOCK_LED_PIN B6
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json
index cd335a1d27..fb204ab910 100644
--- a/keyboards/keebio/quefrency/rev3/info.json
+++ b/keyboards/keebio/quefrency/rev3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3357",
         "device_version": "3.1.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+        "rows": ["B1", "B2", "C7", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F6"}
@@ -16,6 +21,9 @@
     "backlight": {
         "pin": "B5"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "split": {
         "soft_serial_pin": "D0",
         "encoder": {
@@ -24,6 +32,12 @@
                     {"pin_a": "D6", "pin_b": "D4"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+                "rows": ["B3", "B2", "B6", "B4", "D7"]
+            }
         }
     },
     "processor": "atmega32u4",
@@ -34,829 +48,804 @@
     "layouts": {
         "LAYOUT_60": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Left", "x": 13, "y": 4 },
-                { "label": "Down", "x": 14, "y": 4 },
-                { "label": "Right", "x": 15, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-                { "label": "Home", "x": 16, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
-                { "label": "End", "x": 16, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
-                { "label": "Page Up", "x": 16, "y": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-                { "label": "Page Down", "x": 16, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Win", "x": 13, "y": 4 },
-                { "label": "Left", "x": 14, "y": 4 },
-                { "label": "Down", "x": 15, "y": 4 },
-                { "label": "Right", "x": 16, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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": [6, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
             ]
         },
         "LAYOUT_60_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Left", "x": 15.25, "y": 4 },
-                { "label": "Down", "x": 16.25, "y": 4 },
-                { "label": "Right", "x": 17.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_65_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "NUHS", "x": 13.75, "y": 2 },
-                { "label": "Enter", "x": 14.75, "y": 1, "w": 1.25, "h": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Left", "x": 13, "y": 4 },
-                { "label": "Down", "x": 14, "y": 4 },
-                { "label": "Right", "x": 15, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 3},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-                { "label": "Home", "x": 16, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "End", "x": 16, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "NUHS", "x": 13.75, "y": 2 },
-                { "label": "Enter", "x": 14.75, "y": 1, "w": 1.25, "h": 2 },
-                { "label": "Page Up", "x": 16, "y": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-                { "label": "Page Down", "x": 16, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Win", "x": 13, "y": 4 },
-                { "label": "Left", "x": 14, "y": 4 },
-                { "label": "Down", "x": 15, "y": 4 },
-                { "label": "Right", "x": 16, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 3},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
             ]
         },
         "LAYOUT_60_iso_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 1, "w": 1.25, "h": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 3.5, "y": 3 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Left", "x": 15.25, "y": 4 },
-                { "label": "Down", "x": 16.25, "y": 4 },
-                { "label": "Right", "x": 17.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_65_iso_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 1, "w": 1.25, "h": 2 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 3.5, "y": 3 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 2, "w": 1.25 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 3.5, "y": 3 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4 },
-                { "label": "Space", "x": 8.25, "y": 4, "w": 1.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, "w": 1.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keebio/quefrency/rev3/rev3.c b/keyboards/keebio/quefrency/rev3/rev3.c
index 52ce977ac7..d3ada3076f 100644
--- a/keyboards/keebio/quefrency/rev3/rev3.c
+++ b/keyboards/keebio/quefrency/rev3/rev3.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quefrency.h"
+#include "quantum.h"
 #include "split_util.h"
 
 void matrix_init_kb(void) {
diff --git a/keyboards/keebio/quefrency/rev3/rev3.h b/keyboards/keebio/quefrency/rev3/rev3.h
deleted file mode 100644
index 12f76d5c85..0000000000
--- a/keyboards/keebio/quefrency/rev3/rev3.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quefrency.h"
-#include "quantum.h"
-
-#define LAYOUT_60( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_60_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_60_iso( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65_iso( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_60_iso_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65_iso_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_all( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
diff --git a/keyboards/keebio/quefrency/rev4/config.h b/keyboards/keebio/quefrency/rev4/config.h
index 3292fbf302..b27ba56d53 100644
--- a/keyboards/keebio/quefrency/rev4/config.h
+++ b/keyboards/keebio/quefrency/rev4/config.h
@@ -16,12 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 }
 #define SPLIT_HAND_PIN F7
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -30,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json
index de9a383d4f..55fb4adda4 100644
--- a/keyboards/keebio/quefrency/rev4/info.json
+++ b/keyboards/keebio/quefrency/rev4/info.json
@@ -8,11 +8,19 @@
         "pid": "0x4357",
         "device_version": "4.1.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+        "rows": ["B1", "B2", "C7", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "split": {
         "soft_serial_pin": "D0",
         "encoder": {
@@ -21,6 +29,12 @@
                     {"pin_a": "D6", "pin_b": "D4"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+                "rows": ["B3", "B2", "B6", "B4", "D7"]
+            }
         }
     },
     "processor": "atmega32u4",
@@ -31,465 +45,450 @@
     "layouts": {
         "LAYOUT_60": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Left", "x": 13, "y": 4 },
-                { "label": "Down", "x": 14, "y": 4 },
-                { "label": "Right", "x": 15, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-                { "label": "Home", "x": 16, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
-                { "label": "End", "x": 16, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
-                { "label": "Page Up", "x": 16, "y": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-                { "label": "Page Down", "x": 16, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Win", "x": 13, "y": 4 },
-                { "label": "Left", "x": 14, "y": 4 },
-                { "label": "Down", "x": 15, "y": 4 },
-                { "label": "Right", "x": 16, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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": [6, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
             ]
         },
         "LAYOUT_60_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Left", "x": 15.25, "y": 4 },
-                { "label": "Down", "x": 16.25, "y": 4 },
-                { "label": "Right", "x": 17.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_65_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 2, "w": 1.25 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 3.5, "y": 3 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4 },
-                { "label": "Space", "x": 8.25, "y": 4, "w": 1.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, "w": 1.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keebio/quefrency/rev4/rev4.c b/keyboards/keebio/quefrency/rev4/rev4.c
index 66d73a934a..071ac69db9 100644
--- a/keyboards/keebio/quefrency/rev4/rev4.c
+++ b/keyboards/keebio/quefrency/rev4/rev4.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quefrency.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/keebio/quefrency/rev4/rev4.h b/keyboards/keebio/quefrency/rev4/rev4.h
deleted file mode 100644
index 2284a6da43..0000000000
--- a/keyboards/keebio/quefrency/rev4/rev4.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quefrency.h"
-#include "quantum.h"
-
-#define LAYOUT_60( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_60_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_all( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
diff --git a/keyboards/keebio/quefrency/rev5/config.h b/keyboards/keebio/quefrency/rev5/config.h
index 3292fbf302..b27ba56d53 100644
--- a/keyboards/keebio/quefrency/rev5/config.h
+++ b/keyboards/keebio/quefrency/rev5/config.h
@@ -16,12 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 }
-#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 }
-#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 }
 #define SPLIT_HAND_PIN F7
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -30,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLED_SPLIT { 8, 8 }
 #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json
index 422d987258..78a44dfc80 100644
--- a/keyboards/keebio/quefrency/rev5/info.json
+++ b/keyboards/keebio/quefrency/rev5/info.json
@@ -8,11 +8,19 @@
         "pid": "0x5357",
         "device_version": "5.1.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+        "rows": ["B1", "B2", "C7", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "split": {
         "soft_serial_pin": "D0",
         "encoder": {
@@ -21,6 +29,12 @@
                     {"pin_a": "D6", "pin_b": "D4"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+                "rows": ["B3", "B2", "B6", "B4", "D7"]
+            }
         }
     },
     "processor": "atmega32u4",
@@ -31,465 +45,450 @@
     "layouts": {
         "LAYOUT_60": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Left", "x": 13, "y": 4 },
-                { "label": "Down", "x": 14, "y": 4 },
-                { "label": "Right", "x": 15, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-                { "label": "Home", "x": 16, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
-                { "label": "End", "x": 16, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
-                { "label": "Page Up", "x": 16, "y": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-                { "label": "Page Down", "x": 16, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Win", "x": 13, "y": 4 },
-                { "label": "Left", "x": 14, "y": 4 },
-                { "label": "Down", "x": 15, "y": 4 },
-                { "label": "Right", "x": 16, "y": 4 }
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "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": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "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": [6, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
             ]
         },
         "LAYOUT_60_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Left", "x": 15.25, "y": 4 },
-                { "label": "Down", "x": 16.25, "y": 4 },
-                { "label": "Right", "x": 17.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_65_with_macro": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 2, "w": 1.25 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 3.5, "y": 3 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4 },
-                { "label": "Space", "x": 8.25, "y": 4, "w": 1.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [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, "w": 1.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"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": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keebio/quefrency/rev5/rev5.c b/keyboards/keebio/quefrency/rev5/rev5.c
index 66d73a934a..071ac69db9 100644
--- a/keyboards/keebio/quefrency/rev5/rev5.c
+++ b/keyboards/keebio/quefrency/rev5/rev5.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quefrency.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/keebio/quefrency/rev5/rev5.h b/keyboards/keebio/quefrency/rev5/rev5.h
deleted file mode 100644
index 2284a6da43..0000000000
--- a/keyboards/keebio/quefrency/rev5/rev5.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quefrency.h"
-#include "quantum.h"
-
-#define LAYOUT_60( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_60_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_all( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
index 0ac1cc4a6e..c02549e477 100644
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
@@ -8,7 +8,6 @@
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 150
 #define TAPPING_TOGGLE 2
 
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
index 3bb69ef31c..9d65e8da70 100644
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
+++ b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
@@ -8,7 +8,6 @@
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 175
 #define TAPPING_TOGGLE 2
 
diff --git a/keyboards/keebio/rorschach/rev1/config.h b/keyboards/keebio/rorschach/rev1/config.h
index 435ebb2845..979899d547 100644
--- a/keyboards/keebio/rorschach/rev1/config.h
+++ b/keyboards/keebio/rorschach/rev1/config.h
@@ -17,20 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, D2, D4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* WS2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json
index 88cec27844..6b2c9244c0 100644
--- a/keyboards/keebio/rorschach/rev1/info.json
+++ b/keyboards/keebio/rorschach/rev1/info.json
@@ -8,10 +8,18 @@
     "pid": "0x1246",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D7", "E6", "B4", "D2", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5",
     "levels": 5
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "split": {
     "soft_serial_pin": "D0"
   },
@@ -20,67 +28,67 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "w": 1, "x": 0, "y": 0 },
-        { "w": 1, "x": 1, "y": 0 },
-        { "w": 1, "x": 2, "y": 0 },
-        { "w": 1, "x": 3, "y": 0 },
-        { "w": 1, "x": 4, "y": 0 },
-        { "w": 1, "x": 5, "y": 0 },
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
 
-        { "w": 1, "x": 9, "y": 0 },
-        { "w": 1, "x": 10, "y": 0 },
-        { "w": 1, "x": 11, "y": 0 },
-        { "w": 1, "x": 12, "y": 0 },
-        { "w": 1, "x": 13, "y": 0 },
-        { "w": 1, "x": 14, "y": 0 },
+        { "x": 9, "y": 0 },
+        { "x": 10, "y": 0 },
+        { "x": 11, "y": 0 },
+        { "x": 12, "y": 0 },
+        { "x": 13, "y": 0 },
+        { "x": 14, "y": 0 },
 
-        { "w": 1, "x": 0, "y": 1 },
-        { "w": 1, "x": 1, "y": 1 },
-        { "w": 1, "x": 2, "y": 1 },
-        { "w": 1, "x": 3, "y": 1 },
-        { "w": 1, "x": 4, "y": 1 },
-        { "w": 1, "x": 5, "y": 1 },
+        { "x": 0, "y": 1 },
+        { "x": 1, "y": 1 },
+        { "x": 2, "y": 1 },
+        { "x": 3, "y": 1 },
+        { "x": 4, "y": 1 },
+        { "x": 5, "y": 1 },
 
-        { "w": 1, "x": 9, "y": 1 },
-        { "w": 1, "x": 10, "y": 1 },
-        { "w": 1, "x": 11, "y": 1 },
-        { "w": 1, "x": 12, "y": 1 },
-        { "w": 1, "x": 13, "y": 1 },
-        { "w": 1, "x": 14, "y": 1 },
+        { "x": 9, "y": 1 },
+        { "x": 10, "y": 1 },
+        { "x": 11, "y": 1 },
+        { "x": 12, "y": 1 },
+        { "x": 13, "y": 1 },
+        { "x": 14, "y": 1 },
 
-        { "w": 1, "x": 0, "y": 2 },
-        { "w": 1, "x": 1, "y": 2 },
-        { "w": 1, "x": 2, "y": 2 },
-        { "w": 1, "x": 3, "y": 2 },
-        { "w": 1, "x": 4, "y": 2 },
-        { "w": 1, "x": 5, "y": 2 },
+        { "x": 0, "y": 2 },
+        { "x": 1, "y": 2 },
+        { "x": 2, "y": 2 },
+        { "x": 3, "y": 2 },
+        { "x": 4, "y": 2 },
+        { "x": 5, "y": 2 },
 
-        { "w": 1, "x": 9, "y": 2 },
-        { "w": 1, "x": 10, "y": 2 },
-        { "w": 1, "x": 11, "y": 2 },
-        { "w": 1, "x": 12, "y": 2 },
-        { "w": 1, "x": 13, "y": 2 },
-        { "w": 1, "x": 14, "y": 2 },
+        { "x": 9, "y": 2 },
+        { "x": 10, "y": 2 },
+        { "x": 11, "y": 2 },
+        { "x": 12, "y": 2 },
+        { "x": 13, "y": 2 },
+        { "x": 14, "y": 2 },
 
-        { "w": 1, "x": 0, "y": 3 },
-        { "w": 1, "x": 1, "y": 3 },
-        { "w": 1, "x": 2, "y": 3 },
-        { "w": 1, "x": 3, "y": 3 },
-        { "w": 1, "x": 4, "y": 3 },
-        { "w": 1, "x": 5, "y": 3 },
+        { "x": 0, "y": 3 },
+        { "x": 1, "y": 3 },
+        { "x": 2, "y": 3 },
+        { "x": 3, "y": 3 },
+        { "x": 4, "y": 3 },
+        { "x": 5, "y": 3 },
 
-        { "w": 1, "x": 9, "y": 3 },
-        { "w": 1, "x": 10, "y": 3 },
-        { "w": 1, "x": 11, "y": 3 },
-        { "w": 1, "x": 12, "y": 3 },
-        { "w": 1, "x": 13, "y": 3 },
-        { "w": 1, "x": 14, "y": 3 },
+        { "x": 9, "y": 3 },
+        { "x": 10, "y": 3 },
+        { "x": 11, "y": 3 },
+        { "x": 12, "y": 3 },
+        { "x": 13, "y": 3 },
+        { "x": 14, "y": 3 },
 
-        { "w": 1, "x": 5.5, "y": 4 },
-        { "w": 1, "x": 6, "y": 5 },
+        { "x": 5.5, "y": 4 },
+        { "x": 6, "y": 5 },
 
-        { "w": 1, "x": 8, "y": 5 },
-        { "w": 1, "x": 8.5, "y": 4 }
+        { "x": 8, "y": 5 },
+        { "x": 8.5, "y": 4 }
 
       ]
     }
diff --git a/keyboards/keebio/rorschach/rev1/rev1.c b/keyboards/keebio/rorschach/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/keebio/rorschach/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/keebio/rorschach/rev1/rev1.h b/keyboards/keebio/rorschach/rev1/rev1.h
index 278bf8186e..32c421c7d0 100644
--- a/keyboards/keebio/rorschach/rev1/rev1.h
+++ b/keyboards/keebio/rorschach/rev1/rev1.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "rorschach.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
     L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
     L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/keebio/rorschach/rorschach.c b/keyboards/keebio/rorschach/rorschach.c
deleted file mode 100644
index 49e2917890..0000000000
--- a/keyboards/keebio/rorschach/rorschach.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rorschach.h"
diff --git a/keyboards/keebio/rorschach/rorschach.h b/keyboards/keebio/rorschach/rorschach.h
deleted file mode 100644
index f11093f074..0000000000
--- a/keyboards/keebio/rorschach/rorschach.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_keebio_rorschach_rev1
-    #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json
index 1cb88fb39f..a55f42649e 100644
--- a/keyboards/keebio/sinc/info.json
+++ b/keyboards/keebio/sinc/info.json
@@ -20,996 +20,5 @@
     },
     "build": {
         "lto": true
-    },
-    "layouts": {
-        "LAYOUT_75": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":10.75, "y":0},
-                {"label":"F10", "x":11.75, "y":0},
-                {"label":"F11", "x":12.75, "y":0},
-                {"label":"F12", "x":13.75, "y":0},
-                {"label":"F13", "x":15, "y":0},
-
-                {"label":"`", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-
-                {"label":"7", "x":8, "y":1.25},
-                {"label":"8", "x":9, "y":1.25},
-                {"label":"9", "x":10, "y":1.25},
-                {"label":"0", "x":11, "y":1.25},
-                {"label":"-", "x":12, "y":1.25},
-                {"label":"=", "x":13, "y":1.25},
-                {"label":"Del", "x":14, "y":1.25},
-                {"label":"Bksp", "x":15, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-
-                {"label":"Y", "x":7.5, "y":2.25},
-                {"label":"U", "x":8.5, "y":2.25},
-                {"label":"I", "x":9.5, "y":2.25},
-                {"label":"O", "x":10.5, "y":2.25},
-                {"label":"P", "x":11.5, "y":2.25},
-                {"label":"[", "x":12.5, "y":2.25},
-                {"label":"]", "x":13.5, "y":2.25},
-                {"label":"Backslash", "x":14.5, "y":2.25, "w":1.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-
-                {"label":"H", "x":7.75, "y":3.25},
-                {"label":"J", "x":8.75, "y":3.25},
-                {"label":"K", "x":9.75, "y":3.25},
-                {"label":"L", "x":10.75, "y":3.25},
-                {"label":";", "x":11.75, "y":3.25},
-                {"label":"'", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-
-                {"label":"N", "x":8.25, "y":4.25},
-                {"label":"M", "x":9.25, "y":4.25},
-                {"label":",", "x":10.25, "y":4.25},
-                {"label":".", "x":11.25, "y":4.25},
-                {"label":"/", "x":12.25, "y":4.25},
-                {"label":"Shift", "x":13.25, "y":4.25, "w":1.75},
-                {"label":"Up", "x":15, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":3.75, "y":5.25, "w":1.25},
-                {"label":"Space", "x":5, "y":5.25},
-                {"label":"Space", "x":6, "y":5.25, "w":1.25},
-
-                {"label":"Fn", "x":8.25, "y":5.25, "w":1.25},
-                {"label":"Space", "x":9.5, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":11, "y":5.25},
-                {"label":"Ctrl", "x":12, "y":5.25},
-                {"label":"Left", "x":13, "y":5.25},
-                {"label":"Down", "x":14, "y":5.25},
-                {"label":"Right", "x":15, "y":5.25}
-            ]
-        },
-        "LAYOUT_80": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":10.75, "y":0},
-                {"label":"F10", "x":11.75, "y":0},
-                {"label":"F11", "x":12.75, "y":0},
-                {"label":"F12", "x":13.75, "y":0},
-                {"label":"F13", "x":15, "y":0},
-                {"label":"F14", "x":16, "y":0},
-
-                {"label":"`", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-
-                {"label":"7", "x":8, "y":1.25},
-                {"label":"8", "x":9, "y":1.25},
-                {"label":"9", "x":10, "y":1.25},
-                {"label":"0", "x":11, "y":1.25},
-                {"label":"-", "x":12, "y":1.25},
-                {"label":"=", "x":13, "y":1.25},
-                {"label":"Del", "x":14, "y":1.25},
-                {"label":"Bksp", "x":15, "y":1.25},
-                {"label":"Home", "x":16, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-
-                {"label":"Y", "x":7.5, "y":2.25},
-                {"label":"U", "x":8.5, "y":2.25},
-                {"label":"I", "x":9.5, "y":2.25},
-                {"label":"O", "x":10.5, "y":2.25},
-                {"label":"P", "x":11.5, "y":2.25},
-                {"label":"[", "x":12.5, "y":2.25},
-                {"label":"]", "x":13.5, "y":2.25},
-                {"label":"Backslash", "x":14.5, "y":2.25, "w":1.5},
-                {"label":"End", "x":16, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-
-                {"label":"H", "x":7.75, "y":3.25},
-                {"label":"J", "x":8.75, "y":3.25},
-                {"label":"K", "x":9.75, "y":3.25},
-                {"label":"L", "x":10.75, "y":3.25},
-                {"label":";", "x":11.75, "y":3.25},
-                {"label":"'", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":3.25, "w":2.25},
-                {"label":"Page Up", "x":16, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-
-                {"label":"N", "x":8.25, "y":4.25},
-                {"label":"M", "x":9.25, "y":4.25},
-                {"label":",", "x":10.25, "y":4.25},
-                {"label":".", "x":11.25, "y":4.25},
-                {"label":"/", "x":12.25, "y":4.25},
-                {"label":"Shift", "x":13.25, "y":4.25, "w":1.75},
-                {"label":"Up", "x":15, "y":4.25},
-                {"label":"Page Down", "x":16, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":3.75, "y":5.25, "w":1.25},
-                {"label":"Space", "x":5, "y":5.25},
-                {"label":"Space", "x":6, "y":5.25, "w":1.25},
-
-                {"label":"Fn", "x":8.25, "y":5.25, "w":1.25},
-                {"label":"Space", "x":9.5, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":11, "y":5.25},
-                {"label":"Ctrl", "x":12, "y":5.25},
-                {"label":"Win", "x":13, "y":5.25},
-                {"label":"Left", "x":14, "y":5.25},
-                {"label":"Down", "x":15, "y":5.25},
-                {"label":"Right", "x":16, "y":5.25}
-            ]
-        },
-        "LAYOUT_75_with_macro": {
-            "layout": [
-                {"label":"Mute", "x":0, "y":0},
-                {"label":"Esc", "x":2.25, "y":0},
-                {"label":"F1", "x":3.5, "y":0},
-                {"label":"F2", "x":4.5, "y":0},
-                {"label":"F3", "x":5.5, "y":0},
-                {"label":"F4", "x":6.5, "y":0},
-                {"label":"F5", "x":7.75, "y":0},
-                {"label":"F6", "x":8.75, "y":0},
-
-                {"label":"F7", "x":10.75, "y":0},
-                {"label":"F8", "x":11.75, "y":0},
-                {"label":"F9", "x":13, "y":0},
-                {"label":"F10", "x":14, "y":0},
-                {"label":"F11", "x":15, "y":0},
-                {"label":"F12", "x":16, "y":0},
-                {"label":"F13", "x":17.25, "y":0},
-
-                {"label":"F1", "x":0, "y":1.25},
-                {"label":"F6", "x":1, "y":1.25},
-
-                {"label":"Esc", "x":2.25, "y":1.25},
-                {"label":"1", "x":3.25, "y":1.25},
-                {"label":"2", "x":4.25, "y":1.25},
-                {"label":"3", "x":5.25, "y":1.25},
-                {"label":"4", "x":6.25, "y":1.25},
-                {"label":"5", "x":7.25, "y":1.25},
-                {"label":"6", "x":8.25, "y":1.25},
-
-                {"label":"7", "x":10.25, "y":1.25},
-                {"label":"8", "x":11.25, "y":1.25},
-                {"label":"9", "x":12.25, "y":1.25},
-                {"label":"0", "x":13.25, "y":1.25},
-                {"label":"-", "x":14.25, "y":1.25},
-                {"label":"=", "x":15.25, "y":1.25},
-                {"label":"Del", "x":16.25, "y":1.25},
-                {"label":"Bksp", "x":17.25, "y":1.25},
-
-                {"label":"F2", "x":0, "y":2.25},
-                {"label":"F7", "x":1, "y":2.25},
-
-                {"label":"Tab", "x":2.25, "y":2.25, "w":1.5},
-                {"label":"Q", "x":3.75, "y":2.25},
-                {"label":"W", "x":4.75, "y":2.25},
-                {"label":"E", "x":5.75, "y":2.25},
-                {"label":"R", "x":6.75, "y":2.25},
-                {"label":"T", "x":7.75, "y":2.25},
-
-                {"label":"Y", "x":9.75, "y":2.25},
-                {"label":"U", "x":10.75, "y":2.25},
-                {"label":"I", "x":11.75, "y":2.25},
-                {"label":"O", "x":12.75, "y":2.25},
-                {"label":"P", "x":13.75, "y":2.25},
-                {"label":"{", "x":14.75, "y":2.25},
-                {"label":"}", "x":15.75, "y":2.25},
-                {"label":"Backslash", "x":16.75, "y":2.25, "w":1.5},
-
-                {"label":"F3", "x":0, "y":3.25},
-                {"label":"F8", "x":1, "y":3.25},
-
-                {"label":"Caps Lock", "x":2.25, "y":3.25, "w":1.75},
-                {"label":"A", "x":4, "y":3.25},
-                {"label":"S", "x":5, "y":3.25},
-                {"label":"D", "x":6, "y":3.25},
-                {"label":"F", "x":7, "y":3.25},
-                {"label":"G", "x":8, "y":3.25},
-
-                {"label":"H", "x":10, "y":3.25},
-                {"label":"J", "x":11, "y":3.25},
-                {"label":"K", "x":12, "y":3.25},
-                {"label":"L", "x":13, "y":3.25},
-                {"label":":", "x":14, "y":3.25},
-                {"label":"\"", "x":15, "y":3.25},
-                {"label":"Enter", "x":16, "y":3.25, "w":2.25},
-
-                {"label":"F4", "x":0, "y":4.25},
-                {"label":"F9", "x":1, "y":4.25},
-
-                {"label":"Shift", "x":2.25, "y":4.25, "w":2.25},
-                {"label":"Z", "x":4.5, "y":4.25},
-                {"label":"X", "x":5.5, "y":4.25},
-                {"label":"C", "x":6.5, "y":4.25},
-                {"label":"V", "x":7.5, "y":4.25},
-                {"label":"B", "x":8.5, "y":4.25},
-
-                {"label":"N", "x":10.5, "y":4.25},
-                {"label":"M", "x":11.5, "y":4.25},
-                {"label":",", "x":12.5, "y":4.25},
-                {"label":".", "x":13.5, "y":4.25},
-                {"label":"/", "x":14.5, "y":4.25},
-                {"label":"Shift", "x":15.5, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":17.25, "y":4.25},
-
-                {"label":"F5", "x":0, "y":5.25},
-                {"label":"F10", "x":1, "y":5.25},
-
-                {"label":"Ctrl", "x":2.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":3.5, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":4.75, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":6, "y":5.25, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5.25},
-                {"label":"Space", "x":8.25, "y":5.25, "w":1.25},
-
-                {"label":"Fn", "x":10.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":11.75, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":13.25, "y":5.25},
-                {"label":"Ctrl", "x":14.25, "y":5.25},
-                {"label":"Left", "x":15.25, "y":5.25},
-                {"label":"Down", "x":16.25, "y":5.25},
-                {"label":"Right", "x":17.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_80_with_macro": {
-            "layout": [
-                {"label":"Mute", "x":0, "y":0},
-                {"label":"Esc", "x":2.25, "y":0},
-                {"label":"F1", "x":3.5, "y":0},
-                {"label":"F2", "x":4.5, "y":0},
-                {"label":"F3", "x":5.5, "y":0},
-                {"label":"F4", "x":6.5, "y":0},
-                {"label":"F5", "x":7.75, "y":0},
-                {"label":"F6", "x":8.75, "y":0},
-
-                {"label":"F7", "x":10.75, "y":0},
-                {"label":"F8", "x":11.75, "y":0},
-                {"label":"F9", "x":13, "y":0},
-                {"label":"F10", "x":14, "y":0},
-                {"label":"F11", "x":15, "y":0},
-                {"label":"F12", "x":16, "y":0},
-                {"label":"F13", "x":17.25, "y":0},
-                {"label":"F14", "x":18.25, "y":0},
-
-                {"label":"F1", "x":0, "y":1.25},
-                {"label":"F6", "x":1, "y":1.25},
-
-                {"label":"Esc", "x":2.25, "y":1.25},
-                {"label":"1", "x":3.25, "y":1.25},
-                {"label":"2", "x":4.25, "y":1.25},
-                {"label":"3", "x":5.25, "y":1.25},
-                {"label":"4", "x":6.25, "y":1.25},
-                {"label":"5", "x":7.25, "y":1.25},
-                {"label":"6", "x":8.25, "y":1.25},
-
-                {"label":"7", "x":10.25, "y":1.25},
-                {"label":"8", "x":11.25, "y":1.25},
-                {"label":"9", "x":12.25, "y":1.25},
-                {"label":"0", "x":13.25, "y":1.25},
-                {"label":"-", "x":14.25, "y":1.25},
-                {"label":"=", "x":15.25, "y":1.25},
-                {"label":"=", "x":16.25, "y":1.25},
-                {"label":"Bksp", "x":17.25, "y":1.25},
-                {"label":"Home", "x":18.25, "y":1.25},
-
-                {"label":"F2", "x":0, "y":2.25},
-                {"label":"F7", "x":1, "y":2.25},
-
-                {"label":"Tab", "x":2.25, "y":2.25, "w":1.5},
-                {"label":"Q", "x":3.75, "y":2.25},
-                {"label":"W", "x":4.75, "y":2.25},
-                {"label":"E", "x":5.75, "y":2.25},
-                {"label":"R", "x":6.75, "y":2.25},
-                {"label":"T", "x":7.75, "y":2.25},
-
-                {"label":"Y", "x":9.75, "y":2.25},
-                {"label":"U", "x":10.75, "y":2.25},
-                {"label":"I", "x":11.75, "y":2.25},
-                {"label":"O", "x":12.75, "y":2.25},
-                {"label":"P", "x":13.75, "y":2.25},
-                {"label":"{", "x":14.75, "y":2.25},
-                {"label":"}", "x":15.75, "y":2.25},
-                {"label":"|", "x":16.75, "y":2.25, "w":1.5},
-                {"label":"PgUp", "x":18.25, "y":2.25},
-
-                {"label":"F3", "x":0, "y":3.25},
-                {"label":"F8", "x":1, "y":3.25},
-
-                {"label":"Caps Lock", "x":2.25, "y":3.25, "w":1.75},
-                {"label":"A", "x":4, "y":3.25},
-                {"label":"S", "x":5, "y":3.25},
-                {"label":"D", "x":6, "y":3.25},
-                {"label":"F", "x":7, "y":3.25},
-                {"label":"G", "x":8, "y":3.25},
-
-                {"label":"H", "x":10, "y":3.25},
-                {"label":"J", "x":11, "y":3.25},
-                {"label":"K", "x":12, "y":3.25},
-                {"label":"L", "x":13, "y":3.25},
-                {"label":":", "x":14, "y":3.25},
-                {"label":"\"", "x":15, "y":3.25},
-                {"label":"Enter", "x":16, "y":3.25, "w":2.25},
-                {"label":"PgDn", "x":18.25, "y":3.25},
-
-                {"label":"F4", "x":0, "y":4.25},
-                {"label":"F9", "x":1, "y":4.25},
-
-                {"label":"Shift", "x":2.25, "y":4.25, "w":2.25},
-                {"label":"Z", "x":4.5, "y":4.25},
-                {"label":"X", "x":5.5, "y":4.25},
-                {"label":"C", "x":6.5, "y":4.25},
-                {"label":"V", "x":7.5, "y":4.25},
-                {"label":"B", "x":8.5, "y":4.25},
-
-                {"label":"N", "x":10.5, "y":4.25},
-                {"label":"M", "x":11.5, "y":4.25},
-                {"label":",", "x":12.5, "y":4.25},
-                {"label":".", "x":13.5, "y":4.25},
-                {"label":"/", "x":14.5, "y":4.25},
-                {"label":"Shift", "x":15.5, "y":4.25, "w":1.75},
-                {"label":"Up", "x":17.25, "y":4.25},
-                {"label":"End", "x":18.25, "y":4.25},
-
-                {"label":"F5", "x":0, "y":5.25},
-                {"label":"F10", "x":1, "y":5.25},
-
-                {"label":"Ctrl", "x":2.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":3.5, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":4.75, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":6, "y":5.25, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5.25},
-                {"label":"Space", "x":8.25, "y":5.25, "w":1.25},
-
-                {"label":"Fn", "x":10.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":11.75, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":13.25, "y":5.25},
-                {"label":"Ctrl", "x":14.25, "y":5.25},
-                {"label":"Win", "x":15.25, "y":5.25},
-                {"label":"Left", "x":16.25, "y":5.25},
-                {"label":"Down", "x":17.25, "y":5.25},
-                {"label":"Right", "x":18.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_75_iso": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":10.75, "y":0},
-                {"label":"F10", "x":11.75, "y":0},
-                {"label":"F11", "x":12.75, "y":0},
-                {"label":"F12", "x":13.75, "y":0},
-                {"label":"F13", "x":15, "y":0},
-
-                {"label":"`", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-
-                {"label":"7", "x":8, "y":1.25},
-                {"label":"8", "x":9, "y":1.25},
-                {"label":"9", "x":10, "y":1.25},
-                {"label":"0", "x":11, "y":1.25},
-                {"label":"-", "x":12, "y":1.25},
-                {"label":"=", "x":13, "y":1.25},
-                {"label":"Del", "x":14, "y":1.25},
-                {"label":"Bksp", "x":15, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-
-                {"label":"Y", "x":7.5, "y":2.25},
-                {"label":"U", "x":8.5, "y":2.25},
-                {"label":"I", "x":9.5, "y":2.25},
-                {"label":"O", "x":10.5, "y":2.25},
-                {"label":"P", "x":11.5, "y":2.25},
-                {"label":"[", "x":12.5, "y":2.25},
-                {"label":"]", "x":13.5, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-
-                {"label":"H", "x":7.75, "y":3.25},
-                {"label":"J", "x":8.75, "y":3.25},
-                {"label":"K", "x":9.75, "y":3.25},
-                {"label":"L", "x":10.75, "y":3.25},
-                {"label":";", "x":11.75, "y":3.25},
-                {"label":"'", "x":12.75, "y":3.25},
-                {"label":"NUHS", "x":13.75, "y":3.25},
-                {"label":"Enter", "x":14.75, "y":2.25, "w":1.25, "h": 2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"NUBS", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-
-                {"label":"N", "x":8.25, "y":4.25},
-                {"label":"M", "x":9.25, "y":4.25},
-                {"label":",", "x":10.25, "y":4.25},
-                {"label":".", "x":11.25, "y":4.25},
-                {"label":"/", "x":12.25, "y":4.25},
-                {"label":"Shift", "x":13.25, "y":4.25, "w":1.75},
-                {"label":"Up", "x":15, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":3.75, "y":5.25, "w":1.25},
-                {"label":"Space", "x":5, "y":5.25},
-                {"label":"Space", "x":6, "y":5.25, "w":1.25},
-
-                {"label":"Fn", "x":8.25, "y":5.25, "w":1.25},
-                {"label":"Space", "x":9.5, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":11, "y":5.25},
-                {"label":"Ctrl", "x":12, "y":5.25},
-                {"label":"Left", "x":13, "y":5.25},
-                {"label":"Down", "x":14, "y":5.25},
-                {"label":"Right", "x":15, "y":5.25}
-            ]
-        },
-        "LAYOUT_80_iso": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":10.75, "y":0},
-                {"label":"F10", "x":11.75, "y":0},
-                {"label":"F11", "x":12.75, "y":0},
-                {"label":"F12", "x":13.75, "y":0},
-                {"label":"F13", "x":15, "y":0},
-                {"label":"F14", "x":16, "y":0},
-
-                {"label":"`", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-
-                {"label":"7", "x":8, "y":1.25},
-                {"label":"8", "x":9, "y":1.25},
-                {"label":"9", "x":10, "y":1.25},
-                {"label":"0", "x":11, "y":1.25},
-                {"label":"-", "x":12, "y":1.25},
-                {"label":"=", "x":13, "y":1.25},
-                {"label":"Del", "x":14, "y":1.25},
-                {"label":"Bksp", "x":15, "y":1.25},
-                {"label":"Home", "x":16, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-
-                {"label":"Y", "x":7.5, "y":2.25},
-                {"label":"U", "x":8.5, "y":2.25},
-                {"label":"I", "x":9.5, "y":2.25},
-                {"label":"O", "x":10.5, "y":2.25},
-                {"label":"P", "x":11.5, "y":2.25},
-                {"label":"[", "x":12.5, "y":2.25},
-                {"label":"]", "x":13.5, "y":2.25},
-                {"label":"End", "x":16, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-
-                {"label":"H", "x":7.75, "y":3.25},
-                {"label":"J", "x":8.75, "y":3.25},
-                {"label":"K", "x":9.75, "y":3.25},
-                {"label":"L", "x":10.75, "y":3.25},
-                {"label":";", "x":11.75, "y":3.25},
-                {"label":"'", "x":12.75, "y":3.25},
-                {"label":"NUHS", "x":13.75, "y":3.25},
-                {"label":"Enter", "x":14.75, "y":2.25, "w":1.25, "h": 2},
-                {"label":"Page Up", "x":16, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"NUBS", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-
-                {"label":"N", "x":8.25, "y":4.25},
-                {"label":"M", "x":9.25, "y":4.25},
-                {"label":",", "x":10.25, "y":4.25},
-                {"label":".", "x":11.25, "y":4.25},
-                {"label":"/", "x":12.25, "y":4.25},
-                {"label":"Shift", "x":13.25, "y":4.25, "w":1.75},
-                {"label":"Up", "x":15, "y":4.25},
-                {"label":"Page Down", "x":16, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":3.75, "y":5.25, "w":1.25},
-                {"label":"Space", "x":5, "y":5.25},
-                {"label":"Space", "x":6, "y":5.25, "w":1.25},
-
-                {"label":"Fn", "x":8.25, "y":5.25, "w":1.25},
-                {"label":"Space", "x":9.5, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":11, "y":5.25},
-                {"label":"Ctrl", "x":12, "y":5.25},
-                {"label":"Win", "x":13, "y":5.25},
-                {"label":"Left", "x":14, "y":5.25},
-                {"label":"Down", "x":15, "y":5.25},
-                {"label":"Right", "x":16, "y":5.25}
-            ]
-        },
-        "LAYOUT_75_iso_with_macro": {
-            "layout": [
-                {"label":"Mute", "x":0, "y":0},
-                {"label":"Esc", "x":2.25, "y":0},
-                {"label":"F1", "x":3.5, "y":0},
-                {"label":"F2", "x":4.5, "y":0},
-                {"label":"F3", "x":5.5, "y":0},
-                {"label":"F4", "x":6.5, "y":0},
-                {"label":"F5", "x":7.75, "y":0},
-                {"label":"F6", "x":8.75, "y":0},
-
-                {"label":"F7", "x":10.75, "y":0},
-                {"label":"F8", "x":11.75, "y":0},
-                {"label":"F9", "x":13, "y":0},
-                {"label":"F10", "x":14, "y":0},
-                {"label":"F11", "x":15, "y":0},
-                {"label":"F12", "x":16, "y":0},
-                {"label":"F13", "x":17.25, "y":0},
-
-                {"label":"F1", "x":0, "y":1.25},
-                {"label":"F6", "x":1, "y":1.25},
-
-                {"label":"Esc", "x":2.25, "y":1.25},
-                {"label":"1", "x":3.25, "y":1.25},
-                {"label":"2", "x":4.25, "y":1.25},
-                {"label":"3", "x":5.25, "y":1.25},
-                {"label":"4", "x":6.25, "y":1.25},
-                {"label":"5", "x":7.25, "y":1.25},
-                {"label":"6", "x":8.25, "y":1.25},
-
-                {"label":"7", "x":10.25, "y":1.25},
-                {"label":"8", "x":11.25, "y":1.25},
-                {"label":"9", "x":12.25, "y":1.25},
-                {"label":"0", "x":13.25, "y":1.25},
-                {"label":"-", "x":14.25, "y":1.25},
-                {"label":"=", "x":15.25, "y":1.25},
-                {"label":"Del", "x":16.25, "y":1.25},
-                {"label":"Bksp", "x":17.25, "y":1.25},
-
-                {"label":"F2", "x":0, "y":2.25},
-                {"label":"F7", "x":1, "y":2.25},
-
-                {"label":"Tab", "x":2.25, "y":2.25, "w":1.5},
-                {"label":"Q", "x":3.75, "y":2.25},
-                {"label":"W", "x":4.75, "y":2.25},
-                {"label":"E", "x":5.75, "y":2.25},
-                {"label":"R", "x":6.75, "y":2.25},
-                {"label":"T", "x":7.75, "y":2.25},
-
-                {"label":"Y", "x":9.75, "y":2.25},
-                {"label":"U", "x":10.75, "y":2.25},
-                {"label":"I", "x":11.75, "y":2.25},
-                {"label":"O", "x":12.75, "y":2.25},
-                {"label":"P", "x":13.75, "y":2.25},
-                {"label":"{", "x":14.75, "y":2.25},
-                {"label":"}", "x":15.75, "y":2.25},
-
-                {"label":"F3", "x":0, "y":3.25},
-                {"label":"F8", "x":1, "y":3.25},
-
-                {"label":"Caps Lock", "x":2.25, "y":3.25, "w":1.75},
-                {"label":"A", "x":4, "y":3.25},
-                {"label":"S", "x":5, "y":3.25},
-                {"label":"D", "x":6, "y":3.25},
-                {"label":"F", "x":7, "y":3.25},
-                {"label":"G", "x":8, "y":3.25},
-
-                {"label":"H", "x":10, "y":3.25},
-                {"label":"J", "x":11, "y":3.25},
-                {"label":"K", "x":12, "y":3.25},
-                {"label":"L", "x":13, "y":3.25},
-                {"label":":", "x":14, "y":3.25},
-                {"label":"\"", "x":15, "y":3.25},
-                {"label":"NUHS", "x":16, "y":3.25},
-                {"label":"Enter", "x":17, "y":2.25, "w":1.25, "h": 2},
-
-                {"label":"F4", "x":0, "y":4.25},
-                {"label":"F9", "x":1, "y":4.25},
-
-                {"label":"Shift", "x":2.25, "y":4.25, "w":1.25},
-                {"label":"NUBS", "x":3.5, "y":4.25},
-                {"label":"Z", "x":4.5, "y":4.25},
-                {"label":"X", "x":5.5, "y":4.25},
-                {"label":"C", "x":6.5, "y":4.25},
-                {"label":"V", "x":7.5, "y":4.25},
-                {"label":"B", "x":8.5, "y":4.25},
-
-                {"label":"N", "x":10.5, "y":4.25},
-                {"label":"M", "x":11.5, "y":4.25},
-                {"label":",", "x":12.5, "y":4.25},
-                {"label":".", "x":13.5, "y":4.25},
-                {"label":"/", "x":14.5, "y":4.25},
-                {"label":"Shift", "x":15.5, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":17.25, "y":4.25},
-
-                {"label":"F5", "x":0, "y":5.25},
-                {"label":"F10", "x":1, "y":5.25},
-
-                {"label":"Ctrl", "x":2.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":3.5, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":4.75, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":6, "y":5.25, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5.25},
-                {"label":"Space", "x":8.25, "y":5.25, "w":1.25},
-
-                {"label":"Fn", "x":10.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":11.75, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":13.25, "y":5.25},
-                {"label":"Ctrl", "x":14.25, "y":5.25},
-                {"label":"Left", "x":15.25, "y":5.25},
-                {"label":"Down", "x":16.25, "y":5.25},
-                {"label":"Right", "x":17.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_80_iso_with_macro": {
-            "layout": [
-                {"label":"Mute", "x":0, "y":0},
-                {"label":"Esc", "x":2.25, "y":0},
-                {"label":"F1", "x":3.5, "y":0},
-                {"label":"F2", "x":4.5, "y":0},
-                {"label":"F3", "x":5.5, "y":0},
-                {"label":"F4", "x":6.5, "y":0},
-                {"label":"F5", "x":7.75, "y":0},
-                {"label":"F6", "x":8.75, "y":0},
-
-                {"label":"F7", "x":10.75, "y":0},
-                {"label":"F8", "x":11.75, "y":0},
-                {"label":"F9", "x":13, "y":0},
-                {"label":"F10", "x":14, "y":0},
-                {"label":"F11", "x":15, "y":0},
-                {"label":"F12", "x":16, "y":0},
-                {"label":"F13", "x":17.25, "y":0},
-                {"label":"F14", "x":18.25, "y":0},
-
-                {"label":"F1", "x":0, "y":1.25},
-                {"label":"F6", "x":1, "y":1.25},
-
-                {"label":"Esc", "x":2.25, "y":1.25},
-                {"label":"1", "x":3.25, "y":1.25},
-                {"label":"2", "x":4.25, "y":1.25},
-                {"label":"3", "x":5.25, "y":1.25},
-                {"label":"4", "x":6.25, "y":1.25},
-                {"label":"5", "x":7.25, "y":1.25},
-                {"label":"6", "x":8.25, "y":1.25},
-
-                {"label":"7", "x":10.25, "y":1.25},
-                {"label":"8", "x":11.25, "y":1.25},
-                {"label":"9", "x":12.25, "y":1.25},
-                {"label":"0", "x":13.25, "y":1.25},
-                {"label":"-", "x":14.25, "y":1.25},
-                {"label":"=", "x":15.25, "y":1.25},
-                {"label":"=", "x":16.25, "y":1.25},
-                {"label":"Bksp", "x":17.25, "y":1.25},
-                {"label":"Home", "x":18.25, "y":1.25},
-
-                {"label":"F2", "x":0, "y":2.25},
-                {"label":"F7", "x":1, "y":2.25},
-
-                {"label":"Tab", "x":2.25, "y":2.25, "w":1.5},
-                {"label":"Q", "x":3.75, "y":2.25},
-                {"label":"W", "x":4.75, "y":2.25},
-                {"label":"E", "x":5.75, "y":2.25},
-                {"label":"R", "x":6.75, "y":2.25},
-                {"label":"T", "x":7.75, "y":2.25},
-
-                {"label":"Y", "x":9.75, "y":2.25},
-                {"label":"U", "x":10.75, "y":2.25},
-                {"label":"I", "x":11.75, "y":2.25},
-                {"label":"O", "x":12.75, "y":2.25},
-                {"label":"P", "x":13.75, "y":2.25},
-                {"label":"{", "x":14.75, "y":2.25},
-                {"label":"}", "x":15.75, "y":2.25},
-                {"label":"PgUp", "x":18.25, "y":2.25},
-
-                {"label":"F3", "x":0, "y":3.25},
-                {"label":"F8", "x":1, "y":3.25},
-
-                {"label":"Caps Lock", "x":2.25, "y":3.25, "w":1.75},
-                {"label":"A", "x":4, "y":3.25},
-                {"label":"S", "x":5, "y":3.25},
-                {"label":"D", "x":6, "y":3.25},
-                {"label":"F", "x":7, "y":3.25},
-                {"label":"G", "x":8, "y":3.25},
-
-                {"label":"H", "x":10, "y":3.25},
-                {"label":"J", "x":11, "y":3.25},
-                {"label":"K", "x":12, "y":3.25},
-                {"label":"L", "x":13, "y":3.25},
-                {"label":":", "x":14, "y":3.25},
-                {"label":"\"", "x":15, "y":3.25},
-                {"label":"NUHS", "x":16, "y":3.25},
-                {"label":"Enter", "x":17, "y":2.25, "w":1.25, "h": 2},
-                {"label":"PgDn", "x":18.25, "y":3.25},
-
-                {"label":"F4", "x":0, "y":4.25},
-                {"label":"F9", "x":1, "y":4.25},
-
-                {"label":"Shift", "x":2.25, "y":4.25, "w":1.25},
-                {"label":"NUBS", "x":3.5, "y":4.25},
-                {"label":"Z", "x":4.5, "y":4.25},
-                {"label":"X", "x":5.5, "y":4.25},
-                {"label":"C", "x":6.5, "y":4.25},
-                {"label":"V", "x":7.5, "y":4.25},
-                {"label":"B", "x":8.5, "y":4.25},
-
-                {"label":"N", "x":10.5, "y":4.25},
-                {"label":"M", "x":11.5, "y":4.25},
-                {"label":",", "x":12.5, "y":4.25},
-                {"label":".", "x":13.5, "y":4.25},
-                {"label":"/", "x":14.5, "y":4.25},
-                {"label":"Shift", "x":15.5, "y":4.25, "w":1.75},
-                {"label":"Up", "x":17.25, "y":4.25},
-                {"label":"End", "x":18.25, "y":4.25},
-
-                {"label":"F5", "x":0, "y":5.25},
-                {"label":"F10", "x":1, "y":5.25},
-
-                {"label":"Ctrl", "x":2.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":3.5, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":4.75, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":6, "y":5.25, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5.25},
-                {"label":"Space", "x":8.25, "y":5.25, "w":1.25},
-
-                {"label":"Fn", "x":10.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":11.75, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":13.25, "y":5.25},
-                {"label":"Ctrl", "x":14.25, "y":5.25},
-                {"label":"Win", "x":15.25, "y":5.25},
-                {"label":"Left", "x":16.25, "y":5.25},
-                {"label":"Down", "x":17.25, "y":5.25},
-                {"label":"Right", "x":18.25, "y":5.25}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"label":"Mute", "x":0, "y":0},
-                {"label":"Esc", "x":2.25, "y":0},
-                {"label":"F1", "x":3.5, "y":0},
-                {"label":"F2", "x":4.5, "y":0},
-                {"label":"F3", "x":5.5, "y":0},
-                {"label":"F4", "x":6.5, "y":0},
-                {"label":"F5", "x":7.75, "y":0},
-                {"label":"F6", "x":8.75, "y":0},
-
-                {"label":"F7", "x":10.75, "y":0},
-                {"label":"F8", "x":11.75, "y":0},
-                {"label":"F9", "x":13, "y":0},
-                {"label":"F10", "x":14, "y":0},
-                {"label":"F11", "x":15, "y":0},
-                {"label":"F12", "x":16, "y":0},
-                {"label":"F13", "x":17.25, "y":0},
-                {"label":"F14", "x":18.25, "y":0},
-
-                {"label":"F1", "x":0, "y":1.25},
-                {"label":"F6", "x":1, "y":1.25},
-
-                {"label":"Esc", "x":2.25, "y":1.25},
-                {"label":"1", "x":3.25, "y":1.25},
-                {"label":"2", "x":4.25, "y":1.25},
-                {"label":"3", "x":5.25, "y":1.25},
-                {"label":"4", "x":6.25, "y":1.25},
-                {"label":"5", "x":7.25, "y":1.25},
-                {"label":"6", "x":8.25, "y":1.25},
-
-                {"label":"7", "x":10.25, "y":1.25},
-                {"label":"8", "x":11.25, "y":1.25},
-                {"label":"9", "x":12.25, "y":1.25},
-                {"label":"0", "x":13.25, "y":1.25},
-                {"label":"-", "x":14.25, "y":1.25},
-                {"label":"=", "x":15.25, "y":1.25},
-                {"label":"=", "x":16.25, "y":1.25},
-                {"label":"Bksp", "x":17.25, "y":1.25},
-                {"label":"Home", "x":18.25, "y":1.25},
-
-                {"label":"F2", "x":0, "y":2.25},
-                {"label":"F7", "x":1, "y":2.25},
-
-                {"label":"Tab", "x":2.25, "y":2.25, "w":1.5},
-                {"label":"Q", "x":3.75, "y":2.25},
-                {"label":"W", "x":4.75, "y":2.25},
-                {"label":"E", "x":5.75, "y":2.25},
-                {"label":"R", "x":6.75, "y":2.25},
-                {"label":"T", "x":7.75, "y":2.25},
-
-                {"label":"Y", "x":9.75, "y":2.25},
-                {"label":"U", "x":10.75, "y":2.25},
-                {"label":"I", "x":11.75, "y":2.25},
-                {"label":"O", "x":12.75, "y":2.25},
-                {"label":"P", "x":13.75, "y":2.25},
-                {"label":"{", "x":14.75, "y":2.25},
-                {"label":"}", "x":15.75, "y":2.25},
-                {"label":"|", "x":16.75, "y":2.25, "w":1.5},
-                {"label":"PgUp", "x":18.25, "y":2.25},
-
-                {"label":"F3", "x":0, "y":3.25},
-                {"label":"F8", "x":1, "y":3.25},
-
-                {"label":"Caps Lock", "x":2.25, "y":3.25, "w":1.75},
-                {"label":"A", "x":4, "y":3.25},
-                {"label":"S", "x":5, "y":3.25},
-                {"label":"D", "x":6, "y":3.25},
-                {"label":"F", "x":7, "y":3.25},
-                {"label":"G", "x":8, "y":3.25},
-
-                {"label":"H", "x":10, "y":3.25},
-                {"label":"J", "x":11, "y":3.25},
-                {"label":"K", "x":12, "y":3.25},
-                {"label":"L", "x":13, "y":3.25},
-                {"label":":", "x":14, "y":3.25},
-                {"label":"\"", "x":15, "y":3.25},
-                {"label":"NUHS", "x":16, "y":3.25},
-                {"label":"Enter", "x":17, "y":3.25, "w":1.25},
-                {"label":"PgDn", "x":18.25, "y":3.25},
-
-                {"label":"F4", "x":0, "y":4.25},
-                {"label":"F9", "x":1, "y":4.25},
-
-                {"label":"Shift", "x":2.25, "y":4.25, "w":1.25},
-                {"label":"NUBS", "x":3.5, "y":4.25},
-                {"label":"Z", "x":4.5, "y":4.25},
-                {"label":"X", "x":5.5, "y":4.25},
-                {"label":"C", "x":6.5, "y":4.25},
-                {"label":"V", "x":7.5, "y":4.25},
-                {"label":"B", "x":8.5, "y":4.25},
-
-                {"label":"N", "x":10.5, "y":4.25},
-                {"label":"M", "x":11.5, "y":4.25},
-                {"label":",", "x":12.5, "y":4.25},
-                {"label":".", "x":13.5, "y":4.25},
-                {"label":"/", "x":14.5, "y":4.25},
-                {"label":"Shift", "x":15.5, "y":4.25, "w":1.75},
-                {"label":"Up", "x":17.25, "y":4.25},
-                {"label":"End", "x":18.25, "y":4.25},
-
-                {"label":"F5", "x":0, "y":5.25},
-                {"label":"F10", "x":1, "y":5.25},
-
-                {"label":"Ctrl", "x":2.25, "y":5.25, "w":1.25},
-                {"label":"Win", "x":3.5, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":4.75, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":6, "y":5.25, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5.25},
-                {"label":"Space", "x":8.25, "y":5.25, "w":1.25},
-
-                {"label":"Fn", "x":10.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":11.75, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":13.25, "y":5.25},
-                {"label":"Ctrl", "x":14.25, "y":5.25},
-                {"label":"Win", "x":15.25, "y":5.25},
-                {"label":"Left", "x":16.25, "y":5.25},
-                {"label":"Down", "x":17.25, "y":5.25},
-                {"label":"Right", "x":18.25, "y":5.25}
-            ]
-        }
     }
 }
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
index 76566da89f..72845ac510 100644
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@@ -48,7 +48,6 @@
         "pin": "B5"
     },
     "rgblight": {
-        "pin": "E6",
         "led_count" : 16,
         "split_count": [8, 8],
         "animations": {
@@ -63,5 +62,974 @@
             "static_gradient": true,
             "twinkle": true
         }
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "layouts": {
+        "LAYOUT_75": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_iso_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 6], "x": 16, "y": 3.25},
+                {"matrix": [8, 7], "x": 17, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"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": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 7], "x": 16, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+                {"matrix": [11, 8], "x": 16, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+                {"matrix": [6, 8], "x": 16, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+                {"matrix": [7, 8], "x": 16, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 3.25, "w": 2.25},
+                {"matrix": [8, 8], "x": 16, "y": 3.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+                {"matrix": [9, 8], "x": 16, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25},
+                {"matrix": [10, 8], "x": 16, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80_iso": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+                {"matrix": [11, 8], "x": 16, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+                {"matrix": [6, 8], "x": 16, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 8], "x": 16, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [8, 8], "x": 16, "y": 3.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+                {"matrix": [9, 8], "x": 16, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25},
+                {"matrix": [10, 8], "x": 16, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80_iso_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 6], "x": 16, "y": 3.25},
+                {"matrix": [8, 7], "x": 17, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"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": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+                {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 7], "x": 16, "y": 3.25, "w": 2.25},
+                {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+                {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 6], "x": 16, "y": 3.25},
+                {"matrix": [8, 7], "x": 17, "y": 3.25, "w": 1.25},
+                {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"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": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+            ]
+        }
     }
 }
diff --git a/keyboards/keebio/sinc/rev1/rev1.h b/keyboards/keebio/sinc/rev1/rev1.h
deleted file mode 100644
index 1fbbc2d6af..0000000000
--- a/keyboards/keebio/sinc/rev1/rev1.h
+++ /dev/null
@@ -1,219 +0,0 @@
-#pragma once
-
-#include "sinc.h"
-#include "quantum.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT_75( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_75_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_75_iso( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80_iso( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_75_iso_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80_iso_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_all( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
index 53bb9f9d08..d8d4d2e016 100644
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@@ -48,7 +48,6 @@
         "pin": "B5"
     },
     "rgblight": {
-        "pin": "E6",
         "led_count" : 16,
         "split_count": [8, 8],
         "animations": {
@@ -63,5 +62,974 @@
             "static_gradient": true,
             "twinkle": true
         }
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "layouts": {
+        "LAYOUT_75": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_iso_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 6], "x": 16, "y": 3.25},
+                {"matrix": [8, 7], "x": 17, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"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": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 7], "x": 16, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+                {"matrix": [11, 8], "x": 16, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+                {"matrix": [6, 8], "x": 16, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+                {"matrix": [7, 8], "x": 16, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 3.25, "w": 2.25},
+                {"matrix": [8, 8], "x": 16, "y": 3.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+                {"matrix": [9, 8], "x": 16, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25},
+                {"matrix": [10, 8], "x": 16, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80_iso": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+                {"matrix": [11, 8], "x": 16, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+                {"matrix": [6, 8], "x": 16, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 8], "x": 16, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [8, 8], "x": 16, "y": 3.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+                {"matrix": [9, 8], "x": 16, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25},
+                {"matrix": [10, 8], "x": 16, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80_iso_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 6], "x": 16, "y": 3.25},
+                {"matrix": [8, 7], "x": 17, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"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": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+                {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 7], "x": 16, "y": 3.25, "w": 2.25},
+                {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+                {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 6], "x": 16, "y": 3.25},
+                {"matrix": [8, 7], "x": 17, "y": 3.25, "w": 1.25},
+                {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"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": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+            ]
+        }
     }
 }
diff --git a/keyboards/keebio/sinc/rev2/rev2.h b/keyboards/keebio/sinc/rev2/rev2.h
deleted file mode 100644
index 15d4b402b0..0000000000
--- a/keyboards/keebio/sinc/rev2/rev2.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "sinc.h"
-#include "quantum.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT_75( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_75_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_75_iso( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80_iso( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_75_iso_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80_iso_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_all( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
diff --git a/keyboards/keebio/sinc/rev3/config.h b/keyboards/keebio/sinc/rev3/config.h
index 9b27501d3c..fda33076c9 100644
--- a/keyboards/keebio/sinc/rev3/config.h
+++ b/keyboards/keebio/sinc/rev3/config.h
@@ -68,7 +68,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define RGB_DI_PIN GP18
 #define RGB_MATRIX_LED_COUNT 113
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json
index baf5af5f1a..2c7c2e9536 100644
--- a/keyboards/keebio/sinc/rev3/info.json
+++ b/keyboards/keebio/sinc/rev3/info.json
@@ -39,6 +39,10 @@
             {"pin_a": "GP21", "pin_b": "GP20" }
         ]
     },
+    "ws2812": {
+        "pin": "GP18",
+        "driver": "vendor"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "split_count": [56, 57],
@@ -170,5 +174,971 @@
             { "flags": 4, "matrix": [10, 8], "x": 224, "y": 64 },
             { "flags": 2, "x": 224, "y": 55 }
           ]
+    },
+    "layouts": {
+        "LAYOUT_75": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 3.25},
+                {"matrix": [7, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_iso_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 6], "x": 16, "y": 3.25},
+                {"matrix": [7, 7], "x": 17, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"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": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 7], "x": 16, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+                {"matrix": [11, 8], "x": 16, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+                {"matrix": [6, 8], "x": 16, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+                {"matrix": [7, 8], "x": 16, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 3.25, "w": 2.25},
+                {"matrix": [8, 8], "x": 16, "y": 3.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+                {"matrix": [9, 8], "x": 16, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25},
+                {"matrix": [10, 8], "x": 16, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80_iso": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+                {"matrix": [11, 8], "x": 16, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+                {"matrix": [6, 8], "x": 16, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 8], "x": 16, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 3.25},
+                {"matrix": [7, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [8, 8], "x": 16, "y": 3.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+                {"matrix": [9, 8], "x": 16, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25},
+                {"matrix": [10, 8], "x": 16, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80_iso_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 6], "x": 16, "y": 3.25},
+                {"matrix": [7, 7], "x": 17, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"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": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+                {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 7], "x": 16, "y": 3.25, "w": 2.25},
+                {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+                {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 6], "x": 16, "y": 3.25},
+                {"matrix": [8, 7], "x": 17, "y": 3.25, "w": 1.25},
+                {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"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": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+            ]
+        }
     }
 }
diff --git a/keyboards/keebio/sinc/rev3/rev3.h b/keyboards/keebio/sinc/rev3/rev3.h
deleted file mode 100644
index 57d072398a..0000000000
--- a/keyboards/keebio/sinc/rev3/rev3.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* Copyright 2022 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "sinc.h"
-#include "quantum.h"
-
-#define LAYOUT_75( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_75_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
-  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_75_iso( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RC8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, KC_NO, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80_iso( \
-  LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { KC_NO, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RC8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, KC_NO, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_75_iso_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RC8, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, KC_NO, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, KC_NO } \
-  }
-
-#define LAYOUT_80_iso_with_macro( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RC8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, KC_NO, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
-
-#define LAYOUT_all( \
-  LF1,      LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9, \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
-    { LF1, KC_NO, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 }, \
-    { KC_NO, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
-  }
diff --git a/keyboards/keebio/sinc/rev3/rules.mk b/keyboards/keebio/sinc/rev3/rules.mk
index 8fb51ec82d..161ec22b16 100644
--- a/keyboards/keebio/sinc/rev3/rules.mk
+++ b/keyboards/keebio/sinc/rev3/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/keebio/sinc/sinc.c b/keyboards/keebio/sinc/sinc.c
index 9b2f6da512..d50eb82019 100644
--- a/keyboards/keebio/sinc/sinc.c
+++ b/keyboards/keebio/sinc/sinc.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "sinc.h"
+#include "quantum.h"
 #include "split_util.h"
 
 #ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/sinc/sinc.h b/keyboards/keebio/sinc/sinc.h
deleted file mode 100644
index 4607d8125c..0000000000
--- a/keyboards/keebio/sinc/sinc.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_sinc_rev1
-    #include "rev1.h"
-#endif
-#ifdef KEYBOARD_keebio_sinc_rev2
-    #include "rev2.h"
-#endif
-#ifdef KEYBOARD_keebio_sinc_rev3
-    #include "rev3.h"
-#endif
diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h
index c4b27e4324..a05b8a33f2 100644
--- a/keyboards/keebio/stick/config.h
+++ b/keyboards/keebio/stick/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* WS2812 RGB LED */
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 12
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -88,6 +86,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    endif
-#endif
 
 #define TAPPING_TERM 200
diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json
index 028332b5f4..bf1c768f42 100644
--- a/keyboards/keebio/stick/info.json
+++ b/keyboards/keebio/stick/info.json
@@ -8,12 +8,18 @@
         "pid": "0x111C",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "D1", "pin_b": "D0"},
             {"pin_a": "D4", "pin_b": "C6"}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {
diff --git a/keyboards/keebio/stick/rules.mk b/keyboards/keebio/stick/rules.mk
index d5f501196c..0f932779f5 100644
--- a/keyboards/keebio/stick/rules.mk
+++ b/keyboards/keebio/stick/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/keebio/tragicforce68/config.h b/keyboards/keebio/tragicforce68/config.h
index 656be72025..5070f05156 100644
--- a/keyboards/keebio/tragicforce68/config.h
+++ b/keyboards/keebio/tragicforce68/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, B4, E6, C6, D7, D4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebio/tragicforce68/info.json b/keyboards/keebio/tragicforce68/info.json
index 2be5e4f0c1..07d292728b 100644
--- a/keyboards/keebio/tragicforce68/info.json
+++ b/keyboards/keebio/tragicforce68/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0510",
     "device_version": "1.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D3", "D2", "D1", "D0", "B4", "E6", "C6", "D7", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5",
     "levels": 7,
@@ -16,238 +21,253 @@
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["68_ansi"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_68_ansi"
+  },
   "layouts": {
     "LAYOUT_68_ansi": {
       "layout": [
-        {"label":"~", "x":0, "y":0},
-        {"label":"!", "x":1, "y":0},
-        {"label":"@", "x":2, "y":0},
-        {"label":"#", "x":3, "y":0},
-        {"label":"$", "x":4, "y":0},
-        {"label":"%", "x":5, "y":0},
-        {"label":"^", "x":6, "y":0},
-        {"label":"&", "x":7, "y":0},
-        {"label":"*", "x":8, "y":0},
-        {"label":"(", "x":9, "y":0},
-        {"label":")", "x":10, "y":0},
-        {"label":"_", "x":11, "y":0},
-        {"label":"+", "x":12, "y":0},
-        {"label":"Backspace", "x":13, "y":0, "w":2},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-        {"label":"Y", "x":6.5, "y":1},
-        {"label":"U", "x":7.5, "y":1},
-        {"label":"I", "x":8.5, "y":1},
-        {"label":"O", "x":9.5, "y":1},
-        {"label":"P", "x":10.5, "y":1},
-        {"label":" {", "x":11.5, "y":1},
-        {"label":"}", "x":12.5, "y":1},
-        {"label":"|", "x":13.5, "y":1, "w":1.5},
-        {"x":15.25, "y":1},
-        {"x":16.25, "y":1},
-
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-        {"label":"H", "x":6.75, "y":2},
-        {"label":"J", "x":7.75, "y":2},
-        {"label":"K", "x":8.75, "y":2},
-        {"label":"L", "x":9.75, "y":2},
-        {"label":":", "x":10.75, "y":2},
-        {"label":"\"", "x":11.75, "y":2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
-        {"label":"N", "x":7.25, "y":3},
-        {"label":"M", "x":8.25, "y":3},
-        {"label":"<", "x":9.25, "y":3},
-        {"label":">", "x":10.25, "y":3},
-        {"label":"?", "x":11.25, "y":3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-        {"x":15.25, "y":3},
-
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"Win", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":6.25},
-        {"label":"Alt", "x":10, "y":4, "w":1.25},
-        {"label":"Win", "x":11.25, "y":4, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-        {"x":14.25, "y":4},
-        {"x":15.25, "y":4},
-        {"x":16.25, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [4, 0], "x": 8, "y": 0},
+        {"matrix": [4, 1], "x": 9, "y": 0},
+        {"matrix": [4, 2], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [4, 4], "x": 12, "y": 0},
+        {"matrix": [4, 5], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [4, 6], "x": 15.25, "y": 0},
+        {"matrix": [4, 7], "x": 16.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [5, 0], "x": 8.5, "y": 1},
+        {"matrix": [5, 1], "x": 9.5, "y": 1},
+        {"matrix": [5, 2], "x": 10.5, "y": 1},
+        {"matrix": [5, 3], "x": 11.5, "y": 1},
+        {"matrix": [5, 4], "x": 12.5, "y": 1},
+        {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [5, 6], "x": 15.25, "y": 1},
+        {"matrix": [5, 7], "x": 16.25, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [6, 0], "x": 8.75, "y": 2},
+        {"matrix": [6, 1], "x": 9.75, "y": 2},
+        {"matrix": [6, 2], "x": 10.75, "y": 2},
+        {"matrix": [6, 3], "x": 11.75, "y": 2},
+        {"matrix": [6, 4], "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": [7, 0], "x": 9.25, "y": 3},
+        {"matrix": [7, 1], "x": 10.25, "y": 3},
+        {"matrix": [7, 2], "x": 11.25, "y": 3},
+        {"matrix": [7, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [7, 4], "x": 15.25, "y": 3},
+
+        {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [8, 4], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [8, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [8, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [7, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+        {"matrix": [6, 5], "x": 14.25, "y": 4},
+        {"matrix": [6, 6], "x": 15.25, "y": 4},
+        {"matrix": [6, 7], "x": 16.25, "y": 4}
       ]
     },
     "LAYOUT_split_space": {
       "layout": [
-        {"label":"~", "x":0, "y":0},
-        {"label":"!", "x":1, "y":0},
-        {"label":"@", "x":2, "y":0},
-        {"label":"#", "x":3, "y":0},
-        {"label":"$", "x":4, "y":0},
-        {"label":"%", "x":5, "y":0},
-        {"label":"^", "x":6, "y":0},
-        {"label":"&", "x":7, "y":0},
-        {"label":"*", "x":8, "y":0},
-        {"label":"(", "x":9, "y":0},
-        {"label":")", "x":10, "y":0},
-        {"label":"_", "x":11, "y":0},
-        {"label":"+", "x":12, "y":0},
-        {"label":"Backspace", "x":13, "y":0, "w":2},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-        {"label":"Y", "x":6.5, "y":1},
-        {"label":"U", "x":7.5, "y":1},
-        {"label":"I", "x":8.5, "y":1},
-        {"label":"O", "x":9.5, "y":1},
-        {"label":"P", "x":10.5, "y":1},
-        {"label":" {", "x":11.5, "y":1},
-        {"label":"}", "x":12.5, "y":1},
-        {"label":"|", "x":13.5, "y":1, "w":1.5},
-        {"x":15.25, "y":1},
-        {"x":16.25, "y":1},
-
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-        {"label":"H", "x":6.75, "y":2},
-        {"label":"J", "x":7.75, "y":2},
-        {"label":"K", "x":8.75, "y":2},
-        {"label":"L", "x":9.75, "y":2},
-        {"label":":", "x":10.75, "y":2},
-        {"label":"\"", "x":11.75, "y":2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
-        {"label":"N", "x":7.25, "y":3},
-        {"label":"M", "x":8.25, "y":3},
-        {"label":"<", "x":9.25, "y":3},
-        {"label":">", "x":10.25, "y":3},
-        {"label":"?", "x":11.25, "y":3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-        {"x":15.25, "y":3},
-
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"Win", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":2.25},
-        {"x":6, "y":4, "w":1.75},
-        {"x":7.75, "y":4, "w":2.25},
-        {"label":"Alt", "x":10, "y":4, "w":1.25},
-        {"label":"Win", "x":11.25, "y":4, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-        {"x":14.25, "y":4},
-        {"x":15.25, "y":4},
-        {"x":16.25, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [4, 0], "x": 8, "y": 0},
+        {"matrix": [4, 1], "x": 9, "y": 0},
+        {"matrix": [4, 2], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [4, 4], "x": 12, "y": 0},
+        {"matrix": [4, 5], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [4, 6], "x": 15.25, "y": 0},
+        {"matrix": [4, 7], "x": 16.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [5, 0], "x": 8.5, "y": 1},
+        {"matrix": [5, 1], "x": 9.5, "y": 1},
+        {"matrix": [5, 2], "x": 10.5, "y": 1},
+        {"matrix": [5, 3], "x": 11.5, "y": 1},
+        {"matrix": [5, 4], "x": 12.5, "y": 1},
+        {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [5, 6], "x": 15.25, "y": 1},
+        {"matrix": [5, 7], "x": 16.25, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [6, 0], "x": 8.75, "y": 2},
+        {"matrix": [6, 1], "x": 9.75, "y": 2},
+        {"matrix": [6, 2], "x": 10.75, "y": 2},
+        {"matrix": [6, 3], "x": 11.75, "y": 2},
+        {"matrix": [6, 4], "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": [7, 0], "x": 9.25, "y": 3},
+        {"matrix": [7, 1], "x": 10.25, "y": 3},
+        {"matrix": [7, 2], "x": 11.25, "y": 3},
+        {"matrix": [7, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [7, 4], "x": 15.25, "y": 3},
+
+        {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 2.25},
+        {"matrix": [8, 4], "x": 6, "y": 4, "w": 1.75},
+        {"matrix": [8, 5], "x": 7.75, "y": 4, "w": 2.25},
+        {"matrix": [8, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [8, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [7, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+        {"matrix": [6, 5], "x": 14.25, "y": 4},
+        {"matrix": [6, 6], "x": 15.25, "y": 4},
+        {"matrix": [6, 7], "x": 16.25, "y": 4}
       ]
     },
     "LAYOUT_split_space_and_backspace": {
       "layout": [
-        {"label":"~", "x":0, "y":0},
-        {"label":"!", "x":1, "y":0},
-        {"label":"@", "x":2, "y":0},
-        {"label":"#", "x":3, "y":0},
-        {"label":"$", "x":4, "y":0},
-        {"label":"%", "x":5, "y":0},
-        {"label":"^", "x":6, "y":0},
-        {"label":"&", "x":7, "y":0},
-        {"label":"*", "x":8, "y":0},
-        {"label":"(", "x":9, "y":0},
-        {"label":")", "x":10, "y":0},
-        {"label":"_", "x":11, "y":0},
-        {"label":"+", "x":12, "y":0},
-        {"label":"Del", "x":13, "y":0},
-        {"label":"Backspace", "x":14, "y":0},
-        {"x":15.25, "y":0},
-        {"x":16.25, "y":0},
-
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-        {"label":"Y", "x":6.5, "y":1},
-        {"label":"U", "x":7.5, "y":1},
-        {"label":"I", "x":8.5, "y":1},
-        {"label":"O", "x":9.5, "y":1},
-        {"label":"P", "x":10.5, "y":1},
-        {"label":" {", "x":11.5, "y":1},
-        {"label":"}", "x":12.5, "y":1},
-        {"label":"|", "x":13.5, "y":1, "w":1.5},
-        {"x":15.25, "y":1},
-        {"x":16.25, "y":1},
-
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-        {"label":"H", "x":6.75, "y":2},
-        {"label":"J", "x":7.75, "y":2},
-        {"label":"K", "x":8.75, "y":2},
-        {"label":"L", "x":9.75, "y":2},
-        {"label":":", "x":10.75, "y":2},
-        {"label":"\"", "x":11.75, "y":2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
-        {"label":"N", "x":7.25, "y":3},
-        {"label":"M", "x":8.25, "y":3},
-        {"label":"<", "x":9.25, "y":3},
-        {"label":">", "x":10.25, "y":3},
-        {"label":"?", "x":11.25, "y":3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-        {"x":15.25, "y":3},
-
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"Win", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":2.25},
-        {"x":6, "y":4, "w":1.75},
-        {"x":7.75, "y":4, "w":2.25},
-        {"label":"Alt", "x":10, "y":4, "w":1.25},
-        {"label":"Win", "x":11.25, "y":4, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-        {"x":14.25, "y":4},
-        {"x":15.25, "y":4},
-        {"x":16.25, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [4, 0], "x": 8, "y": 0},
+        {"matrix": [4, 1], "x": 9, "y": 0},
+        {"matrix": [4, 2], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [4, 4], "x": 12, "y": 0},
+        {"matrix": [4, 5], "x": 13, "y": 0},
+        {"matrix": [7, 6], "x": 14, "y": 0},
+
+        {"matrix": [4, 6], "x": 15.25, "y": 0},
+        {"matrix": [4, 7], "x": 16.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [5, 0], "x": 8.5, "y": 1},
+        {"matrix": [5, 1], "x": 9.5, "y": 1},
+        {"matrix": [5, 2], "x": 10.5, "y": 1},
+        {"matrix": [5, 3], "x": 11.5, "y": 1},
+        {"matrix": [5, 4], "x": 12.5, "y": 1},
+        {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [5, 6], "x": 15.25, "y": 1},
+        {"matrix": [5, 7], "x": 16.25, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [6, 0], "x": 8.75, "y": 2},
+        {"matrix": [6, 1], "x": 9.75, "y": 2},
+        {"matrix": [6, 2], "x": 10.75, "y": 2},
+        {"matrix": [6, 3], "x": 11.75, "y": 2},
+        {"matrix": [6, 4], "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": [7, 0], "x": 9.25, "y": 3},
+        {"matrix": [7, 1], "x": 10.25, "y": 3},
+        {"matrix": [7, 2], "x": 11.25, "y": 3},
+        {"matrix": [7, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [7, 4], "x": 15.25, "y": 3},
+
+        {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 2.25},
+        {"matrix": [8, 4], "x": 6, "y": 4, "w": 1.75},
+        {"matrix": [8, 5], "x": 7.75, "y": 4, "w": 2.25},
+        {"matrix": [8, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [8, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [7, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+        {"matrix": [6, 5], "x": 14.25, "y": 4},
+        {"matrix": [6, 6], "x": 15.25, "y": 4},
+        {"matrix": [6, 7], "x": 16.25, "y": 4}
       ]
     }
   }
diff --git a/keyboards/keebio/tragicforce68/tragicforce68.c b/keyboards/keebio/tragicforce68/tragicforce68.c
deleted file mode 100644
index 42df8ec295..0000000000
--- a/keyboards/keebio/tragicforce68/tragicforce68.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tragicforce68.h"
diff --git a/keyboards/keebio/tragicforce68/tragicforce68.h b/keyboards/keebio/tragicforce68/tragicforce68.h
deleted file mode 100644
index a177f52816..0000000000
--- a/keyboards/keebio/tragicforce68/tragicforce68.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_68_ansi( \
-    A1, A2, A3, A4, A5, A6, A7, A8, E1, E2, E3, E4, E5, E6,     E7, E8, \
-    B1, B2, B3, B4, B5, B6, B7, B8, F1, F2, F3, F4, F5, F6,     F7, F8, \
-    C1,  C2, C3, C4, C5, C6, C7, C8, G1, G2, G3, G4,    G5, \
-    D1,   D2, D3, D4, D5, D6, D7, D8, H1, H2, H3,      H4,      H5, \
-    J1,  J2,  J3,          J5,           J7,   J8,   H6,    G6, G7, G8 \
-) { \
-    { A1, A2, A3, A4, A5, A6, A7, A8 }, \
-    { B1, B2, B3, B4, B5, B6, B7, B8 }, \
-    { C1, C2, C3, C4, C5, C6, C7, C8 }, \
-    { D1, D2, D3, D4, D5, D6, D7, D8 }, \
-    { E1, E2, E3, E4, E5, E6, E7, E8 }, \
-    { F1, F2, F3, F4, F5, F6, F7, F8 }, \
-    { G1, G2, G3, G4, G5, G6, G7, G8 }, \
-    { H1, H2, H3, H4, H5, H6, KC_NO, KC_NO }, \
-    { J1, J2, J3, KC_NO, J5, KC_NO, J7, J8 } \
-}
-
-#define LAYOUT_split_space( \
-    A1, A2, A3, A4, A5, A6, A7, A8, E1, E2, E3, E4, E5, E6,     E7, E8, \
-    B1, B2, B3, B4, B5, B6, B7, B8, F1, F2, F3, F4, F5, F6,     F7, F8, \
-    C1,  C2, C3, C4, C5, C6, C7, C8, G1, G2, G3, G4,    G5, \
-    D1,   D2, D3, D4, D5, D6, D7, D8, H1, H2, H3,      H4,      H5, \
-    J1,  J2,  J3,    J4,    J5,   J6,    J7,   J8,   H6,    G6, G7, G8 \
-) { \
-    { A1, A2, A3, A4, A5, A6, A7, A8 }, \
-    { B1, B2, B3, B4, B5, B6, B7, B8 }, \
-    { C1, C2, C3, C4, C5, C6, C7, C8 }, \
-    { D1, D2, D3, D4, D5, D6, D7, D8 }, \
-    { E1, E2, E3, E4, E5, E6, E7, E8 }, \
-    { F1, F2, F3, F4, F5, F6, F7, F8 }, \
-    { G1, G2, G3, G4, G5, G6, G7, G8 }, \
-    { H1, H2, H3, H4, H5, H6, KC_NO, KC_NO }, \
-    { J1, J2, J3, J4, J5, J6, J7, J8 } \
-}
-
-#define LAYOUT_split_space_and_backspace( \
-    A1, A2, A3, A4, A5, A6, A7, A8, E1, E2, E3, E4, E5, E6, H7, E7, E8, \
-    B1, B2, B3, B4, B5, B6, B7, B8, F1, F2, F3, F4, F5, F6,     F7, F8, \
-    C1,  C2, C3, C4, C5, C6, C7, C8, G1, G2, G3, G4,    G5, \
-    D1,   D2, D3, D4, D5, D6, D7, D8, H1, H2, H3,      H4,      H5, \
-    J1,  J2,  J3,    J4,    J5,   J6,    J7,   J8,   H6,    G6, G7, G8 \
-) { \
-    { A1, A2, A3, A4, A5, A6, A7, A8 }, \
-    { B1, B2, B3, B4, B5, B6, B7, B8 }, \
-    { C1, C2, C3, C4, C5, C6, C7, C8 }, \
-    { D1, D2, D3, D4, D5, D6, D7, D8 }, \
-    { E1, E2, E3, E4, E5, E6, E7, E8 }, \
-    { F1, F2, F3, F4, F5, F6, F7, F8 }, \
-    { G1, G2, G3, G4, G5, G6, G7, G8 }, \
-    { H1, H2, H3, H4, H5, H6, H7, KC_NO }, \
-    { J1, J2, J3, J4, J5, J6, J7, J8 } \
-}
-
-#define LAYOUT LAYOUT_68_ansi
diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h
index b62aef8a09..bfe597511e 100644
--- a/keyboards/keebio/tukey/config.h
+++ b/keyboards/keebio/tukey/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 8
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -35,9 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-
-#endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/info.json
index 3f34d8e604..47908438ed 100644
--- a/keyboards/keebio/tukey/info.json
+++ b/keyboards/keebio/tukey/info.json
@@ -8,6 +8,9 @@
       "pid": "0x1112",
       "device_version": "1.0.0"
     },
+    "ws2812": {
+      "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {
diff --git a/keyboards/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json
index 0b6d002758..1fadcce126 100644
--- a/keyboards/keebio/viterbi/info.json
+++ b/keyboards/keebio/viterbi/info.json
@@ -7,85 +7,5 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
-    "community_layouts": ["ortho_5x14"],
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
-
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
-
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
-
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4}
-            ]
-        }
-    }
+    "community_layouts": ["ortho_5x14"]
 }
diff --git a/keyboards/keebio/viterbi/rev1/config.h b/keyboards/keebio/viterbi/rev1/config.h
index d911b45208..1dfed1a82f 100644
--- a/keyboards/keebio/viterbi/rev1/config.h
+++ b/keyboards/keebio/viterbi/rev1/config.h
@@ -17,20 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 14
 #define RGBLED_SPLIT { 7, 7 }
diff --git a/keyboards/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/info.json
index d91c35fc85..b28ea246ff 100644
--- a/keyboards/keebio/viterbi/rev1/info.json
+++ b/keyboards/keebio/viterbi/rev1/info.json
@@ -6,5 +6,93 @@
     "usb": {
         "pid": "0x1157",
         "device_version": "1.0.0"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":6, "y":1},
+                {"x":8, "y":1},
+                {"x":9, "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+                {"x":13, "y":1},
+                {"x":14, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":6, "y":2},
+                {"x":8, "y":2},
+                {"x":9, "y":2},
+                {"x":10, "y":2},
+                {"x":11, "y":2},
+                {"x":12, "y":2},
+                {"x":13, "y":2},
+                {"x":14, "y":2},
+
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4},
+                {"x":1, "y":4},
+                {"x":2, "y":4},
+                {"x":3, "y":4},
+                {"x":4, "y":4},
+                {"x":5, "y":4},
+                {"x":6, "y":4},
+                {"x":8, "y":4},
+                {"x":9, "y":4},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        }
     }
 }
diff --git a/keyboards/keebio/viterbi/rev1/rev1.c b/keyboards/keebio/viterbi/rev1/rev1.c
deleted file mode 100644
index 509e42dc51..0000000000
--- a/keyboards/keebio/viterbi/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "viterbi.h"
diff --git a/keyboards/keebio/viterbi/rev1/rev1.h b/keyboards/keebio/viterbi/rev1/rev1.h
index 88a3200f6b..95776a7aeb 100644
--- a/keyboards/keebio/viterbi/rev1/rev1.h
+++ b/keyboards/keebio/viterbi/rev1/rev1.h
@@ -1,16 +1,7 @@
 #pragma once
 
-#include "viterbi.h"
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/keebio/viterbi/rev2/config.h b/keyboards/keebio/viterbi/rev2/config.h
index 898ba3d786..56151a0028 100644
--- a/keyboards/keebio/viterbi/rev2/config.h
+++ b/keyboards/keebio/viterbi/rev2/config.h
@@ -17,20 +17,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
 #define SPLIT_HAND_PIN D2
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 14
 #define RGBLED_SPLIT { 7, 7 }
diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/info.json
index dd375f3053..10f36652ab 100644
--- a/keyboards/keebio/viterbi/rev2/info.json
+++ b/keyboards/keebio/viterbi/rev2/info.json
@@ -7,8 +7,104 @@
         "pid": "0x2157",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 7
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x14"
+    },
+    "layouts": {
+        "LAYOUT_ortho_5x14": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "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": 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, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "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": 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, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "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": 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, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+
+                {"matrix": [8, 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, 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": [9, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 3], "x": 11, "y": 4},
+                {"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/keebio/viterbi/rev2/rev2.c b/keyboards/keebio/viterbi/rev2/rev2.c
index a72cc44436..f00bb726e9 100644
--- a/keyboards/keebio/viterbi/rev2/rev2.c
+++ b/keyboards/keebio/viterbi/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "viterbi.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/viterbi/rev2/rev2.h b/keyboards/keebio/viterbi/rev2/rev2.h
deleted file mode 100644
index 599e6415a3..0000000000
--- a/keyboards/keebio/viterbi/rev2/rev2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "viterbi.h"
-#include "quantum.h"
-
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
-    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
-    L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05, L06 }, \
-		{ L10, L11, L12, L13, L14, L15, L16 }, \
-		{ L20, L21, L22, L23, L24, L25, L26 }, \
-		{ L30, L31, L32, L33, L34, L35, L36 }, \
-		{ L40, L41, L42, L43, L44, L45, L46 }, \
-		{ R06, R05, R04, R03, R02, R01, R00 }, \
-		{ R16, R15, R14, R13, R12, R11, R10 }, \
-		{ R26, R25, R24, R23, R22, R21, R20 }, \
-		{ R36, R35, R34, R33, R32, R31, R30 }, \
-		{ R46, R45, R44, R43, R42, R41, R40 } \
-	}
-
-#define LAYOUT_ortho_5x14 LAYOUT
diff --git a/keyboards/keebio/viterbi/viterbi.c b/keyboards/keebio/viterbi/viterbi.c
deleted file mode 100644
index 509e42dc51..0000000000
--- a/keyboards/keebio/viterbi/viterbi.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "viterbi.h"
diff --git a/keyboards/keebio/viterbi/viterbi.h b/keyboards/keebio/viterbi/viterbi.h
deleted file mode 100644
index b17b322410..0000000000
--- a/keyboards/keebio/viterbi/viterbi.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_viterbi_rev1
-    #include "rev1.h"
-#elif KEYBOARD_keebio_viterbi_rev2
-    #include "rev2.h"
-#endif
-
-#define LAYOUT_ortho_5x14 LAYOUT
-
diff --git a/keyboards/keebio/wavelet/config.h b/keyboards/keebio/wavelet/config.h
index 6866a313d4..b6d4d64719 100644
--- a/keyboards/keebio/wavelet/config.h
+++ b/keyboards/keebio/wavelet/config.h
@@ -19,18 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F4, F5, F7, B3, D2, D1, D4, D7 }
-#define MATRIX_COL_PINS { F6, B1, B2, B6, B4, E6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json
index 1a1663c4d7..c40265fc5b 100644
--- a/keyboards/keebio/wavelet/info.json
+++ b/keyboards/keebio/wavelet/info.json
@@ -8,20 +8,82 @@
     "pid": "0x1046",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["F6", "B1", "B2", "B6", "B4", "E6"],
+    "rows": ["F4", "F5", "F7", "B3", "D2", "D1", "D4", "D7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5",
     "levels": 7
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_4x12"],
+  "layout_aliases": {
+    "LAYOUT_ortho_4x12": "LAYOUT"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0},
-        {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1},
-        {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2},
-        {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [4, 5], "x": 6, "y": 0},
+        {"matrix": [4, 4], "x": 7, "y": 0},
+        {"matrix": [4, 3], "x": 8, "y": 0},
+        {"matrix": [4, 2], "x": 9, "y": 0},
+        {"matrix": [4, 1], "x": 10, "y": 0},
+        {"matrix": [4, 0], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+
+        {"matrix": [5, 5], "x": 6, "y": 1},
+        {"matrix": [5, 4], "x": 7, "y": 1},
+        {"matrix": [5, 3], "x": 8, "y": 1},
+        {"matrix": [5, 2], "x": 9, "y": 1},
+        {"matrix": [5, 1], "x": 10, "y": 1},
+        {"matrix": [5, 0], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+
+        {"matrix": [6, 5], "x": 6, "y": 2},
+        {"matrix": [6, 4], "x": 7, "y": 2},
+        {"matrix": [6, 3], "x": 8, "y": 2},
+        {"matrix": [6, 2], "x": 9, "y": 2},
+        {"matrix": [6, 1], "x": 10, "y": 2},
+        {"matrix": [6, 0], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+
+        {"matrix": [7, 5], "x": 6, "y": 3},
+        {"matrix": [7, 4], "x": 7, "y": 3},
+        {"matrix": [7, 3], "x": 8, "y": 3},
+        {"matrix": [7, 2], "x": 9, "y": 3},
+        {"matrix": [7, 1], "x": 10, "y": 3},
+        {"matrix": [7, 0], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/keebio/wavelet/wavelet.c b/keyboards/keebio/wavelet/wavelet.c
index 466b4fe72e..6f1a050e80 100644
--- a/keyboards/keebio/wavelet/wavelet.c
+++ b/keyboards/keebio/wavelet/wavelet.c
@@ -1,4 +1,4 @@
-#include "wavelet.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/keebio/wavelet/wavelet.h b/keyboards/keebio/wavelet/wavelet.h
deleted file mode 100644
index d6a0ef4227..0000000000
--- a/keyboards/keebio/wavelet/wavelet.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-	L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-	L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-	L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-		{ R05, R04, R03, R02, R01, R00 }, \
-		{ R15, R14, R13, R12, R11, R10 }, \
-		{ R25, R24, R23, R22, R21, R20 }, \
-		{ R35, R34, R33, R32, R31, R30 } \
-	}
-
-#define LAYOUT_ortho_4x12 LAYOUT
diff --git a/keyboards/keebio/wtf60/config.h b/keyboards/keebio/wtf60/config.h
index afd480e018..99fc98b86b 100644
--- a/keyboards/keebio/wtf60/config.h
+++ b/keyboards/keebio/wtf60/config.h
@@ -16,26 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B4, B5, B6, C7, F7, B1, B2, B3, D2, D3, D5, D4, D6, D7 }
 #define AUDIO_PIN C6
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 16
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/wtf60/info.json b/keyboards/keebio/wtf60/info.json
index d6932595cf..687b9de46a 100644
--- a/keyboards/keebio/wtf60/info.json
+++ b/keyboards/keebio/wtf60/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1337",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "C7", "F7", "B1", "B2", "B3", "D2", "D3", "D5", "D4", "D6", "D7"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/keebio/wtf60/wtf60.c b/keyboards/keebio/wtf60/wtf60.c
deleted file mode 100644
index 631af10615..0000000000
--- a/keyboards/keebio/wtf60/wtf60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "wtf60.h"
diff --git a/keyboards/keebmonkey/kbmg68/config.h b/keyboards/keebmonkey/kbmg68/config.h
index 8872d8c9c6..7f996ecc17 100644
--- a/keyboards/keebmonkey/kbmg68/config.h
+++ b/keyboards/keebmonkey/kbmg68/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { B6, B7, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 68
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -50,7 +32,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/keebmonkey/kbmg68/info.json b/keyboards/keebmonkey/kbmg68/info.json
index 802f3d6360..89bb9f7690 100644
--- a/keyboards/keebmonkey/kbmg68/info.json
+++ b/keyboards/keebmonkey/kbmg68/info.json
@@ -8,80 +8,92 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F7", "F6", "F5", "F4"],
+        "rows": ["B1", "B2", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                { "label": "K00 (B1,B6)", "x": 0, "y": 0 },
-                { "label": "K01 (B1,B7)", "x": 1, "y": 0 },
-                { "label": "K02 (B1,D0)", "x": 2, "y": 0 },
-                { "label": "K03 (B1,D1)", "x": 3, "y": 0 },
-                { "label": "K04 (B1,D2)", "x": 4, "y": 0 },
-                { "label": "K05 (B1,D3)", "x": 5, "y": 0 },
-                { "label": "K06 (B1,D4)", "x": 6, "y": 0 },
-                { "label": "K07 (B1,D5)", "x": 7, "y": 0 },
-                { "label": "K08 (B1,D6)", "x": 8, "y": 0 },
-                { "label": "K09 (B1,D7)", "x": 9, "y": 0 },
-                { "label": "K0A (B1,C6)", "x": 10, "y": 0 },
-                { "label": "K0B (B1,C7)", "x": 11, "y": 0 },
-                { "label": "K0C (B1,F7)", "x": 12, "y": 0 },
-                { "label": "K0E (B1,F5)", "x": 13, "y": 0, "w": 2 },
-                { "label": "K0F (B1,F4)", "x": 15, "y": 0 },
-                { "label": "K10 (B2,B6)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K12 (B2,D0)", "x": 1.5, "y": 1 },
-                { "label": "K13 (B2,D1)", "x": 2.5, "y": 1 },
-                { "label": "K14 (B2,D2)", "x": 3.5, "y": 1 },
-                { "label": "K15 (B2,D3)", "x": 4.5, "y": 1 },
-                { "label": "K16 (B2,D4)", "x": 5.5, "y": 1 },
-                { "label": "K17 (B2,D5)", "x": 6.5, "y": 1 },
-                { "label": "K18 (B2,D6)", "x": 7.5, "y": 1 },
-                { "label": "K19 (B2,D7)", "x": 8.5, "y": 1 },
-                { "label": "K1A (B2,C6)", "x": 9.5, "y": 1 },
-                { "label": "K1B (B2,C7)", "x": 10.5, "y": 1 },
-                { "label": "K1C (B2,F7)", "x": 11.5, "y": 1 },
-                { "label": "K1D (B2,F6)", "x": 12.5, "y": 1 },
-                { "label": "K1E (B2,F5)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K1F (B2,F4)", "x": 15, "y": 1 },
-                { "label": "K20 (B3,B6)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K22 (B3,D0)", "x": 1.75, "y": 2 },
-                { "label": "K23 (B3,D1)", "x": 2.75, "y": 2 },
-                { "label": "K24 (B3,D2)", "x": 3.75, "y": 2 },
-                { "label": "K25 (B3,D3)", "x": 4.75, "y": 2 },
-                { "label": "K26 (B3,D4)", "x": 5.75, "y": 2 },
-                { "label": "K27 (B3,D5)", "x": 6.75, "y": 2 },
-                { "label": "K28 (B3,D6)", "x": 7.75, "y": 2 },
-                { "label": "K29 (B3,D7)", "x": 8.75, "y": 2 },
-                { "label": "K2A (B3,C6)", "x": 9.75, "y": 2 },
-                { "label": "K2B (B3,C7)", "x": 10.75, "y": 2 },
-                { "label": "K2C (B3,F7)", "x": 11.75, "y": 2 },
-                { "label": "K2D (B3,F6)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K2F (B3,F4)", "x": 15, "y": 2 },
-                { "label": "K31 (B4,B7)", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "K32 (B4,D0)", "x": 2.25, "y": 3 },
-                { "label": "K33 (B4,D1)", "x": 3.25, "y": 3 },
-                { "label": "K34 (B4,D2)", "x": 4.25, "y": 3 },
-                { "label": "K35 (B4,D3)", "x": 5.25, "y": 3 },
-                { "label": "K36 (B4,D4)", "x": 6.25, "y": 3 },
-                { "label": "K37 (B4,D5)", "x": 7.25, "y": 3 },
-                { "label": "K38 (B4,D6)", "x": 8.25, "y": 3 },
-                { "label": "K39 (B4,D7)", "x": 9.25, "y": 3 },
-                { "label": "K3A (B4,C6)", "x": 10.25, "y": 3 },
-                { "label": "K3B (B4,C7)", "x": 11.25, "y": 3 },
-                { "label": "K3D (B4,F6)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K3E (B4,F5)", "x": 14, "y": 3 },
-                { "label": "K3F (B4,F4)", "x": 15, "y": 3 },
-                { "label": "K40 (B5,B6)", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K41 (B5,B7)", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K43 (B5,D1)", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K46 (B5,D4)", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "K4A (B5,C6)", "x": 10, "y": 4 },
-                { "label": "K4B (B5,C7)", "x": 11, "y": 4 },
-                { "label": "K4C (B5,F7)", "x": 12, "y": 4 },
-                { "label": "K4D (B5,F6)", "x": 13, "y": 4 },
-                { "label": "K4E (B5,F5)", "x": 14, "y": 4 },
-                { "label": "K4F (B5,F4)", "x": 15, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keebmonkey/kbmg68/kbmg68.c b/keyboards/keebmonkey/kbmg68/kbmg68.c
deleted file mode 100644
index 452624d771..0000000000
--- a/keyboards/keebmonkey/kbmg68/kbmg68.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2022 Your Mom Loves My Keyboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kbmg68.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/keebmonkey/kbmg68/kbmg68.h b/keyboards/keebmonkey/kbmg68/kbmg68.h
deleted file mode 100644
index a817a73d78..0000000000
--- a/keyboards/keebmonkey/kbmg68/kbmg68.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 Your Mom Loves My Keyboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
-    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2D, K2F, \
-    K31,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
-    K40, K41, K43,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/keebsforall/coarse60/coarse60.c b/keyboards/keebsforall/coarse60/coarse60.c
deleted file mode 100644
index 8287eec1a8..0000000000
--- a/keyboards/keebsforall/coarse60/coarse60.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-Copyright 2021 Elliot Powell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "coarse60.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebsforall/coarse60/coarse60.h b/keyboards/keebsforall/coarse60/coarse60.h
deleted file mode 100644
index 76f147cf12..0000000000
--- a/keyboards/keebsforall/coarse60/coarse60.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2021 Elliot Powell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define KNO KC_NO
-#define LAYOUT_default LAYOUT_alice_split_bs
-
-#define LAYOUT_alice_split_bs( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2D,\
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-       K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,         \
-       K41,           K44, K45, K46,      K48,      K4A,                K4E \
-) { \
-  {  K00, K01, K02, K03, K04, K05, K06,  K07, K08, K09, K0A, K0B, K0C, K0D, K0E  }, \
-  {  K10, K11, K12, K13, K14, K15, K16,  K17, K18, K19, K1A, K1B, K1C, K1D, K1E  }, \
-  {  K20, K21, K22, K23, K24, K25, K26,  K27, K28, K29, K2A, K2B, K2C, K2D, K2E  }, \
-  {  KNO, K31, K32, K33, K34, K35, K36,  K37, K38, K39, K3A, K3B, K3C, K3D, K3E  }, \
-  {  KNO, K41, KNO, KNO, K44, K45, K46,  KNO, K48, KNO, K4A, KNO, KNO, KNO, K4E  }  \
-}
-
-#define LAYOUT_alice( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-       K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,         \
-       K41,           K44, K45, K46,      K48,      K4A,                K4E \
-) { \
-  {  K00, K01, K02, K03, K04, K05, K06,  K07, K08, K09, K0A, K0B, K0C, K0D, K0E  }, \
-  {  K10, K11, K12, K13, K14, K15, K16,  K17, K18, K19, K1A, K1B, K1C, K1D, K1E  }, \
-  {  K20, K21, K22, K23, K24, K25, K26,  K27, K28, K29, K2A, K2B, K2C, KNO, K2E  }, \
-  {  KNO, K31, K32, K33, K34, K35, K36,  K37, K38, K39, K3A, K3B, K3C, K3D, K3E  }, \
-  {  KNO, K41, KNO, KNO, K44, K45, K46,  KNO, K48, KNO, K4A, KNO, KNO, KNO, K4E  }  \
-}
diff --git a/keyboards/keebsforall/coarse60/config.h b/keyboards/keebsforall/coarse60/config.h
index e30cb58610..20493f173c 100644
--- a/keyboards/keebsforall/coarse60/config.h
+++ b/keyboards/keebsforall/coarse60/config.h
@@ -16,10 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define MATRIX_COL_PINS { B1, B0, A7, B14, A5, A4, A3, B9, B8, B7, B6, B5, B4, B3, A15 }
-#define MATRIX_ROW_PINS { A9, A10, B12, A2, C13 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -29,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/info.json
index d769b4e7d0..ce1ab219bb 100644
--- a/keyboards/keebsforall/coarse60/info.json
+++ b/keyboards/keebsforall/coarse60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5341",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "B14", "A5", "A4", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["A9", "A10", "B12", "A2", "C13"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A8", "pin_b": "A1", "resolution": 2}
@@ -18,6 +23,10 @@
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "indicators": {
         "caps_lock": "B10",
         "num_lock": "B2",
@@ -27,152 +36,169 @@
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_default": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Del", "x":17, "y":0.25},
-                {"label":"Backspace", "x":18, "y":0.25},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 14], "x": 17, "y": 0.25},
+                {"matrix": [2, 13], "x": 18, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.75, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "y": 3.25},
+
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25},
+                {"matrix": [3, 13], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 10], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 14], "x": 18, "y": 4.25, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Backspace", "x":17, "y":0.25, "w":2},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 14], "x": 17, "y": 0.25, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.75, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "y": 3.25},
+
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25},
+                {"matrix": [3, 13], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 10], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 14], "x": 18, "y": 4.25, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/keebsforall/coarse60/rules.mk b/keyboards/keebsforall/coarse60/rules.mk
index 5b122a7b50..e353d7863f 100644
--- a/keyboards/keebsforall/coarse60/rules.mk
+++ b/keyboards/keebsforall/coarse60/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = spi
 ENCODER_ENABLE = yes
 
 
diff --git a/keyboards/keebsforall/freebird60/config.h b/keyboards/keebsforall/freebird60/config.h
deleted file mode 100644
index bee2c33568..0000000000
--- a/keyboards/keebsforall/freebird60/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 KnoblesseOblige
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F5, F4, F1, F0, F6 }
-#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D0, D1, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keebsforall/freebird60/freebird60.c b/keyboards/keebsforall/freebird60/freebird60.c
deleted file mode 100644
index abbb209dfd..0000000000
--- a/keyboards/keebsforall/freebird60/freebird60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 KnoblesseOblige
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "freebird60.h"
diff --git a/keyboards/keebsforall/freebird60/info.json b/keyboards/keebsforall/freebird60/info.json
index 4cd786a174..743624abed 100644
--- a/keyboards/keebsforall/freebird60/info.json
+++ b/keyboards/keebsforall/freebird60/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFB60",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D0", "D1", "D2", "D3", "D5"],
+        "rows": ["F5", "F4", "F1", "F0", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
@@ -15,7 +20,7 @@
             "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
         },
         "LAYOUT_all": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3, "w":1.75}, {"label":"Up", "x":13, "y":3, "w":1}, {"label":"Shift", "x":14, "y":3, "w":1}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1}, {"label":"Ctrl", "x":11, "y":4, "w":1}, {"label":"Left", "x":12, "y":4, "w":1}, {"label":"Down", "x":13, "y":4, "w":1}, {"label":"Right", "x":14, "y":4, "w":1}]
+            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3, "w":1.75}, {"label":"Up", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Ctrl", "x":11, "y":4}, {"label":"Left", "x":12, "y":4}, {"label":"Down", "x":13, "y":4}, {"label":"Right", "x":14, "y":4}]
         }
     }
 }
diff --git a/keyboards/keebsforall/freebirdnp/lite/config.h b/keyboards/keebsforall/freebirdnp/lite/config.h
index 78e75738ec..d1c3c23ee6 100644
--- a/keyboards/keebsforall/freebirdnp/lite/config.h
+++ b/keyboards/keebsforall/freebirdnp/lite/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B7, B6, B5, B4, B3 }
-#define MATRIX_COL_PINS { C7, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebsforall/freebirdnp/lite/info.json b/keyboards/keebsforall/freebirdnp/lite/info.json
index 599d592fc0..91d43ffef8 100644
--- a/keyboards/keebsforall/freebirdnp/lite/info.json
+++ b/keyboards/keebsforall/freebirdnp/lite/info.json
@@ -8,204 +8,66 @@
         "pid": "0x1013",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "B2", "B1", "B0"],
+        "rows": ["B7", "B6", "B5", "B4", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "community_layouts": ["numpad_5x4", "ortho_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {
-                    "label": "Num Lock",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "/",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "*",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "-",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "8",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "9",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "label": "4",
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "5",
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "label": "6",
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "label": "+",
-                    "x": 3,
-                    "y": 1,
-                    "h": 2
-                },
-                {
-                    "label": "1",
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "2",
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "label": "3",
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "label": "0",
-                    "x": 0,
-                    "y": 4,
-                    "w": 2
-                },
-                {
-                    "label": ".",
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "label": "Enter",
-                    "x": 3,
-                    "y": 3,
-                    "h": 2
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         },
         "LAYOUT_ortho_5x4": {
             "layout": [
-                {
-                    "label": "Num Lock",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "/",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "*",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "-",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "8",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "9",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "label": "+",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "label": "4",
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "5",
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "label": "6",
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "label": "+",
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "label": "1",
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "2",
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "label": "3",
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "label": "Enter",
-                    "x": 3,
-                    "y": 3
-                },
-                {
-                    "label": "0",
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "00",
-                    "x": 1,
-                    "y": 4
-                },
-                {
-                    "label": ".",
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "label": "Enter",
-                    "x": 3,
-                    "y": 4
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keebsforall/freebirdnp/lite/lite.c b/keyboards/keebsforall/freebirdnp/lite/lite.c
deleted file mode 100644
index 4d424c17da..0000000000
--- a/keyboards/keebsforall/freebirdnp/lite/lite.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Elliot Powell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "lite.h"
diff --git a/keyboards/keebsforall/freebirdnp/lite/lite.h b/keyboards/keebsforall/freebirdnp/lite/lite.h
deleted file mode 100644
index 7f8cbdeeb0..0000000000
--- a/keyboards/keebsforall/freebirdnp/lite/lite.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 Elliot Powell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_numpad_5x4( \
-    K00, K01, K02, K03,  \
-    K10, K11, K12,       \
-    K20, K21, K22, K13,  \
-    K30, K31, K32,       \
-    K40,      K42, K33   \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, XXX }, \
-    { K30, K31, K32, K33 }, \
-    { K40, XXX, K42, XXX }  \
-}
-
-#define LAYOUT_ortho_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43  \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, K33 }, \
-    { K40, K41, K42, K43 }  \
-}
diff --git a/keyboards/keebsforall/freebirdnp/pro/config.h b/keyboards/keebsforall/freebirdnp/pro/config.h
index 85bcc17f0e..b129ce3add 100644
--- a/keyboards/keebsforall/freebirdnp/pro/config.h
+++ b/keyboards/keebsforall/freebirdnp/pro/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, B7, B6, B5, B4, B3 }
-#define MATRIX_COL_PINS { C7, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebsforall/freebirdnp/pro/info.json b/keyboards/keebsforall/freebirdnp/pro/info.json
index d4eda0ad0b..f3c8307526 100644
--- a/keyboards/keebsforall/freebirdnp/pro/info.json
+++ b/keyboards/keebsforall/freebirdnp/pro/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1014",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "B2", "B1", "B0"],
+        "rows": ["D3", "B7", "B6", "B5", "B4", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D4", "pin_b": "D5"}
@@ -19,65 +24,65 @@
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"F3", "x":2, "y":0},
-                {"label":"MUTE", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"Num Lock", "x":0, "y":1},
-                {"label":"/", "x":1, "y":1},
-                {"label":"*", "x":2, "y":1},
-                {"label":"-", "x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label":"7", "x":0, "y":2},
-                {"label":"8", "x":1, "y":2},
-                {"label":"9", "x":2, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
 
-                {"label":"4", "x":0, "y":3},
-                {"label":"5", "x":1, "y":3},
-                {"label":"6", "x":2, "y":3},
-                {"label":"+", "x":3, "y":2, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
 
-                {"label":"1", "x":0, "y":4},
-                {"label":"2", "x":1, "y":4},
-                {"label":"3", "x":2, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
 
-                {"label":"0", "x":0, "y":5, "w":2},
-                {"label":".", "x":2, "y":5},
-                {"label":"Enter", "x":3, "y":4, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"F3", "x":2, "y":0},
-                {"label":"MUTE", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"Num Lock", "x":0, "y":1},
-                {"label":"/", "x":1, "y":1},
-                {"label":"*", "x":2, "y":1},
-                {"label":"-", "x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label":"7", "x":0, "y":2},
-                {"label":"8", "x":1, "y":2},
-                {"label":"9", "x":2, "y":2},
-                {"label":"+", "x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"label":"4", "x":0, "y":3},
-                {"label":"5", "x":1, "y":3},
-                {"label":"6", "x":2, "y":3},
-                {"label":"+", "x":3, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
 
-                {"label":"1", "x":0, "y":4},
-                {"label":"2", "x":1, "y":4},
-                {"label":"3", "x":2, "y":4},
-                {"label":"Enter", "x":3, "y":4},
+                {"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},
 
-                {"label":"0", "x":0, "y":5},
-                {"label":"00", "x":1, "y":5},
-                {"label":".", "x":2, "y":5},
-                {"label":"Enter", "x":3, "y":5}
+                {"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}
             ]
         }
     }
diff --git a/keyboards/keebsforall/freebirdnp/pro/pro.c b/keyboards/keebsforall/freebirdnp/pro/pro.c
deleted file mode 100644
index dcc72d39b4..0000000000
--- a/keyboards/keebsforall/freebirdnp/pro/pro.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Elliot Powell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "pro.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return false;
-}
diff --git a/keyboards/keebsforall/freebirdnp/pro/pro.h b/keyboards/keebsforall/freebirdnp/pro/pro.h
deleted file mode 100644
index 41b241bee1..0000000000
--- a/keyboards/keebsforall/freebirdnp/pro/pro.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2021 Elliot Powell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_numpad_6x4( \
-    KF0, KF1, KF2, KF3,  \
-    K00, K01, K02, K03,  \
-    K10, K11, K12,       \
-    K20, K21, K22, K13,  \
-    K30, K31, K32,       \
-    K40,      K42, K33   \
-) { \
-    { KF0, KF1, KF2, KF3 }, \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, XXX }, \
-    { K30, K31, K32, K33 }, \
-    { K40, XXX, K42, XXX }  \
-}
-
-#define LAYOUT_ortho_6x4( \
-    KF0, KF1, KF2, KF3,  \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43  \
-) { \
-    { KF0, KF1, KF2, KF3 }, \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, K33 }, \
-    { K40, K41, K42, K43 }  \
-}
diff --git a/keyboards/keebsforall/freebirdtkl/config.h b/keyboards/keebsforall/freebirdtkl/config.h
index 0a47f3ecd9..5de1d62f93 100644
--- a/keyboards/keebsforall/freebirdtkl/config.h
+++ b/keyboards/keebsforall/freebirdtkl/config.h
@@ -17,21 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B2, B1, B0, B3, D5, B7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D3, D2, D1 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/keebsforall/freebirdtkl/freebirdtkl.c b/keyboards/keebsforall/freebirdtkl/freebirdtkl.c
deleted file mode 100644
index f996c90e7b..0000000000
--- a/keyboards/keebsforall/freebirdtkl/freebirdtkl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 KnoblesseOblige
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "freebirdtkl.h"
diff --git a/keyboards/keebsforall/freebirdtkl/freebirdtkl.h b/keyboards/keebsforall/freebirdtkl/freebirdtkl.h
deleted file mode 100644
index 0064172732..0000000000
--- a/keyboards/keebsforall/freebirdtkl/freebirdtkl.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright 2021 KnoblesseOblige
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define kxx KC_NO
-
-/*
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───� ┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d │ │0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───┬───�   ┌───────�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d │ │1e │1f │1g │   │1d     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤   └───────┘
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   │ │2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───�       ┌──────────�
- * │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b    │4d │     │4f │       │4b        │ 2.75u RShift
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───�   └──────────┘
- * │50  │52  │53  │55                      │58  │59  │5a  │5b  │ │5e │5f │5g │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- * │50   │52 │53   │55                         │59   │5a │5b   │ Tsangan/WKL
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_tkl_f13_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,                k4f,      \
-    k50,      k52, k53,      k55,           k58, k59, k5a, k5b,           k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, kxx, kxx, kxx, kxx },  \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, kxx, kxx, kxx, k4f, kxx },  \
-    { k50, kxx, k52, k53, kxx, k55, kxx, kxx, k58, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
-}
-
-#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,        k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d,   k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,        k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                       \
-    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d,             k4f,      \
-    k50, k52, k53,                k55,                k58, k59, k5a, k5b,        k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, kxx, kxx, kxx }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, kxx, k4d, kxx, k4f, kxx }, \
-    { k50, kxx, k52, k53, kxx, k55, kxx, kxx, k58, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,   k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,   k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,   k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                  \
-    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a,      k4b,        k4f,      \
-    k50, k52, k53,                k55,                     k59, k5a, k5b,   k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, kxx, kxx, kxx, kxx }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, kxx, kxx, kxx, k4f, kxx }, \
-    { k50, kxx, k52, k53, kxx, k55, kxx, kxx, kxx, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,                          \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,           k4f,      \
-    k50,      k52, k53,      k55,                k59, k5a, k5b,                k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, kxx, kxx, kxx },  \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, kxx, k4d, kxx, k4f, kxx },  \
-    { k50, kxx, k52, k53, kxx, k55, kxx, kxx, kxx, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
-}
diff --git a/keyboards/keebsforall/freebirdtkl/info.json b/keyboards/keebsforall/freebirdtkl/info.json
index a55626c908..eab9bcd23a 100644
--- a/keyboards/keebsforall/freebirdtkl/info.json
+++ b/keyboards/keebsforall/freebirdtkl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0088",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1"],
+        "rows": ["B2", "B1", "B0", "B3", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -18,392 +23,428 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1.25, "y":0},
-                {"label":"0,2", "x":2.25, "y":0},
-                {"label":"0,3", "x":3.25, "y":0},
-                {"label":"0,4", "x":4.25, "y":0},
-                {"label":"0,5", "x":5.5, "y":0},
-                {"label":"0,6", "x":6.5, "y":0},
-                {"label":"0,7", "x":7.5, "y":0},
-                {"label":"0,8", "x":8.5, "y":0},
-                {"label":"0,9", "x":9.75, "y":0},
-                {"label":"0,10", "x":10.75, "y":0},
-                {"label":"0,11", "x":11.75, "y":0},
-                {"label":"0,12", "x":12.75, "y":0},
-                {"label":"0,13", "x":14, "y":0},
-                {"label":"0,14", "x":15.25, "y":0},
-                {"label":"0,15", "x":16.25, "y":0},
-                {"label":"0,16", "x":17.25, "y":0},
-
-                {"label":"1,0", "x":0, "y":1.25},
-                {"label":"1,1", "x":1, "y":1.25},
-                {"label":"1,2", "x":2, "y":1.25},
-                {"label":"1,3", "x":3, "y":1.25},
-                {"label":"1,4", "x":4, "y":1.25},
-                {"label":"1,5", "x":5, "y":1.25},
-                {"label":"1,6", "x":6, "y":1.25},
-                {"label":"1,7", "x":7, "y":1.25},
-                {"label":"1,8", "x":8, "y":1.25},
-                {"label":"1,9", "x":9, "y":1.25},
-                {"label":"1,10", "x":10, "y":1.25},
-                {"label":"1,11", "x":11, "y":1.25},
-                {"label":"1,12", "x":12, "y":1.25},
-                {"label":"1,13", "x":13, "y":1.25, "w":2},
-                {"label":"1,14", "x":15.25, "y":1.25},
-                {"label":"1,15", "x":16.25, "y":1.25},
-                {"label":"1,16", "x":17.25, "y":1.25},
-
-                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
-                {"label":"2,1", "x":1.5, "y":2.25},
-                {"label":"2,2", "x":2.5, "y":2.25},
-                {"label":"2,3", "x":3.5, "y":2.25},
-                {"label":"2,4", "x":4.5, "y":2.25},
-                {"label":"2,5", "x":5.5, "y":2.25},
-                {"label":"2,6", "x":6.5, "y":2.25},
-                {"label":"2,7", "x":7.5, "y":2.25},
-                {"label":"2,8", "x":8.5, "y":2.25},
-                {"label":"2,9", "x":9.5, "y":2.25},
-                {"label":"2,10", "x":10.5, "y":2.25},
-                {"label":"2,11", "x":11.5, "y":2.25},
-                {"label":"2,12", "x":12.5, "y":2.25},
-                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"2,14", "x":15.25, "y":2.25},
-                {"label":"2,15", "x":16.25, "y":2.25},
-                {"label":"2,16", "x":17.25, "y":2.25},
-
-                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
-                {"label":"3,1", "x":1.75, "y":3.25},
-                {"label":"3,2", "x":2.75, "y":3.25},
-                {"label":"3,3", "x":3.75, "y":3.25},
-                {"label":"3,4", "x":4.75, "y":3.25},
-                {"label":"3,5", "x":5.75, "y":3.25},
-                {"label":"3,6", "x":6.75, "y":3.25},
-                {"label":"3,7", "x":7.75, "y":3.25},
-                {"label":"3,8", "x":8.75, "y":3.25},
-                {"label":"3,9", "x":9.75, "y":3.25},
-                {"label":"3,10", "x":10.75, "y":3.25},
-                {"label":"3,11", "x":11.75, "y":3.25},
-                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
-                {"label":"4,1", "x":2.25, "y":4.25},
-                {"label":"4,2", "x":3.25, "y":4.25},
-                {"label":"4,3", "x":4.25, "y":4.25},
-                {"label":"4,4", "x":5.25, "y":4.25},
-                {"label":"4,5", "x":6.25, "y":4.25},
-                {"label":"4,6", "x":7.25, "y":4.25},
-                {"label":"4,7", "x":8.25, "y":4.25},
-                {"label":"4,8", "x":9.25, "y":4.25},
-                {"label":"4,9", "x":10.25, "y":4.25},
-                {"label":"4,10", "x":11.25, "y":4.25},
-                {"label":"4,11", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"4,15", "x":16.25, "y":4.25},
-
-                {"label":"5,0", "x":0, "y":5.25, "w":1.25},
-                {"label":"5,2", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"5,3", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"5,5", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"5,8", "x":10, "y":5.25, "w":1.25},
-                {"label":"5,9", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"5,10", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"5,11", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"5,14", "x":15.25, "y":5.25},
-                {"label":"5,15", "x":16.25, "y":5.25},
-                {"label":"5,16", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1.25, "y":0},
-                {"label":"0,2", "x":2.25, "y":0},
-                {"label":"0,3", "x":3.25, "y":0},
-                {"label":"0,4", "x":4.25, "y":0},
-                {"label":"0,5", "x":5.5, "y":0},
-                {"label":"0,6", "x":6.5, "y":0},
-                {"label":"0,7", "x":7.5, "y":0},
-                {"label":"0,8", "x":8.5, "y":0},
-                {"label":"0,9", "x":9.75, "y":0},
-                {"label":"0,10", "x":10.75, "y":0},
-                {"label":"0,11", "x":11.75, "y":0},
-                {"label":"0,12", "x":12.75, "y":0},
-                {"label":"0,13", "x":14, "y":0},
-                {"label":"0,14", "x":15.25, "y":0},
-                {"label":"0,15", "x":16.25, "y":0},
-                {"label":"0,16", "x":17.25, "y":0},
-
-                {"label":"1,0", "x":0, "y":1.25},
-                {"label":"1,1", "x":1, "y":1.25},
-                {"label":"1,2", "x":2, "y":1.25},
-                {"label":"1,3", "x":3, "y":1.25},
-                {"label":"1,4", "x":4, "y":1.25},
-                {"label":"1,5", "x":5, "y":1.25},
-                {"label":"1,6", "x":6, "y":1.25},
-                {"label":"1,7", "x":7, "y":1.25},
-                {"label":"1,8", "x":8, "y":1.25},
-                {"label":"1,9", "x":9, "y":1.25},
-                {"label":"1,10", "x":10, "y":1.25},
-                {"label":"1,11", "x":11, "y":1.25},
-                {"label":"1,12", "x":12, "y":1.25},
-                {"label":"1,13", "x":13, "y":1.25},
-                {"label":"3,13", "x":14, "y":1.25},
-                {"label":"1,14", "x":15.25, "y":1.25},
-                {"label":"1,15", "x":16.25, "y":1.25},
-                {"label":"1,16", "x":17.25, "y":1.25},
-
-                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
-                {"label":"2,1", "x":1.5, "y":2.25},
-                {"label":"2,2", "x":2.5, "y":2.25},
-                {"label":"2,3", "x":3.5, "y":2.25},
-                {"label":"2,4", "x":4.5, "y":2.25},
-                {"label":"2,5", "x":5.5, "y":2.25},
-                {"label":"2,6", "x":6.5, "y":2.25},
-                {"label":"2,7", "x":7.5, "y":2.25},
-                {"label":"2,8", "x":8.5, "y":2.25},
-                {"label":"2,9", "x":9.5, "y":2.25},
-                {"label":"2,10", "x":10.5, "y":2.25},
-                {"label":"2,11", "x":11.5, "y":2.25},
-                {"label":"2,12", "x":12.5, "y":2.25},
-                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"2,14", "x":15.25, "y":2.25},
-                {"label":"2,15", "x":16.25, "y":2.25},
-                {"label":"2,16", "x":17.25, "y":2.25},
-
-                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
-                {"label":"3,1", "x":1.75, "y":3.25},
-                {"label":"3,2", "x":2.75, "y":3.25},
-                {"label":"3,3", "x":3.75, "y":3.25},
-                {"label":"3,4", "x":4.75, "y":3.25},
-                {"label":"3,5", "x":5.75, "y":3.25},
-                {"label":"3,6", "x":6.75, "y":3.25},
-                {"label":"3,7", "x":7.75, "y":3.25},
-                {"label":"3,8", "x":8.75, "y":3.25},
-                {"label":"3,9", "x":9.75, "y":3.25},
-                {"label":"3,10", "x":10.75, "y":3.25},
-                {"label":"3,11", "x":11.75, "y":3.25},
-                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
-                {"label":"4,1", "x":2.25, "y":4.25},
-                {"label":"4,2", "x":3.25, "y":4.25},
-                {"label":"4,3", "x":4.25, "y":4.25},
-                {"label":"4,4", "x":5.25, "y":4.25},
-                {"label":"4,5", "x":6.25, "y":4.25},
-                {"label":"4,6", "x":7.25, "y":4.25},
-                {"label":"4,7", "x":8.25, "y":4.25},
-                {"label":"4,8", "x":9.25, "y":4.25},
-                {"label":"4,9", "x":10.25, "y":4.25},
-                {"label":"4,10", "x":11.25, "y":4.25},
-                {"label":"4,11", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"4,13", "x":14, "y":4.25},
-                {"label":"4,15", "x":16.25, "y":4.25},
-
-                {"label":"5,0", "x":0, "y":5.25, "w":1.25},
-                {"label":"5,2", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"5,3", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"5,5", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"5,8", "x":10, "y":5.25, "w":1.25},
-                {"label":"5,9", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"5,10", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"5,11", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"5,14", "x":15.25, "y":5.25},
-                {"label":"5,15", "x":16.25, "y":5.25},
-                {"label":"5,16", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1.25, "y":0},
-                {"label":"0,2", "x":2.25, "y":0},
-                {"label":"0,3", "x":3.25, "y":0},
-                {"label":"0,4", "x":4.25, "y":0},
-                {"label":"0,5", "x":5.5, "y":0},
-                {"label":"0,6", "x":6.5, "y":0},
-                {"label":"0,7", "x":7.5, "y":0},
-                {"label":"0,8", "x":8.5, "y":0},
-                {"label":"0,9", "x":9.75, "y":0},
-                {"label":"0,10", "x":10.75, "y":0},
-                {"label":"0,11", "x":11.75, "y":0},
-                {"label":"0,12", "x":12.75, "y":0},
-                {"label":"0,13", "x":14, "y":0},
-                {"label":"0,14", "x":15.25, "y":0},
-                {"label":"0,15", "x":16.25, "y":0},
-                {"label":"0,16", "x":17.25, "y":0},
-
-                {"label":"1,0", "x":0, "y":1.25},
-                {"label":"1,1", "x":1, "y":1.25},
-                {"label":"1,2", "x":2, "y":1.25},
-                {"label":"1,3", "x":3, "y":1.25},
-                {"label":"1,4", "x":4, "y":1.25},
-                {"label":"1,5", "x":5, "y":1.25},
-                {"label":"1,6", "x":6, "y":1.25},
-                {"label":"1,7", "x":7, "y":1.25},
-                {"label":"1,8", "x":8, "y":1.25},
-                {"label":"1,9", "x":9, "y":1.25},
-                {"label":"1,10", "x":10, "y":1.25},
-                {"label":"1,11", "x":11, "y":1.25},
-                {"label":"1,12", "x":12, "y":1.25},
-                {"label":"1,13", "x":13, "y":1.25, "w":2},
-                {"label":"1,14", "x":15.25, "y":1.25},
-                {"label":"1,15", "x":16.25, "y":1.25},
-                {"label":"1,16", "x":17.25, "y":1.25},
-
-                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
-                {"label":"2,1", "x":1.5, "y":2.25},
-                {"label":"2,2", "x":2.5, "y":2.25},
-                {"label":"2,3", "x":3.5, "y":2.25},
-                {"label":"2,4", "x":4.5, "y":2.25},
-                {"label":"2,5", "x":5.5, "y":2.25},
-                {"label":"2,6", "x":6.5, "y":2.25},
-                {"label":"2,7", "x":7.5, "y":2.25},
-                {"label":"2,8", "x":8.5, "y":2.25},
-                {"label":"2,9", "x":9.5, "y":2.25},
-                {"label":"2,10", "x":10.5, "y":2.25},
-                {"label":"2,11", "x":11.5, "y":2.25},
-                {"label":"2,12", "x":12.5, "y":2.25},
-                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"2,14", "x":15.25, "y":2.25},
-                {"label":"2,15", "x":16.25, "y":2.25},
-                {"label":"2,16", "x":17.25, "y":2.25},
-
-                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
-                {"label":"3,1", "x":1.75, "y":3.25},
-                {"label":"3,2", "x":2.75, "y":3.25},
-                {"label":"3,3", "x":3.75, "y":3.25},
-                {"label":"3,4", "x":4.75, "y":3.25},
-                {"label":"3,5", "x":5.75, "y":3.25},
-                {"label":"3,6", "x":6.75, "y":3.25},
-                {"label":"3,7", "x":7.75, "y":3.25},
-                {"label":"3,8", "x":8.75, "y":3.25},
-                {"label":"3,9", "x":9.75, "y":3.25},
-                {"label":"3,10", "x":10.75, "y":3.25},
-                {"label":"3,11", "x":11.75, "y":3.25},
-                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
-                {"label":"4,1", "x":2.25, "y":4.25},
-                {"label":"4,2", "x":3.25, "y":4.25},
-                {"label":"4,3", "x":4.25, "y":4.25},
-                {"label":"4,4", "x":5.25, "y":4.25},
-                {"label":"4,5", "x":6.25, "y":4.25},
-                {"label":"4,6", "x":7.25, "y":4.25},
-                {"label":"4,7", "x":8.25, "y":4.25},
-                {"label":"4,8", "x":9.25, "y":4.25},
-                {"label":"4,9", "x":10.25, "y":4.25},
-                {"label":"4,10", "x":11.25, "y":4.25},
-                {"label":"4,11", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"4,15", "x":16.25, "y":4.25},
-
-                {"label":"5,0", "x":0, "y":5.25, "w":1.5},
-                {"label":"5,2", "x":1.5, "y":5.25},
-                {"label":"5,3", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"5,5", "x":4, "y":5.25, "w":7},
-                {"label":"5,9", "x":11, "y":5.25, "w":1.5},
-                {"label":"5,10", "x":12.5, "y":5.25},
-                {"label":"5,11", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"5,14", "x":15.25, "y":5.25},
-                {"label":"5,15", "x":16.25, "y":5.25},
-                {"label":"5,16", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1.25, "y":0},
-                {"label":"0,2", "x":2.25, "y":0},
-                {"label":"0,3", "x":3.25, "y":0},
-                {"label":"0,4", "x":4.25, "y":0},
-                {"label":"0,5", "x":5.5, "y":0},
-                {"label":"0,6", "x":6.5, "y":0},
-                {"label":"0,7", "x":7.5, "y":0},
-                {"label":"0,8", "x":8.5, "y":0},
-                {"label":"0,9", "x":9.75, "y":0},
-                {"label":"0,10", "x":10.75, "y":0},
-                {"label":"0,11", "x":11.75, "y":0},
-                {"label":"0,12", "x":12.75, "y":0},
-                {"label":"0,13", "x":14, "y":0},
-                {"label":"0,14", "x":15.25, "y":0},
-                {"label":"0,15", "x":16.25, "y":0},
-                {"label":"0,16", "x":17.25, "y":0},
-
-                {"label":"1,0", "x":0, "y":1.25},
-                {"label":"1,1", "x":1, "y":1.25},
-                {"label":"1,2", "x":2, "y":1.25},
-                {"label":"1,3", "x":3, "y":1.25},
-                {"label":"1,4", "x":4, "y":1.25},
-                {"label":"1,5", "x":5, "y":1.25},
-                {"label":"1,6", "x":6, "y":1.25},
-                {"label":"1,7", "x":7, "y":1.25},
-                {"label":"1,8", "x":8, "y":1.25},
-                {"label":"1,9", "x":9, "y":1.25},
-                {"label":"1,10", "x":10, "y":1.25},
-                {"label":"1,11", "x":11, "y":1.25},
-                {"label":"1,12", "x":12, "y":1.25},
-                {"label":"1,13", "x":13, "y":1.25},
-                {"label":"3,13", "x":14, "y":1.25},
-                {"label":"1,14", "x":15.25, "y":1.25},
-                {"label":"1,15", "x":16.25, "y":1.25},
-                {"label":"1,16", "x":17.25, "y":1.25},
-
-                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
-                {"label":"2,1", "x":1.5, "y":2.25},
-                {"label":"2,2", "x":2.5, "y":2.25},
-                {"label":"2,3", "x":3.5, "y":2.25},
-                {"label":"2,4", "x":4.5, "y":2.25},
-                {"label":"2,5", "x":5.5, "y":2.25},
-                {"label":"2,6", "x":6.5, "y":2.25},
-                {"label":"2,7", "x":7.5, "y":2.25},
-                {"label":"2,8", "x":8.5, "y":2.25},
-                {"label":"2,9", "x":9.5, "y":2.25},
-                {"label":"2,10", "x":10.5, "y":2.25},
-                {"label":"2,11", "x":11.5, "y":2.25},
-                {"label":"2,12", "x":12.5, "y":2.25},
-                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"2,14", "x":15.25, "y":2.25},
-                {"label":"2,15", "x":16.25, "y":2.25},
-                {"label":"2,16", "x":17.25, "y":2.25},
-
-                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
-                {"label":"3,1", "x":1.75, "y":3.25},
-                {"label":"3,2", "x":2.75, "y":3.25},
-                {"label":"3,3", "x":3.75, "y":3.25},
-                {"label":"3,4", "x":4.75, "y":3.25},
-                {"label":"3,5", "x":5.75, "y":3.25},
-                {"label":"3,6", "x":6.75, "y":3.25},
-                {"label":"3,7", "x":7.75, "y":3.25},
-                {"label":"3,8", "x":8.75, "y":3.25},
-                {"label":"3,9", "x":9.75, "y":3.25},
-                {"label":"3,10", "x":10.75, "y":3.25},
-                {"label":"3,11", "x":11.75, "y":3.25},
-                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
-                {"label":"4,1", "x":2.25, "y":4.25},
-                {"label":"4,2", "x":3.25, "y":4.25},
-                {"label":"4,3", "x":4.25, "y":4.25},
-                {"label":"4,4", "x":5.25, "y":4.25},
-                {"label":"4,5", "x":6.25, "y":4.25},
-                {"label":"4,6", "x":7.25, "y":4.25},
-                {"label":"4,7", "x":8.25, "y":4.25},
-                {"label":"4,8", "x":9.25, "y":4.25},
-                {"label":"4,9", "x":10.25, "y":4.25},
-                {"label":"4,10", "x":11.25, "y":4.25},
-                {"label":"4,11", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"4,13", "x":14, "y":4.25},
-                {"label":"4,15", "x":16.25, "y":4.25},
-
-                {"label":"5,0", "x":0, "y":5.25, "w":1.5},
-                {"label":"5,2", "x":1.5, "y":5.25},
-                {"label":"5,3", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"5,5", "x":4, "y":5.25, "w":7},
-                {"label":"5,9", "x":11, "y":5.25, "w":1.5},
-                {"label":"5,10", "x":12.5, "y":5.25},
-                {"label":"5,11", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"5,14", "x":15.25, "y":5.25},
-                {"label":"5,15", "x":16.25, "y":5.25},
-                {"label":"5,16", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keebwerk/mega/ansi/ansi.h b/keyboards/keebwerk/mega/ansi/ansi.h
index daba362731..7f1a26c10e 100755
--- a/keyboards/keebwerk/mega/ansi/ansi.h
+++ b/keyboards/keebwerk/mega/ansi/ansi.h
@@ -15,24 +15,6 @@
  */
 #pragma once
 
-#define XXX KC_NO
-
 #include "quantum.h"
 #include "../wilba_tech/wt_rgb_backlight_keycodes.h"
 #include "via.h"
-
-// This a shortcut to help you visually see your layout.
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/keebwerk/mega/ansi/config.h b/keyboards/keebwerk/mega/ansi/config.h
index a4f3876e68..c02f298e84 100755
--- a/keyboards/keebwerk/mega/ansi/config.h
+++ b/keyboards/keebwerk/mega/ansi/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3, A5 }
-// To enable debugger set A13 A14 -> A5 A7
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Backlight options */
 
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/keebwerk/mega/ansi/info.json b/keyboards/keebwerk/mega/ansi/info.json
index 6cd20c2a32..27ff1b9e8c 100755
--- a/keyboards/keebwerk/mega/ansi/info.json
+++ b/keyboards/keebwerk/mega/ansi/info.json
@@ -8,12 +8,90 @@
         "pid": "0x4B41",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page Down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h
index f0e1766733..3c9e54680b 100644
--- a/keyboards/keebwerk/nano_slider/config.h
+++ b/keyboards/keebwerk/nano_slider/config.h
@@ -17,20 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { F0, F1 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3 }
-
 #define SLIDER_PIN D4
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 4
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -48,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/info.json
index bd47ae0a4b..7c067c6f99 100644
--- a/keyboards/keebwerk/nano_slider/info.json
+++ b/keyboards/keebwerk/nano_slider/info.json
@@ -8,23 +8,33 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3"],
+        "rows": ["F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":0, "y":2.25},
-                {"x":1, "y":2.25},
-                {"x":2, "y":2.25},
-                {"x":3, "y":1.25, "h":2}
+                {"matrix": [1, 1], "x": 0, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1, "y": 1.25},
+                {"matrix": [0, 0], "x": 2, "y": 1.25},
+
+                {"matrix": [0, 1], "x": 0, "y": 2.25},
+                {"matrix": [0, 2], "x": 1, "y": 2.25},
+                {"matrix": [0, 3], "x": 2, "y": 2.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keebwerk/nano_slider/nano_slider.c b/keyboards/keebwerk/nano_slider/nano_slider.c
deleted file mode 100644
index f5730779ac..0000000000
--- a/keyboards/keebwerk/nano_slider/nano_slider.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Duckle
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "nano_slider.h"
-
diff --git a/keyboards/keebwerk/nano_slider/nano_slider.h b/keyboards/keebwerk/nano_slider/nano_slider.h
deleted file mode 100644
index 31985130b0..0000000000
--- a/keyboards/keebwerk/nano_slider/nano_slider.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Duckle
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K11, \
-    K12, K10, K00, \
-    K01, K02, K03, K13  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }  \
-}
diff --git a/keyboards/keebzdotnet/fme/config.h b/keyboards/keebzdotnet/fme/config.h
index 03fa828fa5..bdd65f7f63 100644
--- a/keyboards/keebzdotnet/fme/config.h
+++ b/keyboards/keebzdotnet/fme/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B6, B5, B7, D2 }
-#define MATRIX_COL_PINS { B0, B4, B1, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/keebzdotnet/fme/fme.c b/keyboards/keebzdotnet/fme/fme.c
deleted file mode 100644
index e4b37fa4a9..0000000000
--- a/keyboards/keebzdotnet/fme/fme.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 keebnewb
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "fme.h"
diff --git a/keyboards/keebzdotnet/fme/info.json b/keyboards/keebzdotnet/fme/info.json
index 51691bbce4..42f01c438c 100644
--- a/keyboards/keebzdotnet/fme/info.json
+++ b/keyboards/keebzdotnet/fme/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8008",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B4", "B1", "B3", "B2"],
+        "rows": ["B6", "B5", "B7", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/keebzdotnet/wazowski/config.h b/keyboards/keebzdotnet/wazowski/config.h
index be85b72768..a1746ba0a6 100644
--- a/keyboards/keebzdotnet/wazowski/config.h
+++ b/keyboards/keebzdotnet/wazowski/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6 }
-#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebzdotnet/wazowski/info.json b/keyboards/keebzdotnet/wazowski/info.json
index c5884b6402..c993b41ac9 100644
--- a/keyboards/keebzdotnet/wazowski/info.json
+++ b/keyboards/keebzdotnet/wazowski/info.json
@@ -8,25 +8,36 @@
         "pid": "0x53FC",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3", "B2", "B6"],
+        "rows": ["F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"k01", "x":1, "y":1},
-                {"label":"k04", "x":3, "y":2},
-                {"label":"k06", "x":4, "y":2},
-                {"label":"k08", "x":5, "y":2},
-                {"label":"k12", "x":7, "y":3},
-                {"label":"k00", "x":0, "y":3},
-                {"label":"k03", "x":2, "y":3},
-                {"label":"k07", "x":4, "y":3},
-                {"label":"k09", "x":5, "y":3},
-                {"label":"k10", "x":6, "y":2},
-                {"label":"k02", "x":1, "y":4},
-                {"label":"k05", "x":3, "y":4},
-                {"label":"k11", "x":7, "y":1},
-                {"label":"k13", "x":8, "y":2}
+                {"matrix": [0, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [0, 2], "x": 4, "y": 1},
+                {"matrix": [0, 3], "x": 5, "y": 1},
+
+                {"matrix": [0, 4], "x": 7, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 4, "y": 2},
+                {"matrix": [1, 3], "x": 5, "y": 2},
+
+                {"matrix": [1, 4], "x": 6, "y": 1},
+
+                {"matrix": [2, 0], "x": 1, "y": 3},
+                {"matrix": [2, 1], "x": 3, "y": 3},
+
+                {"matrix": [2, 3], "x": 7, "y": 0},
+
+                {"matrix": [2, 4], "x": 8, "y": 1}
             ]
         }
     }
diff --git a/keyboards/keebzdotnet/wazowski/wazowski.c b/keyboards/keebzdotnet/wazowski/wazowski.c
deleted file mode 100644
index d4d6119ae5..0000000000
--- a/keyboards/keebzdotnet/wazowski/wazowski.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 keebzdotnet
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wazowski.h"
diff --git a/keyboards/keebzdotnet/wazowski/wazowski.h b/keyboards/keebzdotnet/wazowski/wazowski.h
deleted file mode 100644
index 98af75a0e8..0000000000
--- a/keyboards/keebzdotnet/wazowski/wazowski.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 keebzdotnet
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, \
-    k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13 \
-) \
-{ \
-    { k00, k01, k02, k03, k04 }, \
-    { k05, k06, k07, k08, k09 }, \
-    { k10, k11, KC_NO, k12, k13 }  \
-}
diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h
index e9ad8c2fee..2b008e5ca7 100644
--- a/keyboards/kegen/gboy/config.h
+++ b/keyboards/kegen/gboy/config.h
@@ -17,16 +17,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { E2, E6, C6, C7, D7, B6, B5, B4, B3, B2, B1, B0, D4, D6, D5, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,4 +31,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/kegen/gboy/gboy.c b/keyboards/kegen/gboy/gboy.c
deleted file mode 100644
index cd6869748d..0000000000
--- a/keyboards/kegen/gboy/gboy.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2022 Matt Chan
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "gboy.h"
diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json
index 909eb6c568..d85041de71 100644
--- a/keyboards/kegen/gboy/info.json
+++ b/keyboards/kegen/gboy/info.json
@@ -8,10 +8,18 @@
         "pid": "0x6762",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E2", "E6", "C6", "C7", "D7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D4", "D6", "D5", "F0"],
+        "rows": ["F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 15
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h
index f2988c8ede..5146b6ee13 100644
--- a/keyboards/keybage/radpad/config.h
+++ b/keyboards/keybage/radpad/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F5, B5, B6, B2, B3 }
-#define MATRIX_COL_PINS { E6, B4, D7, B1 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 16
     #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
@@ -37,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* OLED Configuration */
 #ifdef OLED_ENABLE
diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json
index f0c0dcd63f..7b3d0c9ea4 100644
--- a/keyboards/keybage/radpad/info.json
+++ b/keyboards/keybage/radpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5250",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "D7", "B1"],
+        "rows": ["F5", "B5", "B6", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D4", "pin_b": "C6", "resolution": 2},
@@ -17,25 +22,33 @@
     "bootmagic": {
         "matrix": [1, 3]
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_4x4_encoders": {
             "layout": [
                 {"x":0, "y":0},
+
                 {"x":3, "y":0},
+
                 {"x":0, "y":1},
                 {"x":1, "y":1},
                 {"x":2, "y":1},
                 {"x":3, "y":1},
+
                 {"x":0, "y":2},
                 {"x":1, "y":2},
                 {"x":2, "y":2},
                 {"x":3, "y":2},
+
                 {"x":0, "y":3},
                 {"x":1, "y":3},
                 {"x":2, "y":3},
                 {"x":3, "y":3},
+
                 {"x":0, "y":4},
                 {"x":1, "y":4},
                 {"x":2, "y":4},
@@ -45,15 +58,19 @@
         "LAYOUT_4x3_encoders": {
             "layout": [
                 {"x":0, "y":0},
+
                 {"x":3, "y":0},
+
                 {"x":0, "y":1},
                 {"x":1, "y":1},
                 {"x":2, "y":1},
                 {"x":3, "y":1},
+
                 {"x":0, "y":2},
                 {"x":1, "y":2},
                 {"x":2, "y":2},
                 {"x":3, "y":2},
+
                 {"x":0, "y":3},
                 {"x":1, "y":3},
                 {"x":2, "y":3},
@@ -62,35 +79,44 @@
         },
         "LAYOUT_3x4_encoders": {
             "layout": [
-                {"x":1, "y":0},
-                {"x":3, "y":0},
+                {"x":0, "y":0},
+
+                {"x":2, "y":0},
+
+                {"x":0, "y":1},
                 {"x":1, "y":1},
                 {"x":2, "y":1},
-                {"x":3, "y":1},
+
+                {"x":0, "y":2},
                 {"x":1, "y":2},
                 {"x":2, "y":2},
-                {"x":3, "y":2},
+
+                {"x":0, "y":3},
                 {"x":1, "y":3},
                 {"x":2, "y":3},
-                {"x":3, "y":3},
+
+                {"x":0, "y":4},
                 {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4}
+                {"x":2, "y":4}
             ]
         },
         "LAYOUT_3x3_encoders": {
             "layout": [
-                {"x":1, "y":0},
-                {"x":3, "y":0},
+                {"x":0, "y":0},
+
+                {"x":2, "y":0},
+
+                {"x":0, "y":1},
                 {"x":1, "y":1},
                 {"x":2, "y":1},
-                {"x":3, "y":1},
+
+                {"x":0, "y":2},
                 {"x":1, "y":2},
                 {"x":2, "y":2},
-                {"x":3, "y":2},
+
+                {"x":0, "y":3},
                 {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3}
+                {"x":2, "y":3}
             ]
         }
     }
diff --git a/keyboards/keybage/radpad/radpad.c b/keyboards/keybage/radpad/radpad.c
deleted file mode 100644
index 4a31d8f573..0000000000
--- a/keyboards/keybage/radpad/radpad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Brandon Schlack
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "radpad.h"
diff --git a/keyboards/keybee/keybee65/config.h b/keyboards/keybee/keybee65/config.h
index e3b01a37bb..fae3a58249 100644
--- a/keyboards/keybee/keybee65/config.h
+++ b/keyboards/keybee/keybee65/config.h
@@ -17,27 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { D3, D2, D0, B0, F0  }
-#define MATRIX_COL_PINS { E6, D1, D5, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN B0
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 68
 // Limit the Brithness of the LEDs
diff --git a/keyboards/keybee/keybee65/info.json b/keyboards/keybee/keybee65/info.json
index fa46a09323..e279cd0668 100644
--- a/keyboards/keybee/keybee65/info.json
+++ b/keyboards/keybee/keybee65/info.json
@@ -8,362 +8,95 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "D1", "D5", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D3", "D2", "D0", "B0", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {
-                    "label": "~",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "!",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "@",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "#",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "$",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "%",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "^",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "&",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "*",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "(",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": ")",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": "_",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "+",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "Backspace",
-                    "x": 13,
-                    "y": 0,
-                    "w": 2
-                },
-                {
-                    "label": "Home",
-                    "x": 15,
-                    "y": 0
-                },
-                {
-                    "label": "Tab",
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "{",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "}",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "|",
-                    "x": 13.5,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Page Up",
-                    "x": 15,
-                    "y": 1
-                },
-                {
-                    "label": "Caps Lock",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": ":",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": "\"",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "Enter",
-                    "x": 12.75,
-                    "y": 2,
-                    "w": 2.25
-                },
-                {
-                    "label": "Page Down",
-                    "x": 15,
-                    "y": 2
-                },
-                {
-                    "label": "Shift",
-                    "x": 0,
-                    "y": 3,
-                    "w": 2.25
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": "<",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": ">",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": "?",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 12.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "UP",
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "End",
-                    "x": 15,
-                    "y": 3
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 0,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Win",
-                    "x": 1.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 2.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "x": 3.75,
-                    "y": 4,
-                    "w": 6.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 10,
-                    "y": 4
-                },
-                {
-                    "label": "Fn",
-                    "x": 11,
-                    "y": 4
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 12,
-                    "y": 4
-                },
-                {
-                    "label": "LEFT",
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "DOWN",
-                    "x": 14,
-                    "y": 4
-                },
-                {
-                    "label": "RIGHT",
-                    "x": 15,
-                    "y": 4
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keybee/keybee65/keybee65.c b/keyboards/keybee/keybee65/keybee65.c
index 1dea6d084a..6033dbeaaa 100644
--- a/keyboards/keybee/keybee65/keybee65.c
+++ b/keyboards/keybee/keybee65/keybee65.c
@@ -11,7 +11,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
-#include "keybee65.h"
+#include "quantum.h"
 
 led_config_t g_led_config  = {
     {
diff --git a/keyboards/keybee/keybee65/keybee65.h b/keyboards/keybee/keybee65/keybee65.h
deleted file mode 100644
index 484f8977aa..0000000000
--- a/keyboards/keybee/keybee65/keybee65.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* Keybee65 Keymap Definitions */
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A, K0B, K0C, KC_NO, K0E, K0F   }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B, K1C, K1D,   K1E, K1F   }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B, K2C, KC_NO, K2E, K2F   }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A, K3B, K3C, KC_NO, K3E, K3F   }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K4A, K4B, K4C, K4D,   K4E, K4F   }  \
-}
diff --git a/keyboards/keybee/keybee65/rules.mk b/keyboards/keybee/keybee65/rules.mk
index b0bc8468ed..c97335f3c5 100644
--- a/keyboards/keybee/keybee65/rules.mk
+++ b/keyboards/keybee/keybee65/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/keyboardio/atreus/atreus.c b/keyboards/keyboardio/atreus/atreus.c
deleted file mode 100644
index 0ad7156581..0000000000
--- a/keyboards/keyboardio/atreus/atreus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (C) 2019, 2020  Keyboard.io, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "atreus.h"
diff --git a/keyboards/keyboardio/atreus/config.h b/keyboards/keyboardio/atreus/config.h
index 8380614fde..5766657a6a 100644
--- a/keyboards/keyboardio/atreus/config.h
+++ b/keyboards/keyboardio/atreus/config.h
@@ -22,23 +22,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { F7, E2, C7, C6, B6, B5, D7, D6, D4, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
  */
diff --git a/keyboards/keyboardio/atreus/info.json b/keyboards/keyboardio/atreus/info.json
index 1e31d8578a..c228a491e3 100644
--- a/keyboards/keyboardio/atreus/info.json
+++ b/keyboards/keyboardio/atreus/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2303",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "E2", "C7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h b/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
index f66f840bfd..c34fa270b4 100644
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
+++ b/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 //#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 200
 #define ONESHOT_TAP_TOGGLE 5
 #define ONESHOT_TIMEOUT 5000
diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/info.json
index c00c016173..bc24c214f7 100644
--- a/keyboards/keyboardio/model01/info.json
+++ b/keyboards/keyboardio/model01/info.json
@@ -8,6 +8,9 @@
     "pid": "0x2301",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "custom"
+  },
   "processor": "atmega32u4",
     "bootloader": "caterina",
   "debounce": 0,
diff --git a/keyboards/keyboardio/model01/rules.mk b/keyboards/keyboardio/model01/rules.mk
index 7edcc5ff77..e653ec5f73 100644
--- a/keyboards/keyboardio/model01/rules.mk
+++ b/keyboards/keyboardio/model01/rules.mk
@@ -15,4 +15,3 @@ SRC += leds.c \
 
 # You can set RGB_MATRIX_ENABLE = no in your rules.mk to disable this and save the Flash
 RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = custom
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
index f85a8eee55..2fd384b986 100644
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
+++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
@@ -31,7 +31,7 @@
 #ifdef RGB_MATRIX_ENABLE
 
 // The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 60
 #define RGBLED_NUM 60
diff --git a/keyboards/keycapsss/kimiko/kimiko.c b/keyboards/keycapsss/kimiko/kimiko.c
index c35cb62544..041387ad53 100644
--- a/keyboards/keycapsss/kimiko/kimiko.c
+++ b/keyboards/keycapsss/kimiko/kimiko.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "kimiko.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keycapsss/kimiko/kimiko.h b/keyboards/keycapsss/kimiko/kimiko.h
deleted file mode 100644
index 948f397a90..0000000000
--- a/keyboards/keycapsss/kimiko/kimiko.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 @ben_roe (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#ifdef KEYBOARD_keycapsss_kimiko_rev1
-#    include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h
index 592fefe5d4..27049500bc 100644
--- a/keyboards/keycapsss/kimiko/rev1/config.h
+++ b/keyboards/keycapsss/kimiko/rev1/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* SK6812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifdef RGBLIGHT_ENABLE
 #   define RGBLED_NUM 60  // Total number of LEDs
 #   define RGBLED_SPLIT { 30, 30 } // LEDs per side
diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json
index 0bfeffe39a..160c7517e0 100644
--- a/keyboards/keycapsss/kimiko/rev1/info.json
+++ b/keyboards/keycapsss/kimiko/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4B69",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F4", "pin_b": "F5"}
@@ -16,6 +21,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/keycapsss/kimiko/rev1/rev1.c b/keyboards/keycapsss/kimiko/rev1/rev1.c
deleted file mode 100644
index bc93aad0af..0000000000
--- a/keyboards/keycapsss/kimiko/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 @ben_roe (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/keycapsss/kimiko/rev1/rev1.h b/keyboards/keycapsss/kimiko/rev1/rev1.h
index 619eed8f38..3359a39838 100644
--- a/keyboards/keycapsss/kimiko/rev1/rev1.h
+++ b/keyboards/keycapsss/kimiko/rev1/rev1.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "kimiko.h"
+#include "quantum.h"
 
 #define LAYOUT( \
     L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h
index 1e0ece062e..6acf662823 100644
--- a/keyboards/keycapsss/o4l_5x12/config.h
+++ b/keyboards/keycapsss/o4l_5x12/config.h
@@ -1,24 +1,5 @@
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D4, D0, D1, D2, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 12
 #    define RGBLIGHT_HUE_STEP 4
 #    define RGBLIGHT_SAT_STEP 4
@@ -35,7 +16,6 @@
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json
index 6409b8a712..0766e0a2e4 100644
--- a/keyboards/keycapsss/o4l_5x12/info.json
+++ b/keyboards/keycapsss/o4l_5x12/info.json
@@ -8,209 +8,217 @@
         "pid": "0x0512",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "F6", "F5", "F4"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_5x12"],
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x12_1x2uC": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4, "w": 2},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"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, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x12_2x2u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4, "w": 2},
-                {"x": 6, "y": 4, "w": 2},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"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": [4, 6], "x": 6, "y": 4, "w": 2},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keycapsss/o4l_5x12/o4l_5x12.c b/keyboards/keycapsss/o4l_5x12/o4l_5x12.c
deleted file mode 100644
index 78267062c3..0000000000
--- a/keyboards/keycapsss/o4l_5x12/o4l_5x12.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "o4l_5x12.h"
diff --git a/keyboards/keycapsss/o4l_5x12/o4l_5x12.h b/keyboards/keycapsss/o4l_5x12/o4l_5x12.h
deleted file mode 100644
index a5f775ef13..0000000000
--- a/keyboards/keycapsss/o4l_5x12/o4l_5x12.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B } \
-}
-
-#define LAYOUT_ortho_5x12_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
-    k40, k41, k42, k43, k44,   k45,    k47, k48, k49, k4A, k4B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { k40, k41, k42, k43, k44, k45, XXX, k47, k48, k49, k4A, k4B } \
-}
-
-#define LAYOUT_ortho_5x12_2x2u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
-    k40, k41, k42, k43,    k44,     k46,    k48, k49, k4A, k4B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { k40, k41, k42, k43, k44, XXX, k46, XXX, k48, k49, k4A, k4B } \
-}
diff --git a/keyboards/keycapsss/plaid_pad/config.h b/keyboards/keycapsss/plaid_pad/config.h
index 5825367ac1..0ac7d2ee62 100644
--- a/keyboards/keycapsss/plaid_pad/config.h
+++ b/keyboards/keycapsss/plaid_pad/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { C0, C1, C2, C3 }
-#define MATRIX_COL_PINS { B0, D7, D6, D5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 // Fix for volume controll with encoder (steadily in/decrease)
diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json
index 5d01d25bbd..6ff2d2cea2 100644
--- a/keyboards/keycapsss/plaid_pad/info.json
+++ b/keyboards/keycapsss/plaid_pad/info.json
@@ -6,28 +6,36 @@
         "vid": "0x7983",
         "pid": "0x5050"
     },
+    "matrix_pins": {
+        "cols": ["B0", "D7", "D6", "D5"],
+        "rows": ["C0", "C1", "C2", "C3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "community_layouts": ["ortho_4x4"],
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"w": 1,"x": 0,"y": 0},
-                {"w": 1,"x": 1,"y": 0},
-                {"w": 1,"x": 2,"y": 0},
-                {"w": 1,"x": 3,"y": 0},
-                {"w": 1,"x": 0,"y": 1},
-                {"w": 1,"x": 1,"y": 1},
-                {"w": 1,"x": 2,"y": 1},
-                {"w": 1,"x": 3,"y": 1},
-                {"w": 1,"x": 0,"y": 2},
-                {"w": 1,"x": 1,"y": 2},
-                {"w": 1,"x": 2,"y": 2},
-                {"w": 1,"x": 3,"y": 2},
-                {"w": 1,"x": 0,"y": 3},
-                {"w": 1,"x": 1,"y": 3},
-                {"w": 1,"x": 2,"y": 3},
-                {"w": 1,"x": 3,"y": 3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/keycapsss/plaid_pad/plaid_pad.c b/keyboards/keycapsss/plaid_pad/plaid_pad.c
deleted file mode 100644
index 127b80a5f9..0000000000
--- a/keyboards/keycapsss/plaid_pad/plaid_pad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Ben Roesner (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "plaid_pad.h"
diff --git a/keyboards/keycapsss/plaid_pad/plaid_pad.h b/keyboards/keycapsss/plaid_pad/plaid_pad.h
deleted file mode 100644
index 3115392163..0000000000
--- a/keyboards/keycapsss/plaid_pad/plaid_pad.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 Ben Roesner (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }  \
-}
diff --git a/keyboards/keycapsss/plaid_pad/rev1/rev1.c b/keyboards/keycapsss/plaid_pad/rev1/rev1.c
deleted file mode 100644
index 7d21ede286..0000000000
--- a/keyboards/keycapsss/plaid_pad/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Ben Roesner (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/keycapsss/plaid_pad/rev1/rev1.h b/keyboards/keycapsss/plaid_pad/rev1/rev1.h
deleted file mode 100644
index 4a42622ba5..0000000000
--- a/keyboards/keycapsss/plaid_pad/rev1/rev1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Ben Roesner (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "plaid_pad.h"
diff --git a/keyboards/keycapsss/plaid_pad/rev2/rev2.c b/keyboards/keycapsss/plaid_pad/rev2/rev2.c
deleted file mode 100644
index 7a830676be..0000000000
--- a/keyboards/keycapsss/plaid_pad/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Ben Roesner (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/keycapsss/plaid_pad/rev2/rev2.h b/keyboards/keycapsss/plaid_pad/rev2/rev2.h
deleted file mode 100644
index 4a42622ba5..0000000000
--- a/keyboards/keycapsss/plaid_pad/rev2/rev2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Ben Roesner (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "plaid_pad.h"
diff --git a/keyboards/keycapsss/plaid_pad/rev3/rev3.c b/keyboards/keycapsss/plaid_pad/rev3/rev3.c
deleted file mode 100644
index bfe1934b3f..0000000000
--- a/keyboards/keycapsss/plaid_pad/rev3/rev3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ben Roesner (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev3.h"
diff --git a/keyboards/keycapsss/plaid_pad/rev3/rev3.h b/keyboards/keycapsss/plaid_pad/rev3/rev3.h
deleted file mode 100644
index d38fe6a5bb..0000000000
--- a/keyboards/keycapsss/plaid_pad/rev3/rev3.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Ben Roesner (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "plaid_pad.h"
-
diff --git a/keyboards/keychron/common/keychron_common.c b/keyboards/keychron/common/keychron_common.c
index a6250966f3..9c7fc3ace5 100644
--- a/keyboards/keychron/common/keychron_common.c
+++ b/keyboards/keychron/common/keychron_common.c
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
 #include "keychron_common.h"
+#include "sync_timer.h"
 
 bool is_siri_active = false;
 uint32_t siri_timer = 0;
diff --git a/keyboards/keychron/common/keychron_common.h b/keyboards/keychron/common/keychron_common.h
index 5e56a828c8..648a5d3371 100644
--- a/keyboards/keychron/common/keychron_common.h
+++ b/keyboards/keychron/common/keychron_common.h
@@ -16,10 +16,14 @@
 
 #pragma once
 
-#include "stdint.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+
 #ifdef VIA_ENABLE
 #    include "via.h"
 #endif
+
 #include "quantum_keycodes.h"
 
 enum custom_keycodes {
diff --git a/keyboards/keychron/q0/config.h b/keyboards/keychron/q0/config.h
index 28e942da07..c0366b1ed8 100644
--- a/keyboards/keychron/q0/config.h
+++ b/keyboards/keychron/q0/config.h
@@ -16,14 +16,8 @@
 
 #pragma once
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 #define CKLED2001_CURRENT_TUNE { 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70 }
 
-/* NKRO */
-#define FORCE_NKRO
-
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
@@ -31,54 +25,5 @@
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
 
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
\ No newline at end of file
diff --git a/keyboards/keychron/q0/rev_0130/config.h b/keyboards/keychron/q0/rev_0130/config.h
index 80a2e150af..12ecfe1356 100644
--- a/keyboards/keychron/q0/rev_0130/config.h
+++ b/keyboards/keychron/q0/rev_0130/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS { A5, A6, A7, B0 }
-
 /* RGB Matrix Driver Configuration */
 #define DRIVER_COUNT 1
 #define DRIVER_ADDR_1 0b1110100
@@ -28,7 +24,5 @@
 #define DRIVER_1_LED_TOTAL 21
 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 
-#define RGB_MATRIX_CENTER { 56, 16 }
-
 /* Enable num-lock LED */
 #define NUM_LOCK_LED_INDEX 4
diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json
index 334f879d3b..688c9da92e 100644
--- a/keyboards/keychron/q0/rev_0130/info.json
+++ b/keyboards/keychron/q0/rev_0130/info.json
@@ -6,10 +6,84 @@
     "usb": {
         "vid": "0x3434",
         "pid": "0x0130",
-        "device_version": "1.0.2"
+        "device_version": "1.0.2",
+        "force_nkro": true
     },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "B0"],
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
+    },
+    "features": {
+        "audio": false,
+        "backlight": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "center_point": [56, 16],
+        "layout": [
+            {"flags": 1,"matrix":[0,0], "x":0, "y":0},
+            {"flags": 1,"matrix":[0,1], "x":37, "y":0},
+            {"flags": 1,"matrix":[0,2], "x":75, "y":0},
+            {"flags": 1,"matrix":[0,3], "x":112, "y":0},
+
+
+            {"flags": 9,"matrix":[1,0], "x":0, "y":6},
+            {"flags": 4,"matrix":[1,1], "x":37, "y":6},
+            {"flags": 4,"matrix":[1,2], "x":75, "y":6},
+            {"flags": 4,"matrix":[1,3], "x":112, "y":6},
+
+            {"flags": 4,"matrix":[2,0], "x":0, "y":13},
+            {"flags": 4,"matrix":[2,1], "x":37, "y":13},
+            {"flags": 4,"matrix":[2,2], "x":75, "y":13},
+            
+            {"flags": 4,"matrix":[3,0], "x":0, "y":19},
+            {"flags": 4,"matrix":[3,1], "x":37, "y":19},
+            {"flags": 4,"matrix":[3,2], "x":75, "y":19},
+            {"flags": 4,"matrix":[2,3], "x":112, "y":16},
+
+            {"flags": 4,"matrix":[4,0], "x":0, "y":25},
+            {"flags": 4,"matrix":[4,1], "x":37, "y":25},
+            {"flags": 4,"matrix":[4,2], "x":75, "y":25},
+
+            {"flags": 4,"matrix":[5,0], "x":18, "y":32},
+            {"flags": 4,"matrix":[5,2], "x":75, "y":32},
+            {"flags": 1,"matrix":[4,3], "x":112, "y":29}
+        ]
+    },
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk b/keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk
index 9cf1a9b56c..495e8907b4 100644
--- a/keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk
+++ b/keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
 
 VPATH += keyboards/keychron/common
 SRC += keychron_common.c
diff --git a/keyboards/keychron/q0/rev_0130/rev_0130.c b/keyboards/keychron/q0/rev_0130/rev_0130.c
index b968361c7e..ffe82a6d8c 100644
--- a/keyboards/keychron/q0/rev_0130/rev_0130.c
+++ b/keyboards/keychron/q0/rev_0130/rev_0130.c
@@ -54,37 +54,4 @@ const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
     {0, L_1,    J_1,    K_1}, // 19
     {0, C_2,    A_2,    B_2}, // 20
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        {  0,  1,  2,  3 },
-        {  4,  5,  6,  7 },
-        {  8,  9, 10, 14 },
-        { 11, 12, 13, __ },
-        { 15, 16, 17, 20 },
-        { 18, __, 19, __ }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {37,0},  {75,0},  {112,0},
-        {0,6},  {37,6},  {75,6},  {112,6},
-        {0,13}, {37,13}, {75,13},
-        {0,19}, {37,19}, {75,19}, {112,16},
-        {0,25}, {37,25}, {75,25},
-        {18,32},         {75,32}, {112,29},
-    },
-    {
-        // LED Index to Flag
-        1, 1, 1, 1,
-        9, 4, 4, 4,
-        4, 4, 4,
-        4, 4, 4, 4,
-        4, 4, 4,
-        4,    4, 1
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q0/rev_0130/rules.mk b/keyboards/keychron/q0/rev_0130/rules.mk
index 3a31dbc81a..4eebc33437 100644
--- a/keyboards/keychron/q0/rev_0130/rules.mk
+++ b/keyboards/keychron/q0/rev_0130/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable.
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = no
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
-LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q0/rev_0131/config.h b/keyboards/keychron/q0/rev_0131/config.h
index f94517ebb4..e4c5c2d3fc 100644
--- a/keyboards/keychron/q0/rev_0131/config.h
+++ b/keyboards/keychron/q0/rev_0131/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS { C14, C15, A0, A1, A2 }
-
 /* RGB Matrix Driver Configuration */
 #define DRIVER_COUNT 1
 #define DRIVER_ADDR_1 0b1110111
diff --git a/keyboards/keychron/q0/rev_0131/info.json b/keyboards/keychron/q0/rev_0131/info.json
index 94808bd9c4..d25a2e6d9d 100644
--- a/keyboards/keychron/q0/rev_0131/info.json
+++ b/keyboards/keychron/q0/rev_0131/info.json
@@ -6,8 +6,27 @@
     "usb": {
         "vid": "0x3434",
         "pid": "0x0131",
-        "device_version": "1.0.0"
+        "device_version": "1.0.0",
+        "force_nkro": true
     },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2"],
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
+    },
+    "features": {
+        "audio": false,
+        "backlight": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A3", "pin_b": "A4"}
@@ -18,6 +37,65 @@
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "layout": [
+            {"flags": 1, "matrix":[0,1], "x":56, "y":0},
+            {"flags": 1, "matrix":[0,2], "x":112, "y":0},
+            {"flags": 1, "matrix":[0,3], "x":168, "y":0},
+            {"flags": 1, "matrix":[0,4], "x":224, "y":0},
+
+            {"flags": 4, "matrix":[1,0], "x":0, "y":15},
+            {"flags": 8, "matrix":[1,1], "x":56, "y":15},
+            {"flags": 4, "matrix":[1,2], "x":112, "y":15},
+            {"flags": 4, "matrix":[1,3], "x":168, "y":15},
+            {"flags": 4, "matrix":[1,4], "x":224, "y":15},
+
+            {"flags": 4, "matrix":[2,0], "x":0, "y":27},
+            {"flags": 4, "matrix":[2,1], "x":56, "y":27},
+            {"flags": 4, "matrix":[2,2], "x":112, "y":27},
+            {"flags": 4, "matrix":[2,3], "x":168, "y":27},
+            {"flags": 4, "matrix":[2,4], "x":224, "y":34},
+            
+            {"flags": 4, "matrix":[3,0], "x":0, "y":40},
+            {"flags": 4, "matrix":[3,1], "x":56, "y":40},
+            {"flags": 4, "matrix":[3,2], "x":112, "y":40},
+            {"flags": 4, "matrix":[3,3], "x":168, "y":40},
+
+            {"flags": 4, "matrix":[4,0], "x":0, "y":52},
+            {"flags": 4, "matrix":[4,1], "x":56, "y":52},
+            {"flags": 4, "matrix":[4,2], "x":112, "y":52},
+            {"flags": 4, "matrix":[4,3], "x":168, "y":52},
+            {"flags": 4, "matrix":[4,4], "x":224, "y":58},
+
+            {"flags": 4, "matrix":[5,0], "x":0, "y":64},
+            {"flags": 4, "matrix":[5,1], "x":84, "y":64},
+            {"flags": 1, "matrix":[5,3], "x":168, "y":64}
+        ]
+    },
     "layouts": {
         "LAYOUT_numpad_6x5": {
             "layout": [
diff --git a/keyboards/keychron/q0/rev_0131/rev_0131.c b/keyboards/keychron/q0/rev_0131/rev_0131.c
index c67a460557..282c511ce2 100644
--- a/keyboards/keychron/q0/rev_0131/rev_0131.c
+++ b/keyboards/keychron/q0/rev_0131/rev_0131.c
@@ -59,37 +59,4 @@ const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
     {0, F_7,    D_7,    E_7},
     {0, F_9,    D_9,    E_9},
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        { __,  0,  1,  2,  3 },
-        {  4,  5,  6,  7,  8 },
-        {  9, 10, 11, 12, 13 },
-        { 14, 15, 16, 17, __ },
-        { 18, 19, 20, 21, 22 },
-        { 23, 24, __, 25, __ },
-    },
-    {
-        // LED Index to Physical Position
-                {56,0},  {112,0},  {168,0},  {224,0},
-        {0,15}, {56,15}, {112,15}, {168,15}, {224,15},
-        {0,27}, {56,27}, {112,27}, {168,27}, {224,34},
-        {0,40}, {56,40}, {112,40}, {168,40},
-        {0,52}, {56,52}, {112,52}, {168,52}, {224,58},
-        {0,64}, {84,64},           {168,64},
-    },
-    {
-        // LED Index to Flag
-           1, 1, 1, 1,
-        4, 8, 4, 4, 4,
-        4, 4, 4, 4, 4,
-        4, 4, 4, 4,
-        4, 4, 4, 4, 4,
-        4,    4, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q0/rev_0131/rules.mk b/keyboards/keychron/q0/rev_0131/rules.mk
index d5f04c34d2..4eebc33437 100644
--- a/keyboards/keychron/q0/rev_0131/rules.mk
+++ b/keyboards/keychron/q0/rev_0131/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable encoder
-DIP_SWITCH_ENABLE = no
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q1/ansi/ansi.c b/keyboards/keychron/q1/ansi/ansi.c
index fc22d1aff3..ee586fef93 100644
--- a/keyboards/keychron/q1/ansi/ansi.c
+++ b/keyboards/keychron/q1/ansi/ansi.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q1/ansi/ansi.h b/keyboards/keychron/q1/ansi/ansi.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q1/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q1/ansi/config.h b/keyboards/keychron/q1/ansi/config.h
index 0a30f7d82d..c6d4e44c87 100644
--- a/keyboards/keychron/q1/ansi/config.h
+++ b/keyboards/keychron/q1/ansi/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 59
 #define DRIVER_2_LED_TOTAL 23
diff --git a/keyboards/keychron/q1/ansi/info.json b/keyboards/keychron/q1/ansi/info.json
index 63602d71c5..7b98521985 100644
--- a/keyboards/keychron/q1/ansi/info.json
+++ b/keyboards/keychron/q1/ansi/info.json
@@ -8,6 +8,14 @@
     	"pid": "0x0100",
     	"device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q1/ansi/rules.mk b/keyboards/keychron/q1/ansi/rules.mk
index 395b661685..0379fdb94c 100644
--- a/keyboards/keychron/q1/ansi/rules.mk
+++ b/keyboards/keychron/q1/ansi/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c
index 5909b993e3..bc559b3541 100644
--- a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q1/ansi_encoder/config.h b/keyboards/keychron/q1/ansi_encoder/config.h
index a41976d560..28bbea9087 100644
--- a/keyboards/keychron/q1/ansi_encoder/config.h
+++ b/keyboards/keychron/q1/ansi_encoder/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 59
 #define DRIVER_2_LED_TOTAL 23
diff --git a/keyboards/keychron/q1/ansi_encoder/info.json b/keyboards/keychron/q1/ansi_encoder/info.json
index 2391e674ad..b46564f64b 100644
--- a/keyboards/keychron/q1/ansi_encoder/info.json
+++ b/keyboards/keychron/q1/ansi_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0101",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "E6", "pin_b": "B7"}
diff --git a/keyboards/keychron/q1/ansi_encoder/rules.mk b/keyboards/keychron/q1/ansi_encoder/rules.mk
index f67fe2bf03..d60167579e 100644
--- a/keyboards/keychron/q1/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q1/ansi_encoder/rules.mk
@@ -13,5 +13,4 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h
index a49ec41a06..a87754e9f2 100644
--- a/keyboards/keychron/q1/config.h
+++ b/keyboards/keychron/q1/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Matrix Driver Configuration */
 #define DRIVER_COUNT 2
 #define DRIVER_ADDR_1 0b1010000
diff --git a/keyboards/keychron/q1/iso/config.h b/keyboards/keychron/q1/iso/config.h
index b9b33cf320..cb7b05560a 100644
--- a/keyboards/keychron/q1/iso/config.h
+++ b/keyboards/keychron/q1/iso/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 59
 #define DRIVER_2_LED_TOTAL 24
diff --git a/keyboards/keychron/q1/iso/info.json b/keyboards/keychron/q1/iso/info.json
index d8f5205f5f..cc8f74bc75 100644
--- a/keyboards/keychron/q1/iso/info.json
+++ b/keyboards/keychron/q1/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0102",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q1/iso/iso.c b/keyboards/keychron/q1/iso/iso.c
index c8e3165bd3..619d89dffc 100644
--- a/keyboards/keychron/q1/iso/iso.c
+++ b/keyboards/keychron/q1/iso/iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q1/iso/iso.h b/keyboards/keychron/q1/iso/iso.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q1/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q1/iso/rules.mk b/keyboards/keychron/q1/iso/rules.mk
index 395b661685..0379fdb94c 100644
--- a/keyboards/keychron/q1/iso/rules.mk
+++ b/keyboards/keychron/q1/iso/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/iso_encoder/config.h b/keyboards/keychron/q1/iso_encoder/config.h
index b52fb88383..c1e84e44d3 100644
--- a/keyboards/keychron/q1/iso_encoder/config.h
+++ b/keyboards/keychron/q1/iso_encoder/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
 /* DIP switch */
 #define DIP_SWITCH_MATRIX_GRID  { {0,1} }
 
diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json
index e4dce374c8..5bc470e102 100644
--- a/keyboards/keychron/q1/iso_encoder/info.json
+++ b/keyboards/keychron/q1/iso_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0103",
         "device_version": "1.0.2"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "E6", "pin_b": "B7"}
diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1/iso_encoder/iso_encoder.c
index c6563ad318..c6b091fff1 100644
--- a/keyboards/keychron/q1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.h b/keyboards/keychron/q1/iso_encoder/iso_encoder.h
deleted file mode 100644
index d62d707b4a..0000000000
--- a/keyboards/keychron/q1/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/rules.mk b/keyboards/keychron/q1/iso_encoder/rules.mk
index 3eea458e72..d994ac1fad 100644
--- a/keyboards/keychron/q1/iso_encoder/rules.mk
+++ b/keyboards/keychron/q1/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 RAW_ENABLE = yes
 LTO_ENABLE = yes
 
diff --git a/keyboards/keychron/q1/q1.c b/keyboards/keychron/q1/q1.c
index aa0789e852..3df62c4339 100644
--- a/keyboards/keychron/q1/q1.c
+++ b/keyboards/keychron/q1/q1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q1.h"
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[] = {
     0b0111111111111101,
diff --git a/keyboards/keychron/q1/q1.h b/keyboards/keychron/q1/q1.h
deleted file mode 100644
index d706779910..0000000000
--- a/keyboards/keychron/q1/q1.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if   defined(KEYBOARD_keychron_q1_ansi)
-#    include "ansi.h"
-#elif defined(KEYBOARD_keychron_q1_ansi_encoder)
-#    include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q1_iso)
-#    include "iso.h"
-#elif defined(KEYBOARD_keychron_q1_iso_encoder)
-#    include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json
index 9814da0c26..e90d961165 100644
--- a/keyboards/keychron/q10/ansi_encoder/info.json
+++ b/keyboards/keychron/q10/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x01A1",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q10/ansi_encoder/rules.mk b/keyboards/keychron/q10/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q10/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q10/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json
index 96311fac06..5a696a39ad 100644
--- a/keyboards/keychron/q10/iso_encoder/info.json
+++ b/keyboards/keychron/q10/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x01A3",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q10/iso_encoder/iso_encoder.h b/keyboards/keychron/q10/iso_encoder/iso_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q10/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q10/iso_encoder/rules.mk b/keyboards/keychron/q10/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q10/iso_encoder/rules.mk
+++ b/keyboards/keychron/q10/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q10/q10.c b/keyboards/keychron/q10/q10.c
index c823e6939f..455a2a25f2 100644
--- a/keyboards/keychron/q10/q10.c
+++ b/keyboards/keychron/q10/q10.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q10.h"
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[] = {
     0b1111111111111111,
diff --git a/keyboards/keychron/q10/q10.h b/keyboards/keychron/q10/q10.h
deleted file mode 100644
index 80e747aca3..0000000000
--- a/keyboards/keychron/q10/q10.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if   defined(KEYBOARD_keychron_q10_ansi_encoder)
-#    include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q10_iso_encoder)
-#    include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/info.json
index 0e3179708a..2e15c38adc 100644
--- a/keyboards/keychron/q12/ansi_encoder/info.json
+++ b/keyboards/keychron/q12/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x01D1",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A2", "pin_b": "C14"}
diff --git a/keyboards/keychron/q12/ansi_encoder/rules.mk b/keyboards/keychron/q12/ansi_encoder/rules.mk
index bf60bb7d7d..9958a466f6 100644
--- a/keyboards/keychron/q12/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q12/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/info.json
index c945fbc771..117d665dc3 100644
--- a/keyboards/keychron/q12/iso_encoder/info.json
+++ b/keyboards/keychron/q12/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x01D3",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A2", "pin_b": "C14"}
diff --git a/keyboards/keychron/q12/iso_encoder/rules.mk b/keyboards/keychron/q12/iso_encoder/rules.mk
index f76ec9b08d..df920055a0 100644
--- a/keyboards/keychron/q12/iso_encoder/rules.mk
+++ b/keyboards/keychron/q12/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q2/ansi/ansi.c b/keyboards/keychron/q2/ansi/ansi.c
index 5c5acb3fd8..28f91269c4 100644
--- a/keyboards/keychron/q2/ansi/ansi.c
+++ b/keyboards/keychron/q2/ansi/ansi.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q2/ansi/ansi.h b/keyboards/keychron/q2/ansi/ansi.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q2/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q2/ansi/info.json b/keyboards/keychron/q2/ansi/info.json
index 054786185a..10d665e02f 100644
--- a/keyboards/keychron/q2/ansi/info.json
+++ b/keyboards/keychron/q2/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0110",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q2/ansi/rules.mk b/keyboards/keychron/q2/ansi/rules.mk
index 6c675518ee..bc7a0e0ff3 100644
--- a/keyboards/keychron/q2/ansi/rules.mk
+++ b/keyboards/keychron/q2/ansi/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no         # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
index c926a5bf75..28f91269c4 100644
--- a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q2/ansi_encoder/info.json b/keyboards/keychron/q2/ansi_encoder/info.json
index a2a12dc39c..abb5031073 100644
--- a/keyboards/keychron/q2/ansi_encoder/info.json
+++ b/keyboards/keychron/q2/ansi_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0111",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "B5"}
diff --git a/keyboards/keychron/q2/ansi_encoder/rules.mk b/keyboards/keychron/q2/ansi_encoder/rules.mk
index 0e909ff6f8..3de172c6e3 100644
--- a/keyboards/keychron/q2/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q2/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h
index e421906a68..63e31cd01d 100644
--- a/keyboards/keychron/q2/config.h
+++ b/keyboards/keychron/q2/config.h
@@ -16,18 +16,11 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 }
-
 #define MATRIX_UNSELECT_DRIVE_HIGH
 
 /* DIP switch */
 #define DIP_SWITCH_MATRIX_GRID  { {4, 4} }
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Matrix Driver Configuration */
 #define DRIVER_COUNT 2
 #define DRIVER_ADDR_1 0b1110111
diff --git a/keyboards/keychron/q2/iso/info.json b/keyboards/keychron/q2/iso/info.json
index e295fcef18..a29db71cca 100644
--- a/keyboards/keychron/q2/iso/info.json
+++ b/keyboards/keychron/q2/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0112",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q2/iso/iso.c b/keyboards/keychron/q2/iso/iso.c
index 7f8d388b0e..1f2c76468e 100644
--- a/keyboards/keychron/q2/iso/iso.c
+++ b/keyboards/keychron/q2/iso/iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q2/iso/iso.h b/keyboards/keychron/q2/iso/iso.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q2/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q2/iso/rules.mk b/keyboards/keychron/q2/iso/rules.mk
index 57b7516f4c..f4aca09af8 100644
--- a/keyboards/keychron/q2/iso/rules.mk
+++ b/keyboards/keychron/q2/iso/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no         # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q2/iso_encoder/info.json b/keyboards/keychron/q2/iso_encoder/info.json
index 028522c259..6c77c3ad5a 100644
--- a/keyboards/keychron/q2/iso_encoder/info.json
+++ b/keyboards/keychron/q2/iso_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0113",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "B5"}
diff --git a/keyboards/keychron/q2/iso_encoder/iso_encoder.c b/keyboards/keychron/q2/iso_encoder/iso_encoder.c
index af7b818149..1f2c76468e 100644
--- a/keyboards/keychron/q2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q2/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q2/iso_encoder/iso_encoder.h b/keyboards/keychron/q2/iso_encoder/iso_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q2/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q2/iso_encoder/rules.mk b/keyboards/keychron/q2/iso_encoder/rules.mk
index 987db28ad5..33a50c67f7 100644
--- a/keyboards/keychron/q2/iso_encoder/rules.mk
+++ b/keyboards/keychron/q2/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q2/jis/info.json b/keyboards/keychron/q2/jis/info.json
index d41bf49cb2..b43e1bd979 100644
--- a/keyboards/keychron/q2/jis/info.json
+++ b/keyboards/keychron/q2/jis/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0114",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q2/jis/rules.mk b/keyboards/keychron/q2/jis/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q2/jis/rules.mk
+++ b/keyboards/keychron/q2/jis/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q2/jis_encoder/info.json b/keyboards/keychron/q2/jis_encoder/info.json
index 18e800703b..09b4ec66a3 100644
--- a/keyboards/keychron/q2/jis_encoder/info.json
+++ b/keyboards/keychron/q2/jis_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0115",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "B5"}
diff --git a/keyboards/keychron/q2/jis_encoder/rules.mk b/keyboards/keychron/q2/jis_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/q2/jis_encoder/rules.mk
+++ b/keyboards/keychron/q2/jis_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q2/q2.c b/keyboards/keychron/q2/q2.c
index 13b2238d17..7ff85556de 100644
--- a/keyboards/keychron/q2/q2.c
+++ b/keyboards/keychron/q2/q2.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q2.h"
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[] = {
     0b1111111111111111,
diff --git a/keyboards/keychron/q2/q2.h b/keyboards/keychron/q2/q2.h
deleted file mode 100644
index a256ceae6a..0000000000
--- a/keyboards/keychron/q2/q2.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if   defined(KEYBOARD_keychron_q2_ansi)
-#    include "ansi.h"
-#elif defined(KEYBOARD_keychron_q2_ansi_encoder)
-#    include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q2_iso)
-#    include "iso.h"
-#elif defined(KEYBOARD_keychron_q2_iso_encoder)
-#    include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q3/ansi/ansi.c b/keyboards/keychron/q3/ansi/ansi.c
index beff3bc5ec..432a914058 100644
--- a/keyboards/keychron/q3/ansi/ansi.c
+++ b/keyboards/keychron/q3/ansi/ansi.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q3/ansi/ansi.h b/keyboards/keychron/q3/ansi/ansi.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/info.json
index 1ebffbff45..c0819fa24c 100644
--- a/keyboards/keychron/q3/ansi/info.json
+++ b/keyboards/keychron/q3/ansi/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0120",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q3/ansi/rules.mk b/keyboards/keychron/q3/ansi/rules.mk
index 8669178c4c..566c476585 100644
--- a/keyboards/keychron/q3/ansi/rules.mk
+++ b/keyboards/keychron/q3/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
index 13f6c26d2d..f873f77d12 100644
--- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/info.json
index 3bd5a9d59a..78d9c50832 100644
--- a/keyboards/keychron/q3/ansi_encoder/info.json
+++ b/keyboards/keychron/q3/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0121",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q3/ansi_encoder/rules.mk b/keyboards/keychron/q3/ansi_encoder/rules.mk
index a8eaf50f9a..95a153f689 100644
--- a/keyboards/keychron/q3/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q3/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/info.json
index b50fffd3a2..b9c6b22df1 100644
--- a/keyboards/keychron/q3/iso/info.json
+++ b/keyboards/keychron/q3/iso/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0122",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q3/iso/iso.c b/keyboards/keychron/q3/iso/iso.c
index e753a39c1b..d747d55115 100644
--- a/keyboards/keychron/q3/iso/iso.c
+++ b/keyboards/keychron/q3/iso/iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q3/iso/iso.h b/keyboards/keychron/q3/iso/iso.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/iso/rules.mk b/keyboards/keychron/q3/iso/rules.mk
index 8669178c4c..566c476585 100644
--- a/keyboards/keychron/q3/iso/rules.mk
+++ b/keyboards/keychron/q3/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/info.json
index 6f1a24b372..4c264bf33f 100644
--- a/keyboards/keychron/q3/iso_encoder/info.json
+++ b/keyboards/keychron/q3/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0123",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.c b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
index 02aac01ddc..d2bb169aac 100644
--- a/keyboards/keychron/q3/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.h b/keyboards/keychron/q3/iso_encoder/iso_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/iso_encoder/rules.mk b/keyboards/keychron/q3/iso_encoder/rules.mk
index a8eaf50f9a..95a153f689 100644
--- a/keyboards/keychron/q3/iso_encoder/rules.mk
+++ b/keyboards/keychron/q3/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/info.json
index 69536c290c..55edbe16f2 100644
--- a/keyboards/keychron/q3/jis/info.json
+++ b/keyboards/keychron/q3/jis/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0124",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q3/jis/jis.c b/keyboards/keychron/q3/jis/jis.c
index 20983c6a5f..f262d3c7d8 100644
--- a/keyboards/keychron/q3/jis/jis.c
+++ b/keyboards/keychron/q3/jis/jis.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "jis.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q3/jis/jis.h b/keyboards/keychron/q3/jis/jis.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/jis/jis.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/jis/rules.mk b/keyboards/keychron/q3/jis/rules.mk
index 8669178c4c..566c476585 100644
--- a/keyboards/keychron/q3/jis/rules.mk
+++ b/keyboards/keychron/q3/jis/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/info.json
index ed12472732..eb0ad6420a 100644
--- a/keyboards/keychron/q3/jis_encoder/info.json
+++ b/keyboards/keychron/q3/jis_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0125",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.c b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
index efaf5fc5f2..0a97c5ca68 100644
--- a/keyboards/keychron/q3/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "jis_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.h b/keyboards/keychron/q3/jis_encoder/jis_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/jis_encoder/jis_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/jis_encoder/rules.mk b/keyboards/keychron/q3/jis_encoder/rules.mk
index a8eaf50f9a..95a153f689 100644
--- a/keyboards/keychron/q3/jis_encoder/rules.mk
+++ b/keyboards/keychron/q3/jis_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/q3.c b/keyboards/keychron/q3/q3.c
index 120013e77e..2bf8bf08a0 100644
--- a/keyboards/keychron/q3/q3.c
+++ b/keyboards/keychron/q3/q3.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q3.h"
+#include "quantum.h"
 #include "rgb_matrix.h"
 
 // clang-format off
diff --git a/keyboards/keychron/q3/q3.h b/keyboards/keychron/q3/q3.h
deleted file mode 100644
index bc2d458bb7..0000000000
--- a/keyboards/keychron/q3/q3.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if   defined(KEYBOARD_keychron_q3_ansi)
-#    include "ansi.h"
-#elif defined(KEYBOARD_keychron_q3_ansi_encoder)
-#    include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q3_iso)
-#    include "iso.h"
-#elif defined(KEYBOARD_keychron_q3_iso_encoder)
-#    include "iso_encoder.h"
-#elif defined(KEYBOARD_keychron_q3_jis)
-#    include "jis.h"
-#elif defined(KEYBOARD_keychron_q3_jis_encoder)
-#    include "jis_encoder.h"
-#endif
diff --git a/keyboards/keychron/q4/ansi_v1/ansi_v1.c b/keyboards/keychron/q4/ansi_v1/ansi_v1.c
index e651744262..88599103ef 100644
--- a/keyboards/keychron/q4/ansi_v1/ansi_v1.c
+++ b/keyboards/keychron/q4/ansi_v1/ansi_v1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi_v1.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q4/ansi_v1/ansi_v1.h b/keyboards/keychron/q4/ansi_v1/ansi_v1.h
deleted file mode 100644
index 381c674dad..0000000000
--- a/keyboards/keychron/q4/ansi_v1/ansi_v1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
\ No newline at end of file
diff --git a/keyboards/keychron/q4/ansi_v1/info.json b/keyboards/keychron/q4/ansi_v1/info.json
index f24a4acba5..3f05afc196 100644
--- a/keyboards/keychron/q4/ansi_v1/info.json
+++ b/keyboards/keychron/q4/ansi_v1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0140",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q4/ansi_v1/rules.mk b/keyboards/keychron/q4/ansi_v1/rules.mk
index 4bb31fd14c..9111c3b9bd 100644
--- a/keyboards/keychron/q4/ansi_v1/rules.mk
+++ b/keyboards/keychron/q4/ansi_v1/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = no
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q4/ansi_v2/ansi_v2.h b/keyboards/keychron/q4/ansi_v2/ansi_v2.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q4/ansi_v2/ansi_v2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q4/ansi_v2/info.json b/keyboards/keychron/q4/ansi_v2/info.json
index f24a4acba5..3f05afc196 100644
--- a/keyboards/keychron/q4/ansi_v2/info.json
+++ b/keyboards/keychron/q4/ansi_v2/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0140",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q4/ansi_v2/rules.mk b/keyboards/keychron/q4/ansi_v2/rules.mk
index 4bb31fd14c..9111c3b9bd 100644
--- a/keyboards/keychron/q4/ansi_v2/rules.mk
+++ b/keyboards/keychron/q4/ansi_v2/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = no
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q4/config.h b/keyboards/keychron/q4/config.h
index 08549247f3..940ee44e77 100644
--- a/keyboards/keychron/q4/config.h
+++ b/keyboards/keychron/q4/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* DIP switch */
 #define DIP_SWITCH_MATRIX_GRID  { {4,4} }
 
diff --git a/keyboards/keychron/q4/iso/info.json b/keyboards/keychron/q4/iso/info.json
index 9c65fa29d1..5686e96511 100644
--- a/keyboards/keychron/q4/iso/info.json
+++ b/keyboards/keychron/q4/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0142",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q4/iso/iso.c b/keyboards/keychron/q4/iso/iso.c
index c1d1982b94..24cbcfd745 100644
--- a/keyboards/keychron/q4/iso/iso.c
+++ b/keyboards/keychron/q4/iso/iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q4/iso/iso.h b/keyboards/keychron/q4/iso/iso.h
deleted file mode 100644
index 381c674dad..0000000000
--- a/keyboards/keychron/q4/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
\ No newline at end of file
diff --git a/keyboards/keychron/q4/iso/rules.mk b/keyboards/keychron/q4/iso/rules.mk
index 4bb31fd14c..9111c3b9bd 100644
--- a/keyboards/keychron/q4/iso/rules.mk
+++ b/keyboards/keychron/q4/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = no
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q4/q4.c b/keyboards/keychron/q4/q4.c
index 6d31e45607..c3cb67bcc2 100644
--- a/keyboards/keychron/q4/q4.c
+++ b/keyboards/keychron/q4/q4.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q4.h"
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[] = {
     0b11111111111111,
diff --git a/keyboards/keychron/q4/q4.h b/keyboards/keychron/q4/q4.h
deleted file mode 100644
index 34aa4a8505..0000000000
--- a/keyboards/keychron/q4/q4.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if   defined(KEYBOARD_keychron_q4_ansi_v1)
-#    include "ansi_v1.h"
-#elif defined(KEYBOARD_keychron_q4_ansi_v2)
-#    include "ansi_v2.h"
-#elif defined(KEYBOARD_keychron_q4_iso)
-#    include "iso.h"
-#endif
diff --git a/keyboards/keychron/q5/ansi/ansi.c b/keyboards/keychron/q5/ansi/ansi.c
index 6aeb46c07d..dda563cd79 100644
--- a/keyboards/keychron/q5/ansi/ansi.c
+++ b/keyboards/keychron/q5/ansi/ansi.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q5/ansi/ansi.h b/keyboards/keychron/q5/ansi/ansi.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json
index 4e77f23b7c..8f3396500f 100644
--- a/keyboards/keychron/q5/ansi/info.json
+++ b/keyboards/keychron/q5/ansi/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0150",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q5/ansi/rules.mk b/keyboards/keychron/q5/ansi/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/q5/ansi/rules.mk
+++ b/keyboards/keychron/q5/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
index 43c27433b2..4d3cc0f036 100644
--- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json
index 7bd6f179c6..86c3b2d39b 100644
--- a/keyboards/keychron/q5/ansi_encoder/info.json
+++ b/keyboards/keychron/q5/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0151",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q5/ansi_encoder/rules.mk b/keyboards/keychron/q5/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q5/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q5/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json
index 20eebe22b0..dc7a2f5f2b 100644
--- a/keyboards/keychron/q5/iso/info.json
+++ b/keyboards/keychron/q5/iso/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0152",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q5/iso/iso.c b/keyboards/keychron/q5/iso/iso.c
index b57474f535..65924abd76 100644
--- a/keyboards/keychron/q5/iso/iso.c
+++ b/keyboards/keychron/q5/iso/iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q5/iso/iso.h b/keyboards/keychron/q5/iso/iso.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/iso/rules.mk b/keyboards/keychron/q5/iso/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/q5/iso/rules.mk
+++ b/keyboards/keychron/q5/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json
index 81cd72036f..26e27edd5e 100644
--- a/keyboards/keychron/q5/iso_encoder/info.json
+++ b/keyboards/keychron/q5/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0153",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.c b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
index 8ae11bc36b..22ba9e2d4e 100644
--- a/keyboards/keychron/q5/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.h b/keyboards/keychron/q5/iso_encoder/iso_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/iso_encoder/rules.mk b/keyboards/keychron/q5/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q5/iso_encoder/rules.mk
+++ b/keyboards/keychron/q5/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q5/q5.c b/keyboards/keychron/q5/q5.c
index 4130dcebe3..7a1cabcd1a 100644
--- a/keyboards/keychron/q5/q5.c
+++ b/keyboards/keychron/q5/q5.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q5.h"
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[] = {
     0b111111111111111111,
diff --git a/keyboards/keychron/q5/q5.h b/keyboards/keychron/q5/q5.h
deleted file mode 100644
index 70ccc8dcfa..0000000000
--- a/keyboards/keychron/q5/q5.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if   defined(KEYBOARD_keychron_q5_ansi)
-#    include "ansi.h"
-#elif defined(KEYBOARD_keychron_q5_ansi_encoder)
-#    include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q5_iso)
-#    include "iso.h"
-#elif defined(KEYBOARD_keychron_q5_iso_encoder)
-#    include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q6/ansi/ansi.c b/keyboards/keychron/q6/ansi/ansi.c
index 982996d347..a81d5f9e9f 100644
--- a/keyboards/keychron/q6/ansi/ansi.c
+++ b/keyboards/keychron/q6/ansi/ansi.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q6/ansi/ansi.h b/keyboards/keychron/q6/ansi/ansi.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q6/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/info.json
index ed1732655f..9e0b6106e2 100644
--- a/keyboards/keychron/q6/ansi/info.json
+++ b/keyboards/keychron/q6/ansi/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0160",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q6/ansi/rules.mk b/keyboards/keychron/q6/ansi/rules.mk
index e57fa16e32..ce3d41a17d 100644
--- a/keyboards/keychron/q6/ansi/rules.mk
+++ b/keyboards/keychron/q6/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
index 6cf593dd25..6fbece3678 100644
--- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/info.json
index 60b983b12e..147dfa5e44 100644
--- a/keyboards/keychron/q6/ansi_encoder/info.json
+++ b/keyboards/keychron/q6/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0161",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q6/ansi_encoder/rules.mk b/keyboards/keychron/q6/ansi_encoder/rules.mk
index a8eaf50f9a..95a153f689 100644
--- a/keyboards/keychron/q6/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q6/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/info.json
index 0195e4420b..f502f42f61 100644
--- a/keyboards/keychron/q6/iso/info.json
+++ b/keyboards/keychron/q6/iso/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0162",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q6/iso/iso.c b/keyboards/keychron/q6/iso/iso.c
index d8c4add867..f2081177e9 100644
--- a/keyboards/keychron/q6/iso/iso.c
+++ b/keyboards/keychron/q6/iso/iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q6/iso/iso.h b/keyboards/keychron/q6/iso/iso.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q6/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q6/iso/rules.mk b/keyboards/keychron/q6/iso/rules.mk
index 638f1eaeb0..3388811add 100644
--- a/keyboards/keychron/q6/iso/rules.mk
+++ b/keyboards/keychron/q6/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 RAW_ENABLE = yes
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/info.json
index 598a715c3f..8bc190a720 100644
--- a/keyboards/keychron/q6/iso_encoder/info.json
+++ b/keyboards/keychron/q6/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0163",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.c b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
index c6a21a6223..e9a6f6edfc 100644
--- a/keyboards/keychron/q6/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.h b/keyboards/keychron/q6/iso_encoder/iso_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q6/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q6/iso_encoder/rules.mk b/keyboards/keychron/q6/iso_encoder/rules.mk
index 757e051f46..d7fe88d9ca 100644
--- a/keyboards/keychron/q6/iso_encoder/rules.mk
+++ b/keyboards/keychron/q6/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 RAW_ENABLE = yes
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
diff --git a/keyboards/keychron/q6/q6.c b/keyboards/keychron/q6/q6.c
index d2f9d2aa4e..8a9750e9de 100644
--- a/keyboards/keychron/q6/q6.c
+++ b/keyboards/keychron/q6/q6.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q6.h"
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[] = {
     0b11111111111111111111,
diff --git a/keyboards/keychron/q6/q6.h b/keyboards/keychron/q6/q6.h
deleted file mode 100644
index 9e878e700c..0000000000
--- a/keyboards/keychron/q6/q6.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if   defined(KEYBOARD_keychron_q6_ansi)
-#    include "ansi.h"
-#elif defined(KEYBOARD_keychron_q6_ansi_encoder)
-#    include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q6_iso)
-#    include "iso.h"
-#elif defined(KEYBOARD_keychron_q6_iso_encoder)
-#    include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q60/ansi/info.json b/keyboards/keychron/q60/ansi/info.json
index c64de7b5e2..02b3d807fd 100644
--- a/keyboards/keychron/q60/ansi/info.json
+++ b/keyboards/keychron/q60/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x01C0",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q60/ansi/rules.mk b/keyboards/keychron/q60/ansi/rules.mk
index 70c663e777..6dcd47b1fe 100644
--- a/keyboards/keychron/q60/ansi/rules.mk
+++ b/keyboards/keychron/q60/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q60/config.h b/keyboards/keychron/q60/config.h
index bd192cd8bd..779feea4ce 100644
--- a/keyboards/keychron/q60/config.h
+++ b/keyboards/keychron/q60/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Matrix Driver Configuration */
 #define DRIVER_COUNT 1
 #define DRIVER_ADDR_1 0b1110100
diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json
index b91892a55b..ec187ee615 100644
--- a/keyboards/keychron/q65/ansi_encoder/info.json
+++ b/keyboards/keychron/q65/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x01B1",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q65/ansi_encoder/rules.mk b/keyboards/keychron/q65/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q65/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q65/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q7/ansi/info.json b/keyboards/keychron/q7/ansi/info.json
index dbbc462a6d..b06285ebd8 100644
--- a/keyboards/keychron/q7/ansi/info.json
+++ b/keyboards/keychron/q7/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0170",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q7/ansi/rules.mk b/keyboards/keychron/q7/ansi/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q7/ansi/rules.mk
+++ b/keyboards/keychron/q7/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q7/config.h b/keyboards/keychron/q7/config.h
index f0a545bd98..0ea9ee5f46 100644
--- a/keyboards/keychron/q7/config.h
+++ b/keyboards/keychron/q7/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, A10, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Matrix Driver Configuration */
 #define DRIVER_COUNT 2
 #define DRIVER_ADDR_1 0b1110111
diff --git a/keyboards/keychron/q7/iso/info.json b/keyboards/keychron/q7/iso/info.json
index 876412d7b6..1d78fbab7e 100644
--- a/keyboards/keychron/q7/iso/info.json
+++ b/keyboards/keychron/q7/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0172",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q7/iso/rules.mk b/keyboards/keychron/q7/iso/rules.mk
index deac2e12e6..7f91e808b1 100644
--- a/keyboards/keychron/q7/iso/rules.mk
+++ b/keyboards/keychron/q7/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q8/ansi/ansi.h b/keyboards/keychron/q8/ansi/ansi.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json
index b80cb42432..194b7ee983 100644
--- a/keyboards/keychron/q8/ansi/info.json
+++ b/keyboards/keychron/q8/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0180",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q8/ansi/rules.mk b/keyboards/keychron/q8/ansi/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q8/ansi/rules.mk
+++ b/keyboards/keychron/q8/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json
index b75a878198..09d3c183e2 100644
--- a/keyboards/keychron/q8/ansi_encoder/info.json
+++ b/keyboards/keychron/q8/ansi_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0181",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "A10"}
diff --git a/keyboards/keychron/q8/ansi_encoder/rules.mk b/keyboards/keychron/q8/ansi_encoder/rules.mk
index d0d74a11b5..e94a89ab85 100644
--- a/keyboards/keychron/q8/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q8/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q8/config.h b/keyboards/keychron/q8/config.h
index 017f463d84..e0f6c673a5 100644
--- a/keyboards/keychron/q8/config.h
+++ b/keyboards/keychron/q8/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 }
-
 /* If PH3 used with a stronger pull resistor then the following definition needs be included */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json
index c5a5b7653e..3502848441 100644
--- a/keyboards/keychron/q8/iso/info.json
+++ b/keyboards/keychron/q8/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0182",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q8/iso/iso.h b/keyboards/keychron/q8/iso/iso.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/iso/rules.mk b/keyboards/keychron/q8/iso/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q8/iso/rules.mk
+++ b/keyboards/keychron/q8/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index 45181452be..721ab371f0 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0183",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "A10"}
diff --git a/keyboards/keychron/q8/iso_encoder/iso_encoder.h b/keyboards/keychron/q8/iso_encoder/iso_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/q8/iso_encoder/rules.mk
+++ b/keyboards/keychron/q8/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q8/q8.c b/keyboards/keychron/q8/q8.c
index d86ced3d1b..a653bdc8b9 100644
--- a/keyboards/keychron/q8/q8.c
+++ b/keyboards/keychron/q8/q8.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q8.h"
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[] = {
     0b111111111111111,
diff --git a/keyboards/keychron/q8/q8.h b/keyboards/keychron/q8/q8.h
deleted file mode 100644
index 02981db19c..0000000000
--- a/keyboards/keychron/q8/q8.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if   defined(KEYBOARD_keychron_q8_ansi)
-#    include "ansi.h"
-#elif defined(KEYBOARD_keychron_q8_ansi_encoder)
-#    include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q8_iso)
-#    include "iso.h"
-#elif defined(KEYBOARD_keychron_q8_iso_encoder)
-#    include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q9/ansi/ansi.c b/keyboards/keychron/q9/ansi/ansi.c
index e10c4de25b..b98149a5f8 100644
--- a/keyboards/keychron/q9/ansi/ansi.c
+++ b/keyboards/keychron/q9/ansi/ansi.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q9/ansi/ansi.h b/keyboards/keychron/q9/ansi/ansi.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q9/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/info.json
index e1a6ae534d..6198156d4b 100644
--- a/keyboards/keychron/q9/ansi/info.json
+++ b/keyboards/keychron/q9/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0190",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
+        "rows": ["B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q9/ansi/rules.mk b/keyboards/keychron/q9/ansi/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q9/ansi/rules.mk
+++ b/keyboards/keychron/q9/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
index 24c401473d..de0eda1c02 100644
--- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ansi_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index 366d3f39c2..0000000000
--- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 1010 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/info.json
index 5100c18945..0fa8e952d3 100644
--- a/keyboards/keychron/q9/ansi_encoder/info.json
+++ b/keyboards/keychron/q9/ansi_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0191",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
+        "rows": ["B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"}
diff --git a/keyboards/keychron/q9/ansi_encoder/rules.mk b/keyboards/keychron/q9/ansi_encoder/rules.mk
index 37010e0d59..7caead18d7 100644
--- a/keyboards/keychron/q9/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q9/ansi_encoder/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes        # Enable Encoder
 ENCODER_MAP_ENBALE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q9/config.h b/keyboards/keychron/q9/config.h
index e051703d11..742dde3ff2 100644
--- a/keyboards/keychron/q9/config.h
+++ b/keyboards/keychron/q9/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Disable DIP switch in matrix data */
 #define MATRIX_MASKED
 
diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/info.json
index 159abc63ae..e581982475 100644
--- a/keyboards/keychron/q9/iso/info.json
+++ b/keyboards/keychron/q9/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0192",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
+        "rows": ["B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q9/iso/iso.c b/keyboards/keychron/q9/iso/iso.c
index e038e8581f..0e258e8c63 100644
--- a/keyboards/keychron/q9/iso/iso.c
+++ b/keyboards/keychron/q9/iso/iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q9/iso/iso.h b/keyboards/keychron/q9/iso/iso.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q9/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q9/iso/rules.mk b/keyboards/keychron/q9/iso/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q9/iso/rules.mk
+++ b/keyboards/keychron/q9/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/info.json
index dee0a8953a..2ae65f6092 100644
--- a/keyboards/keychron/q9/iso_encoder/info.json
+++ b/keyboards/keychron/q9/iso_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0193",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
+        "rows": ["B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"}
diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.c b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
index 7f6db9a128..0804f33671 100644
--- a/keyboards/keychron/q9/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iso_encoder.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.h b/keyboards/keychron/q9/iso_encoder/iso_encoder.h
deleted file mode 100644
index 366d3f39c2..0000000000
--- a/keyboards/keychron/q9/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 1010 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q9/iso_encoder/rules.mk b/keyboards/keychron/q9/iso_encoder/rules.mk
index 37010e0d59..7caead18d7 100644
--- a/keyboards/keychron/q9/iso_encoder/rules.mk
+++ b/keyboards/keychron/q9/iso_encoder/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes        # Enable Encoder
 ENCODER_MAP_ENBALE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q9/q9.c b/keyboards/keychron/q9/q9.c
index 2f98a72974..51dea886f1 100644
--- a/keyboards/keychron/q9/q9.c
+++ b/keyboards/keychron/q9/q9.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q9.h"
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[] = {
     0b111111111111111,
diff --git a/keyboards/keychron/q9/q9.h b/keyboards/keychron/q9/q9.h
deleted file mode 100644
index d6a0ef1bea..0000000000
--- a/keyboards/keychron/q9/q9.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keychron_q9_ansi)
-#    include "ansi.h"
-#elif defined(KEYBOARD_keychron_q9_ansi_encoder)
-#    include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q9_iso)
-#    include "iso.h"
-#elif defined(KEYBOARD_keychron_q9_iso_encoder)
-#    include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/s1/ansi/rgb/info.json b/keyboards/keychron/s1/ansi/rgb/info.json
index 02ea4d4c90..0f490f8e81 100644
--- a/keyboards/keychron/s1/ansi/rgb/info.json
+++ b/keyboards/keychron/s1/ansi/rgb/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0410",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
diff --git a/keyboards/keychron/s1/ansi/rgb/rules.mk b/keyboards/keychron/s1/ansi/rgb/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/s1/ansi/rgb/rules.mk
+++ b/keyboards/keychron/s1/ansi/rgb/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/s1/ansi/white/info.json b/keyboards/keychron/s1/ansi/white/info.json
index a64f5eb0a9..667da15235 100644
--- a/keyboards/keychron/s1/ansi/white/info.json
+++ b/keyboards/keychron/s1/ansi/white/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0411",
         "device_version": "1.0.0"
     },
+    "led_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
diff --git a/keyboards/keychron/s1/ansi/white/rules.mk b/keyboards/keychron/s1/ansi/white/rules.mk
index 081a3b63f0..1fa4f83a77 100644
--- a/keyboards/keychron/s1/ansi/white/rules.mk
+++ b/keyboards/keychron/s1/ansi/white/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/s1/config.h b/keyboards/keychron/s1/config.h
index e12cc0479c..8c98389522 100644
--- a/keyboards/keychron/s1/config.h
+++ b/keyboards/keychron/s1/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Disable DIP switch in matrix data */
 #define MATRIX_MASKED
 
diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/info.json
index d6d35f8474..8f0e43bc76 100644
--- a/keyboards/keychron/v1/ansi/info.json
+++ b/keyboards/keychron/v1/ansi/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0310",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v1/ansi/rules.mk b/keyboards/keychron/v1/ansi/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/v1/ansi/rules.mk
+++ b/keyboards/keychron/v1/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/info.json
index af396f6bb6..1546de3fef 100644
--- a/keyboards/keychron/v1/ansi_encoder/info.json
+++ b/keyboards/keychron/v1/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0311",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v1/ansi_encoder/rules.mk b/keyboards/keychron/v1/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v1/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v1/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/info.json
index d9b11f5f55..8977c93a07 100644
--- a/keyboards/keychron/v1/iso/info.json
+++ b/keyboards/keychron/v1/iso/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0312",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v1/iso/rules.mk b/keyboards/keychron/v1/iso/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/v1/iso/rules.mk
+++ b/keyboards/keychron/v1/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/info.json
index c08e7d4539..fa0ec5e6e2 100644
--- a/keyboards/keychron/v1/iso_encoder/info.json
+++ b/keyboards/keychron/v1/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0313",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v1/iso_encoder/rules.mk b/keyboards/keychron/v1/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v1/iso_encoder/rules.mk
+++ b/keyboards/keychron/v1/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/info.json
index 8d06120f5d..585bb27e26 100644
--- a/keyboards/keychron/v1/jis/info.json
+++ b/keyboards/keychron/v1/jis/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0314",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v1/jis/rules.mk b/keyboards/keychron/v1/jis/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/v1/jis/rules.mk
+++ b/keyboards/keychron/v1/jis/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/info.json
index 7554498481..5e473c07b4 100644
--- a/keyboards/keychron/v1/jis_encoder/info.json
+++ b/keyboards/keychron/v1/jis_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0315",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v1/jis_encoder/rules.mk b/keyboards/keychron/v1/jis_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v1/jis_encoder/rules.mk
+++ b/keyboards/keychron/v1/jis_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/info.json
index cf8ae78b99..b314bcbbd2 100644
--- a/keyboards/keychron/v10/ansi_encoder/info.json
+++ b/keyboards/keychron/v10/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x03A1",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v10/ansi_encoder/rules.mk b/keyboards/keychron/v10/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v10/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v10/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/info.json
index 554e0b907e..ab18577939 100644
--- a/keyboards/keychron/v10/iso_encoder/info.json
+++ b/keyboards/keychron/v10/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x03A3",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v10/iso_encoder/rules.mk b/keyboards/keychron/v10/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v10/iso_encoder/rules.mk
+++ b/keyboards/keychron/v10/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v10/v10.c b/keyboards/keychron/v10/v10.c
index 091c2e9a4b..2e1e3f090f 100644
--- a/keyboards/keychron/v10/v10.c
+++ b/keyboards/keychron/v10/v10.c
@@ -84,17 +84,3 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
 }
 
 #endif // CAPS_LOCK_LED_INDEX
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/keychron/v2/ansi/info.json b/keyboards/keychron/v2/ansi/info.json
index f0bb49cee2..8b60fd9710 100644
--- a/keyboards/keychron/v2/ansi/info.json
+++ b/keyboards/keychron/v2/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0320",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v2/ansi/rules.mk b/keyboards/keychron/v2/ansi/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/v2/ansi/rules.mk
+++ b/keyboards/keychron/v2/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v2/ansi_encoder/info.json b/keyboards/keychron/v2/ansi_encoder/info.json
index 1e729eb636..d59e469213 100644
--- a/keyboards/keychron/v2/ansi_encoder/info.json
+++ b/keyboards/keychron/v2/ansi_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0321",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "B5"}
diff --git a/keyboards/keychron/v2/ansi_encoder/rules.mk b/keyboards/keychron/v2/ansi_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/v2/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v2/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v2/config.h b/keyboards/keychron/v2/config.h
index 4cb2721911..08cc5b8e84 100644
--- a/keyboards/keychron/v2/config.h
+++ b/keyboards/keychron/v2/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 }
-
 /* If uses PH3 with a stronger pull resistor then the following definition should be included */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
diff --git a/keyboards/keychron/v2/iso/info.json b/keyboards/keychron/v2/iso/info.json
index 0679e1737c..3343ef10b8 100644
--- a/keyboards/keychron/v2/iso/info.json
+++ b/keyboards/keychron/v2/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0322",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v2/iso/rules.mk b/keyboards/keychron/v2/iso/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/v2/iso/rules.mk
+++ b/keyboards/keychron/v2/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v2/iso_encoder/info.json b/keyboards/keychron/v2/iso_encoder/info.json
index a784b33ec5..c7492afdba 100644
--- a/keyboards/keychron/v2/iso_encoder/info.json
+++ b/keyboards/keychron/v2/iso_encoder/info.json
@@ -7,6 +7,14 @@
         "pid": "0x0323",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "B5"}
diff --git a/keyboards/keychron/v2/iso_encoder/rules.mk b/keyboards/keychron/v2/iso_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/v2/iso_encoder/rules.mk
+++ b/keyboards/keychron/v2/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v2/jis/info.json b/keyboards/keychron/v2/jis/info.json
index 89ec07b072..6ef7e94a37 100644
--- a/keyboards/keychron/v2/jis/info.json
+++ b/keyboards/keychron/v2/jis/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0324",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v2/jis/rules.mk b/keyboards/keychron/v2/jis/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/v2/jis/rules.mk
+++ b/keyboards/keychron/v2/jis/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v2/jis_encoder/info.json b/keyboards/keychron/v2/jis_encoder/info.json
index abb76636f7..c24569847b 100644
--- a/keyboards/keychron/v2/jis_encoder/info.json
+++ b/keyboards/keychron/v2/jis_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0325",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "B5"}
diff --git a/keyboards/keychron/v2/jis_encoder/rules.mk b/keyboards/keychron/v2/jis_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/v2/jis_encoder/rules.mk
+++ b/keyboards/keychron/v2/jis_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v3/ansi/info.json b/keyboards/keychron/v3/ansi/info.json
index ae70657b84..513838db8c 100644
--- a/keyboards/keychron/v3/ansi/info.json
+++ b/keyboards/keychron/v3/ansi/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0330",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v3/ansi/rules.mk b/keyboards/keychron/v3/ansi/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/v3/ansi/rules.mk
+++ b/keyboards/keychron/v3/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/info.json
index 5fdf765356..1f0e263e24 100644
--- a/keyboards/keychron/v3/ansi_encoder/info.json
+++ b/keyboards/keychron/v3/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0331",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v3/ansi_encoder/rules.mk b/keyboards/keychron/v3/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v3/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v3/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v3/iso/info.json b/keyboards/keychron/v3/iso/info.json
index 9f79518cb2..c7163fcbc7 100644
--- a/keyboards/keychron/v3/iso/info.json
+++ b/keyboards/keychron/v3/iso/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0332",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v3/iso/rules.mk b/keyboards/keychron/v3/iso/rules.mk
index 8f5af0583c..201148f39d 100644
--- a/keyboards/keychron/v3/iso/rules.mk
+++ b/keyboards/keychron/v3/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/info.json
index b38ad45930..915d3c6db1 100644
--- a/keyboards/keychron/v3/iso_encoder/info.json
+++ b/keyboards/keychron/v3/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0333",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v3/iso_encoder/rules.mk b/keyboards/keychron/v3/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v3/iso_encoder/rules.mk
+++ b/keyboards/keychron/v3/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v3/jis/info.json b/keyboards/keychron/v3/jis/info.json
index 3bab42c8dd..f212f3d86f 100644
--- a/keyboards/keychron/v3/jis/info.json
+++ b/keyboards/keychron/v3/jis/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0334",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v3/jis/rules.mk b/keyboards/keychron/v3/jis/rules.mk
index deac2e12e6..7f91e808b1 100644
--- a/keyboards/keychron/v3/jis/rules.mk
+++ b/keyboards/keychron/v3/jis/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/info.json
index 1f2d2b425b..0e9df3bfb8 100644
--- a/keyboards/keychron/v3/jis_encoder/info.json
+++ b/keyboards/keychron/v3/jis_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0335",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v3/jis_encoder/rules.mk b/keyboards/keychron/v3/jis_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v3/jis_encoder/rules.mk
+++ b/keyboards/keychron/v3/jis_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v4/ansi/info.json b/keyboards/keychron/v4/ansi/info.json
index 04bd9e4761..d1c6d60cec 100644
--- a/keyboards/keychron/v4/ansi/info.json
+++ b/keyboards/keychron/v4/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0340",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v4/ansi/rules.mk b/keyboards/keychron/v4/ansi/rules.mk
index 70c663e777..6dcd47b1fe 100644
--- a/keyboards/keychron/v4/ansi/rules.mk
+++ b/keyboards/keychron/v4/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v4/config.h b/keyboards/keychron/v4/config.h
index eb22d58fb9..8d92219f20 100644
--- a/keyboards/keychron/v4/config.h
+++ b/keyboards/keychron/v4/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Matrix Driver Configuration */
 #define DRIVER_COUNT 1
 #define DRIVER_ADDR_1 0b1110111
diff --git a/keyboards/keychron/v4/iso/info.json b/keyboards/keychron/v4/iso/info.json
index 561fdde3cc..8ffc13cd85 100644
--- a/keyboards/keychron/v4/iso/info.json
+++ b/keyboards/keychron/v4/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0342",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v4/iso/rules.mk b/keyboards/keychron/v4/iso/rules.mk
index 70c663e777..6dcd47b1fe 100644
--- a/keyboards/keychron/v4/iso/rules.mk
+++ b/keyboards/keychron/v4/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/info.json
index 40e253367c..6e4f7e2dae 100644
--- a/keyboards/keychron/v5/ansi/info.json
+++ b/keyboards/keychron/v5/ansi/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0350",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v5/ansi/rules.mk b/keyboards/keychron/v5/ansi/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/v5/ansi/rules.mk
+++ b/keyboards/keychron/v5/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/info.json
index 9461379d1a..baa754f4a6 100644
--- a/keyboards/keychron/v5/ansi_encoder/info.json
+++ b/keyboards/keychron/v5/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0351",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/v5/ansi_encoder/rules.mk b/keyboards/keychron/v5/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v5/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v5/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/info.json
index 729297f2a1..c4a10480e5 100644
--- a/keyboards/keychron/v5/iso/info.json
+++ b/keyboards/keychron/v5/iso/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0352",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v5/iso/rules.mk b/keyboards/keychron/v5/iso/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/v5/iso/rules.mk
+++ b/keyboards/keychron/v5/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/info.json
index 21c1891069..16d228d413 100644
--- a/keyboards/keychron/v5/iso_encoder/info.json
+++ b/keyboards/keychron/v5/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0353",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/v5/iso_encoder/rules.mk b/keyboards/keychron/v5/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v5/iso_encoder/rules.mk
+++ b/keyboards/keychron/v5/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/info.json
index b694849f88..c9fb812f32 100644
--- a/keyboards/keychron/v6/ansi/info.json
+++ b/keyboards/keychron/v6/ansi/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0360",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v6/ansi/rules.mk b/keyboards/keychron/v6/ansi/rules.mk
index ee83debd68..de86b770f3 100644
--- a/keyboards/keychron/v6/ansi/rules.mk
+++ b/keyboards/keychron/v6/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v6/ansi_encoder/info.json b/keyboards/keychron/v6/ansi_encoder/info.json
index d6f46506ec..9bfec3341d 100644
--- a/keyboards/keychron/v6/ansi_encoder/info.json
+++ b/keyboards/keychron/v6/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0361",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/v6/ansi_encoder/rules.mk b/keyboards/keychron/v6/ansi_encoder/rules.mk
index bf60bb7d7d..9958a466f6 100644
--- a/keyboards/keychron/v6/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v6/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v6/iso/info.json b/keyboards/keychron/v6/iso/info.json
index 764a3d7622..9024029d26 100644
--- a/keyboards/keychron/v6/iso/info.json
+++ b/keyboards/keychron/v6/iso/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0362",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v6/iso/rules.mk b/keyboards/keychron/v6/iso/rules.mk
index ee83debd68..de86b770f3 100644
--- a/keyboards/keychron/v6/iso/rules.mk
+++ b/keyboards/keychron/v6/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v6/iso_encoder/info.json b/keyboards/keychron/v6/iso_encoder/info.json
index d8f86e5aa0..38fe956bca 100644
--- a/keyboards/keychron/v6/iso_encoder/info.json
+++ b/keyboards/keychron/v6/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0363",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/v6/iso_encoder/rules.mk b/keyboards/keychron/v6/iso_encoder/rules.mk
index f76ec9b08d..df920055a0 100644
--- a/keyboards/keychron/v6/iso_encoder/rules.mk
+++ b/keyboards/keychron/v6/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v6/v6.c b/keyboards/keychron/v6/v6.c
index 02708e7bc1..0f9305d2d0 100644
--- a/keyboards/keychron/v6/v6.c
+++ b/keyboards/keychron/v6/v6.c
@@ -98,17 +98,3 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
 }
 
 #endif // RGB_MATRIX_ENABLE...
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/keychron/v7/ansi/info.json b/keyboards/keychron/v7/ansi/info.json
index 00df236f6d..4fb4147e45 100644
--- a/keyboards/keychron/v7/ansi/info.json
+++ b/keyboards/keychron/v7/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0370",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v7/ansi/rules.mk b/keyboards/keychron/v7/ansi/rules.mk
index 70c663e777..6dcd47b1fe 100644
--- a/keyboards/keychron/v7/ansi/rules.mk
+++ b/keyboards/keychron/v7/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v7/config.h b/keyboards/keychron/v7/config.h
index b6a08098ce..c439a7e366 100644
--- a/keyboards/keychron/v7/config.h
+++ b/keyboards/keychron/v7/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, A10, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Matrix Driver Configuration */
 #define DRIVER_COUNT 2
 #define DRIVER_ADDR_1 0b1110111
diff --git a/keyboards/keychron/v7/iso/info.json b/keyboards/keychron/v7/iso/info.json
index e01b12464c..26a85b57cd 100644
--- a/keyboards/keychron/v7/iso/info.json
+++ b/keyboards/keychron/v7/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0372",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v7/iso/rules.mk b/keyboards/keychron/v7/iso/rules.mk
index 70c663e777..6dcd47b1fe 100644
--- a/keyboards/keychron/v7/iso/rules.mk
+++ b/keyboards/keychron/v7/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/info.json
index f1f2e75e4d..08864a29cf 100644
--- a/keyboards/keychron/v8/ansi/info.json
+++ b/keyboards/keychron/v8/ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0380",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v8/ansi/rules.mk b/keyboards/keychron/v8/ansi/rules.mk
index 6f738741e9..bdb97dbf1c 100644
--- a/keyboards/keychron/v8/ansi/rules.mk
+++ b/keyboards/keychron/v8/ansi/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = no         # Enable Encoder
 ENCODER_MAP_ENABLE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json
index f6a9de655b..cce4165ec9 100644
--- a/keyboards/keychron/v8/ansi_encoder/info.json
+++ b/keyboards/keychron/v8/ansi_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0381",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "B5"}
diff --git a/keyboards/keychron/v8/ansi_encoder/rules.mk b/keyboards/keychron/v8/ansi_encoder/rules.mk
index f2cbf4a660..d2bee999c8 100644
--- a/keyboards/keychron/v8/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v8/ansi_encoder/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes        # Enable Encoder
 ENCODER_MAP_ENABLE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v8/config.h b/keyboards/keychron/v8/config.h
index c5a3857f40..7c6076e199 100644
--- a/keyboards/keychron/v8/config.h
+++ b/keyboards/keychron/v8/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 }
-
 /* If uses PH3 with a stronger pull resistor then the following definition should be included */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
diff --git a/keyboards/keychron/v8/iso/info.json b/keyboards/keychron/v8/iso/info.json
index 22b363d072..2fc2f5292a 100644
--- a/keyboards/keychron/v8/iso/info.json
+++ b/keyboards/keychron/v8/iso/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0382",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v8/iso/rules.mk b/keyboards/keychron/v8/iso/rules.mk
index e306f3211e..fec3d8d15c 100644
--- a/keyboards/keychron/v8/iso/rules.mk
+++ b/keyboards/keychron/v8/iso/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no         # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json
index 2abaeda111..e5f322851e 100644
--- a/keyboards/keychron/v8/iso_encoder/info.json
+++ b/keyboards/keychron/v8/iso_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0383",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "B5"}
diff --git a/keyboards/keychron/v8/iso_encoder/rules.mk b/keyboards/keychron/v8/iso_encoder/rules.mk
index f2cbf4a660..d2bee999c8 100644
--- a/keyboards/keychron/v8/iso_encoder/rules.mk
+++ b/keyboards/keychron/v8/iso_encoder/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes        # Enable Encoder
 ENCODER_MAP_ENABLE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keygem/kg60ansi/config.h b/keyboards/keygem/kg60ansi/config.h
index 8b581bffa0..8c5567387e 100644
--- a/keyboards/keygem/kg60ansi/config.h
+++ b/keyboards/keygem/kg60ansi/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 64
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json
index 7376b01485..31972fe773 100644
--- a/keyboards/keygem/kg60ansi/info.json
+++ b/keyboards/keygem/kg60ansi/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/keygem/kg60ansi/kg60ansi.c b/keyboards/keygem/kg60ansi/kg60ansi.c
deleted file mode 100644
index 15a1f4ee31..0000000000
--- a/keyboards/keygem/kg60ansi/kg60ansi.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2022 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "kg60ansi.h"
diff --git a/keyboards/keygem/kg65rgbv2/config.h b/keyboards/keygem/kg65rgbv2/config.h
index 6a229d81af..eb799efc53 100644
--- a/keyboards/keygem/kg65rgbv2/config.h
+++ b/keyboards/keygem/kg65rgbv2/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 68
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/info.json
index 326d5256e1..8551f905b8 100644
--- a/keyboards/keygem/kg65rgbv2/info.json
+++ b/keyboards/keygem/kg65rgbv2/info.json
@@ -8,84 +8,92 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"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},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-                
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keygem/kg65rgbv2/kg65rgbv2.c b/keyboards/keygem/kg65rgbv2/kg65rgbv2.c
deleted file mode 100644
index f714accbf4..0000000000
--- a/keyboards/keygem/kg65rgbv2/kg65rgbv2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2022 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "kg65rgbv2.h"
diff --git a/keyboards/keygem/kg65rgbv2/kg65rgbv2.h b/keyboards/keygem/kg65rgbv2/kg65rgbv2.h
deleted file mode 100644
index 44415a1894..0000000000
--- a/keyboards/keygem/kg65rgbv2/kg65rgbv2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2022 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* TF60 ANSI Keymap Definitions */
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D, K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D, K0E }, \
-    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D, K1E }, \
-    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B,   KC_NO, K2D, K2E }, \
-    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, KC_NO, K3C,   K3D, K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, K4B,   K4C,   K4D, K4E }  \
-}
diff --git a/keyboards/keyhive/absinthe/absinthe.c b/keyboards/keyhive/absinthe/absinthe.c
deleted file mode 100644
index 502139ed0c..0000000000
--- a/keyboards/keyhive/absinthe/absinthe.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 cfbender
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "absinthe.h"
diff --git a/keyboards/keyhive/absinthe/absinthe.h b/keyboards/keyhive/absinthe/absinthe.h
deleted file mode 100644
index 890aff643e..0000000000
--- a/keyboards/keyhive/absinthe/absinthe.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2020 cfbender
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_default( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
-    K20,      K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, \
-    K40,      K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K56,                \
-    K60, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,           K66, K67,      K68,     \
-    K80, K81, K82,                K83,                       K76,  K86,   K87, K77, K88, K78  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 },\
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 },\
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 },\
-    { XXX, K31, K32, K33, K34, K35, K36, K37, K38 },\
-    { K40, K41, K42, K43, K44, K45, K46, XXX, XXX },\
-    { XXX, K51, K52, K53, K54, K55, K56, XXX, XXX },\
-    { K60, K61, K62, K63, K64, K65, K66, K67, K68 },\
-    { XXX, K71, K72, K73, K74, K75, K76, K77, K78 },\
-    { K80, K81, K82, K83, XXX, XXX, K86, K87, K88 } \
-}
-
-#define LAYOUT_ansi( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06,   K16,    K17, K08, K18, \
-    K20,      K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, \
-    K40,      K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K56,                     \
-    K60, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,               K66,       K68,     \
-    K80, K81, K82,                K83,                K85,   K76,  K86,   K87, K77, K88, K78  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, XXX, K08 },\
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 },\
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 },\
-    { XXX, K31, K32, K33, K34, K35, K36, K37, K38 },\
-    { K40, K41, K42, K43, K44, K45, K46, XXX, XXX },\
-    { XXX, K51, K52, K53, K54, K55, K56, XXX, XXX },\
-    { K60, K61, K62, K63, K64, K65, K66, XXX, K68 },\
-    { XXX, K71, K72, K73, K74, K75, K76, K77, K78 },\
-    { K80, K81, K82, K83, XXX, K85, K86, K87, K88 } \
-}
-
diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index 0c7fe33f6b..72df685e63 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D1, B6, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D3, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 32
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //   #define RGBLIGHT_EFFECT_RGB_TEST
 //   #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/info.json
index 336707f239..8001d6db01 100644
--- a/keyboards/keyhive/absinthe/info.json
+++ b/keyboards/keyhive/absinthe/info.json
@@ -8,6 +8,14 @@
         "pid": "0xFEED",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3", "D0"],
+        "rows": ["D2", "D1", "B6", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B7", "pin_b": "D5"}
@@ -18,144 +26,170 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0},
-                {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0},
-                {"label":"Insert", "x":15.25, "y":0},
-                {"label":"Home", "x":16.25, "y":0},
-                {"label":"PgUp", "x":17.25, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"Backspace", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":1},
-                {"label":"End", "x":16.25, "y":1},
-                {"label":"PgDn", "x":17.25, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"MO(1)", "x":14, "y":3},
-                {"label":"\u2191", "x":16.25, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"label":"Alt", "x":11, "y":4, "w":1.5},
-                {"label":"Win", "x":12.5, "y":4},
-                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":4},
-                {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 2], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 4], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 5], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 6], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1},
+                {"matrix": [2, 8], "x": 16.25, "y": 1},
+                {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 1], "x": 1.5, "y": 4},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [7, 6], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 12.5, "y": 4},
+                {"matrix": [8, 7], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"matrix": [7, 7], "x": 15.25, "y": 4},
+                {"matrix": [8, 8], "x": 16.25, "y": 4},
+                {"matrix": [7, 8], "x": 17.25, "y": 4}
+            ]
         },
         "LAYOUT_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15.25, "y":0},
-                {"label":"Home", "x":16.25, "y":0},
-                {"label":"PgUp", "x":17.25, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":1},
-                {"label":"End", "x":16.25, "y":1},
-                {"label":"PgDn", "x":17.25, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Win", "x":11.25, "y":4, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":4},
-                {"label":"\u2193", "x":16.25, "y":4},
-                {"label":"\u2192", "x":17.25, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 2], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 4], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 5], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 6], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1},
+                {"matrix": [2, 8], "x": 16.25, "y": 1},
+                {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [7, 6], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [7, 7], "x": 15.25, "y": 4},
+                {"matrix": [8, 8], "x": 16.25, "y": 4},
+                {"matrix": [7, 8], "x": 17.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index 6bd579b332..1d63f46b12 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -17,27 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { B5, B4, E6, D4, F6, D3, D2, F4, F5 }
-#define MATRIX_COL_PINS \
-    { D7, C6, D0, D1, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGBLIGHT_ENABLE
-#    define RGB_DI_PIN B6
    #define RGBLED_NUM 32
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/keyhive/ergosaurus/ergosaurus.c b/keyboards/keyhive/ergosaurus/ergosaurus.c
deleted file mode 100644
index 4c31455128..0000000000
--- a/keyboards/keyhive/ergosaurus/ergosaurus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-/* Copyright 2019 cfbender
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ergosaurus.h"
diff --git a/keyboards/keyhive/ergosaurus/ergosaurus.h b/keyboards/keyhive/ergosaurus/ergosaurus.h
deleted file mode 100644
index cef594993d..0000000000
--- a/keyboards/keyhive/ergosaurus/ergosaurus.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 cfbender
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define KNO KC_NO
-
-#define LAYOUT_alice_split_bs( \
-  K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
-  K20, K30, K21, K31, K22, K32, K23,      K33, K24, K34, K25, K35, K26, K36, K27, \
-  K40, K50, K41, K51, K42, K52, K43,      K53, K44, K54, K45, K55, K46,      K47, \
-       K60, K61, K71, K62, K72, K63,      K73, K64, K74, K65, K75, K66, K76, K67, \
-       K80,      K81, K82,      K83,           K84,      K85,                K87  \
-) { \
-  {  K00, K01, K02, K03, K04, K05, K06, K07  }, \
-  {  K10, K11, K12, K13, K14, K15, K16, K17  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, K27  }, \
-  {  K30, K31, K32, K33, K34, K35, K36, KNO  }, \
-  {  K40, K41, K42, K43, K44, K45, K46, K47  }, \
-  {  K50, K51, K52, K53, K54, K55, KNO, KNO  }, \
-  {  K60, K61, K62, K63, K64, K65, K66, K67  }, \
-  {  KNO, K71, K72, K73, K74, K75, K76, KNO  }, \
-  {  K80, K81, K82, K83, K84, K85, KNO, K87  }  \
-}
-
-#define LAYOUT LAYOUT_alice_split_bs
diff --git a/keyboards/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json
index 872ba2d76b..ae3c684aae 100644
--- a/keyboards/keyhive/ergosaurus/info.json
+++ b/keyboards/keyhive/ergosaurus/info.json
@@ -7,82 +7,93 @@
         "pid": "0xE590",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "matrix_pins": {
+        "cols": ["D7", "C6", "D0", "D1", "F7", "B1", "B3", "B2"],
+        "rows": ["B5", "B4", "E6", "D4", "F6", "D3", "D2", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"`", "x":0.5, "y":0},
-                {"label":"Esc", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"|", "x":17, "y":0.25},
-                {"label":"Del", "x":18, "y":0.25},
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [1, 0], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 2.75, "y": 0.25},
+                {"matrix": [1, 1], "x": 3.75, "y": 0},
+                {"matrix": [0, 2], "x": 4.75, "y": 0.25},
+                {"matrix": [1, 2], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 6.75, "y": 0.25},
+                {"matrix": [1, 3], "x": 7.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 11, "y": 0.25},
+                {"matrix": [1, 4], "x": 12, "y": 0.25},
+                {"matrix": [0, 5], "x": 13, "y": 0.25},
+                {"matrix": [1, 5], "x": 14, "y": 0.25},
+                {"matrix": [0, 6], "x": 15, "y": 0},
+                {"matrix": [1, 6], "x": 16, "y": 0.25},
+                {"matrix": [0, 7], "x": 17, "y": 0.25},
+                {"matrix": [1, 7], "x": 18, "y": 0.25},
 
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"Backspace", "x":17.75, "y":1.25, "w":1.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+                {"matrix": [3, 0], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 1.25},
+                {"matrix": [3, 1], "x": 4.25, "y": 1.25},
+                {"matrix": [2, 2], "x": 5.25, "y": 1.25},
+                {"matrix": [3, 2], "x": 6.25, "y": 1.25},
+                {"matrix": [2, 3], "x": 7.25, "y": 1.25},
+                {"matrix": [3, 3], "x": 10.5, "y": 1.25},
+                {"matrix": [2, 4], "x": 11.5, "y": 1.25},
+                {"matrix": [3, 4], "x": 12.5, "y": 1.25},
+                {"matrix": [2, 5], "x": 13.5, "y": 1.25},
+                {"matrix": [3, 5], "x": 14.75, "y": 1.25},
+                {"matrix": [2, 6], "x": 15.75, "y": 1.25},
+                {"matrix": [3, 6], "x": 16.75, "y": 1.25},
+                {"matrix": [2, 7], "x": 17.75, "y": 1.25, "w": 1.5},
 
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [4, 1], "x": 3.25, "y": 2.25},
+                {"matrix": [5, 1], "x": 4.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 10.75, "y": 2.25},
+                {"matrix": [4, 4], "x": 11.75, "y": 2.25},
+                {"matrix": [5, 4], "x": 12.75, "y": 2.25},
+                {"matrix": [4, 5], "x": 13.75, "y": 2.25},
+                {"matrix": [5, 5], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 6], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 7], "x": 17.25, "y": 2.25, "w": 2.25},
 
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"B", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
+                {"matrix": [6, 0], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [6, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 5, "y": 3.25},
+                {"matrix": [6, 2], "x": 6, "y": 3.25},
+                {"matrix": [7, 2], "x": 7, "y": 3.25},
+                {"matrix": [6, 3], "x": 8, "y": 3.25},
+                {"matrix": [7, 3], "x": 10.25, "y": 3.25},
+                {"matrix": [6, 4], "x": 11.25, "y": 3.25},
+                {"matrix": [7, 4], "x": 12.25, "y": 3.25},
+                {"matrix": [6, 5], "x": 13.25, "y": 3.25},
+                {"matrix": [7, 5], "x": 15, "y": 3.25},
+                {"matrix": [6, 6], "x": 16, "y": 3.25},
+                {"matrix": [7, 6], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 7], "x": 18.75, "y": 3.25},
 
-                {"label":"Os", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Enter", "x":6.5, "y":4.25, "w":2},
-                {"label":"Fn", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.25},
-                {"label":"Alt", "x":12.5, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [8, 0], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [8, 1], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [8, 2], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [8, 3], "x": 8.5, "y": 4.25},
+                {"matrix": [8, 4], "x": 10.25, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 5], "x": 12.5, "y": 4.25, "w": 1.5},
+                {"matrix": [8, 7], "x": 18, "y": 4.25, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/keyhive/honeycomb/honeycomb.c b/keyboards/keyhive/honeycomb/honeycomb.c
index 603400c7a3..6acc649e0d 100755
--- a/keyboards/keyhive/honeycomb/honeycomb.c
+++ b/keyboards/keyhive/honeycomb/honeycomb.c
@@ -2,7 +2,7 @@
 #include "pointing_device.h"
 #include "report.h"
 
-void pointing_device_task(void){
+bool pointing_device_task(void){
 	/*report_mouse_t currentReport = {};
     uint32_t timeout = 0;
 
@@ -56,7 +56,7 @@ void pointing_device_task(void){
     } else {
 	xprintf("\r\nRequested packet, data 4 was %d",uart_data[4]);
     }*/
-    pointing_device_send();
+    return pointing_device_send();
 }
 
 void led_init(void) {
diff --git a/keyboards/keyhive/honeycomb/honeycomb.h b/keyboards/keyhive/honeycomb/honeycomb.h
index ec54b59f20..0418dee767 100755
--- a/keyboards/keyhive/honeycomb/honeycomb.h
+++ b/keyboards/keyhive/honeycomb/honeycomb.h
@@ -17,16 +17,3 @@
 #define SET_LED_MAGENTA (RED_LED_ON();  GRN_LED_OFF(); BLU_LED_ON(); )
 #define SET_LED_CYAN    (RED_LED_OFF(); GRN_LED_ON();  BLU_LED_ON(); )
 #define SET_LED_WHITE   (RED_LED_ON();  GRN_LED_ON();  BLU_LED_ON(); )
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-  k13, k14, k15, k16, \
-  k09, k10, k11, k12, \
-  k05, k06, k07, k08, \
-  k01, k02, k03, k04  \
-) \
-{ \
-	{ k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16 } \
-}
diff --git a/keyboards/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json
index 693b836ede..639edee28d 100644
--- a/keyboards/keyhive/honeycomb/info.json
+++ b/keyboards/keyhive/honeycomb/info.json
@@ -13,25 +13,25 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 12], "x": 0, "y": 0},
+                {"matrix": [0, 13], "x": 1, "y": 0},
+                {"matrix": [0, 14], "x": 2, "y": 0},
+                {"matrix": [0, 15], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"matrix": [0, 8], "x": 0, "y": 1},
+                {"matrix": [0, 9], "x": 1, "y": 1},
+                {"matrix": [0, 10], "x": 2, "y": 1},
+                {"matrix": [0, 11], "x": 3, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"matrix": [0, 4], "x": 0, "y": 2},
+                {"matrix": [0, 5], "x": 1, "y": 2},
+                {"matrix": [0, 6], "x": 2, "y": 2},
+                {"matrix": [0, 7], "x": 3, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 3},
+                {"matrix": [0, 1], "x": 1, "y": 3},
+                {"matrix": [0, 2], "x": 2, "y": 3},
+                {"matrix": [0, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/keyhive/lattice60/config.h b/keyboards/keyhive/lattice60/config.h
index 345dfa5c2e..bf9e7337c2 100644
--- a/keyboards/keyhive/lattice60/config.h
+++ b/keyboards/keyhive/lattice60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B2, B3, B4, B5, C0, C1, C2, C3 }
-#define MATRIX_COL_PINS { D7, D6, B0, D5, D1, D4, D0, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keyhive/lattice60/info.json b/keyboards/keyhive/lattice60/info.json
index 345bd4b8e1..d3a0383ec8 100644
--- a/keyboards/keyhive/lattice60/info.json
+++ b/keyboards/keyhive/lattice60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "D6", "B0", "D5", "D1", "D4", "D0", "B1"],
+        "rows": ["B2", "B3", "B4", "B5", "C0", "C1", "C2", "C3"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "community_layouts": ["60_hhkb"],
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index 2922e9ef12..26e1d21dc4 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -14,23 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keyhive/maypad/info.json b/keyboards/keyhive/maypad/info.json
index be72cb07f9..ea0ffb80ae 100644
--- a/keyboards/keyhive/maypad/info.json
+++ b/keyboards/keyhive/maypad/info.json
@@ -8,18 +8,93 @@
         "pid": "0x4D50",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_5x4", "numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
-            "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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": [2, 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, 1], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
+            ]
         },
         "LAYOUT_numpad_5x4_split_plus": {
-            "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"=", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"-", "x":3, "y":1}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
+            ]
         },
         "LAYOUT_ortho_5x4": {
-            "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"00", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
         }
 
     }
diff --git a/keyboards/keyhive/maypad/maypad.c b/keyboards/keyhive/maypad/maypad.c
deleted file mode 100644
index 426575b3d2..0000000000
--- a/keyboards/keyhive/maypad/maypad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 codybender
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "maypad.h"
diff --git a/keyboards/keyhive/maypad/maypad.h b/keyboards/keyhive/maypad/maypad.h
deleted file mode 100644
index ac576f99ea..0000000000
--- a/keyboards/keyhive/maypad/maypad.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2019 codybender
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* maypad numpad layout
- * .-------------------.
- * |NLCK|   /|   *|   -|
- * |-------------------|
- * |   7|   8|   9|    |
- * |--------------|    |
- * |   4|   5|   6|   +|
- * |-------------------|
- * |   1|   2|   3|    |
- * |--------------|    |
- * |        0|   .| Ent|
- * '-------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_numpad_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12,      \
-    k20, k21, k22, k23, \
-    k30, k31, k32,      \
-         k41, k42, k43 \
-) { \
-    { k00,   k01, k02, k03   },  \
-    { k10,   k11, k12, KC_NO },  \
-    { k20,   k21, k22, k23   },  \
-    { k30,   k31, k32, KC_NO },  \
-    { KC_NO, k41, k42, k43   }   \
-}
-
-#define LAYOUT_numpad_5x4_split_plus( \
-        k00, k01, k02, k03, \
-        k10, k11, k12, k13, \
-        k20, k21, k22, k23, \
-        k30, k31, k32,      \
-             k41, k42, k43  \
-) { \
-    { k00,   k01, k02, k03   }, \
-    { k10,   k11, k12, k13   }, \
-    { k20,   k21, k22, k23   }, \
-    { k30,   k31, k32, KC_NO }, \
-    { KC_NO, k41, k42, k43   }  \
-}
-
-#define LAYOUT_ortho_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43  \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 }  \
-}
diff --git a/keyboards/keyhive/navi10/info.json b/keyboards/keyhive/navi10/info.json
index ecafbeb089..d370601b62 100644
--- a/keyboards/keyhive/navi10/info.json
+++ b/keyboards/keyhive/navi10/info.json
@@ -6,10 +6,5 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x0000"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"Fn", "x":0, "y":0}, {"label":"Home", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"Del", "x":0, "y":1}, {"label":"End", "x":1, "y":1}, {"label":"PgDn", "x":2, "y":1}, {"label":"Up", "x":1, "y":3}, {"label":"Left", "x":0, "y":4}, {"label":"Down", "x":1, "y":4}, {"label":"Right", "x":2, "y":4}]
-        }
     }
 }
diff --git a/keyboards/keyhive/navi10/keymaps/devdev/config.h b/keyboards/keyhive/navi10/keymaps/devdev/config.h
index dba45a5f24..8d8a6df8c9 100644
--- a/keyboards/keyhive/navi10/keymaps/devdev/config.h
+++ b/keyboards/keyhive/navi10/keymaps/devdev/config.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 220
 
 #ifdef RGBLIGHT_ENABLE
-    #define RGB_DI_PIN D3
+    #define WS2812_DI_PIN D3
     #define RGBLED_NUM 3
 	
     #define RGBLIGHT_LIMIT_VAL 120
diff --git a/keyboards/keyhive/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h
index d6129ce2ed..2e0110934b 100644
--- a/keyboards/keyhive/navi10/rev0/config.h
+++ b/keyboards/keyhive/navi10/rev0/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
-    { B6, B2, B3, B4 }
-#define MATRIX_COL_PINS \
-    { D1, D0, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json
index e1dda21feb..548d917667 100644
--- a/keyboards/keyhive/navi10/rev0/info.json
+++ b/keyboards/keyhive/navi10/rev0/info.json
@@ -2,6 +2,30 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "F6"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/keyhive/navi10/rev0/rev0.c b/keyboards/keyhive/navi10/rev0/rev0.c
index f6c1f362ca..1eefa5cd91 100644
--- a/keyboards/keyhive/navi10/rev0/rev0.c
+++ b/keyboards/keyhive/navi10/rev0/rev0.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev0.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   // put your keyboard start-up code here
diff --git a/keyboards/keyhive/navi10/rev0/rev0.h b/keyboards/keyhive/navi10/rev0/rev0.h
deleted file mode 100644
index b162d14425..0000000000
--- a/keyboards/keyhive/navi10/rev0/rev0.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k0, k1, k2, \
-    k3, k4, k5, \
-                \
-        k6, \
-    k7, k8, k9 \
-) \
-{ \
-    {k0, k1, k2}, \
-    {k3, k4, k5}, \
-    {KC_NO, k6, KC_NO}, \
-    {k7, k8, k9}, \
-}
-
-
diff --git a/keyboards/keyhive/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h
index 0b7c4cf002..2e0110934b 100644
--- a/keyboards/keyhive/navi10/rev2/config.h
+++ b/keyboards/keyhive/navi10/rev2/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
-    { B6, B2, B3, B4 }
-#define MATRIX_COL_PINS \
-    { D4, C6, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json
index 1b44b7d70f..8db97e67b7 100644
--- a/keyboards/keyhive/navi10/rev2/info.json
+++ b/keyboards/keyhive/navi10/rev2/info.json
@@ -2,6 +2,30 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "B1"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/keyhive/navi10/rev2/rev2.c b/keyboards/keyhive/navi10/rev2/rev2.c
index fed0e03897..1eefa5cd91 100644
--- a/keyboards/keyhive/navi10/rev2/rev2.c
+++ b/keyboards/keyhive/navi10/rev2/rev2.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev2.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   // put your keyboard start-up code here
diff --git a/keyboards/keyhive/navi10/rev2/rev2.h b/keyboards/keyhive/navi10/rev2/rev2.h
deleted file mode 100644
index b162d14425..0000000000
--- a/keyboards/keyhive/navi10/rev2/rev2.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k0, k1, k2, \
-    k3, k4, k5, \
-                \
-        k6, \
-    k7, k8, k9 \
-) \
-{ \
-    {k0, k1, k2}, \
-    {k3, k4, k5}, \
-    {KC_NO, k6, KC_NO}, \
-    {k7, k8, k9}, \
-}
-
-
diff --git a/keyboards/keyhive/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h
index 93ce1cdc42..2e0110934b 100644
--- a/keyboards/keyhive/navi10/rev3/config.h
+++ b/keyboards/keyhive/navi10/rev3/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
-    { B6, B2, B3, B4 }
-#define MATRIX_COL_PINS \
-    { D4, E6, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json
index 2d7d9f1f84..82df44e866 100644
--- a/keyboards/keyhive/navi10/rev3/info.json
+++ b/keyboards/keyhive/navi10/rev3/info.json
@@ -2,6 +2,30 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["D4", "E6", "B1"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/keyhive/navi10/rev3/rev3.c b/keyboards/keyhive/navi10/rev3/rev3.c
index 2b0355aa36..1eefa5cd91 100644
--- a/keyboards/keyhive/navi10/rev3/rev3.c
+++ b/keyboards/keyhive/navi10/rev3/rev3.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev3.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   // put your keyboard start-up code here
diff --git a/keyboards/keyhive/navi10/rev3/rev3.h b/keyboards/keyhive/navi10/rev3/rev3.h
deleted file mode 100644
index b162d14425..0000000000
--- a/keyboards/keyhive/navi10/rev3/rev3.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k0, k1, k2, \
-    k3, k4, k5, \
-                \
-        k6, \
-    k7, k8, k9 \
-) \
-{ \
-    {k0, k1, k2}, \
-    {k3, k4, k5}, \
-    {KC_NO, k6, KC_NO}, \
-    {k7, k8, k9}, \
-}
-
-
diff --git a/keyboards/keyhive/opus/config.h b/keyboards/keyhive/opus/config.h
index 42cc507df9..ae2fa676f6 100644
--- a/keyboards/keyhive/opus/config.h
+++ b/keyboards/keyhive/opus/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-/* PCB pin-out */
-#define MATRIX_ROW_PINS {B1, B3, B2, B6}
-#define MATRIX_COL_PINS {D1, D0, D4, C6, D7, E6, B4, B5, F4, F5, F6, F7}
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keyhive/opus/info.json b/keyboards/keyhive/opus/info.json
index f3ce5cec58..fd508c1003 100644
--- a/keyboards/keyhive/opus/info.json
+++ b/keyboards/keyhive/opus/info.json
@@ -7,6 +7,11 @@
         "pid": "0x4F50",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/keyhive/opus/opus.c b/keyboards/keyhive/opus/opus.c
deleted file mode 100644
index 5a188cf8a0..0000000000
--- a/keyboards/keyhive/opus/opus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 rtwayland
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "opus.h"
diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
index b3114e4011..97f15c940a 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B6, B5, B4 }
-#define MATRIX_COL_PINS { C7, C6, F7, F6, F5, F4, F1, D4, D6, D7, D0, D1, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 12
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/keyhive/smallice/info.json b/keyboards/keyhive/smallice/info.json
index 39bdd4d09a..b3134b1771 100644
--- a/keyboards/keyhive/smallice/info.json
+++ b/keyboards/keyhive/smallice/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5341",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "F7", "F6", "F5", "F4", "F1", "D4", "D6", "D7", "D0", "D1", "D2", "D3", "D5"],
+        "rows": ["B0", "B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/keyhive/smallice/smallice.c b/keyboards/keyhive/smallice/smallice.c
deleted file mode 100644
index c7d65e27ab..0000000000
--- a/keyboards/keyhive/smallice/smallice.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 armastardo / quark
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "smallice.h"
diff --git a/keyboards/keyhive/southpole/config.h b/keyboards/keyhive/southpole/config.h
index 91718d741f..5f36081323 100644
--- a/keyboards/keyhive/southpole/config.h
+++ b/keyboards/keyhive/southpole/config.h
@@ -1,32 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D2, D3, C6, C7, D5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keyhive/southpole/info.json b/keyboards/keyhive/southpole/info.json
index 0c06a2be3b..8228647362 100644
--- a/keyboards/keyhive/southpole/info.json
+++ b/keyboards/keyhive/southpole/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"],
+    "rows": ["D2", "D3", "C6", "C7", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/keyhive/southpole/southpole.c b/keyboards/keyhive/southpole/southpole.c
deleted file mode 100644
index f345893fb5..0000000000
--- a/keyboards/keyhive/southpole/southpole.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "southpole.h"
diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
index b706f26ce2..414590f643 100644
--- a/keyboards/keyhive/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
@@ -19,6 +19,5 @@
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN F6
 #define RGBLED_NUM 1
 #endif
diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json
index 2fc258ee42..69fe9afd77 100644
--- a/keyboards/keyhive/uno/rev1/info.json
+++ b/keyboards/keyhive/uno/rev1/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {
diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
index e940f5fa05..414590f643 100644
--- a/keyboards/keyhive/uno/rev2/config.h
+++ b/keyboards/keyhive/uno/rev2/config.h
@@ -19,6 +19,5 @@
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D1
 #define RGBLED_NUM 1
 #endif
diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json
index 66e0ca20e0..0af41bab77 100644
--- a/keyboards/keyhive/uno/rev2/info.json
+++ b/keyboards/keyhive/uno/rev2/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B3"}
diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h
index 5e00d17106..5ab9348126 100644
--- a/keyboards/keyhive/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
@@ -16,22 +16,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, D2, D3, D4 }
-#define MATRIX_COL_PINS { C4, C5, B7, B6, B5, B4, B3, B2, B1, B0, D6, D5 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN C6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -46,4 +35,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keyhive/ut472/info.json b/keyboards/keyhive/ut472/info.json
index de93aeef6d..9755bd6569 100644
--- a/keyboards/keyhive/ut472/info.json
+++ b/keyboards/keyhive/ut472/info.json
@@ -8,11 +8,70 @@
     "pid": "0x0472",
     "device_version": "0.0.2"
   },
+  "ws2812": {
+    "pin": "C6"
+  },
+  "matrix_pins": {
+    "cols": ["C4", "C5", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5"],
+    "rows": ["D1", "D2", "D3", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.5}, {"label":"LT(3) / Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2, "w":1.5}, {"label":"Z", "x":1.5, "y":2}, {"label":"X", "x":2.5, "y":2}, {"label":"C", "x":3.5, "y":2}, {"label":"V", "x":4.5, "y":2}, {"label":"B", "x":5.5, "y":2}, {"label":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":"<", "x":8.5, "y":2}, {"label":">", "x":9.5, "y":2}, {"label":"?", "x":10.5, "y":2}, {"label":"Shift / Enter", "x":11.5, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"GUI", "x":2, "y":3}, {"label":"Menu", "x":3, "y":3}, {"label":"MO(2)", "x":4, "y":3, "w":1.25}, {"x":5.25, "y":3, "w":2}, {"label":"MO(1)", "x":7.25, "y":3, "w":1.25}, {"label":"\u2190", "x":8.5, "y":3}, {"label":"\u2193", "x":9.5, "y":3}, {"label":"\u2191", "x":10.5, "y":3}, {"label":"\u2192", "x":11.5, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 10], "x": 10.25, "y": 1},
+        {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+        {"matrix": [2, 11], "x": 11.5, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3, "w": 1.25},
+        {"matrix": [3, 5], "x": 5.25, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/keyhive/ut472/keymaps/hvp/config.h b/keyboards/keyhive/ut472/keymaps/hvp/config.h
index ea23adfab5..a2a492ff27 100644
--- a/keyboards/keyhive/ut472/keymaps/hvp/config.h
+++ b/keyboards/keyhive/ut472/keymaps/hvp/config.h
@@ -17,4 +17,3 @@
 #pragma once
 #define TAPPING_TERM 200
 #define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/keyhive/ut472/ut472.c b/keyboards/keyhive/ut472/ut472.c
deleted file mode 100644
index 637922171a..0000000000
--- a/keyboards/keyhive/ut472/ut472.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ut472.h"
diff --git a/keyboards/keyhive/ut472/ut472.h b/keyboards/keyhive/ut472/ut472.h
deleted file mode 100644
index 391392896a..0000000000
--- a/keyboards/keyhive/ut472/ut472.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2018 Carlos Filoteo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
- #pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-  K30, K31, K32, K33, K34,    K35,   K37, K38, K39, K3a, K3b  \
-) \
-  { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b }, \
-    { K30, K31, K32, K33, K34, K35, K35, K37, K38, K39, K3a, K3b }  \
-  }
-
diff --git a/keyboards/keyprez/bison/config.h b/keyboards/keyprez/bison/config.h
index ba68e0d976..c4bb34279d 100644
--- a/keyboards/keyprez/bison/config.h
+++ b/keyboards/keyprez/bison/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, F7, B1, B3, D7 }
-#define MATRIX_COL_PINS { D3, E6, B2, B4, D4, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json
index a18beb8305..bc67710d03 100644
--- a/keyboards/keyprez/bison/info.json
+++ b/keyboards/keyprez/bison/info.json
@@ -8,6 +8,11 @@
         "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"}
@@ -28,301 +33,301 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "F1", "x": 0, "y": 0},
-                {"label": "F2", "x": 1, "y": 0},
-                {"label": "~", "x": 2, "y": 0},
-                {"label": "1", "x": 3, "y": 0},
-                {"label": "2", "x": 4, "y": 0},
-                {"label": "3", "x": 5, "y": 0},
-                {"label": "4", "x": 6, "y": 0},
-                {"label": "5", "x": 7, "y": 0},
-                {"label": "6", "x": 10, "y": 0},
-                {"label": "7", "x": 11, "y": 0},
-                {"label": "8", "x": 12, "y": 0},
-                {"label": "9", "x": 13, "y": 0},
-                {"label": "0", "x": 14, "y": 0},
-                {"label": "-", "x": 15, "y": 0},
-                {"label": "=", "x": 16, "y": 0},
-                {"label": "Del", "x": 17, "y": 0},
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+                {"x": 17, "y": 0},
 
-                {"label": "F3", "x": 0, "y": 1},
-                {"label": "F4", "x": 1, "y": 1},
-                {"label": "Tab", "x": 2, "y": 1},
-                {"label": "Q", "x": 3, "y": 1},
-                {"label": "W", "x": 4, "y": 1},
-                {"label": "E", "x": 5, "y": 1},
-                {"label": "R", "x": 6, "y": 1},
-                {"label": "T", "x": 7, "y": 1},
-                {"label": "Y", "x": 10, "y": 1},
-                {"label": "U", "x": 11, "y": 1},
-                {"label": "I", "x": 12, "y": 1},
-                {"label": "O", "x": 13, "y": 1},
-                {"label": "P", "x": 14, "y": 1},
-                {"label": "[", "x": 15, "y": 1},
-                {"label": "]", "x": 16, "y": 1},
-                {"label": "\\", "x": 17, "y": 1},
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
 
-                {"label": "F5", "x": 0, "y": 2},
-                {"label": "F6", "x": 1, "y": 2},
-                {"label": "Esc", "x": 2, "y": 2},
-                {"label": "A", "x": 3, "y": 2},
-                {"label": "S", "x": 4, "y": 2},
-                {"label": "D", "x": 5, "y": 2},
-                {"label": "F", "x": 6, "y": 2},
-                {"label": "G", "x": 7, "y": 2},
-                {"label": "H", "x": 10, "y": 2},
-                {"label": "J", "x": 11, "y": 2},
-                {"label": "K", "x": 12, "y": 2},
-                {"label": "L", "x": 13, "y": 2},
-                {"label": ";", "x": 14, "y": 2},
-                {"label": "'", "x": 15, "y": 2},
-                {"label": "BS", "x": 16, "y": 2},
-                {"label": "FN", "x": 17, "y": 2},
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 17, "y": 2},
 
-                {"label": "F7", "x": 0, "y": 3},
-                {"label": "F8", "x": 1, "y": 3},
-                {"label": "Shift", "x": 2, "y": 3},
-                {"label": "Z", "x": 3, "y": 3},
-                {"label": "X", "x": 4, "y": 3},
-                {"label": "C", "x": 5, "y": 3},
-                {"label": "V", "x": 6, "y": 3},
-                {"label": "B", "x": 7, "y": 3},
-                {"label": "Mute", "x": 8, "y": 3},
-                {"label": "MPLY", "x": 9, "y": 3},
-                {"label": "N", "x": 10, "y": 3},
-                {"label": "M", "x": 11, "y": 3},
-                {"label": ",", "x": 12, "y": 3},
-                {"label": ".", "x": 13, "y": 3},
-                {"label": "/", "x": 14, "y": 3},
-                {"label": "Enter", "x": 15, "y": 3},
-                {"label": "Home", "x": 16, "y": 3},
-                {"label": "End", "x": 17, "y": 3},
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+                {"x": 17, "y": 3},
 
-                {"label": "OS", "x": 3.75, "y": 4},
-                {"label": "Alt", "x": 4.75, "y": 4},
-                {"label": "Lower", "x": 5.75, "y": 4},
-                {"label": "BS", "x": 6.75, "y": 4, "w": 1.5},
-                {"label": "", "x": 9.75, "y": 4, "w": 1.5},
-                {"label": "Raise", "x": 11.25, "y": 4},
-                {"label": "Alt", "x": 12.25, "y": 4},
-                {"label": "OS", "x": 13.25, "y": 4}
+                {"x": 3.75, "y": 4},
+                {"x": 4.75, "y": 4},
+                {"x": 5.75, "y": 4},
+                {"x": 6.75, "y": 4, "w": 1.5},
+                {"x": 9.75, "y": 4, "w": 1.5},
+                {"x": 11.25, "y": 4},
+                {"x": 12.25, "y": 4},
+                {"x": 13.25, "y": 4}
             ]
         },
 
         "LAYOUT_6_8": {
             "layout": [
-                {"label": "~", "x": 2, "y": 0},
-                {"label": "1", "x": 3, "y": 0},
-                {"label": "2", "x": 4, "y": 0},
-                {"label": "3", "x": 5, "y": 0},
-                {"label": "4", "x": 6, "y": 0},
-                {"label": "5", "x": 7, "y": 0},
-                {"label": "6", "x": 10, "y": 0},
-                {"label": "7", "x": 11, "y": 0},
-                {"label": "8", "x": 12, "y": 0},
-                {"label": "9", "x": 13, "y": 0},
-                {"label": "0", "x": 14, "y": 0},
-                {"label": "-", "x": 15, "y": 0},
-                {"label": "=", "x": 16, "y": 0},
-                {"label": "Del", "x": 17, "y": 0},
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
 
-                {"label": "Tab", "x": 2, "y": 1},
-                {"label": "Q", "x": 3, "y": 1},
-                {"label": "W", "x": 4, "y": 1},
-                {"label": "E", "x": 5, "y": 1},
-                {"label": "R", "x": 6, "y": 1},
-                {"label": "T", "x": 7, "y": 1},
-                {"label": "Y", "x": 10, "y": 1},
-                {"label": "U", "x": 11, "y": 1},
-                {"label": "I", "x": 12, "y": 1},
-                {"label": "O", "x": 13, "y": 1},
-                {"label": "P", "x": 14, "y": 1},
-                {"label": "[", "x": 15, "y": 1},
-                {"label": "]", "x": 16, "y": 1},
-                {"label": "\\", "x": 17, "y": 1},
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
 
-                {"label": "Esc", "x": 2, "y": 2},
-                {"label": "A", "x": 3, "y": 2},
-                {"label": "S", "x": 4, "y": 2},
-                {"label": "D", "x": 5, "y": 2},
-                {"label": "F", "x": 6, "y": 2},
-                {"label": "G", "x": 7, "y": 2},
-                {"label": "H", "x": 10, "y": 2},
-                {"label": "J", "x": 11, "y": 2},
-                {"label": "K", "x": 12, "y": 2},
-                {"label": "L", "x": 13, "y": 2},
-                {"label": ";", "x": 14, "y": 2},
-                {"label": "'", "x": 15, "y": 2},
-                {"label": "BS", "x": 16, "y": 2},
-                {"label": "FN", "x": 17, "y": 2},
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
 
-                {"label": "Shift", "x": 2, "y": 3},
-                {"label": "Z", "x": 3, "y": 3},
-                {"label": "X", "x": 4, "y": 3},
-                {"label": "C", "x": 5, "y": 3},
-                {"label": "V", "x": 6, "y": 3},
-                {"label": "B", "x": 7, "y": 3},
-                {"label": "Mute", "x": 8, "y": 3},
-                {"label": "MPLY", "x": 9, "y": 3},
-                {"label": "N", "x": 10, "y": 3},
-                {"label": "M", "x": 11, "y": 3},
-                {"label": ",", "x": 12, "y": 3},
-                {"label": ".", "x": 13, "y": 3},
-                {"label": "/", "x": 14, "y": 3},
-                {"label": "Enter", "x": 15, "y": 3},
-                {"label": "Home", "x": 16, "y": 3},
-                {"label": "End", "x": 17, "y": 3},
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
 
-                {"label": "OS", "x": 3.75, "y": 4},
-                {"label": "Alt", "x": 4.75, "y": 4},
-                {"label": "Lower", "x": 5.75, "y": 4},
-                {"label": "BS", "x": 6.75, "y": 4, "w": 1.5},
-                {"label": "", "x": 9.75, "y": 4, "w": 1.5},
-                {"label": "Raise", "x": 11.25, "y": 4},
-                {"label": "Alt", "x": 12.25, "y": 4},
-                {"label": "OS", "x": 13.25, "y": 4}
+                {"x": 1.75, "y": 4},
+                {"x": 2.75, "y": 4},
+                {"x": 3.75, "y": 4},
+                {"x": 4.75, "y": 4, "w": 1.5},
+                {"x": 7.75, "y": 4, "w": 1.5},
+                {"x": 9.25, "y": 4},
+                {"x": 10.25, "y": 4},
+                {"x": 11.25, "y": 4}
             ]
         },
 
         "LAYOUT_8_6": {
             "layout": [
-                {"label": "F1", "x": 0, "y": 0},
-                {"label": "F2", "x": 1, "y": 0},
-                {"label": "~", "x": 2, "y": 0},
-                {"label": "1", "x": 3, "y": 0},
-                {"label": "2", "x": 4, "y": 0},
-                {"label": "3", "x": 5, "y": 0},
-                {"label": "4", "x": 6, "y": 0},
-                {"label": "5", "x": 7, "y": 0},
-                {"label": "6", "x": 10, "y": 0},
-                {"label": "7", "x": 11, "y": 0},
-                {"label": "8", "x": 12, "y": 0},
-                {"label": "9", "x": 13, "y": 0},
-                {"label": "0", "x": 14, "y": 0},
-                {"label": "Del", "x": 15, "y": 0},
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
 
-                {"label": "F3", "x": 0, "y": 1},
-                {"label": "F4", "x": 1, "y": 1},
-                {"label": "Tab", "x": 2, "y": 1},
-                {"label": "Q", "x": 3, "y": 1},
-                {"label": "W", "x": 4, "y": 1},
-                {"label": "E", "x": 5, "y": 1},
-                {"label": "R", "x": 6, "y": 1},
-                {"label": "T", "x": 7, "y": 1},
-                {"label": "Y", "x": 10, "y": 1},
-                {"label": "U", "x": 11, "y": 1},
-                {"label": "I", "x": 12, "y": 1},
-                {"label": "O", "x": 13, "y": 1},
-                {"label": "P", "x": 14, "y": 1},
-                {"label": "BS", "x": 15, "y": 1},
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
 
-                {"label": "F5", "x": 0, "y": 2},
-                {"label": "F6", "x": 1, "y": 2},
-                {"label": "Esc", "x": 2, "y": 2},
-                {"label": "A", "x": 3, "y": 2},
-                {"label": "S", "x": 4, "y": 2},
-                {"label": "D", "x": 5, "y": 2},
-                {"label": "F", "x": 6, "y": 2},
-                {"label": "G", "x": 7, "y": 2},
-                {"label": "H", "x": 10, "y": 2},
-                {"label": "J", "x": 11, "y": 2},
-                {"label": "K", "x": 12, "y": 2},
-                {"label": "L", "x": 13, "y": 2},
-                {"label": ";", "x": 14, "y": 2},
-                {"label": "'", "x": 15, "y": 2},
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
 
-                {"label": "F7", "x": 0, "y": 3},
-                {"label": "F8", "x": 1, "y": 3},
-                {"label": "Shift", "x": 2, "y": 3},
-                {"label": "Z", "x": 3, "y": 3},
-                {"label": "X", "x": 4, "y": 3},
-                {"label": "C", "x": 5, "y": 3},
-                {"label": "V", "x": 6, "y": 3},
-                {"label": "B", "x": 7, "y": 3},
-                {"label": "Mute", "x": 8, "y": 3},
-                {"label": "MPLY", "x": 9, "y": 3},
-                {"label": "N", "x": 10, "y": 3},
-                {"label": "M", "x": 11, "y": 3},
-                {"label": ",", "x": 12, "y": 3},
-                {"label": ".", "x": 13, "y": 3},
-                {"label": "/", "x": 14, "y": 3},
-                {"label": "Enter", "x": 15, "y": 3},
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
 
-                {"label": "OS", "x": 3.75, "y": 4},
-                {"label": "Alt", "x": 4.75, "y": 4},
-                {"label": "Lower", "x": 5.75, "y": 4},
-                {"label": "BS", "x": 6.75, "y": 4, "w": 1.5},
-                {"label": "", "x": 9.75, "y": 4, "w": 1.5},
-                {"label": "Raise", "x": 11.25, "y": 4},
-                {"label": "Alt", "x": 12.25, "y": 4},
-                {"label": "FN", "x": 13.25, "y": 4}
+                {"x": 3.75, "y": 4},
+                {"x": 4.75, "y": 4},
+                {"x": 5.75, "y": 4},
+                {"x": 6.75, "y": 4, "w": 1.5},
+                {"x": 9.75, "y": 4, "w": 1.5},
+                {"x": 11.25, "y": 4},
+                {"x": 12.25, "y": 4},
+                {"x": 13.25, "y": 4}
             ]
         },
 
         "LAYOUT_6_6": {
             "layout": [
-                {"label": "~", "x": 2, "y": 0},
-                {"label": "1", "x": 3, "y": 0},
-                {"label": "2", "x": 4, "y": 0},
-                {"label": "3", "x": 5, "y": 0},
-                {"label": "4", "x": 6, "y": 0},
-                {"label": "5", "x": 7, "y": 0},
-                {"label": "6", "x": 10, "y": 0},
-                {"label": "7", "x": 11, "y": 0},
-                {"label": "8", "x": 12, "y": 0},
-                {"label": "9", "x": 13, "y": 0},
-                {"label": "0", "x": 14, "y": 0},
-                {"label": "Del", "x": 15, "y": 0},
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
 
-                {"label": "Tab", "x": 2, "y": 1},
-                {"label": "Q", "x": 3, "y": 1},
-                {"label": "W", "x": 4, "y": 1},
-                {"label": "E", "x": 5, "y": 1},
-                {"label": "R", "x": 6, "y": 1},
-                {"label": "T", "x": 7, "y": 1},
-                {"label": "Y", "x": 10, "y": 1},
-                {"label": "U", "x": 11, "y": 1},
-                {"label": "I", "x": 12, "y": 1},
-                {"label": "O", "x": 13, "y": 1},
-                {"label": "P", "x": 14, "y": 1},
-                {"label": "BS", "x": 15, "y": 1},
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
 
-                {"label": "Esc", "x": 2, "y": 2},
-                {"label": "A", "x": 3, "y": 2},
-                {"label": "S", "x": 4, "y": 2},
-                {"label": "D", "x": 5, "y": 2},
-                {"label": "F", "x": 6, "y": 2},
-                {"label": "G", "x": 7, "y": 2},
-                {"label": "H", "x": 10, "y": 2},
-                {"label": "J", "x": 11, "y": 2},
-                {"label": "K", "x": 12, "y": 2},
-                {"label": "L", "x": 13, "y": 2},
-                {"label": ";", "x": 14, "y": 2},
-                {"label": "'", "x": 15, "y": 2},
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
 
-                {"label": "Shift", "x": 2, "y": 3},
-                {"label": "Z", "x": 3, "y": 3},
-                {"label": "X", "x": 4, "y": 3},
-                {"label": "C", "x": 5, "y": 3},
-                {"label": "V", "x": 6, "y": 3},
-                {"label": "B", "x": 7, "y": 3},
-                {"label": "Mute", "x": 8, "y": 3},
-                {"label": "MPLY", "x": 9, "y": 3},
-                {"label": "N", "x": 10, "y": 3},
-                {"label": "M", "x": 11, "y": 3},
-                {"label": ",", "x": 12, "y": 3},
-                {"label": ".", "x": 13, "y": 3},
-                {"label": "/", "x": 14, "y": 3},
-                {"label": "Enter", "x": 15, "y": 3},
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
 
-                {"label": "OS", "x": 3.75, "y": 4},
-                {"label": "Alt", "x": 4.75, "y": 4},
-                {"label": "Lower", "x": 5.75, "y": 4},
-                {"label": "BS", "x": 6.75, "y": 4, "w": 1.5},
-                {"label": "", "x": 9.75, "y": 4, "w": 1.5},
-                {"label": "Raise", "x": 11.25, "y": 4},
-                {"label": "Alt", "x": 12.25, "y": 4},
-                {"label": "FN", "x": 13.25, "y": 4}
+                {"x": 1.75, "y": 4},
+                {"x": 2.75, "y": 4},
+                {"x": 3.75, "y": 4},
+                {"x": 4.75, "y": 4, "w": 1.5},
+                {"x": 7.75, "y": 4, "w": 1.5},
+                {"x": 9.25, "y": 4},
+                {"x": 10.25, "y": 4},
+                {"x": 11.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keyprez/corgi/config.h b/keyboards/keyprez/corgi/config.h
index 081e14372d..b04e4a036e 100644
--- a/keyboards/keyprez/corgi/config.h
+++ b/keyboards/keyprez/corgi/config.h
@@ -17,17 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- */
-#define MATRIX_ROW_PINS { F5, F7, B2, B6, F4, F6, B1, B3 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D2, B7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keyprez/corgi/corgi.c b/keyboards/keyprez/corgi/corgi.c
deleted file mode 100644
index ba64134de9..0000000000
--- a/keyboards/keyprez/corgi/corgi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Christian Sandven
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "corgi.h"
diff --git a/keyboards/keyprez/corgi/info.json b/keyboards/keyprez/corgi/info.json
index f130ae5919..3c952fec99 100644
--- a/keyboards/keyprez/corgi/info.json
+++ b/keyboards/keyprez/corgi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6", "D2", "B7"],
+        "rows": ["F5", "F7", "B2", "B6", "F4", "F6", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D4"}
diff --git a/keyboards/keyprez/rhino/config.h b/keyboards/keyprez/rhino/config.h
index 3ea5c1384d..ce59f90c35 100644
--- a/keyboards/keyprez/rhino/config.h
+++ b/keyboards/keyprez/rhino/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, B2, B6, B1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D3, D2, D4, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define AUDIO_PIN C6
 #define MUSIC_MAP
 
diff --git a/keyboards/keyprez/rhino/info.json b/keyboards/keyprez/rhino/info.json
index f92ce7b0b2..7681489520 100644
--- a/keyboards/keyprez/rhino/info.json
+++ b/keyboards/keyprez/rhino/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D4", "D7", "E6", "B4", "B5"],
+        "rows": ["B3", "B2", "B6", "B1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D1", "pin_b": "D0"}
@@ -19,180 +24,180 @@
     "layouts": {
         "LAYOUT_ortho_2x2u": {
             "layout": [
-                {"x": 12.5, "y": 0},
+                {"matrix": [7, 6], "x": 12.5, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 1},
+                {"matrix": [0, 2], "x": 2.5, "y": 1},
+                {"matrix": [0, 3], "x": 3.5, "y": 1},
+                {"matrix": [0, 4], "x": 4.5, "y": 1},
+                {"matrix": [0, 5], "x": 5.5, "y": 1},
+                {"matrix": [0, 6], "x": 6.5, "y": 1},
+                {"matrix": [4, 0], "x": 7.5, "y": 1},
+                {"matrix": [4, 1], "x": 8.5, "y": 1},
+                {"matrix": [4, 2], "x": 9.5, "y": 1},
+                {"matrix": [4, 3], "x": 10.5, "y": 1},
+                {"matrix": [4, 4], "x": 11.5, "y": 1},
+                {"matrix": [4, 5], "x": 12.5, "y": 1},
+                {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 2},
+                {"matrix": [1, 2], "x": 2.5, "y": 2},
+                {"matrix": [1, 3], "x": 3.5, "y": 2},
+                {"matrix": [1, 4], "x": 4.5, "y": 2},
+                {"matrix": [1, 5], "x": 5.5, "y": 2},
+                {"matrix": [1, 6], "x": 6.5, "y": 2},
+                {"matrix": [5, 0], "x": 7.5, "y": 2},
+                {"matrix": [5, 1], "x": 8.5, "y": 2},
+                {"matrix": [5, 2], "x": 9.5, "y": 2},
+                {"matrix": [5, 3], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [5, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 6], "x": 13.5, "y": 2, "w": 1.5},
 
-                {"x": 0, "y": 3, "w": 1.5},
-                {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 3},
+                {"matrix": [2, 2], "x": 2.5, "y": 3},
+                {"matrix": [2, 3], "x": 3.5, "y": 3},
+                {"matrix": [2, 4], "x": 4.5, "y": 3},
+                {"matrix": [2, 5], "x": 5.5, "y": 3},
+                {"matrix": [2, 6], "x": 6.5, "y": 3},
+                {"matrix": [6, 0], "x": 7.5, "y": 3},
+                {"matrix": [6, 1], "x": 8.5, "y": 3},
+                {"matrix": [6, 2], "x": 9.5, "y": 3},
+                {"matrix": [6, 3], "x": 10.5, "y": 3},
+                {"matrix": [6, 4], "x": 11.5, "y": 3},
+                {"matrix": [6, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.5},
 
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4},
-                {"x": 3.5, "y": 4},
-                {"x": 4.5, "y": 4},
-                {"x": 5.5, "y": 4, "w": 2},
-                {"x": 7.5, "y": 4, "w": 2},
-                {"x": 9.5, "y": 4},
-                {"x": 10.5, "y": 4},
-                {"x": 11.5, "y": 4},
-                {"x": 12.5, "y": 4}
+                {"matrix": [3, 1], "x": 1.5, "y": 4},
+                {"matrix": [3, 2], "x": 2.5, "y": 4},
+                {"matrix": [3, 3], "x": 3.5, "y": 4},
+                {"matrix": [3, 4], "x": 4.5, "y": 4},
+                {"matrix": [3, 6], "x": 5.5, "y": 4, "w": 2},
+                {"matrix": [7, 0], "x": 7.5, "y": 4, "w": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 4},
+                {"matrix": [7, 3], "x": 10.5, "y": 4},
+                {"matrix": [7, 4], "x": 11.5, "y": 4},
+                {"matrix": [7, 5], "x": 12.5, "y": 4}
             ]
         },
 
         "LAYOUT_ergo_2x2u": {
             "layout": [
-                {"x": 12.5, "y": 0},
+                {"matrix": [7, 6], "x": 12.5, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1, "h": 1.5},
-                {"x": 7.5, "y": 1, "h": 1.5},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 1},
+                {"matrix": [0, 2], "x": 2.5, "y": 1},
+                {"matrix": [0, 3], "x": 3.5, "y": 1},
+                {"matrix": [0, 4], "x": 4.5, "y": 1},
+                {"matrix": [0, 5], "x": 5.5, "y": 1},
+                {"matrix": [0, 6], "x": 6.5, "y": 1, "h": 1.5},
+                {"matrix": [4, 0], "x": 7.5, "y": 1, "h": 1.5},
+                {"matrix": [4, 1], "x": 8.5, "y": 1},
+                {"matrix": [4, 2], "x": 9.5, "y": 1},
+                {"matrix": [4, 3], "x": 10.5, "y": 1},
+                {"matrix": [4, 4], "x": 11.5, "y": 1},
+                {"matrix": [4, 5], "x": 12.5, "y": 1},
+                {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2.5, "h": 1.5},
-                {"x": 7.5, "y": 2.5, "h": 1.5},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 2},
+                {"matrix": [1, 2], "x": 2.5, "y": 2},
+                {"matrix": [1, 3], "x": 3.5, "y": 2},
+                {"matrix": [1, 4], "x": 4.5, "y": 2},
+                {"matrix": [1, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5, "h": 1.5},
+                {"matrix": [6, 0], "x": 7.5, "y": 2.5, "h": 1.5},
+                {"matrix": [5, 1], "x": 8.5, "y": 2},
+                {"matrix": [5, 2], "x": 9.5, "y": 2},
+                {"matrix": [5, 3], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [5, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 6], "x": 13.5, "y": 2, "w": 1.5},
 
-                {"x": 0, "y": 3, "w": 1.5},
-                {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 3},
+                {"matrix": [2, 2], "x": 2.5, "y": 3},
+                {"matrix": [2, 3], "x": 3.5, "y": 3},
+                {"matrix": [2, 4], "x": 4.5, "y": 3},
+                {"matrix": [2, 5], "x": 5.5, "y": 3},
+                {"matrix": [6, 1], "x": 8.5, "y": 3},
+                {"matrix": [6, 2], "x": 9.5, "y": 3},
+                {"matrix": [6, 3], "x": 10.5, "y": 3},
+                {"matrix": [6, 4], "x": 11.5, "y": 3},
+                {"matrix": [6, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.5},
 
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4},
-                {"x": 3.5, "y": 4},
-                {"x": 4.5, "y": 4},
-                {"x": 5.5, "y": 4, "w": 2},
-                {"x": 7.5, "y": 4, "w": 2},
-                {"x": 9.5, "y": 4},
-                {"x": 10.5, "y": 4},
-                {"x": 11.5, "y": 4},
-                {"x": 12.5, "y": 4}
+                {"matrix": [3, 1], "x": 1.5, "y": 4},
+                {"matrix": [3, 2], "x": 2.5, "y": 4},
+                {"matrix": [3, 3], "x": 3.5, "y": 4},
+                {"matrix": [3, 4], "x": 4.5, "y": 4},
+                {"matrix": [3, 6], "x": 5.5, "y": 4, "w": 2},
+                {"matrix": [7, 0], "x": 7.5, "y": 4, "w": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 4},
+                {"matrix": [7, 3], "x": 10.5, "y": 4},
+                {"matrix": [7, 4], "x": 11.5, "y": 4},
+                {"matrix": [7, 5], "x": 12.5, "y": 4}
             ]
         },
 
         "LAYOUT_ortho_7u": {
             "layout": [
-                {"x": 12.5, "y": 0},
+                {"matrix": [7, 6], "x": 12.5, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 1},
+                {"matrix": [0, 2], "x": 2.5, "y": 1},
+                {"matrix": [0, 3], "x": 3.5, "y": 1},
+                {"matrix": [0, 4], "x": 4.5, "y": 1},
+                {"matrix": [0, 5], "x": 5.5, "y": 1},
+                {"matrix": [0, 6], "x": 6.5, "y": 1},
+                {"matrix": [4, 0], "x": 7.5, "y": 1},
+                {"matrix": [4, 1], "x": 8.5, "y": 1},
+                {"matrix": [4, 2], "x": 9.5, "y": 1},
+                {"matrix": [4, 3], "x": 10.5, "y": 1},
+                {"matrix": [4, 4], "x": 11.5, "y": 1},
+                {"matrix": [4, 5], "x": 12.5, "y": 1},
+                {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2, "w": 1.5},
-                {"x": 14, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 2},
+                {"matrix": [1, 2], "x": 2.5, "y": 2},
+                {"matrix": [1, 3], "x": 3.5, "y": 2},
+                {"matrix": [1, 4], "x": 4.5, "y": 2},
+                {"matrix": [1, 5], "x": 5.5, "y": 2},
+                {"matrix": [1, 6], "x": 6.5, "y": 2},
+                {"matrix": [5, 0], "x": 7.5, "y": 2},
+                {"matrix": [5, 1], "x": 8.5, "y": 2},
+                {"matrix": [5, 2], "x": 9.5, "y": 2},
+                {"matrix": [5, 3], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [5, 5], "x": 12.5, "y": 2, "w": 1.5},
+                {"matrix": [5, 6], "x": 14, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.5},
-                {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3, "w": 1.5},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 3},
+                {"matrix": [2, 2], "x": 2.5, "y": 3},
+                {"matrix": [2, 3], "x": 3.5, "y": 3},
+                {"matrix": [2, 4], "x": 4.5, "y": 3},
+                {"matrix": [2, 5], "x": 5.5, "y": 3},
+                {"matrix": [2, 6], "x": 6.5, "y": 3},
+                {"matrix": [6, 0], "x": 7.5, "y": 3},
+                {"matrix": [6, 1], "x": 8.5, "y": 3},
+                {"matrix": [6, 2], "x": 9.5, "y": 3},
+                {"matrix": [6, 3], "x": 10.5, "y": 3},
+                {"matrix": [6, 4], "x": 11.5, "y": 3, "w": 1.5},
+                {"matrix": [6, 5], "x": 13, "y": 3},
+                {"matrix": [6, 6], "x": 14, "y": 3},
 
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4}
+                {"matrix": [3, 1], "x": 1.5, "y": 4},
+                {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [7, 4], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [7, 5], "x": 12.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keyprez/rhino/rhino.c b/keyboards/keyprez/rhino/rhino.c
index 31302eff5b..d2e1bf2e23 100644
--- a/keyboards/keyprez/rhino/rhino.c
+++ b/keyboards/keyprez/rhino/rhino.c
@@ -14,13 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rhino.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    tap_code(clockwise ? KC_VOLU : KC_VOLD);
-    return true;
-}
+#include "quantum.h"
+#include QMK_KEYBOARD_H
 
 __attribute__ ((weak))
 const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_ortho_2x2u(
diff --git a/keyboards/keyprez/rhino/rhino.h b/keyboards/keyprez/rhino/rhino.h
deleted file mode 100644
index 1547717a87..0000000000
--- a/keyboards/keyprez/rhino/rhino.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2021 Christian Sandven
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_2x2u( \
-                                                                   k70,   \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \
-         k60, k61, k62, k63,    k64,      k65,   k66, k67, k68, k69       \
-) { \
-    { k00,   k01,   k02, k03, k04, k05,   k06 }, \
-    { k20,   k21,   k22, k23, k24, k25,   k26 },  \
-    { k40,   k41,   k42, k43, k44, k45,   k46 },  \
-    { KC_NO, k60,   k61, k62, k63, KC_NO, k64 },  \
-    { k07,   k08,   k09, k10, k11, k12,   k13 },  \
-    { k27,   k28,   k29, k30, k31, k32,   k33 },  \
-    { k47,   k48,   k49, k50, k51, k52,   k53 },  \
-    { k65,   KC_NO, k66, k67, k68, k69,   k70 }  \
-}
-
-#define LAYOUT_ergo_2x2u( \
-                                                                   k70,   \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \
-    k40, k41, k42, k43, k44, k45,           k48, k49, k50, k51, k52, k53, \
-         k60, k61, k62, k63,   k64,       k65,   k66, k67, k68, k69           \
-) { \
-    { k00,   k01,   k02, k03, k04, k05,   k06   }, \
-    { k20,   k21,   k22, k23, k24, k25,   KC_NO   },  \
-    { k40,   k41,   k42, k43, k44, k45,   k26 },  \
-    { KC_NO, k60,   k61, k62, k63, KC_NO, k64   },  \
-    { k07,   k08,   k09, k10, k11, k12,   k13   },  \
-    { KC_NO,   k28,   k29, k30, k31, k32,   k33   },  \
-    { k27, k48,   k49, k50, k51, k52,   k53   },  \
-    { k65,   KC_NO, k66, k67, k68, k69,   k70   }  \
-}
-
-#define LAYOUT_ortho_7u( \
-                                                                   k65,   \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \
-         k60,    k61,                k62,                k63,   k64       \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06 }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26 },  \
-    { k40,   k41,   k42,   k43,   k44,   k45,   k46 },  \
-    { KC_NO, k60,   k61,   KC_NO, KC_NO, KC_NO, k62 },  \
-    { k07,   k08,   k09,   k10,   k11,   k12,   k13 },  \
-    { k27,   k28,   k29,   k30,   k31,   k32,   k33 },  \
-    { k47,   k48,   k49,   k50,   k51,   k52,   k53 },  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, k63,   k64,   k65 }  \
-}
-
diff --git a/keyboards/keyprez/unicorn/config.h b/keyboards/keyprez/unicorn/config.h
index 80747b54be..76a8890108 100644
--- a/keyboards/keyprez/unicorn/config.h
+++ b/keyboards/keyprez/unicorn/config.h
@@ -3,25 +3,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
 #define MASTER_RIGHT
-#define MATRIX_ROW_PINS { F4, D3, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { F5, B2, B5, D7, B4, B6, E6, D4 }
-#define MATRIX_ROW_PINS_RIGHT { F4, B2, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS_RIGHT { F5, D3, B5, D7, B4, B6, E6, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json
index e3afebbc0f..610413af8a 100644
--- a/keyboards/keyprez/unicorn/info.json
+++ b/keyboards/keyprez/unicorn/info.json
@@ -8,13 +8,24 @@
         "pid": "0x7563",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "B2", "B5", "D7", "B4", "B6", "E6", "D4"],
+        "rows": ["F4", "D3", "F6", "F7", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D4"}
         ]
     },
     "split": {
-        "soft_serial_pin": "D0"
+        "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",
diff --git a/keyboards/keyprez/unicorn/unicorn.c b/keyboards/keyprez/unicorn/unicorn.c
index 0ddd49658b..213ed629ac 100644
--- a/keyboards/keyprez/unicorn/unicorn.c
+++ b/keyboards/keyprez/unicorn/unicorn.c
@@ -2,17 +2,3 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "unicorn.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/keyquest/enclave/config.h b/keyboards/keyquest/enclave/config.h
index 451048ecc8..406f38124a 100644
--- a/keyboards/keyquest/enclave/config.h
+++ b/keyboards/keyquest/enclave/config.h
@@ -13,15 +13,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Keyboard Matrix Assignments*/
-#define MATRIX_ROW_PINS { D6, B6, F5 }
-#define MATRIX_COL_PINS { B4, B7, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB light setup*/
-#define RGB_DI_PIN B5
 #define RGBLED_NUM 2
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/keyquest/enclave/info.json b/keyboards/keyquest/enclave/info.json
index 8fc3055729..fa0aef8b79 100644
--- a/keyboards/keyquest/enclave/info.json
+++ b/keyboards/keyquest/enclave/info.json
@@ -7,6 +7,14 @@
         "pid": "0x0E0E",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B7", "C7"],
+        "rows": ["D6", "B6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/keysofkings/twokey/config.h b/keyboards/keysofkings/twokey/config.h
index 21661d533d..6fea0e2cb6 100755
--- a/keyboards/keysofkings/twokey/config.h
+++ b/keyboards/keysofkings/twokey/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B4, B5 }
-#define MATRIX_COL_PINS { B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -31,7 +23,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/keysofkings/twokey/info.json b/keyboards/keysofkings/twokey/info.json
index 910d8cc0ef..8040b94fac 100644
--- a/keyboards/keysofkings/twokey/info.json
+++ b/keyboards/keysofkings/twokey/info.json
@@ -8,6 +8,14 @@
         "pid": "0xAE12",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B2"],
+        "rows": ["B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D7", "pin_b": "E6", "resolution": 1}
@@ -18,9 +26,10 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0.5, "y": 0},
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5}
             ]
         }
     }
diff --git a/keyboards/keysofkings/twokey/twokey.c b/keyboards/keysofkings/twokey/twokey.c
deleted file mode 100755
index 1668092bf4..0000000000
--- a/keyboards/keysofkings/twokey/twokey.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2020 Keys of Kings
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "twokey.h"
diff --git a/keyboards/keysofkings/twokey/twokey.h b/keyboards/keysofkings/twokey/twokey.h
deleted file mode 100755
index 169bc9eb11..0000000000
--- a/keyboards/keysofkings/twokey/twokey.h
+++ /dev/null
@@ -1,28 +0,0 @@
- /* Copyright 2020 Keys of Kings
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00,      \
-	K10, K11  \
-) { \
-	{ K00,   KC_NO }, \
-	{ K10,   K11 }  \
-}
-
diff --git a/keyboards/keyspensory/kp60/info.json b/keyboards/keyspensory/kp60/info.json
index b066b8767b..05a6f5c8f8 100644
--- a/keyboards/keyspensory/kp60/info.json
+++ b/keyboards/keyspensory/kp60/info.json
@@ -28,7 +28,6 @@
     },
     "rgblight": {
         "led_count": 8,
-        "pin": "F0",
         "hue_steps": 8,
         "saturation_steps": 8,
         "brightness_steps": 8,
@@ -45,6 +44,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h
index 75b25e02c3..adca3366f2 100644
--- a/keyboards/keystonecaps/gameroyadvance/config.h
+++ b/keyboards/keystonecaps/gameroyadvance/config.h
@@ -17,24 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { D4, D0, D1, C6, D7, E6, F4, B2, B6 }
-#define MATRIX_ROW_PINS_RIGHT { D7, E6, B4, B5, B6 }
-#define MATRIX_COL_PINS_RIGHT { C6, D4, D0, D1, B1, F7, F4, F5, F6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,4 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c
index 797f4dba76..70c49ce118 100644
--- a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c
+++ b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c
@@ -16,31 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "gameroyadvance.h"
-
-
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-
-    if (!encoder_update_user(index, clockwise)) { return false; }
-
-    if (index == 0) {
-
-        if (clockwise) {
-
-            tap_code_delay(KC_VOLU, 10);
-
-        } else {
-
-            tap_code_delay(KC_VOLD, 10);
-
-        }
-
-    }
-
-    return true;
-
-}
-
-#endif
diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json
index 7a968deded..19df3b7916 100644
--- a/keyboards/keystonecaps/gameroyadvance/info.json
+++ b/keyboards/keystonecaps/gameroyadvance/info.json
@@ -8,11 +8,19 @@
         "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"}
         ]
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "split": {
         "soft_serial_pin": "D2",
         "encoder": {
@@ -21,6 +29,12 @@
                     {"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",
@@ -28,211 +42,211 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "x": 1,     "y": 0 },
-                { "x": 2,     "y": 0 },
-                { "x": 3,     "y": 0 },
-                { "x": 4,     "y": 0 },
-                { "x": 5,     "y": 0 },
-                { "x": 6,     "y": 0 },
-                { "x": 7,     "y": 0 },
-
-                { "x": 13.75, "y": 0 },
-                { "x": 14.75, "y": 0 },
-                { "x": 15.75, "y": 0 },
-                { "x": 16.75, "y": 0 },
-                { "x": 17.75, "y": 0 },
-                { "x": 18.75, "y": 0 },
-                { "x": 19.75, "y": 0, "w": 2 },
-                
-                { "x": 0.5,   "y": 1, "w": 1.5 },
-                { "x": 2,     "y": 1 },
-                { "x": 3,     "y": 1 },
-                { "x": 4,     "y": 1 },
-                { "x": 5,     "y": 1 },
-                { "x": 6,     "y": 1 },
-                { "x": 7,     "y": 1 },
-
-                { "x": 8.25,  "y": 1 },
-                { "x": 9.25,  "y": 1 },
-
-                { "x": 11,    "y": 1 },
-                { "x": 12,    "y": 1 },
-
-                { "x": 13.75, "y": 1 },
-                { "x": 14.75, "y": 1 },
-                { "x": 15.75, "y": 1 },
-                { "x": 16.75, "y": 1 },
-                { "x": 17.75, "y": 1 },
-                { "x": 18.75, "y": 1 },
-                { "x": 19.75, "y": 1 },
-                { "x": 20.75, "y": 1, "w": 1.5 },
-
-                { "x": 0.5,   "y": 2, "w": 1.75 },
-                { "x": 2.25,  "y": 2 },
-                { "x": 3.25,  "y": 2 },
-                { "x": 4.25,  "y": 2 },
-                { "x": 5.25,  "y": 2 },
-                { "x": 6.25,  "y": 2 },
-
-                { "x": 8.25,  "y": 2 },
-                { "x": 9.25,  "y": 2 },
-
-                { "x": 11,    "y": 2 },
-                { "x": 12,    "y": 2 },
-
-                { "x": 14,    "y": 2 },
-                { "x": 15,    "y": 2 },
-                { "x": 16,    "y": 2 },
-                { "x": 17,    "y": 2 },
-                { "x": 18,    "y": 2 },
-                { "x": 19,    "y": 2 },
-                { "x": 20,    "y": 2, "w": 2.25 },
-
-                { "x": 0.5,   "y": 3, "w": 2.25 },
-                { "x": 2.75,  "y": 3 },
-                { "x": 3.75,  "y": 3 },
-                { "x": 4.75,  "y": 3 },
-                { "x": 5.75,  "y": 3 },
-                { "x": 6.75,  "y": 3 },
-
-                { "x": 8.25,  "y": 3 },
-                { "x": 9.25,  "y": 3 },
-
-                { "x": 11,    "y": 3 },
-                { "x": 12,    "y": 3 },
-
-                { "x": 13.5,  "y": 3 },
-                { "x": 14.5,  "y": 3 },
-                { "x": 15.5,  "y": 3 },
-                { "x": 16.5,  "y": 3 },
-                { "x": 17.5,  "y": 3 },
-                { "x": 18.5,  "y": 3 },
-                { "x": 19.5,  "y": 3, "w": 2.75 },
-
-                { "x": 1,     "y": 4, "w": 1.25 },
-                { "x": 2.25,  "y": 4, "w": 1.25 },
-                { "x": 3.5,   "y": 4, "w": 1.25 },
-                { "x": 4.75,  "y": 4, "w": 1.25 },
-
-                { "x": 7,     "y": 4, "h": 1.5 },
-                { "x": 8,     "y": 4 },
-
-                { "x": 12.25, "y": 4 },
-                { "x": 13.25, "y": 4, "h": 1.5 },
-
-                { "x": 16.75, "y": 4, "w": 1.25 },
-                { "x": 18,    "y": 4, "w": 1.25 },
-                { "x": 19.25, "y": 4, "w": 1.25 },
-                { "x": 20.5,  "y": 4, "w": 1.25 },
-                
-                { "x": 8,     "y": 5, "h": 1.5 },
-                { "x": 12.25, "y": 5, "h": 1.5 }
+                { "x": 0.5, "y": 0 },
+                { "x": 1.5, "y": 0 },
+                { "x": 2.5, "y": 0 },
+                { "x": 3.5, "y": 0 },
+                { "x": 4.5, "y": 0 },
+                { "x": 5.5, "y": 0 },
+                { "x": 6.5, "y": 0 },
+
+                { "x": 13.25, "y": 0 },
+                { "x": 14.25, "y": 0 },
+                { "x": 15.25, "y": 0 },
+                { "x": 16.25, "y": 0 },
+                { "x": 17.25, "y": 0 },
+                { "x": 18.25, "y": 0 },
+                { "x": 19.25, "y": 0, "w": 2 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+
+                { "x": 7.75, "y": 1 },
+                { "x": 8.75, "y": 1 },
+
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+
+                { "x": 13.25, "y": 1 },
+                { "x": 14.25, "y": 1 },
+                { "x": 15.25, "y": 1 },
+                { "x": 16.25, "y": 1 },
+                { "x": 17.25, "y": 1 },
+                { "x": 18.25, "y": 1 },
+                { "x": 19.25, "y": 1 },
+                { "x": 20.25, "y": 1, "w": 1.5 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+
+                { "x": 10.5, "y": 2 },
+                { "x": 11.5, "y": 2 },
+
+                { "x": 13.5, "y": 2 },
+                { "x": 14.5, "y": 2 },
+                { "x": 15.5, "y": 2 },
+                { "x": 16.5, "y": 2 },
+                { "x": 17.5, "y": 2 },
+                { "x": 18.5, "y": 2 },
+                { "x": 19.5, "y": 2, "w": 2.25 },
+
+                { "x": 0, "y": 3, "w": 2.25 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+
+                { "x": 7.75, "y": 3 },
+                { "x": 8.75, "y": 3 },
+
+                { "x": 10.5, "y": 3 },
+                { "x": 11.5, "y": 3 },
+
+                { "x": 13, "y": 3 },
+                { "x": 14, "y": 3 },
+                { "x": 15, "y": 3 },
+                { "x": 16, "y": 3 },
+                { "x": 17, "y": 3 },
+                { "x": 18, "y": 3 },
+                { "x": 19, "y": 3, "w": 2.75 },
+
+                { "x": 0.5, "y": 4, "w": 1.25 },
+                { "x": 1.75, "y": 4, "w": 1.25 },
+                { "x": 3, "y": 4, "w": 1.25 },
+                { "x": 4.25, "y": 4, "w": 1.25 },
+
+                { "x": 6.5, "y": 4, "h": 1.5 },
+                { "x": 7.5, "y": 4 },
+
+                { "x": 11.75, "y": 4 },
+                { "x": 12.75, "y": 4, "h": 1.5 },
+
+                { "x": 16.25, "y": 4, "w": 1.25 },
+                { "x": 17.5, "y": 4, "w": 1.25 },
+                { "x": 18.75, "y": 4, "w": 1.25 },
+                { "x": 20, "y": 4, "w": 1.25 },
+
+                { "x": 7.5, "y": 5, "h": 1.5 },
+                { "x": 11.75, "y": 5, "h": 1.5 }
             ] },
         "LAYOUT_all": {
             "layout": [
-                { "x": 1,     "y": 0 },
-                { "x": 2,     "y": 0 },
-                { "x": 3,     "y": 0 },
-                { "x": 4,     "y": 0 },
-                { "x": 5,     "y": 0 },
-                { "x": 6,     "y": 0 },
-                { "x": 7,     "y": 0 },
-
-                { "x": 13.75, "y": 0 },
-                { "x": 14.75, "y": 0 },
-                { "x": 15.75, "y": 0 },
-                { "x": 16.75, "y": 0 },
-                { "x": 17.75, "y": 0 },
-                { "x": 18.75, "y": 0 },
-                { "x": 19.75, "y": 0 },
-                { "x": 22.75, "y": 0, "w": 2 },
-                { "x": 20.75, "y": 0 },
-
-                { "x": 0.5,   "y": 1, "w": 1.5 },                
-                { "x": 2,     "y": 1 },
-                { "x": 3,     "y": 1 },
-                { "x": 4,     "y": 1 },
-                { "x": 5,     "y": 1 },
-                { "x": 6,     "y": 1 },
-                { "x": 7,     "y": 1 },
-
-                { "x": 8.25,  "y": 1 },
-                { "x": 9.25,  "y": 1 },
-
-                { "x": 11,    "y": 1 },
-                { "x": 12,    "y": 1 },
-
-                { "x": 13.75, "y": 1 },
-                { "x": 14.75, "y": 1 },
-                { "x": 15.75, "y": 1 },
-                { "x": 16.75, "y": 1 },
-                { "x": 17.75, "y": 1 },
-                { "x": 18.75, "y": 1 },
-                { "x": 19.75, "y": 1 },
-                { "x": 20.75, "y": 1, "w": 1.5 },
-
-                { "x": 0.5,   "y": 2, "w": 1.75 },
-                { "x": 2.25,  "y": 2 },
-                { "x": 3.25,  "y": 2 },
-                { "x": 4.25,  "y": 2 },
-                { "x": 5.25,  "y": 2 },
-                { "x": 6.25,  "y": 2 },
-
-                { "x": 8.25,  "y": 2 },
-                { "x": 9.25,  "y": 2 },
-                
-                { "x": 11,    "y": 2 },
-                { "x": 12,    "y": 2 },
-                
-                { "x": 14,    "y": 2 },
-                { "x": 15,    "y": 2 },
-                { "x": 16,    "y": 2 },
-                { "x": 17,    "y": 2 },
-                { "x": 18,    "y": 2 },
-                { "x": 19,    "y": 2 },
-                { "x": 20,    "y": 2, "w": 2.25 },
-
-                { "x": 0.5,   "y": 3, "w": 1.75 },
-                { "x": 1.75,  "y": 3 },
-                { "x": 2.75,  "y": 3 },
-                { "x": 3.75,  "y": 3 },
-                { "x": 4.75,  "y": 3 },
-                { "x": 5.75,  "y": 3 },
-                { "x": 6.75,  "y": 3 },
-                
-                { "x": 8.25,  "y": 3 },
-                { "x": 9.25,  "y": 3 },
-                
-                { "x": 11,    "y": 3 },
-                { "x": 12,    "y": 3 },
-                
-                { "x": 13.5,  "y": 3 },
-                { "x": 14.5,  "y": 3 },
-                { "x": 15.5,  "y": 3 },
-                { "x": 16.5,  "y": 3 },
-                { "x": 17.5,  "y": 3 },
-                { "x": 18.5,  "y": 3 },
-                { "x": 19.5,  "y": 3, "w": 1.75 },
-                { "x": 21.25, "y": 3 },
-
-                { "x": 1,     "y": 4, "w": 1.25 },
-                { "x": 2.25,  "y": 4, "w": 1.25 },
-                { "x": 3.5,   "y": 4, "w": 1.25 },
-                { "x": 4.75,  "y": 4, "w": 1.25 },
-
-                { "x": 7,     "y": 4, "h": 1.5 },
-                { "x": 8,     "y": 4 },
-
-                { "x": 12.25, "y": 4 },
-                { "x": 13.25, "y": 4, "h": 1.5 },
-
-                { "x": 16.75, "y": 4, "w": 1.25 },
-                { "x": 18,    "y": 4, "w": 1.25 },
-                { "x": 19.25, "y": 4, "w": 1.25 },
-                { "x": 20.5,  "y": 4, "w": 1.25 },
-
-                { "x": 8,     "y": 5, "h": 1.5 },
-                { "x": 12.25, "y": 5, "h": 1.5 }
+                { "x": 0.5, "y": 0 },
+                { "x": 1.5, "y": 0 },
+                { "x": 2.5, "y": 0 },
+                { "x": 3.5, "y": 0 },
+                { "x": 4.5, "y": 0 },
+                { "x": 5.5, "y": 0 },
+                { "x": 6.5, "y": 0 },
+
+                { "x": 13.25, "y": 0 },
+                { "x": 14.25, "y": 0 },
+                { "x": 15.25, "y": 0 },
+                { "x": 16.25, "y": 0 },
+                { "x": 17.25, "y": 0 },
+                { "x": 18.25, "y": 0 },
+                { "x": 19.25, "y": 0 },
+                { "x": 22.25, "y": 0, "w": 2 },
+                { "x": 20.25, "y": 0 },
+
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1 },
+                { "x": 2.5, "y": 1 },
+                { "x": 3.5, "y": 1 },
+                { "x": 4.5, "y": 1 },
+                { "x": 5.5, "y": 1 },
+                { "x": 6.5, "y": 1 },
+
+                { "x": 7.75, "y": 1 },
+                { "x": 8.75, "y": 1 },
+
+                { "x": 10.5, "y": 1 },
+                { "x": 11.5, "y": 1 },
+
+                { "x": 13.25, "y": 1 },
+                { "x": 14.25, "y": 1 },
+                { "x": 15.25, "y": 1 },
+                { "x": 16.25, "y": 1 },
+                { "x": 17.25, "y": 1 },
+                { "x": 18.25, "y": 1 },
+                { "x": 19.25, "y": 1 },
+                { "x": 20.25, "y": 1, "w": 1.5 },
+
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+
+                { "x": 7.75, "y": 2 },
+                { "x": 8.75, "y": 2 },
+
+                { "x": 10.5, "y": 2 },
+                { "x": 11.5, "y": 2 },
+
+                { "x": 13.5, "y": 2 },
+                { "x": 14.5, "y": 2 },
+                { "x": 15.5, "y": 2 },
+                { "x": 16.5, "y": 2 },
+                { "x": 17.5, "y": 2 },
+                { "x": 18.5, "y": 2 },
+                { "x": 19.5, "y": 2, "w": 2.25 },
+
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3 },
+                { "x": 2.25, "y": 3 },
+                { "x": 3.25, "y": 3 },
+                { "x": 4.25, "y": 3 },
+                { "x": 5.25, "y": 3 },
+                { "x": 6.25, "y": 3 },
+
+                { "x": 7.75, "y": 3 },
+                { "x": 8.75, "y": 3 },
+
+                { "x": 10.5, "y": 3 },
+                { "x": 11.5, "y": 3 },
+
+                { "x": 13, "y": 3 },
+                { "x": 14, "y": 3 },
+                { "x": 15, "y": 3 },
+                { "x": 16, "y": 3 },
+                { "x": 17, "y": 3 },
+                { "x": 18, "y": 3 },
+                { "x": 19, "y": 3, "w": 1.75 },
+                { "x": 20.75, "y": 3 },
+
+                { "x": 0.5, "y": 4, "w": 1.25 },
+                { "x": 1.75, "y": 4, "w": 1.25 },
+                { "x": 3, "y": 4, "w": 1.25 },
+                { "x": 4.25, "y": 4, "w": 1.25 },
+
+                { "x": 6.5, "y": 4, "h": 1.5 },
+                { "x": 7.5, "y": 4 },
+
+                { "x": 11.75, "y": 4 },
+                { "x": 12.75, "y": 4, "h": 1.5 },
+
+                { "x": 16.25, "y": 4, "w": 1.25 },
+                { "x": 17.5, "y": 4, "w": 1.25 },
+                { "x": 18.75, "y": 4, "w": 1.25 },
+                { "x": 20, "y": 4, "w": 1.25 },
+
+                { "x": 7.5, "y": 5, "h": 1.5 },
+                { "x": 11.75, "y": 5, "h": 1.5 }
             ]
         }
     }
diff --git a/keyboards/keyten/aperture/aperture.c b/keyboards/keyten/aperture/aperture.c
deleted file mode 100644
index 38415add5a..0000000000
--- a/keyboards/keyten/aperture/aperture.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2022 Ivan Gromov (@key10iq)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "aperture.h"
diff --git a/keyboards/keyten/aperture/aperture.h b/keyboards/keyten/aperture/aperture.h
deleted file mode 100644
index 3dd6081f7e..0000000000
--- a/keyboards/keyten/aperture/aperture.h
+++ /dev/null
@@ -1,48 +0,0 @@
- /* Copyright 2022 Ivan Gromov (@key10iq)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* LAYOUT_65_ansi_blocker_tsangan_split_bs
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3C    │3D │3E │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │40   │41 │42   │46                         │4A   │ │4C │4D │4E │
- * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,                K4A,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, XXX, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/keyten/aperture/config.h b/keyboards/keyten/aperture/config.h
deleted file mode 100644
index f8dcf40b0d..0000000000
--- a/keyboards/keyten/aperture/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2022 Ivan Gromov (@key10iq)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, D0, F7, F5, F6 }
-#define MATRIX_COL_PINS { B7, F0, F1, F4, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyten/aperture/info.json b/keyboards/keyten/aperture/info.json
index f848f705b3..4068d852cd 100644
--- a/keyboards/keyten/aperture/info.json
+++ b/keyboards/keyten/aperture/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6501",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "F0", "F1", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["D1", "D0", "F7", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -17,77 +22,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keyten/kt3700/config.h b/keyboards/keyten/kt3700/config.h
deleted file mode 100644
index d4ad24caf5..0000000000
--- a/keyboards/keyten/kt3700/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2022 Ivan Gromov (@key10iq)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B12, B7, B5, B4, B3, A15 }
-#define MATRIX_COL_PINS { B0, B13, B9, B8 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyten/kt3700/info.json b/keyboards/keyten/kt3700/info.json
index 0e4855e1e8..011ce2332e 100644
--- a/keyboards/keyten/kt3700/info.json
+++ b/keyboards/keyten/kt3700/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3700",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B13", "B9", "B8"],
+        "rows": ["B12", "B7", "B5", "B4", "B3", "A15"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
     	"num_lock": "B6"
     },
@@ -18,67 +23,68 @@
 	},
     "community_layouts": ["numpad_6x4", "ortho_6x4"],
     "layouts": {
-		"LAYOUT_numpad_6x4": {
+        "LAYOUT_numpad_6x4": {
             "layout": [
-				{"x":0, "y":0},
-				{"x":1, "y":0},
-				{"x":2, "y":0},
-				{"x":3, "y":0},
-				
-				{"x":0, "y":2},
-				{"x":1, "y":2}, 
-				{"x":2, "y":2}, 
-				{"x":3, "y":2}, 
-				
-				{"x":0, "y":3}, 
-				{"x":1, "y":3}, 
-				{"x":2, "y":3}, 
-				
-				{"x":0, "y":4}, 
-				{"x":1, "y":4}, 
-				{"x":2, "y":4}, 
-				{"x":3, "y":3, "h":2}, 
-				{"x":0, "y":5}, 
-				{"x":1, "y":5}, 
-				{"x":2, "y":5}, 
-				
-				{"x":0, "y":6, "w":2}, 
-				{"x":2, "y":6},
-				{"x":3, "y":5, "h":2}
+                {"matrix": [0, 0], "x": 0, "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": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+                {"matrix": [4, 2], "x": 2, "y": 5},
+
+                {"matrix": [5, 1], "x": 0, "y": 6, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 6},
+                {"matrix": [5, 3], "x": 3, "y": 5, "h": 2}
             ]
         },
-		"LAYOUT_ortho_6x4": {
+        "LAYOUT_ortho_6x4": {
             "layout": [
-				{"x":0, "y":0},
-				{"x":1, "y":0}, 
-				{"x":2, "y":0}, 
-				{"x":3, "y":0}, 
-				
-				{"x":0, "y":2}, 
-				{"x":1, "y":2}, 
-				{"x":2, "y":2}, 
-				{"x":3, "y":2}, 
-				
-				{"x":0, "y":3}, 
-				{"x":1, "y":3}, 
-				{"x":2, "y":3}, 
-				{"x":3, "y":3}, 
-				
-				{"x":0, "y":4}, 
-				{"x":1, "y":4}, 
-				{"x":2, "y":4}, 
-				{"x":3, "y":4},
-				
-				{"x":0, "y":5}, 
-				{"x":1, "y":5}, 
-				{"x":2, "y":5}, 
-				{"x":3, "y":5}, 
-				
-				{"x":0, "y":6}, 
-				{"x":1, "y":6}, 
-				{"x":2, "y":6}, 
-				{"x":3, "y":6}
-			]
+                {"matrix": [0, 0], "x": 0, "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": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+                {"matrix": [4, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 5},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+                {"matrix": [5, 2], "x": 2, "y": 6},
+                {"matrix": [5, 3], "x": 3, "y": 6}
+            ]
         }
     }
 }
diff --git a/keyboards/keyten/kt3700/kt3700.c b/keyboards/keyten/kt3700/kt3700.c
deleted file mode 100644
index 63596e1d21..0000000000
--- a/keyboards/keyten/kt3700/kt3700.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Ivan Gromov (@key10iq)
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#include "kt3700.h"
diff --git a/keyboards/keyten/kt3700/kt3700.h b/keyboards/keyten/kt3700/kt3700.h
deleted file mode 100644
index 7b65d4ba71..0000000000
--- a/keyboards/keyten/kt3700/kt3700.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright 2022 Ivan Gromov (@key10iq)
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* LAYOUT_numpad_6x4
- * ┌───┬───┬───┬───�
- * │00 │01 │02 │03 │
- * ├───┴───┴───┴───┤
- * │               │
- * ├───┬───┬───┬───┤
- * │10 │11 │12 │13 │   
- * ├───┼───┼───┼───┤
- * │20 │21 │22 │   │
- * ├───┼───┼───┤33 │
- * │30 │31 │32 │   │
- * ├───┼───┼───┼───┤
- * │40 │41 │42 │   │
- * ├───┴───┼───┤53 │
- * │  51   │52 │   │
- * └───────┴───┴───┘
- */
-#define LAYOUT_numpad_6x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22,      \
-	K30, K31, K32, K33, \
-	K40, K41, K42,      \
-	     K51, K52, K53  \
-) { \
-	{ K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, XXX }, \
-	{ K30, K31, K32, K33 }, \
-	{ K40, K41, K42, XXX }, \
-	{ XXX, K51, K52, K53 }  \
-}
-
-/* LAYOUT_ortho_6x4
- * ┌───┬───┬───┬───�
- * │00 │01 │02 │03 │
- * ├───┴───┴───┴───┤
- * │               │
- * ├───┬───┬───┬───┤
- * │10 │11 │12 │13 │   
- * ├───┼───┼───┼───┤
- * │20 │21 │22 │23 │
- * ├───┼───┼───┼───┤
- * │30 │31 │32 │33 │
- * ├───┼───┼───┼───┤
- * │40 │41 │42 │43 │
- * ├───┼───┼───┼───┤
- * │50 │51 │52 │53 │
- * └───┴───┴───┴───┘
- */
-#define LAYOUT_ortho_6x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33, \
-	K40, K41, K42, K43, \
-	K50, K51, K52, K53  \
-) { \
-	{ K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, K23 }, \
-	{ K30, K31, K32, K33 }, \
-	{ K40, K41, K42, K43 }, \
-	{ K50, K51, K52, K53 }  \
-}
diff --git a/keyboards/keyten/kt60_m/config.h b/keyboards/keyten/kt60_m/config.h
deleted file mode 100644
index 1698a92d07..0000000000
--- a/keyboards/keyten/kt60_m/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2022 Ivan Gromov (@key10iq)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C7, C6, B6, F7, F6 }
-#define MATRIX_COL_PINS { B7, F0, F1, F4, F5, D1, D2, D3, D5, D4, D6, D7, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyten/kt60_m/info.json b/keyboards/keyten/kt60_m/info.json
index 7babb7d087..aaff7671b0 100644
--- a/keyboards/keyten/kt60_m/info.json
+++ b/keyboards/keyten/kt60_m/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "F0", "F1", "F4", "F5", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["C7", "C6", "B6", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/keyten/kt60_m/kt60_m.c b/keyboards/keyten/kt60_m/kt60_m.c
deleted file mode 100644
index 7d4f7614c8..0000000000
--- a/keyboards/keyten/kt60_m/kt60_m.c
+++ /dev/null
@@ -1,18 +0,0 @@
- /* Copyright 2022 Ivan Gromov (@key10iq)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-
-#include "kt60_m.h"
\ No newline at end of file
diff --git a/keyboards/kikkou/config.h b/keyboards/kikkou/config.h
deleted file mode 100644
index 614382f7c9..0000000000
--- a/keyboards/kikkou/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2021 Matthew Dias
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, E6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
diff --git a/keyboards/kikkou/info.json b/keyboards/kikkou/info.json
index 3d27cecac5..ff891e8688 100644
--- a/keyboards/kikkou/info.json
+++ b/keyboards/kikkou/info.json
@@ -8,14 +8,162 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
+        "rows": ["F0", "F1", "F4", "F5", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"0,14", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,14", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"2,14", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"0,14", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,14", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"2,14", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.5}, {"label":"4,1", "x":1.5, "y":4}, {"label":"4,2", "x":2.5, "y":4, "w":1.5}, {"label":"4,6", "x":4, "y":4, "w":7}, {"label":"4,11", "x":11, "y":4, "w":1.5}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/kikkou/kikkou.c b/keyboards/kikkou/kikkou.c
deleted file mode 100644
index 704934ace2..0000000000
--- a/keyboards/kikkou/kikkou.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Matthew Dias
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "kikkou.h"
diff --git a/keyboards/kikkou/kikkou.h b/keyboards/kikkou/kikkou.h
deleted file mode 100644
index 7a65880839..0000000000
--- a/keyboards/kikkou/kikkou.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2021 Matthew Dias
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi_blocker( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-	K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-	{ K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-	{ K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-	K40, K41, K42,                K46,                     K4B, K4C, K4D, K4E  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-	{ K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-	{ K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/kikoslab/ellora65/config.h b/keyboards/kikoslab/ellora65/config.h
index 1243e775d3..c6fba5ebcf 100644
--- a/keyboards/kikoslab/ellora65/config.h
+++ b/keyboards/kikoslab/ellora65/config.h
@@ -17,15 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B7, B2, F1, F4, D6, D7, D5, D4, D3, D2 }
-#define MATRIX_COL_PINS { F5, F6, F7, C6, B6, B5, B4, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /*RGB TINGS*/
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 12
diff --git a/keyboards/kikoslab/ellora65/ellora65.c b/keyboards/kikoslab/ellora65/ellora65.c
deleted file mode 100644
index 8ef707c2d8..0000000000
--- a/keyboards/kikoslab/ellora65/ellora65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "ellora65.h"
diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json
index 2fae750985..8b8c83fbbc 100644
--- a/keyboards/kikoslab/ellora65/info.json
+++ b/keyboards/kikoslab/ellora65/info.json
@@ -8,11 +8,19 @@
         "pid": "0xE88F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "C6", "B6", "B5", "B4", "B3"],
+        "rows": ["B7", "B2", "F1", "F4", "D6", "D7", "D5", "D4", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "B1"}
         ]
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "bootmagic": {
         "matrix": [1, 0]
     },
diff --git a/keyboards/kikoslab/kl90/config.h b/keyboards/kikoslab/kl90/config.h
index f5f54eee2c..9987ae161e 100644
--- a/keyboards/kikoslab/kl90/config.h
+++ b/keyboards/kikoslab/kl90/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { F1, F3, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { F2, F0, A2, A1, A0, D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define EMCODER_DIRECTION_FLIP
 
 /*EEPROM for via*/
diff --git a/keyboards/kikoslab/kl90/info.json b/keyboards/kikoslab/kl90/info.json
index f063fd2323..47141fbdd8 100644
--- a/keyboards/kikoslab/kl90/info.json
+++ b/keyboards/kikoslab/kl90/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEA53",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F2", "F0", "A2", "A1", "A0", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2"],
+        "rows": ["F1", "F3", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A3", "pin_b": "A4"},
diff --git a/keyboards/kikoslab/kl90/kl90.c b/keyboards/kikoslab/kl90/kl90.c
deleted file mode 100644
index d592f90255..0000000000
--- a/keyboards/kikoslab/kl90/kl90.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "kl90.h"
diff --git a/keyboards/kin80/blackpill103/blackpill103.c b/keyboards/kin80/blackpill103/blackpill103.c
index c8fd4e5822..e06ad44748 100644
--- a/keyboards/kin80/blackpill103/blackpill103.c
+++ b/keyboards/kin80/blackpill103/blackpill103.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "blackpill103.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   /* LED pins setup */
diff --git a/keyboards/kin80/blackpill103/blackpill103.h b/keyboards/kin80/blackpill103/blackpill103.h
deleted file mode 100644
index 06cc42ba83..0000000000
--- a/keyboards/kin80/blackpill103/blackpill103.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "kin80.h"
diff --git a/keyboards/kin80/blackpill103/config.h b/keyboards/kin80/blackpill103/config.h
index 4dd744162d..80b10df085 100644
--- a/keyboards/kin80/blackpill103/config.h
+++ b/keyboards/kin80/blackpill103/config.h
@@ -17,13 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-//v.1.0
-//#define MATRIX_ROW_PINS { B8, B9, C13, B7, B6, B4, B3 }
-//v.1.1
-#define MATRIX_ROW_PINS { B8, B9, C13, B7, B6, B5, B4 }
-#define MATRIX_COL_PINS { A6, A7, B0, B1, B10, B11, A0, A1, A2, A3, A4, A5 }
-
 #define LED4_PIN A8
diff --git a/keyboards/kin80/blackpill103/info.json b/keyboards/kin80/blackpill103/info.json
index c1df5ed549..79dd6fa7f6 100644
--- a/keyboards/kin80/blackpill103/info.json
+++ b/keyboards/kin80/blackpill103/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "B1", "B10", "B11", "A0", "A1", "A2", "A3", "A4", "A5"],
+        "rows": ["B8", "B9", "C13", "B7", "B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B13",
         "num_lock": "B14",
diff --git a/keyboards/kin80/blackpill401/blackpill401.c b/keyboards/kin80/blackpill401/blackpill401.c
index 26f32d85e0..e06ad44748 100644
--- a/keyboards/kin80/blackpill401/blackpill401.c
+++ b/keyboards/kin80/blackpill401/blackpill401.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "blackpill401.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   /* LED pins setup */
diff --git a/keyboards/kin80/blackpill401/blackpill401.h b/keyboards/kin80/blackpill401/blackpill401.h
deleted file mode 100644
index 06cc42ba83..0000000000
--- a/keyboards/kin80/blackpill401/blackpill401.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "kin80.h"
diff --git a/keyboards/kin80/blackpill401/config.h b/keyboards/kin80/blackpill401/config.h
index f1b9307f24..efacfc10d4 100644
--- a/keyboards/kin80/blackpill401/config.h
+++ b/keyboards/kin80/blackpill401/config.h
@@ -17,10 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A8, B5 }
-#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A5, A6, A7, B0, B1, B10 }
-
 #define LED4_PIN A15
diff --git a/keyboards/kin80/blackpill401/info.json b/keyboards/kin80/blackpill401/info.json
index 8098ac1a2f..7591d3f39c 100644
--- a/keyboards/kin80/blackpill401/info.json
+++ b/keyboards/kin80/blackpill401/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],
+        "rows": ["A4", "B12", "B13", "B14", "B15", "A8", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C13",
         "num_lock": "B4",
diff --git a/keyboards/kin80/blackpill411/blackpill411.c b/keyboards/kin80/blackpill411/blackpill411.c
index 1b68dfc2d3..012a434e41 100644
--- a/keyboards/kin80/blackpill411/blackpill411.c
+++ b/keyboards/kin80/blackpill411/blackpill411.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "blackpill411.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   /* LED pins setup */
diff --git a/keyboards/kin80/blackpill411/blackpill411.h b/keyboards/kin80/blackpill411/blackpill411.h
deleted file mode 100644
index 06cc42ba83..0000000000
--- a/keyboards/kin80/blackpill411/blackpill411.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "kin80.h"
diff --git a/keyboards/kin80/blackpill411/config.h b/keyboards/kin80/blackpill411/config.h
index f1b9307f24..efacfc10d4 100644
--- a/keyboards/kin80/blackpill411/config.h
+++ b/keyboards/kin80/blackpill411/config.h
@@ -17,10 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A8, B5 }
-#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A5, A6, A7, B0, B1, B10 }
-
 #define LED4_PIN A15
diff --git a/keyboards/kin80/blackpill411/info.json b/keyboards/kin80/blackpill411/info.json
index 3ad449e464..a1486351ed 100644
--- a/keyboards/kin80/blackpill411/info.json
+++ b/keyboards/kin80/blackpill411/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],
+        "rows": ["A4", "B12", "B13", "B14", "B15", "A8", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C13",
         "num_lock": "B4",
diff --git a/keyboards/kin80/info.json b/keyboards/kin80/info.json
index a8d846340e..86a805519e 100644
--- a/keyboards/kin80/info.json
+++ b/keyboards/kin80/info.json
@@ -7,7 +7,6 @@
         "pid": "0x4B4E"
     },
     "manufacturer": "Quartz64",
-    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kin80/kin80.c b/keyboards/kin80/kin80.c
deleted file mode 100644
index 89b46c340e..0000000000
--- a/keyboards/kin80/kin80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kin80.h"
diff --git a/keyboards/kin80/micro/config.h b/keyboards/kin80/micro/config.h
index c55fffe1e0..7d514bd3c3 100644
--- a/keyboards/kin80/micro/config.h
+++ b/keyboards/kin80/micro/config.h
@@ -17,7 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B6, B3, B1, D6, B7, B5, D1 }
-#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0, F7, F6, F5, F4, F1, F0 }
-
 #define LED4_PIN B2
diff --git a/keyboards/kin80/micro/info.json b/keyboards/kin80/micro/info.json
index 173b5eff4d..1f711fa8cb 100644
--- a/keyboards/kin80/micro/info.json
+++ b/keyboards/kin80/micro/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "E6", "D7", "C6", "D4", "D0", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B6", "B3", "B1", "D6", "B7", "B5", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0",
         "num_lock": "D2",
diff --git a/keyboards/kin80/micro/micro.c b/keyboards/kin80/micro/micro.c
index 264d1a8577..e06ad44748 100644
--- a/keyboards/kin80/micro/micro.c
+++ b/keyboards/kin80/micro/micro.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "micro.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   /* LED pins setup */
diff --git a/keyboards/kin80/micro/micro.h b/keyboards/kin80/micro/micro.h
deleted file mode 100644
index 6efe88e663..0000000000
--- a/keyboards/kin80/micro/micro.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "kin80.h"
-
diff --git a/keyboards/kindakeyboards/conone65/config.h b/keyboards/kindakeyboards/conone65/config.h
index 3780553ea1..d3147b115a 100644
--- a/keyboards/kindakeyboards/conone65/config.h
+++ b/keyboards/kindakeyboards/conone65/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS {D5,D3,E6,D1,D2}
-#define MATRIX_COL_PINS {B7,F7,D4,D6,D7,B4,B5,B6,C6,C7,F6,F5,F4,F1,F0,D0}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kindakeyboards/conone65/conone65.c b/keyboards/kindakeyboards/conone65/conone65.c
deleted file mode 100644
index 950786542b..0000000000
--- a/keyboards/kindakeyboards/conone65/conone65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Kindakeyboards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "conone65.h"
diff --git a/keyboards/kindakeyboards/conone65/conone65.h b/keyboards/kindakeyboards/conone65/conone65.h
deleted file mode 100644
index d4bbe924c0..0000000000
--- a/keyboards/kindakeyboards/conone65/conone65.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Copyright 2021 Kindakeyboards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define ___ KC_NO
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3d, k3e, \
-    k40, k41, k42,      k44,      k46,      k48, k49, k4a, k4b, k4c,      k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, ___}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, k44, ___, k46, ___, k48, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
-}
-
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, ___}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, k2e, ___}, \
-    {k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
-}
-
-#define LAYOUT_65_ansi_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, k2e, ___}, \
-    {k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
-}
-
-#define LAYOUT_65_ansi_split_bs_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,      k44,      k46,      k48, k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, k2e, ___}, \
-    {k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, k44, ___, k46, ___, k48, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
-}
-
-#define LAYOUT_65_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, ___}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, ___}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
-}
-
-#define LAYOUT_65_iso_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, ___}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
-}
-
-#define LAYOUT_65_iso_split_bs_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,      k44,      k46,      k48, k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, ___}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, ___}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
-    {k40, k41, k42, ___, k44, ___, k46, ___, k48, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
-}
diff --git a/keyboards/kindakeyboards/conone65/info.json b/keyboards/kindakeyboards/conone65/info.json
index e1dfa932f5..6639665ba9 100644
--- a/keyboards/kindakeyboards/conone65/info.json
+++ b/keyboards/kindakeyboards/conone65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6AAB",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F6", "F5", "F4", "F1", "F0", "D0"],
+        "rows": ["D5", "D3", "E6", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "D5",
         "esc_output": "B7"
@@ -18,522 +23,550 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":2, "w":1.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":2.25},
-                {"x":6, "y":4, "w":1.25},
-                {"x":7.25, "y":4, "w":2.75},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 15], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 15], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":2.25},
-                {"x":6, "y":4, "w":1.25},
-                {"x":7.25, "y":4, "w":2.75},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 15], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 15], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_split_bs_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":2.25},
-                {"x":6, "y":4, "w":1.25},
-                {"x":7.25, "y":4, "w":2.75},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 15], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kinesis/alvicstep/alvicstep.c b/keyboards/kinesis/alvicstep/alvicstep.c
index a2a62df36a..274ac083c5 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.c
+++ b/keyboards/kinesis/alvicstep/alvicstep.c
@@ -1,4 +1,4 @@
-#include "kinesis.h"
+#include "alvicstep.h"
 
 // begin section origin  https://github.com/alvicstep/tmk_keyboard 
 
diff --git a/keyboards/kinesis/alvicstep/alvicstep.h b/keyboards/kinesis/alvicstep/alvicstep.h
index 053698770a..3b71e51678 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.h
+++ b/keyboards/kinesis/alvicstep/alvicstep.h
@@ -1,6 +1,13 @@
 #pragma once
 
-#include "../kinesis.h"
+#include "quantum.h"
+
+void all_led_off(void);
+void all_led_on(void);
+void num_lock_led_on(void);
+void caps_lock_led_on(void);
+void scroll_lock_led_on(void);
+void keypad_led_on(void);
 
 #define ___ KC_NO
 
diff --git a/keyboards/kinesis/alvicstep/config.h b/keyboards/kinesis/alvicstep/config.h
index 905c95a272..bb3357ea57 100644
--- a/keyboards/kinesis/alvicstep/config.h
+++ b/keyboards/kinesis/alvicstep/config.h
@@ -1,26 +1,5 @@
 #pragma once
 
-#include "../config.h"
-
 /* key matrix size */
 #define MATRIX_ROWS 16
 #define MATRIX_COLS  8 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-//Passed through the port multipler, so 4 pins =16
-#define MATRIX_ROW_PINS { F0, F1, F2, F3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-// May be upside down. 
-#define MATRIX_COL_PINS { B0,B1, B2, B3, B4, B5, B6, B7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/config.h b/keyboards/kinesis/keymaps/insertsnideremarks/config.h
index 053a291b7c..7749c523f3 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/config.h
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/config.h
@@ -5,7 +5,6 @@
 #include "../../config.h"
 
 // place overrides here
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 150
 #define TAPPING_TOGGLE 2
 
diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/config.h b/keyboards/kinesis/keymaps/tuesdayjohn/config.h
index ebed17fede..b0816d6ae5 100644
--- a/keyboards/kinesis/keymaps/tuesdayjohn/config.h
+++ b/keyboards/kinesis/keymaps/tuesdayjohn/config.h
@@ -1,6 +1,5 @@
 #pragma once
 
 // place overrides here
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 175
 #define TAPPING_TOGGLE 2
diff --git a/keyboards/kinesis/kinesis.c b/keyboards/kinesis/kinesis.c
deleted file mode 100644
index 7a6a1be544..0000000000
--- a/keyboards/kinesis/kinesis.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kinesis.h"
diff --git a/keyboards/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h
deleted file mode 100644
index e3345ee27f..0000000000
--- a/keyboards/kinesis/kinesis.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_kinesis_alvicstep)
-#    include "alvicstep.h"
-#elif defined(KEYBOARD_kinesis_stapelberg)
-#    include "stapelberg.h"
-#elif defined(KEYBOARD_kinesis_kint2pp)
-#    include "kint2pp.h"
-#elif defined(KEYBOARD_kinesis_nguyenvietyen)
-#    include "nguyenvietyen.h"
-#elif defined(KEYBOARD_kinesis_kint36)
-#    include "kint36.h"
-#elif defined(KEYBOARD_kinesis_kint41)
-#    include "kint41.h"
-#elif defined(KEYBOARD_kinesis_kintlc)
-#    include "kintlc.h"
-#endif
-
-#include "quantum.h"
-
-void all_led_off(void);
-void all_led_on(void);
-void num_lock_led_on(void);
-void caps_lock_led_on(void);
-void scroll_lock_led_on(void);
-void keypad_led_on(void);
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index c9d69dbf48..b81985f1ef 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -1,24 +1,5 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D7, E0, E1, C0, C6, F6, D4, D2, D3, D0, B7, D1, E6, B4, B2 }
-#define MATRIX_COL_PINS { E7, F0, F7, B1, B3, B0, D5 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as
 // per https://www.pjrc.com/teensy/low_power.html
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json
index 9619fe05b6..66d27b5f98 100644
--- a/keyboards/kinesis/kint2pp/info.json
+++ b/keyboards/kinesis/kint2pp/info.json
@@ -6,6 +6,11 @@
         "pid": "0x6060",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["E7", "F0", "F7", "B1", "B3", "B0", "D5"],
+        "rows": ["D7", "E0", "E1", "C0", "C6", "F6", "D4", "D2", "D3", "D0", "B7", "D1", "E6", "B4", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C1",
         "num_lock": "C5",
diff --git a/keyboards/kinesis/kint2pp/kint2pp.c b/keyboards/kinesis/kint2pp/kint2pp.c
deleted file mode 100644
index 856e29c31e..0000000000
--- a/keyboards/kinesis/kint2pp/kint2pp.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kint2pp.h"
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index 8837f51ff9..8b291df88e 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, C3, C4, C6, D2, B0, D7, A12, A13, B17, B16, D0, B1, C2, D6 }
-#define MATRIX_COL_PINS { B3, D1, C0, D5, C1, B2, D4 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // The Teensy 3.6 consumes about 80 mA of current at its full speed of 180 MHz:
 // https://forum.pjrc.com/threads/47256-What-is-the-power-consumption-of-the-Teensy-3-6
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index 8224abbe98..ac7c0dae98 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -6,6 +6,11 @@
         "pid": "0x345C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "D1", "C0", "D5", "C1", "B2", "D4"],
+        "rows": ["D3", "C3", "C4", "C6", "D2", "B0", "D7", "A12", "A13", "B17", "B16", "D0", "B1", "C2", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7",
         "num_lock": "A14",
diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h
index 8f29bdc498..74d1a8a78f 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -16,52 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS               \
-    {                                 \
-        LINE_PIN8,      /* ROW_EQL */ \
-            LINE_PIN9,  /* ROW_1 */   \
-            LINE_PIN10, /* ROW_2 */   \
-            LINE_PIN11, /* ROW_3 */   \
-            LINE_PIN7,  /* ROW_4 */   \
-            LINE_PIN16, /* ROW_5 */   \
-            LINE_PIN5,  /* ROW_6 */   \
-            LINE_PIN3,  /* ROW_7 */   \
-            LINE_PIN4,  /* ROW_8 */   \
-            LINE_PIN1,  /* ROW_9 */   \
-            LINE_PIN0,  /* ROW_0 */   \
-            LINE_PIN2,  /* ROW_MIN */ \
-            LINE_PIN17, /* ROW_ESC */ \
-            LINE_PIN23, /* ROW_F1 */  \
-            LINE_PIN21 /* ROW_F2 */  \
-    }
-
-#define MATRIX_COL_PINS             \
-    {                               \
-        LINE_PIN18,     /* COL_0 */ \
-            LINE_PIN14, /* COL_1 */ \
-            LINE_PIN15, /* COL_2 */ \
-            LINE_PIN20, /* COL_3 */ \
-            LINE_PIN22, /* COL_4 */ \
-            LINE_PIN19, /* COL_5 */ \
-            LINE_PIN6   /* COL_6 */ \
-    }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // The Teensy 4.1 consumes about 100 mA of current at its full speed of 600 MHz
 // as per https://www.pjrc.com/store/teensy41.html
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json
index 716275ad3a..0e25a46739 100644
--- a/keyboards/kinesis/kint41/info.json
+++ b/keyboards/kinesis/kint41/info.json
@@ -6,6 +6,11 @@
         "pid": "0x345C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"],
+        "rows": ["LINE_PIN8", "LINE_PIN9", "LINE_PIN10", "LINE_PIN11", "LINE_PIN7", "LINE_PIN16", "LINE_PIN5", "LINE_PIN3", "LINE_PIN4", "LINE_PIN1", "LINE_PIN0", "LINE_PIN2", "LINE_PIN17", "LINE_PIN23", "LINE_PIN21"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "LINE_PIN12",
         "num_lock": "LINE_PIN26",
diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h
index 1939ac4e57..a5610a4c8c 100644
--- a/keyboards/kinesis/kintlc/config.h
+++ b/keyboards/kinesis/kintlc/config.h
@@ -16,52 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS               \
-    {                                 \
-        LINE_PIN8,      /* ROW_EQL */ \
-            LINE_PIN9,  /* ROW_1 */   \
-            LINE_PIN10, /* ROW_2 */   \
-            LINE_PIN11, /* ROW_3 */   \
-            LINE_PIN7,  /* ROW_4 */   \
-            LINE_PIN16, /* ROW_5 */   \
-            LINE_PIN5,  /* ROW_6 */   \
-            LINE_PIN3,  /* ROW_7 */   \
-            LINE_PIN4,  /* ROW_8 */   \
-            LINE_PIN1,  /* ROW_9 */   \
-            LINE_PIN0,  /* ROW_0 */   \
-            LINE_PIN2,  /* ROW_MIN */ \
-            LINE_PIN17, /* ROW_ESC */ \
-            LINE_PIN23, /* ROW_F1 */  \
-            LINE_PIN21 /* ROW_F2 */  \
-    }
-
-#define MATRIX_COL_PINS             \
-    {                               \
-        LINE_PIN18,     /* COL_0 */ \
-            LINE_PIN14, /* COL_1 */ \
-            LINE_PIN15, /* COL_2 */ \
-            LINE_PIN20, /* COL_3 */ \
-            LINE_PIN22, /* COL_4 */ \
-            LINE_PIN19, /* COL_5 */ \
-            LINE_PIN6   /* COL_6 */ \
-    }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // The Teensy LC power consumption is unknown as per
 // https://www.pjrc.com/store/teensylc.html but since
 // https://www.pjrc.com/store/teensy41.html says 100mA, let's go with half.
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json
index 7309fc778f..2bbbd3eb30 100644
--- a/keyboards/kinesis/kintlc/info.json
+++ b/keyboards/kinesis/kintlc/info.json
@@ -6,6 +6,11 @@
         "pid": "0x345C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"],
+        "rows": ["LINE_PIN8", "LINE_PIN9", "LINE_PIN10", "LINE_PIN11", "LINE_PIN7", "LINE_PIN16", "LINE_PIN5", "LINE_PIN3", "LINE_PIN4", "LINE_PIN1", "LINE_PIN0", "LINE_PIN2", "LINE_PIN17", "LINE_PIN23", "LINE_PIN21"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "LINE_PIN12",
         "scroll_lock": "LINE_PIN25",
diff --git a/keyboards/kinesis/nguyenvietyen/config.h b/keyboards/kinesis/nguyenvietyen/config.h
index c6798eb951..f4d3af8dbd 100644
--- a/keyboards/kinesis/nguyenvietyen/config.h
+++ b/keyboards/kinesis/nguyenvietyen/config.h
@@ -3,20 +3,3 @@
 /* key matrix size */
 #define MATRIX_ROWS 16
 #define MATRIX_COLS 8
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-// Passed through the port multipler, so 4 pins =16
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c b/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c
deleted file mode 100644
index 3f01479389..0000000000
--- a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "nguyenvietyen.h"
diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h
index 6d8c61e8f6..a3ae6615ac 100644
--- a/keyboards/kinesis/stapelberg/config.h
+++ b/keyboards/kinesis/stapelberg/config.h
@@ -1,28 +1,8 @@
 #pragma once
 
-#include "../config.h"
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D4, D5, D6, D7, C0, C1, C2, C3, C4, C5, C6 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* don't know if this should be defined at the board or top level. Assuming board 
 #define MOUSEKEY_DELAY          100
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_MAX_SPEED      3
 #define MOUSEKEY_TIME_TO_MAX    10
 */
-
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json
index 37f05a49f4..0224dd6393 100644
--- a/keyboards/kinesis/stapelberg/info.json
+++ b/keyboards/kinesis/stapelberg/info.json
@@ -6,6 +6,11 @@
         "pid": "0x6060",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"],
+        "rows": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F3",
         "num_lock": "F2",
diff --git a/keyboards/kinesis/stapelberg/stapelberg.c b/keyboards/kinesis/stapelberg/stapelberg.c
deleted file mode 100644
index a69679eef9..0000000000
--- a/keyboards/kinesis/stapelberg/stapelberg.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "stapelberg.h"
diff --git a/keyboards/kineticlabs/emu/hotswap/config.h b/keyboards/kineticlabs/emu/hotswap/config.h
deleted file mode 100644
index e247d2cc2e..0000000000
--- a/keyboards/kineticlabs/emu/hotswap/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { E6, D4, B3, B1, B0, B7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kineticlabs/emu/hotswap/hotswap.c b/keyboards/kineticlabs/emu/hotswap/hotswap.c
deleted file mode 100644
index 8b26d5cd84..0000000000
--- a/keyboards/kineticlabs/emu/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hotswap.h"
diff --git a/keyboards/kineticlabs/emu/hotswap/hotswap.h b/keyboards/kineticlabs/emu/hotswap/hotswap.h
deleted file mode 100644
index da02500fec..0000000000
--- a/keyboards/kineticlabs/emu/hotswap/hotswap.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_tkl_ansi( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k011, k012, k013, k014,       k015, k016, k017, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114,       k115, k116, k117, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k214,       k215, k216, k217, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,    k314,                            \
-    k400,       k401, k402, k403, k404, k405, k406, k407, k408, k409, k410,    k414,                k416,       \
-    k500, k501, k502,                   k505,                   k510, k511, k513, k514,       k515, k516, k517  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, ____, k011, k012, k013, k014, k015, k016, k017 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, ____, k114, k115, k116, k117 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214, k215, k216, k217 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, ____, k314, ____, ____, ____ }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, ____, ____, ____, k414, ____, k416, ____ }, \
-    { k500, k501, k502, ____, ____, k505, ____, ____, ____, ____, k510, k511, ____, k513, k514, k515, k516, k517 }  \
-}
diff --git a/keyboards/kineticlabs/emu/hotswap/info.json b/keyboards/kineticlabs/emu/hotswap/info.json
index 7e04725e8e..fe920deb2b 100644
--- a/keyboards/kineticlabs/emu/hotswap/info.json
+++ b/keyboards/kineticlabs/emu/hotswap/info.json
@@ -8,99 +8,117 @@
         "pid": "0xC387",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "D4", "B3", "B1", "B0", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/kineticlabs/emu/soldered/config.h b/keyboards/kineticlabs/emu/soldered/config.h
deleted file mode 100644
index e247d2cc2e..0000000000
--- a/keyboards/kineticlabs/emu/soldered/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { E6, D4, B3, B1, B0, B7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kineticlabs/emu/soldered/info.json b/keyboards/kineticlabs/emu/soldered/info.json
index 82e0313a78..dad20cc868 100644
--- a/keyboards/kineticlabs/emu/soldered/info.json
+++ b/keyboards/kineticlabs/emu/soldered/info.json
@@ -8,281 +8,325 @@
         "pid": "0xC386",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "D4", "B3", "B1", "B0", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5},
-                {"x":14, "y":1.5},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":1.5, "y":5.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":12.5, "y":5.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 14], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/kineticlabs/emu/soldered/soldered.c b/keyboards/kineticlabs/emu/soldered/soldered.c
deleted file mode 100644
index b99b94e08a..0000000000
--- a/keyboards/kineticlabs/emu/soldered/soldered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "soldered.h"
diff --git a/keyboards/kineticlabs/emu/soldered/soldered.h b/keyboards/kineticlabs/emu/soldered/soldered.h
deleted file mode 100644
index 3c11c1a513..0000000000
--- a/keyboards/kineticlabs/emu/soldered/soldered.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_all( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k011, k012, k013, k014,       k015, k016, k017, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k214,       k215, k216, k217, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,    k314,                            \
-    k400,       k401, k402, k403, k404, k405, k406, k407, k408, k409, k410,    k414,                k416,       \
-    k500, k501, k502,                   k505,                   k510, k511, k513, k514,       k515, k516, k517  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, ____, k011, k012, k013, k014, k015, k016, k017 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214, k215, k216, k217 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, ____, k314, ____, ____, ____ }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, ____, ____, ____, k414, ____, k416, ____ }, \
-    { k500, k501, k502, ____, ____, k505, ____, ____, ____, ____, k510, k511, ____, k513, k514, k515, k516, k517 }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k011, k012, k013, k014,       k015, k016, k017, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114,       k115, k116, k117, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k214,       k215, k216, k217, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,    k314,                            \
-    k400,       k401, k402, k403, k404, k405, k406, k407, k408, k409, k410,    k414,                k416,       \
-    k500, k501, k502,                   k505,                   k510, k511, k513, k514,       k515, k516, k517  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, ____, k011, k012, k013, k014, k015, k016, k017 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, ____, k114, k115, k116, k117 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214, k215, k216, k217 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, ____, k314, ____, ____, ____ }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, ____, ____, ____, k414, ____, k416, ____ }, \
-    { k500, k501, k502, ____, ____, k505, ____, ____, ____, ____, k510, k511, ____, k513, k514, k515, k516, k517 }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k011, k012, k013, k014,       k015, k016, k017, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114,       k115, k116, k117, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k214,       k215, k216, k217, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,    k314,                            \
-    k400,       k401, k402, k403, k404, k405, k406, k407, k408, k409, k410,    k414,                k416,       \
-    k500, k501, k502,                   k505,                         k511, k513, k514,       k515, k516, k517  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, ____, k011, k012, k013, k014, k015, k016, k017 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, ____, k114, k115, k116, k117 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214, k215, k216, k217 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, ____, k314, ____, ____, ____ }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, ____, ____, ____, k414, ____, k416, ____ }, \
-    { k500, k501, k502, ____, ____, k505, ____, ____, ____, ____, ____, k511, ____, k513, k514, k515, k516, k517 }  \
-}
diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h
index fadfdae715..af9ffae03d 100644
--- a/keyboards/kingly_keys/ave/config.h
+++ b/keyboards/kingly_keys/ave/config.h
@@ -17,13 +17,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B3, F4, F7, F6, F5 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B7
 #if defined(RGBLIGHT_ENABLE)
 #    define RGBLED_NUM 2
 #    define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json
index cdd3f41835..0de5b82bdd 100644
--- a/keyboards/kingly_keys/ave/ortho/info.json
+++ b/keyboards/kingly_keys/ave/ortho/info.json
@@ -8,186 +8,206 @@
       "pid": "0x1225",
       "device_version": "0.1.1"
   },
+  "matrix_pins": {
+    "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+    "rows": ["B3", "F4", "F7", "F6", "F5"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B2", "pin_b": "B1"}
     ]
   },
+  "ws2812": {
+    "pin": "B7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_ortho_all": {
        "layout": [
-        {"label":"k001", "x":0.00, "y":0.00},
-        {"label":"k002", "x":1.50, "y":0.00},
-        {"label":"k011", "x":10.5, "y":0.00},
-        {"label":"k012", "x":11.5, "y":0.00},
-        {"label":"k013", "x":12.5, "y":0.00},
-        {"label":"k101", "x":0.00, "y":1.50},
-        {"label":"k102", "x":1.50, "y":1.50},
-        {"label":"k103", "x":2.50, "y":1.50},
-        {"label":"k104", "x":3.50, "y":1.50},
-        {"label":"k105", "x":4.50, "y":1.50},
-        {"label":"k106", "x":5.50, "y":1.50},
-        {"label":"k107", "x":6.50, "y":1.50},
-        {"label":"k108", "x":7.50, "y":1.50},
-        {"label":"k109", "x":8.50, "y":1.50},
-        {"label":"k110", "x":9.50, "y":1.50},
-        {"label":"k111", "x":10.5, "y":1.50},
-        {"label":"k112", "x":11.5, "y":1.50},
-        {"label":"k113", "x":12.5, "y":1.50},
-        {"label":"k201", "x":0.00, "y":2.50},
-        {"label":"k202", "x":1.50, "y":2.50},
-        {"label":"k203", "x":2.50, "y":2.50},
-        {"label":"k204", "x":3.50, "y":2.50},
-        {"label":"k205", "x":4.50, "y":2.50},
-        {"label":"k206", "x":5.50, "y":2.50},
-        {"label":"k207", "x":6.50, "y":2.50},
-        {"label":"k208", "x":7.50, "y":2.50},
-        {"label":"k209", "x":8.50, "y":2.50},
-        {"label":"k210", "x":9.50, "y":2.50},
-        {"label":"k211", "x":10.5, "y":2.50},
-        {"label":"k212", "x":11.5, "y":2.50},
-        {"label":"k213", "x":12.5, "y":2.50},
-        {"label":"k301", "x":0.00, "y":3.50},
-        {"label":"k302", "x":1.50, "y":3.50},
-        {"label":"k303", "x":2.50, "y":3.50},
-        {"label":"k304", "x":3.50, "y":3.50},
-        {"label":"k305", "x":4.50, "y":3.50},
-        {"label":"k306", "x":5.50, "y":3.50},
-        {"label":"k307", "x":6.50, "y":3.50},
-        {"label":"k308", "x":7.50, "y":3.50},
-        {"label":"k309", "x":8.50, "y":3.50},
-        {"label":"k310", "x":9.50, "y":3.50},
-        {"label":"k311", "x":10.5, "y":3.50},
-        {"label":"k312", "x":11.5, "y":3.50},
-        {"label":"k313", "x":12.5, "y":3.50},
-        {"label":"k401", "x":0.00, "y":4.50},
-        {"label":"k402", "x":1.50, "y":4.50},
-        {"label":"k403", "x":2.50, "y":4.50},
-        {"label":"k404", "x":3.50, "y":4.50},
-        {"label":"k405", "x":4.50, "y":4.50},
-        {"label":"k406", "x":5.50, "y":4.50},
-        {"label":"k407", "x":6.50, "y":4.50},
-        {"label":"k408", "x":7.50, "y":4.50},
-        {"label":"k409", "x":8.50, "y":4.50},
-        {"label":"k410", "x":9.50, "y":4.50},
-        {"label":"k411", "x":10.5, "y":4.50},
-        {"label":"k412", "x":11.5, "y":4.50},
-        {"label":"k413", "x":12.5, "y":4.50}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1.5, "y": 0},
+          {"matrix": [0, 10], "x": 10.5, "y": 0},
+          {"matrix": [0, 11], "x": 11.5, "y": 0},
+          {"matrix": [0, 12], "x": 12.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+          {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+          {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+          {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+          {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+          {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+          {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+          {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+          {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+          {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+          {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+          {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2.5},
+          {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+          {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+          {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+          {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+          {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+          {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+          {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+          {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+          {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+          {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+          {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+          {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+          {"matrix": [3, 0], "x": 0, "y": 3.5},
+          {"matrix": [3, 1], "x": 1.5, "y": 3.5},
+          {"matrix": [3, 2], "x": 2.5, "y": 3.5},
+          {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+          {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+          {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+          {"matrix": [3, 6], "x": 6.5, "y": 3.5},
+          {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+          {"matrix": [3, 8], "x": 8.5, "y": 3.5},
+          {"matrix": [3, 9], "x": 9.5, "y": 3.5},
+          {"matrix": [3, 10], "x": 10.5, "y": 3.5},
+          {"matrix": [3, 11], "x": 11.5, "y": 3.5},
+          {"matrix": [3, 12], "x": 12.5, "y": 3.5},
+
+          {"matrix": [4, 0], "x": 0, "y": 4.5},
+          {"matrix": [4, 1], "x": 1.5, "y": 4.5},
+          {"matrix": [4, 2], "x": 2.5, "y": 4.5},
+          {"matrix": [4, 3], "x": 3.5, "y": 4.5},
+          {"matrix": [4, 4], "x": 4.5, "y": 4.5},
+          {"matrix": [4, 5], "x": 5.5, "y": 4.5},
+          {"matrix": [4, 6], "x": 6.5, "y": 4.5},
+          {"matrix": [4, 7], "x": 7.5, "y": 4.5},
+          {"matrix": [4, 8], "x": 8.5, "y": 4.5},
+          {"matrix": [4, 9], "x": 9.5, "y": 4.5},
+          {"matrix": [4, 10], "x": 10.5, "y": 4.5},
+          {"matrix": [4, 11], "x": 11.5, "y": 4.5},
+          {"matrix": [4, 12], "x": 12.5, "y": 4.5}
       ]
     },
     "LAYOUT_ortho_2x2u": {
         "layout": [
-         {"label":"k001", "x":0.00, "y":0.00},
-         {"label":"k002", "x":1.50, "y":0.00},
-         {"label":"k011", "x":10.5, "y":0.00},
-         {"label":"k012", "x":11.5, "y":0.00},
-         {"label":"k013", "x":12.5, "y":0.00},
-         {"label":"k101", "x":0.00, "y":1.50},
-         {"label":"k102", "x":1.50, "y":1.50},
-         {"label":"k103", "x":2.50, "y":1.50},
-         {"label":"k104", "x":3.50, "y":1.50},
-         {"label":"k105", "x":4.50, "y":1.50},
-         {"label":"k106", "x":5.50, "y":1.50},
-         {"label":"k107", "x":6.50, "y":1.50},
-         {"label":"k108", "x":7.50, "y":1.50},
-         {"label":"k109", "x":8.50, "y":1.50},
-         {"label":"k110", "x":9.50, "y":1.50},
-         {"label":"k111", "x":10.5, "y":1.50},
-         {"label":"k112", "x":11.5, "y":1.50},
-         {"label":"k113", "x":12.5, "y":1.50},
-         {"label":"k201", "x":0.00, "y":2.50},
-         {"label":"k202", "x":1.50, "y":2.50},
-         {"label":"k203", "x":2.50, "y":2.50},
-         {"label":"k204", "x":3.50, "y":2.50},
-         {"label":"k205", "x":4.50, "y":2.50},
-         {"label":"k206", "x":5.50, "y":2.50},
-         {"label":"k207", "x":6.50, "y":2.50},
-         {"label":"k208", "x":7.50, "y":2.50},
-         {"label":"k209", "x":8.50, "y":2.50},
-         {"label":"k210", "x":9.50, "y":2.50},
-         {"label":"k211", "x":10.5, "y":2.50},
-         {"label":"k212", "x":11.5, "y":2.50},
-         {"label":"k213", "x":12.5, "y":2.50},
-         {"label":"k301", "x":0.00, "y":3.50},
-         {"label":"k302", "x":1.50, "y":3.50},
-         {"label":"k303", "x":2.50, "y":3.50},
-         {"label":"k304", "x":3.50, "y":3.50},
-         {"label":"k305", "x":4.50, "y":3.50},
-         {"label":"k306", "x":5.50, "y":3.50},
-         {"label":"k307", "x":6.50, "y":3.50},
-         {"label":"k308", "x":7.50, "y":3.50},
-         {"label":"k309", "x":8.50, "y":3.50},
-         {"label":"k310", "x":9.50, "y":3.50},
-         {"label":"k311", "x":10.5, "y":3.50},
-         {"label":"k312", "x":11.5, "y":3.50},
-         {"label":"k313", "x":12.5, "y":3.50},
-         {"label":"k401", "x":0.00, "y":4.50},
-         {"label":"k402", "x":1.50, "y":4.50},
-         {"label":"k403", "x":2.50, "y":4.50},
-         {"label":"k404", "x":3.50, "y":4.50},
-         {"label":"k405", "x":4.50, "y":4.50},
-         {"label":"k406", "x":5.50, "y":4.50, "w":2.00},
-         {"label":"k409", "x":7.50, "y":4.50, "w":2.00},
-         {"label":"k410", "x":9.50, "y":4.50},
-         {"label":"k411", "x":10.5, "y":4.50},
-         {"label":"k412", "x":11.5, "y":4.50},
-         {"label":"k413", "x":12.5, "y":4.50}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1.5, "y": 0},
+          {"matrix": [0, 10], "x": 10.5, "y": 0},
+          {"matrix": [0, 11], "x": 11.5, "y": 0},
+          {"matrix": [0, 12], "x": 12.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+          {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+          {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+          {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+          {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+          {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+          {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+          {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+          {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+          {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+          {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+          {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2.5},
+          {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+          {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+          {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+          {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+          {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+          {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+          {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+          {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+          {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+          {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+          {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+          {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+          {"matrix": [3, 0], "x": 0, "y": 3.5},
+          {"matrix": [3, 1], "x": 1.5, "y": 3.5},
+          {"matrix": [3, 2], "x": 2.5, "y": 3.5},
+          {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+          {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+          {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+          {"matrix": [3, 6], "x": 6.5, "y": 3.5},
+          {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+          {"matrix": [3, 8], "x": 8.5, "y": 3.5},
+          {"matrix": [3, 9], "x": 9.5, "y": 3.5},
+          {"matrix": [3, 10], "x": 10.5, "y": 3.5},
+          {"matrix": [3, 11], "x": 11.5, "y": 3.5},
+          {"matrix": [3, 12], "x": 12.5, "y": 3.5},
+
+          {"matrix": [4, 0], "x": 0, "y": 4.5},
+          {"matrix": [4, 1], "x": 1.5, "y": 4.5},
+          {"matrix": [4, 2], "x": 2.5, "y": 4.5},
+          {"matrix": [4, 3], "x": 3.5, "y": 4.5},
+          {"matrix": [4, 4], "x": 4.5, "y": 4.5},
+          {"matrix": [4, 5], "x": 5.5, "y": 4.5, "w": 2},
+          {"matrix": [4, 8], "x": 7.5, "y": 4.5, "w": 2},
+          {"matrix": [4, 9], "x": 9.5, "y": 4.5},
+          {"matrix": [4, 10], "x": 10.5, "y": 4.5},
+          {"matrix": [4, 11], "x": 11.5, "y": 4.5},
+          {"matrix": [4, 12], "x": 12.5, "y": 4.5}
        ]
      },
      "LAYOUT_ortho_big_boy": {
         "layout": [
-         {"label":"k001", "x":0.00, "y":0.00},
-         {"label":"k002", "x":1.50, "y":0.00},
-         {"label":"k011", "x":10.5, "y":0.00},
-         {"label":"k012", "x":11.5, "y":0.00},
-         {"label":"k013", "x":12.5, "y":0.00},
-         {"label":"k101", "x":0.00, "y":1.50},
-         {"label":"k102", "x":1.50, "y":1.50},
-         {"label":"k103", "x":2.50, "y":1.50},
-         {"label":"k104", "x":3.50, "y":1.50},
-         {"label":"k105", "x":4.50, "y":1.50},
-         {"label":"k106", "x":5.50, "y":1.50},
-         {"label":"k107", "x":6.50, "y":1.50},
-         {"label":"k108", "x":7.50, "y":1.50},
-         {"label":"k109", "x":8.50, "y":1.50},
-         {"label":"k110", "x":9.50, "y":1.50},
-         {"label":"k111", "x":10.5, "y":1.50},
-         {"label":"k112", "x":11.5, "y":1.50},
-         {"label":"k113", "x":12.5, "y":1.50},
-         {"label":"k201", "x":0.00, "y":2.50},
-         {"label":"k202", "x":1.50, "y":2.50},
-         {"label":"k203", "x":2.50, "y":2.50},
-         {"label":"k204", "x":3.50, "y":2.50},
-         {"label":"k205", "x":4.50, "y":2.50},
-         {"label":"k206", "x":5.50, "y":2.50},
-         {"label":"k207", "x":6.50, "y":2.50},
-         {"label":"k208", "x":7.50, "y":2.50},
-         {"label":"k209", "x":8.50, "y":2.50},
-         {"label":"k210", "x":9.50, "y":2.50},
-         {"label":"k211", "x":10.5, "y":2.50},
-         {"label":"k212", "x":11.5, "y":2.50},
-         {"label":"k213", "x":12.5, "y":2.50},
-         {"label":"k301", "x":0.00, "y":3.50},
-         {"label":"k302", "x":1.50, "y":3.50},
-         {"label":"k303", "x":2.50, "y":3.50},
-         {"label":"k304", "x":3.50, "y":3.50},
-         {"label":"k305", "x":4.50, "y":3.50},
-         {"label":"k306", "x":5.50, "y":3.50},
-         {"label":"k307", "x":6.50, "y":3.50},
-         {"label":"k308", "x":7.50, "y":3.50},
-         {"label":"k309", "x":8.50, "y":3.50},
-         {"label":"k310", "x":9.50, "y":3.50},
-         {"label":"k311", "x":10.5, "y":3.50},
-         {"label":"k312", "x":11.5, "y":3.50},
-         {"label":"k313", "x":12.5, "y":3.50},
-         {"label":"k401", "x":0.00, "y":4.50},
-         {"label":"k402", "x":1.50, "y":4.50},
-         {"label":"k403", "x":2.50, "y":4.50, "w":1.50},
-         {"label":"k404", "x":4.00, "y":4.50, "w":7.00},
-         {"label":"k405", "x":11.0, "y":4.50, "w":1.50},
-         {"label":"k413", "x":12.5, "y":4.50}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1.5, "y": 0},
+          {"matrix": [0, 10], "x": 10.5, "y": 0},
+          {"matrix": [0, 11], "x": 11.5, "y": 0},
+          {"matrix": [0, 12], "x": 12.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+          {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+          {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+          {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+          {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+          {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+          {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+          {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+          {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+          {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+          {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+          {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2.5},
+          {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+          {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+          {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+          {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+          {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+          {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+          {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+          {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+          {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+          {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+          {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+          {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+          {"matrix": [3, 0], "x": 0, "y": 3.5},
+          {"matrix": [3, 1], "x": 1.5, "y": 3.5},
+          {"matrix": [3, 2], "x": 2.5, "y": 3.5},
+          {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+          {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+          {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+          {"matrix": [3, 6], "x": 6.5, "y": 3.5},
+          {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+          {"matrix": [3, 8], "x": 8.5, "y": 3.5},
+          {"matrix": [3, 9], "x": 9.5, "y": 3.5},
+          {"matrix": [3, 10], "x": 10.5, "y": 3.5},
+          {"matrix": [3, 11], "x": 11.5, "y": 3.5},
+          {"matrix": [3, 12], "x": 12.5, "y": 3.5},
+
+          {"matrix": [4, 0], "x": 0, "y": 4.5},
+          {"matrix": [4, 1], "x": 1.5, "y": 4.5},
+          {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.5},
+          {"matrix": [4, 6], "x": 4, "y": 4.5, "w": 7},
+          {"matrix": [4, 11], "x": 11, "y": 4.5, "w": 1.5},
+          {"matrix": [4, 12], "x": 12.5, "y": 4.5}
        ]
      }
    }
diff --git a/keyboards/kingly_keys/ave/ortho/ortho.c b/keyboards/kingly_keys/ave/ortho/ortho.c
deleted file mode 100644
index 4fb95e7684..0000000000
--- a/keyboards/kingly_keys/ave/ortho/ortho.c
+++ /dev/null
@@ -1,18 +0,0 @@
- /* 
- Copyright 2020 Garret Gartner
-  
- This program is free software: you can redistribute it and/or modify 
- it under the terms of the GNU General Public License as published by 
- the Free Software Foundation, either version 2 of the License, or 
- (at your option) any later version. 
-  
- This program is distributed in the hope that it will be useful, 
- but WITHOUT ANY WARRANTY; without even the implied warranty of 
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- GNU General Public License for more details. 
-  
- You should have received a copy of the GNU General Public License 
- along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#include "ortho.h"
diff --git a/keyboards/kingly_keys/ave/ortho/ortho.h b/keyboards/kingly_keys/ave/ortho/ortho.h
deleted file mode 100644
index 12cdede536..0000000000
--- a/keyboards/kingly_keys/ave/ortho/ortho.h
+++ /dev/null
@@ -1,67 +0,0 @@
- /* 
- Copyright 2020 Garret Gartner
-  
- This program is free software: you can redistribute it and/or modify 
- it under the terms of the GNU General Public License as published by 
- the Free Software Foundation, either version 2 of the License, or 
- (at your option) any later version. 
-  
- This program is distributed in the hope that it will be useful, 
- but WITHOUT ANY WARRANTY; without even the implied warranty of 
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- GNU General Public License for more details. 
-  
- You should have received a copy of the GNU General Public License 
- along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXXX KC_NO
-
-#define LAYOUT_ortho_all( \
-    k001,    k002,                                                 k011, k012, k013, \
-    k101,    k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \
-    k201,    k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \
-    k301,    k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \
-    k401,    k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413 \
-) \
-{ \
-    { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \
-    { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
-    { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \
-    { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \
-    { k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413 } \
-}
-
-#define LAYOUT_ortho_2x2u( \
-    k001,    k002,                                                 k011, k012, k013, \
-    k101,    k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \
-    k201,    k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \
-    k301,    k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \
-    k401,    k402, k403, k404, k405,    k406,       k409,    k410, k411, k412, k413 \
-) \
-{ \
-    { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \
-    { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
-    { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \
-    { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \
-    { k401, k402, k403, k404, k405, k406, XXXX, XXXX, k409, k410, k411, k412, k413 } \
-}
-
-#define LAYOUT_ortho_big_boy( \
-    k001,    k002,                                                 k011, k012, k013, \
-    k101,    k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \
-    k201,    k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \
-    k301,    k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \
-    k401,    k402,    k403,                k407,                      k412,    k413 \
-) \
-{ \
-    { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \
-    { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
-    { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \
-    { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \
-    { k401, k402, k403, XXXX, XXXX, XXXX, k407, XXXX, XXXX, XXXX, XXXX, k412, k413 } \
-}
diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/info.json
index 2e9c83df4c..b975a4aa68 100644
--- a/keyboards/kingly_keys/ave/staggered/info.json
+++ b/keyboards/kingly_keys/ave/staggered/info.json
@@ -8,120 +8,128 @@
      "pid": "0x1225",
      "device_version": "0.1.1"
   },
+  "matrix_pins": {
+    "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+    "rows": ["B3", "F4", "F7", "F6", "F5"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
      "rotary": [
         {"pin_a": "B2", "pin_b": "B1"}
      ]
   },
+  "ws2812": {
+     "pin": "B7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
      "LAYOUT_staggered": {
         "layout": [
-         {"label":"k001", "x":0.00, "y":0.00},
-         {"label":"k002", "x":1.50, "y":0.00},
-         {"label":"k011", "x":10.5, "y":0.00},
-         {"label":"k012", "x":11.5, "y":0.00},
-         {"label":"k013", "x":12.5, "y":0.00},
-         {"label":"k101", "x":0.00, "y":1.50},
-         {"label":"k102", "x":1.50, "y":1.50},
-         {"label":"k103", "x":2.50, "y":1.50},
-         {"label":"k104", "x":3.50, "y":1.50},
-         {"label":"k105", "x":4.50, "y":1.50},
-         {"label":"k106", "x":5.50, "y":1.50},
-         {"label":"k107", "x":6.50, "y":1.50},
-         {"label":"k108", "x":7.50, "y":1.50},
-         {"label":"k109", "x":8.50, "y":1.50},
-         {"label":"k110", "x":9.50, "y":1.50},
-         {"label":"k111", "x":10.5, "y":1.50},
-         {"label":"k112", "x":11.5, "y":1.50},
-         {"label":"k113", "x":12.5, "y":1.50},
-         {"label":"k201", "x":0.00, "y":2.50},
-         {"label":"k202", "x":1.50, "y":2.50, "w":1.25},
-         {"label":"k203", "x":2.75, "y":2.50},
-         {"label":"k204", "x":3.75, "y":2.50},
-         {"label":"k205", "x":4.75, "y":2.50},
-         {"label":"k206", "x":5.75, "y":2.50},
-         {"label":"k207", "x":6.75, "y":2.50},
-         {"label":"k208", "x":7.75, "y":2.50},
-         {"label":"k209", "x":8.75, "y":2.50},
-         {"label":"k210", "x":9.75, "y":2.50},
+         {"label":"k001", "x":0, "y":0},
+         {"label":"k002", "x":1.5, "y":0},
+         {"label":"k011", "x":10.5, "y":0},
+         {"label":"k012", "x":11.5, "y":0},
+         {"label":"k013", "x":12.5, "y":0},
+         {"label":"k101", "x":0, "y":1.5},
+         {"label":"k102", "x":1.5, "y":1.5},
+         {"label":"k103", "x":2.5, "y":1.5},
+         {"label":"k104", "x":3.5, "y":1.5},
+         {"label":"k105", "x":4.5, "y":1.5},
+         {"label":"k106", "x":5.5, "y":1.5},
+         {"label":"k107", "x":6.5, "y":1.5},
+         {"label":"k108", "x":7.5, "y":1.5},
+         {"label":"k109", "x":8.5, "y":1.5},
+         {"label":"k110", "x":9.5, "y":1.5},
+         {"label":"k111", "x":10.5, "y":1.5},
+         {"label":"k112", "x":11.5, "y":1.5},
+         {"label":"k113", "x":12.5, "y":1.5},
+         {"label":"k201", "x":0, "y":2.5},
+         {"label":"k202", "x":1.5, "y":2.5, "w":1.25},
+         {"label":"k203", "x":2.75, "y":2.5},
+         {"label":"k204", "x":3.75, "y":2.5},
+         {"label":"k205", "x":4.75, "y":2.5},
+         {"label":"k206", "x":5.75, "y":2.5},
+         {"label":"k207", "x":6.75, "y":2.5},
+         {"label":"k208", "x":7.75, "y":2.5},
+         {"label":"k209", "x":8.75, "y":2.5},
+         {"label":"k210", "x":9.75, "y":2.5},
          {"label":"k211", "x":10.75, "y":2.5},
          {"label":"k213", "x":11.75, "y":2.5, "w":1.75},
-         {"label":"k301", "x":0.00, "y":3.50},
-         {"label":"k302", "x":1.50, "y":3.50, "w":1.75},
-         {"label":"k303", "x":3.25, "y":3.50},
-         {"label":"k304", "x":4.25, "y":3.50},
-         {"label":"k305", "x":5.25, "y":3.50},
-         {"label":"k306", "x":6.25, "y":3.50},
-         {"label":"k307", "x":7.25, "y":3.50},
-         {"label":"k308", "x":8.25, "y":3.50},
-         {"label":"k309", "x":9.25, "y":3.50},
-         {"label":"k310", "x":10.25, "y":3.50},
-         {"label":"k312", "x":11.25, "y":3.50},
-         {"label":"k313", "x":12.25, "y":3.50, "w":1.25},
-         {"label":"k401", "x":0.00, "y":4.50},
-         {"label":"k402", "x":1.50, "y":4.50, "w":1.25},
-         {"label":"k403", "x":2.75, "y":4.50},
-         {"label":"k404", "x":3.75, "y":4.50, "w":1.25},
-         {"label":"k406", "x":5.00, "y":4.50, "w":2.75},
-         {"label":"k408", "x":7.75, "y":4.50, "w":2.25},
-         {"label":"k411", "x":10.0, "y":4.50, "w":1.25},
-         {"label":"k412", "x":11.25, "y":4.50},
-         {"label":"k413", "x":12.25, "y":4.50, "w":1.25}
+         {"label":"k301", "x":0, "y":3.5},
+         {"label":"k302", "x":1.5, "y":3.5, "w":1.75},
+         {"label":"k303", "x":3.25, "y":3.5},
+         {"label":"k304", "x":4.25, "y":3.5},
+         {"label":"k305", "x":5.25, "y":3.5},
+         {"label":"k306", "x":6.25, "y":3.5},
+         {"label":"k307", "x":7.25, "y":3.5},
+         {"label":"k308", "x":8.25, "y":3.5},
+         {"label":"k309", "x":9.25, "y":3.5},
+         {"label":"k310", "x":10.25, "y":3.5},
+         {"label":"k312", "x":11.25, "y":3.5},
+         {"label":"k313", "x":12.25, "y":3.5, "w":1.25},
+         {"label":"k401", "x":0, "y":4.5},
+         {"label":"k402", "x":1.5, "y":4.5, "w":1.25},
+         {"label":"k403", "x":2.75, "y":4.5},
+         {"label":"k404", "x":3.75, "y":4.5, "w":1.25},
+         {"label":"k406", "x":5, "y":4.5, "w":2.75},
+         {"label":"k408", "x":7.75, "y":4.5, "w":2.25},
+         {"label":"k411", "x":10, "y":4.5, "w":1.25},
+         {"label":"k412", "x":11.25, "y":4.5},
+         {"label":"k413", "x":12.25, "y":4.5, "w":1.25}
        ]
      },
      "LAYOUT_staggered_big_boy": {
         "layout": [
-         {"label":"k001", "x":0.00, "y":0.00},
-         {"label":"k002", "x":1.50, "y":0.00},
-         {"label":"k011", "x":10.5, "y":0.00},
-         {"label":"k012", "x":11.5, "y":0.00},
-         {"label":"k013", "x":12.5, "y":0.00},
-         {"label":"k101", "x":0.00, "y":1.50},
-         {"label":"k102", "x":1.50, "y":1.50},
-         {"label":"k103", "x":2.50, "y":1.50},
-         {"label":"k104", "x":3.50, "y":1.50},
-         {"label":"k105", "x":4.50, "y":1.50},
-         {"label":"k106", "x":5.50, "y":1.50},
-         {"label":"k107", "x":6.50, "y":1.50},
-         {"label":"k108", "x":7.50, "y":1.50},
-         {"label":"k109", "x":8.50, "y":1.50},
-         {"label":"k110", "x":9.50, "y":1.50},
-         {"label":"k111", "x":10.5, "y":1.50},
-         {"label":"k112", "x":11.5, "y":1.50},
-         {"label":"k113", "x":12.5, "y":1.50},
-         {"label":"k201", "x":0.00, "y":2.50},
-         {"label":"k202", "x":1.50, "y":2.50, "w":1.25},
-         {"label":"k203", "x":2.75, "y":2.50},
-         {"label":"k204", "x":3.75, "y":2.50},
-         {"label":"k205", "x":4.75, "y":2.50},
-         {"label":"k206", "x":5.75, "y":2.50},
-         {"label":"k207", "x":6.75, "y":2.50},
-         {"label":"k208", "x":7.75, "y":2.50},
-         {"label":"k209", "x":8.75, "y":2.50},
-         {"label":"k210", "x":9.75, "y":2.50},
+         {"label":"k001", "x":0, "y":0},
+         {"label":"k002", "x":1.5, "y":0},
+         {"label":"k011", "x":10.5, "y":0},
+         {"label":"k012", "x":11.5, "y":0},
+         {"label":"k013", "x":12.5, "y":0},
+         {"label":"k101", "x":0, "y":1.5},
+         {"label":"k102", "x":1.5, "y":1.5},
+         {"label":"k103", "x":2.5, "y":1.5},
+         {"label":"k104", "x":3.5, "y":1.5},
+         {"label":"k105", "x":4.5, "y":1.5},
+         {"label":"k106", "x":5.5, "y":1.5},
+         {"label":"k107", "x":6.5, "y":1.5},
+         {"label":"k108", "x":7.5, "y":1.5},
+         {"label":"k109", "x":8.5, "y":1.5},
+         {"label":"k110", "x":9.5, "y":1.5},
+         {"label":"k111", "x":10.5, "y":1.5},
+         {"label":"k112", "x":11.5, "y":1.5},
+         {"label":"k113", "x":12.5, "y":1.5},
+         {"label":"k201", "x":0, "y":2.5},
+         {"label":"k202", "x":1.5, "y":2.5, "w":1.25},
+         {"label":"k203", "x":2.75, "y":2.5},
+         {"label":"k204", "x":3.75, "y":2.5},
+         {"label":"k205", "x":4.75, "y":2.5},
+         {"label":"k206", "x":5.75, "y":2.5},
+         {"label":"k207", "x":6.75, "y":2.5},
+         {"label":"k208", "x":7.75, "y":2.5},
+         {"label":"k209", "x":8.75, "y":2.5},
+         {"label":"k210", "x":9.75, "y":2.5},
          {"label":"k211", "x":10.75, "y":2.5},
          {"label":"k213", "x":11.75, "y":2.5, "w":1.75},
-         {"label":"k301", "x":0.00, "y":3.50},
-         {"label":"k302", "x":1.50, "y":3.50, "w":1.75},
-         {"label":"k303", "x":3.25, "y":3.50},
-         {"label":"k304", "x":4.25, "y":3.50},
-         {"label":"k305", "x":5.25, "y":3.50},
-         {"label":"k306", "x":6.25, "y":3.50},
-         {"label":"k307", "x":7.25, "y":3.50},
-         {"label":"k308", "x":8.25, "y":3.50},
-         {"label":"k309", "x":9.25, "y":3.50},
-         {"label":"k310", "x":10.25, "y":3.50},
-         {"label":"k312", "x":11.25, "y":3.50},
-         {"label":"k313", "x":12.25, "y":3.50, "w":1.25},
-         {"label":"k401", "x":0.00, "y":4.50},
-         {"label":"k402", "x":1.50, "y":4.50, "w":1.25},
-         {"label":"k403", "x":2.75, "y":4.50},
-         {"label":"k406", "x":3.75, "y":4.50, "w":6.25},
-         {"label":"k411", "x":10.0, "y":4.50, "w":1.25},
-         {"label":"k412", "x":11.25, "y":4.50},
-         {"label":"k413", "x":12.25, "y":4.50, "w":1.25}
+         {"label":"k301", "x":0, "y":3.5},
+         {"label":"k302", "x":1.5, "y":3.5, "w":1.75},
+         {"label":"k303", "x":3.25, "y":3.5},
+         {"label":"k304", "x":4.25, "y":3.5},
+         {"label":"k305", "x":5.25, "y":3.5},
+         {"label":"k306", "x":6.25, "y":3.5},
+         {"label":"k307", "x":7.25, "y":3.5},
+         {"label":"k308", "x":8.25, "y":3.5},
+         {"label":"k309", "x":9.25, "y":3.5},
+         {"label":"k310", "x":10.25, "y":3.5},
+         {"label":"k312", "x":11.25, "y":3.5},
+         {"label":"k313", "x":12.25, "y":3.5, "w":1.25},
+         {"label":"k401", "x":0, "y":4.5},
+         {"label":"k402", "x":1.5, "y":4.5, "w":1.25},
+         {"label":"k403", "x":2.75, "y":4.5},
+         {"label":"k406", "x":3.75, "y":4.5, "w":6.25},
+         {"label":"k411", "x":10, "y":4.5, "w":1.25},
+         {"label":"k412", "x":11.25, "y":4.5},
+         {"label":"k413", "x":12.25, "y":4.5, "w":1.25}
        ]
     }
   }
diff --git a/keyboards/kingly_keys/ave/staggered/staggered.c b/keyboards/kingly_keys/ave/staggered/staggered.c
deleted file mode 100644
index 4aa0d45ea3..0000000000
--- a/keyboards/kingly_keys/ave/staggered/staggered.c
+++ /dev/null
@@ -1,18 +0,0 @@
- /* 
- Copyright 2020 Garret Gartner
-  
- This program is free software: you can redistribute it and/or modify 
- it under the terms of the GNU General Public License as published by 
- the Free Software Foundation, either version 2 of the License, or 
- (at your option) any later version. 
-  
- This program is distributed in the hope that it will be useful, 
- but WITHOUT ANY WARRANTY; without even the implied warranty of 
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- GNU General Public License for more details. 
-  
- You should have received a copy of the GNU General Public License 
- along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#include "staggered.h"
diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h
index 4f79c077e1..719f192955 100644
--- a/keyboards/kingly_keys/little_foot/config.h
+++ b/keyboards/kingly_keys/little_foot/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F6, B6, B2, B3, B1 }
-#define MATRIX_COL_PINS { F5, F7, B5, B4, E6, D7, C6, D4, D0, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define FORCE_NKRO
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -33,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN F4
 #define RGBLED_NUM 10    // Number of LEDs
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/info.json
index e306ed38a2..c3cde9243f 100644
--- a/keyboards/kingly_keys/little_foot/info.json
+++ b/keyboards/kingly_keys/little_foot/info.json
@@ -8,14 +8,117 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F4"
+  },
+  "matrix_pins": {
+    "cols": ["F5", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
+    "rows": ["F6", "B6", "B2", "B3", "B1"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT_split_space_base": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":2}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1.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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 3, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+        {"matrix": [4, 8], "x": 7, "y": 4, "w": 1.5}
+      ]
     },
     "LAYOUT_big_space_base": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":1.5, "y":4, "w":7}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+
+        {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
+      ]
     }
   }
 }
diff --git a/keyboards/kingly_keys/little_foot/little_foot.c b/keyboards/kingly_keys/little_foot/little_foot.c
deleted file mode 100644
index 5513b113a0..0000000000
--- a/keyboards/kingly_keys/little_foot/little_foot.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "little_foot.h"
diff --git a/keyboards/kingly_keys/little_foot/little_foot.h b/keyboards/kingly_keys/little_foot/little_foot.h
deleted file mode 100644
index 860eaeb8f0..0000000000
--- a/keyboards/kingly_keys/little_foot/little_foot.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_split_space_base( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, \
-         k42,        k46,      k47,         k49        \
-) \
-{ \
-    { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010 }, \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110 }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210 }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310 }, \
-    { XXX, k42, XXX, XXX, XXX, k46, k47, XXX, k49, XXX  }  \
-}
-
-#define LAYOUT_big_space_base( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, \
-                           k46                         \
-) \
-{ \
-    { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010 }, \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110 }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210 }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310 }, \
-    { XXX, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX  }  \
-}
diff --git a/keyboards/kingly_keys/romac/config.h b/keyboards/kingly_keys/romac/config.h
index e81c5f4913..0f5a7a6d7f 100644
--- a/keyboards/kingly_keys/romac/config.h
+++ b/keyboards/kingly_keys/romac/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F7, B1, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/kingly_keys/romac/info.json b/keyboards/kingly_keys/romac/info.json
index 1f8b3f4871..236cc335a2 100644
--- a/keyboards/kingly_keys/romac/info.json
+++ b/keyboards/kingly_keys/romac/info.json
@@ -8,11 +8,32 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F7", "B1", "B3"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-	  "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
+	  "layout": [
+      {"matrix": [0, 0], "x": 0, "y": 0},
+      {"matrix": [0, 1], "x": 1, "y": 0},
+      {"matrix": [0, 2], "x": 2, "y": 0},
+
+      {"matrix": [1, 0], "x": 0, "y": 1},
+      {"matrix": [1, 1], "x": 1, "y": 1},
+      {"matrix": [1, 2], "x": 2, "y": 1},
+
+      {"matrix": [2, 0], "x": 0, "y": 2},
+      {"matrix": [2, 1], "x": 1, "y": 2},
+      {"matrix": [2, 2], "x": 2, "y": 2},
+
+      {"matrix": [3, 0], "x": 0, "y": 3},
+      {"matrix": [3, 1], "x": 1, "y": 3},
+      {"matrix": [3, 2], "x": 2, "y": 3}
+    ]
 	}
   }
 }
diff --git a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
index 41bba326c4..c2bd34ed27 100644
--- a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
+++ b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
@@ -1,8 +1,7 @@
 #undef RGBLED_NUM
 #define RGBLED_NUM 16
 
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN F4
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
@@ -16,4 +15,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kingly_keys/romac/romac.c b/keyboards/kingly_keys/romac/romac.c
deleted file mode 100644
index 24f4c16333..0000000000
--- a/keyboards/kingly_keys/romac/romac.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "romac.h"
diff --git a/keyboards/kingly_keys/romac/romac.h b/keyboards/kingly_keys/romac/romac.h
deleted file mode 100644
index e6fb9694d2..0000000000
--- a/keyboards/kingly_keys/romac/romac.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, \
-	K10, K11, K12, \
-	K20, K21, K22, \
-	K30, K31, K32  \
-) \
-{ \
-	{ K00,   K01,   K02 }, \
-	{ K10,   K11,   K12 }, \
-	{ K20,   K21,   K22 }, \
-	{ K30,   K31,   K32 }  \
-}
diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h
index 8392caa689..2d715dbe51 100644
--- a/keyboards/kingly_keys/romac_plus/config.h
+++ b/keyboards/kingly_keys/romac_plus/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, D4, D2, D3 }
-#define MATRIX_COL_PINS { F6, F5, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -15,7 +7,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 4    // Number of LEDs
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json
index a93fa6496b..96c097db5f 100644
--- a/keyboards/kingly_keys/romac_plus/info.json
+++ b/keyboards/kingly_keys/romac_plus/info.json
@@ -8,16 +8,40 @@
     "pid": "0x0002",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F6", "F5", "F4"],
+    "rows": ["C6", "D4", "D2", "D3"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B3", "pin_b": "B2"}
     ]
   },
+  "ws2812": {
+    "pin": "F7"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-	  "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
+	  "layout": [
+      {"matrix": [0, 0], "x": 0, "y": 0},
+      {"matrix": [0, 1], "x": 1, "y": 0},
+      {"matrix": [0, 2], "x": 2, "y": 0},
+
+      {"matrix": [1, 0], "x": 0, "y": 1},
+      {"matrix": [1, 1], "x": 1, "y": 1},
+      {"matrix": [1, 2], "x": 2, "y": 1},
+
+      {"matrix": [2, 0], "x": 0, "y": 2},
+      {"matrix": [2, 1], "x": 1, "y": 2},
+      {"matrix": [2, 2], "x": 2, "y": 2},
+
+      {"matrix": [3, 0], "x": 0, "y": 3},
+      {"matrix": [3, 1], "x": 1, "y": 3},
+      {"matrix": [3, 2], "x": 2, "y": 3}
+    ]
 	}
   }
 }
diff --git a/keyboards/kingly_keys/romac_plus/romac_plus.c b/keyboards/kingly_keys/romac_plus/romac_plus.c
deleted file mode 100644
index 1e95f36c78..0000000000
--- a/keyboards/kingly_keys/romac_plus/romac_plus.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "romac_plus.h"
- 
\ No newline at end of file
diff --git a/keyboards/kingly_keys/romac_plus/romac_plus.h b/keyboards/kingly_keys/romac_plus/romac_plus.h
deleted file mode 100644
index e6fb9694d2..0000000000
--- a/keyboards/kingly_keys/romac_plus/romac_plus.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, \
-	K10, K11, K12, \
-	K20, K21, K22, \
-	K30, K31, K32  \
-) \
-{ \
-	{ K00,   K01,   K02 }, \
-	{ K10,   K11,   K12 }, \
-	{ K20,   K21,   K22 }, \
-	{ K30,   K31,   K32 }  \
-}
diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h
index d1e5d91340..3dba502238 100644
--- a/keyboards/kingly_keys/ropro/config.h
+++ b/keyboards/kingly_keys/ropro/config.h
@@ -16,22 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.#pragma once
  */
 
- /* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, F1, NO_PIN }
-#define MATRIX_COL_PINS { F0, D1, D0, D4, C6, D7, E6, B4, B5, B3, B2, B6, D2, C7 }
-
- /* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
  /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
  /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED --- DIN Pin Routed to VIA on main PCB marked "RGB" */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 18
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/info.json
index b2d3cf21e5..51db685d50 100644
--- a/keyboards/kingly_keys/ropro/info.json
+++ b/keyboards/kingly_keys/ropro/info.json
@@ -8,11 +8,19 @@
     "pid": "0x0002",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2", "B6", "D2", "C7"],
+    "rows": ["F4", "F5", "F6", "F7", "B1", "F1", null]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B7", "pin_b": "D5"}
     ]
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/kingly_keys/ropro/ropro.c b/keyboards/kingly_keys/ropro/ropro.c
deleted file mode 100644
index ccb1ed0dff..0000000000
--- a/keyboards/kingly_keys/ropro/ropro.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ropro.h"
diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h
index 2b4eecd70c..3982ef54e6 100644
--- a/keyboards/kingly_keys/smd_milk/config.h
+++ b/keyboards/kingly_keys/smd_milk/config.h
@@ -15,13 +15,6 @@
  */
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C5, D2 }
-#define MATRIX_COL_PINS { D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 #define FORCE_NKRO
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -31,7 +24,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN B3
 #define RGBLED_NUM 4  // Number of LEDs
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json
index f6bbca9289..2fee4b2603 100644
--- a/keyboards/kingly_keys/smd_milk/info.json
+++ b/keyboards/kingly_keys/smd_milk/info.json
@@ -8,11 +8,22 @@
     "pid": "0xB195",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B3"
+  },
+  "matrix_pins": {
+    "cols": ["D3"],
+    "rows": ["C5", "D2"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
-      "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [1, 0], "x": 0, "y": 1}
+      ]
     }
   }
 }
diff --git a/keyboards/kingly_keys/smd_milk/smd_milk.c b/keyboards/kingly_keys/smd_milk/smd_milk.c
deleted file mode 100644
index 95fa50e029..0000000000
--- a/keyboards/kingly_keys/smd_milk/smd_milk.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Sebastian Williams
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "smd_milk.h"
diff --git a/keyboards/kingly_keys/smd_milk/smd_milk.h b/keyboards/kingly_keys/smd_milk/smd_milk.h
deleted file mode 100644
index 8f294817f9..0000000000
--- a/keyboards/kingly_keys/smd_milk/smd_milk.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Sebastian Williams
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  K00,  \
-  K01  \
-) { \
-  { K00 }, \
-  { K01 } \
-}
diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h
index 3127ee9411..682f1a7531 100644
--- a/keyboards/kingly_keys/soap/config.h
+++ b/keyboards/kingly_keys/soap/config.h
@@ -14,21 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.#pragma once
  */
 
- /* key matrix pins */
-#define MATRIX_ROW_PINS { C7, C6 }
-#define MATRIX_COL_PINS { F4, F1, F0, D5 }
-
- /* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
  /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
  /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED --- DIN Pin Routed to VIA on main PCB marked "RGB" */
-#define RGB_DI_PIN B6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json
index b910faac32..b10260aa0b 100644
--- a/keyboards/kingly_keys/soap/info.json
+++ b/keyboards/kingly_keys/soap/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0003",
     "device_version": "0.0.4"
   },
+  "ws2812": {
+    "pin": "B6"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F1", "F0", "D5"],
+    "rows": ["C7", "C6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "D6", "pin_b": "D7"}
@@ -17,7 +25,17 @@
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":4, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":4, "y":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": 4, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1}
+      ]
     }
   }
 }
diff --git a/keyboards/kingly_keys/soap/soap.c b/keyboards/kingly_keys/soap/soap.c
deleted file mode 100644
index a467c54b74..0000000000
--- a/keyboards/kingly_keys/soap/soap.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "soap.h"
diff --git a/keyboards/kingly_keys/soap/soap.h b/keyboards/kingly_keys/soap/soap.h
deleted file mode 100644
index 8d5eba3ad2..0000000000
--- a/keyboards/kingly_keys/soap/soap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Garret G. (TheRoyalSweatshirt)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Note:  Matrix is a little wacky with the rotary encoder click mapping being
- * on the opposite side of the board.  Remember to pay attention to 
- * the 13th column where the lone key mapped for rotary encoder click (K132).
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13 \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 } \
-}
diff --git a/keyboards/kira75/config.h b/keyboards/kira75/config.h
index 6a69df05e7..b51a90cb7e 100644
--- a/keyboards/kira75/config.h
+++ b/keyboards/kira75/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4 }
-#define MATRIX_COL_PINS { F6, F7, C7, C6, B6, B5, B4, F5, F4, F1, F0, E6, B3, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kira75/info.json b/keyboards/kira75/info.json
index fa366854b2..a8b6a76ffb 100644
--- a/keyboards/kira75/info.json
+++ b/keyboards/kira75/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "C7", "C6", "B6", "B5", "B4", "F5", "F4", "F1", "F0", "E6", "B3", "B2", "B1", "B0"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kira75/kira75.c b/keyboards/kira75/kira75.c
deleted file mode 100644
index bf9afcc8f1..0000000000
--- a/keyboards/kira75/kira75.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "kira75.h"
diff --git a/keyboards/kira80/config.h b/keyboards/kira80/config.h
deleted file mode 100644
index 28c02ab0a6..0000000000
--- a/keyboards/kira80/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2020 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, A0, C2, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kira80/info.json b/keyboards/kira80/info.json
index cb40dc0ab8..3dd54ee7d3 100644
--- a/keyboards/kira80/info.json
+++ b/keyboards/kira80/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC583",
         "device_version": "1.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "A0", "C2", "D7"],
+        "rows": ["B1", "B2", "B3", "B5", "B6", "B7", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4",
         "breathing": true
@@ -20,16 +25,421 @@
     "bootloader": "bootloadhid",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Back", "x":13, "y":1.25}, {"label":"Back", "x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"|", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"FN", "x":14, "y":4.25}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 1], "x": 15.25, "y": 0},
+                {"matrix": [6, 2], "x": 16.25, "y": 0},
+                {"matrix": [6, 12], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [6, 13], "x": 15.25, "y": 2.25},
+                {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 13], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 12], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 1], "x": 15.25, "y": 0},
+                {"matrix": [6, 2], "x": 16.25, "y": 0},
+                {"matrix": [6, 12], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [6, 13], "x": 15.25, "y": 2.25},
+                {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_ansi_wkl": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 1], "x": 15.25, "y": 0},
+                {"matrix": [6, 2], "x": 16.25, "y": 0},
+                {"matrix": [6, 12], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [6, 13], "x": 15.25, "y": 2.25},
+                {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 4], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"\u00ac", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"\"", "x":2, "y":1.25}, {"label":"\u00a3", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"@", "x":11.75, "y":3.25}, {"label":"~", "x":12.75, "y":3.25}, {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"|", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"AltGr", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 1], "x": 15.25, "y": 0},
+                {"matrix": [6, 2], "x": 16.25, "y": 0},
+                {"matrix": [6, 12], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [6, 13], "x": 15.25, "y": 2.25},
+                {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 13], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/kira80/kira80.c b/keyboards/kira80/kira80.c
deleted file mode 100644
index 0f79316fba..0000000000
--- a/keyboards/kira80/kira80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kira80.h"
diff --git a/keyboards/kira80/kira80.h b/keyboards/kira80/kira80.h
deleted file mode 100644
index 0791536395..0000000000
--- a/keyboards/kira80/kira80.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all(\
-    K000,       K002, K003, K004, K005,    K007, K008, K009, K010,    K011, K012, K013, K001,    K091, K092, K102,  \
-    K015, K016, K017, K018, K019, K020, K021, K022, K023, K024, K025, K026, K027, K028, K029,    K096, K095, K094,  \
-    K030, K031, K032, K033, K034, K035, K036, K037, K038, K039, K040, K041, K042, K043,          K103, K098, K097,  \
-    K045, K046, K047, K048, K049, K050, K051, K052, K053, K054, K055, K056,       K057,                             \
-    K060, K058, K061, K062, K063, K064, K065, K066, K067, K068, K069, K070, K071, K072,                K073,        \
-    K075, K076, K077,                   K079,                   K083, K084, K085, K086,          K087, K088, K082   \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  KC_NO, K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO }, \
-    { K015,  K016,  K017,  K018,  K019,  K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028,  K029  }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038,  K039,  K040,  K041,  K042,  K043,  KC_NO }, \
-    { K045,  K046,  K047,  K048,  K049,  K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058,  KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068,  K069,  K070,  K071,  K072,  K073,  KC_NO }, \
-    { K075,  K076,  K077,  KC_NO, K079,  KC_NO, KC_NO, K082,  K083,  K084,  K085,  K086,  K087,  K088,  KC_NO }, \
-    { KC_NO, K091,  K092,  KC_NO, K094,  K095,  K096,  K097,  K098,  KC_NO, KC_NO, KC_NO, K102,  K103,  KC_NO }  \
-}
-
-#define LAYOUT_tkl_ansi(\
-    K000,       K002, K003, K004, K005,    K007, K008, K009, K010,    K011, K012, K013, K001,    K091, K092, K102,  \
-    K015, K016, K017, K018, K019, K020, K021, K022, K023, K024, K025, K026, K027, K028,          K096, K095, K094,  \
-    K030, K031, K032, K033, K034, K035, K036, K037, K038, K039, K040, K041, K042, K043,          K103, K098, K097,  \
-    K045, K046, K047, K048, K049, K050, K051, K052, K053, K054, K055, K056,       K057,                             \
-    K060,       K061, K062, K063, K064, K065, K066, K067, K068, K069, K070,       K071,                K073,        \
-    K075, K076, K077,                   K079,                   K083, K084, K085, K086,          K087, K088, K082   \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  KC_NO, K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO }, \
-    { K015,  K016,  K017,  K018,  K019,  K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028,  KC_NO }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038,  K039,  K040,  K041,  K042,  K043,  KC_NO }, \
-    { K045,  K046,  K047,  K048,  K049,  K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  KC_NO, KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068,  K069,  K070,  K071,  KC_NO, K073,  KC_NO }, \
-    { K075,  K076,  K077,  KC_NO, K079,  KC_NO, KC_NO, K082,  K083,  K084,  K085,  K086,  K087,  K088,  KC_NO }, \
-    { KC_NO, K091,  K092,  KC_NO, K094,  K095,  K096,  K097,  K098,  KC_NO, KC_NO, KC_NO, K102,  K103,  KC_NO }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl(\
-    K000,       K002, K003, K004, K005,    K007, K008, K009, K010,    K011, K012, K013, K001,    K091, K092, K102,  \
-    K015, K016, K017, K018, K019, K020, K021, K022, K023, K024, K025, K026, K027, K028,          K096, K095, K094,  \
-    K030, K031, K032, K033, K034, K035, K036, K037, K038, K039, K040, K041, K042, K043,          K103, K098, K097,  \
-    K045, K046, K047, K048, K049, K050, K051, K052, K053, K054, K055, K056,       K057,                             \
-    K060,       K061, K062, K063, K064, K065, K066, K067, K068, K069, K070,       K071,                K073,        \
-    K075,       K077,                   K079,                         K084,       K086,          K087, K088, K082   \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  KC_NO, K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO }, \
-    { K015,  K016,  K017,  K018,  K019,  K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028,  KC_NO }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038,  K039,  K040,  K041,  K042,  K043,  KC_NO }, \
-    { K045,  K046,  K047,  K048,  K049,  K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  KC_NO, KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068,  K069,  K070,  K071,  KC_NO, K073,  KC_NO }, \
-    { K075,  KC_NO, K077,  KC_NO, K079,  KC_NO, KC_NO, K082,  KC_NO, K084,  KC_NO, K086,  K087,  K088,  KC_NO }, \
-    { KC_NO, K091,  K092,  KC_NO, K094,  K095,  K096,  K097,  K098,  KC_NO, KC_NO, KC_NO, K102,  K103,  KC_NO }  \
-}
-
-#define LAYOUT_tkl_iso(\
-    K000,       K002, K003, K004, K005,    K007, K008, K009, K010,    K011, K012, K013, K001,    K091, K092, K102,  \
-    K015, K016, K017, K018, K019, K020, K021, K022, K023, K024, K025, K026, K027, K028,          K096, K095, K094,  \
-    K030, K031, K032, K033, K034, K035, K036, K037, K038, K039, K040, K041, K042,                K103, K098, K097,  \
-    K045, K046, K047, K048, K049, K050, K051, K052, K053, K054, K055, K056, K043, K057,                             \
-    K060, K058, K061, K062, K063, K064, K065, K066, K067, K068, K069, K070,       K071,                K073,        \
-    K075, K076, K077,                   K079,                   K083, K084, K085, K086,          K087, K088, K082   \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  KC_NO, K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO }, \
-    { K015,  K016,  K017,  K018,  K019,  K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028,  KC_NO }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038,  K039,  K040,  K041,  K042,  K043,  KC_NO }, \
-    { K045,  K046,  K047,  K048,  K049,  K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058,  KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068,  K069,  K070,  K071,  KC_NO, K073,  KC_NO }, \
-    { K075,  K076,  K077,  KC_NO, K079,  KC_NO, KC_NO, K082,  K083,  K084,  K085,  K086,  K087,  K088,  KC_NO }, \
-    { KC_NO, K091,  K092,  KC_NO, K094,  K095,  K096,  K097,  K098,  KC_NO, KC_NO, KC_NO, K102,  K103,  KC_NO }  \
-}
diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h
index 3d06b6bc04..2238a4171f 100644
--- a/keyboards/kiwikeebs/macro/config.h
+++ b/keyboards/kiwikeebs/macro/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, D7 }
-#define MATRIX_COL_PINS { F7, B1, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json
index ae6ed513a2..1cbffbd568 100644
--- a/keyboards/kiwikeebs/macro/info.json
+++ b/keyboards/kiwikeebs/macro/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4712",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3", "B2"],
+        "rows": ["E6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D1", "pin_b": "D0"}
@@ -18,14 +23,16 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "k00", "x": 0, "y": 0 },
-                { "label": "k01", "x": 1, "y": 0 },
-                { "label": "k02", "x": 2, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [1, 3], "x": 3, "y": 0, "w": 2, "h": 2}
 
-                { "label": "k03", "x": 0, "y": 1 },
-                { "label": "k04", "x": 1, "y": 1 },
-                { "label": "k05", "x": 2, "y": 1 },
-                { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 }
             ]
         }
     }
diff --git a/keyboards/kiwikeebs/macro/macro.c b/keyboards/kiwikeebs/macro/macro.c
deleted file mode 100644
index 5eb03509e5..0000000000
--- a/keyboards/kiwikeebs/macro/macro.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "macro.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_AUDIO_VOL_UP);
-        } else {
-            tap_code(KC_AUDIO_VOL_DOWN);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/kiwikeebs/macro/macro.h b/keyboards/kiwikeebs/macro/macro.h
deleted file mode 100644
index ee7c6bd47d..0000000000
--- a/keyboards/kiwikeebs/macro/macro.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-    k03, k04, k05, k06    \
-) { \
-    { k00, k01, k02, KC_NO }, \
-    { k03, k04, k05, k06 }  \
-}
diff --git a/keyboards/kiwikeebs/macro_v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h
index d5fe49330f..2238a4171f 100644
--- a/keyboards/kiwikeebs/macro_v2/config.h
+++ b/keyboards/kiwikeebs/macro_v2/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4 }
-#define MATRIX_COL_PINS { B6, C6, C7, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/info.json
index 168b3ba447..efdf6d860f 100644
--- a/keyboards/kiwikeebs/macro_v2/info.json
+++ b/keyboards/kiwikeebs/macro_v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4712",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "D4"],
+        "rows": ["B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D7", "pin_b": "D6"}
@@ -18,14 +23,15 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "k00", "x": 0, "y": 0 },
-                { "label": "k01", "x": 1, "y": 0 },
-                { "label": "k02", "x": 2, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                { "label": "k03", "x": 0, "y": 1 },
-                { "label": "k04", "x": 1, "y": 1 },
-                { "label": "k05", "x": 2, "y": 1 },
-                { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 }
+                {"matrix": [1, 3], "x": 3, "y": 0, "w": 2, "h": 2}
             ]
         }
     }
diff --git a/keyboards/kiwikeebs/macro_v2/macro_v2.c b/keyboards/kiwikeebs/macro_v2/macro_v2.c
deleted file mode 100644
index 795da21cc9..0000000000
--- a/keyboards/kiwikeebs/macro_v2/macro_v2.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "macro_v2.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_AUDIO_VOL_UP);
-        } else {
-            tap_code(KC_AUDIO_VOL_DOWN);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/kiwikeebs/macro_v2/macro_v2.h b/keyboards/kiwikeebs/macro_v2/macro_v2.h
deleted file mode 100644
index ee7c6bd47d..0000000000
--- a/keyboards/kiwikeebs/macro_v2/macro_v2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-    k03, k04, k05, k06    \
-) { \
-    { k00, k01, k02, KC_NO }, \
-    { k03, k04, k05, k06 }  \
-}
diff --git a/keyboards/kiwikey/borderland/borderland.c b/keyboards/kiwikey/borderland/borderland.c
index 660e8026fc..371dc73098 100644
--- a/keyboards/kiwikey/borderland/borderland.c
+++ b/keyboards/kiwikey/borderland/borderland.c
@@ -2,17 +2,3 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "borderland.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h
index a698476a5f..1676967490 100644
--- a/keyboards/kiwikey/borderland/config.h
+++ b/keyboards/kiwikey/borderland/config.h
@@ -3,27 +3,8 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -40,7 +21,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json
index 84b17c4385..30f8ccc048 100644
--- a/keyboards/kiwikey/borderland/info.json
+++ b/keyboards/kiwikey/borderland/info.json
@@ -8,11 +8,19 @@
         "pid": "0x424C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
+    "ws2812": {
+        "pin": "B2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h
index 086a8c839f..ee2c509f2a 100644
--- a/keyboards/kiwikey/kawii9/config.h
+++ b/keyboards/kiwikey/kawii9/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, B5, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3    // Ver1: F0, Ver2: D3
 #define RGBLED_NUM 4
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/info.json
index e1511b544c..7537e7fe8a 100644
--- a/keyboards/kiwikey/kawii9/info.json
+++ b/keyboards/kiwikey/kawii9/info.json
@@ -8,20 +8,30 @@
         "pid": "0x0303",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6"],
+        "rows": ["B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_3x3": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k10", "x":0, "y":1},
-                {"label":"k11", "x":1, "y":1},
-                {"label":"k12", "x":2, "y":1},
-                {"label":"k20", "x":0, "y":2},
-                {"label":"k21", "x":1, "y":2},
-                {"label":"k22", "x":2, "y":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2}
             ]
         }
     }
diff --git a/keyboards/kiwikey/kawii9/kawii9.c b/keyboards/kiwikey/kawii9/kawii9.c
deleted file mode 100644
index 0e317ca726..0000000000
--- a/keyboards/kiwikey/kawii9/kawii9.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 KiwiKey
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kawii9.h"
diff --git a/keyboards/kiwikey/kawii9/kawii9.h b/keyboards/kiwikey/kawii9/kawii9.h
deleted file mode 100644
index b6fc36a575..0000000000
--- a/keyboards/kiwikey/kawii9/kawii9.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 KiwiKey
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_3x3( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 }  \
-}
diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
index 5332a91304..dd9288a183 100644
--- a/keyboards/kiwikey/wanderland/config.h
+++ b/keyboards/kiwikey/wanderland/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F1, E6, E2, C7, D4 }
-#define MATRIX_COL_PINS { F5, F6, B4, D7, D6, D5, D2, D3, B0, F0, B1, B2, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json
index 3bab46fb4a..eb41a349d0 100644
--- a/keyboards/kiwikey/wanderland/info.json
+++ b/keyboards/kiwikey/wanderland/info.json
@@ -8,10 +8,18 @@
         "pid": "0x574C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "B4", "D7", "D6", "D5", "D2", "D3", "B0", "F0", "B1", "B2", "B3"],
+        "rows": ["F4", "F1", "E6", "E2", "C7", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "indicators": {
         "caps_lock": "B6",
         "num_lock": "C6",
@@ -22,143 +30,167 @@
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"~", "x":1.25, "y":0},
-                {"label":"!", "x":2.25, "y":0},
-                {"label":"@", "x":3.25, "y":0},
-                {"label":"#", "x":4.25, "y":0},
-                {"label":"$", "x":5.25, "y":0},
-                {"label":"%", "x":6.25, "y":0},
-                {"label":"^", "x":7.25, "y":0},
-                {"label":"&", "x":10.25, "y":0},
-                {"label":"*", "x":11.25, "y":0},
-                {"label":"(", "x":12.25, "y":0},
-                {"label":")", "x":13.25, "y":0},
-                {"label":"_", "x":14.25, "y":0},
-                {"label":"+", "x":15.25, "y":0},
-                {"label":"Backspace", "x":16.25, "y":0},
-                {"label":"Del", "x":17.25, "y":0},
-                {"label":"Mute", "x":0, "y":1},
-                {"label":"Tab", "x":1.25, "y":1, "w":1.5},
-                {"label":"Q", "x":2.75, "y":1},
-                {"label":"W", "x":3.75, "y":1},
-                {"label":"E", "x":4.75, "y":1},
-                {"label":"R", "x":5.75, "y":1},
-                {"label":"T", "x":6.75, "y":1},
-                {"label":"Y", "x":9.75, "y":1},
-                {"label":"U", "x":10.75, "y":1},
-                {"label":"I", "x":11.75, "y":1},
-                {"label":"O", "x":12.75, "y":1},
-                {"label":"P", "x":13.75, "y":1},
-                {"label":"{", "x":14.75, "y":1},
-                {"label":"}", "x":15.75, "y":1},
-                {"label":"|", "x":16.75, "y":1, "w":1.5},
-                {"label":"Vol-", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75},
-                {"label":"A", "x":3, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":10, "y":2},
-                {"label":"J", "x":11, "y":2},
-                {"label":"K", "x":12, "y":2},
-                {"label":"L", "x":13, "y":2},
-                {"label":":", "x":14, "y":2},
-                {"label":"\"", "x":15, "y":2},
-                {"label":"Enter", "x":16, "y":2, "w":2.25},
-                {"label":"Vol+", "x":0, "y":3},
-                {"label":"Shift", "x":1.25, "y":3, "w":2.25},
-                {"label":"Z", "x":3.5, "y":3},
-                {"label":"X", "x":4.5, "y":3},
-                {"label":"C", "x":5.5, "y":3},
-                {"label":"V", "x":6.5, "y":3},
-                {"label":"B", "x":7.5, "y":3},
-                {"label":"B", "x":9.5, "y":3},
-                {"label":"N", "x":10.5, "y":3},
-                {"label":"M", "x":11.5, "y":3},
-                {"label":"<", "x":12.5, "y":3},
-                {"label":">", "x":13.5, "y":3},
-                {"label":"?", "x":14.5, "y":3},
-                {"label":"Shift", "x":15.5, "y":3, "w":1.75},
-                {"label":"Win", "x":17.25, "y":3},
-                {"label":"Ctrl", "x":1.25, "y":4, "w":1.5},
-                {"label":"Alt", "x":4.25, "y":4, "w":1.25},
-                {"label":"Space", "x":5.5, "y":4, "w":2.25},
-                {"label":"FN", "x":7.75, "y":4, "w":1.25},
-                {"label":"Space", "x":9.5, "y":4, "w":2.75},
-                {"label":"Alt", "x":12.25, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}
+                {"matrix": [0, 2], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [1, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 3], "x": 4.25, "y": 0},
+                {"matrix": [1, 4], "x": 5.25, "y": 0},
+                {"matrix": [1, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 6], "x": 10.25, "y": 0},
+                {"matrix": [1, 6], "x": 11.25, "y": 0},
+                {"matrix": [1, 7], "x": 12.25, "y": 0},
+                {"matrix": [1, 8], "x": 13.25, "y": 0},
+                {"matrix": [1, 9], "x": 14.25, "y": 0},
+                {"matrix": [1, 10], "x": 15.25, "y": 0},
+                {"matrix": [1, 11], "x": 16.25, "y": 0},
+                {"matrix": [1, 12], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 2.75, "y": 1},
+                {"matrix": [2, 2], "x": 3.75, "y": 1},
+                {"matrix": [2, 3], "x": 4.75, "y": 1},
+                {"matrix": [2, 4], "x": 5.75, "y": 1},
+                {"matrix": [2, 5], "x": 6.75, "y": 1},
+                {"matrix": [0, 7], "x": 9.75, "y": 1},
+
+                {"matrix": [2, 6], "x": 10.75, "y": 1},
+                {"matrix": [2, 7], "x": 11.75, "y": 1},
+                {"matrix": [2, 8], "x": 12.75, "y": 1},
+                {"matrix": [2, 9], "x": 13.75, "y": 1},
+                {"matrix": [2, 10], "x": 14.75, "y": 1},
+                {"matrix": [2, 11], "x": 15.75, "y": 1},
+                {"matrix": [2, 12], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [0, 0], "x": 0, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [3, 1], "x": 3, "y": 2},
+                {"matrix": [3, 2], "x": 4, "y": 2},
+                {"matrix": [3, 3], "x": 5, "y": 2},
+                {"matrix": [3, 4], "x": 6, "y": 2},
+                {"matrix": [3, 5], "x": 7, "y": 2},
+
+                {"matrix": [3, 6], "x": 10, "y": 2},
+                {"matrix": [3, 7], "x": 11, "y": 2},
+                {"matrix": [3, 8], "x": 12, "y": 2},
+                {"matrix": [3, 9], "x": 13, "y": 2},
+                {"matrix": [3, 10], "x": 14, "y": 2},
+                {"matrix": [3, 11], "x": 15, "y": 2},
+                {"matrix": [3, 12], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [0, 3], "x": 0, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [4, 1], "x": 3.5, "y": 3},
+                {"matrix": [4, 2], "x": 4.5, "y": 3},
+                {"matrix": [4, 3], "x": 5.5, "y": 3},
+                {"matrix": [4, 4], "x": 6.5, "y": 3},
+                {"matrix": [4, 5], "x": 7.5, "y": 3},
+
+                {"matrix": [4, 6], "x": 9.5, "y": 3},
+                {"matrix": [4, 7], "x": 10.5, "y": 3},
+                {"matrix": [4, 8], "x": 11.5, "y": 3},
+                {"matrix": [4, 9], "x": 12.5, "y": 3},
+                {"matrix": [4, 10], "x": 13.5, "y": 3},
+                {"matrix": [4, 11], "x": 14.5, "y": 3},
+                {"matrix": [5, 11], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [4, 12], "x": 17.25, "y": 3},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [5, 2], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [5, 3], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [5, 5], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [5, 9], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [5, 12], "x": 16.75, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"~", "x":1.25, "y":0},
-                {"label":"!", "x":2.25, "y":0},
-                {"label":"@", "x":3.25, "y":0},
-                {"label":"#", "x":4.25, "y":0},
-                {"label":"$", "x":5.25, "y":0},
-                {"label":"%", "x":6.25, "y":0},
-                {"label":"^", "x":7.25, "y":0},
-                {"label":"&", "x":10.25, "y":0},
-                {"label":"*", "x":11.25, "y":0},
-                {"label":"(", "x":12.25, "y":0},
-                {"label":")", "x":13.25, "y":0},
-                {"label":"_", "x":14.25, "y":0},
-                {"label":"+", "x":15.25, "y":0},
-                {"label":"Backspace", "x":16.25, "y":0, "w":2},
-                {"label":"Mute", "x":0, "y":1},
-                {"label":"Tab", "x":1.25, "y":1, "w":1.5},
-                {"label":"Q", "x":2.75, "y":1},
-                {"label":"W", "x":3.75, "y":1},
-                {"label":"E", "x":4.75, "y":1},
-                {"label":"R", "x":5.75, "y":1},
-                {"label":"T", "x":6.75, "y":1},
-                {"label":"Y", "x":9.75, "y":1},
-                {"label":"U", "x":10.75, "y":1},
-                {"label":"I", "x":11.75, "y":1},
-                {"label":"O", "x":12.75, "y":1},
-                {"label":"P", "x":13.75, "y":1},
-                {"label":"{", "x":14.75, "y":1},
-                {"label":"}", "x":15.75, "y":1},
-                {"label":"|", "x":16.75, "y":1, "w":1.5},
-                {"label":"Vol-", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75},
-                {"label":"A", "x":3, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":10, "y":2},
-                {"label":"J", "x":11, "y":2},
-                {"label":"K", "x":12, "y":2},
-                {"label":"L", "x":13, "y":2},
-                {"label":":", "x":14, "y":2},
-                {"label":"\"", "x":15, "y":2},
-                {"label":"Enter", "x":16, "y":2, "w":2.25},
-                {"label":"Vol+", "x":0, "y":3},
-                {"label":"Shift", "x":1.25, "y":3, "w":2.25},
-                {"label":"Z", "x":3.5, "y":3},
-                {"label":"X", "x":4.5, "y":3},
-                {"label":"C", "x":5.5, "y":3},
-                {"label":"V", "x":6.5, "y":3},
-                {"label":"B", "x":7.5, "y":3},
-                {"label":"B", "x":9.5, "y":3},
-                {"label":"N", "x":10.5, "y":3},
-                {"label":"M", "x":11.5, "y":3},
-                {"label":"<", "x":12.5, "y":3},
-                {"label":">", "x":13.5, "y":3},
-                {"label":"?", "x":14.5, "y":3},
-                {"label":"Shift", "x":15.5, "y":3, "w":1.75},
-                {"label":"Win", "x":17.25, "y":3},
-                {"label":"Ctrl", "x":1.25, "y":4, "w":1.5},
-                {"label":"Alt", "x":4.25, "y":4, "w":1.25},
-                {"label":"Space", "x":5.5, "y":4, "w":2.25},
-                {"label":"FN", "x":7.75, "y":4, "w":1.25},
-                {"label":"Space", "x":9.5, "y":4, "w":2.75},
-                {"label":"Alt", "x":12.25, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}
+                {"matrix": [0, 2], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [1, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 3], "x": 4.25, "y": 0},
+                {"matrix": [1, 4], "x": 5.25, "y": 0},
+                {"matrix": [1, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 6], "x": 10.25, "y": 0},
+                {"matrix": [1, 6], "x": 11.25, "y": 0},
+                {"matrix": [1, 7], "x": 12.25, "y": 0},
+                {"matrix": [1, 8], "x": 13.25, "y": 0},
+                {"matrix": [1, 9], "x": 14.25, "y": 0},
+                {"matrix": [1, 10], "x": 15.25, "y": 0},
+                {"matrix": [1, 11], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [0, 1], "x": 0, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 2.75, "y": 1},
+                {"matrix": [2, 2], "x": 3.75, "y": 1},
+                {"matrix": [2, 3], "x": 4.75, "y": 1},
+                {"matrix": [2, 4], "x": 5.75, "y": 1},
+                {"matrix": [2, 5], "x": 6.75, "y": 1},
+
+                {"matrix": [0, 7], "x": 9.75, "y": 1},
+                {"matrix": [2, 6], "x": 10.75, "y": 1},
+                {"matrix": [2, 7], "x": 11.75, "y": 1},
+                {"matrix": [2, 8], "x": 12.75, "y": 1},
+                {"matrix": [2, 9], "x": 13.75, "y": 1},
+                {"matrix": [2, 10], "x": 14.75, "y": 1},
+                {"matrix": [2, 11], "x": 15.75, "y": 1},
+                {"matrix": [2, 12], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [0, 0], "x": 0, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [3, 1], "x": 3, "y": 2},
+                {"matrix": [3, 2], "x": 4, "y": 2},
+                {"matrix": [3, 3], "x": 5, "y": 2},
+                {"matrix": [3, 4], "x": 6, "y": 2},
+                {"matrix": [3, 5], "x": 7, "y": 2},
+
+                {"matrix": [3, 6], "x": 10, "y": 2},
+                {"matrix": [3, 7], "x": 11, "y": 2},
+                {"matrix": [3, 8], "x": 12, "y": 2},
+                {"matrix": [3, 9], "x": 13, "y": 2},
+                {"matrix": [3, 10], "x": 14, "y": 2},
+                {"matrix": [3, 11], "x": 15, "y": 2},
+                {"matrix": [3, 12], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [0, 3], "x": 0, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [4, 1], "x": 3.5, "y": 3},
+                {"matrix": [4, 2], "x": 4.5, "y": 3},
+                {"matrix": [4, 3], "x": 5.5, "y": 3},
+                {"matrix": [4, 4], "x": 6.5, "y": 3},
+                {"matrix": [4, 5], "x": 7.5, "y": 3},
+
+                {"matrix": [4, 6], "x": 9.5, "y": 3},
+                {"matrix": [4, 7], "x": 10.5, "y": 3},
+                {"matrix": [4, 8], "x": 11.5, "y": 3},
+                {"matrix": [4, 9], "x": 12.5, "y": 3},
+                {"matrix": [4, 10], "x": 13.5, "y": 3},
+                {"matrix": [4, 11], "x": 14.5, "y": 3},
+                {"matrix": [5, 11], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [4, 12], "x": 17.25, "y": 3},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [5, 2], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [5, 3], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [5, 5], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [5, 9], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [5, 12], "x": 16.75, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/kiwikey/wanderland/wanderland.c b/keyboards/kiwikey/wanderland/wanderland.c
deleted file mode 100644
index 33575e17a6..0000000000
--- a/keyboards/kiwikey/wanderland/wanderland.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 KiwiKey
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wanderland.h"
diff --git a/keyboards/kiwikey/wanderland/wanderland.h b/keyboards/kiwikey/wanderland/wanderland.h
deleted file mode 100644
index f207d01d6c..0000000000
--- a/keyboards/kiwikey/wanderland/wanderland.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2021 KiwiKey
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* Layout Alice split-backspace
- * ┌───� ┌───┬───┬───┬───┬───┬───┬───�         ┌───┬───┬───┬───┬───┬───┬───┬───�
- * │02 │ │10 │11 │12 │13 │14 │15 │05 │         │06 │16 │17 │18 │19 │1A │1B │1C │
- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │01 │ │ 20  │21 │22 │23 │24 │25 │         │07 │26 │27 │28 │29 │2A │2B │ 2C  │
- * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴�        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │00 │ │  30  │31 │32 │33 │34 │35 │         │36 │37 │38 │39 │3A │3B │   3C   │
- * ├───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─�     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │03 │ │   40   │41 │42 │43 │44 │45 │     │46 │47 │48 │49 │4A │4B │  5B  │4C │
- * └───┘ ├──────┬─┴──┬┴───┴┬──┴───┴┬──┴─�   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
- *       │  50  │    │ 52  │  53   │ 55 │   │    57    │ 59  │           │ 5C  │
- *       └──────┘    └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
- */
-#define LAYOUT_alice_split_bs( \
-    k02, k10, k11, k12, k13, k14, k15, k05, k06, k16, k17, k18, k19, k1A, k1B, k1C,      \
-    k01, k20, k21, k22, k23, k24, k25,      k07, k26, k27, k28, k29, k2A, k2B, k2C,      \
-    k00, k30, k31, k32, k33, k34, k35,           k36, k37, k38, k39, k3A, k3B, k3C,      \
-    k03, k40, k41, k42, k43, k44, k45,           k46, k47, k48, k49, k4A, k4B, k5B, k4C, \
-         k50,      k52,   k53,    k55,                  k57,    k59,           k5C       \
-) \
-{ \
-  { k00,   k01,   k02,   k03,   KC_NO, k05,   k06,   k07,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO },   \
-  { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C   },   \
-  { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C   },   \
-  { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C   },   \
-  { k40,   k41,   k42,   k43,   k44,   k45,   k46,   k47,   k48,   k49,   k4A,   k4B,   k4C   },   \
-  { k50,   KC_NO, k52,   k53,   KC_NO, k55,   KC_NO, k57,   KC_NO, k59,   KC_NO, k5B,   k5C   }    \
-}
-
-/* Layout Alice
- * ┌───� ┌───┬───┬───┬───┬───┬───┬───�         ┌───┬───┬───┬───┬───┬───┬───────�
- * │02 │ │10 │11 │12 │13 │14 │15 │05 │         │06 │16 │17 │18 │19 │1A │  1B   │
- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │01 │ │ 20  │21 │22 │23 │24 │25 │         │07 │26 │27 │28 │29 │2A │2B │ 2C  │
- * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴�        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │00 │ │  30  │31 │32 │33 │34 │35 │         │36 │37 │38 │39 │3A │3B │   3C   │
- * ├───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─�     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │03 │ │   40   │41 │42 │43 │44 │45 │     │46 │47 │48 │49 │4A │4B │  5B  │4C │
- * └───┘ ├──────┬─┴──┬┴───┴┬──┴───┴┬──┴─�   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
- *       │  50  │    │ 52  │  53   │ 55 │   │    57    │ 59  │           │ 5C  │
- *       └──────┘    └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
- */
-#define LAYOUT_alice( \
-    k02, k10, k11, k12, k13, k14, k15, k05, k06, k16, k17, k18, k19, k1A, k1B,           \
-    k01, k20, k21, k22, k23, k24, k25,      k07, k26, k27, k28, k29, k2A, k2B, k2C,      \
-    k00, k30, k31, k32, k33, k34, k35,           k36, k37, k38, k39, k3A, k3B, k3C,      \
-    k03, k40, k41, k42, k43, k44, k45,           k46, k47, k48, k49, k4A, k4B, k5B, k4C, \
-         k50,      k52,   k53,    k55,                  k57,    k59,           k5C       \
-) \
-{ \
-  { k00,   k01,   k02,   k03,   KC_NO, k05,   k06,   k07,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO },   \
-  { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   KC_NO },   \
-  { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C   },   \
-  { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C   },   \
-  { k40,   k41,   k42,   k43,   k44,   k45,   k46,   k47,   k48,   k49,   k4A,   k4B,   k4C   },   \
-  { k50,   KC_NO, k52,   k53,   KC_NO, k55,   KC_NO, k57,   KC_NO, k59,   KC_NO, k5B,   k5C   }    \
-}
diff --git a/keyboards/kj_modify/rs40/info.json b/keyboards/kj_modify/rs40/info.json
new file mode 100644
index 0000000000..dfedf672c3
--- /dev/null
+++ b/keyboards/kj_modify/rs40/info.json
@@ -0,0 +1,77 @@
+{
+    "manufacturer": "KJ-Modify",
+    "keyboard_name": "RS40",
+    "maintainer": "Audite Marlow",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B14", "B15", "A8", "A9", "C13", "B9", "B8", "B5", "B4", "B3", "A15"],
+        "rows": ["B13", "A10", "B1", "B10"]
+    },
+    "processor": "STM32F401",
+    "url": "https://www.aliexpress.com/store/911983021",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5253",
+        "vid": "0x4B4A"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0,     "y": 0, "w": 1,    "matrix": [0, 0],  "label": "ESC"},
+                {"x": 1,     "y": 0, "w": 1,    "matrix": [0, 1],  "label": "Q"},
+                {"x": 2,     "y": 0, "w": 1,    "matrix": [0, 2],  "label": "W"},
+                {"x": 3,     "y": 0, "w": 1,    "matrix": [0, 3],  "label": "E"},
+                {"x": 4,     "y": 0, "w": 1,    "matrix": [0, 4],  "label": "R"},
+                {"x": 5,     "y": 0, "w": 1,    "matrix": [0, 5],  "label": "T"},
+                {"x": 6,     "y": 0, "w": 1,    "matrix": [0, 6],  "label": "Y"},
+                {"x": 7,     "y": 0, "w": 1,    "matrix": [0, 7],  "label": "U"},
+                {"x": 8,     "y": 0, "w": 1,    "matrix": [0, 8],  "label": "I"},
+                {"x": 9,     "y": 0, "w": 1,    "matrix": [0, 9],  "label": "O"},
+                {"x": 10,    "y": 0, "w": 1,    "matrix": [0, 10], "label": "P"},
+                {"x": 11,    "y": 0, "w": 1,    "matrix": [0, 11], "label": "BACKSPACE"},
+
+                {"x": 0,     "y": 1, "w": 1.25, "matrix": [1, 0],  "label": "CAPSLOCK"},
+                {"x": 1.25,  "y": 1, "w": 1,    "matrix": [1, 1],  "label": "A"},
+                {"x": 2.25,  "y": 1, "w": 1,    "matrix": [1, 2],  "label": "S"},
+                {"x": 3.25,  "y": 1, "w": 1,    "matrix": [1, 3],  "label": "D"},
+                {"x": 4.25,  "y": 1, "w": 1,    "matrix": [1, 4],  "label": "F"},
+                {"x": 5.25,  "y": 1, "w": 1,    "matrix": [1, 5],  "label": "G"},
+                {"x": 6.25,  "y": 1, "w": 1,    "matrix": [1, 6],  "label": "H"},
+                {"x": 7.25,  "y": 1, "w": 1,    "matrix": [1, 7],  "label": "J"},
+                {"x": 8.25,  "y": 1, "w": 1,    "matrix": [1, 8],  "label": "K"},
+                {"x": 9.25,  "y": 1, "w": 1,    "matrix": [1, 9],  "label": "L"},
+                {"x": 10.25, "y": 1, "w": 1.75, "matrix": [1, 11], "label": "ENTER"},
+
+                {"x": 0,     "y": 2, "w": 1.75, "matrix": [2, 0],  "label": "LSHIFT"},
+                {"x": 1.75,  "y": 2, "w": 1,    "matrix": [2, 2],  "label": "Z"},
+                {"x": 2.75,  "y": 2, "w": 1,    "matrix": [2, 3],  "label": "X"},
+                {"x": 3.75,  "y": 2, "w": 1,    "matrix": [2, 4],  "label": "C"},
+                {"x": 4.75,  "y": 2, "w": 1,    "matrix": [2, 5],  "label": "V"},
+                {"x": 5.75,  "y": 2, "w": 1,    "matrix": [2, 6],  "label": "B"},
+                {"x": 6.75,  "y": 2, "w": 1,    "matrix": [2, 7],  "label": "N"},
+                {"x": 7.75,  "y": 2, "w": 1,    "matrix": [2, 8],  "label": "M"},
+                {"x": 8.75,  "y": 2, "w": 1,    "matrix": [2, 9],  "label": "COMMA"},
+                {"x": 9.75,  "y": 2, "w": 1,    "matrix": [2, 10], "label": "PERIOD"},
+                {"x": 10.75, "y": 2, "w": 1.25, "matrix": [2, 11], "label": "RSHIFT"},
+
+                {"x": 1,     "y": 3, "w": 1.25, "matrix": [3, 0],  "label": "LCTRL"},
+                {"x": 1.25,  "y": 3, "w": 1,    "matrix": [3, 1],  "label": "FN2"},
+                {"x": 2.25,  "y": 3, "w": 1.25, "matrix": [3, 2],  "label": "WIN"},
+                {"x": 3.5,   "y": 3, "w": 2.25, "matrix": [3, 4],  "label": "SPACE"},
+                {"x": 5.75,  "y": 3, "w": 2.75, "matrix": [3, 7],  "label": "FN"},
+                {"x": 8.5,   "y": 3, "w": 1.25, "matrix": [3, 9],  "label": "SLASH"},
+                {"x": 9.75,  "y": 3, "w": 1,    "matrix": [3, 10], "label": "SEMICOLON"},
+                {"x": 10.75, "y": 3, "w": 1.25, "matrix": [3, 11], "label": "RCTRL"}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kj_modify/rs40/keymaps/default/keymap.c b/keyboards/kj_modify/rs40/keymaps/default/keymap.c
new file mode 100644
index 0000000000..03cda315c8
--- /dev/null
+++ b/keyboards/kj_modify/rs40/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Audite Marlow (@auditemarlow)
+// SPDX-License-Identifier: GPL-3.0
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,
+        KC_LCTL, MO(2),   KC_LGUI,          KC_SPC,                    MO(1),            KC_SLSH, KC_SCLN, KC_QUES
+    ),
+	[1] = LAYOUT(
+		_______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+		KC_TAB,  KC_BSLS, KC_QUOT, KC_GRV,  KC_LABK, KC_RABK, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,          KC_DEL,
+		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, KC_LGUI, KC_LALT,          _______,                   _______,          _______, _______, _______
+	),
+	[2] = LAYOUT(
+		KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+		_______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
+		_______, _______, _______,          _______,                   _______,          KC_LEFT, KC_DOWN, KC_RIGHT
+	)
+};
diff --git a/keyboards/kj_modify/rs40/readme.md b/keyboards/kj_modify/rs40/readme.md
new file mode 100644
index 0000000000..a5bcce2796
--- /dev/null
+++ b/keyboards/kj_modify/rs40/readme.md
@@ -0,0 +1,25 @@
+# RS40
+
+A compact 40% keyboard with 42 keys.
+
+* Keyboard Maintainer: [Audite Marlow](https://github.com/auditemarlow)
+* Hardware Supported: RS40 PCB
+* Hardware Availability: https://www.aliexpress.com/store/911983021
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kj_modify/rs40:default
+
+Flashing example for this keyboard:
+
+    make kj_modify/rs40:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kj_modify/rs40/rules.mk b/keyboards/kj_modify/rs40/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/kj_modify/rs40/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kkatano/bakeneko60/bakeneko60.c b/keyboards/kkatano/bakeneko60/bakeneko60.c
deleted file mode 100644
index 809c1ccf18..0000000000
--- a/keyboards/kkatano/bakeneko60/bakeneko60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bakeneko60.h"
diff --git a/keyboards/kkatano/bakeneko60/config.h b/keyboards/kkatano/bakeneko60/config.h
index 49833d6b6d..6aac1d9a5e 100644
--- a/keyboards/kkatano/bakeneko60/config.h
+++ b/keyboards/kkatano/bakeneko60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kkatano/bakeneko60/info.json b/keyboards/kkatano/bakeneko60/info.json
index e4335d1147..dfef4af7ae 100644
--- a/keyboards/kkatano/bakeneko60/info.json
+++ b/keyboards/kkatano/bakeneko60/info.json
@@ -8,6 +8,11 @@
         "pid": "0xCBDC",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_tsangan_hhkb"],
diff --git a/keyboards/kkatano/bakeneko65/rev2/config.h b/keyboards/kkatano/bakeneko65/rev2/config.h
index 6263646091..6aac1d9a5e 100644
--- a/keyboards/kkatano/bakeneko65/rev2/config.h
+++ b/keyboards/kkatano/bakeneko65/rev2/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kkatano/bakeneko65/rev2/info.json b/keyboards/kkatano/bakeneko65/rev2/info.json
index 63cbf3ab7f..fa20fc0fe2 100644
--- a/keyboards/kkatano/bakeneko65/rev2/info.json
+++ b/keyboards/kkatano/bakeneko65/rev2/info.json
@@ -8,312 +8,317 @@
         "pid": "0x4C82",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4 },
-                { "x":11, "y":4 },
-                { "x":12, "y":4 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4 },
-                { "x":11, "y":4 },
-                { "x":12, "y":4 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs_2_right_mods": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.5 },
-                { "x":11.5, "y":4, "w":1.5 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_2_right_mods": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.5 },
-                { "x":11.5, "y":4, "w":1.5 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kkatano/bakeneko65/rev2/rev2.c b/keyboards/kkatano/bakeneko65/rev2/rev2.c
deleted file mode 100644
index a486650790..0000000000
--- a/keyboards/kkatano/bakeneko65/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/kkatano/bakeneko65/rev2/rev2.h b/keyboards/kkatano/bakeneko65/rev2/rev2.h
deleted file mode 100644
index db2d5c14a6..0000000000
--- a/keyboards/kkatano/bakeneko65/rev2/rev2.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_split_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409, k410, k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  k410,  k411,  k412,  k413,  KC_NO, k415 }  \
-}
-
-#define LAYOUT_65_ansi( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,       k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409, k410, k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  k410,  k411,  k412,  k413,  KC_NO, k415 }  \
-}
-
-#define LAYOUT_65_ansi_split_bs_2_right_mods( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409,       k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  KC_NO, k411,  k412,  k413,  KC_NO, k415 }  \
-}
-
-#define LAYOUT_65_ansi_2_right_mods( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,       k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
-    k400, k401, k402,                   k406,                   k409,       k411, k412, k413, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014,  k015 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  KC_NO, k411,  k412,  k413,  KC_NO, k415 }  \
-}
diff --git a/keyboards/kkatano/bakeneko65/rev3/config.h b/keyboards/kkatano/bakeneko65/rev3/config.h
index 6263646091..6aac1d9a5e 100644
--- a/keyboards/kkatano/bakeneko65/rev3/config.h
+++ b/keyboards/kkatano/bakeneko65/rev3/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kkatano/bakeneko65/rev3/info.json b/keyboards/kkatano/bakeneko65/rev3/info.json
index ad74ae3e74..b3b5ee57dc 100644
--- a/keyboards/kkatano/bakeneko65/rev3/info.json
+++ b/keyboards/kkatano/bakeneko65/rev3/info.json
@@ -8,11 +8,90 @@
         "pid": "0x4C83",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0.25}, {"x":1, "y":0.25}, {"x":2, "y":0.25}, {"x":3, "y":0.25}, {"x":4, "y":0.25}, {"x":5, "y":0.25}, {"x":6, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.25}, {"x":9, "y":0.25}, {"x":10, "y":0.25}, {"x":11, "y":0.25}, {"x":12, "y":0.25}, {"x":13, "y":0.25}, {"x":14, "y":0.25}, {"x":15, "y":0.25}, {"x":0, "y":1.25, "w":1.5}, {"x":1.5, "y":1.25}, {"x":2.5, "y":1.25}, {"x":3.5, "y":1.25}, {"x":4.5, "y":1.25}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25}, {"x":7.5, "y":1.25}, {"x":8.5, "y":1.25}, {"x":9.5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.25}, {"x":12.5, "y":1.25}, {"x":13.5, "y":1.25, "w":1.5}, {"x":15, "y":1.25}, {"x":0, "y":2.25, "w":1.75}, {"x":1.75, "y":2.25}, {"x":2.75, "y":2.25}, {"x":3.75, "y":2.25}, {"x":4.75, "y":2.25}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25, "w":2.25}, {"x":15, "y":2.25}, {"x":0, "y":3.25, "w":2.25}, {"x":2.25, "y":3.25}, {"x":3.25, "y":3.25}, {"x":4.25, "y":3.25}, {"x":5.25, "y":3.25}, {"x":6.25, "y":3.25}, {"x":7.25, "y":3.25}, {"x":8.25, "y":3.25}, {"x":9.25, "y":3.25}, {"x":10.25, "y":3.25}, {"x":11.25, "y":3.25}, {"x":12.25, "y":3.25, "w":1.75}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25, "w":1.25}, {"x":2.5, "y":4.25, "w":1.25}, {"x":3.75, "y":4.25, "w":6.25}, {"x":10, "y":4.25, "w":1.25}, {"x":11.25, "y":4.25, "w":1.25}, {"x":13, "y":4.25}, {"x":14, "y":4.25}, {"x":15, "y":4.25}]
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/kkatano/bakeneko65/rev3/rev3.c b/keyboards/kkatano/bakeneko65/rev3/rev3.c
deleted file mode 100644
index cf1084d495..0000000000
--- a/keyboards/kkatano/bakeneko65/rev3/rev3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev3.h"
diff --git a/keyboards/kkatano/bakeneko80/bakeneko80.c b/keyboards/kkatano/bakeneko80/bakeneko80.c
deleted file mode 100644
index 264979f550..0000000000
--- a/keyboards/kkatano/bakeneko80/bakeneko80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bakeneko80.h"
\ No newline at end of file
diff --git a/keyboards/kkatano/bakeneko80/bakeneko80.h b/keyboards/kkatano/bakeneko80/bakeneko80.h
deleted file mode 100644
index 9c30a57566..0000000000
--- a/keyboards/kkatano/bakeneko80/bakeneko80.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_tkl_ansi( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500, k501, k502,                   k506,                   k510, k511, k512, k513, k514, k515, k516  \
-) \
-{ \
-    { k000,  KC_NO, k002,  k003,  k004,  k005,  k006, k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014,  k015,  k016  }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106, k107,  k108,  k109,  k110,  k111,  k112,  k113,  k114,  k115,  k116  }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206, k207,  k208,  k209,  k210,  k211,  k212,  k213,  k214,  k215,  k216  }, \
-    { k300,  k301,  k302,  k303,  k304,  k305,  k306, k307,  k308,  k309,  k310,  k311,  KC_NO, k313,  KC_NO, KC_NO, KC_NO }, \
-    { k400,  KC_NO, k402,  k403,  k404,  k405,  k406, k407,  k408,  k409,  k410,  k411,  k412,  KC_NO, KC_NO, k415,  KC_NO }, \
-    { k500,  k501,  k502,  KC_NO, KC_NO, KC_NO, k506, KC_NO, KC_NO, KC_NO, k510,  k511,  k512,  k513,  k514,  k515,  k516  }  \
-}
diff --git a/keyboards/kkatano/bakeneko80/config.h b/keyboards/kkatano/bakeneko80/config.h
index d13b5396c6..6aac1d9a5e 100644
--- a/keyboards/kkatano/bakeneko80/config.h
+++ b/keyboards/kkatano/bakeneko80/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B0, B1, B7, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kkatano/bakeneko80/info.json b/keyboards/kkatano/bakeneko80/info.json
index 8cb125d309..3dae3252c4 100644
--- a/keyboards/kkatano/bakeneko80/info.json
+++ b/keyboards/kkatano/bakeneko80/info.json
@@ -8,12 +8,118 @@
         "pid": "0x8DEF",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["E6", "B0", "B1", "B7", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
-            "layout": [{"label":"1", "x":0, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":6.5, "y":0}, {"label":"7", "x":7.5, "y":0}, {"label":"8", "x":8.5, "y":0}, {"label":"9", "x":9.5, "y":0}, {"label":"10", "x":11, "y":0}, {"label":"11", "x":12, "y":0}, {"label":"12", "x":13, "y":0}, {"label":"13", "x":14, "y":0}, {"label":"14", "x":15.25, "y":0}, {"label":"15", "x":16.25, "y":0}, {"label":"16", "x":17.25, "y":0}, {"label":"17", "x":0, "y":1.25}, {"label":"18", "x":1, "y":1.25}, {"label":"19", "x":2, "y":1.25}, {"label":"20", "x":3, "y":1.25}, {"label":"21", "x":4, "y":1.25}, {"label":"22", "x":5, "y":1.25}, {"label":"23", "x":6, "y":1.25}, {"label":"24", "x":7, "y":1.25}, {"label":"25", "x":8, "y":1.25}, {"label":"26", "x":9, "y":1.25}, {"label":"27", "x":10, "y":1.25}, {"label":"28", "x":11, "y":1.25}, {"label":"29", "x":12, "y":1.25}, {"label":"30", "x":13, "y":1.25, "w":2}, {"label":"31", "x":15.25, "y":1.25}, {"label":"32", "x":16.25, "y":1.25}, {"label":"33", "x":17.25, "y":1.25}, {"label":"34", "x":0, "y":2.25, "w":1.5}, {"label":"35", "x":1.5, "y":2.25}, {"label":"36", "x":2.5, "y":2.25}, {"label":"37", "x":3.5, "y":2.25}, {"label":"38", "x":4.5, "y":2.25}, {"label":"39", "x":5.5, "y":2.25}, {"label":"40", "x":6.5, "y":2.25}, {"label":"41", "x":7.5, "y":2.25}, {"label":"42", "x":8.5, "y":2.25}, {"label":"43", "x":9.5, "y":2.25}, {"label":"44", "x":10.5, "y":2.25}, {"label":"45", "x":11.5, "y":2.25}, {"label":"46", "x":12.5, "y":2.25}, {"label":"47", "x":13.5, "y":2.25, "w":1.5}, {"label":"48", "x":15.25, "y":2.25}, {"label":"49", "x":16.25, "y":2.25}, {"label":"50", "x":17.25, "y":2.25}, {"label":"51", "x":0, "y":3.25, "w":1.75}, {"label":"52", "x":1.75, "y":3.25}, {"label":"53", "x":2.75, "y":3.25}, {"label":"54", "x":3.75, "y":3.25}, {"label":"55", "x":4.75, "y":3.25}, {"label":"56", "x":5.75, "y":3.25}, {"label":"57", "x":6.75, "y":3.25}, {"label":"58", "x":7.75, "y":3.25}, {"label":"59", "x":8.75, "y":3.25}, {"label":"60", "x":9.75, "y":3.25}, {"label":"61", "x":10.75, "y":3.25}, {"label":"62", "x":11.75, "y":3.25}, {"label":"63", "x":12.75, "y":3.25, "w":2.25}, {"label":"64", "x":0, "y":4.25, "w":2.25}, {"label":"65", "x":2.25, "y":4.25}, {"label":"66", "x":3.25, "y":4.25}, {"label":"67", "x":4.25, "y":4.25}, {"label":"68", "x":5.25, "y":4.25}, {"label":"69", "x":6.25, "y":4.25}, {"label":"70", "x":7.25, "y":4.25}, {"label":"71", "x":8.25, "y":4.25}, {"label":"72", "x":9.25, "y":4.25}, {"label":"73", "x":10.25, "y":4.25}, {"label":"74", "x":11.25, "y":4.25}, {"label":"75", "x":12.25, "y":4.25, "w":2.75}, {"label":"76", "x":16.25, "y":4.25}, {"label":"77", "x":0, "y":5.25, "w":1.25}, {"label":"78", "x":1.25, "y":5.25, "w":1.25}, {"label":"79", "x":2.5, "y":5.25, "w":1.25}, {"label":"80", "x":3.75, "y":5.25, "w":6.25}, {"label":"81", "x":10, "y":5.25, "w":1.25}, {"label":"82", "x":11.25, "y":5.25, "w":1.25}, {"label":"83", "x":12.5, "y":5.25, "w":1.25}, {"label":"84", "x":13.75, "y":5.25, "w":1.25}, {"label":"85", "x":15.25, "y":5.25}, {"label":"86", "x":16.25, "y":5.25}, {"label":"87", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/kkatano/wallaby/config.h b/keyboards/kkatano/wallaby/config.h
index aecfcb1c13..6aac1d9a5e 100644
--- a/keyboards/kkatano/wallaby/config.h
+++ b/keyboards/kkatano/wallaby/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, C7, C6, D4, D0, E6, F0, F1, F4, F5, F6, F7, D7, D6, D1, D2, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kkatano/wallaby/info.json b/keyboards/kkatano/wallaby/info.json
index b5ee4bd1ed..6939509fac 100644
--- a/keyboards/kkatano/wallaby/info.json
+++ b/keyboards/kkatano/wallaby/info.json
@@ -8,99 +8,117 @@
         "pid": "0x5967",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"],
+        "rows": ["B5", "B4", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"1", "x":0, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0}, 
-                {"label":"5", "x":5, "y":0}, 
-                {"label":"6", "x":6.5, "y":0}, 
-                {"label":"7", "x":7.5, "y":0}, 
-                {"label":"8", "x":8.5, "y":0}, 
-                {"label":"9", "x":9.5, "y":0}, 
-                {"label":"10", "x":11, "y":0}, 
-                {"label":"11", "x":12, "y":0}, 
-                {"label":"12", "x":13, "y":0}, 
-                {"label":"13", "x":14, "y":0}, 
-                {"label":"14", "x":15.26, "y":0}, 
-                {"label":"15", "x":16.26, "y":0}, 
-                {"label":"16", "x":17.26, "y":0}, 
-                {"label":"17", "x":0, "y":1.47}, 
-                {"label":"18", "x":1, "y":1.47}, 
-                {"label":"19", "x":2, "y":1.47}, 
-                {"label":"20", "x":3, "y":1.47}, 
-                {"label":"21", "x":4, "y":1.47}, 
-                {"label":"22", "x":5, "y":1.47}, 
-                {"label":"23", "x":6, "y":1.47}, 
-                {"label":"24", "x":7, "y":1.47}, 
-                {"label":"25", "x":8, "y":1.47}, 
-                {"label":"26", "x":9, "y":1.47}, 
-                {"label":"27", "x":10, "y":1.47}, 
-                {"label":"28", "x":11, "y":1.47}, 
-                {"label":"29", "x":12, "y":1.47}, 
-                {"label":"30", "x":13, "y":1.47, "w":2}, 
-                {"label":"31", "x":15.26, "y":1.47}, 
-                {"label":"32", "x":16.26, "y":1.47}, 
-                {"label":"33", "x":17.26, "y":1.47}, 
-                {"label":"34", "x":0, "y":2.47, "w":1.5}, 
-                {"label":"35", "x":1.5, "y":2.47}, 
-                {"label":"36", "x":2.5, "y":2.47}, 
-                {"label":"37", "x":3.5, "y":2.47}, 
-                {"label":"38", "x":4.5, "y":2.47}, 
-                {"label":"39", "x":5.5, "y":2.47}, 
-                {"label":"40", "x":6.5, "y":2.47}, 
-                {"label":"41", "x":7.5, "y":2.47}, 
-                {"label":"42", "x":8.5, "y":2.47}, 
-                {"label":"43", "x":9.5, "y":2.47}, 
-                {"label":"44", "x":10.5, "y":2.47}, 
-                {"label":"45", "x":11.5, "y":2.47}, 
-                {"label":"46", "x":12.5, "y":2.47}, 
-                {"label":"47", "x":13.5, "y":2.47, "w":1.5}, 
-                {"label":"48", "x":15.26, "y":2.47}, 
-                {"label":"49", "x":16.26, "y":2.47}, 
-                {"label":"50", "x":17.26, "y":2.47}, 
-                {"label":"51", "x":0, "y":3.47, "w":1.75}, 
-                {"label":"52", "x":1.75, "y":3.47}, 
-                {"label":"53", "x":2.75, "y":3.47}, 
-                {"label":"54", "x":3.75, "y":3.47}, 
-                {"label":"55", "x":4.75, "y":3.47}, 
-                {"label":"56", "x":5.75, "y":3.47}, 
-                {"label":"57", "x":6.75, "y":3.47}, 
-                {"label":"58", "x":7.75, "y":3.47}, 
-                {"label":"59", "x":8.75, "y":3.47}, 
-                {"label":"60", "x":9.75, "y":3.47}, 
-                {"label":"61", "x":10.75, "y":3.47}, 
-                {"label":"62", "x":11.75, "y":3.47}, 
-                {"label":"63", "x":12.75, "y":3.47, "w":2.25}, 
-                {"label":"64", "x":0, "y":4.47, "w":2.25}, 
-                {"label":"65", "x":2.25, "y":4.47}, 
-                {"label":"66", "x":3.25, "y":4.47}, 
-                {"label":"67", "x":4.25, "y":4.47}, 
-                {"label":"68", "x":5.25, "y":4.47}, 
-                {"label":"69", "x":6.25, "y":4.47}, 
-                {"label":"70", "x":7.25, "y":4.47}, 
-                {"label":"71", "x":8.25, "y":4.47}, 
-                {"label":"72", "x":9.25, "y":4.47}, 
-                {"label":"73", "x":10.25, "y":4.47}, 
-                {"label":"74", "x":11.25, "y":4.47}, 
-                {"label":"75", "x":12.25, "y":4.47, "w":2.75}, 
-                {"label":"76", "x":16.26, "y":4.47}, 
-                {"label":"77", "x":0, "y":5.47, "w":1.25}, 
-                {"label":"78", "x":1.25, "y":5.47, "w":1.25}, 
-                {"label":"79", "x":2.5, "y":5.47, "w":1.25}, 
-                {"label":"80", "x":3.75, "y":5.47, "w":6.25}, 
-                {"label":"81", "x":10, "y":5.47, "w":1.25}, 
-                {"label":"82", "x":11.25, "y":5.47, "w":1.25}, 
-                {"label":"83", "x":12.5, "y":5.47, "w":1.25}, 
-                {"label":"84", "x":13.75, "y":5.47, "w":1.25}, 
-                {"label":"85", "x":15.26, "y":5.47}, 
-                {"label":"86", "x":16.26, "y":5.47}, 
-                {"label":"87", "x":17.26, "y":5.47}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.26, "y": 0},
+                {"matrix": [0, 15], "x": 16.26, "y": 0},
+                {"matrix": [0, 16], "x": 17.26, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.47},
+                {"matrix": [1, 1], "x": 1, "y": 1.47},
+                {"matrix": [1, 2], "x": 2, "y": 1.47},
+                {"matrix": [1, 3], "x": 3, "y": 1.47},
+                {"matrix": [1, 4], "x": 4, "y": 1.47},
+                {"matrix": [1, 5], "x": 5, "y": 1.47},
+                {"matrix": [1, 6], "x": 6, "y": 1.47},
+                {"matrix": [1, 7], "x": 7, "y": 1.47},
+                {"matrix": [1, 8], "x": 8, "y": 1.47},
+                {"matrix": [1, 9], "x": 9, "y": 1.47},
+                {"matrix": [1, 10], "x": 10, "y": 1.47},
+                {"matrix": [1, 11], "x": 11, "y": 1.47},
+                {"matrix": [1, 12], "x": 12, "y": 1.47},
+                {"matrix": [1, 13], "x": 13, "y": 1.47, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.26, "y": 1.47},
+                {"matrix": [1, 15], "x": 16.26, "y": 1.47},
+                {"matrix": [1, 16], "x": 17.26, "y": 1.47},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.47, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.47},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.47},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.47},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.47},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.47},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.47},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.47},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.47},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.47},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.47},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.47},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.47},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.47, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.26, "y": 2.47},
+                {"matrix": [2, 15], "x": 16.26, "y": 2.47},
+                {"matrix": [2, 16], "x": 17.26, "y": 2.47},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.47, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.47},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.47},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.47},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.47},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.47},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.47},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.47},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.47},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.47},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.47},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.47},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.47, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.47, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.47},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.47},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.47},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.47},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.47},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.47},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.47},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.47},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.47},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.47},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.47, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.26, "y": 4.47},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.47, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.47, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.26, "y": 5.47},
+                {"matrix": [5, 15], "x": 16.26, "y": 5.47},
+                {"matrix": [5, 16], "x": 17.26, "y": 5.47}
             ]
         }
     }
diff --git a/keyboards/kkatano/wallaby/wallaby.c b/keyboards/kkatano/wallaby/wallaby.c
index b27ff4e29c..4d619bec8e 100644
--- a/keyboards/kkatano/wallaby/wallaby.c
+++ b/keyboards/kkatano/wallaby/wallaby.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "wallaby.h"
+#include "quantum.h"
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
diff --git a/keyboards/kkatano/wallaby/wallaby.h b/keyboards/kkatano/wallaby/wallaby.h
deleted file mode 100644
index f5ab30b830..0000000000
--- a/keyboards/kkatano/wallaby/wallaby.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_tkl_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,                \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,           k4F,      \
-    k50, k51, k52,                k56,                k5A, k5B, k5C, k5D, k5E, k5F, k5G  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E, k0F, k0G }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, KC_NO, KC_NO, KC_NO }, \
-    { k40, KC_NO, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, KC_NO, KC_NO, k4F, KC_NO }, \
-    { k50, k51, k52, KC_NO, KC_NO, KC_NO, k56, KC_NO, KC_NO, KC_NO, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
-}
diff --git a/keyboards/kkatano/yurei/config.h b/keyboards/kkatano/yurei/config.h
index cd117f9c57..6954b38182 100644
--- a/keyboards/kkatano/yurei/config.h
+++ b/keyboards/kkatano/yurei/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, C7, C6, D4, D0, E6, F0, F1, F4, F5, F6, F7, D7, D6, D1, D2, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kkatano/yurei/info.json b/keyboards/kkatano/yurei/info.json
index b1efc63581..20430f8490 100644
--- a/keyboards/kkatano/yurei/info.json
+++ b/keyboards/kkatano/yurei/info.json
@@ -8,99 +8,117 @@
         "pid": "0x5D5E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"],
+        "rows": ["B5", "B4", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"1", "x":0, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0}, 
-                {"label":"5", "x":5, "y":0}, 
-                {"label":"6", "x":6.5, "y":0}, 
-                {"label":"7", "x":7.5, "y":0}, 
-                {"label":"8", "x":8.5, "y":0}, 
-                {"label":"9", "x":9.5, "y":0}, 
-                {"label":"10", "x":11, "y":0}, 
-                {"label":"11", "x":12, "y":0}, 
-                {"label":"12", "x":13, "y":0}, 
-                {"label":"13", "x":14, "y":0}, 
-                {"label":"14", "x":15.26, "y":0}, 
-                {"label":"15", "x":16.26, "y":0}, 
-                {"label":"16", "x":17.26, "y":0}, 
-                {"label":"17", "x":0, "y":1.47}, 
-                {"label":"18", "x":1, "y":1.47}, 
-                {"label":"19", "x":2, "y":1.47}, 
-                {"label":"20", "x":3, "y":1.47}, 
-                {"label":"21", "x":4, "y":1.47}, 
-                {"label":"22", "x":5, "y":1.47}, 
-                {"label":"23", "x":6, "y":1.47}, 
-                {"label":"24", "x":7, "y":1.47}, 
-                {"label":"25", "x":8, "y":1.47}, 
-                {"label":"26", "x":9, "y":1.47}, 
-                {"label":"27", "x":10, "y":1.47}, 
-                {"label":"28", "x":11, "y":1.47}, 
-                {"label":"29", "x":12, "y":1.47}, 
-                {"label":"30", "x":13, "y":1.47, "w":2}, 
-                {"label":"31", "x":15.26, "y":1.47}, 
-                {"label":"32", "x":16.26, "y":1.47}, 
-                {"label":"33", "x":17.26, "y":1.47}, 
-                {"label":"34", "x":0, "y":2.47, "w":1.5}, 
-                {"label":"35", "x":1.5, "y":2.47}, 
-                {"label":"36", "x":2.5, "y":2.47}, 
-                {"label":"37", "x":3.5, "y":2.47}, 
-                {"label":"38", "x":4.5, "y":2.47}, 
-                {"label":"39", "x":5.5, "y":2.47}, 
-                {"label":"40", "x":6.5, "y":2.47}, 
-                {"label":"41", "x":7.5, "y":2.47}, 
-                {"label":"42", "x":8.5, "y":2.47}, 
-                {"label":"43", "x":9.5, "y":2.47}, 
-                {"label":"44", "x":10.5, "y":2.47}, 
-                {"label":"45", "x":11.5, "y":2.47}, 
-                {"label":"46", "x":12.5, "y":2.47}, 
-                {"label":"47", "x":13.5, "y":2.47, "w":1.5}, 
-                {"label":"48", "x":15.26, "y":2.47}, 
-                {"label":"49", "x":16.26, "y":2.47}, 
-                {"label":"50", "x":17.26, "y":2.47}, 
-                {"label":"51", "x":0, "y":3.47, "w":1.75}, 
-                {"label":"52", "x":1.75, "y":3.47}, 
-                {"label":"53", "x":2.75, "y":3.47}, 
-                {"label":"54", "x":3.75, "y":3.47}, 
-                {"label":"55", "x":4.75, "y":3.47}, 
-                {"label":"56", "x":5.75, "y":3.47}, 
-                {"label":"57", "x":6.75, "y":3.47}, 
-                {"label":"58", "x":7.75, "y":3.47}, 
-                {"label":"59", "x":8.75, "y":3.47}, 
-                {"label":"60", "x":9.75, "y":3.47}, 
-                {"label":"61", "x":10.75, "y":3.47}, 
-                {"label":"62", "x":11.75, "y":3.47}, 
-                {"label":"63", "x":12.75, "y":3.47, "w":2.25}, 
-                {"label":"64", "x":0, "y":4.47, "w":2.25}, 
-                {"label":"65", "x":2.25, "y":4.47}, 
-                {"label":"66", "x":3.25, "y":4.47}, 
-                {"label":"67", "x":4.25, "y":4.47}, 
-                {"label":"68", "x":5.25, "y":4.47}, 
-                {"label":"69", "x":6.25, "y":4.47}, 
-                {"label":"70", "x":7.25, "y":4.47}, 
-                {"label":"71", "x":8.25, "y":4.47}, 
-                {"label":"72", "x":9.25, "y":4.47}, 
-                {"label":"73", "x":10.25, "y":4.47}, 
-                {"label":"74", "x":11.25, "y":4.47}, 
-                {"label":"75", "x":12.25, "y":4.47, "w":2.75}, 
-                {"label":"76", "x":16.26, "y":4.47}, 
-                {"label":"77", "x":0, "y":5.47, "w":1.25}, 
-                {"label":"78", "x":1.25, "y":5.47, "w":1.25}, 
-                {"label":"79", "x":2.5, "y":5.47, "w":1.25}, 
-                {"label":"80", "x":3.75, "y":5.47, "w":6.25}, 
-                {"label":"81", "x":10, "y":5.47, "w":1.25}, 
-                {"label":"82", "x":11.25, "y":5.47, "w":1.25}, 
-                {"label":"83", "x":12.5, "y":5.47, "w":1.25}, 
-                {"label":"84", "x":13.75, "y":5.47, "w":1.25}, 
-                {"label":"85", "x":15.26, "y":5.47}, 
-                {"label":"86", "x":16.26, "y":5.47}, 
-                {"label":"87", "x":17.26, "y":5.47}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.26, "y": 0},
+                {"matrix": [0, 15], "x": 16.26, "y": 0},
+                {"matrix": [0, 16], "x": 17.26, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.47},
+                {"matrix": [1, 1], "x": 1, "y": 1.47},
+                {"matrix": [1, 2], "x": 2, "y": 1.47},
+                {"matrix": [1, 3], "x": 3, "y": 1.47},
+                {"matrix": [1, 4], "x": 4, "y": 1.47},
+                {"matrix": [1, 5], "x": 5, "y": 1.47},
+                {"matrix": [1, 6], "x": 6, "y": 1.47},
+                {"matrix": [1, 7], "x": 7, "y": 1.47},
+                {"matrix": [1, 8], "x": 8, "y": 1.47},
+                {"matrix": [1, 9], "x": 9, "y": 1.47},
+                {"matrix": [1, 10], "x": 10, "y": 1.47},
+                {"matrix": [1, 11], "x": 11, "y": 1.47},
+                {"matrix": [1, 12], "x": 12, "y": 1.47},
+                {"matrix": [1, 13], "x": 13, "y": 1.47, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.26, "y": 1.47},
+                {"matrix": [1, 15], "x": 16.26, "y": 1.47},
+                {"matrix": [1, 16], "x": 17.26, "y": 1.47},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.47, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.47},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.47},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.47},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.47},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.47},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.47},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.47},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.47},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.47},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.47},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.47},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.47},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.47, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.26, "y": 2.47},
+                {"matrix": [2, 15], "x": 16.26, "y": 2.47},
+                {"matrix": [2, 16], "x": 17.26, "y": 2.47},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.47, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.47},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.47},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.47},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.47},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.47},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.47},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.47},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.47},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.47},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.47},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.47},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.47, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.47, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.47},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.47},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.47},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.47},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.47},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.47},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.47},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.47},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.47},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.47},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.47, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.26, "y": 4.47},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.47, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.47, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.47, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.26, "y": 5.47},
+                {"matrix": [5, 15], "x": 16.26, "y": 5.47},
+                {"matrix": [5, 16], "x": 17.26, "y": 5.47}
             ]
         }
     }
diff --git a/keyboards/kkatano/yurei/yurei.c b/keyboards/kkatano/yurei/yurei.c
index 3ac0d32bef..457a6ce48c 100644
--- a/keyboards/kkatano/yurei/yurei.c
+++ b/keyboards/kkatano/yurei/yurei.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "yurei.h"
+#include "quantum.h"
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
diff --git a/keyboards/kkatano/yurei/yurei.h b/keyboards/kkatano/yurei/yurei.h
deleted file mode 100644
index d117d2a02f..0000000000
--- a/keyboards/kkatano/yurei/yurei.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2019 Koichi Katano
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_tkl_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,                \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,           k4F,      \
-    k50, k51, k52,                k56,                k5A, k5B, k5C, k5D, k5E, k5F, k5G  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E, k0F, k0G }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, KC_NO, KC_NO, KC_NO }, \
-    { k40, KC_NO, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, KC_NO, KC_NO, k4F, KC_NO }, \
-    { k50, k51, k52, KC_NO, KC_NO, KC_NO, k56, KC_NO, KC_NO, KC_NO, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
-}
diff --git a/keyboards/kmac/info.json b/keyboards/kmac/info.json
index ddf5361257..0ec6f0b2a9 100644
--- a/keyboards/kmac/info.json
+++ b/keyboards/kmac/info.json
@@ -21,181 +21,207 @@
   "layouts": {
     "LAYOUT_tkl_ansi": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 2, "y": 0 },
-        { "label": "F2", "x": 3, "y": 0 },
-        { "label": "F3", "x": 4, "y": 0 },
-        { "label": "F4", "x": 5, "y": 0 },
-        { "label": "F5", "x": 6.5, "y": 0 },
-        { "label": "F6", "x": 7.5, "y": 0 },
-        { "label": "F7", "x": 8.5, "y": 0 },
-        { "label": "F8", "x": 9.5, "y": 0 },
-        { "label": "F9", "x": 11, "y": 0 },
-        { "label": "F10", "x": 12, "y": 0 },
-        { "label": "F11", "x": 13, "y": 0 },
-        { "label": "F12", "x": 14, "y": 0 },
-        { "label": "PrtSc", "x": 15.25, "y": 0 },
-        { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-        { "label": "~", "x": 0, "y": 1.5 },
-        { "label": "!", "x": 1, "y": 1.5 },
-        { "label": "@", "x": 2, "y": 1.5 },
-        { "label": "#", "x": 3, "y": 1.5 },
-        { "label": "$", "x": 4, "y": 1.5 },
-        { "label": "%", "x": 5, "y": 1.5 },
-        { "label": "^", "x": 6, "y": 1.5 },
-        { "label": "&", "x": 7, "y": 1.5 },
-        { "label": "*", "x": 8, "y": 1.5 },
-        { "label": "(", "x": 9, "y": 1.5 },
-        { "label": ")", "x": 10, "y": 1.5 },
-        { "label": "_", "x": 11, "y": 1.5 },
-        { "label": "+", "x": 12, "y": 1.5 },
-        { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.5 },
-        { "label": "Home", "x": 16.25, "y": 1.5 },
-        { "label": "PgUp", "x": 17.25, "y": 1.5 },
-        { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.5 },
-        { "label": "W", "x": 2.5, "y": 2.5 },
-        { "label": "E", "x": 3.5, "y": 2.5 },
-        { "label": "R", "x": 4.5, "y": 2.5 },
-        { "label": "T", "x": 5.5, "y": 2.5 },
-        { "label": "Y", "x": 6.5, "y": 2.5 },
-        { "label": "U", "x": 7.5, "y": 2.5 },
-        { "label": "I", "x": 8.5, "y": 2.5 },
-        { "label": "O", "x": 9.5, "y": 2.5 },
-        { "label": "P", "x": 10.5, "y": 2.5 },
-        { "label": "{", "x": 11.5, "y": 2.5 },
-        { "label": "}", "x": 12.5, "y": 2.5 },
-        { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.5 },
-        { "label": "End", "x": 16.25, "y": 2.5 },
-        { "label": "PgDn", "x": 17.25, "y": 2.5 },
-        { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.5 },
-        { "label": "S", "x": 2.75, "y": 3.5 },
-        { "label": "D", "x": 3.75, "y": 3.5 },
-        { "label": "F", "x": 4.75, "y": 3.5 },
-        { "label": "G", "x": 5.75, "y": 3.5 },
-        { "label": "H", "x": 6.75, "y": 3.5 },
-        { "label": "J", "x": 7.75, "y": 3.5 },
-        { "label": "K", "x": 8.75, "y": 3.5 },
-        { "label": "L", "x": 9.75, "y": 3.5 },
-        { "label": ":", "x": 10.75, "y": 3.5 },
-        { "label": "\"", "x": 11.75, "y": 3.5 },
-        { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
-        { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.5 },
-        { "label": "X", "x": 3.25, "y": 4.5 },
-        { "label": "C", "x": 4.25, "y": 4.5 },
-        { "label": "V", "x": 5.25, "y": 4.5 },
-        { "label": "B", "x": 6.25, "y": 4.5 },
-        { "label": "N", "x": 7.25, "y": 4.5 },
-        { "label": "M", "x": 8.25, "y": 4.5 },
-        { "label": "<", "x": 9.25, "y": 4.5 },
-        { "label": ">", "x": 10.25, "y": 4.5 },
-        { "label": "?", "x": 11.25, "y": 4.5 },
-        { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.5 },
-        { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-        { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-        { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-        { "x": 3.75, "y": 5.5, "w": 6.25 },
-        { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-        { "label": "Win", "x": 11.25, "y": 5.5, "w": 1.25 },
-        { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-        { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-        { "label": "\u2190", "x": 15.25, "y": 5.5 },
-        { "label": "\u2193", "x": 16.25, "y": 5.5 },
-        { "label": "\u2192", "x": 17.25, "y": 5.5 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 11, "y": 0},
+        {"matrix": [0, 11], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.5}
       ]
     },
     "LAYOUT_tkl_ansi_wkl": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 2, "y": 0 },
-        { "label": "F2", "x": 3, "y": 0 },
-        { "label": "F3", "x": 4, "y": 0 },
-        { "label": "F4", "x": 5, "y": 0 },
-        { "label": "F5", "x": 6.5, "y": 0 },
-        { "label": "F6", "x": 7.5, "y": 0 },
-        { "label": "F7", "x": 8.5, "y": 0 },
-        { "label": "F8", "x": 9.5, "y": 0 },
-        { "label": "F9", "x": 11, "y": 0 },
-        { "label": "F10", "x": 12, "y": 0 },
-        { "label": "F11", "x": 13, "y": 0 },
-        { "label": "F12", "x": 14, "y": 0 },
-        { "label": "PrtSc", "x": 15.25, "y": 0 },
-        { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-        { "label": "~", "x": 0, "y": 1.5 },
-        { "label": "!", "x": 1, "y": 1.5 },
-        { "label": "@", "x": 2, "y": 1.5 },
-        { "label": "#", "x": 3, "y": 1.5 },
-        { "label": "$", "x": 4, "y": 1.5 },
-        { "label": "%", "x": 5, "y": 1.5 },
-        { "label": "^", "x": 6, "y": 1.5 },
-        { "label": "&", "x": 7, "y": 1.5 },
-        { "label": "*", "x": 8, "y": 1.5 },
-        { "label": "(", "x": 9, "y": 1.5 },
-        { "label": ")", "x": 10, "y": 1.5 },
-        { "label": "_", "x": 11, "y": 1.5 },
-        { "label": "+", "x": 12, "y": 1.5 },
-        { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.5 },
-        { "label": "Home", "x": 16.25, "y": 1.5 },
-        { "label": "PgUp", "x": 17.25, "y": 1.5 },
-        { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.5 },
-        { "label": "W", "x": 2.5, "y": 2.5 },
-        { "label": "E", "x": 3.5, "y": 2.5 },
-        { "label": "R", "x": 4.5, "y": 2.5 },
-        { "label": "T", "x": 5.5, "y": 2.5 },
-        { "label": "Y", "x": 6.5, "y": 2.5 },
-        { "label": "U", "x": 7.5, "y": 2.5 },
-        { "label": "I", "x": 8.5, "y": 2.5 },
-        { "label": "O", "x": 9.5, "y": 2.5 },
-        { "label": "P", "x": 10.5, "y": 2.5 },
-        { "label": "{", "x": 11.5, "y": 2.5 },
-        { "label": "}", "x": 12.5, "y": 2.5 },
-        { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.5 },
-        { "label": "End", "x": 16.25, "y": 2.5 },
-        { "label": "PgDn", "x": 17.25, "y": 2.5 },
-        { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.5 },
-        { "label": "S", "x": 2.75, "y": 3.5 },
-        { "label": "D", "x": 3.75, "y": 3.5 },
-        { "label": "F", "x": 4.75, "y": 3.5 },
-        { "label": "G", "x": 5.75, "y": 3.5 },
-        { "label": "H", "x": 6.75, "y": 3.5 },
-        { "label": "J", "x": 7.75, "y": 3.5 },
-        { "label": "K", "x": 8.75, "y": 3.5 },
-        { "label": "L", "x": 9.75, "y": 3.5 },
-        { "label": ":", "x": 10.75, "y": 3.5 },
-        { "label": "\"", "x": 11.75, "y": 3.5 },
-        { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
-        { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.5 },
-        { "label": "X", "x": 3.25, "y": 4.5 },
-        { "label": "C", "x": 4.25, "y": 4.5 },
-        { "label": "V", "x": 5.25, "y": 4.5 },
-        { "label": "B", "x": 6.25, "y": 4.5 },
-        { "label": "N", "x": 7.25, "y": 4.5 },
-        { "label": "M", "x": 8.25, "y": 4.5 },
-        { "label": "<", "x": 9.25, "y": 4.5 },
-        { "label": ">", "x": 10.25, "y": 4.5 },
-        { "label": "?", "x": 11.25, "y": 4.5 },
-        { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.5 },
-        { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 },
-        { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 },
-        { "x": 4, "y": 5.5, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 },
-        { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.5 },
-        { "label": "\u2193", "x": 16.25, "y": 5.5 },
-        { "label": "\u2192", "x": 17.25, "y": 5.5 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 11, "y": 0},
+        {"matrix": [0, 11], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+        {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.5}
       ]
     }
   }
diff --git a/keyboards/kmac/kmac.c b/keyboards/kmac/kmac.c
index 78334cb754..29f7091084 100644
--- a/keyboards/kmac/kmac.c
+++ b/keyboards/kmac/kmac.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "kmac.h"
+#include "quantum.h"
 
 #define F_ROW_MASK 0b01
 #define WASD_MASK 0b10
diff --git a/keyboards/kmac/kmac.h b/keyboards/kmac/kmac.h
deleted file mode 100644
index edeb635836..0000000000
--- a/keyboards/kmac/kmac.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2017-2019 Mathias Andersson <wraul@dbox.se>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT_tkl_ansi( \
-    k00,      k02, k03, k04, k05,      k06, k07, k08, k09,      k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1D,      k1E, k1F, k1G, \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D,      k2E, k2F, k2G, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,           k3D,                     \
-    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,                k4D,           k4F,      \
-    k50, k51, k52,                     k55,                     k58, k5A, k5C, k5D,      k5E, k5F, k5G  \
-) \
-{ \
-    {k00, KC_NO, k02, k03,   k04,   k05, k06,   k07,   k08, k09,   k0A, k0B,   k0C,   k0D, k0E,   k0F,   k0G},   \
-    {k10, k11,   k12, k13,   k14,   k15, k16,   k17,   k18, k19,   k1A, k1B,   k1C,   k1D, k1E,   k1F,   k1G},   \
-    {k20, k21,   k22, k23,   k24,   k25, k26,   k27,   k28, k29,   k2A, k2B,   k2C,   k2D, k2E,   k2F,   k2G},   \
-    {k30, k31,   k32, k33,   k34,   k35, k36,   k37,   k38, k39,   k3A, k3B,   KC_NO, k3D, KC_NO, KC_NO, KC_NO}, \
-    {k40, k41,   k42, k43,   k44,   k45, k46,   k47,   k48, k49,   k4A, KC_NO, KC_NO, k4D, KC_NO, k4F,   KC_NO}, \
-    {k50, k51,   k52, KC_NO, KC_NO, k55, KC_NO, KC_NO, k58, KC_NO, k5A, KC_NO, k5C,   k5D, k5E,   k5F,   k5G }   \
-}
-// clang-format on
-
-// clang-format off
-#define LAYOUT_tkl_ansi_wkl( \
-    k00,      k02, k03, k04, k05,      k06, k07, k08, k09,      k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1D,      k1E, k1F, k1G, \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D,      k2E, k2F, k2G, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,           k3D,                     \
-    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,                k4D,           k4F,      \
-    k50,      k52,                     k55,                          k58,      k5D,      k5E, k5F, k5G  \
-) \
-{ \
-    {k00, KC_NO, k02, k03,   k04,   k05, k06,   k07,   k08, k09,   k0A,   k0B,   k0C,   k0D, k0E,   k0F,   k0G},   \
-    {k10, k11,   k12, k13,   k14,   k15, k16,   k17,   k18, k19,   k1A,   k1B,   k1C,   k1D, k1E,   k1F,   k1G},   \
-    {k20, k21,   k22, k23,   k24,   k25, k26,   k27,   k28, k29,   k2A,   k2B,   k2C,   k2D, k2E,   k2F,   k2G},   \
-    {k30, k31,   k32, k33,   k34,   k35, k36,   k37,   k38, k39,   k3A,   k3B,   KC_NO, k3D, KC_NO, KC_NO, KC_NO}, \
-    {k40, k41,   k42, k43,   k44,   k45, k46,   k47,   k48, k49,   k4A,   KC_NO, KC_NO, k4D, KC_NO, k4F,   KC_NO}, \
-    {k50, KC_NO, k52, KC_NO, KC_NO, k55, KC_NO, KC_NO, k58, KC_NO, KC_NO, KC_NO, KC_NO, k5D, k5E,   k5F,   k5G }   \
-}
-// clang-format on
diff --git a/keyboards/kmac_pad/info.json b/keyboards/kmac_pad/info.json
index 9d07f3d45a..f41da8a452 100644
--- a/keyboards/kmac_pad/info.json
+++ b/keyboards/kmac_pad/info.json
@@ -12,29 +12,29 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"K00", "x":3, "y":0},
+        {"matrix": [0, 0], "x": 3, "y": 0},
 
-        {"label":"K10", "x":0, "y":1.25},
-        {"label":"K11", "x":1, "y":1.25},
-        {"label":"K12", "x":2, "y":1.25},
-        {"label":"K13", "x":3, "y":1.25},
+        {"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},
 
-        {"label":"K20", "x":0, "y":2.25},
-        {"label":"K21", "x":1, "y":2.25},
-        {"label":"K22", "x":2, "y":2.25},
-        {"label":"K23", "x":3, "y":2.25, "h":2},
+        {"matrix": [2, 0], "x": 0, "y": 2.25},
+        {"matrix": [2, 1], "x": 1, "y": 2.25},
+        {"matrix": [2, 2], "x": 2, "y": 2.25},
+        {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
 
-        {"label":"K30", "x":0, "y":3.25},
-        {"label":"K31", "x":1, "y":3.25},
-        {"label":"K32", "x":2, "y":3.25},
+        {"matrix": [3, 0], "x": 0, "y": 3.25},
+        {"matrix": [3, 1], "x": 1, "y": 3.25},
+        {"matrix": [3, 2], "x": 2, "y": 3.25},
 
-        {"label":"K40", "x":0, "y":4.25},
-        {"label":"K41", "x":1, "y":4.25},
-        {"label":"K42", "x":2, "y":4.25},
-        {"label":"K43", "x":3, "y":4.25, "h":2},
+        {"matrix": [4, 0], "x": 0, "y": 4.25},
+        {"matrix": [4, 1], "x": 1, "y": 4.25},
+        {"matrix": [4, 2], "x": 2, "y": 4.25},
+        {"matrix": [4, 3], "x": 3, "y": 4.25, "h": 2},
 
-        {"label":"K50", "x":0, "y":5.25, "w":2},
-        {"label":"K52", "x":2, "y":5.25}
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+        {"matrix": [5, 2], "x": 2, "y": 5.25}
       ]
     }
   }
diff --git a/keyboards/kmac_pad/kmac_pad.c b/keyboards/kmac_pad/kmac_pad.c
index 87083668cc..3de2cb711e 100644
--- a/keyboards/kmac_pad/kmac_pad.c
+++ b/keyboards/kmac_pad/kmac_pad.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "kmac_pad.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
 
diff --git a/keyboards/kmac_pad/kmac_pad.h b/keyboards/kmac_pad/kmac_pad.h
deleted file mode 100644
index 9979608339..0000000000
--- a/keyboards/kmac_pad/kmac_pad.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2021 talsu <talsu84@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-                   K00, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32,      \
-    K40, K41, K42, K43, \
-    K50,      K52       \
-) \
-{ \
-    { K00, KC_NO, KC_NO, KC_NO }, \
-    { K10, K11,   K12,   K13   }, \
-    { K20, K21,   K22,   K23   }, \
-    { K30, K31,   K32,   KC_NO }, \
-    { K40, K41,   K42,   K43   }, \
-    { K50, KC_NO, K52,   KC_NO }  \
-}
diff --git a/keyboards/knobgoblin/config.h b/keyboards/knobgoblin/config.h
index 435c727db5..101faa7619 100644
--- a/keyboards/knobgoblin/config.h
+++ b/keyboards/knobgoblin/config.h
@@ -16,12 +16,4 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, B6, B2, B3, B1 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-
 #define OLED_TIMEOUT 180000
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/knobgoblin/info.json b/keyboards/knobgoblin/info.json
index c0d8de34e9..b17c1077cc 100644
--- a/keyboards/knobgoblin/info.json
+++ b/keyboards/knobgoblin/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6"],
+        "rows": ["D4", "B6", "B2", "B3", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F7", "pin_b": "F6"},
diff --git a/keyboards/knops/mini/config.h b/keyboards/knops/mini/config.h
index 755da7c07d..8b274e7f0f 100644
--- a/keyboards/knops/mini/config.h
+++ b/keyboards/knops/mini/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/knops/mini/info.json b/keyboards/knops/mini/info.json
index 6246a17cd3..ed33aa4c9e 100644
--- a/keyboards/knops/mini/info.json
+++ b/keyboards/knops/mini/info.json
@@ -8,11 +8,24 @@
 		"pid": "0x9460",
 		"device_version": "0.0.1"
 	},
+	"matrix_pins": {
+		"cols": ["F7", "F6", "F5", "F4", "F1", "F0"],
+		"rows": ["D0"]
+	},
+	"diode_direction": "COL2ROW",
 	"processor": "atmega32u4",
 	"bootloader": "atmel-dfu",
 	"layouts": {
 		"LAYOUT": {
-			"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":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": 0, "y": 1},
+				{"matrix": [0, 4], "x": 1, "y": 1},
+				{"matrix": [0, 5], "x": 2, "y": 1}
+			]
 		}
 	}
 }
diff --git a/keyboards/knops/mini/mini.c b/keyboards/knops/mini/mini.c
deleted file mode 100644
index f378cc5d5f..0000000000
--- a/keyboards/knops/mini/mini.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 Kayle Knops
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mini.h"
diff --git a/keyboards/knops/mini/mini.h b/keyboards/knops/mini/mini.h
deleted file mode 100644
index e028dea6d7..0000000000
--- a/keyboards/knops/mini/mini.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2017 Pawnerd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#pragma once
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05 \
-) { \
-    { k00, k01, k02, k03, k04, k05 } \
-}
diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h
index 4b0c193cc1..dd6631f545 100644
--- a/keyboards/kona_classic/config.h
+++ b/keyboards/kona_classic/config.h
@@ -17,21 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-/* Row pin configuration
-*/
-#define MATRIX_ROW_PINS { F1, F5, F6, F7, B6 }
-/* Column pin configuration
- */
-#define MATRIX_COL_PINS { F0, F4, B5, B4, D7, D6, B0, B1, B3, D2, B7, D0, D1, D3, C6, C7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Underlight configuration
  */
-#define RGB_DI_PIN B2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kona_classic/info.json b/keyboards/kona_classic/info.json
index 6a6f996d90..37aef5bd09 100644
--- a/keyboards/kona_classic/info.json
+++ b/keyboards/kona_classic/info.json
@@ -8,6 +8,14 @@
     "pid": "0x6060",
     "device_version": "0.0.3"
   },
+  "ws2812": {
+    "pin": "B2"
+  },
+  "matrix_pins": {
+    "cols": ["F0", "F4", "B5", "B4", "D7", "D6", "B0", "B1", "B3", "D2", "B7", "D0", "D1", "D3", "C6", "C7"],
+    "rows": ["F1", "F5", "F6", "F7", "B6"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/kona_classic/kona_classic.c b/keyboards/kona_classic/kona_classic.c
deleted file mode 100644
index af4ea06e6d..0000000000
--- a/keyboards/kona_classic/kona_classic.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 Mathias Andersson <wraul@dbox.se>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "kona_classic.h"
diff --git a/keyboards/kopibeng/mnk65/config.h b/keyboards/kopibeng/mnk65/config.h
index 8afc9bc75e..62a2978f67 100644
--- a/keyboards/kopibeng/mnk65/config.h
+++ b/keyboards/kopibeng/mnk65/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-#define MATRIX_ROW_PINS { B3, D0, F6, F4, F1 }
-#define MATRIX_COL_PINS { B7, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kopibeng/mnk65/info.json b/keyboards/kopibeng/mnk65/info.json
index 173537922b..014c6d72e0 100644
--- a/keyboards/kopibeng/mnk65/info.json
+++ b/keyboards/kopibeng/mnk65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0651",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B7", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F5"],
+        "rows": ["B3", "D0", "F6", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F0"
     },
diff --git a/keyboards/kopibeng/mnk65/mnk65.c b/keyboards/kopibeng/mnk65/mnk65.c
deleted file mode 100644
index 2ae4eec194..0000000000
--- a/keyboards/kopibeng/mnk65/mnk65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mnk65.h"
\ No newline at end of file
diff --git a/keyboards/kopibeng/mnk65_stm32/config.h b/keyboards/kopibeng/mnk65_stm32/config.h
index fcf5ce2e76..62a2978f67 100644
--- a/keyboards/kopibeng/mnk65_stm32/config.h
+++ b/keyboards/kopibeng/mnk65_stm32/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { A10, B9, A1, B11, A3 }
-#define MATRIX_COL_PINS { A9, B8, F0, C15, C14, C13, B10, B2, B1, B0, A7, A6, A5, A4, A2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kopibeng/mnk65_stm32/info.json b/keyboards/kopibeng/mnk65_stm32/info.json
index 9959b7f3dd..1afc16a4e8 100644
--- a/keyboards/kopibeng/mnk65_stm32/info.json
+++ b/keyboards/kopibeng/mnk65_stm32/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0652",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A9", "B8", "F0", "C15", "C14", "C13", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A2"],
+        "rows": ["A10", "B9", "A1", "B11", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A8"
     },
diff --git a/keyboards/kopibeng/mnk88/config.h b/keyboards/kopibeng/mnk88/config.h
index 77cbf1c358..0dc3925db3 100644
--- a/keyboards/kopibeng/mnk88/config.h
+++ b/keyboards/kopibeng/mnk88/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { A8, B15, A9, B12, A3, B14 }
-#define MATRIX_COL_PINS { A2, A1, A0, B11, B10, B2, F1, B1, B0, A7, A6, A5, F0, A4, C15, C14, C13 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN A10
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 20
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -50,7 +31,6 @@
      #define RGBLIGHT_EFFECT_STATIC_GRADIENT
      #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kopibeng/mnk88/info.json b/keyboards/kopibeng/mnk88/info.json
index 813767a89a..de492844c9 100644
--- a/keyboards/kopibeng/mnk88/info.json
+++ b/keyboards/kopibeng/mnk88/info.json
@@ -8,6 +8,14 @@
         "pid": "0x8800",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A10"
+    },
+    "matrix_pins": {
+        "cols": ["A2", "A1", "A0", "B11", "B10", "B2", "F1", "B1", "B0", "A7", "A6", "A5", "F0", "A4", "C15", "C14", "C13"],
+        "rows": ["A8", "B15", "A9", "B12", "A3", "B14"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B3",
         "scroll_lock": "A15"
@@ -18,490 +26,535 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1.25, "y":0},
-                {"label":"K02", "x":2.25, "y":0},
-                {"label":"K03", "x":3.25, "y":0},
-                {"label":"K04", "x":4.25, "y":0},
-                {"label":"K05", "x":5.5, "y":0},
-                {"label":"K06", "x":6.5, "y":0},
-                {"label":"K07", "x":7.5, "y":0},
-                {"label":"K08", "x":8.5, "y":0},
-                {"label":"K09", "x":9.75, "y":0},
-                {"label":"K0A", "x":10.75, "y":0},
-                {"label":"K0B", "x":11.75, "y":0},
-                {"label":"K0C", "x":12.75, "y":0},
-                {"label":"K0D", "x":14, "y":0},
-                {"label":"K0E", "x":15.25, "y":0},
-                {"label":"K0F", "x":16.25, "y":0},
-                {"label":"K0G", "x":17.25, "y":0},
-
-                {"label":"K10", "x":0, "y":1.25},
-                {"label":"K11", "x":1, "y":1.25},
-                {"label":"K12", "x":2, "y":1.25},
-                {"label":"K13", "x":3, "y":1.25},
-                {"label":"K14", "x":4, "y":1.25},
-                {"label":"K15", "x":5, "y":1.25},
-                {"label":"K16", "x":6, "y":1.25},
-                {"label":"K17", "x":7, "y":1.25},
-                {"label":"K18", "x":8, "y":1.25},
-                {"label":"K19", "x":9, "y":1.25},
-                {"label":"K1A", "x":10, "y":1.25},
-                {"label":"K1B", "x":11, "y":1.25},
-                {"label":"K1C", "x":12, "y":1.25},
-                {"label":"K2C", "x":13, "y":1.25},
-                {"label":"K1D", "x":14, "y":1.25},
-                {"label":"K1E", "x":15.25, "y":1.25},
-                {"label":"K1F", "x":16.25, "y":1.25},
-                {"label":"K1G", "x":17.25, "y":1.25},
-
-                {"label":"K20", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21", "x":1.5, "y":2.25},
-                {"label":"K22", "x":2.5, "y":2.25},
-                {"label":"K23", "x":3.5, "y":2.25},
-                {"label":"K24", "x":4.5, "y":2.25},
-                {"label":"K25", "x":5.5, "y":2.25},
-                {"label":"K26", "x":6.5, "y":2.25},
-                {"label":"K27", "x":7.5, "y":2.25},
-                {"label":"K28", "x":8.5, "y":2.25},
-                {"label":"K29", "x":9.5, "y":2.25},
-                {"label":"K2A", "x":10.5, "y":2.25},
-                {"label":"K2B", "x":11.5, "y":2.25},
-                {"label":"K3C", "x":12.5, "y":2.25},
-                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E", "x":15.25, "y":2.25},
-                {"label":"K2F", "x":16.25, "y":2.25},
-                {"label":"K2G", "x":17.25, "y":2.25},
-
-                {"label":"K30", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31", "x":1.75, "y":3.25},
-                {"label":"K32", "x":2.75, "y":3.25},
-                {"label":"K33", "x":3.75, "y":3.25},
-                {"label":"K34", "x":4.75, "y":3.25},
-                {"label":"K35", "x":5.75, "y":3.25},
-                {"label":"K36", "x":6.75, "y":3.25},
-                {"label":"K37", "x":7.75, "y":3.25},
-                {"label":"K38", "x":8.75, "y":3.25},
-                {"label":"K39", "x":9.75, "y":3.25},
-                {"label":"K3A", "x":10.75, "y":3.25},
-                {"label":"K3B", "x":11.75, "y":3.25},
-                {"label":"K3D", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"K40", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4.25},
-                {"label":"K42", "x":2.25, "y":4.25},
-                {"label":"K43", "x":3.25, "y":4.25},
-                {"label":"K44", "x":4.25, "y":4.25},
-                {"label":"K45", "x":5.25, "y":4.25},
-                {"label":"K46", "x":6.25, "y":4.25},
-                {"label":"K47", "x":7.25, "y":4.25},
-                {"label":"K48", "x":8.25, "y":4.25},
-                {"label":"K49", "x":9.25, "y":4.25},
-                {"label":"K4A", "x":10.25, "y":4.25},
-                {"label":"K4B", "x":11.25, "y":4.25},
-                {"label":"K4C", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"K4D", "x":14, "y":4.25},
-                {"label":"K4F", "x":16.25, "y":4.25},
-
-                {"label":"K50", "x":0, "y":5.25, "w":1.25},
-                {"label":"K51", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K52", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K56", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"K5A", "x":10, "y":5.25, "w":1.25},
-                {"label":"K5B", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K5C", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K5D", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K5E", "x":15.25, "y":5.25},
-                {"label":"K5F", "x":16.25, "y":5.25},
-                {"label":"K4G", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [2, 12], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Menu", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"F13", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Menu", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/kopibeng/mnk88/mnk88.c b/keyboards/kopibeng/mnk88/mnk88.c
index ac40692d48..cb53d31579 100644
--- a/keyboards/kopibeng/mnk88/mnk88.c
+++ b/keyboards/kopibeng/mnk88/mnk88.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mnk88.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     
diff --git a/keyboards/kopibeng/mnk88/mnk88.h b/keyboards/kopibeng/mnk88/mnk88.h
deleted file mode 100644
index fd6803ce0c..0000000000
--- a/keyboards/kopibeng/mnk88/mnk88.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- *              ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- *              │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
- *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�      ┌───────�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C │1D ││1E │1F │1G │      │1D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤      └─┬─────┤
- *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │3C │2D   ││2E │2F │2G │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘     ┌──┴�2D  │ ISO Enter
- *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                  │3D │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�       ┌─┴───┴────┤
- * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │    │4F │       │4C        │ 2.75u RShift
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───�   └──────────┘
- *              │50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │4G │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *              │50   │51 │52   │56                         │5B   │5C │5D   │ Tsangan/WKL
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K3C, K2D,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,           K4F,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,      K5E, K5F, K4G  \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G}, \
-    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___}, \
-    {K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, K4G}, \
-    {K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F, ___}  \
-}
-
-#define LAYOUT_tkl_f13_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K3C, K2D,   K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4G  \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, K2G}, \
-    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___}, \
-    {K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, K4G}, \
-    {K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F, ___}  \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K3C, K2D,   K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4G  \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, K2G}, \
-    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___}, \
-    {K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, K4G}, \
-    {K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, ___, K5B, K5C, K5D, K5E, K5F, ___}  \
-}
-
-#define LAYOUT_tkl_f13_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K3C,        K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K2D,                  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4G  \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, K2G}, \
-    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___}, \
-    {K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, K4G}, \
-    {K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F, ___}  \
-}
-
-#define LAYOUT_tkl_f13_iso_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K3C,        K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K2D,                  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4G  \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, K2G}, \
-    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___}, \
-    {K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, K4G}, \
-    {K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, ___, K5B, K5C, K5D, K5E, K5F, ___}  \
-}
diff --git a/keyboards/kopibeng/typ65/config.h b/keyboards/kopibeng/typ65/config.h
index dfedea3dd2..76cd3ae659 100644
--- a/keyboards/kopibeng/typ65/config.h
+++ b/keyboards/kopibeng/typ65/config.h
@@ -16,27 +16,10 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, F6, B0 }
-#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F5, F4, F1, F0, E6 }
-
 #define INDICATOR_0 B2
 #define INDICATOR_1 B7
 #define INDICATOR_2 B3
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kopibeng/typ65/info.json b/keyboards/kopibeng/typ65/info.json
index 258acfee65..3ba4fe0613 100644
--- a/keyboards/kopibeng/typ65/info.json
+++ b/keyboards/kopibeng/typ65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x065E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F5", "F4", "F1", "F0", "E6"],
+        "rows": ["D0", "D1", "D2", "F6", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B1"
     },
diff --git a/keyboards/kopibeng/xt60/config.h b/keyboards/kopibeng/xt60/config.h
index 1f4191e6d7..62ad0b5f82 100644
--- a/keyboards/kopibeng/xt60/config.h
+++ b/keyboards/kopibeng/xt60/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, F4, D0, B3, B7 }
-#define MATRIX_COL_PINS { C7, F5, F1, F0, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 14
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -50,7 +31,6 @@
     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kopibeng/xt60/info.json b/keyboards/kopibeng/xt60/info.json
index 62da3ebf2f..f4bee2fc16 100644
--- a/keyboards/kopibeng/xt60/info.json
+++ b/keyboards/kopibeng/xt60/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0600",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "F6"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F5", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1"],
+        "rows": ["F7", "F4", "D0", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D4"
     },
diff --git a/keyboards/kopibeng/xt60/xt60.c b/keyboards/kopibeng/xt60/xt60.c
deleted file mode 100644
index db8993d58b..0000000000
--- a/keyboards/kopibeng/xt60/xt60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "xt60.h"
\ No newline at end of file
diff --git a/keyboards/kopibeng/xt60_singa/config.h b/keyboards/kopibeng/xt60_singa/config.h
index 1f4191e6d7..62ad0b5f82 100644
--- a/keyboards/kopibeng/xt60_singa/config.h
+++ b/keyboards/kopibeng/xt60_singa/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, F4, D0, B3, B7 }
-#define MATRIX_COL_PINS { C7, F5, F1, F0, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 14
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -50,7 +31,6 @@
     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kopibeng/xt60_singa/info.json b/keyboards/kopibeng/xt60_singa/info.json
index 9b156ebbf5..d91224f9af 100644
--- a/keyboards/kopibeng/xt60_singa/info.json
+++ b/keyboards/kopibeng/xt60_singa/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0601",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F6"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F5", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1"],
+        "rows": ["F7", "F4", "D0", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D4"
     },
diff --git a/keyboards/kopibeng/xt60_singa/xt60_singa.c b/keyboards/kopibeng/xt60_singa/xt60_singa.c
deleted file mode 100644
index 1a3a2b613f..0000000000
--- a/keyboards/kopibeng/xt60_singa/xt60_singa.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "xt60_singa.h"
\ No newline at end of file
diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h
index e7b6507f53..dd2830d020 100644
--- a/keyboards/kopibeng/xt65/config.h
+++ b/keyboards/kopibeng/xt65/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { D1, D2, D3, B6, C6, C7, F0, F1, F4, F5, F6, F7, B2, B3, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 12
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kopibeng/xt65/info.json b/keyboards/kopibeng/xt65/info.json
index 5becaacc09..ccb3fff9e2 100644
--- a/keyboards/kopibeng/xt65/info.json
+++ b/keyboards/kopibeng/xt65/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0650",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3", "B6", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B3", "B7"],
+        "rows": ["B5", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B1",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "D5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -22,228 +30,228 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"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},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0},
-                {"label":"K05", "x":5, "y":0},
-                {"label":"K06", "x":6, "y":0},
-                {"label":"K07", "x":7, "y":0},
-                {"label":"K08", "x":8, "y":0},
-                {"label":"K09", "x":9, "y":0},
-                {"label":"K0A", "x":10, "y":0},
-                {"label":"K0B", "x":11, "y":0},
-                {"label":"K0C", "x":12, "y":0},
-                {"label":"K0D", "x":13, "y":0},
-                {"label":"K1D", "x":14, "y":0},
-                {"label":"K0E", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label":"K10", "x":0, "y":1, "w":1.5},
-                {"label":"K11", "x":1.5, "y":1},
-                {"label":"K12", "x":2.5, "y":1},
-                {"label":"K13", "x":3.5, "y":1},
-                {"label":"K14", "x":4.5, "y":1},
-                {"label":"K15", "x":5.5, "y":1},
-                {"label":"K16", "x":6.5, "y":1},
-                {"label":"K17", "x":7.5, "y":1},
-                {"label":"K18", "x":8.5, "y":1},
-                {"label":"K19", "x":9.5, "y":1},
-                {"label":"K1A", "x":10.5, "y":1},
-                {"label":"K1B", "x":11.5, "y":1},
-                {"label":"K1C", "x":12.5, "y":1},
-                {"label":"K2D", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K21", "x":1.75, "y":2},
-                {"label":"K22", "x":2.75, "y":2},
-                {"label":"K23", "x":3.75, "y":2},
-                {"label":"K24", "x":4.75, "y":2},
-                {"label":"K25", "x":5.75, "y":2},
-                {"label":"K26", "x":6.75, "y":2},
-                {"label":"K27", "x":7.75, "y":2},
-                {"label":"K28", "x":8.75, "y":2},
-                {"label":"K29", "x":9.75, "y":2},
-                {"label":"K2A", "x":10.75, "y":2},
-                {"label":"K2B", "x":11.75, "y":2},
-                {"label":"K2C", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"K30", "x":0, "y":3, "w":2.25},
-                {"label":"K31", "x":2.25, "y":3},
-                {"label":"K32", "x":3.25, "y":3},
-                {"label":"K33", "x":4.25, "y":3},
-                {"label":"K34", "x":5.25, "y":3},
-                {"label":"K35", "x":6.25, "y":3},
-                {"label":"K36", "x":7.25, "y":3},
-                {"label":"K37", "x":8.25, "y":3},
-                {"label":"K38", "x":9.25, "y":3},
-                {"label":"K39", "x":10.25, "y":3},
-                {"label":"K3A", "x":11.25, "y":3},
-                {"label":"K3B", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D", "x":14, "y":3},
-                {"label":"K3E", "x":15, "y":3},
+                {"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},
 
-                {"label":"K40", "x":0, "y":4, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42", "x":2.5, "y":4, "w":1.25},
-                {"label":"K45", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49", "x":10, "y":4, "w":1.25},
-                {"label":"K4A", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C", "x":13, "y":4},
-                {"label":"K4D", "x":14, "y":4},
-                {"label":"K4E", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"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},
 
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kopibeng/xt65/xt65.c b/keyboards/kopibeng/xt65/xt65.c
deleted file mode 100644
index bd1622bfa2..0000000000
--- a/keyboards/kopibeng/xt65/xt65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "xt65.h"
diff --git a/keyboards/kopibeng/xt65/xt65.h b/keyboards/kopibeng/xt65/xt65.h
deleted file mode 100644
index a31cd15394..0000000000
--- a/keyboards/kopibeng/xt65/xt65.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2021 Samuel Lu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-
-// LAYOUT_all:
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K113, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K213,       K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K313, K314, \
-    K400, K401, K402,             K405,                   K409, K410,             K412, K413, K414  \
-) { \
-    {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \
-    {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114}, \
-    {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214}, \
-    {K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, ____, K313, K314}, \
-    {K400, K401, K402, ____, ____, K405, ____, ____, ____, K409, K410, ____, K412, K413, K414}  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K113, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K213,       K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K313, K314, \
-	K400, K401, K402,             K405,                         K410,             K412, K413, K414  \
-) { \
-    {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \
-    {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114}, \
-    {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214}, \
-    {K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, ____, K313, K314}, \
-    {K400, K401, K402, ____, ____, K405, ____, ____, ____, ____, K410, ____, K412, K413, K414}  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K213,       K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K313, K314, \
-	K400, K401, K402,             K405,                   K409, K410,             K412, K413, K414  \
-) { \
-    {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \
-    {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, ____, K114}, \
-    {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214}, \
-    {K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, ____, K313, K314}, \
-    {K400, K401, K402, ____, ____, K405, ____, ____, ____, K409, K410, ____, K412, K413, K414}  \
-}
diff --git a/keyboards/kopibeng/xt8x/config.h b/keyboards/kopibeng/xt8x/config.h
index 395687caff..68270ad5a3 100644
--- a/keyboards/kopibeng/xt8x/config.h
+++ b/keyboards/kopibeng/xt8x/config.h
@@ -16,27 +16,8 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { A8, B15, A9, B12, A3, B14 }
-#define MATRIX_COL_PINS { A2, A1, A0, B11, B10, B2, F1, B1, B0, A7, A6, A5, F0, A4, C15, C14, C13 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define INDICATOR_PIN_0 B13
 
-#define RGB_DI_PIN A10
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 19
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@
      #define RGBLIGHT_EFFECT_STATIC_GRADIENT
      #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kopibeng/xt8x/info.json b/keyboards/kopibeng/xt8x/info.json
index 61c8edb509..fbd96c2edc 100644
--- a/keyboards/kopibeng/xt8x/info.json
+++ b/keyboards/kopibeng/xt8x/info.json
@@ -8,10 +8,18 @@
         "pid": "0x8788",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A2", "A1", "A0", "B11", "B10", "B2", "F1", "B1", "B0", "A7", "A6", "A5", "F0", "A4", "C15", "C14", "C13"],
+        "rows": ["A8", "B15", "A9", "B12", "A3", "B14"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B3",
         "scroll_lock": "A15"
     },
+    "ws2812": {
+        "pin": "A10"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/kprepublic/bm16a/v1/info.json b/keyboards/kprepublic/bm16a/v1/info.json
index 6c700b37b8..9e99832b3e 100644
--- a/keyboards/kprepublic/bm16a/v1/info.json
+++ b/keyboards/kprepublic/bm16a/v1/info.json
@@ -31,7 +31,6 @@
         "levels": 5
     },
     "rgblight": {
-        "pin": "E2",
         "led_count": 4,
         "animations": {
             "breathing": true,
@@ -46,6 +45,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "community_layouts": ["ortho_4x4"],
     "layouts": {
         "LAYOUT_ortho_4x4": {
diff --git a/keyboards/kprepublic/bm16a/v2/config.h b/keyboards/kprepublic/bm16a/v2/config.h
index f4ac9e7a3b..4f8f76b6b8 100644
--- a/keyboards/kprepublic/bm16a/v2/config.h
+++ b/keyboards/kprepublic/bm16a/v2/config.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN B9
 #define RGB_MATRIX_LED_COUNT 16
 
 #define WS2812_PWM_DRIVER PWMD4
diff --git a/keyboards/kprepublic/bm16a/v2/info.json b/keyboards/kprepublic/bm16a/v2/info.json
index 39b7ef6758..60d5034931 100644
--- a/keyboards/kprepublic/bm16a/v2/info.json
+++ b/keyboards/kprepublic/bm16a/v2/info.json
@@ -13,6 +13,10 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "ws2812": {
+        "pin": "B9",
+        "driver": "pwm"
+    },
     "matrix_pins": {
         "cols": ["B1", "A3", "B0", "B4"],
         "rows": ["A8", "A9", "B5", "B3"]
diff --git a/keyboards/kprepublic/bm16a/v2/rules.mk b/keyboards/kprepublic/bm16a/v2/rules.mk
index c1285e300c..e69de29bb2 100644
--- a/keyboards/kprepublic/bm16a/v2/rules.mk
+++ b/keyboards/kprepublic/bm16a/v2/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = pwm
diff --git a/keyboards/kprepublic/bm16s/bm16s.h b/keyboards/kprepublic/bm16s/bm16s.h
deleted file mode 100755
index 9aca8c0e37..0000000000
--- a/keyboards/kprepublic/bm16s/bm16s.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ K30,   K31,   K32,   K33 }  \
-}
diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h
index c84de01fd5..fb73fedb04 100755
--- a/keyboards/kprepublic/bm16s/config.h
+++ b/keyboards/kprepublic/bm16s/config.h
@@ -1,20 +1,11 @@
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, D0, D3, D2 }
-#define MATRIX_COL_PINS { F7, F6, D4, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -29,4 +20,3 @@
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/kprepublic/bm16s/info.json b/keyboards/kprepublic/bm16s/info.json
index adda71d87b..262ce39fba 100644
--- a/keyboards/kprepublic/bm16s/info.json
+++ b/keyboards/kprepublic/bm16s/info.json
@@ -8,28 +8,39 @@
       "pid": "0x016B",
       "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "E2"
+    },
+    "matrix_pins": {
+      "cols": ["F7", "F6", "D4", "D6"],
+      "rows": ["D1", "D0", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x4"],
     "layouts": {
       "LAYOUT_ortho_4x4": {
         "layout": [
-          {"x":0, "y":0},
-          {"x":1, "y":0},
-          {"x":2, "y":0},
-          {"x":3, "y":0},
-          {"x":0, "y":1},
-          {"x":1, "y":1},
-          {"x":2, "y":1},
-          {"x":3, "y":1},
-          {"x":0, "y":2},
-          {"x":1, "y":2},
-          {"x":2, "y":2},
-          {"x":3, "y":2},
-          {"x":0, "y":3},
-          {"x":1, "y":3},
-          {"x":2, "y":3},
-          {"x":3, "y":3}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3}
         ]
       }
     }
diff --git a/keyboards/kprepublic/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h
index 3028c31e89..f6b358d2bb 100755
--- a/keyboards/kprepublic/bm40hsrgb/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/config.h
@@ -15,26 +15,15 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B2, E6, B5 }
-#define MATRIX_COL_PINS { B6, C6, B4, D7, D4, D6, C7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 53
-#ifdef RGB_DI_PIN
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
-#endif
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json
index 10c41a9b3c..cf58efba9f 100644
--- a/keyboards/kprepublic/bm40hsrgb/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x3430",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "B4", "D7", "D4", "D6", "C7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B3", "B2", "E6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["planck_mit"],
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
index a6a97d5b76..3a48491679 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
@@ -8,9 +8,6 @@
 
 #define TAPPING_TERM 200 // time of holding key, milliseconds
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
 
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
index 53f605c54d..a41020446d 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
@@ -42,7 +42,7 @@ static int current_accel = 0;
     static uint16_t REC = DM_REC1;
     static uint16_t PLY = DM_PLY1;
 
-    void dynamic_macro_record_start_user(void) {
+    void dynamic_macro_record_start_user(int8_t direction) {
         REC = DM_RSTP;
         RECORDING = true;
     }
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
index 9d566d388d..a669c31c24 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
@@ -19,9 +19,6 @@
 #undef TAPPING_TERM
 #define TAPPING_TERM 200
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
 
diff --git a/keyboards/kprepublic/bm40hsrgb/rules.mk b/keyboards/kprepublic/bm40hsrgb/rules.mk
index 9690e3e495..7e0de4a3e8 100755
--- a/keyboards/kprepublic/bm40hsrgb/rules.mk
+++ b/keyboards/kprepublic/bm40hsrgb/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LAYOUTS_HAS_RGB = yes
diff --git a/keyboards/kprepublic/bm43a/bm43a.c b/keyboards/kprepublic/bm43a/bm43a.c
deleted file mode 100644
index 47e42864e0..0000000000
--- a/keyboards/kprepublic/bm43a/bm43a.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bm43a.h"
diff --git a/keyboards/kprepublic/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h
index 329615e1d1..d48bc690b1 100644
--- a/keyboards/kprepublic/bm43a/config.h
+++ b/keyboards/kprepublic/bm43a/config.h
@@ -17,31 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, F4, F1, F0 }
-#define MATRIX_COL_PINS { B0, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 10
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
 #endif
diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json
index 4e23be7857..60d6373b30 100644
--- a/keyboards/kprepublic/bm43a/info.json
+++ b/keyboards/kprepublic/bm43a/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D1", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.c b/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.c
deleted file mode 100755
index 8a0e8faab3..0000000000
--- a/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 bitstarr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bm43hsrgb.h"
diff --git a/keyboards/kprepublic/bm43hsrgb/config.h b/keyboards/kprepublic/bm43hsrgb/config.h
index 56dd07e278..3e8def8541 100755
--- a/keyboards/kprepublic/bm43hsrgb/config.h
+++ b/keyboards/kprepublic/bm43hsrgb/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B6, B4, B5 }
-#define MATRIX_COL_PINS { C6, D2, D1, D0, D7, D6, D4, D5, D3, B7, B3, B2 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 53
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -51,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
     #define RGBLIGHT_EFFECT_RGB_TEST
     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/info.json
index 8190cded61..5e2fb50983 100755
--- a/keyboards/kprepublic/bm43hsrgb/info.json
+++ b/keyboards/kprepublic/bm43hsrgb/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6061",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D2", "D1", "D0", "D7", "D6", "D4", "D5", "D3", "B7", "B3", "B2"],
+        "rows": ["E6", "B6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
index 50c75ee7f6..6f98093e33 100755
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
+++ b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
 #define UNICODE_CYCLE_PERSIST false
 
-#ifdef RGB_DI_PIN
 #undef RGBLIGHT_EFFECT_BREATHING
 #undef RGBLIGHT_EFFECT_RAINBOW_MOOD
 #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +29,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef RGBLIGHT_EFFECT_RGB_TEST
 #undef RGBLIGHT_EFFECT_ALTERNATING
 #undef RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
index a50d259582..8f4ab997f4 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
@@ -17,31 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-//                         0   1   2   3   4   5   6   7   8   9   A   B   C   D
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 69
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 69
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
-#endif
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
index ba4d0fcae5..a7a93f60bf 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
@@ -8,6 +8,17 @@
         "pid": "0xEF8C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
index cb6e15ad0a..4e7e766dda 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no            # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index b30eb50679..dcb7dfcd00 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -15,27 +15,9 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, D2, D3, D5, F6 }
-#define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
-#define RGB_DI_PIN          F0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index 9a765bc984..8ef6f2598c 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -8,6 +8,17 @@
         "pid": "0x1121",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["E6", "D2", "D3", "D5", "F6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
index d1baac82c4..534a21dbf3 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 NO_USB_STARTUP_CHECK = no
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 WS2812_DRIVER_REQUIRED = yes
 
 COMMON_VPATH += $(DRIVER_PATH)/led/issi
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
index 8a5d4a50bc..a11d579239 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
@@ -16,26 +16,7 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-//                         0   1   2   3   4   5   6   7   8   9   A   B   C   D
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 69
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 69
     #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140
@@ -82,5 +63,3 @@
 #define ENABLE_RGB_MATRIX_MULTISPLASH
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
-
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
index a255a480b3..5db6750d85 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
@@ -8,6 +8,17 @@
         "pid": "0xEF9C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F6", "pin_b": "F5", "resolution": 2}
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
index 9f7333b721..499edf6e5f 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
@@ -57,17 +57,3 @@ bool rgb_matrix_indicators_kb(void) {
     }
     return true;
 }
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
index 8164eaacdb..6cd530668c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no            # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 ENCODER_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
index b70904fae3..eada5a6c85 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
@@ -15,26 +15,9 @@
  */
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, D2, D3, D5, F6 }
-#define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
-#define RGB_DI_PIN          F0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index 83efb7b5e7..dde62eea4c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -8,6 +8,17 @@
         "pid": "0x1124",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["E6", "D2", "D3", "D5", "F6"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F4", "resolution": 2}
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
index 6cb40e0622..001debe128 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
@@ -127,17 +127,3 @@ bool rgb_matrix_indicators_kb(void) {
     return true;
 }
 #endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
index 858a74bdf0..a4b968313c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
index 998d574253..62008d679a 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
@@ -17,27 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-//                         0   1   2   3   4   5   6   7   8   9   A   B   C   D
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 70
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 70
 #    define RGB_MATRIX_KEYPRESSES
     // #define RGBLIGHT_HUE_STEP 8
@@ -45,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     // #define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
     // #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
index 3f0e2c6a23..0148d1ef53 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
@@ -8,6 +8,17 @@
         "pid": "0xEF8C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
index 0459a2ad6b..bb8155a9b8 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index a17dac0902..29e89da4d4 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -17,27 +17,9 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, D2, D3, D5, F6 }
-#define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
-#define RGB_DI_PIN          F0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
index 7a49695dbc..4fd7bc002a 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
@@ -8,6 +8,17 @@
         "pid": "0x1123",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["E6", "D2", "D3", "D5", "F6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
index fde42415fe..b6b9ff1110 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
@@ -18,7 +18,6 @@ RGB_MATRIX_ENABLE = yes
 # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
 # normally done by common_features.mk for both of these drivers need to be done
 # here manually.
-RGB_MATRIX_DRIVER = custom
 COMMON_VPATH += $(DRIVER_PATH)/led/issi
 SRC += is31fl3733.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
index bac4d18649..a831ee9a7d 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
@@ -17,25 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 67
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 67
     #define RGB_MATRIX_KEYPRESSES
     #define RGBLIGHT_HUE_STEP 8
@@ -53,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
index 734169c9e4..cc41dbe8bd 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
@@ -8,6 +8,17 @@
         "pid": "0xEF8D",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
index a1fe09e1fd..7b60a21412 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index 5c56764315..ce593d1605 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -15,27 +15,9 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, D2, D3, D5, F6 }
-#define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
-#define RGB_DI_PIN          F0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
index 83962c13ff..a85b20cd5f 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@@ -8,6 +8,17 @@
         "pid": "0x1122",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["E6", "D2", "D3", "D5", "F6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
index 98b66d638e..5db18e7cfa 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
@@ -17,7 +17,6 @@ RGB_MATRIX_ENABLE = yes
 # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
 # normally done by common_features.mk for both of these drivers need to be done
 # here manually.
-RGB_MATRIX_DRIVER = custom
 COMMON_VPATH += $(DRIVER_PATH)/led/issi
 SRC += is31fl3733.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
index f05ae06ee2..e2522723fc 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
@@ -17,35 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, \
-                          B1, \
-                          B2, \
-                          B3, \
-                          E6 }
-#define MATRIX_COL_PINS {     D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN E2
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 73
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 73
     #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
index a2c126ee30..d88f3b8177 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
@@ -8,83 +8,94 @@
         "pid": "0xEF6E",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
+        "rows": ["B0", "B1", "B2", "B3", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"K00 (B0,D0)", "x":0, "y":0},
-                {"label":"K01 (B0,D1)", "x":1, "y":0},
-                {"label":"K02 (B0,D2)", "x":2, "y":0},
-                {"label":"K03 (B0,D3)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,D4)", "x":5, "y":0},
-                {"label":"K06 (B0,D6)", "x":6, "y":0},
-                {"label":"K07 (B0,D7)", "x":7, "y":0},
-                {"label":"K08 (B0,B4)", "x":8, "y":0},
-                {"label":"K09 (B0,B5)", "x":9, "y":0},
-                {"label":"K0A (B0,B6)", "x":10, "y":0},
-                {"label":"K0B (B0,C6)", "x":11, "y":0},
-                {"label":"K0C (B0,C7)", "x":12, "y":0},
-                {"label":"K0D (B0,F7)", "x":13, "y":0, "w":2},
-                {"label":"K0E (B0,F6)", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"K10 (B1,D0)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,D1)", "x":1.5, "y":1},
-                {"label":"K12 (B1,D2)", "x":2.5, "y":1},
-                {"label":"K13 (B1,D3)", "x":3.5, "y":1},
-                {"label":"K14 (B1,D5)", "x":4.5, "y":1},
-                {"label":"K15 (B1,D4)", "x":5.5, "y":1},
-                {"label":"K16 (B1,D6)", "x":6.5, "y":1},
-                {"label":"K17 (B1,D7)", "x":7.5, "y":1},
-                {"label":"K18 (B1,B4)", "x":8.5, "y":1},
-                {"label":"K19 (B1,B5)", "x":9.5, "y":1},
-                {"label":"K1A (B1,B6)", "x":10.5, "y":1},
-                {"label":"K1B (B1,C6)", "x":11.5, "y":1},
-                {"label":"K1C (B1,C7)", "x":12.5, "y":1},
-                {"label":"K1D (B1,F7)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,F6)", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"K20 (B2,D0)", "x":0, "y":2, "w":1.75},
-                {"label":"K22 (B2,D2)", "x":1.75, "y":2},
-                {"label":"K23 (B2,D3)", "x":2.75, "y":2},
-                {"label":"K24 (B2,D5)", "x":3.75, "y":2},
-                {"label":"K25 (B2,D4)", "x":4.75, "y":2},
-                {"label":"K26 (B2,D6)", "x":5.75, "y":2},
-                {"label":"K27 (B2,D7)", "x":6.75, "y":2},
-                {"label":"K28 (B2,B4)", "x":7.75, "y":2},
-                {"label":"K29 (B2,B5)", "x":8.75, "y":2},
-                {"label":"K2A (B2,B6)", "x":9.75, "y":2},
-                {"label":"K2B (B2,C6)", "x":10.75, "y":2},
-                {"label":"K2C (B2,C7)", "x":11.75, "y":2},
-                {"label":"K2D (B2,F7)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B2,F6)", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"K31 (B3,D1)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (B3,D2)", "x":2.25, "y":3},
-                {"label":"K33 (B3,D3)", "x":3.25, "y":3},
-                {"label":"K34 (B3,D5)", "x":4.25, "y":3},
-                {"label":"K35 (B3,D4)", "x":5.25, "y":3},
-                {"label":"K36 (B3,D6)", "x":6.25, "y":3},
-                {"label":"K37 (B3,D7)", "x":7.25, "y":3},
-                {"label":"K38 (B3,B4)", "x":8.25, "y":3},
-                {"label":"K39 (B3,B5)", "x":9.25, "y":3},
-                {"label":"K3A (B3,B6)", "x":10.25, "y":3},
-                {"label":"K3B (B3,C6)", "x":11.25, "y":3},
-                {"label":"K3C (B3,C7)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,F7)", "x":14, "y":3},
-                {"label":"K3E (B3,F6)", "x":15, "y":3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"K40 (E6,D0)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (E6,D1)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (E6,D2)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (E6,B5)", "x":10, "y":4, "w":1.25},
-                {"label":"K4A (E6,B6)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (E6,C7)", "x":13, "y":4},
-                {"label":"K4D (E6,F7)", "x":14, "y":4},
-                {"label":"K4E (E6,F6)", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/rev1.c b/keyboards/kprepublic/bm65hsrgb/rev1/rev1.c
index 6f85f256e1..7f416bc9ae 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/rev1.c
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev1.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/rev1.h b/keyboards/kprepublic/bm65hsrgb/rev1/rev1.h
deleted file mode 100644
index 4bafcf1943..0000000000
--- a/keyboards/kprepublic/bm65hsrgb/rev1/rev1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 bytesapart
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,  k0E,\
-    k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,\
-    k20,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,   k2D,   k2E,\
-    k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,    k3C, k3D, k3E,\
-    k40,  k41,  k42,             k46,             k49, k4A,       k4C, k4D, k4E\
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,  k0E   }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,  k1E   }, \
-    { k20,   KC_NO, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C,   k2D,  k2E   }, \
-    { KC_NO, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C,   k3D,  k3E   }, \
-    { k40,   k41,   k42,   KC_NO, KC_NO, KC_NO, k46,   KC_NO, KC_NO, k49,   k4A,   KC_NO, k4C,   k4D,  k4E   }, \
-}
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
index e782009849..5fb9ee0e98 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
@@ -21,24 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Force NKRO */
 #define FORCE_NKRO
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 74
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 74
     #define RGB_MATRIX_KEYPRESSES
     #define RGBLIGHT_HUE_STEP 8
@@ -107,4 +90,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
index af805bd81c..dc5c2235a8 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
@@ -8,84 +8,95 @@
         "pid": "0x0653",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
+        "rows": ["B0", "B1", "B2", "B3", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_iso_blocker"],
     "layouts": {
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"K00 (B0,D0)", "x":0, "y":0},
-                {"label":"K01 (B0,D1)", "x":1, "y":0},
-                {"label":"K02 (B0,D2)", "x":2, "y":0},
-                {"label":"K03 (B0,D3)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,D4)", "x":5, "y":0},
-                {"label":"K06 (B0,D6)", "x":6, "y":0},
-                {"label":"K07 (B0,D7)", "x":7, "y":0},
-                {"label":"K08 (B0,B4)", "x":8, "y":0},
-                {"label":"K09 (B0,B5)", "x":9, "y":0},
-                {"label":"K0A (B0,B6)", "x":10, "y":0},
-                {"label":"K0B (B0,C6)", "x":11, "y":0},
-                {"label":"K0C (B0,C7)", "x":12, "y":0},
-                {"label":"K0D (B0,F7)", "x":13, "y":0, "w":2},
-                {"label":"K0E (B0,F6)", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"K10 (B1,D0)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,D1)", "x":1.5, "y":1},
-                {"label":"K12 (B1,D2)", "x":2.5, "y":1},
-                {"label":"K13 (B1,D3)", "x":3.5, "y":1},
-                {"label":"K14 (B1,D5)", "x":4.5, "y":1},
-                {"label":"K15 (B1,D4)", "x":5.5, "y":1},
-                {"label":"K16 (B1,D6)", "x":6.5, "y":1},
-                {"label":"K17 (B1,D7)", "x":7.5, "y":1},
-                {"label":"K18 (B1,B4)", "x":8.5, "y":1},
-                {"label":"K19 (B1,B5)", "x":9.5, "y":1},
-                {"label":"K1A (B1,B6)", "x":10.5, "y":1},
-                {"label":"K1B (B1,C6)", "x":11.5, "y":1},
-                {"label":"K1C (B1,C7)", "x":12.5, "y":1},
-                {"label":"K1E (B1,F6)", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"K20 (B2,D0)", "x":0, "y":2, "w":1.75},
-                {"label":"K22 (B2,D2)", "x":1.75, "y":2},
-                {"label":"K23 (B2,D3)", "x":2.75, "y":2},
-                {"label":"K24 (B2,D5)", "x":3.75, "y":2},
-                {"label":"K25 (B2,D4)", "x":4.75, "y":2},
-                {"label":"K26 (B2,D6)", "x":5.75, "y":2},
-                {"label":"K27 (B2,D7)", "x":6.75, "y":2},
-                {"label":"K28 (B2,B4)", "x":7.75, "y":2},
-                {"label":"K29 (B2,B5)", "x":8.75, "y":2},
-                {"label":"K2A (B2,B6)", "x":9.75, "y":2},
-                {"label":"K2B (B2,C6)", "x":10.75, "y":2},
-                {"label":"K2C (B2,C7)", "x":11.75, "y":2},
-                {"label":"K2D (B2,F7)", "x":12.75, "y":2},
-                {"label":"K1D (B1,F7)", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K2E (B2,F6)", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"K30 (B3,D0)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (B3,D1)", "x":1.25, "y":3},
-                {"label":"K32 (B3,D2)", "x":2.25, "y":3},
-                {"label":"K33 (B3,D3)", "x":3.25, "y":3},
-                {"label":"K34 (B3,D5)", "x":4.25, "y":3},
-                {"label":"K35 (B3,D4)", "x":5.25, "y":3},
-                {"label":"K36 (B3,D6)", "x":6.25, "y":3},
-                {"label":"K37 (B3,D7)", "x":7.25, "y":3},
-                {"label":"K38 (B3,B4)", "x":8.25, "y":3},
-                {"label":"K39 (B3,B5)", "x":9.25, "y":3},
-                {"label":"K3A (B3,B6)", "x":10.25, "y":3},
-                {"label":"K3B (B3,C6)", "x":11.25, "y":3},
-                {"label":"K3C (B3,C7)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,F7)", "x":14, "y":3},
-                {"label":"K3E (B3,F6)", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"K40 (E6,D0)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (E6,D1)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (E6,D2)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (E6,B5)", "x":10, "y":4, "w":1.25},
-                {"label":"K4A (E6,B6)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (E6,C7)", "x":13, "y":4},
-                {"label":"K4D (E6,F7)", "x":14, "y":4},
-                {"label":"K4E (E6,F6)", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.c
index 0b2a8f7042..52c661d3f4 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev1.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.h
deleted file mode 100644
index 7f39c6f61b..0000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 deadolus
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1E,   \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K1D,   K2E,   \
-    K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D, K3E,   \
-    K40,  K41,  K42,              K46,                K49,  K4A,     K4C, K4D, K4E    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, XXX, K4C, K4D, K4E }, \
-}
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
index b76036f341..c7b27fab46 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
@@ -17,36 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, \
-                          B1, \
-                          B2, \
-                          B3, \
-                          E6 }
-#define MATRIX_COL_PINS {     D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN E2
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 74
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 74
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
-#endif
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
index 54dc1efe67..a965121f64 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
@@ -8,80 +8,95 @@
         "pid": "0xEF6F",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
+        "rows": ["B0", "B1", "B2", "B3", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"K00 (B0,D0)", "x":0, "y":0},
-                {"label":"K01 (B0,D1)", "x":1, "y":0},
-                {"label":"K02 (B0,D2)", "x":2, "y":0},
-                {"label":"K03 (B0,D3)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,D4)", "x":5, "y":0},
-                {"label":"K06 (B0,D6)", "x":6, "y":0},
-                {"label":"K07 (B0,D7)", "x":7, "y":0},
-                {"label":"K08 (B0,B4)", "x":8, "y":0},
-                {"label":"K09 (B0,B5)", "x":9, "y":0},
-                {"label":"K0A (B0,B6)", "x":10, "y":0},
-                {"label":"K0B (B0,C6)", "x":11, "y":0},
-                {"label":"K0C (B0,C7)", "x":12, "y":0},
-                {"label":"K0D (B0,F7)", "x":13, "y":0, "w":2},
-                {"label":"K0E (B0,F6)", "x":15, "y":0},
-                {"label":"K10 (B1,D0)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,D1)", "x":1.5, "y":1},
-                {"label":"K12 (B1,D2)", "x":2.5, "y":1},
-                {"label":"K13 (B1,D3)", "x":3.5, "y":1},
-                {"label":"K14 (B1,D5)", "x":4.5, "y":1},
-                {"label":"K15 (B1,D4)", "x":5.5, "y":1},
-                {"label":"K16 (B1,D6)", "x":6.5, "y":1},
-                {"label":"K17 (B1,D7)", "x":7.5, "y":1},
-                {"label":"K18 (B1,B4)", "x":8.5, "y":1},
-                {"label":"K19 (B1,B5)", "x":9.5, "y":1},
-                {"label":"K1A (B1,B6)", "x":10.5, "y":1},
-                {"label":"K1B (B1,C6)", "x":11.5, "y":1},
-                {"label":"K1C (B1,C7)", "x":12.5, "y":1},
-                {"label":"K1D (B1,F7)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,F6)", "x":15, "y":1},
-                {"label":"K20 (B2,D0)", "x":0, "y":2, "w":1.75},
-                {"label":"K22 (B2,D2)", "x":1.75, "y":2},
-                {"label":"K23 (B2,D3)", "x":2.75, "y":2},
-                {"label":"K24 (B2,D5)", "x":3.75, "y":2},
-                {"label":"K25 (B2,D4)", "x":4.75, "y":2},
-                {"label":"K26 (B2,D6)", "x":5.75, "y":2},
-                {"label":"K27 (B2,D7)", "x":6.75, "y":2},
-                {"label":"K28 (B2,B4)", "x":7.75, "y":2},
-                {"label":"K29 (B2,B5)", "x":8.75, "y":2},
-                {"label":"K2A (B2,B6)", "x":9.75, "y":2},
-                {"label":"K2B (B2,C6)", "x":10.75, "y":2},
-                {"label":"K2C (B2,C7)", "x":11.75, "y":2},
-                {"label":"K2D (B2,F7)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B2,F6)", "x":15, "y":2},
-                {"label":"K31 (B3,D1)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (B3,D2)", "x":2.25, "y":3},
-                {"label":"K33 (B3,D3)", "x":3.25, "y":3},
-                {"label":"K34 (B3,D5)", "x":4.25, "y":3},
-                {"label":"K35 (B3,D4)", "x":5.25, "y":3},
-                {"label":"K36 (B3,D6)", "x":6.25, "y":3},
-                {"label":"K37 (B3,D7)", "x":7.25, "y":3},
-                {"label":"K38 (B3,B4)", "x":8.25, "y":3},
-                {"label":"K39 (B3,B5)", "x":9.25, "y":3},
-                {"label":"K3A (B3,B6)", "x":10.25, "y":3},
-                {"label":"K3B (B3,C6)", "x":11.25, "y":3},
-                {"label":"K3C (B3,C7)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,F7)", "x":14, "y":3},
-                {"label":"K3E (B3,F6)", "x":15, "y":3},
-                {"label":"K40 (E6,D0)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (E6,D1)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (E6,D2)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (E6,B5)", "x":10, "y":4},
-                {"label":"K4A (E6,B6)", "x":11, "y":4},
-                {"label":"K4B (E6,C6)", "x":12, "y":4},
-                {"label":"K4C (E6,C7)", "x":13, "y":4},
-                {"label":"K4D (E6,F7)", "x":14, "y":4},
-                {"label":"K4E (E6,F6)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
index c1f1a06a33..ceb40da092 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
@@ -43,7 +43,6 @@
 // #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
 // #define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
 // #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT    // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
 // #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
 // #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
 // #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/rev1.c b/keyboards/kprepublic/bm68hsrgb/rev1/rev1.c
index 78f4a15818..abe2b98c20 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/rev1.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev1.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/rev1.h b/keyboards/kprepublic/bm68hsrgb/rev1/rev1.h
deleted file mode 100644
index 3e18b914cc..0000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev1/rev1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 peepeetee
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,  k0E,\
-    k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,\
-    k20,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,   k2D,   k2E,\
-    k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,    k3C, k3D, k3E,\
-    k40,  k41,  k42,             k46,             k49, k4A, k4B, k4C, k4D, k4E\
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,  k0E   }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,  k1E   }, \
-    { k20,   KC_NO, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C,   k2D,  k2E   }, \
-    { KC_NO, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C,   k3D,  k3E   }, \
-    { k40,   k41,   k42,   KC_NO, KC_NO, KC_NO, k46,   KC_NO, KC_NO, k49,   k4A,   k4B,   k4C,   k4D,  k4E   }, \
-}
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
index d348db3cb6..2810b2096e 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -16,17 +16,10 @@
   */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D6, D4, D5, D3, F6 }
-#define MATRIX_COL_PINS { F0, F1, B0, B1, B2, B3, E6, B7, D2, D7, B4, B5, B6, C6, C7}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
 #define USB_POLLING_INTERVAL_MS 1
 
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
-#define RGB_DI_PIN          E2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
index b205449d3f..7e4623804b 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
@@ -8,83 +8,94 @@
         "pid": "0x1131",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "B0", "B1", "B2", "B3", "E6", "B7", "D2", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["D6", "D4", "D5", "D3", "F6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
index 4a13d037d6..7251a24067 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
@@ -13,7 +13,7 @@
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
-#include "rev2.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.h b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.h
deleted file mode 100644
index c4cff29a77..0000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.h
+++ /dev/null
@@ -1,34 +0,0 @@
- /* Copyright 2022 bdtc123
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
index 9072e268b9..0dba15144c 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80hsrgb/bm80hsrgb.c b/keyboards/kprepublic/bm80hsrgb/bm80hsrgb.c
index 3455efd84c..2ec020739a 100644
--- a/keyboards/kprepublic/bm80hsrgb/bm80hsrgb.c
+++ b/keyboards/kprepublic/bm80hsrgb/bm80hsrgb.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bm80hsrgb.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm80hsrgb/bm80hsrgb.h b/keyboards/kprepublic/bm80hsrgb/bm80hsrgb.h
deleted file mode 100644
index 450befe882..0000000000
--- a/keyboards/kprepublic/bm80hsrgb/bm80hsrgb.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 peepeetee
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_tkl_ansi( \
-    K0_0,       K0_2, K0_3, K0_4, K0_5,   K0_7, K0_8, K0_9, K0_A,   K0_B, K0_C, K3_C, K0_D,   K0_E, K0_F, K0_10, \
-    K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9, K1_A, K1_B, K1_C,    K1_D,    K1_E, K1_F, K1_10, \
-     K2_0,   K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9, K2_A, K2_B, K2_C,   K2_D,  K2_E, K2_F, K2_10, \
-     K3_0,    K3_1, K3_2, K3_3, K3_4, K3_5, K3_6, K3_7, K3_8, K3_9, K3_A, K3_B,       K3_D,                      \
-      K4_0,     K4_1, K4_2, K4_3, K4_4, K4_5, K4_6, K4_7, K4_8, K4_9, K4_A,     K4_C,               K4_F,        \
-    K5_0,  K5_1,  K5_2,             K5_5,                       K5_9, K5_A, K5_B, K5_C,       K5_D, K5_F, K5_10  \
-) { \
-	{ K0_0,  KC_NO, K0_2,  K0_3,  K0_4,  K0_5,  KC_NO, K0_7,  K0_8,  K0_9,  K0_A,  K0_B,  K0_C,  K0_D,  K0_E,  K0_F,  K0_10 }, \
-	{ K1_0,  K1_1,  K1_2,  K1_3,  K1_4,  K1_5,  K1_6,  K1_7,  K1_8,  K1_9,  K1_A,  K1_B,  K1_C,  K1_D,  K1_E,  K1_F,  K1_10 }, \
-	{ K2_0,  K2_1,  K2_2,  K2_3,  K2_4,  K2_5,  K2_6,  K2_7,  K2_8,  K2_9,  K2_A,  K2_B,  K2_C,  K2_D,  K2_E,  K2_F,  K2_10 }, \
-	{ K3_0,  K3_1,  K3_2,  K3_3,  K3_4,  K3_5,  K3_6,  K3_7,  K3_8,  K3_9,  K3_A,  K3_B,  K3_C,  K3_D,  KC_NO, KC_NO, KC_NO }, \
-	{ K4_0,  K4_1,  K4_2,  K4_3,  K4_4,  K4_5,  K4_6,  K4_7,  K4_8,  K4_9,  K4_A,  KC_NO, K4_C,  KC_NO, KC_NO, K4_F,  KC_NO }, \
-	{ K5_0,  K5_1,  K5_2,  KC_NO, KC_NO, K5_5,  KC_NO, KC_NO, KC_NO, K5_9,  K5_A,  K5_B,  K5_C,  K5_D,  KC_NO, K5_F,  K5_10 }  \
-}
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index d42521fb9a..a9ba033fb0 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -17,28 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, C6, C7 }
-#define MATRIX_COL_PINS { F0, F1, F4, D7, D6, D4, D5, D3, D2, F5, F6, F7, D1, D0, B4, B5, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 87
 
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 87
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 //#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
@@ -102,10 +83,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 // does not work for some reason, might revisit
 
-
-
-#endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/info.json
index 1cd8c7cc87..d3989e3615 100644
--- a/keyboards/kprepublic/bm80hsrgb/info.json
+++ b/keyboards/kprepublic/bm80hsrgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0xEF83",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "D7", "D6", "D4", "D5", "D3", "D2", "F5", "F6", "F7", "D1", "D0", "B4", "B5", "B6"],
+        "rows": ["B3", "B2", "B1", "B0", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "E6",
         "on_state": 0
@@ -18,93 +29,106 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"K0_0  (B3,F0)", "x":0, "y":0},
-                {"label":"K0_2  (B3,F4)", "x":2, "y":0},
-                {"label":"K0_3  (B3,D7)", "x":3, "y":0},
-                {"label":"K0_4  (B3,D6)", "x":4, "y":0},
-                {"label":"K0_5  (B3,D4)", "x":5, "y":0},
-                {"label":"K0_7  (B3,D3)", "x":6.5, "y":0},
-                {"label":"K0_8  (B3,D2)", "x":7.5, "y":0},
-                {"label":"K0_9  (B3,F5)", "x":8.5, "y":0},
-                {"label":"K0_A  (B3,F6)", "x":9.5, "y":0},
-                {"label":"K0_B  (B3,F7)", "x":11, "y":0},
-                {"label":"K0_C  (B3,D1)", "x":12, "y":0},
-                {"label":"K3_C  (B0,D1)", "x":13, "y":0},
-                {"label":"K0_D  (B3,D0)", "x":14, "y":0},
-                {"label":"K0_E  (B3,B4)", "x":15.25, "y":0},
-                {"label":"K0_F  (B3,B5)", "x":16.25, "y":0},
-                {"label":"K0_10 (B3,B6)", "x":17.25, "y":0},
-                {"label":"K1_0  (B2,F0)", "x":0, "y":1.5},
-                {"label":"K1_1  (B2,F1)", "x":1, "y":1.5},
-                {"label":"K1_2  (B2,F4)", "x":2, "y":1.5},
-                {"label":"K1_3  (B2,D7)", "x":3, "y":1.5},
-                {"label":"K1_4  (B2,D6)", "x":4, "y":1.5},
-                {"label":"K1_5  (B2,D4)", "x":5, "y":1.5},
-                {"label":"K1_6  (B2,D5)", "x":6, "y":1.5},
-                {"label":"K1_7  (B2,D3)", "x":7, "y":1.5},
-                {"label":"K1_8  (B2,D2)", "x":8, "y":1.5},
-                {"label":"K1_9  (B2,F5)", "x":9, "y":1.5},
-                {"label":"K1_A  (B2,F6)", "x":10, "y":1.5},
-                {"label":"K1_B  (B2,F7)", "x":11, "y":1.5},
-                {"label":"K1_C  (B2,D1)", "x":12, "y":1.5},
-                {"label":"K1_D  (B2,D0)", "x":13, "y":1.5, "w":2},
-                {"label":"K1_E  (B2,B4)", "x":15.25, "y":1.5},
-                {"label":"K1_F  (B2,B5)", "x":16.25, "y":1.5},
-                {"label":"K1_10 (B2,B6)", "x":17.25, "y":1.5},
-                {"label":"K2_0  (B1,F0)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K2_1  (B1,F1)", "x":1.5, "y":2.5},
-                {"label":"K2_2  (B1,F4)", "x":2.5, "y":2.5},
-                {"label":"K2_3  (B1,D7)", "x":3.5, "y":2.5},
-                {"label":"K2_4  (B1,D6)", "x":4.5, "y":2.5},
-                {"label":"K2_5  (B1,D4)", "x":5.5, "y":2.5},
-                {"label":"K2_6  (B1,D5)", "x":6.5, "y":2.5},
-                {"label":"K2_7  (B1,D3)", "x":7.5, "y":2.5},
-                {"label":"K2_8  (B1,D2)", "x":8.5, "y":2.5},
-                {"label":"K2_9  (B1,F5)", "x":9.5, "y":2.5},
-                {"label":"K2_A  (B1,F6)", "x":10.5, "y":2.5},
-                {"label":"K2_B  (B1,F7)", "x":11.5, "y":2.5},
-                {"label":"K2_C  (B1,D1)", "x":12.5, "y":2.5},
-                {"label":"K2_D  (B1,D0)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K2_E  (B1,B4)", "x":15.25, "y":2.5},
-                {"label":"K2_F  (B1,B5)", "x":16.25, "y":2.5},
-                {"label":"K2_10 (B1,B6)", "x":17.25, "y":2.5},
-                {"label":"K3_0  (B0,F0)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K3_1  (B0,F1)", "x":1.75, "y":3.5},
-                {"label":"K3_2  (B0,F4)", "x":2.75, "y":3.5},
-                {"label":"K3_3  (B0,D7)", "x":3.75, "y":3.5},
-                {"label":"K3_4  (B0,D6)", "x":4.75, "y":3.5},
-                {"label":"K3_5  (B0,D4)", "x":5.75, "y":3.5},
-                {"label":"K3_6  (B0,D5)", "x":6.75, "y":3.5},
-                {"label":"K3_7  (B0,D3)", "x":7.75, "y":3.5},
-                {"label":"K3_8  (B0,D2)", "x":8.75, "y":3.5},
-                {"label":"K3_9  (B0,F5)", "x":9.75, "y":3.5},
-                {"label":"K3_A  (B0,F6)", "x":10.75, "y":3.5},
-                {"label":"K3_B  (B0,F7)", "x":11.75, "y":3.5},
-                {"label":"K3_D  (B0,D0)", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K4_0  (C6,F0)", "x":0, "y":4.5, "w":2.25},
-                {"label":"K4_1  (C6,F1)", "x":2.25, "y":4.5},
-                {"label":"K4_2  (C6,F4)", "x":3.25, "y":4.5},
-                {"label":"K4_3  (C6,D7)", "x":4.25, "y":4.5},
-                {"label":"K4_4  (C6,D6)", "x":5.25, "y":4.5},
-                {"label":"K4_5  (C6,D4)", "x":6.25, "y":4.5},
-                {"label":"K4_6  (C6,D5)", "x":7.25, "y":4.5},
-                {"label":"K4_7  (C6,D3)", "x":8.25, "y":4.5},
-                {"label":"K4_8  (C6,D2)", "x":9.25, "y":4.5},
-                {"label":"K4_9  (C6,F5)", "x":10.25, "y":4.5},
-                {"label":"K4_A  (C6,F6)", "x":11.25, "y":4.5},
-                {"label":"K4_C  (C6,D1)", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"K4_F  (C6,B5)", "x":16.25, "y":4.5},
-                {"label":"K5_0  (C7,F0)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K5_1  (C7,F1)", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K5_2  (C7,F4)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K5_5  (C7,D4)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K5_9  (C7,F5)", "x":10, "y":5.5, "w":1.25},
-                {"label":"K5_A  (C7,F6)", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"K5_B  (C7,F7)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"K5_C  (C7,D1)", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"K5_D  (C7,D0)", "x":15.25, "y":5.5},
-                {"label":"K5_F  (C7,B5)", "x":16.25, "y":5.5},
-                {"label":"K5_10 (C7,B6)", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [3, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
index be172a8cf6..eaff1148d0 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
@@ -28,7 +28,6 @@
 // #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
 // #define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
 // #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT    // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
 // #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
 // #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
 // #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/kprepublic/bm80hsrgb/rules.mk b/keyboards/kprepublic/bm80hsrgb/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm80hsrgb/rules.mk
+++ b/keyboards/kprepublic/bm80hsrgb/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80v2/bm80v2.c b/keyboards/kprepublic/bm80v2/bm80v2.c
index 7de8c558c7..7a224c9ad0 100644
--- a/keyboards/kprepublic/bm80v2/bm80v2.c
+++ b/keyboards/kprepublic/bm80v2/bm80v2.c
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "bm80v2.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/kprepublic/bm80v2/bm80v2.h b/keyboards/kprepublic/bm80v2/bm80v2.h
deleted file mode 100644
index ee1418f9cf..0000000000
--- a/keyboards/kprepublic/bm80v2/bm80v2.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 bdtc123 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- #pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_tkl_ansi( \
-    K0_0,       K0_2, K0_3, K0_4, K0_5, K0_6,K0_7, K0_8, K0_9,   K0_A, K0_B, K0_C, K0_D,      K0_E, K0_F, K0_10, \
-    K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9, K1_A, K1_B, K1_C,    K1_D,    K1_E, K1_F, K1_10, \
-     K2_0,   K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9, K2_A, K2_B, K2_C,   K2_D,  K2_E, K2_F, K2_10, \
-     K3_0,    K3_1, K3_2, K3_3, K3_4, K3_5, K3_6, K3_7, K3_8, K3_9, K3_A, K3_B,    K3_C,                         \
-        K4_0,   K4_2, K4_3, K4_4, K4_5,  K4_6, K4_7, K4_8, K4_9, K4_A, K4_B, K4_C,                K4_F,        \
-    K5_0,  K5_1,  K5_2,             K5_5,                           K5_A, K5_B, K5_C, K5_D,   K5_E, K5_F, K5_10  \
-) { \
-	{ K0_0,  KC_NO, K0_2,  K0_3,  K0_4,  K0_5,  K0_6, K0_7,  K0_8,  K0_9,  K0_A,  K0_B,  K0_C,  K0_D,  K0_E,  K0_F,  K0_10 }, \
-	{ K1_0,  K1_1,  K1_2,  K1_3,  K1_4,  K1_5,  K1_6,  K1_7,  K1_8,  K1_9,  K1_A,  K1_B,  K1_C,  K1_D,  K1_E,  K1_F,  K1_10 }, \
-	{ K2_0,  K2_1,  K2_2,  K2_3,  K2_4,  K2_5,  K2_6,  K2_7,  K2_8,  K2_9,  K2_A,  K2_B,  K2_C,  K2_D,  K2_E,  K2_F,  K2_10 }, \
-	{ K3_0,  K3_1,  K3_2,  K3_3,  K3_4,  K3_5,  K3_6,  K3_7,  K3_8,  K3_9,  K3_A,  K3_B,  K3_C,  KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ K4_0,  KC_NO,  K4_2,  K4_3,  K4_4,  K4_5,  K4_6,  K4_7,  K4_8,  K4_9,  K4_A,  K4_B,  K4_C,  KC_NO, KC_NO, K4_F,  KC_NO }, \
-	{ K5_0,  K5_1,  K5_2,  KC_NO, KC_NO, K5_5,  KC_NO, KC_NO, KC_NO, KC_NO, K5_A,  K5_B,  K5_C,  K5_D,  K5_E,  K5_F,  K5_10 }  \
-}
-
diff --git a/keyboards/kprepublic/bm80v2/config.h b/keyboards/kprepublic/bm80v2/config.h
index 2562d113fe..98a784d638 100644
--- a/keyboards/kprepublic/bm80v2/config.h
+++ b/keyboards/kprepublic/bm80v2/config.h
@@ -14,13 +14,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { C7, C6, B6, F5, F7, F6 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, D7, D6, B7, B1, B0, B2, B3, D3, D5, D4, D2, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm80v2/info.json b/keyboards/kprepublic/bm80v2/info.json
index f7d153f42c..cbad2ee816 100644
--- a/keyboards/kprepublic/bm80v2/info.json
+++ b/keyboards/kprepublic/bm80v2/info.json
@@ -8,104 +8,120 @@
         "pid": "0x1141",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"],
+        "rows": ["C7", "C6", "B6", "F5", "F7", "F6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
 
-                {"label":"`~", "x":0, "y":1.5},
-                {"label":"1!", "x":1, "y":1.5},
-                {"label":"2@", "x":2, "y":1.5},
-                {"label":"3#", "x":3, "y":1.5},
-                {"label":"4$", "x":4, "y":1.5},
-                {"label":"5%", "x":5, "y":1.5},
-                {"label":"6^", "x":6, "y":1.5},
-                {"label":"7&", "x":7, "y":1.5},
-                {"label":"8*", "x":8, "y":1.5},
-                {"label":"9(", "x":9, "y":1.5},
-                {"label":"0)", "x":10, "y":1.5},
-                {"label":"-_", "x":11, "y":1.5},
-                {"label":"=+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[{", "x":11.5, "y":2.5},
-                {"label":"]}", "x":12.5, "y":2.5},
-                {"label":"\\|", "x":13.5,"y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";:", "x":10.75, "y":3.5},
-                {"label":"'\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
 
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",<", "x":9.25, "y":4.5},
-                {"label":".>", "x":10.25, "y":4.5},
-                {"label":"/?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm80v2/rules.mk b/keyboards/kprepublic/bm80v2/rules.mk
index 0288e3a9b0..ab9a06f5b2 100644
--- a/keyboards/kprepublic/bm80v2/rules.mk
+++ b/keyboards/kprepublic/bm80v2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
index e73cffd108..dea1a76d78 100644
--- a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
+++ b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "bm80v2_iso.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.h b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.h
deleted file mode 100644
index cee54e83e8..0000000000
--- a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 edwardslau *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- #pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_tkl_iso( \
-    K00,      K02, K03, K04, K05,   K06,K07, K08, K09,   K0A, K0B, K0C, K0D,    K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,    K1E, K1F, K1G, \
-     K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E, K2F, K2G, \
-     K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,  K2D,                 \
-    K40,  K41,  K42, K43, K44, K45,  K46, K47, K48, K49, K4A, K4B, K4C,                K4F,    \
-    K50,  K51,  K52,             K55,                     K5A, K5B, K5C, K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, ___, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, K55, ___, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
diff --git a/keyboards/kprepublic/bm80v2_iso/config.h b/keyboards/kprepublic/bm80v2_iso/config.h
index 651da89fb3..526150acbd 100644
--- a/keyboards/kprepublic/bm80v2_iso/config.h
+++ b/keyboards/kprepublic/bm80v2_iso/config.h
@@ -14,13 +14,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { C7, C6, B6, F5, F7, F6 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, D7, D6, B7, B1, B0, B2, B3, D3, D5, D4, D2, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* disable these deprecated features by default */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
diff --git a/keyboards/kprepublic/bm80v2_iso/info.json b/keyboards/kprepublic/bm80v2_iso/info.json
index 826d10d6cd..064af02128 100644
--- a/keyboards/kprepublic/bm80v2_iso/info.json
+++ b/keyboards/kprepublic/bm80v2_iso/info.json
@@ -8,105 +8,121 @@
         "pid": "0x1142",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"],
+        "rows": ["C7", "C6", "B6", "F5", "F7", "F6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_iso"],
     "layouts": {
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
 
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
 
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5},
-                {"x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
 
-                {"x":0, "y":4.5, "w":1.25},
-                {"x":1.25, "y":4.5},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
 
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm80v2_iso/rules.mk b/keyboards/kprepublic/bm80v2_iso/rules.mk
index dfbbfb974d..e74a388dc0 100644
--- a/keyboards/kprepublic/bm80v2_iso/rules.mk
+++ b/keyboards/kprepublic/bm80v2_iso/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes         # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
index 52b58dcf6f..7ecc626803 100644
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ b/keyboards/kprepublic/bm980hsrgb/config.h
@@ -17,28 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, B6, B5, B4, F7, F6, D7 }
-#define MATRIX_COL_PINS { B1, B2, B3, B7, D0, D1, D2, D3, D5, E6, F0, F1, F4, F5, D6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B0
-
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT  98
-//#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 98
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 //#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json
index cae17f2ce4..46ab7e42aa 100644
--- a/keyboards/kprepublic/bm980hsrgb/info.json
+++ b/keyboards/kprepublic/bm980hsrgb/info.json
@@ -8,12 +8,23 @@
         "pid": "0xEF61",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "E6", "F0", "F1", "F4", "F5", "D6"],
+        "rows": ["D4", "B6", "B5", "B4", "F7", "F6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7",
         "num_lock": "C6",
         "scroll_lock": "E2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kprepublic/bm980hsrgb/rules.mk b/keyboards/kprepublic/bm980hsrgb/rules.mk
index 41d2efeaa8..84a2d5cbe6 100644
--- a/keyboards/kprepublic/bm980hsrgb/rules.mk
+++ b/keyboards/kprepublic/bm980hsrgb/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h
index b271703558..f6154f76d4 100644
--- a/keyboards/kprepublic/cospad/config.h
+++ b/keyboards/kprepublic/cospad/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D4, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 4
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kprepublic/cospad/cospad.c b/keyboards/kprepublic/cospad/cospad.c
deleted file mode 100644
index e7772f2908..0000000000
--- a/keyboards/kprepublic/cospad/cospad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "cospad.h"
diff --git a/keyboards/kprepublic/cospad/cospad.h b/keyboards/kprepublic/cospad/cospad.h
index 1e3b6c4276..4838c7f237 100644
--- a/keyboards/kprepublic/cospad/cospad.h
+++ b/keyboards/kprepublic/cospad/cospad.h
@@ -18,208 +18,6 @@
 
 #include "quantum.h"
 
-#define ___ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* 6x4 ortholinear layout
- * ,-------------------.
- * | 00 | 01 | 02 | 03 |
- * |----|----|----|----|
- * | 10 | 11 | 12 | 13 |
- * |----|----|----|----|
- * | 20 | 21 | 22 | 23 |
- * |----|----|----|----|
- * | 30 | 31 | 32 | 33 |
- * |----|----|----|----|
- * | 40 | 41 | 42 | 43 |
- * |----|----|----|----|
- * | 50 | 51 | 52 | 53 |
- * `-------------------'
- */
-#define LAYOUT_ortho_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-    k50, k51, k52, k53 \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 }, \
-    { k50, k51, k52, k53 } \
-}
-
-/* 6x4 gamepad layout
- * ,-------------------.
- * | 00 | 01 | 02 | 03 |
- * |----|----|----|----|
- * | 10 | 11 | 12 | 13 |
- * |----|----|----|----|
- * | 20 | 21 | 22 |    |
- * |----|----|----| 23 |
- * | 30 | 31 | 32 |    |
- * |----|----|----|----|
- * | 40 | 41 | 42 | 43 |
- * |----|----|----|----|
- * | 50 | 51 | 52 | 53 |
- * `-------------------'
- */
-#define LAYOUT_gamepad_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, \
-    k30, k31, k32, k23, \
-    k40, k41, k42, k43, \
-    k50, k51, k52, k53  \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, ___ }, \
-    { k40, k41, k42, k43 }, \
-    { k50, k51, k52, k53 } \
-}
-
-/* 6x4 numpad layout
- * ,-------------------.
- * | 00 | 01 | 02 | 03 |
- * |----|----|----|----|
- * | 10 | 11 | 12 | 13 |
- * |----|----|----|----|
- * | 20 | 21 | 22 |    |
- * |----|----|----| 23 |
- * | 30 | 31 | 32 |    |
- * |----|----|----|----|
- * | 40 | 41 | 42 |    |
- * |----|----|----| 43 |
- * |    50   | 52 |    |
- * `-------------------'
- */
-#define LAYOUT_numpad_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, \
-    k30, k31, k32, k23, \
-    k40, k41, k42, \
-    k50,      k52, k43 \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, ___ }, \
-    { k40, k41, k42, k43 }, \
-    { k50, ___, k52, ___ } \
-}
-
-/* 6x4 numpad layout with split Plus
- * ,-------------------.
- * | 00 | 01 | 02 | 03 |
- * |----|----|----|----|
- * | 10 | 11 | 12 | 13 |
- * |----|----|----|----|
- * | 20 | 21 | 22 | 23 |
- * |----|----|----|----|
- * | 30 | 31 | 32 | 33 |
- * |----|----|----|----|
- * | 40 | 41 | 42 |    |
- * |----|----|----| 43 |
- * |    50   | 52 |    |
- * `-------------------'
- */
-#define LAYOUT_numpad_6x4_split_plus( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, \
-    k50,      k52, k43 \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 }, \
-    { k50, ___, k52, ___ } \
-}
-
-/* 6x4 numpad with split Plus and 0 keys
- * ,-------------------.
- * | 00 | 01 | 02 | 03 |
- * |----|----|----|----|
- * | 10 | 11 | 12 | 13 |
- * |----|----|----|----|
- * | 20 | 21 | 22 | 23 |
- * |----|----|----|----|
- * | 30 | 31 | 32 | 33 |
- * |----|----|----|----|
- * | 40 | 41 | 42 |    |
- * |----|----|----| 43 |
- * | 50 | 51 | 52 |    |
- * `-------------------'
- */
-#define LAYOUT_numpad_6x4_split_plus_zero( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, \
-    k50, k51, k52, k43 \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 }, \
-    { k50, k51, k52, ___ } \
-}
-
-/* 6x4 numpad with split 0 key
- * ,-------------------.
- * | 00 | 01 | 02 | 03 |
- * |----|----|----|----|
- * | 10 | 11 | 12 | 13 |
- * |----|----|----|----|
- * | 20 | 21 | 22 |    |
- * |----|----|----| 23 |
- * | 30 | 31 | 32 |    |
- * |----|----|----|----|
- * | 40 | 41 | 42 |    |
- * |----|----|----| 43 |
- * | 50 | 51 | 52 |    |
- * `-------------------'
- */
-#define LAYOUT_numpad_6x4_split_zero( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, \
-    k30, k31, k32, k23, \
-    k40, k41, k42, \
-    k50, k51, k52, k43 \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, ___ }, \
-    { k40, k41, k42, k43 }, \
-    { k50, k51, k52, ___ } \
-}
 // Add backwards compatibility for existing keymaps
 #define cospad_bl_led_on   backlight_enable
 #define cospad_bl_led_off  backlight_disable
diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/info.json
index ccf1ed42b0..1814b50464 100644
--- a/keyboards/kprepublic/cospad/info.json
+++ b/keyboards/kprepublic/cospad/info.json
@@ -8,10 +8,18 @@
         "pid": "0xB1E5",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7"],
+        "rows": ["D0", "D1", "D2", "D3", "D4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "F7",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "indicators": {
         "num_lock": "B2",
         "on_state": 0
@@ -22,191 +30,191 @@
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-
-                {"x":0, "y":5},
-                {"x":1, "y":5},
-                {"x":2, "y":5},
-                {"x":3, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"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}
             ]
         },
         "LAYOUT_gamepad_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":2, "h":2},
-
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-
-                {"x":0, "y":5},
-                {"x":1, "y":5},
-                {"x":2, "y":5},
-                {"x":3, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"matrix": [5, 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}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":2, "h":2},
-
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-
-                {"x":0, "y":5, "w":2},
-                {"x":2, "y":5},
-                {"x":3, "y":4, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_numpad_6x4_split_plus": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-
-                {"x":0, "y":5, "w":2},
-                {"x":2, "y":5},
-                {"x":3, "y":4, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_numpad_6x4_split_plus_zero": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-
-                {"x":0, "y":5},
-                {"x":1, "y":5},
-                {"x":2, "y":5},
-                {"x":3, "y":4, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_numpad_6x4_split_zero": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":2, "h":2},
-
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-
-                {"x":0, "y":5},
-                {"x":1, "y":5},
-                {"x":2, "y":5},
-                {"x":3, "y":4, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
             ]
         }
     }
diff --git a/keyboards/kprepublic/jj40/config.h b/keyboards/kprepublic/jj40/config.h
index e7c508a232..f26971a5a3 100644
--- a/keyboards/kprepublic/jj40/config.h
+++ b/keyboards/kprepublic/jj40/config.h
@@ -14,13 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, B1, B3, B4 }
-#define MATRIX_COL_PINS { C4, C5, C6, C7, A4, A5, A6, A7, A3, A2, A1, A0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB underglow */
 // NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
 #define RGBLED_NUM 5
diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json
index 4fb1eb18cc..c41c139606 100644
--- a/keyboards/kprepublic/jj40/info.json
+++ b/keyboards/kprepublic/jj40/info.json
@@ -8,25 +8,190 @@
     "pid": "0x0040",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["C4", "C5", "C6", "C7", "A4", "A5", "A6", "A7", "A3", "A2", "A1", "A0"],
+    "rows": ["B0", "B1", "B3", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4",
     "levels": 12,
     "breathing": true
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "processor": "atmega32a",
   "bootloader": "bootloadhid",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_planck_mit"
+  },
   "layouts": {
     "LAYOUT_planck_mit": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
 
     "LAYOUT_ortho_4x12": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
 
     "LAYOUT_planck_1x2uR": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3, "w":2}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3, "w": 2},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/kprepublic/jj40/jj40.c b/keyboards/kprepublic/jj40/jj40.c
deleted file mode 100644
index 894ed49078..0000000000
--- a/keyboards/kprepublic/jj40/jj40.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2018 Kenneth A. <github.com/krusli>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "jj40.h"
diff --git a/keyboards/kprepublic/jj40/jj40.h b/keyboards/kprepublic/jj40/jj40.h
deleted file mode 100644
index a77f35af23..0000000000
--- a/keyboards/kprepublic/jj40/jj40.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }  \
-}
-
-
-#define LAYOUT_planck_mit( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33, K34,    K3X,   K37, K38, K39, K3A, K3B  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, K34, K3X, ___, K37, K38, K39, K3A, K3B }  \
-}
-
-
-#define LAYOUT_planck_1x2uR( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33, K34, K35,   K3X,    K38, K39, K3A, K3B  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, K34, K35, K3X, ___, K38, K39, K3A, K3B }  \
-}
-
-
-#define LAYOUT LAYOUT_planck_mit
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
index 3be7f6f0cb..48d86aedf5 100644
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
+++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
@@ -8,8 +8,6 @@
 
 #define PERMISSIVE_HOLD
        // makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM
-#define IGNORE_MOD_TAP_INTERRUPT
-        // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys.
 
 #define QUICK_TAP_TERM 0
         // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap)
diff --git a/keyboards/kprepublic/jj40/rules.mk b/keyboards/kprepublic/jj40/rules.mk
index 80a6c4bed2..13588c113c 100644
--- a/keyboards/kprepublic/jj40/rules.mk
+++ b/keyboards/kprepublic/jj40/rules.mk
@@ -9,7 +9,6 @@ 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
-WS2812_DRIVER = i2c
 AUDIO_ENABLE = no           # Audio output
 
 # Disable unsupported hardware
diff --git a/keyboards/kprepublic/jj4x4/config.h b/keyboards/kprepublic/jj4x4/config.h
index bb2d842cb8..c0220254b9 100644
--- a/keyboards/kprepublic/jj4x4/config.h
+++ b/keyboards/kprepublic/jj4x4/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B5, B0, B3, B4 }
-#define MATRIX_COL_PINS { A1, A0, A2, A3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB underglow */
 // NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
 #define RGBLED_NUM 4
diff --git a/keyboards/kprepublic/jj4x4/info.json b/keyboards/kprepublic/jj4x4/info.json
index 734757fa9f..337b532f97 100644
--- a/keyboards/kprepublic/jj4x4/info.json
+++ b/keyboards/kprepublic/jj4x4/info.json
@@ -8,33 +8,44 @@
         "pid": "0x0044",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A1", "A0", "A2", "A3"],
+        "rows": ["B5", "B0", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4",
         "levels": 12,
         "breathing": true
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "community_layouts": ["ortho_4x4"],
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/kprepublic/jj4x4/jj4x4.c b/keyboards/kprepublic/jj4x4/jj4x4.c
deleted file mode 100644
index 6330c89de5..0000000000
--- a/keyboards/kprepublic/jj4x4/jj4x4.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2018 Kenneth A. <github.com/krusli>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "jj4x4.h"
diff --git a/keyboards/kprepublic/jj4x4/jj4x4.h b/keyboards/kprepublic/jj4x4/jj4x4.h
deleted file mode 100644
index ee17e896dd..0000000000
--- a/keyboards/kprepublic/jj4x4/jj4x4.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33 \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, K33 } \
-}
diff --git a/keyboards/kprepublic/jj4x4/rules.mk b/keyboards/kprepublic/jj4x4/rules.mk
index 4b774fe5d0..5b9cc80e47 100644
--- a/keyboards/kprepublic/jj4x4/rules.mk
+++ b/keyboards/kprepublic/jj4x4/rules.mk
@@ -9,5 +9,4 @@ 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
-WS2812_DRIVER = i2c
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kprepublic/jj50/config.h b/keyboards/kprepublic/jj50/config.h
index ef614b1f69..3220fd6477 100644
--- a/keyboards/kprepublic/jj50/config.h
+++ b/keyboards/kprepublic/jj50/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4 }
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json
index 126ba09048..a83d42ab6a 100644
--- a/keyboards/kprepublic/jj50/info.json
+++ b/keyboards/kprepublic/jj50/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0050",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4",
         "levels": 12,
         "breathing": true
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "layout_aliases": {
@@ -22,70 +30,70 @@
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"label":"K2B", "x":0, "y":0},
-                {"label":"K2A", "x":1, "y":0},
-                {"label":"K29", "x":2, "y":0},
-                {"label":"K28", "x":3, "y":0},
-                {"label":"K24", "x":4, "y":0},
-                {"label":"K25", "x":5, "y":0},
-                {"label":"K26", "x":6, "y":0},
-                {"label":"K27", "x":7, "y":0},
-                {"label":"K23", "x":8, "y":0},
-                {"label":"K22", "x":9, "y":0},
-                {"label":"K21", "x":10, "y":0},
-                {"label":"K20", "x":11, "y":0},
+                {"matrix": [2, 11], "x": 0, "y": 0},
+                {"matrix": [2, 10], "x": 1, "y": 0},
+                {"matrix": [2, 9], "x": 2, "y": 0},
+                {"matrix": [2, 8], "x": 3, "y": 0},
+                {"matrix": [2, 4], "x": 4, "y": 0},
+                {"matrix": [2, 5], "x": 5, "y": 0},
+                {"matrix": [2, 6], "x": 6, "y": 0},
+                {"matrix": [2, 7], "x": 7, "y": 0},
+                {"matrix": [2, 3], "x": 8, "y": 0},
+                {"matrix": [2, 2], "x": 9, "y": 0},
+                {"matrix": [2, 1], "x": 10, "y": 0},
+                {"matrix": [2, 0], "x": 11, "y": 0},
 
-                {"label":"K0B", "x":0, "y":1},
-                {"label":"K0A", "x":1, "y":1},
-                {"label":"K09", "x":2, "y":1},
-                {"label":"K08", "x":3, "y":1},
-                {"label":"K04", "x":4, "y":1},
-                {"label":"K05", "x":5, "y":1},
-                {"label":"K06", "x":6, "y":1},
-                {"label":"K07", "x":7, "y":1},
-                {"label":"K03", "x":8, "y":1},
-                {"label":"K02", "x":9, "y":1},
-                {"label":"K01", "x":10, "y":1},
-                {"label":"K00", "x":11, "y":1},
+                {"matrix": [0, 11], "x": 0, "y": 1},
+                {"matrix": [0, 10], "x": 1, "y": 1},
+                {"matrix": [0, 9], "x": 2, "y": 1},
+                {"matrix": [0, 8], "x": 3, "y": 1},
+                {"matrix": [0, 4], "x": 4, "y": 1},
+                {"matrix": [0, 5], "x": 5, "y": 1},
+                {"matrix": [0, 6], "x": 6, "y": 1},
+                {"matrix": [0, 7], "x": 7, "y": 1},
+                {"matrix": [0, 3], "x": 8, "y": 1},
+                {"matrix": [0, 2], "x": 9, "y": 1},
+                {"matrix": [0, 1], "x": 10, "y": 1},
+                {"matrix": [0, 0], "x": 11, "y": 1},
 
-                {"label":"K1B", "x":0, "y":2},
-                {"label":"K1A", "x":1, "y":2},
-                {"label":"K19", "x":2, "y":2},
-                {"label":"K18", "x":3, "y":2},
-                {"label":"K14", "x":4, "y":2},
-                {"label":"K15", "x":5, "y":2},
-                {"label":"K16", "x":6, "y":2},
-                {"label":"K17", "x":7, "y":2},
-                {"label":"K13", "x":8, "y":2},
-                {"label":"K12", "x":9, "y":2},
-                {"label":"K11", "x":10, "y":2},
-                {"label":"K10", "x":11, "y":2},
+                {"matrix": [1, 11], "x": 0, "y": 2},
+                {"matrix": [1, 10], "x": 1, "y": 2},
+                {"matrix": [1, 9], "x": 2, "y": 2},
+                {"matrix": [1, 8], "x": 3, "y": 2},
+                {"matrix": [1, 4], "x": 4, "y": 2},
+                {"matrix": [1, 5], "x": 5, "y": 2},
+                {"matrix": [1, 6], "x": 6, "y": 2},
+                {"matrix": [1, 7], "x": 7, "y": 2},
+                {"matrix": [1, 3], "x": 8, "y": 2},
+                {"matrix": [1, 2], "x": 9, "y": 2},
+                {"matrix": [1, 1], "x": 10, "y": 2},
+                {"matrix": [1, 0], "x": 11, "y": 2},
 
-                {"label":"K3B", "x":0, "y":3},
-                {"label":"K3A", "x":1, "y":3},
-                {"label":"K39", "x":2, "y":3},
-                {"label":"K38", "x":3, "y":3},
-                {"label":"K34", "x":4, "y":3},
-                {"label":"K35", "x":5, "y":3},
-                {"label":"K36", "x":6, "y":3},
-                {"label":"K37", "x":7, "y":3},
-                {"label":"K33", "x":8, "y":3},
-                {"label":"K32", "x":9, "y":3},
-                {"label":"K31", "x":10, "y":3},
-                {"label":"K30", "x":11, "y":3},
+                {"matrix": [3, 11], "x": 0, "y": 3},
+                {"matrix": [3, 10], "x": 1, "y": 3},
+                {"matrix": [3, 9], "x": 2, "y": 3},
+                {"matrix": [3, 8], "x": 3, "y": 3},
+                {"matrix": [3, 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, 3], "x": 8, "y": 3},
+                {"matrix": [3, 2], "x": 9, "y": 3},
+                {"matrix": [3, 1], "x": 10, "y": 3},
+                {"matrix": [3, 0], "x": 11, "y": 3},
 
-                {"label":"K4B", "x":0, "y":4},
-                {"label":"K4A", "x":1, "y":4},
-                {"label":"K49", "x":2, "y":4},
-                {"label":"K48", "x":3, "y":4},
-                {"label":"K44", "x":4, "y":4},
-                {"label":"K45", "x":5, "y":4},
-                {"label":"K46", "x":6, "y":4},
-                {"label":"K47", "x":7, "y":4},
-                {"label":"K43", "x":8, "y":4},
-                {"label":"K42", "x":9, "y":4},
-                {"label":"K41", "x":10, "y":4},
-                {"label":"K40", "x":11, "y":4}
+                {"matrix": [4, 11], "x": 0, "y": 4},
+                {"matrix": [4, 10], "x": 1, "y": 4},
+                {"matrix": [4, 9], "x": 2, "y": 4},
+                {"matrix": [4, 8], "x": 3, "y": 4},
+                {"matrix": [4, 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, 3], "x": 8, "y": 4},
+                {"matrix": [4, 2], "x": 9, "y": 4},
+                {"matrix": [4, 1], "x": 10, "y": 4},
+                {"matrix": [4, 0], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/kprepublic/jj50/jj50.c b/keyboards/kprepublic/jj50/jj50.c
deleted file mode 100644
index 91b10aebee..0000000000
--- a/keyboards/kprepublic/jj50/jj50.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "jj50.h"
diff --git a/keyboards/kprepublic/jj50/jj50.h b/keyboards/kprepublic/jj50/jj50.h
deleted file mode 100644
index a3d42856c8..0000000000
--- a/keyboards/kprepublic/jj50/jj50.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 Wayne Jones (WarmCatUK) <waynekjones@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12( \
-    K2B, K2A, K29, K28, K24, K25, K26, K27, K23, K22, K21, K20, \
-    K0B, K0A, K09, K08, K04, K05, K06, K07, K03, K02, K01, K00, \
-    K1B, K1A, K19, K18, K14, K15, K16, K17, K13, K12, K11, K10, \
-    K3B, K3A, K39, K38, K34, K35, K36, K37, K33, K32, K31, K30, \
-    K4B, K4A, K49, K48, K44, K45, K46, K47, K43, K42, K41, K40  \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B  }  \
-}
diff --git a/keyboards/kprepublic/jj50/rules.mk b/keyboards/kprepublic/jj50/rules.mk
index 1ac5e85541..2e721d00cd 100644
--- a/keyboards/kprepublic/jj50/rules.mk
+++ b/keyboards/kprepublic/jj50/rules.mk
@@ -9,5 +9,4 @@ 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
-WS2812_DRIVER = i2c         # This driver powers the RGB Lighting and RGB Matrix features
 LTO_ENABLE = yes            # Enable link time optimization
diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h
index d2103b03c6..2c6034f7be 100644
--- a/keyboards/ktec/daisy/config.h
+++ b/keyboards/ktec/daisy/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D2, D3, D5, B7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 8
 #    define RGBLIGHT_HUE_STEP 12
 #    define RGBLIGHT_SAT_STEP 25
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ktec/daisy/daisy.c b/keyboards/ktec/daisy/daisy.c
deleted file mode 100644
index 98b7ac84b3..0000000000
--- a/keyboards/ktec/daisy/daisy.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "daisy.h"
diff --git a/keyboards/ktec/daisy/info.json b/keyboards/ktec/daisy/info.json
index 6901774b23..db1711eacb 100644
--- a/keyboards/ktec/daisy/info.json
+++ b/keyboards/ktec/daisy/info.json
@@ -8,6 +8,11 @@
         "pid": "0xD7DC",
         "device_version": "5.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["D2", "D3", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D0",
         "levels": 6
@@ -16,6 +21,9 @@
         "caps_lock": "C6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ktec/ergodone/info.json b/keyboards/ktec/ergodone/info.json
index e2b2d4305a..a864057a1c 100644
--- a/keyboards/ktec/ergodone/info.json
+++ b/keyboards/ktec/ergodone/info.json
@@ -25,329 +25,329 @@
       "LAYOUT_ergodox": {
           "layout": [
               { "label": "k00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 },
-              { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 },
-              { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 },
-              { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 },
-              { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 },
-              { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 },
-              { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 },
+              { "label": "k01", "matrix": [0, 1], "x": 1.5, "y": 0.375 },
+              { "label": "k02", "matrix": [0, 2], "x": 2.5, "y": 0.125 },
+              { "label": "k03", "matrix": [0, 3], "x": 3.5, "y": 0 },
+              { "label": "k04", "matrix": [0, 4], "x": 4.5, "y": 0.125 },
+              { "label": "k05", "matrix": [0, 5], "x": 5.5, "y": 0.25 },
+              { "label": "k06", "matrix": [0, 6], "x": 6.5, "y": 0.25 },
               { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 },
-              { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 },
-              { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 },
-              { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-              { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 },
-              { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-              { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
+              { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1.375 },
+              { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1.125 },
+              { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 },
+              { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1.125 },
+              { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1.25 },
+              { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5 },
               { "label": "k20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 },
-              { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 },
-              { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 },
-              { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 },
-              { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 },
-              { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 },
+              { "label": "k21", "matrix": [2, 1], "x": 1.5, "y": 2.375 },
+              { "label": "k22", "matrix": [2, 2], "x": 2.5, "y": 2.125 },
+              { "label": "k23", "matrix": [2, 3], "x": 3.5, "y": 2 },
+              { "label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2.125 },
+              { "label": "k25", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
               { "label": "k30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 },
-              { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 },
-              { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 },
-              { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 },
-              { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 },
-              { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 },
-              { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
-              { "label": "k40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 },
-              { "label": "k41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 },
-              { "label": "k42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 },
-              { "label": "k43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 },
-              { "label": "k44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 },
-              { "label": "k55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 },
-              { "label": "k56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 },
-              { "label": "k54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 },
-              { "label": "k53", "matrix": [5, 3], "w": 1, "x": 5, "y": 6, "h": 2 },
-              { "label": "k52", "matrix": [5, 2], "w": 1, "x": 6, "y": 6, "h": 2 },
-              { "label": "k51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 },
-              { "label": "k07", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 },
-              { "label": "k08", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 },
-              { "label": "k09", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 },
-              { "label": "k0A", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 },
-              { "label": "k0B", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 },
-              { "label": "k0C", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 },
+              { "label": "k31", "matrix": [3, 1], "x": 1.5, "y": 3.375 },
+              { "label": "k32", "matrix": [3, 2], "x": 2.5, "y": 3.125 },
+              { "label": "k33", "matrix": [3, 3], "x": 3.5, "y": 3 },
+              { "label": "k34", "matrix": [3, 4], "x": 4.5, "y": 3.125 },
+              { "label": "k35", "matrix": [3, 5], "x": 5.5, "y": 3.25 },
+              { "label": "k36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5 },
+              { "label": "k40", "matrix": [4, 0], "x": 0.5, "y": 4.375 },
+              { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4.375 },
+              { "label": "k42", "matrix": [4, 2], "x": 2.5, "y": 4.125 },
+              { "label": "k43", "matrix": [4, 3], "x": 3.5, "y": 4 },
+              { "label": "k44", "matrix": [4, 4], "x": 4.5, "y": 4.125 },
+              { "label": "k55", "matrix": [5, 5], "x": 6, "y": 5 },
+              { "label": "k56", "matrix": [5, 6], "x": 7, "y": 5 },
+              { "label": "k54", "matrix": [5, 4], "x": 7, "y": 6 },
+              { "label": "k53", "matrix": [5, 3], "x": 5, "y": 6, "h": 2 },
+              { "label": "k52", "matrix": [5, 2], "x": 6, "y": 6, "h": 2 },
+              { "label": "k51", "matrix": [5, 1], "x": 7, "y": 7 },
+              { "label": "k07", "matrix": [0, 7], "x": 9.5, "y": 0.25 },
+              { "label": "k08", "matrix": [0, 8], "x": 10.5, "y": 0.25 },
+              { "label": "k09", "matrix": [0, 9], "x": 11.5, "y": 0.125 },
+              { "label": "k0A", "matrix": [0, 10], "x": 12.5, "y": 0 },
+              { "label": "k0B", "matrix": [0, 11], "x": 13.5, "y": 0.125 },
+              { "label": "k0C", "matrix": [0, 12], "x": 14.5, "y": 0.375 },
               { "label": "k0D", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 },
-              { "label": "k17", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
-              { "label": "k18", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 },
-              { "label": "k19", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 },
-              { "label": "k1A", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 },
-              { "label": "k1B", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 },
-              { "label": "k1C", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 },
+              { "label": "k17", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5 },
+              { "label": "k18", "matrix": [1, 8], "x": 10.5, "y": 1.25 },
+              { "label": "k19", "matrix": [1, 9], "x": 11.5, "y": 1.125 },
+              { "label": "k1A", "matrix": [1, 10], "x": 12.5, "y": 1 },
+              { "label": "k1B", "matrix": [1, 11], "x": 13.5, "y": 1.125 },
+              { "label": "k1C", "matrix": [1, 12], "x": 14.5, "y": 1.375 },
               { "label": "k1D", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 },
-              { "label": "k28", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 },
-              { "label": "k29", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 },
-              { "label": "k2A", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 },
-              { "label": "k2B", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 },
-              { "label": "k2C", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 },
+              { "label": "k28", "matrix": [2, 8], "x": 10.5, "y": 2.25 },
+              { "label": "k29", "matrix": [2, 9], "x": 11.5, "y": 2.125 },
+              { "label": "k2A", "matrix": [2, 10], "x": 12.5, "y": 2 },
+              { "label": "k2B", "matrix": [2, 11], "x": 13.5, "y": 2.125 },
+              { "label": "k2C", "matrix": [2, 12], "x": 14.5, "y": 2.375 },
               { "label": "k2D", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 },
-              { "label": "k37", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
-              { "label": "k38", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 },
-              { "label": "k39", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 },
-              { "label": "k3A", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 },
-              { "label": "k3B", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 },
-              { "label": "k3C", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 },
+              { "label": "k37", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5 },
+              { "label": "k38", "matrix": [3, 8], "x": 10.5, "y": 3.25 },
+              { "label": "k39", "matrix": [3, 9], "x": 11.5, "y": 3.125 },
+              { "label": "k3A", "matrix": [3, 10], "x": 12.5, "y": 3 },
+              { "label": "k3B", "matrix": [3, 11], "x": 13.5, "y": 3.125 },
+              { "label": "k3C", "matrix": [3, 12], "x": 14.5, "y": 3.375 },
               { "label": "k3D", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 },
-              { "label": "k49", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 },
-              { "label": "k4A", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 },
-              { "label": "k4B", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 },
-              { "label": "k4C", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 },
-              { "label": "k4D", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 },
-              { "label": "k57", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 },
-              { "label": "k58", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 },
-              { "label": "k59", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 },
-              { "label": "k5C", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 },
-              { "label": "k5B", "matrix": [5, 11], "w": 1, "x": 10, "y": 6, "h": 2 },
-              { "label": "k5A", "matrix": [5, 10], "w": 1, "x": 11, "y": 6, "h": 2 }
+              { "label": "k49", "matrix": [4, 9], "x": 11.5, "y": 4.125 },
+              { "label": "k4A", "matrix": [4, 10], "x": 12.5, "y": 4 },
+              { "label": "k4B", "matrix": [4, 11], "x": 13.5, "y": 4.125 },
+              { "label": "k4C", "matrix": [4, 12], "x": 14.5, "y": 4.375 },
+              { "label": "k4D", "matrix": [4, 13], "x": 15.5, "y": 4.375 },
+              { "label": "k57", "matrix": [5, 7], "x": 9, "y": 5 },
+              { "label": "k58", "matrix": [5, 8], "x": 10, "y": 5 },
+              { "label": "k59", "matrix": [5, 9], "x": 9, "y": 6 },
+              { "label": "k5C", "matrix": [5, 12], "x": 9, "y": 7 },
+              { "label": "k5B", "matrix": [5, 11], "x": 10, "y": 6, "h": 2 },
+              { "label": "k5A", "matrix": [5, 10], "x": 11, "y": 6, "h": 2 }
           ]
       },
       "LAYOUT_ergodox_80": {
           "layout": [
               { "label": "k00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 },
-              { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 },
-              { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 },
-              { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 },
-              { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 },
-              { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 },
-              { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 },
+              { "label": "k01", "matrix": [0, 1], "x": 1.5, "y": 0.375 },
+              { "label": "k02", "matrix": [0, 2], "x": 2.5, "y": 0.125 },
+              { "label": "k03", "matrix": [0, 3], "x": 3.5, "y": 0 },
+              { "label": "k04", "matrix": [0, 4], "x": 4.5, "y": 0.125 },
+              { "label": "k05", "matrix": [0, 5], "x": 5.5, "y": 0.25 },
+              { "label": "k06", "matrix": [0, 6], "x": 6.5, "y": 0.25 },
               { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 },
-              { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 },
-              { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 },
-              { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-              { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 },
-              { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-              { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
+              { "label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1.375 },
+              { "label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1.125 },
+              { "label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1 },
+              { "label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1.125 },
+              { "label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1.25 },
+              { "label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5 },
               { "label": "k20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 },
-              { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 },
-              { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 },
-              { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 },
-              { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 },
-              { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 },
+              { "label": "k21", "matrix": [2, 1], "x": 1.5, "y": 2.375 },
+              { "label": "k22", "matrix": [2, 2], "x": 2.5, "y": 2.125 },
+              { "label": "k23", "matrix": [2, 3], "x": 3.5, "y": 2 },
+              { "label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2.125 },
+              { "label": "k25", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
               { "label": "k30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 },
-              { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 },
-              { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 },
-              { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 },
-              { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 },
-              { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 },
-              { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
-              { "label": "k40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 },
-              { "label": "k41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 },
-              { "label": "k42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 },
-              { "label": "k43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 },
-              { "label": "k44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 },
-              { "label": "k55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 },
-              { "label": "k56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 },
-              { "label": "k45", "matrix": [4, 5], "w": 1, "x": 5, "y": 6 },
-              { "label": "k46", "matrix": [4, 6], "w": 1, "x": 6, "y": 6 },
-              { "label": "k54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 },
-              { "label": "k53", "matrix": [5, 3], "w": 1, "x": 5, "y": 7 },
-              { "label": "k52", "matrix": [5, 2], "w": 1, "x": 6, "y": 7 },
-              { "label": "k51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 },
-              { "label": "k07", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 },
-              { "label": "k08", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 },
-              { "label": "k09", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 },
-              { "label": "k0A", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 },
-              { "label": "k0B", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 },
-              { "label": "k0C", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 },
+              { "label": "k31", "matrix": [3, 1], "x": 1.5, "y": 3.375 },
+              { "label": "k32", "matrix": [3, 2], "x": 2.5, "y": 3.125 },
+              { "label": "k33", "matrix": [3, 3], "x": 3.5, "y": 3 },
+              { "label": "k34", "matrix": [3, 4], "x": 4.5, "y": 3.125 },
+              { "label": "k35", "matrix": [3, 5], "x": 5.5, "y": 3.25 },
+              { "label": "k36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5 },
+              { "label": "k40", "matrix": [4, 0], "x": 0.5, "y": 4.375 },
+              { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4.375 },
+              { "label": "k42", "matrix": [4, 2], "x": 2.5, "y": 4.125 },
+              { "label": "k43", "matrix": [4, 3], "x": 3.5, "y": 4 },
+              { "label": "k44", "matrix": [4, 4], "x": 4.5, "y": 4.125 },
+              { "label": "k55", "matrix": [5, 5], "x": 6, "y": 5 },
+              { "label": "k56", "matrix": [5, 6], "x": 7, "y": 5 },
+              { "label": "k45", "matrix": [4, 5], "x": 5, "y": 6 },
+              { "label": "k46", "matrix": [4, 6], "x": 6, "y": 6 },
+              { "label": "k54", "matrix": [5, 4], "x": 7, "y": 6 },
+              { "label": "k53", "matrix": [5, 3], "x": 5, "y": 7 },
+              { "label": "k52", "matrix": [5, 2], "x": 6, "y": 7 },
+              { "label": "k51", "matrix": [5, 1], "x": 7, "y": 7 },
+              { "label": "k07", "matrix": [0, 7], "x": 9.5, "y": 0.25 },
+              { "label": "k08", "matrix": [0, 8], "x": 10.5, "y": 0.25 },
+              { "label": "k09", "matrix": [0, 9], "x": 11.5, "y": 0.125 },
+              { "label": "k0A", "matrix": [0, 10], "x": 12.5, "y": 0 },
+              { "label": "k0B", "matrix": [0, 11], "x": 13.5, "y": 0.125 },
+              { "label": "k0C", "matrix": [0, 12], "x": 14.5, "y": 0.375 },
               { "label": "k0D", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 },
-              { "label": "k17", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
-              { "label": "k18", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 },
-              { "label": "k19", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 },
-              { "label": "k1A", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 },
-              { "label": "k1B", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 },
-              { "label": "k1C", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 },
+              { "label": "k17", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5 },
+              { "label": "k18", "matrix": [1, 8], "x": 10.5, "y": 1.25 },
+              { "label": "k19", "matrix": [1, 9], "x": 11.5, "y": 1.125 },
+              { "label": "k1A", "matrix": [1, 10], "x": 12.5, "y": 1 },
+              { "label": "k1B", "matrix": [1, 11], "x": 13.5, "y": 1.125 },
+              { "label": "k1C", "matrix": [1, 12], "x": 14.5, "y": 1.375 },
               { "label": "k1D", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 },
-              { "label": "k28", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 },
-              { "label": "k29", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 },
-              { "label": "k2A", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 },
-              { "label": "k2B", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 },
-              { "label": "k2C", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 },
+              { "label": "k28", "matrix": [2, 8], "x": 10.5, "y": 2.25 },
+              { "label": "k29", "matrix": [2, 9], "x": 11.5, "y": 2.125 },
+              { "label": "k2A", "matrix": [2, 10], "x": 12.5, "y": 2 },
+              { "label": "k2B", "matrix": [2, 11], "x": 13.5, "y": 2.125 },
+              { "label": "k2C", "matrix": [2, 12], "x": 14.5, "y": 2.375 },
               { "label": "k2D", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 },
-              { "label": "k37", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
-              { "label": "k38", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 },
-              { "label": "k39", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 },
-              { "label": "k3A", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 },
-              { "label": "k3B", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 },
-              { "label": "k3C", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 },
+              { "label": "k37", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5 },
+              { "label": "k38", "matrix": [3, 8], "x": 10.5, "y": 3.25 },
+              { "label": "k39", "matrix": [3, 9], "x": 11.5, "y": 3.125 },
+              { "label": "k3A", "matrix": [3, 10], "x": 12.5, "y": 3 },
+              { "label": "k3B", "matrix": [3, 11], "x": 13.5, "y": 3.125 },
+              { "label": "k3C", "matrix": [3, 12], "x": 14.5, "y": 3.375 },
               { "label": "k3D", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 },
-              { "label": "k49", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 },
-              { "label": "k4A", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 },
-              { "label": "k4B", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 },
-              { "label": "k4C", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 },
-              { "label": "k4D", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 },
-              { "label": "k57", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 },
-              { "label": "k58", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 },
-              { "label": "k59", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 },
-              { "label": "k47", "matrix": [4, 7], "w": 1, "x": 10, "y": 6 },
-              { "label": "k48", "matrix": [4, 8], "w": 1, "x": 11, "y": 6 },
-              { "label": "k5C", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 },
-              { "label": "k5B", "matrix": [5, 11], "w": 1, "x": 10, "y": 7 },
-              { "label": "k5A", "matrix": [5, 10], "w": 1, "x": 11, "y": 7 }
+              { "label": "k49", "matrix": [4, 9], "x": 11.5, "y": 4.125 },
+              { "label": "k4A", "matrix": [4, 10], "x": 12.5, "y": 4 },
+              { "label": "k4B", "matrix": [4, 11], "x": 13.5, "y": 4.125 },
+              { "label": "k4C", "matrix": [4, 12], "x": 14.5, "y": 4.375 },
+              { "label": "k4D", "matrix": [4, 13], "x": 15.5, "y": 4.375 },
+              { "label": "k57", "matrix": [5, 7], "x": 9, "y": 5 },
+              { "label": "k58", "matrix": [5, 8], "x": 10, "y": 5 },
+              { "label": "k59", "matrix": [5, 9], "x": 9, "y": 6 },
+              { "label": "k47", "matrix": [4, 7], "x": 10, "y": 6 },
+              { "label": "k48", "matrix": [4, 8], "x": 11, "y": 6 },
+              { "label": "k5C", "matrix": [5, 12], "x": 9, "y": 7 },
+              { "label": "k5B", "matrix": [5, 11], "x": 10, "y": 7 },
+              { "label": "k5A", "matrix": [5, 10], "x": 11, "y": 7 }
           ]
       },
       "LAYOUT_ergodox_pretty": {
           "layout": [
               { "label": "L00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 },
-              { "label": "L01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 },
-              { "label": "L02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 },
-              { "label": "L03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 },
-              { "label": "L04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 },
-              { "label": "L05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 },
-              { "label": "L06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 },
-              { "label": "R00", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 },
-              { "label": "R01", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 },
-              { "label": "R02", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 },
-              { "label": "R03", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 },
-              { "label": "R04", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 },
-              { "label": "R05", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 },
+              { "label": "L01", "matrix": [0, 1], "x": 1.5, "y": 0.375 },
+              { "label": "L02", "matrix": [0, 2], "x": 2.5, "y": 0.125 },
+              { "label": "L03", "matrix": [0, 3], "x": 3.5, "y": 0 },
+              { "label": "L04", "matrix": [0, 4], "x": 4.5, "y": 0.125 },
+              { "label": "L05", "matrix": [0, 5], "x": 5.5, "y": 0.25 },
+              { "label": "L06", "matrix": [0, 6], "x": 6.5, "y": 0.25 },
+              { "label": "R00", "matrix": [0, 7], "x": 9.5, "y": 0.25 },
+              { "label": "R01", "matrix": [0, 8], "x": 10.5, "y": 0.25 },
+              { "label": "R02", "matrix": [0, 9], "x": 11.5, "y": 0.125 },
+              { "label": "R03", "matrix": [0, 10], "x": 12.5, "y": 0 },
+              { "label": "R04", "matrix": [0, 11], "x": 13.5, "y": 0.125 },
+              { "label": "R05", "matrix": [0, 12], "x": 14.5, "y": 0.375 },
               { "label": "R06", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 },
               { "label": "L10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 },
-              { "label": "L11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 },
-              { "label": "L12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 },
-              { "label": "L13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-              { "label": "L14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 },
-              { "label": "L15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-              { "label": "L16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
-              { "label": "R10", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
-              { "label": "R11", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 },
-              { "label": "R12", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 },
-              { "label": "R13", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 },
-              { "label": "R14", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 },
-              { "label": "R15", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 },
+              { "label": "L11", "matrix": [1, 1], "x": 1.5, "y": 1.375 },
+              { "label": "L12", "matrix": [1, 2], "x": 2.5, "y": 1.125 },
+              { "label": "L13", "matrix": [1, 3], "x": 3.5, "y": 1 },
+              { "label": "L14", "matrix": [1, 4], "x": 4.5, "y": 1.125 },
+              { "label": "L15", "matrix": [1, 5], "x": 5.5, "y": 1.25 },
+              { "label": "L16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5 },
+              { "label": "R10", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5 },
+              { "label": "R11", "matrix": [1, 8], "x": 10.5, "y": 1.25 },
+              { "label": "R12", "matrix": [1, 9], "x": 11.5, "y": 1.125 },
+              { "label": "R13", "matrix": [1, 10], "x": 12.5, "y": 1 },
+              { "label": "R14", "matrix": [1, 11], "x": 13.5, "y": 1.125 },
+              { "label": "R15", "matrix": [1, 12], "x": 14.5, "y": 1.375 },
               { "label": "R16", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 },
               { "label": "L20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 },
-              { "label": "L21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 },
-              { "label": "L22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 },
-              { "label": "L23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 },
-              { "label": "L24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 },
-              { "label": "L25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 },
-              { "label": "R21", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 },
-              { "label": "R22", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 },
-              { "label": "R23", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 },
-              { "label": "R24", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 },
-              { "label": "R25", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 },
+              { "label": "L21", "matrix": [2, 1], "x": 1.5, "y": 2.375 },
+              { "label": "L22", "matrix": [2, 2], "x": 2.5, "y": 2.125 },
+              { "label": "L23", "matrix": [2, 3], "x": 3.5, "y": 2 },
+              { "label": "L24", "matrix": [2, 4], "x": 4.5, "y": 2.125 },
+              { "label": "L25", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+              { "label": "R21", "matrix": [2, 8], "x": 10.5, "y": 2.25 },
+              { "label": "R22", "matrix": [2, 9], "x": 11.5, "y": 2.125 },
+              { "label": "R23", "matrix": [2, 10], "x": 12.5, "y": 2 },
+              { "label": "R24", "matrix": [2, 11], "x": 13.5, "y": 2.125 },
+              { "label": "R25", "matrix": [2, 12], "x": 14.5, "y": 2.375 },
               { "label": "R26", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 },
               { "label": "L30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 },
-              { "label": "L31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 },
-              { "label": "L32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 },
-              { "label": "L33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 },
-              { "label": "L34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 },
-              { "label": "L35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 },
-              { "label": "L36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
-              { "label": "R30", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
-              { "label": "R31", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 },
-              { "label": "R32", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 },
-              { "label": "R33", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 },
-              { "label": "R34", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 },
-              { "label": "R35", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 },
+              { "label": "L31", "matrix": [3, 1], "x": 1.5, "y": 3.375 },
+              { "label": "L32", "matrix": [3, 2], "x": 2.5, "y": 3.125 },
+              { "label": "L33", "matrix": [3, 3], "x": 3.5, "y": 3 },
+              { "label": "L34", "matrix": [3, 4], "x": 4.5, "y": 3.125 },
+              { "label": "L35", "matrix": [3, 5], "x": 5.5, "y": 3.25 },
+              { "label": "L36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5 },
+              { "label": "R30", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5 },
+              { "label": "R31", "matrix": [3, 8], "x": 10.5, "y": 3.25 },
+              { "label": "R32", "matrix": [3, 9], "x": 11.5, "y": 3.125 },
+              { "label": "R33", "matrix": [3, 10], "x": 12.5, "y": 3 },
+              { "label": "R34", "matrix": [3, 11], "x": 13.5, "y": 3.125 },
+              { "label": "R35", "matrix": [3, 12], "x": 14.5, "y": 3.375 },
               { "label": "R36", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 },
-              { "label": "L40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 },
-              { "label": "L41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 },
-              { "label": "L42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 },
-              { "label": "L43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 },
-              { "label": "L44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 },
-              { "label": "R42", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 },
-              { "label": "R43", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 },
-              { "label": "R44", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 },
-              { "label": "R45", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 },
-              { "label": "R46", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 },
-              { "label": "L55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 },
-              { "label": "L56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 },
-              { "label": "R50", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 },
-              { "label": "R51", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 },
-              { "label": "L54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 },
-              { "label": "R52", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 },
-              { "label": "L53", "matrix": [5, 3], "w": 1, "x": 5, "y": 6,"h": 2 },
-              { "label": "L52", "matrix": [5, 2], "w": 1, "x": 6, "y": 6,"h": 2 },
-              { "label": "L51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 },
-              { "label": "R55", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 },
-              { "label": "R54", "matrix": [5, 11], "w": 1, "x": 10, "y": 6, "h": 2 },
-              { "label": "R53", "matrix": [5, 10], "w": 1, "x": 11, "y": 6, "h": 2 }
+              { "label": "L40", "matrix": [4, 0], "x": 0.5, "y": 4.375 },
+              { "label": "L41", "matrix": [4, 1], "x": 1.5, "y": 4.375 },
+              { "label": "L42", "matrix": [4, 2], "x": 2.5, "y": 4.125 },
+              { "label": "L43", "matrix": [4, 3], "x": 3.5, "y": 4 },
+              { "label": "L44", "matrix": [4, 4], "x": 4.5, "y": 4.125 },
+              { "label": "R42", "matrix": [4, 9], "x": 11.5, "y": 4.125 },
+              { "label": "R43", "matrix": [4, 10], "x": 12.5, "y": 4 },
+              { "label": "R44", "matrix": [4, 11], "x": 13.5, "y": 4.125 },
+              { "label": "R45", "matrix": [4, 12], "x": 14.5, "y": 4.375 },
+              { "label": "R46", "matrix": [4, 13], "x": 15.5, "y": 4.375 },
+              { "label": "L55", "matrix": [5, 5], "x": 6, "y": 5 },
+              { "label": "L56", "matrix": [5, 6], "x": 7, "y": 5 },
+              { "label": "R50", "matrix": [5, 7], "x": 9, "y": 5 },
+              { "label": "R51", "matrix": [5, 8], "x": 10, "y": 5 },
+              { "label": "L54", "matrix": [5, 4], "x": 7, "y": 6 },
+              { "label": "R52", "matrix": [5, 9], "x": 9, "y": 6 },
+              { "label": "L53", "matrix": [5, 3], "x": 5, "y": 6,"h": 2 },
+              { "label": "L52", "matrix": [5, 2], "x": 6, "y": 6,"h": 2 },
+              { "label": "L51", "matrix": [5, 1], "x": 7, "y": 7 },
+              { "label": "R55", "matrix": [5, 12], "x": 9, "y": 7 },
+              { "label": "R54", "matrix": [5, 11], "x": 10, "y": 6, "h": 2 },
+              { "label": "R53", "matrix": [5, 10], "x": 11, "y": 6, "h": 2 }
           ]
       },
       "LAYOUT_ergodox_pretty_80": {
           "layout": [
               { "label": "L00", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0.375 },
-              { "label": "L01", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.375 },
-              { "label": "L02", "matrix": [0, 2], "w": 1, "x": 2.5, "y": 0.125 },
-              { "label": "L03", "matrix": [0, 3], "w": 1, "x": 3.5, "y": 0 },
-              { "label": "L04", "matrix": [0, 4], "w": 1, "x": 4.5, "y": 0.125 },
-              { "label": "L05", "matrix": [0, 5], "w": 1, "x": 5.5, "y": 0.25 },
-              { "label": "L06", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0.25 },
-              { "label": "R00", "matrix": [0, 7], "w": 1, "x": 9.5, "y": 0.25 },
-              { "label": "R01", "matrix": [0, 8], "w": 1, "x": 10.5, "y": 0.25 },
-              { "label": "R02", "matrix": [0, 9], "w": 1, "x": 11.5, "y": 0.125 },
-              { "label": "R03", "matrix": [0, 10], "w": 1, "x": 12.5, "y": 0 },
-              { "label": "R04", "matrix": [0, 11], "w": 1, "x": 13.5, "y": 0.125 },
-              { "label": "R05", "matrix": [0, 12], "w": 1, "x": 14.5, "y": 0.375 },
+              { "label": "L01", "matrix": [0, 1], "x": 1.5, "y": 0.375 },
+              { "label": "L02", "matrix": [0, 2], "x": 2.5, "y": 0.125 },
+              { "label": "L03", "matrix": [0, 3], "x": 3.5, "y": 0 },
+              { "label": "L04", "matrix": [0, 4], "x": 4.5, "y": 0.125 },
+              { "label": "L05", "matrix": [0, 5], "x": 5.5, "y": 0.25 },
+              { "label": "L06", "matrix": [0, 6], "x": 6.5, "y": 0.25 },
+              { "label": "R00", "matrix": [0, 7], "x": 9.5, "y": 0.25 },
+              { "label": "R01", "matrix": [0, 8], "x": 10.5, "y": 0.25 },
+              { "label": "R02", "matrix": [0, 9], "x": 11.5, "y": 0.125 },
+              { "label": "R03", "matrix": [0, 10], "x": 12.5, "y": 0 },
+              { "label": "R04", "matrix": [0, 11], "x": 13.5, "y": 0.125 },
+              { "label": "R05", "matrix": [0, 12], "x": 14.5, "y": 0.375 },
               { "label": "R06", "matrix": [0, 13], "w": 1.5, "x": 15.5, "y": 0.375 },
               { "label": "L10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.375 },
-              { "label": "L11", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1.375 },
-              { "label": "L12", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1.125 },
-              { "label": "L13", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-              { "label": "L14", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1.125 },
-              { "label": "L15", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1.25 },
-              { "label": "L16", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1.25, "h": 1.5 },
-              { "label": "R10", "matrix": [1, 7], "w": 1, "x": 9.5, "y": 1.25, "h": 1.5 },
-              { "label": "R11", "matrix": [1, 8], "w": 1, "x": 10.5, "y": 1.25 },
-              { "label": "R12", "matrix": [1, 9], "w": 1, "x": 11.5, "y": 1.125 },
-              { "label": "R13", "matrix": [1, 10], "w": 1, "x": 12.5, "y": 1 },
-              { "label": "R14", "matrix": [1, 11], "w": 1, "x": 13.5, "y": 1.125 },
-              { "label": "R15", "matrix": [1, 12], "w": 1, "x": 14.5, "y": 1.375 },
+              { "label": "L11", "matrix": [1, 1], "x": 1.5, "y": 1.375 },
+              { "label": "L12", "matrix": [1, 2], "x": 2.5, "y": 1.125 },
+              { "label": "L13", "matrix": [1, 3], "x": 3.5, "y": 1 },
+              { "label": "L14", "matrix": [1, 4], "x": 4.5, "y": 1.125 },
+              { "label": "L15", "matrix": [1, 5], "x": 5.5, "y": 1.25 },
+              { "label": "L16", "matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5 },
+              { "label": "R10", "matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5 },
+              { "label": "R11", "matrix": [1, 8], "x": 10.5, "y": 1.25 },
+              { "label": "R12", "matrix": [1, 9], "x": 11.5, "y": 1.125 },
+              { "label": "R13", "matrix": [1, 10], "x": 12.5, "y": 1 },
+              { "label": "R14", "matrix": [1, 11], "x": 13.5, "y": 1.125 },
+              { "label": "R15", "matrix": [1, 12], "x": 14.5, "y": 1.375 },
               { "label": "R16", "matrix": [1, 13], "w": 1.5, "x": 15.5, "y": 1.375 },
               { "label": "L20", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.375 },
-              { "label": "L21", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.375 },
-              { "label": "L22", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.125 },
-              { "label": "L23", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2 },
-              { "label": "L24", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.125 },
-              { "label": "L25", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.25 },
-              { "label": "R21", "matrix": [2, 8], "w": 1, "x": 10.5, "y": 2.25 },
-              { "label": "R22", "matrix": [2, 9], "w": 1, "x": 11.5, "y": 2.125 },
-              { "label": "R23", "matrix": [2, 10], "w": 1, "x": 12.5, "y": 2 },
-              { "label": "R24", "matrix": [2, 11], "w": 1, "x": 13.5, "y": 2.125 },
-              { "label": "R25", "matrix": [2, 12], "w": 1, "x": 14.5, "y": 2.375 },
+              { "label": "L21", "matrix": [2, 1], "x": 1.5, "y": 2.375 },
+              { "label": "L22", "matrix": [2, 2], "x": 2.5, "y": 2.125 },
+              { "label": "L23", "matrix": [2, 3], "x": 3.5, "y": 2 },
+              { "label": "L24", "matrix": [2, 4], "x": 4.5, "y": 2.125 },
+              { "label": "L25", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+              { "label": "R21", "matrix": [2, 8], "x": 10.5, "y": 2.25 },
+              { "label": "R22", "matrix": [2, 9], "x": 11.5, "y": 2.125 },
+              { "label": "R23", "matrix": [2, 10], "x": 12.5, "y": 2 },
+              { "label": "R24", "matrix": [2, 11], "x": 13.5, "y": 2.125 },
+              { "label": "R25", "matrix": [2, 12], "x": 14.5, "y": 2.375 },
               { "label": "R26", "matrix": [2, 13], "w": 1.5, "x": 15.5, "y": 2.375 },
               { "label": "L30", "matrix": [3, 0], "w": 1.5, "x": 0, "y": 3.375 },
-              { "label": "L31", "matrix": [3, 1], "w": 1, "x": 1.5, "y": 3.375 },
-              { "label": "L32", "matrix": [3, 2], "w": 1, "x": 2.5, "y": 3.125 },
-              { "label": "L33", "matrix": [3, 3], "w": 1, "x": 3.5, "y": 3 },
-              { "label": "L34", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3.125 },
-              { "label": "L35", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3.25 },
-              { "label": "L36", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 2.75, "h": 1.5 },
-              { "label": "R30", "matrix": [3, 7], "w": 1, "x": 9.5, "y": 2.75, "h": 1.5 },
-              { "label": "R31", "matrix": [3, 8], "w": 1, "x": 10.5, "y": 3.25 },
-              { "label": "R32", "matrix": [3, 9], "w": 1, "x": 11.5, "y": 3.125 },
-              { "label": "R33", "matrix": [3, 10], "w": 1, "x": 12.5, "y": 3 },
-              { "label": "R34", "matrix": [3, 11], "w": 1, "x": 13.5, "y": 3.125 },
-              { "label": "R35", "matrix": [3, 12], "w": 1, "x": 14.5, "y": 3.375 },
+              { "label": "L31", "matrix": [3, 1], "x": 1.5, "y": 3.375 },
+              { "label": "L32", "matrix": [3, 2], "x": 2.5, "y": 3.125 },
+              { "label": "L33", "matrix": [3, 3], "x": 3.5, "y": 3 },
+              { "label": "L34", "matrix": [3, 4], "x": 4.5, "y": 3.125 },
+              { "label": "L35", "matrix": [3, 5], "x": 5.5, "y": 3.25 },
+              { "label": "L36", "matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5 },
+              { "label": "R30", "matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5 },
+              { "label": "R31", "matrix": [3, 8], "x": 10.5, "y": 3.25 },
+              { "label": "R32", "matrix": [3, 9], "x": 11.5, "y": 3.125 },
+              { "label": "R33", "matrix": [3, 10], "x": 12.5, "y": 3 },
+              { "label": "R34", "matrix": [3, 11], "x": 13.5, "y": 3.125 },
+              { "label": "R35", "matrix": [3, 12], "x": 14.5, "y": 3.375 },
               { "label": "R36", "matrix": [3, 13], "w": 1.5, "x": 15.5, "y": 3.375 },
-              { "label": "L40", "matrix": [4, 0], "w": 1, "x": 0.5, "y": 4.375 },
-              { "label": "L41", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4.375 },
-              { "label": "L42", "matrix": [4, 2], "w": 1, "x": 2.5, "y": 4.125 },
-              { "label": "L43", "matrix": [4, 3], "w": 1, "x": 3.5, "y": 4 },
-              { "label": "L44", "matrix": [4, 4], "w": 1, "x": 4.5, "y": 4.125 },
-              { "label": "R42", "matrix": [4, 9], "w": 1, "x": 11.5, "y": 4.125 },
-              { "label": "R43", "matrix": [4, 10], "w": 1, "x": 12.5, "y": 4 },
-              { "label": "R44", "matrix": [4, 11], "w": 1, "x": 13.5, "y": 4.125 },
-              { "label": "R45", "matrix": [4, 12], "w": 1, "x": 14.5, "y": 4.375 },
-              { "label": "R46", "matrix": [4, 13], "w": 1, "x": 15.5, "y": 4.375 },
-              { "label": "L55", "matrix": [5, 5], "w": 1, "x": 6, "y": 5 },
-              { "label": "L56", "matrix": [5, 6], "w": 1, "x": 7, "y": 5 },
-              { "label": "R50", "matrix": [5, 7], "w": 1, "x": 9, "y": 5 },
-              { "label": "R51", "matrix": [5, 8], "w": 1, "x": 10, "y": 5 },
-              { "label": "L45", "matrix": [4, 5], "w": 1, "x": 5, "y": 6 },
-              { "label": "L46", "matrix": [4, 6], "w": 1, "x": 6, "y": 6 },
-              { "label": "L54", "matrix": [5, 4], "w": 1, "x": 7, "y": 6 },
-              { "label": "R52", "matrix": [5, 9], "w": 1, "x": 9, "y": 6 },
-              { "label": "R40", "matrix": [4, 7], "w": 1, "x": 10, "y": 6 },
-              { "label": "R41", "matrix": [4, 8], "w": 1, "x": 11, "y": 6 },
-              { "label": "L53", "matrix": [5, 3], "w": 1, "x": 5, "y": 7 },
-              { "label": "L52", "matrix": [5, 2], "w": 1, "x": 6, "y": 7 },
-              { "label": "L51", "matrix": [5, 1], "w": 1, "x": 7, "y": 7 },
-              { "label": "R55", "matrix": [5, 12], "w": 1, "x": 9, "y": 7 },
-              { "label": "R54", "matrix": [5, 11], "w": 1, "x": 10, "y": 7 },
-              { "label": "R53", "matrix": [5, 10], "w": 1, "x": 11, "y": 7 }
+              { "label": "L40", "matrix": [4, 0], "x": 0.5, "y": 4.375 },
+              { "label": "L41", "matrix": [4, 1], "x": 1.5, "y": 4.375 },
+              { "label": "L42", "matrix": [4, 2], "x": 2.5, "y": 4.125 },
+              { "label": "L43", "matrix": [4, 3], "x": 3.5, "y": 4 },
+              { "label": "L44", "matrix": [4, 4], "x": 4.5, "y": 4.125 },
+              { "label": "R42", "matrix": [4, 9], "x": 11.5, "y": 4.125 },
+              { "label": "R43", "matrix": [4, 10], "x": 12.5, "y": 4 },
+              { "label": "R44", "matrix": [4, 11], "x": 13.5, "y": 4.125 },
+              { "label": "R45", "matrix": [4, 12], "x": 14.5, "y": 4.375 },
+              { "label": "R46", "matrix": [4, 13], "x": 15.5, "y": 4.375 },
+              { "label": "L55", "matrix": [5, 5], "x": 6, "y": 5 },
+              { "label": "L56", "matrix": [5, 6], "x": 7, "y": 5 },
+              { "label": "R50", "matrix": [5, 7], "x": 9, "y": 5 },
+              { "label": "R51", "matrix": [5, 8], "x": 10, "y": 5 },
+              { "label": "L45", "matrix": [4, 5], "x": 5, "y": 6 },
+              { "label": "L46", "matrix": [4, 6], "x": 6, "y": 6 },
+              { "label": "L54", "matrix": [5, 4], "x": 7, "y": 6 },
+              { "label": "R52", "matrix": [5, 9], "x": 9, "y": 6 },
+              { "label": "R40", "matrix": [4, 7], "x": 10, "y": 6 },
+              { "label": "R41", "matrix": [4, 8], "x": 11, "y": 6 },
+              { "label": "L53", "matrix": [5, 3], "x": 5, "y": 7 },
+              { "label": "L52", "matrix": [5, 2], "x": 6, "y": 7 },
+              { "label": "L51", "matrix": [5, 1], "x": 7, "y": 7 },
+              { "label": "R55", "matrix": [5, 12], "x": 9, "y": 7 },
+              { "label": "R54", "matrix": [5, 11], "x": 10, "y": 7 },
+              { "label": "R53", "matrix": [5, 10], "x": 11, "y": 7 }
           ]
       }
   }
diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h
index 23c362c0aa..a76ebef341 100755
--- a/keyboards/ktec/staryu/config.h
+++ b/keyboards/ktec/staryu/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define RGB_DI_PIN C6
 #define RGBLED_NUM 1     // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json
index 02189fecf7..041cd63cf9 100644
--- a/keyboards/ktec/staryu/info.json
+++ b/keyboards/ktec/staryu/info.json
@@ -15,6 +15,9 @@
     "bootmagic": {
         "matrix": [0, 1]
     },
+    "ws2812": {
+        "pin": "C6"
+    },
     "processor": "atmega32u2",
     "bootloader": "lufa-dfu",
     "matrix_pins": {
diff --git a/keyboards/kudox/columner/columner.c b/keyboards/kudox/columner/columner.c
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/kudox/columner/columner.c
+++ /dev/null
diff --git a/keyboards/kudox/columner/config.h b/keyboards/kudox/columner/config.h
index 7a97d2c42d..7506090b1e 100644
--- a/keyboards/kudox/columner/config.h
+++ b/keyboards/kudox/columner/config.h
@@ -16,23 +16,11 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kudox/columner/info.json b/keyboards/kudox/columner/info.json
index ff34bd12e0..75d5c77bc8 100644
--- a/keyboards/kudox/columner/info.json
+++ b/keyboards/kudox/columner/info.json
@@ -8,9 +8,17 @@
         "pid": "0x9691",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/kudox/kudox.c b/keyboards/kudox/kudox.c
deleted file mode 100644
index d7643747ad..0000000000
--- a/keyboards/kudox/kudox.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "kudox.h"
diff --git a/keyboards/kudox/kudox.h b/keyboards/kudox/kudox.h
deleted file mode 100644
index ca61ea82d1..0000000000
--- a/keyboards/kudox/kudox.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef KEYBOARD_kudox_rev1
-    #include "rev1.h"
-#endif
-#ifdef KEYBOARD_kudox_rev2
-    #include "rev2.h"
-#endif
-#ifdef KEYBOARD_kudox_rev3
-    #include "rev3.h"
-#endif
-#ifdef KEYBOARD_kudox_columner
-    #include "columner.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/kudox/rev1/config.h b/keyboards/kudox/rev1/config.h
index 5b9e4b2bfd..80ac84c64f 100644
--- a/keyboards/kudox/rev1/config.h
+++ b/keyboards/kudox/rev1/config.h
@@ -16,23 +16,11 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kudox/rev1/info.json
index 918288d95e..c5a9427933 100644
--- a/keyboards/kudox/rev1/info.json
+++ b/keyboards/kudox/rev1/info.json
@@ -8,9 +8,17 @@
         "pid": "0x9690",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/kudox/rev1/keymaps/jis/rules.mk b/keyboards/kudox/rev1/keymaps/jis/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/kudox/rev1/keymaps/jis/rules.mk
+++ /dev/null
diff --git a/keyboards/kudox/rev1/keymaps/x1/rules.mk b/keyboards/kudox/rev1/keymaps/x1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/kudox/rev1/keymaps/x1/rules.mk
+++ /dev/null
diff --git a/keyboards/kudox/rev1/rev1.c b/keyboards/kudox/rev1/rev1.c
deleted file mode 100644
index abcdf4843e..0000000000
--- a/keyboards/kudox/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kudox.h"
diff --git a/keyboards/kudox/rev1/rev1.h b/keyboards/kudox/rev1/rev1.h
index 7a97cce699..82373daa6f 100644
--- a/keyboards/kudox/rev1/rev1.h
+++ b/keyboards/kudox/rev1/rev1.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "kudox.h"
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/kudox/rev2/config.h b/keyboards/kudox/rev2/config.h
index 5b9e4b2bfd..80ac84c64f 100644
--- a/keyboards/kudox/rev2/config.h
+++ b/keyboards/kudox/rev2/config.h
@@ -16,23 +16,11 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kudox/rev2/info.json
index 9d4a453413..858f28988d 100644
--- a/keyboards/kudox/rev2/info.json
+++ b/keyboards/kudox/rev2/info.json
@@ -8,9 +8,17 @@
         "pid": "0x9690",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/kudox/rev2/keymaps/jis/rules.mk b/keyboards/kudox/rev2/keymaps/jis/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/kudox/rev2/keymaps/jis/rules.mk
+++ /dev/null
diff --git a/keyboards/kudox/rev2/rev2.c b/keyboards/kudox/rev2/rev2.c
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/kudox/rev2/rev2.c
+++ /dev/null
diff --git a/keyboards/kudox/rev3/config.h b/keyboards/kudox/rev3/config.h
index 7a97d2c42d..7506090b1e 100644
--- a/keyboards/kudox/rev3/config.h
+++ b/keyboards/kudox/rev3/config.h
@@ -16,23 +16,11 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kudox/rev3/info.json
index 738321eb13..d3abd78b62 100644
--- a/keyboards/kudox/rev3/info.json
+++ b/keyboards/kudox/rev3/info.json
@@ -8,9 +8,17 @@
         "pid": "0x9690",
         "device_version": "3.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/kudox/rev3/rev3.c b/keyboards/kudox/rev3/rev3.c
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/kudox/rev3/rev3.c
+++ /dev/null
diff --git a/keyboards/kudox_full/kudox_full.c b/keyboards/kudox_full/kudox_full.c
index d5ab31fc15..d69f679822 100644
--- a/keyboards/kudox_full/kudox_full.c
+++ b/keyboards/kudox_full/kudox_full.c
@@ -1,7 +1,7 @@
 // Copyright 2021 Kumao Kobo (@kumaokobo)
 // SPDX-License-Identifier: GPL-2.0+
 
-#include "kudox_full.h"
+#include "quantum.h"
 
 #ifdef RGBLIGHT_ENABLE
 void eeconfig_init_kb(void) {
diff --git a/keyboards/kudox_full/kudox_full.h b/keyboards/kudox_full/kudox_full.h
deleted file mode 100644
index 78a4dcb474..0000000000
--- a/keyboards/kudox_full/kudox_full.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2021 Kumao Kobo (@kumaokobo)
-// SPDX-License-Identifier: GPL-2.0+
-
-#pragma once
-
-#ifdef KEYBOARD_kudox_full_rev1
-    #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/kudox_full/rev1/config.h b/keyboards/kudox_full/rev1/config.h
index 4bcaef9111..84d08bce54 100644
--- a/keyboards/kudox_full/rev1/config.h
+++ b/keyboards/kudox_full/rev1/config.h
@@ -3,23 +3,11 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D4 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kudox_full/rev1/info.json b/keyboards/kudox_full/rev1/info.json
index 31adb7c81e..98e109e24c 100644
--- a/keyboards/kudox_full/rev1/info.json
+++ b/keyboards/kudox_full/rev1/info.json
@@ -8,9 +8,17 @@
         "pid": "0x9693",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D4"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/kudox_full/rev1/rev1.c b/keyboards/kudox_full/rev1/rev1.c
deleted file mode 100644
index 8dfb941ba2..0000000000
--- a/keyboards/kudox_full/rev1/rev1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 Kumao Kobo (@kumaokobo)
-// SPDX-License-Identifier: GPL-2.0+
-
-#include "rev1.h"
diff --git a/keyboards/kudox_game/kudox_game.c b/keyboards/kudox_game/kudox_game.c
deleted file mode 100644
index cf053afd06..0000000000
--- a/keyboards/kudox_game/kudox_game.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "kudox_game.h"
diff --git a/keyboards/kudox_game/kudox_game.h b/keyboards/kudox_game/kudox_game.h
deleted file mode 100644
index c76f086c87..0000000000
--- a/keyboards/kudox_game/kudox_game.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef KEYBOARD_kudox_game_rev1
-    #include "rev1.h"
-#endif
-#ifdef KEYBOARD_kudox_game_rev2
-    #include "rev2.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/kudox_game/rev1/config.h b/keyboards/kudox_game/rev1/config.h
index af9cf9a54d..5fddd8102a 100644
--- a/keyboards/kudox_game/rev1/config.h
+++ b/keyboards/kudox_game/rev1/config.h
@@ -17,23 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #undef RGBLED_NUM
 #define RGBLED_NUM 7    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kudox_game/rev1/info.json
index ad889c2304..d9fdf0ae35 100644
--- a/keyboards/kudox_game/rev1/info.json
+++ b/keyboards/kudox_game/rev1/info.json
@@ -1,5 +1,13 @@
 {
     "usb": {
         "device_version": "1.0.0"
-    }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/kudox_game/rev1/rev1.c b/keyboards/kudox_game/rev1/rev1.c
deleted file mode 100644
index 32356f8a4a..0000000000
--- a/keyboards/kudox_game/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kudox_game.h"
diff --git a/keyboards/kudox_game/rev1/rev1.h b/keyboards/kudox_game/rev1/rev1.h
index e630a51658..52b30cf61b 100644
--- a/keyboards/kudox_game/rev1/rev1.h
+++ b/keyboards/kudox_game/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "../kudox_game.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kudox_game/rev2/config.h
index 8591c2fd04..7b6ef67bd9 100644
--- a/keyboards/kudox_game/rev2/config.h
+++ b/keyboards/kudox_game/rev2/config.h
@@ -17,23 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #undef RGBLED_NUM
 #define RGBLED_NUM 7    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kudox_game/rev2/info.json
index 3bdd63ee28..23e30a71c5 100644
--- a/keyboards/kudox_game/rev2/info.json
+++ b/keyboards/kudox_game/rev2/info.json
@@ -1,5 +1,13 @@
 {
     "usb": {
         "device_version": "2.0.0"
-    }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/kudox_game/rev2/rev2.c b/keyboards/kudox_game/rev2/rev2.c
deleted file mode 100644
index 32356f8a4a..0000000000
--- a/keyboards/kudox_game/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kudox_game.h"
diff --git a/keyboards/kudox_game/rev2/rev2.h b/keyboards/kudox_game/rev2/rev2.h
index e630a51658..52b30cf61b 100644
--- a/keyboards/kudox_game/rev2/rev2.h
+++ b/keyboards/kudox_game/rev2/rev2.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "../kudox_game.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/kuro/kuro65/config.h b/keyboards/kuro/kuro65/config.h
index 115201c753..f782e9069b 100644
--- a/keyboards/kuro/kuro65/config.h
+++ b/keyboards/kuro/kuro65/config.h
@@ -19,8 +19,6 @@
 
 /* RGB Matrix defines*/
 #ifdef RGB_MATRIX_ENABLE
-// The pin connected to the data pin of the LEDs
-#    define RGB_DI_PIN E6
 // The number of LEDs connected
 #    define RGB_MATRIX_LED_COUNT 69
 
diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json
index 648e1f9abb..d878152e9e 100644
--- a/keyboards/kuro/kuro65/info.json
+++ b/keyboards/kuro/kuro65/info.json
@@ -31,6 +31,9 @@
         "key_lock": false,
         "rgb_matrix": true
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "community_layouts": [ "65_iso" ],
     "layouts": {
         "LAYOUT_65_iso": {
diff --git a/keyboards/kv/revt/config.h b/keyboards/kv/revt/config.h
index 1610a57dd1..c2fe5d4d75 100644
--- a/keyboards/kv/revt/config.h
+++ b/keyboards/kv/revt/config.h
@@ -15,12 +15,5 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A6, B13, B8, A0, A1, A2 }
-#define MATRIX_COL_PINS { B7, B6, B5, B4, B3, B2, B14, B1, B15, B0, B9, B10, B11, B12, A14, A13, A4, A5, A7, A8, A15 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kv/revt/info.json b/keyboards/kv/revt/info.json
index afa7d65e0c..7697f2acbc 100644
--- a/keyboards/kv/revt/info.json
+++ b/keyboards/kv/revt/info.json
@@ -8,134 +8,139 @@
         "pid": "0x6520",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4", "B3", "B2", "B14", "B1", "B15", "B0", "B9", "B10", "B11", "B12", "A14", "A13", "A4", "A5", "A7", "A8", "A15"],
+        "rows": ["A6", "B13", "B8", "A0", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"x": 4.25, "y": 0},
-
-                {"x": 6.25, "y": 0},
-                {"x": 7.25, "y": 0},
-                {"x": 8.25, "y": 0},
-                {"x": 9.25, "y": 0},
-
-                {"x": 10.75, "y": 0},
-                {"x": 11.75, "y": 0},
-                {"x": 12.75, "y": 0},
-                {"x": 13.75, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 18.25, "y": 0},
-
-                {"x": 19.5, "y": 0},
-                {"x": 20.5, "y": 0},
-                {"x": 21.5, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-
-                {"x": 4.25, "y": 1},
-                {"x": 5.25, "y": 1},
-                {"x": 6.25, "y": 1},
-                {"x": 7.25, "y": 1},
-                {"x": 8.25, "y": 1},
-                {"x": 9.25, "y": 1},
-                {"x": 10.25, "y": 1},
-                {"x": 11.25, "y": 1},
-                {"x": 12.25, "y": 1},
-                {"x": 13.25, "y": 1},
-                {"x": 14.25, "y": 1},
-                {"x": 15.25, "y": 1},
-                {"x": 16.25, "y": 1},
-                {"x": 17.25, "y": 1, "w": 2},
-
-                {"x": 19.5, "y": 1},
-                {"x": 20.5, "y": 1},
-                {"x": 21.5, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2, "h": 2},
-
-                {"x": 4.25, "y": 2, "w": 1.5},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2},
-                {"x": 14.75, "y": 2},
-                {"x": 15.75, "y": 2},
-                {"x": 16.75, "y": 2},
-                {"x": 17.75, "y": 2, "w": 1.5},
-
-                {"x": 19.5, "y": 2},
-                {"x": 20.5, "y": 2},
-                {"x": 21.5, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-
-                {"x": 4.25, "y": 3, "w": 1.75},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3, "w": 2.25},
-
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4, "h": 2},
-
-                {"x": 4.25, "y": 4, "w": 2.25},
-                {"x": 6.5, "y": 4},
-                {"x": 7.5, "y": 4},
-                {"x": 8.5, "y": 4},
-                {"x": 9.5, "y": 4},
-                {"x": 10.5, "y": 4},
-                {"x": 11.5, "y": 4},
-                {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4},
-                {"x": 14.5, "y": 4},
-                {"x": 15.5, "y": 4},
-                {"x": 16.5, "y": 4, "w": 2.75},
-
-                {"x": 20.5, "y": 4},
-
-                {"x": 0, "y": 5, "w": 2},
-                {"x": 2, "y": 5},
-
-                {"x": 4.25, "y": 5, "w": 1.25},
-                {"x": 5.5, "y": 5, "w": 1.25},
-                {"x": 6.75, "y": 5, "w": 1.25},
-                {"x": 8, "y": 5, "w": 6.25},
-                {"x": 14.25, "y": 5, "w": 1.25},
-                {"x": 15.5, "y": 5, "w": 1.25},
-                {"x": 16.75, "y": 5, "w": 1.25},
-                {"x": 18, "y": 5, "w": 1.25},
-
-                {"x": 19.5, "y": 5},
-                {"x": 20.5, "y": 5},
-                {"x": 21.5, "y": 5}
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 13.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [0, 17], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [0, 20], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 12], "x": 12.25, "y": 1},
+                {"matrix": [1, 13], "x": 13.25, "y": 1},
+                {"matrix": [1, 14], "x": 14.25, "y": 1},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1, "w": 2},
+
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1},
+                {"matrix": [1, 20], "x": 21.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [2, 4], "x": 4.25, "y": 2, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2},
+                {"matrix": [2, 14], "x": 14.75, "y": 2},
+                {"matrix": [2, 15], "x": 15.75, "y": 2},
+                {"matrix": [2, 16], "x": 16.75, "y": 2},
+                {"matrix": [2, 17], "x": 17.75, "y": 2, "w": 1.5},
+
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [2, 19], "x": 20.5, "y": 2},
+                {"matrix": [2, 20], "x": 21.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 17], "x": 17, "y": 3, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2},
+
+                {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6.5, "y": 4},
+                {"matrix": [4, 6], "x": 7.5, "y": 4},
+                {"matrix": [4, 7], "x": 8.5, "y": 4},
+                {"matrix": [4, 8], "x": 9.5, "y": 4},
+                {"matrix": [4, 9], "x": 10.5, "y": 4},
+                {"matrix": [4, 10], "x": 11.5, "y": 4},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 12], "x": 13.5, "y": 4},
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.5, "y": 4},
+                {"matrix": [4, 17], "x": 16.5, "y": 4, "w": 2.75},
+
+                {"matrix": [4, 19], "x": 20.5, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 5.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 9], "x": 8, "y": 5, "w": 6.25},
+                {"matrix": [5, 14], "x": 14.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 16], "x": 16.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 17], "x": 18, "y": 5, "w": 1.25},
+
+                {"matrix": [5, 18], "x": 19.5, "y": 5},
+                {"matrix": [5, 19], "x": 20.5, "y": 5},
+                {"matrix": [5, 20], "x": 21.5, "y": 5}
             ]
         }
     }
diff --git a/keyboards/kv/revt/revt.c b/keyboards/kv/revt/revt.c
index 443a814015..fba4582c26 100644
--- a/keyboards/kv/revt/revt.c
+++ b/keyboards/kv/revt/revt.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "revt.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   // Turn status LED on
diff --git a/keyboards/kv/revt/revt.h b/keyboards/kv/revt/revt.h
deleted file mode 100644
index ed98f4aabe..0000000000
--- a/keyboards/kv/revt/revt.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Hybrid65
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-                        K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H,   K0I, K0J, K0K, \
-  K10, K11, K12, K13,   K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H,   K1I, K1J, K1K, \
-  K20, K21, K22, K23,   K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H,   K2I, K2J, K2K, \
-  K30, K31, K32,        K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,      K3H,                  \
-  K40, K41, K42, K43,   K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E,           K4H,        K4J,      \
-  K50,      K52,        K54, K55, K56,           K59,                     K5E, K5F, K5G, K5H,   K5I, K5J, K5K  \
-) \
-{ \
-  { KC_NO, KC_NO, KC_NO, KC_NO,  K04, KC_NO, K06, K07,   K08,   K09, K0A,   K0B,   K0C,   K0D,   K0E, K0F,   K0G,   K0H,     K0I,   K0J,   K0K,   }, \
-  { K10, K11,   K12, K13,        K14, K15,   K16, K17,   K18,   K19, K1A,   K1B,   K1C,   K1D,   K1E, K1F,   K1G,   K1H,     K1I,   K1J,   K1K,   }, \
-  { K20, K21,   K22, K23,        K24, K25,   K26, K27,   K28,   K29, K2A,   K2B,   K2C,   K2D,   K2E, K2F,   K2G,   K2H,     K2I,   K2J,   K2K,   }, \
-  { K30, K31,   K32, KC_NO,      K34, K35,   K36, K37,   K38,   K39, K3A,   K3B,   K3C,   K3D,   K3E, K3F,   KC_NO, K3H,     KC_NO, KC_NO, KC_NO, }, \
-  { K40, K41,   K42, K43,        K44, K45,   K46, K47,   K48,   K49, K4A,   K4B,   K4C,   K4D,   K4E, KC_NO, KC_NO, K4H,     KC_NO, K4J,   KC_NO, }, \
-  { K50, KC_NO, K52, KC_NO,      K54, K55,   K56, KC_NO, KC_NO, K59, KC_NO, KC_NO, KC_NO, KC_NO, K5E, K5F,   K5G,   K5H,     K5I,   K5J,   K5K    }, \
-}
diff --git a/keyboards/kwub/bloop/bloop.c b/keyboards/kwub/bloop/bloop.c
deleted file mode 100644
index bbd2980b53..0000000000
--- a/keyboards/kwub/bloop/bloop.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Kwabena Aduse-Poku (Kwub)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bloop.h"
diff --git a/keyboards/kwub/bloop/config.h b/keyboards/kwub/bloop/config.h
index e5f9d358a9..87dc81c24d 100644
--- a/keyboards/kwub/bloop/config.h
+++ b/keyboards/kwub/bloop/config.h
@@ -16,35 +16,8 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { F5, F4, C6, C7, D7 }
-#define MATRIX_COL_PINS \
-    { B4, B5, B6, F6, F1, F7, F0, B0, B7, D3, D2, D1, D5, D4, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_SNAKE
-#    define RGBLIGHT_EFFECT_KNIGHT
-#    define RGBLIGHT_EFFECT_CHRISTMAS
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_RGB_TEST
-#    define RGBLIGHT_EFFECT_ALTERNATING
-#    define RGBLIGHT_EFFECT_TWINKLE
-#    define RGBLED_NUM 0
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/kwub/bloop/info.json b/keyboards/kwub/bloop/info.json
index 9312f84a52..b344f9f3e7 100644
--- a/keyboards/kwub/bloop/info.json
+++ b/keyboards/kwub/bloop/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "F6", "F1", "F7", "F0", "B0", "B7", "D3", "D2", "D1", "D5", "D4", "D6"],
+        "rows": ["F5", "F4", "C6", "C7", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ky01/config.h b/keyboards/ky01/config.h
index f1943f1d2d..224b56103a 100644
--- a/keyboards/ky01/config.h
+++ b/keyboards/ky01/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B5, B4, D7, D4, D6 }
-#define MATRIX_COL_PINS { B3, B7, D0, D1, D2, D3, D5, F0, F1, F4, F5, F6, F7, C7, C6, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ky01/info.json b/keyboards/ky01/info.json
index 32df643d9a..3d21e6eea9 100644
--- a/keyboards/ky01/info.json
+++ b/keyboards/ky01/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4B59",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"],
+        "rows": ["E6", "B5", "B4", "D7", "D4", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ky01/ky01.c b/keyboards/ky01/ky01.c
deleted file mode 100644
index 7ddffc01d9..0000000000
--- a/keyboards/ky01/ky01.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 KnoblesseOblige
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ky01.h"
diff --git a/keyboards/labbe/labbeminiv1/config.h b/keyboards/labbe/labbeminiv1/config.h
index 2e41f13e06..3b8a4eda99 100644
--- a/keyboards/labbe/labbeminiv1/config.h
+++ b/keyboards/labbe/labbeminiv1/config.h
@@ -15,23 +15,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F5, F6 }
-#define MATRIX_COL_PINS { F0, F1, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/labbe/labbeminiv1/info.json b/keyboards/labbe/labbeminiv1/info.json
index ac920876f4..59c53f7ed1 100644
--- a/keyboards/labbe/labbeminiv1/info.json
+++ b/keyboards/labbe/labbeminiv1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4C4D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4"],
+        "rows": ["F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h
index 7261bdb1d1..0a7038363d 100644
--- a/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h
+++ b/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h
@@ -16,7 +16,7 @@
 #pragma once
 
 // ws2812 options
-#define RGB_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to
+#define WS2812_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to
 
 #define RGBLED_NUM 4 // number of LEDs
 #define RGBLIGHT_DEFAULT_MODE 6 // set the rainbow mode
diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
index a4f340ba5f..a06078bce1 100644
--- a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
+++ b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
@@ -16,7 +16,7 @@
 #pragma once
 
 // ws2812 options
-#define RGB_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to
+#define WS2812_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to
 #define RGBLED_NUM 4 // number of LEDs
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/labyrinth75/config.h b/keyboards/labyrinth75/config.h
index 226ef4a530..ce01f7a3ea 100644
--- a/keyboards/labyrinth75/config.h
+++ b/keyboards/labyrinth75/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B0 //D5 could also be the other pin maybe
 #define RGBLED_NUM 6
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/labyrinth75/info.json b/keyboards/labyrinth75/info.json
index 67ad33b84e..eb5f59869f 100644
--- a/keyboards/labyrinth75/info.json
+++ b/keyboards/labyrinth75/info.json
@@ -8,9 +8,17 @@
         "pid": "0x464B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+        "rows": ["B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [0, 2]
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/labyrinth75/labyrinth75.c b/keyboards/labyrinth75/labyrinth75.c
deleted file mode 100644
index 1bfe209587..0000000000
--- a/keyboards/labyrinth75/labyrinth75.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Livi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "labyrinth75.h"
diff --git a/keyboards/laser_ninja/pumpkin_pad/config.h b/keyboards/laser_ninja/pumpkin_pad/config.h
index f8743ddbc0..f42e9c1025 100644
--- a/keyboards/laser_ninja/pumpkin_pad/config.h
+++ b/keyboards/laser_ninja/pumpkin_pad/config.h
@@ -18,7 +18,6 @@
 
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DI_PIN A10
 #    define RGB_MATRIX_LED_COUNT 28
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #    define ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keyboards/laser_ninja/pumpkin_pad/info.json b/keyboards/laser_ninja/pumpkin_pad/info.json
index 8756d34e49..d02445d588 100644
--- a/keyboards/laser_ninja/pumpkin_pad/info.json
+++ b/keyboards/laser_ninja/pumpkin_pad/info.json
@@ -26,6 +26,9 @@
         "pid": "0x7070",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A10"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/late9/config.h b/keyboards/late9/config.h
deleted file mode 100644
index 4b4e44920d..0000000000
--- a/keyboards/late9/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2021 rookiebwoy
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/late9/rev1/config.h b/keyboards/late9/rev1/config.h
index 0f5cafc835..e6fcd30ebe 100644
--- a/keyboards/late9/rev1/config.h
+++ b/keyboards/late9/rev1/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Column/Row IO definitions */
-#define MATRIX_ROW_PINS { B4, E6, D7, B3, B2, B6 }
-#define MATRIX_COL_PINS { B5, C6, D4 }
-
 /* Tap interval for tap dance */
 #define TAPPING_TERM 400
 
diff --git a/keyboards/late9/rev1/info.json b/keyboards/late9/rev1/info.json
index 5c8da7fb21..7d3a710bc5 100644
--- a/keyboards/late9/rev1/info.json
+++ b/keyboards/late9/rev1/info.json
@@ -8,17 +8,39 @@
         "pid": "0x3777",
         "device_version": "0.1.0"
     },
+    "matrix_pins": {
+        "cols": ["B5", "C6", "D4"],
+        "rows": ["B4", "E6", "D7", "B3", "B2", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1},
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3},
-                {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4},
-                {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5}
             ]
         }
     }
diff --git a/keyboards/late9/rev1/rev1.c b/keyboards/late9/rev1/rev1.c
index ffba137189..aa45141b06 100644
--- a/keyboards/late9/rev1/rev1.c
+++ b/keyboards/late9/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev1.h"
+#include "quantum.h"
 
 // OLED logo
 #ifdef OLED_ENABLE
diff --git a/keyboards/late9/rev1/rev1.h b/keyboards/late9/rev1/rev1.h
deleted file mode 100644
index 2e5bb5ec52..0000000000
--- a/keyboards/late9/rev1/rev1.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2021 rookiebwoy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* Matrix layout
- *   ,--------------.
- *   | 00 | 01 | 02 |
- *   |----|----|----|
- *   | 10 | 11 | 12 |
- *   |----|----|----|
- *   | 20 | 21 | 22 |
- *   |----|----|----|
- *   | 30 | 31 | 32 |
- *   |----|----|----|
- *   | 40 | 41 | 42 |
- *   |----|----|----|
- *   | 50 | 51 | 52 |
- *   `--------------'
- */
-#define LAYOUT( \
-	k00, k01, k02,  \
-	k10, k11, k12,  \
-	k20, k21, k22,  \
-	k30, k31, k32,  \
-	k40, k41, k42,  \
-	k50, k51, k52   \
-) \
-{ \
-	{k00, k01, k02}, \
-	{k10, k11, k12}, \
-	{k20, k21, k22}, \
-	{k30, k31, k32}, \
-	{k40, k41, k42}, \
-	{k50, k51, k52}  \
-}
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index 2072b4e630..8b64704638 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS {C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS {F7, F6, F5, F4}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
@@ -103,8 +85,6 @@
 #    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #endif
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -120,4 +100,3 @@
 #define RGBLIGHT_SAT_STEP 5
 #define RGBLIGHT_VAL_STEP 5
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json
index eeb1bf151c..7a5a6fbb6d 100644
--- a/keyboards/latincompass/latin17rgb/info.json
+++ b/keyboards/latincompass/latin17rgb/info.json
@@ -8,34 +8,48 @@
     "pid": "0x7C97",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B7"
+  },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
+  "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": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":1, "h":2},
+        {"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},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"x":0, "y":4, "w":2},
-                {"x":2, "y":4},
-                {"x":3, "y":3, "h":2}
+        {"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/latin17rgb.c b/keyboards/latincompass/latin17rgb/latin17rgb.c
index e165c5b76d..c758e8eb35 100644
--- a/keyboards/latincompass/latin17rgb/latin17rgb.c
+++ b/keyboards/latincompass/latin17rgb/latin17rgb.c
@@ -13,7 +13,7 @@
   * You should have received a copy of the GNU General Public License 
   * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
   */ 
-#include "latin17rgb.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/latincompass/latin17rgb/latin17rgb.h b/keyboards/latincompass/latin17rgb/latin17rgb.h
deleted file mode 100644
index f4ed4bf0c8..0000000000
--- a/keyboards/latincompass/latin17rgb/latin17rgb.h
+++ /dev/null
@@ -1,36 +0,0 @@
- /* Copyright 2021 18438880
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_numpad_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K13, \
-    K30, K31, K32,      \
-    K40,      K41, K33  \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22      }, \
-    { K30, K31, K32, K33 }, \
-    { K40, K41           }  \
-}
-
-#define LAYOUT_pad LAYOUT_numpad_5x4
diff --git a/keyboards/latincompass/latin17rgb/rules.mk b/keyboards/latincompass/latin17rgb/rules.mk
index 9a4182e982..53e01e55d2 100644
--- a/keyboards/latincompass/latin17rgb/rules.mk
+++ b/keyboards/latincompass/latin17rgb/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
index 60a41b7fb3..f702d60979 100644
--- a/keyboards/latincompass/latin47ble/config.h
+++ b/keyboards/latincompass/latin47ble/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { D6, D7, B5, B6 ,C6, C7, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
      #define RGBLED_NUM 3
      #define RGBLIGHT_HUE_STEP 8
      #define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 #define TAPPING_TERM 250
 
diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json
index 5d695e86cf..d52f51352d 100644
--- a/keyboards/latincompass/latin47ble/info.json
+++ b/keyboards/latincompass/latin47ble/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6C62",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B7"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["planck_mit"],
diff --git a/keyboards/latincompass/latin47ble/latin47ble.c b/keyboards/latincompass/latin47ble/latin47ble.c
deleted file mode 100644
index c207b42297..0000000000
--- a/keyboards/latincompass/latin47ble/latin47ble.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2020 haierwangwei2005
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#include "latin47ble.h"
diff --git a/keyboards/latincompass/latin60rgb/config.h b/keyboards/latincompass/latin60rgb/config.h
index e50a75a70a..96e8b75a8e 100644
--- a/keyboards/latincompass/latin60rgb/config.h
+++ b/keyboards/latincompass/latin60rgb/config.h
@@ -15,24 +15,6 @@
   */
 #pragma once
 
-/* USB Device descriptor parameter */
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS {C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS {F7, F6, F5, F4, F1, F0, E6, B0, B1, B2, B3, D6, D4, D3}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/latincompass/latin60rgb/info.json b/keyboards/latincompass/latin60rgb/info.json
index c21003fcd0..5ba1f86df8 100644
--- a/keyboards/latincompass/latin60rgb/info.json
+++ b/keyboards/latincompass/latin60rgb/info.json
@@ -8,6 +8,14 @@
     "pid": "0x6C69",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "IS31FL3733"
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D6", "D4", "D3"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "debounce": 3,
@@ -27,7 +35,7 @@
         { "label": ")", "x": 10, "y": 0 },
         { "label": "_", "x": 11, "y": 0 },
         { "label": "+", "x": 12, "y": 0 },
-        { "label": "|", "x": 13, "y": 0 , "w": 2.0},
+        { "label": "|", "x": 13, "y": 0 , "w": 2},
         { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
         { "label": "Q", "x": 1.5, "y": 1 },
         { "label": "W", "x": 2.5, "y": 1 },
@@ -55,20 +63,20 @@
         { "label": ":", "x": 10.75, "y": 2 },
         { "label": "\"", "x": 11.75, "y": 2 },
         { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 },
-        { "label": "Shift", "x": 0, "y": 3, "w": 2.0 },
-        { "label": "Z", "x": 2.0, "y": 3 },
-        { "label": "X", "x": 3.0, "y": 3 },
-        { "label": "C", "x": 4.0, "y": 3 },
-        { "label": "V", "x": 5.0, "y": 3 },
-        { "label": "B", "x": 6.0, "y": 3 },
-        { "label": "N", "x": 7.0, "y": 3 },
-        { "label": "M", "x": 8.0, "y": 3 },
-        { "label": "<", "x": 9.0, "y": 3 },
-        { "label": ">", "x": 10.0, "y": 3 },
-        { "label": "?", "x": 11.0, "y": 3 },
-        { "label": "Shift", "x": 12.0, "y": 3, "w": 1.0 },
-		{ "label": "Shift", "x": 13.0, "y": 3, "w": 1.0 },
-	    { "label": "Fn", "x": 14.0, "y": 3, "w": 1.0 },
+        { "label": "Shift", "x": 0, "y": 3, "w": 2 },
+        { "label": "Z", "x": 2, "y": 3 },
+        { "label": "X", "x": 3, "y": 3 },
+        { "label": "C", "x": 4, "y": 3 },
+        { "label": "V", "x": 5, "y": 3 },
+        { "label": "B", "x": 6, "y": 3 },
+        { "label": "N", "x": 7, "y": 3 },
+        { "label": "M", "x": 8, "y": 3 },
+        { "label": "<", "x": 9, "y": 3 },
+        { "label": ">", "x": 10, "y": 3 },
+        { "label": "?", "x": 11, "y": 3 },
+        { "label": "Shift", "x": 12, "y": 3, "w": 1 },
+		{ "label": "Shift", "x": 13, "y": 3, "w": 1 },
+	    { "label": "Fn", "x": 14, "y": 3, "w": 1 },
         { "label": "L", "x": 1.25, "y": 4 , "w": 1.25},
         { "label": "L", "x": 2.5, "y": 4, "w": 1.25 },
         { "x": 3.75, "y": 4, "w": 6.25 },
diff --git a/keyboards/latincompass/latin60rgb/rules.mk b/keyboards/latincompass/latin60rgb/rules.mk
index fe9c141422..ea646d3d93 100644
--- a/keyboards/latincompass/latin60rgb/rules.mk
+++ b/keyboards/latincompass/latin60rgb/rules.mk
@@ -11,4 +11,3 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3733 
diff --git a/keyboards/latincompass/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h
index f55d3310c2..01a956c30c 100644
--- a/keyboards/latincompass/latin64ble/config.h
+++ b/keyboards/latincompass/latin64ble/config.h
@@ -15,15 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D6, D7, B5, B6 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6 }
-
-#define DIODE_DIRECTION ROW2COL
-
-
-#define RGB_DI_PIN B7
-
 #define RGBLED_NUM 2
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/latincompass/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json
index 935e788d96..06e1345ea2 100644
--- a/keyboards/latincompass/latin64ble/info.json
+++ b/keyboards/latincompass/latin64ble/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6C71",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6"],
+        "rows": ["D0", "D1", "D2", "D3", "D6", "D7", "B5", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/latincompass/latin64ble/latin64ble.c b/keyboards/latincompass/latin64ble/latin64ble.c
deleted file mode 100644
index 580f4da426..0000000000
--- a/keyboards/latincompass/latin64ble/latin64ble.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 latincompass
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "latin64ble.h"
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
index 3d04d581ce..1a6518c897 100644
--- a/keyboards/latincompass/latin6rgb/config.h
+++ b/keyboards/latincompass/latin6rgb/config.h
@@ -17,24 +17,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS {C7, C6 }
-#define MATRIX_COL_PINS {F7, F6, F5}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/latincompass/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/info.json
index 2ab390e119..dd7cfc232d 100644
--- a/keyboards/latincompass/latin6rgb/info.json
+++ b/keyboards/latincompass/latin6rgb/info.json
@@ -8,18 +8,27 @@
     "pid": "0x7C96",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5"],
+    "rows": ["C7", "C6"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "debounce": 3,
   "layouts": {
     "LAYOUT_numpad_2x3": {
       "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1}
       ]
     }
   }
diff --git a/keyboards/latincompass/latin6rgb/latin6rgb.c b/keyboards/latincompass/latin6rgb/latin6rgb.c
index cc10a7b334..b7c05dd4ad 100644
--- a/keyboards/latincompass/latin6rgb/latin6rgb.c
+++ b/keyboards/latincompass/latin6rgb/latin6rgb.c
@@ -13,7 +13,7 @@
   * You should have received a copy of the GNU General Public License 
   * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
   */ 
-#include "latin6rgb.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/latincompass/latin6rgb/latin6rgb.h b/keyboards/latincompass/latin6rgb/latin6rgb.h
deleted file mode 100644
index 6feae9493a..0000000000
--- a/keyboards/latincompass/latin6rgb/latin6rgb.h
+++ /dev/null
@@ -1,30 +0,0 @@
- /* Copyright 2021 18438880
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_numpad_2x3( \
-    K00, K01, K02,\
-    K10, K11, K12 \
-) { \
-    { K00, K01, K02 }, \
-    { K10, K11, K12 }  \
-}
-
-#define LAYOUT_pad numpad_2x3
diff --git a/keyboards/latincompass/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk
index dc0e116999..f3108efe8b 100644
--- a/keyboards/latincompass/latin6rgb/rules.mk
+++ b/keyboards/latincompass/latin6rgb/rules.mk
@@ -14,6 +14,5 @@ AUDIO_ENABLE = no              # Audio output
 
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 
 RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/latincompass/latinpad/config.h b/keyboards/latincompass/latinpad/config.h
index bfbdf01cd7..d166baebc7 100644
--- a/keyboards/latincompass/latinpad/config.h
+++ b/keyboards/latincompass/latinpad/config.h
@@ -16,14 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6 }
-
-#define DIODE_DIRECTION ROW2COL
-
 #define SSD1306OLED
-#define RGB_DI_PIN D3
 
 #define RGBLED_NUM 18
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/latincompass/latinpad/info.json b/keyboards/latincompass/latinpad/info.json
index b2f4199dfd..6a7e0bd57f 100644
--- a/keyboards/latincompass/latinpad/info.json
+++ b/keyboards/latincompass/latinpad/info.json
@@ -8,37 +8,51 @@
         "pid": "0x6C70",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B2"},
             {"pin_a": "B5", "pin_b": "B6"}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
 
         "LAYOUT": {
             "layout": [
-                {"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8},
-                {"label":"/", "x":0.8, "y":0, "w":0.8, "h":0.8},
+                {"matrix": [4, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
+                {"matrix": [4, 1], "x": 0.8, "y": 0, "w": 0.8, "h": 0.8},
+
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [0, 3], "x": 3, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 3},
 
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
-                {"label":"+", "x":3, "y":1},
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"+", "x":3, "y":2},
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3},
-                {"label":"Enter", "x":3, "y":3},
-                {"label":"0", "x":0, "y":4},
-                {"label":"0", "x":1, "y":4},
-                {"label":".", "x":2, "y":4},
-                {"label":"Enter", "x":3, "y":4}
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 4}
             ]
         }
     }
diff --git a/keyboards/latincompass/latinpad/latinpad.c b/keyboards/latincompass/latinpad/latinpad.c
index 51826bd6a0..b476b4c238 100644
--- a/keyboards/latincompass/latinpad/latinpad.c
+++ b/keyboards/latincompass/latinpad/latinpad.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "latinpad.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/latincompass/latinpad/latinpad.h b/keyboards/latincompass/latinpad/latinpad.h
deleted file mode 100644
index a2c275aec3..0000000000
--- a/keyboards/latincompass/latinpad/latinpad.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 latincompass
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-    K40, K41,           \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) \
-{ \
-    { K00,   K01,   K02,   K03   }, \
-    { K10,   K11,   K12,   K13   }, \
-    { K20,   K21,   K22,   K23   }, \
-    { K30,   K31,   K32,   K33   }, \
-    { K40,   K41,   KC_NO, KC_NO }  \
-}
diff --git a/keyboards/latincompass/latinpad/rules.mk b/keyboards/latincompass/latinpad/rules.mk
index 7583158b92..4d41664e3c 100644
--- a/keyboards/latincompass/latinpad/rules.mk
+++ b/keyboards/latincompass/latinpad/rules.mk
@@ -14,4 +14,3 @@ OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
index fe0ab9999b..56c80f7295 100644
--- a/keyboards/latincompass/latinpadble/config.h
+++ b/keyboards/latincompass/latinpadble/config.h
@@ -21,13 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 // #define NO_ACTION_TAPPING
 // #define NO_ACTION_ONESHOT
 
-#define MATRIX_ROW_PINS { F0, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { D6, D7, B5, B6 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN B7
-
 #define RGBLED_NUM 4
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/latincompass/latinpadble/info.json b/keyboards/latincompass/latinpadble/info.json
index 266f09d8a0..19b0604f80 100644
--- a/keyboards/latincompass/latinpadble/info.json
+++ b/keyboards/latincompass/latinpadble/info.json
@@ -8,11 +8,19 @@
         "pid": "0x7C98",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B5", "B6"],
+        "rows": ["F0", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "C7", "pin_b": "F7"}
         ]
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/latincompass/latinpadble/latinpadble.c b/keyboards/latincompass/latinpadble/latinpadble.c
index cce96241b6..a6cd6784e1 100644
--- a/keyboards/latincompass/latinpadble/latinpadble.c
+++ b/keyboards/latincompass/latinpadble/latinpadble.c
@@ -14,13 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "latinpadble.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (clockwise) {
-        tap_code(KC_PGDN);
-    } else {
-        tap_code(KC_PGUP);
-    }
-    return true;
-}
diff --git a/keyboards/lazydesigners/bolt/bolt.c b/keyboards/lazydesigners/bolt/bolt.c
deleted file mode 100644
index 074d6bfd5a..0000000000
--- a/keyboards/lazydesigners/bolt/bolt.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "bolt.h"
diff --git a/keyboards/lazydesigners/bolt/config.h b/keyboards/lazydesigners/bolt/config.h
index 380b5575e9..218631d1d5 100644
--- a/keyboards/lazydesigners/bolt/config.h
+++ b/keyboards/lazydesigners/bolt/config.h
@@ -17,15 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, C7, B6, D5 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C6, B3, B7, D0, D3, D2, D1 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* RBG underglow */
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	/* #define RGBLIGHT_HUE_STEP 8 */
 	/* #define RGBLIGHT_SAT_STEP 8 */
 	/* #define RGBLIGHT_VAL_STEP 8 */
-#endif
diff --git a/keyboards/lazydesigners/bolt/info.json b/keyboards/lazydesigners/bolt/info.json
index 98874151a8..4a6755f5d5 100644
--- a/keyboards/lazydesigners/bolt/info.json
+++ b/keyboards/lazydesigners/bolt/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0041",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "F7", "C6", "B3", "B7", "D0", "D3", "D2", "D1"],
+        "rows": ["F0", "C7", "B6", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/lazydesigners/cassette8/cassette8.c b/keyboards/lazydesigners/cassette8/cassette8.c
deleted file mode 100755
index a36de6d7a6..0000000000
--- a/keyboards/lazydesigners/cassette8/cassette8.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 LAZYDESIGNERS
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#include "cassette8.h"
diff --git a/keyboards/lazydesigners/cassette8/cassette8.h b/keyboards/lazydesigners/cassette8/cassette8.h
deleted file mode 100755
index 9b640638f6..0000000000
--- a/keyboards/lazydesigners/cassette8/cassette8.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 LAZYDESIGNERS
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT( \
-    K00, K01, K02, K03,   \
-    K10, K11, K12, K13    \
-) { \
-    { K00,   K01,   K02,   K03,   }, \
-    { K10,   K11,   K12,   K13    }, \
-}
diff --git a/keyboards/lazydesigners/cassette8/config.h b/keyboards/lazydesigners/cassette8/config.h
index 8992272f7b..23284233ef 100755
--- a/keyboards/lazydesigners/cassette8/config.h
+++ b/keyboards/lazydesigners/cassette8/config.h
@@ -16,17 +16,7 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B2 }
-#define MATRIX_COL_PINS { B5, B4, B1, B0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RBG underglow */
-#define RGB_DI_PIN C2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -42,5 +32,3 @@
 	/* #define RGBLIGHT_HUE_STEP 8 */
 	/* #define RGBLIGHT_SAT_STEP 8 */
 	/* #define RGBLIGHT_VAL_STEP 8 */
-#endif
-
diff --git a/keyboards/lazydesigners/cassette8/info.json b/keyboards/lazydesigners/cassette8/info.json
index fd2733321b..d01080fabf 100755
--- a/keyboards/lazydesigners/cassette8/info.json
+++ b/keyboards/lazydesigners/cassette8/info.json
@@ -8,19 +8,28 @@
         "pid": "0x0008",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C2"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "B1", "B0"],
+        "rows": ["B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1", "x":0, "y":0},
-                {"label":"2", "x":1, "y":0},
-                {"label":"3", "x":2, "y":0},
-                {"label":"4", "x":3, "y":0},
-                {"label":"5", "x":0, "y":1},
-                {"label":"6", "x":1, "y":1},
-                {"label":"7", "x":2, "y":1},
-                {"label":"8", "x":3, "y":1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1}
             ]
         }
     }
diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h
index 1f625bafb8..0dc7502eac 100644
--- a/keyboards/lazydesigners/dimple/config.h
+++ b/keyboards/lazydesigners/dimple/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -32,8 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* RBG underglow */
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,4 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	/* #define RGBLIGHT_HUE_STEP 8 */
 	/* #define RGBLIGHT_SAT_STEP 8 */
 	/* #define RGBLIGHT_VAL_STEP 8 */
-#endif
diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json
index 5bd57ed1b7..a5fc41c143 100644
--- a/keyboards/lazydesigners/dimple/ortho/info.json
+++ b/keyboards/lazydesigners/dimple/ortho/info.json
@@ -8,151 +8,168 @@
         "pid": "0x0040",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_2u": {
             "layout": [
-              {"label":"Esc", "x":0, "y":0, "w":1.25},
-              {"label":"Q", "x":1.25, "y":0},
-              {"label":"W", "x":2.25, "y":0},
-              {"label":"E", "x":3.25, "y":0},
-              {"label":"R", "x":4.25, "y":0},
-              {"label":"T", "x":5.25, "y":0},
-              {"label":"Y", "x":6.25, "y":0},
-              {"label":"U", "x":7.25, "y":0},
-              {"label":"I", "x":8.25, "y":0},
-              {"label":"O", "x":9.25, "y":0},
-              {"label":"P", "x":10.25, "y":0},
-              {"label":"BackSpace", "x":11.25, "y":0, "w":1.25},
-              {"label":"Tab", "x":0, "y":1, "w":1.25},
-              {"label":"A", "x":1.25, "y":1},
-              {"label":"S", "x":2.25, "y":1},
-              {"label":"D", "x":3.25, "y":1},
-              {"label":"F", "x":4.25, "y":1},
-              {"label":"G", "x":5.25, "y":1},
-              {"label":"H", "x":6.25, "y":1},
-              {"label":"J", "x":7.25, "y":1},
-              {"label":"K", "x":8.25, "y":1},
-              {"label":"L", "x":9.25, "y":1},
-              {"label":"'", "x":10.25, "y":1},
-              {"label":"Enter", "x":11.25, "y":1, "w":1.25},
-              {"label":"Shift", "x":0, "y":2, "w":1.25},
-              {"label":"Z", "x":1.25, "y":2},
-              {"label":"X", "x":2.25, "y":2},
-              {"label":"C", "x":3.25, "y":2},
-              {"label":"V", "x":4.25, "y":2},
-              {"label":"B", "x":5.25, "y":2},
-              {"label":"N", "x":6.25, "y":2},
-              {"label":"M", "x":7.25, "y":2},
-              {"label":",", "x":8.25, "y":2},
-              {"label":".", "x":9.25, "y":2},
-              {"label":"Up", "x":10.25, "y":2},
-              {"label":"FN", "x":11.25, "y":2, "w":1.25},
-              {"label":"Ctrl", "x":0.75, "y":3},
-              {"label":"Gui", "x":1.75, "y":3},
-              {"label":"Alt", "x":2.75, "y":3},
-              {"label":"Space", "x":3.75, "y":3, "w":2},
-              {"label":"FN", "x":5.75, "y":3},
-              {"label":"Space", "x":6.75, "y":3, "w":2},
-              {"label":"Left", "x":8.75, "y":3},
-              {"label":"Down", "x":9.75, "y":3},
-              {"label":"Right", "x":10.75, "y":3}
-           ]
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"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": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3}
+            ]
         },
         "LAYOUT_ortho_3u": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0, "w":1.25},
-                {"label":"Q", "x":1.25, "y":0},
-                {"label":"W", "x":2.25, "y":0},
-                {"label":"E", "x":3.25, "y":0},
-                {"label":"R", "x":4.25, "y":0},
-                {"label":"T", "x":5.25, "y":0},
-                {"label":"Y", "x":6.25, "y":0},
-                {"label":"U", "x":7.25, "y":0},
-                {"label":"I", "x":8.25, "y":0},
-                {"label":"O", "x":9.25, "y":0},
-                {"label":"P", "x":10.25, "y":0},
-                {"label":"BackSpace", "x":11.25, "y":0, "w":1.25},
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":"'", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.25},
-                {"label":"Shift", "x":0, "y":2, "w":1.25},
-                {"label":"Z", "x":1.25, "y":2},
-                {"label":"X", "x":2.25, "y":2},
-                {"label":"C", "x":3.25, "y":2},
-                {"label":"V", "x":4.25, "y":2},
-                {"label":"B", "x":5.25, "y":2},
-                {"label":"N", "x":6.25, "y":2},
-                {"label":"M", "x":7.25, "y":2},
-                {"label":",", "x":8.25, "y":2},
-                {"label":".", "x":9.25, "y":2},
-                {"label":"Up", "x":10.25, "y":2},
-                {"label":"FN", "x":11.25, "y":2, "w":1.25},
-                {"label":"Ctrl", "x":0.75, "y":3},
-                {"label":"Gui", "x":1.75, "y":3},
-                {"label":"Alt", "x":2.75, "y":3},
-                {"label":"Raise", "x":3.75, "y":3},
-                {"label":"FN", "x":4.75, "y":3,"w":3},
-                {"label":"Lower", "x":7.75, "y":3},
-                {"label":"Left", "x":8.75, "y":3},
-                {"label":"Down", "x":9.75, "y":3},
-                {"label":"Right", "x":10.75, "y":3}
-           ]
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"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": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3}
+            ]
         },
         "LAYOUT_ortho_7u": {
             "layout": [
-                    {"label":"Esc", "x":0, "y":0, "w":1.25},
-                    {"label":"Q", "x":1.25, "y":0},
-                    {"label":"W", "x":2.25, "y":0},
-                    {"label":"E", "x":3.25, "y":0},
-                    {"label":"R", "x":4.25, "y":0},
-                    {"label":"T", "x":5.25, "y":0},
-                    {"label":"Y", "x":6.25, "y":0},
-                    {"label":"U", "x":7.25, "y":0},
-                    {"label":"I", "x":8.25, "y":0},
-                    {"label":"O", "x":9.25, "y":0},
-                    {"label":"P", "x":10.25, "y":0},
-                    {"label":"Back<br>Space", "x":11.25, "y":0, "w":1.25},
-                    {"label":"Tab", "x":0, "y":1, "w":1.25},
-                    {"label":"A", "x":1.25, "y":1},
-                    {"label":"S", "x":2.25, "y":1},
-                    {"label":"D", "x":3.25, "y":1},
-                    {"label":"F", "x":4.25, "y":1},
-                    {"label":"G", "x":5.25, "y":1},
-                    {"label":"H", "x":6.25, "y":1},
-                    {"label":"J", "x":7.25, "y":1},
-                    {"label":"K", "x":8.25, "y":1},
-                    {"label":"L", "x":9.25, "y":1},
-                    {"label":"'", "x":10.25, "y":1},
-                    {"label":"Enter", "x":11.25, "y":1, "w":1.25},
-                    {"label":"Shift", "x":0, "y":2, "w":1.25},
-                    {"label":"Z", "x":1.25, "y":2},
-                    {"label":"X", "x":2.25, "y":2},
-                    {"label":"C", "x":3.25, "y":2},
-                    {"label":"V", "x":4.25, "y":2},
-                    {"label":"B", "x":5.25, "y":2},
-                    {"label":"N", "x":6.25, "y":2},
-                    {"label":"M", "x":7.25, "y":2},
-                    {"label":",", "x":8.25, "y":2},
-                    {"label":".", "x":9.25, "y":2},
-                    {"label":"Up", "x":10.25, "y":2},
-                    {"label":"FN", "x":11.25, "y":2, "w":1.25},
-                    {"label":"Ctrl", "x":0.75, "y":3},
-                    {"label":"Gui", "x":1.75, "y":3},
-                    {"label":"Space", "x":2.75, "y":3, "w":7},
-                    {"label":"Down", "x":9.75, "y":3},
-                    {"label":"Right", "x":10.75, "y":3}
-           ]
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"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": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 5], "x": 2.75, "y": 3, "w": 7},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/lazydesigners/dimple/ortho/ortho.c b/keyboards/lazydesigners/dimple/ortho/ortho.c
deleted file mode 100644
index da76fde176..0000000000
--- a/keyboards/lazydesigners/dimple/ortho/ortho.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- Copyright 2021 LAZYDESIGNERS
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ortho.h"
diff --git a/keyboards/lazydesigners/dimple/ortho/ortho.h b/keyboards/lazydesigners/dimple/ortho/ortho.h
deleted file mode 100644
index 592cf47de3..0000000000
--- a/keyboards/lazydesigners/dimple/ortho/ortho.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- Copyright 2021 LAZYDESIGNERS
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/*
- *  ,-------------------------------------------------------------.
- *  |     |    |    |    |    |    |    |    |    |    |    |     |
- *  |-------------------------------------------------------------|
- *  |     |    |    |    |    |    |    |    |    |    |    |     |
- *  |-------------------------------------------------------------|
- *  |     |    |    |    |    |    |    |    |    |    |    |     |
- *  |-------------------------------------------------------------|
- *      |    |    |    |   2U    |    |    2U   |    |    |    |
- *      `------------------------------------------------------'
- */
-
-#define LAYOUT_ortho_2u( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309              \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
-}
-
-/*
- *  ,-------------------------------------------------------------.
- *  |     |    |    |    |    |    |    |    |    |    |    |     |
- *  |-------------------------------------------------------------|
- *  |     |    |    |    |    |    |    |    |    |    |    |     |
- *  |-------------------------------------------------------------|
- *  |     |    |    |    |    |    |    |    |    |    |    |     |
- *  |-------------------------------------------------------------|
- *      |    |    |    |    |      3U      |    |    |    |    |
- *      `------------------------------------------------------'
- */
-
-#define LAYOUT_ortho_3u( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309              \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211  }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
-}
-
-/*
- *  ,-------------------------------------------------------------.
- *  |     |    |    |    |    |    |    |    |    |    |    |     |
- *  |-------------------------------------------------------------|
- *  |     |    |    |    |    |    |    |    |    |    |    |     |
- *  |-------------------------------------------------------------|
- *  |     |    |    |    |    |    |    |    |    |    |    |     |
- *  |-------------------------------------------------------------|
- *      |    |    |               7U                 |    |    |
- *      `------------------------------------------------------'
- */
-
-#define LAYOUT_ortho_7u( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-	K300,       K302,             K305,             K308, K309              \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211  }, \
-	{ K300,  KC_NO, K302,  KC_NO, KC_NO, K305,  KC_NO, KC_NO, K308,  K309,  KC_NO, KC_NO }  \
-}
-
-
diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json
index 1161789c1e..a9b5b8751a 100644
--- a/keyboards/lazydesigners/dimple/staggered/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0040",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/lazydesigners/dimpleplus/config.h b/keyboards/lazydesigners/dimpleplus/config.h
index 9d8dca9693..828667122d 100644
--- a/keyboards/lazydesigners/dimpleplus/config.h
+++ b/keyboards/lazydesigners/dimpleplus/config.h
@@ -17,15 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B3, F0, E6, F4, F5 }
-#define MATRIX_COL_PINS { F1, D5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* RBG underglow */
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	/* #define RGBLIGHT_HUE_STEP 8 */
 	/* #define RGBLIGHT_SAT_STEP 8 */
 	/* #define RGBLIGHT_VAL_STEP 8 */
-#endif
diff --git a/keyboards/lazydesigners/dimpleplus/dimpleplus.c b/keyboards/lazydesigners/dimpleplus/dimpleplus.c
deleted file mode 100644
index 36eed8cc13..0000000000
--- a/keyboards/lazydesigners/dimpleplus/dimpleplus.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "dimpleplus.h"
diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json
index fd9b7bc44c..cf05ed2c9b 100644
--- a/keyboards/lazydesigners/dimpleplus/info.json
+++ b/keyboards/lazydesigners/dimpleplus/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0061",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "D5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B3", "F0", "E6", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
@@ -85,7 +93,7 @@
                 {"label":"K007 (B3,B5)", "x":7.5, "y":0},
                 {"label":"K008 (B3,B4)", "x":8.5, "y":0},
                 {"label":"K009 (B3,D7)", "x":9.5, "y":0},
-                {"label":"K010 (B3,D6)", "x":10.5, "y":0, "w":2.0},
+                {"label":"K010 (B3,D6)", "x":10.5, "y":0, "w":2},
                 {"label":"K100 (F0,F1)", "x":0, "y":1.25},
                 {"label":"K101 (F0,D5)", "x":1, "y":1.25},
                 {"label":"K102 (F0,F6)", "x":2, "y":1.25},
@@ -122,7 +130,7 @@
                 {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75},
                 {"label":"K400 (F5,F1)", "x":0.75, "y":4.25},
                 {"label":"K402 (F5,F6)", "x":1.75, "y":4.25},
-                {"label":"K404 (F5,C7)", "x":2.75, "y":4.25, "w":7.00},
+                {"label":"K404 (F5,C7)", "x":2.75, "y":4.25, "w":7},
                 {"label":"K408 (F5,B4)", "x":9.75, "y":4.25},
                 {"label":"K409 (F5,D7)", "x":10.75, "y":4.25}
             ]
diff --git a/keyboards/lazydesigners/the30/config.h b/keyboards/lazydesigners/the30/config.h
deleted file mode 100644
index fcb62244c4..0000000000
--- a/keyboards/lazydesigners/the30/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2019 Erovia
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2 }
-#define MATRIX_COL_PINS { B1, B2, B3, D4, D6, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/lazydesigners/the30/info.json b/keyboards/lazydesigners/the30/info.json
index 94d5067377..fab36b7f9c 100644
--- a/keyboards/lazydesigners/the30/info.json
+++ b/keyboards/lazydesigners/the30/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0030",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
@@ -17,36 +22,38 @@
     "layouts": {
         "LAYOUT_ortho_3x10": {
             "layout": [
-                {"label":"Q", "x":0, "y":0},
-                {"label":"W", "x":1, "y":0},
-                {"label":"E", "x":2, "y":0},
-                {"label":"R", "x":3, "y":0},
-                {"label":"T", "x":4, "y":0},
-                {"label":"Y", "x":5, "y":0},
-                {"label":"U", "x":6, "y":0},
-                {"label":"I", "x":7, "y":0},
-                {"label":"O", "x":8, "y":0},
-                {"label":"P", "x":9, "y":0},
-                {"label":"A", "x":0, "y":1},
-                {"label":"S", "x":1, "y":1},
-                {"label":"D", "x":2, "y":1},
-                {"label":"F", "x":3, "y":1},
-                {"label":"G", "x":4, "y":1},
-                {"label":"H", "x":5, "y":1},
-                {"label":"J", "x":6, "y":1},
-                {"label":"K", "x":7, "y":1},
-                {"label":"L", "x":8, "y":1},
-                {"label":"ENTER", "x":9, "y":1},
-                {"label":"Z", "x":0, "y":2},
-                {"label":"X", "x":1, "y":2},
-                {"label":"C", "x":2, "y":2},
-                {"label":"V", "x":3, "y":2},
-                {"label":"B", "x":4, "y":2},
-                {"label":"N", "x":5, "y":2},
-                {"label":"M", "x":6, "y":2},
-                {"label":",", "x":7, "y":2},
-                {"label":".", "x":8, "y":2},
-                {"label":"/", "x":9, "y":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2}
             ]
         }
     }
diff --git a/keyboards/lazydesigners/the30/the30.c b/keyboards/lazydesigners/the30/the30.c
deleted file mode 100644
index c41e16dc08..0000000000
--- a/keyboards/lazydesigners/the30/the30.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Erovia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "the30.h"
diff --git a/keyboards/lazydesigners/the30/the30.h b/keyboards/lazydesigners/the30/the30.h
deleted file mode 100644
index 82a6bf8ba5..0000000000
--- a/keyboards/lazydesigners/the30/the30.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 Erovia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/*
- *  ,-------------------------------------------------.
- *  |    |    |    |    |    |    |    |    |    |    |
- *  |-------------------------------------------------|
- *  |    |    |    |    |    |    |    |    |    |    |
- *  |-------------------------------------------------|
- *  |    |    |    |    |    |    |    |    |    |    |
- *  `-------------------------------------------------'
- */
-
-#define LAYOUT_ortho_3x10( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29   }, \
-}
diff --git a/keyboards/lazydesigners/the40/config.h b/keyboards/lazydesigners/the40/config.h
index 6f625c41bd..8a326c3ba0 100644
--- a/keyboards/lazydesigners/the40/config.h
+++ b/keyboards/lazydesigners/the40/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D0, D1, B6, F5 }
-#define MATRIX_COL_PINS { F4, F6, F7, B5, B4, D7, D6, D4, D5, D3, D2, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 8
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -40,4 +32,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/info.json
index 009e6fe006..78c020d65b 100644
--- a/keyboards/lazydesigners/the40/info.json
+++ b/keyboards/lazydesigners/the40/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0042",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F6", "F7", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B0"],
+        "rows": ["D0", "D1", "B6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/lazydesigners/the40/the40.c b/keyboards/lazydesigners/the40/the40.c
deleted file mode 100644
index cd1a22a9c3..0000000000
--- a/keyboards/lazydesigners/the40/the40.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- Copyright 2020 LAZYDESIGNERS
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "the40.h"
diff --git a/keyboards/lazydesigners/the50/config.h b/keyboards/lazydesigners/the50/config.h
index 96b226f6e8..366d9d3325 100644
--- a/keyboards/lazydesigners/the50/config.h
+++ b/keyboards/lazydesigners/the50/config.h
@@ -1,21 +1,10 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 1
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/info.json
index 9a54671b46..3b8f808e4d 100644
--- a/keyboards/lazydesigners/the50/info.json
+++ b/keyboards/lazydesigners/the50/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0050",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"],
+        "rows": ["B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 6
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/lazydesigners/the60/rev1/config.h b/keyboards/lazydesigners/the60/rev1/config.h
index 0845f9db63..5f36081323 100755
--- a/keyboards/lazydesigners/the60/rev1/config.h
+++ b/keyboards/lazydesigners/the60/rev1/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/lazydesigners/the60/rev1/info.json b/keyboards/lazydesigners/the60/rev1/info.json
index 179dd59895..7c1fa4883e 100755
--- a/keyboards/lazydesigners/the60/rev1/info.json
+++ b/keyboards/lazydesigners/the60/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 6
@@ -17,72 +22,77 @@
     "layouts": {
         "LAYOUT_split_spc_split_bspc": {
             "layout": [
-              {"label":"~", "x":0, "y":0},
-              {"label":"!", "x":1, "y":0},
-              {"label":"@", "x":2, "y":0},
-              {"label":"#", "x":3, "y":0},
-              {"label":"$", "x":4, "y":0},
-              {"label":"%", "x":5, "y":0},
-              {"label":"^", "x":6, "y":0},
-              {"label":"&", "x":7, "y":0},
-              {"label":"*", "x":8, "y":0},
-              {"label":"(", "x":9, "y":0},
-              {"label":")", "x":10, "y":0},
-              {"label":"_", "x":11, "y":0},
-              {"label":"+", "x":12, "y":0},
-              {"label":"Home", "x":13, "y":0},
-              {"label":"Del", "x":14, "y":0},
-              {"label":"Tab", "x":0, "y":1, "w":1.5},
-              {"label":"Q", "x":1.5, "y":1},
-              {"label":"W", "x":2.5, "y":1},
-              {"label":"E", "x":3.5, "y":1},
-              {"label":"R", "x":4.5, "y":1},
-              {"label":"T", "x":5.5, "y":1},
-              {"label":"Y", "x":6.5, "y":1},
-              {"label":"U", "x":7.5, "y":1},
-              {"label":"I", "x":8.5, "y":1},
-              {"label":"O", "x":9.5, "y":1},
-              {"label":"P", "x":10.5, "y":1},
-              {"label":"|", "x":11.5, "y":1, "w":1.5},
-              {"label":"}", "x":13, "y":1},
-              {"label":"{", "x":14, "y":1},
-              {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-              {"label":"A", "x":1.75, "y":2},
-              {"label":"S", "x":2.75, "y":2},
-              {"label":"D", "x":3.75, "y":2},
-              {"label":"F", "x":4.75, "y":2},
-              {"label":"G", "x":5.75, "y":2},
-              {"label":"H", "x":6.75, "y":2},
-              {"label":"J", "x":7.75, "y":2},
-              {"label":"K", "x":8.75, "y":2},
-              {"label":"L", "x":9.75, "y":2},
-              {"label":"Enter", "x":10.75, "y":2, "w":2.25},
-              {"label":":", "x":13, "y":2},
-              {"label":"\"", "x":14, "y":2},
-              {"label":"Shift", "x":0, "y":3, "w":2.25},
-              {"label":"Z", "x":2.25, "y":3},
-              {"label":"X", "x":3.25, "y":3},
-              {"label":"C", "x":4.25, "y":3},
-              {"label":"V", "x":5.25, "y":3},
-              {"label":"B", "x":6.25, "y":3},
-              {"label":"N", "x":7.25, "y":3},
-              {"label":"M", "x":8.25, "y":3},
-              {"label":"<", "x":9.25, "y":3},
-              {"label":">", "x":10.25, "y":3},
-              {"label":"Shift", "x":11.25, "y":3, "w":1.75},
-              {"label":"Up", "x":13, "y":3},
-              {"label":"/", "x":14, "y":3},
-              {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-              {"label":"Win", "x":1.25, "y":4, "w":1.25},
-              {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-              {"x":3.75, "y":4, "w":2.25},
-              {"x":6, "y":4, "w":2.75},
-              {"label":"Alt", "x":8.75, "y":4, "w":1.25},
-              {"label":"Menu", "x":10, "y":4},
-              {"label":"Fn", "x":11, "y":4},
-              {"label":"Left", "x":12, "y":4},
-              {"label":"Down", "x":13, "y":4},
-              {"label":"Right", "x":14, "y":4}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "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, 7], "x": 6, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 8.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/lazydesigners/the60/rev1/rev1.c b/keyboards/lazydesigners/the60/rev1/rev1.c
deleted file mode 100755
index 1b6fbd7c2d..0000000000
--- a/keyboards/lazydesigners/the60/rev1/rev1.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "rev1.h"
-
diff --git a/keyboards/lazydesigners/the60/rev1/rev1.h b/keyboards/lazydesigners/the60/rev1/rev1.h
deleted file mode 100755
index e3708461c4..0000000000
--- a/keyboards/lazydesigners/the60/rev1/rev1.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-/*
- *  ,--------------------------------------------------------------------------.
- *  |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |
- *  |--------------------------------------------------------------------------|
- *  |       |    |    |    |    |    |    |    |    |    |    |      |    |    |
- *  |--------------------------------------------------------------------------|
- *  |         |    |    |    |    |    |    |    |    |    |         |    |    |
- *  |--------------------------------------------------------------------------|
- *  |           |    |    |    |    |    |    |    |    |    |       |    |    |
- *  |--------------------------------------------------------------------------|
- *  |      |      |      |         |           |      |    |    |    |    |    |
- *  `--------------------------------------------------------------------------'
- */
-
-#define LAYOUT_split_spc_split_bspc( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-  K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-  K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
-  K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       \
-  K400,       K402, K403, K404,             K407,       K409, K410, K411, K412, K413, K414  \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-  { K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-  { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \
-  { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO }, \
-  { K400,  KC_NO, K402,  K403,  K404,  KC_NO, KC_NO, K407,  KC_NO, K409,  K410,  K411,  K412,  K413,  K414 }  \
-}
-
diff --git a/keyboards/lazydesigners/the60/rev2/config.h b/keyboards/lazydesigners/the60/rev2/config.h
index 11d38876d3..19bd7fbb1f 100755
--- a/keyboards/lazydesigners/the60/rev2/config.h
+++ b/keyboards/lazydesigners/the60/rev2/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 10
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -40,4 +32,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/lazydesigners/the60/rev2/info.json b/keyboards/lazydesigners/the60/rev2/info.json
index 355a8c7bc9..62eddefa13 100755
--- a/keyboards/lazydesigners/the60/rev2/info.json
+++ b/keyboards/lazydesigners/the60/rev2/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0062",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/lazydesigners/the60/rev2/rev2.c b/keyboards/lazydesigners/the60/rev2/rev2.c
deleted file mode 100755
index b1af81707d..0000000000
--- a/keyboards/lazydesigners/the60/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev2.h"
diff --git a/keyboards/leafcutterlabs/bigknob/config.h b/keyboards/leafcutterlabs/bigknob/config.h
index 3c6bf4e8a9..d8b9a4fa0b 100644
--- a/keyboards/leafcutterlabs/bigknob/config.h
+++ b/keyboards/leafcutterlabs/bigknob/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN C7 //D3 - underglow C7 - backlight
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/leafcutterlabs/bigknob/info.json b/keyboards/leafcutterlabs/bigknob/info.json
index 55d5fe13ee..bce699e5c7 100644
--- a/keyboards/leafcutterlabs/bigknob/info.json
+++ b/keyboards/leafcutterlabs/bigknob/info.json
@@ -13,6 +13,9 @@
       {"pin_a": "D0", "pin_b": "D2"}
     ]
   },
+  "ws2812": {
+    "pin": "C7"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "matrix_pins": {
diff --git a/keyboards/leeku/finger65/config.h b/keyboards/leeku/finger65/config.h
index 2b93c1276f..0626eb5d0e 100644
--- a/keyboards/leeku/finger65/config.h
+++ b/keyboards/leeku/finger65/config.h
@@ -19,8 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #define RGBLED_NUM 12
-
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_ROW_PINS { C3, C4, C5, C6, C7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/leeku/finger65/finger65.h b/keyboards/leeku/finger65/finger65.h
deleted file mode 100644
index 3d2ef2db45..0000000000
--- a/keyboards/leeku/finger65/finger65.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2018 Rasmus Schults <rasmusx@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N,      K3P, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N,      K2P, \
-    K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M,      K1O, K1P, \
-    K0A, K0B, K0C,           K0D, K0G, K0I,           K0J, K0M,      K0N, K0O, K0P  \
-) { \
-    { K4A, K4B, K4C, K4D, K4E,   K4F,   K4G, K4H,   K4I, K4J, K4K,   K4L,   K4M, K4N,   K4O,   K4P }, \
-    { K3A, K3B, K3C, K3D, K3E,   K3F,   K3G, K3H,   K3I, K3J, K3K,   K3L,   K3M, K3N,   KC_NO, K3P }, \
-    { K2A, K2B, K2C, K2D, K2E,   K2F,   K2G, K2H,   K2I, K2J, K2K,   K2L,   K2M, K2N,   KC_NO, K2P }, \
-    { K1A, K1B, K1C, K1D, K1E,   K1F,   K1G, K1H,   K1I, K1J, K1K,   K1L,   K1M, KC_NO, K1O,   K1P }, \
-    { K0A, K0B, K0C, K0D, KC_NO, KC_NO, K0G, KC_NO, K0I, K0J, KC_NO, KC_NO, K0M, K0N,   K0O,   K0P }  \
-}
-
-#define LAYOUT_65_ansi( \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M,      K4O, K4P, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N,      K3P, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L,      K2N,      K2P, \
-    K1A,      K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M,      K1O, K1P, \
-    K0A, K0B, K0C,                K0G,                K0J, K0M,      K0N, K0O, K0P  \
-) { \
-    { K4A, K4B,   K4C, K4D,   K4E,   K4F,   K4G, K4H,   K4I,   K4J, K4K,   K4L,   K4M,   KC_NO, K4O,   K4P }, \
-    { K3A, K3B,   K3C, K3D,   K3E,   K3F,   K3G, K3H,   K3I,   K3J, K3K,   K3L,   K3M,   K3N,   KC_NO, K3P }, \
-    { K2A, K2B,   K2C, K2D,   K2E,   K2F,   K2G, K2H,   K2I,   K2J, K2K,   K2L,   KC_NO, K2N,   KC_NO, K2P }, \
-    { K1A, KC_NO, K1C, K1D,   K1E,   K1F,   K1G, K1H,   K1I,   K1J, K1K,   K1L,   K1M,   KC_NO, K1O,   K1P }, \
-    { K0A, K0B,   K0C, KC_NO, KC_NO, KC_NO, K0G, KC_NO, KC_NO, K0J, KC_NO, KC_NO, K0M,   K0N,   K0O,   K0P }  \
-}
-
-#define LAYOUT_65_ansi_split_bs( \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N,      K3P, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L,      K2N,      K2P, \
-    K1A,      K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M,      K1O, K1P, \
-    K0A, K0B, K0C,                K0G,                K0J, K0M,      K0N, K0O, K0P  \
-) { \
-    { K4A, K4B,   K4C, K4D,   K4E,   K4F,   K4G, K4H,   K4I,   K4J, K4K,   K4L,   K4M,   K4N,   K4O,   K4P }, \
-    { K3A, K3B,   K3C, K3D,   K3E,   K3F,   K3G, K3H,   K3I,   K3J, K3K,   K3L,   K3M,   K3N,   KC_NO, K3P }, \
-    { K2A, K2B,   K2C, K2D,   K2E,   K2F,   K2G, K2H,   K2I,   K2J, K2K,   K2L,   KC_NO, K2N,   KC_NO, K2P }, \
-    { K1A, KC_NO, K1C, K1D,   K1E,   K1F,   K1G, K1H,   K1I,   K1J, K1K,   K1L,   K1M,   KC_NO, K1O,   K1P }, \
-    { K0A, K0B,   K0C, KC_NO, KC_NO, KC_NO, K0G, KC_NO, KC_NO, K0J, KC_NO, KC_NO, K0M,   K0N,   K0O,   K0P }  \
-}
diff --git a/keyboards/leeku/finger65/info.json b/keyboards/leeku/finger65/info.json
index beea79a539..ad158a1a64 100644
--- a/keyboards/leeku/finger65/info.json
+++ b/keyboards/leeku/finger65/info.json
@@ -8,1093 +8,243 @@
         "pid": "0x6050",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"],
+        "rows": ["C3", "C4", "C5", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "label": "K4A",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "K4B",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "K4C",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "K4D",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "K4E",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "K4F",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "K4G",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "K4H",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "K4I",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "K4J",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "K4K",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": "K4L",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "K4M",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "K4N",
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "label": "K4O",
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "label": "K4P",
-                    "x": 15,
-                    "y": 0
-                },
-                {
-                    "label": "K3A",
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "K3B",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3C",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3D",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3E",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3F",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3G",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3H",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3I",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3J",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3K",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3L",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3M",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3N",
-                    "x": 13.5,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "K3P",
-                    "x": 15,
-                    "y": 1
-                },
-                {
-                    "label": "K2A",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "K2B",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2C",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2E",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2F",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2G",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2H",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2I",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2J",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2K",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2L",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2M",
-                    "x": 12.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2N",
-                    "x": 13.75,
-                    "y": 2,
-                    "w": 1.25
-                },
-                {
-                    "label": "K2P",
-                    "x": 15,
-                    "y": 2
-                },
-                {
-                    "label": "K1A",
-                    "x": 0,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "K1B",
-                    "x": 1.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1C",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1D",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1E",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1F",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1G",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1H",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1I",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1J",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1K",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1L",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1M",
-                    "x": 12.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "K1O",
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "K1P",
-                    "x": 15,
-                    "y": 3
-                },
-                {
-                    "label": "K0A",
-                    "x": 0,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "K0B",
-                    "x": 1.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "K0C",
-                    "x": 2.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "K0D",
-                    "x": 3.75,
-                    "y": 4,
-                    "w": 2.25
-                },
-                {
-                    "label": "K0G",
-                    "x": 6,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "K0I",
-                    "x": 7.25,
-                    "y": 4,
-                    "w": 2.75
-                },
-                {
-                    "label": "K0J",
-                    "x": 10,
-                    "y": 4,
-                    "w": 1.5
-                },
-                {
-                    "label": "K0M",
-                    "x": 11.5,
-                    "y": 4,
-                    "w": 1.5
-                },
-                {
-                    "label": "K0N",
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "K0O",
-                    "x": 14,
-                    "y": 4
-                },
-                {
-                    "label": "K0P",
-                    "x": 15,
-                    "y": 4
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {
-                    "label": "K4A",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "K4B",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "K4C",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "K4D",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "K4E",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "K4F",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "K4G",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "K4H",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "K4I",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "K4J",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "K4K",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": "K4L",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "K4M",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "K4O",
-                    "x": 13,
-                    "y": 0,
-                    "w": 2
-                },
-                {
-                    "label": "K4P",
-                    "x": 15,
-                    "y": 0
-                },
-                {
-                    "label": "K3A",
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "K3B",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3C",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3D",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3E",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3F",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3G",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3H",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3I",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3J",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3K",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3L",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3M",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "K4N",
-                    "x": 13.5,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "K3P",
-                    "x": 15,
-                    "y": 1
-                },
-                {
-                    "label": "K2A",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "K2B",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2C",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2E",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2F",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2G",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2H",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2I",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2J",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2K",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2L",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2N",
-                    "x": 12.75,
-                    "y": 2,
-                    "w": 2.25
-                },
-                {
-                    "label": "K2P",
-                    "x": 15,
-                    "y": 2
-                },
-                {
-                    "label": "K1A",
-                    "x": 0,
-                    "y": 3,
-                    "w": 2.25
-                },
-                {
-                    "label": "K1B",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1C",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1D",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1E",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1F",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1G",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1H",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1J",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1K",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1L",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1M",
-                    "x": 12.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "K1O",
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "K1P",
-                    "x": 15,
-                    "y": 3
-                },
-                {
-                    "label": "K0A",
-                    "x": 0,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "K0B",
-                    "x": 1.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "K0C",
-                    "x": 2.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "K0G",
-                    "x": 3.75,
-                    "y": 4,
-                    "w": 6.25
-                },
-                {
-                    "label": "K0J",
-                    "x": 10,
-                    "y": 4,
-                    "w": 1.5
-                },
-                {
-                    "label": "K0M",
-                    "x": 11.5,
-                    "y": 4,
-                    "w": 1.5
-                },
-                {
-                    "label": "K0N",
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "K0O",
-                    "x": 14,
-                    "y": 4
-                },
-                {
-                    "label": "K0P",
-                    "x": 15,
-                    "y": 4
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 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, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {
-                    "label": "K4A",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "K4B",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "K4C",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "K4D",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "K4E",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "K4F",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "K4G",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "K4H",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "K4I",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "K4J",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "K4K",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": "K4L",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "K4M",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "K4N",
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "label": "K4O",
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "label": "K4P",
-                    "x": 15,
-                    "y": 0
-                },
-                {
-                    "label": "K3A",
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "K3B",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3C",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3D",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3E",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3F",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3G",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3H",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3I",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3J",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3K",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3L",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "K3M",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "K4N",
-                    "x": 13.5,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "K3P",
-                    "x": 15,
-                    "y": 1
-                },
-                {
-                    "label": "K2A",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "K2B",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2C",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2E",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2F",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2G",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2H",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2I",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2J",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2K",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2L",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "K2N",
-                    "x": 12.75,
-                    "y": 2,
-                    "w": 2.25
-                },
-                {
-                    "label": "K2P",
-                    "x": 15,
-                    "y": 2
-                },
-                {
-                    "label": "K1A",
-                    "x": 0,
-                    "y": 3,
-                    "w": 2.25
-                },
-                {
-                    "label": "K1B",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1C",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1D",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1E",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1F",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1G",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1H",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1J",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1K",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1L",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "K1M",
-                    "x": 12.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "K1O",
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "K1P",
-                    "x": 15,
-                    "y": 3
-                },
-                {
-                    "label": "K0A",
-                    "x": 0,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "K0B",
-                    "x": 1.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "K0C",
-                    "x": 2.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "K0G",
-                    "x": 3.75,
-                    "y": 4,
-                    "w": 6.25
-                },
-                {
-                    "label": "K0J",
-                    "x": 10,
-                    "y": 4,
-                    "w": 1.5
-                },
-                {
-                    "label": "K0M",
-                    "x": 11.5,
-                    "y": 4,
-                    "w": 1.5
-                },
-                {
-                    "label": "K0N",
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "K0O",
-                    "x": 14,
-                    "y": 4
-                },
-                {
-                    "label": "K0P",
-                    "x": 15,
-                    "y": 4
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/lefty/config.h b/keyboards/lefty/config.h
index 313e12eb2c..b1432e4d87 100644
--- a/keyboards/lefty/config.h
+++ b/keyboards/lefty/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins are in subfolders v1/v2 */
-
-/* Diode direction   */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/lefty/info.json b/keyboards/lefty/info.json
index ac48f157aa..b964980d7d 100644
--- a/keyboards/lefty/info.json
+++ b/keyboards/lefty/info.json
@@ -13,38 +13,42 @@
   "layouts": {
     "LAYOUT_all": {
         "layout": [
-          {"label":"F1", "x":0.5, "y":0},
-          {"label":"Escape", "x":2, "y":0},
-          {"label":"1", "x":3, "y":0},
-          {"label":"2", "x":4, "y":0},
-          {"label":"3", "x":5, "y":0},
-          {"label":"4", "x":6, "y":0},
-          {"label":"5", "x":7, "y":0},
-          {"label":"6", "x":8, "y":0},
-          {"label":"F2", "x":0.25, "y":1},
-          {"label":"Tab", "x":1.75, "y":1, "w":1.5},
-          {"label":"Q", "x":3.25, "y":1},
-          {"label":"W", "x":4.25, "y":1},
-          {"label":"E", "x":5.25, "y":1},
-          {"label":"R", "x":6.25, "y":1},
-          {"label":"T", "x":7.25, "y":1},
-          {"label":"F3", "x":0, "y":2},
-          {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
-          {"label":"A", "x":3.25, "y":2},
-          {"label":"S", "x":4.25, "y":2},
-          {"label":"D", "x":5.25, "y":2},
-          {"label":"F", "x":6.25, "y":2},
-          {"label":"G", "x":7.25, "y":2},
-          {"label":"Shift", "x":1.25, "y":3, "w":2.25},
-          {"label":"Z", "x":3.5, "y":3},
-          {"label":"X", "x":4.5, "y":3},
-          {"label":"C", "x":5.5, "y":3},
-          {"label":"V", "x":6.5, "y":3},
-          {"label":"B", "x":7.5, "y":3},
-          {"label":"Control", "x":1.25, "y":4, "w":1.25},
-          {"label":"Alt", "x":4.5, "y":4, "w":1.25},
-          {"label":"Layer2", "x":5.75, "y":4, "w":2},
-          {"label":"Layer3", "x":7.75, "y":4, "w":1.25}
+            {"matrix": [0, 0], "x": 0.5, "y": 0},
+            {"matrix": [0, 1], "x": 2, "y": 0},
+            {"matrix": [0, 2], "x": 3, "y": 0},
+            {"matrix": [0, 3], "x": 4, "y": 0},
+            {"matrix": [0, 4], "x": 5, "y": 0},
+            {"matrix": [0, 5], "x": 6, "y": 0},
+            {"matrix": [0, 6], "x": 7, "y": 0},
+            {"matrix": [0, 7], "x": 8, "y": 0},
+
+            {"matrix": [1, 0], "x": 0.25, "y": 1},
+            {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+            {"matrix": [1, 2], "x": 3.25, "y": 1},
+            {"matrix": [1, 3], "x": 4.25, "y": 1},
+            {"matrix": [1, 4], "x": 5.25, "y": 1},
+            {"matrix": [1, 5], "x": 6.25, "y": 1},
+            {"matrix": [1, 6], "x": 7.25, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+            {"matrix": [2, 2], "x": 3.25, "y": 2},
+            {"matrix": [2, 3], "x": 4.25, "y": 2},
+            {"matrix": [2, 4], "x": 5.25, "y": 2},
+            {"matrix": [2, 5], "x": 6.25, "y": 2},
+            {"matrix": [2, 6], "x": 7.25, "y": 2},
+
+            {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+            {"matrix": [3, 2], "x": 3.5, "y": 3},
+            {"matrix": [3, 3], "x": 4.5, "y": 3},
+            {"matrix": [3, 4], "x": 5.5, "y": 3},
+            {"matrix": [3, 5], "x": 6.5, "y": 3},
+            {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+            {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+            {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+            {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2},
+            {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25}
       ]
     }
   }
diff --git a/keyboards/lefty/lefty.c b/keyboards/lefty/lefty.c
index a3e5301ea1..b1bea424b0 100644
--- a/keyboards/lefty/lefty.c
+++ b/keyboards/lefty/lefty.c
@@ -14,7 +14,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "lefty.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/lefty/lefty.h b/keyboards/lefty/lefty.h
deleted file mode 100644
index 2466552353..0000000000
--- a/keyboards/lefty/lefty.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-// keymap
-#define LAYOUT_all( \
-	K00, K01, K02, K03, K04, K05, K06, K07, \
-	K10, K11, K12, K13, K14, K15, K16,      \
-	K20, K21, K22, K23, K24, K25, K26,      \
-	     K31, K32, K33, K34, K35, K36,      \
-	     K41,      K43, K44,      K46  \
-) \
-{ \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO }, \
-	{ KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   KC_NO }, \
-	{ KC_NO, K41,   KC_NO, K43,   K44,   KC_NO, K46,   KC_NO }  \
-}
-
-#define LAYOUT LAYOUT
diff --git a/keyboards/lefty/rev1/config.h b/keyboards/lefty/rev1/config.h
deleted file mode 100644
index fa70eeb359..0000000000
--- a/keyboards/lefty/rev1/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* key matrix pins */
-
-#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
-#define MATRIX_COL_PINS { D4, B5, F5, F6, F7, B1, B3, F4 }
diff --git a/keyboards/lefty/rev1/info.json b/keyboards/lefty/rev1/info.json
new file mode 100644
index 0000000000..0a3e44c86f
--- /dev/null
+++ b/keyboards/lefty/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["D4", "B5", "F5", "F6", "F7", "B1", "B3", "F4"],
+        "rows": ["F0", "F1", "C7", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/lefty/rev1/rev1.c b/keyboards/lefty/rev1/rev1.c
deleted file mode 100644
index 81734fd7fc..0000000000
--- a/keyboards/lefty/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "lefty.h"
diff --git a/keyboards/lefty/rev2/config.h b/keyboards/lefty/rev2/config.h
deleted file mode 100644
index 8289418728..0000000000
--- a/keyboards/lefty/rev2/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B2, B6, D7, E6, B4 }
-#define MATRIX_COL_PINS { D4, B5, F5, F6, F7, B1, B3, F4 }
diff --git a/keyboards/lefty/rev2/info.json b/keyboards/lefty/rev2/info.json
new file mode 100644
index 0000000000..9b8578c0db
--- /dev/null
+++ b/keyboards/lefty/rev2/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["D4", "B5", "F5", "F6", "F7", "B1", "B3", "F4"],
+        "rows": ["B2", "B6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/lefty/rev2/rev2.c b/keyboards/lefty/rev2/rev2.c
deleted file mode 100644
index 81734fd7fc..0000000000
--- a/keyboards/lefty/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "lefty.h"
diff --git a/keyboards/lets_split/info.json b/keyboards/lets_split/info.json
index 81a0625726..a92a948abd 100644
--- a/keyboards/lets_split/info.json
+++ b/keyboards/lets_split/info.json
@@ -3,10 +3,5 @@
   "maintainer": "qmk",
   "processor": "atmega32u4",
   "bootloader": "caterina",
-  "community_layouts": ["ortho_4x12"],
-  "layouts": {
-    "LAYOUT": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
-    }
-  }
+  "community_layouts": ["ortho_4x12"]
 }
diff --git a/keyboards/lets_split/keymaps/DE_programming/rules.mk b/keyboards/lets_split/keymaps/DE_programming/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lets_split/keymaps/DE_programming/rules.mk
+++ /dev/null
diff --git a/keyboards/lets_split/keymaps/DE_simple/rules.mk b/keyboards/lets_split/keymaps/DE_simple/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lets_split/keymaps/DE_simple/rules.mk
+++ /dev/null
diff --git a/keyboards/lets_split/keymaps/adam/config.h b/keyboards/lets_split/keymaps/adam/config.h
index 826c381b32..9ba612359e 100644
--- a/keyboards/lets_split/keymaps/adam/config.h
+++ b/keyboards/lets_split/keymaps/adam/config.h
@@ -47,7 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #undef TAPPING_TERM
 #define TAPPING_TERM 200 //At 500 some bad logic takes hold
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 
 #endif
diff --git a/keyboards/lets_split/keymaps/poker/rules.mk b/keyboards/lets_split/keymaps/poker/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lets_split/keymaps/poker/rules.mk
+++ /dev/null
diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h
index 1a46cdf108..a54a63fd48 100644
--- a/keyboards/lets_split/keymaps/shaymdev/config.h
+++ b/keyboards/lets_split/keymaps/shaymdev/config.h
@@ -25,8 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define _MASTER_RIGHT
 // #define EE_HANDS
 
-#undef RGB_DI_PIN
-#define RGB_DI_PIN D3
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN D3
 #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -52,5 +52,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define COMBO_COUNT 1
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 220
diff --git a/keyboards/lets_split/keymaps/vim-mode/rules.mk b/keyboards/lets_split/keymaps/vim-mode/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lets_split/keymaps/vim-mode/rules.mk
+++ /dev/null
diff --git a/keyboards/lets_split/keymaps/waples/rules.mk b/keyboards/lets_split/keymaps/waples/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lets_split/keymaps/waples/rules.mk
+++ /dev/null
diff --git a/keyboards/lets_split/keymaps/zer09/config.h b/keyboards/lets_split/keymaps/zer09/config.h
index 36d94824d5..6cdb6dd8b4 100644
--- a/keyboards/lets_split/keymaps/zer09/config.h
+++ b/keyboards/lets_split/keymaps/zer09/config.h
@@ -45,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #undef RGBLED_NUM
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
 
 #define RGBLED_NUM 50
 #endif
diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c
index ee0c931be2..37e8b3ab9b 100644
--- a/keyboards/lets_split/lets_split.c
+++ b/keyboards/lets_split/lets_split.c
@@ -1,4 +1,4 @@
-#include "lets_split.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h
deleted file mode 100644
index 90290e586f..0000000000
--- a/keyboards/lets_split/lets_split.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_lets_split_rev1
-    #include "rev1.h"
-#elif KEYBOARD_lets_split_rev2
-    #include "rev2.h"
-#elif KEYBOARD_lets_split_sockets
-    #include "sockets.h"
-#endif
diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h
index 8c0f5cd3f6..a7b7c4843e 100644
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@@ -18,21 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { B5, B4, E6, D7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-// #define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 16    // Number of LEDs
 
 /*
diff --git a/keyboards/lets_split/rev1/info.json b/keyboards/lets_split/rev1/info.json
index 15821a6da0..3c9cea5e5e 100644
--- a/keyboards/lets_split/rev1/info.json
+++ b/keyboards/lets_split/rev1/info.json
@@ -6,7 +6,79 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["B5", "B4", "E6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [4, 0], "x": 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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "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": 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": 11, "y": 1},
+                {"matrix": [5, 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": [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": 11, "y": 2},
+                {"matrix": [6, 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": [7, 0], "x": 7, "y": 3},
+                {"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},
+                {"matrix": [7, 5], "x": 12, "y": 3}
+            ]
+        }
     }
 }
diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c
deleted file mode 100644
index 3caa114c22..0000000000
--- a/keyboards/lets_split/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lets_split.h"
diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h
deleted file mode 100644
index 6a65954f22..0000000000
--- a/keyboards/lets_split/rev1/rev1.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "lets_split.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-	L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-	L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-	L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-		{ R00, R01, R02, R03, R04, R05 }, \
-		{ R10, R11, R12, R13, R14, R15 }, \
-		{ R20, R21, R22, R23, R24, R25 }, \
-		{ R30, R31, R32, R33, R34, R35 } \
-	}
-
-#define LAYOUT_ortho_4x12 LAYOUT
diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h
index ed53eb4976..a30fed6078 100644
--- a/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/config.h
@@ -18,21 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/lets_split/rev2/info.json b/keyboards/lets_split/rev2/info.json
index 27d850be7e..0cbada3605 100644
--- a/keyboards/lets_split/rev2/info.json
+++ b/keyboards/lets_split/rev2/info.json
@@ -6,7 +6,20 @@
         "pid": "0x0002",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+        }
     }
 }
diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c
deleted file mode 100644
index 3caa114c22..0000000000
--- a/keyboards/lets_split/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lets_split.h"
diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h
index a1a3f00a0e..14db8b445b 100644
--- a/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "lets_split.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/lets_split/sockets/config.h b/keyboards/lets_split/sockets/config.h
index 1e4a438d2c..3655ec19c5 100644
--- a/keyboards/lets_split/sockets/config.h
+++ b/keyboards/lets_split/sockets/config.h
@@ -18,16 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { B1, B5, E6, B4 }
-#define MATRIX_COL_PINS { F4, F7, D7, B3, B2, B6}
-// #define MATRIX_COL_PINS { B6, B2, B3, D7, F7, F4} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D4
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 /* Audio settings */
diff --git a/keyboards/lets_split/sockets/info.json b/keyboards/lets_split/sockets/info.json
index a1e4efc410..7ff2deb91c 100644
--- a/keyboards/lets_split/sockets/info.json
+++ b/keyboards/lets_split/sockets/info.json
@@ -6,7 +6,20 @@
         "pid": "0x0BEE",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "D7", "B3", "B2", "B6"],
+        "rows": ["B1", "B5", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
+    },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+        }
     }
 }
diff --git a/keyboards/lets_split/sockets/sockets.c b/keyboards/lets_split/sockets/sockets.c
deleted file mode 100644
index 3caa114c22..0000000000
--- a/keyboards/lets_split/sockets/sockets.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lets_split.h"
diff --git a/keyboards/lets_split/sockets/sockets.h b/keyboards/lets_split/sockets/sockets.h
index a1a3f00a0e..14db8b445b 100644
--- a/keyboards/lets_split/sockets/sockets.h
+++ b/keyboards/lets_split/sockets/sockets.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "lets_split.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h
index a4b4d931c4..ae682e447f 100644
--- a/keyboards/lfkeyboards/lfk65_hs/config.h
+++ b/keyboards/lfkeyboards/lfk65_hs/config.h
@@ -1,14 +1,9 @@
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROW_PINS {B0, B3, B2, B1, F5}
-#define MATRIX_COL_PINS {E6, F4, B7, D5, D3, D2, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4}
 #define RGBLED_NUM 20     // Number of LEDs
 
 #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255}
 
-#define RGB_DI_PIN C7  // Have to set it to something to get the ws2812 code to compile
 #define RGBLED_NUM 20     // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/info.json
index a2aea08829..bc92cf80fc 100644
--- a/keyboards/lfkeyboards/lfk65_hs/info.json
+++ b/keyboards/lfkeyboards/lfk65_hs/info.json
@@ -8,13 +8,21 @@
     "pid": "0x6064",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["E6", "F4", "B7", "D5", "D3", "D2", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+    "rows": ["B0", "B3", "B2", "B1", "F5"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "levels": 8
   },
+  "ws2812": {
+    "pin": "C7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
-    "LAYOUT_all": {"layout":[{"label": "~","x": 0,"y": 0},{"label": "!","x": 1,"y": 0},{"label": "@","x": 2,"y": 0},{"label": "#","x": 3,"y": 0},{"label": "$","x": 4,"y": 0},{"label": "%","x": 5,"y": 0},{"label": "^","x": 6,"y": 0},{"label": "&","x": 7,"y": 0},{"label": "*","x": 8,"y": 0},{"label": "(","x": 9,"y": 0},{"label": ")","x": 10,"y": 0},{"label": "_","x": 11,"y": 0},{"label": "+","x": 12,"y": 0},{"label": "","x": 13,"y": 0,"w": 1},{"label": "","x": 14,"y": 0,"w": 1},{"label": "Home","x": 15,"y": 0},{"label": "Tab","x": 0,"y": 1,"w": 1.5},{"label": "Q","x": 1.5,"y": 1},{"label": "W","x": 2.5,"y": 1},{"label": "E","x": 3.5,"y": 1},{"label": "R","x": 4.5,"y": 1},{"label": "T","x": 5.5,"y": 1},{"label": "Y","x": 6.5,"y": 1},{"label": "U","x": 7.5,"y": 1},{"label": "I","x": 8.5,"y": 1},{"label": "O","x": 9.5,"y": 1},{"label": "P","x": 10.5,"y": 1},{"label": "{","x": 11.5,"y": 1},{"label": "}","x": 12.5,"y": 1},{"label": "|","x": 13.5,"y": 1,"w": 1.5},{"label": "Page Up","x": 15,"y": 1},{"label": "Caps Lock","x": 0,"y": 2,"w": 1.75},{"label": "A","x": 1.75,"y": 2},{"label": "S","x": 2.75,"y": 2},{"label": "D","x": 3.75,"y": 2},{"label": "F","x": 4.75,"y": 2},{"label": "G","x": 5.75,"y": 2},{"label": "H","x": 6.75,"y": 2},{"label": "J","x": 7.75,"y": 2},{"label": "K","x": 8.75,"y": 2},{"label": "L","x": 9.75,"y": 2},{"label": ":","x": 10.75,"y": 2},{"label": "\"","x": 11.75,"y": 2},{"label": "","x": 12.75,"y": 2},{"label": "Enter","x": 13.75,"y": 2,"w": 1.25},{"label": "Page Down","x": 15,"y": 2},{"label": "Shift","x": 0,"y": 3,"w": 1.25},{"label": "","x": 1.25,"y": 3},{"label": "Z","x": 2.25,"y": 3},{"label": "X","x": 3.25,"y": 3},{"label": "C","x": 4.25,"y": 3},{"label": "V","x": 5.25,"y": 3},{"label": "B","x": 6.25,"y": 3},{"label": "N","x": 7.25,"y": 3},{"label": "M","x": 8.25,"y": 3},{"label": "<","x": 9.25,"y": 3},{"label": ">","x": 10.25,"y": 3},{"label": "?","x": 11.25,"y": 3},{"label": "Shift","x": 12.25,"y": 3,"w": 1.75},{"label": "↑","x": 14,"y": 3},{"label": "End","x": 15,"y": 3},{"label": "Ctrl","x": 0,"y": 4,"w": 1.25},{"label": "Win","x": 1.25,"y": 4,"w": 1.25},{"label": "Alt","x": 2.5,"y": 4,"w": 1.25},{"x": 3.75,"y": 4,"w": 6.25},{"label": "Alt","x": 10,"y": 4},{"label": "Fn","x": 11,"y": 4},{"label": "Ctrl","x": 12,"y": 4},{"label": "�","x": 13,"y": 4},{"label": "↓","x": 14,"y": 4},{"label": "→","x": 15,"y": 4}]},
+    "LAYOUT_all": {"layout":[{"label": "~","x": 0,"y": 0},{"label": "!","x": 1,"y": 0},{"label": "@","x": 2,"y": 0},{"label": "#","x": 3,"y": 0},{"label": "$","x": 4,"y": 0},{"label": "%","x": 5,"y": 0},{"label": "^","x": 6,"y": 0},{"label": "&","x": 7,"y": 0},{"label": "*","x": 8,"y": 0},{"label": "(","x": 9,"y": 0},{"label": ")","x": 10,"y": 0},{"label": "_","x": 11,"y": 0},{"label": "+","x": 12,"y": 0},{"label": "","x": 13,"y": 0},{"label": "","x": 14,"y": 0},{"label": "Home","x": 15,"y": 0},{"label": "Tab","x": 0,"y": 1,"w": 1.5},{"label": "Q","x": 1.5,"y": 1},{"label": "W","x": 2.5,"y": 1},{"label": "E","x": 3.5,"y": 1},{"label": "R","x": 4.5,"y": 1},{"label": "T","x": 5.5,"y": 1},{"label": "Y","x": 6.5,"y": 1},{"label": "U","x": 7.5,"y": 1},{"label": "I","x": 8.5,"y": 1},{"label": "O","x": 9.5,"y": 1},{"label": "P","x": 10.5,"y": 1},{"label": "{","x": 11.5,"y": 1},{"label": "}","x": 12.5,"y": 1},{"label": "|","x": 13.5,"y": 1,"w": 1.5},{"label": "Page Up","x": 15,"y": 1},{"label": "Caps Lock","x": 0,"y": 2,"w": 1.75},{"label": "A","x": 1.75,"y": 2},{"label": "S","x": 2.75,"y": 2},{"label": "D","x": 3.75,"y": 2},{"label": "F","x": 4.75,"y": 2},{"label": "G","x": 5.75,"y": 2},{"label": "H","x": 6.75,"y": 2},{"label": "J","x": 7.75,"y": 2},{"label": "K","x": 8.75,"y": 2},{"label": "L","x": 9.75,"y": 2},{"label": ":","x": 10.75,"y": 2},{"label": "\"","x": 11.75,"y": 2},{"label": "","x": 12.75,"y": 2},{"label": "Enter","x": 13.75,"y": 2,"w": 1.25},{"label": "Page Down","x": 15,"y": 2},{"label": "Shift","x": 0,"y": 3,"w": 1.25},{"label": "","x": 1.25,"y": 3},{"label": "Z","x": 2.25,"y": 3},{"label": "X","x": 3.25,"y": 3},{"label": "C","x": 4.25,"y": 3},{"label": "V","x": 5.25,"y": 3},{"label": "B","x": 6.25,"y": 3},{"label": "N","x": 7.25,"y": 3},{"label": "M","x": 8.25,"y": 3},{"label": "<","x": 9.25,"y": 3},{"label": ">","x": 10.25,"y": 3},{"label": "?","x": 11.25,"y": 3},{"label": "Shift","x": 12.25,"y": 3,"w": 1.75},{"label": "↑","x": 14,"y": 3},{"label": "End","x": 15,"y": 3},{"label": "Ctrl","x": 0,"y": 4,"w": 1.25},{"label": "Win","x": 1.25,"y": 4,"w": 1.25},{"label": "Alt","x": 2.5,"y": 4,"w": 1.25},{"x": 3.75,"y": 4,"w": 6.25},{"label": "Alt","x": 10,"y": 4},{"label": "Fn","x": 11,"y": 4},{"label": "Ctrl","x": 12,"y": 4},{"label": "�","x": 13,"y": 4},{"label": "↓","x": 14,"y": 4},{"label": "→","x": 15,"y": 4}]},
     "LAYOUT_ansi": {"layout":[{"label": "~","x": 0,"y": 0},{"label": "!","x": 1,"y": 0},{"label": "@","x": 2,"y": 0},{"label": "#","x": 3,"y": 0},{"label": "$","x": 4,"y": 0},{"label": "%","x": 5,"y": 0},{"label": "^","x": 6,"y": 0},{"label": "&","x": 7,"y": 0},{"label": "*","x": 8,"y": 0},{"label": "(","x": 9,"y": 0},{"label": ")","x": 10,"y": 0},{"label": "_","x": 11,"y": 0},{"label": "+","x": 12,"y": 0},{"label": "Backspace","x": 13,"y": 0,"w": 2},{"label": "Home","x": 15,"y": 0},{"label": "Tab","x": 0,"y": 1,"w": 1.5},{"label": "Q","x": 1.5,"y": 1},{"label": "W","x": 2.5,"y": 1},{"label": "E","x": 3.5,"y": 1},{"label": "R","x": 4.5,"y": 1},{"label": "T","x": 5.5,"y": 1},{"label": "Y","x": 6.5,"y": 1},{"label": "U","x": 7.5,"y": 1},{"label": "I","x": 8.5,"y": 1},{"label": "O","x": 9.5,"y": 1},{"label": "P","x": 10.5,"y": 1},{"label": "{","x": 11.5,"y": 1},{"label": "}","x": 12.5,"y": 1},{"label": "|","x": 13.5,"y": 1,"w": 1.5},{"label": "Page Up","x": 15,"y": 1},{"label": "Caps Lock","x": 0,"y": 2,"w": 1.75},{"label": "A","x": 1.75,"y": 2},{"label": "S","x": 2.75,"y": 2},{"label": "D","x": 3.75,"y": 2},{"label": "F","x": 4.75,"y": 2},{"label": "G","x": 5.75,"y": 2},{"label": "H","x": 6.75,"y": 2},{"label": "J","x": 7.75,"y": 2},{"label": "K","x": 8.75,"y": 2},{"label": "L","x": 9.75,"y": 2},{"label": ":","x": 10.75,"y": 2},{"label": "\"","x": 11.75,"y": 2},{"label": "Enter","x": 12.75,"y": 2,"w": 2.25},{"label": "Page Down","x": 15,"y": 2},{"label": "Shift","x": 0,"y": 3,"w": 2.25},{"label": "Z","x": 2.25,"y": 3},{"label": "X","x": 3.25,"y": 3},{"label": "C","x": 4.25,"y": 3},{"label": "V","x": 5.25,"y": 3},{"label": "B","x": 6.25,"y": 3},{"label": "N","x": 7.25,"y": 3},{"label": "M","x": 8.25,"y": 3},{"label": "<","x": 9.25,"y": 3},{"label": ">","x": 10.25,"y": 3},{"label": "?","x": 11.25,"y": 3},{"label": "Shift","x": 12.25,"y": 3,"w": 1.75},{"label": "↑","x": 14,"y": 3},{"label": "End","x": 15,"y": 3},{"label": "Ctrl","x": 0,"y": 4,"w": 1.25},{"label": "Win","x": 1.25,"y": 4,"w": 1.25},{"label": "Alt","x": 2.5,"y": 4,"w": 1.25},{"x": 3.75,"y": 4,"w": 6.25},{"label": "Alt","x": 10,"y": 4},{"label": "Fn","x": 11,"y": 4},{"label": "Ctrl","x": 12,"y": 4},{"label": "�","x": 13,"y": 4},{"label": "↓","x": 14,"y": 4},{"label": "→","x": 15,"y": 4}]}
   }
 }
diff --git a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
index 3d273e8aec..47ad655ddc 100644
--- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
+++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
@@ -2,7 +2,6 @@
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
 #include "lfk65_hs.h"
-#include "keymap.h"
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record)
 {
diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h
index 3e88fe3d37..5748d29987 100644
--- a/keyboards/lfkeyboards/lfk78/config.h
+++ b/keyboards/lfkeyboards/lfk78/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_MAP { 8, 16, 40, 55, 70, 128, 200, 255 }
 
 #define TAPPING_TERM 200
@@ -28,8 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_PIN C6
 #define AUDIO_VOICES
 
-#define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_HUE_STEP 10
 #    define RGBLIGHT_SAT_STEP 17
 #    define RGBLIGHT_VAL_STEP 17
@@ -44,8 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
 
-#endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/lfkeyboards/lfk78/revb/config.h b/keyboards/lfkeyboards/lfk78/revb/config.h
index 8437f8efc0..377ea21123 100644
--- a/keyboards/lfkeyboards/lfk78/revb/config.h
+++ b/keyboards/lfkeyboards/lfk78/revb/config.h
@@ -1,16 +1,3 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { E6, F7, D2, D3, D4, D5, D6, D7 }
-
 #define RGBLED_NUM 31
diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/info.json
index 026ec0d0c5..cfc1baf28c 100644
--- a/keyboards/lfkeyboards/lfk78/revb/info.json
+++ b/keyboards/lfkeyboards/lfk78/revb/info.json
@@ -8,10 +8,18 @@
         "pid": "0x3738",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F7", "D2", "D3", "D4", "D5", "D6", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "driver": "custom",
         "levels": 8
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/lfkeyboards/lfk78/revb/revb.h b/keyboards/lfkeyboards/lfk78/revb/revb.h
index aa48c26ed4..d81a2363cd 100644
--- a/keyboards/lfkeyboards/lfk78/revb/revb.h
+++ b/keyboards/lfkeyboards/lfk78/revb/revb.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "lfk78.h"
+
 // readability
 #define XXX KC_NO
 
diff --git a/keyboards/lfkeyboards/lfk78/revc/config.h b/keyboards/lfkeyboards/lfk78/revc/config.h
index 46db66470b..78343dc888 100644
--- a/keyboards/lfkeyboards/lfk78/revc/config.h
+++ b/keyboards/lfkeyboards/lfk78/revc/config.h
@@ -1,16 +1,3 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D3, D4, D5, D6 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, E6, E7, F0, F1, F2, F3, C0, C1, C2, C3 }
-
 #define RGBLED_NUM 27
diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/info.json
index 8867f107e8..d1062dee05 100644
--- a/keyboards/lfkeyboards/lfk78/revc/info.json
+++ b/keyboards/lfkeyboards/lfk78/revc/info.json
@@ -8,10 +8,18 @@
         "pid": "0x3738",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "E6", "E7", "F0", "F1", "F2", "F3", "C0", "C1", "C2", "C3"],
+        "rows": ["D2", "D3", "D4", "D5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "driver": "custom",
         "levels": 8
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/lfkeyboards/lfk78/revc/revc.h b/keyboards/lfkeyboards/lfk78/revc/revc.h
index 6a9dd87bf9..e7ab930d2f 100644
--- a/keyboards/lfkeyboards/lfk78/revc/revc.h
+++ b/keyboards/lfkeyboards/lfk78/revc/revc.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "lfk78.h"
+
 // readability
 #define XXX KC_NO
 
diff --git a/keyboards/lfkeyboards/lfk78/revj/config.h b/keyboards/lfkeyboards/lfk78/revj/config.h
index 46db66470b..78343dc888 100644
--- a/keyboards/lfkeyboards/lfk78/revj/config.h
+++ b/keyboards/lfkeyboards/lfk78/revj/config.h
@@ -1,16 +1,3 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D3, D4, D5, D6 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, E6, E7, F0, F1, F2, F3, C0, C1, C2, C3 }
-
 #define RGBLED_NUM 27
diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/info.json
index 320e5f89ec..34c703f6a6 100644
--- a/keyboards/lfkeyboards/lfk78/revj/info.json
+++ b/keyboards/lfkeyboards/lfk78/revj/info.json
@@ -8,10 +8,18 @@
         "pid": "0x3738",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "E6", "E7", "F0", "F1", "F2", "F3", "C0", "C1", "C2", "C3"],
+        "rows": ["D2", "D3", "D4", "D5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "driver": "custom",
         "levels": 8
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "at90usb646",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/lfkeyboards/lfk78/revj/revj.h b/keyboards/lfkeyboards/lfk78/revj/revj.h
index 6a9dd87bf9..e7ab930d2f 100644
--- a/keyboards/lfkeyboards/lfk78/revj/revj.h
+++ b/keyboards/lfkeyboards/lfk78/revj/revj.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "lfk78.h"
+
 // readability
 #define XXX KC_NO
 
diff --git a/keyboards/lfkeyboards/lfk87/config.h b/keyboards/lfkeyboards/lfk87/config.h
index 3120a184e6..7d583ed3ea 100644
--- a/keyboards/lfkeyboards/lfk87/config.h
+++ b/keyboards/lfkeyboards/lfk87/config.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}
 
-#define RGB_DI_PIN F4  // Have to set it to something to get the ws2812 code to compile
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/lfkeyboards/lfk87/info.json b/keyboards/lfkeyboards/lfk87/info.json
index 9ba48f7b29..be984e0eea 100644
--- a/keyboards/lfkeyboards/lfk87/info.json
+++ b/keyboards/lfkeyboards/lfk87/info.json
@@ -12,6 +12,9 @@
     "driver": "custom",
     "levels": 10
   },
+  "ws2812": {
+    "pin": "F4"
+  },
   "community_layouts": ["tkl_ansi", "tkl_iso"],
   "layouts": {
     "LAYOUT_tkl_ansi": {
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c
index ce81aa7d27..58dcfde46d 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.c
+++ b/keyboards/lfkeyboards/lfk87/lfk87.c
@@ -3,7 +3,6 @@
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
 #include "lfk87.h"
-#include "keymap.h"
 #include "issi.h"
 #include "TWIlib.h"
 #include "lighting.h"
diff --git a/keyboards/lfkeyboards/lfkpad/config.h b/keyboards/lfkeyboards/lfkpad/config.h
index 8b94c56803..5393e47b39 100644
--- a/keyboards/lfkeyboards/lfkpad/config.h
+++ b/keyboards/lfkeyboards/lfkpad/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D5, F4, F6, F7, C7, C6 }
-#define MATRIX_COL_PINS { F1, F0, D4, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7  // Have to set it to something to get the ws2812 code to compile
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 28
 #    define RGBLIGHT_HUE_STEP 10
 #    define RGBLIGHT_SAT_STEP 17
@@ -51,8 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
 
-#endif
-
 #define TAPPING_TERM 200
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/lfkeyboards/lfkpad/info.json b/keyboards/lfkeyboards/lfkpad/info.json
index 86180fc6ca..d4abb0abdd 100644
--- a/keyboards/lfkeyboards/lfkpad/info.json
+++ b/keyboards/lfkeyboards/lfkpad/info.json
@@ -8,33 +8,46 @@
         "pid": "0x3231",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "D4", "D6"],
+        "rows": ["D5", "F4", "F6", "F7", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["numpad_6x4"],
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":2, "h":2},
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":0, "y":5, "w":2},
-                {"x":2, "y":5},
-                {"x":3, "y":4, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
             ]
         }
     }
diff --git a/keyboards/lfkeyboards/lfkpad/lfkpad.c b/keyboards/lfkeyboards/lfkpad/lfkpad.c
index fffa26ca3a..7d8dd865fb 100644
--- a/keyboards/lfkeyboards/lfkpad/lfkpad.c
+++ b/keyboards/lfkeyboards/lfkpad/lfkpad.c
@@ -1,5 +1,3 @@
-#include "lfkpad.h"
-
 #include "quantum.h"
 
 #include <avr/timer_avr.h>
diff --git a/keyboards/lfkeyboards/lfkpad/lfkpad.h b/keyboards/lfkeyboards/lfkpad/lfkpad.h
deleted file mode 100644
index 5ca8a3c50d..0000000000
--- a/keyboards/lfkeyboards/lfkpad/lfkpad.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_numpad_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k23, \
-    k40, k41, k42,      \
-    k50,      k52, k43  \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, ___ }, \
-    { k40, k41, k42, k43 }, \
-    { k50, ___, k52, ___ } \
-}
diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h
index 2d648c4e4d..c367ad95c3 100644
--- a/keyboards/lfkeyboards/mini1800/config.h
+++ b/keyboards/lfkeyboards/mini1800/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
-/* Matrix config */
-    #define MATRIX_ROW_PINS {D7, E1, F2, F0, F1}
-    #define MATRIX_COL_PINS {E6, E0, A3, A4, A5, A6, A7, C7, C5, C4, C3, C2, C1, C0, D6, A2, A1, A0, F3}
     #define RGBLED_NUM 26     // Number of LEDs
 
 #define AUDIO_VOICES
@@ -30,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}
 
-#define RGB_DI_PIN F4  // Have to set it to something to get the ws2812 code to compile
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/lfkeyboards/mini1800/info.json b/keyboards/lfkeyboards/mini1800/info.json
index 6b66ed9774..84fe6bd472 100644
--- a/keyboards/lfkeyboards/mini1800/info.json
+++ b/keyboards/lfkeyboards/mini1800/info.json
@@ -8,10 +8,18 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "E0", "A3", "A4", "A5", "A6", "A7", "C7", "C5", "C4", "C3", "C2", "C1", "C0", "D6", "A2", "A1", "A0", "F3"],
+        "rows": ["D7", "E1", "F2", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "driver": "custom",
         "levels": 10
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c
index f435f55677..adccd8c278 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.c
+++ b/keyboards/lfkeyboards/mini1800/mini1800.c
@@ -3,7 +3,6 @@
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
 #include "mini1800.h"
-#include "keymap.h"
 #include "issi.h"
 #include "TWIlib.h"
 #include "lighting.h"
diff --git a/keyboards/lfkeyboards/smk65/info.json b/keyboards/lfkeyboards/smk65/info.json
index c806a7414c..fa21398129 100644
--- a/keyboards/lfkeyboards/smk65/info.json
+++ b/keyboards/lfkeyboards/smk65/info.json
@@ -7,13 +7,5 @@
     "vid": "0x4C46",
     "device_version": "0.0.6"
   },
-  "community_layouts": ["65_ansi", "65_iso"],
-  "layouts": {
-    "LAYOUT_65_ansi": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
-    },
-    "LAYOUT_65_iso": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
-    }
-  }
+  "community_layouts": ["65_ansi", "65_iso"]
 }
diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h
index b746d90232..af7f6b17b8 100644
--- a/keyboards/lfkeyboards/smk65/revb/config.h
+++ b/keyboards/lfkeyboards/smk65/revb/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255}
 
-#define RGB_DI_PIN C7  // Have to set it to something to get the ws2812 code to compile
 #define RGBLED_NUM 20     // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/info.json
index 25cbf0f77a..57e53e809b 100644
--- a/keyboards/lfkeyboards/smk65/revb/info.json
+++ b/keyboards/lfkeyboards/smk65/revb/info.json
@@ -5,6 +5,244 @@
     "backlight": {
         "levels": 8
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "at90usb646",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [2, 13], "x": 14, "y": 4},
+                {"matrix": [3, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [2, 13], "x": 14, "y": 4},
+                {"matrix": [3, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 15], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 14], "x": 28, "y": 0},
+                {"matrix": [1, 15], "x": 29, "y": 0},
+
+                {"matrix": [2, 0], "x": 30, "y": 0},
+                {"matrix": [2, 1], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 14], "x": 42, "y": 0},
+                {"matrix": [2, 15], "x": 43, "y": 0},
+
+                {"matrix": [3, 0], "x": 44, "y": 0},
+                {"matrix": [3, 1], "x": 45, "y": 0},
+                {"matrix": [3, 2], "x": 46, "y": 0},
+                {"matrix": [3, 3], "x": 47, "y": 0},
+                {"matrix": [3, 4], "x": 48, "y": 0},
+                {"matrix": [3, 5], "x": 49, "y": 0},
+                {"matrix": [3, 6], "x": 50, "y": 0},
+                {"matrix": [3, 7], "x": 51, "y": 0},
+                {"matrix": [3, 8], "x": 52, "y": 0},
+                {"matrix": [3, 9], "x": 53, "y": 0},
+                {"matrix": [3, 10], "x": 54, "y": 0},
+                {"matrix": [3, 11], "x": 55, "y": 0},
+                {"matrix": [3, 12], "x": 56, "y": 0},
+                {"matrix": [3, 14], "x": 57, "y": 0},
+                {"matrix": [3, 15], "x": 58, "y": 0},
+
+                {"matrix": [4, 0], "x": 59, "y": 0},
+                {"matrix": [4, 1], "x": 60, "y": 0},
+                {"matrix": [4, 2], "x": 61, "y": 0},
+                {"matrix": [4, 6], "x": 62, "y": 0},
+                {"matrix": [4, 10], "x": 63, "y": 0},
+                {"matrix": [4, 11], "x": 64, "y": 0},
+                {"matrix": [4, 12], "x": 65, "y": 0},
+                {"matrix": [4, 13], "x": 66, "y": 0},
+                {"matrix": [2, 13], "x": 67, "y": 0},
+                {"matrix": [3, 13], "x": 68, "y": 0}
+            ]
+        }
+    }
 }
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c
index 858305244a..32dbce8fd5 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.c
+++ b/keyboards/lfkeyboards/smk65/revb/revb.c
@@ -15,8 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <avr/sfr_defs.h>
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
-#include "smk65.h"
-#include "keymap.h"
+#include "revb.h"
 #include "debug.h"
 #include "issi.h"
 #include "TWIlib.h"
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.h b/keyboards/lfkeyboards/smk65/revb/revb.h
index 28fed40aa2..6b63eb7944 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.h
+++ b/keyboards/lfkeyboards/smk65/revb/revb.h
@@ -39,67 +39,3 @@ extern const Layer_Info layer_info[];
 
 void reset_keyboard_kb(void);
 void click(uint16_t freq, uint16_t duration);
-
-// readability
-#define ___ KC_NO
-
-/* Vanilla Keymap */
-// This a shortcut to help you visually see your layout.
-/*
-* ,-------------------------------------------------------------------------------.
-* | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D |   1E    | 1G |
-* |-------------------------------------------------------------------------------|
-* | 21   | 22 |23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D |   2F   | 2G |
-* |-------------------------------------------------------------------------------|
-* | 31    | 32 |33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C |      3F    | 3G |
-* |-------------------------------------------------------------------------------|
-* | 41      | 42 |43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C |    4D    | 4F | 4G |
-* |-------------------------------------------------------------------------------|
-* | 51  |  52  | 53  |              57        | 5A | 5B | 5C | 5D |  5E | 3E | 4E |
-* `-------------------------------------------------------------------------------'
-*/
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_65_ansi( \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,         k1F, k1G, \
-    k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,       k2F, k2G, \
-    k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,           k3F, k3G, \
-    k41,      k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,         k4D, k4F, k4G, \
-    k51, k52, k53,              k57,                     k5B, k5C, k5D, k5E, k3E, k4E  \
-) { \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F, k1G }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G }, \
-    { k41, ___, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \
-    { k51, k52, k53, ___, ___, ___, k57, ___, ___, ___, k5B, k5C, k5D, k5E, ___, ___ }, \
-}
-
-#define LAYOUT_65_iso( \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,         k1F, k1G, \
-    k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,            k2G, \
-    k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3F, k2F, k3G, \
-    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,         k4D, k4F, k4G, \
-    k51, k52, k53,              k57,                     k5B, k5C, k5D, k5E, k3E, k4E  \
-) { \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F, k1G }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G }, \
-    { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \
-    { k51, k52, k53, ___, ___, ___, k57, ___, ___, ___, k5B, k5C, k5D, k5E, ___, ___ }, \
-}
-
-// TODO: remove backwards compatibility with previous keymaps
-#define LAYOUT LAYOUT_65_ansi
-#define LAYOUT_iso( \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,         k1E, k1G, \
-    k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,       k2F, k2G, \
-    k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,           k3F, k3G, \
-    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,         k4D, k4F, k4G, \
-    k51, k52, k53,              k57,                     k5B, k5C, k5D, k5E, k3E, k4E  \
-) { \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, ___, k1G }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G }, \
-    { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \
-    { k51, k52, k53, ___, ___, ___, k57, ___, ___, ___, k5B, k5C, k5D, k5E, ___, ___ }, \
-}
diff --git a/keyboards/lfkeyboards/smk65/revf/info.json b/keyboards/lfkeyboards/smk65/revf/info.json
index 685e550b42..4ab91ef7f6 100644
--- a/keyboards/lfkeyboards/smk65/revf/info.json
+++ b/keyboards/lfkeyboards/smk65/revf/info.json
@@ -3,5 +3,241 @@
         "pid": "0x565F"
     },
     "processor": "atmega32u4",
-    "bootloader": "halfkay"
+    "bootloader": "halfkay",
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [2, 13], "x": 14, "y": 4},
+                {"matrix": [3, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [2, 13], "x": 14, "y": 4},
+                {"matrix": [3, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 16, "y": 0},
+                {"matrix": [1, 1], "x": 17, "y": 0},
+                {"matrix": [1, 2], "x": 18, "y": 0},
+                {"matrix": [1, 3], "x": 19, "y": 0},
+                {"matrix": [1, 4], "x": 20, "y": 0},
+                {"matrix": [1, 5], "x": 21, "y": 0},
+                {"matrix": [1, 6], "x": 22, "y": 0},
+                {"matrix": [1, 7], "x": 23, "y": 0},
+                {"matrix": [1, 8], "x": 24, "y": 0},
+                {"matrix": [1, 9], "x": 25, "y": 0},
+                {"matrix": [1, 10], "x": 26, "y": 0},
+                {"matrix": [1, 11], "x": 27, "y": 0},
+                {"matrix": [1, 12], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 15], "x": 30, "y": 0},
+
+                {"matrix": [2, 0], "x": 31, "y": 0},
+                {"matrix": [2, 1], "x": 32, "y": 0},
+                {"matrix": [2, 2], "x": 33, "y": 0},
+                {"matrix": [2, 3], "x": 34, "y": 0},
+                {"matrix": [2, 4], "x": 35, "y": 0},
+                {"matrix": [2, 5], "x": 36, "y": 0},
+                {"matrix": [2, 6], "x": 37, "y": 0},
+                {"matrix": [2, 7], "x": 38, "y": 0},
+                {"matrix": [2, 8], "x": 39, "y": 0},
+                {"matrix": [2, 9], "x": 40, "y": 0},
+                {"matrix": [2, 10], "x": 41, "y": 0},
+                {"matrix": [2, 11], "x": 42, "y": 0},
+                {"matrix": [2, 12], "x": 43, "y": 0},
+                {"matrix": [2, 14], "x": 44, "y": 0},
+                {"matrix": [2, 15], "x": 45, "y": 0},
+
+                {"matrix": [3, 0], "x": 46, "y": 0},
+                {"matrix": [3, 1], "x": 47, "y": 0},
+                {"matrix": [3, 2], "x": 48, "y": 0},
+                {"matrix": [3, 3], "x": 49, "y": 0},
+                {"matrix": [3, 4], "x": 50, "y": 0},
+                {"matrix": [3, 5], "x": 51, "y": 0},
+                {"matrix": [3, 6], "x": 52, "y": 0},
+                {"matrix": [3, 7], "x": 53, "y": 0},
+                {"matrix": [3, 8], "x": 54, "y": 0},
+                {"matrix": [3, 9], "x": 55, "y": 0},
+                {"matrix": [3, 10], "x": 56, "y": 0},
+                {"matrix": [3, 11], "x": 57, "y": 0},
+                {"matrix": [3, 12], "x": 58, "y": 0},
+                {"matrix": [3, 14], "x": 59, "y": 0},
+                {"matrix": [3, 15], "x": 60, "y": 0},
+
+                {"matrix": [4, 0], "x": 61, "y": 0},
+                {"matrix": [4, 1], "x": 62, "y": 0},
+                {"matrix": [4, 2], "x": 63, "y": 0},
+                {"matrix": [4, 4], "x": 64, "y": 0},
+                {"matrix": [4, 6], "x": 65, "y": 0},
+                {"matrix": [4, 8], "x": 66, "y": 0},
+                {"matrix": [4, 10], "x": 67, "y": 0},
+                {"matrix": [4, 11], "x": 68, "y": 0},
+                {"matrix": [4, 12], "x": 69, "y": 0},
+                {"matrix": [4, 13], "x": 70, "y": 0},
+                {"matrix": [2, 13], "x": 71, "y": 0},
+                {"matrix": [3, 13], "x": 72, "y": 0}
+            ]
+        }
+    }
 }
diff --git a/keyboards/lfkeyboards/smk65/revf/revf.h b/keyboards/lfkeyboards/smk65/revf/revf.h
deleted file mode 100644
index 35238fdc78..0000000000
--- a/keyboards/lfkeyboards/smk65/revf/revf.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Copyright 2020 LFKeyboards
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define ___ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_65_ansi( \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,         k1F, k1G, \
-    k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,       k2F, k2G, \
-    k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,           k3F, k3G, \
-    k41,      k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,         k4D, k4F, k4G, \
-    k51, k52, k53,              k57,                     k5B, k5C, k5D, k5E, k3E, k4E  \
-) { \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F, k1G }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G }, \
-    { k41, ___, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \
-    { k51, k52, k53, ___, ___, ___, k57, ___, ___, ___, k5B, k5C, k5D, k5E, ___, ___ }, \
-}
-
-#define LAYOUT_65_iso( \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,         k1F, k1G, \
-    k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,            k2G, \
-    k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, k2F, k3G, \
-    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,         k4D, k4F, k4G, \
-    k51, k52, k53,              k57,                     k5B, k5C, k5D, k5E, k3E, k4E  \
-) { \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F, k1G }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, ___, k3G }, \
-    { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \
-    { k51, k52, k53, ___, ___, ___, k57, ___, ___, ___, k5B, k5C, k5D, k5E, ___, ___ }, \
-}
-
-#define LAYOUT_all( \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,    k1F, k1G, \
-    k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,       k2F, k2G, \
-    k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, k3F, k3G, \
-    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,         k4D, k4F, k4G, \
-    k51, k52, k53,         k55, k57, k59,                k5B, k5C, k5D, k5E, k3E, k4E  \
-) { \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G }, \
-    { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \
-    { k51, k52, k53, ___, k55, ___, k57, ___, k59, ___, k5B, k5C, k5D, k5E, ___, ___ }, \
-}
diff --git a/keyboards/lfkeyboards/smk65/smk65.h b/keyboards/lfkeyboards/smk65/smk65.h
deleted file mode 100644
index 534b763de6..0000000000
--- a/keyboards/lfkeyboards/smk65/smk65.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 LFKeyboards
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_lfkeyboards_smk65_revb
-    #include "revb.h"
-#elif KEYBOARD_lfkeyboards_smk65_revf
-    #include "revf.h"
-#endif
diff --git a/keyboards/lily58/config.h b/keyboards/lily58/config.h
index a67e22b876..553b738b48 100644
--- a/keyboards/lily58/config.h
+++ b/keyboards/lily58/config.h
@@ -18,7 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-
 // Use the lily version to get the Lily58 logo instead of the qmk logo
 #define OLED_FONT_H "lib/glcdfont_lily.c"
diff --git a/keyboards/lily58/glow_enc/config.h b/keyboards/lily58/glow_enc/config.h
index d89148dbbf..0f78f92d72 100644
--- a/keyboards/lily58/glow_enc/config.h
+++ b/keyboards/lily58/glow_enc/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-#define RGB_DI_PIN F4
-
 #define RGBLED_NUM 72    // Number of LEDs
 
 #define RGBLED_SPLIT { 36, 36 }
diff --git a/keyboards/lily58/glow_enc/glow_enc.c b/keyboards/lily58/glow_enc/glow_enc.c
deleted file mode 100644
index 57a0df93db..0000000000
--- a/keyboards/lily58/glow_enc/glow_enc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-Copyright 2020 Ben Roesner (keycapsss.com)
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "lily58.h"
-
diff --git a/keyboards/lily58/glow_enc/glow_enc.h b/keyboards/lily58/glow_enc/glow_enc.h
index f9cc1c26b8..2a81dc0027 100644
--- a/keyboards/lily58/glow_enc/glow_enc.h
+++ b/keyboards/lily58/glow_enc/glow_enc.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "lily58.h"
-
 #include "quantum.h"
 
 
diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json
index bc2eae23da..3f3e9e8e94 100644
--- a/keyboards/lily58/glow_enc/info.json
+++ b/keyboards/lily58/glow_enc/info.json
@@ -8,12 +8,23 @@
         "pid": "0x0059",
         "device_version": "1.0.0"
     },
+    "features": {
+        "encoder": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "D4"}
         ]
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "encoder": {
             "right": {
@@ -23,6 +34,9 @@
             }
         }
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/lily58/glow_enc/rules.mk b/keyboards/lily58/glow_enc/rules.mk
index 3d80190eb2..4da205a168 100644
--- a/keyboards/lily58/glow_enc/rules.mk
+++ b/keyboards/lily58/glow_enc/rules.mk
@@ -1,8 +1 @@
-ENCODER_ENABLE = yes       # ENables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB light
-LTO_ENABLE = yes 		   # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features
-BOOTMAGIC_ENABLE = no
-RGB_MATRIX_ENABLE = no     # Per key rgb leds
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
+LTO_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/hvp/config.h b/keyboards/lily58/keymaps/hvp/config.h
index 5699395f73..ec0960470a 100644
--- a/keyboards/lily58/keymaps/hvp/config.h
+++ b/keyboards/lily58/keymaps/hvp/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 150
 
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/lily58/keymaps/muppetjones/config.h b/keyboards/lily58/keymaps/muppetjones/config.h
index 283a4ed890..81bc728d5a 100644
--- a/keyboards/lily58/keymaps/muppetjones/config.h
+++ b/keyboards/lily58/keymaps/muppetjones/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Change "hold" time (default is 200 ms)
 #define TAPPING_TERM 200
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
 
diff --git a/keyboards/lily58/keymaps/muuko/config.h b/keyboards/lily58/keymaps/muuko/config.h
index 377ee816fe..5d833d34d0 100644
--- a/keyboards/lily58/keymaps/muuko/config.h
+++ b/keyboards/lily58/keymaps/muuko/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_MUSIC_MODE
 
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef TAPPING_TERM
 #undef TAPPING_TERM
diff --git a/keyboards/lily58/keymaps/narze/config.h b/keyboards/lily58/keymaps/narze/config.h
index a6fac1a58b..814338c18f 100644
--- a/keyboards/lily58/keymaps/narze/config.h
+++ b/keyboards/lily58/keymaps/narze/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define COMBO_TERM 20
 #define COMBO_COUNT 3
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 
 #define QUICK_TAP_TERM 0
diff --git a/keyboards/lily58/keymaps/niolang/config.h b/keyboards/lily58/keymaps/niolang/config.h
index 58ffd90e2f..dedefc2fcf 100644
--- a/keyboards/lily58/keymaps/niolang/config.h
+++ b/keyboards/lily58/keymaps/niolang/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-/* Necessary because of use fo tap dance for ç (leads to un wanted modifications after typing c if not) */
-#define IGNORE_MOD_TAP_INTERRUPT
-
 /* RGB light */
 #ifdef RGBLIGHT_ENABLE
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/lily58/lib/host_led_state_reader.c b/keyboards/lily58/lib/host_led_state_reader.c
index 6bdd4a5a9f..fbf9b99f70 100644
--- a/keyboards/lily58/lib/host_led_state_reader.c
+++ b/keyboards/lily58/lib/host_led_state_reader.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include "led.h"
 #include "host.h"
-#include "lily58.h"
 
 char host_led_state_str[24];
 
diff --git a/keyboards/lily58/lib/keylogger.c b/keyboards/lily58/lib/keylogger.c
index 2fc3e663ec..0d17e654f4 100644
--- a/keyboards/lily58/lib/keylogger.c
+++ b/keyboards/lily58/lib/keylogger.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include "action.h"
-#include "lily58.h"
 
 char keylog_str[24] = {};
 char keylogs_str[21] = {};
diff --git a/keyboards/lily58/lib/layer_state_reader.c b/keyboards/lily58/lib/layer_state_reader.c
index 868d8e5cb4..ffc2c4e2c6 100644
--- a/keyboards/lily58/lib/layer_state_reader.c
+++ b/keyboards/lily58/lib/layer_state_reader.c
@@ -1,7 +1,5 @@
-
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 #include <stdio.h>
-#include "lily58.h"
 
 #define L_BASE 0
 #define L_LOWER (1 << 1)
diff --git a/keyboards/lily58/lib/logo_reader.c b/keyboards/lily58/lib/logo_reader.c
index 9f8adb8466..039a538cc5 100644
--- a/keyboards/lily58/lib/logo_reader.c
+++ b/keyboards/lily58/lib/logo_reader.c
@@ -1,5 +1,3 @@
-#include "lily58.h"
-
 const char *read_logo(void) {
   static char logo[] = {
       0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
diff --git a/keyboards/lily58/lib/mode_icon_reader.c b/keyboards/lily58/lib/mode_icon_reader.c
index 27c6d92cd0..195ac71862 100644
--- a/keyboards/lily58/lib/mode_icon_reader.c
+++ b/keyboards/lily58/lib/mode_icon_reader.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <stdbool.h>
-#include "lily58.h"
 
 char mode_icon[24];
 
diff --git a/keyboards/lily58/lib/rgb_state_reader.c b/keyboards/lily58/lib/rgb_state_reader.c
index e0efe2e528..3d74fb45e4 100644
--- a/keyboards/lily58/lib/rgb_state_reader.c
+++ b/keyboards/lily58/lib/rgb_state_reader.c
@@ -1,6 +1,5 @@
 #ifdef RGBLIGHT_ENABLE
 
-#include QMK_KEYBOARD_H
 #include <stdio.h>
 
 extern rgblight_config_t rgblight_config;
diff --git a/keyboards/lily58/lib/timelogger.c b/keyboards/lily58/lib/timelogger.c
index b00c13cb0a..83fe9706dd 100644
--- a/keyboards/lily58/lib/timelogger.c
+++ b/keyboards/lily58/lib/timelogger.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include "timer.h"
-#include "lily58.h"
 
 char timelog_str[24] = {};
 int last_time = 0;
diff --git a/keyboards/lily58/light/config.h b/keyboards/lily58/light/config.h
index 3a0780e0a6..91934e61c0 100644
--- a/keyboards/lily58/light/config.h
+++ b/keyboards/lily58/light/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-#define RGB_DI_PIN D3
 #define RGBLED_SPLIT { 35, 35 }
 #define RGBLED_NUM 70
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json
index 82e9affbd0..4db30403f7 100644
--- a/keyboards/lily58/light/info.json
+++ b/keyboards/lily58/light/info.json
@@ -8,12 +8,24 @@
         "pid": "0x4C4C",
         "device_version": "1.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F4", "pin_b": "F5"}
         ]
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "encoder": {
             "right": {
@@ -23,6 +35,9 @@
             }
         }
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/lily58/light/light.c b/keyboards/lily58/light/light.c
deleted file mode 100644
index 57a0df93db..0000000000
--- a/keyboards/lily58/light/light.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-Copyright 2020 Ben Roesner (keycapsss.com)
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "lily58.h"
-
diff --git a/keyboards/lily58/light/light.h b/keyboards/lily58/light/light.h
index 833ad13d00..5d873e04cc 100644
--- a/keyboards/lily58/light/light.h
+++ b/keyboards/lily58/light/light.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "lily58.h"
-
 #include "quantum.h"
 
 
diff --git a/keyboards/lily58/light/rules.mk b/keyboards/lily58/light/rules.mk
index d4957d98e4..4da205a168 100644
--- a/keyboards/lily58/light/rules.mk
+++ b/keyboards/lily58/light/rules.mk
@@ -1,3 +1 @@
-ENCODER_ENABLE = yes       # ENables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB light
-LTO_ENABLE = yes 		   # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features
+LTO_ENABLE = yes
diff --git a/keyboards/lily58/lily58.c b/keyboards/lily58/lily58.c
deleted file mode 100644
index 6108d70b90..0000000000
--- a/keyboards/lily58/lily58.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lily58.h"
diff --git a/keyboards/lily58/lily58.h b/keyboards/lily58/lily58.h
deleted file mode 100644
index c082030032..0000000000
--- a/keyboards/lily58/lily58.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_lily58_rev1
-    #include "rev1.h"
-#elif KEYBOARD_lily58_light
-    #include "light.h"
-#elif KEYBOARD_lily58_glow_enc
-    #include "glow_enc.h"
-#endif
diff --git a/keyboards/lily58/r2g/config.h b/keyboards/lily58/r2g/config.h
index 9770e28a53..dc6cee3af7 100644
--- a/keyboards/lily58/r2g/config.h
+++ b/keyboards/lily58/r2g/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifdef RGB_MATRIX_ENABLE
-#   define RGB_DI_PIN D3
 #   define RGB_MATRIX_LED_COUNT 74
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED
 #   define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/lily58/r2g/info.json b/keyboards/lily58/r2g/info.json
index 909cc78f18..a5041a62a5 100644
--- a/keyboards/lily58/r2g/info.json
+++ b/keyboards/lily58/r2g/info.json
@@ -24,6 +24,9 @@
         "enabled": true,
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h
index 1e6d2d08fc..8e94f9f62b 100644
--- a/keyboards/lily58/rev1/config.h
+++ b/keyboards/lily58/rev1/config.h
@@ -19,12 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json
index 793386b664..4ce69ea5f5 100644
--- a/keyboards/lily58/rev1/info.json
+++ b/keyboards/lily58/rev1/info.json
@@ -8,9 +8,21 @@
         "pid": "0xEB2D",
         "device_version": "1.0.0"
     },
+    "features": {
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/lily58/rev1/rev1.c b/keyboards/lily58/rev1/rev1.c
deleted file mode 100644
index 6108d70b90..0000000000
--- a/keyboards/lily58/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lily58.h"
diff --git a/keyboards/lily58/rev1/rev1.h b/keyboards/lily58/rev1/rev1.h
index aa9f5727c2..436f4e710e 100644
--- a/keyboards/lily58/rev1/rev1.h
+++ b/keyboards/lily58/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "lily58.h"
-
 #include "quantum.h"
 
 #ifdef RGBLIGHT_ENABLE
@@ -9,14 +7,6 @@
 #include "ws2812.h"
 #endif
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #ifndef FLIP_HALF
 #define LAYOUT( \
 	L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05,  \
diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk
index 2fca52967d..76ce166170 100644
--- a/keyboards/lily58/rules.mk
+++ b/keyboards/lily58/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # OLED display
-SPLIT_KEYBOARD = yes
+OLED_DRIVER = SSD1306
 
 DEFAULT_FOLDER = lily58/rev1
diff --git a/keyboards/lime/lime.c b/keyboards/lime/lime.c
index 3f51811329..2a91587e57 100644
--- a/keyboards/lime/lime.c
+++ b/keyboards/lime/lime.c
@@ -1,4 +1,4 @@
-#include "lime.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 
diff --git a/keyboards/lime/lime.h b/keyboards/lime/lime.h
deleted file mode 100644
index 97cee454bc..0000000000
--- a/keyboards/lime/lime.h
+++ /dev/null
@@ -1,21 +0,0 @@
- /* Copyright 2021 HellSingCoder
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#pragma once
-
-#ifdef KEYBOARD_lime_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h
index 841a7bb764..6ecfdf3034 100644
--- a/keyboards/lime/rev1/config.h
+++ b/keyboards/lime/rev1/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 100
 
 /* joystick support */
diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json
index fb05828f6d..8fb3cb2f28 100644
--- a/keyboards/lime/rev1/info.json
+++ b/keyboards/lime/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2784",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
diff --git a/keyboards/lime/rev1/rev1.c b/keyboards/lime/rev1/rev1.c
index 4cc560623b..50c2e6dff6 100644
--- a/keyboards/lime/rev1/rev1.c
+++ b/keyboards/lime/rev1/rev1.c
@@ -14,7 +14,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
-#include "lime.h"
+#include "rev1.h"
 
 /* Encoders */
 #ifdef ENCODER_ENABLE
diff --git a/keyboards/linworks/dolice/config.h b/keyboards/linworks/dolice/config.h
index 394b953afb..446ade0fcc 100644
--- a/keyboards/linworks/dolice/config.h
+++ b/keyboards/linworks/dolice/config.h
@@ -17,9 +17,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Force USB NKRO */
 #define FORCE_NKRO
-
-#define MATRIX_ROW_PINS { F5, F4, F6, F7, B0, B7, D7, D6, D4 }
-#define MATRIX_COL_PINS { E6, F0, F1, B4, D5, D3, D2, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/linworks/dolice/dolice.c b/keyboards/linworks/dolice/dolice.c
deleted file mode 100644
index febac2099f..0000000000
--- a/keyboards/linworks/dolice/dolice.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dolice.h"
diff --git a/keyboards/linworks/dolice/dolice.h b/keyboards/linworks/dolice/dolice.h
deleted file mode 100644
index 22a9338cf3..0000000000
--- a/keyboards/linworks/dolice/dolice.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright 221 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice( \
-    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  \
-    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
-    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
-          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,  K77,  \
-          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
-) { \
-  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
-  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
-  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
-  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
-  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
-  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   KC_NO,  }, \
-  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
-  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   K77,    }, \
-  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
-}
-
-#define LAYOUT_alice_split_bs( \
-    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  K57,  \
-    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
-    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
-          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,  K77,  \
-          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
-) { \
-  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
-  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
-  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
-  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
-  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
-  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   K57,    }, \
-  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
-  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   K77,    }, \
-  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
-}
-
-#define LAYOUT_long_rshift( \
-    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  \
-    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
-    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
-          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,        \
-          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
-) { \
-  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
-  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
-  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
-  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
-  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
-  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   KC_NO,  }, \
-  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
-  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   KC_NO,  }, \
-  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
-}
-
-#define LAYOUT_long_rshift_split_bs( \
-    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  K57,  \
-    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
-    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
-          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,        \
-          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
-) { \
-  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
-  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
-  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
-  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
-  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
-  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   K57,    }, \
-  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
-  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   KC_NO,  }, \
-  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json
index 1db5f48470..ae201fd50e 100644
--- a/keyboards/linworks/dolice/info.json
+++ b/keyboards/linworks/dolice/info.json
@@ -7,6 +7,11 @@
       "pid": "0x0005",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["E6", "F0", "F1", "B4", "D5", "D3", "D2", "B2"],
+      "rows": ["F5", "F4", "F6", "F7", "B0", "B7", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "B5",
       "breathing": true
@@ -19,282 +24,329 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+        "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
       "LAYOUT_alice": {
         "layout": [
-          {"x":0, "y":0},
-          {"x":1.25, "y":0},
-          {"x":2.25, "y":0},
-          {"x":3.25, "y":0},
-          {"x":4.25, "y":0},
-          {"x":5.25, "y":0},
-          {"x":6.25, "y":0},
-          {"x":7.25, "y":0},
-          {"x":10.25, "y":0},
-          {"x":11.25, "y":0},
-          {"x":12.25, "y":0},
-          {"x":13.25, "y":0},
-          {"x":14.25, "y":0},
-          {"x":15.25, "y":0},
-          {"x":16.25, "y":0, "w": 2},
-          {"x":0, "y":1},
-          {"x":1.25, "y":1, "w":1.5},
-          {"x":2.75, "y":1},
-          {"x":3.75, "y":1},
-          {"x":4.75, "y":1},
-          {"x":5.75, "y":1},
-          {"x":6.75, "y":1},
-          {"x":9.75, "y":1},
-          {"x":10.75, "y":1},
-          {"x":11.75, "y":1},
-          {"x":12.75, "y":1},
-          {"x":13.75, "y":1},
-          {"x":14.75, "y":1},
-          {"x":15.75, "y":1},
-          {"x":16.75, "y":1, "w":1.5},
-          {"x":0, "y":2},
-          {"x":1.25, "y":2, "w":1.75},
-          {"x":3, "y":2},
-          {"x":4, "y":2},
-          {"x":5, "y":2},
-          {"x":6, "y":2},
-          {"x":7, "y":2},
-          {"x":10, "y":2},
-          {"x":11, "y":2},
-          {"x":12, "y":2},
-          {"x":13, "y":2},
-          {"x":14, "y":2},
-          {"x":15, "y":2},
-          {"x":16, "y":2, "w":2.25},
-          {"x":1.25, "y":3, "w":2.25},
-          {"x":3.5, "y":3},
-          {"x":4.5, "y":3},
-          {"x":5.5, "y":3},
-          {"x":6.5, "y":3},
-          {"x":7.5, "y":3},
-          {"x":9.5, "y":3},
-          {"x":10.5, "y":3},
-          {"x":11.5, "y":3},
-          {"x":12.5, "y":3},
-          {"x":13.5, "y":3},
-          {"x":14.5, "y":3},
-          {"x":15.5, "y":3, "w":1.75},
-          {"x":17.25, "y":3},
-          {"x":1.25, "y":4, "w":1.5},
-          {"x":4.25, "y":4, "w":1.5},
-          {"x":5.75, "y":4, "w":2},
-          {"x":7.75, "y":4, "w":1.25},
-          {"x":9.5, "y":4, "w":2.75},
-          {"x":12.25, "y":4, "w":1.5},
-          {"x":16.75, "y":4, "w":1.5}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+
+          {"matrix": [1, 0], "x": 1.25, "y": 0},
+          {"matrix": [0, 1], "x": 2.25, "y": 0},
+          {"matrix": [1, 1], "x": 3.25, "y": 0},
+          {"matrix": [0, 2], "x": 4.25, "y": 0},
+          {"matrix": [1, 2], "x": 5.25, "y": 0},
+          {"matrix": [0, 3], "x": 6.25, "y": 0},
+          {"matrix": [1, 3], "x": 7.25, "y": 0},
+
+          {"matrix": [1, 4], "x": 10.25, "y": 0},
+          {"matrix": [0, 5], "x": 11.25, "y": 0},
+          {"matrix": [1, 5], "x": 12.25, "y": 0},
+          {"matrix": [0, 6], "x": 13.25, "y": 0},
+          {"matrix": [1, 6], "x": 14.25, "y": 0},
+          {"matrix": [0, 7], "x": 15.25, "y": 0},
+          {"matrix": [1, 7], "x": 16.25, "y": 0, "w": 2},
+
+          {"matrix": [2, 0], "x": 0, "y": 1},
+
+          {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
+          {"matrix": [2, 1], "x": 2.75, "y": 1},
+          {"matrix": [2, 2], "x": 3.75, "y": 1},
+          {"matrix": [3, 2], "x": 4.75, "y": 1},
+          {"matrix": [2, 3], "x": 5.75, "y": 1},
+          {"matrix": [3, 3], "x": 6.75, "y": 1},
+
+          {"matrix": [2, 4], "x": 9.75, "y": 1},
+          {"matrix": [3, 4], "x": 10.75, "y": 1},
+          {"matrix": [2, 5], "x": 11.75, "y": 1},
+          {"matrix": [3, 5], "x": 12.75, "y": 1},
+          {"matrix": [2, 6], "x": 13.75, "y": 1},
+          {"matrix": [3, 6], "x": 14.75, "y": 1},
+          {"matrix": [2, 7], "x": 15.75, "y": 1},
+          {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+          {"matrix": [4, 0], "x": 0, "y": 2},
+
+          {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+          {"matrix": [4, 1], "x": 3, "y": 2},
+          {"matrix": [4, 2], "x": 4, "y": 2},
+          {"matrix": [5, 2], "x": 5, "y": 2},
+          {"matrix": [4, 3], "x": 6, "y": 2},
+          {"matrix": [5, 3], "x": 7, "y": 2},
+
+          {"matrix": [4, 4], "x": 10, "y": 2},
+          {"matrix": [5, 4], "x": 11, "y": 2},
+          {"matrix": [4, 5], "x": 12, "y": 2},
+          {"matrix": [5, 5], "x": 13, "y": 2},
+          {"matrix": [4, 6], "x": 14, "y": 2},
+          {"matrix": [5, 6], "x": 15, "y": 2},
+          {"matrix": [4, 7], "x": 16, "y": 2, "w": 2.25},
+
+          {"matrix": [7, 0], "x": 1.25, "y": 3, "w": 2.25},
+          {"matrix": [6, 1], "x": 3.5, "y": 3},
+          {"matrix": [6, 2], "x": 4.5, "y": 3},
+          {"matrix": [7, 2], "x": 5.5, "y": 3},
+          {"matrix": [6, 3], "x": 6.5, "y": 3},
+          {"matrix": [7, 3], "x": 7.5, "y": 3},
+
+          {"matrix": [6, 4], "x": 9.5, "y": 3},
+          {"matrix": [7, 4], "x": 10.5, "y": 3},
+          {"matrix": [6, 5], "x": 11.5, "y": 3},
+          {"matrix": [7, 5], "x": 12.5, "y": 3},
+          {"matrix": [6, 6], "x": 13.5, "y": 3},
+          {"matrix": [7, 6], "x": 14.5, "y": 3},
+          {"matrix": [6, 7], "x": 15.5, "y": 3, "w": 1.75},
+          {"matrix": [7, 7], "x": 17.25, "y": 3},
+
+          {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 1], "x": 4.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 2], "x": 5.75, "y": 4, "w": 2},
+          {"matrix": [8, 3], "x": 7.75, "y": 4, "w": 1.25},
+          {"matrix": [8, 4], "x": 9.5, "y": 4, "w": 2.75},
+          {"matrix": [8, 5], "x": 12.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 7], "x": 16.75, "y": 4, "w": 1.5}
         ]
       },
       "LAYOUT_alice_split_bs": {
         "layout": [
-          {"x":0, "y":0},
-          {"x":1.25, "y":0},
-          {"x":2.25, "y":0},
-          {"x":3.25, "y":0},
-          {"x":4.25, "y":0},
-          {"x":5.25, "y":0},
-          {"x":6.25, "y":0},
-          {"x":7.25, "y":0},
-          {"x":10.25, "y":0},
-          {"x":11.25, "y":0},
-          {"x":12.25, "y":0},
-          {"x":13.25, "y":0},
-          {"x":14.25, "y":0},
-          {"x":15.25, "y":0},
-          {"x":16.25, "y":0},
-          {"x":17.25, "y":0},
-          {"x":0, "y":1},
-          {"x":1.25, "y":1, "w":1.5},
-          {"x":2.75, "y":1},
-          {"x":3.75, "y":1},
-          {"x":4.75, "y":1},
-          {"x":5.75, "y":1},
-          {"x":6.75, "y":1},
-          {"x":9.75, "y":1},
-          {"x":10.75, "y":1},
-          {"x":11.75, "y":1},
-          {"x":12.75, "y":1},
-          {"x":13.75, "y":1},
-          {"x":14.75, "y":1},
-          {"x":15.75, "y":1},
-          {"x":16.75, "y":1, "w":1.5},
-          {"x":0, "y":2},
-          {"x":1.25, "y":2, "w":1.75},
-          {"x":3, "y":2},
-          {"x":4, "y":2},
-          {"x":5, "y":2},
-          {"x":6, "y":2},
-          {"x":7, "y":2},
-          {"x":10, "y":2},
-          {"x":11, "y":2},
-          {"x":12, "y":2},
-          {"x":13, "y":2},
-          {"x":14, "y":2},
-          {"x":15, "y":2},
-          {"x":16, "y":2, "w":2.25},
-          {"x":1.25, "y":3, "w":2.25},
-          {"x":3.5, "y":3},
-          {"x":4.5, "y":3},
-          {"x":5.5, "y":3},
-          {"x":6.5, "y":3},
-          {"x":7.5, "y":3},
-          {"x":9.5, "y":3},
-          {"x":10.5, "y":3},
-          {"x":11.5, "y":3},
-          {"x":12.5, "y":3},
-          {"x":13.5, "y":3},
-          {"x":14.5, "y":3},
-          {"x":15.5, "y":3, "w":1.75},
-          {"x":17.25, "y":3},
-          {"x":1.25, "y":4, "w":1.5},
-          {"x":4.25, "y":4, "w":1.5},
-          {"x":5.75, "y":4, "w":2},
-          {"x":7.75, "y":4, "w":1.25},
-          {"x":9.5, "y":4, "w":2.75},
-          {"x":12.25, "y":4, "w":1.5},
-          {"x":16.75, "y":4, "w":1.5}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+
+          {"matrix": [1, 0], "x": 1.25, "y": 0},
+          {"matrix": [0, 1], "x": 2.25, "y": 0},
+          {"matrix": [1, 1], "x": 3.25, "y": 0},
+          {"matrix": [0, 2], "x": 4.25, "y": 0},
+          {"matrix": [1, 2], "x": 5.25, "y": 0},
+          {"matrix": [0, 3], "x": 6.25, "y": 0},
+          {"matrix": [1, 3], "x": 7.25, "y": 0},
+
+          {"matrix": [1, 4], "x": 10.25, "y": 0},
+          {"matrix": [0, 5], "x": 11.25, "y": 0},
+          {"matrix": [1, 5], "x": 12.25, "y": 0},
+          {"matrix": [0, 6], "x": 13.25, "y": 0},
+          {"matrix": [1, 6], "x": 14.25, "y": 0},
+          {"matrix": [0, 7], "x": 15.25, "y": 0},
+          {"matrix": [1, 7], "x": 16.25, "y": 0},
+          {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+          {"matrix": [2, 0], "x": 0, "y": 1},
+
+          {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
+          {"matrix": [2, 1], "x": 2.75, "y": 1},
+          {"matrix": [2, 2], "x": 3.75, "y": 1},
+          {"matrix": [3, 2], "x": 4.75, "y": 1},
+          {"matrix": [2, 3], "x": 5.75, "y": 1},
+          {"matrix": [3, 3], "x": 6.75, "y": 1},
+
+          {"matrix": [2, 4], "x": 9.75, "y": 1},
+          {"matrix": [3, 4], "x": 10.75, "y": 1},
+          {"matrix": [2, 5], "x": 11.75, "y": 1},
+          {"matrix": [3, 5], "x": 12.75, "y": 1},
+          {"matrix": [2, 6], "x": 13.75, "y": 1},
+          {"matrix": [3, 6], "x": 14.75, "y": 1},
+          {"matrix": [2, 7], "x": 15.75, "y": 1},
+          {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+          {"matrix": [4, 0], "x": 0, "y": 2},
+
+          {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+          {"matrix": [4, 1], "x": 3, "y": 2},
+          {"matrix": [4, 2], "x": 4, "y": 2},
+          {"matrix": [5, 2], "x": 5, "y": 2},
+          {"matrix": [4, 3], "x": 6, "y": 2},
+          {"matrix": [5, 3], "x": 7, "y": 2},
+
+          {"matrix": [4, 4], "x": 10, "y": 2},
+          {"matrix": [5, 4], "x": 11, "y": 2},
+          {"matrix": [4, 5], "x": 12, "y": 2},
+          {"matrix": [5, 5], "x": 13, "y": 2},
+          {"matrix": [4, 6], "x": 14, "y": 2},
+          {"matrix": [5, 6], "x": 15, "y": 2},
+          {"matrix": [4, 7], "x": 16, "y": 2, "w": 2.25},
+
+          {"matrix": [7, 0], "x": 1.25, "y": 3, "w": 2.25},
+          {"matrix": [6, 1], "x": 3.5, "y": 3},
+          {"matrix": [6, 2], "x": 4.5, "y": 3},
+          {"matrix": [7, 2], "x": 5.5, "y": 3},
+          {"matrix": [6, 3], "x": 6.5, "y": 3},
+          {"matrix": [7, 3], "x": 7.5, "y": 3},
+
+          {"matrix": [6, 4], "x": 9.5, "y": 3},
+          {"matrix": [7, 4], "x": 10.5, "y": 3},
+          {"matrix": [6, 5], "x": 11.5, "y": 3},
+          {"matrix": [7, 5], "x": 12.5, "y": 3},
+          {"matrix": [6, 6], "x": 13.5, "y": 3},
+          {"matrix": [7, 6], "x": 14.5, "y": 3},
+          {"matrix": [6, 7], "x": 15.5, "y": 3, "w": 1.75},
+          {"matrix": [7, 7], "x": 17.25, "y": 3},
+
+          {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 1], "x": 4.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 2], "x": 5.75, "y": 4, "w": 2},
+          {"matrix": [8, 3], "x": 7.75, "y": 4, "w": 1.25},
+          {"matrix": [8, 4], "x": 9.5, "y": 4, "w": 2.75},
+          {"matrix": [8, 5], "x": 12.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 7], "x": 16.75, "y": 4, "w": 1.5}
         ]
       },
       "LAYOUT_long_rshift": {
         "layout": [
-          {"x":0, "y":0},
-          {"x":1.25, "y":0},
-          {"x":2.25, "y":0},
-          {"x":3.25, "y":0},
-          {"x":4.25, "y":0},
-          {"x":5.25, "y":0},
-          {"x":6.25, "y":0},
-          {"x":7.25, "y":0},
-          {"x":10.25, "y":0},
-          {"x":11.25, "y":0},
-          {"x":12.25, "y":0},
-          {"x":13.25, "y":0},
-          {"x":14.25, "y":0},
-          {"x":15.25, "y":0},
-          {"x":16.25, "y":0, "w":2},
-          {"x":0, "y":1},
-          {"x":1.25, "y":1, "w":1.5},
-          {"x":2.75, "y":1},
-          {"x":3.75, "y":1},
-          {"x":4.75, "y":1},
-          {"x":5.75, "y":1},
-          {"x":6.75, "y":1},
-          {"x":9.75, "y":1},
-          {"x":10.75, "y":1},
-          {"x":11.75, "y":1},
-          {"x":12.75, "y":1},
-          {"x":13.75, "y":1},
-          {"x":14.75, "y":1},
-          {"x":15.75, "y":1},
-          {"x":16.75, "y":1, "w":1.5},
-          {"x":0, "y":2},
-          {"x":1.25, "y":2, "w":1.75},
-          {"x":3, "y":2},
-          {"x":4, "y":2},
-          {"x":5, "y":2},
-          {"x":6, "y":2},
-          {"x":7, "y":2},
-          {"x":10, "y":2},
-          {"x":11, "y":2},
-          {"x":12, "y":2},
-          {"x":13, "y":2},
-          {"x":14, "y":2},
-          {"x":15, "y":2},
-          {"x":16, "y":2, "w":2.25},
-          {"x":1.25, "y":3, "w":2.25},
-          {"x":3.5, "y":3},
-          {"x":4.5, "y":3},
-          {"x":5.5, "y":3},
-          {"x":6.5, "y":3},
-          {"x":7.5, "y":3},
-          {"x":9.5, "y":3},
-          {"x":10.5, "y":3},
-          {"x":11.5, "y":3},
-          {"x":12.5, "y":3},
-          {"x":13.5, "y":3},
-          {"x":14.5, "y":3},
-          {"x":15.5, "y":3, "w":2.75},
-          {"x":1.25, "y":4, "w":1.5},
-          {"x":4.25, "y":4, "w":1.5},
-          {"x":5.75, "y":4, "w":2},
-          {"x":7.75, "y":4, "w":1.25},
-          {"x":9.5, "y":4, "w":2.75},
-          {"x":12.25, "y":4, "w":1.5},
-          {"x":16.75, "y":4, "w":1.5}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+
+          {"matrix": [1, 0], "x": 1.25, "y": 0},
+          {"matrix": [0, 1], "x": 2.25, "y": 0},
+          {"matrix": [1, 1], "x": 3.25, "y": 0},
+          {"matrix": [0, 2], "x": 4.25, "y": 0},
+          {"matrix": [1, 2], "x": 5.25, "y": 0},
+          {"matrix": [0, 3], "x": 6.25, "y": 0},
+          {"matrix": [1, 3], "x": 7.25, "y": 0},
+
+          {"matrix": [1, 4], "x": 10.25, "y": 0},
+          {"matrix": [0, 5], "x": 11.25, "y": 0},
+          {"matrix": [1, 5], "x": 12.25, "y": 0},
+          {"matrix": [0, 6], "x": 13.25, "y": 0},
+          {"matrix": [1, 6], "x": 14.25, "y": 0},
+          {"matrix": [0, 7], "x": 15.25, "y": 0},
+          {"matrix": [1, 7], "x": 16.25, "y": 0, "w": 2},
+
+          {"matrix": [2, 0], "x": 0, "y": 1},
+
+          {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
+          {"matrix": [2, 1], "x": 2.75, "y": 1},
+          {"matrix": [2, 2], "x": 3.75, "y": 1},
+          {"matrix": [3, 2], "x": 4.75, "y": 1},
+          {"matrix": [2, 3], "x": 5.75, "y": 1},
+          {"matrix": [3, 3], "x": 6.75, "y": 1},
+          {"matrix": [2, 4], "x": 9.75, "y": 1},
+
+          {"matrix": [3, 4], "x": 10.75, "y": 1},
+          {"matrix": [2, 5], "x": 11.75, "y": 1},
+          {"matrix": [3, 5], "x": 12.75, "y": 1},
+          {"matrix": [2, 6], "x": 13.75, "y": 1},
+          {"matrix": [3, 6], "x": 14.75, "y": 1},
+          {"matrix": [2, 7], "x": 15.75, "y": 1},
+          {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+          {"matrix": [4, 0], "x": 0, "y": 2},
+
+          {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+          {"matrix": [4, 1], "x": 3, "y": 2},
+          {"matrix": [4, 2], "x": 4, "y": 2},
+          {"matrix": [5, 2], "x": 5, "y": 2},
+          {"matrix": [4, 3], "x": 6, "y": 2},
+          {"matrix": [5, 3], "x": 7, "y": 2},
+
+          {"matrix": [4, 4], "x": 10, "y": 2},
+          {"matrix": [5, 4], "x": 11, "y": 2},
+          {"matrix": [4, 5], "x": 12, "y": 2},
+          {"matrix": [5, 5], "x": 13, "y": 2},
+          {"matrix": [4, 6], "x": 14, "y": 2},
+          {"matrix": [5, 6], "x": 15, "y": 2},
+          {"matrix": [4, 7], "x": 16, "y": 2, "w": 2.25},
+
+          {"matrix": [7, 0], "x": 1.25, "y": 3, "w": 2.25},
+          {"matrix": [6, 1], "x": 3.5, "y": 3},
+          {"matrix": [6, 2], "x": 4.5, "y": 3},
+          {"matrix": [7, 2], "x": 5.5, "y": 3},
+          {"matrix": [6, 3], "x": 6.5, "y": 3},
+          {"matrix": [7, 3], "x": 7.5, "y": 3},
+
+          {"matrix": [6, 4], "x": 9.5, "y": 3},
+          {"matrix": [7, 4], "x": 10.5, "y": 3},
+          {"matrix": [6, 5], "x": 11.5, "y": 3},
+          {"matrix": [7, 5], "x": 12.5, "y": 3},
+          {"matrix": [6, 6], "x": 13.5, "y": 3},
+          {"matrix": [7, 6], "x": 14.5, "y": 3},
+          {"matrix": [6, 7], "x": 15.5, "y": 3, "w": 2.75},
+
+          {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 1], "x": 4.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 2], "x": 5.75, "y": 4, "w": 2},
+          {"matrix": [8, 3], "x": 7.75, "y": 4, "w": 1.25},
+          {"matrix": [8, 4], "x": 9.5, "y": 4, "w": 2.75},
+          {"matrix": [8, 5], "x": 12.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 7], "x": 16.75, "y": 4, "w": 1.5}
         ]
       },
       "LAYOUT_long_rshift_split_bs": {
         "layout": [
-          {"x":0, "y":0},
-          {"x":1.25, "y":0},
-          {"x":2.25, "y":0},
-          {"x":3.25, "y":0},
-          {"x":4.25, "y":0},
-          {"x":5.25, "y":0},
-          {"x":6.25, "y":0},
-          {"x":7.25, "y":0},
-          {"x":10.25, "y":0},
-          {"x":11.25, "y":0},
-          {"x":12.25, "y":0},
-          {"x":13.25, "y":0},
-          {"x":14.25, "y":0},
-          {"x":15.25, "y":0},
-          {"x":16.25, "y":0},
-          {"x":17.25, "y":0},
-          {"x":0, "y":1},
-          {"x":1.25, "y":1, "w":1.5},
-          {"x":2.75, "y":1},
-          {"x":3.75, "y":1},
-          {"x":4.75, "y":1},
-          {"x":5.75, "y":1},
-          {"x":6.75, "y":1},
-          {"x":9.75, "y":1},
-          {"x":10.75, "y":1},
-          {"x":11.75, "y":1},
-          {"x":12.75, "y":1},
-          {"x":13.75, "y":1},
-          {"x":14.75, "y":1},
-          {"x":15.75, "y":1},
-          {"x":16.75, "y":1, "w":1.5},
-          {"x":0, "y":2},
-          {"x":1.25, "y":2, "w":1.75},
-          {"x":3, "y":2},
-          {"x":4, "y":2},
-          {"x":5, "y":2},
-          {"x":6, "y":2},
-          {"x":7, "y":2},
-          {"x":10, "y":2},
-          {"x":11, "y":2},
-          {"x":12, "y":2},
-          {"x":13, "y":2},
-          {"x":14, "y":2},
-          {"x":15, "y":2},
-          {"x":16, "y":2, "w":2.25},
-          {"x":1.25, "y":3, "w":2.25},
-          {"x":3.5, "y":3},
-          {"x":4.5, "y":3},
-          {"x":5.5, "y":3},
-          {"x":6.5, "y":3},
-          {"x":7.5, "y":3},
-          {"x":9.5, "y":3},
-          {"x":10.5, "y":3},
-          {"x":11.5, "y":3},
-          {"x":12.5, "y":3},
-          {"x":13.5, "y":3},
-          {"x":14.5, "y":3},
-          {"x":15.5, "y":3, "w":2.75},
-          {"x":1.25, "y":4, "w":1.5},
-          {"x":4.25, "y":4, "w":1.5},
-          {"x":5.75, "y":4, "w":2},
-          {"x":7.75, "y":4, "w":1.25},
-          {"x":9.5, "y":4, "w":2.75},
-          {"x":12.25, "y":4, "w":1.5},
-          {"x":16.75, "y":4, "w":1.5}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+
+          {"matrix": [1, 0], "x": 1.25, "y": 0},
+          {"matrix": [0, 1], "x": 2.25, "y": 0},
+          {"matrix": [1, 1], "x": 3.25, "y": 0},
+          {"matrix": [0, 2], "x": 4.25, "y": 0},
+          {"matrix": [1, 2], "x": 5.25, "y": 0},
+          {"matrix": [0, 3], "x": 6.25, "y": 0},
+          {"matrix": [1, 3], "x": 7.25, "y": 0},
+
+          {"matrix": [1, 4], "x": 10.25, "y": 0},
+          {"matrix": [0, 5], "x": 11.25, "y": 0},
+          {"matrix": [1, 5], "x": 12.25, "y": 0},
+          {"matrix": [0, 6], "x": 13.25, "y": 0},
+          {"matrix": [1, 6], "x": 14.25, "y": 0},
+          {"matrix": [0, 7], "x": 15.25, "y": 0},
+          {"matrix": [1, 7], "x": 16.25, "y": 0},
+          {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+          {"matrix": [2, 0], "x": 0, "y": 1},
+
+          {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
+          {"matrix": [2, 1], "x": 2.75, "y": 1},
+          {"matrix": [2, 2], "x": 3.75, "y": 1},
+          {"matrix": [3, 2], "x": 4.75, "y": 1},
+          {"matrix": [2, 3], "x": 5.75, "y": 1},
+          {"matrix": [3, 3], "x": 6.75, "y": 1},
+
+          {"matrix": [2, 4], "x": 9.75, "y": 1},
+          {"matrix": [3, 4], "x": 10.75, "y": 1},
+          {"matrix": [2, 5], "x": 11.75, "y": 1},
+          {"matrix": [3, 5], "x": 12.75, "y": 1},
+          {"matrix": [2, 6], "x": 13.75, "y": 1},
+          {"matrix": [3, 6], "x": 14.75, "y": 1},
+          {"matrix": [2, 7], "x": 15.75, "y": 1},
+          {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+          {"matrix": [4, 0], "x": 0, "y": 2},
+
+          {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+          {"matrix": [4, 1], "x": 3, "y": 2},
+          {"matrix": [4, 2], "x": 4, "y": 2},
+          {"matrix": [5, 2], "x": 5, "y": 2},
+          {"matrix": [4, 3], "x": 6, "y": 2},
+          {"matrix": [5, 3], "x": 7, "y": 2},
+
+          {"matrix": [4, 4], "x": 10, "y": 2},
+          {"matrix": [5, 4], "x": 11, "y": 2},
+          {"matrix": [4, 5], "x": 12, "y": 2},
+          {"matrix": [5, 5], "x": 13, "y": 2},
+          {"matrix": [4, 6], "x": 14, "y": 2},
+          {"matrix": [5, 6], "x": 15, "y": 2},
+          {"matrix": [4, 7], "x": 16, "y": 2, "w": 2.25},
+
+          {"matrix": [7, 0], "x": 1.25, "y": 3, "w": 2.25},
+          {"matrix": [6, 1], "x": 3.5, "y": 3},
+          {"matrix": [6, 2], "x": 4.5, "y": 3},
+          {"matrix": [7, 2], "x": 5.5, "y": 3},
+          {"matrix": [6, 3], "x": 6.5, "y": 3},
+          {"matrix": [7, 3], "x": 7.5, "y": 3},
+
+          {"matrix": [6, 4], "x": 9.5, "y": 3},
+          {"matrix": [7, 4], "x": 10.5, "y": 3},
+          {"matrix": [6, 5], "x": 11.5, "y": 3},
+          {"matrix": [7, 5], "x": 12.5, "y": 3},
+          {"matrix": [6, 6], "x": 13.5, "y": 3},
+          {"matrix": [7, 6], "x": 14.5, "y": 3},
+          {"matrix": [6, 7], "x": 15.5, "y": 3, "w": 2.75},
+
+          {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 1], "x": 4.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 2], "x": 5.75, "y": 4, "w": 2},
+          {"matrix": [8, 3], "x": 7.75, "y": 4, "w": 1.25},
+          {"matrix": [8, 4], "x": 9.5, "y": 4, "w": 2.75},
+          {"matrix": [8, 5], "x": 12.25, "y": 4, "w": 1.5},
+          {"matrix": [8, 7], "x": 16.75, "y": 4, "w": 1.5}
         ]
       }
     }
-  }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/keyboards/linworks/em8/info.json b/keyboards/linworks/em8/info.json
index 4abcb323a4..f501b5e52c 100644
--- a/keyboards/linworks/em8/info.json
+++ b/keyboards/linworks/em8/info.json
@@ -107,12 +107,12 @@
                 {"x":1.25, "y":4, "w":1.5, "matrix":[4,1] },
                 {"x":4.25, "y":4, "w":1.5, "matrix":[4,3] },
                 {"x":5.75, "y":4, "w":2.25, "matrix":[4,5] },
-                {"x":8, "y":4, "w":1, "matrix":[4,6] },
+                {"x":8, "y":4, "matrix":[4,6] },
                 {"x":9.5, "y":4, "w":2.75, "matrix":[4,8] },
                 {"x":12.25, "y":4, "w":1.5, "matrix":[4,10] },
-                {"x":16.5, "y":4.25, "w":1, "matrix":[4,12] },
-                {"x":17.5, "y":4.25, "w":1, "matrix":[4,13] },
-                {"x":18.5, "y":4.25, "w":1, "matrix":[4,14] }
+                {"x":16.5, "y":4.25, "matrix":[4,12] },
+                {"x":17.5, "y":4.25, "matrix":[4,13] },
+                {"x":18.5, "y":4.25, "matrix":[4,14] }
             ]
         },
 
@@ -186,12 +186,12 @@
                 {"x":1.25, "y":4, "w":1.5, "matrix":[4,1] },
                 {"x":4.25, "y":4, "w":1.5, "matrix":[4,3] },
                 {"x":5.75, "y":4, "w":2.25, "matrix":[4,5] },
-                {"x":8, "y":4, "w":1, "matrix":[4,6] },
+                {"x":8, "y":4, "matrix":[4,6] },
                 {"x":9.5, "y":4, "w":2.75, "matrix":[4,8] },
                 {"x":12.25, "y":4, "w":1.5, "matrix":[4,10] },
-                {"x":16.5, "y":4.25, "w":1, "matrix":[4,12] },
-                {"x":17.5, "y":4.25, "w":1, "matrix":[4,13] },
-                {"x":18.5, "y":4.25, "w":1, "matrix":[4,14] }
+                {"x":16.5, "y":4.25, "matrix":[4,12] },
+                {"x":17.5, "y":4.25, "matrix":[4,13] },
+                {"x":18.5, "y":4.25, "matrix":[4,14] }
             ]
         }
     }
diff --git a/keyboards/linworks/fave104/config.h b/keyboards/linworks/fave104/config.h
index 5d3830ef6c..73e72a129f 100644
--- a/keyboards/linworks/fave104/config.h
+++ b/keyboards/linworks/fave104/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B11, B10, B2,  B1,  B0, A7, A6,  A5,  A4,  A3,  A2, A0 }
-#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A13, A14, A15, B3     }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD2
 #define BACKLIGHT_PWM_CHANNEL 2
 #define BACKLIGHT_PAL_MODE 2
diff --git a/keyboards/linworks/fave104/fave104.c b/keyboards/linworks/fave104/fave104.c
deleted file mode 100644
index f6b1e8d11b..0000000000
--- a/keyboards/linworks/fave104/fave104.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "fave104.h"
diff --git a/keyboards/linworks/fave104/fave104.h b/keyboards/linworks/fave104/fave104.h
deleted file mode 100644
index bd30b1e0c4..0000000000
--- a/keyboards/linworks/fave104/fave104.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2021 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K10,  K11,        K12,    K13,  K14,  K15,    K16,  K17,  K18,  K19, \
-    K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K30,  K31,  K32,  K33,  K34,    K35,  K36,  K37,    K38,  K39,  K40,  K41, \
-    K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K50,  K51,  K52,  K53,  K54,        K55,    K56,  K57,  K58,    K59,  K60,  K61,  K62, \
-    K63,  K64,  K65,  K66,  K67,  K68,  K69,  K70,  K71,  K72,  K73,  K74,  K75,        K76,                        K77,  K78,  K79,  K80, \
-    K81,  K82,  K83,  K84,  K85,  K86,  K87,  K88,  K89,  K90,  K91,  K92,  K93,        K94,          K95,          K96,  K97,  K98,  K99, \
-    K100, K101, K102,                   K103,                   K104, K105, K106,       K107,   K108, K109, K110,   K111, K112, K113, K114 \
-) { \
-  { K00,    K01,   K03,   K05,   K07,   K09,  K11,    K12,   K14,   K16,  K18 }, \
-  { KC_NO,  K02,   K04,   K06,   K08,   K10,  KC_NO,  K13,   K15,   K17,  K19 }, \
-  { K20,    K22,   K24,   K26,   K28,   K30,  K32,    K34,   K36,   K38,  K40 }, \
-  { K21,    K23,   K25,   K27,   K29,   K31,  K33,    K35,   K37,   K39,  K41 }, \
-  { K42,    K44,   K46,   K48,   K50,   K52,  K54,    K55,   K57,   K59,  K61 }, \
-  { K43,    K45,   K47,   K49,   K51,   K53,  KC_NO,  K56,   K58,   K60,  K62 }, \
-  { K63,    K65,   K67,   K69,   K71,   K73,  K75,    K76,   KC_NO, K77,  K79 }, \
-  { K64,    K66,   K68,   K70,   K72,   K74,  KC_NO,  KC_NO, KC_NO, K78,  K80 }, \
-  { K81,    K83,   K85,   K87,   K89,   K91,  K93,    K94,   K95,   K96,  K98 }, \
-  { K82,    K84,   K86,   K88,   K90,   K92,  KC_NO,  KC_NO, KC_NO, K97,  K99 }, \
-  { K100,   K102,  KC_NO, K103,  KC_NO, K104, K106,   K107,  K109,  K111, K113}, \
-  { K101,   KC_NO, KC_NO, KC_NO, KC_NO, K105, KC_NO,  K108,  K110,  K112, K114}  \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K10,  K11,        K12,    K13,  K14,  K15,    K16,  K17,  K18,  K19, \
-    K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K30,  K31,  K32,        K34,    K35,  K36,  K37,    K38,  K39,  K40,  K41, \
-    K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K50,  K51,  K52,  K53,  K54,        K55,    K56,  K57,  K58,    K59,  K60,  K61,  K62, \
-    K63,  K64,  K65,  K66,  K67,  K68,  K69,  K70,  K71,  K72,  K73,  K74,              K76,                        K77,  K78,  K79,  K80, \
-    K81,        K83,  K84,  K85,  K86,  K87,  K88,  K89,  K90,  K91,  K92,  K93,                      K95,          K96,  K97,  K98,  K99, \
-    K100, K101, K102,                   K103,                   K104, K105, K106,       K107,   K108, K109, K110,   K111, K112, K113, K114 \
-) { \
-  { K00,    K01,   K03,   K05,   K07,   K09,  K11,    K12,   K14,   K16,  K18 }, \
-  { KC_NO,  K02,   K04,   K06,   K08,   K10,  KC_NO,  K13,   K15,   K17,  K19 }, \
-  { K20,    K22,   K24,   K26,   K28,   K30,  K32,    K34,   K36,   K38,  K40 }, \
-  { K21,    K23,   K25,   K27,   K29,   K31,  KC_NO,  K35,   K37,   K39,  K41 }, \
-  { K42,    K44,   K46,   K48,   K50,   K52,  K54,    K55,   K57,   K59,  K61 }, \
-  { K43,    K45,   K47,   K49,   K51,   K53,  KC_NO,  K56,   K58,   K60,  K62 }, \
-  { K63,    K65,   K67,   K69,   K71,   K73,  KC_NO,  K76,   KC_NO, K77,  K79 }, \
-  { K64,    K66,   K68,   K70,   K72,   K74,  KC_NO,  KC_NO, KC_NO, K78,  K80 }, \
-  { K81,    K83,   K85,   K87,   K89,   K91,  K93,    KC_NO, K95,   K96,  K98 }, \
-  { KC_NO,  K84,   K86,   K88,   K90,   K92,  KC_NO,  KC_NO, KC_NO, K97,  K99 }, \
-  { K100,   K102,  KC_NO, K103,  KC_NO, K104, K106,   K107,  K109,  K111, K113}, \
-  { K101,   KC_NO, KC_NO, KC_NO, KC_NO, K105, KC_NO,  K108,  K110,  K112, K114}  \
-}
-
-#define LAYOUT_fullsize_iso( \
-    K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K10,  K11,        K12,    K13,  K14,  K15,    K16,  K17,  K18,  K19, \
-    K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K30,  K31,  K32,  K33,  K34,    K35,  K36,  K37,    K38,  K39,  K40,  K41, \
-    K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K50,  K51,  K52,  K53,  K54,                K56,  K57,  K58,    K59,  K60,  K61,  K62, \
-    K63,  K64,  K65,  K66,  K67,  K68,  K69,  K70,  K71,  K72,  K73,  K74,  K75,        K76,                        K77,  K78,  K79,  K80, \
-    K81,  K82,  K83,  K84,  K85,  K86,  K87,  K88,  K89,  K90,  K91,  K92,  K93,        K94,          K95,          K96,  K97,  K98,  K99, \
-    K100, K101, K102,                   K103,                   K104, K105, K106,       K107,   K108, K109, K110,   K111, K112, K113, K114 \
-) { \
-  { K00,    K01,   K03,   K05,   K07,   K09,  K11,    K12,   K14,   K16,  K18 }, \
-  { KC_NO,  K02,   K04,   K06,   K08,   K10,  KC_NO,  K13,   K15,   K17,  K19 }, \
-  { K20,    K22,   K24,   K26,   K28,   K30,  K32,    K34,   K36,   K38,  K40 }, \
-  { K21,    K23,   K25,   K27,   K29,   K31,  K33,    K35,   K37,   K39,  K41 }, \
-  { K42,    K44,   K46,   K48,   K50,   K52,  K54,    KC_NO, K57,   K59,  K61 }, \
-  { K43,    K45,   K47,   K49,   K51,   K53,  KC_NO,  K56,   K58,   K60,  K62 }, \
-  { K63,    K65,   K67,   K69,   K71,   K73,  K75,    K76,   KC_NO, K77,  K79 }, \
-  { K64,    K66,   K68,   K70,   K72,   K74,  KC_NO,  KC_NO, KC_NO, K78,  K80 }, \
-  { K81,    K83,   K85,   K87,   K89,   K91,  K93,    K94,   K95,   K96,  K98 }, \
-  { K82,    K84,   K86,   K88,   K90,   K92,  KC_NO,  KC_NO, KC_NO, K97,  K99 }, \
-  { K100,   K102,  KC_NO, K103,  KC_NO, K104, K106,   K107,  K109,  K111, K113}, \
-  { K101,   KC_NO, KC_NO, KC_NO, KC_NO, K105, KC_NO,  K108,  K110,  K112, K114}  \
-}
-
diff --git a/keyboards/linworks/fave104/info.json b/keyboards/linworks/fave104/info.json
index 03beb2ad89..e5fcf4f0c8 100644
--- a/keyboards/linworks/fave104/info.json
+++ b/keyboards/linworks/fave104/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A13", "A14", "A15", "B3"],
+        "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A1",
         "levels": 5,
@@ -24,371 +29,410 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"x":18.5, "y":0},
-                {"x":19.5, "y":0},
-                {"x":20.5, "y":0},
-                {"x":21.5, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
-                {"label":"+", "x":21.5, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25},
-                {"label":"0", "x":19.5, "y":5.25},
-                {"label":".", "x":20.5, "y":5.25},
-                {"label":"Enter", "x":21.5, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
+                {"matrix": [0, 10], "x": 20.5, "y": 0},
+                {"matrix": [1, 10], "x": 21.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 18.5, "y": 1.25},
+                {"matrix": [3, 9], "x": 19.5, "y": 1.25},
+                {"matrix": [2, 10], "x": 20.5, "y": 1.25},
+                {"matrix": [3, 10], "x": 21.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [4, 9], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 9], "x": 19.5, "y": 2.25},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 10], "x": 21.5, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 3.25},
+                {"matrix": [6, 10], "x": 20.5, "y": 3.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 10], "x": 20.5, "y": 4.25},
+                {"matrix": [9, 10], "x": 21.5, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
+
+                {"matrix": [10, 9], "x": 18.5, "y": 5.25},
+                {"matrix": [11, 9], "x": 19.5, "y": 5.25},
+                {"matrix": [10, 10], "x": 20.5, "y": 5.25},
+                {"matrix": [11, 10], "x": 21.5, "y": 5.25}
             ]
         },
-
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"x":18.5, "y":0},
-                {"x":19.5, "y":0},
-                {"x":20.5, "y":0},
-                {"x":21.5, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
-                {"label":"+", "x":21.5, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25},
-                {"label":"0", "x":19.5, "y":5.25},
-                {"label":".", "x":20.5, "y":5.25},
-                {"label":"Enter", "x":21.5, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
+                {"matrix": [0, 10], "x": 20.5, "y": 0},
+                {"matrix": [1, 10], "x": 21.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [2, 7], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 18.5, "y": 1.25},
+                {"matrix": [3, 9], "x": 19.5, "y": 1.25},
+                {"matrix": [2, 10], "x": 20.5, "y": 1.25},
+                {"matrix": [3, 10], "x": 21.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [4, 9], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 9], "x": 19.5, "y": 2.25},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 10], "x": 21.5, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 3.25},
+                {"matrix": [6, 10], "x": 20.5, "y": 3.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 10], "x": 20.5, "y": 4.25},
+                {"matrix": [9, 10], "x": 21.5, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
+
+                {"matrix": [10, 9], "x": 18.5, "y": 5.25},
+                {"matrix": [11, 9], "x": 19.5, "y": 5.25},
+                {"matrix": [10, 10], "x": 20.5, "y": 5.25},
+                {"matrix": [11, 10], "x": 21.5, "y": 5.25}
             ]
         },
-
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"x":18.5, "y":0},
-                {"x":19.5, "y":0},
-                {"x":20.5, "y":0},
-                {"x":21.5, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"#", "x":12.75, "y":3.25},
-                {"label":"Enter", "x": 13.75, "y":2.25, "w":1.25, "h":2},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
-                {"label":"+", "x":21.5, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25},
-                {"label":"0", "x":19.5, "y":5.25},
-                {"label":".", "x":20.5, "y":5.25},
-                {"label":"Enter", "x":21.5, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
+                {"matrix": [0, 10], "x": 20.5, "y": 0},
+                {"matrix": [1, 10], "x": 21.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 18.5, "y": 1.25},
+                {"matrix": [3, 9], "x": 19.5, "y": 1.25},
+                {"matrix": [2, 10], "x": 20.5, "y": 1.25},
+                {"matrix": [3, 10], "x": 21.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [4, 9], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 9], "x": 19.5, "y": 2.25},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 10], "x": 21.5, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 3.25},
+                {"matrix": [6, 10], "x": 20.5, "y": 3.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 10], "x": 20.5, "y": 4.25},
+                {"matrix": [9, 10], "x": 21.5, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
+
+                {"matrix": [10, 9], "x": 18.5, "y": 5.25},
+                {"matrix": [11, 9], "x": 19.5, "y": 5.25},
+                {"matrix": [10, 10], "x": 20.5, "y": 5.25},
+                {"matrix": [11, 10], "x": 21.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h
index 22e23f1a71..2c8d4845b1 100644
--- a/keyboards/linworks/fave65h/config.h
+++ b/keyboards/linworks/fave65h/config.h
@@ -17,18 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { D1, D0, D2, D3, D5  }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Define RGB */
 #define RGBLED_NUM 67
 #define RGB_MATRIX_LED_COUNT 67
-#define RGB_DI_PIN B0
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/linworks/fave65h/fave65h.c b/keyboards/linworks/fave65h/fave65h.c
index 00b854269a..01cf705e2a 100644
--- a/keyboards/linworks/fave65h/fave65h.c
+++ b/keyboards/linworks/fave65h/fave65h.c
@@ -11,7 +11,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
-#include "fave65h.h"
+#include "quantum.h"
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/linworks/fave65h/fave65h.h b/keyboards/linworks/fave65h/fave65h.h
deleted file mode 100644
index 2d41275705..0000000000
--- a/keyboards/linworks/fave65h/fave65h.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�   ┌───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │2C │0D │0E │   │0D     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤   └───────┘
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3C    │3D │3E │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │48  │4A  │ │4C │4D │4E │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬─────┬───────────────────────────┬────┬────�
- * │40   │41   │46                         │48  │4A  │ Blocker WKL
- * └─────┴─────┴───────────────────────────┴────┴────┘
- */
-
-/* FAve 65H Keymap Definitions */
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K48, K4A,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08, K09,   K0A, K0B,   K0C,   K0D, K0E }, \
-    { K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18, K19,   K1A, K1B,   K1C,   K1D, K1E }, \
-    { K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28, K29,   K2A, K2B,   KC_NO, K2D, K2E }, \
-    { K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38, K39,   K3A, KC_NO, K3C,   K3D, K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, K4C,   K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K2C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K48, K4A,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08, K09,   K0A, K0B,   K0C, K0D, K0E }, \
-    { K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18, K19,   K1A, K1B,   K1C, K1D, K1E }, \
-    { K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28, K29,   K2A, K2B,   K2C, K2D, K2E }, \
-    { K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38, K39,   K3A, KC_NO, K3C, K3D, K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, \
-    K40, K41,                K46,                K48, K4A,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02,   K03,   K04,   K05,   K06, K07,   K08, K09,   K0A, K0B,   K0C,   K0D, K0E }, \
-    { K10, K11, K12,   K13,   K14,   K15,   K16, K17,   K18, K19,   K1A, K1B,   K1C,   K1D, K1E }, \
-    { K20, K21, K22,   K23,   K24,   K25,   K26, K27,   K28, K29,   K2A, K2B,   KC_NO, K2D, K2E }, \
-    { K30, K31, K32,   K33,   K34,   K35,   K36, K37,   K38, K39,   K3A, KC_NO, K3C,   K3D, K3E }, \
-    { K40, K41, KC_NO, KC_NO, KC_NO, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, K4C,   K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_wkl_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K2C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, \
-    K40, K41,                K46,                K48, K4A,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02,   K03,   K04,   K05,   K06, K07,   K08, K09,   K0A, K0B,   K0C, K0D, K0E }, \
-    { K10, K11, K12,   K13,   K14,   K15,   K16, K17,   K18, K19,   K1A, K1B,   K1C, K1D, K1E }, \
-    { K20, K21, K22,   K23,   K24,   K25,   K26, K27,   K28, K29,   K2A, K2B,   K2C, K2D, K2E }, \
-    { K30, K31, K32,   K33,   K34,   K35,   K36, K37,   K38, K39,   K3A, KC_NO, K3C, K3D, K3E }, \
-    { K40, K41, KC_NO, KC_NO, KC_NO, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json
index c04eb5644b..c0fbdd6903 100644
--- a/keyboards/linworks/fave65h/info.json
+++ b/keyboards/linworks/fave65h/info.json
@@ -8,6 +8,17 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D1", "D0", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -18,302 +29,302 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5$", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Page Up", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Down", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5$", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Delete", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Home", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [2, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Page Up", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Down", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_wkl": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5$", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Page Up", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Down", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_wkl_split_bs": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5$", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Delete", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Home", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [2, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Page Up", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Down", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":4, "w":1.5},
-                {"label":"Space", "x":3, "y":4, "w":7},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/linworks/fave65h/rules.mk b/keyboards/linworks/fave65h/rules.mk
index f876ea8a18..f92cb03d08 100644
--- a/keyboards/linworks/fave65h/rules.mk
+++ b/keyboards/linworks/fave65h/rules.mk
@@ -14,4 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/linworks/fave84h/config.h b/keyboards/linworks/fave84h/config.h
index 516f30e96f..5ce329db0a 100644
--- a/keyboards/linworks/fave84h/config.h
+++ b/keyboards/linworks/fave84h/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 
 #define RGB_MATRIX_LED_COUNT 126
-#define RGB_DI_PIN D2
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES 
diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json
index 95df89fd4e..7d19a24cb1 100644
--- a/keyboards/linworks/fave84h/info.json
+++ b/keyboards/linworks/fave84h/info.json
@@ -15,6 +15,9 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"],
         "rows": ["B1", "B2", "B3", "D3", "D1", "D0"]
diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h
index 37aa1a68fc..fb227ca802 100644
--- a/keyboards/linworks/fave87/config.h
+++ b/keyboards/linworks/fave87/config.h
@@ -18,14 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Force USB NKRO */
 #define FORCE_NKRO
 
-#define MATRIX_ROW_PINS { D3, D5, D1, D2, D4, D0, F5, F4, F7, F6, B5, B4 }
-#define MATRIX_COL_PINS { F1, F0, E6, B0, B1, B2, B3, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Underglow */
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 40
 #define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/linworks/fave87/fave87.c b/keyboards/linworks/fave87/fave87.c
deleted file mode 100644
index 49272baf5a..0000000000
--- a/keyboards/linworks/fave87/fave87.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "fave87.h"
diff --git a/keyboards/linworks/fave87/fave87.h b/keyboards/linworks/fave87/fave87.h
deleted file mode 100644
index 7c3490f457..0000000000
--- a/keyboards/linworks/fave87/fave87.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright 2021 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
-    K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,  K027,  K037,  K028,  K038, \
-    K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,  K056,         K057,  K048,  K058, \
-    K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,  K066,  K076,                             \
-    K080,  K090,  K081,  K091,  K082,  K092,  K083,  K093,  K084,  K094,  K085,  K095,  K086,  K096,                K088,        \
-    K100,  K110,  K101,                       K103,                       K105,  K115,  K106,  K116,         K117,  K108,  K118 \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
-  { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028  }, \
-  { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
-  { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
-  { K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058  }, \
-  { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
-  { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-  { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
-  { K090,  K091,  K092,  K093,  K094,  K095,  K096,  KC_NO, KC_NO }, \
-  { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
-  { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
-    K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,         K037,  K028,  K038, \
-    K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,  K056,         K057,  K048,  K058, \
-    K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,         K076,                             \
-    K080,         K081,  K091,  K082,  K092,  K083,  K093,  K084,  K094,  K085,  K095,         K086,                K088,        \
-    K100,  K110,  K101,                       K103,                       K105,  K115,  K106,  K116,         K117,  K108,  K118 \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
-  { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
-  { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
-  { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
-  { K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058  }, \
-  { K060,  K061,  K062,  K063,  K064,  K065,  KC_NO, KC_NO, KC_NO }, \
-  { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-  { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
-  { KC_NO, K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
-  { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
-  { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
-}
-
-#define LAYOUT_tkl_ansi_split_bs_rshift( \
-    K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
-    K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,  K027,  K037,  K028,  K038, \
-    K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,  K056,         K057,  K048,  K058, \
-    K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,         K076,                             \
-    K080,         K081,  K091,  K082,  K092,  K083,  K093,  K084,  K094,  K085,  K095,  K086,  K096,                K088,        \
-    K100,  K110,  K101,                       K103,                       K105,  K115,  K106,  K116,         K117,  K108,  K118 \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
-  { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
-  { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
-  { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
-  { K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058  }, \
-  { K060,  K061,  K062,  K063,  K064,  K065,  KC_NO, KC_NO, KC_NO }, \
-  { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-  { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
-  { KC_NO, K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
-  { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
-  { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
-    K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,         K037,  K028,  K038, \
-    K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,                K057,  K048,  K058, \
-    K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,  K066,  K076,                             \
-    K080,  K090,  K081,  K091,  K082,  K092,  K083,  K093,  K084,  K094,  K085,  K095,         K086,                K088,        \
-    K100,  K110,  K101,                       K103,                       K105,  K115,  K106,  K116,         K117,  K108,  K118 \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
-  { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
-  { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
-  { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
-  { K050,  K051,  K052,  K053,  K054,  K055,  KC_NO, K057,  K058  }, \
-  { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
-  { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-  { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
-  { K090,  K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
-  { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
-  { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
-}
-
-#define LAYOUT_tkl_iso_split_bs_rshift( \
-    K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
-    K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,  K027,  K037,  K028,  K038, \
-    K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,                K057,  K048,  K058, \
-    K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,  K066,  K076,                             \
-    K080,  K090,  K081,  K091,  K082,  K092,  K083,  K093,  K084,  K094,  K085,  K095,  K086,  K096,                K088,        \
-    K100,  K110,  K101,                       K103,                       K105,  K115,  K106,  K116,         K117,  K108,  K118 \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
-  { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
-  { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
-  { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
-  { K050,  K051,  K052,  K053,  K054,  K055,  KC_NO, K057,  K058  }, \
-  { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
-  { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
-  { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
-  { K090,  K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
-  { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
-  { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
-}
diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json
index b6ac9b78c1..2694d09930 100644
--- a/keyboards/linworks/fave87/info.json
+++ b/keyboards/linworks/fave87/info.json
@@ -7,505 +7,550 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "E6", "B0", "B1", "B2", "B3", "D6", "D7"],
+        "rows": ["D3", "D5", "D1", "D2", "D4", "D0", "F5", "F4", "F7", "F6", "B5", "B4"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi", "tkl_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":3.25, "w":1.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}]
-        },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
 
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         },
-
         "LAYOUT_tkl_ansi_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":13, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         },
-
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"#", "x":12.75, "y":3.25},
-                {"label":"Enter", "x": 13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         },
-
         "LAYOUT_tkl_iso_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":13, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"#", "x":12.75, "y":3.25},
-                {"label":"Enter", "x": 13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
index 29d57ab51e..ef57446100 100644
--- a/keyboards/linworks/fave87h/config.h
+++ b/keyboards/linworks/fave87h/config.h
@@ -17,18 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B1, B2, B3, D3, D1, D0  }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B0, B7, E6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Define RGB */
 #define RGBLED_NUM 87
 #define RGB_MATRIX_LED_COUNT 87
-#define RGB_DI_PIN D2
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/linworks/fave87h/fave87h.c b/keyboards/linworks/fave87h/fave87h.c
index 6883214db3..c529e439b9 100644
--- a/keyboards/linworks/fave87h/fave87h.c
+++ b/keyboards/linworks/fave87h/fave87h.c
@@ -11,8 +11,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
-#include "fave87h.h"
 
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
diff --git a/keyboards/linworks/fave87h/fave87h.h b/keyboards/linworks/fave87h/fave87h.h
deleted file mode 100644
index 30e9fc7ac5..0000000000
--- a/keyboards/linworks/fave87h/fave87h.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- * ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───┬───�   ┌───────�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3C │ │1E │1F │1G │   │1D     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤   └───────┘
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───�
- * │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4C        │     │4F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───�
- * │50  │51  │52  │55                      │59  │5A  │5C  │5D  │ │5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- */
-
-/* FAve 87H Keymap Definitions */
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,  K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                 \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,       K4F,      \
-    K50, K51, K52,                K55,                K59, K5A, K5C, K5D,  K5E, K5F, K5G  \
-) { \
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, ___, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, K55, ___, ___, ___, K59, K5A, ___, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_ansi_split_bs( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C,  K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,       K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                      \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,            K4F,      \
-    K50, K51, K52,                K55,                K59, K5A, K5C, K5D,       K5E, K5F, K5G  \
-) { \
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, ___, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, K55, ___, ___, ___, K59, K5A, ___, K5C, K5D, K5E, K5F, K5G }  \
-}
diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json
index 1746353c26..4b7aff9ae3 100644
--- a/keyboards/linworks/fave87h/info.json
+++ b/keyboards/linworks/fave87h/info.json
@@ -8,6 +8,17 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"],
+        "rows": ["B1", "B2", "B3", "D3", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -19,195 +30,211 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "!", "x": 1, "y": 1.25 },
-                { "label": "@", "x": 2, "y": 1.25 },
-                { "label": "#", "x": 3, "y": 1.25 },
-                { "label": "$", "x": 4, "y": 1.25 },
-                { "label": "%", "x": 5, "y": 1.25 },
-                { "label": "^", "x": 6, "y": 1.25 },
-                { "label": "&", "x": 7, "y": 1.25 },
-                { "label": "*", "x": 8, "y": 1.25 },
-                { "label": "(", "x": 9, "y": 1.25 },
-                { "label": ")", "x": 10, "y": 1.25 },
-                { "label": "_", "x": 11, "y": 1.25 },
-                { "label": "+", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PgUp", "x": 17.25, "y": 1.25 },
-
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "{", "x": 11.5, "y": 2.25 },
-                { "label": "}", "x": 12.5, "y": 2.25 },
-                { "label": "|", "x": 13.5, "y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PgDn", "x": 17.25, "y": 2.25 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ":", "x": 10.75, "y": 3.25 },
-                { "label": "\"", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": "<", "x": 9.25, "y": 4.25 },
-                { "label": ">", "x": 10.25, "y": 4.25 },
-                { "label": "?", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_split_bs": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "!", "x": 1, "y": 1.25 },
-                { "label": "@", "x": 2, "y": 1.25 },
-                { "label": "#", "x": 3, "y": 1.25 },
-                { "label": "$", "x": 4, "y": 1.25 },
-                { "label": "%", "x": 5, "y": 1.25 },
-                { "label": "^", "x": 6, "y": 1.25 },
-                { "label": "&", "x": 7, "y": 1.25 },
-                { "label": "*", "x": 8, "y": 1.25 },
-                { "label": "(", "x": 9, "y": 1.25 },
-                { "label": ")", "x": 10, "y": 1.25 },
-                { "label": "_", "x": 11, "y": 1.25 },
-                { "label": "+", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25 },
-                { "label": "Delete", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PgUp", "x": 17.25, "y": 1.25 },
-
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "{", "x": 11.5, "y": 2.25 },
-                { "label": "}", "x": 12.5, "y": 2.25 },
-                { "label": "|", "x": 13.5, "y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PgDn", "x": 17.25, "y": 2.25 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ":", "x": 10.75, "y": 3.25 },
-                { "label": "\"", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": "<", "x": 9.25, "y": 4.25 },
-                { "label": ">", "x": 10.25, "y": 4.25 },
-                { "label": "?", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/linworks/fave87h/rules.mk b/keyboards/linworks/fave87h/rules.mk
index f876ea8a18..f92cb03d08 100644
--- a/keyboards/linworks/fave87h/rules.mk
+++ b/keyboards/linworks/fave87h/rules.mk
@@ -14,4 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h
index 19580b9464..66c5212371 100644
--- a/keyboards/linworks/whale75/config.h
+++ b/keyboards/linworks/whale75/config.h
@@ -18,19 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Force USB NKRO */
 #define FORCE_NKRO
 
-#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7, A0 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 3
 #define BACKLIGHT_PAL_MODE 6
 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it.
 
 /* Underglow */
-#define RGB_DI_PIN B9
 #define WS2812_EXTERNAL_PULLUP // This board uses a pull-up + 5 V tolerant GPIO in open drain config ro generate a 5 V signal
 #define RGBLED_NUM 18
 /* section for PWM WS2812 driver */
diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json
index b84425f6f6..c95cffb9c9 100644
--- a/keyboards/linworks/whale75/info.json
+++ b/keyboards/linworks/whale75/info.json
@@ -7,6 +7,15 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B9",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
+        "rows": ["B3", "B4", "B5", "B6", "B7", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A15", "pin_b": "A14", "resolution": 2}
diff --git a/keyboards/linworks/whale75/rules.mk b/keyboards/linworks/whale75/rules.mk
index bd6499b239..2fd78a13f1 100644
--- a/keyboards/linworks/whale75/rules.mk
+++ b/keyboards/linworks/whale75/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
-WS2812_DRIVER = pwm
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/littlealby/mute/config.h b/keyboards/littlealby/mute/config.h
index 343830cf87..bd2aa9c26b 100644
--- a/keyboards/littlealby/mute/config.h
+++ b/keyboards/littlealby/mute/config.h
@@ -18,6 +18,5 @@
 #define USB_MAX_POWER_CONSUMPTION 100
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 1
 #endif
diff --git a/keyboards/littlealby/mute/info.json b/keyboards/littlealby/mute/info.json
index 8837e60778..9d2a172116 100644
--- a/keyboards/littlealby/mute/info.json
+++ b/keyboards/littlealby/mute/info.json
@@ -8,6 +8,9 @@
     "pid": "0x4D55",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B6"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "matrix_pins": {
diff --git a/keyboards/lizard_trick/tenkey_plusplus/config.h b/keyboards/lizard_trick/tenkey_plusplus/config.h
index c2d33c6ae7..960e9ea019 100644
--- a/keyboards/lizard_trick/tenkey_plusplus/config.h
+++ b/keyboards/lizard_trick/tenkey_plusplus/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B7, D4, B5, B6, C6, C7 }
-#define MATRIX_COL_PINS { D5, D3, D2, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/lizard_trick/tenkey_plusplus/info.json b/keyboards/lizard_trick/tenkey_plusplus/info.json
index eb8ef5e48d..a14dcbdee7 100644
--- a/keyboards/lizard_trick/tenkey_plusplus/info.json
+++ b/keyboards/lizard_trick/tenkey_plusplus/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "F7"],
+        "rows": ["B7", "D4", "B5", "B6", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "D7"},
@@ -20,31 +25,31 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "Mute", "x": 0, "y": 0, "w": 1.3},
-                {"label": "MDPL", "x": 1.3, "y": 0, "w": 1.4},
-                {"label": "MDNX", "x": 2.7, "y": 0, "w": 1.3},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.3},
+                {"matrix": [0, 1], "x": 1.3, "y": 0, "w": 1.4},
+                {"matrix": [0, 3], "x": 2.7, "y": 0, "w": 1.3},
 
-                {"label": "Num Lock", "x": 0, "y": 1},
-                {"label": "/", "x": 1, "y": 1},
-                {"label": "*", "x": 2, "y": 1},
-                {"label": "-", "x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label": "7", "x": 0, "y": 2},
-                {"label": "8", "x": 1, "y": 2},
-                {"label": "9", "x": 2, "y": 2},
-                {"label": "+", "x": 3, "y": 2, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
 
-                {"label": "4", "x": 0, "y": 3},
-                {"label": "5", "x": 1, "y": 3},
-                {"label": "6", "x": 2, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"label": "1", "x": 0, "y": 4},
-                {"label": "2", "x": 1, "y": 4},
-                {"label": "3", "x": 2, "y": 4},
-                {"label": "Enter", "x": 3, "y": 4, "h" :2},
+                {"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, "h": 2},
 
-                {"label": "0", "x": 0, "y": 5, "w": 2},
-                {"label": ".", "x": 2, "y": 5}
+                {"matrix": [5, 1], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5}
             ]
         }
     }
diff --git a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.c b/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.c
deleted file mode 100644
index 96c0b92dff..0000000000
--- a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Jonathon Carstens jonathon@lizardtrick.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "tenkey_plusplus.h"
diff --git a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h b/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h
deleted file mode 100644
index 72f3880652..0000000000
--- a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2020 Jonathon Carstens jonathon@lizardtrick.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-    K00, K01,      K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32,      \
-    K40, K41, K42, K43, \
-         K51, K52       \
-) { \
-    { K00,   K01,   KC_NO, K03    }, \
-    { K10,   K11,   K12,   K13    }, \
-    { K20,   K21,   K22,   K23    }, \
-    { K30,   K31,   K32,   KC_NO  }, \
-    { K40,   K41,   K42,   K43    }, \
-    { KC_NO, K51,   K52,   KC_NO  }  \
-}
diff --git a/keyboards/ll3macorn/bongopad/bongopad.c b/keyboards/ll3macorn/bongopad/bongopad.c
index 42a8a199cb..f6d03ded6c 100644
--- a/keyboards/ll3macorn/bongopad/bongopad.c
+++ b/keyboards/ll3macorn/bongopad/bongopad.c
@@ -1,22 +1,6 @@
 // Copyright 2021 Ll3macorn (@ll3macorn)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include "bongopad.h"
-
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    // rest fo the code
-    if (clockwise) {
-        tap_code_delay(KC_VOLU, 10);
-    } else {
-        tap_code_delay(KC_VOLD, 10);
-    }
-    return true;
-}
-#endif
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/ll3macorn/bongopad/bongopad.h b/keyboards/ll3macorn/bongopad/bongopad.h
deleted file mode 100644
index 31fc0cc5c7..0000000000
--- a/keyboards/ll3macorn/bongopad/bongopad.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2021 Ll3macorn (@ll3macorn)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-	K00,           \
-	K10, K11, K12, \
-	K20, K21, K22, \
-	K30, K31, K32  \
-) { \
-	{ K00,   KC_NO, KC_NO }, \
-	{ K10,   K11,   K12 }, \
-	{ K20,   K21,   K22 }, \
-	{ K30,   K31,   K32 }  \
-}
-
diff --git a/keyboards/ll3macorn/bongopad/config.h b/keyboards/ll3macorn/bongopad/config.h
index 1ea347bfd6..b4d4367f1d 100644
--- a/keyboards/ll3macorn/bongopad/config.h
+++ b/keyboards/ll3macorn/bongopad/config.h
@@ -3,16 +3,8 @@
 #pragma once
 
 /* rgb underglow */
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 6
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F7, D7, C6, D4 }
-#define MATRIX_COL_PINS { F4, F5, F6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* misc */
 #define LAYER_STATE_8BIT
 #define NO_ACTION_TAPPING
diff --git a/keyboards/ll3macorn/bongopad/info.json b/keyboards/ll3macorn/bongopad/info.json
index f24e1a3f6f..f7276d6e82 100644
--- a/keyboards/ll3macorn/bongopad/info.json
+++ b/keyboards/ll3macorn/bongopad/info.json
@@ -8,6 +8,11 @@
 		"pid": "0x2949",
 		"device_version": "0.0.1"
 	},
+	"matrix_pins": {
+		"cols": ["F4", "F5", "F6"],
+		"rows": ["F7", "D7", "C6", "D4"]
+	},
+	"diode_direction": "COL2ROW",
 	"encoder": {
 		"rotary": [
 			{"pin_a": "B1", "pin_b": "B3"}
@@ -16,11 +21,28 @@
 	"bootmagic": {
 		"matrix": [1, 0]
 	},
+	"ws2812": {
+		"pin": "E6"
+	},
 	"processor": "atmega32u4",
 	"bootloader": "atmel-dfu",
 	"layouts": {
-	    "LAYOUT_default": {
-		"layout": [{"x":0, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
-	    }
+		"LAYOUT_default": {
+			"layout": [
+				{"matrix": [0, 0], "x": 0, "y": 0},
+
+				{"matrix": [1, 0], "x": 0, "y": 1},
+				{"matrix": [1, 1], "x": 1, "y": 1},
+				{"matrix": [1, 2], "x": 2, "y": 1},
+
+				{"matrix": [2, 0], "x": 0, "y": 2},
+				{"matrix": [2, 1], "x": 1, "y": 2},
+				{"matrix": [2, 2], "x": 2, "y": 2},
+
+				{"matrix": [3, 0], "x": 0, "y": 3},
+				{"matrix": [3, 1], "x": 1, "y": 3},
+				{"matrix": [3, 2], "x": 2, "y": 3}
+			]
+		}
 	}
-    }
\ No newline at end of file
+}
diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h
index be16ca1652..b4b2fc9f9e 100644
--- a/keyboards/lm_keyboard/lm60n/config.h
+++ b/keyboards/lm_keyboard/lm60n/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F1, F5, F6, F7, B3, B2, B1 }
-#define MATRIX_COL_PINS { B4, D7, D6, D4, D5, D3, D2, D1, D0, C6, B6, B5, F4, F0, E6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 41
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/lm_keyboard/lm60n/info.json b/keyboards/lm_keyboard/lm60n/info.json
index cfbce23c2e..73d8a51372 100644
--- a/keyboards/lm_keyboard/lm60n/info.json
+++ b/keyboards/lm_keyboard/lm60n/info.json
@@ -8,10 +8,18 @@
         "pid": "0x4B01",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "C6", "B6", "B5", "F4", "F0", "E6"],
+        "rows": ["F1", "F5", "F6", "F7", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7",
         "num_lock": "B7"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/lm_keyboard/lm60n/lm60n.c b/keyboards/lm_keyboard/lm60n/lm60n.c
deleted file mode 100644
index 91b010c6bd..0000000000
--- a/keyboards/lm_keyboard/lm60n/lm60n.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 gkeyboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "lm60n.h"
diff --git a/keyboards/loki65/config.h b/keyboards/loki65/config.h
index 80768d8445..00fde9ed33 100644
--- a/keyboards/loki65/config.h
+++ b/keyboards/loki65/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 }
-#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14, B15 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
@@ -35,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_CHANNEL 5
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
 
-#define RGB_DI_PIN A9
 #define RGBLED_NUM 37
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/loki65/info.json b/keyboards/loki65/info.json
index f2639713a5..183cb85a43 100644
--- a/keyboards/loki65/info.json
+++ b/keyboards/loki65/info.json
@@ -8,6 +8,15 @@
         "pid": "0x4C36",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A9",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "on_state": 0
diff --git a/keyboards/loki65/rules.mk b/keyboards/loki65/rules.mk
index f430af42f4..000ee78e21 100644
--- a/keyboards/loki65/rules.mk
+++ b/keyboards/loki65/rules.mk
@@ -17,5 +17,4 @@ 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
-WS2812_DRIVER = pwm         # Driver for RGB uderglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/longnald/corin/config.h b/keyboards/longnald/corin/config.h
index 2ee23c057b..ed18cd96b9 100644
--- a/keyboards/longnald/corin/config.h
+++ b/keyboards/longnald/corin/config.h
@@ -18,15 +18,6 @@
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { F4, F0, B2, B3, D5 }
-#define MATRIX_COL_PINS { F7, F6, F1, F5, B1, E6, D4, B7, D1, D2, D0, B4, B6, C6, C7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 64
 #    define RGBLIGHT_HUE_STEP 20
 #    define RGBLIGHT_SAT_STEP 20
@@ -37,4 +28,3 @@
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #    define RGBLIGHT_EFFECT_SNAKE
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
diff --git a/keyboards/longnald/corin/corin.c b/keyboards/longnald/corin/corin.c
deleted file mode 100644
index fabe3686d8..0000000000
--- a/keyboards/longnald/corin/corin.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 
- * Copyright (C) 2020 Longnald <support@longnald.com>
- * Copyright (C) 2020 Seaton Jiang <seaton@vtrois.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "corin.h"
\ No newline at end of file
diff --git a/keyboards/longnald/corin/info.json b/keyboards/longnald/corin/info.json
index 5381fd0e32..f639adb39a 100644
--- a/keyboards/longnald/corin/info.json
+++ b/keyboards/longnald/corin/info.json
@@ -8,6 +8,14 @@
     "pid": "0x1024",
     "device_version": "0.0.4"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F1", "F5", "B1", "E6", "D4", "B7", "D1", "D2", "D0", "B4", "B6", "C6", "C7"],
+    "rows": ["F4", "F0", "B2", "B3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/lpad/lpad.c b/keyboards/lpad/lpad.c
deleted file mode 100644
index 214dd2e390..0000000000
--- a/keyboards/lpad/lpad.c
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2023 Laneware Peripherals
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "quantum.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } 
-        return true; 
-}
-#endif
diff --git a/keyboards/lucid/alexa/alexa.c b/keyboards/lucid/alexa/alexa.c
deleted file mode 100644
index c8bbfcdc77..0000000000
--- a/keyboards/lucid/alexa/alexa.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2021 <hello@lucidkb.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "alexa.h"
diff --git a/keyboards/lucid/alexa/alexa.h b/keyboards/lucid/alexa/alexa.h
deleted file mode 100644
index 9fd221fcea..0000000000
--- a/keyboards/lucid/alexa/alexa.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2021 <hello@lucidkb.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�   ┌───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │0E │   │0D     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤   └───────┘
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B    │3D │3E │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │45                      │49  │4A  │ │4C │4D │4E │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K45,           K49, K4A,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
-    { K40, K41, K42, ___, ___, K45, ___, ___, ___, K49, K4A, ___, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K45,           K49, K4A,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
-    { K40, K41, K42, ___, ___, K45, ___, ___, ___, K49, K4A, ___, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/lucid/alexa/config.h b/keyboards/lucid/alexa/config.h
index 82dcbe66ab..2b4eb9c910 100644
--- a/keyboards/lucid/alexa/config.h
+++ b/keyboards/lucid/alexa/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/lucid/alexa/info.json b/keyboards/lucid/alexa/info.json
index 72ebafad5b..791d2b60d3 100644
--- a/keyboards/lucid/alexa/info.json
+++ b/keyboards/lucid/alexa/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
@@ -17,153 +22,153 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"Home", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"\"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
+                {"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},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"\"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
+                {"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},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/lucid/alexa_solder/alexa_solder.c b/keyboards/lucid/alexa_solder/alexa_solder.c
deleted file mode 100644
index 446e4f063a..0000000000
--- a/keyboards/lucid/alexa_solder/alexa_solder.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2022 <hello@makerkeyboards.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "alexa_solder.h"
diff --git a/keyboards/lucid/alexa_solder/config.h b/keyboards/lucid/alexa_solder/config.h
index 8345f486d9..80a707a180 100644
--- a/keyboards/lucid/alexa_solder/config.h
+++ b/keyboards/lucid/alexa_solder/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *Ã¥
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/lucid/alexa_solder/info.json b/keyboards/lucid/alexa_solder/info.json
index 849a681179..41cbc3b2f2 100644
--- a/keyboards/lucid/alexa_solder/info.json
+++ b/keyboards/lucid/alexa_solder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
diff --git a/keyboards/lucid/kbd8x_hs/config.h b/keyboards/lucid/kbd8x_hs/config.h
index 4fdafb75d4..bedbdb7de7 100644
--- a/keyboards/lucid/kbd8x_hs/config.h
+++ b/keyboards/lucid/kbd8x_hs/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *Ã¥
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B4, B5, B6, C0, E1, E0 }
-#define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/lucid/kbd8x_hs/info.json b/keyboards/lucid/kbd8x_hs/info.json
index 70c22a5dd2..ef78933882 100644
--- a/keyboards/lucid/kbd8x_hs/info.json
+++ b/keyboards/lucid/kbd8x_hs/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7"
     },
@@ -16,291 +21,313 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25, "w": 2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"SQ", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
-
         "LAYOUT_tkl_ansi_7u": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25, "w": 2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"SQ", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Win", "x":12.5, "y":5.25, "w":1},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
-
         "LAYOUT_tkl_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25, "w": 2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"SQ", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/lucid/kbd8x_hs/kbd8x_hs.h b/keyboards/lucid/kbd8x_hs/kbd8x_hs.h
deleted file mode 100644
index 565bc43a6a..0000000000
--- a/keyboards/lucid/kbd8x_hs/kbd8x_hs.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-Copyright 2020 <hello@lucidkb.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-/* === TKL ANSI w/ 6.25U Space === */
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,           K4F,      \
-    K50, K51, K52,           K55,                K59, K5A, K5B,      K5D, K5E, K5F, K5G  \
-) { \
-    { K00, KC_NO, K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, K3B,   KC_NO, K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, K41,   K42, K43,   K44,   K45, K46,   K47,   K48,   K49, K4A, KC_NO, K4C,   KC_NO, KC_NO, K4F,   KC_NO }, \
-    { K50, K51,   K52, KC_NO, KC_NO, K55, KC_NO, KC_NO, KC_NO, K59, K5A, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G   } \
-}
-
-/* === TKL ANSI w/ 7U Space === */
-#define LAYOUT_tkl_ansi_7u( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,           K4F,      \
-    K50, K51, K52,           K55,                     K5A, K5B,      K5D, K5E, K5F, K5G  \
-) { \
-    { K00, KC_NO, K02, K03,   K04,   K05, K06,   K07,   K08,   K09,   K0A, K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29,   K2A, K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39,   K3A, K3B,   KC_NO, K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, K41,   K42, K43,   K44,   K45, K46,   K47,   K48,   K49,   K4A, KC_NO, K4C,   KC_NO, KC_NO, K4F,   KC_NO }, \
-    { K50, K51,   K52, KC_NO, KC_NO, K55, KC_NO, KC_NO, KC_NO, KC_NO, K5A, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G   } \
-}
-
-/* === All used matrix spots populated === */
-#define LAYOUT_tkl_all( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,           K4F,      \
-    K50, K51, K52,           K55,                K59, K5A, K5B,      K5D, K5E, K5F, K5G  \
-) { \
-    { K00, KC_NO, K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, K3B,   KC_NO, K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, K41,   K42, K43,   K44,   K45, K46,   K47,   K48,   K49, K4A, KC_NO, K4C,   KC_NO, KC_NO, K4F,   KC_NO }, \
-    { K50, K51,   K52, KC_NO, KC_NO, K55, KC_NO, KC_NO, KC_NO, K59, K5A, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G   } \
-}
diff --git a/keyboards/lucid/kbd8x_hs/kbx8s_hs.c b/keyboards/lucid/kbd8x_hs/kbx8s_hs.c
deleted file mode 100644
index 52e4ed5394..0000000000
--- a/keyboards/lucid/kbd8x_hs/kbx8s_hs.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <hello@lucidkb.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "kbd8x_hs.h"
diff --git a/keyboards/lucid/phantom_hs/config.h b/keyboards/lucid/phantom_hs/config.h
index 4c035e2275..bedbdb7de7 100644
--- a/keyboards/lucid/phantom_hs/config.h
+++ b/keyboards/lucid/phantom_hs/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/lucid/phantom_hs/info.json b/keyboards/lucid/phantom_hs/info.json
index 569f05d414..5709d422d4 100644
--- a/keyboards/lucid/phantom_hs/info.json
+++ b/keyboards/lucid/phantom_hs/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
@@ -17,77 +22,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
+                {"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},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/lucid/phantom_hs/phantom_hs.c b/keyboards/lucid/phantom_hs/phantom_hs.c
deleted file mode 100644
index 4d10b67bd6..0000000000
--- a/keyboards/lucid/phantom_hs/phantom_hs.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <hello@lucidkb.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "phantom_hs.h"
diff --git a/keyboards/lucid/phantom_hs/phantom_hs.h b/keyboards/lucid/phantom_hs/phantom_hs.h
deleted file mode 100644
index 6dc53cfa7b..0000000000
--- a/keyboards/lucid/phantom_hs/phantom_hs.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 <hello@lucidkb.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* Phantom Keymap Definitions */
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,   K0E }, \
-    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D,   K1E }, \
-    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B,   K2C,   KC_NO, K2E }, \
-    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, K3B,   KC_NO, K3D,   K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C,   K4D,   K4E }  \
-}
diff --git a/keyboards/lucid/phantom_solder/config.h b/keyboards/lucid/phantom_solder/config.h
index 1c696f8eb2..bedbdb7de7 100644
--- a/keyboards/lucid/phantom_solder/config.h
+++ b/keyboards/lucid/phantom_solder/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *Ã¥
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/lucid/phantom_solder/info.json b/keyboards/lucid/phantom_solder/info.json
index 15cf74a8eb..53e6170dde 100644
--- a/keyboards/lucid/phantom_solder/info.json
+++ b/keyboards/lucid/phantom_solder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7"
     },
diff --git a/keyboards/lucid/phantom_solder/phantom_solder.c b/keyboards/lucid/phantom_solder/phantom_solder.c
deleted file mode 100644
index bd036146f4..0000000000
--- a/keyboards/lucid/phantom_solder/phantom_solder.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <hello@lucidkb.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "phantom_solder.h"
diff --git a/keyboards/lucid/scarlet/config.h b/keyboards/lucid/scarlet/config.h
index 4fdafb75d4..bedbdb7de7 100644
--- a/keyboards/lucid/scarlet/config.h
+++ b/keyboards/lucid/scarlet/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *Ã¥
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B4, B5, B6, C0, E1, E0 }
-#define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/lucid/scarlet/info.json b/keyboards/lucid/scarlet/info.json
index 9d4006a8fe..89cdd21806 100644
--- a/keyboards/lucid/scarlet/info.json
+++ b/keyboards/lucid/scarlet/info.json
@@ -8,103 +8,116 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "at90usb646",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_tkl_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
 
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Back Space", "x":13, "y":1.25, "w": 2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"SQ", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/lucid/scarlet/scarlet.c b/keyboards/lucid/scarlet/scarlet.c
deleted file mode 100644
index aa26a78c43..0000000000
--- a/keyboards/lucid/scarlet/scarlet.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <hello@lucidkb.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "scarlet.h"
diff --git a/keyboards/lucid/scarlet/scarlet.h b/keyboards/lucid/scarlet/scarlet.h
deleted file mode 100644
index c9309c635a..0000000000
--- a/keyboards/lucid/scarlet/scarlet.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 <hello@lucidkb.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* === All used matrix spots populated === */
-#define LAYOUT_tkl_all( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,           K4F,      \
-    K50, K51, K52,           K55,                K59, K5A, K5B,      K5D, K5E, K5F, K5G  \
-) { \
-    { K00, KC_NO, K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, K3B,   KC_NO, K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, K41,   K42, K43,   K44,   K45, K46,   K47,   K48,   K49, K4A, KC_NO, K4C,   KC_NO, KC_NO, K4F,   KC_NO }, \
-    { K50, K51,   K52, KC_NO, KC_NO, K55, KC_NO, KC_NO, KC_NO, K59, K5A, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G   } \
-}
diff --git a/keyboards/lw67/config.h b/keyboards/lw67/config.h
index 4ca1261982..c9f23257a3 100644
--- a/keyboards/lw67/config.h
+++ b/keyboards/lw67/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, B7, D0, D1, D2 }
-#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, B0, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/lw67/info.json b/keyboards/lw67/info.json
index f443702d69..2dae9dc2e1 100644
--- a/keyboards/lw67/info.json
+++ b/keyboards/lw67/info.json
@@ -8,6 +8,11 @@
         "pid": "0x9998",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "B0", "B1"],
+        "rows": ["E6", "B7", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F0", "pin_b": "F1"}
diff --git a/keyboards/lw67/lw67.c b/keyboards/lw67/lw67.c
index 87eaa1671e..87f69e9df5 100644
--- a/keyboards/lw67/lw67.c
+++ b/keyboards/lw67/lw67.c
@@ -15,16 +15,3 @@
   */ 
 
 #include "lw67.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } 
-        return false; 
-}
-
diff --git a/keyboards/lw75/config.h b/keyboards/lw75/config.h
index 77a51635b4..ce4da1d32e 100644
--- a/keyboards/lw75/config.h
+++ b/keyboards/lw75/config.h
@@ -3,16 +3,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, B7, D0, D1, D2, B1 }
-#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, B0, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/lw75/info.json b/keyboards/lw75/info.json
index de5f70ca14..3249465704 100644
--- a/keyboards/lw75/info.json
+++ b/keyboards/lw75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1111",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "B0", "B2"],
+        "rows": ["E6", "B7", "D0", "D1", "D2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F0", "pin_b": "F1"}
diff --git a/keyboards/lw75/lw75.c b/keyboards/lw75/lw75.c
index 110a26ce1a..1ec6841515 100644
--- a/keyboards/lw75/lw75.c
+++ b/keyboards/lw75/lw75.c
@@ -2,18 +2,3 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "lw75.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } 
-        return true; 
-}
-#endif
-
diff --git a/keyboards/lxxt/info.json b/keyboards/lxxt/info.json
index 0a90b3e00b..abd0d7c84f 100644
--- a/keyboards/lxxt/info.json
+++ b/keyboards/lxxt/info.json
@@ -20,8 +20,11 @@
         "rows": ["GP29", "GP26", "GP22", "GP24", "GP17"],
         "cols": ["GP25", "GP23", "GP7", "GP0", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"]
     },
+    "ws2812": {
+        "pin": "GP21",
+        "driver": "vendor"
+    },
 	"rgblight": {
-	"pin": "GP21",
 	"led_count": 16,
 	"hue_steps": 8,
 	"saturation_steps": 8,
diff --git a/keyboards/lxxt/rules.mk b/keyboards/lxxt/rules.mk
index 7fbf8d36ab..5af1ba8536 100644
--- a/keyboards/lxxt/rules.mk
+++ b/keyboards/lxxt/rules.mk
@@ -1,3 +1 @@
 ENCODER_ENABLE = yes
-
-WS2812_DRIVER = vendor
diff --git a/keyboards/lyso1/lck75/config.h b/keyboards/lyso1/lck75/config.h
index 110d7ecfe9..ef5df5dd3d 100644
--- a/keyboards/lyso1/lck75/config.h
+++ b/keyboards/lyso1/lck75/config.h
@@ -16,24 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14  15*/
-#define MATRIX_ROW_PINS { C2, C3, C7, C4, C6, C5 }
-#define MATRIX_COL_PINS { A0, B0, A1, B1, A2, B2, A3, B3, A4, B4, A5, A6, A7, D7, D6, D5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -59,7 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    undef LOCKING_RESYNC_ENABLE
 #endif
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM 200
 
diff --git a/keyboards/lyso1/lck75/info.json b/keyboards/lyso1/lck75/info.json
index f3102475d9..9369fc54fe 100644
--- a/keyboards/lyso1/lck75/info.json
+++ b/keyboards/lyso1/lck75/info.json
@@ -8,6 +8,11 @@
       "pid": "0x6163",
       "device_version": "0.0.2"
     },
+    "matrix_pins": {
+      "cols": ["A0", "B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "B4", "A5", "A6", "A7", "D7", "D6", "D5"],
+      "rows": ["C2", "C3", "C7", "C4", "C6", "C5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "D1", "pin_b": "D0", "resolution": 2}
@@ -17,25 +22,721 @@
     "bootloader": "usbasploader",
     "layouts": {
         "LAYOUT_default": {
-          "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"Mute", "x":15.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"PgDn", "x":15.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"[", "x":11.5, "y":2.25}, {"label":"]", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15.5, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":";", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Del", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"MO(1)", "x":15.5, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         },
         "LAYOUT_7u": {
-          "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"Mute", "x":15.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"PgDn", "x":15.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"[", "x":11.5, "y":2.25}, {"label":"]", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15.5, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":";", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Del", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"MO(1)", "x":15.5, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":1.5, "y":5.25, "w":1.5}, {"x":3, "y":5.25, "w":7}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         },
         "LAYOUT_7u_iso": {
-          "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"Mute", "x":15.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"PgDn", "x":15.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"[", "x":11.5, "y":2.25}, {"label":"]", "x":12.5, "y":2.25}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"PgUp", "x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.25}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":";", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"|", "x":12.75, "y":3.25}, {"label":"Del", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"Shift", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"MO(1)", "x":15.5, "y":4.25}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"Alt", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":1.5, "y":5.25, "w":1.5}, {"x":3, "y":5.25, "w":7}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         },
         "LAYOUT_iso": {
-           "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"Mute", "x":15.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"PgDn", "x":15.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"[", "x":11.5, "y":2.25}, {"label":"]", "x":12.5, "y":2.25}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"PgUp", "x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.25}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":";", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"|", "x":12.75, "y":3.25}, {"label":"Del", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"Shift", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"MO(1)", "x":15.5, "y":4.25}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"Alt", "x":0, "y":5.25, "w":1.25}, {"label":"Alt", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         },
-	"LAYOUT_sbs": {
-           "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"Mute", "x":15.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"|", "x":13, "y":1.25}, {"label":"Insert", "x":14, "y":1.25}, {"label":"PgDn", "x":15.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"[", "x":11.5, "y":2.25}, {"label":"]", "x":12.5, "y":2.25}, {"label":"Backspace", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.25}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":";", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Del", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"MO(1)", "x":15.5, "y":4.25}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"Alt", "x":0, "y":5.25, "w":1.25}, {"label":"Alt", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+        "LAYOUT_sbs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         },
-	"LAYOUT_7u_sbs": {
-           "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"Mute", "x":15.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"|", "x":13, "y":1.25}, {"label":"Insert", "x":14, "y":1.25}, {"label":"PgDn", "x":15.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"[", "x":11.5, "y":2.25}, {"label":"]", "x":12.5, "y":2.25}, {"label":"Backspace", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.25}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":";", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Del", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"MO(1)", "x":15.5, "y":4.25}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"Alt", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":1.5, "y":5.25, "w":1.5}, {"x":3, "y":5.25, "w":7}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+        "LAYOUT_7u_sbs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         },
-	"LAYOUT_iso_sbs": {
-           "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"Mute", "x":15.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Ins", "x":13, "y":1.25}, {"label":"Del", "x":14, "y":1.25}, {"label":"PgDn", "x":15.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"[", "x":11.5, "y":2.25}, {"label":"]", "x":12.5, "y":2.25}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"PgUp", "x":15.5, "y":2.25}, {"x":0, "y":3.25, "w":1.25}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":";", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"|", "x":12.75, "y":3.25}, {"label":"Del", "x":15.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"Shift", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"MO(1)", "x":15.5, "y":4.25}, {"label":"Up", "x":14.25, "y":4.5}, {"label":"Alt", "x":0, "y":5.25, "w":1.25}, {"label":"Alt", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"Left", "x":13.25, "y":5.5}, {"label":"Down", "x":14.25, "y":5.5}, {"label":"Right", "x":15.25, "y":5.5}]
+        "LAYOUT_iso_sbs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/keyboards/lyso1/lck75/lck75.c b/keyboards/lyso1/lck75/lck75.c
index 55650681ac..af0cdc6467 100644
--- a/keyboards/lyso1/lck75/lck75.c
+++ b/keyboards/lyso1/lck75/lck75.c
@@ -12,19 +12,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "lck75.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
+#include "quantum.h"
 
 #define IDLE_FRAMES 5
 #define IDLE_SPEED 30
diff --git a/keyboards/lyso1/lck75/lck75.h b/keyboards/lyso1/lck75/lck75.h
deleted file mode 100644
index d7648eff2a..0000000000
--- a/keyboards/lyso1/lck75/lck75.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Copyright 2020 Lyso1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-//#define BONGO ENABLE
-
-#pragma once
-
-
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_default(\
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
-    K50, K51, K52,                K56,                K5A, K5B, K5C,      K5E, K5F \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, K0E, K0F}, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, _x_, K1E, K1F}, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _x_, K2E, K2F}, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, _x_, K3E, K3F}, \
-  { K40, _x_, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
-  { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_7u( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
-    K50,      K52,                K56,                K5A, K5B, K5C,      K5E, K5F \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, K0E, K0F}, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, _x_, K1E, K1F}, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _x_, K2E, K2F}, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, _x_, K3E, K3F}, \
-  { K40, _x_, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
-  { K50, _x_, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_iso_sbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
-    K50, K51, K52,                K56,                K5A, K5B, K5C,      K5E, K5F \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, K0E, K0F}, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _x_, _x_, K2F}, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, _x_, K3E, K3F}, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
-  { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_sbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
-    K50, K51, K52,                K56,                K5A, K5B, K5C,      K5E, K5F \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, K0E, K0F}, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _x_, K2E, K2F}, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, _x_, K3E, K3F}, \
-  { K40, _x_, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
-  { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_7u_sbs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
-    K50,      K52,                K56,                K5A, K5B, K5C,      K5E, K5F \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, K0E, K0F}, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _x_, K2E, K2F}, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, _x_, K3E, K3F}, \
-  { K40, _x_, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
-  { K50, _x_, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
-    K50, K51, K52,                K56,                K5A, K5B, K5C,      K5E, K5F \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, K0E, K0F}, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, _x_, K1E, K1F}, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _x_, _x_, K2F}, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, _x_, K3E, K3F}, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
-  { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
-
-#define LAYOUT_7u_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
-    K50,      K52,                K56,                K5A, K5B, K5C,      K5E, K5F \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _x_, K0E, K0F}, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, _x_, K1E, K1F}, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, _x_, _x_, K2F}, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, _x_, K3E, K3F}, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, _x_, K4E, K4F}, \
-  { K50, _x_, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, K5B, K5C, _x_, K5E, K5F} \
-}
diff --git a/keyboards/lyso1/lefishe/config.h b/keyboards/lyso1/lefishe/config.h
index 647ccf707a..5f12ded844 100644
--- a/keyboards/lyso1/lefishe/config.h
+++ b/keyboards/lyso1/lefishe/config.h
@@ -16,14 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { F0, F1, D5, C7, C6, B6, B5, B4, D7, D6, D4, D3, D2, D1, D0, B3, B2, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/lyso1/lefishe/info.json b/keyboards/lyso1/lefishe/info.json
index ad9618f1c1..580a6e0959 100644
--- a/keyboards/lyso1/lefishe/info.json
+++ b/keyboards/lyso1/lefishe/info.json
@@ -8,20 +8,373 @@
         "pid": "0x6169",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "D5", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B3", "B2", "B1"],
+        "rows": ["B7", "F7", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
-	"LAYOUT_default": {
-         "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"label":"Caps", "x":2.25, "y":2, "w":1.25}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"LGUI", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+        "LAYOUT_default": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 16], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 15], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
+            ]
         },
-	 "LAYOUT_wk_sbs": {
-           "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"|", "x":15.25, "y":0}, {"x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps", "x":2.25, "y":2, "w":1.25}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"LGUI", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+        "LAYOUT_wk_sbs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 16], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 15], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
+            ]
         },
-	 "LAYOUT_wkl_sbs": {
-            "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"|", "x":15.25, "y":0}, {"x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps", "x":2.25, "y":2, "w":1.25}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+        "LAYOUT_wkl_sbs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 16], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 15], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
+            ]
         },
-	 "LAYOUT_wkl": {
-            "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps", "x":2.25, "y":2, "w":1.25}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+        "LAYOUT_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 16], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 15], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/lyso1/lefishe/lefishe.c b/keyboards/lyso1/lefishe/lefishe.c
deleted file mode 100644
index c557a59c2d..0000000000
--- a/keyboards/lyso1/lefishe/lefishe.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Lyso1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "lefishe.h"
diff --git a/keyboards/lyso1/lefishe/lefishe.h b/keyboards/lyso1/lefishe/lefishe.h
deleted file mode 100644
index 98197b21c4..0000000000
--- a/keyboards/lyso1/lefishe/lefishe.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2020 Lyso1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015,       K017, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,       K116, K117, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,             K216, K217, \
-	K300, K301, K302,       K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, K316, K317, \
-	K400, K401, K402, K403, K404,                   K408,                         K413,       K415, K416, K417  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  KC_NO, K017 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  KC_NO, K116,  K117 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, KC_NO, K216,  K217 }, \
-	{ K300,  K301,  K302,  KC_NO, K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315,  K316,  K317 }, \
-	{ K400,  K401,  K402,  K403,  K404,  KC_NO, KC_NO, KC_NO, K408,  KC_NO, KC_NO, KC_NO, KC_NO, K413,  KC_NO, K415,  K416,  K417 }  \
-}
-
-#define LAYOUT_wk_sbs( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,       K116, K117, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,             K216, K217, \
-	K300, K301, K302,       K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, K316, K317, \
-	K400, K401, K402, K403, K404,                   K408,                         K413,       K415, K416, K417  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  KC_NO, K116,  K117 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, KC_NO, K216,  K217 }, \
-	{ K300,  K301,  K302,  KC_NO, K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315,  K316,  K317 }, \
-	{ K400,  K401,  K402,  K403,  K404,  KC_NO, KC_NO, KC_NO, K408,  KC_NO, KC_NO, KC_NO, KC_NO, K413,  KC_NO, K415,  K416,  K417 }  \
-}
-
-#define LAYOUT_wkl_sbs( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,       K116, K117, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,             K216, K217, \
-	K300, K301, K302,       K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, K316, K317, \
-	K400, K401, K402,       K404,                   K408,                         K413,       K415, K416, K417  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  KC_NO, K116,  K117 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, KC_NO, K216,  K217 }, \
-	{ K300,  K301,  K302,  KC_NO, K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315,  K316,  K317 }, \
-	{ K400,  K401,  K402,  KC_NO, K404,  KC_NO, KC_NO, KC_NO, K408,  KC_NO, KC_NO, KC_NO, KC_NO, K413,  KC_NO, K415,  K416,  K417 }  \
-}
-
-#define LAYOUT_wkl( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015,       K017, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,       K116, K117, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,             K216, K217, \
-	K300, K301, K302,       K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, K316, K317, \
-	K400, K401, K402,       K404,                   K408,                         K413,       K415, K416, K417  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  KC_NO, K017 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  KC_NO, K116,  K117 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, KC_NO, K216,  K217 }, \
-	{ K300,  K301,  K302,  KC_NO, K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315,  K316,  K317 }, \
-	{ K400,  K401,  K402,  KC_NO, K404,  KC_NO, KC_NO, KC_NO, K408,  KC_NO, KC_NO, KC_NO, KC_NO, K413,  KC_NO, K415,  K416,  K417 }  \
-}
diff --git a/keyboards/lz/erghost/config.h b/keyboards/lz/erghost/config.h
index 0f9730066e..d8dd76c62d 100644
--- a/keyboards/lz/erghost/config.h
+++ b/keyboards/lz/erghost/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION ROW2COL
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 28
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/lz/erghost/erghost.c b/keyboards/lz/erghost/erghost.c
deleted file mode 100644
index 7ea321e12e..0000000000
--- a/keyboards/lz/erghost/erghost.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "erghost.h"
diff --git a/keyboards/lz/erghost/erghost.h b/keyboards/lz/erghost/erghost.h
index 5f5244340c..9ea2f716f5 100644
--- a/keyboards/lz/erghost/erghost.h
+++ b/keyboards/lz/erghost/erghost.h
@@ -62,6 +62,6 @@
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C, KC_NO,   K2E,   K2F,   K2G   }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, KC_NO,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
     { K50,   K51,   K52,   KC_NO, K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
 }
diff --git a/keyboards/lz/erghost/info.json b/keyboards/lz/erghost/info.json
index 0ba1055fe3..b1e4ea8f29 100644
--- a/keyboards/lz/erghost/info.json
+++ b/keyboards/lz/erghost/info.json
@@ -12,6 +12,9 @@
         "pin": "B6",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "D6",
         "num_lock": "D7",
diff --git a/keyboards/m10a/config.h b/keyboards/m10a/config.h
index dac3f44a3e..6c9b63c5ee 100644
--- a/keyboards/m10a/config.h
+++ b/keyboards/m10a/config.h
@@ -18,14 +18,6 @@
 
 #pragma once
 
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { B6, F7, F6, D6 }
-#define MATRIX_COL_PINS { F5, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/m10a/info.json b/keyboards/m10a/info.json
index f517d49087..08da6e584a 100644
--- a/keyboards/m10a/info.json
+++ b/keyboards/m10a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x00AA",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F1", "F0"],
+        "rows": ["B6", "F7", "F6", "D6"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B7",
         "levels": 6
@@ -17,19 +22,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
 
-                {"x":1, "y":3, "w":2}
+                {"matrix": [3, 2], "x": 1, "y": 3, "w": 2}
             ]
         }
     }
diff --git a/keyboards/m10a/m10a.c b/keyboards/m10a/m10a.c
deleted file mode 100644
index d9e7503a48..0000000000
--- a/keyboards/m10a/m10a.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright
- *   2017 Josh Black (@consolenaut)
- *   2021 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "m10a.h"
diff --git a/keyboards/m10a/m10a.h b/keyboards/m10a/m10a.h
deleted file mode 100644
index 2eb14b7a7f..0000000000
--- a/keyboards/m10a/m10a.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright
- *   2017 Josh Black (@consolenaut)
- *   2021 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
-      k00, k01, k02, \
-      k10, k11, k12, \
-      k20, k21, k22, \
-                k32  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 }, \
-    { ___, ___, k32 } \
-}
diff --git a/keyboards/machine_industries/m4_a/config.h b/keyboards/machine_industries/m4_a/config.h
index 0e71c0e8c1..da001ee1da 100644
--- a/keyboards/machine_industries/m4_a/config.h
+++ b/keyboards/machine_industries/m4_a/config.h
@@ -3,23 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C7, C6 }
-#define MATRIX_COL_PINS { F6, F7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/machine_industries/m4_a/info.json b/keyboards/machine_industries/m4_a/info.json
index 05c2a57234..7ab42a0213 100644
--- a/keyboards/machine_industries/m4_a/info.json
+++ b/keyboards/machine_industries/m4_a/info.json
@@ -8,15 +8,20 @@
         "pid": "0x004A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7"],
+        "rows": ["C7", "C6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0, "h":2},
-                {"x":0, "y":1, "w":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0, "h": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 2}
             ]
         }
     }
diff --git a/keyboards/machine_industries/m4_a/m4_a.c b/keyboards/machine_industries/m4_a/m4_a.c
deleted file mode 100644
index a1598688a8..0000000000
--- a/keyboards/machine_industries/m4_a/m4_a.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 naut
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "m4_a.h"
diff --git a/keyboards/machine_industries/m4_a/m4_a.h b/keyboards/machine_industries/m4_a/m4_a.h
deleted file mode 100644
index 13d3010991..0000000000
--- a/keyboards/machine_industries/m4_a/m4_a.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2022 naut
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k11, \
-    k10  \
-) { \
-    { k00, k01 }, \
-    { k10, k11 }  \
-}
diff --git a/keyboards/machkeyboards/mach3/config.h b/keyboards/machkeyboards/mach3/config.h
deleted file mode 100644
index ba1628e954..0000000000
--- a/keyboards/machkeyboards/mach3/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Mach Keyboards
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key pins */
-#define MATRIX_ROW_PINS { D1, D0, D4 }
-#define MATRIX_COL_PINS { E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/machkeyboards/mach3/info.json b/keyboards/machkeyboards/mach3/info.json
index 767beb2026..3af4e154c1 100644
--- a/keyboards/machkeyboards/mach3/info.json
+++ b/keyboards/machkeyboards/mach3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4D33",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B5"],
+        "rows": ["D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 5,
diff --git a/keyboards/macro1/config.h b/keyboards/macro1/config.h
index a03f212f37..30b3906f0d 100644
--- a/keyboards/macro1/config.h
+++ b/keyboards/macro1/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, B7, D0, D1, D2, B3 }
-#define MATRIX_COL_PINS { D3, D4, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/macro1/info.json b/keyboards/macro1/info.json
index ae4de40310..5fb86fecb7 100644
--- a/keyboards/macro1/info.json
+++ b/keyboards/macro1/info.json
@@ -8,6 +8,11 @@
       "pid": "0x9999",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["D3", "D4", "D6", "D7"],
+      "rows": ["E6", "B7", "D0", "D1", "D2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "F0", "pin_b": "F1"}
diff --git a/keyboards/macro1/macro1.c b/keyboards/macro1/macro1.c
index f1fbed1d15..a9cba4ecfa 100644
--- a/keyboards/macro1/macro1.c
+++ b/keyboards/macro1/macro1.c
@@ -14,18 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "macro1.h"
-
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return false;
-}
diff --git a/keyboards/majistic/config.h b/keyboards/majistic/config.h
index 2ff78e2bed..c896b12478 100644
--- a/keyboards/majistic/config.h
+++ b/keyboards/majistic/config.h
@@ -18,15 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, F4, F5 }  // F4, F5 is dummy
-#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS_RIGHT { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/majistic/info.json b/keyboards/majistic/info.json
index be3a1cafdd..7c475660c7 100644
--- a/keyboards/majistic/info.json
+++ b/keyboards/majistic/info.json
@@ -8,8 +8,19 @@
     	"pid": "0x6E55",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-    	"soft_serial_pin": "D2"
+    	"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",
diff --git a/keyboards/majistic/majistic.c b/keyboards/majistic/majistic.c
deleted file mode 100644
index 7ceba7cf28..0000000000
--- a/keyboards/majistic/majistic.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 yossiyossy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "majistic.h"
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/config.h b/keyboards/makenova/omega/omega4/keymaps/default/config.h
index 1d2dd05351..c60e064e21 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default/config.h
@@ -9,4 +9,3 @@
 #endif
 
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
index 1d2dd05351..c60e064e21 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
@@ -9,4 +9,3 @@
 #endif
 
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
index 1d2dd05351..c60e064e21 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
@@ -9,4 +9,3 @@
 #endif
 
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/omega4.c b/keyboards/makenova/omega/omega4/omega4.c
deleted file mode 100644
index b64ae638bd..0000000000
--- a/keyboards/makenova/omega/omega4/omega4.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 makenova (@makenova)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "omega4.h"
diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h
index c00353db89..64f4553f90 100644
--- a/keyboards/makrosu/config.h
+++ b/keyboards/makrosu/config.h
@@ -16,39 +16,10 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B6 }
-#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5}
-
 #define TAP_CODE_DELAY 10
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-
-// EEPROM usage
-
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json
index 77974305e5..96eaf9fad6 100644
--- a/keyboards/makrosu/info.json
+++ b/keyboards/makrosu/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8585",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B1", "F7", "F6", "F5"],
+        "rows": ["B6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "E6", "pin_b": "D1"}
@@ -21,14 +26,13 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-      
-                {"label" : "Esc", "x":0, "y":0},
-                {"label" : "F1", "x":1, "y":0},
-                {"label" : "F2", "x":2, "y":0},
-                
-                {"label" : "Lower", "x":0, "y":1},
-                {"label" : "Z", "x":1.5, "y":1},
-                {"label" : "X", "x":2.5, "y":1}
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1.5, "y": 1},
+                {"matrix": [0, 5], "x": 2.5, "y": 1}
             ]
         }
     }
diff --git a/keyboards/makrosu/makrosu.c b/keyboards/makrosu/makrosu.c
deleted file mode 100644
index 8a9a222789..0000000000
--- a/keyboards/makrosu/makrosu.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2021 Valdydesu_ 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#include "makrosu.h"
diff --git a/keyboards/makrosu/makrosu.h b/keyboards/makrosu/makrosu.h
deleted file mode 100644
index ee61ce1185..0000000000
--- a/keyboards/makrosu/makrosu.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K02, K03, K04, \
-    K00, K01, K05  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05 }, \
-}
-
diff --git a/keyboards/malevolti/lyra/lyra.c b/keyboards/malevolti/lyra/lyra.c
index cd8d7c2e8b..0bc9b6b20f 100644
--- a/keyboards/malevolti/lyra/lyra.c
+++ b/keyboards/malevolti/lyra/lyra.c
@@ -13,7 +13,7 @@
   * You should have received a copy of the GNU General Public License 
   * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
   */ 
-#include "lyra.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 
diff --git a/keyboards/malevolti/lyra/lyra.h b/keyboards/malevolti/lyra/lyra.h
deleted file mode 100644
index 941f292c93..0000000000
--- a/keyboards/malevolti/lyra/lyra.h
+++ /dev/null
@@ -1,23 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-#include "quantum.h"
-
-
-#ifdef KEYBOARD_malevolti_lyra_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/malevolti/lyra/rev1/config.h b/keyboards/malevolti/lyra/rev1/config.h
index 113174ff1e..38a1a09cd3 100644
--- a/keyboards/malevolti/lyra/rev1/config.h
+++ b/keyboards/malevolti/lyra/rev1/config.h
@@ -15,10 +15,4 @@
   */
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 100
diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json
index 572e5c118d..2cc916c7cf 100644
--- a/keyboards/malevolti/lyra/rev1/info.json
+++ b/keyboards/malevolti/lyra/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4C43",
         "device_version": "30.3.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/malevolti/lyra/rev1/rev1.c b/keyboards/malevolti/lyra/rev1/rev1.c
deleted file mode 100644
index db31ea975c..0000000000
--- a/keyboards/malevolti/lyra/rev1/rev1.c
+++ /dev/null
@@ -1,19 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "rev1.h"
-
-
diff --git a/keyboards/malevolti/lyra/rev1/rev1.h b/keyboards/malevolti/lyra/rev1/rev1.h
index 81b862c5c6..021350f106 100644
--- a/keyboards/malevolti/lyra/rev1/rev1.h
+++ b/keyboards/malevolti/lyra/rev1/rev1.h
@@ -15,7 +15,7 @@
   */ 
 
 #pragma once
-#include "lyra.h"
+#include "quantum.h"
 
 
 #define LAYOUT( \
diff --git a/keyboards/malevolti/superlyra/rev1/config.h b/keyboards/malevolti/superlyra/rev1/config.h
index 4a56b96808..cffc2e9ff2 100644
--- a/keyboards/malevolti/superlyra/rev1/config.h
+++ b/keyboards/malevolti/superlyra/rev1/config.h
@@ -15,10 +15,4 @@
   */ 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 100
diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json
index c45b496c54..1c0e9c72bc 100644
--- a/keyboards/malevolti/superlyra/rev1/info.json
+++ b/keyboards/malevolti/superlyra/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4C53",
         "device_version": "30.3.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
+        "rows": ["B7", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/malevolti/superlyra/rev1/rev1.c b/keyboards/malevolti/superlyra/rev1/rev1.c
deleted file mode 100644
index 35b44aed16..0000000000
--- a/keyboards/malevolti/superlyra/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "rev1.h"
diff --git a/keyboards/malevolti/superlyra/rev1/rev1.h b/keyboards/malevolti/superlyra/rev1/rev1.h
index 8bc17d1173..fd3c819e11 100644
--- a/keyboards/malevolti/superlyra/rev1/rev1.h
+++ b/keyboards/malevolti/superlyra/rev1/rev1.h
@@ -15,7 +15,7 @@
   */ 
 
 #pragma once
-#include "superlyra.h"
+#include "quantum.h"
 
 
 #define LAYOUT( \
diff --git a/keyboards/malevolti/superlyra/superlyra.c b/keyboards/malevolti/superlyra/superlyra.c
deleted file mode 100644
index 045ec9a097..0000000000
--- a/keyboards/malevolti/superlyra/superlyra.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#include "superlyra.h"
-
diff --git a/keyboards/malevolti/superlyra/superlyra.h b/keyboards/malevolti/superlyra/superlyra.h
deleted file mode 100644
index b3c0f16daf..0000000000
--- a/keyboards/malevolti/superlyra/superlyra.h
+++ /dev/null
@@ -1,23 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-#include "quantum.h"
-
-
-#ifdef KEYBOARD_malevolti_superlyra_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h
index 8c8e3f4ccb..918edbdbb0 100644
--- a/keyboards/manta60/config.h
+++ b/keyboards/manta60/config.h
@@ -17,27 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 ,B4}
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 68
 #    define RGBLIGHT_SPLIT
 #    define RGBLED_SPLIT { 34, 34 }
@@ -61,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 #    define USB_MAX_POWER_CONSUMPTION 400
diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json
index e81c4e4580..2802f75821 100644
--- a/keyboards/manta60/info.json
+++ b/keyboards/manta60/info.json
@@ -8,9 +8,17 @@
         "pid": "0x991D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/manta60/manta60.c b/keyboards/manta60/manta60.c
deleted file mode 100644
index 1013fce72d..0000000000
--- a/keyboards/manta60/manta60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kamonanban
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "manta60.h"
diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h
index 1839a1091d..3d4d25aad3 100644
--- a/keyboards/manyboard/macro/config.h
+++ b/keyboards/manyboard/macro/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { D4, D5, D6, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Pins */
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 2
 #define RGBLIGHT_LIMIT_VAL 10
diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json
index cdf40f6801..ad7bf1e556 100644
--- a/keyboards/manyboard/macro/info.json
+++ b/keyboards/manyboard/macro/info.json
@@ -8,32 +8,43 @@
         "pid": "0x0015",
         "device_version": "1.0.3"
     },
+    "matrix_pins": {
+        "cols": ["D4", "D5", "D6", "D7"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "C6", "pin_b": "C7"}
         ]
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-				{"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-				{"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-				{"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/manyboard/macro/macro.c b/keyboards/manyboard/macro/macro.c
deleted file mode 100644
index eb8a188f3c..0000000000
--- a/keyboards/manyboard/macro/macro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 WillEhman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "macro.h"
diff --git a/keyboards/manyboard/macro/macro.h b/keyboards/manyboard/macro/macro.h
deleted file mode 100644
index 0dccdbebfb..0000000000
--- a/keyboards/manyboard/macro/macro.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 WillEhman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ K30,   K31,   K32,   K33 }  \
-}
diff --git a/keyboards/maple_computing/6ball/6ball.c b/keyboards/maple_computing/6ball/6ball.c
deleted file mode 100644
index 1eddde9ba5..0000000000
--- a/keyboards/maple_computing/6ball/6ball.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "6ball.h"
diff --git a/keyboards/maple_computing/6ball/6ball.h b/keyboards/maple_computing/6ball/6ball.h
deleted file mode 100644
index ef73a72053..0000000000
--- a/keyboards/maple_computing/6ball/6ball.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k05, k00, k01, \
-    k04, k03, k02 \
-) { \
-    { k00, k01, k02, k03, k04, k05 } \
-}
diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h
index 4eaec15ad2..59679e2753 100644
--- a/keyboards/maple_computing/6ball/config.h
+++ b/keyboards/maple_computing/6ball/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* pin-out */
-#define MATRIX_ROW_PINS { F5 }
-#define MATRIX_COL_PINS { F4, D4, B5, B6, B2, F6 }
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN F7
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -37,7 +29,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 6    // Number of LEDs
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 200
diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json
index 21df7d9dda..b799baa28c 100644
--- a/keyboards/maple_computing/6ball/info.json
+++ b/keyboards/maple_computing/6ball/info.json
@@ -8,18 +8,26 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "D4", "B5", "B6", "B2", "F6"],
+        "rows": ["F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1, "y":0},
-                {"x":2, "y":0.5},
+                {"matrix": [0, 5], "x": 0, "y": 0.5},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0.5},
 
-                {"x":0, "y":1.5},
-                {"x":1, "y":2},
-                {"x":2, "y":1.5}
+                {"matrix": [0, 4], "x": 0, "y": 1.5},
+                {"matrix": [0, 3], "x": 1, "y": 2},
+                {"matrix": [0, 2], "x": 2, "y": 1.5}
             ]
         }
     }
diff --git a/keyboards/maple_computing/c39/c39.c b/keyboards/maple_computing/c39/c39.c
deleted file mode 100755
index 78ecae5a32..0000000000
--- a/keyboards/maple_computing/c39/c39.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "c39.h"
diff --git a/keyboards/maple_computing/c39/c39.h b/keyboards/maple_computing/c39/c39.h
deleted file mode 100755
index 797dd1ef77..0000000000
--- a/keyboards/maple_computing/c39/c39.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C  \
-  ) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }  \
-}
-
-#define LAYOUT_ortho_3x13 LAYOUT
diff --git a/keyboards/maple_computing/c39/config.h b/keyboards/maple_computing/c39/config.h
deleted file mode 100755
index 1b11bc5ce9..0000000000
--- a/keyboards/maple_computing/c39/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { D1, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D7, E6, C6, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/maple_computing/c39/info.json b/keyboards/maple_computing/c39/info.json
index 370f21ad09..4b673c575a 100755
--- a/keyboards/maple_computing/c39/info.json
+++ b/keyboards/maple_computing/c39/info.json
@@ -8,11 +8,61 @@
         "pid": "0xCA39",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "C6", "D2", "D3"],
+        "rows": ["D1", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_3x13"
+    },
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Back", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"M1", "x":11.25, "y":0}, {"label":"M2", "x":12.25, "y":0}, {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"Enter", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"M3", "x":11.25, "y":1}, {"label":"M4", "x":12.25, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"Fn", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"M5", "x":11.25, "y":2}, {"label":"M6", "x":12.25, "y":2}]
+        "LAYOUT_ortho_3x13": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 12], "x": 12.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 12], "x": 12.25, "y": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/maple_computing/c39/keymaps/drashna/config.h b/keyboards/maple_computing/c39/keymaps/drashna/config.h
index e48bc46ca8..5b4f82c9b1 100644
--- a/keyboards/maple_computing/c39/keymaps/drashna/config.h
+++ b/keyboards/maple_computing/c39/keymaps/drashna/config.h
@@ -24,7 +24,7 @@
 #define MATRIX_ROW_PINS \
     { B7, B1, B0 }
 
-#define RGB_DI_PIN B10
+#define WS2812_DI_PIN B10
 #define RGBLED_NUM 15
 
 #define SOLENOID_PIN B11
diff --git a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
index 33bb381a4e..bc77f77e49 100644
--- a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
+++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
@@ -29,6 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 
 #ifdef RGBLIGHT_ENABLE
-#  define RGB_DI_PIN D0
+#  define WS2812_DI_PIN D0
 #  define RGBLED_NUM 4
 #endif // !RGBLIGHT_ENABLE
diff --git a/keyboards/maple_computing/christmas_tree/christmas_tree.c b/keyboards/maple_computing/christmas_tree/christmas_tree.c
deleted file mode 100644
index c03670a3a5..0000000000
--- a/keyboards/maple_computing/christmas_tree/christmas_tree.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "christmas_tree.h"
diff --git a/keyboards/maple_computing/christmas_tree/christmas_tree.h b/keyboards/maple_computing/christmas_tree/christmas_tree.h
deleted file mode 100644
index 68eefca6a8..0000000000
--- a/keyboards/maple_computing/christmas_tree/christmas_tree.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k10, k20, k30, k40, k50 \
-) { \
-    { k00 }, \
-    { k10 }, \
-    { k20 }, \
-    { k30 }, \
-    { k40 }, \
-    { k50 } \
-}
diff --git a/keyboards/maple_computing/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h
index 40c2ce1f48..5070f05156 100644
--- a/keyboards/maple_computing/christmas_tree/config.h
+++ b/keyboards/maple_computing/christmas_tree/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { D3, F4, D0, F6, F5, D4 }
-#define MATRIX_COL_PINS { D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json
index d60dabe1df..0a19667957 100644
--- a/keyboards/maple_computing/christmas_tree/info.json
+++ b/keyboards/maple_computing/christmas_tree/info.json
@@ -7,6 +7,11 @@
     "vid": "0xFEED",
     "pid": "0x3070"
   },
+  "matrix_pins": {
+    "cols": ["D1"],
+    "rows": ["D3", "F4", "D0", "F6", "F5", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D2"
   },
@@ -14,7 +19,16 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 1, "y": 0},
+
+        {"matrix": [1, 0], "x": 0.5, "y": 1},
+        {"matrix": [2, 0], "x": 1.5, "y": 1},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+        {"matrix": [4, 0], "x": 1, "y": 2},
+        {"matrix": [5, 0], "x": 2, "y": 2}
+      ]
     }
   }
 }
diff --git a/keyboards/maple_computing/christmas_tree/v2017/v2017.c b/keyboards/maple_computing/christmas_tree/v2017/v2017.c
deleted file mode 100644
index 22067e5367..0000000000
--- a/keyboards/maple_computing/christmas_tree/v2017/v2017.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "v2017.h"
\ No newline at end of file
diff --git a/keyboards/maple_computing/christmas_tree/v2017/v2017.h b/keyboards/maple_computing/christmas_tree/v2017/v2017.h
deleted file mode 100644
index f779c0ed47..0000000000
--- a/keyboards/maple_computing/christmas_tree/v2017/v2017.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "christmas_tree.h"
diff --git a/keyboards/maple_computing/ivy/config.h b/keyboards/maple_computing/ivy/config.h
index 3192143e77..49b31f1edf 100644
--- a/keyboards/maple_computing/ivy/config.h
+++ b/keyboards/maple_computing/ivy/config.h
@@ -16,10 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/maple_computing/ivy/ivy.c b/keyboards/maple_computing/ivy/ivy.c
deleted file mode 100644
index 007ef67253..0000000000
--- a/keyboards/maple_computing/ivy/ivy.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ivy.h"
diff --git a/keyboards/maple_computing/ivy/ivy.h b/keyboards/maple_computing/ivy/ivy.h
deleted file mode 100644
index 645c5e0ef7..0000000000
--- a/keyboards/maple_computing/ivy/ivy.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_maple_computing_ivy_rev1
-    #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/maple_computing/ivy/rev1/config.h b/keyboards/maple_computing/ivy/rev1/config.h
deleted file mode 100644
index 902f807051..0000000000
--- a/keyboards/maple_computing/ivy/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Let's Macro V2 pin-out */
-#define MATRIX_ROW_PINS { F1, B2, D3 }
-#define MATRIX_COL_PINS { F5, B3, D5 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json
index 19109ca73f..3b971cb673 100644
--- a/keyboards/maple_computing/ivy/rev1/info.json
+++ b/keyboards/maple_computing/ivy/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6012",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "B3", "D5"],
+        "rows": ["F1", "B2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D2"
     },
@@ -16,9 +21,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 0},
+                {"matrix": [2, 2], "x": 2, "y": 0}
             ]
         }
     }
diff --git a/keyboards/maple_computing/ivy/rev1/rev1.c b/keyboards/maple_computing/ivy/rev1/rev1.c
deleted file mode 100644
index 007ef67253..0000000000
--- a/keyboards/maple_computing/ivy/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ivy.h"
diff --git a/keyboards/maple_computing/ivy/rev1/rev1.h b/keyboards/maple_computing/ivy/rev1/rev1.h
deleted file mode 100644
index ac338368ed..0000000000
--- a/keyboards/maple_computing/ivy/rev1/rev1.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "ivy.h"
-
-#define LAYOUT( \
-	K00, \
-    K01, \
-    K02  \
-	) \
-	{ \
-		{ K00, KC_NO, KC_NO }, \
-		{ KC_NO, K01, KC_NO }, \
-		{ KC_NO, KC_NO, K02 }, \
-	}
diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h
index 24942e7a51..c2949ab3a7 100644
--- a/keyboards/maple_computing/jnao/config.h
+++ b/keyboards/maple_computing/jnao/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E6, F0, F5, F6, F7 }
-#define MATRIX_COL_PINS { F1, F4, B1, B2, B3, B7, D1, D2, D4, D6, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json
index afa5a8674e..f1e753017f 100644
--- a/keyboards/maple_computing/jnao/info.json
+++ b/keyboards/maple_computing/jnao/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6017",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F4", "B1", "B2", "B3", "B7", "D1", "D2", "D4", "D6", "D7", "B4"],
+    "rows": ["E6", "F0", "F5", "F6", "F7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D0"
   },
@@ -17,118 +22,125 @@
   "layouts": {
     "LAYOUT_ortho_5x12": {
       "layout": [
-        {"label":"`", "x":0, "y":0},
-        {"label":"1", "x":1, "y":0},
-        {"label":"2", "x":2, "y":0},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0},
-        {"label":"5", "x":5, "y":0},
-        {"label":"6", "x":6, "y":0},
-        {"label":"7", "x":7, "y":0},
-        {"label":"8", "x":8, "y":0},
-        {"label":"9", "x":9, "y":0},
-        {"label":"0", "x":10, "y":0},
-        {"label":"Backspace", "x":11, "y":0},
-        {"label":"Tab", "x":0, "y":1},
-        {"label":"Q", "x":1, "y":1},
-        {"label":"W", "x":2, "y":1},
-        {"label":"E", "x":3, "y":1},
-        {"label":"R", "x":4, "y":1},
-        {"label":"T", "x":5, "y":1},
-        {"label":"Y", "x":6, "y":1},
-        {"label":"U", "x":7, "y":1},
-        {"label":"I", "x":8, "y":1},
-        {"label":"O", "x":9, "y":1},
-        {"label":"P", "x":10, "y":1},
-        {"label":"Delete", "x":11, "y":1},
-        {"label":"Esc", "x":0, "y":2},
-        {"label":"A", "x":1, "y":2},
-        {"label":"S", "x":2, "y":2},
-        {"label":"D", "x":3, "y":2},
-        {"label":"F", "x":4, "y":2},
-        {"label":"G", "x":5, "y":2},
-        {"label":"H", "x":6, "y":2},
-        {"label":"J", "x":7, "y":2},
-        {"label":"K", "x":8, "y":2},
-        {"label":"L", "x":9, "y":2},
-        {"label":";", "x":10, "y":2},
-        {"label":"'", "x":11, "y":2},
-        {"label":"Shift", "x":0, "y":3},
-        {"label":"Z", "x":1, "y":3},
-        {"label":"X", "x":2, "y":3},
-        {"label":"C", "x":3, "y":3},
-        {"label":"V", "x":4, "y":3},
-        {"label":"B", "x":5, "y":3},
-        {"label":"N", "x":6, "y":3},
-        {"label":"M", "x":7, "y":3},
-        {"label":",", "x":8, "y":3},
-        {"label":".", "x":9, "y":3},
-        {"label":"/", "x":10, "y":3},
-        {"label":"Enter", "x":11, "y":3},
-        {"label":"Fn", "x":0, "y":4},
-        {"label":"Ctrl", "x":1, "y":4},
-        {"label":"Alt", "x":2, "y":4},
-        {"label":"Meta", "x":3, "y":4},
-        {"label":"Lower", "x":4, "y":4},
-        {"label":"Space", "x":5, "y":4},
-        {"label":"Space", "x":6, "y":4},
-        {"label":"Raise", "x":7, "y":4},
-        {"label":"Left", "x":8, "y":4},
-        {"label":"Down", "x":9, "y":4},
-        {"label":"Up", "x":10, "y":4},
-        {"label":"Right", "x":11, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
+        {"matrix": [4, 7], "x": 7, "y": 4},
+        {"matrix": [4, 8], "x": 8, "y": 4},
+        {"matrix": [4, 9], "x": 9, "y": 4},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4}
       ]
     },
     "LAYOUT_ortho_4x12": {
       "layout": [
-        {"label":"Tab", "x":0, "y":0},
-        {"label":"Q", "x":1, "y":0},
-        {"label":"W", "x":2, "y":0},
-        {"label":"E", "x":3, "y":0},
-        {"label":"R", "x":4, "y":0},
-        {"label":"T", "x":5, "y":0},
-        {"label":"Y", "x":6, "y":0},
-        {"label":"U", "x":7, "y":0},
-        {"label":"I", "x":8, "y":0},
-        {"label":"O", "x":9, "y":0},
-        {"label":"P", "x":10, "y":0},
-        {"label":"Delete", "x":11, "y":0},
-        {"label":"Esc", "x":0, "y":1},
-        {"label":"A", "x":1, "y":1},
-        {"label":"S", "x":2, "y":1},
-        {"label":"D", "x":3, "y":1},
-        {"label":"F", "x":4, "y":1},
-        {"label":"G", "x":5, "y":1},
-        {"label":"H", "x":6, "y":1},
-        {"label":"J", "x":7, "y":1},
-        {"label":"K", "x":8, "y":1},
-        {"label":"L", "x":9, "y":1},
-        {"label":";", "x":10, "y":1},
-        {"label":"'", "x":11, "y":1},
-        {"label":"Shift", "x":0, "y":2},
-        {"label":"Z", "x":1, "y":2},
-        {"label":"X", "x":2, "y":2},
-        {"label":"C", "x":3, "y":2},
-        {"label":"V", "x":4, "y":2},
-        {"label":"B", "x":5, "y":2},
-        {"label":"N", "x":6, "y":2},
-        {"label":"M", "x":7, "y":2},
-        {"label":",", "x":8, "y":2},
-        {"label":".", "x":9, "y":2},
-        {"label":"/", "x":10, "y":2},
-        {"label":"Enter", "x":11, "y":2},
-        {"label":"Fn", "x":0, "y":3},
-        {"label":"Ctrl", "x":1, "y":3},
-        {"label":"Alt", "x":2, "y":3},
-        {"label":"Meta", "x":3, "y":3},
-        {"label":"Lower", "x":4, "y":3},
-        {"label":"Space", "x":5, "y":3},
-        {"label":"Space", "x":6, "y":3},
-        {"label":"Raise", "x":7, "y":3},
-        {"label":"Left", "x":8, "y":3},
-        {"label":"Down", "x":9, "y":3},
-        {"label":"Up", "x":10, "y":3},
-        {"label":"Right", "x":11, "y":3}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/maple_computing/jnao/jnao.c b/keyboards/maple_computing/jnao/jnao.c
deleted file mode 100644
index 8a49c747a1..0000000000
--- a/keyboards/maple_computing/jnao/jnao.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jnao.h"
diff --git a/keyboards/maple_computing/jnao/jnao.h b/keyboards/maple_computing/jnao/jnao.h
deleted file mode 100644
index 357a025f91..0000000000
--- a/keyboards/maple_computing/jnao/jnao.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, \
-    k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412 \
-) \
-{ \
-    { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012 }, \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112 }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212 }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312 }, \
-    { k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412 } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312 \
-) \
-{ \
-    {k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012}, \
-    {k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112}, \
-    {k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212}, \
-    {k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312}, \
-    {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
-}
diff --git a/keyboards/maple_computing/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h
index bc4eacf9a3..b9449c4714 100644
--- a/keyboards/maple_computing/launchpad/config.h
+++ b/keyboards/maple_computing/launchpad/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -41,7 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#ifdef SUBPROJECT_rev1
-    #include "rev1/config.h"
-#endif
diff --git a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h
index 6aaf996e57..6b65e2dcc3 100644
--- a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h
@@ -16,12 +16,10 @@
 #pragma once
 
 /* Underlight Configuration */
-#ifdef RGB_DI_PIN
-    #undef RGB_DI_PIN
-    #define RGB_DI_PIN F4
+    #undef WS2812_DI_PIN
+    #define WS2812_DI_PIN F4
     #undef RGBLED_NUM
     #define RGBLED_NUM 2  // Number of LEDs
-#endif
 #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
index 3ee1ec3013..3d47ae41e7 100644
--- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /* Underlight Configuration */
-#define RGB_DI_PIN F4
+#define WS2812_DI_PIN F4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
index 7329440ee1..fb64366e6f 100644
--- a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
@@ -17,8 +17,8 @@
 #pragma once
 
 /* Underlight Configuration */
-#undef RGB_DI_PIN
-#define RGB_DI_PIN F5
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN F5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/maple_computing/launchpad/launchpad.c b/keyboards/maple_computing/launchpad/launchpad.c
deleted file mode 100644
index cc2812a76c..0000000000
--- a/keyboards/maple_computing/launchpad/launchpad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "launchpad.h"
diff --git a/keyboards/maple_computing/launchpad/launchpad.h b/keyboards/maple_computing/launchpad/launchpad.h
deleted file mode 100644
index f2a1b40588..0000000000
--- a/keyboards/maple_computing/launchpad/launchpad.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_maple_computing_launchpad_rev1)
-#    include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h
index cd0ea962c2..7cf73259b4 100644
--- a/keyboards/maple_computing/launchpad/rev1/config.h
+++ b/keyboards/maple_computing/launchpad/rev1/config.h
@@ -17,16 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "../config.h"
-
-/* Let's Macro V2 pin-out */
-#define MATRIX_ROW_PINS { C6, B1, B3, D7 }
-#define MATRIX_COL_PINS { D2, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 10
-#define RGB_DI_PIN F6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json
index 8ae1835b69..81c23850ec 100644
--- a/keyboards/maple_computing/launchpad/rev1/info.json
+++ b/keyboards/maple_computing/launchpad/rev1/info.json
@@ -8,22 +8,30 @@
         "pid": "0x6007",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F6"
+    },
+    "matrix_pins": {
+        "cols": ["D2", "F7"],
+        "rows": ["C6", "B1", "B3", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3}
             ]
         }
     }
diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.c b/keyboards/maple_computing/launchpad/rev1/rev1.c
deleted file mode 100644
index cc2812a76c..0000000000
--- a/keyboards/maple_computing/launchpad/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "launchpad.h"
diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.h b/keyboards/maple_computing/launchpad/rev1/rev1.h
deleted file mode 100644
index 2ea6e7e775..0000000000
--- a/keyboards/maple_computing/launchpad/rev1/rev1.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "../launchpad.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, \
-    k10, k11, \
-    k20, k21, \
-    k30, k31 \
-) { \
-    { k00, k01 }, \
-    { k10, k11 }, \
-    { k20, k21 }, \
-    { k30, k31 } \
-}
diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h
index 55d2428db0..c64be02975 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/config.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/config.h
@@ -18,15 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Let's Split EH? pin-out */
-#define MATRIX_ROW_PINS { B1, B3, D7, B4 }
-#define MATRIX_COL_PINS { F4, F5, C6, B6, B5, D5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN B2
 #define RGBLED_NUM 12    // Number of LEDs (each hand)
 #define RGBLED_SPLIT { 6, 6 }
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/maple_computing/lets_split_eh/eh/eh.c b/keyboards/maple_computing/lets_split_eh/eh/eh.c
deleted file mode 100644
index d5a312085d..0000000000
--- a/keyboards/maple_computing/lets_split_eh/eh/eh.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lets_split_eh.h"
diff --git a/keyboards/maple_computing/lets_split_eh/eh/eh.h b/keyboards/maple_computing/lets_split_eh/eh/eh.h
deleted file mode 100644
index ff37229787..0000000000
--- a/keyboards/maple_computing/lets_split_eh/eh/eh.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "lets_split_eh.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-	L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-	L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-	L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-        { R00, R01, R02, R03, R04, R05 }, \
-        { R10, R11, R12, R13, R14, R15 }, \
-        { R20, R21, R22, R23, R24, R25 }, \
-        { R30, R31, R32, R33, R34, R35 } \
-	}
-    
-#define LAYOUT_ortho_4x12 LAYOUT
diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json
index 4574b10b64..1908f56eeb 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/info.json
+++ b/keyboards/maple_computing/lets_split_eh/eh/info.json
@@ -8,69 +8,84 @@
         "pid": "0xE401",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "C6", "B6", "B5", "D5"],
+        "rows": ["B1", "B3", "D7", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
+    "ws2812": {
+        "pin": "B2"
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x12"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "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": 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": 11, "y": 1},
+                {"matrix": [5, 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},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
+                {"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": 11, "y": 2},
+                {"matrix": [6, 5], "x": 12, "y": 2},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"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},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"matrix": [7, 0], "x": 7, "y": 3},
+                {"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},
+                {"matrix": [7, 5], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk
+++ /dev/null
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk
+++ /dev/null
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk
+++ /dev/null
diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c
index 37075aa67d..37e8b3ab9b 100644
--- a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c
+++ b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c
@@ -1,4 +1,4 @@
-#include "lets_split_eh.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.h b/keyboards/maple_computing/lets_split_eh/lets_split_eh.h
deleted file mode 100644
index aae072e0b6..0000000000
--- a/keyboards/maple_computing/lets_split_eh/lets_split_eh.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_maple_computing_lets_split_eh_eh
-    #include "eh.h"
-#endif
diff --git a/keyboards/maple_computing/minidox/config.h b/keyboards/maple_computing/minidox/config.h
index cc2f0c8379..c59b7d33b1 100644
--- a/keyboards/maple_computing/minidox/config.h
+++ b/keyboards/maple_computing/minidox/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/maple_computing/minidox/keymaps/alairock/config.h b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
index e51d11b241..6780e524ab 100644
--- a/keyboards/maple_computing/minidox/keymaps/alairock/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D7
+#define WS2812_DI_PIN D7
 
 #define RGBLED_NUM 8   // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/maple_computing/minidox/keymaps/bepo/config.h b/keyboards/maple_computing/minidox/keymaps/bepo/config.h
index f2a669ec94..1809262044 100644
--- a/keyboards/maple_computing/minidox/keymaps/bepo/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/bepo/config.h
@@ -1,4 +1,3 @@
 #pragma once
 
 #define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
index 0bb532c663..af4401a4a0 100644
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
 #define ONESHOT_TIMEOUT 1000
 #define TAPPING_TERM 200
 
diff --git a/keyboards/maple_computing/minidox/keymaps/khitsule/config.h b/keyboards/maple_computing/minidox/keymaps/khitsule/config.h
deleted file mode 100644
index 645e80ee8f..0000000000
--- a/keyboards/maple_computing/minidox/keymaps/khitsule/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#define IGNORE_MOD_TAP_INTERRUPT
-
-#endif
diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
index 37602b9163..98f8d6b071 100644
--- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
@@ -5,4 +5,3 @@
 
 #define COMBO_COUNT 10
 #define COMBO_TERM 100
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
index 91ef94841e..d0f15e7d19 100644
--- a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D7
+#define WS2812_DI_PIN D7
 
 #define RGBLED_NUM 8   // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
index ee5aaa8294..fe4212d6c4 100644
--- a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D7
+#define WS2812_DI_PIN D7
 
 #define RGBLED_NUM 8   // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
 
 #endif
diff --git a/keyboards/maple_computing/minidox/minidox.c b/keyboards/maple_computing/minidox/minidox.c
deleted file mode 100644
index b4bffbb3e4..0000000000
--- a/keyboards/maple_computing/minidox/minidox.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "minidox.h"
\ No newline at end of file
diff --git a/keyboards/maple_computing/minidox/minidox.h b/keyboards/maple_computing/minidox/minidox.h
deleted file mode 100644
index bae36b5560..0000000000
--- a/keyboards/maple_computing/minidox/minidox.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_maple_computing_minidox_rev1
-    #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/maple_computing/minidox/rev1/config.h b/keyboards/maple_computing/minidox/rev1/config.h
deleted file mode 100644
index 26979e4edc..0000000000
--- a/keyboards/maple_computing/minidox/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { B2, B6, B4, B5 }
-#define MATRIX_COL_PINS { F4, D3, D2, D1, D4 }
-
-//#define EE_HANDS
diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json
index 83794bb116..e42ec5a08d 100644
--- a/keyboards/maple_computing/minidox/rev1/info.json
+++ b/keyboards/maple_computing/minidox/rev1/info.json
@@ -8,15 +8,67 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "D3", "D2", "D1", "D4"],
+    "rows": ["B2", "B6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["split_3x5_3"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_split_3x5_3"
+  },
   "layouts": {
     "LAYOUT_split_3x5_3": {
-      "layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.125},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.125},
+        {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+        {"matrix": [4, 4], "x": 7, "y": 0.25},
+        {"matrix": [4, 3], "x": 8, "y": 0.125},
+        {"matrix": [4, 2], "x": 9, "y": 0},
+        {"matrix": [4, 1], "x": 10, "y": 0.125},
+        {"matrix": [4, 0], "x": 11, "y": 0.375},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.125},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.125},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+        {"matrix": [5, 4], "x": 7, "y": 1.25},
+        {"matrix": [5, 3], "x": 8, "y": 1.125},
+        {"matrix": [5, 2], "x": 9, "y": 1},
+        {"matrix": [5, 1], "x": 10, "y": 1.125},
+        {"matrix": [5, 0], "x": 11, "y": 1.375},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.125},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.125},
+        {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+        {"matrix": [6, 4], "x": 7, "y": 2.25},
+        {"matrix": [6, 3], "x": 8, "y": 2.125},
+        {"matrix": [6, 2], "x": 9, "y": 2},
+        {"matrix": [6, 1], "x": 10, "y": 2.125},
+        {"matrix": [6, 0], "x": 11, "y": 2.375},
+
+        {"matrix": [3, 2], "x": 2.5, "y": 4.75},
+        {"matrix": [3, 3], "x": 3.5, "y": 4.75},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.75, "h": 2},
+
+        {"matrix": [7, 4], "x": 6.5, "y": 3.75, "h": 2},
+        {"matrix": [7, 3], "x": 7.5, "y": 4.75},
+        {"matrix": [7, 2], "x": 8.5, "y": 4.75}
+      ]
     }
   }
 }
diff --git a/keyboards/maple_computing/minidox/rev1/rev1.c b/keyboards/maple_computing/minidox/rev1/rev1.c
deleted file mode 100644
index 72b473933e..0000000000
--- a/keyboards/maple_computing/minidox/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "minidox.h"
diff --git a/keyboards/maple_computing/minidox/rev1/rev1.h b/keyboards/maple_computing/minidox/rev1/rev1.h
deleted file mode 100644
index bb8bd64666..0000000000
--- a/keyboards/maple_computing/minidox/rev1/rev1.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_split_3x5_3( \
-  k01, k02, k03, k04, k05,    k45, k44, k43, k42, k41, \
-  k11, k12, k13, k14, k15,    k55, k54, k53, k52, k51, \
-  k21, k22, k23, k24, k25,    k65, k64, k63, k62, k61, \
-            k33, k34, k35,    k75, k74, k73            \
-  ) \
-  { \
-    { k01, k02, k03, k04, k05 }, \
-    { k11, k12, k13, k14, k15 }, \
-    { k21, k22, k23, k24, k25 }, \
-    { ___, ___, k33, k34, k35 }, \
-    { k41, k42, k43, k44, k45 }, \
-    { k51, k52, k53, k54, k55 }, \
-    { k61, k62, k63, k64, k65 }, \
-    { ___, ___, k73, k74, k75 } \
-  }
-
-#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
index 53e7bfe55f..e3b34d1bf0 100644
--- a/keyboards/maple_computing/the_ruler/config.h
+++ b/keyboards/maple_computing/the_ruler/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C7 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -55,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define RGB_DI_PIN E6     // The pin your RGB strip is wired to
 #define RGBLED_NUM 1      // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json
index 69347412ce..336d48af4c 100644
--- a/keyboards/maple_computing/the_ruler/info.json
+++ b/keyboards/maple_computing/the_ruler/info.json
@@ -8,11 +8,26 @@
     "pid": "0x6007",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "E6"
+  },
+  "matrix_pins": {
+    "cols": ["D6", "D7", "B4", "B5", "B6", "C6"],
+    "rows": ["C7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
       "LAYOUT": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0, "w":2}]
+          "layout": [
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
+              {"matrix": [0, 4], "x": 4, "y": 0},
+              {"matrix": [0, 5], "x": 5, "y": 0, "w": 2}
+          ]
       }
   }
 }
diff --git a/keyboards/maple_computing/the_ruler/the_ruler.c b/keyboards/maple_computing/the_ruler/the_ruler.c
deleted file mode 100644
index 29a8248924..0000000000
--- a/keyboards/maple_computing/the_ruler/the_ruler.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "the_ruler.h"
diff --git a/keyboards/maple_computing/the_ruler/the_ruler.h b/keyboards/maple_computing/the_ruler/the_ruler.h
deleted file mode 100644
index 171d21a072..0000000000
--- a/keyboards/maple_computing/the_ruler/the_ruler.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05 ) { \
-    { K00, K01, K02, K03, K04, K05 }  \
-}
diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h
index bf7aa7f198..5de3d8b15d 100644
--- a/keyboards/marksard/leftover30/config.h
+++ b/keyboards/marksard/leftover30/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, B2, F7, F6, B3, B1, D4, D0 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 6
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -51,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json
index 39de1d6bda..e6d482fcde 100644
--- a/keyboards/marksard/leftover30/info.json
+++ b/keyboards/marksard/leftover30/info.json
@@ -8,11 +8,19 @@
         "pid": "0xDFA8",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6"],
+        "rows": ["B6", "B2", "F7", "F6", "B3", "B1", "D4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F4", "pin_b": "F5"}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/marksard/leftover30/keymaps/default/config.h b/keyboards/marksard/leftover30/keymaps/default/config.h
index 8bffbbb3b5..8d29b8e6c9 100644
--- a/keyboards/marksard/leftover30/keymaps/default/config.h
+++ b/keyboards/marksard/leftover30/keymaps/default/config.h
@@ -18,7 +18,6 @@
 
 // place overrides here
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
 #define TAPPING_TERM_PER_KEY
diff --git a/keyboards/marksard/rhymestone/common/oled_helper.c b/keyboards/marksard/rhymestone/common/oled_helper.c
index 354c1fb896..613798c941 100644
--- a/keyboards/marksard/rhymestone/common/oled_helper.c
+++ b/keyboards/marksard/rhymestone/common/oled_helper.c
@@ -1,8 +1,10 @@
-#ifdef OLED_ENABLE
-#include QMK_KEYBOARD_H
+#include "oled_helper.h"
+#include "quantum.h"
 #include <stdio.h>
 #include <string.h>
 
+#ifdef OLED_ENABLE
+
 void render_logo(void) {
 
   static const char PROGMEM logo_buf[]={
diff --git a/keyboards/marksard/rhymestone/common/oled_helper.h b/keyboards/marksard/rhymestone/common/oled_helper.h
index dc9a938f6c..9495937e2a 100644
--- a/keyboards/marksard/rhymestone/common/oled_helper.h
+++ b/keyboards/marksard/rhymestone/common/oled_helper.h
@@ -1,3 +1,8 @@
+#pragma once
+
+#include <stdint.h>
+#include "action.h"
+
 #ifdef OLED_ENABLE
 
 void render_logo(void);
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index 9cc003be13..32927c4506 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -17,27 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-
 #ifdef RGBLIGHT_ENABLE
-// #ifdef RGB_DI_PIN
   #define RGBLED_NUM 40
   #define RGBLED_SPLIT {20, 20}
   #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json
index 6d68519512..07135b5be0 100644
--- a/keyboards/marksard/rhymestone/rev1/info.json
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -8,9 +8,20 @@
         "pid": "0xDFA1",
         "device_version": "0.2.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x10"],
diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk
index affdbd6f11..6f15328b5a 100644
--- a/keyboards/marksard/rhymestone/rules.mk
+++ b/keyboards/marksard/rhymestone/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 
 DEFAULT_FOLDER = marksard/rhymestone/rev1
diff --git a/keyboards/marksard/treadstone32/keymaps/default/config.h b/keyboards/marksard/treadstone32/keymaps/default/config.h
index 863588c5aa..82020a59b8 100644
--- a/keyboards/marksard/treadstone32/keymaps/default/config.h
+++ b/keyboards/marksard/treadstone32/keymaps/default/config.h
@@ -18,7 +18,6 @@
 
 // place overrides here
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
 #define TAPPING_TERM_PER_KEY
diff --git a/keyboards/marksard/treadstone32/keymaps/like_jis/config.h b/keyboards/marksard/treadstone32/keymaps/like_jis/config.h
index 863588c5aa..82020a59b8 100644
--- a/keyboards/marksard/treadstone32/keymaps/like_jis/config.h
+++ b/keyboards/marksard/treadstone32/keymaps/like_jis/config.h
@@ -18,7 +18,6 @@
 
 // place overrides here
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
 #define TAPPING_TERM_PER_KEY
diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h
index a460abd0ef..22435108df 100644
--- a/keyboards/marksard/treadstone32/lite/config.h
+++ b/keyboards/marksard/treadstone32/lite/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6, B2, F7, F6, B3, B1, F4, F5 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 6
   #ifndef IOS_DEVICE_ENABLE
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
@@ -55,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //   #define RGBLIGHT_EFFECT_RGB_TEST
 //   #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard
diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json
index 040083b968..0ab62d9cde 100644
--- a/keyboards/marksard/treadstone32/lite/info.json
+++ b/keyboards/marksard/treadstone32/lite/info.json
@@ -3,6 +3,14 @@
     "usb": {
         "device_version": "0.1.5"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6"],
+        "rows": ["B6", "B2", "F7", "F6", "B3", "B1", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/marksard/treadstone32/lite/lite.c b/keyboards/marksard/treadstone32/lite/lite.c
deleted file mode 100644
index a1997feff0..0000000000
--- a/keyboards/marksard/treadstone32/lite/lite.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 marksard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "lite.h"
diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h
index db39ee477c..1f3a9ec168 100644
--- a/keyboards/marksard/treadstone32/rev1/config.h
+++ b/keyboards/marksard/treadstone32/rev1/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F1, F0, E6, B2, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 6
   #ifndef IOS_DEVICE_ENABLE
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
@@ -56,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //   #define RGBLIGHT_EFFECT_RGB_TEST
 //   #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard
diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json
index 51b46b22d2..6e75600e8e 100644
--- a/keyboards/marksard/treadstone32/rev1/info.json
+++ b/keyboards/marksard/treadstone32/rev1/info.json
@@ -3,6 +3,14 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C7"],
+        "rows": ["F1", "F0", "E6", "B2", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/marksard/treadstone32/rev1/rev1.c b/keyboards/marksard/treadstone32/rev1/rev1.c
deleted file mode 100644
index bf41abddbe..0000000000
--- a/keyboards/marksard/treadstone32/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 marksard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/marksard/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c
index 68adbe83a8..c3c8f23cbc 100644
--- a/keyboards/marksard/treadstone48/common/oled_helper.c
+++ b/keyboards/marksard/treadstone48/common/oled_helper.c
@@ -1,8 +1,10 @@
-#ifdef OLED_ENABLE
-#include QMK_KEYBOARD_H
+#include "oled_helper.h"
+#include "quantum.h"
 #include <stdio.h>
 #include <string.h>
 
+#ifdef OLED_ENABLE
+
 void render_logo(void) {
 
   const char logo_buf[]={
diff --git a/keyboards/marksard/treadstone48/common/oled_helper.h b/keyboards/marksard/treadstone48/common/oled_helper.h
index 56c2a5b236..3dc186f05c 100644
--- a/keyboards/marksard/treadstone48/common/oled_helper.h
+++ b/keyboards/marksard/treadstone48/common/oled_helper.h
@@ -1,5 +1,10 @@
+#pragma once
+
 #ifdef OLED_ENABLE
 
+#include <stdint.h>
+#include "action.h"
+
 void render_logo(void);
 void update_key_status(uint16_t keycode, keyrecord_t *record);
 void render_key_status(void);
diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h
index 505548a75d..5379417262 100644
--- a/keyboards/marksard/treadstone48/rev1/config.h
+++ b/keyboards/marksard/treadstone48/rev1/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #ifndef RS_EXTRA_LED
     #define RGBLED_NUM 12
     #define RGBLED_SPLIT {12, 0}
@@ -57,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //   #define RGBLIGHT_EFFECT_RGB_TEST
 //   #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json
index 2c589cac51..6b24cc27e3 100644
--- a/keyboards/marksard/treadstone48/rev1/info.json
+++ b/keyboards/marksard/treadstone48/rev1/info.json
@@ -8,9 +8,17 @@
     "pid": "0xDFA3",
     "device_version": "0.1.0"
   },
+  "matrix_pins": {
+    "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+    "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h
index 54ac1f2fce..f18bcf44e7 100644
--- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h
@@ -23,7 +23,6 @@
 #endif
 #define TAPPING_TERM 225
 #define PREVENT_STUCK_MODIFIERS
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef MOUSEKEY_ENABLE
   #undef MOUSEKEY_INTERVAL
diff --git a/keyboards/marksard/treadstone48/rev1/rev1.c b/keyboards/marksard/treadstone48/rev1/rev1.c
deleted file mode 100644
index 3daa3e8e81..0000000000
--- a/keyboards/marksard/treadstone48/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 marksard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h
index 02b08d3bf1..a605380716 100644
--- a/keyboards/marksard/treadstone48/rev2/config.h
+++ b/keyboards/marksard/treadstone48/rev2/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 12
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //   #define RGBLIGHT_EFFECT_RGB_TEST
 //   #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json
index 34f44f1aba..223fff5818 100644
--- a/keyboards/marksard/treadstone48/rev2/info.json
+++ b/keyboards/marksard/treadstone48/rev2/info.json
@@ -8,6 +8,14 @@
         "pid": "0xDFA3",
         "device_version": "0.2.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/marksard/treadstone48/rev2/rev2.c b/keyboards/marksard/treadstone48/rev2/rev2.c
deleted file mode 100644
index f7e7bc7702..0000000000
--- a/keyboards/marksard/treadstone48/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 marksard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/massdrop/alt/alt.h b/keyboards/massdrop/alt/alt.h
index c3761bee8b..9fc6eac15e 100644
--- a/keyboards/massdrop/alt/alt.h
+++ b/keyboards/massdrop/alt/alt.h
@@ -9,20 +9,6 @@
 #include "usb/udi_cdc.h"
 #include "usb/usb_hub.h"
 
-#define LAYOUT_65_ansi_blocker( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, \
-    K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, \
-    K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, \
-    K46, K47, K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, \
-    K61, K62, K63, K64, K65, K66, K67 \
-) { \
-    {   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K10,   K11,   K12,   K13,   K14,   K15, }, \
-    {   K16,   K17,   K18,   K19,   K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K30, }, \
-    {   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K40,   K41,   K42, KC_NO,   K43,   K44, }, \
-    {   K45, KC_NO,   K46,   K47,   K48,   K49,   K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58, }, \
-    {   K59,   K60,   K61, KC_NO, KC_NO, KC_NO,   K62, KC_NO, KC_NO, KC_NO,   K63,   K64,   K65,   K66,   K67, }, \
-}
-
 #define TOGGLE_FLAG_AND_PRINT(var, name) { \
         if (var) { \
             dprintf(name " disabled\r\n"); \
@@ -32,5 +18,3 @@
             dprintf(name " enabled\r\n"); \
         } \
     }
-
-#define LAYOUT LAYOUT_65_ansi_blocker // Ensure that user made existing keymaps do not break. 
diff --git a/keyboards/massdrop/alt/config.h b/keyboards/massdrop/alt/config.h
index fe2db0a478..33991d4c8f 100644
--- a/keyboards/massdrop/alt/config.h
+++ b/keyboards/massdrop/alt/config.h
@@ -21,12 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* USB Device descriptor parameter */
 #define SERIAL_NUM          "Unavailable"
 
-#define MATRIX_ROW_PINS { A00, A01, A02, A03, A04 }
-#define MATRIX_COL_PINS { B04, B05, B06, B07, B08, B09, B10, B11, B12, B13, A05, A06, A07, A10, A11 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Temporary solution for matrix delay */
 #define IGNORE_ATOMIC_BLOCK
 
diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json
index 128a990b46..90de8c6904 100644
--- a/keyboards/massdrop/alt/info.json
+++ b/keyboards/massdrop/alt/info.json
@@ -8,77 +8,92 @@
         "pid": "0xEED3",
         "device_version": "1.0.1"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["B04", "B05", "B06", "B07", "B08", "B09", "B10", "B11", "B12", "B13", "A05", "A06", "A07", "A10", "A11"],
+        "rows": ["A00", "A01", "A02", "A03", "A04"]
+    },
+    "diode_direction": "COL2ROW",
     "community_layouts": ["65_ansi_blocker"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-              {"label":"ESCAPE", "x":0, "y":0},
-              {"label":"1", "x":1, "y":0},
-              {"label":"2", "x":2, "y":0},
-              {"label":"3", "x":3, "y":0},
-              {"label":"4", "x":4, "y":0},
-              {"label":"5", "x":5, "y":0},
-              {"label":"6", "x":6, "y":0},
-              {"label":"7", "x":7, "y":0},
-              {"label":"8", "x":8, "y":0},
-              {"label":"9", "x":9, "y":0},
-              {"label":"0", "x":10, "y":0},
-              {"label":"MINUS", "x":11, "y":0},
-              {"label":"EQUALS", "x":12, "y":0},
-              {"label":"BACKSPACE", "x":13, "y":0, "w":2},
-              {"label":"DELETE", "x":15, "y":0},
-              {"label":"TAB", "x":0, "y":1, "w":1.5},
-              {"label":"Q", "x":1.5, "y":1},
-              {"label":"W", "x":2.5, "y":1},
-              {"label":"E", "x":3.5, "y":1},
-              {"label":"R", "x":4.5, "y":1},
-              {"label":"T", "x":5.5, "y":1},
-              {"label":"Y", "x":6.5, "y":1},
-              {"label":"U", "x":7.5, "y":1},
-              {"label":"I", "x":8.5, "y":1},
-              {"label":"O", "x":9.5, "y":1},
-              {"label":"P", "x":10.5, "y":1},
-              {"label":"LEFT BRACKET", "x":11.5, "y":1},
-              {"label":"RIGHT BRACKET", "x":12.5, "y":1},
-              {"label":"BACK SLASH", "x":13.5, "y":1, "w":1.5},
-              {"label":"HOME", "x":15, "y":1},
-              {"label":"CAPS LOCK", "x":0, "y":2, "w":1.75},
-              {"label":"A", "x":1.75, "y":2},
-              {"label":"S", "x":2.75, "y":2},
-              {"label":"D", "x":3.75, "y":2},
-              {"label":"F", "x":4.75, "y":2},
-              {"label":"G", "x":5.75, "y":2},
-              {"label":"H", "x":6.75, "y":2},
-              {"label":"J", "x":7.75, "y":2},
-              {"label":"K", "x":8.75, "y":2},
-              {"label":"L", "x":9.75, "y":2},
-              {"label":"SEMICOLON", "x":10.75, "y":2},
-              {"label":"SINGLE TICK", "x":11.75, "y":2},
-              {"label":"ENTER", "x":12.75, "y":2, "w":2.25},
-              {"label":"PAGE UP", "x":15, "y":2},
-              {"label":"LEFT SHIFT", "x":0, "y":3, "w":2.25},
-              {"label":"Z", "x":2.25, "y":3},
-              {"label":"X", "x":3.25, "y":3},
-              {"label":"C", "x":4.25, "y":3},
-              {"label":"V", "x":5.25, "y":3},
-              {"label":"B", "x":6.25, "y":3},
-              {"label":"N", "x":7.25, "y":3},
-              {"label":"M", "x":8.25, "y":3},
-              {"label":"COMMA", "x":9.25, "y":3},
-              {"label":"PERIOD", "x":10.25, "y":3},
-              {"label":"FORWARD SLASH", "x":11.25, "y":3},
-              {"label":"RIGHT SHIFT", "x":12.25, "y":3, "w":1.75},
-              {"label":"UP ARROW", "x":14, "y":3},
-              {"label":"PAGE DOWN", "x":15, "y":3},
-              {"label":"LEFT CTRL", "x":0, "y":4, "w":1.25},
-              {"label":"LEFT WIN", "x":1.25, "y":4, "w":1.25},
-              {"label":"LEFT ALT", "x":2.5, "y":4, "w":1.25},
-              {"label":"SPACEBAR", "x":3.75, "y":4, "w":6.25},
-              {"label":"RIGHT ALT", "x":10, "y":4, "w":1.25},
-              {"label":"FN", "x":11.25, "y":4, "w":1.25},
-              {"label":"LEFT ARROW", "x":13, "y":4},
-              {"label":"DOWN ARROW", "x":14, "y":4},
-              {"label":"RIGHT ARROW", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/massdrop/alt/keymaps/b_/config.h b/keyboards/massdrop/alt/keymaps/b_/config.h
index 8f06c0dd34..d87bdade68 100644
--- a/keyboards/massdrop/alt/keymaps/b_/config.h
+++ b/keyboards/massdrop/alt/keymaps/b_/config.h
@@ -31,7 +31,6 @@
 // #define RETRO_TAPPING               			// Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
 // #define TAPPING_TOGGLE 2            			// How many taps before triggering the toggle
 // #define PERMISSIVE_HOLD             			// Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT    			// Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
 // #define QUICK_TAP_TERM 0          			// Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
 // #define LEADER_TIMEOUT 300          			// How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
 // #define LEADER_PER_KEY_TIMING       			// Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h
index 83f0d13bd5..331b34c9b0 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/config.h
+++ b/keyboards/massdrop/alt/keymaps/pregame/config.h
@@ -44,7 +44,6 @@
 // #define RETRO_TAPPING               			// Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
 // #define TAPPING_TOGGLE 2            			// How many taps before triggering the toggle
 // #define PERMISSIVE_HOLD             			// Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT    			// Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
 // #define QUICK_TAP_TERM 0          			// Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
 // #define LEADER_TIMEOUT 300          			// How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
 // #define LEADER_PER_KEY_TIMING       			// Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c b/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
index e1b6de116e..c5905d502f 100644
--- a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
@@ -49,7 +49,7 @@ uint8_t currentWPM;
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 static uint32_t key_timer;
-idle_timer = timer_read();
+idle_timer = timer_read32();
 
 
     switch (keycode) {
@@ -146,7 +146,7 @@ idle_timer = timer_read();
 
 void matrix_scan_user(void) {
 //custom idle rbg switch off function
-    if (timer_elapsed(idle_timer) > IDLE_TIMER_DURATION) {
+    if (timer_elapsed32(idle_timer) > IDLE_TIMER_DURATION) {
         idle_timer = 0;
         timer_clear();
         rgbkeyIdle = true;
diff --git a/keyboards/massdrop/alt/rules.mk b/keyboards/massdrop/alt/rules.mk
index a302c82d86..e176fa733d 100644
--- a/keyboards/massdrop/alt/rules.mk
+++ b/keyboards/massdrop/alt/rules.mk
@@ -26,4 +26,3 @@ AUTO_SHIFT_ENABLE = no      # Auto Shift
 
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
diff --git a/keyboards/massdrop/ctrl/config.h b/keyboards/massdrop/ctrl/config.h
index aadc0a915b..33991d4c8f 100644
--- a/keyboards/massdrop/ctrl/config.h
+++ b/keyboards/massdrop/ctrl/config.h
@@ -21,12 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* USB Device descriptor parameter */
 #define SERIAL_NUM          "Unavailable"
 
-#define MATRIX_ROW_PINS { B04, B05, B06, B07, B08, B09, A10, A11, B10, B11, B12 }
-#define MATRIX_COL_PINS { A00, A01, A02, A03, A04, A05, A06, A07 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Temporary solution for matrix delay */
 #define IGNORE_ATOMIC_BLOCK
 
diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json
index 34c60ca088..c9124ac782 100644
--- a/keyboards/massdrop/ctrl/info.json
+++ b/keyboards/massdrop/ctrl/info.json
@@ -8,6 +8,14 @@
         "pid": "0xEED2",
         "device_version": "1.0.1"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["A00", "A01", "A02", "A03", "A04", "A05", "A06", "A07"],
+        "rows": ["B04", "B05", "B06", "B07", "B08", "B09", "A10", "A11", "B10", "B11", "B12"]
+    },
+    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
index 8584c07a5d..c8fa629552 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
@@ -28,7 +28,6 @@
 // #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
 #define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
 // #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT    // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
 // #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
 // #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
 // #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
index b975b7895b..a17ad45c4c 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
@@ -46,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
 // #define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
 // #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT    // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
 // #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
 // #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
 // #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
index 87db7fe8ea..2166f67e8c 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
@@ -44,7 +44,6 @@
 // #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
 #define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
 // #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT    // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
 // #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
 // #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
 // #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/ctrl/rules.mk b/keyboards/massdrop/ctrl/rules.mk
index a302c82d86..e176fa733d 100644
--- a/keyboards/massdrop/ctrl/rules.mk
+++ b/keyboards/massdrop/ctrl/rules.mk
@@ -26,4 +26,3 @@ AUTO_SHIFT_ENABLE = no      # Auto Shift
 
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
diff --git a/keyboards/massdrop/thekey/config.h b/keyboards/massdrop/thekey/config.h
index 0869e77a7a..31d395f570 100644
--- a/keyboards/massdrop/thekey/config.h
+++ b/keyboards/massdrop/thekey/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { D4 }
-#define MATRIX_COL_PINS { D2, D1, D0 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN B1
 #define RGBLED_NUM 2
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/massdrop/thekey/info.json b/keyboards/massdrop/thekey/info.json
index 56fe74729c..73b640b11c 100644
--- a/keyboards/massdrop/thekey/info.json
+++ b/keyboards/massdrop/thekey/info.json
@@ -8,17 +8,25 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0"],
+        "rows": ["D4"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "K00 (D4,D2)", "x": 0, "y": 0 },
-                { "label": "K01 (D4,D1)", "x": 1, "y": 0 },
-                { "label": "K02 (D4,D0)", "x": 2, "y": 0 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0}
             ]
         }
     }
diff --git a/keyboards/massdrop/thekey/thekey.c b/keyboards/massdrop/thekey/thekey.c
deleted file mode 100644
index b32c302cd0..0000000000
--- a/keyboards/massdrop/thekey/thekey.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Joe Maples <joe@maples.dev>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "thekey.h"
diff --git a/keyboards/massdrop/thekey/thekey.h b/keyboards/massdrop/thekey/thekey.h
deleted file mode 100644
index f889c973c7..0000000000
--- a/keyboards/massdrop/thekey/thekey.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Joe Maples <joe@maples.dev>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    K00, K01, K02  \
-) { \
-    { K00, K01, K02 }, \
-}
diff --git a/keyboards/massdrop/thekey_v2/config.h b/keyboards/massdrop/thekey_v2/config.h
index 3f7dc30ac1..82744c137c 100644
--- a/keyboards/massdrop/thekey_v2/config.h
+++ b/keyboards/massdrop/thekey_v2/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { D4 }
-#define MATRIX_COL_PINS { D2, D1, D0 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN B1
 #define RGBLED_NUM 5
 #define RGBLIGHT_LED_MAP {4, 0, 1, 2, 3}
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/massdrop/thekey_v2/info.json b/keyboards/massdrop/thekey_v2/info.json
index 19ae416b6e..b54cec2268 100644
--- a/keyboards/massdrop/thekey_v2/info.json
+++ b/keyboards/massdrop/thekey_v2/info.json
@@ -8,14 +8,22 @@
         "pid": "0x0000",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0"],
+        "rows": ["D4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "K00 (D4,D2)", "x": 0, "y": 0 },
-                { "label": "K01 (D4,D1)", "x": 1, "y": 0 },
-                { "label": "K02 (D4,D0)", "x": 2, "y": 0 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0}
             ]
         }
     }
diff --git a/keyboards/massdrop/thekey_v2/thekey_v2.c b/keyboards/massdrop/thekey_v2/thekey_v2.c
deleted file mode 100644
index b1a824d9d4..0000000000
--- a/keyboards/massdrop/thekey_v2/thekey_v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Jason Wihardja
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "thekey_v2.h"
diff --git a/keyboards/massdrop/thekey_v2/thekey_v2.h b/keyboards/massdrop/thekey_v2/thekey_v2.h
deleted file mode 100644
index c3b8e1a8ea..0000000000
--- a/keyboards/massdrop/thekey_v2/thekey_v2.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 Jason Wihardja
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    K00, K01, K02  \
-) { \
-    { K00, K01, K02 }, \
-}
diff --git a/keyboards/masterworks/classy_tkl/rev_a/config.h b/keyboards/masterworks/classy_tkl/rev_a/config.h
index e8920b5b85..5f1fd650f1 100644
--- a/keyboards/masterworks/classy_tkl/rev_a/config.h
+++ b/keyboards/masterworks/classy_tkl/rev_a/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { C7, F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS \
-    { B4, D7, D6, D4, C6, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0, E6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/masterworks/classy_tkl/rev_a/info.json b/keyboards/masterworks/classy_tkl/rev_a/info.json
index 5a3c567bc9..d71614e737 100644
--- a/keyboards/masterworks/classy_tkl/rev_a/info.json
+++ b/keyboards/masterworks/classy_tkl/rev_a/info.json
@@ -8,277 +8,321 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D6", "D4", "C6", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "F7"],
+        "rows": ["C7", "F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "x": 13, "y": 1.5 },
-                { "label": "Backspace2", "x": 14, "y": 1.5 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "|", "x": 1.25, "y": 4.5 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 4.5, "w": 1 },
-                { "label": "Up", "x": 16.25, "y": 4.5 },
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 },
-                { "label": "Win", "x": 1.5, "y": 5.5, "w": 1 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 },
-                { "label": "Space", "x": 4, "y": 5.5, "w": 7 },
-                { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 },
-                { "label": "Win", "x": 12.5, "y": 5.5, "w": 1 },
-                { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 },
-                { "label": "Left", "x": 15.25, "y": 5.5 },
-                { "label": "Down", "x": 16.25, "y": 5.5 },
-                { "label": "Right", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [3, 13], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "Up", "x": 16.25, "y": 4.5 },
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 },
-                { "label": "Space", "x": 4, "y": 5.5, "w": 7 },
-                { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 },
-                { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 },
-                { "label": "Left", "x": 15.25, "y": 5.5 },
-                { "label": "Down", "x": 16.25, "y": 5.5 },
-                { "label": "Right", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso_wkl": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-                { "label": "\u00ac", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "\"", "x": 2, "y": 1.5 },
-                { "label": "\u00a3", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "@", "x": 11.75, "y": 3.5 },
-                { "label": "~", "x": 12.75, "y": 3.5 },
-                { "label": "Enter", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "|", "x": 1.25, "y": 4.5 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "Up", "x": 16.25, "y": 4.5 },
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 },
-                { "label": "Space", "x": 4, "y": 5.5, "w": 7 },
-                { "label": "AltGr", "x": 11, "y": 5.5, "w": 1.5 },
-                { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 },
-                { "label": "Left", "x": 15.25, "y": 5.5 },
-                { "label": "Down", "x": 16.25, "y": 5.5 },
-                { "label": "Right", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/masterworks/classy_tkl/rev_a/rev_a.c b/keyboards/masterworks/classy_tkl/rev_a/rev_a.c
index 58c0393db7..3a3446d7ae 100644
--- a/keyboards/masterworks/classy_tkl/rev_a/rev_a.c
+++ b/keyboards/masterworks/classy_tkl/rev_a/rev_a.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev_a.h"
+#include "quantum.h"
 
 #define CAPS_PIN B5
 #define SCROLL_PIN B6
diff --git a/keyboards/masterworks/classy_tkl/rev_a/rev_a.h b/keyboards/masterworks/classy_tkl/rev_a/rev_a.h
deleted file mode 100644
index 73e68b598d..0000000000
--- a/keyboards/masterworks/classy_tkl/rev_a/rev_a.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2020 Mathias Andersson <wraul@dbox.se>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-// clang-format off
-#define LAYOUT_all( \
-    k00,      k02, k03, k04, k05,      k06, k07, k08, k09,      k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k3D,      k1E, k1F, k1G, \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D,      k2E, k2F, k2G, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,           k3C,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,           k4C, k4D,           k4F,      \
-    k50, k52, k53,                     k57,                          k5B, k5C, k5D,      k5E, k5F, k5G  \
-) \
-{ \
-    { k00, KC_NO, k02, k03, k04,   k05,   k06,   k07, k08,   k09,   k0A,   k0B, k0C,   k0D, k0E,   k0F,   k0G },   \
-    { k10, k11,   k12, k13, k14,   k15,   k16,   k17, k18,   k19,   k1A,   k1B, k1C,   k1D, k1E,   k1F,   k1G },   \
-    { k20, k21,   k22, k23, k24,   k25,   k26,   k27, k28,   k29,   k2A,   k2B, k2C,   k2D, k2E,   k2F,   k2G },   \
-    { k30, k31,   k32, k33, k34,   k35,   k36,   k37, k38,   k39,   k3A,   k3B, k3C,   k3D, KC_NO, KC_NO, KC_NO }, \
-    { k40, k41,   k42, k43, k44,   k45,   k46,   k47, k48,   k49,   k4A,   k4B, k4C,   k4D, KC_NO, k4F,   KC_NO }, \
-    { k50, KC_NO, k52, k53, KC_NO, KC_NO, KC_NO, k57, KC_NO, KC_NO, KC_NO, k5B, k5C,   k5D, k5E,   k5F,   k5G },   \
-}
-
-#define LAYOUT_tkl_ansi_wkl( \
-    k00,      k02, k03, k04, k05,      k06, k07, k08, k09,      k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k3D,      k1E, k1F, k1G, \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D,      k2E, k2F, k2G, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,           k3C,                     \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,                k4C,           k4F,      \
-    k50,      k53,                     k57,                          k5B,      k5D,      k5E, k5F, k5G  \
-) \
-{ \
-    { k00, KC_NO, k02,   k03, k04,   k05,   k06,   k07, k08,   k09,   k0A,   k0B, k0C,   k0D,   k0E,   k0F,   k0G },   \
-    { k10, k11,   k12,   k13, k14,   k15,   k16,   k17, k18,   k19,   k1A,   k1B, k1C,   KC_NO, k1E,   k1F,   k1G },   \
-    { k20, k21,   k22,   k23, k24,   k25,   k26,   k27, k28,   k29,   k2A,   k2B, k2C,   k2D,   k2E,   k2F,   k2G },   \
-    { k30, k31,   k32,   k33, k34,   k35,   k36,   k37, k38,   k39,   k3A,   k3B, k3C,   k3D,   KC_NO, KC_NO, KC_NO }, \
-    { k40, KC_NO, k42,   k43, k44,   k45,   k46,   k47, k48,   k49,   k4A,   k4B, k4C,   KC_NO, KC_NO, k4F,   KC_NO }, \
-    { k50, KC_NO, KC_NO, k53, KC_NO, KC_NO, KC_NO, k57, KC_NO, KC_NO, KC_NO, k5B, KC_NO, k5D,   k5E,   k5F,   k5G },   \
-}
-
-#define LAYOUT_tkl_iso_wkl( \
-    k00,      k02, k03, k04, k05,      k06, k07, k08, k09,      k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k3D,      k1E, k1F, k1G, \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,                k2E, k2F, k2G, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k2D,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,                k4C,           k4F,      \
-    k50,      k53,                     k57,                          k5B,      k5D,      k5E, k5F, k5G  \
-) \
-{ \
-    { k00, KC_NO, k02,   k03, k04,   k05,   k06,   k07, k08,   k09,   k0A,   k0B, k0C,   k0D,   k0E,   k0F,   k0G },   \
-    { k10, k11,   k12,   k13, k14,   k15,   k16,   k17, k18,   k19,   k1A,   k1B, k1C,   KC_NO, k1E,   k1F,   k1G },   \
-    { k20, k21,   k22,   k23, k24,   k25,   k26,   k27, k28,   k29,   k2A,   k2B, k2C,   k2D,   k2E,   k2F,   k2G },   \
-    { k30, k31,   k32,   k33, k34,   k35,   k36,   k37, k38,   k39,   k3A,   k3B, k3C,   k3D,   KC_NO, KC_NO, KC_NO }, \
-    { k40, k41,   k42,   k43, k44,   k45,   k46,   k47, k48,   k49,   k4A,   k4B, k4C,   KC_NO, KC_NO, k4F,   KC_NO }, \
-    { k50, KC_NO, KC_NO, k53, KC_NO, KC_NO, KC_NO, k57, KC_NO, KC_NO, KC_NO, k5B, KC_NO, k5D,   k5E,   k5F,   k5G },   \
-}
-// clang-format on
diff --git a/keyboards/matchstickworks/southpad/config.h b/keyboards/matchstickworks/southpad/config.h
deleted file mode 100644
index 93f155fa3e..0000000000
--- a/keyboards/matchstickworks/southpad/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2021 Logan Butler
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, B5, B6, B7, C7, C6 }
-#define MATRIX_COL_PINS { B0, B1, B2, B4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/matchstickworks/southpad/info.json b/keyboards/matchstickworks/southpad/info.json
index 3c88dc453c..887c0484cb 100644
--- a/keyboards/matchstickworks/southpad/info.json
+++ b/keyboards/matchstickworks/southpad/info.json
@@ -8,37 +8,42 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B4"],
+        "rows": ["B3", "B5", "B6", "B7", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_numpad_6x4_southpaw": {
             "layout": [
-                {"label":"Bksp", "x":0, "y":0},
-                {"label":"=", "x":1, "y":0},
-                {"label":"(", "x":2, "y":0},
-                {"label":")", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"-", "x":0, "y":1},
-                {"label":"*", "x":1, "y":1},
-                {"label":"/", "x":2, "y":1},
-                {"label":"Num Lock", "x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label":"9", "x":1, "y":2},
-                {"label":"8", "x":2, "y":2},
-                {"label":"7", "x":3, "y":2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "h": 2},
 
-                {"label":"+", "x":0, "y":2, "h":2},
-                {"label":"6", "x":1, "y":3},
-                {"label":"5", "x":2, "y":3},
-                {"label":"4", "x":3, "y":3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
 
-                {"label":"3", "x":1, "y":4},
-                {"label":"2", "x":2, "y":4},
-                {"label":"1", "x":3, "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, 0], "x": 0, "y": 4, "h": 2},
 
-                {"label":"Enter", "x":0, "y":4, "h":2},
-                {"label":".", "x":1, "y":5},
-                {"label":"0", "x":2, "y":5, "w":2}
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 3], "x": 2, "y": 5, "w": 2}
             ]
         }
     }
diff --git a/keyboards/matchstickworks/southpad/southpad.c b/keyboards/matchstickworks/southpad/southpad.c
deleted file mode 100644
index 52c9c1e6b1..0000000000
--- a/keyboards/matchstickworks/southpad/southpad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Logan Butler
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "southpad.h"
diff --git a/keyboards/matchstickworks/southpad/southpad.h b/keyboards/matchstickworks/southpad/southpad.h
deleted file mode 100644
index bdfb11bdd0..0000000000
--- a/keyboards/matchstickworks/southpad/southpad.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 Logan Butler
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_numpad_6x4_southpaw( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-         k21, k22, k23, \
-    k20, k31, k32, k33, \
-         k41, k42, k43, \
-    k40, k51,   k53     \
-) \
-{ \
-    { k00,   k01, k02,   k03 }, \
-    { k10,   k11, k12,   k13 }, \
-    { k20,   k21, k22,   k23 }, \
-    { KC_NO, k31, k32,   k33 }, \
-    { k40,   k41, k42,   k43 }, \
-    { KC_NO, k51, KC_NO, k53 }  \
-}
-
diff --git a/keyboards/matrix/abelx/abelx.h b/keyboards/matrix/abelx/abelx.h
index b5a1cc7aa7..1363d11467 100644
--- a/keyboards/matrix/abelx/abelx.h
+++ b/keyboards/matrix/abelx/abelx.h
@@ -21,41 +21,6 @@
 
 #include "quantum.h"
 
-
-#define LAYOUT_tkl_iso( \
-    K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,          K013, K014, K015, \
-  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,          K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,                K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,                      K413, \
-	K500, K501, K502,                   K506,             K509, K510, K511, K512,                K513, K514, K515\
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013, K014, K015}, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113, K114, K115}, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212, KC_NO, K214, K116}, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313, K215, K216}, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412, KC_NO, K413,KC_NO}, \
-	{ K500,  K501,  K502, KC_NO, KC_NO, KC_NO,  K506,  K509,  K510,  K511,  K512,  K513,  K514, KC_NO, K515,KC_NO}, \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,          K013, K014, K015, \
-  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,          K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,          K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K412,                K413, \
-	K500, K501, K502,                   K506,             K509, K510, K511, K512,                K513, K514, K515\
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013, K014, K015}, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113, K114, K115}, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213, K214, K116}, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311, KC_NO,  K313, K215, K216}, \
-	{ K400, KC_NO,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412, KC_NO, K413,KC_NO}, \
-	{ K500,  K501,  K502, KC_NO, KC_NO, KC_NO,  K506,  K509,  K510,  K511,  K512,  K513,  K514, KC_NO, K515,KC_NO}, \
-}
-
 void set_pin(uint16_t pin);
 void clear_pin(uint16_t pin);
 uint8_t read_pin(uint16_t pin);
diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h
index ba603684a5..a1eaecf36e 100644
--- a/keyboards/matrix/abelx/config.h
+++ b/keyboards/matrix/abelx/config.h
@@ -91,7 +91,6 @@
 
 // rgb light setting
 #define RGBLED_NUM 9
-#define RGB_DI_PIN B4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/info.json
index 121251f3b5..60a272dc1f 100644
--- a/keyboards/matrix/abelx/info.json
+++ b/keyboards/matrix/abelx/info.json
@@ -8,12 +8,217 @@
     "pid": "0xAB87",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B4"
+  },
   "layouts": {
     "LAYOUT_tkl_ansi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25},{"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
+      ]
     },
     "LAYOUT_tkl_iso": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"\u00ac", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"\"", "x":2, "y":1.5}, {"label":"\u00a3", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"@", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25},{"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
+      ]
     }
   }
 }
diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h
index ff49f9aac5..017961460c 100644
--- a/keyboards/matrix/cain_re/config.h
+++ b/keyboards/matrix/cain_re/config.h
@@ -19,17 +19,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, C7, C6, D5, D2, D4, D7, B7, D1 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, B5, B6, B3, B2, B1, D0, B4, D6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,7 +37,6 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_LED_MAP { 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3 }
-#endif
 
 #define CAPS_PIN    D3
 #define NUM_PIN     F7
diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json
index 84b8dc38eb..f97a28bfbc 100644
--- a/keyboards/matrix/cain_re/info.json
+++ b/keyboards/matrix/cain_re/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0106",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "B5", "B6", "B3", "B2", "B1", "D0", "B4", "D6"],
+        "rows": ["F0", "C7", "C6", "D5", "D2", "D4", "D7", "B7", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h
index ea2e015af4..d817e8b6f2 100644
--- a/keyboards/matrix/falcon/config.h
+++ b/keyboards/matrix/falcon/config.h
@@ -15,12 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F1, B7, F7, F5, F4}
-#define MATRIX_COL_PINS { F6, B3, B2, B1, B0, C7, C6, B6, B5, B4, D7, D6, D4}
-
-#define DIODE_DIRECTION ROW2COL
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -34,7 +28,6 @@
 
 //rgb light setting
 #define RGBLED_NUM      4
-#define RGB_DI_PIN      D1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json
index e52ffa1c74..7aa9a28373 100644
--- a/keyboards/matrix/falcon/info.json
+++ b/keyboards/matrix/falcon/info.json
@@ -8,9 +8,17 @@
         "pid": "0x474E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "B3", "B2", "B1", "B0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F1", "B7", "F7", "F5", "F4"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "E2"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_hhkb"],
diff --git a/keyboards/matrix/m12og/rev1/config.h b/keyboards/matrix/m12og/rev1/config.h
index 7388b0ccd8..f0ad633575 100644
--- a/keyboards/matrix/m12og/rev1/config.h
+++ b/keyboards/matrix/m12og/rev1/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 /* RGB */
-#define RGB_DI_PIN B8
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json
index 434b28fbf2..37eadece52 100644
--- a/keyboards/matrix/m12og/rev1/info.json
+++ b/keyboards/matrix/m12og/rev1/info.json
@@ -12,6 +12,9 @@
         "caps_lock": "B6",
         "scroll_lock": "B5"
     },
+    "ws2812": {
+        "pin": "B8"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h
index 9df2a43d50..7fb34f5001 100644
--- a/keyboards/matrix/m12og/rev2/config.h
+++ b/keyboards/matrix/m12og/rev2/config.h
@@ -4,17 +4,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, F0, B7, C7, D3, B0, D1 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, B6, B5, B4, D7, D0, D2, D6, D4, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B3
-
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -31,4 +20,3 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-#endif
diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/info.json
index af7e96d719..7ebf087c0a 100644
--- a/keyboards/matrix/m12og/rev2/info.json
+++ b/keyboards/matrix/m12og/rev2/info.json
@@ -8,14 +8,322 @@
     "pid": "0x8712",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B3"
+  },
+  "matrix_pins": {
+    "cols": ["F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D0", "D2", "D6", "D4", "D5"],
+    "rows": ["E6", "F0", "B7", "C7", "D3", "B0", "D1"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [5, 0], "x": 13, "y": 0},
+        {"matrix": [5, 1], "x": 14, "y": 0},
+        {"matrix": [5, 2], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 16, "y": 0},
+        {"matrix": [1, 1], "x": 17, "y": 0},
+        {"matrix": [1, 2], "x": 18, "y": 0},
+        {"matrix": [1, 3], "x": 19, "y": 0},
+        {"matrix": [1, 4], "x": 20, "y": 0},
+        {"matrix": [1, 5], "x": 21, "y": 0},
+        {"matrix": [1, 6], "x": 22, "y": 0},
+        {"matrix": [1, 7], "x": 23, "y": 0},
+        {"matrix": [1, 8], "x": 24, "y": 0},
+        {"matrix": [1, 9], "x": 25, "y": 0},
+        {"matrix": [1, 10], "x": 26, "y": 0},
+        {"matrix": [1, 11], "x": 27, "y": 0},
+        {"matrix": [1, 12], "x": 28, "y": 0},
+        {"matrix": [1, 13], "x": 29, "y": 0},
+        {"matrix": [0, 13], "x": 30, "y": 0},
+        {"matrix": [5, 3], "x": 31, "y": 0},
+        {"matrix": [5, 4], "x": 32, "y": 0},
+        {"matrix": [5, 5], "x": 33, "y": 0},
+
+        {"matrix": [2, 0], "x": 34, "y": 0},
+        {"matrix": [2, 1], "x": 35, "y": 0},
+        {"matrix": [2, 2], "x": 36, "y": 0},
+        {"matrix": [2, 3], "x": 37, "y": 0},
+        {"matrix": [2, 4], "x": 38, "y": 0},
+        {"matrix": [2, 5], "x": 39, "y": 0},
+        {"matrix": [2, 6], "x": 40, "y": 0},
+        {"matrix": [2, 7], "x": 41, "y": 0},
+        {"matrix": [2, 8], "x": 42, "y": 0},
+        {"matrix": [2, 9], "x": 43, "y": 0},
+        {"matrix": [2, 10], "x": 44, "y": 0},
+        {"matrix": [2, 11], "x": 45, "y": 0},
+        {"matrix": [2, 12], "x": 46, "y": 0},
+        {"matrix": [2, 13], "x": 47, "y": 0},
+        {"matrix": [5, 6], "x": 48, "y": 0},
+        {"matrix": [5, 7], "x": 49, "y": 0},
+        {"matrix": [5, 8], "x": 50, "y": 0},
+
+        {"matrix": [3, 0], "x": 51, "y": 0},
+        {"matrix": [3, 1], "x": 52, "y": 0},
+        {"matrix": [3, 2], "x": 53, "y": 0},
+        {"matrix": [3, 3], "x": 54, "y": 0},
+        {"matrix": [3, 4], "x": 55, "y": 0},
+        {"matrix": [3, 5], "x": 56, "y": 0},
+        {"matrix": [3, 6], "x": 57, "y": 0},
+        {"matrix": [3, 7], "x": 58, "y": 0},
+        {"matrix": [3, 8], "x": 59, "y": 0},
+        {"matrix": [3, 9], "x": 60, "y": 0},
+        {"matrix": [3, 10], "x": 61, "y": 0},
+        {"matrix": [3, 11], "x": 62, "y": 0},
+        {"matrix": [3, 12], "x": 63, "y": 0},
+        {"matrix": [3, 13], "x": 64, "y": 0},
+
+        {"matrix": [4, 0], "x": 65, "y": 0},
+        {"matrix": [4, 1], "x": 66, "y": 0},
+        {"matrix": [4, 2], "x": 67, "y": 0},
+        {"matrix": [4, 3], "x": 68, "y": 0},
+        {"matrix": [4, 4], "x": 69, "y": 0},
+        {"matrix": [4, 5], "x": 70, "y": 0},
+        {"matrix": [4, 6], "x": 71, "y": 0},
+        {"matrix": [4, 7], "x": 72, "y": 0},
+        {"matrix": [4, 8], "x": 73, "y": 0},
+        {"matrix": [4, 9], "x": 74, "y": 0},
+        {"matrix": [4, 10], "x": 75, "y": 0},
+        {"matrix": [4, 11], "x": 76, "y": 0},
+        {"matrix": [4, 12], "x": 77, "y": 0},
+        {"matrix": [4, 13], "x": 78, "y": 0},
+        {"matrix": [6, 10], "x": 79, "y": 0},
+
+        {"matrix": [6, 0], "x": 80, "y": 0},
+        {"matrix": [6, 1], "x": 81, "y": 0},
+        {"matrix": [6, 2], "x": 82, "y": 0},
+        {"matrix": [6, 3], "x": 83, "y": 0},
+        {"matrix": [6, 4], "x": 84, "y": 0},
+        {"matrix": [6, 5], "x": 85, "y": 0},
+        {"matrix": [6, 6], "x": 86, "y": 0},
+        {"matrix": [6, 7], "x": 87, "y": 0},
+        {"matrix": [6, 8], "x": 88, "y": 0},
+        {"matrix": [6, 9], "x": 89, "y": 0}
+      ]
+    },
     "LAYOUT_tkl_ansi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Menu", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [5, 0], "x": 15.25, "y": 0},
+        {"matrix": [5, 1], "x": 16.25, "y": 0},
+        {"matrix": [5, 2], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [0, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [5, 3], "x": 15.25, "y": 1.5},
+        {"matrix": [5, 4], "x": 16.25, "y": 1.5},
+        {"matrix": [5, 5], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [5, 6], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 10], "x": 16.25, "y": 4.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.5},
+        {"matrix": [6, 1], "x": 1.5, "y": 5.5},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [6, 3], "x": 4, "y": 5.5, "w": 7},
+        {"matrix": [6, 4], "x": 11, "y": 5.5, "w": 1.5},
+        {"matrix": [6, 5], "x": 12.5, "y": 5.5},
+        {"matrix": [6, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+        {"matrix": [6, 7], "x": 15.25, "y": 5.5},
+        {"matrix": [6, 8], "x": 16.25, "y": 5.5},
+        {"matrix": [6, 9], "x": 17.25, "y": 5.5}
+      ]
     },
     "LAYOUT_tkl_iso": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"\u00ac", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"\"", "x":2, "y":1.5}, {"label":"\u00a3", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"@", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"AltGr", "x":11, "y":5.5, "w":1.5}, {"label":"Menu", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [5, 0], "x": 15.25, "y": 0},
+        {"matrix": [5, 1], "x": 16.25, "y": 0},
+        {"matrix": [5, 2], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [0, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [5, 3], "x": 15.25, "y": 1.5},
+        {"matrix": [5, 4], "x": 16.25, "y": 1.5},
+        {"matrix": [5, 5], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+        {"matrix": [5, 6], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 10], "x": 16.25, "y": 4.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.5},
+        {"matrix": [6, 1], "x": 1.5, "y": 5.5},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [6, 3], "x": 4, "y": 5.5, "w": 7},
+        {"matrix": [6, 4], "x": 11, "y": 5.5, "w": 1.5},
+        {"matrix": [6, 5], "x": 12.5, "y": 5.5},
+        {"matrix": [6, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+        {"matrix": [6, 7], "x": 15.25, "y": 5.5},
+        {"matrix": [6, 8], "x": 16.25, "y": 5.5},
+        {"matrix": [6, 9], "x": 17.25, "y": 5.5}
+      ]
     }
   }
 }
diff --git a/keyboards/matrix/m12og/rev2/rev2.c b/keyboards/matrix/m12og/rev2/rev2.c
index 4f2af13eb2..1a35dff7a9 100644
--- a/keyboards/matrix/m12og/rev2/rev2.c
+++ b/keyboards/matrix/m12og/rev2/rev2.c
@@ -2,7 +2,7 @@
  * rev2.c
  */
 
-#include "rev2.h"
+#include "quantum.h"
 
 void matrix_init_user(void) {
 	setPinOutput(C6);
diff --git a/keyboards/matrix/m12og/rev2/rev2.h b/keyboards/matrix/m12og/rev2/rev2.h
deleted file mode 100644
index b2aa4aea7e..0000000000
--- a/keyboards/matrix/m12og/rev2/rev2.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * m12og.h
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,        K500, K501, K502,\
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K013,  K503, K504, K505,\
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,        K506, K507, K508,\
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,                         \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,              K610,      \
-    K600, K601, K602,                   K603,                         K604, K605, K606,        K607, K608, K609 \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013  }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113  }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213  }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313  }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413  }, \
-    { K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609,  K610,  KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,   K500, K501, K502, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,   K503, K504, K505, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,         K506, K507, K508, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,                     \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,               K610,       \
-	K600, K601, K602,                         K603,                   K604, K605, K606,   K607, K608, K609  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313  }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO }, \
-	{ K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609,  K610,  KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,   K500, K501, K502, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,   K503, K504, K505, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,   K506, K507, K508, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                     \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K412,         K610,       \
-	K600, K601, K602,                   K603,                         K604, K605, K606,   K607, K608, K609  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213  }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313  }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO }, \
-	{ K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-	{ K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609,  K610,  KC_NO, KC_NO, KC_NO }  \
-}
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index d7b846cbcf..421773affc 100644
--- a/keyboards/matrix/m20add/config.h
+++ b/keyboards/matrix/m20add/config.h
@@ -79,7 +79,6 @@
 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
 
 // rgb light setting
-#define RGB_DI_PIN B4  // reserved pin for future usage
 #define RGBLED_NUM 20
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json
index 4aa7f19efb..7d88bb81f5 100644
--- a/keyboards/matrix/m20add/info.json
+++ b/keyboards/matrix/m20add/info.json
@@ -8,12 +8,216 @@
     "pid": "0x20AD",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B4"
+  },
   "layouts": {
     "LAYOUT_tkl_ansi_tsangan": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Menu", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+        {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 12.5, "y": 5.5},
+        {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5},
+
+        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
+      ]
     },
     "LAYOUT_tkl_iso_tsangan": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"\u00ac", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"\"", "x":2, "y":1.5}, {"label":"\u00a3", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"@", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"AltGr", "x":11, "y":5.5, "w":1.5}, {"label":"Menu", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+        {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 12.5, "y": 5.5},
+        {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5},
+
+        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
+      ]
     }
   }
 }
diff --git a/keyboards/matrix/m20add/m20add.h b/keyboards/matrix/m20add/m20add.h
index 1c85dc3bde..69c88ddff6 100644
--- a/keyboards/matrix/m20add/m20add.h
+++ b/keyboards/matrix/m20add/m20add.h
@@ -6,41 +6,6 @@
 
 #include "quantum.h"
 
-
-#define LAYOUT_tkl_iso_tsangan( \
-    K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,          K013, K014, K015, \
-  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,          K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,                K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,                      K413, \
-	K500, K501, K502,                         K503,                   K504, K505, K506,          K507, K508, K509  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013, K014, K015}, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113, K114, K115}, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212, KC_NO, K214, K116}, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313, K215, K216}, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412, KC_NO, K413,KC_NO}, \
-	{ K500,  K501,  K502, KC_NO, KC_NO, KC_NO,  K503, KC_NO,  K504,  K505,  K506,  K507,  K508, KC_NO, K509,KC_NO}, \
-}
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,          K013, K014, K015, \
-  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,          K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,          K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K412,                K413, \
-	K500, K501, K502,                         K503,                   K504, K505, K506,          K507, K508, K509  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013, K014, K015}, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113, K114, K115}, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213, K214, K116}, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311, KC_NO,  K313, K215, K216}, \
-	{ K400, KC_NO,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412, KC_NO, K413,KC_NO}, \
-	{ K500,  K501,  K502, KC_NO, KC_NO, KC_NO,  K503, KC_NO,  K504,  K505,  K506,  K507,  K508, KC_NO, K509,KC_NO}, \
-}
-
 void set_pin(uint16_t pin);
 void clear_pin(uint16_t pin);
 uint8_t read_pin(uint16_t pin);
diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h
index 69b54b5bd0..8ee1b57bde 100644
--- a/keyboards/matrix/me/config.h
+++ b/keyboards/matrix/me/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS {D3, D5, D4, D6, B5, B4}
-#define MATRIX_COL_PINS {B7, B3, B2, B1, B0, F0, F1, F4, F5, F6, F7, C7, C6, B6, D7}
-#define DIODE_DIRECTION COL2ROW
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -33,7 +28,6 @@
 
 //rgb light setting
 #define RGBLED_NUM          4
-#define RGB_DI_PIN          E2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/info.json
index cfe0ad22d4..e7b9265b18 100644
--- a/keyboards/matrix/me/info.json
+++ b/keyboards/matrix/me/info.json
@@ -8,18 +8,325 @@
     "pid": "0x454D",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "D7"],
+    "rows": ["D3", "D5", "D4", "D6", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "E6",
     "scroll_lock": "D2"
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [1, 14], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 16, "y": 0},
+        {"matrix": [1, 1], "x": 17, "y": 0},
+        {"matrix": [1, 2], "x": 18, "y": 0},
+        {"matrix": [1, 3], "x": 19, "y": 0},
+        {"matrix": [1, 4], "x": 20, "y": 0},
+        {"matrix": [1, 5], "x": 21, "y": 0},
+        {"matrix": [1, 6], "x": 22, "y": 0},
+        {"matrix": [1, 7], "x": 23, "y": 0},
+        {"matrix": [1, 8], "x": 24, "y": 0},
+        {"matrix": [1, 9], "x": 25, "y": 0},
+        {"matrix": [1, 10], "x": 26, "y": 0},
+        {"matrix": [1, 11], "x": 27, "y": 0},
+        {"matrix": [1, 12], "x": 28, "y": 0},
+        {"matrix": [1, 13], "x": 29, "y": 0},
+        {"matrix": [2, 14], "x": 30, "y": 0},
+        {"matrix": [3, 14], "x": 31, "y": 0},
+        {"matrix": [5, 14], "x": 32, "y": 0},
+
+        {"matrix": [2, 0], "x": 33, "y": 0},
+        {"matrix": [2, 1], "x": 34, "y": 0},
+        {"matrix": [2, 2], "x": 35, "y": 0},
+        {"matrix": [2, 3], "x": 36, "y": 0},
+        {"matrix": [2, 4], "x": 37, "y": 0},
+        {"matrix": [2, 5], "x": 38, "y": 0},
+        {"matrix": [2, 6], "x": 39, "y": 0},
+        {"matrix": [2, 7], "x": 40, "y": 0},
+        {"matrix": [2, 8], "x": 41, "y": 0},
+        {"matrix": [2, 9], "x": 42, "y": 0},
+        {"matrix": [2, 10], "x": 43, "y": 0},
+        {"matrix": [2, 11], "x": 44, "y": 0},
+        {"matrix": [2, 12], "x": 45, "y": 0},
+        {"matrix": [2, 13], "x": 46, "y": 0},
+        {"matrix": [5, 13], "x": 47, "y": 0},
+        {"matrix": [5, 12], "x": 48, "y": 0},
+        {"matrix": [5, 11], "x": 49, "y": 0},
+
+        {"matrix": [3, 0], "x": 50, "y": 0},
+        {"matrix": [3, 1], "x": 51, "y": 0},
+        {"matrix": [3, 2], "x": 52, "y": 0},
+        {"matrix": [3, 3], "x": 53, "y": 0},
+        {"matrix": [3, 4], "x": 54, "y": 0},
+        {"matrix": [3, 5], "x": 55, "y": 0},
+        {"matrix": [3, 6], "x": 56, "y": 0},
+        {"matrix": [3, 7], "x": 57, "y": 0},
+        {"matrix": [3, 8], "x": 58, "y": 0},
+        {"matrix": [3, 9], "x": 59, "y": 0},
+        {"matrix": [3, 10], "x": 60, "y": 0},
+        {"matrix": [3, 11], "x": 61, "y": 0},
+        {"matrix": [3, 12], "x": 62, "y": 0},
+        {"matrix": [3, 13], "x": 63, "y": 0},
+
+        {"matrix": [4, 0], "x": 64, "y": 0},
+        {"matrix": [4, 1], "x": 65, "y": 0},
+        {"matrix": [4, 2], "x": 66, "y": 0},
+        {"matrix": [4, 3], "x": 67, "y": 0},
+        {"matrix": [4, 4], "x": 68, "y": 0},
+        {"matrix": [4, 5], "x": 69, "y": 0},
+        {"matrix": [4, 6], "x": 70, "y": 0},
+        {"matrix": [4, 7], "x": 71, "y": 0},
+        {"matrix": [4, 8], "x": 72, "y": 0},
+        {"matrix": [4, 9], "x": 73, "y": 0},
+        {"matrix": [4, 10], "x": 74, "y": 0},
+        {"matrix": [4, 11], "x": 75, "y": 0},
+        {"matrix": [4, 12], "x": 76, "y": 0},
+        {"matrix": [4, 13], "x": 77, "y": 0},
+
+        {"matrix": [5, 0], "x": 78, "y": 0},
+        {"matrix": [5, 1], "x": 79, "y": 0},
+        {"matrix": [5, 2], "x": 80, "y": 0},
+        {"matrix": [5, 3], "x": 81, "y": 0},
+        {"matrix": [5, 4], "x": 82, "y": 0},
+        {"matrix": [5, 5], "x": 83, "y": 0},
+        {"matrix": [5, 6], "x": 84, "y": 0},
+        {"matrix": [5, 7], "x": 85, "y": 0},
+        {"matrix": [5, 8], "x": 86, "y": 0},
+        {"matrix": [5, 9], "x": 87, "y": 0},
+        {"matrix": [5, 10], "x": 88, "y": 0}
+      ]
+    },
     "LAYOUT_tkl_ansi_tsangan": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Menu", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [1, 14], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 11], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 3], "x": 4, "y": 5.5, "w": 7},
+        {"matrix": [5, 5], "x": 11, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 6], "x": 12.5, "y": 5.5},
+        {"matrix": [5, 7], "x": 13.5, "y": 5.5, "w": 1.5},
+
+        {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 10], "x": 17.25, "y": 5.5}
+      ]
     },
     "LAYOUT_tkl_iso_tsangan": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"\u00ac", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"\"", "x":2, "y":1.5}, {"label":"\u00a3", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"@", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"AltGr", "x":11, "y":5.5, "w":1.5}, {"label":"Menu", "x":12.5, "y":5.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [1, 14], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 11], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 3], "x": 4, "y": 5.5, "w": 7},
+        {"matrix": [5, 5], "x": 11, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 6], "x": 12.5, "y": 5.5},
+        {"matrix": [5, 7], "x": 13.5, "y": 5.5, "w": 1.5},
+
+        {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 10], "x": 17.25, "y": 5.5}
+      ]
     }
   }
 }
diff --git a/keyboards/matrix/me/me.c b/keyboards/matrix/me/me.c
deleted file mode 100644
index c99f26e623..0000000000
--- a/keyboards/matrix/me/me.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * me.c
- *
-  Copyright 2021 astro 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "me.h"
diff --git a/keyboards/matrix/me/me.h b/keyboards/matrix/me/me.h
deleted file mode 100644
index f10417f58f..0000000000
--- a/keyboards/matrix/me/me.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
-  * me.h
-  *
-  Copyright 2021 astro 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    K000, 		K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, 		 K014, K015, K016, \
-  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,          K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,          K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,                      K415, \
-	K500, K501, K502,                         K507,                   K511, K512, K513,          K514, K515, K516  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K014,  K015}, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K016}, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K114}, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311, KC_NO,  K313,  K115}, \
-	{ K400, KC_NO,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K415, KC_NO}, \
-	{ K500,  K501,  K502,  K507, KC_NO,  K511,  K512,  K513,  K514,  K515,  K516,  K216,  K215,  K214,  K116}, \
-}
-
-#define LAYOUT_tkl_iso_tsangan( \
-    K000, 		K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, 		 K014, K015, K016, \
-  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,          K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,                K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,                      K415, \
-	K500, K501, K502,                         K507,                   K511, K512, K513,          K514, K515, K516  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K014,  K015}, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K016}, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212, KC_NO,  K114}, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K115}, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K415, KC_NO}, \
-	{ K500,  K501,  K502,  K507, KC_NO,  K511,  K512,  K513,  K514,  K515,  K516,  K216,  K215,  K214,  K116}, \
-}
-
-#define LAYOUT_all( \
-    K000, 		K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, 		 K014, K015, K016, \
-  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,          K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,          K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,                      K415, \
-	K500, K501, K502,                         K507,             K508, K511, K512, K513,          K514, K515, K516  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K014,  K015}, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K016}, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K114}, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K115}, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K415, KC_NO}, \
-	{ K500,  K501,  K502,  K507,  K508,  K511,  K512,  K513,  K514,  K515,  K516,  K216,  K215,  K214,  K116}, \
-}
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index a5688556f2..5a74ab5206 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -11,11 +11,6 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-#define MATRIX_ROW_PINS {  B0,  A1, C14, C13,  A0}
-#define MATRIX_COL_PINS { C15, B10,  B7,  B6,  B5,  B4, A15, A10,  A9,  A8, B15, B14, B13, B12,  B2}
-
-#define DIODE_DIRECTION COL2ROW
-
 // i2c setting
 #define I2C1_SCL_PIN B8
 #define I2C1_SDA_PIN B9
@@ -81,7 +76,6 @@
 
 /* indicator rgb */
 #define RGBLED_NUM 7
-#define RGB_DI_PIN B1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
index 9251760aa2..33dedc6bce 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/info.json
@@ -8,1428 +8,393 @@
     "pid": "0x0065",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B1"
+  },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
   "community_layouts": ["65_iso_blocker"],
   "layouts": {
     "LAYOUT_default": {
       "layout": [
-        {
-          "label": "~",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "!",
-          "x": 1,
-          "y": 0
-        },
-        {
-          "label": "@",
-          "x": 2,
-          "y": 0
-        },
-        {
-          "label": "#",
-          "x": 3,
-          "y": 0
-        },
-        {
-          "label": "$",
-          "x": 4,
-          "y": 0
-        },
-        {
-          "label": "%",
-          "x": 5,
-          "y": 0
-        },
-        {
-          "label": "^",
-          "x": 6,
-          "y": 0
-        },
-        {
-          "label": "&",
-          "x": 7,
-          "y": 0
-        },
-        {
-          "label": "*",
-          "x": 8,
-          "y": 0
-        },
-        {
-          "label": "(",
-          "x": 9,
-          "y": 0
-        },
-        {
-          "label": ")",
-          "x": 10,
-          "y": 0
-        },
-        {
-          "label": "_",
-          "x": 11,
-          "y": 0
-        },
-        {
-          "label": "+",
-          "x": 12,
-          "y": 0
-        },
-        {
-          "label": "|",
-          "x": 13,
-          "y": 0
-        },
-        {
-          "label": "~",
-          "x": 14,
-          "y": 0
-        },
-        {
-          "label": "Ins",
-          "x": 15,
-          "y": 0
-        },
-        {
-          "label": "Tab",
-          "x": 0,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "Q",
-          "x": 1.5,
-          "y": 1
-        },
-        {
-          "label": "W",
-          "x": 2.5,
-          "y": 1
-        },
-        {
-          "label": "E",
-          "x": 3.5,
-          "y": 1
-        },
-        {
-          "label": "R",
-          "x": 4.5,
-          "y": 1
-        },
-        {
-          "label": "T",
-          "x": 5.5,
-          "y": 1
-        },
-        {
-          "label": "Y",
-          "x": 6.5,
-          "y": 1
-        },
-        {
-          "label": "U",
-          "x": 7.5,
-          "y": 1
-        },
-        {
-          "label": "I",
-          "x": 8.5,
-          "y": 1
-        },
-        {
-          "label": "O",
-          "x": 9.5,
-          "y": 1
-        },
-        {
-          "label": "P",
-          "x": 10.5,
-          "y": 1
-        },
-        {
-          "label": "{",
-          "x": 11.5,
-          "y": 1
-        },
-        {
-          "label": "}",
-          "x": 12.5,
-          "y": 1
-        },
-        {
-          "label": "Backspace",
-          "x": 13.5,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "Page up",
-          "x": 15,
-          "y": 1
-        },
-        {
-          "label": "Ctrl",
-          "x": 0,
-          "y": 2,
-          "w": 1.75
-        },
-        {
-          "label": "A",
-          "x": 1.75,
-          "y": 2
-        },
-        {
-          "label": "S",
-          "x": 2.75,
-          "y": 2
-        },
-        {
-          "label": "D",
-          "x": 3.75,
-          "y": 2
-        },
-        {
-          "label": "F",
-          "x": 4.75,
-          "y": 2
-        },
-        {
-          "label": "G",
-          "x": 5.75,
-          "y": 2
-        },
-        {
-          "label": "H",
-          "x": 6.75,
-          "y": 2
-        },
-        {
-          "label": "J",
-          "x": 7.75,
-          "y": 2
-        },
-        {
-          "label": "K",
-          "x": 8.75,
-          "y": 2
-        },
-        {
-          "label": "L",
-          "x": 9.75,
-          "y": 2
-        },
-        {
-          "label": ":",
-          "x": 10.75,
-          "y": 2
-        },
-        {
-          "label": "\"",
-          "x": 11.75,
-          "y": 2
-        },
-        {
-          "label": "Enter",
-          "x": 12.75,
-          "y": 2,
-          "w": 2.25
-        },
-        {
-          "label": "Page down",
-          "x": 15,
-          "y": 2
-        },
-        {
-          "label": "Shift",
-          "x": 0,
-          "y": 3,
-          "w": 2.25
-        },
-        {
-          "label": "Z",
-          "x": 2.25,
-          "y": 3
-        },
-        {
-          "label": "X",
-          "x": 3.25,
-          "y": 3
-        },
-        {
-          "label": "C",
-          "x": 4.25,
-          "y": 3
-        },
-        {
-          "label": "V",
-          "x": 5.25,
-          "y": 3
-        },
-        {
-          "label": "B",
-          "x": 6.25,
-          "y": 3
-        },
-        {
-          "label": "N",
-          "x": 7.25,
-          "y": 3
-        },
-        {
-          "label": "M",
-          "x": 8.25,
-          "y": 3
-        },
-        {
-          "label": "<",
-          "x": 9.25,
-          "y": 3
-        },
-        {
-          "label": ">",
-          "x": 10.25,
-          "y": 3
-        },
-        {
-          "label": "?",
-          "x": 11.25,
-          "y": 3
-        },
-        {
-          "label": "Shift",
-          "x": 12.25,
-          "y": 3,
-          "w": 1.75
-        },
-        {
-          "label": "&uarr;",
-          "x": 14,
-          "y": 3
-        },
-        {
-          "label": "End",
-          "x": 15,
-          "y": 3
-        },
-        {
-          "label": "Caps Lock",
-          "x": 0,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "Win",
-          "x": 1.25,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "Alt",
-          "x": 2.5,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "x": 3.75,
-          "y": 4,
-          "w": 6.25
-        },
-        {
-          "label": "Alt",
-          "x": 10,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "Fn",
-          "x": 11.25,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "&larr;",
-          "x": 13,
-          "y": 4
-        },
-        {
-          "label": "&darr;",
-          "x": 14,
-          "y": 4
-        },
-        {
-          "label": "&rarr;",
-          "x": 15,
-          "y": 4
-        }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [4, 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": [4, 11], "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": [4, 12], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [4, 13], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_default_splitspace": {
       "layout": [
-        {
-          "label": "~",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "!",
-          "x": 1,
-          "y": 0
-        },
-        {
-          "label": "@",
-          "x": 2,
-          "y": 0
-        },
-        {
-          "label": "#",
-          "x": 3,
-          "y": 0
-        },
-        {
-          "label": "$",
-          "x": 4,
-          "y": 0
-        },
-        {
-          "label": "%",
-          "x": 5,
-          "y": 0
-        },
-        {
-          "label": "^",
-          "x": 6,
-          "y": 0
-        },
-        {
-          "label": "&",
-          "x": 7,
-          "y": 0
-        },
-        {
-          "label": "*",
-          "x": 8,
-          "y": 0
-        },
-        {
-          "label": "(",
-          "x": 9,
-          "y": 0
-        },
-        {
-          "label": ")",
-          "x": 10,
-          "y": 0
-        },
-        {
-          "label": "_",
-          "x": 11,
-          "y": 0
-        },
-        {
-          "label": "+",
-          "x": 12,
-          "y": 0
-        },
-        {
-          "label": "|",
-          "x": 13,
-          "y": 0
-        },
-        {
-          "label": "~",
-          "x": 14,
-          "y": 0
-        },
-        {
-          "label": "Ins",
-          "x": 15,
-          "y": 0
-        },
-        {
-          "label": "Tab",
-          "x": 0,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "Q",
-          "x": 1.5,
-          "y": 1
-        },
-        {
-          "label": "W",
-          "x": 2.5,
-          "y": 1
-        },
-        {
-          "label": "E",
-          "x": 3.5,
-          "y": 1
-        },
-        {
-          "label": "R",
-          "x": 4.5,
-          "y": 1
-        },
-        {
-          "label": "T",
-          "x": 5.5,
-          "y": 1
-        },
-        {
-          "label": "Y",
-          "x": 6.5,
-          "y": 1
-        },
-        {
-          "label": "U",
-          "x": 7.5,
-          "y": 1
-        },
-        {
-          "label": "I",
-          "x": 8.5,
-          "y": 1
-        },
-        {
-          "label": "O",
-          "x": 9.5,
-          "y": 1
-        },
-        {
-          "label": "P",
-          "x": 10.5,
-          "y": 1
-        },
-        {
-          "label": "{",
-          "x": 11.5,
-          "y": 1
-        },
-        {
-          "label": "}",
-          "x": 12.5,
-          "y": 1
-        },
-        {
-          "label": "Backspace",
-          "x": 13.5,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "Page up",
-          "x": 15,
-          "y": 1
-        },
-        {
-          "label": "Ctrl",
-          "x": 0,
-          "y": 2,
-          "w": 1.75
-        },
-        {
-          "label": "A",
-          "x": 1.75,
-          "y": 2
-        },
-        {
-          "label": "S",
-          "x": 2.75,
-          "y": 2
-        },
-        {
-          "label": "D",
-          "x": 3.75,
-          "y": 2
-        },
-        {
-          "label": "F",
-          "x": 4.75,
-          "y": 2
-        },
-        {
-          "label": "G",
-          "x": 5.75,
-          "y": 2
-        },
-        {
-          "label": "H",
-          "x": 6.75,
-          "y": 2
-        },
-        {
-          "label": "J",
-          "x": 7.75,
-          "y": 2
-        },
-        {
-          "label": "K",
-          "x": 8.75,
-          "y": 2
-        },
-        {
-          "label": "L",
-          "x": 9.75,
-          "y": 2
-        },
-        {
-          "label": ":",
-          "x": 10.75,
-          "y": 2
-        },
-        {
-          "label": "\"",
-          "x": 11.75,
-          "y": 2
-        },
-        {
-          "label": "Enter",
-          "x": 12.75,
-          "y": 2,
-          "w": 2.25
-        },
-        {
-          "label": "Page down",
-          "x": 15,
-          "y": 2
-        },
-        {
-          "label": "Shift",
-          "x": 0,
-          "y": 3,
-          "w": 2.25
-        },
-        {
-          "label": "Z",
-          "x": 2.25,
-          "y": 3
-        },
-        {
-          "label": "X",
-          "x": 3.25,
-          "y": 3
-        },
-        {
-          "label": "C",
-          "x": 4.25,
-          "y": 3
-        },
-        {
-          "label": "V",
-          "x": 5.25,
-          "y": 3
-        },
-        {
-          "label": "B",
-          "x": 6.25,
-          "y": 3
-        },
-        {
-          "label": "N",
-          "x": 7.25,
-          "y": 3
-        },
-        {
-          "label": "M",
-          "x": 8.25,
-          "y": 3
-        },
-        {
-          "label": "<",
-          "x": 9.25,
-          "y": 3
-        },
-        {
-          "label": ">",
-          "x": 10.25,
-          "y": 3
-        },
-        {
-          "label": "?",
-          "x": 11.25,
-          "y": 3
-        },
-        {
-          "label": "Shift",
-          "x": 12.25,
-          "y": 3,
-          "w": 1.75
-        },
-        {
-          "label": "&uarr;",
-          "x": 14,
-          "y": 3
-        },
-        {
-          "label": "End",
-          "x": 15,
-          "y": 3
-        },
-        {
-          "label": "Caps Lock",
-          "x": 0,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "Win",
-          "x": 1.25,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "Alt",
-          "x": 2.5,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "x": 3.75,
-          "y": 4,
-          "w": 2.25
-        },
-        {
-          "label": "Fn",
-          "x": 6,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "x": 7.25,
-          "y": 4,
-          "w": 2.75
-        },
-        {
-          "label": "Alt",
-          "x": 10,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "Fn",
-          "x": 11.25,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "&larr;",
-          "x": 13,
-          "y": 4
-        },
-        {
-          "label": "&darr;",
-          "x": 14,
-          "y": 4
-        },
-        {
-          "label": "&rarr;",
-          "x": 15,
-          "y": 4
-        }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [4, 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": [4, 11], "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": [4, 12], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [4, 13], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+        {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+        {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_wkl": {
       "layout": [
-        {
-          "label": "~",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "!",
-          "x": 1,
-          "y": 0
-        },
-        {
-          "label": "@",
-          "x": 2,
-          "y": 0
-        },
-        {
-          "label": "#",
-          "x": 3,
-          "y": 0
-        },
-        {
-          "label": "$",
-          "x": 4,
-          "y": 0
-        },
-        {
-          "label": "%",
-          "x": 5,
-          "y": 0
-        },
-        {
-          "label": "^",
-          "x": 6,
-          "y": 0
-        },
-        {
-          "label": "&",
-          "x": 7,
-          "y": 0
-        },
-        {
-          "label": "*",
-          "x": 8,
-          "y": 0
-        },
-        {
-          "label": "(",
-          "x": 9,
-          "y": 0
-        },
-        {
-          "label": ")",
-          "x": 10,
-          "y": 0
-        },
-        {
-          "label": "_",
-          "x": 11,
-          "y": 0
-        },
-        {
-          "label": "+",
-          "x": 12,
-          "y": 0
-        },
-        {
-          "label": "|",
-          "x": 13,
-          "y": 0
-        },
-        {
-          "label": "~",
-          "x": 14,
-          "y": 0
-        },
-        {
-          "label": "Ins",
-          "x": 15,
-          "y": 0
-        },
-        {
-          "label": "Tab",
-          "x": 0,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "Q",
-          "x": 1.5,
-          "y": 1
-        },
-        {
-          "label": "W",
-          "x": 2.5,
-          "y": 1
-        },
-        {
-          "label": "E",
-          "x": 3.5,
-          "y": 1
-        },
-        {
-          "label": "R",
-          "x": 4.5,
-          "y": 1
-        },
-        {
-          "label": "T",
-          "x": 5.5,
-          "y": 1
-        },
-        {
-          "label": "Y",
-          "x": 6.5,
-          "y": 1
-        },
-        {
-          "label": "U",
-          "x": 7.5,
-          "y": 1
-        },
-        {
-          "label": "I",
-          "x": 8.5,
-          "y": 1
-        },
-        {
-          "label": "O",
-          "x": 9.5,
-          "y": 1
-        },
-        {
-          "label": "P",
-          "x": 10.5,
-          "y": 1
-        },
-        {
-          "label": "{",
-          "x": 11.5,
-          "y": 1
-        },
-        {
-          "label": "}",
-          "x": 12.5,
-          "y": 1
-        },
-        {
-          "label": "Backspace",
-          "x": 13.5,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "Page up",
-          "x": 15,
-          "y": 1
-        },
-        {
-          "label": "Ctrl",
-          "x": 0,
-          "y": 2,
-          "w": 1.75
-        },
-        {
-          "label": "A",
-          "x": 1.75,
-          "y": 2
-        },
-        {
-          "label": "S",
-          "x": 2.75,
-          "y": 2
-        },
-        {
-          "label": "D",
-          "x": 3.75,
-          "y": 2
-        },
-        {
-          "label": "F",
-          "x": 4.75,
-          "y": 2
-        },
-        {
-          "label": "G",
-          "x": 5.75,
-          "y": 2
-        },
-        {
-          "label": "H",
-          "x": 6.75,
-          "y": 2
-        },
-        {
-          "label": "J",
-          "x": 7.75,
-          "y": 2
-        },
-        {
-          "label": "K",
-          "x": 8.75,
-          "y": 2
-        },
-        {
-          "label": "L",
-          "x": 9.75,
-          "y": 2
-        },
-        {
-          "label": ":",
-          "x": 10.75,
-          "y": 2
-        },
-        {
-          "label": "\"",
-          "x": 11.75,
-          "y": 2
-        },
-        {
-          "label": "Enter",
-          "x": 12.75,
-          "y": 2,
-          "w": 2.25
-        },
-        {
-          "label": "Page down",
-          "x": 15,
-          "y": 2
-        },
-        {
-          "label": "Shift",
-          "x": 0,
-          "y": 3,
-          "w": 2.25
-        },
-        {
-          "label": "Z",
-          "x": 2.25,
-          "y": 3
-        },
-        {
-          "label": "X",
-          "x": 3.25,
-          "y": 3
-        },
-        {
-          "label": "C",
-          "x": 4.25,
-          "y": 3
-        },
-        {
-          "label": "V",
-          "x": 5.25,
-          "y": 3
-        },
-        {
-          "label": "B",
-          "x": 6.25,
-          "y": 3
-        },
-        {
-          "label": "N",
-          "x": 7.25,
-          "y": 3
-        },
-        {
-          "label": "M",
-          "x": 8.25,
-          "y": 3
-        },
-        {
-          "label": "<",
-          "x": 9.25,
-          "y": 3
-        },
-        {
-          "label": ">",
-          "x": 10.25,
-          "y": 3
-        },
-        {
-          "label": "?",
-          "x": 11.25,
-          "y": 3
-        },
-        {
-          "label": "Shift",
-          "x": 12.25,
-          "y": 3,
-          "w": 1.75
-        },
-        {
-          "label": "&uarr;",
-          "x": 14,
-          "y": 3
-        },
-        {
-          "label": "End",
-          "x": 15,
-          "y": 3
-        },
-        {
-          "label": "Caps Lock",
-          "x": 0,
-          "y": 4,
-          "w": 1.5
-        },
-        {
-          "label": "Win",
-          "x": 1.5,
-          "y": 4
-        },
-        {
-          "label": "Alt",
-          "x": 2.5,
-          "y": 4,
-          "w": 1.5
-        },
-        {
-          "x": 4,
-          "y": 4,
-          "w": 7
-        },
-        {
-          "label": "Fn",
-          "x": 11,
-          "y": 4,
-          "w": 1.5
-        },
-        {
-          "label": "&larr;",
-          "x": 13,
-          "y": 4
-        },
-        {
-          "label": "&darr;",
-          "x": 14,
-          "y": 4
-        },
-        {
-          "label": "&rarr;",
-          "x": 15,
-          "y": 4
-        }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [4, 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": [4, 11], "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": [4, 12], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [4, 13], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 7], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_iso": {
       "layout": [
-        {
-          "label": "~",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "!",
-          "x": 1,
-          "y": 0
-        },
-        {
-          "label": "@",
-          "x": 2,
-          "y": 0
-        },
-        {
-          "label": "#",
-          "x": 3,
-          "y": 0
-        },
-        {
-          "label": "$",
-          "x": 4,
-          "y": 0
-        },
-        {
-          "label": "%",
-          "x": 5,
-          "y": 0
-        },
-        {
-          "label": "^",
-          "x": 6,
-          "y": 0
-        },
-        {
-          "label": "&",
-          "x": 7,
-          "y": 0
-        },
-        {
-          "label": "*",
-          "x": 8,
-          "y": 0
-        },
-        {
-          "label": "(",
-          "x": 9,
-          "y": 0
-        },
-        {
-          "label": ")",
-          "x": 10,
-          "y": 0
-        },
-        {
-          "label": "_",
-          "x": 11,
-          "y": 0
-        },
-        {
-          "label": "+",
-          "x": 12,
-          "y": 0
-        },
-        {
-          "label": "Backspace",
-          "x": 13,
-          "y": 0,
-          "w": 2
-        },
-        {
-          "label": "Ins",
-          "x": 15,
-          "y": 0
-        },
-        {
-          "label": "Tab",
-          "x": 0,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "Q",
-          "x": 1.5,
-          "y": 1
-        },
-        {
-          "label": "W",
-          "x": 2.5,
-          "y": 1
-        },
-        {
-          "label": "E",
-          "x": 3.5,
-          "y": 1
-        },
-        {
-          "label": "R",
-          "x": 4.5,
-          "y": 1
-        },
-        {
-          "label": "T",
-          "x": 5.5,
-          "y": 1
-        },
-        {
-          "label": "Y",
-          "x": 6.5,
-          "y": 1
-        },
-        {
-          "label": "U",
-          "x": 7.5,
-          "y": 1
-        },
-        {
-          "label": "I",
-          "x": 8.5,
-          "y": 1
-        },
-        {
-          "label": "O",
-          "x": 9.5,
-          "y": 1
-        },
-        {
-          "label": "P",
-          "x": 10.5,
-          "y": 1
-        },
-        {
-          "label": "{",
-          "x": 11.5,
-          "y": 1
-        },
-        {
-          "label": "}",
-          "x": 12.5,
-          "y": 1
-        },
-        {
-          "label": "Page up",
-          "x": 15,
-          "y": 1
-        },
-        {
-          "label": "Caps Lock",
-          "x": 0,
-          "y": 2,
-          "w": 1.75
-        },
-        {
-          "label": "A",
-          "x": 1.75,
-          "y": 2
-        },
-        {
-          "label": "S",
-          "x": 2.75,
-          "y": 2
-        },
-        {
-          "label": "D",
-          "x": 3.75,
-          "y": 2
-        },
-        {
-          "label": "F",
-          "x": 4.75,
-          "y": 2
-        },
-        {
-          "label": "G",
-          "x": 5.75,
-          "y": 2
-        },
-        {
-          "label": "H",
-          "x": 6.75,
-          "y": 2
-        },
-        {
-          "label": "J",
-          "x": 7.75,
-          "y": 2
-        },
-        {
-          "label": "K",
-          "x": 8.75,
-          "y": 2
-        },
-        {
-          "label": "L",
-          "x": 9.75,
-          "y": 2
-        },
-        {
-          "label": ":",
-          "x": 10.75,
-          "y": 2
-        },
-        {
-          "label": "\"",
-          "x": 11.75,
-          "y": 2
-        },
-        {
-          "label": "|",
-          "x": 12.75,
-          "y": 2
-        },
-        {
-          "label": "Enter",
-          "x": 13.75,
-          "y": 1,
-          "w": 1.25,
-          "h": 2
-        },
-        {
-          "label": "Page down",
-          "x": 15,
-          "y": 2
-        },
-        {
-          "label": "Shift",
-          "x": 0,
-          "y": 3,
-          "w": 1.25
-        },
-        {
-          "label": "Win",
-          "x": 1.25,
-          "y": 3
-        },
-        {
-          "label": "Z",
-          "x": 2.25,
-          "y": 3
-        },
-        {
-          "label": "X",
-          "x": 3.25,
-          "y": 3
-        },
-        {
-          "label": "C",
-          "x": 4.25,
-          "y": 3
-        },
-        {
-          "label": "V",
-          "x": 5.25,
-          "y": 3
-        },
-        {
-          "label": "B",
-          "x": 6.25,
-          "y": 3
-        },
-        {
-          "label": "N",
-          "x": 7.25,
-          "y": 3
-        },
-        {
-          "label": "M",
-          "x": 8.25,
-          "y": 3
-        },
-        {
-          "label": "<",
-          "x": 9.25,
-          "y": 3
-        },
-        {
-          "label": ">",
-          "x": 10.25,
-          "y": 3
-        },
-        {
-          "label": "?",
-          "x": 11.25,
-          "y": 3
-        },
-        {
-          "label": "Shift",
-          "x": 12.25,
-          "y": 3,
-          "w": 1.75
-        },
-        {
-          "label": "&rarr;",
-          "x": 14,
-          "y": 3
-        },
-        {
-          "label": "End",
-          "x": 15,
-          "y": 3
-        },
-        {
-          "label": "Ctrl",
-          "x": 0,
-          "y": 4,
-          "w": 1.5
-        },
-        {
-          "label": "Win",
-          "x": 1.5,
-          "y": 4
-        },
-        {
-          "label": "Alt",
-          "x": 2.5,
-          "y": 4,
-          "w": 1.5
-        },
-        {
-          "x": 4,
-          "y": 4,
-          "w": 7
-        },
-        {
-          "label": "Fn",
-          "x": 11,
-          "y": 4,
-          "w": 1.5
-        },
-        {
-          "label": "&larr;",
-          "x": 13,
-          "y": 4
-        },
-        {
-          "label": "&darr;",
-          "x": 14,
-          "y": 4
-        },
-        {
-          "label": "&rarr;",
-          "x": 15,
-          "y": 4
-        }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+        {"matrix": [4, 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": [4, 11], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"matrix": [4, 12], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [4, 13], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 7], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_65_iso_blocker": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+        {"matrix": [4, 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": [4, 11], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"matrix": [4, 12], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [4, 13], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c
index 44450229a1..671d272d85 100644
--- a/keyboards/matrix/noah/noah.c
+++ b/keyboards/matrix/noah/noah.c
@@ -2,7 +2,7 @@
  * noah.c
  */
 
-#include "noah.h"
+#include "quantum.h"
 
 void bootloader_jump(void) {
     // This board doesn't use the standard DFU bootloader, and no information is available regarding how to enter bootloader mode. All we can do here is reset.
diff --git a/keyboards/matrix/noah/noah.h b/keyboards/matrix/noah/noah.h
deleted file mode 100644
index 15810c7063..0000000000
--- a/keyboards/matrix/noah/noah.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * noah.h
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-	k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-	k40, k41, k42, k43, k44, k45, k46, k47, k48) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,KC_NO,k2d, KC_NO}, \
-    {k30,KC_NO,k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO}, \
-    {k40, k41, k42,KC_NO,k43,KC_NO,k44, k45, k46, k47, k48, k1e, k2e, k3e, k0f}  \
-}
-
-#define LAYOUT_wkl( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-	k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-	k40, k41, k42, k43,      k45, k46, k47, k48 \
-) { \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,KC_NO,k2d, KC_NO}, \
-    {k30,KC_NO,k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO}, \
-    {k40, k41, k42,KC_NO,k43,KC_NO,KC_NO, k45, k46, k47, k48, k1e, k2e, k3e, k0f}  \
-}
-
-#define LAYOUT_iso( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-	k40, k41, k42, k43,      k45, k46, k47, k48 \
-) { \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,KC_NO, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,KC_NO, KC_NO}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO}, \
-    {k40, k41, k42,KC_NO,k43,KC_NO,KC_NO, k45, k46, k47, k48, k1e, k2e, k3e, k0f}  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,                k43,           k44, k45,      k46, k47, k48 \
-) { \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,KC_NO, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,KC_NO, KC_NO}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO}, \
-    {k40, k41, k42,KC_NO,k43,KC_NO,k44, k45, k46, k47, k48, k1e, k2e, k3e, k0f}  \
-}
-
-#define LAYOUT_default_splitspace( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-	k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-	k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a \
-) { \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,KC_NO,k2d, KC_NO}, \
-    {k30,KC_NO,k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO}, \
-    {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k1e, k2e, k3e, k0f}  \
-}
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index 616574f4ae..55ea2f42b0 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -25,11 +25,11 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 NO_USB_STARTUP_CHECK = yes	# Disable initialization only when usb is plugged in
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 
 RGBLIGHT_ENABLE = yes
 RGBLIGHT_CUSTOM_DRIVER = yes
+WS2812_DRIVER_REQUIRED = yes
 
 CUSTOM_MATRIX = yes
 # project specific files
-SRC += ws2812.c matrix.c
+SRC += matrix.c
diff --git a/keyboards/matthewdias/m3n3van/config.h b/keyboards/matthewdias/m3n3van/config.h
deleted file mode 100644
index 81acfef553..0000000000
--- a/keyboards/matthewdias/m3n3van/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2021 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* m3n3van PCB default pin-out */
-#define MATRIX_ROW_PINS { B5, B6, C6, C7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F1, F7, F0, E6, D3, D0, D1, D2, D4, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/matthewdias/m3n3van/info.json b/keyboards/matthewdias/m3n3van/info.json
index ffe44159a0..5b7cafa2da 100644
--- a/keyboards/matthewdias/m3n3van/info.json
+++ b/keyboards/matthewdias/m3n3van/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2323",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F1", "F7", "F0", "E6", "D3", "D0", "D1", "D2", "D4", "D6"],
+        "rows": ["B5", "B6", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "D7"}
diff --git a/keyboards/matthewdias/m3n3van/m3n3van.c b/keyboards/matthewdias/m3n3van/m3n3van.c
deleted file mode 100644
index 5032a02c3c..0000000000
--- a/keyboards/matthewdias/m3n3van/m3n3van.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "m3n3van.h"
diff --git a/keyboards/matthewdias/minim/config.h b/keyboards/matthewdias/minim/config.h
deleted file mode 100644
index b39f67e82a..0000000000
--- a/keyboards/matthewdias/minim/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2020 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* minim PCB default pin-out */
-#define MATRIX_ROW_PINS { D6, D7, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F1, F7, F0, B0, D1, B1, D2, B2, D3, D5, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/matthewdias/minim/info.json b/keyboards/matthewdias/minim/info.json
index d6b12a0975..f0aa07e6e9 100644
--- a/keyboards/matthewdias/minim/info.json
+++ b/keyboards/matthewdias/minim/info.json
@@ -8,6 +8,11 @@
         "pid": "0xAAAA",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F1", "F7", "F0", "B0", "D1", "B1", "D2", "B2", "D3", "D5", "B3"],
+        "rows": ["D6", "D7", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/matthewdias/minim/minim.c b/keyboards/matthewdias/minim/minim.c
deleted file mode 100644
index aadb26fee2..0000000000
--- a/keyboards/matthewdias/minim/minim.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "minim.h"
diff --git a/keyboards/matthewdias/model_v/config.h b/keyboards/matthewdias/model_v/config.h
deleted file mode 100644
index 1821ec0b06..0000000000
--- a/keyboards/matthewdias/model_v/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2021 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* model-v PCB default pin-out */
-#define MATRIX_ROW_PINS { D3, D5, D6, D4 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/matthewdias/model_v/info.json b/keyboards/matthewdias/model_v/info.json
index 7c9f24c892..f3fa150d57 100644
--- a/keyboards/matthewdias/model_v/info.json
+++ b/keyboards/matthewdias/model_v/info.json
@@ -7,152 +7,166 @@
         "pid": "0x6D76",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7"],
+        "rows": ["D3", "D5", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_split": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "Q", "x": 1, "y": 0 },
-                { "label": "W", "x": 2, "y": 0 },
-                { "label": "E", "x": 3, "y": 0 },
-                { "label": "R", "x": 4, "y": 0 },
-                { "label": "T", "x": 5, "y": 0 },
-                { "label": "Y", "x": 6, "y": 0 },
-                { "label": "U", "x": 7, "y": 0 },
-                { "label": "I", "x": 8, "y": 0 },
-                { "label": "O", "x": 9, "y": 0 },
-                { "label": "P", "x": 10, "y": 0 },
-                { "label": "Backspace", "x": 11, "y": 0, "w": 1.75 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
-                { "label": "A", "x": 1.25, "y": 1 },
-                { "label": "S", "x": 2.25, "y": 1 },
-                { "label": "D", "x": 3.25, "y": 1 },
-                { "label": "F", "x": 4.25, "y": 1 },
-                { "label": "G", "x": 5.25, "y": 1 },
-                { "label": "H", "x": 6.25, "y": 1 },
-                { "label": "J", "x": 7.25, "y": 1 },
-                { "label": "K", "x": 8.25, "y": 1 },
-                { "label": "L", "x": 9.25, "y": 1 },
-                { "label": ";", "x": 10.25, "y": 1 },
-                { "label": "Enter", "x": 11.25, "y": 1, "w": 1.5 },
-                { "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "Z", "x": 1.75, "y": 2 },
-                { "label": "X", "x": 2.75, "y": 2 },
-                { "label": "C", "x": 3.75, "y": 2 },
-                { "label": "V", "x": 4.75, "y": 2 },
-                { "label": "B", "x": 5.75, "y": 2 },
-                { "label": "N", "x": 6.75, "y": 2 },
-                { "label": "M", "x": 7.75, "y": 2 },
-                { "label": "<", "x": 8.75, "y": 2 },
-                { "label": ">", "x": 9.75, "y": 2 },
-                { "label": "/", "x": 10.75, "y": 2 },
-                { "label": "Shift", "x": 11.75, "y": 2 },
-                { "label": "Ctrl", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 3 },
-                { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "Raise", "x": 3.5, "y": 3 },
-                { "x": 4.5, "y": 3, "w": 2.25 },
-                { "x": 6.75, "y": 3, "w": 2 },
-                { "label": "Lower", "x": 8.75, "y": 3 },
-                { "label": "Meta", "x": 9.75, "y": 3 },
-                { "label": "Alt", "x": 10.75, "y": 3 },
-                { "label": "Ctrl", "x": 11.75, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         },
         "LAYOUT_2x3u": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "Q", "x": 1, "y": 0 },
-                { "label": "W", "x": 2, "y": 0 },
-                { "label": "E", "x": 3, "y": 0 },
-                { "label": "R", "x": 4, "y": 0 },
-                { "label": "T", "x": 5, "y": 0 },
-                { "label": "Y", "x": 6, "y": 0 },
-                { "label": "U", "x": 7, "y": 0 },
-                { "label": "I", "x": 8, "y": 0 },
-                { "label": "O", "x": 9, "y": 0 },
-                { "label": "P", "x": 10, "y": 0 },
-                { "label": "Backspace", "x": 11, "y": 0, "w": 1.75 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
-                { "label": "A", "x": 1.25, "y": 1 },
-                { "label": "S", "x": 2.25, "y": 1 },
-                { "label": "D", "x": 3.25, "y": 1 },
-                { "label": "F", "x": 4.25, "y": 1 },
-                { "label": "G", "x": 5.25, "y": 1 },
-                { "label": "H", "x": 6.25, "y": 1 },
-                { "label": "J", "x": 7.25, "y": 1 },
-                { "label": "K", "x": 8.25, "y": 1 },
-                { "label": "L", "x": 9.25, "y": 1 },
-                { "label": ";", "x": 10.25, "y": 1 },
-                { "label": "Enter", "x": 11.25, "y": 1, "w": 1.5 },
-                { "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "Z", "x": 1.75, "y": 2 },
-                { "label": "X", "x": 2.75, "y": 2 },
-                { "label": "C", "x": 3.75, "y": 2 },
-                { "label": "V", "x": 4.75, "y": 2 },
-                { "label": "B", "x": 5.75, "y": 2 },
-                { "label": "N", "x": 6.75, "y": 2 },
-                { "label": "M", "x": 7.75, "y": 2 },
-                { "label": "<", "x": 8.75, "y": 2 },
-                { "label": ">", "x": 9.75, "y": 2 },
-                { "label": "/", "x": 10.75, "y": 2 },
-                { "label": "Shift", "x": 11.75, "y": 2 },
-                { "label": "Ctrl", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 3 },
-                { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 },
-                { "x": 3.5, "y": 3, "w": 3 },
-                { "x": 6.5, "y": 3, "w": 3 },
-                { "label": "Meta", "x": 9.5, "y": 3, "w": 1.25 },
-                { "label": "Alt", "x": 10.75, "y": 3 },
-                { "label": "Ctrl", "x": 11.75, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.5, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 6.5, "y": 3, "w": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         },
         "LAYOUT_bigbar": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "Q", "x": 1, "y": 0 },
-                { "label": "W", "x": 2, "y": 0 },
-                { "label": "E", "x": 3, "y": 0 },
-                { "label": "R", "x": 4, "y": 0 },
-                { "label": "T", "x": 5, "y": 0 },
-                { "label": "Y", "x": 6, "y": 0 },
-                { "label": "U", "x": 7, "y": 0 },
-                { "label": "I", "x": 8, "y": 0 },
-                { "label": "O", "x": 9, "y": 0 },
-                { "label": "P", "x": 10, "y": 0 },
-                { "label": "Backspace", "x": 11, "y": 0, "w": 1.75 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
-                { "label": "A", "x": 1.25, "y": 1 },
-                { "label": "S", "x": 2.25, "y": 1 },
-                { "label": "D", "x": 3.25, "y": 1 },
-                { "label": "F", "x": 4.25, "y": 1 },
-                { "label": "G", "x": 5.25, "y": 1 },
-                { "label": "H", "x": 6.25, "y": 1 },
-                { "label": "J", "x": 7.25, "y": 1 },
-                { "label": "K", "x": 8.25, "y": 1 },
-                { "label": "L", "x": 9.25, "y": 1 },
-                { "label": ";", "x": 10.25, "y": 1 },
-                { "label": "Enter", "x": 11.25, "y": 1, "w": 1.5 },
-                { "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "Z", "x": 1.75, "y": 2 },
-                { "label": "X", "x": 2.75, "y": 2 },
-                { "label": "C", "x": 3.75, "y": 2 },
-                { "label": "V", "x": 4.75, "y": 2 },
-                { "label": "B", "x": 5.75, "y": 2 },
-                { "label": "N", "x": 6.75, "y": 2 },
-                { "label": "M", "x": 7.75, "y": 2 },
-                { "label": "<", "x": 8.75, "y": 2 },
-                { "label": ">", "x": 9.75, "y": 2 },
-                { "label": "/", "x": 10.75, "y": 2 },
-                { "label": "Shift", "x": 11.75, "y": 2 },
-                { "label": "Ctrl", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 3 },
-                { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 },
-                { "x": 3.5, "y": 3, "w": 6.25 },
-                { "label": "Meta", "x": 9.75, "y": 3 },
-                { "label": "Alt", "x": 10.75, "y": 3 },
-                { "label": "Ctrl", "x": 11.75, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.5, "y": 3, "w": 6.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         }
     }
diff --git a/keyboards/matthewdias/model_v/model_v.c b/keyboards/matthewdias/model_v/model_v.c
deleted file mode 100644
index a65738d97b..0000000000
--- a/keyboards/matthewdias/model_v/model_v.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "model_v.h"
diff --git a/keyboards/matthewdias/model_v/model_v.h b/keyboards/matthewdias/model_v/model_v.h
deleted file mode 100644
index 6f3a96080e..0000000000
--- a/keyboards/matthewdias/model_v/model_v.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-Copyright 2021 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_split( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33,      K35,      K37, K38, K39, K3A, K3B  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, XXX, K35, XXX, K37, K38, K39, K3A, K3B }  \
-}
-
-#define LAYOUT_2x3u( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32,           K35,      K37,      K39, K3A, K3B  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, XXX, XXX, K35, XXX, K37, XXX, K39, K3A, K3B }  \
-}
-
-#define LAYOUT_bigbar( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32,           K35,                K39, K3A, K3B  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, XXX, XXX, K35, XXX, XXX, XXX, K39, K3A, K3B }  \
-}
diff --git a/keyboards/matthewdias/txuu/config.h b/keyboards/matthewdias/txuu/config.h
deleted file mode 100644
index 88b02f4b55..0000000000
--- a/keyboards/matthewdias/txuu/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2021 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* m3n3van PCB default pin-out */
-#define MATRIX_ROW_PINS { B1, B0, F7, F4, F1 }
-#define MATRIX_COL_PINS { F0, F5, F6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/matthewdias/txuu/info.json b/keyboards/matthewdias/txuu/info.json
index f71b1ed80b..5129444f49 100644
--- a/keyboards/matthewdias/txuu/info.json
+++ b/keyboards/matthewdias/txuu/info.json
@@ -7,6 +7,11 @@
         "pid": "0x2809",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F5", "F6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["B1", "B0", "F7", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -15,74 +20,78 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,3", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,10", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,12", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0},
-                {"label":"0,14", "x":14, "y":0},
-                {"label":"0,15", "x":15, "y":0},
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,14", "x":13.5, "y":1, "w":1.5},
-                {"label":"1,15", "x":15, "y":1},
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,13", "x":12.75, "y":2, "w":2.25},
-                {"label":"2,15", "x":15, "y":2},
-                {"label":"3,0", "x":0, "y":3, "w":2.25},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,14", "x":14, "y":3},
-                {"label":"3,15", "x":15, "y":3},
-                {"label":"4,0", "x":0, "y":4, "w":1.25},
-                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
-                {"label":"4,3", "x":2.5, "y":4, "w":1.25},
-                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
-                {"label":"4,10", "x":10, "y":4, "w":1.25},
-                {"label":"4,11", "x":11.25, "y":4, "w":1.25},
-                {"label":"4,13", "x":13, "y":4},
-                {"label":"4,14", "x":14, "y":4},
-                {"label":"4,15", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/matthewdias/txuu/txuu.c b/keyboards/matthewdias/txuu/txuu.c
deleted file mode 100644
index 81c4b440ad..0000000000
--- a/keyboards/matthewdias/txuu/txuu.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "txuu.h"
diff --git a/keyboards/matthewdias/txuu/txuu.h b/keyboards/matthewdias/txuu/txuu.h
deleted file mode 100644
index 6ba459804b..0000000000
--- a/keyboards/matthewdias/txuu/txuu.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2021 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }  \
-}
diff --git a/keyboards/maxipad/info.json b/keyboards/maxipad/info.json
index 5670d8d361..4b8e3fa0a0 100644
--- a/keyboards/maxipad/info.json
+++ b/keyboards/maxipad/info.json
@@ -8,12 +8,85 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_5x6",
+    "LAYOUT_grid": "LAYOUT_ortho_5x6"
+  },
   "layouts": {
-      "LAYOUT_grid": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}]
+      "LAYOUT_ortho_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": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1},
+            {"matrix": [1, 3], "x": 3, "y": 1},
+            {"matrix": [1, 4], "x": 4, "y": 1},
+            {"matrix": [1, 5], "x": 5, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1, "y": 2},
+            {"matrix": [2, 2], "x": 2, "y": 2},
+            {"matrix": [2, 3], "x": 3, "y": 2},
+            {"matrix": [2, 4], "x": 4, "y": 2},
+            {"matrix": [2, 5], "x": 5, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3},
+            {"matrix": [3, 3], "x": 3, "y": 3},
+            {"matrix": [3, 4], "x": 4, "y": 3},
+            {"matrix": [3, 5], "x": 5, "y": 3},
+
+            {"matrix": [4, 0], "x": 0, "y": 4},
+            {"matrix": [4, 1], "x": 1, "y": 4},
+            {"matrix": [4, 2], "x": 2, "y": 4},
+            {"matrix": [4, 3], "x": 3, "y": 4},
+            {"matrix": [4, 4], "x": 4, "y": 4},
+            {"matrix": [4, 5], "x": 5, "y": 4}
+          ]
       },
       "LAYOUT_1x2uC": {
-        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"w": 2, "x":4, "y":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": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 5], "x": 4, "y": 4, "w": 2}
+        ]
     }
   }
 }
diff --git a/keyboards/maxipad/maxipad.c b/keyboards/maxipad/maxipad.c
deleted file mode 100644
index 44a0c2b742..0000000000
--- a/keyboards/maxipad/maxipad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "maxipad.h"
\ No newline at end of file
diff --git a/keyboards/maxipad/maxipad.h b/keyboards/maxipad/maxipad.h
deleted file mode 100644
index e2a0805053..0000000000
--- a/keyboards/maxipad/maxipad.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#ifdef KEYBOARD_maxipad_promicro
-    #include "promicro.h"
-#elif KEYBOARD_maxipad_teensy2
-    #include "teensy2.h"
-#endif
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_grid( \
-    k00, k01, k02, k03, k04, k05, \
-    k10, k11, k12, k13, k14, k15, \
-    k20, k21, k22, k23, k24, k25, \
-    k30, k31, k32, k33, k34, k35, \
-    k40, k41, k42, k43, k44, k45 \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k40, k41, k42, k43, k44, k45 } \
-}
-
-#define LAYOUT_1x2uC( \
-    k00, k01, k02, k03, k04, k05, \
-    k10, k11, k12, k13, k14, k15, \
-    k20, k21, k22, k23, k24, k25, \
-    k30, k31, k32, k33, k34, k35, \
-    k40, k41, k42, k43,    k44   \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k40, k41, k42, k43, ___, k44 } \
-}
-
-#define LAYOUT LAYOUT_grid
-#define LAYOUT_ortho_5x6 LAYOUT_grid
diff --git a/keyboards/maxipad/promicro/config.h b/keyboards/maxipad/promicro/config.h
deleted file mode 100644
index fba2d442ea..0000000000
--- a/keyboards/maxipad/promicro/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
-#define MATRIX_COL_PINS { F4, C6, D7, F5, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/maxipad/promicro/info.json b/keyboards/maxipad/promicro/info.json
index 4369a04103..1499162155 100644
--- a/keyboards/maxipad/promicro/info.json
+++ b/keyboards/maxipad/promicro/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["F4", "C6", "D7", "F5", "B4", "B5"],
+        "rows": ["B6", "B2", "B3", "B1", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/maxipad/promicro/promicro.c b/keyboards/maxipad/promicro/promicro.c
deleted file mode 100644
index 4ecd974645..0000000000
--- a/keyboards/maxipad/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "maxipad.h"
diff --git a/keyboards/maxipad/promicro/promicro.h b/keyboards/maxipad/promicro/promicro.h
deleted file mode 100644
index 8f1419c9d7..0000000000
--- a/keyboards/maxipad/promicro/promicro.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "maxipad.h"
-#include "quantum.h"
-
diff --git a/keyboards/maxipad/teensy2/config.h b/keyboards/maxipad/teensy2/config.h
deleted file mode 100644
index a222115a0c..0000000000
--- a/keyboards/maxipad/teensy2/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6, F7, B2, B3, B1 }
-#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/maxipad/teensy2/info.json b/keyboards/maxipad/teensy2/info.json
index 0b2db81c11..d7f78b4175 100644
--- a/keyboards/maxipad/teensy2/info.json
+++ b/keyboards/maxipad/teensy2/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["F6", "C6", "D7", "F5", "B4", "B5"],
+        "rows": ["B6", "F7", "B2", "B3", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay"
 }
diff --git a/keyboards/maxipad/teensy2/teensy2.c b/keyboards/maxipad/teensy2/teensy2.c
deleted file mode 100644
index 4ecd974645..0000000000
--- a/keyboards/maxipad/teensy2/teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "maxipad.h"
diff --git a/keyboards/maxipad/teensy2/teensy2.h b/keyboards/maxipad/teensy2/teensy2.h
deleted file mode 100644
index acb213acc8..0000000000
--- a/keyboards/maxipad/teensy2/teensy2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "maxipad.h"
-#include "quantum.h"
diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/info.json
index 12d53bb0f6..e277b1c266 100644
--- a/keyboards/maxr1998/phoebe/info.json
+++ b/keyboards/maxr1998/phoebe/info.json
@@ -23,301 +23,69 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "w": 1,
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "w": 1,
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 5,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 6,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 7,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 8,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 9,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 10,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 11,
-                    "y": 1
-                },
-                {
-                    "w": 1,
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 5,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 6,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 7,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 8,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 9,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 10,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 11,
-                    "y": 2
-                },
-                {
-                    "w": 1,
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 3,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 4,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 5,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 6,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 7,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 8,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 10,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "w": 1,
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "w": 1,
-                    "x": 1,
-                    "y": 4
-                },
-                {
-                    "w": 1,
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "w": 1,
-                    "x": 3,
-                    "y": 4
-                },
-                {
-                    "w": 1,
-                    "x": 4,
-                    "y": 4
-                },
-                {
-                    "w": 2,
-                    "x": 5,
-                    "y": 4
-                },
-                {
-                    "w": 1,
-                    "x": 7,
-                    "y": 4
-                },
-                {
-                    "w": 1,
-                    "x": 8,
-                    "y": 4
-                },
-                {
-                    "w": 1,
-                    "x": 9,
-                    "y": 4
-                },
-                {
-                    "w": 1,
-                    "x": 10,
-                    "y": 4
-                },
-                {
-                    "w": 1,
-                    "x": 11,
-                    "y": 4
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
             ]
         }
     },
@@ -349,7 +117,9 @@
         ]
     },
     "rgblight": {
-        "led_count": 8,
+        "led_count": 8
+    },
+    "ws2812": {
         "pin": "F0"
     }
 }
diff --git a/keyboards/maxr1998/phoebe/phoebe.c b/keyboards/maxr1998/phoebe/phoebe.c
index 28d3afea50..b05f9b3235 100644
--- a/keyboards/maxr1998/phoebe/phoebe.c
+++ b/keyboards/maxr1998/phoebe/phoebe.c
@@ -1,3 +1,3 @@
-#include "phoebe.h"
+#include "quantum.h"
 
 const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {50, 50, 50};
diff --git a/keyboards/maxr1998/phoebe/phoebe.h b/keyboards/maxr1998/phoebe/phoebe.h
deleted file mode 100644
index f3e61756a3..0000000000
--- a/keyboards/maxr1998/phoebe/phoebe.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-      k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-      k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-      k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b \
-) \
-{ \
-      { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-      { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-      { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-      { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-      { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
-}
diff --git a/keyboards/maxr1998/pulse4k/config.h b/keyboards/maxr1998/pulse4k/config.h
index 3756899498..5da4e44855 100644
--- a/keyboards/maxr1998/pulse4k/config.h
+++ b/keyboards/maxr1998/pulse4k/config.h
@@ -17,20 +17,11 @@
 
 #pragma once
 
-
-/* Matrix pins */
-#define MATRIX_ROW_PINS { B4, E6 }
-#define MATRIX_COL_PINS { B7, B3, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Combo setup */
 #define COMBO_COUNT 1
 #define COMBO_TERM 150
 
 /* RGB LED Setup */
-#define RGB_DI_PIN          F7 // pin the DI on the WS2812B is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json
index 9db0307940..2d3b6e8a4b 100644
--- a/keyboards/maxr1998/pulse4k/info.json
+++ b/keyboards/maxr1998/pulse4k/info.json
@@ -8,6 +8,14 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F7"
+  },
+  "matrix_pins": {
+    "cols": ["B7", "B3", "F0"],
+    "rows": ["B4", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "D2", "pin_b": "D3"},
@@ -18,13 +26,15 @@
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
-      "layout": [ 
-        { "w": 1, "x": 0, "y": 0 }, 
-        { "w": 1, "x": 1, "y": 0 }, 
-        { "w": 1, "x": 2, "y": 0 }, 
-        { "w": 1, "x": 0, "y": 1 }, 
-        { "w": 1, "x": 1, "y": 1 }, 
-        { "w": 1, "x": 2, "y": 1 } ]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1}
+      ]
     }
   }
 }
diff --git a/keyboards/maxr1998/pulse4k/pulse4k.h b/keyboards/maxr1998/pulse4k/pulse4k.h
index cc0a373b66..ba4514d451 100644
--- a/keyboards/maxr1998/pulse4k/pulse4k.h
+++ b/keyboards/maxr1998/pulse4k/pulse4k.h
@@ -19,15 +19,6 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-      k00, k01, k02, \
-      k10, k11, k12 \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-}
-
 void encoder_one_update(bool clockwise);
 
 void encoder_two_update(bool clockwise);
diff --git a/keyboards/mb44/config.h b/keyboards/mb44/config.h
deleted file mode 100644
index 365fed7340..0000000000
--- a/keyboards/mb44/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 melonbred
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D6, D5, D4 }
-#define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mb44/info.json b/keyboards/mb44/info.json
index 865f05674f..95acbc9ba2 100644
--- a/keyboards/mb44/info.json
+++ b/keyboards/mb44/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6D62",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"],
+        "rows": ["D1", "D6", "D5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D2"}
@@ -18,195 +23,211 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0, "w":1.75},
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.5},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "w":6.25},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 5], "x": 3, "y": 3, "w": 6.25},
+
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         },
         "LAYOUT_2u_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0, "w":1.75},
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.5},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3, "w":1.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3, "w":2.25},
-                {"x":5.5, "y":3},
-                {"x":6.5, "y":3, "w":2.75},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         },
         "LAYOUT_2u1u_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0, "w":1.75},
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.5},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3, "w":1.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3, "w":2.75},
-                {"x":6, "y":3, "w":2.25},
-                {"x":8.25, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 5], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 8.25, "y": 3},
+
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         },
         "LAYOUT_3u_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0, "w":1.75},
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.5},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3, "w":1.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3, "w":3},
-                {"x":6.25, "y":3, "w":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 3},
+
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         }
     }
diff --git a/keyboards/mb44/mb44.c b/keyboards/mb44/mb44.c
deleted file mode 100644
index 16f68705f8..0000000000
--- a/keyboards/mb44/mb44.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 melonbred
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mb44.h"
\ No newline at end of file
diff --git a/keyboards/mb44/mb44.h b/keyboards/mb44/mb44.h
deleted file mode 100644
index e3c490e87c..0000000000
--- a/keyboards/mb44/mb44.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2021 melonbred
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define XXX KC_NO
-
-
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32,           K35,                K39, K3A, K3B \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, XXX, XXX, K35, XXX, XXX, XXX, K39, K3A, K3B } \
-}
-
-#define LAYOUT_2u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33,      K35, K36,           K39, K3A, K3B \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, XXX, K35, K36, XXX, XXX, K39, K3A, K3B } \
-}
-
-#define LAYOUT_2u1u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33,      K35, K36,           K39, K3A, K3B \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, XXX, K35, K36, XXX, XXX, K39, K3A, K3B } \
-}
-
-#define LAYOUT_3u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33,           K36,           K39, K3A, K3B \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, XXX, XXX, K36, XXX, XXX, K39, K3A, K3B } \
-}
diff --git a/keyboards/mc_76k/config.h b/keyboards/mc_76k/config.h
index 6b70bdd6b8..3616da4ede 100644
--- a/keyboards/mc_76k/config.h
+++ b/keyboards/mc_76k/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C7, C6, B6, B0, D1, D0 }
-#define MATRIX_COL_PINS { D5, D3, D4, B1, D6, D7, B4, B5, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mc_76k/info.json b/keyboards/mc_76k/info.json
index 791d798ff9..419ed2edf3 100644
--- a/keyboards/mc_76k/info.json
+++ b/keyboards/mc_76k/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4D43",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D4", "B1", "D6", "D7", "B4", "B5", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["C7", "C6", "B6", "B0", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mechanickeys/miniashen40/config.h b/keyboards/mechanickeys/miniashen40/config.h
deleted file mode 100644
index 012ca89fae..0000000000
--- a/keyboards/mechanickeys/miniashen40/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 jfescobar18
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { C5, C4, C3, D0, C2, D1, C1, C0, D4, B0, D7, D6, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechanickeys/miniashen40/info.json b/keyboards/mechanickeys/miniashen40/info.json
index 30e2ecab36..73d6b3aa1a 100644
--- a/keyboards/mechanickeys/miniashen40/info.json
+++ b/keyboards/mechanickeys/miniashen40/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6D6E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C5", "C4", "C3", "D0", "C2", "D1", "C1", "C0", "D4", "B0", "D7", "D6", "B5"],
+        "rows": ["B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "layouts": {
diff --git a/keyboards/mechanickeys/miniashen40/miniashen40.c b/keyboards/mechanickeys/miniashen40/miniashen40.c
deleted file mode 100644
index 9c740e117e..0000000000
--- a/keyboards/mechanickeys/miniashen40/miniashen40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 jfescobar18
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/
-
-#include "miniashen40.h"
diff --git a/keyboards/mechanickeys/undead60m/config.h b/keyboards/mechanickeys/undead60m/config.h
index c86a3af0f1..9388d3da68 100644
--- a/keyboards/mechanickeys/undead60m/config.h
+++ b/keyboards/mechanickeys/undead60m/config.h
@@ -16,26 +16,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow */
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 16
   #define RGBLIGHT_SLEEP
   #define RGBLIGHT_EFFECT_BREATHING
@@ -48,4 +29,3 @@
   #define RGBLIGHT_EFFECT_RGB_TEST
   #define RGBLIGHT_EFFECT_ALTERNATING
   #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/mechanickeys/undead60m/info.json b/keyboards/mechanickeys/undead60m/info.json
index 9bee50289c..1821fbdbaf 100644
--- a/keyboards/mechanickeys/undead60m/info.json
+++ b/keyboards/mechanickeys/undead60m/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3C4D",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3", "B2"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F6", "pin_b": "F5"}
diff --git a/keyboards/mechbrewery/mb65h/config.h b/keyboards/mechbrewery/mb65h/config.h
deleted file mode 100644
index e27625de97..0000000000
--- a/keyboards/mechbrewery/mb65h/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 MechBrewery
- * Author: tuananhnguyen204 (https://github.com/AnthonyNguyen168) (tuananhnguyen204@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B7, D0, F0, F1, F4 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D1, D2, D3, D6, D7, B4, B6, C6, C7, F7, F6, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechbrewery/mb65h/info.json b/keyboards/mechbrewery/mb65h/info.json
index e96a92660d..ea5b2f48b8 100644
--- a/keyboards/mechbrewery/mb65h/info.json
+++ b/keyboards/mechbrewery/mb65h/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D1", "D2", "D3", "D6", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5"],
+        "rows": ["B7", "D0", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
@@ -15,77 +20,78 @@
 
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}]
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/mechbrewery/mb65h/mb65h.c b/keyboards/mechbrewery/mb65h/mb65h.c
deleted file mode 100644
index 040ef8ce44..0000000000
--- a/keyboards/mechbrewery/mb65h/mb65h.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 MechBrewery
- * Author: tuananhnguyen204 (https://github.com/AnthonyNguyen168) (tuananhnguyen204@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mb65h.h"
\ No newline at end of file
diff --git a/keyboards/mechbrewery/mb65h/mb65h.h b/keyboards/mechbrewery/mb65h/mb65h.h
deleted file mode 100644
index b52b09ea54..0000000000
--- a/keyboards/mechbrewery/mb65h/mb65h.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2022 MechBrewery
- * Author: tuananhnguyen204 (https://github.com/AnthonyNguyen168) (tuananhnguyen204@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�    
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │  0E   │0F │    
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │2F │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │3F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │43  │46                      │4A  │4B  │ │4D │4E │4F │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
diff --git a/keyboards/mechbrewery/mb65s/config.h b/keyboards/mechbrewery/mb65s/config.h
index 7023e30ced..ede35e4bab 100644
--- a/keyboards/mechbrewery/mb65s/config.h
+++ b/keyboards/mechbrewery/mb65s/config.h
@@ -17,15 +17,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B7, D0, F0, F1, F4 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D1, D2, D3, D6, D7, B4, B6, C6, C7, F7, F6, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -42,4 +33,3 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 240
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json
index 7692ac996c..4943f4f9a2 100644
--- a/keyboards/mechbrewery/mb65s/info.json
+++ b/keyboards/mechbrewery/mb65s/info.json
@@ -8,10 +8,18 @@
         "pid": "0x3635",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D1", "D2", "D3", "D6", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5"],
+        "rows": ["B7", "D0", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D4",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": [
@@ -27,683 +35,683 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [1, 15], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 0], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mechbrewery/mb65s/mb65s.c b/keyboards/mechbrewery/mb65s/mb65s.c
deleted file mode 100644
index 4d8e2cf759..0000000000
--- a/keyboards/mechbrewery/mb65s/mb65s.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 MechBrewery
- * Author: tuananhnguyen204 (https://github.com/AnthonyNguyen168) (tuananhnguyen204@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mb65s.h"
\ No newline at end of file
diff --git a/keyboards/mechbrewery/mb65s/mb65s.h b/keyboards/mechbrewery/mb65s/mb65s.h
deleted file mode 100644
index 1e863b9bcd..0000000000
--- a/keyboards/mechbrewery/mb65s/mb65s.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/* Copyright 2022 MechBrewery
- * Author: tuananhnguyen204 (https://github.com/AnthonyNguyen168) (tuananhnguyen204@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0E     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- *              │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�2D  │ ISO Enter
- *  LShift      │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │2F │   │1E │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │3F │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- *              │40  │41  │43  │46                      │4A  │4B  │ │4D │4E │4F │
- *              └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────�
- *              │40   │41 │43   │46                         │4B   │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                     K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                     K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                     K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41,      K43,           K46,                     K4B,      K4D, K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, XXX, K4D, K4E, K4F }, \
-}
diff --git a/keyboards/mechkeys/acr60/acr60.c b/keyboards/mechkeys/acr60/acr60.c
deleted file mode 100644
index 7cba669b84..0000000000
--- a/keyboards/mechkeys/acr60/acr60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2017 Ryan Mitchell (@newtmitch)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "acr60.h"
diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h
index 493f54b3f7..8f261b69f2 100644
--- a/keyboards/mechkeys/acr60/config.h
+++ b/keyboards/mechkeys/acr60/config.h
@@ -16,21 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/info.json
index 816e74a2bb..67d28157c5 100644
--- a/keyboards/mechkeys/acr60/info.json
+++ b/keyboards/mechkeys/acr60/info.json
@@ -8,6 +8,11 @@
         "pid": "0xCA60",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 5
@@ -16,6 +21,9 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/mechkeys/alu84/alu84.c b/keyboards/mechkeys/alu84/alu84.c
deleted file mode 100755
index 3e058d3ed5..0000000000
--- a/keyboards/mechkeys/alu84/alu84.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2017 @TurboMech /u/TurboMech <discord> @A9entOran9e#6134
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "alu84.h"
diff --git a/keyboards/mechkeys/alu84/alu84.h b/keyboards/mechkeys/alu84/alu84.h
deleted file mode 100755
index dc263eb8d1..0000000000
--- a/keyboards/mechkeys/alu84/alu84.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2017 @TurboMech /u/TurboMech <discord> @A9entOran9e#6134
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_75_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K4E, K4F, \
-    K50, K51,      K53,           K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, K3F }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, ___, K4D, K4E, K4F }, \
-    { K50, K51, ___, K53, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
diff --git a/keyboards/mechkeys/alu84/config.h b/keyboards/mechkeys/alu84/config.h
index bb3b38500c..16e5930364 100755
--- a/keyboards/mechkeys/alu84/config.h
+++ b/keyboards/mechkeys/alu84/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, B7 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, F5, D4, B1, B0, B5, B4, D7, D6, B3, F4, F6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #if defined(RGBLIGHT_ENABLE)
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/mechkeys/alu84/info.json b/keyboards/mechkeys/alu84/info.json
index aaf9cc7ac1..5251bc600b 100644
--- a/keyboards/mechkeys/alu84/info.json
+++ b/keyboards/mechkeys/alu84/info.json
@@ -8,10 +8,18 @@
         "pid": "0xCA75",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -21,95 +29,95 @@
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0},
-                {"label":"K05", "x":5, "y":0},
-                {"label":"K06", "x":6, "y":0},
-                {"label":"K07", "x":7, "y":0},
-                {"label":"K08", "x":8, "y":0},
-                {"label":"K09", "x":9, "y":0},
-                {"label":"K0A", "x":10, "y":0},
-                {"label":"K0B", "x":11, "y":0},
-                {"label":"K0C", "x":12, "y":0},
-                {"label":"K0D", "x":13, "y":0},
-                {"label":"K0E", "x":14, "y":0},
-                {"label":"K0F", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"K10", "x":0, "y":1},
-                {"label":"K11", "x":1, "y":1},
-                {"label":"K12", "x":2, "y":1},
-                {"label":"K13", "x":3, "y":1},
-                {"label":"K14", "x":4, "y":1},
-                {"label":"K15", "x":5, "y":1},
-                {"label":"K16", "x":6, "y":1},
-                {"label":"K17", "x":7, "y":1},
-                {"label":"K18", "x":8, "y":1},
-                {"label":"K19", "x":9, "y":1},
-                {"label":"K1A", "x":10, "y":1},
-                {"label":"K1B", "x":11, "y":1},
-                {"label":"K1C", "x":12, "y":1},
-                {"label":"K1E", "x":13, "y":1, "w":2},
-                {"label":"K1F", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label":"K20", "x":0, "y":2, "w":1.5},
-                {"label":"K22", "x":1.5, "y":2},
-                {"label":"K23", "x":2.5, "y":2},
-                {"label":"K24", "x":3.5, "y":2},
-                {"label":"K25", "x":4.5, "y":2},
-                {"label":"K26", "x":5.5, "y":2},
-                {"label":"K27", "x":6.5, "y":2},
-                {"label":"K28", "x":7.5, "y":2},
-                {"label":"K29", "x":8.5, "y":2},
-                {"label":"K2A", "x":9.5, "y":2},
-                {"label":"K2B", "x":10.5, "y":2},
-                {"label":"K2C", "x":11.5, "y":2},
-                {"label":"K2D", "x":12.5, "y":2},
-                {"label":"K2E", "x":13.5, "y":2, "w":1.5},
-                {"label":"K2F", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label":"K30", "x":0, "y":3, "w":1.75},
-                {"label":"K32", "x":1.75, "y":3},
-                {"label":"K33", "x":2.75, "y":3},
-                {"label":"K34", "x":3.75, "y":3},
-                {"label":"K35", "x":4.75, "y":3},
-                {"label":"K36", "x":5.75, "y":3},
-                {"label":"K37", "x":6.75, "y":3},
-                {"label":"K38", "x":7.75, "y":3},
-                {"label":"K39", "x":8.75, "y":3},
-                {"label":"K3A", "x":9.75, "y":3},
-                {"label":"K3B", "x":10.75, "y":3},
-                {"label":"K3C", "x":11.75, "y":3},
-                {"label":"K3D", "x":12.75, "y":3, "w":2.25},
-                {"label":"K3F", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label":"K40", "x":0, "y":4, "w":2.25},
-                {"label":"K42", "x":2.25, "y":4},
-                {"label":"K43", "x":3.25, "y":4},
-                {"label":"K44", "x":4.25, "y":4},
-                {"label":"K45", "x":5.25, "y":4},
-                {"label":"K46", "x":6.25, "y":4},
-                {"label":"K47", "x":7.25, "y":4},
-                {"label":"K48", "x":8.25, "y":4},
-                {"label":"K49", "x":9.25, "y":4},
-                {"label":"K4A", "x":10.25, "y":4},
-                {"label":"K4B", "x":11.25, "y":4},
-                {"label":"K4D", "x":12.25, "y":4, "w":1.75},
-                {"label":"K4E", "x":14, "y":4},
-                {"label":"K4F", "x":15, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
 
-                {"label":"K50", "x":0, "y":5, "w":1.25},
-                {"label":"K51", "x":1.25, "y":5, "w":1.25},
-                {"label":"K53", "x":2.5, "y":5, "w":1.25},
-                {"label":"K56", "x":3.75, "y":5, "w":6.25},
-                {"label":"K5A", "x":10, "y":5},
-                {"label":"K5B", "x":11, "y":5},
-                {"label":"K5C", "x":12, "y":5},
-                {"label":"K5D", "x":13, "y":5},
-                {"label":"K5E", "x":14, "y":5},
-                {"label":"K5F", "x":15, "y":5}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h
index b345f44269..a7436fb00c 100755
--- a/keyboards/mechkeys/espectro/config.h
+++ b/keyboards/mechkeys/espectro/config.h
@@ -16,22 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, B3, E6, F0, D5, D4, D6, C7 }
-#define MATRIX_COL_PINS { C6, F1, F4, F5, F6, F7, D7, B4, B5, D0, D1, D2, D3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 10
@@ -47,6 +37,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-
-#endif
diff --git a/keyboards/mechkeys/espectro/espectro.c b/keyboards/mechkeys/espectro/espectro.c
deleted file mode 100755
index 64494c49c1..0000000000
--- a/keyboards/mechkeys/espectro/espectro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 @TurboMech /u/TurboMech <discord> @A9entOran9e#6134
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "espectro.h"
diff --git a/keyboards/mechkeys/espectro/espectro.h b/keyboards/mechkeys/espectro/espectro.h
deleted file mode 100755
index 98c930f8f5..0000000000
--- a/keyboards/mechkeys/espectro/espectro.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Copyright 2018 @TurboMech /u/TurboMech <discord> @A9entOran9e#6134
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#pragma once
-
-#include "quantum.h"
-
-
-/*
- * Placement of every possible switch defined below.
- * x2 means the diode allows two possible positions for the switch
- *
- * Layout:
- *   ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────�
- *   │K00  │K01  │K02  │K03  │K04  │K60  │K61  │K62  │K63  │K05  │K06  │K07  │K08  │K72  │K09  │K0A  │K0B  │K0C  │K7C  │
- *   │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │
- *   ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
- *   │K10  │K11  │K12  │K13  │K14  │K64  │K65  │K66  │K67  │K15  │K16  │K17  │K18  │K70  │K71  │K19  │K1A  │K1B  │K1C  │
- *   │     │     │     │     │     │     │     │     │     │     │     │     │     │     │x2   │     │     │     │     │
- *   ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┼─────┼─────┼─────┼─────┤          ┌────────�
- *   │K20     │K21  │K22  │K23  │K24  │K68  │K69  │K6A  │K6B  │K25  │K26  │K27  │K28  │K73     │K29  │K2A  │K2B  │K2C  │          │K38     │
- *   │        │     │     │     │     │     │     │     │     │     │     │     │     │        │     │     │     │     │          │        │
- *   ├────────┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴────────┼─────┼─────┼─────┼─────┤      ┌───┴─�      │
- *   │K30       │K31  │K32  │K33  │K34  │K6C  │K75  │K76  │K77  │K35  │K36  │K37  │K38         │K39  │K3A  │K3B  │K3C  │      │K73  │      │
- *   │          │     │     │     │     │     │     │     │     │     │     │     │            │     │     │     │     │      │     │      │
- *   ├───────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──────┬─────┼─────┼─────┼─────┼─────┤      └─────┴──────┘
- *   │K40x2  │K41  │K42  │K43  │K44  │K78  │K79  │K7A  │K7B  │K45  │K46  │K47  │K48      │K74  │K49  │K4A  │K4B  │K4C  │
- *   │       │     │     │     │     │     │     │     │     │     │     │     │         │     │     │     │     │     │
- *   ├───────┼─────┴─┬───┴───┬─┴─────┴─────┴─────┴─────┴─────┴───┬─┴───┬─┴───┬─┴───┬─────┼─────┼─────┼─────┼─────┼─────┤
- *   │K50    │K51    │K52    │K59                                │K55  │K56  │K57  │K58  │K53  │K54  │K5A  │K5B  │K5C  │
- *   │x2     │x2     │       │x3                                 │x3   │x2   │x2   │x2   │x2   │     │x2   │     │     │
- *   └───────┴───────┴───────┴───────────────────────────────────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
- *
- * Variants:
- *   - 2u Backspace:      Delete K70   Use K71
- *   - 2u Num +:          Delete K3C   Use K2C
- *   - 2u Num Enter:      Delete K5C   Use K4C
- *   - ANSI Left Shift:   Delete K41   Use K40
- *
- *   ANSI Backslash and ISO Hash are the same position
- *   ANSI Enter and ISO Enter are the same position
- *   For two 1.5u modifiers on the right of the Spacebar, delete K56 and use K55 and K57
- *
- * Matrix:
- *   { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C }, \
- *   { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C }, \
- *   { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C }, \
- *   { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C }, \
- *   { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4C }, \
- *   { K50,  K51,  K52,  K53,  K54,  K55,  K56,  K57,  K58,  K59,  K5A,  K5B,  K5C }, \
- *   { K60,  K61,  K62,  K63,  K64,  K65,  K66,  K67,  K68,  K69,  K6A,  K6B,  K6C }, \
- *   { K70,  K71,  K72,  K73,  K74,  K75,  K76,  K77,  K78,  K79,  K7A,  K7B,  K7C }  \
- */
-
-
-/* LAYOUT_all (Identical to LAYOUT_split_shift_and_bs)
- *   Every matrix position
- * ,---------------------------------------------------------------------------.
- * | 00| 01| 02| 03| 04| 60| 61| 62| 63| 05| 06| 07| 08| 72| 09| 0A| 0B| 0C| 7C|
- * |---------------------------------------------------------------------------|
- * | 10| 11| 12| 13| 14| 64| 65| 66| 67| 15| 16| 17| 18| 70| 71| 19| 1A| 1B| 1C|
- * |---------------------------------------------------------------------------|
- * | 20  | 21| 22| 23| 24| 68| 69| 6A| 6B| 25| 26| 27| 28|   73| 29| 2A| 2B| 2C|
- * |---------------------------------------------------------------------------|
- * | 30   | 31| 32| 33| 34| 6C| 75| 76| 77| 35| 36| 37|      38| 39| 3A| 3B| 3C|
- * |---------------------------------------------------------------------------|
- * | 40 | 41| 42| 43| 44| 78| 79| 7A| 7B| 45| 46| 47|    48| 74| 49| 4A| 4B| 4C|
- * |---------------------------------------------------------------------------|
- * | 50 | 51 | 52 |           59           | 55| 56| 57| 58| 53| 54| 5A| 5B| 5C|
- * `---------------------------------------------------------------------------'
-*/
-
-
-//Arrow keys and 1.75u right shift
-#define LAYOUT_default( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09,    K0A, K0B, K0C, K7C, \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18,      K71,    K19, K1A, K1B, K1C, \
-  K20,    K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,   K73,    K29, K2A, K2B, K2C, \
-  K30,     K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37,       K38,    K39, K3A, K3B,      \
-  K40,       K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,     K48, K74,    K49, K4A, K4B, K4C, \
-  K50,  K51,  K52,                K59,              K55, K56, K57, K58, K53, K54,    K5A, K5B       \
-) { \
-  { K00,    K01,    K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C   }, \
-  { K10,    K11,    K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C   }, \
-  { K20,    K21,    K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C   }, \
-  { K30,    K31,    K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  KC_NO }, \
-  { K40,    KC_NO,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4C   }, \
-  { K50,    K51,    K52,  K53,  K54,  K55,  K56,  K57,  K58,  K59,  K5A,  K5B,  KC_NO }, \
-  { K60,    K61,    K62,  K63,  K64,  K65,  K66,  K67,  K68,  K69,  K6A,  K6B,  K6C   }, \
-  { KC_NO,  K71,    K72,  K73,  K74,  K75,  K76,  K77,  K78,  K79,  K7A,  K7B,  K7C   }  \
-}
-
-// Split backspace 1.5u right mods
-#define LAYOUT_split_bs_joined_right( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C,  \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71, K19, K1A, K1B, K1C,  \
-  K20,   K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,  K73,   K29, K2A, K2B, K2C,  \
-  K30,    K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37,     K38,    K39, K3A, K3B,       \
-  K40,     K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,    K48,    K74, K49, K4A, K4B, K4C,  \
-  K50, K51, K52,                K59,                     K55, K57, K58, K53, K54, K5A, K5B        \
-) { \
-  { K00,  K01,    K02,  K03,  K04,  K05,  K06,    K07,  K08,  K09,  K0A,  K0B,  K0C   }, \
-  { K10,  K11,    K12,  K13,  K14,  K15,  K16,    K17,  K18,  K19,  K1A,  K1B,  K1C   }, \
-  { K20,  K21,    K22,  K23,  K24,  K25,  K26,    K27,  K28,  K29,  K2A,  K2B,  K2C   }, \
-  { K30,  K31,    K32,  K33,  K34,  K35,  K36,    K37,  K38,  K39,  K3A,  K3B,  KC_NO }, \
-  { K40,  KC_NO,  K42,  K43,  K44,  K45,  K46,    K47,  K48,  K49,  K4A,  K4B,  K4C   }, \
-  { K50,  K51,    K52,  K53,  K54,  K55,  KC_NO,  K57,  K58,  K59,  K5A,  K5B,  KC_NO }, \
-  { K60,  K61,    K62,  K63,  K64,  K65,  K66,    K67,  K68,  K69,  K6A,  K6B,  K6C   }, \
-  { K70,  K71,    K72,  K73,  K74,  K75,  K76,    K77,  K78,  K79,  K7A,  K7B,  K7C   }, \
-}
-
-// Split numpad (enter, 0), split shifts (right, left), split backspace
-// This layout contains every possible keycode placement
-#define LAYOUT_split_shift_and_bs( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09,    K0A, K0B, K0C, K7C, \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71,    K19, K1A, K1B, K1C, \
-  K20,    K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,   K73,    K29, K2A, K2B, K2C, \
-  K30,     K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37,       K38,    K39, K3A, K3B, K3C, \
-  K40,  K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,     K48, K74,    K49, K4A, K4B, K4C, \
-  K50,  K51,  K52,                K59,              K55, K56, K57, K58, K53, K54,    K5A, K5B, K5C  \
-) { \
-  { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C },  \
-  { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C },  \
-  { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C },  \
-  { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C },  \
-  { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4C },  \
-  { K50,  K51,  K52,  K53,  K54,  K55,  K56,  K57,  K58,  K59,  K5A,  K5B,  K5C },  \
-  { K60,  K61,  K62,  K63,  K64,  K65,  K66,  K67,  K68,  K69,  K6A,  K6B,  K6C },  \
-  { K70,  K71,  K72,  K73,  K74,  K75,  K76,  K77,  K78,  K79,  K7A,  K7B,  K7C },  \
-}
-
-// ISO Layout
-#define LAYOUT_iso( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09,    K0A, K0B, K0C, K7C, \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18,      K71,    K19, K1A, K1B, K1C, \
-  K20,    K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,           K29, K2A, K2B, K2C, \
-  K30,     K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K73,  K38,    K39, K3A, K3B,      \
-  K40,  K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,     K48, K74,    K49, K4A, K4B, K4C, \
-  K50,  K51,  K52,                K59,              K55, K56, K57, K58, K53, K54,    K5A, K5B       \
-) { \
-  { K00,    K01,    K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C   }, \
-  { K10,    K11,    K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C   }, \
-  { K20,    K21,    K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C   }, \
-  { K30,    K31,    K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  KC_NO }, \
-  { K40,    K41,    K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4C   }, \
-  { K50,    K51,    K52,  K53,  K54,  K55,  K56,  K57,  K58,  K59,  K5A,  K5B,  KC_NO }, \
-  { K60,    K61,    K62,  K63,  K64,  K65,  K66,  K67,  K68,  K69,  K6A,  K6B,  K6C   }, \
-  { KC_NO,  K71,    K72,  K73,  K74,  K75,  K76,  K77,  K78,  K79,  K7A,  K7B,  K7C   }  \
-}
diff --git a/keyboards/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/info.json
index 1361065e75..40d6710829 100644
--- a/keyboards/mechkeys/espectro/info.json
+++ b/keyboards/mechkeys/espectro/info.json
@@ -8,6 +8,11 @@
     "pid": "0xCA96",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C6", "F1", "F4", "F5", "F6", "F7", "D7", "B4", "B5", "D0", "D1", "D2", "D3"],
+    "rows": ["B7", "B3", "E6", "F0", "D5", "D4", "D6", "C7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "levels": 5
@@ -18,451 +23,451 @@
     "scroll_lock": "B1",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_default": {
       "layout": [
-        {"label":"ESC", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PRINT SCREEN", "x":13, "y":0},
-        {"label":"HOME", "x":14, "y":0},
-        {"label":"END", "x":15, "y":0},
-        {"label":"PAGE UP", "x":16, "y":0},
-        {"label":"PAGE DOWN", "x":17, "y":0},
-        {"label":"DELETE", "x":18, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [6, 0], "x": 5, "y": 0},
+        {"matrix": [6, 1], "x": 6, "y": 0},
+        {"matrix": [6, 2], "x": 7, "y": 0},
+        {"matrix": [6, 3], "x": 8, "y": 0},
+        {"matrix": [0, 5], "x": 9, "y": 0},
+        {"matrix": [0, 6], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0},
+        {"matrix": [0, 8], "x": 12, "y": 0},
+        {"matrix": [7, 2], "x": 13, "y": 0},
+        {"matrix": [0, 9], "x": 14, "y": 0},
+        {"matrix": [0, 10], "x": 15, "y": 0},
+        {"matrix": [0, 11], "x": 16, "y": 0},
+        {"matrix": [0, 12], "x": 17, "y": 0},
+        {"matrix": [7, 12], "x": 18, "y": 0},
 
-        {"label":"GRAVE", "x":0, "y":1},
-        {"label":"1", "x":1, "y":1},
-        {"label":"2", "x":2, "y":1},
-        {"label":"3", "x":3, "y":1},
-        {"label":"4", "x":4, "y":1},
-        {"label":"5", "x":5, "y":1},
-        {"label":"6", "x":6, "y":1},
-        {"label":"7", "x":7, "y":1},
-        {"label":"8", "x":8, "y":1},
-        {"label":"9", "x":9, "y":1},
-        {"label":"0", "x":10, "y":1},
-        {"label":"MINUS", "x":11, "y":1},
-        {"label":"EQUAL", "x":12, "y":1},
-        {"label":"BACKSPACE", "x":13, "y":1, "w":2},
-        {"label":"NUM LOCK", "x":15, "y":1},
-        {"label":"KEYPAD /", "x":16, "y":1},
-        {"label":"KEYPAD *", "x":17, "y":1},
-        {"label":"KEYPAD -", "x":18, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [6, 4], "x": 5, "y": 1},
+        {"matrix": [6, 5], "x": 6, "y": 1},
+        {"matrix": [6, 6], "x": 7, "y": 1},
+        {"matrix": [6, 7], "x": 8, "y": 1},
+        {"matrix": [1, 5], "x": 9, "y": 1},
+        {"matrix": [1, 6], "x": 10, "y": 1},
+        {"matrix": [1, 7], "x": 11, "y": 1},
+        {"matrix": [1, 8], "x": 12, "y": 1},
+        {"matrix": [7, 1], "x": 13, "y": 1, "w": 2},
+        {"matrix": [1, 9], "x": 15, "y": 1},
+        {"matrix": [1, 10], "x": 16, "y": 1},
+        {"matrix": [1, 11], "x": 17, "y": 1},
+        {"matrix": [1, 12], "x": 18, "y": 1},
 
-        {"label":"TAB", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"LBRACKET", "x":11.5, "y":2},
-        {"label":"RBRACKET", "x":12.5, "y":2},
-        {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
-        {"label":"KEYPAD 7", "x":15, "y":2},
-        {"label":"KEYPAD 8", "x":16, "y":2},
-        {"label":"KEYPAD 9", "x":17, "y":2},
-        {"label":"KEYPAD +", "x":18, "y":2, "h":2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [6, 8], "x": 5.5, "y": 2},
+        {"matrix": [6, 9], "x": 6.5, "y": 2},
+        {"matrix": [6, 10], "x": 7.5, "y": 2},
+        {"matrix": [6, 11], "x": 8.5, "y": 2},
+        {"matrix": [2, 5], "x": 9.5, "y": 2},
+        {"matrix": [2, 6], "x": 10.5, "y": 2},
+        {"matrix": [2, 7], "x": 11.5, "y": 2},
+        {"matrix": [2, 8], "x": 12.5, "y": 2},
+        {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+        {"matrix": [2, 9], "x": 15, "y": 2},
+        {"matrix": [2, 10], "x": 16, "y": 2},
+        {"matrix": [2, 11], "x": 17, "y": 2},
+        {"matrix": [2, 12], "x": 18, "y": 2, "h": 2},
 
-        {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":"SEMICOLON", "x":10.75, "y":3},
-        {"label":"QUOTE", "x":11.75, "y":3},
-        {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
-        {"label":"KEYPAD 4", "x":15, "y":3},
-        {"label":"KEYPAD 5", "x":16, "y":3},
-        {"label":"KEYPAD 6", "x":17, "y":3},
+        {"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": [6, 12], "x": 5.75, "y": 3},
+        {"matrix": [7, 5], "x": 6.75, "y": 3},
+        {"matrix": [7, 6], "x": 7.75, "y": 3},
+        {"matrix": [7, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 5], "x": 9.75, "y": 3},
+        {"matrix": [3, 6], "x": 10.75, "y": 3},
+        {"matrix": [3, 7], "x": 11.75, "y": 3},
+        {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+        {"matrix": [3, 9], "x": 15, "y": 3},
+        {"matrix": [3, 10], "x": 16, "y": 3},
+        {"matrix": [3, 11], "x": 17, "y": 3},
 
-        {"label":"LSHIFT", "x":0, "y":4, "w":2.25},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":"COMMA", "x":9.25, "y":4},
-        {"label":"PERIOD", "x":10.25, "y":4},
-        {"label":"SLASH", "x":11.25, "y":4},
-        {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
-        {"label":"UP", "x":14, "y":4},
-        {"label":"KEYPAD 1", "x":15, "y":4},
-        {"label":"KEYPAD 2", "x":16, "y":4},
-        {"label":"KEYPAD 3", "x":17, "y":4},
-        {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4},
+        {"matrix": [4, 3], "x": 3.25, "y": 4},
+        {"matrix": [4, 4], "x": 4.25, "y": 4},
+        {"matrix": [7, 8], "x": 5.25, "y": 4},
+        {"matrix": [7, 9], "x": 6.25, "y": 4},
+        {"matrix": [7, 10], "x": 7.25, "y": 4},
+        {"matrix": [7, 11], "x": 8.25, "y": 4},
+        {"matrix": [4, 5], "x": 9.25, "y": 4},
+        {"matrix": [4, 6], "x": 10.25, "y": 4},
+        {"matrix": [4, 7], "x": 11.25, "y": 4},
+        {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+        {"matrix": [7, 4], "x": 14, "y": 4},
+        {"matrix": [4, 9], "x": 15, "y": 4},
+        {"matrix": [4, 10], "x": 16, "y": 4},
+        {"matrix": [4, 11], "x": 17, "y": 4},
+        {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
 
-        {"label":"LCTRL", "x":0, "y":5, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
-        {"label":"LALT", "x":2.5, "y":5, "w":1.25},
-        {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
-        {"label":"RALT", "x":10, "y":5},
-        {"label":"RCTRL", "x":11, "y":5},
-        {"label":"FN", "x":12, "y":5},
-        {"label":"LEFT", "x":13, "y":5},
-        {"label":"DOWN", "x":14, "y":5},
-        {"label":"RIGHT", "x":15, "y":5},
-        {"label":"KEYPAD 0", "x":16, "y":5},
-        {"label":"KEYPAD .", "x":17, "y":5}
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25},
+        {"matrix": [5, 5], "x": 10, "y": 5},
+        {"matrix": [5, 6], "x": 11, "y": 5},
+        {"matrix": [5, 7], "x": 12, "y": 5},
+        {"matrix": [5, 8], "x": 13, "y": 5},
+        {"matrix": [5, 3], "x": 14, "y": 5},
+        {"matrix": [5, 4], "x": 15, "y": 5},
+        {"matrix": [5, 10], "x": 16, "y": 5},
+        {"matrix": [5, 11], "x": 17, "y": 5}
       ]
     },
-
     "LAYOUT_split_bs_joined_right": {
       "layout": [
-        {"label": "K00", "x": 0, "y": 0},
-        {"label": "K01", "x": 1, "y": 0},
-        {"label": "K02", "x": 2, "y": 0},
-        {"label": "K03", "x": 3, "y": 0},
-        {"label": "K04", "x": 4, "y": 0},
-        {"label": "K60", "x": 5, "y": 0},
-        {"label": "K61", "x": 6, "y": 0},
-        {"label": "K62", "x": 7, "y": 0},
-        {"label": "K63", "x": 8, "y": 0},
-        {"label": "K05", "x": 9, "y": 0},
-        {"label": "K06", "x": 10, "y": 0},
-        {"label": "K07", "x": 11, "y": 0},
-        {"label": "K08", "x": 12, "y": 0},
-        {"label": "K72", "x": 13, "y": 0},
-        {"label": "K09", "x": 14, "y": 0},
-        {"label": "K0A", "x": 15, "y": 0},
-        {"label": "K0B", "x": 16, "y": 0},
-        {"label": "K0C", "x": 17, "y": 0},
-        {"label": "K7C", "x": 18, "y": 0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [6, 0], "x": 5, "y": 0},
+        {"matrix": [6, 1], "x": 6, "y": 0},
+        {"matrix": [6, 2], "x": 7, "y": 0},
+        {"matrix": [6, 3], "x": 8, "y": 0},
+        {"matrix": [0, 5], "x": 9, "y": 0},
+        {"matrix": [0, 6], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0},
+        {"matrix": [0, 8], "x": 12, "y": 0},
+        {"matrix": [7, 2], "x": 13, "y": 0},
+        {"matrix": [0, 9], "x": 14, "y": 0},
+        {"matrix": [0, 10], "x": 15, "y": 0},
+        {"matrix": [0, 11], "x": 16, "y": 0},
+        {"matrix": [0, 12], "x": 17, "y": 0},
+        {"matrix": [7, 12], "x": 18, "y": 0},
 
-        {"label": "K10", "x": 0, "y": 1},
-        {"label": "K11", "x": 1, "y": 1},
-        {"label": "K12", "x": 2, "y": 1},
-        {"label": "K13", "x": 3, "y": 1},
-        {"label": "K14", "x": 4, "y": 1},
-        {"label": "K64", "x": 5, "y": 1},
-        {"label": "K65", "x": 6, "y": 1},
-        {"label": "K66", "x": 7, "y": 1},
-        {"label": "K67", "x": 8, "y": 1},
-        {"label": "K15", "x": 9, "y": 1},
-        {"label": "K16", "x": 10, "y": 1},
-        {"label": "K17", "x": 11, "y": 1},
-        {"label": "K18", "x": 12, "y": 1},
-        {"label": "K70", "x": 13, "y": 1},
-        {"label": "K71", "x": 14, "y": 1},
-        {"label": "K19", "x": 15, "y": 1},
-        {"label": "K1A", "x": 16, "y": 1},
-        {"label": "K1B", "x": 17, "y": 1},
-        {"label": "K1C", "x": 18, "y": 1},
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [6, 4], "x": 5, "y": 1},
+        {"matrix": [6, 5], "x": 6, "y": 1},
+        {"matrix": [6, 6], "x": 7, "y": 1},
+        {"matrix": [6, 7], "x": 8, "y": 1},
+        {"matrix": [1, 5], "x": 9, "y": 1},
+        {"matrix": [1, 6], "x": 10, "y": 1},
+        {"matrix": [1, 7], "x": 11, "y": 1},
+        {"matrix": [1, 8], "x": 12, "y": 1},
+        {"matrix": [7, 0], "x": 13, "y": 1},
+        {"matrix": [7, 1], "x": 14, "y": 1},
+        {"matrix": [1, 9], "x": 15, "y": 1},
+        {"matrix": [1, 10], "x": 16, "y": 1},
+        {"matrix": [1, 11], "x": 17, "y": 1},
+        {"matrix": [1, 12], "x": 18, "y": 1},
 
-        {"label": "K20", "x": 0, "y": 2, "w": 1.5},
-        {"label": "K21", "x": 1.5, "y": 2},
-        {"label": "K22", "x": 2.5, "y": 2},
-        {"label": "K23", "x": 3.5, "y": 2},
-        {"label": "K24", "x": 4.5, "y": 2},
-        {"label": "K68", "x": 5.5, "y": 2},
-        {"label": "K69", "x": 6.5, "y": 2},
-        {"label": "K6A", "x": 7.5, "y": 2},
-        {"label": "K6B", "x": 8.5, "y": 2},
-        {"label": "K25", "x": 9.5, "y": 2},
-        {"label": "K26", "x": 10.5, "y": 2},
-        {"label": "K27", "x": 11.5, "y": 2},
-        {"label": "K28", "x": 12.5, "y": 2},
-        {"label": "K73", "x": 13.5, "y": 2, "w": 1.5},
-        {"label": "K29", "x": 15, "y": 2},
-        {"label": "K2A", "x": 16, "y": 2},
-        {"label": "K2B", "x": 17, "y": 2},
-        {"label": "K2C", "x": 18, "y": 2, "h": 2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [6, 8], "x": 5.5, "y": 2},
+        {"matrix": [6, 9], "x": 6.5, "y": 2},
+        {"matrix": [6, 10], "x": 7.5, "y": 2},
+        {"matrix": [6, 11], "x": 8.5, "y": 2},
+        {"matrix": [2, 5], "x": 9.5, "y": 2},
+        {"matrix": [2, 6], "x": 10.5, "y": 2},
+        {"matrix": [2, 7], "x": 11.5, "y": 2},
+        {"matrix": [2, 8], "x": 12.5, "y": 2},
+        {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+        {"matrix": [2, 9], "x": 15, "y": 2},
+        {"matrix": [2, 10], "x": 16, "y": 2},
+        {"matrix": [2, 11], "x": 17, "y": 2},
+        {"matrix": [2, 12], "x": 18, "y": 2, "h": 2},
 
-        {"label": "K30", "x": 0, "y": 3, "w": 1.75},
-        {"label": "K31", "x": 1.75, "y": 3},
-        {"label": "K32", "x": 2.75, "y": 3},
-        {"label": "K33", "x": 3.75, "y": 3},
-        {"label": "K34", "x": 4.75, "y": 3},
-        {"label": "K6C", "x": 5.75, "y": 3},
-        {"label": "K75", "x": 6.75, "y": 3},
-        {"label": "K76", "x": 7.75, "y": 3},
-        {"label": "K77", "x": 8.75, "y": 3},
-        {"label": "K35", "x": 9.75, "y": 3},
-        {"label": "K36", "x": 10.75, "y": 3},
-        {"label": "K37", "x": 11.75, "y": 3},
-        {"label": "K38", "x": 12.75, "y": 3, "w": 2.25},
-        {"label": "K39", "x": 15, "y": 3},
-        {"label": "K3A", "x": 16, "y": 3},
-        {"label": "K3B", "x": 17, "y": 3},
+        {"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": [6, 12], "x": 5.75, "y": 3},
+        {"matrix": [7, 5], "x": 6.75, "y": 3},
+        {"matrix": [7, 6], "x": 7.75, "y": 3},
+        {"matrix": [7, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 5], "x": 9.75, "y": 3},
+        {"matrix": [3, 6], "x": 10.75, "y": 3},
+        {"matrix": [3, 7], "x": 11.75, "y": 3},
+        {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+        {"matrix": [3, 9], "x": 15, "y": 3},
+        {"matrix": [3, 10], "x": 16, "y": 3},
+        {"matrix": [3, 11], "x": 17, "y": 3},
 
-        {"label": "K40", "x": 0, "y": 4, "w": 2.25},
-        {"label": "K42", "x": 2.25, "y": 4},
-        {"label": "K43", "x": 3.25, "y": 4},
-        {"label": "K44", "x": 4.25, "y": 4},
-        {"label": "K78", "x": 5.25, "y": 4},
-        {"label": "K79", "x": 6.25, "y": 4},
-        {"label": "K7A", "x": 7.25, "y": 4},
-        {"label": "K7B", "x": 8.25, "y": 4},
-        {"label": "K45", "x": 9.25, "y": 4},
-        {"label": "K46", "x": 10.25, "y": 4},
-        {"label": "K47", "x": 11.25, "y": 4},
-        {"label": "K48", "x": 12.25, "y": 4, "w": 1.75},
-        {"label": "K74", "x": 14, "y": 4},
-        {"label": "K49", "x": 15, "y": 4},
-        {"label": "K4A", "x": 16, "y": 4},
-        {"label": "K4B", "x": 17, "y": 4},
-        {"label": "K4C", "x": 18, "y": 4, "h": 2},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4},
+        {"matrix": [4, 3], "x": 3.25, "y": 4},
+        {"matrix": [4, 4], "x": 4.25, "y": 4},
+        {"matrix": [7, 8], "x": 5.25, "y": 4},
+        {"matrix": [7, 9], "x": 6.25, "y": 4},
+        {"matrix": [7, 10], "x": 7.25, "y": 4},
+        {"matrix": [7, 11], "x": 8.25, "y": 4},
+        {"matrix": [4, 5], "x": 9.25, "y": 4},
+        {"matrix": [4, 6], "x": 10.25, "y": 4},
+        {"matrix": [4, 7], "x": 11.25, "y": 4},
+        {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+        {"matrix": [7, 4], "x": 14, "y": 4},
+        {"matrix": [4, 9], "x": 15, "y": 4},
+        {"matrix": [4, 10], "x": 16, "y": 4},
+        {"matrix": [4, 11], "x": 17, "y": 4},
+        {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
 
-        {"label": "K50", "x": 0, "y": 5, "w": 1.25},
-        {"label": "K51", "x": 1.25, "y": 5, "w": 1.25},
-        {"label": "K52", "x": 2.5, "y": 5, "w": 1.25},
-        {"label": "K59", "x": 3.75, "y": 5, "w": 6.25},
-        {"label": "K55", "x": 10, "y": 5, "w": 1.5},
-        {"label": "K57", "x": 11.5, "y": 5, "w": 1.5},
-        {"label": "K58", "x": 13, "y": 5},
-        {"label": "K53", "x": 14, "y": 5},
-        {"label": "K54", "x": 15, "y": 5},
-        {"label": "K5A", "x": 16, "y": 5},
-        {"label": "K5B", "x": 17, "y": 5}
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25},
+        {"matrix": [5, 5], "x": 10, "y": 5, "w": 1.5},
+        {"matrix": [5, 7], "x": 11.5, "y": 5, "w": 1.5},
+        {"matrix": [5, 8], "x": 13, "y": 5},
+        {"matrix": [5, 3], "x": 14, "y": 5},
+        {"matrix": [5, 4], "x": 15, "y": 5},
+        {"matrix": [5, 10], "x": 16, "y": 5},
+        {"matrix": [5, 11], "x": 17, "y": 5}
       ]
     },
-
     "LAYOUT_split_shift_and_bs": {
       "layout": [
-        {"label":"ESC", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PRINT SCREEN", "x":13, "y":0},
-        {"label":"HOME", "x":14, "y":0},
-        {"label":"END", "x":15, "y":0},
-        {"label":"PAGE UP", "x":16, "y":0},
-        {"label":"PAGE DOWN", "x":17, "y":0},
-        {"label":"DELETE", "x":18, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [6, 0], "x": 5, "y": 0},
+        {"matrix": [6, 1], "x": 6, "y": 0},
+        {"matrix": [6, 2], "x": 7, "y": 0},
+        {"matrix": [6, 3], "x": 8, "y": 0},
+        {"matrix": [0, 5], "x": 9, "y": 0},
+        {"matrix": [0, 6], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0},
+        {"matrix": [0, 8], "x": 12, "y": 0},
+        {"matrix": [7, 2], "x": 13, "y": 0},
+        {"matrix": [0, 9], "x": 14, "y": 0},
+        {"matrix": [0, 10], "x": 15, "y": 0},
+        {"matrix": [0, 11], "x": 16, "y": 0},
+        {"matrix": [0, 12], "x": 17, "y": 0},
+        {"matrix": [7, 12], "x": 18, "y": 0},
 
-        {"label":"GRAVE", "x":0, "y":1},
-        {"label":"1", "x":1, "y":1},
-        {"label":"2", "x":2, "y":1},
-        {"label":"3", "x":3, "y":1},
-        {"label":"4", "x":4, "y":1},
-        {"label":"5", "x":5, "y":1},
-        {"label":"6", "x":6, "y":1},
-        {"label":"7", "x":7, "y":1},
-        {"label":"8", "x":8, "y":1},
-        {"label":"9", "x":9, "y":1},
-        {"label":"0", "x":10, "y":1},
-        {"label":"MINUS", "x":11, "y":1},
-        {"label":"EQUAL", "x":12, "y":1},
-        {"label":"BACKSPACE", "x":13, "y":1},
-        {"label":"BACKSPACE", "x":14, "y":1},
-        {"label":"NUM LOCK", "x":15, "y":1},
-        {"label":"KEYPAD /", "x":16, "y":1},
-        {"label":"KEYPAD *", "x":17, "y":1},
-        {"label":"KEYPAD -", "x":18, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [6, 4], "x": 5, "y": 1},
+        {"matrix": [6, 5], "x": 6, "y": 1},
+        {"matrix": [6, 6], "x": 7, "y": 1},
+        {"matrix": [6, 7], "x": 8, "y": 1},
+        {"matrix": [1, 5], "x": 9, "y": 1},
+        {"matrix": [1, 6], "x": 10, "y": 1},
+        {"matrix": [1, 7], "x": 11, "y": 1},
+        {"matrix": [1, 8], "x": 12, "y": 1},
+        {"matrix": [7, 0], "x": 13, "y": 1},
+        {"matrix": [7, 1], "x": 14, "y": 1},
+        {"matrix": [1, 9], "x": 15, "y": 1},
+        {"matrix": [1, 10], "x": 16, "y": 1},
+        {"matrix": [1, 11], "x": 17, "y": 1},
+        {"matrix": [1, 12], "x": 18, "y": 1},
 
-        {"label":"TAB", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"LBRACKET", "x":11.5, "y":2},
-        {"label":"RBRACKET", "x":12.5, "y":2},
-        {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
-        {"label":"KEYPAD 7", "x":15, "y":2},
-        {"label":"KEYPAD 8", "x":16, "y":2},
-        {"label":"KEYPAD 9", "x":17, "y":2},
-        {"label":"KEYPAD +", "x":18, "y":2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [6, 8], "x": 5.5, "y": 2},
+        {"matrix": [6, 9], "x": 6.5, "y": 2},
+        {"matrix": [6, 10], "x": 7.5, "y": 2},
+        {"matrix": [6, 11], "x": 8.5, "y": 2},
+        {"matrix": [2, 5], "x": 9.5, "y": 2},
+        {"matrix": [2, 6], "x": 10.5, "y": 2},
+        {"matrix": [2, 7], "x": 11.5, "y": 2},
+        {"matrix": [2, 8], "x": 12.5, "y": 2},
+        {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+        {"matrix": [2, 9], "x": 15, "y": 2},
+        {"matrix": [2, 10], "x": 16, "y": 2},
+        {"matrix": [2, 11], "x": 17, "y": 2},
+        {"matrix": [2, 12], "x": 18, "y": 2},
 
-        {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":"SEMICOLON", "x":10.75, "y":3},
-        {"label":"QUOTE", "x":11.75, "y":3},
-        {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
-        {"label":"KEYPAD 4", "x":15, "y":3},
-        {"label":"KEYPAD 5", "x":16, "y":3},
-        {"label":"KEYPAD 6", "x":17, "y":3},
-        {"label":"KEYPAD +", "x":18, "y":3},
+        {"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": [6, 12], "x": 5.75, "y": 3},
+        {"matrix": [7, 5], "x": 6.75, "y": 3},
+        {"matrix": [7, 6], "x": 7.75, "y": 3},
+        {"matrix": [7, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 5], "x": 9.75, "y": 3},
+        {"matrix": [3, 6], "x": 10.75, "y": 3},
+        {"matrix": [3, 7], "x": 11.75, "y": 3},
+        {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+        {"matrix": [3, 9], "x": 15, "y": 3},
+        {"matrix": [3, 10], "x": 16, "y": 3},
+        {"matrix": [3, 11], "x": 17, "y": 3},
+        {"matrix": [3, 12], "x": 18, "y": 3},
 
-        {"label":"LSHIFT", "x":0, "y":4, "w":1.25},
-        {"label":"ISO BACKSLASH", "x":1.25, "y":4},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":"COMMA", "x":9.25, "y":4},
-        {"label":"PERIOD", "x":10.25, "y":4},
-        {"label":"SLASH", "x":11.25, "y":4},
-        {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
-        {"label":"UP", "x":14, "y":4},
-        {"label":"KEYPAD 1", "x":15, "y":4},
-        {"label":"KEYPAD 2", "x":16, "y":4},
-        {"label":"KEYPAD 3", "x":17, "y":4},
-        {"label":"KEYPAD ENTER", "x":18, "y":4},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4},
+        {"matrix": [4, 2], "x": 2.25, "y": 4},
+        {"matrix": [4, 3], "x": 3.25, "y": 4},
+        {"matrix": [4, 4], "x": 4.25, "y": 4},
+        {"matrix": [7, 8], "x": 5.25, "y": 4},
+        {"matrix": [7, 9], "x": 6.25, "y": 4},
+        {"matrix": [7, 10], "x": 7.25, "y": 4},
+        {"matrix": [7, 11], "x": 8.25, "y": 4},
+        {"matrix": [4, 5], "x": 9.25, "y": 4},
+        {"matrix": [4, 6], "x": 10.25, "y": 4},
+        {"matrix": [4, 7], "x": 11.25, "y": 4},
+        {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+        {"matrix": [7, 4], "x": 14, "y": 4},
+        {"matrix": [4, 9], "x": 15, "y": 4},
+        {"matrix": [4, 10], "x": 16, "y": 4},
+        {"matrix": [4, 11], "x": 17, "y": 4},
+        {"matrix": [4, 12], "x": 18, "y": 4},
 
-        {"label":"LCTRL", "x":0, "y":5, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
-        {"label":"LALT", "x":2.5, "y":5, "w":1.25},
-        {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
-        {"label":"RALT", "x":10, "y":5},
-        {"label":"MENU", "x":11, "y":5},
-        {"label":"RCTRL", "x":12, "y":5},
-        {"label":"LEFT", "x":13, "y":5},
-        {"label":"DOWN", "x":14, "y":5},
-        {"label":"RIGHT", "x":15, "y":5},
-        {"label":"KEYPAD 0", "x":16, "y":5},
-        {"label":"KEYPAD .", "x":17, "y":5},
-        {"label":"KEYPAD ENTER", "x":18, "y":5}
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25},
+        {"matrix": [5, 5], "x": 10, "y": 5},
+        {"matrix": [5, 6], "x": 11, "y": 5},
+        {"matrix": [5, 7], "x": 12, "y": 5},
+        {"matrix": [5, 8], "x": 13, "y": 5},
+        {"matrix": [5, 3], "x": 14, "y": 5},
+        {"matrix": [5, 4], "x": 15, "y": 5},
+        {"matrix": [5, 10], "x": 16, "y": 5},
+        {"matrix": [5, 11], "x": 17, "y": 5},
+        {"matrix": [5, 12], "x": 18, "y": 5}
       ]
     },
-
     "LAYOUT_iso": {
-      "layout": [
-        {"label":"ESC", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PRINT SCREEN", "x":13, "y":0},
-        {"label":"HOME", "x":14, "y":0},
-        {"label":"END", "x":15, "y":0},
-        {"label":"PAGE UP", "x":16, "y":0},
-        {"label":"PAGE DOWN", "x":17, "y":0},
-        {"label":"DELETE", "x":18, "y":0},
+    "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [6, 0], "x": 5, "y": 0},
+        {"matrix": [6, 1], "x": 6, "y": 0},
+        {"matrix": [6, 2], "x": 7, "y": 0},
+        {"matrix": [6, 3], "x": 8, "y": 0},
+        {"matrix": [0, 5], "x": 9, "y": 0},
+        {"matrix": [0, 6], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0},
+        {"matrix": [0, 8], "x": 12, "y": 0},
+        {"matrix": [7, 2], "x": 13, "y": 0},
+        {"matrix": [0, 9], "x": 14, "y": 0},
+        {"matrix": [0, 10], "x": 15, "y": 0},
+        {"matrix": [0, 11], "x": 16, "y": 0},
+        {"matrix": [0, 12], "x": 17, "y": 0},
+        {"matrix": [7, 12], "x": 18, "y": 0},
 
-        {"label":"GRAVE", "x":0, "y":1},
-        {"label":"1", "x":1, "y":1},
-        {"label":"2", "x":2, "y":1},
-        {"label":"3", "x":3, "y":1},
-        {"label":"4", "x":4, "y":1},
-        {"label":"5", "x":5, "y":1},
-        {"label":"6", "x":6, "y":1},
-        {"label":"7", "x":7, "y":1},
-        {"label":"8", "x":8, "y":1},
-        {"label":"9", "x":9, "y":1},
-        {"label":"0", "x":10, "y":1},
-        {"label":"MINUS", "x":11, "y":1},
-        {"label":"EQUAL", "x":12, "y":1},
-        {"label":"BACKSPACE", "x":13, "y":1, "w":2},
-        {"label":"NUM LOCK", "x":15, "y":1},
-        {"label":"KEYPAD /", "x":16, "y":1},
-        {"label":"KEYPAD *", "x":17, "y":1},
-        {"label":"KEYPAD -", "x":18, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [6, 4], "x": 5, "y": 1},
+        {"matrix": [6, 5], "x": 6, "y": 1},
+        {"matrix": [6, 6], "x": 7, "y": 1},
+        {"matrix": [6, 7], "x": 8, "y": 1},
+        {"matrix": [1, 5], "x": 9, "y": 1},
+        {"matrix": [1, 6], "x": 10, "y": 1},
+        {"matrix": [1, 7], "x": 11, "y": 1},
+        {"matrix": [1, 8], "x": 12, "y": 1},
+        {"matrix": [7, 1], "x": 13, "y": 1, "w": 2},
+        {"matrix": [1, 9], "x": 15, "y": 1},
+        {"matrix": [1, 10], "x": 16, "y": 1},
+        {"matrix": [1, 11], "x": 17, "y": 1},
+        {"matrix": [1, 12], "x": 18, "y": 1},
 
-        {"label":"TAB", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"LBRACKET", "x":11.5, "y":2},
-        {"label":"RBRACKET", "x":12.5, "y":2},
-        {"label":"KEYPAD 7", "x":15, "y":2},
-        {"label":"KEYPAD 8", "x":16, "y":2},
-        {"label":"KEYPAD 9", "x":17, "y":2},
-        {"label":"KEYPAD +", "x":18, "y":2, "h":2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [6, 8], "x": 5.5, "y": 2},
+        {"matrix": [6, 9], "x": 6.5, "y": 2},
+        {"matrix": [6, 10], "x": 7.5, "y": 2},
+        {"matrix": [6, 11], "x": 8.5, "y": 2},
+        {"matrix": [2, 5], "x": 9.5, "y": 2},
+        {"matrix": [2, 6], "x": 10.5, "y": 2},
+        {"matrix": [2, 7], "x": 11.5, "y": 2},
+        {"matrix": [2, 8], "x": 12.5, "y": 2},
+        {"matrix": [2, 9], "x": 15, "y": 2},
+        {"matrix": [2, 10], "x": 16, "y": 2},
+        {"matrix": [2, 11], "x": 17, "y": 2},
+        {"matrix": [2, 12], "x": 18, "y": 2, "h": 2},
 
-        {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":"SEMICOLON", "x":10.75, "y":3},
-        {"label":"QUOTE", "x":11.75, "y":3},
-        {"label":"ISO HASH", "x":12.75, "y":3},
-        {"label":"ENTER", "x":13.75, "y":2, "w":1.25, "h":2},
-        {"label":"KEYPAD 4", "x":15, "y":3},
-        {"label":"KEYPAD 5", "x":16, "y":3},
-        {"label":"KEYPAD 6", "x":17, "y":3},
+        {"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": [6, 12], "x": 5.75, "y": 3},
+        {"matrix": [7, 5], "x": 6.75, "y": 3},
+        {"matrix": [7, 6], "x": 7.75, "y": 3},
+        {"matrix": [7, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 5], "x": 9.75, "y": 3},
+        {"matrix": [3, 6], "x": 10.75, "y": 3},
+        {"matrix": [3, 7], "x": 11.75, "y": 3},
+        {"matrix": [7, 3], "x": 12.75, "y": 3},
+        {"matrix": [3, 8], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+        {"matrix": [3, 9], "x": 15, "y": 3},
+        {"matrix": [3, 10], "x": 16, "y": 3},
+        {"matrix": [3, 11], "x": 17, "y": 3},
 
-        {"label":"LSHIFT", "x":0, "y":4, "w":1.25},
-        {"label":"ISO BACKSLASH", "x":1.25, "y":4},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":"COMMA", "x":9.25, "y":4},
-        {"label":"PERIOD", "x":10.25, "y":4},
-        {"label":"SLASH", "x":11.25, "y":4},
-        {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
-        {"label":"UP", "x":14, "y":4},
-        {"label":"KEYPAD 1", "x":15, "y":4},
-        {"label":"KEYPAD 2", "x":16, "y":4},
-        {"label":"KEYPAD 3", "x":17, "y":4},
-        {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4},
+        {"matrix": [4, 2], "x": 2.25, "y": 4},
+        {"matrix": [4, 3], "x": 3.25, "y": 4},
+        {"matrix": [4, 4], "x": 4.25, "y": 4},
+        {"matrix": [7, 8], "x": 5.25, "y": 4},
+        {"matrix": [7, 9], "x": 6.25, "y": 4},
+        {"matrix": [7, 10], "x": 7.25, "y": 4},
+        {"matrix": [7, 11], "x": 8.25, "y": 4},
+        {"matrix": [4, 5], "x": 9.25, "y": 4},
+        {"matrix": [4, 6], "x": 10.25, "y": 4},
+        {"matrix": [4, 7], "x": 11.25, "y": 4},
+        {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+        {"matrix": [7, 4], "x": 14, "y": 4},
+        {"matrix": [4, 9], "x": 15, "y": 4},
+        {"matrix": [4, 10], "x": 16, "y": 4},
+        {"matrix": [4, 11], "x": 17, "y": 4},
+        {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
 
-        {"label":"LCTRL", "x":0, "y":5, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
-        {"label":"LALT", "x":2.5, "y":5, "w":1.25},
-        {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
-        {"label":"RALT", "x":10, "y":5},
-        {"label":"MENU", "x":11, "y":5},
-        {"label":"RCTRL", "x":12, "y":5},
-        {"label":"LEFT", "x":13, "y":5},
-        {"label":"DOWN", "x":14, "y":5},
-        {"label":"RIGHT", "x":15, "y":5},
-        {"label":"KEYPAD 0", "x":16, "y":5},
-        {"label":"KEYPAD .", "x":17, "y":5}
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25},
+        {"matrix": [5, 5], "x": 10, "y": 5},
+        {"matrix": [5, 6], "x": 11, "y": 5},
+        {"matrix": [5, 7], "x": 12, "y": 5},
+        {"matrix": [5, 8], "x": 13, "y": 5},
+        {"matrix": [5, 3], "x": 14, "y": 5},
+        {"matrix": [5, 4], "x": 15, "y": 5},
+        {"matrix": [5, 10], "x": 16, "y": 5},
+        {"matrix": [5, 11], "x": 17, "y": 5}
       ]
     }
   }
diff --git a/keyboards/mechkeys/mechmini/mechmini.c b/keyboards/mechkeys/mechmini/mechmini.c
deleted file mode 100644
index 46e29ba3e9..0000000000
--- a/keyboards/mechkeys/mechmini/mechmini.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
- * Copyright 2018 TurboMech /u/TurboMech <discord> @A9entOran9e#6134
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- *This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "mechmini.h"
diff --git a/keyboards/mechkeys/mechmini/mechmini.h b/keyboards/mechkeys/mechmini/mechmini.h
deleted file mode 100644
index 9420b3e161..0000000000
--- a/keyboards/mechkeys/mechmini/mechmini.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
- * Copyright 2018 TurboMech /u/TurboMech <discord> @A9entOran9e#6134
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- *This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mechkeys_mechmini_v1)
-#    include "v1.h"
-#elif defined(KEYBOARD_mechkeys_mechmini_v2)
-#    include "v2.h"
-#endif
diff --git a/keyboards/mechkeys/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h
index 3da5747d2b..f76d0f01e1 100644
--- a/keyboards/mechkeys/mechmini/v1/config.h
+++ b/keyboards/mechkeys/mechmini/v1/config.h
@@ -17,14 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4 }
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB underglow */
-// The RGB_DI_PIN value seems to be shared between all PS2AVRGB boards.
-// The same pin is used on the JJ40, at least.
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -36,4 +29,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN E2
diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
index 751be56e38..5932ce53d0 100644
--- a/keyboards/mechkeys/mechmini/v1/info.json
+++ b/keyboards/mechkeys/mechmini/v1/info.json
@@ -8,9 +8,17 @@
         "pid": "0xCA40",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"],
+        "rows": ["B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "layouts": {
diff --git a/keyboards/mechkeys/mechmini/v1/rules.mk b/keyboards/mechkeys/mechmini/v1/rules.mk
index 1829f64e67..e1dfc31721 100644
--- a/keyboards/mechkeys/mechmini/v1/rules.mk
+++ b/keyboards/mechkeys/mechmini/v1/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/mechkeys/mechmini/v1/v1.c b/keyboards/mechkeys/mechmini/v1/v1.c
deleted file mode 100644
index ba0e095209..0000000000
--- a/keyboards/mechkeys/mechmini/v1/v1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "v1.h"
diff --git a/keyboards/mechkeys/mechmini/v1/v1.h b/keyboards/mechkeys/mechmini/v1/v1.h
index 07d1e683f7..6991930d6f 100644
--- a/keyboards/mechkeys/mechmini/v1/v1.h
+++ b/keyboards/mechkeys/mechmini/v1/v1.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "../mechmini.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h
index c318669851..9517f6a731 100755
--- a/keyboards/mechkeys/mechmini/v2/config.h
+++ b/keyboards/mechkeys/mechmini/v2/config.h
@@ -15,22 +15,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B3, B1, B0, D5, B7, C7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -45,4 +35,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json
index 58ad7525db..53f60637f9 100644
--- a/keyboards/mechkeys/mechmini/v2/info.json
+++ b/keyboards/mechkeys/mechmini/v2/info.json
@@ -8,23 +8,224 @@
     "pid": "0xCA40",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"],
+    "rows": ["D0", "D1", "D2", "D3"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6"
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_ortho": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Caps", "x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"GUI", "x":3, "y":3}, {"label":"MO(1)", "x":4, "y":3}, {"label":"Space", "x":5, "y":3}, {"label":"Space", "x":6, "y":3}, {"label":"MO(2)", "x":7, "y":3}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}, {"label":"&rarr;", "x":11, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
     "LAYOUT_2u_space_ortho": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Caps", "x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"GUI", "x":3, "y":3}, {"label":"MO(1)", "x":4, "y":3}, {"label":"Space", "x":5, "y":3, "w":2}, {"label":"MO(2)", "x":7, "y":3}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}, {"label":"&rarr;", "x":11, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
     "LAYOUT_625_space": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back<br>Space", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"Enter", "x":10.25, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":"Shift", "x":9.75, "y":2, "w":1.25}, {"label":">", "x":11, "y":2}, {"label":"Control", "x":0, "y":3, "w":1.25}, {"label":"Alt", "x":1.25, "y":3}, {"label":"GUI", "x":2.25, "y":3}, {"x":3.25, "y":3, "w":6.25}, {"label":"MO(1)", "x":9.5, "y":3, "w":1.25}, {"label":"MO(2)", "x":10.75, "y":3, "w":1.25}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+        {"matrix": [2, 11], "x": 11, "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, 6], "x": 3.25, "y": 3, "w": 6.25},
+        {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+      ]
     },
     "LAYOUT_split_space": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back<br>Space", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"Enter", "x":10.25, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":"Shift", "x":9.75, "y":2, "w":1.25}, {"label":">", "x":11, "y":2}, {"label":"Control", "x":0, "y":3, "w":1.25}, {"label":"Alt", "x":1.25, "y":3}, {"label":"GUI", "x":2.25, "y":3, "w":1.25}, {"label":"Space", "x":3.5, "y":3, "w":2.75}, {"label":"Space", "x":6.25, "y":3, "w":2.25}, {"label":"Control", "x":8.5, "y":3, "w":1.25}, {"label":"MO(1)", "x":9.75, "y":3}, {"label":"MO(2)", "x":10.75, "y":3, "w":1.25}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.75},
+        {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 10], "x": 9.75, "y": 3},
+        {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+      ]
     }
   }
 }
diff --git a/keyboards/mechkeys/mechmini/v2/v2.c b/keyboards/mechkeys/mechmini/v2/v2.c
deleted file mode 100755
index caf7c6f0f2..0000000000
--- a/keyboards/mechkeys/mechmini/v2/v2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "v2.h"
diff --git a/keyboards/mechkeys/mechmini/v2/v2.h b/keyboards/mechkeys/mechmini/v2/v2.h
deleted file mode 100755
index a0a620675e..0000000000
--- a/keyboards/mechkeys/mechmini/v2/v2.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2018 TurboMech /u/TurboMech <discord> @A9entOran9e#6134
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- *This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../mechmini.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_ortho( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B } \
-}
-
-#define LAYOUT_625_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,      k1B, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32,                k36,                k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, XXX, k3A, k3B } \
-}
-
-#define LAYOUT_split_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,      k1B, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32,      k34,           k37,      k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, XXX, k34, XXX, XXX, k37, XXX, k39, k3A, k3B } \
-}
-
-#define LAYOUT_2u_space_ortho( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34,   k35,    k37, k38, k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3A, k3B } \
-}
diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h
index 065c3006c6..a66af811bb 100644
--- a/keyboards/mechkeys/mk60/config.h
+++ b/keyboards/mechkeys/mk60/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 12
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json
index 42d9c3bd24..0e79cae73e 100644
--- a/keyboards/mechkeys/mk60/info.json
+++ b/keyboards/mechkeys/mk60/info.json
@@ -8,6 +8,11 @@
       "pid": "0x0000",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"],
+      "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "B6",
       "levels": 6,
@@ -17,6 +22,9 @@
       "caps_lock": "B7",
       "on_state": 0
     },
+    "ws2812": {
+      "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mechkeys/mk60/mk60.c b/keyboards/mechkeys/mk60/mk60.c
deleted file mode 100644
index 7ec8bff22b..0000000000
--- a/keyboards/mechkeys/mk60/mk60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mk60.h"
diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h
index e7f24e3985..e3e2bf2fa1 100644
--- a/keyboards/mechllama/g35/config.h
+++ b/keyboards/mechllama/g35/config.h
@@ -17,9 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
-
 #define FORCE_NKRO
diff --git a/keyboards/mechllama/g35/g35.c b/keyboards/mechllama/g35/g35.c
deleted file mode 100644
index e3925674fe..0000000000
--- a/keyboards/mechllama/g35/g35.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kaylyn Bogle
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "g35.h"
diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json
index ae29c4bfbd..310cf6367f 100644
--- a/keyboards/mechllama/g35/info.json
+++ b/keyboards/mechllama/g35/info.json
@@ -7,6 +7,9 @@
         "vid": "0xCEEB",
         "pid": "0x0035"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mechllama/g35/v1/config.h b/keyboards/mechllama/g35/v1/config.h
index fbda4b7db2..1aee08380c 100644
--- a/keyboards/mechllama/g35/v1/config.h
+++ b/keyboards/mechllama/g35/v1/config.h
@@ -17,7 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { F5, F6, F4, F1, D4 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F0, D5 }
-
 #define RGBLED_NUM 41
diff --git a/keyboards/mechllama/g35/v1/info.json b/keyboards/mechllama/g35/v1/info.json
index 90ac25f360..c5d4c69e7b 100644
--- a/keyboards/mechllama/g35/v1/info.json
+++ b/keyboards/mechllama/g35/v1/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "F0", "D5"],
+        "rows": ["F5", "F6", "F4", "F1", "D4"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/mechllama/g35/v2/config.h b/keyboards/mechllama/g35/v2/config.h
index cd4d6e991c..7c15560a1a 100644
--- a/keyboards/mechllama/g35/v2/config.h
+++ b/keyboards/mechllama/g35/v2/config.h
@@ -17,7 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { F5, F4, F1, F0, D4 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, D5 }
-
 #define RGBLED_NUM 6
diff --git a/keyboards/mechllama/g35/v2/info.json b/keyboards/mechllama/g35/v2/info.json
index e557e4d307..563625f428 100644
--- a/keyboards/mechllama/g35/v2/info.json
+++ b/keyboards/mechllama/g35/v2/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.2"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "D5"],
+        "rows": ["F5", "F4", "F1", "F0", "D4"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/mechlovin/adelais/adelais.c b/keyboards/mechlovin/adelais/adelais.c
index da954bce04..5758bb7322 100644
--- a/keyboards/mechlovin/adelais/adelais.c
+++ b/keyboards/mechlovin/adelais/adelais.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "adelais.h"
+#include "quantum.h"
 
 #ifdef RGBLIGHT_ENABLE
 void keyboard_post_init_kb(void) {
diff --git a/keyboards/mechlovin/adelais/adelais.h b/keyboards/mechlovin/adelais/adelais.h
deleted file mode 100644
index 6c3980a090..0000000000
--- a/keyboards/mechlovin/adelais/adelais.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mechlovin_adelais_rgb_led_rev1
-    #include "rev1.h"
-#elif KEYBOARD_mechlovin_adelais_rgb_led_rev2
-    #include "rev2.h"
-#elif KEYBOARD_mechlovin_adelais_rgb_led_rev3
-    #include "rev3.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev2
-    #include "rev2.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev3
-    #include "rev3.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev4
-    #include "rev4.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_avr_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json
index f9680e47d5..42b16d6398 100644
--- a/keyboards/mechlovin/adelais/info.json
+++ b/keyboards/mechlovin/adelais/info.json
@@ -6,302 +6,5 @@
         "vid": "0x4D4C",
         "device_version": "0.0.1"
     },
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs"
-    },
-    "community_layouts": ["alice", "alice_split_bs"],
-    "layouts": {
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"label":"K1E", "x":0, "y":0},
-                {"label":"K00", "x":1.5, "y":0},
-                {"label":"K01", "x":2.5, "y":0},
-                {"label":"K02", "x":3.5, "y":0},
-                {"label":"K03", "x":4.5, "y":0},
-                {"label":"K04", "x":5.5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":10.5, "y":0},
-                {"label":"K08", "x":11.5, "y":0},
-                {"label":"K09", "x":12.5, "y":0},
-                {"label":"K0A", "x":13.5, "y":0},
-                {"label":"K0B", "x":14.5, "y":0},
-                {"label":"K0C", "x":15.5, "y":0},
-                {"label":"K0D", "x":16.5, "y":0},
-                {"label":"K0E", "x":17.5, "y":0},
-
-                {"label":"K2E", "x":0, "y":1},
-                {"label":"K10", "x":1.5, "y":1, "w":1.5},
-                {"label":"K11", "x":3, "y":1},
-                {"label":"K12", "x":4, "y":1},
-                {"label":"K13", "x":5, "y":1},
-                {"label":"K14", "x":6, "y":1},
-                {"label":"K15", "x":7, "y":1},
-                {"label":"K16", "x":10, "y":1},
-                {"label":"K17", "x":11, "y":1},
-                {"label":"K18", "x":12, "y":1},
-                {"label":"K19", "x":13, "y":1},
-                {"label":"K1A", "x":14, "y":1},
-                {"label":"K1B", "x":15, "y":1},
-                {"label":"K1C", "x":16, "y":1},
-                {"label":"K1D", "x":17, "y":1, "w":1.5},
-
-                {"label":"K3E", "x":0, "y":2},
-                {"label":"K20", "x":1.5, "y":2, "w":1.75},
-                {"label":"K21", "x":3.25, "y":2},
-                {"label":"K22", "x":4.25, "y":2},
-                {"label":"K23", "x":5.25, "y":2},
-                {"label":"K24", "x":6.25, "y":2},
-                {"label":"K25", "x":7.25, "y":2},
-                {"label":"K26", "x":10.25, "y":2},
-                {"label":"K27", "x":11.25, "y":2},
-                {"label":"K28", "x":12.25, "y":2},
-                {"label":"K29", "x":13.25, "y":2},
-                {"label":"K2A", "x":14.25, "y":2},
-                {"label":"K2B", "x":15.25, "y":2},
-                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"K30", "x":1.5, "y":3, "w":2.25},
-                {"label":"K32", "x":3.75, "y":3},
-                {"label":"K33", "x":4.75, "y":3},
-                {"label":"K34", "x":5.75, "y":3},
-                {"label":"K35", "x":6.75, "y":3},
-                {"label":"K36", "x":7.75, "y":3},
-                {"label":"K37", "x":9.75, "y":3},
-                {"label":"K38", "x":10.75, "y":3},
-                {"label":"K39", "x":11.75, "y":3},
-                {"label":"K3A", "x":12.75, "y":3},
-                {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K3D", "x":14.75, "y":3},
-                {"label":"K3C", "x":15.75, "y":3, "w":1.75},
-                {"label":"K4D", "x":17.5, "y":3},
-
-                {"label":"K40", "x":1.5, "y":4, "w":1.5},
-                {"label":"K42", "x":4.5, "y":4, "w":1.25},
-                {"label":"K44", "x":5.75, "y":4, "w":2.25},
-                {"label":"K46", "x":8, "y":4, "w":1.25},
-                {"label":"K48", "x":9.75, "y":4, "w":2.75},
-                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E", "x":17, "y":4, "w":1.5}
-            ]
-        },
-        "LAYOUT_alice": {
-            "layout": [
-                {"label":"K1E", "x":0, "y":0},
-                {"label":"K00", "x":1.5, "y":0},
-                {"label":"K01", "x":2.5, "y":0},
-                {"label":"K02", "x":3.5, "y":0},
-                {"label":"K03", "x":4.5, "y":0},
-                {"label":"K04", "x":5.5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":10.5, "y":0},
-                {"label":"K08", "x":11.5, "y":0},
-                {"label":"K09", "x":12.5, "y":0},
-                {"label":"K0A", "x":13.5, "y":0},
-                {"label":"K0B", "x":14.5, "y":0},
-                {"label":"K0C", "x":15.5, "y":0},
-                {"label":"K0D", "x":16.5, "y":0, "w":2},
-
-                {"label":"K2E", "x":0, "y":1},
-                {"label":"K10", "x":1.5, "y":1, "w":1.5},
-                {"label":"K11", "x":3, "y":1},
-                {"label":"K12", "x":4, "y":1},
-                {"label":"K13", "x":5, "y":1},
-                {"label":"K14", "x":6, "y":1},
-                {"label":"K15", "x":7, "y":1},
-                {"label":"K16", "x":10, "y":1},
-                {"label":"K17", "x":11, "y":1},
-                {"label":"K18", "x":12, "y":1},
-                {"label":"K19", "x":13, "y":1},
-                {"label":"K1A", "x":14, "y":1},
-                {"label":"K1B", "x":15, "y":1},
-                {"label":"K1C", "x":16, "y":1},
-                {"label":"K1D", "x":17, "y":1, "w":1.5},
-
-                {"label":"K3E", "x":0, "y":2},
-                {"label":"K20", "x":1.5, "y":2, "w":1.75},
-                {"label":"K21", "x":3.25, "y":2},
-                {"label":"K22", "x":4.25, "y":2},
-                {"label":"K23", "x":5.25, "y":2},
-                {"label":"K24", "x":6.25, "y":2},
-                {"label":"K25", "x":7.25, "y":2},
-                {"label":"K26", "x":10.25, "y":2},
-                {"label":"K27", "x":11.25, "y":2},
-                {"label":"K28", "x":12.25, "y":2},
-                {"label":"K29", "x":13.25, "y":2},
-                {"label":"K2A", "x":14.25, "y":2},
-                {"label":"K2B", "x":15.25, "y":2},
-                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"K30", "x":1.5, "y":3, "w":2.25},
-                {"label":"K32", "x":3.75, "y":3},
-                {"label":"K33", "x":4.75, "y":3},
-                {"label":"K34", "x":5.75, "y":3},
-                {"label":"K35", "x":6.75, "y":3},
-                {"label":"K36", "x":7.75, "y":3},
-                {"label":"K37", "x":9.75, "y":3},
-                {"label":"K38", "x":10.75, "y":3},
-                {"label":"K39", "x":11.75, "y":3},
-                {"label":"K3A", "x":12.75, "y":3},
-                {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K3D", "x":14.75, "y":3},
-                {"label":"K3C", "x":15.75, "y":3, "w":1.75},
-                {"label":"K4D", "x":17.5, "y":3},
-
-                {"label":"K40", "x":1.5, "y":4, "w":1.5},
-                {"label":"K42", "x":4.5, "y":4, "w":1.25},
-                {"label":"K44", "x":5.75, "y":4, "w":2.25},
-                {"label":"K46", "x":8, "y":4, "w":1.25},
-                {"label":"K48", "x":9.75, "y":4, "w":2.75},
-                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E", "x":17, "y":4, "w":1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs_full_rshift": {
-            "layout": [
-                {"label":"K1E", "x":0, "y":0},
-                {"label":"K00", "x":1.5, "y":0},
-                {"label":"K01", "x":2.5, "y":0},
-                {"label":"K02", "x":3.5, "y":0},
-                {"label":"K03", "x":4.5, "y":0},
-                {"label":"K04", "x":5.5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":10.5, "y":0},
-                {"label":"K08", "x":11.5, "y":0},
-                {"label":"K09", "x":12.5, "y":0},
-                {"label":"K0A", "x":13.5, "y":0},
-                {"label":"K0B", "x":14.5, "y":0},
-                {"label":"K0C", "x":15.5, "y":0},
-                {"label":"K0D", "x":16.5, "y":0},
-                {"label":"K0E", "x":17.5, "y":0},
-
-                {"label":"K2E", "x":0, "y":1},
-                {"label":"K10", "x":1.5, "y":1, "w":1.5},
-                {"label":"K11", "x":3, "y":1},
-                {"label":"K12", "x":4, "y":1},
-                {"label":"K13", "x":5, "y":1},
-                {"label":"K14", "x":6, "y":1},
-                {"label":"K15", "x":7, "y":1},
-                {"label":"K16", "x":10, "y":1},
-                {"label":"K17", "x":11, "y":1},
-                {"label":"K18", "x":12, "y":1},
-                {"label":"K19", "x":13, "y":1},
-                {"label":"K1A", "x":14, "y":1},
-                {"label":"K1B", "x":15, "y":1},
-                {"label":"K1C", "x":16, "y":1},
-                {"label":"K1D", "x":17, "y":1, "w":1.5},
-
-                {"label":"K3E", "x":0, "y":2},
-                {"label":"K20", "x":1.5, "y":2, "w":1.75},
-                {"label":"K21", "x":3.25, "y":2},
-                {"label":"K22", "x":4.25, "y":2},
-                {"label":"K23", "x":5.25, "y":2},
-                {"label":"K24", "x":6.25, "y":2},
-                {"label":"K25", "x":7.25, "y":2},
-                {"label":"K26", "x":10.25, "y":2},
-                {"label":"K27", "x":11.25, "y":2},
-                {"label":"K28", "x":12.25, "y":2},
-                {"label":"K29", "x":13.25, "y":2},
-                {"label":"K2A", "x":14.25, "y":2},
-                {"label":"K2B", "x":15.25, "y":2},
-                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"K30", "x":1.5, "y":3, "w":2.25},
-                {"label":"K32", "x":3.75, "y":3},
-                {"label":"K33", "x":4.75, "y":3},
-                {"label":"K34", "x":5.75, "y":3},
-                {"label":"K35", "x":6.75, "y":3},
-                {"label":"K36", "x":7.75, "y":3},
-                {"label":"K37", "x":9.75, "y":3},
-                {"label":"K38", "x":10.75, "y":3},
-                {"label":"K39", "x":11.75, "y":3},
-                {"label":"K3A", "x":12.75, "y":3},
-                {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K3D", "x":14.75, "y":3},
-                {"label":"K3C", "x":15.75, "y":3, "w":2.75},
-
-                {"label":"K40", "x":1.5, "y":4, "w":1.5},
-                {"label":"K42", "x":4.5, "y":4, "w":1.25},
-                {"label":"K44", "x":5.75, "y":4, "w":2.25},
-                {"label":"K46", "x":8, "y":4, "w":1.25},
-                {"label":"K48", "x":9.75, "y":4, "w":2.75},
-                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E", "x":17, "y":4, "w":1.5}
-            ]
-        },
-        "LAYOUT_alice_full_rshift": {
-            "layout": [
-                {"label":"K1E", "x":0, "y":0},
-                {"label":"K00", "x":1.5, "y":0},
-                {"label":"K01", "x":2.5, "y":0},
-                {"label":"K02", "x":3.5, "y":0},
-                {"label":"K03", "x":4.5, "y":0},
-                {"label":"K04", "x":5.5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":10.5, "y":0},
-                {"label":"K08", "x":11.5, "y":0},
-                {"label":"K09", "x":12.5, "y":0},
-                {"label":"K0A", "x":13.5, "y":0},
-                {"label":"K0B", "x":14.5, "y":0},
-                {"label":"K0C", "x":15.5, "y":0},
-                {"label":"K0D", "x":16.5, "y":0, "w":2},
-
-                {"label":"K2E", "x":0, "y":1},
-                {"label":"K10", "x":1.5, "y":1, "w":1.5},
-                {"label":"K11", "x":3, "y":1},
-                {"label":"K12", "x":4, "y":1},
-                {"label":"K13", "x":5, "y":1},
-                {"label":"K14", "x":6, "y":1},
-                {"label":"K15", "x":7, "y":1},
-                {"label":"K16", "x":10, "y":1},
-                {"label":"K17", "x":11, "y":1},
-                {"label":"K18", "x":12, "y":1},
-                {"label":"K19", "x":13, "y":1},
-                {"label":"K1A", "x":14, "y":1},
-                {"label":"K1B", "x":15, "y":1},
-                {"label":"K1C", "x":16, "y":1},
-                {"label":"K1D", "x":17, "y":1, "w":1.5},
-
-                {"label":"K3E", "x":0, "y":2},
-                {"label":"K20", "x":1.5, "y":2, "w":1.75},
-                {"label":"K21", "x":3.25, "y":2},
-                {"label":"K22", "x":4.25, "y":2},
-                {"label":"K23", "x":5.25, "y":2},
-                {"label":"K24", "x":6.25, "y":2},
-                {"label":"K25", "x":7.25, "y":2},
-                {"label":"K26", "x":10.25, "y":2},
-                {"label":"K27", "x":11.25, "y":2},
-                {"label":"K28", "x":12.25, "y":2},
-                {"label":"K29", "x":13.25, "y":2},
-                {"label":"K2A", "x":14.25, "y":2},
-                {"label":"K2B", "x":15.25, "y":2},
-                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"K30", "x":1.5, "y":3, "w":2.25},
-                {"label":"K32", "x":3.75, "y":3},
-                {"label":"K33", "x":4.75, "y":3},
-                {"label":"K34", "x":5.75, "y":3},
-                {"label":"K35", "x":6.75, "y":3},
-                {"label":"K36", "x":7.75, "y":3},
-                {"label":"K37", "x":9.75, "y":3},
-                {"label":"K38", "x":10.75, "y":3},
-                {"label":"K39", "x":11.75, "y":3},
-                {"label":"K3A", "x":12.75, "y":3},
-                {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K3D", "x":14.75, "y":3},
-                {"label":"K3C", "x":15.75, "y":3, "w":2.75},
-
-                {"label":"K40", "x":1.5, "y":4, "w":1.5},
-                {"label":"K42", "x":4.5, "y":4, "w":1.25},
-                {"label":"K44", "x":5.75, "y":4, "w":2.25},
-                {"label":"K46", "x":8, "y":4, "w":1.25},
-                {"label":"K48", "x":9.75, "y":4, "w":2.75},
-                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E", "x":17, "y":4, "w":1.5}
-            ]
-        }
-    }
+    "community_layouts": ["alice", "alice_split_bs"]
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/config.h b/keyboards/mechlovin/adelais/rgb_led/config.h
deleted file mode 100644
index 2ec0afd47b..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
index f668bd88ed..909bc7f83a 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
-
-#define RGB_DI_PIN A7
 #define RGB_MATRIX_LED_COUNT 91
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
index f098bdbf95..816b9414c1 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
@@ -3,6 +3,14 @@
     "usb": {
         "pid": "0xAEC1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"],
+        "rows": ["B1", "A0", "C13", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
     "bootloader": "stm32-dfu",
@@ -10,5 +18,333 @@
         "caps_lock": "B2",
         "num_lock": "C15",
         "scroll_lock": "B9"
+    },
+    "ws2812": {
+        "pin": "A7"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
index 490599c43a..5f01f322df 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "adelais.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
index 9be57067bb..aad92997d0 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index d9d75a4b9e..1e549f9a89 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A7 }
-
-#define RGB_DI_PIN A15
 #define RGBLED_NUM      23
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index 7dcd0f1765..4ac693f894 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -3,11 +3,22 @@
     "usb": {
         "pid": "0xAEC2"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"],
+        "rows": ["B1", "A0", "C13", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A4", "pin_b": "A3"}
         ]
     },
+    "ws2812": {
+        "pin": "A15"
+    },
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
     "bootloader": "stm32-dfu",
@@ -15,5 +26,330 @@
         "caps_lock": "B2",
         "num_lock": "C15",
         "scroll_lock": "B9"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
index 20b4b69114..e51e92ed6f 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "adelais.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
index b52c4f9db3..e79b2862e6 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
@@ -1,4 +1,3 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index 7457fd50a7..c4f801b40d 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -17,11 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A4, A3, C13, A1, A2}
-#define MATRIX_COL_PINS { B10, B11, B2, B1, B0, A6, A5, A10, A9, A15, B3, B4, B5, B8, B9 }
-
 #ifdef  RGBLIGHT_ENABLE
-#define RGB_DI_PIN A7
 #define WS2812_SPI SPID1 // default: SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 5 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
 #define RGBLED_NUM      23
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index 3f83750e3a..d1775ccb83 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -3,6 +3,14 @@
     "usb": {
         "pid": "0xAEC3"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"],
+        "rows": ["A4", "A3", "C13", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B12", "pin_b": "B13"}
@@ -14,5 +22,318 @@
         "caps_lock": "C14",
         "num_lock": "A0",
         "scroll_lock": "C15"
+    },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "spi"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
index ad9c7c4db0..b7e03d0f1e 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev3.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h
deleted file mode 100644
index 28c373ad85..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2021 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K31, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K41, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K43, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3C, K3D, K3E,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D, KC_NO   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D, KC_NO   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   K43,   K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K31, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D,\
-    K41, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K43, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3C, K3D, K3E,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D, KC_NO   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D, KC_NO   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D, KC_NO   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   K43,   K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K31, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K41, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K43, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3C, K3D,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K31, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K41, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K43, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3C, K3D,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
-
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
index 7127485d00..5664ce6844 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
@@ -2,10 +2,8 @@
 #   change yes to no to disable
 #
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
-WS2812_DRIVER = spi
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
 
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h
index e1081a9560..1ba9c573b1 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h
@@ -17,16 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 3
 
-#define RGB_DI_PIN A7
 #define RGBLED_NUM 23
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json
index a5f20190d1..9c6bd46a70 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json
@@ -1,9 +1,17 @@
 {
     "keyboard_name": "Adelais",
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"],
+        "rows": ["B1", "A0", "C13", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B0",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "A7"
+    },
     "indicators": {
         "caps_lock": "B2",
         "num_lock": "C15",
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
index a6efa3810a..9a2a280c10 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
@@ -4,5 +4,330 @@
     },
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rev2.h b/keyboards/mechlovin/adelais/standard_led/arm/rev2/rev2.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rev2.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
index 60d20c4a29..a5ebef5b87 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
@@ -11,5 +11,330 @@
     },
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rev3.h b/keyboards/mechlovin/adelais/standard_led/arm/rev3/rev3.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rev3.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
index 925b7cd213..b6ee0c5b67 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
@@ -8,5 +8,330 @@
             {"pin_a": "A4", "pin_b": "A3"},
             {"pin_a": "B7", "pin_b": "B6"}
         ]
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3D, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, KC_NO, K4E   }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
index 831642126b..da42bf05d2 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 23
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
index e385d5ef1a..31de7de957 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
@@ -14,11 +14,339 @@
         "pin": "B5",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "indicators": {
         "caps_lock": "E6",
         "num_lock": "D7",
         "scroll_lock": "F7"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"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": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"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": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "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": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h
deleted file mode 100644
index 71bb49409d..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K4C, K3C, K3D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4D \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, K4C,   K4D, KC_NO   }, \
-}
-
-#define LAYOUT_alice( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D,\
-    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
-    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
-         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K4C, K3C, K3D,\
-         K40,      K42,      K44,      K46,             K48,     K4A,               K4D \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D, KC_NO   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, K4C,   K4D, KC_NO   }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K4C, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4D  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, K4C,   K4D,   KC_NO }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
-    K1E, K00, K01, K02, K03, K04, K05, K06,         K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K2E, K10, K11, K12, K13, K14, K15,              K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K3E, K20, K21, K22, K23, K24, K25,              K26, K27, K28, K29, K2A, K2B, K2D,      \
-         K30,      K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K4C, K3C,      \
-         K40,      K42,      K44,      K46,              K48,      K4A,                K4D  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E   }, \
-    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, K4C,   K4D,   KC_NO }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h
deleted file mode 100644
index 768ea4744f..0000000000
--- a/keyboards/mechlovin/delphine/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, D3 }
-#define MATRIX_COL_PINS { F7, D7, D6, D2 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/delphine/delphine.c b/keyboards/mechlovin/delphine/delphine.c
deleted file mode 100644
index 8e33b6603c..0000000000
--- a/keyboards/mechlovin/delphine/delphine.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "delphine.h"
diff --git a/keyboards/mechlovin/delphine/delphine.h b/keyboards/mechlovin/delphine/delphine.h
deleted file mode 100644
index da0254eeb4..0000000000
--- a/keyboards/mechlovin/delphine/delphine.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───�
- * │00 │01 │02 │03 │
- * └───┴───┴───┴───┘
- * ┌───┬───┬───┬───�
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤   ┌───�
- * │20 │21 │22 │23 │   │   │
- * ├───┼───┼───┼───┤   │23 │ 2u Plus
- * │30 │31 │32 │33 │   │   │
- * ├───┼───┼───┼───┤   ├───┤
- * │40 │41 │42 │43 │   │   │
- * ├───┼───┼───┼───┤   │43 │ 2u Enter
- * │50 │51 │52 │53 │   │   │
- * └───┴───┴───┴───┘   └───┘
- * ┌───────�
- * │51     │ 2u 0/Ins
- * └───────┘
- */
-
-#define LAYOUT_ortho_6x4( \
-    K00, K01, K02, K03,   \
-    K10, K11, K12, K13,   \
-    K20, K21, K22, K23,   \
-    K30, K31, K32, K33,   \
-    K40, K41, K42, K43,   \
-    K50, K51, K52, K53    \
-) { \
-    { K00,   K01,   K02,   K03   }, \
-    { K10,   K11,   K12,   K13   }, \
-    { K20,   K21,   K22,   K23   }, \
-    { K30,   K31,   K32,   K33   }, \
-    { K40,   K41,   K42,   K43   }, \
-    { K50,   K51,   K52,   K53   }, \
-}
-
-#define LAYOUT_numpad_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22,      \
-    K30, K31, K32, K23, \
-    K40, K41, K42,      \
-    K51,      K52, K43  \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, XXX }, \
-    { K40, K41, K42, K43 }, \
-    { XXX, K51, K52, XXX }, \
-}
diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json
index 4495943544..baeeab6f18 100644
--- a/keyboards/mechlovin/delphine/info.json
+++ b/keyboards/mechlovin/delphine/info.json
@@ -6,6 +6,11 @@
     "usb": {
         "vid": "0x4D4C"
     },
+    "matrix_pins": {
+        "cols": ["F7", "D7", "D6", "D2"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "num_lock": "B5"
     },
@@ -15,60 +20,65 @@
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"label":"K00 (F0,F7)", "x":0, "y":0},
-                {"label":"K01 (F0,D7)", "x":1, "y":0},
-                {"label":"K02 (F0,D6)", "x":2, "y":0},
-                {"label":"K03 (F0,D2)", "x":3, "y":0},
-                {"label":"K10 (F1,F7)", "x":0, "y":1.25},
-                {"label":"K11 (F1,D7)", "x":1, "y":1.25},
-                {"label":"K12 (F1,D6)", "x":2, "y":1.25},
-                {"label":"K13 (F1,D2)", "x":3, "y":1.25},
-                {"label":"K20 (F4,F7)", "x":0, "y":2.25},
-                {"label":"K21 (F4,D7)", "x":1, "y":2.25},
-                {"label":"K22 (F4,D6)", "x":2, "y":2.25},
-                {"label":"K23 (F4,D2)", "x":3, "y":2.25},
-                {"label":"K30 (F5,F7)", "x":0, "y":3.25},
-                {"label":"K31 (F5,D7)", "x":1, "y":3.25},
-                {"label":"K32 (F5,D6)", "x":2, "y":3.25},
-                {"label":"K33 (F5,D2)", "x":3, "y":3.25},
-                {"label":"K40 (F6,F7)", "x":0, "y":4.25},
-                {"label":"K41 (F6,D7)", "x":1, "y":4.25},
-                {"label":"K42 (F6,D6)", "x":2, "y":4.25},
-                {"label":"K43 (F6,D2)", "x":3, "y":4.25},
-                {"label":"K50 (D3,F7)", "x":0, "y":5.25},
-                {"label":"K51 (D3,D7)", "x":1, "y":5.25},
-                {"label":"K52 (D3,D6)", "x":2, "y":5.25},
-                {"label":"K53 (D3,D2)", "x":3, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"label":"K00 (F0,F7)", "x":0, "y":0},
-                {"label":"K01 (F0,D7)", "x":1, "y":0},
-                {"label":"K02 (F0,D6)", "x":2, "y":0},
-                {"label":"K03 (F0,D2)", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"K10 (F1,F7)", "x":0, "y":1.25},
-                {"label":"K11 (F1,D7)", "x":1, "y":1.25},
-                {"label":"K12 (F1,D6)", "x":2, "y":1.25},
-                {"label":"K13 (F1,D2)", "x":3, "y":1.25},
+                {"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},
 
-                {"label":"K20 (F4,F7)", "x":0, "y":2.25},
-                {"label":"K21 (F4,D7)", "x":1, "y":2.25},
-                {"label":"K22 (F4,D6)", "x":2, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
 
-                {"label":"K30 (F5,F7)", "x":0, "y":3.25},
-                {"label":"K31 (F5,D7)", "x":1, "y":3.25},
-                {"label":"K32 (F5,D6)", "x":2, "y":3.25},
-                {"label":"K23 (F4,D2)", "x":3, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
 
-                {"label":"K40 (F6,F7)", "x":0, "y":4.25},
-                {"label":"K41 (F6,D7)", "x":1, "y":4.25},
-                {"label":"K42 (F6,D6)", "x":2, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
 
-                {"label":"K51 (D3,D7)", "x":0, "y":5.25, "w":2},
-                {"label":"K52 (D3,D6)", "x":2, "y":5.25},
-                {"label":"K43 (F6,D2)", "x":3, "y":4.25, "h":2}
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/mechlovin/delphine/mono_led/config.h b/keyboards/mechlovin/delphine/mono_led/config.h
index b1ef0e072a..5b9d874128 100644
--- a/keyboards/mechlovin/delphine/mono_led/config.h
+++ b/keyboards/mechlovin/delphine/mono_led/config.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 13
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/info.json
index ce88a638a9..7f775f8c36 100644
--- a/keyboards/mechlovin/delphine/mono_led/info.json
+++ b/keyboards/mechlovin/delphine/mono_led/info.json
@@ -3,6 +3,9 @@
         "pid": "0xDEF1",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "backlight": {
         "pin": "B6"
     }
diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h
index 0f91dd6efa..c813d4fa12 100644
--- a/keyboards/mechlovin/delphine/rgb_led/config.h
+++ b/keyboards/mechlovin/delphine/rgb_led/config.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 13
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json
index 0a8f1ab220..3b9fb036e9 100644
--- a/keyboards/mechlovin/delphine/rgb_led/info.json
+++ b/keyboards/mechlovin/delphine/rgb_led/info.json
@@ -2,5 +2,11 @@
     "usb": {
         "pid": "0xDEF2",
         "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
     }
 }
diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
index 3e02735cdf..02a011ba4b 100644
--- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
+++ b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rgb_led.h"
+#include "quantum.h"
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.h b/keyboards/mechlovin/delphine/rgb_led/rgb_led.h
deleted file mode 100644
index 60d5817344..0000000000
--- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/delphine/rgb_led/rules.mk b/keyboards/mechlovin/delphine/rgb_led/rules.mk
index 204fb1241b..5c624bc68f 100644
--- a/keyboards/mechlovin/delphine/rgb_led/rules.mk
+++ b/keyboards/mechlovin/delphine/rgb_led/rules.mk
@@ -1,3 +1,2 @@
 RGBLIGHT_ENABLE = no               # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes            # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h
index 951eab595b..d366188f76 100644
--- a/keyboards/mechlovin/foundation/config.h
+++ b/keyboards/mechlovin/foundation/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B12, B13, B14, A8, A2 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A15, B9, B8, B7, B6, B5, B4, B3}
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 22
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -53,6 +33,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 #define TAP_CODE_DELAY 10
\ No newline at end of file
diff --git a/keyboards/mechlovin/foundation/foundation.c b/keyboards/mechlovin/foundation/foundation.c
deleted file mode 100644
index 12d3e848d7..0000000000
--- a/keyboards/mechlovin/foundation/foundation.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "foundation.h"
diff --git a/keyboards/mechlovin/foundation/foundation.h b/keyboards/mechlovin/foundation/foundation.h
index 0444817bbf..717e9f3b16 100644
--- a/keyboards/mechlovin/foundation/foundation.h
+++ b/keyboards/mechlovin/foundation/foundation.h
@@ -27,7 +27,7 @@
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,     K0G,   K0H }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,     K1G,   K1H }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   KC_NO, KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO,   K3G, KC_NO }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   KC_NO,   K3G, KC_NO }, \
     { K40,   K41,   K42,   K43, KC_NO, KC_NO, KC_NO,   K47, KC_NO, KC_NO, KC_NO,   K4B,   K4C,   K4D,   K4E,   K4F,     K4G,   K4H }, \
 }
 
diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json
index bb7491ff19..c1c871a199 100644
--- a/keyboards/mechlovin/foundation/info.json
+++ b/keyboards/mechlovin/foundation/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0180",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A15", "B9", "B8", "B7", "B6", "B5", "B4", "B3"],
+        "rows": ["B12", "B13", "B14", "A8", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C13", "pin_b": "C14"}
@@ -17,6 +22,9 @@
         "caps_lock": "A1",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layout_aliases": {
diff --git a/keyboards/mechlovin/hannah60rgb/config.h b/keyboards/mechlovin/hannah60rgb/config.h
deleted file mode 100644
index b10cdfb013..0000000000
--- a/keyboards/mechlovin/hannah60rgb/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14 }
-
-#define DIODE_DIRECTION COL2ROW
\ No newline at end of file
diff --git a/keyboards/mechlovin/hannah60rgb/hannah60rgb.h b/keyboards/mechlovin/hannah60rgb/hannah60rgb.h
deleted file mode 100644
index 9944b12284..0000000000
--- a/keyboards/mechlovin/hannah60rgb/hannah60rgb.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mechlovin_hannah60rgb_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_mechlovin_hannah60rgb_rev2)
-    #include "rev2.h"
-#endif
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/config.h b/keyboards/mechlovin/hannah60rgb/rev1/config.h
index 9033ee59b2..08006aa996 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev1/config.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#define RGB_DI_PIN A15
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_COUNT 72
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json
index 2ed43a3fc2..af4db50699 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json
@@ -8,6 +8,17 @@
         "pid": "0x6001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A15"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
+        "rows": ["A4", "A5", "A3", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
index b61ac10b14..d8bad04c4f 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
+++ b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hannah60rgb.h"
+#include "rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk b/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
index 9be57067bb..aad92997d0 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
+++ b/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h
index aff3a43340..81335f31be 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-#    define RGB_DI_PIN A15
 #    define RGBLED_NUM      18
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json
index 798e67ee78..c03bb99161 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json
@@ -8,6 +8,17 @@
         "pid": "0x6002",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A15"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
+        "rows": ["A4", "A5", "A3", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk b/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
index fcd42ec58e..e1f93c7525 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
+++ b/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
@@ -1,3 +1,2 @@
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h
index e96bc8bc85..1686c861fb 100644
--- a/keyboards/mechlovin/hannah65/config.h
+++ b/keyboards/mechlovin/hannah65/config.h
@@ -17,21 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD4
 #define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/mechlovin/hannah65/hannah65.c b/keyboards/mechlovin/hannah65/hannah65.c
deleted file mode 100644
index 92e0917ebe..0000000000
--- a/keyboards/mechlovin/hannah65/hannah65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hannah65.h"
diff --git a/keyboards/mechlovin/hannah65/hannah65.h b/keyboards/mechlovin/hannah65/hannah65.h
deleted file mode 100644
index 99da5a2a1a..0000000000
--- a/keyboards/mechlovin/hannah65/hannah65.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mechlovin_hannah65_rev1)
-#    include "rev1.h"
-#endif
\ No newline at end of file
diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json
index 74ae965fb7..88a3f39719 100644
--- a/keyboards/mechlovin/hannah65/info.json
+++ b/keyboards/mechlovin/hannah65/info.json
@@ -3,6 +3,11 @@
         "pin": "B8",
         "breathing": true
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
+        "rows": ["A4", "A5", "A3", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B9",
         "on_state": 0
diff --git a/keyboards/mechlovin/hannah65/rev1/haus/info.json b/keyboards/mechlovin/hannah65/rev1/haus/info.json
index 55ddde0a58..ac97de5f18 100644
--- a/keyboards/mechlovin/hannah65/rev1/haus/info.json
+++ b/keyboards/mechlovin/hannah65/rev1/haus/info.json
@@ -11,218 +11,230 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0},
-                {"label":"K1D (B1,D2)", "x":14, "y":0},
-                {"label":"K0E (B0,D3)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (B3,B6)", "x":1.25, "y":3},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
-                {"label":"K0E (B0,D3)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
-                {"label":"K0E (B0,D3)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K2D (B2,D2)", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2C (B2,D1)", "x":12.75, "y":2},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (B3,B6)", "x":1.25, "y":3},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mechlovin/hannah65/rev1/rev1.h b/keyboards/mechlovin/hannah65/rev1/rev1.h
deleted file mode 100644
index 0b6b863d56..0000000000
--- a/keyboards/mechlovin/hannah65/rev1/rev1.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      K1E,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2D, K2E,   \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E,   \
-    K40, K41, K42,                K46,                K4A, K4B,      K4C, K4D, K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,      K2E,   \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,   \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D, K1E,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E,   \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,   \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h
index be1d769e67..362a7fc459 100644
--- a/keyboards/mechlovin/hannah910/config.h
+++ b/keyboards/mechlovin/hannah910/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B6, D3, C6, C7 }
-#define MATRIX_COL_PINS { E6, B1, B3, F0, F1, F4, F5, F6, F7, D5, D4, B4, D6, D7, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/hannah910/hannah910.c b/keyboards/mechlovin/hannah910/hannah910.c
index fa5b04ea76..0208e16348 100644
--- a/keyboards/mechlovin/hannah910/hannah910.c
+++ b/keyboards/mechlovin/hannah910/hannah910.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "hannah910.h"
+#include "quantum.h"
 
 void led_init_ports(void) {
   setPinOutput(B2);
diff --git a/keyboards/mechlovin/hannah910/hannah910.h b/keyboards/mechlovin/hannah910/hannah910.h
deleted file mode 100644
index 2cc38d0690..0000000000
--- a/keyboards/mechlovin/hannah910/hannah910.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mechlovin_hannah910_rev1
-    #include "rev1.h"
-#elif KEYBOARD_mechlovin_hannah910_rev2
-    #include "rev2.h"
-#elif KEYBOARD_mechlovin_hannah910_rev3
-    #include "rev3.h"
-#endif
diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json
index ae5f966622..9a554f3b52 100644
--- a/keyboards/mechlovin/hannah910/rev1/info.json
+++ b/keyboards/mechlovin/hannah910/rev1/info.json
@@ -8,10 +8,18 @@
         "pid": "0x9101",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
+        "rows": ["B5", "B6", "D3", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json
index cfb43e786c..43f6ab51a1 100644
--- a/keyboards/mechlovin/hannah910/rev2/info.json
+++ b/keyboards/mechlovin/hannah910/rev2/info.json
@@ -8,232 +8,256 @@
         "pid": "0x9102",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
+        "rows": ["B5", "B6", "D3", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_65_ansi_blocker",
+        "LAYOUT_iso": "LAYOUT_65_iso_blocker_split_bs"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0},
-                {"label":"K0E (B0,D3)", "x":14, "y":0},
-                {"label":"K49 (B4,C6)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2C (B2,D1)", "x":12.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":13.75, "y":2, "w":1.25},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (B3,B6)", "x":1.25, "y":3},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K44 (B4,C1)", "x":3.75, "y":4, "w":2.75},
-                {"label":"K46 (B4,C3)", "x":6.5, "y":4, "w":1.25},
-                {"label":"K48 (B4,C5)", "x":7.75, "y":4, "w":2.25},
-                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 9], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0},
-                {"label":"K05", "x":5, "y":0},
-                {"label":"K06", "x":6, "y":0},
-                {"label":"K07", "x":7, "y":0},
-                {"label":"K08", "x":8, "y":0},
-                {"label":"K09", "x":9, "y":0},
-                {"label":"K0A", "x":10, "y":0},
-                {"label":"K0B", "x":11, "y":0},
-                {"label":"K0C", "x":12, "y":0},
-                {"label":"K0D", "x":13, "y":0},
-                {"label":"K0E", "x":14, "y":0},
-                {"label":"K49", "x":15, "y":0},
-                {"label":"K10", "x":0, "y":1, "w":1.5},
-                {"label":"K11", "x":1.5, "y":1},
-                {"label":"K12", "x":2.5, "y":1},
-                {"label":"K13", "x":3.5, "y":1},
-                {"label":"K14", "x":4.5, "y":1},
-                {"label":"K15", "x":5.5, "y":1},
-                {"label":"K16", "x":6.5, "y":1},
-                {"label":"K17", "x":7.5, "y":1},
-                {"label":"K18", "x":8.5, "y":1},
-                {"label":"K19", "x":9.5, "y":1},
-                {"label":"K1A", "x":10.5, "y":1},
-                {"label":"K1B", "x":11.5, "y":1},
-                {"label":"K1C", "x":12.5, "y":1},
-                {"label":"K1E", "x":15, "y":1},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K21", "x":1.75, "y":2},
-                {"label":"K22", "x":2.75, "y":2},
-                {"label":"K23", "x":3.75, "y":2},
-                {"label":"K24", "x":4.75, "y":2},
-                {"label":"K25", "x":5.75, "y":2},
-                {"label":"K26", "x":6.75, "y":2},
-                {"label":"K27", "x":7.75, "y":2},
-                {"label":"K28", "x":8.75, "y":2},
-                {"label":"K29", "x":9.75, "y":2},
-                {"label":"K2A", "x":10.75, "y":2},
-                {"label":"K2B", "x":11.75, "y":2},
-                {"label":"K2C", "x":12.75, "y":2},
-                {"label":"K2D", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K2E", "x":15, "y":2},
-                {"label":"K30", "x":0, "y":3, "w":1.25},
-                {"label":"K31", "x":1.25, "y":3},
-                {"label":"K32", "x":2.25, "y":3},
-                {"label":"K33", "x":3.25, "y":3},
-                {"label":"K34", "x":4.25, "y":3},
-                {"label":"K35", "x":5.25, "y":3},
-                {"label":"K36", "x":6.25, "y":3},
-                {"label":"K37", "x":7.25, "y":3},
-                {"label":"K38", "x":8.25, "y":3},
-                {"label":"K39", "x":9.25, "y":3},
-                {"label":"K3A", "x":10.25, "y":3},
-                {"label":"K3B", "x":11.25, "y":3},
-                {"label":"K3C", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D", "x":14, "y":3},
-                {"label":"K3E", "x":15, "y":3},
-                {"label":"K40", "x":0, "y":4, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A", "x":10, "y":4, "w":1.25},
-                {"label":"K4B", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C", "x":13, "y":4},
-                {"label":"K4D", "x":14, "y":4},
-                {"label":"K4E", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 9], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0},
-                {"label":"K05", "x":5, "y":0},
-                {"label":"K06", "x":6, "y":0},
-                {"label":"K07", "x":7, "y":0},
-                {"label":"K08", "x":8, "y":0},
-                {"label":"K09", "x":9, "y":0},
-                {"label":"K0A", "x":10, "y":0},
-                {"label":"K0B", "x":11, "y":0},
-                {"label":"K0C", "x":12, "y":0},
-                {"label":"K0D", "x":13, "y":0, "w":2},
-                {"label":"K49", "x":15, "y":0},
-                {"label":"K10", "x":0, "y":1, "w":1.5},
-                {"label":"K11", "x":1.5, "y":1},
-                {"label":"K12", "x":2.5, "y":1},
-                {"label":"K13", "x":3.5, "y":1},
-                {"label":"K14", "x":4.5, "y":1},
-                {"label":"K15", "x":5.5, "y":1},
-                {"label":"K16", "x":6.5, "y":1},
-                {"label":"K17", "x":7.5, "y":1},
-                {"label":"K18", "x":8.5, "y":1},
-                {"label":"K19", "x":9.5, "y":1},
-                {"label":"K1A", "x":10.5, "y":1},
-                {"label":"K1B", "x":11.5, "y":1},
-                {"label":"K1C", "x":12.5, "y":1},
-                {"label":"K1D", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E", "x":15, "y":1},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K21", "x":1.75, "y":2},
-                {"label":"K22", "x":2.75, "y":2},
-                {"label":"K23", "x":3.75, "y":2},
-                {"label":"K24", "x":4.75, "y":2},
-                {"label":"K25", "x":5.75, "y":2},
-                {"label":"K26", "x":6.75, "y":2},
-                {"label":"K27", "x":7.75, "y":2},
-                {"label":"K28", "x":8.75, "y":2},
-                {"label":"K29", "x":9.75, "y":2},
-                {"label":"K2A", "x":10.75, "y":2},
-                {"label":"K2B", "x":11.75, "y":2},
-                {"label":"K2D", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E", "x":15, "y":2},
-                {"label":"K30", "x":0, "y":3, "w":2.25},
-                {"label":"K32", "x":2.25, "y":3},
-                {"label":"K33", "x":3.25, "y":3},
-                {"label":"K34", "x":4.25, "y":3},
-                {"label":"K35", "x":5.25, "y":3},
-                {"label":"K36", "x":6.25, "y":3},
-                {"label":"K37", "x":7.25, "y":3},
-                {"label":"K38", "x":8.25, "y":3},
-                {"label":"K39", "x":9.25, "y":3},
-                {"label":"K3A", "x":10.25, "y":3},
-                {"label":"K3B", "x":11.25, "y":3},
-                {"label":"K3C", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D", "x":14, "y":3},
-                {"label":"K3E", "x":15, "y":3},
-                {"label":"K40", "x":0, "y":4, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A", "x":10, "y":4, "w":1.25},
-                {"label":"K4B", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C", "x":13, "y":4},
-                {"label":"K4D", "x":14, "y":4},
-                {"label":"K4E", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [4, 9], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mechlovin/hannah910/rev2/rev2.h b/keyboards/mechlovin/hannah910/rev2/rev2.h
deleted file mode 100644
index 6d87fea7e8..0000000000
--- a/keyboards/mechlovin/hannah910/rev2/rev2.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K49, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03,   K04, K05,   K06, K07,   K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13,   K14, K15,   K16, K17,   K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23,   K24, K25,   K26, K27,   K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33,   K34, K35,   K36, K37,   K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K49, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08,   K09, K0A, K0B, K0C, K0D,   K0E }, \
-    { K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18,   K19, K1A, K1B, K1C, KC_NO, K1E }, \
-    { K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28,   K29, K2A, K2B, K2C, K2D,   K2E }, \
-    { K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38,   K39, K3A, K3B, K3C, K3D,   K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D,   K4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09, K0A, K0B, K0C,   K0D, KC_NO }, \
-    { K10, K11,   K12, K13,   K14,   K15,   K16, K17,   K18,   K19, K1A, K1B, K1C,   K1D, K1E   }, \
-    { K20, K21,   K22, K23,   K24,   K25,   K26, K27,   K28,   K29, K2A, K2B, KC_NO, K2D, K2E   }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39, K3A, K3B, K3C,   K3D, K3E   }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C,   K4D, K4E   }  \
-}
-
-#define LAYOUT_iso LAYOUT_65_iso_blocker_split_bs
-#define LAYOUT_ansi LAYOUT_65_ansi_blocker
diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json
index 14219cb9b6..d6b606913d 100644
--- a/keyboards/mechlovin/hannah910/rev3/info.json
+++ b/keyboards/mechlovin/hannah910/rev3/info.json
@@ -8,163 +8,179 @@
         "pid": "0x9103",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
+        "rows": ["B5", "B6", "D3", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0},
-                {"label":"K0E (B0,D3)", "x":14, "y":0},
-                {"label":"K48 (B4,C5)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2C (B2,D1)", "x":12.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":13.75, "y":2, "w":1.25},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (B3,B6)", "x":1.25, "y":3},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K43 (B4,C0)", "x":3.75, "y":4, "w":2.75},
-                {"label":"K46 (B4,C3)", "x":6.5, "y":4, "w":1.25},
-                {"label":"K47 (B4,C4)", "x":7.75, "y":4, "w":2.25},
-                {"label":"K49 (B4,C6)", "x":10, "y":4},
-                {"label":"K4A (B4,C7)", "x":11, "y":4},
-                {"label":"K4B (B4,D0)", "x":12, "y":4},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 8], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
-                {"label":"K48 (B4,C5)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (B4,C6)", "x":10, "y":4},
-                {"label":"K4A (B4,C7)", "x":11, "y":4},
-                {"label":"K4B (B4,D0)", "x":12, "y":4},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [4, 8], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
-        }        
+        }
     }
     ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }
diff --git a/keyboards/mechlovin/hannah910/rev3/rev3.h b/keyboards/mechlovin/hannah910/rev3/rev3.h
deleted file mode 100644
index 2a987538d7..0000000000
--- a/keyboards/mechlovin/hannah910/rev3/rev3.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-
-#include "quantum.h"
-
-
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K48,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,   \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,   \
-    K40, K41, K42, K43,           K46,  K47,     K49, K4A, K4B, K4C, K4D, K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   K43,   KC_NO, KC_NO, K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K48,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E,   \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,   \
-    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D, KC_NO   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B, KC_NO,   K2D,   K2E   }, \
-    { K30, KC_NO,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42, KC_NO,   KC_NO, KC_NO, K46, KC_NO,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
diff --git a/keyboards/mechlovin/hex4b/config.h b/keyboards/mechlovin/hex4b/config.h
deleted file mode 100644
index 028be1fb52..0000000000
--- a/keyboards/mechlovin/hex4b/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/hex4b/hex4b.c b/keyboards/mechlovin/hex4b/hex4b.c
deleted file mode 100644
index fb8c4aef16..0000000000
--- a/keyboards/mechlovin/hex4b/hex4b.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hex4b.h"
diff --git a/keyboards/mechlovin/hex4b/hex4b.h b/keyboards/mechlovin/hex4b/hex4b.h
deleted file mode 100644
index 17e2da910f..0000000000
--- a/keyboards/mechlovin/hex4b/hex4b.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───�
- * │00 │ │01 │02 │03 │04 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │
- * ├───┼─┴─┬─┴─┬─┴─┬─┴─┬─┴─┼───┼───┼───┼───┼─┴─┬─┴─┬─┴─┬─┴─┬─┴─┼───┤   ┌───────�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3C │1E │   │1D     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤   └───────┘
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │2E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │3E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │4E │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───────┼───┤
- * │50  │51  │52  │56                      │5A  │5B  │ │5C │5D │5E │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────�
- * │50   │51 │52   │56                         │5B   │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_split_bs( \
-    K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,      K3E,      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E       \
-) { \
-    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E }, \
-}
-
-#define LAYOUT_2u_bs( \
-    K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,      K3E, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E  \
-) { \
-    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E }, \
-}
-
-#define LAYOUT_tsangan_split_bs( \
-    K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,      K3E,      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E       \
-) { \
-    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E }, \
-}
-
-#define LAYOUT_tsangan_2u_bs( \
-    K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,      K3E, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E  \
-) { \
-    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E }, \
-}
diff --git a/keyboards/mechlovin/hex4b/info.json b/keyboards/mechlovin/hex4b/info.json
index 3cc4645584..9964736255 100644
--- a/keyboards/mechlovin/hex4b/info.json
+++ b/keyboards/mechlovin/hex4b/info.json
@@ -16,362 +16,382 @@
     "layouts": {
         "LAYOUT_split_bs": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,B7)", "x":1.5, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.5, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.5, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6, "y":0},
-                {"label":"K07 (B0,C5)", "x":7, "y":0},
-                {"label":"K08 (B0,C6)", "x":8, "y":0},
-                {"label":"K09 (B0,C7)", "x":9, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.5, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.5, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.5, "y":0},
-                {"label":"K0D (B0,D3)", "x":13.5, "y":0},
-                {"label":"K0E (B0,D4)", "x":15, "y":0},
-
-                {"label":"K10 (B1,B6)", "x":0, "y":1},
-                {"label":"K11 (B1,B7)", "x":1, "y":1},
-                {"label":"K12 (B1,C0)", "x":2, "y":1},
-                {"label":"K13 (B1,C1)", "x":3, "y":1},
-                {"label":"K14 (B1,C2)", "x":4, "y":1},
-                {"label":"K15 (B1,C3)", "x":5, "y":1},
-                {"label":"K16 (B1,C4)", "x":6, "y":1},
-                {"label":"K17 (B1,C5)", "x":7, "y":1},
-                {"label":"K18 (B1,C6)", "x":8, "y":1},
-                {"label":"K19 (B1,C7)", "x":9, "y":1},
-                {"label":"K1A (B1,D0)", "x":10, "y":1},
-                {"label":"K1B (B1,D1)", "x":11, "y":1},
-                {"label":"K1C (B1,D2)", "x":12, "y":1},
-                {"label":"K1D (B1,D3)", "x":13, "y":1},
-                {"label":"K3C (B3,D2)", "x":14, "y":1},
-                {"label":"K1E (B1,D4)", "x":15, "y":1},
-
-                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
-                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15, "y":2},
-
-                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
-                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
-                {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
-                {"label":"K3E (B3,D4)", "x":15, "y":3},
-
-                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4},
-                {"label":"K4E (B4,D4)", "x":15, "y":4},
-
-                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.25},
-                {"label":"K51 (B5,B7)", "x":1.25, "y":5, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":13, "y":5},
-                {"label":"K5D (B5,D3)", "x":14, "y":5},
-                {"label":"K5E (B5,D4)", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [3, 12], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_2u_bs": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,B7)", "x":1.5, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.5, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.5, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6, "y":0},
-                {"label":"K07 (B0,C5)", "x":7, "y":0},
-                {"label":"K08 (B0,C6)", "x":8, "y":0},
-                {"label":"K09 (B0,C7)", "x":9, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.5, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.5, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.5, "y":0},
-                {"label":"K0D (B0,D3)", "x":13.5, "y":0},
-                {"label":"K0E (B0,D4)", "x":15, "y":0},
-
-                {"label":"K10 (B1,B6)", "x":0, "y":1},
-                {"label":"K11 (B1,B7)", "x":1, "y":1},
-                {"label":"K12 (B1,C0)", "x":2, "y":1},
-                {"label":"K13 (B1,C1)", "x":3, "y":1},
-                {"label":"K14 (B1,C2)", "x":4, "y":1},
-                {"label":"K15 (B1,C3)", "x":5, "y":1},
-                {"label":"K16 (B1,C4)", "x":6, "y":1},
-                {"label":"K17 (B1,C5)", "x":7, "y":1},
-                {"label":"K18 (B1,C6)", "x":8, "y":1},
-                {"label":"K19 (B1,C7)", "x":9, "y":1},
-                {"label":"K1A (B1,D0)", "x":10, "y":1},
-                {"label":"K1B (B1,D1)", "x":11, "y":1},
-                {"label":"K1C (B1,D2)", "x":12, "y":1},
-                {"label":"K1D (B1,D3)", "x":13, "y":1, "w":2},
-                {"label":"K1E (B1,D4)", "x":15, "y":1},
-
-                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
-                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15, "y":2},
-
-                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
-                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
-                {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
-                {"label":"K3E (B3,D4)", "x":15, "y":3},
-
-                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4},
-                {"label":"K4E (B4,D4)", "x":15, "y":4},
-
-                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.25},
-                {"label":"K51 (B5,B7)", "x":1.25, "y":5, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":13, "y":5},
-                {"label":"K5D (B5,D3)", "x":14, "y":5},
-                {"label":"K5E (B5,D4)", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_tsangan_split_bs": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,B7)", "x":1.5, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.5, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.5, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6, "y":0},
-                {"label":"K07 (B0,C5)", "x":7, "y":0},
-                {"label":"K08 (B0,C6)", "x":8, "y":0},
-                {"label":"K09 (B0,C7)", "x":9, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.5, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.5, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.5, "y":0},
-                {"label":"K0D (B0,D3)", "x":13.5, "y":0},
-                {"label":"K0E (B0,D4)", "x":15, "y":0},
-
-                {"label":"K10 (B1,B6)", "x":0, "y":1},
-                {"label":"K11 (B1,B7)", "x":1, "y":1},
-                {"label":"K12 (B1,C0)", "x":2, "y":1},
-                {"label":"K13 (B1,C1)", "x":3, "y":1},
-                {"label":"K14 (B1,C2)", "x":4, "y":1},
-                {"label":"K15 (B1,C3)", "x":5, "y":1},
-                {"label":"K16 (B1,C4)", "x":6, "y":1},
-                {"label":"K17 (B1,C5)", "x":7, "y":1},
-                {"label":"K18 (B1,C6)", "x":8, "y":1},
-                {"label":"K19 (B1,C7)", "x":9, "y":1},
-                {"label":"K1A (B1,D0)", "x":10, "y":1},
-                {"label":"K1B (B1,D1)", "x":11, "y":1},
-                {"label":"K1C (B1,D2)", "x":12, "y":1},
-                {"label":"K1D (B1,D3)", "x":13, "y":1},
-                {"label":"K3C (B3,D2)", "x":14, "y":1},
-                {"label":"K1E (B1,D4)", "x":15, "y":1},
-
-                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
-                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15, "y":2},
-
-                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
-                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
-                {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
-                {"label":"K3E (B3,D4)", "x":15, "y":3},
-
-                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4},
-                {"label":"K4E (B4,D4)", "x":15, "y":4},
-
-                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.5},
-                {"label":"K51 (B5,B7)", "x":1.5, "y":5},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.5},
-                {"label":"K56 (B5,C4)", "x":4, "y":5, "w":7},
-                {"label":"K5B (B5,D1)", "x":11, "y":5, "w":1.5},
-                {"label":"K5C (B5,D2)", "x":13, "y":5},
-                {"label":"K5D (B5,D3)", "x":14, "y":5},
-                {"label":"K5E (B5,D4)", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [3, 12], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_tsangan_2u_bs": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,B7)", "x":1.5, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.5, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.5, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6, "y":0},
-                {"label":"K07 (B0,C5)", "x":7, "y":0},
-                {"label":"K08 (B0,C6)", "x":8, "y":0},
-                {"label":"K09 (B0,C7)", "x":9, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.5, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.5, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.5, "y":0},
-                {"label":"K0D (B0,D3)", "x":13.5, "y":0},
-                {"label":"K0E (B0,D4)", "x":15, "y":0},
-
-                {"label":"K10 (B1,B6)", "x":0, "y":1},
-                {"label":"K11 (B1,B7)", "x":1, "y":1},
-                {"label":"K12 (B1,C0)", "x":2, "y":1},
-                {"label":"K13 (B1,C1)", "x":3, "y":1},
-                {"label":"K14 (B1,C2)", "x":4, "y":1},
-                {"label":"K15 (B1,C3)", "x":5, "y":1},
-                {"label":"K16 (B1,C4)", "x":6, "y":1},
-                {"label":"K17 (B1,C5)", "x":7, "y":1},
-                {"label":"K18 (B1,C6)", "x":8, "y":1},
-                {"label":"K19 (B1,C7)", "x":9, "y":1},
-                {"label":"K1A (B1,D0)", "x":10, "y":1},
-                {"label":"K1B (B1,D1)", "x":11, "y":1},
-                {"label":"K1C (B1,D2)", "x":12, "y":1},
-                {"label":"K1D (B1,D3)", "x":13, "y":1, "w":2},
-                {"label":"K1E (B1,D4)", "x":15, "y":1},
-
-                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
-                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15, "y":2},
-
-                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
-                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
-                {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
-                {"label":"K3E (B3,D4)", "x":15, "y":3},
-
-                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4},
-                {"label":"K4E (B4,D4)", "x":15, "y":4},
-
-                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.5},
-                {"label":"K51 (B5,B7)", "x":1.5, "y":5},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.5},
-                {"label":"K56 (B5,C4)", "x":4, "y":5, "w":7},
-                {"label":"K5B (B5,D1)", "x":11, "y":5, "w":1.5},
-                {"label":"K5C (B5,D2)", "x":13, "y":5},
-                {"label":"K5D (B5,D3)", "x":14, "y":5},
-                {"label":"K5E (B5,D4)", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h
deleted file mode 100644
index 1baf1aa2ea..0000000000
--- a/keyboards/mechlovin/hex4b/rev1/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B7, A2, A1, A3, A4, A5 }
-#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 }
diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json
index cec380a91f..1e9a7d5776 100644
--- a/keyboards/mechlovin/hex4b/rev1/info.json
+++ b/keyboards/mechlovin/hex4b/rev1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "D1", "D0"],
+        "rows": ["B7", "A2", "A1", "A3", "A4", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4",
         "levels": 5,
diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h
index c0486dd0b7..14dfffbed3 100644
--- a/keyboards/mechlovin/hex4b/rev2/config.h
+++ b/keyboards/mechlovin/hex4b/rev2/config.h
@@ -17,19 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A3, C13, B7, B6, B5, B4, B3 }
-
 #define BACKLIGHT_PWM_DRIVER PWMD4
diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json
index 7d9a2cb40a..8609be01c3 100644
--- a/keyboards/mechlovin/hex4b/rev2/info.json
+++ b/keyboards/mechlovin/hex4b/rev2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "C13", "B7", "B6", "B5", "B4", "B3"],
+        "rows": ["A4", "B12", "B13", "B14", "B15", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B8",
         "levels": 5,
diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h
index b0791490a2..a22137acf7 100644
--- a/keyboards/mechlovin/hex6c/config.h
+++ b/keyboards/mechlovin/hex6c/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 }
-#define MATRIX_COL_PINS { A13, A14, A1, A0, C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 3
 
diff --git a/keyboards/mechlovin/hex6c/hex6c.c b/keyboards/mechlovin/hex6c/hex6c.c
deleted file mode 100644
index 255121dc19..0000000000
--- a/keyboards/mechlovin/hex6c/hex6c.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hex6c.h"
diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json
index 387043bde6..2e82a83785 100644
--- a/keyboards/mechlovin/hex6c/info.json
+++ b/keyboards/mechlovin/hex6c/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6C01",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A13", "A14", "A1", "A0", "C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"],
+        "rows": ["A10", "B13", "B12", "B11", "C14", "C15"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A15", "pin_b": "A2"}
diff --git a/keyboards/mechlovin/infinity87/infinity87.c b/keyboards/mechlovin/infinity87/infinity87.c
deleted file mode 100644
index 434e796091..0000000000
--- a/keyboards/mechlovin/infinity87/infinity87.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "infinity87.h"
diff --git a/keyboards/mechlovin/infinity87/infinity87.h b/keyboards/mechlovin/infinity87/infinity87.h
deleted file mode 100644
index b7b00bef40..0000000000
--- a/keyboards/mechlovin/infinity87/infinity87.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/infinity87/rev1/config.h b/keyboards/mechlovin/infinity87/rev1/config.h
index e03ee6dded..2265fff2d1 100644
--- a/keyboards/mechlovin/infinity87/rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rev1/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 }
-#define MATRIX_COL_PINS { C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 }
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 3
-
-#define DIODE_DIRECTION COL2ROW
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json
index be094e09ae..dbe7cb83f9 100644
--- a/keyboards/mechlovin/infinity87/rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"],
+        "rows": ["A10", "B13", "B12", "B11", "C14", "C15"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B0",
         "breathing": true
diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.c b/keyboards/mechlovin/infinity87/rev1/rev1.c
deleted file mode 100644
index c65ff19838..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.h b/keyboards/mechlovin/infinity87/rev1/rev1.h
deleted file mode 100644
index 167ed6940a..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rev1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/config.h b/keyboards/mechlovin/infinity87/rev1/standard/config.h
index f154c344b3..7b3e497cdf 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/config.h
+++ b/keyboards/mechlovin/infinity87/rev1/standard/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN A15
 #define RGBLED_NUM 26
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json
index 29597cce3f..cd4cf76b35 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/standard/info.json
@@ -8,6 +8,9 @@
         "pid": "0x8701",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A15"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h
index 178374c1e7..2d6fb7bc2b 100644
--- a/keyboards/mechlovin/infinity87/rev2/config.h
+++ b/keyboards/mechlovin/infinity87/rev2/config.h
@@ -35,7 +35,6 @@
 #define DIODE_DIRECTION ROW2COL
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 24
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
index d75dd051bc..b85416b9b2 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -17,6 +17,9 @@
         "num_lock": "D7",
         "scroll_lock": "B4"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mechlovin/infinity87/rev2/rev2.c b/keyboards/mechlovin/infinity87/rev2/rev2.c
deleted file mode 100644
index ab9ecbf6fc..0000000000
--- a/keyboards/mechlovin/infinity87/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rev2/rev2.h b/keyboards/mechlovin/infinity87/rev2/rev2.h
deleted file mode 100644
index 16cdf9ed85..0000000000
--- a/keyboards/mechlovin/infinity87/rev2/rev2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
index a609587210..10fc42f830 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A10, A13, A14, C13, A4, A3 }
-#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, B11, B10, B2, B1, B0, A7, A6, A5, A2, A1, A0 }
-
-
-#define DIODE_DIRECTION COL2ROW
-
 //rgb matrix setting
 // This is a 7-bit address, that gets left-shifted and bit 0
 // set to 0 for write, 1 for read (as per I2C protocol)
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
index 604fa512ed..097fc6a820 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x8710",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A2", "A1", "A0"],
+        "rows": ["A10", "A13", "A14", "C13", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
index 210fb843b3..c10d47d191 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rgb_rev1.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h
deleted file mode 100644
index 16cdf9ed85..0000000000
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
index 5a28c2e1c2..e408bde91c 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h
index 697ef34ccb..eee31e69ef 100644
--- a/keyboards/mechlovin/infinity875/config.h
+++ b/keyboards/mechlovin/infinity875/config.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION ROW2COL
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 42
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/mechlovin/infinity875/infinity875.c b/keyboards/mechlovin/infinity875/infinity875.c
index 43606b6c92..09749bbc2b 100644
--- a/keyboards/mechlovin/infinity875/infinity875.c
+++ b/keyboards/mechlovin/infinity875/infinity875.c
@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "infinity875.h"
+#include "quantum.h"
+
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
   //Key Matrix to LED Index
diff --git a/keyboards/mechlovin/infinity875/infinity875.h b/keyboards/mechlovin/infinity875/infinity875.h
deleted file mode 100644
index 2febe0824c..0000000000
--- a/keyboards/mechlovin/infinity875/infinity875.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright 2021 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,        K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                        \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
-}
-
-#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,        K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                        \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, KC_NO,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
-}
-
-#define LAYOUT_tkl_f13_iso_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                        \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
-}
-
-#define LAYOUT_tkl_ansi_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,        K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                        \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
-) { \
-    { K00, KC_NO,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, KC_NO,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
-}
-
-#define LAYOUT_tkl_iso_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                        \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
-) { \
-    { K00, KC_NO,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
-}
diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json
index f27235b8c5..fcec3c2afa 100644
--- a/keyboards/mechlovin/infinity875/info.json
+++ b/keyboards/mechlovin/infinity875/info.json
@@ -8,27 +8,557 @@
         "pid": "0x0875",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "indicators": {
         "caps_lock": "D6",
         "scroll_lock": "B4"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso_split_bs_rshift": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,13", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_f13_iso_split_bs_rshift": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,13", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         }
     }
     ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
diff --git a/keyboards/mechlovin/infinity875/rules.mk b/keyboards/mechlovin/infinity875/rules.mk
index 202f5f759b..33f549f3ae 100644
--- a/keyboards/mechlovin/infinity875/rules.mk
+++ b/keyboards/mechlovin/infinity875/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 SRC += matrix.c
diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h
index 11ae35100b..dd0f9e4f30 100644
--- a/keyboards/mechlovin/infinity88/config.h
+++ b/keyboards/mechlovin/infinity88/config.h
@@ -17,26 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 }
-#define MATRIX_COL_PINS { C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7,B1, B2, B10, B3, B14, B15 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 3
 
-#define RGB_DI_PIN A15
 #define RGBLED_NUM 26
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
diff --git a/keyboards/mechlovin/infinity88/infinity88.c b/keyboards/mechlovin/infinity88/infinity88.c
deleted file mode 100644
index 4d352358a7..0000000000
--- a/keyboards/mechlovin/infinity88/infinity88.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "infinity88.h"
diff --git a/keyboards/mechlovin/infinity88/infinity88.h b/keyboards/mechlovin/infinity88/infinity88.h
deleted file mode 100644
index c7decced45..0000000000
--- a/keyboards/mechlovin/infinity88/infinity88.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- *              ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───� ┌───┬───┬───�
- *              │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││3E │ │0E │0F │0G │
- *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───┬───�      ┌───────�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │0D │ │1E │1F │1G │      │1D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤                     ┌─────�
- *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │        │     │                     │2D   │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤ └───┴───┴───┘     ┌──┴�3D  │ ISO Enter        ┌──┴─────┤ ANSI Enter
- *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D  │                   │3C │    │                  │3D      │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤     ┌───�       ┌─┴───┴────┤                ┌─┴─┬──────┤
- * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │     │4F │       │4D        │ 2.75u RShift   │4C │4D    │ 1u/1.75u
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───�   └──────────┘                └───┴──────┘
- *              │50  │51  │52  │56                      │5A  │5B  │5C  │5D  │ │5E │5F │5G │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *              │50   │51 │52   │56                         │5B   │5C │5D   │ Tsangan/WKL
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K3E,       K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D,  K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,       K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                       \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4D,       K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,       K5E, K5F, K5G   \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
-
-#define LAYOUT_tkl_f13_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K3E,  K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,  K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,       K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,  K5E, K5F, K5G   \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, XXX, XXX }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
-
-#define LAYOUT_tkl_f13_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K3E,  K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,  K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,       K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,       K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,  K5E, K5F, K5G   \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
-}
diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json
index 37ccd27537..fdbb45a7d6 100644
--- a/keyboards/mechlovin/infinity88/info.json
+++ b/keyboards/mechlovin/infinity88/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8802",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"],
+        "rows": ["A10", "B13", "B12", "B11", "C14", "C15"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B0",
         "breathing": true
@@ -16,6 +21,9 @@
         "caps_lock": "A4",
         "num_lock": "A3"
     },
+    "ws2812": {
+        "pin": "A15"
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
@@ -23,293 +31,325 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,F4)", "x":1.25, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.25, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.25, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.25, "y":0},
-                {"label":"K05 (B0,C3)", "x":5.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6.5, "y":0},
-                {"label":"K07 (B0,C5)", "x":7.5, "y":0},
-                {"label":"K08 (B0,C6)", "x":8.5, "y":0},
-                {"label":"K09 (B0,C7)", "x":9.75, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.75, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.75, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.75, "y":0},
-                {"label":"K3E (B3,D4)", "x":14, "y":0},
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0},
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25},
-                {"label":"K0D (B0,D3)", "x":14, "y":1.25},
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
-                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
-                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4.25},
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [3, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,F4)", "x":1.25, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.25, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.25, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.25, "y":0},
-                {"label":"K05 (B0,C3)", "x":5.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6.5, "y":0},
-                {"label":"K07 (B0,C5)", "x":7.5, "y":0},
-                {"label":"K08 (B0,C6)", "x":8.5, "y":0},
-                {"label":"K09 (B0,C7)", "x":9.75, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.75, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.75, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.75, "y":0},
-                {"label":"K3E (B3,D4)", "x":14, "y":0},
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0},
-
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25, "w":2},
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
-
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
-
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
-                {"label":"K3D (B3,D3)", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":2.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
-                {"label":"K4D (B4,D3)", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
-
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [3, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,F4)", "x":1.25, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.25, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.25, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.25, "y":0},
-                {"label":"K05 (B0,C3)", "x":5.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6.5, "y":0},
-                {"label":"K07 (B0,C5)", "x":7.5, "y":0},
-                {"label":"K08 (B0,C6)", "x":8.5, "y":0},
-                {"label":"K09 (B0,C7)", "x":9.75, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.75, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.75, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.75, "y":0},
-                {"label":"K3E (B3,D4)", "x":14, "y":0},
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0},
-
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25, "w":2},
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
-
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
-
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
-                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
-                {"label":"K3D (B3,D3)", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
-                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
-                {"label":"K4D (B4,D3)", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
-
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [3, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h
index e0900333cd..db2ba4b78e 100644
--- a/keyboards/mechlovin/infinityce/config.h
+++ b/keyboards/mechlovin/infinityce/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D7, D6, B6, B1, C6, C7 }
-#define MATRIX_COL_PINS { B5, B4, B0, D5, D4, D1, D0, E6, F7, F6, F5, F4, F1, F0, B2, D3, D2}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 31
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json
index 1ab5cad305..b5e1da8d58 100644
--- a/keyboards/mechlovin/infinityce/info.json
+++ b/keyboards/mechlovin/infinityce/info.json
@@ -8,10 +8,18 @@
         "pid": "0x8801",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "B0", "D5", "D4", "D1", "D0", "E6", "F7", "F6", "F5", "F4", "F1", "F0", "B2", "D3", "D2"],
+        "rows": ["D7", "D6", "B6", "B1", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mechlovin/jay60/config.h b/keyboards/mechlovin/jay60/config.h
index afc0a4af7d..d685b92631 100644
--- a/keyboards/mechlovin/jay60/config.h
+++ b/keyboards/mechlovin/jay60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C2, C1, C0, D7, A1 }
-#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, C3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/info.json
index f64b25c9e7..f06f4b2fea 100644
--- a/keyboards/mechlovin/jay60/info.json
+++ b/keyboards/mechlovin/jay60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0600",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "C3"],
+        "rows": ["C2", "C1", "C0", "D7", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D4"
     },
diff --git a/keyboards/mechlovin/jay60/jay60.c b/keyboards/mechlovin/jay60/jay60.c
deleted file mode 100644
index 9571c1375a..0000000000
--- a/keyboards/mechlovin/jay60/jay60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "jay60.h"
diff --git a/keyboards/mechlovin/kanu/config.h b/keyboards/mechlovin/kanu/config.h
index 6a6dc97744..bfa2908890 100644
--- a/keyboards/mechlovin/kanu/config.h
+++ b/keyboards/mechlovin/kanu/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B6, D3, C6, C7 }
-#define MATRIX_COL_PINS { E6, B1, B3, F0, F1, F4, F5, F6, F7, D5, D4, B4, D6, D7, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json
index 628a78e1a5..fabaf33380 100644
--- a/keyboards/mechlovin/kanu/info.json
+++ b/keyboards/mechlovin/kanu/info.json
@@ -8,232 +8,328 @@
         "pid": "0x4B4E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
+        "rows": ["B5", "B6", "D3", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs", "65_iso_blocker"],
     "layouts": {
-        "LAYOUT_all": {
+        "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": [4, 9], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0},
-                {"label":"K0E (B0,D3)", "x":14, "y":0},
-                {"label":"K49 (B4,C6)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2C (B2,D1)", "x":12.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":13.75, "y":2, "w":1.25},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (B3,B6)", "x":1.25, "y":3},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K44 (B4,C1)", "x":3.75, "y":4, "w":2.75},
-                {"label":"K46 (B4,C3)", "x":6.5, "y":4, "w":1.25},
-                {"label":"K48 (B4,C5)", "x":7.75, "y":4, "w":2.25},
-                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [4, 9], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 14], "x": 28, "y": 0},
+
+                {"matrix": [2, 0], "x": 29, "y": 0},
+                {"matrix": [2, 1], "x": 30, "y": 0},
+                {"matrix": [2, 2], "x": 31, "y": 0},
+                {"matrix": [2, 3], "x": 32, "y": 0},
+                {"matrix": [2, 4], "x": 33, "y": 0},
+                {"matrix": [2, 5], "x": 34, "y": 0},
+                {"matrix": [2, 6], "x": 35, "y": 0},
+                {"matrix": [2, 7], "x": 36, "y": 0},
+                {"matrix": [2, 8], "x": 37, "y": 0},
+                {"matrix": [2, 9], "x": 38, "y": 0},
+                {"matrix": [2, 10], "x": 39, "y": 0},
+                {"matrix": [2, 11], "x": 40, "y": 0},
+                {"matrix": [2, 12], "x": 41, "y": 0},
+                {"matrix": [2, 13], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+
+                {"matrix": [3, 0], "x": 44, "y": 0},
+                {"matrix": [3, 1], "x": 45, "y": 0},
+                {"matrix": [3, 2], "x": 46, "y": 0},
+                {"matrix": [3, 3], "x": 47, "y": 0},
+                {"matrix": [3, 4], "x": 48, "y": 0},
+                {"matrix": [3, 5], "x": 49, "y": 0},
+                {"matrix": [3, 6], "x": 50, "y": 0},
+                {"matrix": [3, 7], "x": 51, "y": 0},
+                {"matrix": [3, 8], "x": 52, "y": 0},
+                {"matrix": [3, 9], "x": 53, "y": 0},
+                {"matrix": [3, 10], "x": 54, "y": 0},
+                {"matrix": [3, 11], "x": 55, "y": 0},
+                {"matrix": [3, 12], "x": 56, "y": 0},
+                {"matrix": [3, 13], "x": 57, "y": 0},
+                {"matrix": [3, 14], "x": 58, "y": 0},
+
+                {"matrix": [4, 0], "x": 59, "y": 0},
+                {"matrix": [4, 1], "x": 60, "y": 0},
+                {"matrix": [4, 2], "x": 61, "y": 0},
+                {"matrix": [4, 6], "x": 62, "y": 0},
+                {"matrix": [4, 10], "x": 63, "y": 0},
+                {"matrix": [4, 11], "x": 64, "y": 0},
+                {"matrix": [4, 12], "x": 65, "y": 0},
+                {"matrix": [4, 13], "x": 66, "y": 0},
+                {"matrix": [4, 14], "x": 67, "y": 0}
             ]
-        },        
+        },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0},
-                {"label":"K0E (B0,D3)", "x":14, "y":0},
-                {"label":"K49 (B4,C6)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2C (B2,D1)", "x":12.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (B3,B6)", "x":1.25, "y":3},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 9], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi_blocker": {
+        "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
-                {"label":"K49 (B4,C6)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 9], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mechlovin/kanu/kanu.c b/keyboards/mechlovin/kanu/kanu.c
index ceb874e124..67bf8f88fb 100644
--- a/keyboards/mechlovin/kanu/kanu.c
+++ b/keyboards/mechlovin/kanu/kanu.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kanu.h"
+#include "quantum.h"
 
 void led_init_ports(void) {
   setPinOutput(B2);
diff --git a/keyboards/mechlovin/kanu/kanu.h b/keyboards/mechlovin/kanu/kanu.h
deleted file mode 100644
index 54163529d6..0000000000
--- a/keyboards/mechlovin/kanu/kanu.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k67, \
-    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k45, \
-    k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, \
-    k61, k62, k63,      k64,      k65,      k66,      k68, k69, k70, k71, k72  \
-) \
-{ \
-    { k00, k01, k02, k03,   k04, k05,   k06, k07,   k08, k09, k10, k11, k12, k13, k14 }, \
-    { k15, k16, k17, k18,   k19, k20,   k21, k22,   k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33,   k34, k35,   k36, k37,   k38, k39, k40, k41, k42, k43, k45 }, \
-    { k46, k47, k48, k49,   k50, k51,   k52, k53,   k54, k55, k56, k57, k58, k59, k60 }, \
-    { k61, k62, k63, KC_NO, k64, KC_NO, k65, KC_NO, k66, k67, k68, k69, k70, k71, k72 }, \
-}
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k66, \
-    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27,      k29, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k45, \
-    k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, \
-    k61, k62, k63,                k65,                k67, k68, k69, k70, k71  \
-) \
-{ \
-    { k00, k01, k02, k03,   k04,   k05,   k06,   k07,   k08, k09,   k10, k11, k12, k13,   k14 }, \
-    { k15, k16, k17, k18,   k19,   k20,   k21,   k22,   k23, k24,   k25, k26, k27, KC_NO, k29 }, \
-    { k30, k31, k32, k33,   k34,   k35,   k36,   k37,   k38, k39,   k40, k41, k42, k43,   k45 }, \
-    { k46, k47, k48, k49,   k50,   k51,   k52,   k53,   k54, k55,   k56, k57, k58, k59,   k60 }, \
-    { k61, k62, k63, KC_NO, KC_NO, KC_NO, k65, KC_NO, KC_NO, k66, k67, k68, k69, k70,   k71 }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k66, \
-    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27,      k29, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k45, \
-    k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, \
-    k61, k62, k63,                k65,                k67, k68, k69, k70, k71  \
-) \
-{ \
-    { k00, k01, k02, k03,   k04,   k05,   k06,   k07,   k08, k09,   k10, k11, k12, k13,   KC_NO }, \
-    { k15, k16, k17, k18,   k19,   k20,   k21,   k22,   k23, k24,   k25, k26, k27, KC_NO, k29 }, \
-    { k30, k31, k32, k33,   k34,   k35,   k36,   k37,   k38, k39,   k40, k41, k42, k43,   k45 }, \
-    { k46, k47, k48, k49,   k50,   k51,   k52,   k53,   k54, k55,   k56, k57, k58, k59,   k60 }, \
-    { k61, k62, k63, KC_NO, KC_NO, KC_NO, k65, KC_NO, KC_NO, k66,   k67, k68, k69, k70,   k71 }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k66, \
-    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41,      k43, k45, \
-    k46,      k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, \
-    k61, k62, k63,                k65,                k67, k68, k69, k70, k71  \
-) \
-{ \
-    { k00, k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k10, k11, k12,   k13, KC_NO }, \
-    { k15, k16,   k17, k18,   k19,   k20,   k21, k22,   k23,   k24,   k25, k26, k27,   k28, k29   }, \
-    { k30, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k40, k41, KC_NO, k43, k45   }, \
-    { k46, KC_NO, k48, k49,   k50,   k51,   k52, k53,   k54,   k55,   k56, k57, k58,   k59, k60   }, \
-    { k61, k62,   k63, KC_NO, KC_NO, KC_NO, k65, KC_NO, KC_NO, k66, k67, k68, k69,   k70, k71 }, \
-}
-
diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h
index b05cc594e4..68e6d62c48 100644
--- a/keyboards/mechlovin/kay60/config.h
+++ b/keyboards/mechlovin/kay60/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D5, D3, D2, B1, B5}
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B2, B3, B7, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 22
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json
index a12cb83719..48ca04815b 100644
--- a/keyboards/mechlovin/kay60/info.json
+++ b/keyboards/mechlovin/kay60/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0601",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B3", "B7", "B4", "D7", "D6", "D4"],
+        "rows": ["D5", "D3", "D2", "B1", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mechlovin/kay60/kay60.c b/keyboards/mechlovin/kay60/kay60.c
deleted file mode 100644
index 61d968e48c..0000000000
--- a/keyboards/mechlovin/kay60/kay60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kay60.h"
diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h
index d3cacf757a..af8fb5765c 100644
--- a/keyboards/mechlovin/kay65/config.h
+++ b/keyboards/mechlovin/kay65/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B7, D3, D5, D4, C6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, E6, B0, D2, D1, D0, B3, B2, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 24
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json
index 3bfc5c66e5..fbd556217c 100644
--- a/keyboards/mechlovin/kay65/info.json
+++ b/keyboards/mechlovin/kay65/info.json
@@ -8,229 +8,249 @@
         "pid": "0x6502",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "E6", "B0", "D2", "D1", "D0", "B3", "B2", "B1"],
+        "rows": ["B7", "D3", "D5", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker", "65_iso_blocker"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0},
-                {"label":"K1D (B1,D2)", "x":14, "y":0},
-                {"label":"K0E (B0,D3)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (B3,B6)", "x":1.25, "y":3},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (B4,C7)", "x":10, "y":4},
-                {"label":"K4A (B4,C7)", "x":11, "y":4},
-                {"label":"K4B (B4,D0)", "x":12, "y":4},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
-                {"label":"K0E (B0,D3)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4A (B4,D0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C0)", "x":3, "y":0},
-                {"label":"K04 (B0,C1)", "x":4, "y":0},
-                {"label":"K05 (B0,C2)", "x":5, "y":0},
-                {"label":"K06 (B0,C3)", "x":6, "y":0},
-                {"label":"K07 (B0,C4)", "x":7, "y":0},
-                {"label":"K08 (B0,C5)", "x":8, "y":0},
-                {"label":"K09 (B0,C6)", "x":9, "y":0},
-                {"label":"K0A (B0,C7)", "x":10, "y":0},
-                {"label":"K0B (B0,D0)", "x":11, "y":0},
-                {"label":"K0C (B0,D1)", "x":12, "y":0},
-                {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
-                {"label":"K0E (B0,D3)", "x":15, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
-                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
-                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
-                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
-                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
-                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
-                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
-                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
-                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
-                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
-                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
-                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
-                {"label":"K1E (B1,D3)", "x":15, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
-                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
-                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
-                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
-                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
-                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
-                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
-                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
-                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
-                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
-                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
-                {"label":"K2C (B2,D1)", "x":12.75, "y":2},
-                {"label":"K2D (B2,D2)", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"K2E (B2,D3)", "x":15, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (B3,B6)", "x":1.25, "y":3},
-                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
-                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
-                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
-                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
-                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
-                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
-                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
-                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
-                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
-                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
-                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (B3,D2)", "x":14, "y":3},
-                {"label":"K3E (B3,D3)", "x":15, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4A (B4,D0)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (B4,D1)", "x":13, "y":4},
-                {"label":"K4D (B4,D2)", "x":14, "y":4},
-                {"label":"K4E (B4,D3)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mechlovin/kay65/kay65.c b/keyboards/mechlovin/kay65/kay65.c
index abc6a7f8d4..591c618c6c 100644
--- a/keyboards/mechlovin/kay65/kay65.c
+++ b/keyboards/mechlovin/kay65/kay65.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "kay65.h"
+#include "quantum.h"
 
 void keyboard_pre_init_user(void) {
   // Call the keyboard pre init code.
diff --git a/keyboards/mechlovin/kay65/kay65.h b/keyboards/mechlovin/kay65/kay65.h
deleted file mode 100644
index 1af2673dc1..0000000000
--- a/keyboards/mechlovin/kay65/kay65.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright 2021 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      K1E,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2D, K2E,   \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E,   \
-    K40, K41, K42,                K46,           K49, K4A, K4B,      K4C, K4D, K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,      K2E,   \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,   \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,   \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,   \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
diff --git a/keyboards/mechlovin/mechlovin9/config.h b/keyboards/mechlovin/mechlovin9/config.h
deleted file mode 100644
index 94a281c2f8..0000000000
--- a/keyboards/mechlovin/mechlovin9/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
-Copyright 2021 Mechlovin' Studio
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/mechlovin9/mechlovin9.c b/keyboards/mechlovin/mechlovin9/mechlovin9.c
deleted file mode 100644
index a5a8b6c0fe..0000000000
--- a/keyboards/mechlovin/mechlovin9/mechlovin9.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mechlovin9.h"
diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h
index c5e997d425..3686536dfb 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/config.h
+++ b/keyboards/mechlovin/mechlovin9/rev1/config.h
@@ -17,18 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 }
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json
index aa8e9e94e3..1ece8fc52d 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev1/info.json
@@ -4,6 +4,11 @@
         "pid": "0x6509",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
+        "rows": ["A4", "A5", "A3", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "features": {
         "backlight": true
     },
diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h
deleted file mode 100644
index f550a2e39a..0000000000
--- a/keyboards/mechlovin/mechlovin9/rev2/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
-#define MATRIX_COL_PINS { B2, B1, B0, B3, B4, B5, D0, D1, D5, D6, D7, C0, C3, C2, C1 }
diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json
index 85a20210b2..01e8d59579 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev2/info.json
@@ -4,6 +4,11 @@
         "pid": "0x6509",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0", "B3", "B4", "B5", "D0", "D1", "D5", "D6", "D7", "C0", "C3", "C2", "C1"],
+        "rows": ["A0", "A1", "A2", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "features": {
         "backlight": true
     },
diff --git a/keyboards/mechlovin/mechlovin9/rev3/info.json b/keyboards/mechlovin/mechlovin9/rev3/info.json
index d5da28d3ed..f5efcc1f6a 100644
--- a/keyboards/mechlovin/mechlovin9/rev3/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev3/info.json
@@ -16,6 +16,7 @@
         "rows": ["B12", "B13", "B14", "B15", "A1"],
         "cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "C13", "B7", "B6", "B5", "B4", "B3"]
     },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B9"
     }
diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h
index 0f9a61426e..3aa97fd207 100644
--- a/keyboards/mechlovin/olly/bb/config.h
+++ b/keyboards/mechlovin/olly/bb/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS {D6, A5, A4, A3, A6}
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B3
 #define RGBLED_NUM 24
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
index 887e32d9a5..4bb73904d0 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/info.json
@@ -12,6 +12,9 @@
         "pin": "D4",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "indicators": {
         "caps_lock": "B0",
         "num_lock": "B1",
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h
index 2b42e66edc..5e1321bc8b 100644
--- a/keyboards/mechlovin/olly/jf/config.h
+++ b/keyboards/mechlovin/olly/jf/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
-#define RGB_DI_PIN B3
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index 86de2f1bfe..ba324e6f3e 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -17,6 +17,9 @@
         "num_lock": "B1",
         "scroll_lock": "B2"
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "bootmagic": {
         "matrix": [1, 14]
     },
diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h
index 89e8a32d4f..a1127f6aad 100644
--- a/keyboards/mechlovin/olly/octagon/config.h
+++ b/keyboards/mechlovin/olly/octagon/config.h
@@ -17,16 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B12, A6, A5, A4, A3 }
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B2, B1, A15, B3, B9, B8, B7, B6, B5, B4 }
-
 #ifdef  RGBLIGHT_ENABLE
-#define RGB_DI_PIN A7
 #define RGBLED_NUM      26
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index 9adec5281c..81893874e0 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -8,6 +8,17 @@
         "pid": "0xD750",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A7"
+    },
+    "led_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"],
+        "rows": ["B0", "B12", "A6", "A5", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layout_aliases": {
@@ -16,7 +27,100 @@
     },
     "layouts": {
         "LAYOUT_split_bs": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}, {"label":"1,3", "x":3, "y":1}, {"label":"1,4", "x":4, "y":1}, {"label":"1,5", "x":5, "y":1}, {"label":"1,6", "x":6, "y":1}, {"label":"1,7", "x":7, "y":1}, {"label":"1,8", "x":8, "y":1}, {"label":"1,9", "x":9, "y":1}, {"label":"1,10", "x":10, "y":1}, {"label":"1,11", "x":11, "y":1}, {"label":"1,12", "x":12, "y":1}, {"label":"1,13", "x":13, "y":1}, {"label":"1,14", "x":14, "y":1}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.5}, {"label":"2,1", "x":1.5, "y":2}, {"label":"2,2", "x":2.5, "y":2}, {"label":"2,3", "x":3.5, "y":2}, {"label":"2,4", "x":4.5, "y":2}, {"label":"2,5", "x":5.5, "y":2}, {"label":"2,6", "x":6.5, "y":2}, {"label":"2,7", "x":7.5, "y":2}, {"label":"2,8", "x":8.5, "y":2}, {"label":"2,9", "x":9.5, "y":2}, {"label":"2,10", "x":10.5, "y":2}, {"label":"2,11", "x":11.5, "y":2}, {"label":"2,12", "x":12.5, "y":2}, {"label":"2,14", "x":13.5, "y":2, "w":1.5}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.75}, {"label":"3,1", "x":1.75, "y":3}, {"label":"3,2", "x":2.75, "y":3}, {"label":"3,3", "x":3.75, "y":3}, {"label":"3,4", "x":4.75, "y":3}, {"label":"3,5", "x":5.75, "y":3}, {"label":"3,6", "x":6.75, "y":3}, {"label":"3,7", "x":7.75, "y":3}, {"label":"3,8", "x":8.75, "y":3}, {"label":"3,9", "x":9.75, "y":3}, {"label":"3,10", "x":10.75, "y":3}, {"label":"3,11", "x":11.75, "y":3}, {"label":"3,12", "x":12.75, "y":3}, {"label":"3,13", "x":13.75, "y":3, "w":1.25}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4}, {"label":"4,2", "x":2.25, "y":4}, {"label":"4,3", "x":3.25, "y":4}, {"label":"4,4", "x":4.25, "y":4}, {"label":"4,5", "x":5.25, "y":4}, {"label":"4,6", "x":6.25, "y":4}, {"label":"4,7", "x":7.25, "y":4}, {"label":"4,8", "x":8.25, "y":4}, {"label":"4,9", "x":9.25, "y":4}, {"label":"4,10", "x":10.25, "y":4}, {"label":"4,11", "x":11.25, "y":4}, {"label":"4,12", "x":12.25, "y":4, "w":1.75}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "x":15, "y":4}, {"label":"5,0", "x":0, "y":5, "w":1.25}, {"label":"5,1", "x":1.25, "y":5, "w":1.25}, {"label":"5,2", "x":2.5, "y":5, "w":1.25}, {"label":"5,6", "x":3.75, "y":5, "w":6.25}, {"label":"5,10", "x":10, "y":5}, {"label":"5,11", "x":11, "y":5}, {"label":"5,12", "x":12, "y":5}, {"label":"5,13", "x":13, "y":5}, {"label":"5,14", "x":14, "y":5}, {"label":"5,15", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
         }
     }
 }
diff --git a/keyboards/mechlovin/olly/octagon/octagon.c b/keyboards/mechlovin/olly/octagon/octagon.c
index 9f70c76638..41f9dbb438 100644
--- a/keyboards/mechlovin/olly/octagon/octagon.c
+++ b/keyboards/mechlovin/olly/octagon/octagon.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "octagon.h"
+#include "quantum.h"
 
 const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
diff --git a/keyboards/mechlovin/olly/octagon/octagon.h b/keyboards/mechlovin/olly/octagon/octagon.h
deleted file mode 100644
index d63b345720..0000000000
--- a/keyboards/mechlovin/olly/octagon/octagon.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2022 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E, K4F }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }, \
-}
diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk
index 25096b03d7..97303c7e2f 100644
--- a/keyboards/mechlovin/olly/octagon/rules.mk
+++ b/keyboards/mechlovin/olly/octagon/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = IS31FL3731
 RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/orion/config.h b/keyboards/mechlovin/olly/orion/config.h
index 225795d3c0..efb5f91189 100644
--- a/keyboards/mechlovin/olly/orion/config.h
+++ b/keyboards/mechlovin/olly/orion/config.h
@@ -17,25 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A8, A9, A10, B11, C13, C14 }
-#define MATRIX_COL_PINS { B14, B13, B12, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, A15, B3, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #ifdef RGBLIGHT_ENABLE
-#    define RGB_DI_PIN B15
 #    define RGBLED_NUM 24
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json
index 89433dfd1b..ad792e81af 100644
--- a/keyboards/mechlovin/olly/orion/info.json
+++ b/keyboards/mechlovin/olly/orion/info.json
@@ -8,22 +8,341 @@
         "pid": "0xD870",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "A15", "B3", "B4"],
+        "rows": ["A8", "A9", "A10", "B11", "C13", "C14"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "B10",
         "num_lock": "A13",
         "scroll_lock": "A14"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
         "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_tkl_iso_split_bs_rshift": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,13", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         },
         "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
         }
     },
     "meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
diff --git a/keyboards/mechlovin/olly/orion/orion.c b/keyboards/mechlovin/olly/orion/orion.c
index 270683fa4c..9fc89a6d02 100644
--- a/keyboards/mechlovin/olly/orion/orion.c
+++ b/keyboards/mechlovin/olly/orion/orion.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "orion.h"
+#include "quantum.h"
 
 void board_init(void) {
    //JTAG-DP Disabled and SW-DP Enabled    
diff --git a/keyboards/mechlovin/olly/orion/orion.h b/keyboards/mechlovin/olly/orion/orion.h
deleted file mode 100644
index fb62e0948e..0000000000
--- a/keyboards/mechlovin/olly/orion/orion.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2022 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,        K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                        \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
-) { \
-    { K00, KC_NO,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
-}
-
-#define LAYOUT_tkl_ansi_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,        K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                        \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
-) { \
-    { K00, KC_NO,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40, KC_NO,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
-}
-
-#define LAYOUT_tkl_iso_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                        \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
-) { \
-    { K00, KC_NO,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
-}
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h
index 1540505bad..06dc10ad91 100644
--- a/keyboards/mechlovin/pisces/config.h
+++ b/keyboards/mechlovin/pisces/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, F0, F5, F6, F7 }
-#define MATRIX_COL_PINS { E6, B1, B3, D0, D1, D2, D3, D5, F4, F1, D4, D6, D7, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 12
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -51,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json
index 19246528e7..3159cc500b 100644
--- a/keyboards/mechlovin/pisces/info.json
+++ b/keyboards/mechlovin/pisces/info.json
@@ -8,12 +8,20 @@
         "pid": "0x6501",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B1", "B3", "D0", "D1", "D2", "D3", "D5", "F4", "F1", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["B0", "F0", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
     "indicators": {
         "caps_lock": "B2"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mechlovin/pisces/pisces.c b/keyboards/mechlovin/pisces/pisces.c
deleted file mode 100644
index b43bf2aaa4..0000000000
--- a/keyboards/mechlovin/pisces/pisces.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pisces.h"
diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h
index abfafffd0d..4b064e3676 100644
--- a/keyboards/mechlovin/serratus/config.h
+++ b/keyboards/mechlovin/serratus/config.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION ROW2COL
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 24
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json
index e5125314cb..ca23ddecf3 100644
--- a/keyboards/mechlovin/serratus/info.json
+++ b/keyboards/mechlovin/serratus/info.json
@@ -17,6 +17,9 @@
         "num_lock": "D7",
         "scroll_lock": "B4"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mechlovin/serratus/serratus.c b/keyboards/mechlovin/serratus/serratus.c
deleted file mode 100644
index b396e57bf5..0000000000
--- a/keyboards/mechlovin/serratus/serratus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "serratus.h"
diff --git a/keyboards/mechlovin/th1800/config.h b/keyboards/mechlovin/th1800/config.h
deleted file mode 100644
index 0dca95dfee..0000000000
--- a/keyboards/mechlovin/th1800/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, B7, D0, D1, D5, D6 }
-#define MATRIX_COL_PINS { A3, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, B3, B2, B0, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json
index 02efb8dc03..d42f6dbef6 100644
--- a/keyboards/mechlovin/th1800/info.json
+++ b/keyboards/mechlovin/th1800/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1800",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A3", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "B3", "B2", "B0", "B1"],
+        "rows": ["B6", "B7", "D0", "D1", "D5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A0",
         "num_lock": "A2",
diff --git a/keyboards/mechlovin/th1800/th1800.c b/keyboards/mechlovin/th1800/th1800.c
deleted file mode 100644
index f27b244c41..0000000000
--- a/keyboards/mechlovin/th1800/th1800.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "th1800.h"
diff --git a/keyboards/mechlovin/tmkl/config.h b/keyboards/mechlovin/tmkl/config.h
index 54cd52de76..e604c6bcfa 100644
--- a/keyboards/mechlovin/tmkl/config.h
+++ b/keyboards/mechlovin/tmkl/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A8, A4, A5, A3, A2, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 3
 
diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/info.json
index 5cdd06aa12..d6be668d13 100644
--- a/keyboards/mechlovin/tmkl/info.json
+++ b/keyboards/mechlovin/tmkl/info.json
@@ -7,6 +7,11 @@
         "pid": "0xC601",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
+        "rows": ["A8", "A4", "A5", "A3", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B8",
         "breathing": true
diff --git a/keyboards/mechlovin/tmkl/tmkl.c b/keyboards/mechlovin/tmkl/tmkl.c
deleted file mode 100644
index 22c4d3f0b8..0000000000
--- a/keyboards/mechlovin/tmkl/tmkl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "tmkl.h"
\ No newline at end of file
diff --git a/keyboards/mechlovin/tmkl/tmkl.h b/keyboards/mechlovin/tmkl/tmkl.h
index d31f61012a..3d30e61d89 100644
--- a/keyboards/mechlovin/tmkl/tmkl.h
+++ b/keyboards/mechlovin/tmkl/tmkl.h
@@ -30,6 +30,6 @@
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   KC_NO, K4B,   K4C,   K4D   }, \
+    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D   }, \
     { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D   }, \
 }
diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h
index 17467fd9fe..b3a4876ba0 100644
--- a/keyboards/mechlovin/zed60/config.h
+++ b/keyboards/mechlovin/zed60/config.h
@@ -17,33 +17,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B10, B2, B1, B0, A2 }
-#define MATRIX_COL_PINS { A10, A3, A9, A8, B15, B14, B13, B12, B5, B4, B3, A15, B7, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN A7
 #define RGBLED_NUM 22
 #define RGBLIGHT_LIMIT_VAL 255
 
 #define WS2812_SPI SPID1 // default: SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 5 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
 
-//#define RGB_DI_PIN E2
-//#ifdef RGB_DI_PIN
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json
index 3c0c450c69..6ee5954db4 100644
--- a/keyboards/mechlovin/zed60/info.json
+++ b/keyboards/mechlovin/zed60/info.json
@@ -8,9 +8,18 @@
         "pid": "0x0602",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B5", "B4", "B3", "A15", "B7", "B6"],
+        "rows": ["B10", "B2", "B1", "B0", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A4"
     },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "spi"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layout_aliases": {
diff --git a/keyboards/mechlovin/zed60/rules.mk b/keyboards/mechlovin/zed60/rules.mk
index a0a5d79843..622edc3408 100644
--- a/keyboards/mechlovin/zed60/rules.mk
+++ b/keyboards/mechlovin/zed60/rules.mk
@@ -10,4 +10,3 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = spi
diff --git a/keyboards/mechlovin/zed60/zed60.c b/keyboards/mechlovin/zed60/zed60.c
deleted file mode 100644
index fb0c44ec3d..0000000000
--- a/keyboards/mechlovin/zed60/zed60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "zed60.h"
diff --git a/keyboards/mechlovin/zed65/config.h b/keyboards/mechlovin/zed65/config.h
deleted file mode 100644
index 40392b609a..0000000000
--- a/keyboards/mechlovin/zed65/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h
index 233d2b8fd0..3bbf0bb2e6 100644
--- a/keyboards/mechlovin/zed65/mono_led/config.h
+++ b/keyboards/mechlovin/zed65/mono_led/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B12, A6, A5, A4, A3 }
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B2, B1, A15, B3, B9, B8, B7, B6, B5, B4 }
-
-
 #ifdef LED_MATRIX_ENABLE
 // This is a 7-bit address, that gets left-shifted and bit 0
 // set to 0 for write, 1 for read (as per I2C protocol)
@@ -66,8 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VIA_QMK_LED_MATRIX_ENABLE
 #endif
 
-#define RGB_DI_PIN A7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 24
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -84,4 +77,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json
index 75fcb44ae3..25dc91a8f9 100644
--- a/keyboards/mechlovin/zed65/mono_led/info.json
+++ b/keyboards/mechlovin/zed65/mono_led/info.json
@@ -8,15 +8,246 @@
         "pid": "0x6503",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A7"
+    },
+    "led_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"],
+        "rows": ["B12", "A6", "A5", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,14", "x":13.5, "y":1, "w":1.5}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,13", "x":13.75, "y":2, "w":1.25}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,14", "x":14, "y":3}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,13", "x":13, "y":4}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi_blocker": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,14", "x":13.5, "y":1, "w":1.5}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,14", "x":14, "y":3}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,13", "x":13, "y":4}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_iso_blocker": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,14", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,14", "x":14, "y":3}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,13", "x":13, "y":4}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/mono_led/mono_led.c b/keyboards/mechlovin/zed65/mono_led/mono_led.c
index b6bf37f98f..e618d41489 100644
--- a/keyboards/mechlovin/zed65/mono_led/mono_led.c
+++ b/keyboards/mechlovin/zed65/mono_led/mono_led.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "mono_led.h"
+#include "quantum.h"
 
 
 
diff --git a/keyboards/mechlovin/zed65/mono_led/mono_led.h b/keyboards/mechlovin/zed65/mono_led/mono_led.h
deleted file mode 100644
index e2f66a9144..0000000000
--- a/keyboards/mechlovin/zed65/mono_led/mono_led.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F,  \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C, KC_NO,   K1E,   K1F }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D, KC_NO,   K2F }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C, KC_NO,   K3E,   K3F }, \
-    { K40,   K41,   K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO, KC_NO,   K4A,   K4B, KC_NO,   K4D,   K4E,   K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2F,  \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F,  \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D, KC_NO,   K0F }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C, KC_NO,   K1E,   K1F }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B, KC_NO,   K2D, KC_NO,   K2F }, \
-    { K30, KC_NO,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C, KC_NO,   K3E,   K3F }, \
-    { K40,   K41,   K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO, KC_NO,   K4A,   K4B, KC_NO,   K4D,   K4E,   K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F,  \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D, KC_NO,   K0F }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C, KC_NO,   K1E,   K1F }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C, KC_NO, KC_NO,   K2F }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C, KC_NO,   K3E,   K3F }, \
-    { K40,   K41,   K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO, KC_NO,   K4A,   K4B, KC_NO,   K4D,   K4E,   K4F }, \
-}
diff --git a/keyboards/mechlovin/zed65/mono_led/rules.mk b/keyboards/mechlovin/zed65/mono_led/rules.mk
index 78624e6fd3..55d38a7b91 100644
--- a/keyboards/mechlovin/zed65/mono_led/rules.mk
+++ b/keyboards/mechlovin/zed65/mono_led/rules.mk
@@ -1,5 +1,4 @@
 
 NKRO_ENABLE = yes            # Enable N-Key Rollover
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = IS31FL3731
 RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/config.h b/keyboards/mechlovin/zed65/no_backlight/cor65/config.h
deleted file mode 100644
index 890026c2fc..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B12, B13, B14, B15, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A6, A5, A4, A3, A2, C13, B7, B6, B5, B4, B3 }
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c b/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c
deleted file mode 100644
index 632a595ece..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "cor65.h"
-
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.h b/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.h
deleted file mode 100644
index 5096a10cc3..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E,      K2F, \
-    K30, K31,      K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E, K3F, \
-    K40, K41, K42, K43,                K47,           K4A, K4B,           K4D, K4E, K4F  \
-) { \
-    { K00,  K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E, K0F  }, \
-    { K10,  K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E, K1F  }, \
-    { K20,  K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E, K2F  }, \
-    { K30,  K31, KC_NO,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E, K3F  }, \
-    { K40,  K41,   K42,   K43, KC_NO, KC_NO, KC_NO,   K47, KC_NO, KC_NO,   K4A,   K4B, KC_NO,   K4D,   K4E, K4F  }, \
-}
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30, K31,      K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
-    K40, K41, K42, K43,                K47,           K4A, K4B,      K4D, K4E, K4F  \
-) { \
-    { K00,  K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E, K0F  }, \
-    { K10,  K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E, K1F  }, \
-    { K20,  K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C, KC_NO,   K2E, K2F  }, \
-    { K30,  K31, KC_NO,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E, K3F  }, \
-    { K40,  K41,   K42,   K43, KC_NO, KC_NO, KC_NO,   K47, KC_NO, KC_NO,   K4A,   K4B, KC_NO,   K4D,   K4E, K4F  }, \
-}
-
-#define LAYOUT_winkeyless( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30, K31,      K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
-    K40, K41,      K43,                K47,                K4B,      K4D, K4E, K4F  \
-) { \
-    { K00,  K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E, K0F  }, \
-    { K10,  K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E, K1F  }, \
-    { K20,  K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C, KC_NO,   K2E, K2F  }, \
-    { K30,  K31, KC_NO,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E, K3F  }, \
-    { K40,  K41, KC_NO,   K43, KC_NO, KC_NO, KC_NO,   K47, KC_NO, KC_NO, KC_NO,   K4B, KC_NO,   K4D,   K4E, K4F  }, \
-}
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
index 2f0ea4817f..11fb617ac4 100644
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
@@ -8,19 +8,260 @@
         "pid": "0x6504",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "A2", "C13", "B7", "B6", "B5", "B4", "B3"],
+        "rows": ["B12", "B13", "B14", "B15", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B9",
         "on_state": 0
     },
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.25, "y":0}, {"label":"0,6", "x":6.25, "y":0}, {"label":"0,7", "x":7.25, "y":0}, {"label":"0,8", "x":8.25, "y":0}, {"label":"0,9", "x":9.25, "y":0}, {"label":"0,10", "x":10.25, "y":0}, {"label":"0,11", "x":11.25, "y":0}, {"label":"0,12", "x":12.25, "y":0}, {"label":"0,13", "x":13.25, "y":0}, {"label":"0,14", "x":14.25, "y":0}, {"label":"2,13", "x":15.25, "y":0}, {"label":"0,15", "x":16.75, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1.25, "y":1, "w":1.5}, {"label":"1,2", "x":2.75, "y":1}, {"label":"1,3", "x":3.75, "y":1}, {"label":"1,4", "x":4.75, "y":1}, {"label":"1,5", "x":5.75, "y":1}, {"label":"1,6", "x":6.75, "y":1}, {"label":"1,7", "x":7.75, "y":1}, {"label":"1,8", "x":8.75, "y":1}, {"label":"1,9", "x":9.75, "y":1}, {"label":"1,10", "x":10.75, "y":1}, {"label":"1,11", "x":11.75, "y":1}, {"label":"1,12", "x":12.75, "y":1}, {"label":"1,13", "x":13.75, "y":1}, {"label":"1,14", "x":14.75, "y":1, "w":1.5}, {"label":"1,15", "x":16.75, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1.25, "y":2, "w":1.75}, {"label":"2,2", "x":3, "y":2}, {"label":"2,3", "x":4, "y":2}, {"label":"2,4", "x":5, "y":2}, {"label":"2,5", "x":6, "y":2}, {"label":"2,6", "x":7, "y":2}, {"label":"2,7", "x":8, "y":2}, {"label":"2,8", "x":9, "y":2}, {"label":"2,9", "x":10, "y":2}, {"label":"2,10", "x":11, "y":2}, {"label":"2,11", "x":12, "y":2}, {"label":"2,12", "x":13, "y":2}, {"label":"2,14", "x":14, "y":2, "w":2.25}, {"label":"2,15", "x":16.75, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1.25, "y":3, "w":2.25}, {"label":"3,3", "x":3.5, "y":3}, {"label":"3,4", "x":4.5, "y":3}, {"label":"3,5", "x":5.5, "y":3}, {"label":"3,6", "x":6.5, "y":3}, {"label":"3,7", "x":7.5, "y":3}, {"label":"3,8", "x":8.5, "y":3}, {"label":"3,9", "x":9.5, "y":3}, {"label":"3,10", "x":10.5, "y":3}, {"label":"3,11", "x":11.5, "y":3}, {"label":"3,12", "x":12.5, "y":3}, {"label":"3,13", "x":13.5, "y":3, "w":1.75}, {"label":"3,15", "x":16.75, "y":3}, {"label":"3,14", "x":15.5, "y":3.25}, {"label":"4,0", "x":0, "y":4}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,3", "x":3.75, "y":4, "w":1.25}, {"label":"4,7", "x":5, "y":4, "w":6.25}, {"label":"4,10", "x":11.25, "y":4, "w":1.25}, {"label":"4,11", "x":12.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.5, "y":4.25}, {"label":"4,14", "x":15.5, "y":4.25}, {"label":"4,15", "x":16.5, "y":4.25}]       
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [2, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 16.75, "y": 3},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.25}
+            ]
         },
         "LAYOUT_65_ansi": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.25, "y":0}, {"label":"0,6", "x":6.25, "y":0}, {"label":"0,7", "x":7.25, "y":0}, {"label":"0,8", "x":8.25, "y":0}, {"label":"0,9", "x":9.25, "y":0}, {"label":"0,10", "x":10.25, "y":0}, {"label":"0,11", "x":11.25, "y":0}, {"label":"0,12", "x":12.25, "y":0}, {"label":"0,13", "x":13.25, "y":0}, {"label":"0,14", "x":14.25, "y":0, "w":2}, {"label":"0,15", "x":16.75, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1.25, "y":1, "w":1.5}, {"label":"1,2", "x":2.75, "y":1}, {"label":"1,3", "x":3.75, "y":1}, {"label":"1,4", "x":4.75, "y":1}, {"label":"1,5", "x":5.75, "y":1}, {"label":"1,6", "x":6.75, "y":1}, {"label":"1,7", "x":7.75, "y":1}, {"label":"1,8", "x":8.75, "y":1}, {"label":"1,9", "x":9.75, "y":1}, {"label":"1,10", "x":10.75, "y":1}, {"label":"1,11", "x":11.75, "y":1}, {"label":"1,12", "x":12.75, "y":1}, {"label":"1,13", "x":13.75, "y":1}, {"label":"1,14", "x":14.75, "y":1, "w":1.5}, {"label":"1,15", "x":16.75, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1.25, "y":2, "w":1.75}, {"label":"2,2", "x":3, "y":2}, {"label":"2,3", "x":4, "y":2}, {"label":"2,4", "x":5, "y":2}, {"label":"2,5", "x":6, "y":2}, {"label":"2,6", "x":7, "y":2}, {"label":"2,7", "x":8, "y":2}, {"label":"2,8", "x":9, "y":2}, {"label":"2,9", "x":10, "y":2}, {"label":"2,10", "x":11, "y":2}, {"label":"2,11", "x":12, "y":2}, {"label":"2,12", "x":13, "y":2}, {"label":"2,14", "x":14, "y":2, "w":2.25}, {"label":"2,15", "x":16.75, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1.25, "y":3, "w":2.25}, {"label":"3,3", "x":3.5, "y":3}, {"label":"3,4", "x":4.5, "y":3}, {"label":"3,5", "x":5.5, "y":3}, {"label":"3,6", "x":6.5, "y":3}, {"label":"3,7", "x":7.5, "y":3}, {"label":"3,8", "x":8.5, "y":3}, {"label":"3,9", "x":9.5, "y":3}, {"label":"3,10", "x":10.5, "y":3}, {"label":"3,11", "x":11.5, "y":3}, {"label":"3,12", "x":12.5, "y":3}, {"label":"3,13", "x":13.5, "y":3, "w":1.75}, {"label":"3,15", "x":16.75, "y":3}, {"label":"3,14", "x":15.5, "y":3.25}, {"label":"4,0", "x":0, "y":4}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,3", "x":3.75, "y":4, "w":1.25}, {"label":"4,7", "x":5, "y":4, "w":6.25}, {"label":"4,10", "x":11.25, "y":4, "w":1.25}, {"label":"4,11", "x":12.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.5, "y":4.25}, {"label":"4,14", "x":15.5, "y":4.25}, {"label":"4,15", "x":16.5, "y":4.25}]       
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 16.75, "y": 3},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.25}
+            ]
         },
         "LAYOUT_winkeyless": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.25, "y":0}, {"label":"0,6", "x":6.25, "y":0}, {"label":"0,7", "x":7.25, "y":0}, {"label":"0,8", "x":8.25, "y":0}, {"label":"0,9", "x":9.25, "y":0}, {"label":"0,10", "x":10.25, "y":0}, {"label":"0,11", "x":11.25, "y":0}, {"label":"0,12", "x":12.25, "y":0}, {"label":"0,13", "x":13.25, "y":0}, {"label":"0,14", "x":14.25, "y":0, "w":2}, {"label":"0,15", "x":16.75, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1.25, "y":1, "w":1.5}, {"label":"1,2", "x":2.75, "y":1}, {"label":"1,3", "x":3.75, "y":1}, {"label":"1,4", "x":4.75, "y":1}, {"label":"1,5", "x":5.75, "y":1}, {"label":"1,6", "x":6.75, "y":1}, {"label":"1,7", "x":7.75, "y":1}, {"label":"1,8", "x":8.75, "y":1}, {"label":"1,9", "x":9.75, "y":1}, {"label":"1,10", "x":10.75, "y":1}, {"label":"1,11", "x":11.75, "y":1}, {"label":"1,12", "x":12.75, "y":1}, {"label":"1,13", "x":13.75, "y":1}, {"label":"1,14", "x":14.75, "y":1, "w":1.5}, {"label":"1,15", "x":16.75, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1.25, "y":2, "w":1.75}, {"label":"2,2", "x":3, "y":2}, {"label":"2,3", "x":4, "y":2}, {"label":"2,4", "x":5, "y":2}, {"label":"2,5", "x":6, "y":2}, {"label":"2,6", "x":7, "y":2}, {"label":"2,7", "x":8, "y":2}, {"label":"2,8", "x":9, "y":2}, {"label":"2,9", "x":10, "y":2}, {"label":"2,10", "x":11, "y":2}, {"label":"2,11", "x":12, "y":2}, {"label":"2,12", "x":13, "y":2}, {"label":"2,14", "x":14, "y":2, "w":2.25}, {"label":"2,15", "x":16.75, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1.25, "y":3, "w":2.25}, {"label":"3,3", "x":3.5, "y":3}, {"label":"3,4", "x":4.5, "y":3}, {"label":"3,5", "x":5.5, "y":3}, {"label":"3,6", "x":6.5, "y":3}, {"label":"3,7", "x":7.5, "y":3}, {"label":"3,8", "x":8.5, "y":3}, {"label":"3,9", "x":9.5, "y":3}, {"label":"3,10", "x":10.5, "y":3}, {"label":"3,11", "x":11.5, "y":3}, {"label":"3,12", "x":12.5, "y":3}, {"label":"3,13", "x":13.5, "y":3, "w":1.75}, {"label":"3,15", "x":16.75, "y":3}, {"label":"3,14", "x":15.5, "y":3.25}, {"label":"4,0", "x":0, "y":4}, {"label":"4,1", "x":1.25, "y":4, "w":1.5}, {"label":"4,3", "x":3.75, "y":4, "w":1.5}, {"label":"4,7", "x":5.25, "y":4, "w":7}, {"label":"4,11", "x":12.25, "y":4, "w":1.5}, {"label":"4,13", "x":14.5, "y":4.25}, {"label":"4,14", "x":15.5, "y":4.25}, {"label":"4,15", "x":16.5, "y":4.25}]       
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 16.75, "y": 3},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 13], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.25}
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/config.h b/keyboards/mechlovin/zed65/no_backlight/retro66/config.h
index 4739a7c2b1..6786e3b953 100644
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/config.h
+++ b/keyboards/mechlovin/zed65/no_backlight/retro66/config.h
@@ -17,8 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B13, B14, A8, A1, A0 }
-#define MATRIX_COL_PINS { B11, B12, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, B3, A15, B5 }
-
 #define TAP_CODE_DELAY 10
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
index f14d88910b..a014cfb554 100644
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6601",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
+        "rows": ["B13", "B14", "A8", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B8"},
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c b/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c
deleted file mode 100644
index ffdf09db28..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "retro66.h"
-
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
index 67c1ffb2d6..6a0f857d25 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
@@ -17,21 +17,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B13, B14, A8, A1, A0 }
-#define MATRIX_COL_PINS { B11, B12, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, B3, A15, B5 }
-
-
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 24
 #define RGBLIGHT_LIMIT_VAL 255
 
 #define WS2812_SPI SPID2 // default: SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 0 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
 
-//#define RGB_DI_PIN E2
-//#ifdef RGB_DI_PIN
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
@@ -47,4 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
index e023f83396..fb00050ed8 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
@@ -8,9 +8,18 @@
         "pid": "0x6602",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
+        "rows": ["B13", "B14", "A8", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C14"
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "layout_aliases": {
         "LAYOUT_65_ansi_blocker": "LAYOUT_ansi_blocker",
         "LAYOUT_65_iso_blocker": "LAYOUT_iso_blocker"
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
index 48d473fbdb..84ef473c02 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
@@ -1,2 +1 @@
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-WS2812_DRIVER = spi
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/zed65.c b/keyboards/mechlovin/zed65/zed65.c
deleted file mode 100644
index 289c98d068..0000000000
--- a/keyboards/mechlovin/zed65/zed65.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "zed65.h"
diff --git a/keyboards/mechlovin/zed65/zed65.h b/keyboards/mechlovin/zed65/zed65.h
deleted file mode 100644
index 85bd4eb3d2..0000000000
--- a/keyboards/mechlovin/zed65/zed65.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mechlovin_zed65_no_backlight_retro66
-    #include "retro66.h"
-#elif KEYBOARD_mechlovin_zed65_no_backlight_wearhaus66
-    #include "wearhaus66.h"
-#elif KEYBOARD_mechlovin_zed65_no_backlight_cor65
-    #include "cor65.h"
-#elif KEYBOARD_mechlovin_zed65_mono_led
-    #include "mono_led.h"
-#endif
diff --git a/keyboards/mechstudio/dawn/config.h b/keyboards/mechstudio/dawn/config.h
deleted file mode 100644
index 4270fca037..0000000000
--- a/keyboards/mechstudio/dawn/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 David Dejaeghere
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B1,B2,B3,D1,D6,D4}
-#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D5,D3,D2}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechstudio/dawn/dawn.c b/keyboards/mechstudio/dawn/dawn.c
deleted file mode 100644
index 43edc785ad..0000000000
--- a/keyboards/mechstudio/dawn/dawn.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 David Dejaeghere
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dawn.h"
diff --git a/keyboards/mechstudio/dawn/info.json b/keyboards/mechstudio/dawn/info.json
index 4b4d6c5c26..e8bbcbb1ae 100644
--- a/keyboards/mechstudio/dawn/info.json
+++ b/keyboards/mechstudio/dawn/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0004",
     "device_version": "0.0.4"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D2"],
+    "rows": ["B1", "B2", "B3", "D1", "D6", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "qmk_lufa_bootloader": {
     "esc_input": "B1",
     "esc_output": "F0"
diff --git a/keyboards/mechstudio/ud_40_ortho/config.h b/keyboards/mechstudio/ud_40_ortho/config.h
index 41a6be19a4..48bffd7f7f 100644
--- a/keyboards/mechstudio/ud_40_ortho/config.h
+++ b/keyboards/mechstudio/ud_40_ortho/config.h
@@ -16,17 +16,6 @@
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {C2,B4,B5,B6}
-#define MATRIX_COL_PINS {C5,D0,B3,B2,B1,B0,D6,D5,D4,D3,D2,D1}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B7
- #ifdef RGB_DI_PIN
    #define RGBLED_NUM 10
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -43,4 +32,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
- #endif
diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json
index a517137f96..2b81a900db 100644
--- a/keyboards/mechstudio/ud_40_ortho/info.json
+++ b/keyboards/mechstudio/ud_40_ortho/info.json
@@ -8,16 +8,76 @@
     "pid": "0x0002",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["C5", "D0", "B3", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2", "D1"],
+    "rows": ["C2", "B4", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "qmk_lufa_bootloader": {
     "esc_input": "B7",
     "esc_output": "F0"
   },
+  "ws2812": {
+    "pin": "B7"
+  },
   "processor": "atmega32u2",
   "bootloader": "qmk-dfu",
   "community_layouts": ["ortho_4x12"],
   "layouts": {
     "LAYOUT_ortho_4x12": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/mechstudio/ud_40_ortho/ud_40_ortho.c b/keyboards/mechstudio/ud_40_ortho/ud_40_ortho.c
deleted file mode 100644
index 054684e7bd..0000000000
--- a/keyboards/mechstudio/ud_40_ortho/ud_40_ortho.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 David Dejaeghere
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ud_40_ortho.h"
diff --git a/keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h b/keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h
deleted file mode 100644
index 6e0b608e7b..0000000000
--- a/keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 David Dejaeghere
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_4x12( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) { \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
diff --git a/keyboards/mechwild/bbs/config.h b/keyboards/mechwild/bbs/config.h
index 10bf4dd23e..a8c1b6243a 100644
--- a/keyboards/mechwild/bbs/config.h
+++ b/keyboards/mechwild/bbs/config.h
@@ -7,22 +7,6 @@
 /* allows the "key" button on the blackpill to toggle caps lock for user testing before soldering */
 #define DIP_SWITCH_PINS { A0 }
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B12, B10, B13, B1, B14 }
-#define MATRIX_COL_PINS { B0, A7, A6, A5, A4, A3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json
index 0adaf90bf7..bdc29e68ac 100644
--- a/keyboards/mechwild/bbs/info.json
+++ b/keyboards/mechwild/bbs/info.json
@@ -8,6 +8,11 @@
         "pid": "0x170E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "A7", "A6", "A5", "A4", "A3"],
+        "rows": ["B12", "B10", "B13", "B1", "B14"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C13",
         "on_state": 0
@@ -18,38 +23,38 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"k00", "x":0, "y":0.5},
-                {"label":"k01", "x":1, "y":0.5},
-                {"label":"k02", "x":2, "y":0.25},
-                {"label":"k03", "x":3, "y":0.125},
-                {"label":"k04", "x":4, "y":0.25},
-                {"label":"k05", "x":5, "y":0.25},
-                {"label":"k06", "x":6.75, "y":0.25},
-                {"label":"k07", "x":7.75, "y":0.25},
-                {"label":"k08", "x":8.75, "y":0.125},
-                {"label":"k09", "x":9.75, "y":0.25},
-                {"label":"k0A", "x":10.75, "y":0.5},
-                {"label":"k0B", "x":11.75, "y":0.5},
+                {"x":0, "y":0.375},
+                {"x":1, "y":0.375},
+                {"x":2, "y":0.125},
+                {"x":3, "y":0},
+                {"x":4, "y":0.125},
+                {"x":5, "y":0.125},
+                {"x":6.75, "y":0.125},
+                {"x":7.75, "y":0.125},
+                {"x":8.75, "y":0},
+                {"x":9.75, "y":0.125},
+                {"x":10.75, "y":0.375},
+                {"x":11.75, "y":0.375},
 
-                {"label":"k10", "x":0, "y":1.5},
-                {"label":"k11", "x":1, "y":1.5},
-                {"label":"k12", "x":2, "y":1.25},
-                {"label":"k13", "x":3, "y":1.125},
-                {"label":"k14", "x":4, "y":1.25},
-                {"label":"k15", "x":5, "y":1.25},
-                {"label":"k16", "x":6.75, "y":1.25},
-                {"label":"k17", "x":7.75, "y":1.25},
-                {"label":"k18", "x":8.75, "y":1.125},
-                {"label":"k19", "x":9.75, "y":1.25},
-                {"label":"k1A", "x":10.75, "y":1.5},
-                {"label":"k1B", "x":11.75, "y":1.5},
+                {"x":0, "y":1.375},
+                {"x":1, "y":1.375},
+                {"x":2, "y":1.125},
+                {"x":3, "y":1},
+                {"x":4, "y":1.125},
+                {"x":5, "y":1.125},
+                {"x":6.75, "y":1.125},
+                {"x":7.75, "y":1.125},
+                {"x":8.75, "y":1},
+                {"x":9.75, "y":1.125},
+                {"x":10.75, "y":1.375},
+                {"x":11.75, "y":1.375},
 
-                {"label":"k23", "x":2.75, "y":3.25, "h":1.5},
-                {"label":"k24", "x":3.75, "y":3.25, "h":1.5},
-                {"label":"k25", "x":4.75, "y":3, "h":1.5},
-                {"label":"k26", "x":7, "y":3, "h":1.5},
-                {"label":"k27", "x":8, "y":3.25, "h":1.5},
-                {"label":"k28", "x":9, "y":3.25, "h":1.5}
+                {"x":2.75, "y":3.125, "h":1.5},
+                {"x":3.75, "y":3.125, "h":1.5},
+                {"x":4.75, "y":2.875, "h":1.5},
+                {"x":7, "y":2.875, "h":1.5},
+                {"x":8, "y":3.125, "h":1.5},
+                {"x":9, "y":3.125, "h":1.5}
             ]
         }
     }
diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/info.json
index 5aa4ac1e80..6def1c9fbe 100644
--- a/keyboards/mechwild/bde/lefty/info.json
+++ b/keyboards/mechwild/bde/lefty/info.json
@@ -11,7 +11,6 @@
     "diode_direction": "ROW2COL",
     "rgblight": {
         "led_count": 16,
-        "pin": "D2",
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -25,6 +24,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/mechwild/bde/lefty/keymaps/default/config.h b/keyboards/mechwild/bde/lefty/keymaps/default/config.h
index 5c2d15a006..c8b98febcd 100644
--- a/keyboards/mechwild/bde/lefty/keymaps/default/config.h
+++ b/keyboards/mechwild/bde/lefty/keymaps/default/config.h
@@ -15,8 +15,6 @@
  */
 
 #pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
 #define TAPPING_TERM 250
diff --git a/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h
index 8476c8ccd6..656cf1a794 100644
--- a/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h
+++ b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h
@@ -15,8 +15,6 @@
  */
 
 #pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
 #define TAPPING_TERM 250
diff --git a/keyboards/mechwild/bde/lefty/keymaps/via/config.h b/keyboards/mechwild/bde/lefty/keymaps/via/config.h
index 8476c8ccd6..656cf1a794 100644
--- a/keyboards/mechwild/bde/lefty/keymaps/via/config.h
+++ b/keyboards/mechwild/bde/lefty/keymaps/via/config.h
@@ -15,8 +15,6 @@
  */
 
 #pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
 #define TAPPING_TERM 250
diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json
index 4d27c53895..a50d2abaa5 100644
--- a/keyboards/mechwild/bde/rev2/info.json
+++ b/keyboards/mechwild/bde/rev2/info.json
@@ -16,7 +16,6 @@
     "diode_direction": "COL2ROW",
     "rgblight": {
         "led_count": 8,
-        "pin": "B6",
         "animations": {
             "rainbow_swirl": true
         },
@@ -24,6 +23,9 @@
         "saturation_steps": 8,
         "brightness_steps": 8
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/mechwild/bde/rev2/keymaps/via/config.h b/keyboards/mechwild/bde/rev2/keymaps/via/config.h
index d09385ca5d..9630c999ff 100644
--- a/keyboards/mechwild/bde/rev2/keymaps/via/config.h
+++ b/keyboards/mechwild/bde/rev2/keymaps/via/config.h
@@ -15,8 +15,6 @@
  */
 
 #pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
 #define TAPPING_TERM 250
diff --git a/keyboards/mechwild/bde/rev2/rev2.c b/keyboards/mechwild/bde/rev2/rev2.c
index 3dae312e2b..3d83144024 100644
--- a/keyboards/mechwild/bde/rev2/rev2.c
+++ b/keyboards/mechwild/bde/rev2/rev2.c
@@ -14,23 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev2.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    switch (index) {
-        case 0:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        break;
-    }
-    return true;
-}
-#endif
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 static const char PROGMEM mw_logo[] = {
diff --git a/keyboards/mechwild/bde/rev2/rev2.h b/keyboards/mechwild/bde/rev2/rev2.h
deleted file mode 100644
index bb37c7ef69..0000000000
--- a/keyboards/mechwild/bde/rev2/rev2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2022 Kyle McCreery 
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/righty/info.json
index af23e6e293..0cf78b35a6 100644
--- a/keyboards/mechwild/bde/righty/info.json
+++ b/keyboards/mechwild/bde/righty/info.json
@@ -11,7 +11,6 @@
     "diode_direction": "ROW2COL",
     "rgblight": {
         "led_count": 16,
-        "pin": "D2",
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -25,6 +24,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/mechwild/bde/righty/keymaps/default/config.h b/keyboards/mechwild/bde/righty/keymaps/default/config.h
index 5c2d15a006..2507b2e612 100644
--- a/keyboards/mechwild/bde/righty/keymaps/default/config.h
+++ b/keyboards/mechwild/bde/righty/keymaps/default/config.h
@@ -15,9 +15,6 @@
  */
 
 #pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
-
 /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
 #define TAPPING_TERM 250
 
diff --git a/keyboards/mechwild/bde/righty/keymaps/via/config.h b/keyboards/mechwild/bde/righty/keymaps/via/config.h
index 5c2d15a006..c8b98febcd 100644
--- a/keyboards/mechwild/bde/righty/keymaps/via/config.h
+++ b/keyboards/mechwild/bde/righty/keymaps/via/config.h
@@ -15,8 +15,6 @@
  */
 
 #pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
 #define TAPPING_TERM 250
diff --git a/keyboards/mechwild/mercutio/config.h b/keyboards/mechwild/mercutio/config.h
index 070fe36eb7..f9f13d9ac0 100755
--- a/keyboards/mechwild/mercutio/config.h
+++ b/keyboards/mechwild/mercutio/config.h
@@ -17,16 +17,8 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D4, C3, C0, C1, C2}
-#define MATRIX_COL_PINS { B0, D7, D6, D5, B1, B2, B3}
-
 #define TAP_CODE_DELAY 10
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Define custom font */
 #define OLED_FONT_H "lib/mercutiofont.c"
 
diff --git a/keyboards/mechwild/mercutio/info.json b/keyboards/mechwild/mercutio/info.json
index 98c815c6a8..20207a6ef6 100644
--- a/keyboards/mechwild/mercutio/info.json
+++ b/keyboards/mechwild/mercutio/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1703",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B0", "D7", "D6", "D5", "B1", "B2", "B3"],
+        "rows": ["D0", "D1", "D4", "C3", "C0", "C1", "C2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"}
diff --git a/keyboards/mechwild/mercutio/mercutio.c b/keyboards/mechwild/mercutio/mercutio.c
index 890bf869de..c0369397d1 100755
--- a/keyboards/mechwild/mercutio/mercutio.c
+++ b/keyboards/mechwild/mercutio/mercutio.c
@@ -17,25 +17,6 @@
 
 #include "mercutio.h"
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if(!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-
-    switch (index) {
-        case 0:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        break;
-    }
-    return true;
-}
-#endif
-
 #ifdef OLED_ENABLE
 static const char PROGMEM mercutio_name[] = {
     0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0x95, 0xB5, 0x96, 0xD5, 0xB6, 0xB6,
diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
index 92a8dfa323..dd67669e92 100644
--- a/keyboards/mechwild/mokulua/mirrored/config.h
+++ b/keyboards/mechwild/mokulua/mirrored/config.h
@@ -3,16 +3,8 @@
 
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
 #define TAP_CODE_DELAY 10
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define OLED_FONT_H "keyboards/mechwild/mokulua/glcdfont.c"
 
 #define MASTER_LEFT
@@ -25,8 +17,6 @@
 #define SPLIT_OLED_ENABLE
 
 /* RGB options */
-#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -43,7 +33,6 @@
 //#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //#    define RGBLIGHT_EFFECT_RGB_TEST
 //#    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index 29d2497cc1..2ef17fd3aa 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/info.json
@@ -8,6 +8,11 @@
         "pid": "0x170C",
         "device_version": "1.0.3"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "B2"}
@@ -16,6 +21,9 @@
     "split": {
         "soft_serial_pin": "D3"
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
index b720c271b2..4312b373ac 100644
--- a/keyboards/mechwild/mokulua/standard/config.h
+++ b/keyboards/mechwild/mokulua/standard/config.h
@@ -3,16 +3,8 @@
 
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
 #define TAP_CODE_DELAY 10
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define OLED_FONT_H "keyboards/mechwild/mokulua/glcdfont.c"
 
 #define MASTER_LEFT
@@ -25,8 +17,6 @@
 #define SPLIT_OLED_ENABLE
 
 /* RGB options */
-#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -43,7 +33,6 @@
 //#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //#    define RGBLIGHT_EFFECT_RGB_TEST
 //#    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index d3451698f6..18594c39ed 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/info.json
@@ -8,6 +8,11 @@
         "pid": "0x170B",
         "device_version": "1.0.3"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "B2"}
@@ -16,6 +21,9 @@
     "split": {
         "soft_serial_pin": "D3"
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index d3158c3306..ce04115635 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -17,20 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { F5, B2, B3, B1, F7, F6 }
-#define MATRIX_COL_PINS { B5, D7, C6, D4, B6 }
-
 #define TAP_CODE_DELAY 10
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define OLED_FONT_H "keyboards/mechwild/murphpad/lib/murphpadfont.c"
 
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 8
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -47,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json
index 92af56f0dd..29247492ca 100644
--- a/keyboards/mechwild/murphpad/info.json
+++ b/keyboards/mechwild/murphpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1705",
         "device_version": "3.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "D7", "C6", "D4", "B6"],
+        "rows": ["F5", "B2", "B3", "B1", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "E6", "pin_b": "B4"},
@@ -17,18 +22,50 @@
     "bootmagic": {
         "matrix": [0, 1]
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 1, "y": 0}, {"label": "k01", "x": 2, "y": 0}, {"label": "k02", "x": 3, "y": 0}, {"label": "k03", "x": 4, "y": 0},
-				{"label": "k10", "x": 1, "y": 1}, {"label": "k11", "x": 2, "y": 1}, {"label": "k12", "x": 3, "y": 1}, {"label": "k13", "x": 4, "y": 1},
-                {"label": "k20", "x": 1, "y": 2}, {"label": "k21", "x": 2, "y": 2}, {"label": "k22", "x": 3, "y": 2}, {"label": "k23", "x": 4, "y": 2},
-                {"label": "k30", "x": 0, "y": 3}, {"label": "k31", "x": 1, "y": 3}, {"label": "k32", "x": 2, "y": 3}, {"label": "k33", "x": 3, "y": 3}, {"label": "k34", "x": 4, "y": 3}, 
-                {"label": "k40", "x": 0, "y": 4}, {"label": "k41", "x": 1, "y": 4}, {"label": "k42", "x": 2, "y": 4}, {"label": "k43", "x": 3, "y": 4}, {"label": "k44", "x": 4, "y": 4}, 
-                {"label": "k50", "x": 0, "y": 5}, {"label": "k51", "x": 1, "y": 5}, {"label": "k52", "x": 2, "y": 5}, {"label": "k53", "x": 3, "y": 5}, {"label": "k54", "x": 4, "y": 5}, 
-				{"label": "BACK00", "x": 1, "y": 6}, {"label": "BACK01", "x": 2, "y": 6}, {"label": "BACK02", "x": 3, "y": 6}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "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": [0, 0], "x": 1, "y": 6},
+                {"matrix": [1, 0], "x": 2, "y": 6},
+                {"matrix": [2, 0], "x": 3, "y": 6}
             ]
         }
     }
diff --git a/keyboards/mechwild/murphpad/murphpad.c b/keyboards/mechwild/murphpad/murphpad.c
index ba5183f2c3..3ad6409e92 100644
--- a/keyboards/mechwild/murphpad/murphpad.c
+++ b/keyboards/mechwild/murphpad/murphpad.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "murphpad.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/mechwild/murphpad/murphpad.h b/keyboards/mechwild/murphpad/murphpad.h
deleted file mode 100644
index 2735e22057..0000000000
--- a/keyboards/mechwild/murphpad/murphpad.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-         k00, k01, k02, k03, \
-         k10, k11, k12, k13, \
-         k20, k21, k22, k23, \
-    k30, k31, k32, k33, k34, \
-    k40, k41, k42, k43, k44, \
-    k50, k51, k52, k53, k54, \
-	\
-	     BACK00, BACK01, BACK02 \
-\
-) { \
-    { BACK00, k00, k01, k02, k03 }, \
-    { BACK01, k10, k11, k12, k13 },  \
-    { BACK02, k20, k21, k22, k23 },  \
-    { k30, k31, k32, k33, k34 },     \
-    { k40, k41, k42, k43, k44 },     \
-    { k50, k51, k52, k53, k54 }      \
-}
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index 72efdae1e2..b01fcda5ef 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -17,28 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A8, B15, B14, B13, B12, A15, B3 }
-#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
-
 #define TAP_CODE_DELAY 10
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB settings, uncomment this define to enable RGB */
-#define RGB_DI_PIN A0
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 10
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -55,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index cbe9f7cfa8..853d7ebcc3 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1707",
         "device_version": "2.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"],
+        "rows": ["A8", "B15", "B14", "B13", "B12", "A15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B4"}
@@ -20,79 +25,86 @@
     "bootmagic": {
         "matrix": [5, 4]
     },
+    "ws2812": {
+        "pin": "A0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k55", "x": 0.3, "y": 0}, 
-                {"label": "k54", "x": 1.72, "y": 0}, 
-                {"label": "k53", "x": 2.72, "y": 0}, 
-                {"label": "k52", "x": 4.00, "y": 0}, 
-                {"label": "k51", "x": 5, "y": 0}, 
-                {"label": "k50", "x": 6, "y": 0}, 
-                {"label": "k00", "x": 7, "y": 0}, 
-                {"label": "k01", "x": 8, "y": 0}, 
-                {"label": "k02", "x": 10.75, "y": 0}, 
-                {"label": "k03", "x": 11.75, "y": 0}, 
-                {"label": "k04", "x": 12.75, "y": 0}, 
-                {"label": "k05", "x": 13.75, "y": 0}, 
-                {"label": "k06", "x": 15, "y": 0}, 
-                {"label": "k07", "x": 16, "y": 0}, 
-                {"label": "k08", "x": 17, "y": 0}, 
-                {"label": "k09", "x": 18, "y": 0},
-                {"label": "k65", "x": 0.2, "y": 1}, 
-                {"label": "k59", "x": 1.47, "y": 1, "w": 1.5}, 
-                {"label": "k58", "x": 2.97, "y": 1}, 
-                {"label": "k57", "x": 4.50, "y": 1}, 
-                {"label": "k56", "x": 5.5, "y": 1}, 
-                {"label": "k10", "x": 6.5, "y": 1}, 
-                {"label": "k11", "x": 7.5, "y": 1}, 
-                {"label": "k12", "x": 10.25, "y": 1}, 
-                {"label": "k13", "x": 11.25, "y": 1}, 
-                {"label": "k14", "x": 12.25, "y": 1}, 
-                {"label": "k15", "x": 13.25, "y": 1}, 
-                {"label": "k16", "x": 14.75, "y": 1}, 
-                {"label": "k17", "x": 15.75, "y": 1}, 
-                {"label": "k18", "x": 16.75, "y": 1}, 
-                {"label": "k19", "x": 17.75, "y": 1, "w": 1.5},
-                {"label": "k64", "x": 0.1, "y": 2}, 
-                {"label": "k69", "x": 1.40, "y": 2, "w": 1.75}, 
-                {"label": "k68", "x": 3.12, "y": 2}, 
-                {"label": "k63", "x": 4.75, "y": 2}, 
-                {"label": "k20", "x": 5.75, "y": 2}, 
-                {"label": "k21", "x": 6.75, "y": 2}, 
-                {"label": "k22", "x": 7.75, "y": 2}, 
-                {"label": "k23", "x": 10.5, "y": 2}, 
-                {"label": "k24", "x": 11.5, "y": 2}, 
-                {"label": "k25", "x": 12.5, "y": 2}, 
-                {"label": "k26", "x": 13.5, "y": 2}, 
-                {"label": "k27", "x": 15.1, "y": 2}, 
-                {"label": "k28", "x": 16.1, "y": 2}, 
-                {"label": "k29", "x": 17.1, "y": 2, "w": 2.25},
-                {"label": "k62", "x": 1.22, "y": 3, "w": 2.25}, 
-                {"label": "k60", "x": 3.47, "y": 3}, 
-                {"label": "k67", "x": 5.25, "y": 3}, 
-                {"label": "k66", "x": 6.25, "y": 3}, 
-                {"label": "k30", "x": 7.25, "y": 3}, 
-                {"label": "k31", "x": 8.25, "y": 3}, 
-                {"label": "k32", "x": 10, "y": 3}, 
-                {"label": "k33", "x": 11, "y": 3}, 
-                {"label": "k34", "x": 12, "y": 3}, 
-                {"label": "k35", "x": 13, "y": 3}, 
-                {"label": "k36", "x": 14.75, "y": 3}, 
-                {"label": "k37", "x": 15.75, "y": 3}, 
-                {"label": "k38", "x": 16.75, "y": 3}, 
-                {"label": "k39", "x": 17.75, "y": 3, "w": 1.75},
-                {"label": "k61", "x": 1.25, "y": 4, "w": 1.25}, 
-                {"label": "k40", "x": 2.72, "y": 4, "w": 1.25}, 
-                {"label": "k41", "x": 5.25, "y": 4, "w": 1.25}, 
-                {"label": "k42", "x": 6.50, "y": 4, "w": 2.25}, 
-                {"label": "k43", "x": 8.75, "y": 4}, 
-                {"label": "k44", "x": 10, "y": 4, "w": 2.75}, 
-                {"label": "k45", "x": 12.75, "y": 4}, 
-                {"label": "k46", "x": 14.75, "y": 4}, 
-                {"label": "k47", "x": 15.75, "y": 4}, 
-                {"label": "k48", "x": 16.75, "y": 4},
-                {"label": "k49", "x": 17.75, "y": 4}
+                {"x": 0.2, "y": 0},
+                {"x": 1.62, "y": 0},
+                {"x": 2.62, "y": 0},
+                {"x": 3.9, "y": 0},
+                {"x": 4.9, "y": 0},
+                {"x": 5.9, "y": 0},
+                {"x": 6.9, "y": 0},
+                {"x": 7.9, "y": 0},
+                {"x": 10.65, "y": 0},
+                {"x": 11.65, "y": 0},
+                {"x": 12.65, "y": 0},
+                {"x": 13.65, "y": 0},
+                {"x": 14.9, "y": 0},
+                {"x": 15.9, "y": 0},
+                {"x": 16.9, "y": 0},
+                {"x": 17.9, "y": 0},
+
+                {"x": 0.1, "y": 1},
+                {"x": 1.37, "y": 1, "w": 1.5},
+                {"x": 2.87, "y": 1},
+                {"x": 4.4, "y": 1},
+                {"x": 5.4, "y": 1},
+                {"x": 6.4, "y": 1},
+                {"x": 7.4, "y": 1},
+                {"x": 10.15, "y": 1},
+                {"x": 11.15, "y": 1},
+                {"x": 12.15, "y": 1},
+                {"x": 13.15, "y": 1},
+                {"x": 14.65, "y": 1},
+                {"x": 15.65, "y": 1},
+                {"x": 16.65, "y": 1},
+                {"x": 17.65, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2},
+                {"x": 1.3, "y": 2, "w": 1.75},
+                {"x": 3.02, "y": 2},
+                {"x": 4.65, "y": 2},
+                {"x": 5.65, "y": 2},
+                {"x": 6.65, "y": 2},
+                {"x": 7.65, "y": 2},
+                {"x": 10.4, "y": 2},
+                {"x": 11.4, "y": 2},
+                {"x": 12.4, "y": 2},
+                {"x": 13.4, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 17, "y": 2, "w": 2.25},
+
+                {"x": 1.12, "y": 3, "w": 2.25},
+                {"x": 3.37, "y": 3},
+                {"x": 5.15, "y": 3},
+                {"x": 6.15, "y": 3},
+                {"x": 7.15, "y": 3},
+                {"x": 8.15, "y": 3},
+                {"x": 9.9, "y": 3},
+                {"x": 10.9, "y": 3},
+                {"x": 11.9, "y": 3},
+                {"x": 12.9, "y": 3},
+                {"x": 14.65, "y": 3},
+                {"x": 15.65, "y": 3},
+                {"x": 16.65, "y": 3},
+                {"x": 17.65, "y": 3, "w": 1.75},
+
+                {"x": 1.15, "y": 4, "w": 1.25},
+                {"x": 2.62, "y": 4, "w": 1.25},
+                {"x": 5.15, "y": 4, "w": 1.25},
+                {"x": 6.4, "y": 4, "w": 2.25},
+                {"x": 8.65, "y": 4},
+                {"x": 9.9, "y": 4, "w": 2.75},
+                {"x": 12.65, "y": 4},
+                {"x": 14.65, "y": 4},
+                {"x": 15.65, "y": 4},
+                {"x": 16.65, "y": 4},
+                {"x": 17.65, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mechwild/obe/obe.c b/keyboards/mechwild/obe/obe.c
index 195d4a7679..548f955825 100644
--- a/keyboards/mechwild/obe/obe.c
+++ b/keyboards/mechwild/obe/obe.c
@@ -15,19 +15,3 @@
  */
 
 #include "obe.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    switch (index) {
-        case 0:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        break;
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/mechwild/obe/obe.h b/keyboards/mechwild/obe/obe.h
index b2b22b37e3..8c57aa283b 100644
--- a/keyboards/mechwild/obe/obe.h
+++ b/keyboards/mechwild/obe/obe.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-//#ifdef KEYBOARD_mechwild_obe_eeprom
-//#    include "eeprom.h"
-//#endif
-
 #include "quantum.h"
 
 /* This is a shortcut to help you visually see your layout.
diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
index bf2e1a0b58..4bb69498e9 100644
--- a/keyboards/mechwild/puckbuddy/config.h
+++ b/keyboards/mechwild/puckbuddy/config.h
@@ -18,19 +18,6 @@
  */
 #define TAPPING_TERM 0
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B12, B13, B14, B15 }
-#define MATRIX_COL_PINS { B10, A8, B4, B5 }
-
 /* spi config */
 #define SPI_DRIVER SPID1
 #define SPI_SCK_PIN A5
@@ -44,12 +31,7 @@
 
 #define TAP_CODE_DELAY 10
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB settings, uncomment this define to enable RGB */
-#define RGB_DI_PIN A3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 3
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -65,7 +47,6 @@
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json
index 825def96a2..b8e653be6b 100644
--- a/keyboards/mechwild/puckbuddy/info.json
+++ b/keyboards/mechwild/puckbuddy/info.json
@@ -8,6 +8,11 @@
         "pid": "0x170F",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B10", "A8", "B4", "B5"],
+        "rows": ["B12", "B13", "B14", "B15"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B0"},
@@ -18,27 +23,35 @@
         "caps_lock": "C13",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "A3"
+    },
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F401",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1.5, "y":0},
-                {"label":"k02", "x":2.5, "y":0},
-                {"label":"k03", "x":3.5, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k10", "x":0, "y":1.25},
-                {"label":"k15", "x":5, "y":1.25},
-                {"label":"k20", "x":0, "y":2.25},
-                {"label":"k25", "x":5, "y":2.25},
-                {"label":"k30", "x":0, "y":3.25},
-                {"label":"k35", "x":5, "y":3.25},
-                {"label":"k31", "x":1, "y":4.5},
-                {"label":"k32", "x":2, "y":4.5},
-                {"label":"k33", "x":3, "y":4.5},
-                {"label":"k34", "x":4, "y":4.5}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [1, 1], "x": 2.5, "y": 0},
+                {"matrix": [2, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 2], "x": 5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 2], "x": 5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 2], "x": 5, "y": 3.25},
+
+                {"matrix": [0, 3], "x": 1, "y": 4.5},
+                {"matrix": [1, 3], "x": 2, "y": 4.5},
+                {"matrix": [2, 3], "x": 3, "y": 4.5},
+                {"matrix": [3, 3], "x": 4, "y": 4.5}
+            ]
         }
     }
 }
diff --git a/keyboards/mechwild/puckbuddy/puckbuddy.h b/keyboards/mechwild/puckbuddy/puckbuddy.h
index 31bcad6917..294cdb1839 100644
--- a/keyboards/mechwild/puckbuddy/puckbuddy.h
+++ b/keyboards/mechwild/puckbuddy/puckbuddy.h
@@ -5,29 +5,6 @@
 
 #include "quantum.h"
 
-#define ___ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03,      k05,\
-    k10,                     k15,\
-    k20,                     k25,\
-    k30,                     k35,\
-         k31, k32, k33, k34      \
-) { \
-    { k00, k01, k05, k31 }, \
-    { k10, k02, k15, k32 }, \
-    { k20, k03, k25, k33 }, \
-    { k30, ___, k35, k34 }  \
-}
-
 typedef union {
     uint32_t raw;
     struct {
diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json
index 9d9ee27eb5..084331d669 100644
--- a/keyboards/mechwild/sugarglider/info.json
+++ b/keyboards/mechwild/sugarglider/info.json
@@ -24,7 +24,6 @@
     "diode_direction": "COL2ROW",
     "rgblight": {
         "led_count": 10,
-        "pin": "B5",
         "max_brightness": 255,
         "hue_steps": 8,
         "saturation_steps": 8,
@@ -42,6 +41,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "encoder": {
         "rotary": [
             { "pin_a": "B0",  "pin_b": "A2",  "resolution": 4 },
diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h
index 88b160a980..5be535ab1e 100644
--- a/keyboards/mechwild/waka60/config.h
+++ b/keyboards/mechwild/waka60/config.h
@@ -17,28 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B8, B4, B3, B9, A15, B12, B13, B14, B15, A8 }
-#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, A5, A4 }
-
 #define TAP_CODE_DELAY 10
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB settings, uncomment this define to enable RGB */
-#define RGB_DI_PIN A1
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 3
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -55,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json
index eb7d2d9f54..1f41cf4617 100644
--- a/keyboards/mechwild/waka60/info.json
+++ b/keyboards/mechwild/waka60/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1709",
         "device_version": "1.0.1"
     },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["B8", "B4", "B3", "B9", "A15", "B12", "B13", "B14", "B15", "A8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A3", "pin_b": "A2"}
diff --git a/keyboards/mechwild/waka60/waka60.c b/keyboards/mechwild/waka60/waka60.c
index 180d0a6786..f0c5f143e4 100644
--- a/keyboards/mechwild/waka60/waka60.c
+++ b/keyboards/mechwild/waka60/waka60.c
@@ -15,19 +15,3 @@
  */
 
 #include "waka60.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    switch (index) {
-        case 0:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        break;
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/mecxlabs/mp1/info.json b/keyboards/mecxlabs/mp1/info.json
index db989e5517..4ab194f883 100644
--- a/keyboards/mecxlabs/mp1/info.json
+++ b/keyboards/mecxlabs/mp1/info.json
@@ -31,15 +31,15 @@
     "layouts": {
         "LAYOUT_ortho_3x3": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.0 },
-                { "matrix": [2, 0], "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.0, "y": 2.0 },
-                { "matrix": [2, 2], "x": 2.0, "y": 2.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 }
             ]
         }
     }
diff --git a/keyboards/mehkee96/config.h b/keyboards/mehkee96/config.h
index 2066e16662..e5f456306d 100644
--- a/keyboards/mehkee96/config.h
+++ b/keyboards/mehkee96/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 18
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mehkee96/info.json b/keyboards/mehkee96/info.json
index 40f4cd71b4..7a95a92fc2 100644
--- a/keyboards/mehkee96/info.json
+++ b/keyboards/mehkee96/info.json
@@ -8,9 +8,17 @@
         "pid": "0x422D",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1",
         "num_lock": "D0"
diff --git a/keyboards/mehkee96/mehkee96.c b/keyboards/mehkee96/mehkee96.c
deleted file mode 100644
index d9e2bac7a5..0000000000
--- a/keyboards/mehkee96/mehkee96.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "mehkee96.h"
diff --git a/keyboards/mehkee96/rules.mk b/keyboards/mehkee96/rules.mk
index 4fbc43c43e..e629a74231 100644
--- a/keyboards/mehkee96/rules.mk
+++ b/keyboards/mehkee96/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no	# Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/meletrix/zoom65/config.h b/keyboards/meletrix/zoom65/config.h
index 4c05b1d83b..e5cc1f3e5b 100644
--- a/keyboards/meletrix/zoom65/config.h
+++ b/keyboards/meletrix/zoom65/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, E6, D5, F1, F4 }
-#define MATRIX_COL_PINS { C7, D3, D2, D1, D0, B7, B3, B2, C6, B6, B5, B4, D7, D6, D4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 5, 4 } }
 #define ENCODERS_CCW_KEY { { 3, 4 } }
diff --git a/keyboards/meletrix/zoom65/info.json b/keyboards/meletrix/zoom65/info.json
index 0968df4794..30e4962a29 100644
--- a/keyboards/meletrix/zoom65/info.json
+++ b/keyboards/meletrix/zoom65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "D5", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B0", "resolution": 2}
@@ -23,618 +28,618 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"EncoderRotateL", "x":15, "y":0, "w":0.5},
-                {"label":"EncoderClick", "x":15.5, "y":0},
-                {"label":"EncoderRotateR", "x":16.5, "y":0, "w":0.5},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift1", "x":0, "y":3, "w":1.25},
-                {"label":"Shift2", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space1", "x":3.75, "y":4, "w":2.25},
-                {"label":"Space2", "x":6, "y":4, "w":1.25},
-                {"label":"Space3", "x":7.25, "y":4, "w":2.75},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [4, 3], "x": 15, "y": 0, "w": 0.5},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [4, 5], "x": 16.5, "y": 0, "w": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_lshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift1", "x":0, "y":3, "w":1.25},
-                {"label":"Shift2", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_space": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space1", "x":3.75, "y":4, "w":2.25},
-                {"label":"Space2", "x":6, "y":4, "w":1.25},
-                {"label":"Space3", "x":7.25, "y":4, "w":2.75},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_space": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space1", "x":3.75, "y":4, "w":2.25},
-                {"label":"Space2", "x":6, "y":4, "w":1.25},
-                {"label":"Space3", "x":7.25, "y":4, "w":2.75},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": 15, "y": 1},
+
+                {"matrix": [1, 14], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 0], "x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 2.75, "y": 2},
+                {"matrix": [2, 2], "x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2},
+                {"matrix": [2, 10], "x": 11.75, "y": 2},
+                {"matrix": [2, 11], "x": 12.75, "y": 2},
+                {"matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/meletrix/zoom65/zoom65.c b/keyboards/meletrix/zoom65/zoom65.c
index ff27a4442f..10b48c7b2d 100644
--- a/keyboards/meletrix/zoom65/zoom65.c
+++ b/keyboards/meletrix/zoom65/zoom65.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "zoom65.h"
+#include "quantum.h"
 
 #ifdef VIA_ENABLE
 static uint8_t encoder_state[NUM_ENCODERS] = {0};
@@ -30,7 +30,9 @@ void encoder_action_unregister(void)
             keyevent_t encoder_event = (keyevent_t){
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)};
+                .time = timer_read(),
+                .type = KEY_EVENT
+            };
             encoder_state[index] = 0;
             action_exec(encoder_event);
         }
@@ -41,7 +43,9 @@ void encoder_action_register(uint8_t index, bool clockwise)
     keyevent_t encoder_event = (keyevent_t){
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)};
+        .time = timer_read(),
+        .type = KEY_EVENT
+    };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
 }
@@ -57,10 +61,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise)
     encoder_action_register(index, clockwise);
     return true;
 };
-#else
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-	tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, 10);
-    return true;
-}
 #endif
diff --git a/keyboards/meletrix/zoom65/zoom65.h b/keyboards/meletrix/zoom65/zoom65.h
deleted file mode 100644
index 81948ba1da..0000000000
--- a/keyboards/meletrix/zoom65/zoom65.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/* Copyright 2021 meletrix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-/* Standard Arrangement
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ ◯                ISO
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───�            ┌─────�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │            │1d   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤         ┌──┴�    │
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │         │2c │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤         └───┴────┘
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │44      │46  │48        │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K43, K0E, K45, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,           K44, K46, K48,      K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_ansi_blocker
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E,      \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E       \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_iso_blocker
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │    │2e │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_ansi_blocker_split_bs
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_iso_blocker_split_bs
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │    │2e │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_ansi_blocker_split_lshift
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_blocker_split_lshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_ansi_blocker_split_space
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │44      │46  │48        │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_blocker_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,           K44, K46, K48,      K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_iso_blocker_split_space
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │    │2e │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │44      │46  │48        │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_iso_blocker_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,           K44, K46, K48,      K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
diff --git a/keyboards/meletrix/zoom65_lite/config.h b/keyboards/meletrix/zoom65_lite/config.h
index 4c05b1d83b..e5cc1f3e5b 100644
--- a/keyboards/meletrix/zoom65_lite/config.h
+++ b/keyboards/meletrix/zoom65_lite/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, E6, D5, F1, F4 }
-#define MATRIX_COL_PINS { C7, D3, D2, D1, D0, B7, B3, B2, C6, B6, B5, B4, D7, D6, D4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 5, 4 } }
 #define ENCODERS_CCW_KEY { { 3, 4 } }
diff --git a/keyboards/meletrix/zoom65_lite/info.json b/keyboards/meletrix/zoom65_lite/info.json
index d5dcd621ef..b8b59a487d 100644
--- a/keyboards/meletrix/zoom65_lite/info.json
+++ b/keyboards/meletrix/zoom65_lite/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "D5", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B0", "resolution": 2}
@@ -23,618 +28,618 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"EncoderRotateL", "x":15, "y":0, "w":0.5},
-                {"label":"EncoderClick", "x":15.5, "y":0},
-                {"label":"EncoderRotateR", "x":16.5, "y":0, "w":0.5},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift1", "x":0, "y":3, "w":1.25},
-                {"label":"Shift2", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space1", "x":3.75, "y":4, "w":2.25},
-                {"label":"Space2", "x":6, "y":4, "w":1.25},
-                {"label":"Space3", "x":7.25, "y":4, "w":2.75},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [4, 3], "x": 15, "y": 0, "w": 0.5},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [4, 5], "x": 16.5, "y": 0, "w": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_lshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift1", "x":0, "y":3, "w":1.25},
-                {"label":"Shift2", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_space": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space1", "x":3.75, "y":4, "w":2.25},
-                {"label":"Space2", "x":6, "y":4, "w":1.25},
-                {"label":"Space3", "x":7.25, "y":4, "w":2.75},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_space": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Encode", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PageUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space1", "x":3.75, "y":4, "w":2.25},
-                {"label":"Space2", "x":6, "y":4, "w":1.25},
-                {"label":"Space3", "x":7.25, "y":4, "w":2.75},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": 15, "y": 1},
+
+                {"matrix": [1, 14], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 0], "x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 2.75, "y": 2},
+                {"matrix": [2, 2], "x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2},
+                {"matrix": [2, 10], "x": 11.75, "y": 2},
+                {"matrix": [2, 11], "x": 12.75, "y": 2},
+                {"matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/meletrix/zoom65_lite/keymaps/via/keymap.c b/keyboards/meletrix/zoom65_lite/keymaps/via/keymap.c
index 23729b4349..4adfaba69d 100644
--- a/keyboards/meletrix/zoom65_lite/keymaps/via/keymap.c
+++ b/keyboards/meletrix/zoom65_lite/keymaps/via/keymap.c
@@ -29,7 +29,9 @@ void encoder_action_unregister(void)
             keyevent_t encoder_event = (keyevent_t){
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)};
+                .time = timer_read(),
+                .type = KEY_EVENT
+            };
             encoder_state[index] = 0;
             action_exec(encoder_event);
         }
@@ -40,7 +42,9 @@ void encoder_action_register(uint8_t index, bool clockwise)
     keyevent_t encoder_event = (keyevent_t){
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)};
+        .time = timer_read(),
+        .type = KEY_EVENT
+    };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
 }
diff --git a/keyboards/meletrix/zoom65_lite/zoom65_lite.c b/keyboards/meletrix/zoom65_lite/zoom65_lite.c
deleted file mode 100644
index 1e1100a207..0000000000
--- a/keyboards/meletrix/zoom65_lite/zoom65_lite.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 meletrix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "zoom65_lite.h"
-
-#ifndef VIA_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-	tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, 10);
-    return true;
-}
-#endif
diff --git a/keyboards/meletrix/zoom65_lite/zoom65_lite.h b/keyboards/meletrix/zoom65_lite/zoom65_lite.h
deleted file mode 100644
index 81948ba1da..0000000000
--- a/keyboards/meletrix/zoom65_lite/zoom65_lite.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/* Copyright 2021 meletrix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-/* Standard Arrangement
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ ◯                ISO
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───�            ┌─────�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │            │1d   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤         ┌──┴�    │
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │         │2c │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤         └───┴────┘
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │44      │46  │48        │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K43, K0E, K45, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,           K44, K46, K48,      K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_ansi_blocker
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E,      \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E       \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_iso_blocker
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │    │2e │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_ansi_blocker_split_bs
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_iso_blocker_split_bs
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │    │2e │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_ansi_blocker_split_lshift
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_blocker_split_lshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_ansi_blocker_split_space
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │44      │46  │48        │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_blocker_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,           K44, K46, K48,      K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-
-/* LAYOUT_65_iso_blocker_split_space
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │1e │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │    │2e │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │44      │46  │48        │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_iso_blocker_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,           K44, K46, K48,      K4A, K4B,      K4C, K4D, K4E  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h
index c016ab1f56..c8fe7f9a31 100644
--- a/keyboards/meletrix/zoom87/config.h
+++ b/keyboards/meletrix/zoom87/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 }
-#define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 20
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -41,5 +33,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
diff --git a/keyboards/meletrix/zoom87/info.json b/keyboards/meletrix/zoom87/info.json
index c60f7f8799..25a61b89f2 100644
--- a/keyboards/meletrix/zoom87/info.json
+++ b/keyboards/meletrix/zoom87/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"],
+        "rows": ["B3", "B7", "B2", "F0", "D3", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -24,594 +32,648 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-                { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 4.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "x": 3.75, "y": 5.25, "w": 2.25 },
-                { "x": 6, "y": 5.25, "w": 1.25 },
-                { "x": 7.25, "y": 5.25, "w": 2.75 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 6], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w" : 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_split_bs": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_split_lshift": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w" : 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-                { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 4.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_split_rshift": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w" : 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_split_space": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.25, "y": 0 },
-                { "label": "F2", "x": 2.25, "y": 0 },
-                { "label": "F3", "x": 3.25, "y": 0 },
-                { "label": "F4", "x": 4.25, "y": 0 },
-                { "label": "F5", "x": 5.5, "y": 0 },
-                { "label": "F6", "x": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "Print", "x": 15.25, "y": 0 },
-                { "label": "Scroll", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w" : 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "x": 3.75, "y": 5.25, "w": 2.25 },
-                { "x": 6, "y": 5.25, "w": 1.25 },
-                { "x": 7.25, "y": 5.25, "w": 2.75 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 6], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/meletrix/zoom87/zoom87.c b/keyboards/meletrix/zoom87/zoom87.c
deleted file mode 100644
index 59fc2ba3c8..0000000000
--- a/keyboards/meletrix/zoom87/zoom87.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 meletrix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "zoom87.h"
diff --git a/keyboards/meletrix/zoom87/zoom87.h b/keyboards/meletrix/zoom87/zoom87.h
deleted file mode 100644
index 03b94bfc40..0000000000
--- a/keyboards/meletrix/zoom87/zoom87.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Copyright 2022 meletrix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-/* Standard Arrangement
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───�
- * │50  │51  │52  │55      │56  │57        │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                        \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50, K51, K52,           K55, K56, K57,           K5A, K5B, K5C, K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   K56,   K57,   KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_split_bs
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┼───┴┬────┬────┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                   \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,             K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_split_lshift
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_split_lshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_split_rshift
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───�
- * │50  │51  │52  │56                      │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_split_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4F,       \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_split_space
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───�
- * │50  │51  │52  │55      │56  │57        │5a  │5b  │5c  │5d  ││5e │5f │5g │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50, K51, K52,           K55, K56, K57,           K5A, K5B, K5C, K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   K56,   K55,   KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
diff --git a/keyboards/melgeek/mach80/info.json b/keyboards/melgeek/mach80/info.json
index c3ac841283..e084dda413 100755
--- a/keyboards/melgeek/mach80/info.json
+++ b/keyboards/melgeek/mach80/info.json
@@ -15,191 +15,207 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2.0},
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
-                {"x": 16.25, "y": 4.5},
-
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2.0},
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
-                {"x": 16.25, "y": 4.5},
-
-                {"x": 0, "y": 5.5, "w": 1.5},
-                {"x": 2.5, "y": 5.5, "w": 1.5},
-                {"x": 4, "y": 5.5, "w": 7},
-                {"x": 11, "y": 5.5, "w": 1.5},
-                {"x": 13.5, "y": 5.5, "w": 1.5},
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 9], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/melgeek/mach80/mach80.c b/keyboards/melgeek/mach80/mach80.c
deleted file mode 100755
index 28d21b22b1..0000000000
--- a/keyboards/melgeek/mach80/mach80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mach80.h"
diff --git a/keyboards/melgeek/mach80/mach80.h b/keyboards/melgeek/mach80/mach80.h
deleted file mode 100755
index 6e954a9185..0000000000
--- a/keyboards/melgeek/mach80/mach80.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_tkl_ansi( \
-    K00,	  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K3D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K3E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K3F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,           K4E,	         \
-    K50, K51, K52,           K55,                K59, K5A, K5B, K5C, K5D, K5E, K5F       \
-) { \
-	{K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
-	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
-	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \
-	{K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F}, \
-	{K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, XXX, K4E, XXX}, \
-	{K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, K5A, K5B, K5C, K5D, K5E, K5F}  \
-}
-
-#define LAYOUT_tkl_ansi_wkl( \
-    K00,	  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K3D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K3E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K3F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,           K4E,	         \
-    K50,      K52,           K55,                K59,           K5C, K5D, K5E, K5F       \
-) { \
-	{K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
-	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
-	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \
-	{K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F}, \
-	{K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, XXX, K4E, XXX}, \
-	{K50, XXX, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, XXX, XXX, K5C, K5D, K5E, K5F}  \
-}
diff --git a/keyboards/melgeek/mach80/rev1/config.h b/keyboards/melgeek/mach80/rev1/config.h
index 62af5154e6..072419e163 100755
--- a/keyboards/melgeek/mach80/rev1/config.h
+++ b/keyboards/melgeek/mach80/rev1/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, E6 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #define RGB_MATRIX_LED_COUNT 97
 #define DRIVER_INDICATOR_LED_TOTAL 3
 
diff --git a/keyboards/melgeek/mach80/rev1/info.json b/keyboards/melgeek/mach80/rev1/info.json
new file mode 100644
index 0000000000..3a1a27847d
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev1/info.json
@@ -0,0 +1,10 @@
+{
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "E6"]
+    },
+    "diode_direction": "ROW2COL"
+}
diff --git a/keyboards/melgeek/mach80/rev1/rev1.c b/keyboards/melgeek/mach80/rev1/rev1.c
index 468fc1f698..bb04eddd5b 100755
--- a/keyboards/melgeek/mach80/rev1/rev1.c
+++ b/keyboards/melgeek/mach80/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mach80.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/melgeek/mach80/rev1/rules.mk b/keyboards/melgeek/mach80/rev1/rules.mk
index c4fed6e6e4..e0955f157a 100755
--- a/keyboards/melgeek/mach80/rev1/rules.mk
+++ b/keyboards/melgeek/mach80/rev1/rules.mk
@@ -10,6 +10,5 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 
 LTO_ENABLE = yes
diff --git a/keyboards/melgeek/mach80/rev2/config.h b/keyboards/melgeek/mach80/rev2/config.h
index b42d96691a..10d3bde47a 100755
--- a/keyboards/melgeek/mach80/rev2/config.h
+++ b/keyboards/melgeek/mach80/rev2/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, E6 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #define RGB_MATRIX_LED_COUNT 94
 #define DRIVER_INDICATOR_LED_TOTAL 3
 
diff --git a/keyboards/melgeek/mach80/rev2/info.json b/keyboards/melgeek/mach80/rev2/info.json
new file mode 100644
index 0000000000..3a1a27847d
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev2/info.json
@@ -0,0 +1,10 @@
+{
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "E6"]
+    },
+    "diode_direction": "ROW2COL"
+}
diff --git a/keyboards/melgeek/mach80/rev2/rev2.c b/keyboards/melgeek/mach80/rev2/rev2.c
index e817ef70a6..7e578c78b5 100755
--- a/keyboards/melgeek/mach80/rev2/rev2.c
+++ b/keyboards/melgeek/mach80/rev2/rev2.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mach80.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/melgeek/mach80/rev2/rules.mk b/keyboards/melgeek/mach80/rev2/rules.mk
index c4fed6e6e4..e0955f157a 100755
--- a/keyboards/melgeek/mach80/rev2/rules.mk
+++ b/keyboards/melgeek/mach80/rev2/rules.mk
@@ -10,6 +10,5 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 
 LTO_ENABLE = yes
diff --git a/keyboards/melgeek/mj61/mj61.c b/keyboards/melgeek/mj61/mj61.c
deleted file mode 100644
index a3aa29676a..0000000000
--- a/keyboards/melgeek/mj61/mj61.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mj61.h"
diff --git a/keyboards/melgeek/mj61/rev1/config.h b/keyboards/melgeek/mj61/rev1/config.h
index c3f72d006a..ea29d94b9b 100644
--- a/keyboards/melgeek/mj61/rev1/config.h
+++ b/keyboards/melgeek/mj61/rev1/config.h
@@ -16,22 +16,5 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
-#define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_COUNT 63
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj61/rev1/info.json b/keyboards/melgeek/mj61/rev1/info.json
new file mode 100644
index 0000000000..c146adef04
--- /dev/null
+++ b/keyboards/melgeek/mj61/rev1/info.json
@@ -0,0 +1,10 @@
+{
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "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
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj61/rev1/rules.mk
+++ b/keyboards/melgeek/mj61/rev1/rules.mk
@@ -10,5 +10,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj61/rev2/config.h b/keyboards/melgeek/mj61/rev2/config.h
index 422d4847e4..0cd072eb4b 100644
--- a/keyboards/melgeek/mj61/rev2/config.h
+++ b/keyboards/melgeek/mj61/rev2/config.h
@@ -16,22 +16,5 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
-#define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_COUNT 71
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj61/rev2/info.json b/keyboards/melgeek/mj61/rev2/info.json
new file mode 100644
index 0000000000..330137a02a
--- /dev/null
+++ b/keyboards/melgeek/mj61/rev2/info.json
@@ -0,0 +1,10 @@
+{
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "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
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj61/rev2/rules.mk
+++ b/keyboards/melgeek/mj61/rev2/rules.mk
@@ -10,5 +10,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj63/mj63.c b/keyboards/melgeek/mj63/mj63.c
deleted file mode 100644
index 8b1ff38651..0000000000
--- a/keyboards/melgeek/mj63/mj63.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mj63.h"
diff --git a/keyboards/melgeek/mj63/rev1/config.h b/keyboards/melgeek/mj63/rev1/config.h
index 31c4e0f148..8abf7f5595 100644
--- a/keyboards/melgeek/mj63/rev1/config.h
+++ b/keyboards/melgeek/mj63/rev1/config.h
@@ -16,22 +16,5 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
-#define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_COUNT 65
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj63/rev1/info.json b/keyboards/melgeek/mj63/rev1/info.json
new file mode 100644
index 0000000000..c146adef04
--- /dev/null
+++ b/keyboards/melgeek/mj63/rev1/info.json
@@ -0,0 +1,10 @@
+{
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "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
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj63/rev1/rules.mk
+++ b/keyboards/melgeek/mj63/rev1/rules.mk
@@ -10,5 +10,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj63/rev2/config.h b/keyboards/melgeek/mj63/rev2/config.h
index 422d4847e4..0cd072eb4b 100644
--- a/keyboards/melgeek/mj63/rev2/config.h
+++ b/keyboards/melgeek/mj63/rev2/config.h
@@ -16,22 +16,5 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
-#define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_COUNT 71
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj63/rev2/info.json b/keyboards/melgeek/mj63/rev2/info.json
new file mode 100644
index 0000000000..330137a02a
--- /dev/null
+++ b/keyboards/melgeek/mj63/rev2/info.json
@@ -0,0 +1,10 @@
+{
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "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
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj63/rev2/rules.mk
+++ b/keyboards/melgeek/mj63/rev2/rules.mk
@@ -10,5 +10,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj64/mj64.c b/keyboards/melgeek/mj64/mj64.c
deleted file mode 100644
index 8e57f68232..0000000000
--- a/keyboards/melgeek/mj64/mj64.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mj64.h"
diff --git a/keyboards/melgeek/mj64/rev1/config.h b/keyboards/melgeek/mj64/rev1/config.h
index a0048f6912..ab8fcd6e09 100644
--- a/keyboards/melgeek/mj64/rev1/config.h
+++ b/keyboards/melgeek/mj64/rev1/config.h
@@ -16,22 +16,5 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
-#define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_COUNT 66
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj64/rev1/info.json
new file mode 100644
index 0000000000..c146adef04
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev1/info.json
@@ -0,0 +1,10 @@
+{
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "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
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj64/rev1/rules.mk
+++ b/keyboards/melgeek/mj64/rev1/rules.mk
@@ -10,5 +10,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj64/rev2/config.h b/keyboards/melgeek/mj64/rev2/config.h
index a0048f6912..ab8fcd6e09 100644
--- a/keyboards/melgeek/mj64/rev2/config.h
+++ b/keyboards/melgeek/mj64/rev2/config.h
@@ -16,22 +16,5 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
-#define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_COUNT 66
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/info.json
new file mode 100644
index 0000000000..c146adef04
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev2/info.json
@@ -0,0 +1,10 @@
+{
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "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
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj64/rev2/rules.mk
+++ b/keyboards/melgeek/mj64/rev2/rules.mk
@@ -10,5 +10,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj64/rev3/config.h b/keyboards/melgeek/mj64/rev3/config.h
index bcb2110b60..a5a1fbf3e0 100644
--- a/keyboards/melgeek/mj64/rev3/config.h
+++ b/keyboards/melgeek/mj64/rev3/config.h
@@ -16,22 +16,5 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
-#define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_COUNT 72
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj64/rev3/info.json
new file mode 100644
index 0000000000..330137a02a
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev3/info.json
@@ -0,0 +1,10 @@
+{
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "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
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj64/rev3/rules.mk
+++ b/keyboards/melgeek/mj64/rev3/rules.mk
@@ -10,5 +10,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json
index f7a24f9a55..71fce4cf7a 100644
--- a/keyboards/melgeek/mj65/info.json
+++ b/keyboards/melgeek/mj65/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0065",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "B14"],
+        "rows": ["B12", "B11", "B10", "B1", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
@@ -16,78 +24,78 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/melgeek/mj65/mj65.c b/keyboards/melgeek/mj65/mj65.c
deleted file mode 100644
index 3686798dab..0000000000
--- a/keyboards/melgeek/mj65/mj65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mj65.h"
diff --git a/keyboards/melgeek/mj65/mj65.h b/keyboards/melgeek/mj65/mj65.h
deleted file mode 100644
index b3ecc6bda6..0000000000
--- a/keyboards/melgeek/mj65/mj65.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E}, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E}, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E}  \
-}
diff --git a/keyboards/melgeek/mj65/rev3/config.h b/keyboards/melgeek/mj65/rev3/config.h
index 24ed74f4b6..7fc5f0afd1 100644
--- a/keyboards/melgeek/mj65/rev3/config.h
+++ b/keyboards/melgeek/mj65/rev3/config.h
@@ -16,22 +16,5 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
-#define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1, B14 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_COUNT 76
 #define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj65/rev3/rev3.c b/keyboards/melgeek/mj65/rev3/rev3.c
index 6719a03b0f..f44c412659 100644
--- a/keyboards/melgeek/mj65/rev3/rev3.c
+++ b/keyboards/melgeek/mj65/rev3/rev3.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mj65.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk
index 51ff8073d2..b3984d93c0 100644
--- a/keyboards/melgeek/mj65/rev3/rules.mk
+++ b/keyboards/melgeek/mj65/rev3/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED   = no
diff --git a/keyboards/melgeek/mj6xy/mj6xy.c b/keyboards/melgeek/mj6xy/mj6xy.c
deleted file mode 100755
index 78297ab7c4..0000000000
--- a/keyboards/melgeek/mj6xy/mj6xy.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mj6xy.h"
diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h
index a093ab8d37..dbe73b7e3d 100755
--- a/keyboards/melgeek/mj6xy/rev3/config.h
+++ b/keyboards/melgeek/mj6xy/rev3/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B6, B5, B4, D7, D6, D4, D5, F7, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN    C6
-
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -42,4 +33,3 @@
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/info.json
index ccd7165a72..5dd66001c5 100644
--- a/keyboards/melgeek/mj6xy/rev3/info.json
+++ b/keyboards/melgeek/mj6xy/rev3/info.json
@@ -1,7 +1,15 @@
 {
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "F7", "D2", "D1", "D0"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "driver": "software",
         "pin": "B7",
         "levels": 10
+    },
+    "ws2812": {
+        "pin": "C6"
     }
 }
diff --git a/keyboards/melgeek/mj6xy/rev3/rev3.c b/keyboards/melgeek/mj6xy/rev3/rev3.c
deleted file mode 100644
index 7982316513..0000000000
--- a/keyboards/melgeek/mj6xy/rev3/rev3.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mj6xy.h"
-
diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json
index a7930598f7..c4fe0a33db 100755
--- a/keyboards/melgeek/mojo68/info.json
+++ b/keyboards/melgeek/mojo68/info.json
@@ -8,85 +8,96 @@
     	"pid": "0x0068",
     	"device_version": "0.0.1"
     },
+    "rgb_matrix": {
+    	"driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
     "community_layouts": ["68_ansi"],
     "layouts": {
         "LAYOUT_68_ansi": {
-			"layout": [
-				{"x":0, "y":0},
-				{"x":1, "y":0},
-				{"x":2, "y":0},
-				{"x":3, "y":0},
-				{"x":4, "y":0},
-				{"x":5, "y":0},
-				{"x":6, "y":0},
-				{"x":7, "y":0},
-				{"x":8, "y":0},
-				{"x":9, "y":0},
-				{"x":10, "y":0},
-				{"x":11, "y":0},
-				{"x":12, "y":0},
-				{"x":13, "y":0, "w":2.0},
-				{"x":15, "y":0},
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-				{"x":0, "y":1, "w":1.5},
-				{"x":1.5, "y":1},
-				{"x":2.5, "y":1},
-				{"x":3.5, "y":1},
-				{"x":4.5, "y":1},
-				{"x":5.5, "y":1},
-				{"x":6.5, "y":1},
-				{"x":7.5, "y":1},
-				{"x":8.5, "y":1},
-				{"x":9.5, "y":1},
-				{"x":10.5, "y":1},
-				{"x":11.5, "y":1},
-				{"x":12.5, "y":1},
-				{"x":13.5, "y":1, "w":1.5},
-				{"x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
 
-				{"x":0, "y":2, "w":1.75},
-				{"x":1.75, "y":2},
-				{"x":2.75, "y":2},
-				{"x":3.75, "y":2},
-				{"x":4.75, "y":2},
-				{"x":5.75, "y":2},
-				{"x":6.75, "y":2},
-				{"x":7.75, "y":2},
-				{"x":8.75, "y":2},
-				{"x":9.75, "y":2},
-				{"x":10.75, "y":2},
-				{"x":11.75, "y":2},
-				{"x":12.75, "y":2, "w":2.25},
-				{"x":15, "y":2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-				{"x":0, "y":3, "w":2.25},
-				{"x":2.25, "y":3},
-				{"x":3.25, "y":3},
-				{"x":4.25, "y":3},
-				{"x":5.25, "y":3},
-				{"x":6.25, "y":3},
-				{"x":7.25, "y":3},
-				{"x":8.25, "y":3},
-				{"x":9.25, "y":3},
-				{"x":10.25, "y":3},
-				{"x":11.25, "y":3},
-				{"x":12.25, "y":3, "w":1.75},
-				{"x":14, "y":3},
-				{"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-				{"x":0, "y":4, "w":1.25},
-				{"x":1.25, "y":4, "w":1.25},
-				{"x":2.5, "y":4, "w":1.25},
-				{"x":3.75, "y":4, "w":6.25},
-				{"x":10, "y":4},
-				{"x":11, "y":4},
-				{"x":12, "y":4},
-				{"x":13, "y":4},
-				{"x":14, "y":4},
-				{"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/melgeek/mojo68/mojo68.c b/keyboards/melgeek/mojo68/mojo68.c
deleted file mode 100755
index d217daf0ac..0000000000
--- a/keyboards/melgeek/mojo68/mojo68.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mojo68.h"
diff --git a/keyboards/melgeek/mojo68/mojo68.h b/keyboards/melgeek/mojo68/mojo68.h
deleted file mode 100755
index f5823c1926..0000000000
--- a/keyboards/melgeek/mojo68/mojo68.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_68_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h
index 7cb916e4fb..2a93a475cf 100755
--- a/keyboards/melgeek/mojo68/rev1/config.h
+++ b/keyboards/melgeek/mojo68/rev1/config.h
@@ -16,22 +16,5 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B0 ,B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_COUNT 68
 #define DRIVER_INDICATOR_LED_TOTAL 3
diff --git a/keyboards/melgeek/mojo68/rev1/rev1.c b/keyboards/melgeek/mojo68/rev1/rev1.c
index 17c235820b..cadc625adb 100755
--- a/keyboards/melgeek/mojo68/rev1/rev1.c
+++ b/keyboards/melgeek/mojo68/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mojo68.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/melgeek/mojo68/rev1/rules.mk b/keyboards/melgeek/mojo68/rev1/rules.mk
index 6180ab52a4..c66b1abcd4 100755
--- a/keyboards/melgeek/mojo68/rev1/rules.mk
+++ b/keyboards/melgeek/mojo68/rev1/rules.mk
@@ -10,4 +10,3 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json
index 185b3414fc..7d7c6db3ff 100644
--- a/keyboards/melgeek/mojo75/info.json
+++ b/keyboards/melgeek/mojo75/info.json
@@ -8,6 +8,14 @@
         "pid": "0x7075",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+        "rows": ["B11", "B10", "B1", "B0", "A7", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
@@ -16,95 +24,95 @@
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1, "w":2},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.5},
-                {"x":1.5, "y":2},
-                {"x":2.5, "y":2},
-                {"x":3.5, "y":2},
-                {"x":4.5, "y":2},
-                {"x":5.5, "y":2},
-                {"x":6.5, "y":2},
-                {"x":7.5, "y":2},
-                {"x":8.5, "y":2},
-                {"x":9.5, "y":2},
-                {"x":10.5, "y":2},
-                {"x":11.5, "y":2},
-                {"x":12.5, "y":2},
-                {"x":13.5, "y":2, "w":1.5},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.75},
-                {"x":1.75, "y":3},
-                {"x":2.75, "y":3},
-                {"x":3.75, "y":3},
-                {"x":4.75, "y":3},
-                {"x":5.75, "y":3},
-                {"x":6.75, "y":3},
-                {"x":7.75, "y":3},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3},
-                {"x":12.75, "y":3, "w":2.25},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":2.25},
-                {"x":2.25, "y":4},
-                {"x":3.25, "y":4},
-                {"x":4.25, "y":4},
-                {"x":5.25, "y":4},
-                {"x":6.25, "y":4},
-                {"x":7.25, "y":4},
-                {"x":8.25, "y":4},
-                {"x":9.25, "y":4},
-                {"x":10.25, "y":4},
-                {"x":11.25, "y":4},
-                {"x":12.25, "y":4, "w":1.75},
-                {"x":14, "y":4},
-                {"x":15, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
 
-                {"x":0, "y":5, "w":1.25},
-                {"x":1.25, "y":5, "w":1.25},
-                {"x":2.5, "y":5, "w":1.25},
-                {"x":3.75, "y":5, "w":6.25},
-                {"x":10, "y":5},
-                {"x":11, "y":5},
-                {"x":12, "y":5},
-                {"x":13, "y":5},
-                {"x":14, "y":5},
-                {"x":15, "y":5}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5},
+                {"matrix": [5, 10], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/melgeek/mojo75/mojo75.c b/keyboards/melgeek/mojo75/mojo75.c
deleted file mode 100644
index 53db19d104..0000000000
--- a/keyboards/melgeek/mojo75/mojo75.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mojo75.h"
-
diff --git a/keyboards/melgeek/mojo75/mojo75.h b/keyboards/melgeek/mojo75/mojo75.h
deleted file mode 100644
index 4d141cd9ce..0000000000
--- a/keyboards/melgeek/mojo75/mojo75.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_75_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,      K4E, K4F, \
-	K50, K51, K52,           K55,                K59, K5A,      K5C, K5D, K5E, K5F  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, XXX, K4E, K4F }, \
-	{ K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, K5A, XXX, K5C, K5D, K5E, K5F }  \
-}
diff --git a/keyboards/melgeek/mojo75/rev1/config.h b/keyboards/melgeek/mojo75/rev1/config.h
index 6bbda5752a..44435f2220 100644
--- a/keyboards/melgeek/mojo75/rev1/config.h
+++ b/keyboards/melgeek/mojo75/rev1/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B11, B10, B1, B0, A7, A6 }
-#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_COUNT 92
 #define DRIVER_INDICATOR_LED_TOTAL 0
 
diff --git a/keyboards/melgeek/mojo75/rev1/rev1.c b/keyboards/melgeek/mojo75/rev1/rev1.c
index b73e101f1e..a313a25cfe 100644
--- a/keyboards/melgeek/mojo75/rev1/rev1.c
+++ b/keyboards/melgeek/mojo75/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mojo75.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mojo75/rev1/rules.mk
+++ b/keyboards/melgeek/mojo75/rev1/rules.mk
@@ -10,5 +10,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json
index 9c33a5d3a2..68850559ba 100644
--- a/keyboards/melgeek/tegic/info.json
+++ b/keyboards/melgeek/tegic/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0081",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
@@ -46,7 +54,7 @@
                 {"x": 10,	"y": 1.5},
                 {"x": 11,	"y": 1.5},
                 {"x": 12,	"y": 1.5},
-                {"x": 13,	"y": 1.5, "w": 2.0},
+                {"x": 13,	"y": 1.5, "w": 2},
                 {"x": 15.5, "y": 1.5},
 
                 {"x": 0,	"y": 2.5, "w": 1.5},
diff --git a/keyboards/melgeek/tegic/rev1/config.h b/keyboards/melgeek/tegic/rev1/config.h
index e1d22a6384..bba7c01f5f 100755
--- a/keyboards/melgeek/tegic/rev1/config.h
+++ b/keyboards/melgeek/tegic/rev1/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, D3 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_MATRIX_LED_COUNT 91
 //#define DRIVER_INDICATOR_LED_TOTAL 3
 
diff --git a/keyboards/melgeek/tegic/rev1/rules.mk b/keyboards/melgeek/tegic/rev1/rules.mk
index 974cf04cb8..d05853b8b0 100755
--- a/keyboards/melgeek/tegic/rev1/rules.mk
+++ b/keyboards/melgeek/tegic/rev1/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 
 LTO_ENABLE = yes
 
diff --git a/keyboards/melgeek/tegic/tegic.c b/keyboards/melgeek/tegic/tegic.c
deleted file mode 100755
index e2f5b49f5e..0000000000
--- a/keyboards/melgeek/tegic/tegic.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "tegic.h"
-
diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/config.h
index 6824b665b4..3c19a6f93c 100644
--- a/keyboards/melgeek/z70ultra/config.h
+++ b/keyboards/melgeek/z70ultra/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json
index a7042fe04b..697d107a4f 100644
--- a/keyboards/melgeek/z70ultra/info.json
+++ b/keyboards/melgeek/z70ultra/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6570",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B1", "A10", "B5", "B4", "B3", "A15", "A2", "A1", "A0", "C15", "C14", "C13"],
+        "rows": ["B12", "B13", "B14", "B15", "A3", "B9"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
@@ -16,153 +24,153 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [5, 6], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [5, 7], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 9], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [5, 8], "x": 14, "y": 3},
+                {"matrix": [5, 10], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"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": [5, 11], "x": 13, "y": 4},
+                {"matrix": [5, 12], "x": 14, "y": 4},
+                {"matrix": [5, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_ansi_split_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [5, 6], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [5, 7], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 9], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [5, 8], "x": 14, "y": 3},
+                {"matrix": [5, 10], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":3},
-                {"x":6.75, "y":4, "w":3},
-                {"x":9.75, "y":4, "w":1.5},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"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": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [5, 11], "x": 13, "y": 4},
+                {"matrix": [5, 12], "x": 14, "y": 4},
+                {"matrix": [5, 13], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/melgeek/z70ultra/rev1/config.h b/keyboards/melgeek/z70ultra/rev1/config.h
deleted file mode 100644
index 64dacfff18..0000000000
--- a/keyboards/melgeek/z70ultra/rev1/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B13, B14, B15, A3, B9 }
-#define MATRIX_COL_PINS { B11, B10, B1, A10, B5, B4, B3, A15, A2, A1, A0, C15, C14, C13 }
-
diff --git a/keyboards/melgeek/z70ultra/rev1/rules.mk b/keyboards/melgeek/z70ultra/rev1/rules.mk
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/z70ultra/rev1/rules.mk
+++ b/keyboards/melgeek/z70ultra/rev1/rules.mk
@@ -10,5 +10,4 @@ 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
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/z70ultra.c
index 9ade47d43e..9ff2e778c6 100644
--- a/keyboards/melgeek/z70ultra/z70ultra.c
+++ b/keyboards/melgeek/z70ultra/z70ultra.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "z70ultra.h"
+#include "quantum.h"
 
 
 #ifdef RGB_MATRIX_ENABLE
@@ -165,14 +165,4 @@ void matrix_init_kb(void) {
 
     matrix_init_user();
 }
-
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
 #endif
diff --git a/keyboards/melgeek/z70ultra/z70ultra.h b/keyboards/melgeek/z70ultra/z70ultra.h
deleted file mode 100644
index 8f7a84584f..0000000000
--- a/keyboards/melgeek/z70ultra/z70ultra.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K45,           K49, K4A,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, K0E, K1E, K3D, K2E, K3E, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_ansi_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,           K44,      K46,      K49, K4A,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX }, \
-    { K40, K41, K42, XXX, K44, XXX, K46, XXX, XXX, K49, K4A, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, K0E, K1E, K3D, K2E, K3E, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/meme/config.h b/keyboards/meme/config.h
index cf96f9f4de..d876570c80 100644
--- a/keyboards/meme/config.h
+++ b/keyboards/meme/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C2, D0, D1, D4, D5, D6, B0, B1, B2, B3  }
-#define MATRIX_COL_PINS { D3, D2, B5, B6, C7, C6, C5, C4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/meme/info.json b/keyboards/meme/info.json
index 500c76ebdf..f76f55e621 100644
--- a/keyboards/meme/info.json
+++ b/keyboards/meme/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D3", "D2", "B5", "B6", "C7", "C6", "C5", "C4"],
+    "rows": ["C2", "D0", "D1", "D4", "D5", "D6", "B0", "B1", "B2", "B3"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "breathing": true
diff --git a/keyboards/meme/meme.c b/keyboards/meme/meme.c
deleted file mode 100644
index 928f121fe9..0000000000
--- a/keyboards/meme/meme.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "meme.h"
diff --git a/keyboards/meow48/config.h b/keyboards/meow48/config.h
index 7c1f14f2d2..5965ca253d 100644
--- a/keyboards/meow48/config.h
+++ b/keyboards/meow48/config.h
@@ -17,27 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5, F4, F5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define OLED_BRIGHTNESS 100
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 48
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -56,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/meow48/info.json b/keyboards/meow48/info.json
index ba3d696cb0..d0b9810fcd 100644
--- a/keyboards/meow48/info.json
+++ b/keyboards/meow48/info.json
@@ -7,7 +7,15 @@
         "device_version": "1.0.0",
         "pid": "0xF048",
         "vid": "0xF048"
-           },
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/meow65/config.h b/keyboards/meow65/config.h
index 9518361db0..edaab9eb0d 100644
--- a/keyboards/meow65/config.h
+++ b/keyboards/meow65/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, B6, B5, B7, F7 }
-#define MATRIX_COL_PINS { F5, F6, B0, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/meow65/info.json b/keyboards/meow65/info.json
index 729fb3287c..2187a021fb 100644
--- a/keyboards/meow65/info.json
+++ b/keyboards/meow65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4D36",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "B0", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "C7"],
+        "rows": ["C6", "B6", "B5", "B7", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -17,77 +22,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1!", "x": 1, "y": 0 },
-                { "label": "2@", "x": 2, "y": 0 },
-                { "label": "3#", "x": 3, "y": 0 },
-                { "label": "4$", "x": 4, "y": 0 },
-                { "label": "5%", "x": 5, "y": 0 },
-                { "label": "6^", "x": 6, "y": 0 },
-                { "label": "7&", "x": 7, "y": 0 },
-                { "label": "8*", "x": 8, "y": 0 },
-                { "label": "9(", "x": 9, "y": 0 },
-                { "label": "0)", "x": 10, "y": 0 },
-                { "label": "-_", "x": 11, "y": 0 },
-                { "label": "=+", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Home", "x": 15, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[{", "x": 11.5, "y": 1 },
-                { "label": "]}", "x": 12.5, "y": 1 },
-                { "label": "\\|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "PageUp", "x": 15, "y": 1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                { "label": "Caps", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";:", "x": 10.75, "y": 2 },
-                { "label": "'\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Page Down", "x": 15, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",<", "x": 9.25, "y": 3 },
-                { "label": ".>", "x": 10.25, "y": 3 },
-                { "label": "/?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "x": 14, "y": 3 },
-                { "label": "End", "x": 15, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "GUI", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 13, "y": 4 },
-                { "label": "\u2193", "x": 14, "y": 4 },
-                { "label": "\u2192", "x": 15, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/meow65/meow65.c b/keyboards/meow65/meow65.c
deleted file mode 100644
index 4d03f6a460..0000000000
--- a/keyboards/meow65/meow65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 mrninhvn
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "meow65.h"
diff --git a/keyboards/meow65/meow65.h b/keyboards/meow65/meow65.h
deleted file mode 100644
index 2643158342..0000000000
--- a/keyboards/meow65/meow65.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 mrninhvn
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_65_ansi_blocker( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k213, k214, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310,       k312, k313, k314, \
-    k400, k401, k402,             k405,                   k409, k410,       k412, k413, k414  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  k114 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  k214 }, \
-    { k300,  k301,  k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  KC_NO, k312,  k313,  k314 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, k405,  KC_NO, KC_NO, KC_NO, k409,  k410,  KC_NO, k412,  k413,  k414 }  \
-}
diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h
deleted file mode 100644
index 7bf2b1b33b..0000000000
--- a/keyboards/merge/iso_macro/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
- /* Copyright 2021 duoshock 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { F4, F5, F6}
-#define MATRIX_COL_PINS { B4, B5, B6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json
index bc4269755f..fe20e701ba 100644
--- a/keyboards/merge/iso_macro/info.json
+++ b/keyboards/merge/iso_macro/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1200",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6"],
+        "rows": ["F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F0", "pin_b": "F1"},
@@ -22,16 +27,18 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.5, "y":0, "w":1.25, "h":2},
+                {"matrix": [2, 1], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [2, 0], "x": 4.5, "y": 0, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 2], "x": 0, "y": 1},
 
-                {"x":0, "y":1},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1}
+                {"matrix": [1, 0], "x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1}
             ]
         }
     }
diff --git a/keyboards/merge/iso_macro/iso_macro.c b/keyboards/merge/iso_macro/iso_macro.c
deleted file mode 100644
index 6052f9cce9..0000000000
--- a/keyboards/merge/iso_macro/iso_macro.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 duoshock 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
-
-#include "iso_macro.h"
diff --git a/keyboards/merge/iso_macro/iso_macro.h b/keyboards/merge/iso_macro/iso_macro.h
deleted file mode 100644
index dfa9386449..0000000000
--- a/keyboards/merge/iso_macro/iso_macro.h
+++ /dev/null
@@ -1,29 +0,0 @@
- /* Copyright 2021 duoshock 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-      k21, k00, k01, k02, k20, \
-      k22, k10, k11, k12 \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 }  \
-} 
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h
index 9dcfb6e074..7f80333ad3 100644
--- a/keyboards/merge/uc1/config.h
+++ b/keyboards/merge/uc1/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B1, B2 }
-#define MATRIX_COL_PINS { B3, B4 }
-
-#define RGB_DI_PIN B5
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -36,6 +32,3 @@
 #define RGBLIGHT_VAL_STEP 10
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGBLIGHT_SLEEP
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json
index 55b68a4510..95de5a2e20 100644
--- a/keyboards/merge/uc1/info.json
+++ b/keyboards/merge/uc1/info.json
@@ -8,6 +8,14 @@
     "pid": "0x5543",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B5"
+  },
+  "matrix_pins": {
+    "cols": ["B3", "B4"],
+    "rows": ["B1", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "F5", "pin_b": "F6"}
@@ -17,11 +25,12 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout":   [
-        {"label":"0", "x":0, "y":0},
-        {"label":"1", "x":1.25, "y":0},
-        {"label":"2", "x":2.25, "y":0},
-        {"label":"3", "x":3.25, "y":0}
+      "layout": [
+        {"matrix": [1, 1], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [1, 0], "x": 3.25, "y": 0}
       ]
     }
   }
diff --git a/keyboards/merge/uc1/uc1.c b/keyboards/merge/uc1/uc1.c
deleted file mode 100644
index d23e7426d8..0000000000
--- a/keyboards/merge/uc1/uc1.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 duoshock 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
-
-#include "uc1.h"
diff --git a/keyboards/merge/uc1/uc1.h b/keyboards/merge/uc1/uc1.h
deleted file mode 100644
index 84e655d1b9..0000000000
--- a/keyboards/merge/uc1/uc1.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* Copyright 2021 duoshock 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-      k11, k00, k01, k10 \
-) \
-{ \
-    { k00, k01 }, \
-    { k10, k11 }  \
-} 
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index c249a1816a..57c2dcb6fb 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -16,17 +16,10 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_USB_DETECT
 #define MASTER_LEFT
 #define SPLIT_MODS_ENABLE
 
-#define RGB_DI_PIN D3
 #define RGBLIGHT_SPLIT
 #define RGBLED_NUM 83
 #define RGBLED_SPLIT { 39, 44 }
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index e548d63151..fd566ab395 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -8,6 +8,11 @@
         "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"}
@@ -16,6 +21,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index 238e5f6d43..f267fa3670 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -16,17 +16,10 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, C7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_USB_DETECT
 #define MASTER_LEFT
 #define SPLIT_MODS_ENABLE
 
-#define RGB_DI_PIN D3
 #define RGBLIGHT_SPLIT
 #define RGBLED_NUM 100
 #define RGBLED_SPLIT { 48, 52 }
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
index e3e1359c92..9b7e73b2da 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/info.json
@@ -8,6 +8,11 @@
         "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"}
@@ -16,6 +21,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h
index 6d21adc774..b02c9578cd 100644
--- a/keyboards/merge/uma/config.h
+++ b/keyboards/merge/uma/config.h
@@ -16,11 +16,5 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_USB_DETECT
 #define SPLIT_MODS_ENABLE
diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json
index 1363705253..d6a07150f6 100644
--- a/keyboards/merge/uma/info.json
+++ b/keyboards/merge/uma/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3232",
         "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",
     "backlight": {
         "pin": "C6"
     },
diff --git a/keyboards/merge/uma/uma.h b/keyboards/merge/uma/uma.h
index b7fb9a5d61..3e2b5fa264 100644
--- a/keyboards/merge/uma/uma.h
+++ b/keyboards/merge/uma/uma.h
@@ -126,7 +126,7 @@
     { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
     { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
     { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
     { R00, R01, R02, R03, R04, R05, R06, R07 }, \
     { R10, R11, R12, R13, R14, R15, R16, R17 }, \
     { R20, R21, R22, R23, R24, R25, R26, R27 }, \
@@ -145,7 +145,7 @@
     { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
     { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
     { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
     { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
     { R10, R11, R12, R13, R14, R15, R16, R17 }, \
     { R20, R21, R22, R23, R24, R25, R26, R27 }, \
@@ -164,7 +164,7 @@
     { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
     { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
     { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
     { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
     { R10, R11, R12, R13, R14, R15, R16, R17 }, \
     { R20, R21, R22, R23, R24, R25, R26, R27 }, \
@@ -183,7 +183,7 @@
     { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
     { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
     { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
-    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
     { R00, R01, R02, R03, R04, R05, R06, R07 }, \
     { R10, R11, R12, R13, R14, R15, R16, R17 }, \
     { R20, R21, R22, R23, R24, R25, R26, R27 }, \
diff --git a/keyboards/mesa/mesa_tkl/config.h b/keyboards/mesa/mesa_tkl/config.h
index 3db70ee092..5ebe5ccc58 100644
--- a/keyboards/mesa/mesa_tkl/config.h
+++ b/keyboards/mesa/mesa_tkl/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D1, D0, B0, C6, C7 }
-#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0, B1, B2, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mesa/mesa_tkl/info.json b/keyboards/mesa/mesa_tkl/info.json
index b940ffb7f5..45fe5b49a5 100644
--- a/keyboards/mesa/mesa_tkl/info.json
+++ b/keyboards/mesa/mesa_tkl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3"],
+        "rows": ["D2", "D1", "D0", "B0", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mesa/mesa_tkl/mesa_tkl.c b/keyboards/mesa/mesa_tkl/mesa_tkl.c
deleted file mode 100644
index f75153b321..0000000000
--- a/keyboards/mesa/mesa_tkl/mesa_tkl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Mesa Keyboards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mesa_tkl.h"
diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h
index a0df182439..9e64ab48a6 100644
--- a/keyboards/meson/config.h
+++ b/keyboards/meson/config.h
@@ -17,17 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F7, C6, F6, F5 }
-#define MATRIX_COL_PINS { D4, D7, E6, B3, B2, B6, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USE_I2C
 
-#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 10
    #define RGBLIGHT_SPLIT
    #define RGBLED_SPLIT { 5, 5 }
@@ -46,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json
index 869a2ccb7a..41e3a6b4a2 100644
--- a/keyboards/meson/info.json
+++ b/keyboards/meson/info.json
@@ -7,9 +7,17 @@
       "pid": "0x0000",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["D4", "D7", "E6", "B3", "B2", "B6", "F4"],
+      "rows": ["F7", "C6", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
       "soft_serial_pin": "D0"
     },
+    "ws2812": {
+      "pin": "B5"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/meson/meson.c b/keyboards/meson/meson.c
deleted file mode 100644
index 4b777633b1..0000000000
--- a/keyboards/meson/meson.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Luciano M
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "meson.h"
diff --git a/keyboards/metamechs/timberwolf/config.h b/keyboards/metamechs/timberwolf/config.h
deleted file mode 100644
index 916b315725..0000000000
--- a/keyboards/metamechs/timberwolf/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2020 Croktopus
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_COL_PINS { B2, D1, D2, C7, F5, F6, F7, F0, E6 }
-#define MATRIX_ROW_PINS { B6, B5, B4, D7, D6, D4, D5, D3, F4, F1, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/metamechs/timberwolf/info.json b/keyboards/metamechs/timberwolf/info.json
index ae12912f00..cc5aca28d6 100644
--- a/keyboards/metamechs/timberwolf/info.json
+++ b/keyboards/metamechs/timberwolf/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5754",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D2", "C7", "F5", "F6", "F7", "F0", "E6"],
+        "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F4", "F1", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "C6",
         "levels": 16
@@ -119,9 +124,9 @@
                 {"label":"Win", "x":2.75, "y":5.25},
                 {"label":"Alt", "x":3.75, "y":5.25, "w":1.5},
                 {"x":5.25, "y":5.25, "w":5.5},
-                {"label":"Alt", "x":10.75, "y":5.25, "w":1},
+                {"label":"Alt", "x":10.75, "y":5.25},
                 {"label":"Win", "x":11.75, "y":5.25},
-                {"label":"Ctrl", "x":12.75, "y":5.25, "w":1},
+                {"label":"Ctrl", "x":12.75, "y":5.25},
                 {"label":"Left", "x":13.75, "y":5.5},
                 {"label":"Left", "x":14.75, "y":5.5},
                 {"label":"Down", "x":15.75, "y":5.5},
diff --git a/keyboards/metamechs/timberwolf/timberwolf.c b/keyboards/metamechs/timberwolf/timberwolf.c
index ff50851247..f21c0daa07 100644
--- a/keyboards/metamechs/timberwolf/timberwolf.c
+++ b/keyboards/metamechs/timberwolf/timberwolf.c
@@ -23,13 +23,3 @@ void led_update_ports(led_t led_state) {
         backlight_set(0);
     }
 }
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-	if (clockwise) {
-		tap_code(KC_VOLU);
-	} else {
-		tap_code(KC_VOLD);
-	}
-    return true;
-}
diff --git a/keyboards/mexsistor/ludmila/config.h b/keyboards/mexsistor/ludmila/config.h
index 208e11fc1c..8d8aaed5c7 100644
--- a/keyboards/mexsistor/ludmila/config.h
+++ b/keyboards/mexsistor/ludmila/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define RGB_DI_PIN D1
 #define RGBLED_NUM 4
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mexsistor/ludmila/info.json b/keyboards/mexsistor/ludmila/info.json
index ea42f18d30..fcfecd0fd7 100644
--- a/keyboards/mexsistor/ludmila/info.json
+++ b/keyboards/mexsistor/ludmila/info.json
@@ -13,17 +13,21 @@
             {"pin_a": "F6", "pin_b": "F5"}
         ]
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "SW1", "x": 0, "y": 0},
-                {"label": "SW3", "x": 1, "y": 0},
-                {"label": "Encoder", "x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [2, 0], "x": 3, "y": 0},
 
-                {"label": "SW2", "x": 0, "y": 1},
-                {"label": "SW4", "x": 1, "y": 1}
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1}
             ]
         }
     }
diff --git a/keyboards/mexsistor/ludmila/ludmila.c b/keyboards/mexsistor/ludmila/ludmila.c
deleted file mode 100644
index 4125d19671..0000000000
--- a/keyboards/mexsistor/ludmila/ludmila.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Kevin M.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ludmila.h"
diff --git a/keyboards/mexsistor/ludmila/ludmila.h b/keyboards/mexsistor/ludmila/ludmila.h
deleted file mode 100644
index fc95a5492e..0000000000
--- a/keyboards/mexsistor/ludmila/ludmila.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Kevin M.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k20, \
-    k10, k11 \
-) { \
-    { k00, k01, }, \
-    { k10, k11, }, \
-    { k20 }  \
-  }
diff --git a/keyboards/mikeneko65/config.h b/keyboards/mikeneko65/config.h
index f3e7d79932..42ab44fce1 100644
--- a/keyboards/mikeneko65/config.h
+++ b/keyboards/mikeneko65/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, C7 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, E6, B0, B7, D4, D6, D7, B6, B5, B4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mikeneko65/info.json b/keyboards/mikeneko65/info.json
index 0ae602b096..ebd6a4a7a4 100644
--- a/keyboards/mikeneko65/info.json
+++ b/keyboards/mikeneko65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6D54",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D4", "D6", "D7", "B6", "B5", "B4"],
+        "rows": ["D0", "D1", "D2", "D3", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -17,77 +22,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mikeneko65/mikeneko65.c b/keyboards/mikeneko65/mikeneko65.c
deleted file mode 100644
index c968026a50..0000000000
--- a/keyboards/mikeneko65/mikeneko65.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 kkatano
- * Copyright 2022 takishim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mikeneko65.h"
diff --git a/keyboards/mikeneko65/mikeneko65.h b/keyboards/mikeneko65/mikeneko65.h
deleted file mode 100644
index 9273b0fdbc..0000000000
--- a/keyboards/mikeneko65/mikeneko65.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 kkatano
- * Copyright 2022 takishim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k213, k214, \
-    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314, \
-    k400, k401, k402,                   k406,             k409,       k411, k412, k413, k414  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014 }, \
-    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  k114 }, \
-    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  k214 }, \
-    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  k314 }, \
-    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  KC_NO, k411,  k412,  k413,  k414 }  \
-}
diff --git a/keyboards/miller/gm862/config.h b/keyboards/miller/gm862/config.h
index b2aee68f70..4bd9748ab5 100644
--- a/keyboards/miller/gm862/config.h
+++ b/keyboards/miller/gm862/config.h
@@ -1,21 +1,5 @@
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS {F0, F1, F4, F5, B4}
-#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6, B0, B1, B2, B3, B7, D2, D3, D5 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/miller/gm862/info.json b/keyboards/miller/gm862/info.json
index 9f3d247305..ec09fc96a4 100644
--- a/keyboards/miller/gm862/info.json
+++ b/keyboards/miller/gm862/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0223",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "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,
diff --git a/keyboards/miller/gm862/rules.mk b/keyboards/miller/gm862/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/miller/gm862/rules.mk
+++ b/keyboards/miller/gm862/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/millipad/config.h b/keyboards/millipad/config.h
index ab1d6e7c51..7d416ae8db 100644
--- a/keyboards/millipad/config.h
+++ b/keyboards/millipad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, C7 }
-#define MATRIX_COL_PINS { F0, F1, F4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_RESYNC_ENABLE
 
 #define FORCE_NKRO
diff --git a/keyboards/millipad/info.json b/keyboards/millipad/info.json
index 9469f2baba..975c41481b 100644
--- a/keyboards/millipad/info.json
+++ b/keyboards/millipad/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x1A1B",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "D7", "D6", "D4"],
+        "rows": ["C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D2"}
@@ -18,19 +23,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0},
-				{"label": "k03", "x": 3, "y": 0},
-				{"label": "k04", "x": 4, "y": 0},
-				{"label": "k05", "x": 5, "y": 0},
-				
-				{"label": "k10", "x": 0, "y": 1},
-				{"label": "k11", "x": 1, "y": 1},
-				{"label": "k12", "x": 2, "y": 1},
-				{"label": "k13", "x": 3, "y": 1},
-				{"label": "k14", "x": 4, "y": 1},
-				{"label": "k15", "x": 5, "y": 1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1}
             ]
         }
     }
diff --git a/keyboards/millipad/millipad.c b/keyboards/millipad/millipad.c
deleted file mode 100644
index 5b6b668289..0000000000
--- a/keyboards/millipad/millipad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Jirou
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "millipad.h"
diff --git a/keyboards/millipad/millipad.h b/keyboards/millipad/millipad.h
deleted file mode 100644
index 35eb843d6f..0000000000
--- a/keyboards/millipad/millipad.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 Jirou
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, \
-    k10, k11, k12, k13, k14, k15    \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }  \
-}
diff --git a/keyboards/mincedshon/ecila/config.h b/keyboards/mincedshon/ecila/config.h
index 9c7e498de3..976c62c659 100644
--- a/keyboards/mincedshon/ecila/config.h
+++ b/keyboards/mincedshon/ecila/config.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN B0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mincedshon/ecila/ecila.c b/keyboards/mincedshon/ecila/ecila.c
deleted file mode 100644
index 909de998c9..0000000000
--- a/keyboards/mincedshon/ecila/ecila.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 mincedshon (@mincedshon)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "ecila.h"
diff --git a/keyboards/mincedshon/ecila/info.json b/keyboards/mincedshon/ecila/info.json
index 9cd5ed61e1..6b277ce590 100644
--- a/keyboards/mincedshon/ecila/info.json
+++ b/keyboards/mincedshon/ecila/info.json
@@ -7,6 +7,9 @@
       "pid": "0x534B",
       "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "bootloader": "atmel-dfu",
     "features": {
       "bootmagic": true,
diff --git a/keyboards/mini_elixivy/config.h b/keyboards/mini_elixivy/config.h
index fafc795574..d90fdba271 100644
--- a/keyboards/mini_elixivy/config.h
+++ b/keyboards/mini_elixivy/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B6, E6, F6, C7 }
-#define MATRIX_COL_PINS { F7, F5, F4, F1, F0, B7, D0, D1, D2, D3, D4, D6, D7, B4, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mini_elixivy/info.json b/keyboards/mini_elixivy/info.json
index 3567b555ac..7134938252 100644
--- a/keyboards/mini_elixivy/info.json
+++ b/keyboards/mini_elixivy/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F5", "F4", "F1", "F0", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "C6"],
+        "rows": ["B5", "B6", "E6", "F6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "D5"}
@@ -19,20 +24,155 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout":[
-                {"label":"Esc", "x":0, "y":0},{"label":"1", "x":1, "y":0},{"label":"2", "x":2, "y":0},{"label":"3", "x":3, "y":0},{"label":"4", "x":4, "y":0},{"label":"5", "x":5, "y":0},{"label":"6", "x":6, "y":0},{"label":"7", "x":7, "y":0},{"label":"8", "x":8, "y":0},{"label":"9", "x":9, "y":0},{"label":"0", "x":10, "y":0},{"label":"Dash", "x":11, "y":0},{"label":"Equals", "x":12, "y":0},{"label":"Backspace", "x":13, "y":0, "w":2.00},{"label":"Mute", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},{"label":"Q", "x":1.5, "y":1},{"label":"W", "x":2.5, "y":1},{"label":"E", "x":3.5, "y":1},{"label":"R", "x":4.5, "y":1},{"label":"T", "x":5.5, "y":1},{"label":"Y", "x":6.5, "y":1},{"label":"U", "x":7.5, "y":1},{"label":"I", "x":8.5, "y":1},{"label":"O", "x":9.5, "y":1},{"label":"P", "x":10.5, "y":1},{"label":"[", "x":11.5, "y":1},{"label":"]", "x":12.5, "y":1},{"label":"BackSlash", "x":13.5, "y":1, "w":1.5},{"label":"PrintScr", "x":15, "y":1},
-                {"label":"Caps", "x":0, "y":2, "w":1.75},{"label":"A", "x":1.75, "y":2},{"label":"S", "x":2.75, "y":2},{"label":"D", "x":3.75, "y":2},{"label":"F", "x":4.75, "y":2},{"label":"G", "x":5.75, "y":2},{"label":"H", "x":6.75, "y":2},{"label":"J", "x":7.75, "y":2},{"label":"K", "x":8.75, "y":2},{"label":"L", "x":9.75, "y":2},{"label":";", "x":10.75, "y":2},{"label":"'", "x":11.75, "y":2},{"label":"Enter", "x":12.75, "y":2, "w":2.25},{"label":"Del", "x":15, "y":2},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},{"label":"Z", "x":2.25, "y":3},{"label":"X", "x":3.25, "y":3},{"label":"C", "x":4.25, "y":3},{"label":"V", "x":5.25, "y":3},{"label":"B", "x":6.25, "y":3},{"label":"N", "x":7.25, "y":3},{"label":"M", "x":8.25, "y":3},{"label":",", "x":9.25, "y":3},{"label":".", "x":10.25, "y":3},{"label":"/", "x":11.25, "y":3},{"label":"Shift", "x":12.25, "y":3, "w":1.75},{"label":"Up", "x":14, "y":3},{"label":"`", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},{"label":"Win", "x":1.25, "y":4, "w":1.25},{"label":"Alt", "x":2.50, "y":4, "w":1.25},{"label":"", "x":3.75, "y":4, "w":6.25},{"label":"Alt", "x":10, "y":4},{"label":"Fn", "x":11, "y":4},{"label":"Ctrl", "x":12, "y":4},{"label":"Left", "x":13, "y":4},{"label":"Down", "x":14, "y":4},{"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout":[
-                {"label":"Esc", "x":0, "y":0},{"label":"1", "x":1, "y":0},{"label":"2", "x":2, "y":0},{"label":"3", "x":3, "y":0},{"label":"4", "x":4, "y":0},{"label":"5", "x":5, "y":0},{"label":"6", "x":6, "y":0},{"label":"7", "x":7, "y":0},{"label":"8", "x":8, "y":0},{"label":"9", "x":9, "y":0},{"label":"0", "x":10, "y":0},{"label":"Dash", "x":11, "y":0},{"label":"Equals", "x":12, "y":0},{"label":"Backspace", "x":13, "y":0, "w":2.00},{"label":"Mute", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},{"label":"Q", "x":1.5, "y":1},{"label":"W", "x":2.5, "y":1},{"label":"E", "x":3.5, "y":1},{"label":"R", "x":4.5, "y":1},{"label":"T", "x":5.5, "y":1},{"label":"Y", "x":6.5, "y":1},{"label":"U", "x":7.5, "y":1},{"label":"I", "x":8.5, "y":1},{"label":"O", "x":9.5, "y":1},{"label":"P", "x":10.5, "y":1},{"label":"[", "x":11.5, "y":1},{"label":"]", "x":12.5, "y":1},{"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},{"label":"PrintScr", "x":15, "y":1},
-                {"label":"Caps", "x":0, "y":2, "w":1.75},{"label":"A", "x":1.75, "y":2},{"label":"S", "x":2.75, "y":2},{"label":"D", "x":3.75, "y":2},{"label":"F", "x":4.75, "y":2},{"label":"G", "x":5.75, "y":2},{"label":"H", "x":6.75, "y":2},{"label":"J", "x":7.75, "y":2},{"label":"K", "x":8.75, "y":2},{"label":"L", "x":9.75, "y":2},{"label":";", "x":10.75, "y":2},{"label":"'", "x":11.75, "y":2},{"label":"BackSlash", "x":12.75, "y":2},{"label":"Del", "x":15, "y":2},
-                {"label":"Shift", "x":0, "y":3, "w":1.25},{"label":"BackSlash", "x":1.25, "y":3},{"label":"Z", "x":2.25, "y":3},{"label":"X", "x":3.25, "y":3},{"label":"C", "x":4.25, "y":3},{"label":"V", "x":5.25, "y":3},{"label":"B", "x":6.25, "y":3},{"label":"N", "x":7.25, "y":3},{"label":"M", "x":8.25, "y":3},{"label":",", "x":9.25, "y":3},{"label":".", "x":10.25, "y":3},{"label":"/", "x":11.25, "y":3},{"label":"Shift", "x":12.25, "y":3, "w":1.75},{"label":"Up", "x":14, "y":3},{"label":"`", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},{"label":"Win", "x":1.25, "y":4, "w":1.25},{"label":"Alt", "x":2.50, "y":4, "w":1.25},{"label":"", "x":3.75, "y":4, "w":6.25},{"label":"Alt", "x":10, "y":4},{"label":"Fn", "x":11, "y":4},{"label":"Ctrl", "x":12, "y":4},{"label":"Left", "x":13, "y":4},{"label":"Down", "x":14, "y":4},{"label":"Right", "x":15, "y":4}              
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mini_elixivy/mini_elixivy.c b/keyboards/mini_elixivy/mini_elixivy.c
deleted file mode 100644
index a8d9c931c2..0000000000
--- a/keyboards/mini_elixivy/mini_elixivy.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 minibois
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mini_elixivy.h"
-
-/* Rotary Encoder's function (currently volume up/down) */
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return true;
-}
diff --git a/keyboards/mini_elixivy/mini_elixivy.h b/keyboards/mini_elixivy/mini_elixivy.h
deleted file mode 100644
index 154a1d74e9..0000000000
--- a/keyboards/mini_elixivy/mini_elixivy.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2021 minibois
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// Easier reading of layouts
-#define ___ KC_NO
-
-/* ANSI
- * ,-------------------------------------------------------------.
- * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0a |0b |0c |   0d|0e |
- * |-------------------------------------------------------------|
- * |10  |11 |12 |13 |14 |15 |16 |17 |18 |19 |1a |1b |1c |  1d|1e |
- * |-------------------------------------------------------------|
- * |20   |21 |22 |23 |24 |25 |26 |27 |28 |29 |2a |2b |2c    ||2e |
- * |-------------------------------------------------------------|
- * |30     ||32 |33 |34 |35 |36 |37 |38 |39 |3a |3b      |3b |3c |
- * |-------------------------------------------------------------|
- * |40  |41  |42  |           46         |49 |4a |4b |4c |4d |4e |
- * `-------------------------------------------------------------'
-*/
-#define LAYOUT_65_ansi( \
-        k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e   ,   \
-        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e   ,   \
-        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e   ,   \
-        k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e   ,   \
-        k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e       \
-) \
-{ \
-    {   k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e   },  \
-    {   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e   },  \
-    {   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e   },  \
-    {   k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e   },  \
-    {   k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e   }   \
-}
-
-/* ISO
- * ,-------------------------------------------------------------.
- * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0a |0b |0c |   0d|0e |
- * |-------------------------------------------------------------|
- * |10  |11 |12 |13 |14 |15 |16 |17 |18 |19 |1a |1b |1c |    |1e |
- * |-----------------------------------------------------| 1d|---|
- * |20   |21 |22 |23 |24 |25 |26 |27 |28 |29 |2a |2b |2c |   |2e |
- * |-------------------------------------------------------------|
- * |30  |31 |32 |33 |34 |35 |36 |37 |38 |39 |3a |3b      |3b |3c |
- * |-------------------------------------------------------------|
- * |40  |41  |42  |           46         |49 |4a |4b |4c |4d |4e |
- * `-------------------------------------------------------------'
-*/
-#define LAYOUT_65_iso( \
-        k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e   ,   \
-        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e   ,   \
-        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e   ,   \
-        k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e   ,   \
-        k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e       \
-) \
-{ \
-    {   k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e   },  \
-    {   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e   },  \
-    {   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e   },  \
-    {   k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e   },  \
-    {   k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e   }   \
-}
diff --git a/keyboards/mini_ten_key_plus/config.h b/keyboards/mini_ten_key_plus/config.h
index 1773beff05..d90fdba271 100644
--- a/keyboards/mini_ten_key_plus/config.h
+++ b/keyboards/mini_ten_key_plus/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, B1, B5, B4, E6 }
-#define MATRIX_COL_PINS { F5, F4, B6, D7, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mini_ten_key_plus/info.json b/keyboards/mini_ten_key_plus/info.json
index e69e49b06b..089668ec14 100644
--- a/keyboards/mini_ten_key_plus/info.json
+++ b/keyboards/mini_ten_key_plus/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "B6", "D7", "C6"],
+        "rows": ["D4", "B1", "B5", "B4", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F7", "pin_b": "F6", "resolution": 2}
diff --git a/keyboards/miniaxe/config.h b/keyboards/miniaxe/config.h
index 3b9010455c..8d0955d769 100644
--- a/keyboards/miniaxe/config.h
+++ b/keyboards/miniaxe/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* Uncomment below if use underglow */
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/miniaxe/info.json b/keyboards/miniaxe/info.json
index 292f69085a..4847749582 100644
--- a/keyboards/miniaxe/info.json
+++ b/keyboards/miniaxe/info.json
@@ -11,6 +11,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "matrix_pins": {
diff --git a/keyboards/minimacro5/config.h b/keyboards/minimacro5/config.h
index 272c37ff50..317e150935 100644
--- a/keyboards/minimacro5/config.h
+++ b/keyboards/minimacro5/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 200
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN B5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/minimacro5/info.json b/keyboards/minimacro5/info.json
index 7c6748c574..134b50f017 100644
--- a/keyboards/minimacro5/info.json
+++ b/keyboards/minimacro5/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0007",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B5"
+  },
   "encoder": {
     "rotary": [
       {"pin_a": "D3", "pin_b": "F5", "resolution": 2},
diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h
index 4024ac6f45..1d1616ee25 100644
--- a/keyboards/minimon/index_tab/config.h
+++ b/keyboards/minimon/index_tab/config.h
@@ -16,21 +16,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, B7, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D2, F1, F0 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 10
 #define RGBLIGHT_SLEEP
 
diff --git a/keyboards/minimon/index_tab/index_tab.c b/keyboards/minimon/index_tab/index_tab.c
deleted file mode 100644
index a0d8377e97..0000000000
--- a/keyboards/minimon/index_tab/index_tab.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 Kyrre Havik Eriksen
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "index_tab.h"
diff --git a/keyboards/minimon/index_tab/index_tab.h b/keyboards/minimon/index_tab/index_tab.h
deleted file mode 100644
index e1419379ba..0000000000
--- a/keyboards/minimon/index_tab/index_tab.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright 2020 Kyrre Havik Eriksen
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │50 │51 │52 │53 │54 │55 │56 │57 │58 │59 │5a │5b │5c │
- * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
- * ┌───┬───┬───┬───┬───────┬───────┬───┬───┬───┬───┬───�
- * │50 │51 │52 │53 │54     │56     │58 │59 │5a │5b │5c │ 2x2u
- * └───┴───┴───┴───┴───────┴───────┴───┴───┴───┴───┴───┘
- * ┌───┬───┬───┬───────────────────────────┬───┬───┬───�
- * │50 │51 │52 │            56             │5a │5b │5c │ 7u_space
- * └───┴───┴───┴───────────────────────────┴───┴───┴───┘
- */
-
-#define LAYOUT_ortho_6x13( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, \
-  K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5a, K5b, K5c  \
-) \
-  { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5a, K5b, K5c }  \
-  }
-
-#define LAYOUT_2x2u( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, \
-  K50, K51, K52, K53, K54,      K56,      K58, K59, K5a, K5b, K5c  \
-) \
-  { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c }, \
-    { K50, K51, K52, K53, K54, XXX, K56, XXX, K58, K59, K5a, K5b, K5c }  \
-  }
-
-#define LAYOUT_7u_space( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, \
-  K50, K51, K52,                K56,                K5a, K5b, K5c  \
-) \
-  { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5a, K5b, K5c }  \
-  }
diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json
index f3fd4717ec..c386795024 100644
--- a/keyboards/minimon/index_tab/info.json
+++ b/keyboards/minimon/index_tab/info.json
@@ -9,260 +9,268 @@
         "pid": "0x1306",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D2", "F1", "F0"],
+        "rows": ["D3", "B7", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_6x13": {
             "layout": [
-                {"label":"CAPS", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
 
-                {"label":"<>", "x":0, "y":1},
-                {"label":"1!", "x":1, "y":1},
-                {"label":"2\"", "x":2, "y":1},
-                {"label":"3#", "x":3, "y":1},
-                {"label":"4\u00a4", "x":4, "y":1},
-                {"label":"5%", "x":5, "y":1},
-                {"label":"6&", "x":6, "y":1},
-                {"label":"7/", "x":7, "y":1},
-                {"label":"8(", "x":8, "y":1},
-                {"label":"9)", "x":9, "y":1},
-                {"label":"0=", "x":10, "y":1},
-                {"label":"+?", "x":11, "y":1},
-                {"label":"\\`", "x":12, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
 
-                {"label":"TAB", "x":0, "y":2},
-                {"label":"Q", "x":1, "y":2},
-                {"label":"W", "x":2, "y":2},
-                {"label":"E", "x":3, "y":2},
-                {"label":"R", "x":4, "y":2},
-                {"label":"T", "x":5, "y":2},
-                {"label":"Y", "x":6, "y":2},
-                {"label":"U", "x":7, "y":2},
-                {"label":"I", "x":8, "y":2},
-                {"label":"O", "x":9, "y":2},
-                {"label":"P", "x":10, "y":2},
-                {"label":"\u00c5", "x":11, "y":2},
-                {"label":"BKSP", "x":12, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
 
-                {"label":"CTRL", "x":0, "y":3},
-                {"label":"A", "x":1, "y":3},
-                {"label":"S", "x":2, "y":3},
-                {"label":"D", "x":3, "y":3},
-                {"label":"F", "x":4, "y":3},
-                {"label":"G", "x":5, "y":3},
-                {"label":"H", "x":6, "y":3},
-                {"label":"J", "x":7, "y":3},
-                {"label":"K", "x":8, "y":3},
-                {"label":"L", "x":9, "y":3},
-                {"label":"\u00d8", "x":10, "y":3},
-                {"label":"\u00c6", "x":11, "y":3},
-                {"label":"\u00a8^", "x":12, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
 
-                {"label":"SHIFT", "x":0, "y":4},
-                {"label":"Z", "x":1, "y":4},
-                {"label":"X", "x":2, "y":4},
-                {"label":"C", "x":3, "y":4},
-                {"label":"V", "x":4, "y":4},
-                {"label":"B", "x":5, "y":4},
-                {"label":"N", "x":6, "y":4},
-                {"label":"M", "x":7, "y":4},
-                {"label":",;", "x":8, "y":4},
-                {"label":".:", "x":9, "y":4},
-                {"label":"-_", "x":10, "y":4},
-                {"label":"\u2191", "x":11, "y":4},
-                {"label":"\u21b2", "x":12, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
 
-                {"label":"ESC", "x":0, "y":5},
-                {"label":"|\u00a7", "x":1, "y":5},
-                {"label":"WIN", "x":2, "y":5},
-                {"label":"LALT", "x":3, "y":5},
-                {"label":"Space", "x":4, "y":5},
-                {"label":"Space", "x":5, "y":5},
-                {"label":"Space", "x":6, "y":5},
-                {"label":"Space", "x":7, "y":5},
-                {"label":"FN", "x":8, "y":5},
-                {"label":"'*", "x":9, "y":5},
-                {"label":"\u2190", "x":10, "y":5},
-                {"label":"\u2193", "x":11, "y":5},
-                {"label":"\u2192", "x":12, "y":5}
+                {"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": [5, 9], "x": 9, "y": 5},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5}
             ]
         },
         "LAYOUT_2x2u": {
             "layout": [
-                {"label":"CAPS", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
 
-                {"label":"<>", "x":0, "y":1},
-                {"label":"1!", "x":1, "y":1},
-                {"label":"2\"", "x":2, "y":1},
-                {"label":"3#", "x":3, "y":1},
-                {"label":"4\u00a4", "x":4, "y":1},
-                {"label":"5%", "x":5, "y":1},
-                {"label":"6&", "x":6, "y":1},
-                {"label":"7/", "x":7, "y":1},
-                {"label":"8(", "x":8, "y":1},
-                {"label":"9)", "x":9, "y":1},
-                {"label":"0=", "x":10, "y":1},
-                {"label":"+?", "x":11, "y":1},
-                {"label":"\\`", "x":12, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
 
-                {"label":"TAB", "x":0, "y":2},
-                {"label":"Q", "x":1, "y":2},
-                {"label":"W", "x":2, "y":2},
-                {"label":"E", "x":3, "y":2},
-                {"label":"R", "x":4, "y":2},
-                {"label":"T", "x":5, "y":2},
-                {"label":"Y", "x":6, "y":2},
-                {"label":"U", "x":7, "y":2},
-                {"label":"I", "x":8, "y":2},
-                {"label":"O", "x":9, "y":2},
-                {"label":"P", "x":10, "y":2},
-                {"label":"\u00c5", "x":11, "y":2},
-                {"label":"BKSP", "x":12, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
 
-                {"label":"CTRL", "x":0, "y":3},
-                {"label":"A", "x":1, "y":3},
-                {"label":"S", "x":2, "y":3},
-                {"label":"D", "x":3, "y":3},
-                {"label":"F", "x":4, "y":3},
-                {"label":"G", "x":5, "y":3},
-                {"label":"H", "x":6, "y":3},
-                {"label":"J", "x":7, "y":3},
-                {"label":"K", "x":8, "y":3},
-                {"label":"L", "x":9, "y":3},
-                {"label":"\u00d8", "x":10, "y":3},
-                {"label":"\u00c6", "x":11, "y":3},
-                {"label":"\u00a8^", "x":12, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
 
-                {"label":"SHIFT", "x":0, "y":4},
-                {"label":"Z", "x":1, "y":4},
-                {"label":"X", "x":2, "y":4},
-                {"label":"C", "x":3, "y":4},
-                {"label":"V", "x":4, "y":4},
-                {"label":"B", "x":5, "y":4},
-                {"label":"N", "x":6, "y":4},
-                {"label":"M", "x":7, "y":4},
-                {"label":",;", "x":8, "y":4},
-                {"label":".:", "x":9, "y":4},
-                {"label":"-_", "x":10, "y":4},
-                {"label":"\u2191", "x":11, "y":4},
-                {"label":"\u21b2", "x":12, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
 
-                {"label":"ESC", "x":0, "y":5},
-                {"label":"|\u00a7", "x":1, "y":5},
-                {"label":"WIN", "x":2, "y":5},
-                {"label":"LALT", "x":3, "y":5},
-                {"label":"Space", "x":4, "y":5, "w":2},
-                {"label":"Space", "x":6, "y":5, "w":2},
-                {"label":"FN", "x":8, "y":5},
-                {"label":"'*", "x":9, "y":5},
-                {"label":"\u2190", "x":10, "y":5},
-                {"label":"\u2193", "x":11, "y":5},
-                {"label":"\u2192", "x":12, "y":5}
+                {"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, "w": 2},
+                {"matrix": [5, 6], "x": 6, "y": 5, "w": 2},
+                {"matrix": [5, 8], "x": 8, "y": 5},
+                {"matrix": [5, 9], "x": 9, "y": 5},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5}
             ]
         },
         "LAYOUT_7u_space": {
             "layout": [
-                {"label":"Fn/Caps", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
 
-                {"label":"<>", "x":0, "y":1},
-                {"label":"1!", "x":1, "y":1},
-                {"label":"2\"", "x":2, "y":1},
-                {"label":"3#", "x":3, "y":1},
-                {"label":"4\u00a4", "x":4, "y":1},
-                {"label":"5%", "x":5, "y":1},
-                {"label":"6&", "x":6, "y":1},
-                {"label":"7/", "x":7, "y":1},
-                {"label":"8(", "x":8, "y":1},
-                {"label":"9)", "x":9, "y":1},
-                {"label":"0=", "x":10, "y":1},
-                {"label":"+?", "x":11, "y":1},
-                {"label":"\\`", "x":12, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
 
-                {"label":"TAB", "x":0, "y":2},
-                {"label":"Q", "x":1, "y":2},
-                {"label":"W", "x":2, "y":2},
-                {"label":"E", "x":3, "y":2},
-                {"label":"R", "x":4, "y":2},
-                {"label":"T", "x":5, "y":2},
-                {"label":"Y", "x":6, "y":2},
-                {"label":"U", "x":7, "y":2},
-                {"label":"I", "x":8, "y":2},
-                {"label":"O", "x":9, "y":2},
-                {"label":"P", "x":10, "y":2},
-                {"label":"\u00c5", "x":11, "y":2},
-                {"label":"BKSP", "x":12, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
 
-                {"label":"CTRL", "x":0, "y":3},
-                {"label":"A", "x":1, "y":3},
-                {"label":"S", "x":2, "y":3},
-                {"label":"D", "x":3, "y":3},
-                {"label":"F", "x":4, "y":3},
-                {"label":"G", "x":5, "y":3},
-                {"label":"H", "x":6, "y":3},
-                {"label":"J", "x":7, "y":3},
-                {"label":"K", "x":8, "y":3},
-                {"label":"L", "x":9, "y":3},
-                {"label":"\u00d8", "x":10, "y":3},
-                {"label":"\u00c6", "x":11, "y":3},
-                {"label":"\u00a8^", "x":12, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
 
-                {"label":"SHIFT", "x":0, "y":4},
-                {"label":"Z", "x":1, "y":4},
-                {"label":"X", "x":2, "y":4},
-                {"label":"C", "x":3, "y":4},
-                {"label":"V", "x":4, "y":4},
-                {"label":"B", "x":5, "y":4},
-                {"label":"N", "x":6, "y":4},
-                {"label":"M", "x":7, "y":4},
-                {"label":",;", "x":8, "y":4},
-                {"label":".:", "x":9, "y":4},
-                {"label":"-_", "x":10, "y":4},
-                {"label":"\u2191", "x":11, "y":4},
-                {"label":"\u21b2", "x":12, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
 
-                {"label":"GESC", "x":0, "y":5},
-                {"label":"WIN", "x":1, "y":5},
-                {"label":"LALT", "x":2, "y":5},
-                {"label":"Space", "x":3, "y":5, "w":7},
-                {"label":"\u2190", "x":10, "y":5},
-                {"label":"\u2193", "x":11, "y":5},
-                {"label":"\u2192", "x":12, "y":5}
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5}
             ]
         }
     }
diff --git a/keyboards/mino/hotswap/config.h b/keyboards/mino/hotswap/config.h
index 841abc16f5..45fec5af48 100644
--- a/keyboards/mino/hotswap/config.h
+++ b/keyboards/mino/hotswap/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, C6, D4, D2}
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mino/hotswap/hotswap.c b/keyboards/mino/hotswap/hotswap.c
deleted file mode 100644
index 46f2f9aef0..0000000000
--- a/keyboards/mino/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 ShandonCodes
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hotswap.h"
diff --git a/keyboards/mino/hotswap/hotswap.h b/keyboards/mino/hotswap/hotswap.h
deleted file mode 100644
index fc55cc8c2b..0000000000
--- a/keyboards/mino/hotswap/hotswap.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2022 ShandonCodes
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_default( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k3b, \
-    k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,     \
-    k30,      k31, k32, k33, k35, k37, k38, k39, k3a \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b},  \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b}, \
-    { k30, k31, k32, k33, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b}, \
-}
-
diff --git a/keyboards/mino/hotswap/info.json b/keyboards/mino/hotswap/info.json
index 4e932f4939..9ba7617920 100644
--- a/keyboards/mino/hotswap/info.json
+++ b/keyboards/mino/hotswap/info.json
@@ -8,60 +8,65 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7"],
+        "rows": ["D3", "C6", "D4", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
 
-                {"x": 0, "y": 1, "w": 1.25},
-                {"x": 1.25, "y": 1},
-                {"x": 2.25, "y": 1},
-                {"x": 3.25, "y": 1},
-                {"x": 4.25, "y": 1},
-                {"x": 5.25, "y": 1},
-                {"x": 6.25, "y": 1},
-                {"x": 7.25, "y": 1},
-                {"x": 8.25, "y": 1},
-                {"x": 9.25, "y": 1},
-                {"x": 10.25, "y": 1},
-                {"x": 11.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
 
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3, "w": 1.25},
-                {"x": 3.5, "y": 3, "w": 2.25},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3, "w": 2.75},
-                {"x": 9.5, "y": 3, "w": 1.25},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3, "w": 1.25}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/mino/mino.c b/keyboards/mino/mino.c
deleted file mode 100644
index dc9e6d9c01..0000000000
--- a/keyboards/mino/mino.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 ShandonCodes
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mino.h"
\ No newline at end of file
diff --git a/keyboards/mino/mino.h b/keyboards/mino/mino.h
deleted file mode 100644
index fa98480c27..0000000000
--- a/keyboards/mino/mino.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 ShandonCodes
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
- #pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mino_hotswap
-#    include "hotswap.h"
-#endif
\ No newline at end of file
diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h
index 2839e63b1a..41c0f7e8eb 100644
--- a/keyboards/mint60/config.h
+++ b/keyboards/mint60/config.h
@@ -17,31 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { D4, B3, B1, F7, B2, B6, F6, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 8
 #define RGBLIGHT_SPLIT
 
diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json
index f8011a5920..90b5236d43 100644
--- a/keyboards/mint60/info.json
+++ b/keyboards/mint60/info.json
@@ -8,9 +8,17 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D4", "B3", "B1", "F7", "B2", "B6", "F6", "F5"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/mint60/mint60.c b/keyboards/mint60/mint60.c
deleted file mode 100644
index 8905392eff..0000000000
--- a/keyboards/mint60/mint60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Eucalyn
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mint60.h"
diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h
index e5768a480d..c50e01bbe0 100644
--- a/keyboards/misonoworks/chocolatebar/config.h
+++ b/keyboards/misonoworks/chocolatebar/config.h
@@ -17,18 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B7, D2, D3 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define FORCE_NKRO
 
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -40,4 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define RGBLIGHT_EFFECT_RGB_TEST
 // #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json
index bc577e22fe..ce4f796b88 100644
--- a/keyboards/misonoworks/chocolatebar/info.json
+++ b/keyboards/misonoworks/chocolatebar/info.json
@@ -8,6 +8,14 @@
         "pid": "0xC456",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B3", "B2"],
+        "rows": ["B0", "B7", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h
index 2c71926b81..0b1dbb4c57 100644
--- a/keyboards/misonoworks/karina/config.h
+++ b/keyboards/misonoworks/karina/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// pins
-#define MATRIX_ROW_PINS { D2, D3, D5, F0 }
-#define MATRIX_COL_PINS { B3, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6}
-
-// diode mode
-#define DIODE_DIRECTION COL2ROW
-
 #define FORCE_NKRO
 #define MK_3_SPEED
 #define TERMINAL_HELP
@@ -32,8 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 19
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -45,4 +35,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json
index 922e4117e6..803f31a18e 100644
--- a/keyboards/misonoworks/karina/info.json
+++ b/keyboards/misonoworks/karina/info.json
@@ -8,6 +8,14 @@
         "pid": "0xC456",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
+        "rows": ["D2", "D3", "D5", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B1", "resolution": 3},
diff --git a/keyboards/misonoworks/karina/karina.c b/keyboards/misonoworks/karina/karina.c
deleted file mode 100644
index f621e3f452..0000000000
--- a/keyboards/misonoworks/karina/karina.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 MisonoWorks
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "karina.h"
diff --git a/keyboards/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h
index 1021ddf951..db7e1b66da 100644
--- a/keyboards/misterknife/knife66/config.h
+++ b/keyboards/misterknife/knife66/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { B2, B1, B0, A7, A6, A5, A4, B9, B8, B7, B6, B5, B4, B3, A15 }
-#define MATRIX_ROW_PINS { B15, A8, A3, A2, A1 }
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN A9
-
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 200
-#endif
 
 #define WS2812_PWM_DRIVER PWMD1  // default: PWMD1
 #define WS2812_PWM_CHANNEL 2  // default: 2
diff --git a/keyboards/misterknife/knife66/info.json b/keyboards/misterknife/knife66/info.json
index 4a7bc23c35..e1ca5dc060 100644
--- a/keyboards/misterknife/knife66/info.json
+++ b/keyboards/misterknife/knife66/info.json
@@ -8,6 +8,15 @@
         "pid": "0x4172",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A9",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B15", "A8", "A3", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/misterknife/knife66/knife66.c b/keyboards/misterknife/knife66/knife66.c
deleted file mode 100644
index 0e261b3a81..0000000000
--- a/keyboards/misterknife/knife66/knife66.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Thierry Kleist
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
- #include "knife66.h"
diff --git a/keyboards/misterknife/knife66/rules.mk b/keyboards/misterknife/knife66/rules.mk
index 532eee6a62..0f15f10b20 100644
--- a/keyboards/misterknife/knife66/rules.mk
+++ b/keyboards/misterknife/knife66/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-WS2812_DRIVER = pwm
diff --git a/keyboards/misterknife/knife66_iso/config.h b/keyboards/misterknife/knife66_iso/config.h
index 4974254844..beddc04724 100644
--- a/keyboards/misterknife/knife66_iso/config.h
+++ b/keyboards/misterknife/knife66_iso/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { B2, B1, B0, A7, A6, A5, A4, B9, B8, B7, B6, B5, B4, B3, A15 }
-#define MATRIX_ROW_PINS { B15, A8, A3, A2, A1 }
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN A9
-
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -41,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 160
-#endif
 
 #define WS2812_PWM_DRIVER PWMD1  // default: PWMD1
 #define WS2812_PWM_CHANNEL 2  // default: 2
diff --git a/keyboards/misterknife/knife66_iso/info.json b/keyboards/misterknife/knife66_iso/info.json
index b3c84a65bc..2906899b16 100644
--- a/keyboards/misterknife/knife66_iso/info.json
+++ b/keyboards/misterknife/knife66_iso/info.json
@@ -8,6 +8,15 @@
         "pid": "0x4173",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A9",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B15", "A8", "A3", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/misterknife/knife66_iso/knife66_iso.c b/keyboards/misterknife/knife66_iso/knife66_iso.c
deleted file mode 100644
index fe966b0ee7..0000000000
--- a/keyboards/misterknife/knife66_iso/knife66_iso.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Thierry Kleist
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
- #include "knife66_iso.h"
diff --git a/keyboards/misterknife/knife66_iso/rules.mk b/keyboards/misterknife/knife66_iso/rules.mk
index 532eee6a62..0f15f10b20 100644
--- a/keyboards/misterknife/knife66_iso/rules.mk
+++ b/keyboards/misterknife/knife66_iso/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-WS2812_DRIVER = pwm
diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h
index def4cc581c..76fa3df3f4 100644
--- a/keyboards/miuni32/config.h
+++ b/keyboards/miuni32/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F4, D7}
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F1, E6, B7, B3, B2, B1, B0}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -55,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define RGB_DI_PIN D0     // The pin your RGB strip is wired to
 #define RGBLED_NUM 17     // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/miuni32/info.json b/keyboards/miuni32/info.json
index 7dd62adb5a..0c1c5d7c44 100644
--- a/keyboards/miuni32/info.json
+++ b/keyboards/miuni32/info.json
@@ -8,14 +8,96 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F1", "E6", "B7", "B3", "B2", "B1", "B0"],
+        "rows": ["F0", "F4", "D7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_ortho_3x11"
+    },
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2, "w": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2}
+            ]
         },
         "LAYOUT_ortho_3x11": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/miuni32/miuni32.c b/keyboards/miuni32/miuni32.c
deleted file mode 100644
index 7defbe891b..0000000000
--- a/keyboards/miuni32/miuni32.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "miuni32.h"
diff --git a/keyboards/miuni32/miuni32.h b/keyboards/miuni32/miuni32.h
deleted file mode 100644
index c95a37e2e8..0000000000
--- a/keyboards/miuni32/miuni32.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, \
-    k20, k21, k22, k23,      k25, k26, k27, k28, k29, k2A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, XXX, k25, k26, k27, k28, k29, k2A } \
-}
-
-#define LAYOUT_ortho_3x11( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A } \
-}
-
-#define LAYOUT_all LAYOUT_ortho_3x11
diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h
index ed82723108..cddab38dbc 100644
--- a/keyboards/mixi/config.h
+++ b/keyboards/mixi/config.h
@@ -6,8 +6,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 5
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -26,4 +24,3 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYER_BLINK
-#endif
diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json
index 3af1d02f47..cd8e02195e 100644
--- a/keyboards/mixi/info.json
+++ b/keyboards/mixi/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4D49",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "D7", "pin_b": "E6"},
diff --git a/keyboards/mk65/info.json b/keyboards/mk65/info.json
index 84cd0fbca1..7a0aaa4ffd 100644
--- a/keyboards/mk65/info.json
+++ b/keyboards/mk65/info.json
@@ -33,7 +33,6 @@
         "key_lock": false
     },
     "rgblight": {
-        "pin": "B0",
         "led_count": 7,
         "hue_steps": 8,
         "saturation_steps": 8,
@@ -53,6 +52,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/mk65/mk65.c b/keyboards/mk65/mk65.c
deleted file mode 100644
index 8afb0ac415..0000000000
--- a/keyboards/mk65/mk65.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2022 DeskDaily
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/mkh_studio/bully/info.json b/keyboards/mkh_studio/bully/info.json
index 3615b4893f..a2187ba9e4 100644
--- a/keyboards/mkh_studio/bully/info.json
+++ b/keyboards/mkh_studio/bully/info.json
@@ -23,52 +23,52 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "w": 1.5, "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.5, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.5, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.5, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.5, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.5, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.5, "y": 0.0 },
-                { "matrix": [3, 11], "x": 12.5, "y": 0.0 },
-                { "matrix": [1, 0], "w": 1.75, "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.75, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.75, "y": 1.0 },
-                { "matrix": [1, 3], "x": 3.75, "y": 1.0 },
-                { "matrix": [1, 4], "x": 4.75, "y": 1.0 },
-                { "matrix": [1, 5], "x": 5.75, "y": 1.0 },
-                { "matrix": [1, 6], "x": 6.75, "y": 1.0 },
-                { "matrix": [1, 7], "x": 7.75, "y": 1.0 },
-                { "matrix": [1, 8], "x": 8.75, "y": 1.0 },
-                { "matrix": [1, 9], "x": 9.75, "y": 1.0 },
-                { "matrix": [1, 10], "x": 10.75, "y": 1.0 },
-                { "matrix": [1, 11], "w": 1.75, "x": 11.75, "y": 1.0 },
-                { "matrix": [2, 0], "w": 2.25, "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 2.25, "y": 2.0 },
-                { "matrix": [2, 2], "x": 3.25, "y": 2.0 },
-                { "matrix": [2, 3], "x": 4.25, "y": 2.0 },
-                { "matrix": [2, 4], "x": 5.25, "y": 2.0 },
-                { "matrix": [2, 5], "x": 6.25, "y": 2.0 },
-                { "matrix": [2, 6], "x": 7.25, "y": 2.0 },
-                { "matrix": [2, 7], "x": 8.25, "y": 2.0 },
-                { "matrix": [2, 8], "x": 9.25, "y": 2.0 },
-                { "matrix": [2, 9], "x": 10.25, "y": 2.0 },
-                { "matrix": [2, 10], "x": 11.25, "y": 2.0 },
-                { "matrix": [2, 11], "w": 1.25, "x": 12.25, "y": 2.0 },
-                { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3.0 },
-                { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3.0 },
-                { "matrix": [3, 3], "w": 3, "x": 3.75, "y": 3.0, "h": 0.5 },
+                { "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1.5, "y": 0 },
+                { "matrix": [0, 2], "x": 2.5, "y": 0 },
+                { "matrix": [0, 3], "x": 3.5, "y": 0 },
+                { "matrix": [0, 4], "x": 4.5, "y": 0 },
+                { "matrix": [0, 5], "x": 5.5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [0, 9], "x": 9.5, "y": 0 },
+                { "matrix": [0, 10], "x": 10.5, "y": 0 },
+                { "matrix": [0, 11], "x": 11.5, "y": 0 },
+                { "matrix": [3, 11], "x": 12.5, "y": 0 },
+                { "matrix": [1, 0], "w": 1.75, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.75, "y": 1 },
+                { "matrix": [1, 2], "x": 2.75, "y": 1 },
+                { "matrix": [1, 3], "x": 3.75, "y": 1 },
+                { "matrix": [1, 4], "x": 4.75, "y": 1 },
+                { "matrix": [1, 5], "x": 5.75, "y": 1 },
+                { "matrix": [1, 6], "x": 6.75, "y": 1 },
+                { "matrix": [1, 7], "x": 7.75, "y": 1 },
+                { "matrix": [1, 8], "x": 8.75, "y": 1 },
+                { "matrix": [1, 9], "x": 9.75, "y": 1 },
+                { "matrix": [1, 10], "x": 10.75, "y": 1 },
+                { "matrix": [1, 11], "w": 1.75, "x": 11.75, "y": 1 },
+                { "matrix": [2, 0], "w": 2.25, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 2.25, "y": 2 },
+                { "matrix": [2, 2], "x": 3.25, "y": 2 },
+                { "matrix": [2, 3], "x": 4.25, "y": 2 },
+                { "matrix": [2, 4], "x": 5.25, "y": 2 },
+                { "matrix": [2, 5], "x": 6.25, "y": 2 },
+                { "matrix": [2, 6], "x": 7.25, "y": 2 },
+                { "matrix": [2, 7], "x": 8.25, "y": 2 },
+                { "matrix": [2, 8], "x": 9.25, "y": 2 },
+                { "matrix": [2, 9], "x": 10.25, "y": 2 },
+                { "matrix": [2, 10], "x": 11.25, "y": 2 },
+                { "matrix": [2, 11], "w": 1.25, "x": 12.25, "y": 2 },
+                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3 },
+                { "matrix": [3, 3], "w": 3, "x": 3.75, "y": 3, "h": 0.5 },
                 { "matrix": [3, 5], "w": 6, "x": 3.75, "y": 3.5, "h": 0.5 },
-                { "matrix": [3, 6], "w": 3, "x": 6.75, "y": 3.0, "h": 0.5 },
-                { "matrix": [3, 8], "w": 1.25, "x": 9.75, "y": 3.0 },
-                { "matrix": [3, 9], "w": 1.25, "x": 11, "y": 3.0 },
-                { "matrix": [3, 10], "w": 1.25, "x": 12.25, "y": 3.0 }
+                { "matrix": [3, 6], "w": 3, "x": 6.75, "y": 3, "h": 0.5 },
+                { "matrix": [3, 8], "w": 1.25, "x": 9.75, "y": 3 },
+                { "matrix": [3, 9], "w": 1.25, "x": 11, "y": 3 },
+                { "matrix": [3, 10], "w": 1.25, "x": 12.25, "y": 3 }
             ]
         }
     }    
diff --git a/keyboards/ml/gas75/config.h b/keyboards/ml/gas75/config.h
index bd9c4b6e4e..96516121d3 100644
--- a/keyboards/ml/gas75/config.h
+++ b/keyboards/ml/gas75/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D5, D4, D7, D6, B4 }
-#define MATRIX_COL_PINS { D1, D2, B5, B6, C6, C7, F7, F6, F5, F4, E6, B0, B1, B2, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
@@ -33,9 +25,6 @@
     #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #define RGB_MATRIX_KEYPRESSES
 
-    /* RGB Matrix config */
-    #define RGB_DI_PIN D0
-
     /* RGB Matrix effect */
     #define ENABLE_RGB_MATRIX_ALPHAS_MODS
     #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json
index 2687ada0d9..d2a09cf7f7 100644
--- a/keyboards/ml/gas75/info.json
+++ b/keyboards/ml/gas75/info.json
@@ -8,11 +8,22 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "E6", "B0", "B1", "B2", "B3"],
+        "rows": ["D3", "D5", "D4", "D7", "D6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F0", "pin_b": "F1"}
         ]
     },
+    "ws2812": {
+        "pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ml/gas75/keymaps/via/keymap.c b/keyboards/ml/gas75/keymaps/via/keymap.c
index b5e3055427..615e36557a 100644
--- a/keyboards/ml/gas75/keymaps/via/keymap.c
+++ b/keyboards/ml/gas75/keymaps/via/keymap.c
@@ -169,7 +169,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -181,7 +182,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/ml/gas75/rules.mk b/keyboards/ml/gas75/rules.mk
index 031ace3d41..27645344ae 100644
--- a/keyboards/ml/gas75/rules.mk
+++ b/keyboards/ml/gas75/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Encoder enabled
 ENCODER_ENABLE = yes
diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h
index 8daaa6e9f8..70e1beb43e 100644
--- a/keyboards/mlego/m48/config.h
+++ b/keyboards/mlego/m48/config.h
@@ -15,9 +15,6 @@
  */
 #pragma once
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mlego/m48/info.json b/keyboards/mlego/m48/info.json
index 0a9d879ad4..2411fc1d5b 100644
--- a/keyboards/mlego/m48/info.json
+++ b/keyboards/mlego/m48/info.json
@@ -9,7 +9,59 @@
     "community_layouts": ["ortho_4x12"],
     "layouts": {
         "LAYOUT_ortho_4x12": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/mlego/m48/m48.c b/keyboards/mlego/m48/m48.c
deleted file mode 100644
index 887521075b..0000000000
--- a/keyboards/mlego/m48/m48.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021-2022 alin elena <alin@elena.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "m48.h"
-
diff --git a/keyboards/mlego/m48/m48.h b/keyboards/mlego/m48/m48.h
index f9ef8aee39..5acc5c4590 100644
--- a/keyboards/mlego/m48/m48.h
+++ b/keyboards/mlego/m48/m48.h
@@ -19,18 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#define LAYOUT_ortho_4x12( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }  \
-}
-
 static inline void led_lwr(const bool on) {
 #ifdef LED_NUM_LOCK_PIN
     writePin(LED_NUM_LOCK_PIN, on);
diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h
index 04c1bb4509..303b7ae5b5 100644
--- a/keyboards/mlego/m48/rev1/config.h
+++ b/keyboards/mlego/m48/rev1/config.h
@@ -15,15 +15,8 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { A6, A7, B0, B10 }
-#define MATRIX_COL_PINS \
-    { A10, A15, B3, B4, B5, B7, B6, A1, A2, A3, A4, A5 }
-
 #ifdef RGBLIGHT_ENABLE
 #define RGBLIGHT_LAYERS
-#define RGB_DI_PIN B15
 
 #define RGBLED_NUM 20
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json
index ecfa4dc940..4ccf9ede92 100644
--- a/keyboards/mlego/m48/rev1/info.json
+++ b/keyboards/mlego/m48/rev1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x6261",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"],
+        "rows": ["A6", "A7", "B0", "B10"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A0", "pin_b": "B8"}
@@ -13,6 +18,9 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F401",
     "bootloader": "tinyuf2",
     "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h
index 82e327451d..70e1beb43e 100644
--- a/keyboards/mlego/m60/config.h
+++ b/keyboards/mlego/m60/config.h
@@ -15,10 +15,6 @@
  */
 #pragma once
 
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mlego/m60/info.json b/keyboards/mlego/m60/info.json
index 61b720a843..ba06e10872 100644
--- a/keyboards/mlego/m60/info.json
+++ b/keyboards/mlego/m60/info.json
@@ -9,7 +9,72 @@
     "community_layouts": ["ortho_5x12"],
     "layouts": {
         "LAYOUT_ortho_5x12": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/mlego/m60/m60.c b/keyboards/mlego/m60/m60.c
deleted file mode 100644
index e5dba32cdf..0000000000
--- a/keyboards/mlego/m60/m60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021-2022 alin elena <alin@elena.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "m60.h"
-
diff --git a/keyboards/mlego/m60/m60.h b/keyboards/mlego/m60/m60.h
index 70cdbef69a..13a56f3ff0 100644
--- a/keyboards/mlego/m60/m60.h
+++ b/keyboards/mlego/m60/m60.h
@@ -19,20 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#define LAYOUT_ortho_5x12( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411  \
-) { \
-    {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011}, \
-    {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111}, \
-    {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211}, \
-    {K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311}, \
-    {K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411}  \
-}
-
 static inline void led_lwr(const bool on) {
 #ifdef LED_NUM_LOCK_PIN
     writePin(LED_NUM_LOCK_PIN, on);
diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h
index 7805e6e82b..dc6c4c225d 100644
--- a/keyboards/mlego/m60/rev1/config.h
+++ b/keyboards/mlego/m60/rev1/config.h
@@ -15,14 +15,8 @@
  */
 #pragma once
 
-#define MATRIX_ROW_PINS \
-    { A6, A7, B0, B1, B10 }
-#define MATRIX_COL_PINS \
-    { A10, A15, B3, B4, B5, B7, B6, A1, A2, A3, A4, A5 }
-
 #ifdef RGBLIGHT_ENABLE
 
-#define RGB_DI_PIN B15
 #define RGBLIGHT_LAYERS
 
 #define RGBLED_NUM 20
diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json
index e9e03cb189..bbe9f86112 100644
--- a/keyboards/mlego/m60/rev1/info.json
+++ b/keyboards/mlego/m60/rev1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x6161",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"],
+        "rows": ["A6", "A7", "B0", "B1", "B10"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A0", "pin_b": "B8"}
@@ -13,6 +18,9 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F401",
     "bootloader": "tinyuf2",
     "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h
index 8daaa6e9f8..70e1beb43e 100644
--- a/keyboards/mlego/m60_split/config.h
+++ b/keyboards/mlego/m60_split/config.h
@@ -15,9 +15,6 @@
  */
 #pragma once
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mlego/m60_split/info.json b/keyboards/mlego/m60_split/info.json
index de8a558eb1..9a332e2c33 100644
--- a/keyboards/mlego/m60_split/info.json
+++ b/keyboards/mlego/m60_split/info.json
@@ -9,7 +9,77 @@
     "community_layouts": ["ortho_5x12"],
     "layouts": {
         "LAYOUT_ortho_5x12": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":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": [5, 5], "x": 6, "y": 0},
+                {"matrix": [5, 4], "x": 7, "y": 0},
+                {"matrix": [5, 3], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 0], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [6, 5], "x": 6, "y": 1},
+                {"matrix": [6, 4], "x": 7, "y": 1},
+                {"matrix": [6, 3], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 0], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [7, 5], "x": 6, "y": 2},
+                {"matrix": [7, 4], "x": 7, "y": 2},
+                {"matrix": [7, 3], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 1], "x": 10, "y": 2},
+                {"matrix": [7, 0], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [8, 5], "x": 6, "y": 3},
+                {"matrix": [8, 4], "x": 7, "y": 3},
+                {"matrix": [8, 3], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 1], "x": 10, "y": 3},
+                {"matrix": [8, 0], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+
+                {"matrix": [9, 5], "x": 6, "y": 4},
+                {"matrix": [9, 4], "x": 7, "y": 4},
+                {"matrix": [9, 3], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 1], "x": 10, "y": 4},
+                {"matrix": [9, 0], "x": 11, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/mlego/m60_split/m60_split.c b/keyboards/mlego/m60_split/m60_split.c
deleted file mode 100644
index 49fa10457a..0000000000
--- a/keyboards/mlego/m60_split/m60_split.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021-2022 alin elena <alin@elena.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "m60_split.h"
-
diff --git a/keyboards/mlego/m60_split/m60_split.h b/keyboards/mlego/m60_split/m60_split.h
index 11cbd5be60..10be6662c4 100644
--- a/keyboards/mlego/m60_split/m60_split.h
+++ b/keyboards/mlego/m60_split/m60_split.h
@@ -17,26 +17,6 @@
 
 #include "quantum.h"
 
-#define LAYOUT_ortho_5x12( \
-    L00, L01, L02, L03, L04, L05,   R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,   R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,   R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35,   R30, R31, R32, R33, R34, R35, \
-    L40, L41, L42, L43, L44, L45,   R40, R41, R42, R43, R44, R45  \
-) { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45 }, \
-    { R05, R04, R03, R02, R01, R00 }, \
-    { R15, R14, R13, R12, R11, R10 }, \
-    { R25, R24, R23, R22, R21, R20 }, \
-    { R35, R34, R33, R32, R31, R30 }, \
-    { R45, R44, R43, R42, R41, R40 }  \
-}
-
-
 static inline void led_lwr(const bool on) {
 #ifdef LED_NUM_LOCK_PIN
     writePin(LED_NUM_LOCK_PIN, on);
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
index a835d8c4f3..88a208b8f4 100644
--- a/keyboards/mlego/m60_split/rev1/config.h
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -15,18 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { B0, A6, A7, B1, A5 }
-#define MATRIX_COL_PINS \
-    { B14, A10, A15, B3, B4, B5 }
-
-#define MATRIX_ROW_PINS_RIGHT \
-    { B1, A4, A5, A6, A7 }
-
-#define MATRIX_COL_PINS_RIGHT \
-    { B0, A3, A2, A1, B7, B5 }  // cols are from right to left to match the layout
-
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
 
@@ -36,7 +24,6 @@
 #define SERIAL_USART_SPEED 921600
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B15
 #define RGBLIGHT_SPLIT
 #define RGBLIGHT_LAYERS
 
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
index 237b933eb0..d316d64105 100644
--- a/keyboards/mlego/m60_split/rev1/info.json
+++ b/keyboards/mlego/m60_split/rev1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x6361",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B14", "A10", "A15", "B3", "B4", "B5"],
+        "rows": ["B0", "A6", "A7", "B1", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A0", "pin_b": "B8"}
@@ -13,9 +18,18 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "split": {
         "bootmagic": {
             "matrix": [5, 0]
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B0", "A3", "A2", "A1", "B7", "B5"],
+                "rows": ["B1", "A4", "A5", "A6", "A7"]
+            }
         }
     },
     "processor": "STM32F401",
diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h
index 2bb9334497..cfcb26edc1 100644
--- a/keyboards/mlego/m60_split/rev2/config.h
+++ b/keyboards/mlego/m60_split/rev2/config.h
@@ -15,18 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { B0, A6, A7, B1, A5 }
-#define MATRIX_COL_PINS \
-    { B14, A10, A15, B3, B4, B5 }
-
-#define MATRIX_ROW_PINS_RIGHT \
-    { B1, A4, A5, A6, A7 }
-
-#define MATRIX_COL_PINS_RIGHT \
-    { B0, A3, A2, A1, B7, B5 }  // cols are from right to left to match the layout
-
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
 
@@ -38,7 +26,6 @@
 
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B15
 #define RGBLIGHT_SPLIT
 #define RGBLIGHT_LAYERS
 #define RGBLED_NUM 16
diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json
index 4e281733e1..40718aa647 100644
--- a/keyboards/mlego/m60_split/rev2/info.json
+++ b/keyboards/mlego/m60_split/rev2/info.json
@@ -3,6 +3,11 @@
         "pid": "0x6362",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B14", "A10", "A15", "B3", "B4", "B5"],
+        "rows": ["B0", "A6", "A7", "B1", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A0", "pin_b": "B8"}
@@ -13,9 +18,18 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "split": {
         "bootmagic": {
             "matrix": [5, 0]
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B0", "A3", "A2", "A1", "B7", "B5"],
+                "rows": ["B1", "A4", "A5", "A6", "A7"]
+            }
         }
     },
     "processor": "STM32F411",
diff --git a/keyboards/mlego/m65/config.h b/keyboards/mlego/m65/config.h
index 3810f998d2..bdb0c16621 100644
--- a/keyboards/mlego/m65/config.h
+++ b/keyboards/mlego/m65/config.h
@@ -17,8 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/mlego/m65/info.json b/keyboards/mlego/m65/info.json
index 3c7d816d62..c032cda3fe 100644
--- a/keyboards/mlego/m65/info.json
+++ b/keyboards/mlego/m65/info.json
@@ -9,75 +9,75 @@
     "layouts": {
         "LAYOUT_ortho_5x13": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mlego/m65/m65.h b/keyboards/mlego/m65/m65.h
index 9564b3d529..0c3f3b5ba6 100644
--- a/keyboards/mlego/m65/m65.h
+++ b/keyboards/mlego/m65/m65.h
@@ -19,20 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#define LAYOUT_ortho_5x13( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 }, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412 }  \
-}
-
 enum unicode_names {
     la = 0,
     lA,
diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h
index d58ee7627f..2ed846b170 100644
--- a/keyboards/mlego/m65/rev1/config.h
+++ b/keyboards/mlego/m65/rev1/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                          0   1   2    3   4
-#define MATRIX_ROW_PINS \
-    { B11, B0, B1, A2, A3 }
-//                         0    1   2   3   4   5   6   7   8    9  10  11   12
-#define MATRIX_COL_PINS \
-    { A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 }
-
-#define RGB_DI_PIN B15
-
 #define RGBLIGHT_LAYERS
 
 #undef RGBLED_NUM
diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json
index f4d8ba7578..3c939ef4c2 100644
--- a/keyboards/mlego/m65/rev1/info.json
+++ b/keyboards/mlego/m65/rev1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x6061",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A15", "B3", "B4", "B5", "B9", "B8", "B7", "B6", "C15", "A0", "A7", "B10"],
+        "rows": ["B11", "B0", "B1", "A2", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A8", "pin_b": "A9"}
@@ -13,6 +18,9 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino"
 }
diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h
index 8094879b1c..791b73e2f6 100644
--- a/keyboards/mlego/m65/rev2/config.h
+++ b/keyboards/mlego/m65/rev2/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                          0   1   2    3   4
-#define MATRIX_ROW_PINS \
-    { B11, B0, B1, A2, A3 }
-//                         0    1   2   3   4   5   6   7   8    9  10  11   12
-#define MATRIX_COL_PINS \
-    { A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 }
-
-#define RGB_DI_PIN B15
-
 #define RGBLIGHT_LAYERS
 
 #undef RGBLED_NUM
diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json
index 7d265197ca..64df0a2ba6 100644
--- a/keyboards/mlego/m65/rev2/info.json
+++ b/keyboards/mlego/m65/rev2/info.json
@@ -3,6 +3,11 @@
         "pid": "0x6061",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A15", "B3", "B4", "B5", "B9", "B8", "B7", "B6", "C15", "A0", "A7", "B10"],
+        "rows": ["B11", "B0", "B1", "A2", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A8", "pin_b": "A9"}
@@ -13,6 +18,9 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F103", // GD32F303CCT6
     "bootloader": "stm32duino"
 }
diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h
index 4a71449cb0..81f02bc411 100644
--- a/keyboards/mlego/m65/rev3/config.h
+++ b/keyboards/mlego/m65/rev3/config.h
@@ -17,16 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                          0   1   2   3   4
-#define MATRIX_ROW_PINS \
-    { B10, A5, A6, A7, B0 }
-//                         0    1   2   3   4   5   6   7   8    9  10  11   12
-#define MATRIX_COL_PINS \
-    { A10, A15, B3, B4, B5, B9, B8, B7, A1, A2, A3, A4, B1 }
-
 #ifdef RGBLIGHT_ENABLE
 
-#define RGB_DI_PIN B15
 #define RGBLIGHT_LAYERS
 #undef RGBLED_NUM
 #define RGBLED_NUM 20
diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json
index 39c26191c6..b72b706587 100644
--- a/keyboards/mlego/m65/rev3/info.json
+++ b/keyboards/mlego/m65/rev3/info.json
@@ -3,6 +3,11 @@
         "pid": "0x6062",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A15", "B3", "B4", "B5", "B9", "B8", "B7", "A1", "A2", "A3", "A4", "B1"],
+        "rows": ["B10", "A5", "A6", "A7", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A0", "pin_b": "B6"}
@@ -13,6 +18,9 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F401",
     "bootloader": "tinyuf2",
     "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h
index a8b9b596d5..942f360688 100644
--- a/keyboards/mlego/m65/rev4/config.h
+++ b/keyboards/mlego/m65/rev4/config.h
@@ -17,16 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                          0   1   2   3   4
-#define MATRIX_ROW_PINS \
-    { B10, A5, A6, A7, B0 }
-//                         0    1   2   3   4   5   6   7   8    9  10  11   12
-#define MATRIX_COL_PINS \
-    { B14, A8, A10, A15, B3, B4, B5, B7, A1, A2, A3, A4, B1 }
-
 #ifdef RGBLIGHT_ENABLE
 
-#define RGB_DI_PIN B15
 #define RGBLIGHT_LAYERS
 #undef RGBLED_NUM
 #define RGBLED_NUM 20
diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json
index 91af43a6a1..d671845e62 100644
--- a/keyboards/mlego/m65/rev4/info.json
+++ b/keyboards/mlego/m65/rev4/info.json
@@ -3,6 +3,11 @@
         "pid": "0x6062",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B14", "A8", "A10", "A15", "B3", "B4", "B5", "B7", "A1", "A2", "A3", "A4", "B1"],
+        "rows": ["B10", "A5", "A6", "A7", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A0", "pin_b": "B6"}
@@ -13,6 +18,9 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F401",
     "bootloader": "tinyuf2",
     "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/mmkzoo65/config.h b/keyboards/mmkzoo65/config.h
index 2149df4a93..24b79416a8 100644
--- a/keyboards/mmkzoo65/config.h
+++ b/keyboards/mmkzoo65/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B2, B3, B7, E6, B0 }
-#define MATRIX_COL_PINS { B1, F0, F1, F4, F5, F6, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define FORCE_NKRO
 
 /* 将USB 轮询速率更改为 1000hz 并为精英游��次扫�使用更大的密钥*/
diff --git a/keyboards/mmkzoo65/info.json b/keyboards/mmkzoo65/info.json
index 5d613fee01..bd98fdbd35 100644
--- a/keyboards/mmkzoo65/info.json
+++ b/keyboards/mmkzoo65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6505",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["B2", "B3", "B7", "E6", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mmkzoo65/mmkzoo65.c b/keyboards/mmkzoo65/mmkzoo65.c
deleted file mode 100644
index 09da82dd89..0000000000
--- a/keyboards/mmkzoo65/mmkzoo65.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 TW59420 <https://github.com/TW59420>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mmkzoo65.h"
-
diff --git a/keyboards/mnk1800s/config.h b/keyboards/mnk1800s/config.h
index 5c277a3f48..79fdc4275f 100755
--- a/keyboards/mnk1800s/config.h
+++ b/keyboards/mnk1800s/config.h
@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B13, B12, A7, A6, A5 }
-#define MATRIX_COL_PINS { B10, B2, B1, B0, B14, B15, A8, A9, A10, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/mnk1800s/info.json b/keyboards/mnk1800s/info.json
index 26fab96ba9..619911f907 100755
--- a/keyboards/mnk1800s/info.json
+++ b/keyboards/mnk1800s/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3138",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B2", "B1", "B0", "B14", "B15", "A8", "A9", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B13", "B12", "A7", "A6", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/mnk1800s/mnk1800s.c b/keyboards/mnk1800s/mnk1800s.c
deleted file mode 100755
index f7fcd20c2b..0000000000
--- a/keyboards/mnk1800s/mnk1800s.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mnk1800s.h"
diff --git a/keyboards/mnk50/config.h b/keyboards/mnk50/config.h
index d238bd0564..79fdc4275f 100755
--- a/keyboards/mnk50/config.h
+++ b/keyboards/mnk50/config.h
@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B12, B13, A10, A6 }
-#define MATRIX_COL_PINS { B14, B15, A8, A9, A13, A14, A15, B3, B4, B5, B6, B7, B8, B9 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/mnk50/info.json b/keyboards/mnk50/info.json
index 26b900d70a..3d4c98edc7 100755
--- a/keyboards/mnk50/info.json
+++ b/keyboards/mnk50/info.json
@@ -8,170 +8,175 @@
         "pid": "0x4D35",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B14", "B15", "A8", "A9", "A13", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
+        "rows": ["B12", "B13", "A10", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
 
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1},
-                {"x":12.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2, "w":1.25},
-                {"x":13, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 13], "x": 13, "y": 2},
 
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3, "w":1.25},
-                {"x":3.5, "y":3},
-                {"x":4.5, "y":3, "w":2},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3, "w":2},
-                {"x":9.5, "y":3},
-                {"x":10.5, "y":3, "w":1.25},
-                {"x":11.75, "y":3}
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3, "w": 2},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         },
         "LAYOUT_split_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
 
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1},
-                {"x":12.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2, "w":1.25},
-                {"x":13, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 13], "x": 13, "y": 2},
 
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3, "w":1.25},
-                {"x":3.5, "y":3},
-                {"x":4.5, "y":3, "w":2.25},
-                {"x":6.75, "y":3, "w":2.75},
-                {"x":9.5, "y":3},
-                {"x":10.5, "y":3, "w":1.25},
-                {"x":11.75, "y":3}
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         },
         "LAYOUT_7u_space": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
 
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1},
-                {"x":12.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2, "w":1.25},
-                {"x":13, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 13], "x": 13, "y": 2},
 
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3, "w":1.25},
-                {"x":3.5, "y":3, "w":7},
-                {"x":10.5, "y":3, "w":1.25},
-                {"x":11.75, "y":3}
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 7},
+                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         }
     }
diff --git a/keyboards/mnk50/mnk50.c b/keyboards/mnk50/mnk50.c
deleted file mode 100755
index 0e833dc7b3..0000000000
--- a/keyboards/mnk50/mnk50.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mnk50.h"
diff --git a/keyboards/mnk50/mnk50.h b/keyboards/mnk50/mnk50.h
deleted file mode 100644
index 5944450387..0000000000
--- a/keyboards/mnk50/mnk50.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2021 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-/*
- *   ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- *   │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │
- *   ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
- *   │10  │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1D    │
- *   ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤   ┌────────�
- *   │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B  │2D │   │2B      │ 2.25u RShift
- *   └────┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┴───┘   └────────┘
- *        │31 │32  │33 │   35   │    37    │39 │3A  │3B │
- *        └───┴────┴───┴────────┴──────────┴───┴────┴───┘
- *                 ┌───────────────────────────�
- *                 │            36             │ 7u Spacebar
- *                 └───────────────────────────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,      K1D, \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
-         K31, K32, K33,      K35, K36, K37,      K39, K3A, K3B            \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, XXX, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { XXX, K31, K32, K33, XXX, K35, K36, K37, XXX, K39, K3A, K3B, XXX, XXX }  \
-}
-
-#define LAYOUT_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,      K1D, \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
-         K31, K32, K33,      K35,      K37,      K39, K3A, K3B            \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, XXX, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { XXX, K31, K32, K33, XXX, K35, XXX, K37, XXX, K39, K3A, K3B, XXX, XXX }  \
-}
-
-#define LAYOUT_7u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,      K1D, \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
-         K31, K32,                K36,                K3A, K3B            \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, XXX, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { XXX, K31, K32, XXX, XXX, XXX, K36, XXX, XXX, XXX, K3A, K3B, XXX, XXX }  \
-}
diff --git a/keyboards/mnk75/config.h b/keyboards/mnk75/config.h
index f2c84192d4..79fdc4275f 100755
--- a/keyboards/mnk75/config.h
+++ b/keyboards/mnk75/config.h
@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A2, A14, A15, B3, B4, B5 }
-#define MATRIX_COL_PINS { A1, B9, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/mnk75/info.json b/keyboards/mnk75/info.json
index 71ff32beb1..91a1c8f21e 100755
--- a/keyboards/mnk75/info.json
+++ b/keyboards/mnk75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4D37",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"],
+        "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/mnk75/mnk75.c b/keyboards/mnk75/mnk75.c
deleted file mode 100755
index 357bb07823..0000000000
--- a/keyboards/mnk75/mnk75.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- #include "mnk75.h"
diff --git a/keyboards/mntre/config.h b/keyboards/mntre/config.h
index 54a640366b..55a7a8457e 100644
--- a/keyboards/mntre/config.h
+++ b/keyboards/mntre/config.h
@@ -3,23 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, B5, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { D5, F7, E6, C7, B3, B2, B1, B0, F0, F1, F4, F5, F6, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_CUSTOM_RESOLUTION 0x400
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/mntre/info.json b/keyboards/mntre/info.json
index 36426c3cc1..7fae38f4ad 100644
--- a/keyboards/mntre/info.json
+++ b/keyboards/mntre/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1302",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D5", "F7", "E6", "C7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "C6"],
+        "rows": ["B6", "B5", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "max_brightness": 84
diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h
index da995299e4..52f0c6784d 100644
--- a/keyboards/mode/m65ha_alpha/config.h
+++ b/keyboards/mode/m65ha_alpha/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B10, B12, C8 , C4 , C5 , B0 , C10, B13, B14, B15, A15, C6 , C7 , A8 , C9}
-#define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mode/m65ha_alpha/info.json b/keyboards/mode/m65ha_alpha/info.json
index 4d27f46223..a7afd10663 100644
--- a/keyboards/mode/m65ha_alpha/info.json
+++ b/keyboards/mode/m65ha_alpha/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6566",
     "device_version": "0.6.5"
   },
+  "matrix_pins": {
+    "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"],
+    "rows": ["A7", "A10", "D2", "C12", "B1", "C11"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "A6"
   },
@@ -19,151 +24,151 @@
   "layouts": {
       "LAYOUT_65_ansi_blocker": {
           "layout": [
-              { "label": "K00", "x": 0, "y": 0 },
-              { "label": "K01", "x": 1, "y": 0 },
-              { "label": "K02", "x": 2, "y": 0 },
-              { "label": "K03", "x": 3, "y": 0 },
-              { "label": "K04", "x": 4, "y": 0 },
-              { "label": "K05", "x": 5, "y": 0 },
-              { "label": "K06", "x": 6, "y": 0 },
-              { "label": "K07", "x": 7, "y": 0 },
-              { "label": "K08", "x": 8, "y": 0 },
-              { "label": "K09", "x": 9, "y": 0 },
-              { "label": "K0A", "x": 10, "y": 0 },
-              { "label": "K0B", "x": 11, "y": 0 },
-              { "label": "K0C", "x": 12, "y": 0 },
-              { "label": "K0D", "x": 13, "y": 0, "w": 2 },
-              { "label": "K0E", "x": 15, "y": 0 },
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
+              {"matrix": [0, 4], "x": 4, "y": 0},
+              {"matrix": [0, 5], "x": 5, "y": 0},
+              {"matrix": [0, 6], "x": 6, "y": 0},
+              {"matrix": [0, 7], "x": 7, "y": 0},
+              {"matrix": [0, 8], "x": 8, "y": 0},
+              {"matrix": [0, 9], "x": 9, "y": 0},
+              {"matrix": [0, 10], "x": 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},
 
-              { "label": "K10", "x": 0, "y": 1, "w": 1.5 },
-              { "label": "K11", "x": 1.5, "y": 1 },
-              { "label": "K12", "x": 2.5, "y": 1 },
-              { "label": "K13", "x": 3.5, "y": 1 },
-              { "label": "K14", "x": 4.5, "y": 1 },
-              { "label": "K15", "x": 5.5, "y": 1 },
-              { "label": "K16", "x": 6.5, "y": 1 },
-              { "label": "K17", "x": 7.5, "y": 1 },
-              { "label": "K18", "x": 8.5, "y": 1 },
-              { "label": "K19", "x": 9.5, "y": 1 },
-              { "label": "K1A", "x": 10.5, "y": 1 },
-              { "label": "K1B", "x": 11.5, "y": 1 },
-              { "label": "K1C", "x": 12.5, "y": 1 },
-              { "label": "K1D", "x": 13.5, "y": 1, "w": 1.5},
-              { "label": "K1E", "x": 15, "y": 1 },
+              {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+              {"matrix": [1, 1], "x": 1.5, "y": 1},
+              {"matrix": [1, 2], "x": 2.5, "y": 1},
+              {"matrix": [1, 3], "x": 3.5, "y": 1},
+              {"matrix": [1, 4], "x": 4.5, "y": 1},
+              {"matrix": [1, 5], "x": 5.5, "y": 1},
+              {"matrix": [1, 6], "x": 6.5, "y": 1},
+              {"matrix": [1, 7], "x": 7.5, "y": 1},
+              {"matrix": [1, 8], "x": 8.5, "y": 1},
+              {"matrix": [1, 9], "x": 9.5, "y": 1},
+              {"matrix": [1, 10], "x": 10.5, "y": 1},
+              {"matrix": [1, 11], "x": 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},
 
-              { "label": "K20", "x": 0, "y": 2, "w": 1.75 },
-              { "label": "K21", "x": 1.75, "y": 2 },
-              { "label": "K22", "x": 2.75, "y": 2 },
-              { "label": "K23", "x": 3.75, "y": 2 },
-              { "label": "K24", "x": 4.75, "y": 2 },
-              { "label": "K25", "x": 5.75, "y": 2 },
-              { "label": "K26", "x": 6.75, "y": 2 },
-              { "label": "K27", "x": 7.75, "y": 2 },
-              { "label": "K28", "x": 8.75, "y": 2 },
-              { "label": "K29", "x": 9.75, "y": 2 },
-              { "label": "K2A", "x": 10.75, "y": 2 },
-              { "label": "K2B", "x": 11.75, "y": 2 },
-              { "label": "K2D", "x": 12.75, "y": 2, "w": 2.25 },
-              { "label": "K2E", "x": 15, "y": 2 },
+              {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+              {"matrix": [2, 1], "x": 1.75, "y": 2},
+              {"matrix": [2, 2], "x": 2.75, "y": 2},
+              {"matrix": [2, 3], "x": 3.75, "y": 2},
+              {"matrix": [2, 4], "x": 4.75, "y": 2},
+              {"matrix": [2, 5], "x": 5.75, "y": 2},
+              {"matrix": [2, 6], "x": 6.75, "y": 2},
+              {"matrix": [2, 7], "x": 7.75, "y": 2},
+              {"matrix": [2, 8], "x": 8.75, "y": 2},
+              {"matrix": [2, 9], "x": 9.75, "y": 2},
+              {"matrix": [2, 10], "x": 10.75, "y": 2},
+              {"matrix": [2, 11], "x": 11.75, "y": 2},
+              {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+              {"matrix": [2, 14], "x": 15, "y": 2},
 
-              { "label": "K30", "x": 0, "y": 3, "w": 2.25 },
-              { "label": "K32", "x": 2.25, "y": 3 },
-              { "label": "K33", "x": 3.25, "y": 3 },
-              { "label": "K34", "x": 4.25, "y": 3 },
-              { "label": "K35", "x": 5.25, "y": 3 },
-              { "label": "K36", "x": 6.25, "y": 3 },
-              { "label": "K37", "x": 7.25, "y": 3 },
-              { "label": "K38", "x": 8.25, "y": 3 },
-              { "label": "K39", "x": 9.25, "y": 3 },
-              { "label": "K3A", "x": 10.25, "y": 3 },
-              { "label": "K3B", "x": 11.25, "y": 3 },
-              { "label": "K3C", "x": 12.25, "y": 3, "w": 1.75 },
-              { "label": "K3D", "x": 14, "y": 3 },
-              { "label": "K3E", "x": 15, "y": 3 },
+              {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+              {"matrix": [3, 2], "x": 2.25, "y": 3},
+              {"matrix": [3, 3], "x": 3.25, "y": 3},
+              {"matrix": [3, 4], "x": 4.25, "y": 3},
+              {"matrix": [3, 5], "x": 5.25, "y": 3},
+              {"matrix": [3, 6], "x": 6.25, "y": 3},
+              {"matrix": [3, 7], "x": 7.25, "y": 3},
+              {"matrix": [3, 8], "x": 8.25, "y": 3},
+              {"matrix": [3, 9], "x": 9.25, "y": 3},
+              {"matrix": [3, 10], "x": 10.25, "y": 3},
+              {"matrix": [3, 11], "x": 11.25, "y": 3},
+              {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+              {"matrix": [3, 13], "x": 14, "y": 3},
+              {"matrix": [3, 14], "x": 15, "y": 3},
 
-              { "label": "K40", "x": 0, "y": 4, "w": 1.25 },
-              { "label": "K41", "x": 1.25, "y": 4, "w": 1.25 },
-              { "label": "K42", "x": 2.5, "y": 4, "w": 1.25 },
-              { "label": "K56", "x": 3.75, "y": 4, "w": 6.25 },
-              { "label": "K5A", "x": 10, "y": 4, "w": 1.25 },
-              { "label": "K5B", "x": 11.25, "y": 4, "w": 1.25 },
-              { "label": "K5C", "x": 13, "y": 4 },
-              { "label": "K5D", "x": 14, "y": 4 },
-              { "label": "K5E", "x": 15, "y": 4 }
+              {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+              {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+              {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+              {"matrix": [5, 6], "x": 3.75, "y": 4, "w": 6.25},
+              {"matrix": [5, 10], "x": 10, "y": 4, "w": 1.25},
+              {"matrix": [5, 11], "x": 11.25, "y": 4, "w": 1.25},
+              {"matrix": [5, 12], "x": 13, "y": 4},
+              {"matrix": [5, 13], "x": 14, "y": 4},
+              {"matrix": [5, 14], "x": 15, "y": 4}
           ]
       },
       "LAYOUT_65_ansi_blocker_tsangan": {
           "layout": [
-              { "label": "K00", "x": 0, "y": 0 },
-              { "label": "K01", "x": 1, "y": 0 },
-              { "label": "K02", "x": 2, "y": 0 },
-              { "label": "K03", "x": 3, "y": 0 },
-              { "label": "K04", "x": 4, "y": 0 },
-              { "label": "K05", "x": 5, "y": 0 },
-              { "label": "K06", "x": 6, "y": 0 },
-              { "label": "K07", "x": 7, "y": 0 },
-              { "label": "K08", "x": 8, "y": 0 },
-              { "label": "K09", "x": 9, "y": 0 },
-              { "label": "K0A", "x": 10, "y": 0 },
-              { "label": "K0B", "x": 11, "y": 0 },
-              { "label": "K0C", "x": 12, "y": 0 },
-              { "label": "K0D", "x": 13, "y": 0, "w": 2 },
-              { "label": "K0E", "x": 15, "y": 0 },
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
+              {"matrix": [0, 4], "x": 4, "y": 0},
+              {"matrix": [0, 5], "x": 5, "y": 0},
+              {"matrix": [0, 6], "x": 6, "y": 0},
+              {"matrix": [0, 7], "x": 7, "y": 0},
+              {"matrix": [0, 8], "x": 8, "y": 0},
+              {"matrix": [0, 9], "x": 9, "y": 0},
+              {"matrix": [0, 10], "x": 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},
 
-              { "label": "K10", "x": 0, "y": 1, "w": 1.5 },
-              { "label": "K11", "x": 1.5, "y": 1 },
-              { "label": "K12", "x": 2.5, "y": 1 },
-              { "label": "K13", "x": 3.5, "y": 1 },
-              { "label": "K14", "x": 4.5, "y": 1 },
-              { "label": "K15", "x": 5.5, "y": 1 },
-              { "label": "K16", "x": 6.5, "y": 1 },
-              { "label": "K17", "x": 7.5, "y": 1 },
-              { "label": "K18", "x": 8.5, "y": 1 },
-              { "label": "K19", "x": 9.5, "y": 1 },
-              { "label": "K1A", "x": 10.5, "y": 1 },
-              { "label": "K1B", "x": 11.5, "y": 1 },
-              { "label": "K1C", "x": 12.5, "y": 1 },
-              { "label": "K1D", "x": 13.5, "y": 1, "w": 1.5},
-              { "label": "K1E", "x": 15, "y": 1 },
+              {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+              {"matrix": [1, 1], "x": 1.5, "y": 1},
+              {"matrix": [1, 2], "x": 2.5, "y": 1},
+              {"matrix": [1, 3], "x": 3.5, "y": 1},
+              {"matrix": [1, 4], "x": 4.5, "y": 1},
+              {"matrix": [1, 5], "x": 5.5, "y": 1},
+              {"matrix": [1, 6], "x": 6.5, "y": 1},
+              {"matrix": [1, 7], "x": 7.5, "y": 1},
+              {"matrix": [1, 8], "x": 8.5, "y": 1},
+              {"matrix": [1, 9], "x": 9.5, "y": 1},
+              {"matrix": [1, 10], "x": 10.5, "y": 1},
+              {"matrix": [1, 11], "x": 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},
 
-              { "label": "K20", "x": 0, "y": 2, "w": 1.75 },
-              { "label": "K21", "x": 1.75, "y": 2 },
-              { "label": "K22", "x": 2.75, "y": 2 },
-              { "label": "K23", "x": 3.75, "y": 2 },
-              { "label": "K24", "x": 4.75, "y": 2 },
-              { "label": "K25", "x": 5.75, "y": 2 },
-              { "label": "K26", "x": 6.75, "y": 2 },
-              { "label": "K27", "x": 7.75, "y": 2 },
-              { "label": "K28", "x": 8.75, "y": 2 },
-              { "label": "K29", "x": 9.75, "y": 2 },
-              { "label": "K2A", "x": 10.75, "y": 2 },
-              { "label": "K2B", "x": 11.75, "y": 2 },
-              { "label": "K2D", "x": 12.75, "y": 2, "w": 2.25 },
-              { "label": "K2E", "x": 15, "y": 2 },
+              {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+              {"matrix": [2, 1], "x": 1.75, "y": 2},
+              {"matrix": [2, 2], "x": 2.75, "y": 2},
+              {"matrix": [2, 3], "x": 3.75, "y": 2},
+              {"matrix": [2, 4], "x": 4.75, "y": 2},
+              {"matrix": [2, 5], "x": 5.75, "y": 2},
+              {"matrix": [2, 6], "x": 6.75, "y": 2},
+              {"matrix": [2, 7], "x": 7.75, "y": 2},
+              {"matrix": [2, 8], "x": 8.75, "y": 2},
+              {"matrix": [2, 9], "x": 9.75, "y": 2},
+              {"matrix": [2, 10], "x": 10.75, "y": 2},
+              {"matrix": [2, 11], "x": 11.75, "y": 2},
+              {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+              {"matrix": [2, 14], "x": 15, "y": 2},
 
-              { "label": "K30", "x": 0, "y": 3, "w": 2.25 },
-              { "label": "K32", "x": 2.25, "y": 3 },
-              { "label": "K33", "x": 3.25, "y": 3 },
-              { "label": "K34", "x": 4.25, "y": 3 },
-              { "label": "K35", "x": 5.25, "y": 3 },
-              { "label": "K36", "x": 6.25, "y": 3 },
-              { "label": "K37", "x": 7.25, "y": 3 },
-              { "label": "K38", "x": 8.25, "y": 3 },
-              { "label": "K39", "x": 9.25, "y": 3 },
-              { "label": "K3A", "x": 10.25, "y": 3 },
-              { "label": "K3B", "x": 11.25, "y": 3 },
-              { "label": "K3C", "x": 12.25, "y": 3, "w": 1.75 },
-              { "label": "K3D", "x": 14, "y": 3 },
-              { "label": "K3E", "x": 15, "y": 3 },
+              {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+              {"matrix": [3, 2], "x": 2.25, "y": 3},
+              {"matrix": [3, 3], "x": 3.25, "y": 3},
+              {"matrix": [3, 4], "x": 4.25, "y": 3},
+              {"matrix": [3, 5], "x": 5.25, "y": 3},
+              {"matrix": [3, 6], "x": 6.25, "y": 3},
+              {"matrix": [3, 7], "x": 7.25, "y": 3},
+              {"matrix": [3, 8], "x": 8.25, "y": 3},
+              {"matrix": [3, 9], "x": 9.25, "y": 3},
+              {"matrix": [3, 10], "x": 10.25, "y": 3},
+              {"matrix": [3, 11], "x": 11.25, "y": 3},
+              {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+              {"matrix": [3, 13], "x": 14, "y": 3},
+              {"matrix": [3, 14], "x": 15, "y": 3},
 
-              { "label": "K40", "x": 0, "y": 4, "w": 1.5 },
-              { "label": "K41", "x": 1.5, "y": 4 },
-              { "label": "K42", "x": 2.5, "y": 4, "w": 1.5 },
-              { "label": "K56", "x": 4, "y": 4, "w": 7 },
-              { "label": "K5B", "x": 11, "y": 4, "w": 1.5 },
-              { "label": "K5C", "x": 13, "y": 4 },
-              { "label": "K5D", "x": 14, "y": 4 },
-              { "label": "K5E", "x": 15, "y": 4 }
+              {"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": [5, 6], "x": 4, "y": 4, "w": 7},
+              {"matrix": [5, 11], "x": 11, "y": 4, "w": 1.5},
+              {"matrix": [5, 12], "x": 13, "y": 4},
+              {"matrix": [5, 13], "x": 14, "y": 4},
+              {"matrix": [5, 14], "x": 15, "y": 4}
           ]
       }
   }
diff --git a/keyboards/mode/m65ha_alpha/m65ha_alpha.c b/keyboards/mode/m65ha_alpha/m65ha_alpha.c
index 4160ffed95..60a9a89927 100644
--- a/keyboards/mode/m65ha_alpha/m65ha_alpha.c
+++ b/keyboards/mode/m65ha_alpha/m65ha_alpha.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "m65ha_alpha.h"
+#include "quantum.h"
 
 void board_init(void) {
     setPinInput(B10);
diff --git a/keyboards/mode/m65ha_alpha/m65ha_alpha.h b/keyboards/mode/m65ha_alpha/m65ha_alpha.h
deleted file mode 100644
index a2bc4251fd..0000000000
--- a/keyboards/mode/m65ha_alpha/m65ha_alpha.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright 2020 �lvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D     │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │56                      │5A  │5B  │ │5C │5D │5E │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────�
- * │40   │41 │42   │56                         │5B   │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_65_ansi_blocker( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-	K40, K41, K42,                K56,                K5A, K5B, K5C, K5D, K5E \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
-	{ K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-	{ K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-	{ ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E } \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-	K40, K41, K42,                K56,                     K5B, K5C, K5D, K5E \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
-	{ K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-	{ K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-	{ ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, ___, K5B, K5C, K5D, K5E } \
-}
diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h
index 62faefd168..52f0c6784d 100644
--- a/keyboards/mode/m65hi_alpha/config.h
+++ b/keyboards/mode/m65hi_alpha/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B10, B12, C8 , C4 , C5 , B0 , C10, B13, B14, B15, A15, C6 , C7 , A8 , C9 }
-#define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/info.json
index c6ea41bee0..1899284f8c 100644
--- a/keyboards/mode/m65hi_alpha/info.json
+++ b/keyboards/mode/m65hi_alpha/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6574",
     "device_version": "0.6.5"
   },
+  "matrix_pins": {
+    "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"],
+    "rows": ["A7", "A10", "D2", "C12", "B1", "C11"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "A6"
   },
@@ -19,153 +24,153 @@
   "layouts": {
       "LAYOUT_65_iso_blocker": {
           "layout": [
-              { "label": "K00", "x": 0, "y": 0 },
-              { "label": "K01", "x": 1, "y": 0 },
-              { "label": "K02", "x": 2, "y": 0 },
-              { "label": "K03", "x": 3, "y": 0 },
-              { "label": "K04", "x": 4, "y": 0 },
-              { "label": "K05", "x": 5, "y": 0 },
-              { "label": "K06", "x": 6, "y": 0 },
-              { "label": "K07", "x": 7, "y": 0 },
-              { "label": "K08", "x": 8, "y": 0 },
-              { "label": "K09", "x": 9, "y": 0 },
-              { "label": "K0A", "x": 10, "y": 0 },
-              { "label": "K0B", "x": 11, "y": 0 },
-              { "label": "K0C", "x": 12, "y": 0 },
-              { "label": "K0D", "x": 13, "y": 0, "w": 2 },
-              { "label": "K0E", "x": 15, "y": 0 },
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
+              {"matrix": [0, 4], "x": 4, "y": 0},
+              {"matrix": [0, 5], "x": 5, "y": 0},
+              {"matrix": [0, 6], "x": 6, "y": 0},
+              {"matrix": [0, 7], "x": 7, "y": 0},
+              {"matrix": [0, 8], "x": 8, "y": 0},
+              {"matrix": [0, 9], "x": 9, "y": 0},
+              {"matrix": [0, 10], "x": 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},
 
-              { "label": "K10", "x": 0, "y": 1, "w": 1.5 },
-              { "label": "K11", "x": 1.5, "y": 1 },
-              { "label": "K12", "x": 2.5, "y": 1 },
-              { "label": "K13", "x": 3.5, "y": 1 },
-              { "label": "K14", "x": 4.5, "y": 1 },
-              { "label": "K15", "x": 5.5, "y": 1 },
-              { "label": "K16", "x": 6.5, "y": 1 },
-              { "label": "K17", "x": 7.5, "y": 1 },
-              { "label": "K18", "x": 8.5, "y": 1 },
-              { "label": "K19", "x": 9.5, "y": 1 },
-              { "label": "K1A", "x": 10.5, "y": 1 },
-              { "label": "K1B", "x": 11.5, "y": 1 },
-              { "label": "K1C", "x": 12.5, "y": 1 },
-              { "label": "K1E", "x": 15, "y": 1 },
+              {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+              {"matrix": [1, 1], "x": 1.5, "y": 1},
+              {"matrix": [1, 2], "x": 2.5, "y": 1},
+              {"matrix": [1, 3], "x": 3.5, "y": 1},
+              {"matrix": [1, 4], "x": 4.5, "y": 1},
+              {"matrix": [1, 5], "x": 5.5, "y": 1},
+              {"matrix": [1, 6], "x": 6.5, "y": 1},
+              {"matrix": [1, 7], "x": 7.5, "y": 1},
+              {"matrix": [1, 8], "x": 8.5, "y": 1},
+              {"matrix": [1, 9], "x": 9.5, "y": 1},
+              {"matrix": [1, 10], "x": 10.5, "y": 1},
+              {"matrix": [1, 11], "x": 11.5, "y": 1},
+              {"matrix": [1, 12], "x": 12.5, "y": 1},
+              {"matrix": [1, 14], "x": 15, "y": 1},
 
-              { "label": "K20", "x": 0, "y": 2, "w": 1.75 },
-              { "label": "K21", "x": 1.75, "y": 2 },
-              { "label": "K22", "x": 2.75, "y": 2 },
-              { "label": "K23", "x": 3.75, "y": 2 },
-              { "label": "K24", "x": 4.75, "y": 2 },
-              { "label": "K25", "x": 5.75, "y": 2 },
-              { "label": "K26", "x": 6.75, "y": 2 },
-              { "label": "K27", "x": 7.75, "y": 2 },
-              { "label": "K28", "x": 8.75, "y": 2 },
-              { "label": "K29", "x": 9.75, "y": 2 },
-              { "label": "K2A", "x": 10.75, "y": 2 },
-              { "label": "K2B", "x": 11.75, "y": 2 },
-              { "label": "K2C", "x": 12.75, "y": 2 },
-              { "label": "K2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-              { "label": "K2E", "x": 15, "y": 2 },
+              {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+              {"matrix": [2, 1], "x": 1.75, "y": 2},
+              {"matrix": [2, 2], "x": 2.75, "y": 2},
+              {"matrix": [2, 3], "x": 3.75, "y": 2},
+              {"matrix": [2, 4], "x": 4.75, "y": 2},
+              {"matrix": [2, 5], "x": 5.75, "y": 2},
+              {"matrix": [2, 6], "x": 6.75, "y": 2},
+              {"matrix": [2, 7], "x": 7.75, "y": 2},
+              {"matrix": [2, 8], "x": 8.75, "y": 2},
+              {"matrix": [2, 9], "x": 9.75, "y": 2},
+              {"matrix": [2, 10], "x": 10.75, "y": 2},
+              {"matrix": [2, 11], "x": 11.75, "y": 2},
+              {"matrix": [2, 12], "x": 12.75, "y": 2},
+              {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+              {"matrix": [2, 14], "x": 15, "y": 2},
 
-              { "label": "K30", "x": 0, "y": 3, "w": 1.25 },
-              { "label": "K31", "x": 1.25, "y": 3 },
-              { "label": "K32", "x": 2.25, "y": 3 },
-              { "label": "K33", "x": 3.25, "y": 3 },
-              { "label": "K34", "x": 4.25, "y": 3 },
-              { "label": "K35", "x": 5.25, "y": 3 },
-              { "label": "K36", "x": 6.25, "y": 3 },
-              { "label": "K37", "x": 7.25, "y": 3 },
-              { "label": "K38", "x": 8.25, "y": 3 },
-              { "label": "K39", "x": 9.25, "y": 3 },
-              { "label": "K3A", "x": 10.25, "y": 3 },
-              { "label": "K3B", "x": 11.25, "y": 3 },
-              { "label": "K3C", "x": 12.25, "y": 3, "w": 1.75 },
-              { "label": "K3D", "x": 14, "y": 3 },
-              { "label": "K3E", "x": 15, "y": 3 },
+              {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+              {"matrix": [3, 1], "x": 1.25, "y": 3},
+              {"matrix": [3, 2], "x": 2.25, "y": 3},
+              {"matrix": [3, 3], "x": 3.25, "y": 3},
+              {"matrix": [3, 4], "x": 4.25, "y": 3},
+              {"matrix": [3, 5], "x": 5.25, "y": 3},
+              {"matrix": [3, 6], "x": 6.25, "y": 3},
+              {"matrix": [3, 7], "x": 7.25, "y": 3},
+              {"matrix": [3, 8], "x": 8.25, "y": 3},
+              {"matrix": [3, 9], "x": 9.25, "y": 3},
+              {"matrix": [3, 10], "x": 10.25, "y": 3},
+              {"matrix": [3, 11], "x": 11.25, "y": 3},
+              {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+              {"matrix": [3, 13], "x": 14, "y": 3},
+              {"matrix": [3, 14], "x": 15, "y": 3},
 
-              { "label": "K40", "x": 0, "y": 4, "w": 1.25 },
-              { "label": "K41", "x": 1.25, "y": 4, "w": 1.25 },
-              { "label": "K42", "x": 2.5, "y": 4, "w": 1.25 },
-              { "label": "K56", "x": 3.75, "y": 4, "w": 6.25 },
-              { "label": "K5A", "x": 10, "y": 4, "w": 1.25 },
-              { "label": "K5B", "x": 11.25, "y": 4, "w": 1.25 },
-              { "label": "K5C", "x": 13, "y": 4 },
-              { "label": "K5D", "x": 14, "y": 4 },
-              { "label": "K5E", "x": 15, "y": 4 }
+              {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+              {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+              {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+              {"matrix": [5, 6], "x": 3.75, "y": 4, "w": 6.25},
+              {"matrix": [5, 10], "x": 10, "y": 4, "w": 1.25},
+              {"matrix": [5, 11], "x": 11.25, "y": 4, "w": 1.25},
+              {"matrix": [5, 12], "x": 13, "y": 4},
+              {"matrix": [5, 13], "x": 14, "y": 4},
+              {"matrix": [5, 14], "x": 15, "y": 4}
           ]
       },
       "LAYOUT_65_iso_blocker_tsangan": {
           "layout": [
-              { "label": "K00", "x": 0, "y": 0 },
-              { "label": "K01", "x": 1, "y": 0 },
-              { "label": "K02", "x": 2, "y": 0 },
-              { "label": "K03", "x": 3, "y": 0 },
-              { "label": "K04", "x": 4, "y": 0 },
-              { "label": "K05", "x": 5, "y": 0 },
-              { "label": "K06", "x": 6, "y": 0 },
-              { "label": "K07", "x": 7, "y": 0 },
-              { "label": "K08", "x": 8, "y": 0 },
-              { "label": "K09", "x": 9, "y": 0 },
-              { "label": "K0A", "x": 10, "y": 0 },
-              { "label": "K0B", "x": 11, "y": 0 },
-              { "label": "K0C", "x": 12, "y": 0 },
-              { "label": "K0D", "x": 13, "y": 0, "w": 2 },
-              { "label": "K0E", "x": 15, "y": 0 },
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
+              {"matrix": [0, 4], "x": 4, "y": 0},
+              {"matrix": [0, 5], "x": 5, "y": 0},
+              {"matrix": [0, 6], "x": 6, "y": 0},
+              {"matrix": [0, 7], "x": 7, "y": 0},
+              {"matrix": [0, 8], "x": 8, "y": 0},
+              {"matrix": [0, 9], "x": 9, "y": 0},
+              {"matrix": [0, 10], "x": 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},
 
-              { "label": "K10", "x": 0, "y": 1, "w": 1.5 },
-              { "label": "K11", "x": 1.5, "y": 1 },
-              { "label": "K12", "x": 2.5, "y": 1 },
-              { "label": "K13", "x": 3.5, "y": 1 },
-              { "label": "K14", "x": 4.5, "y": 1 },
-              { "label": "K15", "x": 5.5, "y": 1 },
-              { "label": "K16", "x": 6.5, "y": 1 },
-              { "label": "K17", "x": 7.5, "y": 1 },
-              { "label": "K18", "x": 8.5, "y": 1 },
-              { "label": "K19", "x": 9.5, "y": 1 },
-              { "label": "K1A", "x": 10.5, "y": 1 },
-              { "label": "K1B", "x": 11.5, "y": 1 },
-              { "label": "K1C", "x": 12.5, "y": 1 },
-              { "label": "K1E", "x": 15, "y": 1 },
+              {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+              {"matrix": [1, 1], "x": 1.5, "y": 1},
+              {"matrix": [1, 2], "x": 2.5, "y": 1},
+              {"matrix": [1, 3], "x": 3.5, "y": 1},
+              {"matrix": [1, 4], "x": 4.5, "y": 1},
+              {"matrix": [1, 5], "x": 5.5, "y": 1},
+              {"matrix": [1, 6], "x": 6.5, "y": 1},
+              {"matrix": [1, 7], "x": 7.5, "y": 1},
+              {"matrix": [1, 8], "x": 8.5, "y": 1},
+              {"matrix": [1, 9], "x": 9.5, "y": 1},
+              {"matrix": [1, 10], "x": 10.5, "y": 1},
+              {"matrix": [1, 11], "x": 11.5, "y": 1},
+              {"matrix": [1, 12], "x": 12.5, "y": 1},
+              {"matrix": [1, 14], "x": 15, "y": 1},
 
-              { "label": "K20", "x": 0, "y": 2, "w": 1.75 },
-              { "label": "K21", "x": 1.75, "y": 2 },
-              { "label": "K22", "x": 2.75, "y": 2 },
-              { "label": "K23", "x": 3.75, "y": 2 },
-              { "label": "K24", "x": 4.75, "y": 2 },
-              { "label": "K25", "x": 5.75, "y": 2 },
-              { "label": "K26", "x": 6.75, "y": 2 },
-              { "label": "K27", "x": 7.75, "y": 2 },
-              { "label": "K28", "x": 8.75, "y": 2 },
-              { "label": "K29", "x": 9.75, "y": 2 },
-              { "label": "K2A", "x": 10.75, "y": 2 },
-              { "label": "K2B", "x": 11.75, "y": 2 },
-              { "label": "K2C", "x": 12.75, "y": 2 },
-              { "label": "K2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-              { "label": "K2E", "x": 15, "y": 2 },
+              {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+              {"matrix": [2, 1], "x": 1.75, "y": 2},
+              {"matrix": [2, 2], "x": 2.75, "y": 2},
+              {"matrix": [2, 3], "x": 3.75, "y": 2},
+              {"matrix": [2, 4], "x": 4.75, "y": 2},
+              {"matrix": [2, 5], "x": 5.75, "y": 2},
+              {"matrix": [2, 6], "x": 6.75, "y": 2},
+              {"matrix": [2, 7], "x": 7.75, "y": 2},
+              {"matrix": [2, 8], "x": 8.75, "y": 2},
+              {"matrix": [2, 9], "x": 9.75, "y": 2},
+              {"matrix": [2, 10], "x": 10.75, "y": 2},
+              {"matrix": [2, 11], "x": 11.75, "y": 2},
+              {"matrix": [2, 12], "x": 12.75, "y": 2},
+              {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+              {"matrix": [2, 14], "x": 15, "y": 2},
 
-              { "label": "K30", "x": 0, "y": 3, "w": 1.25 },
-              { "label": "K31", "x": 1.25, "y": 3 },
-              { "label": "K32", "x": 2.25, "y": 3 },
-              { "label": "K33", "x": 3.25, "y": 3 },
-              { "label": "K34", "x": 4.25, "y": 3 },
-              { "label": "K35", "x": 5.25, "y": 3 },
-              { "label": "K36", "x": 6.25, "y": 3 },
-              { "label": "K37", "x": 7.25, "y": 3 },
-              { "label": "K38", "x": 8.25, "y": 3 },
-              { "label": "K39", "x": 9.25, "y": 3 },
-              { "label": "K3A", "x": 10.25, "y": 3 },
-              { "label": "K3B", "x": 11.25, "y": 3 },
-              { "label": "K3C", "x": 12.25, "y": 3, "w": 1.75 },
-              { "label": "K3D", "x": 14, "y": 3 },
-              { "label": "K3E", "x": 15, "y": 3 },
+              {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+              {"matrix": [3, 1], "x": 1.25, "y": 3},
+              {"matrix": [3, 2], "x": 2.25, "y": 3},
+              {"matrix": [3, 3], "x": 3.25, "y": 3},
+              {"matrix": [3, 4], "x": 4.25, "y": 3},
+              {"matrix": [3, 5], "x": 5.25, "y": 3},
+              {"matrix": [3, 6], "x": 6.25, "y": 3},
+              {"matrix": [3, 7], "x": 7.25, "y": 3},
+              {"matrix": [3, 8], "x": 8.25, "y": 3},
+              {"matrix": [3, 9], "x": 9.25, "y": 3},
+              {"matrix": [3, 10], "x": 10.25, "y": 3},
+              {"matrix": [3, 11], "x": 11.25, "y": 3},
+              {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+              {"matrix": [3, 13], "x": 14, "y": 3},
+              {"matrix": [3, 14], "x": 15, "y": 3},
 
-              { "label": "K40", "x": 0, "y": 4, "w": 1.5 },
-              { "label": "K41", "x": 1.5, "y": 4 },
-              { "label": "K42", "x": 2.5, "y": 4, "w": 1.5 },
-              { "label": "K56", "x": 4, "y": 4, "w": 7 },
-              { "label": "K5B", "x": 11, "y": 4, "w": 1.5 },
-              { "label": "K5C", "x": 13, "y": 4 },
-              { "label": "K5D", "x": 14, "y": 4 },
-              { "label": "K5E", "x": 15, "y": 4 }
+              {"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": [5, 6], "x": 4, "y": 4, "w": 7},
+              {"matrix": [5, 11], "x": 11, "y": 4, "w": 1.5},
+              {"matrix": [5, 12], "x": 13, "y": 4},
+              {"matrix": [5, 13], "x": 14, "y": 4},
+              {"matrix": [5, 14], "x": 15, "y": 4}
           ]
       }
   }
diff --git a/keyboards/mode/m65hi_alpha/m65hi_alpha.c b/keyboards/mode/m65hi_alpha/m65hi_alpha.c
index 42c88ba354..60a9a89927 100644
--- a/keyboards/mode/m65hi_alpha/m65hi_alpha.c
+++ b/keyboards/mode/m65hi_alpha/m65hi_alpha.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "m65hi_alpha.h"
+#include "quantum.h"
 
 void board_init(void) {
     setPinInput(B10);
diff --git a/keyboards/mode/m65hi_alpha/m65hi_alpha.h b/keyboards/mode/m65hi_alpha/m65hi_alpha.h
deleted file mode 100644
index a4360e6ef0..0000000000
--- a/keyboards/mode/m65hi_alpha/m65hi_alpha.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright 2020 �lvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D     │0E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�2D  ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │56                      │5A  │5B  │ │5C │5D │5E │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────�
- * │40   │41 │42   │56                         │5B   │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_65_iso_blocker( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-	K40, K41, K42,                K56,                K5A, K5B, K5C, K5D, K5E \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-	{ K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-	{ ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E } \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-	K40, K41, K42,                K56,                     K5B, K5C, K5D, K5E \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-	{ K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-	{ ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, ___, K5B, K5C, K5D, K5E } \
-}
diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h
index 173c679f1f..ed3faacae0 100644
--- a/keyboards/mode/m65s/config.h
+++ b/keyboards/mode/m65s/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { C7 , A8 , A10, A4 , A5 , A6 , C10, A7, C4 , C5 , A15, B0 , B1 , B12, B10, B13 }
-#define MATRIX_ROW_PINS { A3 , B14, B15, C9 , C6 , C11 } 
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json
index 53c7ccace4..c744b3512d 100644
--- a/keyboards/mode/m65s/info.json
+++ b/keyboards/mode/m65s/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6583",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "A8", "A10", "A4", "A5", "A6", "C10", "A7", "C4", "C5", "A15", "B0", "B1", "B12", "B10", "B13"],
+        "rows": ["A3", "B14", "B15", "C9", "C6", "C11"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C8"
     },
diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h
index 2b0b122a6b..640cc43a5a 100644
--- a/keyboards/mode/m75h/config.h
+++ b/keyboards/mode/m75h/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-                        //C0, C1, C2,  C3,  C4,  C5,  C6,  C7, C8,  C9, C10, C11, C12, C13, C14, C15
-#define MATRIX_COL_PINS { C8, C7, A10, B13, B12, B10, B1, C10, C11, D2, C12, B3,  B4,  B5,  B8,  B9 }
-                        //R0, R1, R2,  R3,  R4,  R5 , R6
-#define MATRIX_ROW_PINS { C5, B0, B14, B15, A8 , C9 , A15} 
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mode/m75h/info.json b/keyboards/mode/m75h/info.json
index f7d265707e..e481cc09e7 100644
--- a/keyboards/mode/m75h/info.json
+++ b/keyboards/mode/m75h/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7572",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C8", "C7", "A10", "B13", "B12", "B10", "B1", "C10", "C11", "D2", "C12", "B3", "B4", "B5", "B8", "B9"],
+        "rows": ["C5", "B0", "B14", "B15", "A8", "C9", "A15"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h
index 6c90b66be5..b8307f4396 100644
--- a/keyboards/mode/m75s/config.h
+++ b/keyboards/mode/m75s/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-                       // C0, C1, C2,  C3,  C4,  C5,  C6,  C7, C8,  C9, C10, C11, C12, C13, C14, C15
-#define MATRIX_COL_PINS { C8, A8, A10, B13, B12, B10, B1, C10, C11, D2, C12, B3,  B4,  B5,  B8,  B9 }
-                       // R0, R1, R2,  R3,  R4,  R5 , R6
-#define MATRIX_ROW_PINS { C5, B0, B14, B15, C7 , C9 , A15} 
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mode/m75s/info.json b/keyboards/mode/m75s/info.json
index f046a8dffd..a3f2fd77ec 100644
--- a/keyboards/mode/m75s/info.json
+++ b/keyboards/mode/m75s/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7583",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C8", "A8", "A10", "B13", "B12", "B10", "B1", "C10", "C11", "D2", "C12", "B3", "B4", "B5", "B8", "B9"],
+        "rows": ["C5", "B0", "B14", "B15", "C7", "C9", "A15"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "C6",
         "levels": 20,
diff --git a/keyboards/mode/m75s/m75s.c b/keyboards/mode/m75s/m75s.c
deleted file mode 100644
index 87e643653c..0000000000
--- a/keyboards/mode/m75s/m75s.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright 2022 Gondolindrim <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "m75s.h"
diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h
index 6b59fc9872..72ad307905 100644
--- a/keyboards/mode/m80v1/config.h
+++ b/keyboards/mode/m80v1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-#define MATRIX_ROW_PINS { A10, A15, B3, B9, A3, A4 }
-#define MATRIX_COL_PINS { B8, B7, B6, B5, B4, A2, A1, A0, F1, F0, C15, C14, C13, A7, A6, A5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json
index e7558244ce..07e477bf9f 100644
--- a/keyboards/mode/m80v1/m80h/info.json
+++ b/keyboards/mode/m80v1/m80h/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0081",
     	"device_version": "0.7.2"
     },
+    "matrix_pins": {
+        "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"],
+        "rows": ["A10", "A15", "B3", "B9", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
 	"community_layouts": [ "tkl_ansi" ],
@@ -17,93 +22,108 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-			{"label":"Esc", "x":0, "y":0},
-			{"label":"F1", "x":2, "y":0},
-			{"label":"F2", "x":3, "y":0},
-			{"label":"F3", "x":4, "y":0},
-			{"label":"F4", "x":5, "y":0},
-			{"label":"F5", "x":6.5, "y":0},
-			{"label":"F6", "x":7.5, "y":0},
-			{"label":"F7", "x":8.5, "y":0},
-			{"label":"F8", "x":9.5, "y":0},
-			{"label":"F9", "x":11, "y":0},
-			{"label":"F10", "x":12, "y":0},
-			{"label":"F11", "x":13, "y":0},
-			{"label":"F12", "x":14, "y":0},
-			{"label":"Bkspc", "x":13, "y":1.5, "w": 2},
-			{"label":"Mute", "x":15.25, "y":0},
-			{"label":"VolDn", "x":16.25, "y":0},
-			{"label":"VolUp", "x":17.25, "y":0},
-			{"label":"~", "x":0, "y":1.5},
-			{"label":"1", "x":1, "y":1.5},
-			{"label":"2", "x":2, "y":1.5},
-			{"label":"3", "x":3, "y":1.5},
-			{"label":"4", "x":4, "y":1.5},
-			{"label":"5", "x":5, "y":1.5}, 
-			{"label":"6", "x":6, "y":1.5},
-			{"label":"7", "x":7, "y":1.5},
-			{"label":"8", "x":8, "y":1.5},
-			{"label":"9", "x":9, "y":1.5},
-			{"label":"0", "x":10, "y":1.5},
-			{"label":"_", "x":11, "y":1.5},
-			{"label":"+", "x":12, "y":1.5},
-			{"label":"Insert", "x":15.25, "y":1.5},
-			{"label":"Home", "x":16.25, "y":1.5},
-			{"label":"PgUp", "x":17.25, "y":1.5},
-			{"label":"Tab", "x":0, "y":2.5, "w":1.5},
-			{"label":"Q", "x":1.5, "y":2.5},
-			{"label":"W", "x":2.5, "y":2.5},
-			{"label":"E", "x":3.5, "y":2.5},
-			{"label":"R", "x":4.5, "y":2.5},
-			{"label":"T", "x":5.5, "y":2.5},
-			{"label":"Y", "x":6.5, "y":2.5},
-			{"label":"U", "x":7.5, "y":2.5},
-			{"label":"I", "x":8.5, "y":2.5},
-			{"label":"O", "x":9.5, "y":2.5},
-			{"label":"P", "x":10.5, "y":2.5},
-			{"label":"{", "x":11.5, "y":2.5},
-			{"label":"}", "x":12.5, "y":2.5},
-			{"label":"|", "x":13.5, "y":2.5, "w":1.5},
-			{"label":"Delete", "x":15.25, "y":2.5},
-			{"label":"End", "x":16.25, "y":2.5},
-			{"label":"PgDn", "x":17.25, "y":2.5},
-			{"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-			{"label":"A", "x":1.75, "y":3.5},
-			{"label":"S", "x":2.75, "y":3.5},
-			{"label":"D", "x":3.75, "y":3.5},
-			{"label":"F", "x":4.75, "y":3.5},
-			{"label":"G", "x":5.75, "y":3.5},
-			{"label":"H", "x":6.75, "y":3.5},
-			{"label":"J", "x":7.75, "y":3.5},
-			{"label":"K", "x":8.75, "y":3.5},
-			{"label":"L", "x":9.75, "y":3.5},
-			{"label":":", "x":10.75, "y":3.5},
-			{"label":"\"", "x":11.75, "y":3.5},
-			{"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-			{"label":"Shift", "x":0, "y":4.5, "w":2.25},
-			{"label":"Z", "x":2.25, "y":4.5},
-			{"label":"X", "x":3.25, "y":4.5},
-			{"label":"C", "x":4.25, "y":4.5},
-			{"label":"V", "x":5.25, "y":4.5},
-			{"label":"B", "x":6.25, "y":4.5},
-			{"label":"N", "x":7.25, "y":4.5},
-			{"label":"M", "x":8.25, "y":4.5},
-			{"label":",", "x":9.25, "y":4.5},
-			{"label":".", "x":10.25, "y":4.5},
-			{"label":"/", "x":11.25, "y":4.5},
-			{"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-			{"label":"\u2191", "x":16.25, "y":4.5},
-			{"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-			{"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-			{"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-			{"x":3.75, "y":5.5, "w":6.25},
-			{"label":"Alt", "x":10, "y":5.5, "w":1.25},
-			{"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-			{"label":"FN1", "x":12.5, "y":5.5, "w":1.25},
-			{"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-			{"label":"\u2190", "x":15.25, "y":5.5},
-			{"label":"\u2193", "x":16.25, "y":5.5},
-			{"label":"\u2192", "x":17.25, "y":5.5}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [3, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+
+                {"matrix": [1, 13], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/mode/m80v1/m80h/m80h.c b/keyboards/mode/m80v1/m80h/m80h.c
deleted file mode 100644
index 6213a91363..0000000000
--- a/keyboards/mode/m80v1/m80h/m80h.c
+++ /dev/null
@@ -1,14 +0,0 @@
- /* Copyright 2020 �lvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  */
-
-#include "m80h.h"
diff --git a/keyboards/mode/m80v1/m80h/m80h.h b/keyboards/mode/m80v1/m80h/m80h.h
deleted file mode 100644
index 49f115fdc6..0000000000
--- a/keyboards/mode/m80v1/m80h/m80h.h
+++ /dev/null
@@ -1,32 +0,0 @@
- /* Copyright 2020 �lvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  */
-
-#pragma once
-
-#include "m80v1.h"
-
-#define LAYOUT_tkl_ansi( \
-    K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K415,  K114, K115,  K116, \
-    K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,         K214, K215,  K216, \
-    K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K514,  K314, K315,  K316, \
-    K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,                            \
-    K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  K512,                      K515,        \
-    K601,  K602,  K603,                       K607,                K610,  K611,  K612,  K613,         K614, K615,  K616  \
-) { \
-    { K101,   K102,   K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 , K115,  K116 },  \
-    { K201,   K202,   K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 , K215,  K216 },  \
-    { K301,   K302,   K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 , K315,  K316 },  \
-    { K401,   K402,   K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO, K415 , KC_NO }, \
-    { K501,   K502,   K503,  K504,  K505,  K506,  K507,  K508,  K509,  K510,  K511,  K512,  KC_NO, K514 , K515,  KC_NO }, \
-    { K601,   K602,   K603,  KC_NO, KC_NO, KC_NO, K607,  KC_NO, KC_NO, K610,  K611,  K612,  K613,  K614 , K615,  K616 }   \
-}
diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json
index a94585c926..48f5444fc2 100644
--- a/keyboards/mode/m80v1/m80s/info.json
+++ b/keyboards/mode/m80v1/m80s/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0080",
     	"device_version": "0.8.3"
     },
+    "matrix_pins": {
+        "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"],
+        "rows": ["A10", "A15", "B3", "B9", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/mode/m80v1/m80s/m80s.c b/keyboards/mode/m80v1/m80s/m80s.c
deleted file mode 100644
index 1f532d0ce4..0000000000
--- a/keyboards/mode/m80v1/m80s/m80s.c
+++ /dev/null
@@ -1,14 +0,0 @@
- /* Copyright 2020 �lvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  */
-
-#include "m80s.h"
diff --git a/keyboards/mode/m80v1/m80s/m80s.h b/keyboards/mode/m80v1/m80s/m80s.h
index b5d1e4dd06..e1a5f990ba 100644
--- a/keyboards/mode/m80v1/m80s/m80s.h
+++ b/keyboards/mode/m80v1/m80s/m80s.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "m80v1.h"
+#include "quantum.h"
 
 #define LAYOUT_eighty_m80s( \
     K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K415,  K114, K115,  K116, \
diff --git a/keyboards/mode/m80v1/m80v1.c b/keyboards/mode/m80v1/m80v1.c
deleted file mode 100644
index 225ed9cc8d..0000000000
--- a/keyboards/mode/m80v1/m80v1.c
+++ /dev/null
@@ -1,14 +0,0 @@
- /* Copyright 2020 �lvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  */
-
-#include "m80v1.h"
diff --git a/keyboards/mode/m80v1/m80v1.h b/keyboards/mode/m80v1/m80v1.h
deleted file mode 100644
index 704ea28439..0000000000
--- a/keyboards/mode/m80v1/m80v1.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mode_m80v1_m80h)
-  #include "m80h.h"
-#elif defined(KEYBOARD_mode_m80v1_m80s)
-  #include "m80s.h"
-#endif // Mode80 solderable "S" and hotswap "H" revisions
diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h
index dcfd8d1614..d553d5d894 100644
--- a/keyboards/mode/m80v2/config.h
+++ b/keyboards/mode/m80v2/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B12, B13, B14, B3, B4, B9 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, B0, B1, B10, A8, A10, B15, A15, B5, B8, C13 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mode/m80v2/m80v2.c b/keyboards/mode/m80v2/m80v2.c
deleted file mode 100644
index faad98b7a7..0000000000
--- a/keyboards/mode/m80v2/m80v2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright 2020 �lvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "m80v2.h"
diff --git a/keyboards/mode/m80v2/m80v2.h b/keyboards/mode/m80v2/m80v2.h
deleted file mode 100644
index c00f148e62..0000000000
--- a/keyboards/mode/m80v2/m80v2.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 �lvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mode_m80v2_m80v2h)
-  #include "m80v2h.h"
-#elif defined(KEYBOARD_mode_m80v2_m80v2s)
-  #include "m80v2s.h"
-#endif
diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json
index 51788340ca..1ac0ee9d26 100644
--- a/keyboards/mode/m80v2/m80v2h/info.json
+++ b/keyboards/mode/m80v2/m80v2h/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0083",
     	"device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"],
+        "rows": ["B12", "B13", "B14", "B3", "B4", "B9"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
     	"caps_lock": "A0",
     	"on_state": 0
@@ -21,93 +26,108 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-			{"label":"Esc", "x":0, "y":0},
-			{"label":"F1", "x":2, "y":0},
-			{"label":"F2", "x":3, "y":0},
-			{"label":"F3", "x":4, "y":0},
-			{"label":"F4", "x":5, "y":0},
-			{"label":"F5", "x":6.5, "y":0},
-			{"label":"F6", "x":7.5, "y":0},
-			{"label":"F7", "x":8.5, "y":0},
-			{"label":"F8", "x":9.5, "y":0},
-			{"label":"F9", "x":11, "y":0},
-			{"label":"F10", "x":12, "y":0},
-			{"label":"F11", "x":13, "y":0},
-			{"label":"F12", "x":14, "y":0},
-			{"label":"Bkspc", "x":13, "y":1.5, "w": 2},
-			{"label":"Mute", "x":15.25, "y":0},
-			{"label":"VolDn", "x":16.25, "y":0},
-			{"label":"VolUp", "x":17.25, "y":0},
-			{"label":"~", "x":0, "y":1.5},
-			{"label":"1", "x":1, "y":1.5},
-			{"label":"2", "x":2, "y":1.5},
-			{"label":"3", "x":3, "y":1.5},
-			{"label":"4", "x":4, "y":1.5},
-			{"label":"5", "x":5, "y":1.5}, 
-			{"label":"6", "x":6, "y":1.5},
-			{"label":"7", "x":7, "y":1.5},
-			{"label":"8", "x":8, "y":1.5},
-			{"label":"9", "x":9, "y":1.5},
-			{"label":"0", "x":10, "y":1.5},
-			{"label":"_", "x":11, "y":1.5},
-			{"label":"+", "x":12, "y":1.5},
-			{"label":"Insert", "x":15.25, "y":1.5},
-			{"label":"Home", "x":16.25, "y":1.5},
-			{"label":"PgUp", "x":17.25, "y":1.5},
-			{"label":"Tab", "x":0, "y":2.5, "w":1.5},
-			{"label":"Q", "x":1.5, "y":2.5},
-			{"label":"W", "x":2.5, "y":2.5},
-			{"label":"E", "x":3.5, "y":2.5},
-			{"label":"R", "x":4.5, "y":2.5},
-			{"label":"T", "x":5.5, "y":2.5},
-			{"label":"Y", "x":6.5, "y":2.5},
-			{"label":"U", "x":7.5, "y":2.5},
-			{"label":"I", "x":8.5, "y":2.5},
-			{"label":"O", "x":9.5, "y":2.5},
-			{"label":"P", "x":10.5, "y":2.5},
-			{"label":"{", "x":11.5, "y":2.5},
-			{"label":"}", "x":12.5, "y":2.5},
-			{"label":"|", "x":13.5, "y":2.5, "w":1.5},
-			{"label":"Delete", "x":15.25, "y":2.5},
-			{"label":"End", "x":16.25, "y":2.5},
-			{"label":"PgDn", "x":17.25, "y":2.5},
-			{"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-			{"label":"A", "x":1.75, "y":3.5},
-			{"label":"S", "x":2.75, "y":3.5},
-			{"label":"D", "x":3.75, "y":3.5},
-			{"label":"F", "x":4.75, "y":3.5},
-			{"label":"G", "x":5.75, "y":3.5},
-			{"label":"H", "x":6.75, "y":3.5},
-			{"label":"J", "x":7.75, "y":3.5},
-			{"label":"K", "x":8.75, "y":3.5},
-			{"label":"L", "x":9.75, "y":3.5},
-			{"label":":", "x":10.75, "y":3.5},
-			{"label":"\"", "x":11.75, "y":3.5},
-			{"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-			{"label":"Shift", "x":0, "y":4.5, "w":2.25},
-			{"label":"Z", "x":2.25, "y":4.5},
-			{"label":"X", "x":3.25, "y":4.5},
-			{"label":"C", "x":4.25, "y":4.5},
-			{"label":"V", "x":5.25, "y":4.5},
-			{"label":"B", "x":6.25, "y":4.5},
-			{"label":"N", "x":7.25, "y":4.5},
-			{"label":"M", "x":8.25, "y":4.5},
-			{"label":",", "x":9.25, "y":4.5},
-			{"label":".", "x":10.25, "y":4.5},
-			{"label":"/", "x":11.25, "y":4.5},
-			{"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-			{"label":"\u2191", "x":16.25, "y":4.5},
-			{"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-			{"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-			{"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-			{"x":3.75, "y":5.5, "w":6.25},
-			{"label":"Alt", "x":10, "y":5.5, "w":1.25},
-			{"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-			{"label":"FN1", "x":12.5, "y":5.5, "w":1.25},
-			{"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-			{"label":"\u2190", "x":15.25, "y":5.5},
-			{"label":"\u2193", "x":16.25, "y":5.5},
-			{"label":"\u2192", "x":17.25, "y":5.5}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.c b/keyboards/mode/m80v2/m80v2h/m80v2h.c
deleted file mode 100644
index 0d4e533c30..0000000000
--- a/keyboards/mode/m80v2/m80v2h/m80v2h.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright 2020 �lvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "m80v2h.h"
diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.h b/keyboards/mode/m80v2/m80v2h/m80v2h.h
deleted file mode 100644
index 28d1d2784c..0000000000
--- a/keyboards/mode/m80v2/m80v2h/m80v2h.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 �lvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "m80v2.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_tkl_ansi( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, K1G, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                \
-	K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,      \
-        K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F, K5G  \
-)\
-{\
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F, K1G }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___, ___, ___ }, \
-	{ K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-	{ K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F, K5G } \
-}
diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json
index d7f5dd663b..5793fa00a7 100644
--- a/keyboards/mode/m80v2/m80v2s/info.json
+++ b/keyboards/mode/m80v2/m80v2s/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0082",
     	"device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"],
+        "rows": ["B12", "B13", "B14", "B3", "B4", "B9"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
     	"caps_lock": "A0",
     	"on_state": 0
diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.c b/keyboards/mode/m80v2/m80v2s/m80v2s.c
deleted file mode 100644
index 7be89b1288..0000000000
--- a/keyboards/mode/m80v2/m80v2s/m80v2s.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright 2020 �lvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "m80v2s.h"
diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.h b/keyboards/mode/m80v2/m80v2s/m80v2s.h
index 440b54583a..88f38d8b05 100644
--- a/keyboards/mode/m80v2/m80v2s/m80v2s.h
+++ b/keyboards/mode/m80v2/m80v2s/m80v2s.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "m80v2.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/mokey/ginkgo65/ginkgo65.c b/keyboards/mokey/ginkgo65/ginkgo65.c
deleted file mode 100644
index 4ab3aae51f..0000000000
--- a/keyboards/mokey/ginkgo65/ginkgo65.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ginkgo65.h"
-
diff --git a/keyboards/mokey/ginkgo65/ginkgo65.h b/keyboards/mokey/ginkgo65/ginkgo65.h
deleted file mode 100644
index 1594e5c793..0000000000
--- a/keyboards/mokey/ginkgo65/ginkgo65.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/* Copyright 2021 Ocean
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*LAYOUT_65_ansi_blocker
-  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
-  * │k00│k01│k02│k03│k04│k05│k06│k07│k08│k09│k0A│k0B│k0C│  k0D  │k0F│
-  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-  * │ k10 │k11│k12│k13│k14│k15│k16│k17│k18│k19│k1A│k1B│k1C│ k1D │k1E│
-  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-  * │ k20  │k21│k22│k23│k24│k25│k26│k27│k28│k29│k2A│k2B│  k2D   │k2E│
-  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-  * │   k30  │k32│k33│k34│k35│k36│k37│k38│k39│k3A│k3B│  k3C │k3D│k3E│
-  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-  * │k40 │k41 │k42 │  k44                   │k49 │k4A │ │k4C│k4D│k4E│
-  * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-    1     2    3    4    5    6    7    8    9    10   11   12   13   14   15   16
-*/
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,      k44,                     k49, k4A,      k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
-    { k40, k41, k42, XXX, k44, XXX, XXX, XXX, XXX, k49, k4A, XXX, k4C, k4D, k4E, XXX }, \
-}
-
-/*LAYOUT_65_ansi_blocker_split_bs
-  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
-  * │k00│k01│k02│k03│k04│k05│k06│k07│k08│k09│k0A│k0B│k0C│k0D│k0E│k0F│
-  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-  * │ k10 │k11│k12│k13│k14│k15│k16│k17│k18│k19│k1A│k1B│k1C│ k1D │k1E│
-  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-  * │ k20  │k21│k22│k23│k24│k25│k26│k27│k28│k29│k2A│k2B│  k2D   │k2E│
-  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-  * │   k30  │k32│k33│k34│k35│k36│k37│k38│k39│k3A│k3B│  k3C │k3D│k3E│
-  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-  * │k40 │k41 │k42 │  k44                   │k49 │k4A │ │k4C│k4D│k4E│
-  * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-    1     2    3    4    5    6    7    8    9    10   11   12   13   14   15   16
-*/
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,      k44,                     k49, k4A,      k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
-    { k40, k41, k42, XXX, k44, XXX, XXX, XXX, XXX, k49, k4A, XXX, k4C, k4D, k4E, XXX }, \
-}
-
-/*LAYOUT_65_ansi_blocker_tsangan_split_bs
-  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
-  * │k00│k01│k02│k03│k04│k05│k06│k07│k08│k09│k0A│k0B│k0C│k0D│k0E│k0F│
-  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-  * │ k10 │k11│k12│k13│k14│k15│k16│k17│k18│k19│k1A│k1B│k1C│ k1D │k1E│
-  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-  * │ k20  │k21│k22│k23│k24│k25│k26│k27│k28│k29│k2A│k2B│  k2D   │k2E│
-  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-  * │   k30  │k32│k33│k34│k35│k36│k37│k38│k39│k3A│k3B│  k3C │k3D│k3E│
-  * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
-  * │k40  │k41│k42  │ k44                       │k4A  │ │k4C│k4D│k4E│
-  * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
-    1     2    3    4    5    6    7    8    9    10   11   12   13   14   15   16
-*/
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,      k44,                          k4A,      k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
-    { k40, k41, k42, XXX, k44, XXX, XXX, XXX, XXX, XXX, k4A, XXX, k4C, k4D, k4E, XXX }, \
-}
-
-/*LAYOUT_65_iso_blocker
-  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
-  * │k00│k01│k02│k03│k04│k05│k06│k07│k08│k09│k0A│k0B│k0C│  k0D  │k0F│
-  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-  * │ k10 │k11│k12│k13│k14│k15│k16│k17│k18│k19│k1A│k1B│k1C│ K2D │k1E│
-  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
-  * │ k20  │k21│k22│k23│k24│k25│k26│k27│k28│k29│k2A│k2B│k1D│    │k2E│
-  * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-  * │k30 │k31│k32│k33│k34│k35│k36│k37│k38│k39│k3A│k3B│  k3C │k3D│k3E│
-  * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-  * │k40 │k41 │k42 │  k44                   │k49 │k4A │ │k4C│k4D│k4E│
-  * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-    1     2    3    4    5    6    7    8    9    10   11   12   13   14   15   16
-*/
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D, k2E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,      k44,                     k49, k4A,      k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
-    { k40, k41, k42, XXX, k44, XXX, XXX, XXX, XXX, k49, k4A, XXX, k4C, k4D, k4E, XXX }, \
-}
-
-/*LAYOUT_65_iso_blocker_split_bs
-  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
-  * │k00│k01│k02│k03│k04│k05│k06│k07│k08│k09│k0A│k0B│k0C│k0D│k0E│k0F│
-  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-  * │ k10 │k11│k12│k13│k14│k15│k16│k17│k18│k19│k1A│k1B│k1C│ K2D │k1E│
-  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
-  * │ k20  │k21│k22│k23│k24│k25│k26│k27│k28│k29│k2A│k2B│k1D│    │k2E│
-  * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-  * │k30 │k31│k32│k33│k34│k35│k36│k37│k38│k39│k3A│k3B│  k3C │k3D│k3E│
-  * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-  * │k40 │k41 │k42 │  k44                   │k49 │k4A │ │k4C│k4D│k4E│
-  * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-    1     2    3    4    5    6    7    8    9    10   11   12   13   14   15   16
-*/
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D, k2E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,      k44,                     k49, k4A,      k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
-    { k40, k41, k42, XXX, k44, XXX, XXX, XXX, XXX, k49, k4A, XXX, k4C, k4D, k4E, XXX }, \
-}
-
-/*LAYOUT_65_iso_blocker_tsangan_split_bs
-  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
-  * │k00│k01│k02│k03│k04│k05│k06│k07│k08│k09│k0A│k0B│k0C│k0D│k0E│k0F│
-  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-  * │ k10 │k11│k12│k13│k14│k15│k16│k17│k18│k19│k1A│k1B│k1C│ K2D │k1E│
-  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    ├───┤
-  * │ k20  │k21│k22│k23│k24│k25│k26│k27│k28│k29│k2A│k2B│k1D│    │k2E│
-  * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-  * │k30 │k31│k32│k33│k34│k35│k36│k37│k38│k39│k3A│k3B│  k3C │k3D│k3E│
-  * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
-  * │k40  │k41│k42  │ k44                       │k4A  │ │k4C│k4D│k4E│
-  * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
-    1     2    3    4    5    6    7    8    9    10   11   12   13   14   15   16
-*/
-#define LAYOUT_65_iso_blocker_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D, k2E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,      k44,                          k4A,      k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
-    { k40, k41, k42, XXX, k44, XXX, XXX, XXX, XXX, XXX, k4A, XXX, k4C, k4D, k4E, XXX }, \
-}
-
-/*LAYOUT_all
-  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
-  * │k00│k01│k02│k03│k04│k05│k06│k07│k08│k09│k0A│k0B│k0C│k0D│k0E│k0F│
-  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-  * │ k10 │k11│k12│k13│k14│k15│k16│k17│k18│k19│k1A│k1B│k1C│ k1D │k1E│
-  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-  * │ k20  │k21│k22│k23│k24│k25│k26│k27│k28│k29│k2A│k2B│  K2D   │k2E│
-  * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-  * │k30 │k31│k32│k33│k34│k35│k36│k37│k38│k39│k3A│k3B│  k3C │k3D│k3E│
-  * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-  * │k40 │k41 │k42 │k43     │K44 │ K46      │K49 │k4A │ │k4C│k4D│k4E│
-  * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
-    1     2    3    4    5    6    7    8    9    10   11   12   13   14   15   16
-*/
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,           K43, k44, K46,      K49, k4A,      k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
-    { k40, k41, k42, K43, k44, XXX, K46, XXX, XXX, XXX, k4A, XXX, k4C, k4D, k4E, XXX }, \
-}
diff --git a/keyboards/mokey/ginkgo65/info.json b/keyboards/mokey/ginkgo65/info.json
index 81e3fe1a38..4fffbd596a 100644
--- a/keyboards/mokey/ginkgo65/info.json
+++ b/keyboards/mokey/ginkgo65/info.json
@@ -28,536 +28,536 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_iso_blocker":{
+        "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_iso_blocker_split_bs":{
+        "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_iso_blocker_tsangan_split_bs":{
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Fn", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_all":{
+        "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":2.25},
-                {"label":"Space", "x":6, "y":4, "w":1.25},
-                {"label":"Space", "x":7.25, "y":4, "w":2.75},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mokey/ginkgo65hot/config.h b/keyboards/mokey/ginkgo65hot/config.h
deleted file mode 100644
index c3f836fd12..0000000000
--- a/keyboards/mokey/ginkgo65hot/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2021 Kyle McCreery
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mokey/ginkgo65hot/ginkgo65hot.c b/keyboards/mokey/ginkgo65hot/ginkgo65hot.c
deleted file mode 100644
index 1db0f9c22d..0000000000
--- a/keyboards/mokey/ginkgo65hot/ginkgo65hot.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ginkgo65hot.h"
-
diff --git a/keyboards/mokey/ginkgo65hot/ginkgo65hot.h b/keyboards/mokey/ginkgo65hot/ginkgo65hot.h
deleted file mode 100644
index e4a42d9ad9..0000000000
--- a/keyboards/mokey/ginkgo65hot/ginkgo65hot.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 Ocean
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*LAYOUT_65_ansi_blocker
-  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
-  * │k00│k01│k02│k03│k04│k05│k06│k07│k08│k09│k0A│k0B│k0C│  k0D  │k0E│
-  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-  * │ k10 │k11│k12│k13│k14│k15│k16│k17│k18│k19│k1A│k1B│k1C│ k1D │k1E│
-  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-  * │ k20  │k21│k22│k23│k24│k25│k26│k27│k28│k29│k2A│k2B│  k2D   │k2E│
-  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-  * │   k30  │k32│k33│k34│k35│k36│k37│k38│k39│k3A│k3B│  k3C │k3D│k3E│
-  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-  * │k40 │k41 │k42 │  k44                   │k49 │k4A │ │k4C│k4D│k4E│
-  * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-*/
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2E, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40, k41, k42,      k44,                     k49, k4A,      k4C, k4D, k4E  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, XXX, k44, XXX, XXX, XXX, XXX, k49, k4A, XXX, k4C, k4D, k4E }, \
-}
diff --git a/keyboards/mokey/ginkgo65hot/info.json b/keyboards/mokey/ginkgo65hot/info.json
index 31427c7cb3..d63a1f9beb 100644
--- a/keyboards/mokey/ginkgo65hot/info.json
+++ b/keyboards/mokey/ginkgo65hot/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3366",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 6,
@@ -23,77 +28,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15, "y":0},
-                
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
-                
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Return", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Up", "x":15, "y":2},
-                
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mokey/ibis80/config.h b/keyboards/mokey/ibis80/config.h
deleted file mode 100644
index 51dbcc0bf7..0000000000
--- a/keyboards/mokey/ibis80/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2021 Kyle McCreery
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B0, B1, B2, E6, F0, F1 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mokey/ibis80/ibis80.c b/keyboards/mokey/ibis80/ibis80.c
deleted file mode 100644
index faddc99eb5..0000000000
--- a/keyboards/mokey/ibis80/ibis80.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ibis80.h"
\ No newline at end of file
diff --git a/keyboards/mokey/ibis80/ibis80.h b/keyboards/mokey/ibis80/ibis80.h
deleted file mode 100644
index 0f2c60a533..0000000000
--- a/keyboards/mokey/ibis80/ibis80.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2021 Ocean
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- *  ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───� ┌───┬───┬───�
- *  │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │ │0E │0F │0G │
- *  └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
- *  ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───┬───�
- *  │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │1G │
- *  ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤    ┌─────�
- *  │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │    │3D   │
- *  ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴�    │ ISO Enter
- *  │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │               │2D │    │
- *  ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───�     └───┴────┘
- *  │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4D        │     │4F │
- *  ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───�
- *  │50   │51 │52   │56                         │5A   │5B │5D   │ │5E │5F │5G │
- *  └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
- *  ┌─────�   ┌─────┬───────────────────────────┬─────�   ┌─────�
- *  │50   │   │52   │56                         │5A   │   │5D   │
- *  └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
- */
-
-#define LAYOUT_tkl_f13_ansi_tsangan(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,   k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,   k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,   k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,   \
-    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a,      k4d,        k4f, \
-    k50, k51, k52,                k56,                     k5a, k5b, k5d,   k5e, k5f, k5g \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, XXX, XXX, k4d, XXX, k4f, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g }  \
-}
-
-#define LAYOUT_tkl_f13_ansi_wkl(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,   k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,   k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,   k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,   \
-    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a,      k4d,        k4f, \
-    k50,      k52,                k56,                     k5a,      k5d,   k5e, k5f, k5g \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, XXX, XXX, k4d, XXX, k4f, XXX }, \
-    { k50, XXX, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, XXX, XXX, k5d, k5e, k5f, k5g }  \
-}
diff --git a/keyboards/mokey/ibis80/info.json b/keyboards/mokey/ibis80/info.json
index df1771d5e8..5324930df8 100644
--- a/keyboards/mokey/ibis80/info.json
+++ b/keyboards/mokey/ibis80/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3380",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
+        "rows": ["B0", "B1", "B2", "E6", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -16,202 +21,210 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1.25, "y": 0},
-                {"label": "k02", "x": 2.25, "y": 0},
-                {"label": "k03", "x": 3.25, "y": 0},
-                {"label": "k04", "x": 4.25, "y": 0},
-                {"label": "k05", "x": 5.5, "y": 0},
-                {"label": "k06", "x": 6.5, "y": 0},
-                {"label": "k07", "x": 7.5, "y": 0},
-                {"label": "k08", "x": 8.5, "y": 0},
-                {"label": "k09", "x": 9.75, "y": 0},
-                {"label": "k0A", "x": 10.75, "y": 0},
-                {"label": "k0B", "x": 11.75, "y": 0},
-                {"label": "k0C", "x": 12.75, "y": 0},
-                {"label": "k0D", "x": 14, "y": 0},
-
-                {"label": "k0E", "x": 15.25, "y": 0},
-                {"label": "k0F", "x": 16.25, "y": 0},
-                {"label": "k0G", "x": 17.25, "y": 0},
-
-                {"label": "k10", "x": 0, "y": 1.5},
-                {"label": "k11", "x": 1, "y": 1.5},
-                {"label": "k12", "x": 2, "y": 1.5},
-                {"label": "k13", "x": 3, "y": 1.5},
-                {"label": "k14", "x": 4, "y": 1.5},
-                {"label": "k15", "x": 5, "y": 1.5},
-                {"label": "k16", "x": 6, "y": 1.5},
-                {"label": "k17", "x": 7, "y": 1.5},
-                {"label": "k18", "x": 8, "y": 1.5},
-                {"label": "k19", "x": 9, "y": 1.5},
-                {"label": "k1A", "x": 10, "y": 1.5},
-                {"label": "k1B", "x": 11, "y": 1.5},
-                {"label": "k1C", "x": 12, "y": 1.5},
-                {"label": "k1D", "x": 13, "y": 1.5, "w": 2},
-
-                {"label": "k1E", "x": 15.25, "y": 1.5},
-                {"label": "k1F", "x": 16.25, "y": 1.5},
-                {"label": "k1G", "x": 17.25, "y": 1.5},
-
-                {"label": "k20", "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "k21", "x": 1.5, "y": 2.5},
-                {"label": "k22", "x": 2.5, "y": 2.5},
-                {"label": "k23", "x": 3.5, "y": 2.5},
-                {"label": "k24", "x": 4.5, "y": 2.5},
-                {"label": "k25", "x": 5.5, "y": 2.5},
-                {"label": "k26", "x": 6.5, "y": 2.5},
-                {"label": "k27", "x": 7.5, "y": 2.5},
-                {"label": "k28", "x": 8.5, "y": 2.5},
-                {"label": "k29", "x": 9.5, "y": 2.5},
-                {"label": "k2A", "x": 10.5, "y": 2.5},
-                {"label": "k2B", "x": 11.5, "y": 2.5},
-                {"label": "k2C", "x": 12.5, "y": 2.5},
-                {"label": "k2D", "x": 13.5, "y": 2.5},
-
-                {"label": "k2E", "x": 15.25, "y": 2.5},
-                {"label": "k2F", "x": 16.25, "y": 2.5},
-                {"label": "k2G", "x": 17.25, "y": 2.5},
-
-                {"label": "k30", "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "k31", "x": 1.75, "y": 3.5},
-                {"label": "k32", "x": 2.75, "y": 3.5},
-                {"label": "k33", "x": 3.75, "y": 3.5},
-                {"label": "k34", "x": 4.75, "y": 3.5},
-                {"label": "k35", "x": 5.75, "y": 3.5},
-                {"label": "k36", "x": 6.75, "y": 3.5},
-                {"label": "k37", "x": 7.75, "y": 3.5},
-                {"label": "k38", "x": 8.75, "y": 3.5},
-                {"label": "k39", "x": 9.75, "y": 3.5},
-                {"label": "k3A", "x": 10.75, "y": 3.5},
-                {"label": "k3B", "x": 11.75, "y": 3.5},
-                {"label": "k3D", "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"label": "k40", "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "k41", "x": 2.25, "y": 4.5},
-                {"label": "k42", "x": 3.25, "y": 4.5},
-                {"label": "k43", "x": 4.25, "y": 4.5},
-                {"label": "k44", "x": 5.25, "y": 4.5},
-                {"label": "k45", "x": 6.25, "y": 4.5},
-                {"label": "k46", "x": 7.25, "y": 4.5},
-                {"label": "k47", "x": 8.25, "y": 4.5},
-                {"label": "k48", "x": 9.25, "y": 4.5},
-                {"label": "k49", "x": 10.25, "y": 4.5},
-                {"label": "k4A", "x": 11.25, "y": 4.5},
-                {"label": "k4D", "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"label": "k4F", "x": 16.25, "y": 4.5},
-
-                {"label": "k50", "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "k51", "x": 1.5, "y": 5.5},
-                {"label": "k52", "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "k56", "x": 4, "y": 5.5, "w": 7},
-                {"label": "k5A", "x": 11, "y": 5.5, "w": 1.5},
-                {"label": "k5B", "x": 12.5, "y": 5.5},
-                {"label": "k5D", "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"label": "k5E", "x": 15.25, "y": 5.5},
-                {"label": "k5F", "x": 16.25, "y": 5.5},
-                {"label": "k5G", "x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_ansi_wkl": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1.25, "y": 0},
-                {"label": "k02", "x": 2.25, "y": 0},
-                {"label": "k03", "x": 3.25, "y": 0},
-                {"label": "k04", "x": 4.25, "y": 0},
-                {"label": "k05", "x": 5.5, "y": 0},
-                {"label": "k06", "x": 6.5, "y": 0},
-                {"label": "k07", "x": 7.5, "y": 0},
-                {"label": "k08", "x": 8.5, "y": 0},
-                {"label": "k09", "x": 9.75, "y": 0},
-                {"label": "k0A", "x": 10.75, "y": 0},
-                {"label": "k0B", "x": 11.75, "y": 0},
-                {"label": "k0C", "x": 12.75, "y": 0},
-                {"label": "k0D", "x": 14, "y": 0},
-
-                {"label": "k0E", "x": 15.25, "y": 0},
-                {"label": "k0F", "x": 16.25, "y": 0},
-                {"label": "k0G", "x": 17.25, "y": 0},
-
-                {"label": "k10", "x": 0, "y": 1.5},
-                {"label": "k11", "x": 1, "y": 1.5},
-                {"label": "k12", "x": 2, "y": 1.5},
-                {"label": "k13", "x": 3, "y": 1.5},
-                {"label": "k14", "x": 4, "y": 1.5},
-                {"label": "k15", "x": 5, "y": 1.5},
-                {"label": "k16", "x": 6, "y": 1.5},
-                {"label": "k17", "x": 7, "y": 1.5},
-                {"label": "k18", "x": 8, "y": 1.5},
-                {"label": "k19", "x": 9, "y": 1.5},
-                {"label": "k1A", "x": 10, "y": 1.5},
-                {"label": "k1B", "x": 11, "y": 1.5},
-                {"label": "k1C", "x": 12, "y": 1.5},
-                {"label": "k1D", "x": 13, "y": 1.5, "w": 2},
-
-                {"label": "k1E", "x": 15.25, "y": 1.5},
-                {"label": "k1F", "x": 16.25, "y": 1.5},
-                {"label": "k1G", "x": 17.25, "y": 1.5},
-
-                {"label": "k20", "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "k21", "x": 1.5, "y": 2.5},
-                {"label": "k22", "x": 2.5, "y": 2.5},
-                {"label": "k23", "x": 3.5, "y": 2.5},
-                {"label": "k24", "x": 4.5, "y": 2.5},
-                {"label": "k25", "x": 5.5, "y": 2.5},
-                {"label": "k26", "x": 6.5, "y": 2.5},
-                {"label": "k27", "x": 7.5, "y": 2.5},
-                {"label": "k28", "x": 8.5, "y": 2.5},
-                {"label": "k29", "x": 9.5, "y": 2.5},
-                {"label": "k2A", "x": 10.5, "y": 2.5},
-                {"label": "k2B", "x": 11.5, "y": 2.5},
-                {"label": "k2C", "x": 12.5, "y": 2.5},
-                {"label": "k2D", "x": 13.5, "y": 2.5},
-
-                {"label": "k2E", "x": 15.25, "y": 2.5},
-                {"label": "k2F", "x": 16.25, "y": 2.5},
-                {"label": "k2G", "x": 17.25, "y": 2.5},
-
-                {"label": "k30", "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "k31", "x": 1.75, "y": 3.5},
-                {"label": "k32", "x": 2.75, "y": 3.5},
-                {"label": "k33", "x": 3.75, "y": 3.5},
-                {"label": "k34", "x": 4.75, "y": 3.5},
-                {"label": "k35", "x": 5.75, "y": 3.5},
-                {"label": "k36", "x": 6.75, "y": 3.5},
-                {"label": "k37", "x": 7.75, "y": 3.5},
-                {"label": "k38", "x": 8.75, "y": 3.5},
-                {"label": "k39", "x": 9.75, "y": 3.5},
-                {"label": "k3A", "x": 10.75, "y": 3.5},
-                {"label": "k3B", "x": 11.75, "y": 3.5},
-                {"label": "k3D", "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"label": "k40", "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "k41", "x": 2.25, "y": 4.5},
-                {"label": "k42", "x": 3.25, "y": 4.5},
-                {"label": "k43", "x": 4.25, "y": 4.5},
-                {"label": "k44", "x": 5.25, "y": 4.5},
-                {"label": "k45", "x": 6.25, "y": 4.5},
-                {"label": "k46", "x": 7.25, "y": 4.5},
-                {"label": "k47", "x": 8.25, "y": 4.5},
-                {"label": "k48", "x": 9.25, "y": 4.5},
-                {"label": "k49", "x": 10.25, "y": 4.5},
-                {"label": "k4A", "x": 11.25, "y": 4.5},
-                {"label": "k4D", "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"label": "k4F", "x": 16.25, "y": 4.5},
-
-                {"label": "k50", "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "k52", "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "k56", "x": 4, "y": 5.5, "w": 7},
-                {"label": "k5A", "x": 11, "y": 5.5, "w": 1.5},
-                {"label": "k5D", "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"label": "k5E", "x": 15.25, "y": 5.5},
-                {"label": "k5F", "x": 16.25, "y": 5.5},
-                {"label": "k5G", "x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/mokey/mokey63/config.h b/keyboards/mokey/mokey63/config.h
deleted file mode 100644
index 4347c233c3..0000000000
--- a/keyboards/mokey/mokey63/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2021 Kyle McCreery
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B5, B6, B2, B3, B1 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mokey/mokey63/info.json b/keyboards/mokey/mokey63/info.json
index 0a29380114..6da3bc3133 100644
--- a/keyboards/mokey/mokey63/info.json
+++ b/keyboards/mokey/mokey63/info.json
@@ -8,6 +8,11 @@
         "pid": "0x063A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B5", "B6", "B2", "B3", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mokey/mokey63/mokey63.c b/keyboards/mokey/mokey63/mokey63.c
deleted file mode 100644
index ea30335a84..0000000000
--- a/keyboards/mokey/mokey63/mokey63.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "mokey63.h"
diff --git a/keyboards/mokey/mokey64/config.h b/keyboards/mokey/mokey64/config.h
deleted file mode 100644
index 4946ac2a9b..0000000000
--- a/keyboards/mokey/mokey64/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2021 Kyle McCreery
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D2, D1, D3, D5, D4, D6, D7, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mokey/mokey64/info.json b/keyboards/mokey/mokey64/info.json
index b31ef95cfd..36126d9243 100644
--- a/keyboards/mokey/mokey64/info.json
+++ b/keyboards/mokey/mokey64/info.json
@@ -8,6 +8,11 @@
         "pid": "0x001A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D2", "D1", "D3", "D5", "D4", "D6", "D7", "B6"],
+        "rows": ["B1", "B2", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mokey/mokey64/mokey64.c b/keyboards/mokey/mokey64/mokey64.c
deleted file mode 100644
index 5ba764b6b2..0000000000
--- a/keyboards/mokey/mokey64/mokey64.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mokey64.h"
\ No newline at end of file
diff --git a/keyboards/mokey/xox70/config.h b/keyboards/mokey/xox70/config.h
deleted file mode 100644
index 12780d9be9..0000000000
--- a/keyboards/mokey/xox70/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2021 Kyle McCreery
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-#define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
-#define MATRIX_COL_PINS { F6, C7, F4, F5, F1, B6, D0, D2, D3, D1, D7, D4, D5, D6, B4, B5, C6, B7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mokey/xox70/info.json b/keyboards/mokey/xox70/info.json
index f2dc99719a..9d3216ab15 100644
--- a/keyboards/mokey/xox70/info.json
+++ b/keyboards/mokey/xox70/info.json
@@ -8,432 +8,437 @@
         "pid": "0x3370",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "C7", "F4", "F5", "F1", "B6", "D0", "D2", "D3", "D1", "D7", "D4", "D5", "D6", "B4", "B5", "C6", "B7"],
+        "rows": ["F7", "B7", "F5", "F1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_nofrow_ansi", "tkl_nofrow_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"k00", "x": 0, "y": 0},
-                {"label":"k01", "x": 1, "y": 0},
-                {"label":"k02", "x": 2, "y": 0},
-                {"label":"k03", "x": 3, "y": 0},
-                {"label":"k04", "x": 4, "y": 0},
-                {"label":"k05", "x": 5, "y": 0},
-                {"label":"k06", "x": 6, "y": 0},
-                {"label":"k07", "x": 7, "y": 0},
-                {"label":"k08", "x": 8, "y": 0},
-                {"label":"k09", "x": 9, "y": 0},
-                {"label":"k0A", "x": 10, "y": 0},
-                {"label":"k0B", "x": 11, "y": 0},
-                {"label":"k0C", "x": 12, "y": 0},
-                {"label":"k0D", "x": 13, "y": 0},
-                {"label":"k0E", "x": 14, "y": 0},
-
-                {"label":"k0F", "x": 15.25, "y": 0},
-                {"label":"k0G", "x": 16.25, "y": 0},
-                {"label":"k0H", "x": 17.25, "y": 0},
-
-                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
-                {"label":"k12", "x": 1.5, "y": 1},
-                {"label":"k13", "x": 2.5, "y": 1},
-                {"label":"k14", "x": 3.5, "y": 1},
-                {"label":"k15", "x": 4.5, "y": 1},
-                {"label":"k16", "x": 5.5, "y": 1},
-                {"label":"k17", "x": 6.5, "y": 1},
-                {"label":"k18", "x": 7.5, "y": 1},
-                {"label":"k19", "x": 8.5, "y": 1},
-                {"label":"k1A", "x": 9.5, "y": 1},
-                {"label":"k1B", "x": 10.5, "y": 1},
-                {"label":"k1C", "x": 11.5, "y": 1},
-                {"label":"k1D", "x": 12.5, "y": 1},
-                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label":"k1F", "x": 15.25, "y": 1},
-                {"label":"k1G", "x": 16.25, "y": 1},
-                {"label":"k1H", "x": 17.25, "y": 1},
-
-                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
-                {"label":"k22", "x": 1.75, "y": 2},
-                {"label":"k23", "x": 2.75, "y": 2},
-                {"label":"k24", "x": 3.75, "y": 2},
-                {"label":"k25", "x": 4.75, "y": 2},
-                {"label":"k26", "x": 5.75, "y": 2},
-                {"label":"k27", "x": 6.75, "y": 2},
-                {"label":"k28", "x": 7.75, "y": 2},
-                {"label":"k29", "x": 8.75, "y": 2},
-                {"label":"k2A", "x": 9.75, "y": 2},
-                {"label":"k2B", "x": 10.75, "y": 2},
-                {"label":"k2C", "x": 11.75, "y": 2},
-                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
-                {"label":"k31", "x": 1.25, "y": 3},
-                {"label":"k32", "x": 2.25, "y": 3},
-                {"label":"k33", "x": 3.25, "y": 3},
-                {"label":"k34", "x": 4.25, "y": 3},
-                {"label":"k35", "x": 5.25, "y": 3},
-                {"label":"k36", "x": 6.25, "y": 3},
-                {"label":"k37", "x": 7.25, "y": 3},
-                {"label":"k38", "x": 8.25, "y": 3},
-                {"label":"k39", "x": 9.25, "y": 3},
-                {"label":"k3A", "x": 10.25, "y": 3},
-                {"label":"k3B", "x": 11.25, "y": 3},
-                {"label":"k3D", "x": 12.25, "y": 3, "w": 1.75},
-                {"label":"k3E", "x": 14, "y": 3},
-
-                {"label":"k3G", "x": 16.25, "y": 3},
-
-                {"label":"k40", "x": 0, "y": 4, "w": 1.5},
-                {"label":"k41", "x": 1.5, "y": 4},
-                {"label":"k43", "x": 2.5, "y": 4, "w": 1.5},
-                {"label":"k44", "x": 4, "y": 4, "w": 2.5},
-                {"label":"k46", "x": 6.5, "y": 4},
-                {"label":"k48", "x": 7.5, "y": 4, "w": 2.5},
-                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
-                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
-
-                {"label":"k4F", "x": 15.25, "y": 4},
-                {"label":"k4G", "x": 16.25, "y": 4},
-                {"label":"k4H", "x": 17.25, "y": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.5},
+                {"matrix": [4, 6], "x": 6.5, "y": 4},
+                {"matrix": [4, 8], "x": 7.5, "y": 4, "w": 2.5},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_tkl_nofrow_ansi": {
             "layout": [
-                {"label":"k00", "x": 0, "y": 0},
-                {"label":"k01", "x": 1, "y": 0},
-                {"label":"k02", "x": 2, "y": 0},
-                {"label":"k03", "x": 3, "y": 0},
-                {"label":"k04", "x": 4, "y": 0},
-                {"label":"k05", "x": 5, "y": 0},
-                {"label":"k06", "x": 6, "y": 0},
-                {"label":"k07", "x": 7, "y": 0},
-                {"label":"k08", "x": 8, "y": 0},
-                {"label":"k09", "x": 9, "y": 0},
-                {"label":"k0A", "x": 10, "y": 0},
-                {"label":"k0B", "x": 11, "y": 0},
-                {"label":"k0C", "x": 12, "y": 0},
-                {"label":"k0E", "x": 13, "y": 0, "w": 2},
-
-                {"label":"k0F", "x": 15.25, "y": 0},
-                {"label":"k0G", "x": 16.25, "y": 0},
-                {"label":"k0H", "x": 17.25, "y": 0},
-
-                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
-                {"label":"k12", "x": 1.5, "y": 1},
-                {"label":"k13", "x": 2.5, "y": 1},
-                {"label":"k14", "x": 3.5, "y": 1},
-                {"label":"k15", "x": 4.5, "y": 1},
-                {"label":"k16", "x": 5.5, "y": 1},
-                {"label":"k17", "x": 6.5, "y": 1},
-                {"label":"k18", "x": 7.5, "y": 1},
-                {"label":"k19", "x": 8.5, "y": 1},
-                {"label":"k1A", "x": 9.5, "y": 1},
-                {"label":"k1B", "x": 10.5, "y": 1},
-                {"label":"k1C", "x": 11.5, "y": 1},
-                {"label":"k1D", "x": 12.5, "y": 1},
-                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label":"k1F", "x": 15.25, "y": 1},
-                {"label":"k1G", "x": 16.25, "y": 1},
-                {"label":"k1H", "x": 17.25, "y": 1},
-
-                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
-                {"label":"k22", "x": 1.75, "y": 2},
-                {"label":"k23", "x": 2.75, "y": 2},
-                {"label":"k24", "x": 3.75, "y": 2},
-                {"label":"k25", "x": 4.75, "y": 2},
-                {"label":"k26", "x": 5.75, "y": 2},
-                {"label":"k27", "x": 6.75, "y": 2},
-                {"label":"k28", "x": 7.75, "y": 2},
-                {"label":"k29", "x": 8.75, "y": 2},
-                {"label":"k2A", "x": 9.75, "y": 2},
-                {"label":"k2B", "x": 10.75, "y": 2},
-                {"label":"k2C", "x": 11.75, "y": 2},
-                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label":"k30", "x": 0, "y": 3, "w": 2.25},
-                {"label":"k32", "x": 2.25, "y": 3},
-                {"label":"k33", "x": 3.25, "y": 3},
-                {"label":"k34", "x": 4.25, "y": 3},
-                {"label":"k35", "x": 5.25, "y": 3},
-                {"label":"k36", "x": 6.25, "y": 3},
-                {"label":"k37", "x": 7.25, "y": 3},
-                {"label":"k38", "x": 8.25, "y": 3},
-                {"label":"k39", "x": 9.25, "y": 3},
-                {"label":"k3A", "x": 10.25, "y": 3},
-                {"label":"k3B", "x": 11.25, "y": 3},
-                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label":"k3G", "x": 16.25, "y": 3},
-
-                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
-                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
-                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
-                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
-                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
-
-                {"label":"k4F", "x": 15.25, "y": 4},
-                {"label":"k4G", "x": 16.25, "y": 4},
-                {"label":"k4H", "x": 17.25, "y": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 16], "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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_tkl_nofrow_iso": {
             "layout": [
-                {"label":"k00", "x": 0, "y": 0},
-                {"label":"k01", "x": 1, "y": 0},
-                {"label":"k02", "x": 2, "y": 0},
-                {"label":"k03", "x": 3, "y": 0},
-                {"label":"k04", "x": 4, "y": 0},
-                {"label":"k05", "x": 5, "y": 0},
-                {"label":"k06", "x": 6, "y": 0},
-                {"label":"k07", "x": 7, "y": 0},
-                {"label":"k08", "x": 8, "y": 0},
-                {"label":"k09", "x": 9, "y": 0},
-                {"label":"k0A", "x": 10, "y": 0},
-                {"label":"k0B", "x": 11, "y": 0},
-                {"label":"k0C", "x": 12, "y": 0},
-                {"label":"k0E", "x": 13, "y": 0, "w": 2},
-
-                {"label":"k0F", "x": 15.25, "y": 0},
-                {"label":"k0G", "x": 16.25, "y": 0},
-                {"label":"k0H", "x": 17.25, "y": 0},
-
-                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
-                {"label":"k12", "x": 1.5, "y": 1},
-                {"label":"k13", "x": 2.5, "y": 1},
-                {"label":"k14", "x": 3.5, "y": 1},
-                {"label":"k15", "x": 4.5, "y": 1},
-                {"label":"k16", "x": 5.5, "y": 1},
-                {"label":"k17", "x": 6.5, "y": 1},
-                {"label":"k18", "x": 7.5, "y": 1},
-                {"label":"k19", "x": 8.5, "y": 1},
-                {"label":"k1A", "x": 9.5, "y": 1},
-                {"label":"k1B", "x": 10.5, "y": 1},
-                {"label":"k1C", "x": 11.5, "y": 1},
-                {"label":"k1D", "x": 12.5, "y": 1},
-
-                {"label":"k1F", "x": 15.25, "y": 1},
-                {"label":"k1G", "x": 16.25, "y": 1},
-                {"label":"k1H", "x": 17.25, "y": 1},
-
-                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
-                {"label":"k22", "x": 1.75, "y": 2},
-                {"label":"k23", "x": 2.75, "y": 2},
-                {"label":"k24", "x": 3.75, "y": 2},
-                {"label":"k25", "x": 4.75, "y": 2},
-                {"label":"k26", "x": 5.75, "y": 2},
-                {"label":"k27", "x": 6.75, "y": 2},
-                {"label":"k28", "x": 7.75, "y": 2},
-                {"label":"k29", "x": 8.75, "y": 2},
-                {"label":"k2A", "x": 9.75, "y": 2},
-                {"label":"k2B", "x": 10.75, "y": 2},
-                {"label":"k2C", "x": 11.75, "y": 2},
-                {"label":"k1E", "x": 12.75, "y": 2},
-                {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
-                {"label":"k31", "x": 1.25, "y": 3},
-                {"label":"k32", "x": 2.25, "y": 3},
-                {"label":"k33", "x": 3.25, "y": 3},
-                {"label":"k34", "x": 4.25, "y": 3},
-                {"label":"k35", "x": 5.25, "y": 3},
-                {"label":"k36", "x": 6.25, "y": 3},
-                {"label":"k37", "x": 7.25, "y": 3},
-                {"label":"k38", "x": 8.25, "y": 3},
-                {"label":"k39", "x": 9.25, "y": 3},
-                {"label":"k3A", "x": 10.25, "y": 3},
-                {"label":"k3B", "x": 11.25, "y": 3},
-                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label":"k3G", "x": 16.25, "y": 3},
-
-                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
-                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
-                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
-                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
-                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
-
-                {"label":"k4F", "x": 15.25, "y": 4},
-                {"label":"k4G", "x": 16.25, "y": 4},
-                {"label":"k4H", "x": 17.25, "y": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 16], "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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_tkl_nofrow_ansi_split_bs": {
             "layout": [
-                {"label":"k00", "x": 0, "y": 0},
-                {"label":"k01", "x": 1, "y": 0},
-                {"label":"k02", "x": 2, "y": 0},
-                {"label":"k03", "x": 3, "y": 0},
-                {"label":"k04", "x": 4, "y": 0},
-                {"label":"k05", "x": 5, "y": 0},
-                {"label":"k06", "x": 6, "y": 0},
-                {"label":"k07", "x": 7, "y": 0},
-                {"label":"k08", "x": 8, "y": 0},
-                {"label":"k09", "x": 9, "y": 0},
-                {"label":"k0A", "x": 10, "y": 0},
-                {"label":"k0B", "x": 11, "y": 0},
-                {"label":"k0C", "x": 12, "y": 0},
-                {"label":"k0D", "x": 13, "y": 0},
-                {"label":"k0E", "x": 14, "y": 0},
-
-                {"label":"k0F", "x": 15.25, "y": 0},
-                {"label":"k0G", "x": 16.25, "y": 0},
-                {"label":"k0H", "x": 17.25, "y": 0},
-
-                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
-                {"label":"k12", "x": 1.5, "y": 1},
-                {"label":"k13", "x": 2.5, "y": 1},
-                {"label":"k14", "x": 3.5, "y": 1},
-                {"label":"k15", "x": 4.5, "y": 1},
-                {"label":"k16", "x": 5.5, "y": 1},
-                {"label":"k17", "x": 6.5, "y": 1},
-                {"label":"k18", "x": 7.5, "y": 1},
-                {"label":"k19", "x": 8.5, "y": 1},
-                {"label":"k1A", "x": 9.5, "y": 1},
-                {"label":"k1B", "x": 10.5, "y": 1},
-                {"label":"k1C", "x": 11.5, "y": 1},
-                {"label":"k1D", "x": 12.5, "y": 1},
-                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label":"k1F", "x": 15.25, "y": 1},
-                {"label":"k1G", "x": 16.25, "y": 1},
-                {"label":"k1H", "x": 17.25, "y": 1},
-
-                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
-                {"label":"k22", "x": 1.75, "y": 2},
-                {"label":"k23", "x": 2.75, "y": 2},
-                {"label":"k24", "x": 3.75, "y": 2},
-                {"label":"k25", "x": 4.75, "y": 2},
-                {"label":"k26", "x": 5.75, "y": 2},
-                {"label":"k27", "x": 6.75, "y": 2},
-                {"label":"k28", "x": 7.75, "y": 2},
-                {"label":"k29", "x": 8.75, "y": 2},
-                {"label":"k2A", "x": 9.75, "y": 2},
-                {"label":"k2B", "x": 10.75, "y": 2},
-                {"label":"k2C", "x": 11.75, "y": 2},
-                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label":"k30", "x": 0, "y": 3, "w": 2.25},
-                {"label":"k32", "x": 2.25, "y": 3},
-                {"label":"k33", "x": 3.25, "y": 3},
-                {"label":"k34", "x": 4.25, "y": 3},
-                {"label":"k35", "x": 5.25, "y": 3},
-                {"label":"k36", "x": 6.25, "y": 3},
-                {"label":"k37", "x": 7.25, "y": 3},
-                {"label":"k38", "x": 8.25, "y": 3},
-                {"label":"k39", "x": 9.25, "y": 3},
-                {"label":"k3A", "x": 10.25, "y": 3},
-                {"label":"k3B", "x": 11.25, "y": 3},
-                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label":"k3G", "x": 16.25, "y": 3},
-
-                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
-                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
-                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
-                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
-                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
-
-                {"label":"k4F", "x": 15.25, "y": 4},
-                {"label":"k4G", "x": 16.25, "y": 4},
-                {"label":"k4H", "x": 17.25, "y": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 16], "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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
         "LAYOUT_tkl_nofrow_iso_split_bs": {
             "layout": [
-                {"label":"k00", "x": 0, "y": 0},
-                {"label":"k01", "x": 1, "y": 0},
-                {"label":"k02", "x": 2, "y": 0},
-                {"label":"k03", "x": 3, "y": 0},
-                {"label":"k04", "x": 4, "y": 0},
-                {"label":"k05", "x": 5, "y": 0},
-                {"label":"k06", "x": 6, "y": 0},
-                {"label":"k07", "x": 7, "y": 0},
-                {"label":"k08", "x": 8, "y": 0},
-                {"label":"k09", "x": 9, "y": 0},
-                {"label":"k0A", "x": 10, "y": 0},
-                {"label":"k0B", "x": 11, "y": 0},
-                {"label":"k0C", "x": 12, "y": 0},
-                {"label":"k0D", "x": 13, "y": 0},
-                {"label":"k0E", "x": 14, "y": 0},
-
-                {"label":"k0F", "x": 15.25, "y": 0},
-                {"label":"k0G", "x": 16.25, "y": 0},
-                {"label":"k0H", "x": 17.25, "y": 0},
-
-                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
-                {"label":"k12", "x": 1.5, "y": 1},
-                {"label":"k13", "x": 2.5, "y": 1},
-                {"label":"k14", "x": 3.5, "y": 1},
-                {"label":"k15", "x": 4.5, "y": 1},
-                {"label":"k16", "x": 5.5, "y": 1},
-                {"label":"k17", "x": 6.5, "y": 1},
-                {"label":"k18", "x": 7.5, "y": 1},
-                {"label":"k19", "x": 8.5, "y": 1},
-                {"label":"k1A", "x": 9.5, "y": 1},
-                {"label":"k1B", "x": 10.5, "y": 1},
-                {"label":"k1C", "x": 11.5, "y": 1},
-                {"label":"k1D", "x": 12.5, "y": 1},
-
-                {"label":"k1F", "x": 15.25, "y": 1},
-                {"label":"k1G", "x": 16.25, "y": 1},
-                {"label":"k1H", "x": 17.25, "y": 1},
-
-                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
-                {"label":"k22", "x": 1.75, "y": 2},
-                {"label":"k23", "x": 2.75, "y": 2},
-                {"label":"k24", "x": 3.75, "y": 2},
-                {"label":"k25", "x": 4.75, "y": 2},
-                {"label":"k26", "x": 5.75, "y": 2},
-                {"label":"k27", "x": 6.75, "y": 2},
-                {"label":"k28", "x": 7.75, "y": 2},
-                {"label":"k29", "x": 8.75, "y": 2},
-                {"label":"k2A", "x": 9.75, "y": 2},
-                {"label":"k2B", "x": 10.75, "y": 2},
-                {"label":"k2C", "x": 11.75, "y": 2},
-                {"label":"k1E", "x": 12.75, "y": 2},
-                {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
-                {"label":"k31", "x": 1.25, "y": 3},
-                {"label":"k32", "x": 2.25, "y": 3},
-                {"label":"k33", "x": 3.25, "y": 3},
-                {"label":"k34", "x": 4.25, "y": 3},
-                {"label":"k35", "x": 5.25, "y": 3},
-                {"label":"k36", "x": 6.25, "y": 3},
-                {"label":"k37", "x": 7.25, "y": 3},
-                {"label":"k38", "x": 8.25, "y": 3},
-                {"label":"k39", "x": 9.25, "y": 3},
-                {"label":"k3A", "x": 10.25, "y": 3},
-                {"label":"k3B", "x": 11.25, "y": 3},
-                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label":"k3G", "x": 16.25, "y": 3},
-
-                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
-                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
-                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
-                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
-                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
-
-                {"label":"k4F", "x": 15.25, "y": 4},
-                {"label":"k4G", "x": 16.25, "y": 4},
-                {"label":"k4H", "x": 17.25, "y": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 16], "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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mokey/xox70/xox70.c b/keyboards/mokey/xox70/xox70.c
deleted file mode 100644
index 7c46b6a54a..0000000000
--- a/keyboards/mokey/xox70/xox70.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "xox70.h"
\ No newline at end of file
diff --git a/keyboards/mokey/xox70/xox70.h b/keyboards/mokey/xox70/xox70.h
deleted file mode 100644
index 3c0f15d2f7..0000000000
--- a/keyboards/mokey/xox70/xox70.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright 2021 Ocean
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- *                                                                ┌───────�
- *                                                                │0E     │ 2u Backspace
- *                                                                └───────┘
- *            ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───┬───�
- *            │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0F │0G │0H │
- *            ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤    ┌─────�
- *            │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │ │1F │1G │1H │    │2D   │
- *            ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴�    │ ISO Enter
- *            │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │               │1E │    │
- * ┌────────� ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───�     ├───┴────┴─�
- * │30      │ │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │     │3G │     │3D        │
- * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───� └──────────┘
- *            │40  │41  │43  │46                      │4A  │4B  │4D  │4E  │ │4F │4G │4H │
- *            └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- *            ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *            │40   │41 │43   │46                         │4B   │4D │4E   │
- *            └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- *            ┌─────�   ┌─────┬───────────┬───┬───────────┬─────�   ┌─────�
- *            │40   │   │43   │44         │46 │48         │4B   │   │4E   │
- *            └─────┘   └─────┴───────────┴───┴───────────┴─────┘   └─────┘
- */
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,        k1F, k1G, k1H, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E,             k3G, \
-    k40, k41, k43,           k44, k46, k48,           k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, XXX, k3G, XXX }, \
-    { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
-}
-
-#define LAYOUT_tkl_nofrow_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E,   k0F, k0G, k0H, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F, k1G, k1H, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,        k3G, \
-    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,   k4F, k4G, k4H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
-}
-
-#define LAYOUT_tkl_nofrow_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E,   k0F, k0G, k0H, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,        k1F, k1G, k1H, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,        k3G, \
-    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,   k4F, k4G, k4H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
-}
-
-#define LAYOUT_tkl_nofrow_ansi_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,        k1F, k1G, k1H, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,             k3G, \
-    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
-}
-
-#define LAYOUT_tkl_nofrow_iso_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
-    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,             k1F, k1G, k1H, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,             k3G, \
-    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
-    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
-}
diff --git a/keyboards/mokey/xox70hot/config.h b/keyboards/mokey/xox70hot/config.h
deleted file mode 100644
index 12780d9be9..0000000000
--- a/keyboards/mokey/xox70hot/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2021 Kyle McCreery
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-
-#define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
-#define MATRIX_COL_PINS { F6, C7, F4, F5, F1, B6, D0, D2, D3, D1, D7, D4, D5, D6, B4, B5, C6, B7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mokey/xox70hot/info.json b/keyboards/mokey/xox70hot/info.json
index 132ade0c9d..590684d79f 100644
--- a/keyboards/mokey/xox70hot/info.json
+++ b/keyboards/mokey/xox70hot/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3371",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "C7", "F4", "F5", "F1", "B6", "D0", "D2", "D3", "D1", "D7", "D4", "D5", "D6", "B4", "B5", "C6", "B7"],
+        "rows": ["F7", "B7", "F5", "F1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -16,80 +21,84 @@
     "layouts": {
         "LAYOUT_tkl_nofrow_ansi_tsangan": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0e", "x":13, "y":0, "w":2},
-                {"label":"k0f", "x":15.25, "y":0},
-                {"label":"k0g", "x":16.25, "y":0},
-                {"label":"k0h", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k12", "x":1.5, "y":1},
-                {"label":"k13", "x":2.5, "y":1},
-                {"label":"k14", "x":3.5, "y":1},
-                {"label":"k15", "x":4.5, "y":1},
-                {"label":"k16", "x":5.5, "y":1},
-                {"label":"k17", "x":6.5, "y":1},
-                {"label":"k18", "x":7.5, "y":1},
-                {"label":"k19", "x":8.5, "y":1},
-                {"label":"k1a", "x":9.5, "y":1},
-                {"label":"k1b", "x":10.5, "y":1},
-                {"label":"k1c", "x":11.5, "y":1},
-                {"label":"k1d", "x":12.5, "y":1},
-                {"label":"k1e", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1f", "x":15.25, "y":1},
-                {"label":"k1g", "x":16.25, "y":1},
-                {"label":"k1h", "x":17.25, "y":1},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k22", "x":1.75, "y":2},
-                {"label":"k23", "x":2.75, "y":2},
-                {"label":"k24", "x":3.75, "y":2},
-                {"label":"k25", "x":4.75, "y":2},
-                {"label":"k26", "x":5.75, "y":2},
-                {"label":"k27", "x":6.75, "y":2},
-                {"label":"k28", "x":7.75, "y":2},
-                {"label":"k29", "x":8.75, "y":2},
-                {"label":"k2a", "x":9.75, "y":2},
-                {"label":"k2b", "x":10.75, "y":2},
-                {"label":"k2c", "x":11.75, "y":2},
-                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
 
-                {"label":"k30", "x":0, "y":3, "w":2.25},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3d", "x":12.25, "y":3, "w":2.75},
-                {"label":"k3g", "x":16.25, "y":3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5},
 
-                {"label":"k40", "x":0, "y":4, "w":1.5},
-                {"label":"k41", "x":1.5, "y":4},
-                {"label":"k43", "x":2.5, "y":4, "w":1.5},
-                {"label":"k46", "x":4, "y":4, "w":7},
-                {"label":"k4a", "x":11, "y":4, "w":1.5},
-                {"label":"k4b", "x":12.5, "y":4},
-                {"label":"k4e", "x":13.5, "y":4, "w":1.5},
-                {"label":"k4f", "x":15.25, "y":4},
-                {"label":"k4g", "x":16.25, "y":4},
-                {"label":"k4h", "x":17.25, "y":4}
+                {"matrix": [4, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mokey/xox70hot/xox70hot.c b/keyboards/mokey/xox70hot/xox70hot.c
deleted file mode 100644
index 728b5e4e39..0000000000
--- a/keyboards/mokey/xox70hot/xox70hot.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "xox70hot.h"
\ No newline at end of file
diff --git a/keyboards/mokey/xox70hot/xox70hot.h b/keyboards/mokey/xox70hot/xox70hot.h
deleted file mode 100644
index 5e6f9665c8..0000000000
--- a/keyboards/mokey/xox70hot/xox70hot.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Ocean
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#pragma once
-
-#include "quantum.h"
-
-#define xxx KC_NO
-
-#define LAYOUT_tkl_nofrow_ansi_tsangan(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, k0h, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,           k3g, \
-    k40, k41,      k43,           k46,                k4a, k4b,           k4e, k4f, k4g, k4h \
-) \
-{ \
-    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,  KC_NO, k0e,     k0f,   k0g,   k0h }, \
-    { k10,  KC_NO, k12,   k13,  k14,  k15,   k16,  k17,   k18,  k19,   k1a,  k1b,  k1c,   k1d,  k1e,     k1f,   k1g,   k1h }, \
-    { k20,  KC_NO, k22,   k23,  k24,  k25,   k26,  k27,   k28,  k29,   k2a,  k2b,  k2c,   k2d,  KC_NO,  KC_NO, KC_NO,KC_NO }, \
-    { k30,  KC_NO, k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  KC_NO, k3d,  KC_NO,  KC_NO,  k3g, KC_NO }, \
-    { k40,  k41,   KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a,  k4b,  KC_NO, KC_NO,k4e,     k4f,   k4g,   k4h }  \
-}
-
diff --git a/keyboards/molecule/adns.c b/keyboards/molecule/adns.c
index be40cf7ea7..96fc83ee0b 100644
--- a/keyboards/molecule/adns.c
+++ b/keyboards/molecule/adns.c
@@ -237,11 +237,11 @@ motion_delta_t readSensor(void) {
     return delta;
 }
 
-void pointing_device_task(void) {
+bool pointing_device_task(void) {
     motion_delta_t delta = readSensor();
 
     report_mouse_t report = pointing_device_get_report();
-   
+
     if(delta.motion_ind) {
         // clamp deltas from -127 to 127
         report.x = delta.delta_x < -127 ? -127 : delta.delta_x > 127 ? 127 : delta.delta_x;
@@ -250,5 +250,5 @@ void pointing_device_task(void) {
     }
 
     pointing_device_set_report(report);
-    pointing_device_send();
+    return pointing_device_send();
 }
diff --git a/keyboards/molecule/config.h b/keyboards/molecule/config.h
index 9812cd5b83..1755979bbc 100755
--- a/keyboards/molecule/config.h
+++ b/keyboards/molecule/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6, B6 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* OLED */
 #define OLED_TIMEOUT 0
 
diff --git a/keyboards/molecule/info.json b/keyboards/molecule/info.json
index dd4a2773ca..aff7852107 100755
--- a/keyboards/molecule/info.json
+++ b/keyboards/molecule/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/molecule/molecule.c b/keyboards/molecule/molecule.c
deleted file mode 100755
index c5f035289e..0000000000
--- a/keyboards/molecule/molecule.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 bbrfkr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "molecule.h"
diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h
index 5425085bb6..014b1f93a5 100644
--- a/keyboards/momoka_ergo/config.h
+++ b/keyboards/momoka_ergo/config.h
@@ -17,15 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define SELECT_SOFT_SERIAL_SPEED 5
 
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 22
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_CHRISTMAS
diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json
index 3c1eefd090..fbba58a840 100644
--- a/keyboards/momoka_ergo/info.json
+++ b/keyboards/momoka_ergo/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D1"
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
diff --git a/keyboards/momoka_ergo/momoka_ergo.c b/keyboards/momoka_ergo/momoka_ergo.c
deleted file mode 100644
index 8069d7f512..0000000000
--- a/keyboards/momoka_ergo/momoka_ergo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 StefanGrindelwald
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "momoka_ergo.h"
diff --git a/keyboards/momokai/tap_duo/config.h b/keyboards/momokai/tap_duo/config.h
index ca447bf9c6..f3ad54d153 100644
--- a/keyboards/momokai/tap_duo/config.h
+++ b/keyboards/momokai/tap_duo/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E0 }
-#define MATRIX_COL_PINS { E6, B2, D1, D2, D3 }
-
-#define DIODE_DIRECTION COL2ROW
-
-
 // Tweak how the mouse cursor moves. https://docs.qmk.fm/#/feature_mouse_keys
 // Accelerated mode (default).
 #define MOUSEKEY_DELAY  10
@@ -37,7 +30,6 @@
 
 
 //TODO: implement RGB Matrix
-#define RGB_DI_PIN F0
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_LED_COUNT 4
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json
index b23740befa..843573c6ca 100644
--- a/keyboards/momokai/tap_duo/info.json
+++ b/keyboards/momokai/tap_duo/info.json
@@ -8,16 +8,28 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B2", "D1", "D2", "D3"],
+        "rows": ["E0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "K00 (E0,E6)", "x": 0.25, "y": 0 },
-                { "label": "K01 (E0,B2)", "x": 1.25, "y": 0 },
-                { "label": "K02 (E0,D1)", "x": 0.75, "y": 1.25, "w": 0.5, "h": 0.5 },
-                { "label": "K03 (E0,D2)", "x": 1.25, "y": 1.25, "w": 0.5, "h": 0.5 },
-                { "label": "K04 (E0,D3)", "x": 1.75, "y": 1.25, "w": 0.5, "h": 0.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 0.5, "y": 1.25, "w": 0.5, "h": 0.5},
+                {"matrix": [0, 3], "x": 1, "y": 1.25, "w": 0.5, "h": 0.5},
+                {"matrix": [0, 4], "x": 1.5, "y": 1.25, "w": 0.5, "h": 0.5}
             ]
         }
     }
diff --git a/keyboards/momokai/tap_duo/rules.mk b/keyboards/momokai/tap_duo/rules.mk
index 0459a2ad6b..bb8155a9b8 100644
--- a/keyboards/momokai/tap_duo/rules.mk
+++ b/keyboards/momokai/tap_duo/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/momokai/tap_duo/tap_duo.c b/keyboards/momokai/tap_duo/tap_duo.c
index bd53810838..4e0bc9f42c 100644
--- a/keyboards/momokai/tap_duo/tap_duo.c
+++ b/keyboards/momokai/tap_duo/tap_duo.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tap_duo.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/momokai/tap_duo/tap_duo.h b/keyboards/momokai/tap_duo/tap_duo.h
deleted file mode 100644
index 74b87dab62..0000000000
--- a/keyboards/momokai/tap_duo/tap_duo.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 Momokai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, \
-	K02, K03, K04  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04}  \
-}
-
diff --git a/keyboards/momokai/tap_trio/config.h b/keyboards/momokai/tap_trio/config.h
index 7a38599d11..b60152e21c 100644
--- a/keyboards/momokai/tap_trio/config.h
+++ b/keyboards/momokai/tap_trio/config.h
@@ -16,15 +16,7 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E0 }
-#define MATRIX_COL_PINS { E6, B2, B7, D1, D2, D3 }
-
-#define DIODE_DIRECTION COL2ROW
-
-
 //TODO: implement RGB Matrix
-#define RGB_DI_PIN F0
 // #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
 
 
diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json
index 63e6257ee8..dbe5cb6bc7 100644
--- a/keyboards/momokai/tap_trio/info.json
+++ b/keyboards/momokai/tap_trio/info.json
@@ -8,17 +8,29 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B2", "B7", "D1", "D2", "D3"],
+        "rows": ["E0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "K00 (E0,E6)", "x": 0, "y": 0, "w": 1.5, "h": 1.5 },
-                { "label": "K01 (E0,B2)", "x": 2.25, "y": 0, "w": 1.5, "h": 1.5 },
-                { "label": "K02 (E0,B7)", "x": 4.5, "y": 0, "w": 1.5, "h": 1.5 },
-                { "label": "K03 (E0,D1)", "x": 2.25, "y": 2.5 },
-                { "label": "K04 (E0,D2)", "x": 3.75, "y": 2.5 },
-                { "label": "K05 (E0,D3)", "x": 5.25, "y": 2.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5, "h": 1.5},
+                {"matrix": [0, 1], "x": 2.25, "y": 0, "w": 1.5, "h": 1.5},
+                {"matrix": [0, 2], "x": 4.5, "y": 0, "w": 1.5, "h": 1.5},
+
+                {"matrix": [0, 3], "x": 2.25, "y": 2.5},
+                {"matrix": [0, 4], "x": 3.75, "y": 2.5},
+                {"matrix": [0, 5], "x": 5.25, "y": 2.5}
             ]
         }
     }
diff --git a/keyboards/momokai/tap_trio/rules.mk b/keyboards/momokai/tap_trio/rules.mk
index 0459a2ad6b..bb8155a9b8 100644
--- a/keyboards/momokai/tap_trio/rules.mk
+++ b/keyboards/momokai/tap_trio/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/momokai/tap_trio/tap_trio.c b/keyboards/momokai/tap_trio/tap_trio.c
index 69b850e04c..73957745a9 100644
--- a/keyboards/momokai/tap_trio/tap_trio.c
+++ b/keyboards/momokai/tap_trio/tap_trio.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tap_trio.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/momokai/tap_trio/tap_trio.h b/keyboards/momokai/tap_trio/tap_trio.h
deleted file mode 100644
index b2b17b3436..0000000000
--- a/keyboards/momokai/tap_trio/tap_trio.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 Momokai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, \
-	K03, K04, K05  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05 }  \
-}
-
diff --git a/keyboards/monarch/config.h b/keyboards/monarch/config.h
index 2d319c4fdf..30181978df 100644
--- a/keyboards/monarch/config.h
+++ b/keyboards/monarch/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B10, B2, B1, B0, A5, A7, A4, A3, B6 }
-#define MATRIX_ROW_PINS { A15, B3, B11, A2, A1, B9 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/monarch/info.json b/keyboards/monarch/info.json
index 95fafb5eb4..db1274d2ef 100644
--- a/keyboards/monarch/info.json
+++ b/keyboards/monarch/info.json
@@ -8,6 +8,11 @@
         "pid": "0x43C1",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B10", "B2", "B1", "B0", "A5", "A7", "A4", "A3", "B6"],
+        "rows": ["A15", "B3", "B11", "A2", "A1", "B9"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 24,
@@ -22,13 +27,245 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi": {
-            "layout": [{"x":0.25, "y":0.25}, {"x":1.25, "y":0.25}, {"x":2.25, "y":0.25}, {"x":3.25, "y":0.25}, {"x":4.25, "y":0.25}, {"x":5.25, "y":0.25}, {"x":6.25, "y":0.25}, {"x":7.25, "y":0.25}, {"x":8.25, "y":0.25}, {"x":9.25, "y":0.25}, {"x":10.25, "y":0.25}, {"x":11.25, "y":0.25}, {"x":12.25, "y":0.25}, {"x":13.25, "y":0.25}, {"x":14.25, "y":0.25}, {"x":15.75, "y":0.25}, {"x":0.25, "y":1.25, "w":1.5}, {"x":1.75, "y":1.25}, {"x":2.75, "y":1.25}, {"x":3.75, "y":1.25}, {"x":4.75, "y":1.25}, {"x":5.75, "y":1.25}, {"x":6.75, "y":1.25}, {"x":7.75, "y":1.25}, {"x":8.75, "y":1.25}, {"x":9.75, "y":1.25}, {"x":10.75, "y":1.25}, {"x":11.75, "y":1.25}, {"x":12.75, "y":1.25}, {"x":13.75, "y":1.25, "w":1.5}, {"x":15.75, "y":1.75}, {"x":0.25, "y":2.25, "w":1.75}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4, "y":2.25}, {"x":5, "y":2.25}, {"x":6, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.25}, {"x":9, "y":2.25}, {"x":10, "y":2.25}, {"x":11, "y":2.25}, {"x":12, "y":2.25}, {"x":13, "y":2.25, "w":2.25}, {"x":15.75, "y":2.75}, {"x":0.25, "y":3.25, "w":2.25}, {"x":2.5, "y":3.25}, {"x":3.5, "y":3.25}, {"x":4.5, "y":3.25}, {"x":5.5, "y":3.25}, {"x":6.5, "y":3.25}, {"x":7.5, "y":3.25}, {"x":8.5, "y":3.25}, {"x":9.5, "y":3.25}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.25}, {"x":12.5, "y":3.25, "w":1.75}, {"x":14.5, "y":3.5}, {"x":0.25, "y":4.25, "w":1.5}, {"x":1.75, "y":4.25}, {"x":2.75, "y":4.25, "w":1.5}, {"x":4.25, "y":4.25, "w":7}, {"x":11.25, "y":4.25, "w":1.5}, {"x":13.5, "y":4.5}, {"x":14.5, "y":4.5}, {"x":15.5, "y":4.5}]
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":15.5, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":15.5, "y":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":15.5, "y":2.5},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+
+                {"x":14.25, "y":3.25},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+
+                {"x":13.25, "y":4.25},
+                {"x":14.25, "y":4.25},
+                {"x":15.25, "y":4.25}
+            ]
         },
         "LAYOUT_iso": {
-            "layout": [{"x":0.25, "y":0.25}, {"x":1.25, "y":0.25}, {"x":2.25, "y":0.25}, {"x":3.25, "y":0.25}, {"x":4.25, "y":0.25}, {"x":5.25, "y":0.25}, {"x":6.25, "y":0.25}, {"x":7.25, "y":0.25}, {"x":8.25, "y":0.25}, {"x":9.25, "y":0.25}, {"x":10.25, "y":0.25}, {"x":11.25, "y":0.25}, {"x":12.25, "y":0.25}, {"x":13.25, "y":0.25}, {"x":14.25, "y":0.25}, {"x":15.75, "y":0.25}, {"x":0.25, "y":1.25, "w":1.5}, {"x":1.75, "y":1.25}, {"x":2.75, "y":1.25}, {"x":3.75, "y":1.25}, {"x":4.75, "y":1.25}, {"x":5.75, "y":1.25}, {"x":6.75, "y":1.25}, {"x":7.75, "y":1.25}, {"x":8.75, "y":1.25}, {"x":9.75, "y":1.25}, {"x":10.75, "y":1.25}, {"x":11.75, "y":1.25}, {"x":12.75, "y":1.25}, {"x":14, "y":1.25, "w":1.25, "h":2}, {"x":15.75, "y":1.75}, {"x":0.25, "y":2.25, "w":1.75}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4, "y":2.25}, {"x":5, "y":2.25}, {"x":6, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.25}, {"x":9, "y":2.25}, {"x":10, "y":2.25}, {"x":11, "y":2.25}, {"x":12, "y":2.25}, {"x":13, "y":2.25}, {"x":15.75, "y":2.75}, {"x":0.25, "y":3.25, "w":1.25}, {"x":1.5, "y":3.25}, {"x":2.5, "y":3.25}, {"x":3.5, "y":3.25}, {"x":4.5, "y":3.25}, {"x":5.5, "y":3.25}, {"x":6.5, "y":3.25}, {"x":7.5, "y":3.25}, {"x":8.5, "y":3.25}, {"x":9.5, "y":3.25}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.25}, {"x":12.5, "y":3.25, "w":1.75}, {"x":14.5, "y":3.5}, {"x":0.25, "y":4.25, "w":1.5}, {"x":1.75, "y":4.25}, {"x":2.75, "y":4.25, "w":1.5}, {"x":4.25, "y":4.25, "w":7}, {"x":11.25, "y":4.25, "w":1.5}, {"x":13.5, "y":4.5}, {"x":14.5, "y":4.5}, {"x":15.5, "y":4.5}]
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":15.5, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":15.5, "y":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+
+                {"x":15.5, "y":2.5},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+
+                {"x":14.25, "y":3.25},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+
+                {"x":13.25, "y":4.25},
+                {"x":14.25, "y":4.25},
+                {"x":15.25, "y":4.25}
+            ]
         },
         "LAYOUT_all": {
-            "layout": [{"x":0.25, "y":0.25}, {"x":1.25, "y":0.25}, {"x":2.25, "y":0.25}, {"x":3.25, "y":0.25}, {"x":4.25, "y":0.25}, {"x":5.25, "y":0.25}, {"x":6.25, "y":0.25}, {"x":7.25, "y":0.25}, {"x":8.25, "y":0.25}, {"x":9.25, "y":0.25}, {"x":10.25, "y":0.25}, {"x":11.25, "y":0.25}, {"x":12.25, "y":0.25}, {"x":13.25, "y":0.25}, {"x":14.25, "y":0.25}, {"x":15.75, "y":0.25}, {"x":0.25, "y":1.25, "w":1.5}, {"x":1.75, "y":1.25}, {"x":2.75, "y":1.25}, {"x":3.75, "y":1.25}, {"x":4.75, "y":1.25}, {"x":5.75, "y":1.25}, {"x":6.75, "y":1.25}, {"x":7.75, "y":1.25}, {"x":8.75, "y":1.25}, {"x":9.75, "y":1.25}, {"x":10.75, "y":1.25}, {"x":11.75, "y":1.25}, {"x":12.75, "y":1.25}, {"x":13.75, "y":1.25, "w":1.5}, {"x":15.75, "y":1.75}, {"x":0.25, "y":2.25, "w":1.75}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":4, "y":2.25}, {"x":5, "y":2.25}, {"x":6, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.25}, {"x":9, "y":2.25}, {"x":10, "y":2.25}, {"x":11, "y":2.25}, {"x":12, "y":2.25}, {"x":13, "y":2.25, "w":2.25}, {"x":15.75, "y":2.75}, {"x":0.25, "y":3.25, "w":1.25}, {"x":1.5, "y":3.25}, {"x":2.5, "y":3.25}, {"x":3.5, "y":3.25}, {"x":4.5, "y":3.25}, {"x":5.5, "y":3.25}, {"x":6.5, "y":3.25}, {"x":7.5, "y":3.25}, {"x":8.5, "y":3.25}, {"x":9.5, "y":3.25}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.25}, {"x":12.5, "y":3.25, "w":1.75}, {"x":14.5, "y":3.5}, {"x":0.25, "y":4.25, "w":1.5}, {"x":1.75, "y":4.25}, {"x":2.75, "y":4.25, "w":1.5}, {"x":4.25, "y":4.25, "w":7}, {"x":11.25, "y":4.25, "w":1.5}, {"x":13.5, "y":4.5}, {"x":14.5, "y":4.5}, {"x":15.5, "y":4.5}, {"x":0.25, "y":5.25}, {"x":1.25, "y":5.25}]
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":15.5, "y":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":15.5, "y":2.5},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+
+                {"x":14.25, "y":3.25},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+
+                {"x":13.25, "y":4.25},
+                {"x":14.25, "y":4.25},
+                {"x":15.25, "y":4.25},
+
+                {"x":0, "y":5},
+                {"x":1, "y":5}
+            ]
         }
     }
 }
diff --git a/keyboards/monarch/keymaps/via/keymap.c b/keyboards/monarch/keymaps/via/keymap.c
index b1b86aa015..c70f9c213b 100644
--- a/keyboards/monarch/keymaps/via/keymap.c
+++ b/keyboards/monarch/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          BL_ON,
-      _______, _______, _______,                                      BL_TOGG,                   _______,                  BL_DOWN, BL_OFF,  BL_UP, 
+      _______, _______, _______,                                      BL_TOGG,                   _______,                  BL_DOWN, BL_OFF,  BL_UP,
       _______, _______
   ),
   [2] = LAYOUT_all(
@@ -54,24 +54,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 keyevent_t encoder_ccw = {
     .key = (keypos_t){.row = 5, .col = 0},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder_cw = {
     .key = (keypos_t){.row = 5, .col = 1},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 void matrix_scan_user(void) {
-    if (IS_PRESSED(encoder_ccw)) {
+    if (encoder_ccw.pressed) {
         encoder_ccw.pressed = false;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
     }
 
-    if (IS_PRESSED(encoder_cw)) {
+    if (encoder_cw.pressed) {
         encoder_cw.pressed = false;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
     }
 }
@@ -79,11 +81,11 @@ void matrix_scan_user(void) {
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (clockwise) {
         encoder_cw.pressed = true;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
     } else {
         encoder_ccw.pressed = true;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
     }
     return true;
diff --git a/keyboards/monarch/monarch.c b/keyboards/monarch/monarch.c
deleted file mode 100644
index a054e2caef..0000000000
--- a/keyboards/monarch/monarch.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-Copyright 2021 King Keyboards www.kingkbs.com
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "monarch.h"
diff --git a/keyboards/monoflex60/config.h b/keyboards/monoflex60/config.h
deleted file mode 100644
index 6de9ac8ee6..0000000000
--- a/keyboards/monoflex60/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2022 Ivan Gromov (@key10iq)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, D0, D3, D2, D5 }
-#define MATRIX_COL_PINS { B7, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/monoflex60/info.json b/keyboards/monoflex60/info.json
index 771c5aac66..b849109756 100644
--- a/keyboards/monoflex60/info.json
+++ b/keyboards/monoflex60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x60EB",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D1", "D0", "D3", "D2", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": [
diff --git a/keyboards/monoflex60/monoflex60.c b/keyboards/monoflex60/monoflex60.c
deleted file mode 100644
index 075a79125e..0000000000
--- a/keyboards/monoflex60/monoflex60.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2022 Ivan Gromov (@key10iq)
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "monoflex60.h"
diff --git a/keyboards/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h
index d03610af38..80d0b4fda3 100644
--- a/keyboards/monstargear/xo87/rgb/config.h
+++ b/keyboards/monstargear/xo87/rgb/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { E6,E7, E3, B0, B1 ,A2}
-#define MATRIX_COL_PINS { C5,C3,C1,E1,D6,D2,B7,B3,F6,F7,F3,A5,A1,E2,C7,A6 }
-#define DIODE_DIRECTION ROW2COL
-#define RGB_DI_PIN D7
 #define RGB_MATRIX_LED_COUNT 110
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
diff --git a/keyboards/monstargear/xo87/rgb/info.json b/keyboards/monstargear/xo87/rgb/info.json
index 8176bac03f..1ae406ac32 100644
--- a/keyboards/monstargear/xo87/rgb/info.json
+++ b/keyboards/monstargear/xo87/rgb/info.json
@@ -8,12 +8,124 @@
     "pid": "0x584F",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D7"
+  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
+  "matrix_pins": {
+    "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"],
+    "rows": ["E6", "E7", "E3", "B0", "B1", "A2"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "at90usb646",
   "bootloader": "lufa-dfu",
   "community_layouts": ["tkl_ansi"],
   "layouts": {
     "LAYOUT_tkl_ansi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
-      }
-   }
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 13], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [4, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 13], "x": 15.25, "y": 2.5},
+        {"matrix": [2, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [2, 15], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [4, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+      ]
+    }
+  }
 }
diff --git a/keyboards/monstargear/xo87/rgb/rgb.h b/keyboards/monstargear/xo87/rgb/rgb.h
deleted file mode 100644
index adab61e593..0000000000
--- a/keyboards/monstargear/xo87/rgb/rgb.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 datafx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_tkl_ansi( \
-    K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,    K013, K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K313,    K113, K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K413,    K213, K214, K215, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K312,                      \
-    K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K412,          K414,       \
-    K500, K501, K502,                   K506,                   K510, K511, K512, K415,    K513, K514, K515  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, KC_NO }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414,  K415 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  K513,  K514,  K515 }  \
-}
diff --git a/keyboards/monstargear/xo87/rgb/rules.mk b/keyboards/monstargear/xo87/rgb/rules.mk
index cc8c380fc0..332aa40f38 100644
--- a/keyboards/monstargear/xo87/rgb/rules.mk
+++ b/keyboards/monstargear/xo87/rgb/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 RAW_ENABLE = no
diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h
index 65c76647ab..f8e73dccb8 100644
--- a/keyboards/monstargear/xo87/solderable/config.h
+++ b/keyboards/monstargear/xo87/solderable/config.h
@@ -19,16 +19,11 @@
 
 #define brightnessMax 8
 
-#define MATRIX_ROW_PINS { E6,E7,E3,B0,B1,A2}
-#define MATRIX_COL_PINS { C5,C3,C1,E1,D6,D2,B7,B3,F6,F7,F3,A5,A1,E2,C7,A6 }
-
 #define KEYLED_ROWS 6
 #define KEYLED_COLS 16
 #define KEYLED_ROW_PINS { E5,B4,B5,F0,C6,D5 }
 #define KEYLED_COL_PINS { C4,C2,C0,E0,D4,E4,B6,B2,F4,A0,F2,A4,F1,A7,D3,A3 }
 
-#define DIODE_DIRECTION ROW2COL
-#define RGB_DI_PIN D7
 #define RGB_MATRIX_LED_COUNT 21
 #define DRIVER_COUNT 2
 #define RGBLED_NUM 21
diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/info.json
index f3a8ca1657..9decf28f70 100644
--- a/keyboards/monstargear/xo87/solderable/info.json
+++ b/keyboards/monstargear/xo87/solderable/info.json
@@ -8,10 +8,18 @@
         "pid": "0x5344",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"],
+        "rows": ["E6", "E7", "E3", "B0", "B1", "A2"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "driver": "custom",
         "pin": "F0"
     },
+    "ws2812": {
+        "pin": "D7"
+    },
     "processor": "at90usb646",
     "bootloader": "lufa-dfu",
     "layouts": {
diff --git a/keyboards/montsinger/rebound/rebound.c b/keyboards/montsinger/rebound/rebound.c
deleted file mode 100644
index fbb10be713..0000000000
--- a/keyboards/montsinger/rebound/rebound.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rebound.h"
diff --git a/keyboards/montsinger/rebound/rebound.h b/keyboards/montsinger/rebound/rebound.h
deleted file mode 100644
index 6bddfb2c3a..0000000000
--- a/keyboards/montsinger/rebound/rebound.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 Ross Montsinger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_montsinger_rebound_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_montsinger_rebound_rev2)
-    #include "rev2.h"
-#elif defined(KEYBOARD_montsinger_rebound_rev3)
-    #include "rev3.h"
-#elif defined(KEYBOARD_montsinger_rebound_rev4)
-    #include "rev4.h"
-#endif
diff --git a/keyboards/montsinger/rebound/rev1/config.h b/keyboards/montsinger/rebound/rev1/config.h
index 6063a52f09..274c715a93 100644
--- a/keyboards/montsinger/rebound/rev1/config.h
+++ b/keyboards/montsinger/rebound/rev1/config.h
@@ -14,25 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on 
-diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { D1, B5, B2, B6 }
-#define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/montsinger/rebound/rev1/info.json b/keyboards/montsinger/rebound/rev1/info.json
index d7d6cf0d07..be323b6f65 100644
--- a/keyboards/montsinger/rebound/rev1/info.json
+++ b/keyboards/montsinger/rebound/rev1/info.json
@@ -8,60 +8,68 @@
         "pid": "0x552F",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D1", "B5", "B2", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x12"],
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/montsinger/rebound/rev1/rev1.h b/keyboards/montsinger/rebound/rev1/rev1.h
deleted file mode 100644
index a4e180e2ec..0000000000
--- a/keyboards/montsinger/rebound/rev1/rev1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 Ross Montsinger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once 
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- * The first section contains all of the arguments representing the 
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,\
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B\
-    ) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \
-}
diff --git a/keyboards/montsinger/rebound/rev2/config.h b/keyboards/montsinger/rebound/rev2/config.h
index cbf4c9b8df..274c715a93 100644
--- a/keyboards/montsinger/rebound/rev2/config.h
+++ b/keyboards/montsinger/rebound/rev2/config.h
@@ -14,25 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on 
-diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { D1, B5, B2, B6, B0 }
-#define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/montsinger/rebound/rev2/info.json b/keyboards/montsinger/rebound/rev2/info.json
index 8c2aec4e4d..4a98f62a2f 100644
--- a/keyboards/montsinger/rebound/rev2/info.json
+++ b/keyboards/montsinger/rebound/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x552F",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D1", "B5", "B2", "B6", "B0"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D3"}
@@ -19,121 +24,120 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
 
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
 
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
 
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 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": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
             ]
         },
         "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},
 
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
 
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
 
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 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},
 
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/montsinger/rebound/rev2/rev2.h b/keyboards/montsinger/rebound/rev2/rev2.h
deleted file mode 100644
index 16e0da23c9..0000000000
--- a/keyboards/montsinger/rebound/rev2/rev2.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2020 Ross Montsinger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- * The first section contains all of the arguments representing the
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,\
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B\
-    ) { \
-  { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-  { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B   }, \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05,      K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A, K2B,\
-    K30, K31, K32, K33, K34, K35, K40, K36, K37, K38, K39, K3A, K3B\
-    ) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }, \
-  { K40, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/montsinger/rebound/rev3/config.h b/keyboards/montsinger/rebound/rev3/config.h
index 00506c85bc..274c715a93 100644
--- a/keyboards/montsinger/rebound/rev3/config.h
+++ b/keyboards/montsinger/rebound/rev3/config.h
@@ -14,25 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on
-diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { F4, F5, D1, D0, B0 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/montsinger/rebound/rev3/info.json b/keyboards/montsinger/rebound/rev3/info.json
index 2f9338afc3..8f4dee862e 100644
--- a/keyboards/montsinger/rebound/rev3/info.json
+++ b/keyboards/montsinger/rebound/rev3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x552F",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
+        "rows": ["F4", "F5", "D1", "D0", "B0"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D2"}
@@ -19,121 +24,120 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
 
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "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, 2], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 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, 4], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
             ]
         },
         "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},
 
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
 
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
 
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 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},
 
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/montsinger/rebound/rev3/rev3.h b/keyboards/montsinger/rebound/rev3/rev3.h
deleted file mode 100644
index b709a4cea0..0000000000
--- a/keyboards/montsinger/rebound/rev3/rev3.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2020 Ross Montsinger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- * The first section contains all of the arguments representing the
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,\
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B\
-    ) { \
-  { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-  { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B   }, \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05,      K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K42, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K43, K26, K27, K28, K29, K2A, K2B,\
-    K30, K31, K32, K33, K34, K35, K44, K36, K37, K38, K39, K3A, K3B\
-    ) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }, \
-  { KC_NO, KC_NO, K42, K43, K44, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/montsinger/rebound/rev4/config.h b/keyboards/montsinger/rebound/rev4/config.h
index 58cf478e13..b0b9bb6c17 100644
--- a/keyboards/montsinger/rebound/rev4/config.h
+++ b/keyboards/montsinger/rebound/rev4/config.h
@@ -14,30 +14,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on
-diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5, B2, B3, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 17
diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json
index dd76ea25e9..fbee96edc7 100644
--- a/keyboards/montsinger/rebound/rev4/info.json
+++ b/keyboards/montsinger/rebound/rev4/info.json
@@ -8,132 +8,139 @@
         "pid": "0x0001",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5", "B2", "B3", "B1"],
+        "rows": ["D1", "D0", "D4", "C6", "F7", "F6", "F5", "F4"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D3"}
         ]
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x12"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [7, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [7, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 2], "x": 5, "y": 0},
 
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [7, 4], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [7, 5], "x": 10, "y": 0},
+                {"matrix": [0, 6], "x": 11, "y": 0},
+                {"matrix": [7, 6], "x": 12, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [6, 0], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [6, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [6, 2], "x": 5, "y": 1},
+                {"matrix": [1, 3], "x": 6, "y": 1},
+                {"matrix": [1, 4], "x": 7, "y": 1},
+                {"matrix": [6, 4], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [6, 5], "x": 10, "y": 1},
+                {"matrix": [1, 6], "x": 11, "y": 1},
+                {"matrix": [6, 6], "x": 12, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [5, 4], "x": 8, "y": 2},
+                {"matrix": [2, 5], "x": 9, "y": 2},
+                {"matrix": [5, 5], "x": 10, "y": 2},
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [5, 6], "x": 12, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [4, 0], "x": 1, "y": 3},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [4, 1], "x": 3, "y": 3},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [4, 2], "x": 5, "y": 3},
+                {"matrix": [3, 3], "x": 6, "y": 3},
+                {"matrix": [3, 4], "x": 7, "y": 3},
+                {"matrix": [4, 4], "x": 8, "y": 3},
+                {"matrix": [3, 5], "x": 9, "y": 3},
+                {"matrix": [4, 5], "x": 10, "y": 3},
+                {"matrix": [3, 6], "x": 11, "y": 3},
+                {"matrix": [4, 6], "x": 12, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12": {
             "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [7, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [7, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 2], "x": 5, "y": 0},
 
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [7, 4], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [7, 5], "x": 10, "y": 0},
+                {"matrix": [0, 6], "x": 11, "y": 0},
+                {"matrix": [7, 6], "x": 12, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [6, 0], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [6, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [6, 2], "x": 5, "y": 1},
 
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
+                {"matrix": [1, 4], "x": 7, "y": 1},
+                {"matrix": [6, 4], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [6, 5], "x": 10, "y": 1},
+                {"matrix": [1, 6], "x": 11, "y": 1},
+                {"matrix": [6, 6], "x": 12, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
 
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [5, 4], "x": 8, "y": 2},
+                {"matrix": [2, 5], "x": 9, "y": 2},
+                {"matrix": [5, 5], "x": 10, "y": 2},
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [5, 6], "x": 12, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [4, 0], "x": 1, "y": 3},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [4, 1], "x": 3, "y": 3},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [4, 2], "x": 5, "y": 3},
 
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"matrix": [3, 4], "x": 7, "y": 3},
+                {"matrix": [4, 4], "x": 8, "y": 3},
+                {"matrix": [3, 5], "x": 9, "y": 3},
+                {"matrix": [4, 5], "x": 10, "y": 3},
+                {"matrix": [3, 6], "x": 11, "y": 3},
+                {"matrix": [4, 6], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/montsinger/rebound/rev4/rev4.h b/keyboards/montsinger/rebound/rev4/rev4.h
deleted file mode 100644
index c0e5c9e68d..0000000000
--- a/keyboards/montsinger/rebound/rev4/rev4.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2020 Ross Montsinger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- * The first section contains all of the arguments representing the
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x12( \
-    K00, K70, K01, K71, K02, K72, K04, K74, K05, K75, K06, K76, \
-    K10, K60, K11, K61, K12, K62, K14, K64, K15, K65, K16, K66, \
-    K20, K50, K21, K51, K22, K52, K24, K54, K25, K55, K26, K56, \
-    K30, K40, K31, K41, K32, K42, K34, K44, K35, K45, K36, K46  \
-    ) { \
-  { K00, K01, K02, KC_NO, K04, K05, K06}, \
-  { K10, K11, K12, KC_NO, K14, K15, K16}, \
-  { K20, K21, K22, KC_NO, K24, K25, K26}, \
-  { K30, K31, K32, KC_NO, K34, K35, K36}, \
-  { K40, K41, K42, KC_NO, K44, K45, K46}, \
-  { K50, K51, K52, KC_NO, K54, K55, K56}, \
-  { K60, K61, K62, KC_NO, K64, K65, K66}, \
-  { K70, K71, K72, KC_NO, K74, K75, K76}  \
-}
-
-#define LAYOUT_all( \
-    K00, K70, K01, K71, K02, K72,      K04, K74, K05, K75, K06, K76, \
-    K10, K60, K11, K61, K12, K62, K13, K14, K64, K15, K65, K16, K66, \
-    K20, K50, K21, K51, K22, K52, K23, K24, K54, K25, K55, K26, K56,\
-    K30, K40, K31, K41, K32, K42, K33, K34, K44, K35, K45, K36, K46\
-    ) { \
-  { K00, K01, K02, KC_NO, K04, K05, K06}, \
-  { K10, K11, K12, K13, K14, K15, K16}, \
-  { K20, K21, K22, K23, K24, K25, K26}, \
-  { K30, K31, K32, K33, K34, K35, K36}, \
-  { K40, K41, K42, KC_NO, K44, K45, K46}, \
-  { K50, K51, K52, KC_NO, K54, K55, K56}, \
-  { K60, K61, K62, KC_NO, K64, K65, K66}, \
-  { K70, K71, K72, KC_NO, K74, K75, K76} \
-}
-
diff --git a/keyboards/montsinger/rewind/config.h b/keyboards/montsinger/rewind/config.h
index fb1d814501..274c715a93 100644
--- a/keyboards/montsinger/rewind/config.h
+++ b/keyboards/montsinger/rewind/config.h
@@ -14,25 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on
-diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B5, B4, D2, D3, B2 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, E6, D7, C6, D4, D0, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/montsinger/rewind/info.json b/keyboards/montsinger/rewind/info.json
index 6df88109e8..d034f95b52 100644
--- a/keyboards/montsinger/rewind/info.json
+++ b/keyboards/montsinger/rewind/info.json
@@ -8,65 +8,70 @@
         "pid": "0x552F",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "E6", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["B5", "B4", "D2", "D3", "B2"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_ortho_5x10": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":7, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4}
             ]
         }
     }
diff --git a/keyboards/montsinger/rewind/rewind.c b/keyboards/montsinger/rewind/rewind.c
deleted file mode 100644
index 6796ef8d2e..0000000000
--- a/keyboards/montsinger/rewind/rewind.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rewind.h"
diff --git a/keyboards/montsinger/rewind/rewind.h b/keyboards/montsinger/rewind/rewind.h
deleted file mode 100644
index 3019c7c034..0000000000
--- a/keyboards/montsinger/rewind/rewind.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 Ross Montsinger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- * The first section contains all of the arguments representing the
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x10( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39,\
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49\
-    ) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49 } \
-}
-
diff --git a/keyboards/moon/info.json b/keyboards/moon/info.json
index 153f6f74a9..a89caf86d2 100644
--- a/keyboards/moon/info.json
+++ b/keyboards/moon/info.json
@@ -21,454 +21,519 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"~", "x":0, "y":1.5}, 
-                {"label":"!", "x":1, "y":1.5}, 
-                {"label":"@", "x":2, "y":1.5}, 
-                {"label":"#", "x":3, "y":1.5}, 
-                {"label":"$", "x":4, "y":1.5}, 
-                {"label":"%", "x":5, "y":1.5}, 
-                {"label":"^", "x":6, "y":1.5}, 
-                {"label":"&", "x":7, "y":1.5}, 
-                {"label":"*", "x":8, "y":1.5}, 
-                {"label":"(", "x":9, "y":1.5}, 
-                {"label":")", "x":10, "y":1.5}, 
-                {"label":"_", "x":11, "y":1.5}, 
-                {"label":"+", "x":12, "y":1.5}, 
-                {"label":"Backspace", "x":13, "y":1.5, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.5}, 
-                {"label":"W", "x":2.5, "y":2.5}, 
-                {"label":"E", "x":3.5, "y":2.5}, 
-                {"label":"R", "x":4.5, "y":2.5}, 
-                {"label":"T", "x":5.5, "y":2.5}, 
-                {"label":"Y", "x":6.5, "y":2.5}, 
-                {"label":"U", "x":7.5, "y":2.5}, 
-                {"label":"I", "x":8.5, "y":2.5}, 
-                {"label":"O", "x":9.5, "y":2.5}, 
-                {"label":"P", "x":10.5, "y":2.5}, 
-                {"label":"{", "x":11.5, "y":2.5}, 
-                {"label":"}", "x":12.5, "y":2.5}, 
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.5}, 
-                {"label":"End", "x":16.25, "y":2.5}, 
-                {"label":"PgDn", "x":17.25, "y":2.5}, 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.5}, 
-                {"label":"S", "x":2.75, "y":3.5}, 
-                {"label":"D", "x":3.75, "y":3.5}, 
-                {"label":"F", "x":4.75, "y":3.5}, 
-                {"label":"G", "x":5.75, "y":3.5}, 
-                {"label":"H", "x":6.75, "y":3.5}, 
-                {"label":"J", "x":7.75, "y":3.5}, 
-                {"label":"K", "x":8.75, "y":3.5}, 
-                {"label":"L", "x":9.75, "y":3.5}, 
-                {"label":":", "x":10.75, "y":3.5}, 
-                {"label":"\"", "x":11.75, "y":3.5}, 
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, 
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":4.5}, 
-                {"label":"Z", "x":2.25, "y":4.5}, 
-                {"label":"X", "x":3.25, "y":4.5}, 
-                {"label":"C", "x":4.25, "y":4.5}, 
-                {"label":"V", "x":5.25, "y":4.5}, 
-                {"label":"B", "x":6.25, "y":4.5}, 
-                {"label":"N", "x":7.25, "y":4.5}, 
-                {"label":"M", "x":8.25, "y":4.5}, 
-                {"label":"<", "x":9.25, "y":4.5}, 
-                {"label":">", "x":10.25, "y":4.5}, 
-                {"label":"?", "x":11.25, "y":4.5}, 
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
-                {"label":"Up", "x":16.25, "y":4.5}, 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, 
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, 
-                {"label":"Left", "x":15.25, "y":5.5}, 
-                {"label":"Down", "x":16.25, "y":5.5}, 
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 6], "x": 0, "y": 0},
+
+                {"matrix": [0, 7], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 9], "x": 4, "y": 0},
+                {"matrix": [0, 10], "x": 5, "y": 0},
+
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+                {"matrix": [0, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 11, "y": 0},
+                {"matrix": [0, 5], "x": 12, "y": 0},
+                {"matrix": [6, 6], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 0},
+                {"matrix": [6, 9], "x": 16.25, "y": 0},
+                {"matrix": [6, 10], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [1, 10], "x": 4, "y": 1.5},
+                {"matrix": [1, 0], "x": 5, "y": 1.5},
+                {"matrix": [1, 1], "x": 6, "y": 1.5},
+                {"matrix": [1, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 3], "x": 8, "y": 1.5},
+                {"matrix": [1, 4], "x": 9, "y": 1.5},
+                {"matrix": [1, 5], "x": 10, "y": 1.5},
+                {"matrix": [6, 0], "x": 11, "y": 1.5},
+                {"matrix": [6, 1], "x": 12, "y": 1.5},
+                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 7], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 0], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"~", "x":0, "y":1.5}, 
-                {"label":"!", "x":1, "y":1.5}, 
-                {"label":"@", "x":2, "y":1.5}, 
-                {"label":"#", "x":3, "y":1.5}, 
-                {"label":"$", "x":4, "y":1.5}, 
-                {"label":"%", "x":5, "y":1.5}, 
-                {"label":"^", "x":6, "y":1.5}, 
-                {"label":"&", "x":7, "y":1.5}, 
-                {"label":"*", "x":8, "y":1.5}, 
-                {"label":"(", "x":9, "y":1.5}, 
-                {"label":")", "x":10, "y":1.5}, 
-                {"label":"_", "x":11, "y":1.5}, 
-                {"label":"+", "x":12, "y":1.5}, 
-                {"label":"Backspace", "x":13, "y":1.5, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.5}, 
-                {"label":"W", "x":2.5, "y":2.5}, 
-                {"label":"E", "x":3.5, "y":2.5}, 
-                {"label":"R", "x":4.5, "y":2.5}, 
-                {"label":"T", "x":5.5, "y":2.5}, 
-                {"label":"Y", "x":6.5, "y":2.5}, 
-                {"label":"U", "x":7.5, "y":2.5}, 
-                {"label":"I", "x":8.5, "y":2.5}, 
-                {"label":"O", "x":9.5, "y":2.5}, 
-                {"label":"P", "x":10.5, "y":2.5}, 
-                {"label":"{", "x":11.5, "y":2.5}, 
-                {"label":"}", "x":12.5, "y":2.5}, 
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.5}, 
-                {"label":"End", "x":16.25, "y":2.5}, 
-                {"label":"PgDn", "x":17.25, "y":2.5}, 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.5}, 
-                {"label":"S", "x":2.75, "y":3.5}, 
-                {"label":"D", "x":3.75, "y":3.5}, 
-                {"label":"F", "x":4.75, "y":3.5}, 
-                {"label":"G", "x":5.75, "y":3.5}, 
-                {"label":"H", "x":6.75, "y":3.5}, 
-                {"label":"J", "x":7.75, "y":3.5}, 
-                {"label":"K", "x":8.75, "y":3.5}, 
-                {"label":"L", "x":9.75, "y":3.5}, 
-                {"label":":", "x":10.75, "y":3.5}, 
-                {"label":"\"", "x":11.75, "y":3.5}, 
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, 
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25}, 
-                {"label":"Z", "x":2.25, "y":4.5}, 
-                {"label":"X", "x":3.25, "y":4.5}, 
-                {"label":"C", "x":4.25, "y":4.5}, 
-                {"label":"V", "x":5.25, "y":4.5}, 
-                {"label":"B", "x":6.25, "y":4.5}, 
-                {"label":"N", "x":7.25, "y":4.5}, 
-                {"label":"M", "x":8.25, "y":4.5}, 
-                {"label":"<", "x":9.25, "y":4.5}, 
-                {"label":">", "x":10.25, "y":4.5}, 
-                {"label":"?", "x":11.25, "y":4.5}, 
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
-                {"label":"Up", "x":16.25, "y":4.5}, 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, 
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, 
-                {"label":"Left", "x":15.25, "y":5.5}, 
-                {"label":"Down", "x":16.25, "y":5.5}, 
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 6], "x": 0, "y": 0},
+
+                {"matrix": [0, 7], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 9], "x": 4, "y": 0},
+                {"matrix": [0, 10], "x": 5, "y": 0},
+
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+                {"matrix": [0, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 11, "y": 0},
+                {"matrix": [0, 5], "x": 12, "y": 0},
+                {"matrix": [6, 6], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 0},
+                {"matrix": [6, 9], "x": 16.25, "y": 0},
+                {"matrix": [6, 10], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [1, 10], "x": 4, "y": 1.5},
+                {"matrix": [1, 0], "x": 5, "y": 1.5},
+                {"matrix": [1, 1], "x": 6, "y": 1.5},
+                {"matrix": [1, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 3], "x": 8, "y": 1.5},
+                {"matrix": [1, 4], "x": 9, "y": 1.5},
+                {"matrix": [1, 5], "x": 10, "y": 1.5},
+                {"matrix": [6, 0], "x": 11, "y": 1.5},
+                {"matrix": [6, 1], "x": 12, "y": 1.5},
+                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 0], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"~", "x":0, "y":1.5}, 
-                {"label":"!", "x":1, "y":1.5}, 
-                {"label":"@", "x":2, "y":1.5}, 
-                {"label":"#", "x":3, "y":1.5}, 
-                {"label":"$", "x":4, "y":1.5}, 
-                {"label":"%", "x":5, "y":1.5}, 
-                {"label":"^", "x":6, "y":1.5}, 
-                {"label":"&", "x":7, "y":1.5}, 
-                {"label":"*", "x":8, "y":1.5}, 
-                {"label":"(", "x":9, "y":1.5}, 
-                {"label":")", "x":10, "y":1.5}, 
-                {"label":"_", "x":11, "y":1.5}, 
-                {"label":"+", "x":12, "y":1.5}, 
-                {"label":"Backspace", "x":13, "y":1.5, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.5}, 
-                {"label":"W", "x":2.5, "y":2.5}, 
-                {"label":"E", "x":3.5, "y":2.5}, 
-                {"label":"R", "x":4.5, "y":2.5}, 
-                {"label":"T", "x":5.5, "y":2.5}, 
-                {"label":"Y", "x":6.5, "y":2.5}, 
-                {"label":"U", "x":7.5, "y":2.5}, 
-                {"label":"I", "x":8.5, "y":2.5}, 
-                {"label":"O", "x":9.5, "y":2.5}, 
-                {"label":"P", "x":10.5, "y":2.5}, 
-                {"label":"{", "x":11.5, "y":2.5}, 
-                {"label":"}", "x":12.5, "y":2.5}, 
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.5}, 
-                {"label":"End", "x":16.25, "y":2.5}, 
-                {"label":"PgDn", "x":17.25, "y":2.5}, 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.5}, 
-                {"label":"S", "x":2.75, "y":3.5}, 
-                {"label":"D", "x":3.75, "y":3.5}, 
-                {"label":"F", "x":4.75, "y":3.5}, 
-                {"label":"G", "x":5.75, "y":3.5}, 
-                {"label":"H", "x":6.75, "y":3.5}, 
-                {"label":"J", "x":7.75, "y":3.5}, 
-                {"label":"K", "x":8.75, "y":3.5}, 
-                {"label":"L", "x":9.75, "y":3.5}, 
-                {"label":":", "x":10.75, "y":3.5}, 
-                {"label":"\"", "x":11.75, "y":3.5}, 
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, 
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25}, 
-                {"label":"Z", "x":2.25, "y":4.5}, 
-                {"label":"X", "x":3.25, "y":4.5}, 
-                {"label":"C", "x":4.25, "y":4.5}, 
-                {"label":"V", "x":5.25, "y":4.5}, 
-                {"label":"B", "x":6.25, "y":4.5}, 
-                {"label":"N", "x":7.25, "y":4.5}, 
-                {"label":"M", "x":8.25, "y":4.5}, 
-                {"label":"<", "x":9.25, "y":4.5}, 
-                {"label":">", "x":10.25, "y":4.5}, 
-                {"label":"?", "x":11.25, "y":4.5}, 
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
-                {"label":"Up", "x":16.25, "y":4.5}, 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, 
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, 
-                {"label":"Space", "x":4, "y":5.5, "w":7}, 
-                {"label":"Alt", "x":11, "y":5.5, "w":1.5}, 
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, 
-                {"label":"Left", "x":15.25, "y":5.5}, 
-                {"label":"Down", "x":16.25, "y":5.5}, 
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 6], "x": 0, "y": 0},
+
+                {"matrix": [0, 7], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 9], "x": 4, "y": 0},
+                {"matrix": [0, 10], "x": 5, "y": 0},
+
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+                {"matrix": [0, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 11, "y": 0},
+                {"matrix": [0, 5], "x": 12, "y": 0},
+                {"matrix": [6, 6], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 0},
+                {"matrix": [6, 9], "x": 16.25, "y": 0},
+                {"matrix": [6, 10], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [1, 10], "x": 4, "y": 1.5},
+                {"matrix": [1, 0], "x": 5, "y": 1.5},
+                {"matrix": [1, 1], "x": 6, "y": 1.5},
+                {"matrix": [1, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 3], "x": 8, "y": 1.5},
+                {"matrix": [1, 4], "x": 9, "y": 1.5},
+                {"matrix": [1, 5], "x": 10, "y": 1.5},
+                {"matrix": [6, 0], "x": 11, "y": 1.5},
+                {"matrix": [6, 1], "x": 12, "y": 1.5},
+                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 0], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"\u00ac", "x":0, "y":1.5}, 
-                {"label":"!", "x":1, "y":1.5}, 
-                {"label":"\"", "x":2, "y":1.5}, 
-                {"label":"\u00a3", "x":3, "y":1.5}, 
-                {"label":"$", "x":4, "y":1.5}, 
-                {"label":"%", "x":5, "y":1.5}, 
-                {"label":"^", "x":6, "y":1.5}, 
-                {"label":"&", "x":7, "y":1.5}, 
-                {"label":"*", "x":8, "y":1.5}, 
-                {"label":"(", "x":9, "y":1.5}, 
-                {"label":")", "x":10, "y":1.5}, 
-                {"label":"_", "x":11, "y":1.5}, 
-                {"label":"+", "x":12, "y":1.5}, 
-                {"label":"Backspace", "x":13, "y":1.5, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.5}, 
-                {"label":"W", "x":2.5, "y":2.5}, 
-                {"label":"E", "x":3.5, "y":2.5}, 
-                {"label":"R", "x":4.5, "y":2.5}, 
-                {"label":"T", "x":5.5, "y":2.5}, 
-                {"label":"Y", "x":6.5, "y":2.5}, 
-                {"label":"U", "x":7.5, "y":2.5}, 
-                {"label":"I", "x":8.5, "y":2.5}, 
-                {"label":"O", "x":9.5, "y":2.5}, 
-                {"label":"P", "x":10.5, "y":2.5}, 
-                {"label":"{", "x":11.5, "y":2.5}, 
-                {"label":"}", "x":12.5, "y":2.5}, 
-                {"label":"Delete", "x":15.25, "y":2.5}, 
-                {"label":"End", "x":16.25, "y":2.5}, 
-                {"label":"PgDn", "x":17.25, "y":2.5}, 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.5}, 
-                {"label":"S", "x":2.75, "y":3.5}, 
-                {"label":"D", "x":3.75, "y":3.5}, 
-                {"label":"F", "x":4.75, "y":3.5}, 
-                {"label":"G", "x":5.75, "y":3.5}, 
-                {"label":"H", "x":6.75, "y":3.5}, 
-                {"label":"J", "x":7.75, "y":3.5}, 
-                {"label":"K", "x":8.75, "y":3.5}, 
-                {"label":"L", "x":9.75, "y":3.5}, 
-                {"label":":", "x":10.75, "y":3.5}, 
-                {"label":"@", "x":11.75, "y":3.5}, 
-                {"label":"~", "x":12.75, "y":3.5}, 
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, 
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":4.5}, 
-                {"label":"Z", "x":2.25, "y":4.5}, 
-                {"label":"X", "x":3.25, "y":4.5}, 
-                {"label":"C", "x":4.25, "y":4.5}, 
-                {"label":"V", "x":5.25, "y":4.5}, 
-                {"label":"B", "x":6.25, "y":4.5}, 
-                {"label":"N", "x":7.25, "y":4.5}, 
-                {"label":"M", "x":8.25, "y":4.5}, 
-                {"label":"<", "x":9.25, "y":4.5}, 
-                {"label":">", "x":10.25, "y":4.5}, 
-                {"label":"?", "x":11.25, "y":4.5}, 
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
-                {"label":"Up", "x":16.25, "y":4.5}, 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, 
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, 
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, 
-                {"label":"Left", "x":15.25, "y":5.5}, 
-                {"label":"Down", "x":16.25, "y":5.5}, 
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 6], "x": 0, "y": 0},
+
+                {"matrix": [0, 7], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 9], "x": 4, "y": 0},
+                {"matrix": [0, 10], "x": 5, "y": 0},
+
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+                {"matrix": [0, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 11, "y": 0},
+                {"matrix": [0, 5], "x": 12, "y": 0},
+                {"matrix": [6, 6], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 0},
+                {"matrix": [6, 9], "x": 16.25, "y": 0},
+                {"matrix": [6, 10], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [1, 10], "x": 4, "y": 1.5},
+                {"matrix": [1, 0], "x": 5, "y": 1.5},
+                {"matrix": [1, 1], "x": 6, "y": 1.5},
+                {"matrix": [1, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 3], "x": 8, "y": 1.5},
+                {"matrix": [1, 4], "x": 9, "y": 1.5},
+                {"matrix": [1, 5], "x": 10, "y": 1.5},
+                {"matrix": [6, 0], "x": 11, "y": 1.5},
+                {"matrix": [6, 1], "x": 12, "y": 1.5},
+                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
+
+                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 8], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 7], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 0], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"\u00ac", "x":0, "y":1.5}, 
-                {"label":"!", "x":1, "y":1.5}, 
-                {"label":"\"", "x":2, "y":1.5}, 
-                {"label":"\u00a3", "x":3, "y":1.5}, 
-                {"label":"$", "x":4, "y":1.5}, 
-                {"label":"%", "x":5, "y":1.5}, 
-                {"label":"^", "x":6, "y":1.5}, 
-                {"label":"&", "x":7, "y":1.5}, 
-                {"label":"*", "x":8, "y":1.5}, 
-                {"label":"(", "x":9, "y":1.5}, 
-                {"label":")", "x":10, "y":1.5}, 
-                {"label":"_", "x":11, "y":1.5}, 
-                {"label":"+", "x":12, "y":1.5}, 
-                {"label":"Backspace", "x":13, "y":1.5, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.5}, 
-                {"label":"W", "x":2.5, "y":2.5}, 
-                {"label":"E", "x":3.5, "y":2.5}, 
-                {"label":"R", "x":4.5, "y":2.5}, 
-                {"label":"T", "x":5.5, "y":2.5}, 
-                {"label":"Y", "x":6.5, "y":2.5}, 
-                {"label":"U", "x":7.5, "y":2.5}, 
-                {"label":"I", "x":8.5, "y":2.5}, 
-                {"label":"O", "x":9.5, "y":2.5}, 
-                {"label":"P", "x":10.5, "y":2.5}, 
-                {"label":"{", "x":11.5, "y":2.5}, 
-                {"label":"}", "x":12.5, "y":2.5}, 
-                {"label":"Delete", "x":15.25, "y":2.5}, 
-                {"label":"End", "x":16.25, "y":2.5}, 
-                {"label":"PgDn", "x":17.25, "y":2.5}, 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.5}, 
-                {"label":"S", "x":2.75, "y":3.5}, 
-                {"label":"D", "x":3.75, "y":3.5}, 
-                {"label":"F", "x":4.75, "y":3.5}, 
-                {"label":"G", "x":5.75, "y":3.5}, 
-                {"label":"H", "x":6.75, "y":3.5}, 
-                {"label":"J", "x":7.75, "y":3.5}, 
-                {"label":"K", "x":8.75, "y":3.5}, 
-                {"label":"L", "x":9.75, "y":3.5}, 
-                {"label":":", "x":10.75, "y":3.5}, 
-                {"label":"@", "x":11.75, "y":3.5}, 
-                {"label":"~", "x":12.75, "y":3.5}, 
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, 
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":4.5}, 
-                {"label":"Z", "x":2.25, "y":4.5}, 
-                {"label":"X", "x":3.25, "y":4.5}, 
-                {"label":"C", "x":4.25, "y":4.5}, 
-                {"label":"V", "x":5.25, "y":4.5}, 
-                {"label":"B", "x":6.25, "y":4.5}, 
-                {"label":"N", "x":7.25, "y":4.5}, 
-                {"label":"M", "x":8.25, "y":4.5}, 
-                {"label":"<", "x":9.25, "y":4.5}, 
-                {"label":">", "x":10.25, "y":4.5}, 
-                {"label":"?", "x":11.25, "y":4.5}, 
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
-                {"label":"Up", "x":16.25, "y":4.5}, 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, 
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, 
-                {"label":"Space", "x":4, "y":5.5, "w":7}, 
-                {"label":"AltGr", "x":11, "y":5.5, "w":1.5}, 
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, 
-                {"label":"Left", "x":15.25, "y":5.5}, 
-                {"label":"Down", "x":16.25, "y":5.5}, 
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 6], "x": 0, "y": 0},
+
+                {"matrix": [0, 7], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 9], "x": 4, "y": 0},
+                {"matrix": [0, 10], "x": 5, "y": 0},
+
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+                {"matrix": [0, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 11, "y": 0},
+                {"matrix": [0, 5], "x": 12, "y": 0},
+                {"matrix": [6, 6], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 0},
+                {"matrix": [6, 9], "x": 16.25, "y": 0},
+                {"matrix": [6, 10], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [1, 10], "x": 4, "y": 1.5},
+                {"matrix": [1, 0], "x": 5, "y": 1.5},
+                {"matrix": [1, 1], "x": 6, "y": 1.5},
+                {"matrix": [1, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 3], "x": 8, "y": 1.5},
+                {"matrix": [1, 4], "x": 9, "y": 1.5},
+                {"matrix": [1, 5], "x": 10, "y": 1.5},
+                {"matrix": [6, 0], "x": 11, "y": 1.5},
+                {"matrix": [6, 1], "x": 12, "y": 1.5},
+                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
+
+                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 8], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 7], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 0], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/moon/moon.c b/keyboards/moon/moon.c
deleted file mode 100644
index 95ce007e2b..0000000000
--- a/keyboards/moon/moon.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Mathias Andersson <wraul@dbox.se>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "moon.h"
diff --git a/keyboards/moon/moon.h b/keyboards/moon/moon.h
deleted file mode 100644
index 8599aded1b..0000000000
--- a/keyboards/moon/moon.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright 2019 Mathias Andersson <wraul@dbox.se>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    k06,      k07, k08, k09, k0A,      k00, k01, k02, k03,      k04, k05, k66, k67,      k68, k69, k6A, \
-    k16, k17, k18, k19, k1A, k10, k11, k12, k13, k14, k15, k60, k61,           k62,      k63, k64, k65, \
-    k26,      k27, k28, k29, k2A, k20, k21, k22, k23, k24, k25, k76, k77,      k78,      k79, k7A, k70, \
-    k36,      k37, k38, k39, k3A, k30, k31, k32, k33, k34, k35, k71,           k72,                     \
-    k46, k47, k48, k49, k4A, k40, k41, k42, k43, k44, k45, k73,                k75,           k74,      \
-    k56, k57, k58,                     k59,                     k5A, k50, k51, k52,      k53, k54, k55  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k06,      k07, k08, k09, k0A,      k00, k01, k02, k03,      k04, k05, k66, k67,      k68, k69, k6A, \
-    k16, k17, k18, k19, k1A, k10, k11, k12, k13, k14, k15, k60, k61,           k62,      k63, k64, k65, \
-    k26,      k27, k28, k29, k2A, k20, k21, k22, k23, k24, k25, k76, k77,      k78,      k79, k7A, k70, \
-    k36,      k37, k38, k39, k3A, k30, k31, k32, k33, k34, k35, k71,           k72,                     \
-    k46,      k48, k49, k4A, k40, k41, k42, k43, k44, k45, k73,                k75,           k74,      \
-    k56, k57, k58,                     k59,                     k5A, k50, k51, k52,      k53, k54, k55  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07,   k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17,   k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27,   k28, k29, k2A }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37,   k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, KC_NO, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57,   k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67,   k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77,   k78, k79, k7A }, \
-}
-
-#define LAYOUT_tkl_ansi_wkl( \
-    k06,      k07, k08, k09, k0A,      k00, k01, k02, k03,      k04, k05, k66, k67,      k68, k69, k6A, \
-    k16, k17, k18, k19, k1A, k10, k11, k12, k13, k14, k15, k60, k61,           k62,      k63, k64, k65, \
-    k26,      k27, k28, k29, k2A, k20, k21, k22, k23, k24, k25, k76, k77,      k78,      k79, k7A, k70, \
-    k36,      k37, k38, k39, k3A, k30, k31, k32, k33, k34, k35, k71,           k72,                     \
-    k46,      k48, k49, k4A, k40, k41, k42, k43, k44, k45, k73,                k75,           k74,      \
-    k56,      k58,                     k59,                          k50,      k52,      k53, k54, k55  \
-) \
-{ \
-    { k00, k01,   k02, k03, k04, k05, k06, k07,   k08, k09, k0A   }, \
-    { k10, k11,   k12, k13, k14, k15, k16, k17,   k18, k19, k1A   }, \
-    { k20, k21,   k22, k23, k24, k25, k26, k27,   k28, k29, k2A   }, \
-    { k30, k31,   k32, k33, k34, k35, k36, k37,   k38, k39, k3A   }, \
-    { k40, k41,   k42, k43, k44, k45, k46, KC_NO, k48, k49, k4A   }, \
-    { k50, KC_NO, k52, k53, k54, k55, k56, KC_NO, k58, k59, KC_NO }, \
-    { k60, k61,   k62, k63, k64, k65, k66, k67,   k68, k69, k6A   }, \
-    { k70, k71,   k72, k73, k74, k75, k76, k77,   k78, k79, k7A   }, \
-}
-
-#define LAYOUT_tkl_iso( \
-    k06,      k07, k08, k09, k0A,      k00, k01, k02, k03,      k04, k05, k66, k67,      k68, k69, k6A, \
-    k16, k17, k18, k19, k1A, k10, k11, k12, k13, k14, k15, k60, k61,           k62,      k63, k64, k65, \
-    k26,      k27, k28, k29, k2A, k20, k21, k22, k23, k24, k25, k76, k77,                k79, k7A, k70, \
-    k36,      k37, k38, k39, k3A, k30, k31, k32, k33, k34, k35, k71, k78,      k72,                     \
-    k46, k47, k48, k49, k4A, k40, k41, k42, k43, k44, k45, k73,                k75,           k74,      \
-    k56, k57, k58,                     k59,                     k5A, k50, k51, k52,      k53, k54, k55  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
-}
-
-#define LAYOUT_tkl_iso_wkl( \
-    k06,      k07, k08, k09, k0A,      k00, k01, k02, k03,      k04, k05, k66, k67,      k68, k69, k6A, \
-    k16, k17, k18, k19, k1A, k10, k11, k12, k13, k14, k15, k60, k61,           k62,      k63, k64, k65, \
-    k26,      k27, k28, k29, k2A, k20, k21, k22, k23, k24, k25, k76, k77,                k79, k7A, k70, \
-    k36,      k37, k38, k39, k3A, k30, k31, k32, k33, k34, k35, k71, k78,      k72,                     \
-    k46, k47, k48, k49, k4A, k40, k41, k42, k43, k44, k45, k73,                k75,           k74,      \
-    k56,      k58,                     k59,                          k50,      k52,      k53, k54, k55  \
-) \
-{ \
-    { k00, k01,   k02, k03, k04, k05, k06, k07,   k08, k09, k0A   }, \
-    { k10, k11,   k12, k13, k14, k15, k16, k17,   k18, k19, k1A   }, \
-    { k20, k21,   k22, k23, k24, k25, k26, k27,   k28, k29, k2A   }, \
-    { k30, k31,   k32, k33, k34, k35, k36, k37,   k38, k39, k3A   }, \
-    { k40, k41,   k42, k43, k44, k45, k46, k47,   k48, k49, k4A   }, \
-    { k50, KC_NO, k52, k53, k54, k55, k56, KC_NO, k58, k59, KC_NO }, \
-    { k60, k61,   k62, k63, k64, k65, k66, k67,   k68, k69, k6A   }, \
-    { k70, k71,   k72, k73, k74, k75, k76, k77,   k78, k79, k7A   }, \
-}
diff --git a/keyboards/moonlander/info.json b/keyboards/moonlander/info.json
index 3492713a6a..c8b0133f47 100644
--- a/keyboards/moonlander/info.json
+++ b/keyboards/moonlander/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1969",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/moonlander/keymaps/jjerrell/config.h b/keyboards/moonlander/keymaps/jjerrell/config.h
index aa4bf3885e..e39340c80a 100644
--- a/keyboards/moonlander/keymaps/jjerrell/config.h
+++ b/keyboards/moonlander/keymaps/jjerrell/config.h
@@ -24,4 +24,3 @@
 #undef PRODUCT
 #define PRODUCT         "Moonlander Mark I - Modified by <@jjerrell>"
 
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index 83b5997b53..70bcd63152 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -28,7 +28,7 @@ bool is_launching     = false;
 #ifdef DYNAMIC_MACRO_ENABLE
 static bool is_dynamic_recording = false;
 
-void dynamic_macro_record_start_user(void) { is_dynamic_recording = true; }
+void dynamic_macro_record_start_user(int8_t direction) { is_dynamic_recording = true; }
 
 void dynamic_macro_record_end_user(int8_t direction) {
     is_dynamic_recording = false;
diff --git a/keyboards/moonlander/rules.mk b/keyboards/moonlander/rules.mk
index 825afb6ba1..12987afdac 100644
--- a/keyboards/moonlander/rules.mk
+++ b/keyboards/moonlander/rules.mk
@@ -14,7 +14,6 @@ AUDIO_DRIVER = dac_additive
 CUSTOM_MATRIX = lite
 SWAP_HANDS_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 EEPROM_DRIVER = i2c
 
 #project specific files
diff --git a/keyboards/morizon/config.h b/keyboards/morizon/config.h
index d19633a9ad..5b0945d4d4 100644
--- a/keyboards/morizon/config.h
+++ b/keyboards/morizon/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/morizon/info.json b/keyboards/morizon/info.json
index b012a2ecc6..4d4e0aa69b 100644
--- a/keyboards/morizon/info.json
+++ b/keyboards/morizon/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/morizon/morizon.c b/keyboards/morizon/morizon.c
deleted file mode 100644
index 1196375cd0..0000000000
--- a/keyboards/morizon/morizon.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Steven Karrmann
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "morizon.h"
diff --git a/keyboards/mountainblocks/mb17/config.h b/keyboards/mountainblocks/mb17/config.h
index 992b89937c..2aca1d46b3 100644
--- a/keyboards/mountainblocks/mb17/config.h
+++ b/keyboards/mountainblocks/mb17/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { F7, E6, D7, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mountainblocks/mb17/info.json b/keyboards/mountainblocks/mb17/info.json
index 56cb02fa28..ea6840b365 100644
--- a/keyboards/mountainblocks/mb17/info.json
+++ b/keyboards/mountainblocks/mb17/info.json
@@ -8,11 +8,38 @@
         "pid": "0x0017",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "E6", "D7", "C6"],
+        "rows": ["F4", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_numpad_5x4": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":1, "h":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":0, "y":4, "w":2}, {"x":2, "y":4}, {"x":3, "y":3, "h":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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": [2, 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, 1], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/mountainblocks/mb17/mb17.c b/keyboards/mountainblocks/mb17/mb17.c
deleted file mode 100644
index abc6183cbf..0000000000
--- a/keyboards/mountainblocks/mb17/mb17.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mb17.h"
diff --git a/keyboards/mountainblocks/mb17/mb17.h b/keyboards/mountainblocks/mb17/mb17.h
deleted file mode 100644
index dbfb68a932..0000000000
--- a/keyboards/mountainblocks/mb17/mb17.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_numpad_5x4( \
-    k00, k01, k02, k03,    \
-    k10, k11, k12,         \
-    k20, k21, k22, k23,    \
-    k30, k31, k32,         \
-    k41, k42,      k43     \
-){ \
-    { k00, k01, k02, k03 },  \
-    { k10, k11, k12, ___ },  \
-    { k20, k21, k22, k23 },  \
-    { k30, k31, k32, ___ },  \
-    { ___, k41, k42, k43 }   \
-}
diff --git a/keyboards/ms_sculpt/info.json b/keyboards/ms_sculpt/info.json
index 23d5666a4d..1e540bd58c 100644
--- a/keyboards/ms_sculpt/info.json
+++ b/keyboards/ms_sculpt/info.json
@@ -32,13 +32,13 @@
     "layouts": {
         "LAYOUT_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0, "w":1, "h":0.8},
-                {"label":"F1", "x":1, "y":0, "w":1, "h":0.8},
-                {"label":"F2", "x":2, "y":0, "w":1, "h":0.8},
-                {"label":"F3", "x":3, "y":0, "w":1, "h":0.8},
-                {"label":"F4", "x":4, "y":0, "w":1, "h":0.8},
-                {"label":"F5", "x":5, "y":0, "w":1, "h":0.8},
-                {"label":"F6", "x":6, "y":0, "w":1, "h":0.8},
+                {"label":"Esc", "x":0, "y":0, "h":0.8},
+                {"label":"F1", "x":1, "y":0, "h":0.8},
+                {"label":"F2", "x":2, "y":0, "h":0.8},
+                {"label":"F3", "x":3, "y":0, "h":0.8},
+                {"label":"F4", "x":4, "y":0, "h":0.8},
+                {"label":"F5", "x":5, "y":0, "h":0.8},
+                {"label":"F6", "x":6, "y":0, "h":0.8},
                 {"label":"F7", "x":8, "y":0, "w":0.975, "h":0.8},
                 {"label":"F8", "x":8.975, "y":0, "w":0.975, "h":0.8},
                 {"label":"F9", "x":9.95, "y":0, "w":0.975, "h":0.8},
diff --git a/keyboards/mschwingen/modelm/config.h b/keyboards/mschwingen/modelm/config.h
index 6545f91070..c828bd36ff 100644
--- a/keyboards/mschwingen/modelm/config.h
+++ b/keyboards/mschwingen/modelm/config.h
@@ -70,7 +70,6 @@
 #endif
 
 // 3* WS2812 LEDs instead of singlecolor GPIO LEDs
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 3
 
 // disabled, needs PCB patch.
diff --git a/keyboards/mschwingen/modelm/info.json b/keyboards/mschwingen/modelm/info.json
index a1e22f1614..4df6816eb1 100644
--- a/keyboards/mschwingen/modelm/info.json
+++ b/keyboards/mschwingen/modelm/info.json
@@ -8,6 +8,9 @@
         "pid": "0x558E",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "lufa-dfu",
     "layouts": {
diff --git a/keyboards/mschwingen/modelm/led_ws2812/rules.mk b/keyboards/mschwingen/modelm/led_ws2812/rules.mk
index 424388fd8f..9a69649289 100644
--- a/keyboards/mschwingen/modelm/led_ws2812/rules.mk
+++ b/keyboards/mschwingen/modelm/led_ws2812/rules.mk
@@ -1,2 +1 @@
-# variant for WS2812 LEDs
-SRC += ws2812.c
+WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/mschwingen/modelm/modelm.c b/keyboards/mschwingen/modelm/modelm.c
index 122dca3400..23d1b1484a 100644
--- a/keyboards/mschwingen/modelm/modelm.c
+++ b/keyboards/mschwingen/modelm/modelm.c
@@ -204,7 +204,7 @@ void update_layer_leds(void) {
 
 #endif
 
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
     isRecording++;
     blink_cycle_timer = timer_read();
 }
diff --git a/keyboards/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h
index fef54ac0e1..5250c1c84f 100644
--- a/keyboards/mss_studio/m63_rgb/config.h
+++ b/keyboards/mss_studio/m63_rgb/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B4, A0,  A2, A3 }
-#define MATRIX_COL_PINS { B0, B1, B2, B10, A7, A6, A5, A4, B5, B6, A1, B7, B8, B9 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
@@ -35,9 +27,6 @@
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
-    /* RGB Matrix config */
-    #define RGB_DI_PIN B15
-
     /* RGB Matrix effect */
     #define ENABLE_RGB_MATRIX_ALPHAS_MODS
     #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/mss_studio/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/info.json
index 45b0723102..0907269c9e 100644
--- a/keyboards/mss_studio/m63_rgb/info.json
+++ b/keyboards/mss_studio/m63_rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x6063",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"],
+        "rows": ["B3", "B4", "A0", "A2", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/mss_studio/m63_rgb/rules.mk b/keyboards/mss_studio/m63_rgb/rules.mk
index e3a981b634..138bf78056 100644
--- a/keyboards/mss_studio/m63_rgb/rules.mk
+++ b/keyboards/mss_studio/m63_rgb/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/mss_studio/m64_rgb/config.h b/keyboards/mss_studio/m64_rgb/config.h
index 6f095b6aa4..7270ccb4b3 100644
--- a/keyboards/mss_studio/m64_rgb/config.h
+++ b/keyboards/mss_studio/m64_rgb/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B4, A0,  A2, A3 }
-#define MATRIX_COL_PINS { B0, B1, B2, B10, A7, A6, A5, A4, B5, B6, A1, B7, B8, B9 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
@@ -35,9 +27,6 @@
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
-    /* RGB Matrix config */
-    #define RGB_DI_PIN B15
-
     /* RGB Matrix effect */
     #define ENABLE_RGB_MATRIX_ALPHAS_MODS
     #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/mss_studio/m64_rgb/info.json b/keyboards/mss_studio/m64_rgb/info.json
index ec168e049b..0680794c85 100644
--- a/keyboards/mss_studio/m64_rgb/info.json
+++ b/keyboards/mss_studio/m64_rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x6064",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"],
+        "rows": ["B3", "B4", "A0", "A2", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/mss_studio/m64_rgb/rules.mk b/keyboards/mss_studio/m64_rgb/rules.mk
index e3a981b634..138bf78056 100644
--- a/keyboards/mss_studio/m64_rgb/rules.mk
+++ b/keyboards/mss_studio/m64_rgb/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/mt/blocked65/blocked65.c b/keyboards/mt/blocked65/blocked65.c
deleted file mode 100644
index 81da8005b0..0000000000
--- a/keyboards/mt/blocked65/blocked65.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "blocked65.h"
diff --git a/keyboards/mt/blocked65/blocked65.h b/keyboards/mt/blocked65/blocked65.h
deleted file mode 100644
index 09fe673a66..0000000000
--- a/keyboards/mt/blocked65/blocked65.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-// readability
-#define _x_ KC_NO
-#define LAYOUT_65_ansi_blocker( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E  \
-){ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-  { K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-  { K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, _x_, K4A, K4B, K4C, K4D, K4E }, \
-}
diff --git a/keyboards/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h
index bd4c880e3b..b61be3ea8f 100644
--- a/keyboards/mt/blocked65/config.h
+++ b/keyboards/mt/blocked65/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -33,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Backlight configuration
  */
-#define RGB_DI_PIN E2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mt/blocked65/info.json b/keyboards/mt/blocked65/info.json
index c16d04cd5b..fa169a1d35 100644
--- a/keyboards/mt/blocked65/info.json
+++ b/keyboards/mt/blocked65/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 6
@@ -17,7 +25,79 @@
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"PrScr", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Del", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Alt", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/mt/mt40/config.h b/keyboards/mt/mt40/config.h
index 8a77b3dc7b..bb90137436 100644
--- a/keyboards/mt/mt40/config.h
+++ b/keyboards/mt/mt40/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define RGB_DI_PIN C0
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -31,27 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-/* #define CC6 0x63 // C3 */
-/* #define CB6 0x37 // B7 */
-/* #define CC7 0x62 // C2 */
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 /* #define LOCKING_SUPPORT_ENABLE */
 /* Locking resynchronize hack */
diff --git a/keyboards/mt/mt40/info.json b/keyboards/mt/mt40/info.json
index 730cdf6c24..4d3cab4eba 100644
--- a/keyboards/mt/mt40/info.json
+++ b/keyboards/mt/mt40/info.json
@@ -8,15 +8,77 @@
     "pid": "0x422D",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D2"
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "processor": "atmega32a",
   "bootloader": "bootloadhid",
   "community_layouts": ["planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_planck_mit"
+  },
   "layouts": {
     "LAYOUT_planck_mit": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
+      "layout": [
+        {"matrix": [4, 0], "x": 0, "y": 0},
+        {"matrix": [3, 1], "x": 1, "y": 0},
+        {"matrix": [3, 2], "x": 2, "y": 0},
+        {"matrix": [3, 3], "x": 3, "y": 0},
+        {"matrix": [3, 4], "x": 4, "y": 0},
+        {"matrix": [3, 5], "x": 5, "y": 0},
+        {"matrix": [5, 2], "x": 6, "y": 0},
+        {"matrix": [5, 12], "x": 7, "y": 0},
+        {"matrix": [6, 12], "x": 8, "y": 0},
+        {"matrix": [6, 2], "x": 9, "y": 0},
+        {"matrix": [3, 10], "x": 10, "y": 0},
+        {"matrix": [4, 14], "x": 11, "y": 0},
+
+        {"matrix": [3, 0], "x": 0, "y": 1},
+        {"matrix": [2, 1], "x": 1, "y": 1},
+        {"matrix": [2, 2], "x": 2, "y": 1},
+        {"matrix": [2, 3], "x": 3, "y": 1},
+        {"matrix": [2, 4], "x": 4, "y": 1},
+        {"matrix": [2, 5], "x": 5, "y": 1},
+        {"matrix": [5, 3], "x": 6, "y": 1},
+        {"matrix": [5, 13], "x": 7, "y": 1},
+        {"matrix": [6, 13], "x": 8, "y": 1},
+        {"matrix": [6, 3], "x": 9, "y": 1},
+        {"matrix": [2, 10], "x": 10, "y": 1},
+        {"matrix": [2, 11], "x": 11, "y": 1},
+
+        {"matrix": [1, 0], "x": 0, "y": 2},
+        {"matrix": [1, 1], "x": 1, "y": 2},
+        {"matrix": [1, 2], "x": 2, "y": 2},
+        {"matrix": [1, 3], "x": 3, "y": 2},
+        {"matrix": [1, 4], "x": 4, "y": 2},
+        {"matrix": [1, 5], "x": 5, "y": 2},
+        {"matrix": [5, 4], "x": 6, "y": 2},
+        {"matrix": [5, 14], "x": 7, "y": 2},
+        {"matrix": [6, 14], "x": 8, "y": 2},
+        {"matrix": [6, 4], "x": 9, "y": 2},
+        {"matrix": [1, 10], "x": 10, "y": 2},
+        {"matrix": [6, 6], "x": 11, "y": 2},
+
+        {"matrix": [2, 0], "x": 0, "y": 3},
+        {"matrix": [0, 0], "x": 1, "y": 3},
+        {"matrix": [0, 1], "x": 2, "y": 3},
+        {"matrix": [0, 2], "x": 3, "y": 3},
+        {"matrix": [0, 4], "x": 4, "y": 3},
+        {"matrix": [0, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [0, 11], "x": 7, "y": 3},
+        {"matrix": [5, 6], "x": 8, "y": 3},
+        {"matrix": [5, 8], "x": 9, "y": 3},
+        {"matrix": [5, 7], "x": 10, "y": 3},
+        {"matrix": [5, 9], "x": 11, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/mt/mt40/mt40.c b/keyboards/mt/mt40/mt40.c
deleted file mode 100644
index dd079e7d81..0000000000
--- a/keyboards/mt/mt40/mt40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mt40.h"
diff --git a/keyboards/mt/mt40/mt40.h b/keyboards/mt/mt40/mt40.h
deleted file mode 100644
index dc0de22b28..0000000000
--- a/keyboards/mt/mt40/mt40.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_planck_mit( \
-    k40, k31, k32, k33, k34, k35, k52, k5C, k6C, k62, k3A, k4E, \
-    k30, k21, k22, k23, k24, k25, k53, k5D, k6D, k63, k2A, k2B, \
-    k10, k11, k12, k13, k14, k15, k54, k5E, k6E, k64, k1A, k66, \
-    k20, k00, k01, k02, k04,    k05,   k0B, k56, k58, k57, k59 \
-) { \
-    { k00, k01, k02, XXX, k04, k05, XXX, XXX, XXX, XXX, XXX, k0B, XXX, XXX, XXX }, \
-    { k10, k11, k12, k13, k14, k15, XXX, XXX, XXX, XXX, k1A, XXX, XXX, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, XXX, k2A, k2B, XXX, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, XXX, XXX, XXX, XXX, k3A, XXX, XXX, XXX, XXX }, \
-    { k40, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4E }, \
-    { XXX, XXX, k52, k53, k54, k05, k56, k57, k58, k59, XXX, XXX, k5C, k5D, k5E }, \
-    { XXX, XXX, k62, k63, k64, XXX, k66, XXX, XXX, XXX, XXX, XXX, k6C, k6D, k6E } \
-}
-
-#define LAYOUT LAYOUT_planck_mit
diff --git a/keyboards/mt/mt40/rules.mk b/keyboards/mt/mt40/rules.mk
index 05b8900231..b50ebe5888 100644
--- a/keyboards/mt/mt40/rules.mk
+++ b/keyboards/mt/mt40/rules.mk
@@ -10,6 +10,5 @@ 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. 
-WS2812_DRIVER = i2c
 
 LAYOUTS_HAS_RGB = no
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index d989525a1b..ec07876c33 100644
--- a/keyboards/mt/mt64rgb/config.h
+++ b/keyboards/mt/mt64rgb/config.h
@@ -15,23 +15,6 @@
   */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, D6, D5, D3, D2 }
-#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6,F5, F4, F1, F0, B1, B2, B3, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
@@ -97,8 +80,6 @@
 
 #endif
 
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -114,7 +95,6 @@
 #define RGBLIGHT_SAT_STEP 5
 #define RGBLIGHT_VAL_STEP 5
 #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mt/mt64rgb/info.json b/keyboards/mt/mt64rgb/info.json
index 20acbceedb..25f1c7082f 100644
--- a/keyboards/mt/mt64rgb/info.json
+++ b/keyboards/mt/mt64rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"],
+        "rows": ["D7", "D6", "D5", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["64_ansi"],
diff --git a/keyboards/mt/mt64rgb/rules.mk b/keyboards/mt/mt64rgb/rules.mk
index 56bc9f5752..f72e92e8a8 100644
--- a/keyboards/mt/mt64rgb/rules.mk
+++ b/keyboards/mt/mt64rgb/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 
 AUDIO_ENABLE = no           # Audio output
 
diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h
index 0eba561a04..1a2d49d734 100644
--- a/keyboards/mt/mt84/config.h
+++ b/keyboards/mt/mt84/config.h
@@ -15,23 +15,6 @@
   */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, D6, D5, D3, D2, D4 }
-#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6,F5, F4, F1, F0, B1, B2, B3, B7, E6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 	#define RGB_MATRIX_KEYPRESSES
 	#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
@@ -100,8 +83,6 @@
 
 #endif
 
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #    define RGBLIGHT_EFFECT_BREATHING
@@ -110,7 +91,6 @@
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mt/mt84/info.json b/keyboards/mt/mt84/info.json
index ad101223aa..0880102dd1 100644
--- a/keyboards/mt/mt84/info.json
+++ b/keyboards/mt/mt84/info.json
@@ -8,12 +8,113 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3737"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "E6"],
+        "rows": ["D7", "D6", "D5", "D3", "D2", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi"],
     "layouts": {
        "LAYOUT_75_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5},
+                {"matrix": [5, 10], "x": 11, "y": 5},
+                {"matrix": [5, 11], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
+            ]
         }
     }
 }
diff --git a/keyboards/mt/mt84/mt84.c b/keyboards/mt/mt84/mt84.c
index 049878419f..fcbf65cf46 100644
--- a/keyboards/mt/mt84/mt84.c
+++ b/keyboards/mt/mt84/mt84.c
@@ -13,7 +13,7 @@
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
-#include "mt84.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mt/mt84/mt84.h b/keyboards/mt/mt84/mt84.h
deleted file mode 100644
index d3de007c94..0000000000
--- a/keyboards/mt/mt84/mt84.h
+++ /dev/null
@@ -1,35 +0,0 @@
-   /* Copyright 2020 MaiKong<704340378@qq.com>
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_75_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k4E, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,\
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E,\
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,          k3E, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, \
-    k50, k51, k52,                k55,                         k59, k5A, k5B, k5C, k5D, k5E \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, k3E}, \
-    {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E}, \
-    {k50, k51, k52, KC_NO,KC_NO, k55, KC_NO,KC_NO,KC_NO, k59, k5A, k5B, k5C, k5D, k5E} \
-}
diff --git a/keyboards/mt/mt84/rules.mk b/keyboards/mt/mt84/rules.mk
index fc03a2e534..03f1dd8986 100644
--- a/keyboards/mt/mt84/rules.mk
+++ b/keyboards/mt/mt84/rules.mk
@@ -9,7 +9,6 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGB_MATRIX_ENABLE = yes     # Use RGB Matrix
-RGB_MATRIX_DRIVER = IS31FL3737
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h
index 8a5dbe68f8..b1268b2b59 100644
--- a/keyboards/mt/mt980/config.h
+++ b/keyboards/mt/mt980/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -31,4 +21,3 @@
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 185
-#endif
diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json
index 59afd26650..2e291fc69b 100644
--- a/keyboards/mt/mt980/info.json
+++ b/keyboards/mt/mt980/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+    "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"]
+  },
+  "diode_direction": "ROW2COL",
   "backlight": {
     "pin": "B6"
   },
@@ -17,6 +22,9 @@
     "scroll_lock": "B5",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "bootmagic": {
     "matrix": [5, 0]
   },
diff --git a/keyboards/mt/mt980/mt980.c b/keyboards/mt/mt980/mt980.c
deleted file mode 100644
index 69f7cc491a..0000000000
--- a/keyboards/mt/mt980/mt980.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "mt980.h"
diff --git a/keyboards/mt/ncr80/hotswap/config.h b/keyboards/mt/ncr80/hotswap/config.h
index 65ca63af7e..1bc6c9f937 100644
--- a/keyboards/mt/ncr80/hotswap/config.h
+++ b/keyboards/mt/ncr80/hotswap/config.h
@@ -17,23 +17,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- */
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,4 +32,3 @@
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 180
-#endif
diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json
index ed288b9e8d..a6201ad430 100644
--- a/keyboards/mt/ncr80/hotswap/info.json
+++ b/keyboards/mt/ncr80/hotswap/info.json
@@ -8,12 +8,20 @@
         "pid": "0x2002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "C6",
         "num_lock": "B5",
         "scroll_lock": "C7",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mt/ncr80/solder/config.h b/keyboards/mt/ncr80/solder/config.h
deleted file mode 100644
index c6828a9323..0000000000
--- a/keyboards/mt/ncr80/solder/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 Jordan Duabe
- * Copyright 2022 peepeetee
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- */
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mt/ncr80/solder/info.json b/keyboards/mt/ncr80/solder/info.json
index 2005f45d48..aea6232991 100644
--- a/keyboards/mt/ncr80/solder/info.json
+++ b/keyboards/mt/ncr80/solder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 5
diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/info.json
index e97d70bf3b..53604882e3 100644
--- a/keyboards/mt/split75/info.json
+++ b/keyboards/mt/split75/info.json
@@ -11,6 +11,9 @@
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1",
         "num_lock": "D0",
@@ -23,7 +26,7 @@
             "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"|", "x":16.75, "y":2, "w":1.5}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3, "w":2.25}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":2.25}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}]
         },
         "LAYOUT_iso": {
-            "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3},  {"label":"'", "x":16, "y":3}, {"label":"Enter", "x":17, "y":2, "w":1.25, "h":2}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":1.25}, {"label":"|", "x":3.5, "y":4, "w":1}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}]
+            "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3},  {"label":"'", "x":16, "y":3}, {"label":"Enter", "x":17, "y":2, "w":1.25, "h":2}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":1.25}, {"label":"|", "x":3.5, "y":4}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}]
         }
     }
 }
diff --git a/keyboards/mt/split75/rules.mk b/keyboards/mt/split75/rules.mk
index ebcb8a1159..f616b9400e 100644
--- a/keyboards/mt/split75/rules.mk
+++ b/keyboards/mt/split75/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
 
 # custom matrix setup
 CUSTOM_MATRIX = lite
diff --git a/keyboards/mt/split75/split75.c b/keyboards/mt/split75/split75.c
deleted file mode 100644
index 890c9d1de3..0000000000
--- a/keyboards/mt/split75/split75.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Artjoms Rizihs (@artjomsR)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "split75.h"
diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h
index a1b98373b4..e062eaef89 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/config.h
+++ b/keyboards/mtbkeys/mtb60/hotswap/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pinout */
-#define MATRIX_ROW_PINS { D6, D7, B4, B5, D5 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, B7, B6, F7, C6, C7, F6, F4, F1, F0, F5, E6 }
-
-/* diode direction: COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Pin WS2812 RGB LEDs are connected to */
-#define RGB_DI_PIN D4
-
-#ifdef RGB_DI_PIN
 #   define RGBLED_NUM 16
 #   define RGBLIGHT_HUE_STEP 8
 #   define RGBLIGHT_SAT_STEP 8
@@ -46,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #   define RGBLIGHT_EFFECT_TWINKLE
 #   define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */
-#endif /* RGB_DI_PIN */
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mtbkeys/mtb60/hotswap/hotswap.c b/keyboards/mtbkeys/mtb60/hotswap/hotswap.c
deleted file mode 100644
index f23de6af54..0000000000
--- a/keyboards/mtbkeys/mtb60/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 MTBKeys
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hotswap.h"
diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
index 6f5da086d0..f9f86f9b02 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/info.json
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "B7", "B6", "F7", "C6", "C7", "F6", "F4", "F1", "F0", "F5", "E6"],
+        "rows": ["D6", "D7", "B4", "B5", "D5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h
index 4d14b392f0..e062eaef89 100644
--- a/keyboards/mtbkeys/mtb60/solder/config.h
+++ b/keyboards/mtbkeys/mtb60/solder/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pinout */
-#define MATRIX_ROW_PINS { D0, D1, F4, F1, D2 }
-#define MATRIX_COL_PINS { E6, F0, F5, F6, F7, D5, D3, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* diode direction: COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Pin WS2812 RGB LEDs are connected to */
-#define RGB_DI_PIN B0
-
-#ifdef RGB_DI_PIN
 #   define RGBLED_NUM 16
 #   define RGBLIGHT_HUE_STEP 8
 #   define RGBLIGHT_SAT_STEP 8
@@ -46,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #   define RGBLIGHT_EFFECT_TWINKLE
 #   define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */
-#endif /* RGB_DI_PIN */
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json
index 2f97a88913..2769bc084e 100644
--- a/keyboards/mtbkeys/mtb60/solder/info.json
+++ b/keyboards/mtbkeys/mtb60/solder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F5", "F6", "F7", "D5", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D0", "D1", "F4", "F1", "D2"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/mtbkeys/mtb60/solder/solder.c b/keyboards/mtbkeys/mtb60/solder/solder.c
deleted file mode 100644
index 9bb7f2b98e..0000000000
--- a/keyboards/mtbkeys/mtb60/solder/solder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 MTBKeys
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "solder.h"
diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json
index b54258280b..1c9eaef3a1 100644
--- a/keyboards/murcielago/info.json
+++ b/keyboards/murcielago/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0001",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["C6", "B6", "B5", "D7", "D6", "D4"],
+    "rows": ["B4", "D5", "B3", "B2", "B1", "B0"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "F0", "pin_b": "F1"}
@@ -21,6 +26,12 @@
           {"pin_a": "F6", "pin_b": "F7"}
         ]
       }
+    },
+    "matrix_pins": {
+      "right": {
+        "cols": ["D6", "D7", "D3", "B2", "B1", "B0"],
+        "rows": ["B3", "B7", "D4", "B6", "C6", "C7"]
+      }
     }
   },
   "processor": "atmega32u4",
@@ -31,50 +42,50 @@
         {"label":"0,0", "x":0, "y":0.425},
         {"label":"0,1", "x":1, "y":0.25},
         {"label":"0,2", "x":2, "y":0.125},
-        {"label":"0,3", "x":3, "y":0.0},
+        {"label":"0,3", "x":3, "y":0},
         {"label":"0,4", "x":4, "y":0.125},
         {"label":"0,5", "x":5, "y":0.25},
         {"label":"6,0", "x":9, "y":0.25},
         {"label":"6,1", "x":10, "y":0.125},
-        {"label":"6,2", "x":11, "y":0.0},
+        {"label":"6,2", "x":11, "y":0},
         {"label":"6,3", "x":12, "y":0.125},
         {"label":"6,4", "x":13, "y":0.25},
         {"label":"6,5", "x":14, "y":0.425},
         {"label":"1,0", "x":0, "y":1.425},
         {"label":"1,1", "x":1, "y":1.25},
         {"label":"1,2", "x":2, "y":1.125},
-        {"label":"1,3", "x":3, "y":1.0},
+        {"label":"1,3", "x":3, "y":1},
         {"label":"1,4", "x":4, "y":1.125},
         {"label":"1,5", "x":5, "y":1.25},
         {"label":"7,0", "x":9, "y":1.25},
         {"label":"7,1", "x":10, "y":1.125},
-        {"label":"7,2", "x":11, "y":1.0},
+        {"label":"7,2", "x":11, "y":1},
         {"label":"7,3", "x":12, "y":1.125},
         {"label":"7,4", "x":13, "y":1.25},
         {"label":"7,5", "x":14, "y":1.425},
         {"label":"2,0", "x":0, "y":2.425},
         {"label":"2,1", "x":1, "y":2.25},
         {"label":"2,2", "x":2, "y":2.125},
-        {"label":"2,3", "x":3, "y":2.0},
+        {"label":"2,3", "x":3, "y":2},
         {"label":"2,4", "x":4, "y":2.125},
         {"label":"2,5", "x":5, "y":2.25},
         {"label":"8,0", "x":9, "y":2.25},
         {"label":"8,1", "x":10, "y":2.125},
-        {"label":"8,2", "x":11, "y":2.0},
+        {"label":"8,2", "x":11, "y":2},
         {"label":"8,3", "x":12, "y":2.125},
         {"label":"8,4", "x":13, "y":2.25},
         {"label":"8,5", "x":14, "y":2.425},
         {"label":"3,0", "x":0, "y":3.425},
         {"label":"3,1", "x":1, "y":3.25},
         {"label":"3,2", "x":2, "y":3.125},
-        {"label":"3,3", "x":3, "y":3.0},
+        {"label":"3,3", "x":3, "y":3},
         {"label":"3,4", "x":4, "y":3.125},
         {"label":"3,5", "x":5, "y":3.25},
         {"label":"5,5", "x":6, "y":3.25},
         {"label":"11,0", "x":8, "y":3.25},
         {"label":"9,0", "x":9, "y":3.25},
         {"label":"9,1", "x":10, "y":3.125},
-        {"label":"9,2", "x":11, "y":3.0},
+        {"label":"9,2", "x":11, "y":3},
         {"label":"9,3", "x":12, "y":3.125},
         {"label":"9,4", "x":13, "y":3.25},
         {"label":"9,5", "x":14, "y":3.425},
diff --git a/keyboards/murcielago/murcielago.c b/keyboards/murcielago/murcielago.c
deleted file mode 100644
index 30215c69cd..0000000000
--- a/keyboards/murcielago/murcielago.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 elagil
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "murcielago.h"
\ No newline at end of file
diff --git a/keyboards/murcielago/rev1/config.h b/keyboards/murcielago/rev1/config.h
index f334ebc63f..156f708632 100644
--- a/keyboards/murcielago/rev1/config.h
+++ b/keyboards/murcielago/rev1/config.h
@@ -21,24 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 #define SPLIT_USB_DETECT
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, D5, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { C6, B6, B5, D7, D6, D4 }
-#define MATRIX_ROW_PINS_RIGHT { B3, B7, D4, B6, C6, C7 }
-#define MATRIX_COL_PINS_RIGHT { D6, D7, D3, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mwstudio/alicekk/alicekk.c b/keyboards/mwstudio/alicekk/alicekk.c
index 96c468066a..e8ab40b2b9 100644
--- a/keyboards/mwstudio/alicekk/alicekk.c
+++ b/keyboards/mwstudio/alicekk/alicekk.c
@@ -14,17 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "alicekk.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h
index 290871bde5..53ac3aa161 100644
--- a/keyboards/mwstudio/alicekk/config.h
+++ b/keyboards/mwstudio/alicekk/config.h
@@ -16,19 +16,8 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A3, A5, A6, A7, B0 }
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, A4, A2, A1, B6, B5, B4, B3, A15 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 #define FORCE_NKRO
 
-
-#define RGB_DI_PIN B1
-
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGBLED_NUM 87
diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json
index ec0d58b07e..b88dd97b3a 100644
--- a/keyboards/mwstudio/alicekk/info.json
+++ b/keyboards/mwstudio/alicekk/info.json
@@ -6,11 +6,19 @@
         "pid": "0x3201",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "A4", "A2", "A1", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["A3", "A5", "A6", "A7", "B0"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B11", "pin_b": "B10"}
         ]
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
diff --git a/keyboards/mwstudio/alicekk/keymaps/via/keymap.c b/keyboards/mwstudio/alicekk/keymaps/via/keymap.c
index 6c21e053fa..92e893d5c5 100644
--- a/keyboards/mwstudio/alicekk/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/alicekk/keymaps/via/keymap.c
@@ -63,7 +63,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -75,7 +76,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/mwstudio/mw65_black/config.h b/keyboards/mwstudio/mw65_black/config.h
index 79d1d5e1b2..f987360d4a 100644
--- a/keyboards/mwstudio/mw65_black/config.h
+++ b/keyboards/mwstudio/mw65_black/config.h
@@ -16,18 +16,7 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, D7, B4, B3, B6 }
-#define MATRIX_COL_PINS { B0, B1, B2, D0, D1, D2, D3, D5, C6, F7, F4, F6, F5, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 21
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json
index 23151df686..3e433aff92 100644
--- a/keyboards/mwstudio/mw65_black/info.json
+++ b/keyboards/mwstudio/mw65_black/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6500",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "D0", "D1", "D2", "D3", "D5", "C6", "F7", "F4", "F6", "F5", "F1", "F0"],
+        "rows": ["D4", "D7", "B4", "B3", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "E6", "pin_b": "D6"}
diff --git a/keyboards/mwstudio/mw65_rgb/config.h b/keyboards/mwstudio/mw65_rgb/config.h
index 2a90d77ee9..ebde358b49 100644
--- a/keyboards/mwstudio/mw65_rgb/config.h
+++ b/keyboards/mwstudio/mw65_rgb/config.h
@@ -16,17 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, B7 }
-#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, C7, F7, F6, F5, F4, F1, F0, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* RGB Matrix config */
-#define RGB_DI_PIN B3
-
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT 83
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json
index ee00dd70c1..f4c1a50672 100644
--- a/keyboards/mwstudio/mw65_rgb/info.json
+++ b/keyboards/mwstudio/mw65_rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x6502",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
+        "rows": ["D0", "D1", "D2", "D3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B2"}
diff --git a/keyboards/mwstudio/mw65_rgb/rules.mk b/keyboards/mwstudio/mw65_rgb/rules.mk
index b7a0f357da..faabb5cad7 100644
--- a/keyboards/mwstudio/mw65_rgb/rules.mk
+++ b/keyboards/mwstudio/mw65_rgb/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 ENCODER_ENABLE = yes
diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h
index f9040f64ad..9603e1db2b 100644
--- a/keyboards/mwstudio/mw660/config.h
+++ b/keyboards/mwstudio/mw660/config.h
@@ -18,8 +18,6 @@
 
 #define FORCE_NKRO
 
-
-#define RGB_DI_PIN B8
 #define DRIVER_LED_TOTAL 34
 #define RGBLED_NUM 34
 
diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/info.json
index 7e7b9609ff..8bf0f3f2fc 100644
--- a/keyboards/mwstudio/mw660/info.json
+++ b/keyboards/mwstudio/mw660/info.json
@@ -12,6 +12,9 @@
         "nkro": true,
         "rgblight": true
     },
+    "ws2812": {
+        "pin": "B8"
+    },
     "matrix_pins": {
         "cols": ["A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7" ],
         "rows": ["A3", "A4", "A5", "A6", "A2" ]
diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h
index 4cb7a8a22c..0a9b073ce1 100644
--- a/keyboards/mwstudio/mw75/config.h
+++ b/keyboards/mwstudio/mw75/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5, B0}
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B3
 #define RGBLIGHT_SLEEP
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json
index 866f488a6e..aaac84fcb1 100644
--- a/keyboards/mwstudio/mw75/info.json
+++ b/keyboards/mwstudio/mw75/info.json
@@ -8,6 +8,14 @@
         "pid": "0x7501",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
+        "rows": ["B7", "D0", "D1", "D2", "D3", "D5", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B2"}
@@ -16,6 +24,9 @@
     "bootmagic": {
         "matrix": [0, 1]
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/mwstudio/mw75/rules.mk b/keyboards/mwstudio/mw75/rules.mk
index 067e1df2ae..041f588c14 100644
--- a/keyboards/mwstudio/mw75/rules.mk
+++ b/keyboards/mwstudio/mw75/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h
index b5f4500d58..ded31181aa 100644
--- a/keyboards/mwstudio/mw75r2/config.h
+++ b/keyboards/mwstudio/mw75r2/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5}
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D4, D6, F7, F6, E6, F0, F1, F4, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B3
 #define RGBLIGHT_SLEEP
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json
index 4d794246eb..c66145d731 100644
--- a/keyboards/mwstudio/mw75r2/info.json
+++ b/keyboards/mwstudio/mw75r2/info.json
@@ -8,6 +8,17 @@
         "pid": "0x7502",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "F7", "F6", "E6", "F0", "F1", "F4", "F5"],
+        "rows": ["B7", "D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B2"}
diff --git a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
index 7b7e1877f5..633629abc7 100644
--- a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
@@ -115,7 +115,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -127,7 +128,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/mwstudio/mw75r2/rules.mk b/keyboards/mwstudio/mw75r2/rules.mk
index 067e1df2ae..041f588c14 100644
--- a/keyboards/mwstudio/mw75r2/rules.mk
+++ b/keyboards/mwstudio/mw75r2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
diff --git a/keyboards/mwstudio/mw80/info.json b/keyboards/mwstudio/mw80/info.json
index 04d50a8aa4..0b0a9717d3 100644
--- a/keyboards/mwstudio/mw80/info.json
+++ b/keyboards/mwstudio/mw80/info.json
@@ -22,9 +22,12 @@
     "indicators": {
         "caps_lock": "A0"
     },
+    "ws2812": {
+        "pin": "B8",
+        "driver": "pwm"
+    },
     "rgblight": {
         "led_count": 16,
-        "pin": "B8",
         "hue_steps": 10,
         "saturation_steps": 17,
         "brightness_steps": 17,
diff --git a/keyboards/mwstudio/mw80/mw80.c b/keyboards/mwstudio/mw80/mw80.c
deleted file mode 100644
index e402f305ec..0000000000
--- a/keyboards/mwstudio/mw80/mw80.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2022 TW59420 <https://github.com/TW59420>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/mwstudio/mw80/rules.mk b/keyboards/mwstudio/mw80/rules.mk
index 0ee3c1c5ee..e69de29bb2 100644
--- a/keyboards/mwstudio/mw80/rules.mk
+++ b/keyboards/mwstudio/mw80/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = pwm
\ No newline at end of file
diff --git a/keyboards/mxss/config.h b/keyboards/mxss/config.h
index 14ed456ecf..d33ee88ce8 100644
--- a/keyboards/mxss/config.h
+++ b/keyboards/mxss/config.h
@@ -17,16 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* matrix pin configuration */
-#define MATRIX_ROW_PINS { F4, F1, F7, B1, B7 }
-#define MATRIX_COL_PINS { D7, D6, D4, D0, C6, B6, D1, B5, D2, B4, D3, D5, B0, B2, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Basic RGB configuration */
-#define RGB_DI_PIN C7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mxss/info.json b/keyboards/mxss/info.json
index 8bc0277016..a69292473e 100644
--- a/keyboards/mxss/info.json
+++ b/keyboards/mxss/info.json
@@ -8,6 +8,14 @@
     "pid": "0x5353",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "C7"
+  },
+  "matrix_pins": {
+    "cols": ["D7", "D6", "D4", "D0", "C6", "B6", "D1", "B5", "D2", "B4", "D3", "D5", "B0", "B2", "B3"],
+    "rows": ["F4", "F1", "F7", "B1", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/mxss/mxss.c b/keyboards/mxss/mxss.c
index 21beee232c..3bd3e639c9 100644
--- a/keyboards/mxss/mxss.c
+++ b/keyboards/mxss/mxss.c
@@ -16,7 +16,7 @@
  * EEPROM management code from ../cannonkeys/stm32f072/keyboard.c
  */
 
-#include QMK_KEYBOARD_H
+#include "mxss.h"
 #include "eeprom.h"
 #include "action_layer.h"
 #include "rgblight.h"
diff --git a/keyboards/mysticworks/wyvern/config.h b/keyboards/mysticworks/wyvern/config.h
index 3d2aab65c7..d025a3d4de 100644
--- a/keyboards/mysticworks/wyvern/config.h
+++ b/keyboards/mysticworks/wyvern/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS {D0,D1,D5,D3,F7,F6,F5,F4,F1,F0}
-#define MATRIX_COL_PINS {E6,B0,D4,D6,D7,B4,B5,B6,C6,C7}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mysticworks/wyvern/info.json b/keyboards/mysticworks/wyvern/info.json
index f2307c1f03..2150a691a8 100644
--- a/keyboards/mysticworks/wyvern/info.json
+++ b/keyboards/mysticworks/wyvern/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["D0", "D1", "D5", "D3", "F7", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/mysticworks/wyvern/wyvern.c b/keyboards/mysticworks/wyvern/wyvern.c
deleted file mode 100644
index 015fb5ff05..0000000000
--- a/keyboards/mysticworks/wyvern/wyvern.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Albert Dong <albert@mysticworks.xyz>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "wyvern.h"
-
diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h
index 95bf0d9b87..7240672afe 100644
--- a/keyboards/nack/config.h
+++ b/keyboards/nack/config.h
@@ -17,16 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A0, A1, A2, A3 }
-#define MATRIX_COL_PINS { A6, A7, A8, A9, A10, B0, B1, B2, B6, B7, C13, C14, C15 }
-
-#define DIODE_DIRECTION ROW2COL
 #define TAPPING_TOGGLE 2
 
 #ifdef RGB_MATRIX_ENABLE
     #define WS2812_SPI SPID1
     #define WS2812_SPI_MOSI_PAL_MODE 5
-    #define RGB_DI_PIN B5
     #define RGBLED_NUM 52
     #define RGB_MATRIX_LED_COUNT RGBLED_NUM
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 // Max brightness of LEDs
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
index 3ece3f5dba..827e0fec0e 100644
--- a/keyboards/nack/info.json
+++ b/keyboards/nack/info.json
@@ -8,6 +8,18 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5",
+        "driver": "spi"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "A8", "A9", "A10", "B0", "B1", "B2", "B6", "B7", "C13", "C14", "C15"],
+        "rows": ["A0", "A1", "A2", "A3"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
@@ -17,61 +29,61 @@
     "layouts": {
         "LAYOUT_ortho_4x13": {
             "layout": [
-                {"label":"Tab", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"Ã…", "x":11, "y":0},
-                {"label":"¨", "x":12, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
 
-                {"label":"Esc", "x":0, "y":1},
-                {"label":"A", "x":1, "y":1},
-                {"label":"S", "x":2, "y":1},
-                {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1},
-                {"label":"G", "x":5, "y":1},
-                {"label":"H", "x":6, "y":1},
-                {"label":"J", "x":7, "y":1},
-                {"label":"K", "x":8, "y":1},
-                {"label":"L", "x":9, "y":1},
-                {"label":"Ö", "x":10, "y":1},
-                {"label":"Ä", "x":11, "y":1},
-                {"label":"'", "x":12, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
 
-                {"label":"Shift", "x":0, "y":2},
-                {"label":"Z", "x":1, "y":2},
-                {"label":"X", "x":2, "y":2},
-                {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2},
-                {"label":"B", "x":5, "y":2},
-                {"label":"N", "x":6, "y":2},
-                {"label":"M", "x":7, "y":2},
-                {"label":",", "x":8, "y":2},
-                {"label":".", "x":9, "y":2},
-                {"label":"-", "x":10, "y":2},
-                {"label":"Up", "x":11, "y":2},
-                {"label":"Backspace", "x":12, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
 
-                {"label":"Ctrl", "x":0, "y":3},
-                {"label":"Alt", "x":1, "y":3},
-                {"label":"GUI", "x":2, "y":3},
-                {"label":"Fn1", "x":3, "y":3},
-                {"label":"Space", "x":4, "y":3},
-                {"label":"NoOp", "x":5, "y":3},
-                {"label":"Fn2", "x":6, "y":3},
-                {"label":"Alt Gr", "x":7, "y":3},
-                {"label":"<", "x":8, "y":3},
-                {"label":"Enter", "x":9, "y":3},
-                {"label":"Left", "x":10, "y":3},
-                {"label":"Down", "x":11, "y":3},
-                {"label":"Right", "x":12, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/nack/nack.c b/keyboards/nack/nack.c
index 8433e551c4..27e029a9fd 100644
--- a/keyboards/nack/nack.c
+++ b/keyboards/nack/nack.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
     led_config_t g_led_config = { {
@@ -37,4 +37,3 @@
       4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
     } };
 #endif
-
diff --git a/keyboards/nack/nack.h b/keyboards/nack/nack.h
deleted file mode 100644
index b409d40df3..0000000000
--- a/keyboards/nack/nack.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x13( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,\
-    k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25,\
-    k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38,\
-    k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51\
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12 },\
-    { k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25 },\
-    { k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38 },\
-    { k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51 },\
-}
diff --git a/keyboards/nack/rules.mk b/keyboards/nack/rules.mk
index ff4148699a..d2558648dd 100644
--- a/keyboards/nack/rules.mk
+++ b/keyboards/nack/rules.mk
@@ -11,7 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = spi
 AUDIO_DRIVER = dac_basic 	# How to drive the 2 speakers
 UNICODE_ENABLE = yes        # Unicode support
diff --git a/keyboards/nacly/sodium42/config.h b/keyboards/nacly/sodium42/config.h
index 690f7c96f9..1bbaec44c6 100644
--- a/keyboards/nacly/sodium42/config.h
+++ b/keyboards/nacly/sodium42/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F7, D4, D7, B4 }
-#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN F4
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json
index 752f5c5372..255d4e85e2 100644
--- a/keyboards/nacly/sodium42/info.json
+++ b/keyboards/nacly/sodium42/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFED0",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "C6", "E6", "B5", "B2", "B3"],
+        "rows": ["F7", "D4", "D7", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D3"
     },
diff --git a/keyboards/nacly/sodium42/sodium42.c b/keyboards/nacly/sodium42/sodium42.c
deleted file mode 100644
index 980b123bac..0000000000
--- a/keyboards/nacly/sodium42/sodium42.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 NaCly
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "sodium42.h"
diff --git a/keyboards/nacly/sodium50/config.h b/keyboards/nacly/sodium50/config.h
index 55abbac4d1..1bbaec44c6 100644
--- a/keyboards/nacly/sodium50/config.h
+++ b/keyboards/nacly/sodium50/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F7, D4, D7, B4}
-#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3, B1 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN F4
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json
index 6e2e6d5aef..182162e39f 100644
--- a/keyboards/nacly/sodium50/info.json
+++ b/keyboards/nacly/sodium50/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFED0",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"],
+        "rows": ["F7", "D4", "D7", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D3"
     },
diff --git a/keyboards/nacly/sodium50/sodium50.c b/keyboards/nacly/sodium50/sodium50.c
deleted file mode 100644
index 74b2b5e16c..0000000000
--- a/keyboards/nacly/sodium50/sodium50.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 NaCly
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "sodium50.h"
diff --git a/keyboards/nacly/sodium62/config.h b/keyboards/nacly/sodium62/config.h
index 5e24b062cf..c526c9c9c5 100644
--- a/keyboards/nacly/sodium62/config.h
+++ b/keyboards/nacly/sodium62/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F7, D4, D7, B4, B6 }
-#define MATRIX_COL_PINS { D2, C6, E6, B5, B2, B3, B1 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN F4
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json
index bf9a50ded2..07e380569b 100644
--- a/keyboards/nacly/sodium62/info.json
+++ b/keyboards/nacly/sodium62/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFED0",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"],
+        "rows": ["F7", "D4", "D7", "B4", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D3"
     },
diff --git a/keyboards/nacly/splitreus62/config.h b/keyboards/nacly/splitreus62/config.h
index b7b0ec0d30..9c6773547e 100644
--- a/keyboards/nacly/splitreus62/config.h
+++ b/keyboards/nacly/splitreus62/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D3, D2, D1, D4, C6, D7 }
-#define MATRIX_COL_PINS { E6, B4, B5, B6, B2, B3 }
-
-#define DIODE_DIRECTION ROW2COL
-
 #define SPLIT_HAND_PIN F4
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -32,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN B1
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 #define RGBLED_SPLIT { 6, 6 }
diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json
index a3a3c88e0b..e8361decda 100644
--- a/keyboards/nacly/splitreus62/info.json
+++ b/keyboards/nacly/splitreus62/info.json
@@ -8,9 +8,17 @@
       "pid": "0xFED0",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B5", "B6", "B2", "B3"],
+        "rows": ["D3", "D2", "D1", "D4", "C6", "D7"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
       "soft_serial_pin": "D0"
     },
+    "ws2812": {
+      "pin": "B1"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/nacly/splitreus62/splitreus62.c b/keyboards/nacly/splitreus62/splitreus62.c
deleted file mode 100644
index d6ea3f9135..0000000000
--- a/keyboards/nacly/splitreus62/splitreus62.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "splitreus62.h"
diff --git a/keyboards/nacly/ua62/config.h b/keyboards/nacly/ua62/config.h
index 882bda8ccf..0391f174c9 100644
--- a/keyboards/nacly/ua62/config.h
+++ b/keyboards/nacly/ua62/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nacly/ua62/info.json b/keyboards/nacly/ua62/info.json
index d7bbd11265..82e284ebe7 100644
--- a/keyboards/nacly/ua62/info.json
+++ b/keyboards/nacly/ua62/info.json
@@ -8,6 +8,11 @@
       "pid": "0xFFFF",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D3", "D2", "D1", "D0", "D4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/nacly/ua62/ua62.c b/keyboards/nacly/ua62/ua62.c
deleted file mode 100644
index cac45f3fbf..0000000000
--- a/keyboards/nacly/ua62/ua62.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 NaCly
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ua62.h"
-
diff --git a/keyboards/nasu/config.h b/keyboards/nasu/config.h
index 8fcc31d7ff..185f725cb4 100644
--- a/keyboards/nasu/config.h
+++ b/keyboards/nasu/config.h
@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A13, A10, B10, B2, A6 }
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B8, B7, B6, B5, B4, B3, A15, A14 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/nasu/info.json b/keyboards/nasu/info.json
index 363d8a3052..1765cab0be 100644
--- a/keyboards/nasu/info.json
+++ b/keyboards/nasu/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4E53",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "A10", "B10", "B2", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B1",
         "num_lock": "B0",
@@ -20,78 +25,154 @@
     "bootloader": "stm32-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
     "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [3, 0], "x": 30, "y": 0},
+                {"matrix": [2, 1], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [3, 1], "x": 44, "y": 0},
+                {"matrix": [3, 2], "x": 45, "y": 0},
+                {"matrix": [3, 3], "x": 46, "y": 0},
+                {"matrix": [3, 4], "x": 47, "y": 0},
+                {"matrix": [3, 5], "x": 48, "y": 0},
+                {"matrix": [3, 6], "x": 49, "y": 0},
+                {"matrix": [3, 7], "x": 50, "y": 0},
+                {"matrix": [3, 8], "x": 51, "y": 0},
+                {"matrix": [3, 9], "x": 52, "y": 0},
+                {"matrix": [3, 10], "x": 53, "y": 0},
+                {"matrix": [3, 11], "x": 54, "y": 0},
+                {"matrix": [3, 12], "x": 55, "y": 0},
+                {"matrix": [3, 13], "x": 56, "y": 0},
+                {"matrix": [3, 14], "x": 57, "y": 0},
+                {"matrix": [4, 1], "x": 58, "y": 0},
+                {"matrix": [4, 3], "x": 59, "y": 0},
+                {"matrix": [4, 5], "x": 60, "y": 0},
+                {"matrix": [4, 6], "x": 61, "y": 0},
+                {"matrix": [4, 8], "x": 62, "y": 0},
+                {"matrix": [4, 10], "x": 63, "y": 0},
+                {"matrix": [4, 14], "x": 64, "y": 0}
+            ]
+        },
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":10.25, "y":0},
-                {"x":11.25, "y":0},
-                {"x":12.25, "y":0},
-                {"x":13.25, "y":0},
-                {"x":14.25, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
 
-                {"x":0, "y":1},
-                {"x":1.25, "y":1, "w":1.5},
-                {"x":2.75, "y":1},
-                {"x":3.75, "y":1},
-                {"x":4.75, "y":1},
-                {"x":5.75, "y":1},
-                {"x":6.75, "y":1},
-                {"x":9.75, "y":1},
-                {"x":10.75, "y":1},
-                {"x":11.75, "y":1},
-                {"x":12.75, "y":1},
-                {"x":13.75, "y":1},
-                {"x":14.75, "y":1},
-                {"x":15.75, "y":1},
-                {"x":16.75, "y":1, "w":1.5},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
 
-                {"x":0, "y":2},
-                {"x":1.25, "y":2, "w":1.75},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
-                {"x":15, "y":2},
-                {"x":16, "y":2, "w":2.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
 
-                {"x":1.25, "y":3, "w":2.25},
-                {"x":3.5, "y":3},
-                {"x":4.5, "y":3},
-                {"x":5.5, "y":3},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3},
-                {"x":9.5, "y":3},
-                {"x":10.5, "y":3},
-                {"x":11.5, "y":3},
-                {"x":12.5, "y":3},
-                {"x":13.5, "y":3},
-                {"x":14.5, "y":3},
-                {"x":15.5, "y":3, "w":1.75},
-                {"x":17.25, "y":3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
 
-                {"x":1.25, "y":4, "w":1.5},
-                {"x":4.25, "y":4, "w":1.5},
-                {"x":5.75, "y":4, "w":2},
-                {"x":7.75, "y":4, "w":1.25},
-                {"x":9.5, "y":4, "w":2.75},
-                {"x":12.25, "y":4, "w":1.5},
-                {"x":16.75, "y":4, "w":1.5}
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/nasu/nasu.c b/keyboards/nasu/nasu.c
deleted file mode 100644
index e7ae6a369e..0000000000
--- a/keyboards/nasu/nasu.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "nasu.h"
diff --git a/keyboards/nasu/nasu.h b/keyboards/nasu/nasu.h
deleted file mode 100644
index 41bd1212f6..0000000000
--- a/keyboards/nasu/nasu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K10, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K20, K11, K12, K13, K14, K15, K16,      K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      \
-    K30, K21, K22, K23, K24, K25, K26,      K27, K28, K29, K2A, K2B, K2C,      K2E,      \
-         K31, K32, K33, K34, K35, K36,      K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-         K41,      K43,      K45, K46,           K48,      K4A,                K4E       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E }  \
-}
-
-#define LAYOUT_alice( \
-    K10, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K20, K11, K12, K13, K14, K15, K16,      K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      \
-    K30, K21, K22, K23, K24, K25, K26,      K27, K28, K29, K2A, K2B, K2C,      K2E,      \
-         K31, K32, K33, K34, K35, K36,      K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-         K41,      K43,      K45, K46,           K48,      K4A,                K4E       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E }  \
-}
diff --git a/keyboards/ncc1701kb/config.h b/keyboards/ncc1701kb/config.h
index adfe863976..bd03d32227 100644
--- a/keyboards/ncc1701kb/config.h
+++ b/keyboards/ncc1701kb/config.h
@@ -17,12 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* NCC-1701-KB PCB default pin-out */
-#define MATRIX_ROW_PINS { D4, D6, D7 }
-#define MATRIX_COL_PINS { B4, B5, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 #define TAPPING_TERM 200
diff --git a/keyboards/ncc1701kb/info.json b/keyboards/ncc1701kb/info.json
index 828eefef02..246edae947 100644
--- a/keyboards/ncc1701kb/info.json
+++ b/keyboards/ncc1701kb/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1701",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B4", "B5", "B6"],
+    "rows": ["D4", "D6", "D7"]
+  },
+  "diode_direction": "ROW2COL",
   "backlight": {
     "pin": "B7",
     "breathing": true
@@ -22,15 +27,17 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0},
-        {"label":"Encoder", "x":1, "y":0},
-        {"x":2, "y":0},
-        {"x":0, "y":1},
-        {"x":1, "y":1},
-        {"x":2, "y":1},
-        {"x":0, "y":2},
-        {"x":1, "y":2},
-        {"x":2, "y":2}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2}
       ]
     }
   }
diff --git a/keyboards/ncc1701kb/ncc1701kb.c b/keyboards/ncc1701kb/ncc1701kb.c
deleted file mode 100644
index b654ece5ac..0000000000
--- a/keyboards/ncc1701kb/ncc1701kb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ncc1701kb.h"
diff --git a/keyboards/ncc1701kb/ncc1701kb.h b/keyboards/ncc1701kb/ncc1701kb.h
deleted file mode 100644
index 639adc409d..0000000000
--- a/keyboards/ncc1701kb/ncc1701kb.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-      k00, k01, k02, \
-      k10, k11, k12, \
-      k20, k21, k22  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 } \
-} 
diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h
index 0e5ca7a6b6..1a5eb90e61 100644
--- a/keyboards/neito/config.h
+++ b/keyboards/neito/config.h
@@ -15,16 +15,10 @@
  */
 #pragma once
 
-#define MATRIX_ROW_PINS { E6, F0, F5, F6, C7, C6, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { F4, F1, F7, B2, D1, D2, B3, B1 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define GRAVE_ESC_CTRL_OVERRIDE
 
 /* RGB Light Configuration */
 
-#define RGB_DI_PIN D5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json
index 7455762b51..10cce03e82 100644
--- a/keyboards/neito/info.json
+++ b/keyboards/neito/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB44C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F7", "B2", "D1", "D2", "B3", "B1"],
+        "rows": ["E6", "F0", "F5", "F6", "C7", "C6", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B7", "pin_b": "B0"}
@@ -21,6 +26,9 @@
     "indicators": {
         "caps_lock": "B6"
     },
+    "ws2812": {
+        "pin": "D5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
@@ -72,7 +80,7 @@
                 {"label":"4,5", "x":14.94, "y":2.25},
                 {"label":"5,5", "x":15.94, "y":2.25},
                 {"label":"4,6", "x":16.94, "y":2.25},
-                {"label":"4,7", "x":19.69, "y":2.0},
+                {"label":"4,7", "x":19.69, "y":2},
 
                 {"label":"6,0", "x":0, "y":3.25, "w":1.25},
                 {"label":"8,0", "x":1.25, "y":3.25},
diff --git a/keyboards/neito/neito.c b/keyboards/neito/neito.c
deleted file mode 100644
index a05831ec17..0000000000
--- a/keyboards/neito/neito.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Oliver Granlund
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "neito.h"
diff --git a/keyboards/nek_type_a/nek_type_a.c b/keyboards/nek_type_a/nek_type_a.c
deleted file mode 100644
index f7e1dd4d7b..0000000000
--- a/keyboards/nek_type_a/nek_type_a.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Mike Roberts
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "nek_type_a.h"
diff --git a/keyboards/nemui/config.h b/keyboards/nemui/config.h
index 04f94fe86c..a371cd708d 100644
--- a/keyboards/nemui/config.h
+++ b/keyboards/nemui/config.h
@@ -16,10 +16,6 @@
  */
 #pragma once
 
-#define MATRIX_COL_PINS { B2, B1, B0, B10, B11, A7, B12, B13, B14, A10, A9, A8, B7, B8, B9 }
-#define MATRIX_ROW_PINS { A3, A4, A5, A6, A2 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nemui/info.json b/keyboards/nemui/info.json
index 3ac29f519c..933961ade7 100644
--- a/keyboards/nemui/info.json
+++ b/keyboards/nemui/info.json
@@ -8,6 +8,11 @@
     "pid": "0x2371",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B2", "B1", "B0", "B10", "B11", "A7", "B12", "B13", "B14", "A10", "A9", "A8", "B7", "B8", "B9"],
+    "rows": ["A3", "A4", "A5", "A6", "A2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F072",
   "bootloader": "stm32-dfu",
   "layouts": {
@@ -67,13 +72,11 @@
     },
     {
       "x": 13,
-      "y": 0,
-      "w": 1
+      "y": 0
     },
     {
       "x": 14,
-      "y": 0,
-      "w": 1
+      "y": 0
     },
     {
       "x": 0,
diff --git a/keyboards/nemui/nemui.c b/keyboards/nemui/nemui.c
deleted file mode 100644
index cdfebb0555..0000000000
--- a/keyboards/nemui/nemui.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2020 Bachoo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "nemui.h"
diff --git a/keyboards/neokeys/g67/element_hs/config.h b/keyboards/neokeys/g67/element_hs/config.h
index dd5d026ea5..6073564e1f 100644
--- a/keyboards/neokeys/g67/element_hs/config.h
+++ b/keyboards/neokeys/g67/element_hs/config.h
@@ -16,24 +16,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, B7, D5, D1, D2, D3, D4, D0, D6, D7, B4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #if defined(RGBLIGHT_ENABLE)
-    #define RGB_DI_PIN F0
     #define RGBLED_NUM 77
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/neokeys/g67/element_hs/element_hs.c b/keyboards/neokeys/g67/element_hs/element_hs.c
deleted file mode 100644
index c5dd40fe6a..0000000000
--- a/keyboards/neokeys/g67/element_hs/element_hs.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "element_hs.h"
diff --git a/keyboards/neokeys/g67/element_hs/element_hs.h b/keyboards/neokeys/g67/element_hs/element_hs.h
deleted file mode 100644
index cfb7d67b60..0000000000
--- a/keyboards/neokeys/g67/element_hs/element_hs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1E,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,        K2E,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,     K3E,   \
-    K40,  K41,  K43,              K46,                K4A,  K4B,  K4C,  K4D,   K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
diff --git a/keyboards/neokeys/g67/element_hs/info.json b/keyboards/neokeys/g67/element_hs/info.json
index 24dc48cab2..18155520de 100644
--- a/keyboards/neokeys/g67/element_hs/info.json
+++ b/keyboards/neokeys/g67/element_hs/info.json
@@ -8,83 +8,91 @@
         "pid": "0x5049",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/neokeys/g67/hotswap/config.h b/keyboards/neokeys/g67/hotswap/config.h
index b77c529e88..2021d3a95e 100644
--- a/keyboards/neokeys/g67/hotswap/config.h
+++ b/keyboards/neokeys/g67/hotswap/config.h
@@ -16,24 +16,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D4, D5, D6, D7, B4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #if defined(RGBLIGHT_ENABLE)
-    #define RGB_DI_PIN F0
     #define RGBLED_NUM 77
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/neokeys/g67/hotswap/hotswap.c b/keyboards/neokeys/g67/hotswap/hotswap.c
deleted file mode 100644
index dfa980344e..0000000000
--- a/keyboards/neokeys/g67/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hotswap.h"
diff --git a/keyboards/neokeys/g67/hotswap/hotswap.h b/keyboards/neokeys/g67/hotswap/hotswap.h
deleted file mode 100644
index 474300d067..0000000000
--- a/keyboards/neokeys/g67/hotswap/hotswap.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1E,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,        K2E,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,     K3E,   \
-    K40,  K41,  K43,              K46,                K4A,  K4B,  K4C,  K4D,   K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
diff --git a/keyboards/neokeys/g67/hotswap/info.json b/keyboards/neokeys/g67/hotswap/info.json
index 9dca75aee1..3a57fefc09 100644
--- a/keyboards/neokeys/g67/hotswap/info.json
+++ b/keyboards/neokeys/g67/hotswap/info.json
@@ -8,83 +8,91 @@
         "pid": "0x5048",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B4"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/neokeys/g67/soldered/config.h b/keyboards/neokeys/g67/soldered/config.h
index 68374d3e40..5fa404fa5a 100644
--- a/keyboards/neokeys/g67/soldered/config.h
+++ b/keyboards/neokeys/g67/soldered/config.h
@@ -16,24 +16,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D4, D5, D6, D7, B5, B4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #if defined(RGBLIGHT_ENABLE)
-    #define RGB_DI_PIN F0
     #define RGBLED_NUM 18
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/neokeys/g67/soldered/info.json b/keyboards/neokeys/g67/soldered/info.json
index 7b61a631d2..5fde8fe740 100644
--- a/keyboards/neokeys/g67/soldered/info.json
+++ b/keyboards/neokeys/g67/soldered/info.json
@@ -8,545 +8,553 @@
         "pid": "0x5053",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "B4"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 10,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi", "65_ansi_blocker", "65_ansi_blocker_tsangan", "65_iso", "65_iso_blocker"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":2, "w":1.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"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, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"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, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/neokeys/g67/soldered/soldered.c b/keyboards/neokeys/g67/soldered/soldered.c
deleted file mode 100644
index a2c5a258aa..0000000000
--- a/keyboards/neokeys/g67/soldered/soldered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "soldered.h"
diff --git a/keyboards/neokeys/g67/soldered/soldered.h b/keyboards/neokeys/g67/soldered/soldered.h
deleted file mode 100644
index d68f07d2e6..0000000000
--- a/keyboards/neokeys/g67/soldered/soldered.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E,    K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3E, K3F,   \
-    K40,  K41,  K42,              K47,                K48, K49, K4B, K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E,   K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, K2F   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, KC_NO, K47,   K48,   K49,   KC_NO, K4B,   K4C,   K4D,   KC_NO, K4F   }, \
-}
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E,    K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,   K2F,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3E, K3F,   \
-    K40,  K41,  K42,              K47,                K48, K49, K4B, K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E,   K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, K2F   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, KC_NO, K47,   K48,   K49,   KC_NO, K4B,   K4C,   K4D,   KC_NO, K4F   }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E,    K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,   K2F,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3E, K3F,   \
-    K40,  K41,  K42,              K47,                K48,  K49,     K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E,   K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, K2F   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, KC_NO, K47,   K48,   K49,   KC_NO, KC_NO, K4C,   K4D,   KC_NO, K4F   }, \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E,    K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,   K2F,   \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3E, K3F,   \
-    K40,  K41,  K42,              K47,                      K49,     K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E,   K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, K2F   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, KC_NO, K47,   KC_NO, K49,   KC_NO, KC_NO, K4C,   K4D,   KC_NO, K4F   }, \
-}
-
-#define LAYOUT_65_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3E, K3F,   \
-    K40,  K41,  K42,              K47,                K48, K49, K4B, K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, KC_NO, K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, K2F   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, KC_NO, K47,   K48,   K49,   KC_NO, K4B,   K4C,   K4D,   KC_NO, K4F   }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3E, K3F,   \
-    K40,  K41,  K42,              K47,                K48,  K49,     K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, KC_NO, K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, K2F   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, KC_NO, K47,   K48,   K49,   KC_NO, KC_NO, K4C,   K4D,   KC_NO, K4F   }, \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,         K1F,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2F,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3E, K3F,   \
-    K40,  K41,  K42,              K47,                      K49,     K4C, K4D, K4F    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, KC_NO, K1F   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, K2F   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, KC_NO, K47,   KC_NO, K49,   KC_NO, KC_NO, K4C,   K4D,   KC_NO, K4F   }, \
-}
diff --git a/keyboards/neopad/config.h b/keyboards/neopad/config.h
index 8b0f83f7a0..6200d5a594 100755
--- a/keyboards/neopad/config.h
+++ b/keyboards/neopad/config.h
@@ -16,9 +16,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Column/Row IO definitions */
-#define DIODE_DIRECTION COL2ROW
-
 /* Reduce tapdance required taps from 5 to 2 */
 #define TAPPING_TOGGLE 2
diff --git a/keyboards/neopad/rev1/config.h b/keyboards/neopad/rev1/config.h
index dce1020b44..fd1724caf1 100755
--- a/keyboards/neopad/rev1/config.h
+++ b/keyboards/neopad/rev1/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/* Column/Row IO definitions */
-#define MATRIX_ROW_PINS { F4, F5 }
-#define MATRIX_COL_PINS { B3, B2, B6 }
-
 /* Onboard LEDs */
 #define LED_00 F6
 #define LED_01 F7
diff --git a/keyboards/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json
index 48654b6941..8a8f357c96 100755
--- a/keyboards/neopad/rev1/info.json
+++ b/keyboards/neopad/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0913",
         "device_version": "0.1.0"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B6"],
+        "rows": ["F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D1", "pin_b": "D0"},
@@ -19,8 +24,13 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0},
-                                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
             ]
         }
     }
diff --git a/keyboards/neopad/rev1/rev1.c b/keyboards/neopad/rev1/rev1.c
index 665294451a..86e47c8932 100755
--- a/keyboards/neopad/rev1/rev1.c
+++ b/keyboards/neopad/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev1.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set LED IO as outputs
diff --git a/keyboards/neopad/rev1/rev1.h b/keyboards/neopad/rev1/rev1.h
deleted file mode 100755
index 87b9405bb1..0000000000
--- a/keyboards/neopad/rev1/rev1.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 rookiebwoy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-	       k00, k01, k02, \
-	       k10, k11, k12  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }  \
-}
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index 2c1b62448e..74872d0c7d 100644
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -18,11 +18,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E6, B7, F6, F1, F0}
-#define MATRIX_COL_PINS { F7, B0, B3, B1, B2, F4, C7, C6, B6, B5, B4, D7, D3, D2, D6, D4}
-#define DIODE_DIRECTION COL2ROW
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -44,7 +39,6 @@
 
 //rgb light setting
 #define RGBLED_NUM          68
-#define RGB_DI_PIN          D5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json
index 29f5c0c2f4..195907488f 100644
--- a/keyboards/neson_design/700e/info.json
+++ b/keyboards/neson_design/700e/info.json
@@ -8,9 +8,17 @@
         "pid": "0x700E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B0", "B3", "B1", "B2", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D3", "D2", "D6", "D4"],
+        "rows": ["E6", "B7", "F6", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F5"
     },
+    "ws2812": {
+        "pin": "D5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index b98385f836..35a2671ede 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -18,11 +18,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, B1, F6, F4, F1}
-#define MATRIX_COL_PINS { F7, B0, E6, C7, C6, B6, B5, B4, D7, D6, D4, D5, B2, D3, D2 }
-#define DIODE_DIRECTION COL2ROW
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -44,7 +39,6 @@
 
 //rgb light setting
 #define RGBLED_NUM          65
-#define RGB_DI_PIN          B3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json
index 19de748afb..5e0faf393a 100644
--- a/keyboards/neson_design/n6/info.json
+++ b/keyboards/neson_design/n6/info.json
@@ -8,9 +8,17 @@
         "pid": "0x4E36",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B0", "E6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B2", "D3", "D2"],
+        "rows": ["F0", "B1", "F6", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F5"
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -20,153 +28,153 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4, "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c
index 45affc1b03..5727ab655f 100644
--- a/keyboards/neson_design/n6/n6.c
+++ b/keyboards/neson_design/n6/n6.c
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "n6.h"
+#include "quantum.h"
 #include "i2c_master.h"
 #include "drivers/led/issi/is31fl3731.h"
 
diff --git a/keyboards/neson_design/n6/n6.h b/keyboards/neson_design/n6/n6.h
deleted file mode 100644
index b8f2f2e53b..0000000000
--- a/keyboards/neson_design/n6/n6.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
-  * @file n6.h
-  *
-    Copyright 2021 astro
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*                                                     ┌───────�
- *                                        2u Backspace │0E     │
- *                                                     └───────┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │48                      │49  │4A  │ │4B │4C │4D │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────┬─┬───┬───┬───�
- * │40   │41 │42   │48                         │4A   │ │4B │4C │4D │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
- * ┌─────┬──┬─────┬───────────────────────────┬─────┬──┬───┬───┬───�
- * │40   │  │42   │48                         │4A   │  │4B │4C │4D │ WKL
- * └─────┘  └─────┴───────────────────────────┴─────┘  └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K4E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K48,           K49, K4A,      K4B, K4C, K4D  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, ___, ___, ___, ___, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K48,           K49, K4A,      K4B, K4C, K4D  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, ___, ___, ___, ___, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h
index 5cdbbcea37..18c605eb62 100644
--- a/keyboards/newgame40/config.h
+++ b/keyboards/newgame40/config.h
@@ -17,13 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* pin-out */
-#define MATRIX_ROW_PINS { F7, B1, B3, B2 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN F6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -63,7 +57,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // iOS device need lessthan 100
   #define USB_MAX_POWER_CONSUMPTION 100
 #endif
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 
 #define TAPPING_TERM 200
diff --git a/keyboards/newgame40/info.json b/keyboards/newgame40/info.json
index eabcccd708..2cbb4c117d 100644
--- a/keyboards/newgame40/info.json
+++ b/keyboards/newgame40/info.json
@@ -8,12 +8,64 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+    "rows": ["F7", "B1", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
+  "ws2812": {
+    "pin": "F6"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_4x10"],
   "layouts": {
     "LAYOUT_ortho_4x10": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/newgame40/newgame40.c b/keyboards/newgame40/newgame40.c
deleted file mode 100644
index 98add8ea0e..0000000000
--- a/keyboards/newgame40/newgame40.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "newgame40.h"
diff --git a/keyboards/newgame40/newgame40.h b/keyboards/newgame40/newgame40.h
deleted file mode 100644
index e6146e4f14..0000000000
--- a/keyboards/newgame40/newgame40.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x10( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 } \
-}
diff --git a/keyboards/nibiria/stream15/config.h b/keyboards/nibiria/stream15/config.h
index b782f3467f..8a1f5b6c2b 100644
--- a/keyboards/nibiria/stream15/config.h
+++ b/keyboards/nibiria/stream15/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A1, A2, B11, B12, B13 }
-#define MATRIX_ROW_PINS { B10, B9, B8 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nibiria/stream15/info.json b/keyboards/nibiria/stream15/info.json
index 72e6facbda..0fe4b9ed23 100644
--- a/keyboards/nibiria/stream15/info.json
+++ b/keyboards/nibiria/stream15/info.json
@@ -8,31 +8,33 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "B11", "B12", "B13"],
+        "rows": ["B10", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ortho_3x5": {
-            
             "layout": [
-                {"label":"1", "x":0, "y":0},
-                {"label":"2", "x":1, "y":0},
-                {"label":"3", "x":2, "y":0},
-                {"label":"4", "x":3, "y":0},
-                {"label":"5", "x":4, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
 
-                {"label":"6", "x":0, "y":1},
-                {"label":"7", "x":1, "y":1},
-                {"label":"8", "x":2, "y":1},
-                {"label":"9", "x":3, "y":1},
-                {"label":"10", "x":4, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
 
-                {"label":"11", "x":0, "y":2},
-                {"label":"12", "x":1, "y":2},
-                {"label":"13", "x":2, "y":2},
-                {"label":"14", "x":3, "y":2},
-                {"label":"15", "x":4, "y":2}
-                
-                
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2}
             ]
         }
     }
diff --git a/keyboards/nibiria/stream15/stream15.c b/keyboards/nibiria/stream15/stream15.c
deleted file mode 100644
index eaafc85802..0000000000
--- a/keyboards/nibiria/stream15/stream15.c
+++ /dev/null
@@ -1,19 +0,0 @@
- /* Copyright 2021 Matt Clendaniel 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "stream15.h"
-
-
diff --git a/keyboards/nibiria/stream15/stream15.h b/keyboards/nibiria/stream15/stream15.h
deleted file mode 100644
index 51ac60eb17..0000000000
--- a/keyboards/nibiria/stream15/stream15.h
+++ /dev/null
@@ -1,31 +0,0 @@
- /* Copyright 2021 Matt Clendaniel
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT_ortho_3x5( \
-	K00, K01, K02, K03, K04, \
-	K05, K06, K07, K08, K09, \
-	K10, K11, K12, K13, K14  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04 }, \
-	{ K05,   K06,   K07,   K08,   K09 }, \
-	{ K10,   K11,   K12,   K13,   K14 }  \
-}
diff --git a/keyboards/nightingale_studios/hailey/config.h b/keyboards/nightingale_studios/hailey/config.h
index dece45d140..ae2ee205a4 100644
--- a/keyboards/nightingale_studios/hailey/config.h
+++ b/keyboards/nightingale_studios/hailey/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A8, B15, B14, B13, B12, B6, A14 }
-#define MATRIX_COL_PINS { A4, A3, F1, F0, C15, C14, C13, B11, B10, B2, B1, B0, A7, A5, A6, B5, A15 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nightingale_studios/hailey/hailey.c b/keyboards/nightingale_studios/hailey/hailey.c
deleted file mode 100644
index ec537397d5..0000000000
--- a/keyboards/nightingale_studios/hailey/hailey.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 zvecr<git@zvecr.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "hailey.h"
diff --git a/keyboards/nightingale_studios/hailey/info.json b/keyboards/nightingale_studios/hailey/info.json
index 7316afacb9..e5b6a28461 100644
--- a/keyboards/nightingale_studios/hailey/info.json
+++ b/keyboards/nightingale_studios/hailey/info.json
@@ -7,6 +7,11 @@
         "pid": "0x4879",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A4", "A3", "F1", "F0", "C15", "C14", "C13", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "B5", "A15"],
+        "rows": ["A8", "B15", "B14", "B13", "B12", "B6", "A14"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B4"}
diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h
index e4e99106a3..d1703c1c80 100644
--- a/keyboards/nightly_boards/adellein/config.h
+++ b/keyboards/nightly_boards/adellein/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B0, B5, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B7, B3, B2, D0, D1, D2, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 14
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -48,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#endif
-
 /* Encoders */
 #define ENCODERS_CW_KEY  { { 3, 3 } }
 #define ENCODERS_CCW_KEY { { 1, 3 } }
diff --git a/keyboards/nightly_boards/adellein/encoder_action.c b/keyboards/nightly_boards/adellein/encoder_action.c
index 6b553d3969..522fb58d5a 100644
--- a/keyboards/nightly_boards/adellein/encoder_action.c
+++ b/keyboards/nightly_boards/adellein/encoder_action.c
@@ -26,7 +26,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -38,7 +39,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json
index 7967cfc99b..d45356262d 100644
--- a/keyboards/nightly_boards/adellein/info.json
+++ b/keyboards/nightly_boards/adellein/info.json
@@ -8,11 +8,19 @@
     	"pid": "0x0010",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B7", "B3", "B2", "D0", "D1", "D2", "D3"],
+        "rows": ["B1", "B0", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
     	"rotary": [
     		{"pin_a": "C7", "pin_b": "C6"}
     	]
     },
+    "ws2812": {
+    	"pin": "D5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h
index acd477fa71..d56e19898b 100644
--- a/keyboards/nightly_boards/alter/rev1/config.h
+++ b/keyboards/nightly_boards/alter/rev1/config.h
@@ -14,25 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F7, F6, F5, E6, D0, B7, D5, D3, D2, D1 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B0, B1, B2, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -49,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json
index 21efb61c29..0c33b1c769 100644
--- a/keyboards/nightly_boards/alter/rev1/info.json
+++ b/keyboards/nightly_boards/alter/rev1/info.json
@@ -8,87 +8,103 @@
     	"pid": "0x0002",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B0", "B1", "B2", "B3"],
+        "rows": ["F7", "F6", "F5", "E6", "D0", "B7", "D5", "D3", "D2", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
     	"caps_lock": "D6",
     	"num_lock": "D7",
     	"scroll_lock": "B4"
     },
+    "ws2812": {
+    	"pin": "F1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
-             "layout": [
-				{"x":0.5, "y":0}, 
-				{"x":2, "y":0}, 
-				{"x":3, "y":0}, 
-				{"x":4, "y":0}, 
-				{"x":5, "y":0}, 
-				{"x":6, "y":0}, 
-				{"x":7, "y":0}, 
-				{"x":8, "y":0}, 
-				{"x":11.25, "y":0}, 
-				{"x":12.25, "y":0}, 
-				{"x":13.25, "y":0}, 
-				{"x":14.25, "y":0}, 
-				{"x":15.25, "y":0}, 
-				{"x":16.25, "y":0}, 
-				{"x":17.25, "y":0}, 
-				{"x":18.25, "y":0}, 
-				
-				{"x":0.25, "y":1}, 
-				{"x":1.75, "y":1, "w":1.5}, 
-				{"x":3.25, "y":1}, 
-				{"x":4.25, "y":1}, 
-				{"x":5.25, "y":1}, 
-				{"x":6.25, "y":1}, 
-				{"x":7.25, "y":1}, 
-				{"x":11, "y":1}, 
-				{"x":12, "y":1}, 
-				{"x":13, "y":1}, 
-				{"x":14, "y":1}, 
-				{"x":15, "y":1}, 
-				{"x":16, "y":1}, 
-				{"x":17, "y":1}, 
-				{"x":18, "y":1, "w":1.5}, 
-				
-				{"x":0, "y":2}, 
-				{"x":1.5, "y":2, "w":1.75}, 
-				{"x":3.25, "y":2}, 
-				{"x":4.5, "y":2}, 
-				{"x":5.5, "y":2}, 
-				{"x":6.5, "y":2}, 
-				{"x":7.5, "y":2}, 
-				{"x":11.25, "y":2}, 
-				{"x":12.25, "y":2}, 
-				{"x":13.25, "y":2}, 
-				{"x":14.25, "y":2}, 
-				{"x":15.5, "y":2}, 
-				{"x":16.5, "y":2}, 
-				{"x":17.5, "y":2, "w":2.25}, 
-				
-				{"x":1.25, "y":3, "w":2.25}, 
-				{"x":3.5, "y":3}, 
-				{"x":5, "y":3}, 
-				{"x":6, "y":3}, 
-				{"x":7, "y":3}, 
-				{"x":8, "y":3}, 
-				{"x":10.75, "y":3}, 
-				{"x":11.75, "y":3}, 
-				{"x":12.75, "y":3}, 
-				{"x":13.75, "y":3}, 
-				{"x":15.25, "y":3}, 
-				{"x":16.25, "y":3}, 
-				{"x":17.25, "y":3, "w":1.75}, 
-				{"x":19, "y":3}, 
-				
-				{"x":1.25, "y":4, "w":1.5}, 
-				{"x":5, "y":4, "w":1.5}, 
-				{"x":6.5, "y":4, "w":2}, 
-				{"x":8.5, "y":4, "w":1.25}, 
-				{"x":10.5, "y":4, "w":2.75}, 
-				{"x":13.25, "y":4, "w":1.5}, 
-				{"x":18.25, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 1], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 2], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 3], "x": 8, "y": 0},
+
+                {"matrix": [0, 4], "x": 11.25, "y": 0},
+                {"matrix": [1, 4], "x": 12.25, "y": 0},
+                {"matrix": [0, 5], "x": 13.25, "y": 0},
+                {"matrix": [1, 5], "x": 14.25, "y": 0},
+                {"matrix": [0, 6], "x": 15.25, "y": 0},
+                {"matrix": [1, 6], "x": 16.25, "y": 0},
+                {"matrix": [1, 7], "x": 17.25, "y": 0},
+                {"matrix": [0, 7], "x": 18.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+                {"matrix": [3, 0], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 3.25, "y": 1},
+                {"matrix": [3, 1], "x": 4.25, "y": 1},
+                {"matrix": [2, 2], "x": 5.25, "y": 1},
+                {"matrix": [3, 2], "x": 6.25, "y": 1},
+                {"matrix": [2, 3], "x": 7.25, "y": 1},
+
+                {"matrix": [2, 4], "x": 11, "y": 1},
+                {"matrix": [3, 4], "x": 12, "y": 1},
+                {"matrix": [2, 5], "x": 13, "y": 1},
+                {"matrix": [3, 5], "x": 14, "y": 1},
+                {"matrix": [2, 6], "x": 15, "y": 1},
+                {"matrix": [3, 6], "x": 16, "y": 1},
+                {"matrix": [2, 7], "x": 17, "y": 1},
+                {"matrix": [3, 7], "x": 18, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 3.25, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2},
+                {"matrix": [5, 2], "x": 5.5, "y": 2},
+                {"matrix": [4, 3], "x": 6.5, "y": 2},
+                {"matrix": [5, 3], "x": 7.5, "y": 2},
+
+                {"matrix": [4, 4], "x": 11.25, "y": 2},
+                {"matrix": [5, 4], "x": 12.25, "y": 2},
+                {"matrix": [4, 5], "x": 13.25, "y": 2},
+                {"matrix": [5, 5], "x": 14.25, "y": 2},
+                {"matrix": [4, 6], "x": 15.5, "y": 2},
+                {"matrix": [5, 6], "x": 16.5, "y": 2},
+                {"matrix": [4, 7], "x": 17.5, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [7, 1], "x": 3.5, "y": 3},
+                {"matrix": [6, 2], "x": 5, "y": 3},
+                {"matrix": [7, 2], "x": 6, "y": 3},
+                {"matrix": [6, 3], "x": 7, "y": 3},
+                {"matrix": [7, 3], "x": 8, "y": 3},
+
+                {"matrix": [6, 4], "x": 10.75, "y": 3},
+                {"matrix": [7, 4], "x": 11.75, "y": 3},
+                {"matrix": [6, 5], "x": 12.75, "y": 3},
+                {"matrix": [7, 5], "x": 13.75, "y": 3},
+                {"matrix": [6, 6], "x": 15.25, "y": 3},
+                {"matrix": [7, 6], "x": 16.25, "y": 3},
+                {"matrix": [6, 7], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 19, "y": 3},
+
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [8, 2], "x": 5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 6.5, "y": 4, "w": 2},
+                {"matrix": [8, 3], "x": 8.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 4], "x": 10.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 5], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 18.25, "y": 4, "w": 1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/nightly_boards/alter/rev1/rev1.c b/keyboards/nightly_boards/alter/rev1/rev1.c
deleted file mode 100644
index b250d32d12..0000000000
--- a/keyboards/nightly_boards/alter/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/nightly_boards/alter/rev1/rev1.h b/keyboards/nightly_boards/alter/rev1/rev1.h
deleted file mode 100644
index 8fbbc71aaf..0000000000
--- a/keyboards/nightly_boards/alter/rev1/rev1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_alice_split_bs( \
-       K00,   K10, K01, K11, K02, K12, K03, K13,         K04, K14, K05, K15, K06, K16, K17, K07,     \
-      K20,  K30,    K21,  K31, K22, K32, K23,          K24, K34, K25, K35,  K26, K36, K27, K37,      \
-     K40,  K50,     K51,   K42, K52, K43, K53,          K44, K54, K45, K55,    K46, K56, K47,        \
-          K70,       K71,     K62, K72, K63, K73,     K64, K74, K65, K75,    K66, K76, K67,     K77, \
-          K90,               K82,   K92,      K83,    K84,         K95,                     K87      \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
-    { K30,   K31,   K32,   KC_NO, K34,   K35,   K36,   K37   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   KC_NO }, \
-    { KC_NO, KC_NO, K62,   K63,   K64,   K65,   K66,   K67   }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77   }, \
-    { KC_NO, KC_NO, K82,   K83,   K84,   KC_NO, KC_NO, K87   }, \
-    { K90,   KC_NO, K92,   KC_NO, KC_NO, K95,   KC_NO, KC_NO }, \
-}
-
-#define LAYOUT LAYOUT_alice_split_bs
diff --git a/keyboards/nightly_boards/alter_lite/alter_lite.c b/keyboards/nightly_boards/alter_lite/alter_lite.c
deleted file mode 100644
index 90e2d8c5b3..0000000000
--- a/keyboards/nightly_boards/alter_lite/alter_lite.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 DeskDaily
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "alter_lite.h"
diff --git a/keyboards/nightly_boards/alter_lite/config.h b/keyboards/nightly_boards/alter_lite/config.h
index ee04e0a75e..e462b35b07 100644
--- a/keyboards/nightly_boards/alter_lite/config.h
+++ b/keyboards/nightly_boards/alter_lite/config.h
@@ -14,22 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, D3, D5, B5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D2, E6, B6, C6, C7, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nightly_boards/alter_lite/info.json b/keyboards/nightly_boards/alter_lite/info.json
index d76a278a75..10f3c03843 100644
--- a/keyboards/nightly_boards/alter_lite/info.json
+++ b/keyboards/nightly_boards/alter_lite/info.json
@@ -4,87 +4,97 @@
     "url": "",
     "maintainer": "DeskDaily",
     "usb": {
-    	"vid": "0xD812",
-    	"pid": "0x0013",
-    	"device_version": "0.0.1"
+        "vid": "0xD812",
+        "pid": "0x0013",
+        "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "E6", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
+        "rows": ["F0", "F1", "D3", "D5", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
-    	"caps_lock": "D7",
-    	"num_lock": "D6",
-    	"scroll_lock": "D4",
-    	"on_state": 0
+        "caps_lock": "D7",
+        "num_lock": "D6",
+        "scroll_lock": "D4",
+        "on_state": 0
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-			{"x":0.5, "y":0.15},
-			{"x":1.75, "y":0.25},
-			{"x":2.75, "y":0.25},
-			{"x":3.75, "y":0.25},
-			{"x":4.75, "y":0.25},
-			{"x":5.75, "y":0.25},
-			{"x":6.75, "y":0.25},
-			{"x":7.75, "y":0.25},
-			{"x":11.25, "y":0.25},
-			{"x":12.25, "y":0.25},
-			{"x":13.25, "y":0.25},
-			{"x":14.25, "y":0.25},
-			{"x":15.25, "y":0.25},
-			{"x":16.25, "y":0.25},
-			{"x":17.25, "y":0.25},
-			{"x":18.25, "y":0.25},
-			{"x":0.25, "y":1.15},
-			{"x":1.5, "y":1.25, "w":1.5},
-			{"x":3, "y":1.25},
-			{"x":4.25, "y":1.25},
-			{"x":5.25, "y":1.25},
-			{"x":6.25, "y":1.25},
-			{"x":7.25, "y":1.25},
-			{"x":10.75, "y":1.25},
-			{"x":11.75, "y":1.25},
-			{"x":12.75, "y":1.25},
-			{"x":13.75, "y":1.25},
-			{"x":15, "y":1.25},
-			{"x":16, "y":1.25},
-			{"x":17, "y":1.25},
-			{"x":18, "y":1.25, "w":1.5},
-			{"x":0, "y":2.15},
-			{"x":1.25, "y":2.25, "w":1.75},
-			{"x":3, "y":2.25},
-			{"x":4.5, "y":2.25},
-			{"x":5.5, "y":2.25},
-			{"x":6.5, "y":2.25},
-			{"x":7.5, "y":2.25},
-			{"x":11, "y":2.25},
-			{"x":12, "y":2.25},
-			{"x":13, "y":2.25},
-			{"x":14, "y":2.25},
-			{"x":15.5, "y":2.25},
-			{"x":16.5, "y":2.25},
-			{"x":17.5, "y":2.25, "w":2.25},
-			{"x":1, "y":3.25, "w":2.25},
-			{"x":3.25, "y":3.25},
-			{"x":5, "y":3.25},
-			{"x":6, "y":3.25},
-			{"x":7, "y":3.25},
-			{"x":8, "y":3.25},
-			{"x":10.5, "y":3.25},
-			{"x":11.5, "y":3.25},
-			{"x":12.5, "y":3.25},
-			{"x":13.5, "y":3.25},
-			{"x":15.25, "y":3.25},
-			{"x":16.25, "y":3.25},
-			{"x":17.25, "y":3.25, "w":1.75},
-			{"x":19, "y":3.25},
-			{"x":1, "y":4.25, "w":1.5},
-			{"x":4.75, "y":4.25, "w":1.5},
-			{"x":6.25, "y":4.25, "w":2},
-			{"x":8.25, "y":4.25, "w":1.25},
-			{"x":10.5, "y":4.25, "w":2.75},
-			{"x":13.25, "y":4.25, "w":1.5},
-			{"x":18.25, "y":4.25, "w":1.5}]
+                {"x":0.5, "y":0},
+                {"x":1.75, "y":0.1},
+                {"x":2.75, "y":0.1},
+                {"x":3.75, "y":0.1},
+                {"x":4.75, "y":0.1},
+                {"x":5.75, "y":0.1},
+                {"x":6.75, "y":0.1},
+                {"x":7.75, "y":0.1},
+                {"x":11.25, "y":0.1},
+                {"x":12.25, "y":0.1},
+                {"x":13.25, "y":0.1},
+                {"x":14.25, "y":0.1},
+                {"x":15.25, "y":0.1},
+                {"x":16.25, "y":0.1},
+                {"x":17.25, "y":0.1},
+                {"x":18.25, "y":0.1},
+
+                {"x":0.25, "y":1},
+                {"x":1.5, "y":1.1, "w":1.5},
+                {"x":3, "y":1.1},
+                {"x":4.25, "y":1.1},
+                {"x":5.25, "y":1.1},
+                {"x":6.25, "y":1.1},
+                {"x":7.25, "y":1.1},
+                {"x":10.75, "y":1.1},
+                {"x":11.75, "y":1.1},
+                {"x":12.75, "y":1.1},
+                {"x":13.75, "y":1.1},
+                {"x":15, "y":1.1},
+                {"x":16, "y":1.1},
+                {"x":17, "y":1.1},
+                {"x":18, "y":1.1, "w":1.5},
+
+                {"x":0, "y":2},
+                {"x":1.25, "y":2.1, "w":1.75},
+                {"x":3, "y":2.1},
+                {"x":4.5, "y":2.1},
+                {"x":5.5, "y":2.1},
+                {"x":6.5, "y":2.1},
+                {"x":7.5, "y":2.1},
+                {"x":11, "y":2.1},
+                {"x":12, "y":2.1},
+                {"x":13, "y":2.1},
+                {"x":14, "y":2.1},
+                {"x":15.5, "y":2.1},
+                {"x":16.5, "y":2.1},
+                {"x":17.5, "y":2.1, "w":2.25},
+
+                {"x":1, "y":3.1, "w":2.25},
+                {"x":3.25, "y":3.1},
+                {"x":5, "y":3.1},
+                {"x":6, "y":3.1},
+                {"x":7, "y":3.1},
+                {"x":8, "y":3.1},
+                {"x":10.5, "y":3.1},
+                {"x":11.5, "y":3.1},
+                {"x":12.5, "y":3.1},
+                {"x":13.5, "y":3.1},
+                {"x":15.25, "y":3.1},
+                {"x":16.25, "y":3.1},
+                {"x":17.25, "y":3.1, "w":1.75},
+                {"x":19, "y":3.1},
+
+                {"x":1, "y":4.1, "w":1.5},
+                {"x":4.75, "y":4.1, "w":1.5},
+                {"x":6.25, "y":4.1, "w":2},
+                {"x":8.25, "y":4.1, "w":1.25},
+                {"x":10.5, "y":4.1, "w":2.75},
+                {"x":13.25, "y":4.1, "w":1.5},
+                {"x":18.25, "y":4.1, "w":1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/nightly_boards/conde60/conde60.c b/keyboards/nightly_boards/conde60/conde60.c
deleted file mode 100644
index 2f31ade1be..0000000000
--- a/keyboards/nightly_boards/conde60/conde60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DeskDaily
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "conde60.h"
diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h
index 9cad75e7b6..541d2e289e 100644
--- a/keyboards/nightly_boards/conde60/config.h
+++ b/keyboards/nightly_boards/conde60/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B2, F0, F1, F4 }
-#define MATRIX_COL_PINS { B0, B3, B7, B6, C6, C7, F7, F6, F5, D4, D6, D7, B4, B5 }
-
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -45,11 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#endif
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nightly_boards/conde60/info.json b/keyboards/nightly_boards/conde60/info.json
index 67c415381c..3fda17eb2c 100644
--- a/keyboards/nightly_boards/conde60/info.json
+++ b/keyboards/nightly_boards/conde60/info.json
@@ -8,6 +8,14 @@
     	"pid": "0x0015",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B3", "B7", "B6", "C6", "C7", "F7", "F6", "F5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["B1", "B2", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+    	"pin": "D5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nightly_boards/daily60/config.h b/keyboards/nightly_boards/daily60/config.h
index 719e0b4a9c..3d0b7f438c 100644
--- a/keyboards/nightly_boards/daily60/config.h
+++ b/keyboards/nightly_boards/daily60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { GP23, GP24, GP20, GP19, GP18 }
-#define MATRIX_COL_PINS { GP22, GP0, GP1, GP2, GP5, GP7, GP8, GP9, GP10, GP11, GP12, GP13, GP14, GP15 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nightly_boards/daily60/daily60.c b/keyboards/nightly_boards/daily60/daily60.c
deleted file mode 100644
index 88b9448777..0000000000
--- a/keyboards/nightly_boards/daily60/daily60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DeskDaily
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "daily60.h"
diff --git a/keyboards/nightly_boards/daily60/info.json b/keyboards/nightly_boards/daily60/info.json
index afb674faf4..d8fd05b824 100644
--- a/keyboards/nightly_boards/daily60/info.json
+++ b/keyboards/nightly_boards/daily60/info.json
@@ -7,6 +7,11 @@
     	"pid": "0x0024",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["GP22", "GP0", "GP1", "GP2", "GP5", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15"],
+        "rows": ["GP23", "GP24", "GP20", "GP19", "GP18"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "RP2040",
     "bootloader": "rp2040",
     "layouts": {
diff --git a/keyboards/nightly_boards/jisoo/config.h b/keyboards/nightly_boards/jisoo/config.h
index 0e55d4ed66..3d0b7f438c 100644
--- a/keyboards/nightly_boards/jisoo/config.h
+++ b/keyboards/nightly_boards/jisoo/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { GP26, GP27, GP28, GP18, GP19, GP20 }
-#define MATRIX_COL_PINS { GP25, GP14, GP13, GP12, GP11, GP10, GP9, GP8, GP7, GP6, GP5, GP4, GP3, GP2, GP1, GP0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nightly_boards/jisoo/info.json b/keyboards/nightly_boards/jisoo/info.json
index a2a4418541..9c2ea85453 100644
--- a/keyboards/nightly_boards/jisoo/info.json
+++ b/keyboards/nightly_boards/jisoo/info.json
@@ -7,6 +7,11 @@
     	"pid": "0x0025",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["GP25", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP0"],
+        "rows": ["GP26", "GP27", "GP28", "GP18", "GP19", "GP20"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "RP2040",
     "bootloader": "rp2040",
     "layouts": {
diff --git a/keyboards/nightly_boards/jisoo/jisoo.c b/keyboards/nightly_boards/jisoo/jisoo.c
deleted file mode 100644
index 96a85b4214..0000000000
--- a/keyboards/nightly_boards/jisoo/jisoo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DeskDaily
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "jisoo.h"
diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h
index a59197bcf9..a43016970c 100644
--- a/keyboards/nightly_boards/n2/config.h
+++ b/keyboards/nightly_boards/n2/config.h
@@ -14,25 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F1, C7 }
-#define MATRIX_COL_PINS { F0, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D4
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 2
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -49,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/nightly_boards/n2/info.json b/keyboards/nightly_boards/n2/info.json
index 8339bedc87..f925eba577 100644
--- a/keyboards/nightly_boards/n2/info.json
+++ b/keyboards/nightly_boards/n2/info.json
@@ -8,11 +8,22 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "C6"],
+        "rows": ["F1", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D4"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":0, "y":1}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 1], "x": 0, "y": 1}
+            ]
         }
     }
 }
diff --git a/keyboards/nightly_boards/n2/n2.c b/keyboards/nightly_boards/n2/n2.c
deleted file mode 100644
index d5daa06a64..0000000000
--- a/keyboards/nightly_boards/n2/n2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "n2.h"
-
diff --git a/keyboards/nightly_boards/n2/n2.h b/keyboards/nightly_boards/n2/n2.h
deleted file mode 100644
index 10242e41d7..0000000000
--- a/keyboards/nightly_boards/n2/n2.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00,   \
-    K11    \
-) { \
-    { K00,   KC_NO }, \
-    { KC_NO, K11   }, \
-}
diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h
index 055aea6055..474742b6af 100644
--- a/keyboards/nightly_boards/n40_o/config.h
+++ b/keyboards/nightly_boards/n40_o/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, F0, F1, D7, NO_PIN }
-#define MATRIX_COL_PINS { B5, C7, D6, D4, B3, B2, B1, B0, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B4
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -48,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#endif
-
 /* Encoders */
 #define ENCODERS_CW_KEY  { { 2, 4 },{ 4, 4 },{ 6, 4 } }
 #define ENCODERS_CCW_KEY { { 1, 4 },{ 3, 4 },{ 5, 4 } }
diff --git a/keyboards/nightly_boards/n40_o/encoder_action.c b/keyboards/nightly_boards/n40_o/encoder_action.c
index 6b553d3969..522fb58d5a 100644
--- a/keyboards/nightly_boards/n40_o/encoder_action.c
+++ b/keyboards/nightly_boards/n40_o/encoder_action.c
@@ -26,7 +26,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -38,7 +39,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/info.json
index f68bc89be3..f1401f5061 100644
--- a/keyboards/nightly_boards/n40_o/info.json
+++ b/keyboards/nightly_boards/n40_o/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0009",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "C7", "D6", "D4", "B3", "B2", "B1", "B0", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "F0", "F1", "D7", null]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
     	"rotary": [
     		{"pin_a": "F6", "pin_b": "F7"},
@@ -15,190 +20,193 @@
     		{"pin_a": "B6", "pin_b": "C6"}
     	]
     },
+    "ws2812": {
+        "pin": "B4"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_4x13_encoders": {
             "layout": [
-			{"x":0, "y":0}, 
-			{"x":1, "y":0}, 
-			{"x":2.25, "y":0}, 
-			{"x":3.5, "y":0}, 
-			{"x":4.5, "y":0}, 
-			{"x":5.5, "y":0}, 
-			{"x":6.5, "y":0}, 
-			{"x":7.5, "y":0}, 
-			{"x":8.5, "y":0}, 
-			{"x":9.5, "y":0}, 
-			{"x":10.5, "y":0}, 
-			{"x":11.5, "y":0}, 
-			{"x":12.5, "y":0}, 
-			{"x":13.5, "y":0}, 
-			{"x":14.5, "y":0}, 
-			
-			{"x":0, "y":1}, 
-			{"x":1, "y":1}, 
-			{"x":2.25, "y":1}, 
-			{"x":3.5, "y":1}, 
-			{"x":4.5, "y":1}, 
-			{"x":5.5, "y":1}, 
-			{"x":6.5, "y":1}, 
-			{"x":7.5, "y":1}, 
-			{"x":8.5, "y":1}, 
-			{"x":9.5, "y":1}, 
-			{"x":10.5, "y":1}, 
-			{"x":11.5, "y":1}, 
-			{"x":12.5, "y":1}, 
-			{"x":13.5, "y":1}, 
-			{"x":14.5, "y":1}, 
-			
-			{"x":0, "y":2}, 
-			{"x":1, "y":2}, 
-			{"x":2.25, "y":2}, 
-			{"x":3.5, "y":2}, 
-			{"x":4.5, "y":2}, 
-			{"x":5.5, "y":2}, 
-			{"x":6.5, "y":2}, 
-			{"x":7.5, "y":2}, 
-			{"x":8.5, "y":2}, 
-			{"x":9.5, "y":2}, 
-			{"x":10.5, "y":2}, 
-			{"x":11.5, "y":2}, 
-			{"x":12.5, "y":2}, 
-			{"x":13.5, "y":2}, 
-			{"x":14.5, "y":2}, 
-			
-			{"x":2.25, "y":3}, 
-			{"x":3.5, "y":3}, 
-			{"x":4.5, "y":3}, 
-			{"x":5.5, "y":3}, 
-			{"x":6.5, "y":3}, 
-			{"x":7.5, "y":3}, 
-			{"x":8.5, "y":3}, 
-			{"x":9.5, "y":3}, 
-			{"x":10.5, "y":3}, 
-			{"x":11.5, "y":3}, 
-			{"x":12.5, "y":3}, 
-			{"x":13.5, "y":3}, 
-			{"x":14.5, "y":3}
-			]
+                {"matrix": [4, 1], "x": 0, "y": 0},
+                {"matrix": [4, 2], "x": 1, "y": 0},
+                {"matrix": [0, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [0, 6], "x": 8.5, "y": 0},
+                {"matrix": [0, 7], "x": 9.5, "y": 0},
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+                {"matrix": [0, 10], "x": 12.5, "y": 0},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0},
+
+                {"matrix": [4, 3], "x": 0, "y": 1},
+                {"matrix": [4, 4], "x": 1, "y": 1},
+                {"matrix": [1, 0], "x": 2.25, "y": 1},
+                {"matrix": [1, 1], "x": 3.5, "y": 1},
+                {"matrix": [1, 2], "x": 4.5, "y": 1},
+                {"matrix": [1, 3], "x": 5.5, "y": 1},
+                {"matrix": [1, 4], "x": 6.5, "y": 1},
+                {"matrix": [1, 5], "x": 7.5, "y": 1},
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [1, 7], "x": 9.5, "y": 1},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+                {"matrix": [4, 6], "x": 1, "y": 2},
+                {"matrix": [2, 0], "x": 2.25, "y": 2},
+                {"matrix": [2, 1], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2},
+                {"matrix": [2, 3], "x": 5.5, "y": 2},
+                {"matrix": [2, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 2},
+                {"matrix": [2, 6], "x": 8.5, "y": 2},
+                {"matrix": [2, 7], "x": 9.5, "y": 2},
+                {"matrix": [2, 8], "x": 10.5, "y": 2},
+                {"matrix": [2, 9], "x": 11.5, "y": 2},
+                {"matrix": [2, 10], "x": 12.5, "y": 2},
+                {"matrix": [2, 11], "x": 13.5, "y": 2},
+                {"matrix": [2, 12], "x": 14.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+                {"matrix": [3, 6], "x": 8.5, "y": 3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3}
+            ]
         },
         "LAYOUT_ortho_4x13": {
             "layout": [
-			{"x":0, "y":0}, 
-			{"x":1.25, "y":0}, 
-			{"x":2.25, "y":0}, 
-			{"x":3.25, "y":0}, 
-			{"x":4.25, "y":0}, 
-			{"x":5.25, "y":0}, 
-			{"x":6.25, "y":0}, 
-			{"x":7.25, "y":0}, 
-			{"x":8.25, "y":0}, 
-			{"x":9.25, "y":0}, 
-			{"x":10.25, "y":0}, 
-			{"x":11.25, "y":0}, 
-			{"x":12.25, "y":0}, 
-			
-			{"x":0, "y":1}, 
-			{"x":1.25, "y":1}, 
-			{"x":2.25, "y":1}, 
-			{"x":3.25, "y":1}, 
-			{"x":4.25, "y":1}, 
-			{"x":5.25, "y":1}, 
-			{"x":6.25, "y":1}, 
-			{"x":7.25, "y":1}, 
-			{"x":8.25, "y":1}, 
-			{"x":9.25, "y":1}, 
-			{"x":10.25, "y":1},
-			{"x":11.25, "y":1}, 
-			{"x":12.25, "y":1}, 
-			
-			{"x":0, "y":2}, 
-			{"x":1.25, "y":2}, 
-			{"x":2.25, "y":2}, 
-			{"x":3.25, "y":2}, 
-			{"x":4.25, "y":2}, 
-			{"x":5.25, "y":2}, 
-			{"x":6.25, "y":2}, 
-			{"x":7.25, "y":2}, 
-			{"x":8.25, "y":2}, 
-			{"x":9.25, "y":2}, 
-			{"x":10.25, "y":2}, 
-			{"x":11.25, "y":2}, 
-			{"x":12.25, "y":2}, 
-			
-			{"x":0, "y":3}, 
-			{"x":1.25, "y":3}, 
-			{"x":2.25, "y":3}, 
-			{"x":3.25, "y":3}, 
-			{"x":4.25, "y":3}, 
-			{"x":5.25, "y":3}, 
-			{"x":6.25, "y":3}, 
-			{"x":7.25, "y":3}, 
-			{"x":8.25, "y":3}, 
-			{"x":9.25, "y":3}, 
-			{"x":10.25, "y":3}, 
-			{"x":11.25, "y":3}, 
-			{"x":12.25, "y":3}
-			]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 12], "x": 12.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 12], "x": 12.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3}
+            ]
         },
         "LAYOUT_ortho_4x13_1x2u_c": {
             "layout": [
-			{"x":0, "y":0}, 
-			{"x":1.25, "y":0}, 
-			{"x":2.25, "y":0}, 
-			{"x":3.25, "y":0}, 
-			{"x":4.25, "y":0}, 
-			{"x":5.25, "y":0}, 
-			{"x":6.25, "y":0}, 
-			{"x":7.25, "y":0}, 
-			{"x":8.25, "y":0}, 
-			{"x":9.25, "y":0}, 
-			{"x":10.25, "y":0}, 
-			{"x":11.25, "y":0}, 
-			{"x":12.25, "y":0}, 
-			
-			{"x":0, "y":1}, 
-			{"x":1.25, "y":1}, 
-			{"x":2.25, "y":1}, 
-			{"x":3.25, "y":1}, 
-			{"x":4.25, "y":1}, 
-			{"x":5.25, "y":1}, 
-			{"x":6.25, "y":1}, 
-			{"x":7.25, "y":1}, 
-			{"x":8.25, "y":1}, 
-			{"x":9.25, "y":1}, 
-			{"x":10.25, "y":1},
-			{"x":11.25, "y":1}, 
-			{"x":12.25, "y":1}, 
-			
-			{"x":0, "y":2}, 
-			{"x":1.25, "y":2}, 
-			{"x":2.25, "y":2}, 
-			{"x":3.25, "y":2}, 
-			{"x":4.25, "y":2}, 
-			{"x":5.25, "y":2}, 
-			{"x":6.25, "y":2}, 
-			{"x":7.25, "y":2}, 
-			{"x":8.25, "y":2}, 
-			{"x":9.25, "y":2}, 
-			{"x":10.25, "y":2}, 
-			{"x":11.25, "y":2}, 
-			{"x":12.25, "y":2}, 
-			
-			{"x":0, "y":3}, 
-			{"x":1.25, "y":3}, 
-			{"x":2.25, "y":3}, 
-			{"x":3.25, "y":3}, 
-			{"x":4.25, "y":3}, 
-			{"x":5.25, "y":3}, 
-			{"x":6.25, "y":3, "w":2}, 
-			{"x":8.25, "y":3}, 
-			{"x":9.25, "y":3}, 
-			{"x":10.25, "y":3}, 
-			{"x":11.25, "y":3}, 
-			{"x":12.25, "y":3}
-			]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 12], "x": 12.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 12], "x": 12.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/nightly_boards/n40_o/n40_o.c b/keyboards/nightly_boards/n40_o/n40_o.c
index 060daaa4b2..643803f903 100644
--- a/keyboards/nightly_boards/n40_o/n40_o.c
+++ b/keyboards/nightly_boards/n40_o/n40_o.c
@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "n40_o.h"
+#include "quantum.h"
+#include "encoder_action.h"
 
 void matrix_scan_kb(void) {
     encoder_action_unregister();
diff --git a/keyboards/nightly_boards/n40_o/n40_o.h b/keyboards/nightly_boards/n40_o/n40_o.h
deleted file mode 100644
index d7c44d9d88..0000000000
--- a/keyboards/nightly_boards/n40_o/n40_o.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-#include "encoder_action.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_ortho_4x13( \
-    K00,  K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,  \
-    K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  \
-    K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,  \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_ortho_4x13_1x2u_c( \
-    K00,  K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,  \
-    K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  \
-    K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,  \
-    K30,  K31, K32, K33, K34, K35, K36,      K38, K39, K3A, K3B, K3C  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO, K38,   K39,   K3A,   K3B,   K3C   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_ortho_4x13_encoders( \
-    E00A,  E00B, K00,  K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,  \
-    E01A,  E01B, K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  \
-    E02A,  E02B, K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,  \
-                 K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C   }, \
-    { KC_NO, E00A,  E00B,  E01A,  E01B,  E02A,  E02B,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-}
diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h
index 7ec0b48079..9daf4c7579 100644
--- a/keyboards/nightly_boards/n60_s/config.h
+++ b/keyboards/nightly_boards/n60_s/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, D7, D6, D0, E6, NO_PIN }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Encoders */
 #define ENCODERS_CW_KEY  { { 1, 5 } }
 #define ENCODERS_CCW_KEY { { 0, 5 } }
@@ -45,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Underglow */
 
-#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -63,8 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLIGHT_EFFECT_ALTERNATING
 
-#endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nightly_boards/n60_s/encoder_action.c b/keyboards/nightly_boards/n60_s/encoder_action.c
index 6b553d3969..522fb58d5a 100644
--- a/keyboards/nightly_boards/n60_s/encoder_action.c
+++ b/keyboards/nightly_boards/n60_s/encoder_action.c
@@ -26,7 +26,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -38,7 +39,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/info.json
index 519f31cf28..50e94f22d2 100644
--- a/keyboards/nightly_boards/n60_s/info.json
+++ b/keyboards/nightly_boards/n60_s/info.json
@@ -8,11 +8,19 @@
     	"pid": "0x0007",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"],
+        "rows": ["B4", "D7", "D6", "D0", "E6", null]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
     	"rotary": [
     		{"pin_a": "D3", "pin_b": "D5"}
     	]
     },
+    "ws2812": {
+    	"pin": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h
index 5191be1d84..492b8fb618 100644
--- a/keyboards/nightly_boards/n87/config.h
+++ b/keyboards/nightly_boards/n87/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F1, F0, D7, B4, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, C7, C6, B6, B5, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 #define AUDIO_PIN B7
 
diff --git a/keyboards/nightly_boards/n87/info.json b/keyboards/nightly_boards/n87/info.json
index a45c8333fc..1be9d83f1c 100644
--- a/keyboards/nightly_boards/n87/info.json
+++ b/keyboards/nightly_boards/n87/info.json
@@ -8,284 +8,331 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "C7", "C6", "B6", "B5", "D6"],
+        "rows": ["B0", "B1", "B2", "B3", "F1", "F0", "D7", "B4", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_tkl_ansi_split_bs_rshift": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25},
-                {"x": 14, "y": 1.25},
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25, "w": 2.25},
-                {"x": 0, "y": 4.25, "w": 2.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 1.75},
-                {"x": 14, "y": 4.25},
-                {"x": 16.25, "y": 4.25},
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 1], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_split_bs_rshift_tsangan": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25},
-                {"x": 14, "y": 1.25},
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25, "w": 2.25},
-                {"x": 0, "y": 4.25, "w": 2.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 1.75},
-                {"x": 14, "y": 4.25},
-                {"x": 16.25, "y": 4.25},
-                {"x": 0, "y": 5.25, "w": 1.5},
-                {"x": 1.5, "y": 5.25},
-                {"x": 2.5, "y": 5.25, "w": 1.5},
-                {"x": 4, "y": 5.25, "w": 7},
-                {"x": 11, "y": 5.25, "w": 1.5},
-                {"x": 12.5, "y": 5.25},
-                {"x": 13.5, "y": 5.25, "w": 1.5},
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 1], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_split_bs_rshift_symmetric": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25},
-                {"x": 14, "y": 1.25},
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25, "w": 2.25},
-                {"x": 0, "y": 4.25, "w": 2.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 1.75},
-                {"x": 14, "y": 4.25},
-                {"x": 16.25, "y": 4.25},
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.875, "y": 5.25, "w": 1.25},
-                {"x": 3.125, "y": 5.25, "w": 1.25},
-                {"x": 4.375, "y": 5.25, "w": 6.25},
-                {"x": 10.625, "y": 5.25, "w": 1.25},
-                {"x": 11.875, "y": 5.25, "w": 1.25},
-                {"x": 13.755, "y": 5.25, "w": 1.25},
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 1], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.875, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 3.125, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 4.375, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10.625, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.875, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.755, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/nightly_boards/n87/n87.c b/keyboards/nightly_boards/n87/n87.c
deleted file mode 100644
index a9cf87a1b6..0000000000
--- a/keyboards/nightly_boards/n87/n87.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "n87.h"
diff --git a/keyboards/nightly_boards/n87/n87.h b/keyboards/nightly_boards/n87/n87.h
deleted file mode 100644
index 31ab83e5ca..0000000000
--- a/keyboards/nightly_boards/n87/n87.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_tkl_ansi_split_bs_rshift( \
-    K00,      K10, K01, K11, K02,   K03, K13, K04, K14,    K05, K15, K06, K16,  K17, K08, K18,  \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,  K37, K28, K38,  \
-    K40,   K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,     K57, K48, K58,  \
-    K60,    K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,                         \
-    K80,       K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86,     K96,       K88,       \
-    KA0,  KB0,  KA1,              KA3,                KA5,  KB5,  KA6,  KB6,    KB7, KA8, KB8   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO, K08   }, \
-    { K10,   K11,   KC_NO, K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   KC_NO, K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58   }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO, KC_NO }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   KC_NO, KC_NO }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   KC_NO, K88   }, \
-    { KC_NO, K91,   K92,   K93,   K94,   K95,   K96,   KC_NO, KC_NO }, \
-    { KA0,   KA1,   KC_NO, KA3,   KC_NO, KA5,   KA6,   KC_NO, KA8   }, \
-    { KB0,   KC_NO, KC_NO, KC_NO, KC_NO, KB5,   KB6,   KB7,   KB8   }, \
-}
-
-#define LAYOUT_tkl_ansi_split_bs_rshift_tsangan( \
-    K00,      K10, K01, K11, K02,   K03, K13, K04, K14,    K05, K15, K06, K16,  K17, K08, K18,  \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,  K37, K28, K38,  \
-    K40,   K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,     K57, K48, K58,  \
-    K60,    K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,                         \
-    K80,       K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86,     K96,       K88,       \
-    KA0,  KB0,  KA1,              KA3,                       KB5,  KA6,  KB6,    KB7, KA8, KB8   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO, K08   }, \
-    { K10,   K11,   KC_NO, K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   KC_NO, K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58   }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO, KC_NO }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   KC_NO, KC_NO }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   KC_NO, K88   }, \
-    { KC_NO, K91,   K92,   K93,   K94,   K95,   K96,   KC_NO, KC_NO }, \
-    { KA0,   KA1,   KC_NO, KA3,   KC_NO, KC_NO,   KA6,   KC_NO, KA8   }, \
-    { KB0,   KC_NO, KC_NO, KC_NO, KC_NO, KB5,   KB6,   KB7,   KB8   }, \
-}
-
-#define LAYOUT_tkl_ansi_split_bs_rshift_symmetric( \
-    K00,      K10, K01, K11, K02,   K03, K13, K04, K14,    K05, K15, K06, K16,  K17, K08, K18,  \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,  K37, K28, K38,  \
-    K40,   K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,     K57, K48, K58,  \
-    K60,    K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,                         \
-    K80,       K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86,     K96,       K88,       \
-    KA0,  KB0,  KA1,              KA3,                       KA5,  KB5,  KB6,    KB7, KA8, KB8   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO, K08   }, \
-    { K10,   K11,   KC_NO, K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   KC_NO, K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58   }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO, KC_NO }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   KC_NO, KC_NO }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   KC_NO, K88   }, \
-    { KC_NO, K91,   K92,   K93,   K94,   K95,   K96,   KC_NO, KC_NO }, \
-    { KA0,   KA1,   KC_NO, KA3,   KC_NO, KA5,   KC_NO,   KC_NO, KA8   }, \
-    { KB0,   KC_NO, KC_NO, KC_NO, KC_NO, KB5,   KB6,   KB7,   KB8   }, \
-}
diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h
index e889ad4c4d..e0358f57d1 100644
--- a/keyboards/nightly_boards/n9/config.h
+++ b/keyboards/nightly_boards/n9/config.h
@@ -14,25 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, B1, B3 }
-#define MATRIX_COL_PINS { F6, F7, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F5
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 8
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -49,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/nightly_boards/n9/info.json b/keyboards/nightly_boards/n9/info.json
index 3b93fbdac1..6929804d0c 100644
--- a/keyboards/nightly_boards/n9/info.json
+++ b/keyboards/nightly_boards/n9/info.json
@@ -8,22 +8,31 @@
     	"pid": "0x0012",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "D4"],
+        "rows": ["F4", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F5"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-			{"x":0, "y":0}, 
-			{"x":1, "y":0}, 
-			{"x":2, "y":0}, 
-			
-			{"x":0, "y":1}, 
-			{"x":1, "y":1}, 
-			{"x":2, "y":1}, 
-			
-			{"x":0, "y":2}, 
-			{"x":1, "y":2}, 
-			{"x":2, "y":2}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/nightly_boards/n9/n9.c b/keyboards/nightly_boards/n9/n9.c
deleted file mode 100644
index e6b736aa8b..0000000000
--- a/keyboards/nightly_boards/n9/n9.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "n9.h"
-
diff --git a/keyboards/nightly_boards/n9/n9.h b/keyboards/nightly_boards/n9/n9.h
deleted file mode 100644
index 6b0dbdc2e6..0000000000
--- a/keyboards/nightly_boards/n9/n9.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02,   \
-    K10, K11, K12,   \
-    K20, K21, K22    \
-) { \
-    { K00,   K01,   K02   }, \
-    { K10,   K11,   K12   }, \
-    { K20,   K21,   K22   }, \
-}
diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h
index 44868adff6..27c3d4bd02 100644
--- a/keyboards/nightly_boards/octopad/config.h
+++ b/keyboards/nightly_boards/octopad/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B2, B3, NO_PIN }
-#define MATRIX_COL_PINS { F1, F0, D0, D1, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 8
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -48,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#endif
-
 /* Encoders */
 #define ENCODERS_CW_KEY  { { 3, 2 },{ 1, 2 } }
 #define ENCODERS_CCW_KEY { { 2, 2 },{ 0, 2 } }
diff --git a/keyboards/nightly_boards/octopad/encoder_action.c b/keyboards/nightly_boards/octopad/encoder_action.c
index 6b553d3969..522fb58d5a 100644
--- a/keyboards/nightly_boards/octopad/encoder_action.c
+++ b/keyboards/nightly_boards/octopad/encoder_action.c
@@ -26,7 +26,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -38,7 +39,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json
index d6dfc74805..4fd95b4a8c 100644
--- a/keyboards/nightly_boards/octopad/info.json
+++ b/keyboards/nightly_boards/octopad/info.json
@@ -8,34 +8,43 @@
     	"pid": "0x0004",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "D0", "D1", "B1"],
+        "rows": ["B2", "B3", null]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
     	"rotary": [
     		{"pin_a": "C7", "pin_b": "C6"},
     		{"pin_a": "F4", "pin_b": "F5"}
     	]
     },
+    "ws2812": {
+    	"pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-			{"x":0, "y":0}, 
-			{"x":1, "y":0}, 
-			{"x":2, "y":0}, 
-			{"x":3.5, "y":0}, 
-			{"x":4.5, "y":0}, 
-			{"x":5.5, "y":0}, 
-			
-			{"x":1.25, "y":1.25}, 
-			{"x":2.25, "y":1.25}, 
-			{"x":3.25, "y":1.25}, 
-			{"x":4.25, "y":1.25}, 
-			
-			{"x":1.25, "y":2.25}, 
-			{"x":2.25, "y":2.25}, 
-			{"x":3.25, "y":2.25}, 
-			{"x":4.25, "y":2.25}
-			]
+                {"matrix": [2, 0], "x": 0, "y": 0},
+                {"matrix": [0, 4], "x": 1, "y": 0},
+                {"matrix": [2, 1], "x": 2, "y": 0},
+
+                {"matrix": [2, 2], "x": 3.5, "y": 0},
+                {"matrix": [1, 4], "x": 4.5, "y": 0},
+                {"matrix": [2, 3], "x": 5.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 1.25},
+                {"matrix": [0, 1], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 4.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 2.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 2.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 2.25}
+            ]
         }
     }
 }
diff --git a/keyboards/nightly_boards/octopad/octopad.h b/keyboards/nightly_boards/octopad/octopad.h
index 941afd3f07..33cf8e0b68 100644
--- a/keyboards/nightly_boards/octopad/octopad.h
+++ b/keyboards/nightly_boards/octopad/octopad.h
@@ -18,22 +18,3 @@
 
 #include "quantum.h"
 #include "encoder_action.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    E00A, K04,   E00B,  E01A, K14,  E01B, \
-    K00,  K01,   K02,   K03,    \
-    K10,  K11,   K12,   K13    \
-\
-) { \
-    { K00,   K01,   K02,    K03,    K04   }, \
-    { K10,   K11,   K12,    K13,    K14   }, \
-    { E00A,  E00B,  E01A,   E01B,   KC_NO }  \
-}
diff --git a/keyboards/nightly_boards/octopadplus/config.h b/keyboards/nightly_boards/octopadplus/config.h
index 5936e812c8..7547d5a97b 100644
--- a/keyboards/nightly_boards/octopadplus/config.h
+++ b/keyboards/nightly_boards/octopadplus/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F6, D3 }
-#define MATRIX_COL_PINS { E6, F5, C7, D7, F4, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/info.json
index 0dbd1dee70..71556373dc 100644
--- a/keyboards/nightly_boards/octopadplus/info.json
+++ b/keyboards/nightly_boards/octopadplus/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0014",
     	"device_version": "0.0.1"
 	},
+    "matrix_pins": {
+        "cols": ["E6", "F5", "C7", "D7", "F4", "D2"],
+        "rows": ["F6", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F0", "pin_b": "F1", "resolution": 5},
@@ -33,24 +38,28 @@
         "hue_steps": 8,
         "led_count": 8,
         "max_brightness": 255,
-        "pin": "F7",
         "saturation_steps": 8,
         "sleep": true
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-			{"x":0, "y":0}, 
-			{"x":3, "y":0}, 
-			{"x":0, "y":1.25}, 
-			{"x":1, "y":1.25}, 
-			{"x":2, "y":1.25}, 
-			{"x":3, "y":1.25}, 
-			
-			{"x":0, "y":2.25}, 
-			{"x":1, "y":2.25}, 
-			{"x":2, "y":2.25}, 
-			{"x":3, "y":2.25}]
+                {"matrix": [0, 4], "x": 0, "y": 0},
+                {"matrix": [1, 5], "x": 3, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2, "y": 1.25},
+                {"matrix": [0, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2, "y": 2.25},
+                {"matrix": [1, 3], "x": 3, "y": 2.25}
+            ]
         }
     }
 }
diff --git a/keyboards/nightly_boards/octopadplus/octopadplus.c b/keyboards/nightly_boards/octopadplus/octopadplus.c
deleted file mode 100644
index 6e5c025ba2..0000000000
--- a/keyboards/nightly_boards/octopadplus/octopadplus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DeskDaily
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "octopadplus.h"
diff --git a/keyboards/nightly_boards/octopadplus/octopadplus.h b/keyboards/nightly_boards/octopadplus/octopadplus.h
deleted file mode 100644
index b32e6d8f2f..0000000000
--- a/keyboards/nightly_boards/octopadplus/octopadplus.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2022 DeskDaily
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K04,                K15, \
-    K00,  K01,   K02,   K03,    \
-    K10,  K11,   K12,   K13    \
-\
-) { \
-    { K00,   K01,   K02,    K03,    K04,    KC_NO  }, \
-    { K10,   K11,   K12,    K13,    KC_NO,  K15    }, \
-}
diff --git a/keyboards/nightly_boards/paraluman/config.h b/keyboards/nightly_boards/paraluman/config.h
index 5afc485007..b21da143b5 100644
--- a/keyboards/nightly_boards/paraluman/config.h
+++ b/keyboards/nightly_boards/paraluman/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, F7, B1, B0, E6 }
-#define MATRIX_COL_PINS { B2, F6, F5, F4, F1, F0, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nightly_boards/paraluman/info.json b/keyboards/nightly_boards/paraluman/info.json
index 5d7238faaa..57e0e225dd 100644
--- a/keyboards/nightly_boards/paraluman/info.json
+++ b/keyboards/nightly_boards/paraluman/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0012",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "F6", "F5", "F4", "F1", "F0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["D0", "F7", "B1", "B0", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nightly_boards/paraluman/paraluman.c b/keyboards/nightly_boards/paraluman/paraluman.c
deleted file mode 100644
index 00769d9380..0000000000
--- a/keyboards/nightly_boards/paraluman/paraluman.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 DeskDaily
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "paraluman.h"
diff --git a/keyboards/nightly_boards/ph_arisu/config.h b/keyboards/nightly_boards/ph_arisu/config.h
index 11ab2707a2..5f36081323 100644
--- a/keyboards/nightly_boards/ph_arisu/config.h
+++ b/keyboards/nightly_boards/ph_arisu/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/nightly_boards/ph_arisu/info.json b/keyboards/nightly_boards/ph_arisu/info.json
index ddf9469f36..640760fd10 100644
--- a/keyboards/nightly_boards/ph_arisu/info.json
+++ b/keyboards/nightly_boards/ph_arisu/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/nightly_boards/ph_arisu/ph_arisu.c b/keyboards/nightly_boards/ph_arisu/ph_arisu.c
deleted file mode 100644
index e1cd5d3a04..0000000000
--- a/keyboards/nightly_boards/ph_arisu/ph_arisu.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ph_arisu.h"
diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h
index bb1f16afc4..39eec86786 100644
--- a/keyboards/nightmare/config.h
+++ b/keyboards/nightmare/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { B4, B5, D3, D2, D1, D0, F4, F5, F6, F7, B1, B3, B2, B6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nightmare/info.json b/keyboards/nightmare/info.json
index 0e349f1a15..87f0187e59 100644
--- a/keyboards/nightmare/info.json
+++ b/keyboards/nightmare/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4E49",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "D3", "D2", "D1", "D0", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [0, 1]
     },
@@ -16,527 +21,125 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {
-                    "label": "Home",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "`",
-                    "x": 1.25,
-                    "y": 0
-                },
-                {
-                    "label": "Q",
-                    "x": 2.25,
-                    "y": 0
-                },
-                {
-                    "label": "W",
-                    "x": 3.25,
-                    "y": 0
-                },
-                {
-                    "label": "E",
-                    "x": 4.25,
-                    "y": 0
-                },
-                {
-                    "label": "R",
-                    "x": 5.25,
-                    "y": 0
-                },
-                {
-                    "label": "T",
-                    "x": 6.25,
-                    "y": 0
-                },
-                {
-                    "label": "Y",
-                    "x": 7.25,
-                    "y": 0
-                },
-                {
-                    "label": "U",
-                    "x": 8.25,
-                    "y": 0
-                },
-                {
-                    "label": "I",
-                    "x": 9.25,
-                    "y": 0
-                },
-                {
-                    "label": "O",
-                    "x": 10.25,
-                    "y": 0
-                },
-                {
-                    "label": "P",
-                    "x": 11.25,
-                    "y": 0
-                },
-                {
-                    "label": "{",
-                    "x": 12.25,
-                    "y": 0
-                },
-                {
-                    "label": "}",
-                    "x": 13.25,
-                    "y": 0
-                },
-                {
-                    "label": "Bspc",
-                    "x": 14.25,
-                    "y": 0
-                },
-                {
-                    "label": "End",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Tab",
-                    "x": 1.25,
-                    "y": 1,
-                    "w": 1.25
-                },
-                {
-                    "label": "A",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "S",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "D",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "F",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "G",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "H",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "J",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "K",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "L",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": ":",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "\"",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "Enter",
-                    "x": 13.5,
-                    "y": 1,
-                    "w": 1.75
-                },
-                {
-                    "label": "PgUp",
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "Shift",
-                    "x": 1.25,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "Z",
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "label": "X",
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "label": "C",
-                    "x": 5,
-                    "y": 2
-                },
-                {
-                    "label": "V",
-                    "x": 6,
-                    "y": 2
-                },
-                {
-                    "label": "B",
-                    "x": 7,
-                    "y": 2
-                },
-                {
-                    "label": "N",
-                    "x": 8,
-                    "y": 2
-                },
-                {
-                    "label": "M",
-                    "x": 9,
-                    "y": 2
-                },
-                {
-                    "label": "<",
-                    "x": 10,
-                    "y": 2
-                },
-                {
-                    "label": "<",
-                    "x": 11,
-                    "y": 2
-                },
-                {
-                    "label": "?",
-                    "x": 12,
-                    "y": 2
-                },
-                {
-                    "label": "Shift",
-                    "x": 13,
-                    "y": 2,
-                    "w": 1.25
-                },
-                {
-                    "label": "MO(1)",
-                    "x": 14.25,
-                    "y": 2
-                },
-                {
-                    "label": "PgDn",
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "GUI",
-                    "x": 2.5,
-                    "y": 3
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 3.5,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "x": 4.75,
-                    "y": 3,
-                    "w": 7
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 11.75,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "MO(2)",
-                    "x": 13,
-                    "y": 3
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [1, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2, "w": 1.25},
+                {"matrix": [3, 13], "x": 14.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 2.5, "y": 3},
+                {"matrix": [3, 2], "x": 3.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 4.75, "y": 3, "w": 7},
+                {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 12], "x": 13, "y": 3}
             ]
         },
         "LAYOUT_split": {
             "layout": [
-                {
-                    "label": "Home",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "`",
-                    "x": 1.25,
-                    "y": 0
-                },
-                {
-                    "label": "Q",
-                    "x": 2.25,
-                    "y": 0
-                },
-                {
-                    "label": "W",
-                    "x": 3.25,
-                    "y": 0
-                },
-                {
-                    "label": "E",
-                    "x": 4.25,
-                    "y": 0
-                },
-                {
-                    "label": "R",
-                    "x": 5.25,
-                    "y": 0
-                },
-                {
-                    "label": "T",
-                    "x": 6.25,
-                    "y": 0
-                },
-                {
-                    "label": "Y",
-                    "x": 7.25,
-                    "y": 0
-                },
-                {
-                    "label": "U",
-                    "x": 8.25,
-                    "y": 0
-                },
-                {
-                    "label": "I",
-                    "x": 9.25,
-                    "y": 0
-                },
-                {
-                    "label": "O",
-                    "x": 10.25,
-                    "y": 0
-                },
-                {
-                    "label": "P",
-                    "x": 11.25,
-                    "y": 0
-                },
-                {
-                    "label": "{",
-                    "x": 12.25,
-                    "y": 0
-                },
-                {
-                    "label": "}",
-                    "x": 13.25,
-                    "y": 0
-                },
-                {
-                    "label": "Bspc",
-                    "x": 14.25,
-                    "y": 0
-                },
-                {
-                    "label": "End",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Tab",
-                    "x": 1.25,
-                    "y": 1,
-                    "w": 1.25
-                },
-                {
-                    "label": "A",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "S",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "D",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "F",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "G",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "H",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "J",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "K",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "L",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": ":",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "\"",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "Enter",
-                    "x": 13.5,
-                    "y": 1,
-                    "w": 1.75
-                },
-                {
-                    "label": "PgUp",
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "Shift",
-                    "x": 1.25,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "Z",
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "label": "X",
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "label": "C",
-                    "x": 5,
-                    "y": 2
-                },
-                {
-                    "label": "V",
-                    "x": 6,
-                    "y": 2
-                },
-                {
-                    "label": "B",
-                    "x": 7,
-                    "y": 2
-                },
-                {
-                    "label": "N",
-                    "x": 8,
-                    "y": 2
-                },
-                {
-                    "label": "M",
-                    "x": 9,
-                    "y": 2
-                },
-                {
-                    "label": "<",
-                    "x": 10,
-                    "y": 2
-                },
-                {
-                    "label": "<",
-                    "x": 11,
-                    "y": 2
-                },
-                {
-                    "label": "?",
-                    "x": 12,
-                    "y": 2
-                },
-                {
-                    "label": "Shift",
-                    "x": 13,
-                    "y": 2,
-                    "w": 1.25
-                },
-                {
-                    "label": "MO(1)",
-                    "x": 14.25,
-                    "y": 2
-                },
-                {
-                    "label": "PgDn",
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "GUI",
-                    "x": 2.5,
-                    "y": 3
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 3.5,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 4.75,
-                    "y": 3
-                },
-                {
-                    "x": 5.75,
-                    "y": 3,
-                    "w": 2.25
-                },
-                {
-                    "x": 8,
-                    "y": 3,
-                    "w": 2.75
-                },
-                {
-                    "label": "RGUI",
-                    "x": 10.75,
-                    "y": 3
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 11.75,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "MO(2)",
-                    "x": 13,
-                    "y": 3
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [1, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2, "w": 1.25},
+                {"matrix": [3, 13], "x": 14.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 2.5, "y": 3},
+                {"matrix": [3, 2], "x": 3.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 8, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 12], "x": 13, "y": 3}
             ]
         }
     }
diff --git a/keyboards/nightmare/nightmare.c b/keyboards/nightmare/nightmare.c
deleted file mode 100644
index 301a8981a8..0000000000
--- a/keyboards/nightmare/nightmare.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 cfbender
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "nightmare.h"
diff --git a/keyboards/nightmare/nightmare.h b/keyboards/nightmare/nightmare.h
deleted file mode 100644
index 017e3494e0..0000000000
--- a/keyboards/nightmare/nightmare.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2019 cfbender
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_default( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k113, k013, \
-    k100,  k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,   k213,    \
-    k200, k201,   k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,  k313,    \
-    k300,      k301, k302,                         k307,               k311, k312             \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008, k009, k010, k011, k012, k013   }, \
-	{ k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108, k109, k110, k111, k112, k113   }, \
-	{ k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208, k209, k210, k211, k212, k213   }, \
-	{ k300,  k301,  k302,  KC_NO, KC_NO, KC_NO, KC_NO, k307, KC_NO, KC_NO, KC_NO, k311, k312, k313 } \
-}
-
-
-#define LAYOUT_split( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k113, k013, \
-    k100,  k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,   k213,    \
-    k200, k201,   k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,  k313,    \
-    k300,      k301, k302, k304,      k305,         k307,  k309,  k311, k312             \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008, k009, k010, k011, k012, k013   }, \
-	{ k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108, k109, k110, k111, k112, k113   }, \
-	{ k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208, k209, k210, k211, k212, k213   }, \
-	{ k300,  k301,  k302,  KC_NO, k304,  k305, KC_NO,  k307, KC_NO, k309, KC_NO, k311, k312, k313 } \
-}
diff --git a/keyboards/nimrod/config.h b/keyboards/nimrod/config.h
index f828070707..d74e88c63a 100644
--- a/keyboards/nimrod/config.h
+++ b/keyboards/nimrod/config.h
@@ -15,23 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F5, B6, D7, C6 }
-#define MATRIX_COL_PINS { D1, F4, B5, B4, E6, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/nimrod/info.json b/keyboards/nimrod/info.json
index ed1b8b02e9..4c14f8fd07 100644
--- a/keyboards/nimrod/info.json
+++ b/keyboards/nimrod/info.json
@@ -8,208 +8,228 @@
         "pid": "0x720D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "F4", "B5", "B4", "E6", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["F5", "B6", "D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x10"],
     "layouts": {
         "LAYOUT_ortho_4x10": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1.25 },
-                { "x": 1.25, "y": 0, "w": 1.25 },
-                { "x": 2.5, "y": 0, "w": 1.25 },
-                { "x": 3.75, "y": 0, "w": 1.25 },
-                { "x": 5, "y": 0, "w": 1.25 },
-                { "x": 6.25, "y": 0, "w": 1.25 },
-                { "x": 7.5, "y": 0, "w": 1.25 },
-                { "x": 8.75, "y": 0, "w": 1.25 },
-                { "x": 10, "y": 0, "w": 1.25 },
-                { "x": 11.25, "y": 0, "w": 1.25 },
-                { "x": 0, "y": 1, "w": 1.25 },
-                { "x": 1.25, "y": 1, "w": 1.25 },
-                { "x": 2.5, "y": 1, "w": 1.25 },
-                { "x": 3.75, "y": 1, "w": 1.25 },
-                { "x": 5, "y": 1, "w": 1.25 },
-                { "x": 6.25, "y": 1, "w": 1.25 },
-                { "x": 7.5, "y": 1, "w": 1.25 },
-                { "x": 8.75, "y": 1, "w": 1.25 },
-                { "x": 10, "y": 1, "w": 1.25 },
-                { "x": 11.25, "y": 1, "w": 1.25 },
-                { "x": 0, "y": 2, "w": 1.25 },
-                { "x": 1.25, "y": 2, "w": 1.25 },
-                { "x": 2.5, "y": 2, "w": 1.25 },
-                { "x": 3.75, "y": 2, "w": 1.25 },
-                { "x": 5, "y": 2, "w": 1.25 },
-                { "x": 6.25, "y": 2, "w": 1.25 },
-                { "x": 7.5, "y": 2, "w": 1.25 },
-                { "x": 8.75, "y": 2, "w": 1.25 },
-                { "x": 10, "y": 2, "w": 1.25 },
-                { "x": 11.25, "y": 2, "w": 1.25 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3, "w": 1.25 },
-                { "x": 2.5, "y": 3, "w": 1.25 },
-                { "x": 3.75, "y": 3, "w": 1.25 },
-                { "x": 5, "y": 3, "w": 1.25 },
-                { "x": 6.25, "y": 3, "w": 1.25 },
-                { "x": 7.5, "y": 3, "w": 1.25 },
-                { "x": 8.75, "y": 3, "w": 1.25 },
-                { "x": 10, "y": 3, "w": 1.25 },
-                { "x": 11.25, "y": 3, "w": 1.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25},
+                {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25},
+                {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 10, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_left_space": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1.25 },
-                { "x": 1.25, "y": 0, "w": 1.25 },
-                { "x": 2.5, "y": 0, "w": 1.25 },
-                { "x": 3.75, "y": 0, "w": 1.25 },
-                { "x": 5, "y": 0, "w": 1.25 },
-                { "x": 6.25, "y": 0, "w": 1.25 },
-                { "x": 7.5, "y": 0, "w": 1.25 },
-                { "x": 8.75, "y": 0, "w": 1.25 },
-                { "x": 10, "y": 0, "w": 1.25 },
-                { "x": 11.25, "y": 0, "w": 1.25 },
-                { "x": 0, "y": 1, "w": 1.25 },
-                { "x": 1.25, "y": 1, "w": 1.25 },
-                { "x": 2.5, "y": 1, "w": 1.25 },
-                { "x": 3.75, "y": 1, "w": 1.25 },
-                { "x": 5, "y": 1, "w": 1.25 },
-                { "x": 6.25, "y": 1, "w": 1.25 },
-                { "x": 7.5, "y": 1, "w": 1.25 },
-                { "x": 8.75, "y": 1, "w": 1.25 },
-                { "x": 10, "y": 1, "w": 1.25 },
-                { "x": 11.25, "y": 1, "w": 1.25 },
-                { "x": 0, "y": 2, "w": 1.25 },
-                { "x": 1.25, "y": 2, "w": 1.25 },
-                { "x": 2.5, "y": 2, "w": 1.25 },
-                { "x": 3.75, "y": 2, "w": 1.25 },
-                { "x": 5, "y": 2, "w": 1.25 },
-                { "x": 6.25, "y": 2, "w": 1.25 },
-                { "x": 7.5, "y": 2, "w": 1.25 },
-                { "x": 8.75, "y": 2, "w": 1.25 },
-                { "x": 10, "y": 2, "w": 1.25 },
-                { "x": 11.25, "y": 2, "w": 1.25 },
-                { "x": 0, "y": 3, "w": 6.25 },
-                { "x": 6.25, "y": 3, "w": 1.25 },
-                { "x": 7.5, "y": 3, "w": 1.25 },
-                { "x": 8.75, "y": 3, "w": 1.25 },
-                { "x": 10, "y": 3, "w": 1.25 },
-                { "x": 11.25, "y": 3, "w": 1.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25},
+                {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25},
+                {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 6.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 10, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_center_space": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1.25 },
-                { "x": 1.25, "y": 0, "w": 1.25 },
-                { "x": 2.5, "y": 0, "w": 1.25 },
-                { "x": 3.75, "y": 0, "w": 1.25 },
-                { "x": 5, "y": 0, "w": 1.25 },
-                { "x": 6.25, "y": 0, "w": 1.25 },
-                { "x": 7.5, "y": 0, "w": 1.25 },
-                { "x": 8.75, "y": 0, "w": 1.25 },
-                { "x": 10, "y": 0, "w": 1.25 },
-                { "x": 11.25, "y": 0, "w": 1.25 },
-                { "x": 0, "y": 1, "w": 1.25 },
-                { "x": 1.25, "y": 1, "w": 1.25 },
-                { "x": 2.5, "y": 1, "w": 1.25 },
-                { "x": 3.75, "y": 1, "w": 1.25 },
-                { "x": 5, "y": 1, "w": 1.25 },
-                { "x": 6.25, "y": 1, "w": 1.25 },
-                { "x": 7.5, "y": 1, "w": 1.25 },
-                { "x": 8.75, "y": 1, "w": 1.25 },
-                { "x": 10, "y": 1, "w": 1.25 },
-                { "x": 11.25, "y": 1, "w": 1.25 },
-                { "x": 0, "y": 2, "w": 1.25 },
-                { "x": 1.25, "y": 2, "w": 1.25 },
-                { "x": 2.5, "y": 2, "w": 1.25 },
-                { "x": 3.75, "y": 2, "w": 1.25 },
-                { "x": 5, "y": 2, "w": 1.25 },
-                { "x": 6.25, "y": 2, "w": 1.25 },
-                { "x": 7.5, "y": 2, "w": 1.25 },
-                { "x": 8.75, "y": 2, "w": 1.25 },
-                { "x": 10, "y": 2, "w": 1.25 },
-                { "x": 11.25, "y": 2, "w": 1.25 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3, "w": 1.25 },
-                { "x": 2.5, "y": 3, "w": 6.25 },
-                { "x": 8.75, "y": 3, "w": 1.25 },
-                { "x": 10, "y": 3, "w": 1.25 },
-                { "x": 11.25, "y": 3, "w": 1.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25},
+                {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25},
+                {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 6.25},
+                {"matrix": [3, 7], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 10, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_right_space": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1.25 },
-                { "x": 1.25, "y": 0, "w": 1.25 },
-                { "x": 2.5, "y": 0, "w": 1.25 },
-                { "x": 3.75, "y": 0, "w": 1.25 },
-                { "x": 5, "y": 0, "w": 1.25 },
-                { "x": 6.25, "y": 0, "w": 1.25 },
-                { "x": 7.5, "y": 0, "w": 1.25 },
-                { "x": 8.75, "y": 0, "w": 1.25 },
-                { "x": 10, "y": 0, "w": 1.25 },
-                { "x": 11.25, "y": 0, "w": 1.25 },
-                { "x": 0, "y": 1, "w": 1.25 },
-                { "x": 1.25, "y": 1, "w": 1.25 },
-                { "x": 2.5, "y": 1, "w": 1.25 },
-                { "x": 3.75, "y": 1, "w": 1.25 },
-                { "x": 5, "y": 1, "w": 1.25 },
-                { "x": 6.25, "y": 1, "w": 1.25 },
-                { "x": 7.5, "y": 1, "w": 1.25 },
-                { "x": 8.75, "y": 1, "w": 1.25 },
-                { "x": 10, "y": 1, "w": 1.25 },
-                { "x": 11.25, "y": 1, "w": 1.25 },
-                { "x": 0, "y": 2, "w": 1.25 },
-                { "x": 1.25, "y": 2, "w": 1.25 },
-                { "x": 2.5, "y": 2, "w": 1.25 },
-                { "x": 3.75, "y": 2, "w": 1.25 },
-                { "x": 5, "y": 2, "w": 1.25 },
-                { "x": 6.25, "y": 2, "w": 1.25 },
-                { "x": 7.5, "y": 2, "w": 1.25 },
-                { "x": 8.75, "y": 2, "w": 1.25 },
-                { "x": 10, "y": 2, "w": 1.25 },
-                { "x": 11.25, "y": 2, "w": 1.25 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3, "w": 1.25 },
-                { "x": 2.5, "y": 3, "w": 1.25 },
-                { "x": 3.75, "y": 3, "w": 1.25 },
-                { "x": 5, "y": 3, "w": 1.25 },
-                { "x": 6.25, "y": 3, "w": 6.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25},
+                {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25},
+                {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 5, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 6.25}
             ]
         },
         "LAYOUT_split_space": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1.25 },
-                { "x": 1.25, "y": 0, "w": 1.25 },
-                { "x": 2.5, "y": 0, "w": 1.25 },
-                { "x": 3.75, "y": 0, "w": 1.25 },
-                { "x": 5, "y": 0, "w": 1.25 },
-                { "x": 6.25, "y": 0, "w": 1.25 },
-                { "x": 7.5, "y": 0, "w": 1.25 },
-                { "x": 8.75, "y": 0, "w": 1.25 },
-                { "x": 10, "y": 0, "w": 1.25 },
-                { "x": 11.25, "y": 0, "w": 1.25 },
-                { "x": 0, "y": 1, "w": 1.25 },
-                { "x": 1.25, "y": 1, "w": 1.25 },
-                { "x": 2.5, "y": 1, "w": 1.25 },
-                { "x": 3.75, "y": 1, "w": 1.25 },
-                { "x": 5, "y": 1, "w": 1.25 },
-                { "x": 6.25, "y": 1, "w": 1.25 },
-                { "x": 7.5, "y": 1, "w": 1.25 },
-                { "x": 8.75, "y": 1, "w": 1.25 },
-                { "x": 10, "y": 1, "w": 1.25 },
-                { "x": 11.25, "y": 1, "w": 1.25 },
-                { "x": 0, "y": 2, "w": 1.25 },
-                { "x": 1.25, "y": 2, "w": 1.25 },
-                { "x": 2.5, "y": 2, "w": 1.25 },
-                { "x": 3.75, "y": 2, "w": 1.25 },
-                { "x": 5, "y": 2, "w": 1.25 },
-                { "x": 6.25, "y": 2, "w": 1.25 },
-                { "x": 7.5, "y": 2, "w": 1.25 },
-                { "x": 8.75, "y": 2, "w": 1.25 },
-                { "x": 10, "y": 2, "w": 1.25 },
-                { "x": 11.25, "y": 2, "w": 1.25 },
-                { "x": 0, "y": 3, "w": 6.25 },
-                { "x": 6.25, "y": 3, "w": 6.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25},
+                {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25},
+                {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 6.25},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 6.25}
             ]
         }
     }
diff --git a/keyboards/nimrod/nimrod.c b/keyboards/nimrod/nimrod.c
deleted file mode 100644
index bed03197f8..0000000000
--- a/keyboards/nimrod/nimrod.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 cjcodell1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "nimrod.h"
diff --git a/keyboards/nimrod/nimrod.h b/keyboards/nimrod/nimrod.h
deleted file mode 100644
index 253154905c..0000000000
--- a/keyboards/nimrod/nimrod.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2020 cjcodell1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_ortho_4x10( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39  \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09  }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19  }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29  }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39  }  \
-}
-
-#define LAYOUT_left_space( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
-            K32,           K35, K36, K37, K38, K39  \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09  }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19  }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29  }, \
-  { XXX, XXX, K32, XXX, XXX, K35, K36, K37, K38, K39  }  \
-}
-
-#define LAYOUT_center_space( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
-  K30, K31,           K34,           K37, K38, K39  \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09  }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19  }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29  }, \
-  { K30, K31, XXX, XXX, K34, XXX, XXX, K37, K38, K39  }  \
-}
-
-#define LAYOUT_right_space( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
-  K30, K31, K32, K33, K34,           K37            \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09  }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19  }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29  }, \
-  { K30, K31, K32, K33, K34, XXX, XXX, K37, XXX, XXX  }  \
-}
-
-#define LAYOUT_split_space( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
-            K32,                     K37            \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09  }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19  }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29  }, \
-  { XXX, XXX, K32, XXX, XXX, XXX, XXX, K37, XXX, XXX  }  \
-}
diff --git a/keyboards/ning/tiny_board/tb16_rgb/config.h b/keyboards/ning/tiny_board/tb16_rgb/config.h
index d6e6c6a154..a44da94f82 100644
--- a/keyboards/ning/tiny_board/tb16_rgb/config.h
+++ b/keyboards/ning/tiny_board/tb16_rgb/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN B5
 #define RGB_MATRIX_LED_COUNT 16
 
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/ning/tiny_board/tb16_rgb/info.json b/keyboards/ning/tiny_board/tb16_rgb/info.json
index 5c19f2fe6b..08e361c960 100644
--- a/keyboards/ning/tiny_board/tb16_rgb/info.json
+++ b/keyboards/ning/tiny_board/tb16_rgb/info.json
@@ -12,10 +12,16 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "matrix_pins": {
         "cols": ["B6", "B1", "B3", "B2"],
         "rows": ["F7", "F6", "F5", "F4"]
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "development_board": "promicro",
     "url": "",
     "usb": {
diff --git a/keyboards/ning/tiny_board/tb16_rgb/rules.mk b/keyboards/ning/tiny_board/tb16_rgb/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/ning/tiny_board/tb16_rgb/rules.mk
+++ b/keyboards/ning/tiny_board/tb16_rgb/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/nix_studio/n60_a/config.h b/keyboards/nix_studio/n60_a/config.h
deleted file mode 100644
index 871856ed65..0000000000
--- a/keyboards/nix_studio/n60_a/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright Nix Studio & Valdiieee
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nix_studio/n60_a/info.json b/keyboards/nix_studio/n60_a/info.json
index 73fe121551..7d8f44b432 100644
--- a/keyboards/nix_studio/n60_a/info.json
+++ b/keyboards/nix_studio/n60_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3630",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nix_studio/n60_a/n60_a.c b/keyboards/nix_studio/n60_a/n60_a.c
deleted file mode 100644
index 9a5563cb89..0000000000
--- a/keyboards/nix_studio/n60_a/n60_a.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright Nix Studio & Valdiieee
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#include "n60_a.h"
diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h
index fa337fe426..dad8a5e9f1 100644
--- a/keyboards/nix_studio/oxalys80/config.h
+++ b/keyboards/nix_studio/oxalys80/config.h
@@ -16,30 +16,11 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -56,4 +37,3 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
-#endif
diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/info.json
index 64e491cc41..768eccb7c2 100644
--- a/keyboards/nix_studio/oxalys80/info.json
+++ b/keyboards/nix_studio/oxalys80/info.json
@@ -8,9 +8,17 @@
         "pid": "0x3830",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "indicators": {
         "caps_lock": "E6",
         "scroll_lock": "B2",
@@ -22,672 +30,728 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                { "x":13, "y":1.5},
-                {"label":"Bksp", "x":14, "y":1.5},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                { "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
-                { "x":14, "y":4.5},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                { "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5},
+                {"matrix": [6, 6], "x": 14, "y": 1.5},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                { "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                { "x":4, "y":5.5, "w":7},
-                {"label":"Win", "x":11, "y":5.5, "w":1.5},
-                {"label":"Menu", "x":12.5, "y":5.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                { "x":4, "y":5.5, "w":7},
-                {"label":"Alt", "x":11, "y":5.5, "w":1.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"NUBS", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"NUBS", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                {"label":"Space", "x":4, "y":5.5, "w":7},
-                {"label":"Win", "x":11, "y":5.5, "w":1.5},
-                {"label":"Menu", "x":12.5, "y":5.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"NUBS", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                {"label":"Space", "x":4, "y":5.5, "w":7},
-                {"label":"Alt", "x":11, "y":5.5, "w":1.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/nix_studio/oxalys80/oxalys80.c b/keyboards/nix_studio/oxalys80/oxalys80.c
index c5078a9f83..cfebb71043 100644
--- a/keyboards/nix_studio/oxalys80/oxalys80.c
+++ b/keyboards/nix_studio/oxalys80/oxalys80.c
@@ -13,8 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "oxalys80.h"
 
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {  // EEPROM is getting reset!
   rgblight_enable(); // Enable RGB by default
diff --git a/keyboards/nix_studio/oxalys80/oxalys80.h b/keyboards/nix_studio/oxalys80/oxalys80.h
deleted file mode 100644
index 2a9f789b5d..0000000000
--- a/keyboards/nix_studio/oxalys80/oxalys80.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* Copyright 2021 Nix Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* LAYOUT_all
- *              ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- *              │00 │   │01 │11 │02 │12 │ │03 │13 │04 │14 │ │05 │15 │06 │16 │ │07 │17 │08 │
- *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───┬───�      ┌───────�
- *              │20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │66 │ │27 │37 │28 │      │36     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
- *              │40   │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56   │ │47 │57 │48 │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴�76  │ ISO Enter
- *  LShift      │60    │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │76      │                   │56 │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───�       ┌─┴───┴────┤
- * │80      │   │80  │90 │81 │91 │82 │92 │83 │93 │84 │94 │85 │95 │86    │96 │     │97 │       │86        │ 2.75u RShift
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───�   └──────────┘
- *              │A0  │B0  │A1  │A3                      │A5  │B5  │A6  │B6  │ │A7 │B7 │A8 │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *              │A0   │B0 │A1   │A3                         │B5   │A6 │B6   │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *              │A0   │   │A1   │A3                         │B5   │   │B6   │ WKL
- *              └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
- */
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_all(\
-    K00,      K01, K11, K02, K12,   K03, K13, K04, K14,    K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K66,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,        K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K76,                       \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96,             K97,      \
-    KA0, KB0, KA1,                KA3,                KA5, KB5, KA6, KB6,        KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, K66, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { K90, K91, K92, K93, K94, K95, K96, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, KA5, KA6, KA7, KA8 }, \
-    { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_ansi(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,   K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K76,                  \
-    K80,      K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0, KB0, KA1,                KA3,                KA5, KB5, KA6, KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { ___, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, KA5, KA6, KA7, KA8 }, \
-    { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,   K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K76,                  \
-    K80,      K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0, KB0, KA1,                KA3,                     KB5, KA6, KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { ___, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, ___, KA6, KA7, KA8 }, \
-    { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,   K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K76,                  \
-    K80,      K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0,      KA1,                KA3,                     KB5,      KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { ___, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, ___, ___, KA7, KA8 }, \
-    { ___, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_iso(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,        K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K56, K76,                  \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0, KB0, KA1,                KA3,                KA5, KB5, KA6, KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { K90, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, KA5, KA6, KA7, KA8 }, \
-    { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_iso_tsangan(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,        K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K56, K76,                  \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0, KB0, KA1,                KA3,                     KB5, KA6, KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { K90, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, ___, KA6, KA7, KA8 }, \
-    { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_iso_wkl(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,        K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K56, K76,                  \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0,      KA1,                KA3,                     KB5,      KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { K90, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, ___, ___, KA7, KA8 }, \
-    { ___, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
diff --git a/keyboards/nixkeyboards/day_off/config.h b/keyboards/nixkeyboards/day_off/config.h
deleted file mode 100644
index a280d81458..0000000000
--- a/keyboards/nixkeyboards/day_off/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Nix Keyboards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS \
-    { B3, B7, F5, F4, F1 }
-#define MATRIX_COL_PINS \
-    { F0, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nixkeyboards/day_off/day_off.c b/keyboards/nixkeyboards/day_off/day_off.c
deleted file mode 100644
index 2694682f09..0000000000
--- a/keyboards/nixkeyboards/day_off/day_off.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Nix Keyboards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "day_off.h"
diff --git a/keyboards/nixkeyboards/day_off/day_off.h b/keyboards/nixkeyboards/day_off/day_off.h
deleted file mode 100644
index f890b837e6..0000000000
--- a/keyboards/nixkeyboards/day_off/day_off.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Nix Keyboards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all(K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,\
-	       K011, K012, K013, K014, K101, K102, K103, K104, K105, K106, \
-	       K107, K108, K109, K110, K111, K112, K113, K114, K200, K201, \
-	       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-	       K212, K213, K214, K300, K301, K302, K303, K304, K305, K306, \
-	       K307, K308, K309, K310, K311, K312, K313, K314, K400, K401, \
-	       K402, K403, K405, K407, K408, K410, K411, K412, K413, K414) \
-    {   {KC_NO, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \
-      	{KC_NO, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114}, \
-        {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214}, \
-	{K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314}, \
-	{K400, K401, K402, K403, KC_NO, K405, KC_NO, K407, K408, KC_NO, K410, K411, K412, K413, KC_NO} \
-    }
diff --git a/keyboards/nixkeyboards/day_off/info.json b/keyboards/nixkeyboards/day_off/info.json
index 4a9d7bbff6..3bb6933b4c 100644
--- a/keyboards/nixkeyboards/day_off/info.json
+++ b/keyboards/nixkeyboards/day_off/info.json
@@ -8,6 +8,11 @@
         "pid": "0x444F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B3", "B7", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "B1"}
@@ -21,76 +26,76 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"~", "x":1.5, "y":0},
-                {"label":"!", "x":2.5, "y":0},
-                {"label":"@", "x":3.5, "y":0},
-                {"label":"#", "x":4.5, "y":0},
-                {"label":"$", "x":5.5, "y":0},
-                {"label":"%", "x":6.5, "y":0},
-                {"label":"^", "x":7.5, "y":0},
-                {"label":"&", "x":8.5, "y":0},
-                {"label":"*", "x":9.5, "y":0},
-                {"label":"(", "x":10.5, "y":0},
-                {"label":")", "x":11.5, "y":0},
-                {"label":"_", "x":12.5, "y":0},
-                {"label":"+", "x":13.5, "y":0},
-                {"label":"Bksp", "x":14.5, "y":0},
-                {"label":"Del", "x":15.5, "y":0},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":8, "y":1},
-                {"label":"U", "x":9, "y":1},
-                {"label":"I", "x":10, "y":1},
-                {"label":"O", "x":11, "y":1},
-                {"label":"P", "x":12, "y":1},
-                {"label":"{", "x":13, "y":1},
-                {"label":"}", "x":14, "y":1},
-                {"label":"|", "x":15, "y":1, "w":1.5},
-                {"label":"M1", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
-                {"label":"A", "x":3.25, "y":2},
-                {"label":"S", "x":4.25, "y":2},
-                {"label":"D", "x":5.25, "y":2},
-                {"label":"F", "x":6.25, "y":2},
-                {"label":"G", "x":7.25, "y":2},
-                {"label":"H", "x":8.25, "y":2},
-                {"label":"J", "x":9.25, "y":2},
-                {"label":"K", "x":10.25, "y":2},
-                {"label":"L", "x":11.25, "y":2},
-                {"label":":", "x":12.25, "y":2},
-                {"label":"\"", "x":13.25, "y":2},
-                {"label":"Enter", "x":14.25, "y":2, "w":2.25},
-                {"label":"M2", "x":0, "y":3},
-                {"label":"", "x":1.5, "y":3, "w":1.25},
-                {"label":"Shift", "x":2.75, "y":3},
-                {"label":"Z", "x":3.75, "y":3},
-                {"label":"X", "x":4.75, "y":3},
-                {"label":"C", "x":5.75, "y":3},
-                {"label":"V", "x":6.75, "y":3},
-                {"label":"B", "x":7.75, "y":3},
-                {"label":"N", "x":8.75, "y":3},
-                {"label":"M", "x":9.75, "y":3},
-                {"label":"<", "x":10.75, "y":3},
-                {"label":">", "x":11.75, "y":3},
-                {"label":"?", "x":12.75, "y":3},
-                {"label":"Shift", "x":13.75, "y":3, "w":1.75},
-                {"label":"", "x":15.5, "y":3},
-                {"label":"M3", "x":0, "y":4},
-                {"label":"Ctrl", "x":1.5, "y":4, "w":1.25},
-                {"label":"Win", "x":2.75, "y":4, "w":1.25},
-                {"label":"Alt", "x":4, "y":4, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4, "w":6.25},
-                {"label":"Space", "x":5.25, "y":4, "w":2.25},
-                {"label":"Mod", "x":7.5, "y":4, "w":1.25},
-                {"label":"Space", "x":8.75, "y":4, "w":2.25},
-                {"label":"Alt", "x":11.5, "y":4, "w":1.25},
-                {"label":"Win", "x":12.75, "y":4, "w":1.25},
-                {"label":"Menu", "x":14, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}
+                {"label":"~", "x":1.5, "y":0, "matrix":[0, 1]},
+                {"label":"!", "x":2.5, "y":0, "matrix":[0, 2]},
+                {"label":"@", "x":3.5, "y":0, "matrix":[0, 3]},
+                {"label":"#", "x":4.5, "y":0, "matrix":[0, 4]},
+                {"label":"$", "x":5.5, "y":0, "matrix":[0, 5]},
+                {"label":"%", "x":6.5, "y":0, "matrix":[0, 6]},
+                {"label":"^", "x":7.5, "y":0, "matrix":[0, 7]},
+                {"label":"&", "x":8.5, "y":0, "matrix":[0, 8]},
+                {"label":"*", "x":9.5, "y":0, "matrix":[0, 9]},
+                {"label":"(", "x":10.5, "y":0, "matrix":[0, 10]},
+                {"label":")", "x":11.5, "y":0, "matrix":[0, 11]},
+                {"label":"_", "x":12.5, "y":0, "matrix":[0, 12]},
+                {"label":"+", "x":13.5, "y":0, "matrix":[0, 13]},
+                {"label":"Bksp", "x":14.5, "y":0, "matrix":[0, 14]},
+                {"label":"Del", "x":15.5, "y":0, "matrix":[1, 1]},
+                {"label":"Tab", "x":1.5, "y":1, "w":1.5, "matrix":[1, 2]},
+                {"label":"Q", "x":3, "y":1, "matrix":[1, 3]},
+                {"label":"W", "x":4, "y":1, "matrix":[1, 4]},
+                {"label":"E", "x":5, "y":1, "matrix":[1, 5]},
+                {"label":"R", "x":6, "y":1, "matrix":[1, 6]},
+                {"label":"T", "x":7, "y":1, "matrix":[1, 7]},
+                {"label":"Y", "x":8, "y":1, "matrix":[1, 8]},
+                {"label":"U", "x":9, "y":1, "matrix":[1, 9]},
+                {"label":"I", "x":10, "y":1, "matrix":[1, 10]},
+                {"label":"O", "x":11, "y":1, "matrix":[1, 11]},
+                {"label":"P", "x":12, "y":1, "matrix":[1, 12]},
+                {"label":"{", "x":13, "y":1, "matrix":[1, 13]},
+                {"label":"}", "x":14, "y":1, "matrix":[1, 14]},
+                {"label":"|", "x":15, "y":1, "w":1.5, "matrix":[2, 0]},
+                {"label":"M1", "x":0, "y":2, "matrix":[2, 1]},
+                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75, "matrix":[2, 2]},
+                {"label":"A", "x":3.25, "y":2, "matrix":[2, 3]},
+                {"label":"S", "x":4.25, "y":2, "matrix":[2, 4]},
+                {"label":"D", "x":5.25, "y":2, "matrix":[2, 5]},
+                {"label":"F", "x":6.25, "y":2, "matrix":[2, 6]},
+                {"label":"G", "x":7.25, "y":2, "matrix":[2, 7]},
+                {"label":"H", "x":8.25, "y":2, "matrix":[2, 8]},
+                {"label":"J", "x":9.25, "y":2, "matrix":[2, 9]},
+                {"label":"K", "x":10.25, "y":2, "matrix":[2, 10]},
+                {"label":"L", "x":11.25, "y":2, "matrix":[2, 11]},
+                {"label":":", "x":12.25, "y":2, "matrix":[2, 12]},
+                {"label":"\"", "x":13.25, "y":2, "matrix":[2, 13]},
+                {"label":"Enter", "x":14.25, "y":2, "w":2.25, "matrix":[2, 14]},
+                {"label":"M2", "x":0, "y":3, "matrix":[3, 0]},
+                {"label":"", "x":1.5, "y":3, "w":1.25, "matrix":[3, 1]},
+                {"label":"Shift", "x":2.75, "y":3, "matrix":[3, 2]},
+                {"label":"Z", "x":3.75, "y":3, "matrix":[3, 3]},
+                {"label":"X", "x":4.75, "y":3, "matrix":[3, 4]},
+                {"label":"C", "x":5.75, "y":3, "matrix":[3, 5]},
+                {"label":"V", "x":6.75, "y":3, "matrix":[3, 6]},
+                {"label":"B", "x":7.75, "y":3, "matrix":[3, 7]},
+                {"label":"N", "x":8.75, "y":3, "matrix":[3, 8]},
+                {"label":"M", "x":9.75, "y":3, "matrix":[3, 9]},
+                {"label":"<", "x":10.75, "y":3, "matrix":[3, 10]},
+                {"label":">", "x":11.75, "y":3, "matrix":[3, 11]},
+                {"label":"?", "x":12.75, "y":3, "matrix":[3, 12]},
+                {"label":"Shift", "x":13.75, "y":3, "w":1.75, "matrix":[3, 13]},
+                {"label":"", "x":15.5, "y":3, "matrix":[3, 14]},
+                {"label":"M3", "x":0, "y":4, "matrix":[4, 0]},
+                {"label":"Ctrl", "x":1.5, "y":4, "w":1.25, "matrix":[4, 1]},
+                {"label":"Win", "x":2.75, "y":4, "w":1.25, "matrix":[4, 2]},
+                {"label":"Alt", "x":4, "y":4, "w":1.25, "matrix":[4, 3]},
+                {"label":"Space", "x":5.25, "y":4, "w":6.25, "matrix":[4, 5]},
+                {"label":"Space", "x":5.25, "y":4, "w":2.25, "matrix":[4, 7]},
+                {"label":"Mod", "x":7.5, "y":4, "w":1.25, "matrix":[4, 8]},
+                {"label":"Space", "x":8.75, "y":4, "w":2.25, "matrix":[4, 10]},
+                {"label":"Alt", "x":11.5, "y":4, "w":1.25, "matrix":[4, 11]},
+                {"label":"Win", "x":12.75, "y":4, "w":1.25, "matrix":[4, 12]},
+                {"label":"Menu", "x":14, "y":4, "w":1.25, "matrix":[4, 13]},
+                {"label":"Ctrl", "x":15.25, "y":4, "w":1.25, "matrix":[4, 14]}
             ]
         }
     }
diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h
index bec3df0189..1eb25da282 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v1/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS     { E6, B4, B5, B7, D5, C7, F1, F0, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS     { F4, F5, F6, F7, D7, C6, D4, D0, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION     COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json
index bbf52486b9..175e57253b 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4A57",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "D7", "C6", "D4", "D0", "D2", "D3"],
+        "rows": ["E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0",
         "num_lock": "D1"
@@ -17,119 +22,124 @@
     "layouts": {
         "LAYOUT_rh": {
             "layout": [
-                {"x":0.75,   "y":0.25,  "label":"Esc"},
-                {"x":2.25,   "y":0.25,  "label":"F1"},
-                {"x":3.25,   "y":0.25,  "label":"F2"},
-                {"x":4.25,   "y":0.25,  "r":14, "rx":4, "ry":2.5, "label":"F3"},
-                {"x":5.25,   "y":0.125, "r":14, "rx":4, "ry":2.5, "label":"F4"},
-                {"x":6.25,   "y":0.25,  "r":14, "rx":4, "ry":2.5, "label":"F5"},
-                {"x":7.25,   "y":0.375, "r":14, "rx":4, "ry":2.5, "label":"F6"},
-                {"x":10.25,  "y":0.375, "r":-14, "rx":13.25, "ry":2.5, "label":"F7"},
-                {"x":11.25,  "y":0.25,  "r":-14, "rx":13.25, "ry":2.5, "label":"F8"},
-                {"x":12.25,  "y":0.125, "r":-14, "rx":13.25, "ry":2.5, "label":"F9"},
-                {"x":13.25,  "y":0.25,  "r":-14, "rx":13.25, "ry":2.5, "label":"F10"},
-                {"x":14.25,  "y":0.25,  "label":"F11"},
-                {"x":15.25,  "y":0.25,  "label":"F12"},
-                {"x":16.375, "y":0.25,  "label":"Print"},
-                {"x":17.375, "y":0.25,  "label":"Scroll"},
-                {"x":18.5,   "y":0.25,  "label":"Ins"},
-                {"x":19.5,   "y":0.25,  "label":"Del"},
-                {"x":20.75,  "y":0.25,  "label":"Home"},
-                {"x":21.75,  "y":0.25,  "label":"End"},
-                {"x":22.75,  "y":0.25,  "label":"PgUp"},
-                {"x":23.75,  "y":0.25,  "label":"PgDn"},
-                {"x":2,      "y":1.5,   "label":"Grave"},
-                {"x":3,      "y":1.5,   "label":"1"},
-                {"x":4.25,   "y":1.5,   "r":14, "rx":4, "ry":2.5, "label":"2"},
-                {"x":5.25,   "y":1.375, "r":14, "rx":4, "ry":2.5, "label":"3"},
-                {"x":6.25,   "y":1.5,   "r":14, "rx":4, "ry":2.5, "label":"4"},
-                {"x":7.25,   "y":1.625, "r":14, "rx":4, "ry":2.5, "label":"5"},
-                {"x":10.25,  "y":1.625, "r":-14, "rx":13.25, "ry":2.5, "label":"6"},
-                {"x":11.25,  "y":1.5,   "r":-14, "rx":13.25, "ry":2.5, "label":"7"},
-                {"x":12.25,  "y":1.375, "r":-14, "rx":13.25, "ry":2.5, "label":"8"},
-                {"x":13.25,  "y":1.5,   "r":-14, "rx":13.25, "ry":2.5, "label":"9"},
-                {"x":14.5,   "y":1.5,   "label":"0"},
-                {"x":15.5,   "y":1.5,   "label":"Dash"},
-                {"x":16.5,   "y":1.5,   "label":"Equals"},
-                {"x":17.5,   "y":1.5,   "label":"Backspace"},
-                {"x":18.5,   "y":1.5,   "label":"Split BS"},
-                {"x":20.75,  "y":1.5,   "label":"NumLock"},
-                {"x":21.75,  "y":1.5,   "label":"P-Div"},
-                {"x":22.75,  "y":1.5,   "label":"P-Mult"},
-                {"x":23.75,  "y":1.5,   "label":"Pause"},
-                {"x":1.25,   "y":2.5,   "w":1.5, "label":"Tab"},
-                {"x":2.75,   "y":2.5,   "label":"Q"},
-                {"x":4.25,   "y":2.5,   "r":14, "rx":4, "ry":2.5, "label":"W"},
-                {"x":5.25,   "y":2.375, "r":14, "rx":4, "ry":2.5, "label":"E"},
-                {"x":6.25,   "y":2.5,   "r":14, "rx":4, "ry":2.5, "label":"R"},
-                {"x":7.25,   "y":2.625, "r":14, "rx":4, "ry":2.5, "label":"T"},
-                {"x":10.25,  "y":2.625, "r":-14, "rx":13.25, "ry":2.5, "label":"y"},
-                {"x":11.25,  "y":2.5,   "r":-14, "rx":13.25, "ry":2.5, "label":"U"},
-                {"x":12.25,  "y":2.375, "r":-14, "rx":13.25, "ry":2.5, "label":"I"},
-                {"x":13.25,  "y":2.5,   "r":-14, "rx":13.25, "ry":2.5, "label":"O"},
-                {"x":14.75,  "y":2.5,   "label":"P"},
-                {"x":15.75,  "y":2.5,   "label":"L bracket"},
-                {"x":16.75,  "y":2.5,   "label":"R bracket"},
-                {"x":17.75,  "y":2.5,   "w":1.5, "label":"ANSI Backslash"},
-                {"x":20.75,  "y":2.5,   "label":"P-7"},
-                {"x":21.75,  "y":2.5,   "label":"P-8"},
-                {"x":22.75,  "y":2.5,   "label":"P-9"},
-                {"x":23.75,  "y":2.5,   "label":"P-Minus"},
-                {"x":0.75,   "y":3.5,   "w":1.75, "label":"Caps Lock"},
-                {"x":2.5,    "y":3.5,   "label":"A"},
-                {"x":4.25,   "y":3.5,   "r":14, "rx":4, "ry":2.5, "label":"S"},
-                {"x":5.25,   "y":3.375, "r":14, "rx":4, "ry":2.5, "label":"D"},
-                {"x":6.25,   "y":3.5,   "r":14, "rx":4, "ry":2.5, "label":"F"},
-                {"x":7.25,   "y":3.625, "r":14, "rx":4, "ry":2.5, "label":"G"},
-                {"x":10.25,  "y":3.625, "r":-14, "rx":13.25, "ry":2.5, "label":"H"},
-                {"x":11.25,  "y":3.5,   "r":-14, "rx":13.25, "ry":2.5, "label":"J"},
-                {"x":12.25,  "y":3.375, "r":-14, "rx":13.25, "ry":2.5, "label":"K"},
-                {"x":13.25,  "y":3.5,   "r":-14, "rx":13.25, "ry":2.5, "label":"L"},
-                {"x":15,     "y":3.5,   "label":"Semicolon"},
-                {"x":16,     "y":3.5,   "label":"Quote"},
-                {"x":17,     "y":3.5,   "label":"Non-US Hash"},
-                {"x":18,     "y":3.5,   "w":1.25, "label":"Enter"},
-                {"x":20.75,  "y":3.5,   "label":"P-4"},
-                {"x":21.75,  "y":3.5,   "label":"P-5"},
-                {"x":22.75,  "y":3.5,   "label":"P-6"},
-                {"x":23.75,  "y":3.5,   "label":"P-Plus"},
-                {"x":0,      "y":4.5,   "w":1.25, "label":"Left Shift"},
-                {"x":1.25,   "y":4.5,   "label":"Non-US Backslash"},
-                {"x":2.25,   "y":4.5,   "label":"Z"},
-                {"x":4.25,   "y":4.5,   "r":14, "rx":4, "ry":2.5, "label":"X"},
-                {"x":5.25,   "y":4.375, "r":14, "rx":4, "ry":2.5, "label":"C"},
-                {"x":6.25,   "y":4.5,   "r":14, "rx":4, "ry":2.5, "label":"V"},
-                {"x":7.25,   "y":4.625, "r":14, "rx":4, "ry":2.5, "label":"B"},
-                {"x":8.25,   "y":4.625, "r":14, "rx":4, "ry":2.5, "label":"Layer"},
-                {"x":9.25,   "y":4.625, "r":-14, "rx":13.25, "ry":2.5, "label":"Layer"},
-                {"x":10.25,  "y":4.625, "r":-14, "rx":13.25, "ry":2.5, "label":"N"},
-                {"x":11.25,  "y":4.5,   "r":-14, "rx":13.25, "ry":2.5, "label":"M"},
-                {"x":12.25,  "y":4.375, "r":-14, "rx":13.25, "ry":2.5, "label":"Comma"},
-                {"x":13.25,  "y":4.5,   "r":-14, "rx":13.25, "ry":2.5, "label":"Period"},
-                {"x":15.25,  "y":4.5,   "label":"Slash"},
-                {"x":16.25,  "y":4.5,   "label":"JIS Backslash"},
-                {"x":17.25,  "y":4.5,   "w":1.25, "label":"Right Shift"},
-                {"x":18.5,   "y":4.5,   "label":"Up"},
-                {"x":20.75,  "y":4.5,   "label":"P-1"},
-                {"x":21.75,  "y":4.5,   "label":"P-2"},
-                {"x":22.75,  "y":4.5,   "label":"P-3"},
-                {"x":23.75,  "y":4.5,   "label":"P-Enter"},
-                {"x":0.5,    "y":5.5,   "w":1.25, "label":"Left Ctrl"},
-                {"x":1.75,   "y":5.5,   "w":1.25, "label":"Left GUI"},
-                {"x":4.75,   "y":5.5,   "w":1.25, "r":14, "rx":4, "ry":2.5, "label":"Left Alt"},
-                {"x":6,      "y":5.5,   "w":1.25, "r":14, "rx":4, "ry":2.5, "label":"Menu"},
-                {"x":7.25,   "y":5.625, "w":2, "r":14, "rx":4, "ry":2.5, "label":"Space"},
-                {"x":9.25,   "y":5.625, "w":2.75, "r":-14, "rx":13.25, "ry":2.5, "label":"Space"},
-                {"x":12,     "y":5.5,   "w":1.25, "r":-14, "rx":13.25, "ry":2.5, "label":"Right Alt"},
-                {"x":15,     "y":5.5,   "w":1.25, "label":"Right GUI"},
-                {"x":16.25,  "y":5.5,   "w":1.25, "label":"Right Ctrl"},
-                {"x":17.5,   "y":5.5,   "label":"Left"},
-                {"x":18.5,   "y":5.5,   "label":"Down"},
-                {"x":19.5,   "y":5.5,   "label":"Right"},
-                {"x":20.75,  "y":5.5,   "label":"P-0"},
-                {"x":21.75,  "y":5.5,   "label":"P-00"},
-                {"x":22.75,  "y":5.5,   "label":"P-Decimal"},
-                {"x":23.75,  "y":5.5,   "label":"P-Enter"}
+                {"x":0.75, "y":0.125},
+                {"x":2.25, "y":0.125},
+                {"x":3.25, "y":0.125},
+                {"x":4.25, "y":0.125, "r":14, "rx":4, "ry":2.5},
+                {"x":5.25, "y":0, "r":14, "rx":4, "ry":2.5},
+                {"x":6.25, "y":0.125, "r":14, "rx":4, "ry":2.5},
+                {"x":7.25, "y":0.25, "r":14, "rx":4, "ry":2.5},
+                {"x":10.25, "y":0.25, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":11.25, "y":0.125, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":12.25, "y":0, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":13.25, "y":0.125, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":14.25, "y":0.125},
+                {"x":15.25, "y":0.125},
+                {"x":16.375, "y":0.125},
+                {"x":17.375, "y":0.125},
+                {"x":18.5, "y":0.125},
+                {"x":19.5, "y":0.125},
+                {"x":20.75, "y":0.125},
+                {"x":21.75, "y":0.125},
+                {"x":22.75, "y":0.125},
+                {"x":23.75, "y":0.125},
+
+                {"x":2, "y":1.375},
+                {"x":3, "y":1.375},
+                {"x":4.25, "y":1.375, "r":14, "rx":4, "ry":2.5},
+                {"x":5.25, "y":1.25, "r":14, "rx":4, "ry":2.5},
+                {"x":6.25, "y":1.375, "r":14, "rx":4, "ry":2.5},
+                {"x":7.25, "y":1.5, "r":14, "rx":4, "ry":2.5},
+                {"x":10.25, "y":1.5, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":11.25, "y":1.375, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":12.25, "y":1.25, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":13.25, "y":1.375, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":14.5, "y":1.375},
+                {"x":15.5, "y":1.375},
+                {"x":16.5, "y":1.375},
+                {"x":17.5, "y":1.375},
+                {"x":18.5, "y":1.375},
+                {"x":20.75, "y":1.375},
+                {"x":21.75, "y":1.375},
+                {"x":22.75, "y":1.375},
+                {"x":23.75, "y":1.375},
+
+                {"x":1.25, "y":2.375, "w":1.5},
+                {"x":2.75, "y":2.375},
+                {"x":4.25, "y":2.375, "r":14, "rx":4, "ry":2.5},
+                {"x":5.25, "y":2.25, "r":14, "rx":4, "ry":2.5},
+                {"x":6.25, "y":2.375, "r":14, "rx":4, "ry":2.5},
+                {"x":7.25, "y":2.5, "r":14, "rx":4, "ry":2.5},
+                {"x":10.25, "y":2.5, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":11.25, "y":2.375, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":12.25, "y":2.25, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":13.25, "y":2.375, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":14.75, "y":2.375},
+                {"x":15.75, "y":2.375},
+                {"x":16.75, "y":2.375},
+                {"x":17.75, "y":2.375, "w":1.5},
+                {"x":20.75, "y":2.375},
+                {"x":21.75, "y":2.375},
+                {"x":22.75, "y":2.375},
+                {"x":23.75, "y":2.375},
+
+                {"x":0.75, "y":3.375, "w":1.75},
+                {"x":2.5, "y":3.375},
+                {"x":4.25, "y":3.375, "r":14, "rx":4, "ry":2.5},
+                {"x":5.25, "y":3.25, "r":14, "rx":4, "ry":2.5},
+                {"x":6.25, "y":3.375, "r":14, "rx":4, "ry":2.5},
+                {"x":7.25, "y":3.5, "r":14, "rx":4, "ry":2.5},
+                {"x":10.25, "y":3.5, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":11.25, "y":3.375, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":12.25, "y":3.25, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":13.25, "y":3.375, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":15, "y":3.375},
+                {"x":16, "y":3.375},
+                {"x":17, "y":3.375},
+                {"x":18, "y":3.375, "w":1.25},
+                {"x":20.75, "y":3.375},
+                {"x":21.75, "y":3.375},
+                {"x":22.75, "y":3.375},
+                {"x":23.75, "y":3.375},
+
+                {"x":0, "y":4.375, "w":1.25},
+                {"x":1.25, "y":4.375},
+                {"x":2.25, "y":4.375},
+                {"x":4.25, "y":4.375, "r":14, "rx":4, "ry":2.5},
+                {"x":5.25, "y":4.25, "r":14, "rx":4, "ry":2.5},
+                {"x":6.25, "y":4.375, "r":14, "rx":4, "ry":2.5},
+                {"x":7.25, "y":4.5, "r":14, "rx":4, "ry":2.5},
+                {"x":8.25, "y":4.5, "r":14, "rx":4, "ry":2.5},
+                {"x":9.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":10.25, "y":4.5, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":11.25, "y":4.375, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":12.25, "y":4.25, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":13.25, "y":4.375, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":15.25, "y":4.375},
+                {"x":16.25, "y":4.375},
+                {"x":17.25, "y":4.375, "w":1.25},
+                {"x":18.5, "y":4.375},
+                {"x":20.75, "y":4.375},
+                {"x":21.75, "y":4.375},
+                {"x":22.75, "y":4.375},
+                {"x":23.75, "y":4.375},
+
+                {"x":0.5, "y":5.375, "w":1.25},
+                {"x":1.75, "y":5.375, "w":1.25},
+                {"x":4.75, "y":5.375, "w":1.25, "r":14, "rx":4, "ry":2.5},
+                {"x":6, "y":5.375, "w":1.25, "r":14, "rx":4, "ry":2.5},
+                {"x":7.25, "y":5.5, "w":2, "r":14, "rx":4, "ry":2.5},
+                {"x":9.25, "y":5.5, "w":2.75, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":12, "y":5.375, "w":1.25, "r":-14, "rx":13.25, "ry":2.5},
+                {"x":15, "y":5.375, "w":1.25},
+                {"x":16.25, "y":5.375, "w":1.25},
+                {"x":17.5, "y":5.375},
+                {"x":18.5, "y":5.375},
+                {"x":19.5, "y":5.375},
+                {"x":20.75, "y":5.375},
+                {"x":21.75, "y":5.375},
+                {"x":22.75, "y":5.375},
+                {"x":23.75, "y":5.375}
             ]
         }
     }
diff --git a/keyboards/nopunin10did/jabberwocky/v1/v1.c b/keyboards/nopunin10did/jabberwocky/v1/v1.c
deleted file mode 100644
index bea87aa889..0000000000
--- a/keyboards/nopunin10did/jabberwocky/v1/v1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v1.h"
diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h
index 0a91a41444..7be9070afe 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v2/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS     { B2, B3, B1, D4, B4, D1, E6, B0, F0, F1, F4, F5 }
-#define MATRIX_COL_PINS     { D0, D2, D3, D5, B5, D7, F6, F7, C7, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION     COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json
index a2b9d5a02c..9fe24951e4 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4A58",
         "device_version": "0.2.0"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D2", "D3", "D5", "B5", "D7", "F6", "F7", "C7", "B6"],
+        "rows": ["B2", "B3", "B1", "D4", "B4", "D1", "E6", "B0", "F0", "F1", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "driver": "software",
         "pins": ["D6"],
@@ -22,246 +27,246 @@
     "layouts": {
         "LAYOUT_lh": {
             "layout": [
-                {"x":0,      "y":0.25,  "label":"Home"},
-                {"x":1,      "y":0.25,  "label":"End"},
-                {"x":2,      "y":0.25,  "label":"PgUp"},
-                {"x":3,      "y":0.25,  "label":"PgDn"},
-                {"x":5,      "y":0.25,  "label":"Esc"},
-                {"x":6.5,    "y":0.25,  "label":"F1"},
-                {"x":7.5,    "y":0.25,  "label":"F2"},
-                {"x":8.5,    "y":0.25,  "label":"F3"},
-                {"x":9.5,    "y":0.125, "label":"F4"},
-                {"x":10.5,   "y":0.25,  "label":"F5"},
-                {"x":11.5,   "y":0.375, "label":"F6"},
-                {"x":14.75,  "y":0.375, "label":"F7"},
-                {"x":15.75,  "y":0.25,  "label":"F8"},
-                {"x":16.75,  "y":0.125, "label":"F9"},
-                {"x":17.75,  "y":0.25,  "label":"F10"},
-                {"x":18.75,  "y":0.25,  "label":"F11"},
-                {"x":19.75,  "y":0.25,  "label":"F12"},
-                {"x":21,     "y":0.25,  "label":"Print"},
-                {"x":22,     "y":0.25,  "label":"Scroll"},
-                {"x":23,     "y":0.25,  "label":"Ins"},
-                {"x":24,     "y":0.25,  "label":"Del"},
-                
-                {"x":0,      "y":1.5,   "label":"NumLock"},
-                {"x":1,      "y":1.5,   "label":"P-Div"},
-                {"x":2,      "y":1.5,   "label":"P-Mult"},
-                {"x":3,      "y":1.5,   "label":"P-Minus"},
-                {"x":6.25,   "y":1.5,   "label":"Grave"},
-                {"x":7.25,   "y":1.5,   "label":"1"},
-                {"x":8.5,    "y":1.5,   "label":"2"},
-                {"x":9.5,    "y":1.375, "label":"3"},
-                {"x":10.5,   "y":1.5,   "label":"4"},
-                {"x":11.5,   "y":1.625, "label":"5"},
-                {"x":14.75,  "y":1.625, "label":"6"},
-                {"x":15.75,  "y":1.5,   "label":"7"},
-                {"x":16.75,  "y":1.375, "label":"8"},
-                {"x":17.75,  "y":1.5,   "label":"9"},
-                {"x":19,     "y":1.5,   "label":"0"},
-                {"x":20,     "y":1.5,   "label":"Dash"},
-                {"x":21,     "y":1.5,   "label":"Equals"},
-                {"x":22,     "y":1.5,   "label":"Backspace"},
-                {"x":23,     "y":1.5,   "label":"Backspace"},
-                
-                {"x":0,      "y":2.5,   "label":"P-7"},
-                {"x":1,      "y":2.5,   "label":"P-8"},
-                {"x":2,      "y":2.5,   "label":"P-9"},
-                {"x":3,      "y":2.5,   "label":"P-Plus"},
-                {"x":5.5,    "y":2.5,   "w":1.5, "label":"Tab"},
-                {"x":7,      "y":2.5,   "label":"Q"},
-                {"x":8.5,    "y":2.5,   "label":"W"},
-                {"x":9.5,    "y":2.375, "label":"E"},
-                {"x":10.5,   "y":2.5,   "label":"R"},
-                {"x":11.5,   "y":2.625, "label":"T"},
-                {"x":14.75,  "y":2.625, "label":"Y"},
-                {"x":15.75,  "y":2.5,   "label":"U"},
-                {"x":16.75,  "y":2.375, "label":"I"},
-                {"x":17.75,  "y":2.5,   "label":"O"},
-                {"x":19.25,  "y":2.5,   "label":"P"},
-                {"x":20.25,  "y":2.5,   "label":"L bracket"},
-                {"x":21.25,  "y":2.5,   "label":"R bracket"},
-                {"x":22.25,  "y":2.5,   "w":1.5, "label":"ANSI Backslash"},
-                
-                {"x":0,      "y":3.5,   "label":"P-4"},
-                {"x":1,      "y":3.5,   "label":"P-5"},
-                {"x":2,      "y":3.5,   "label":"P-6"},
-                {"x":3,      "y":3.5,   "label":"P-Plus"},
-                {"x":5,      "y":3.5,   "w":1.75, "label":"Caps Lock"},
-                {"x":6.75,   "y":3.5,   "label":"A"},
-                {"x":8.5,    "y":3.5,   "label":"S"},
-                {"x":9.5,    "y":3.375, "label":"D"},
-                {"x":10.5,   "y":3.5,   "label":"F"},
-                {"x":11.5,   "y":3.625, "label":"G"},
-                {"x":14.75,  "y":3.625, "label":"H"},
-                {"x":15.75,  "y":3.5,   "label":"J"},
-                {"x":16.75,  "y":3.375, "label":"K"},
-                {"x":17.75,  "y":3.5,   "label":"L"},
-                {"x":19.5,   "y":3.5,   "label":"Semicolon"},
-                {"x":20.5,   "y":3.5,   "label":"Quote"},
-                {"x":21.5,   "y":3.5,   "label":"Non-US Hash"},
-                {"x":22.5,   "y":3.5,   "w":1.25, "label":"Enter"},
-                
-                {"x":0,      "y":4.5,   "label":"P-1"},
-                {"x":1,      "y":4.5,   "label":"P-2"},
-                {"x":2,      "y":4.5,   "label":"P-3"},
-                {"x":3,      "y":4.5,   "label":"P-Enter"},
-                {"x":4.25,   "y":4.5,   "w":1.25, "label":"Left Shift"},
-                {"x":5.25,   "y":4.5,   "label":"Non-US Backslash"},
-                {"x":6.25,   "y":4.5,   "label":"Z"},
-                {"x":8.5,    "y":4.5,   "label":"X"},
-                {"x":9.5,    "y":4.375, "label":"C"},
-                {"x":10.5,   "y":4.5,   "label":"V"},
-                {"x":11.5,   "y":4.625, "label":"B"},
-                {"x":12.5,   "y":4.625, "label":"Layer"},
-                {"x":13.75,  "y":4.625, "label":"Layer"},
-                {"x":14.75,  "y":4.625, "label":"N"},
-                {"x":15.75,  "y":4.5,   "label":"M"},
-                {"x":16.75,  "y":4.375, "label":"Comma"},
-                {"x":17.75,  "y":4.5,   "label":"Period"},
-                {"x":19.75,  "y":4.5,   "label":"Slash"},
-                {"x":20.75,  "y":4.5,   "label":"JIS Ro"},
-                {"x":21.75,  "y":4.5,   "w":1.25, "label":"Right Shift"},
-                {"x":23,     "y":4.5,   "label":"Up"},
-                
-                {"x":0,      "y":5.5,   "label":"P-0"},
-                {"x":1,      "y":5.5,   "label":"P-00"},
-                {"x":2,      "y":5.5,   "label":"P-Decimal"},
-                {"x":3,      "y":5.5,   "label":"P-Enter"},
-                {"x":4.75,   "y":5.5,   "w":1.25, "label":"Left Ctrl"},
-                {"x":6,      "y":5.5,   "w":1.25, "label":"Left GUI"},
-                {"x":9,      "y":5.5,   "w":1.25, "label":"Left Alt"},
-                {"x":10.25,  "y":5.5,   "w":1.25, "label":"Menu"},
-                {"x":11.5,   "y":5.625, "w":2,    "label":"Space"},
-                {"x":13.75,  "y":5.625, "w":2.75, "label":"Space"},
-                {"x":16.5,   "y":5.5,   "w":1.25, "label":"Right Alt"},
-                {"x":19.5,   "y":5.5,   "w":1.25, "label":"Right GUI"},
-                {"x":20.75,  "y":5.5,   "w":1.25, "label":"Right Ctrl"},
-                {"x":22,     "y":5.5,   "label":"Left"},
-                {"x":23,     "y":5.5,   "label":"Down"},
-                {"x":24,     "y":5.5,   "label":"Right"}
+                {"x":0, "y":0.125},
+                {"x":1, "y":0.125},
+                {"x":2, "y":0.125},
+                {"x":3, "y":0.125},
+                {"x":5, "y":0.125},
+                {"x":6.5, "y":0.125},
+                {"x":7.5, "y":0.125},
+                {"x":8.5, "y":0.125},
+                {"x":9.5, "y":0},
+                {"x":10.5, "y":0.125},
+                {"x":11.5, "y":0.25},
+                {"x":14.75, "y":0.25},
+                {"x":15.75, "y":0.125},
+                {"x":16.75, "y":0},
+                {"x":17.75, "y":0.125},
+                {"x":18.75, "y":0.125},
+                {"x":19.75, "y":0.125},
+                {"x":21, "y":0.125},
+                {"x":22, "y":0.125},
+                {"x":23, "y":0.125},
+                {"x":24, "y":0.125},
+
+                {"x":0, "y":1.375},
+                {"x":1, "y":1.375},
+                {"x":2, "y":1.375},
+                {"x":3, "y":1.375},
+                {"x":6.25, "y":1.375},
+                {"x":7.25, "y":1.375},
+                {"x":8.5, "y":1.375},
+                {"x":9.5, "y":1.25},
+                {"x":10.5, "y":1.375},
+                {"x":11.5, "y":1.5},
+                {"x":14.75, "y":1.5},
+                {"x":15.75, "y":1.375},
+                {"x":16.75, "y":1.25},
+                {"x":17.75, "y":1.375},
+                {"x":19, "y":1.375},
+                {"x":20, "y":1.375},
+                {"x":21, "y":1.375},
+                {"x":22, "y":1.375},
+                {"x":23, "y":1.375},
+
+                {"x":0, "y":2.375},
+                {"x":1, "y":2.375},
+                {"x":2, "y":2.375},
+                {"x":3, "y":2.375},
+                {"x":5.5, "y":2.375, "w":1.5},
+                {"x":7, "y":2.375},
+                {"x":8.5, "y":2.375},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.375},
+                {"x":11.5, "y":2.5},
+                {"x":14.75, "y":2.5},
+                {"x":15.75, "y":2.375},
+                {"x":16.75, "y":2.25},
+                {"x":17.75, "y":2.375},
+                {"x":19.25, "y":2.375},
+                {"x":20.25, "y":2.375},
+                {"x":21.25, "y":2.375},
+                {"x":22.25, "y":2.375, "w":1.5},
+
+                {"x":0, "y":3.375},
+                {"x":1, "y":3.375},
+                {"x":2, "y":3.375},
+                {"x":3, "y":3.375},
+                {"x":5, "y":3.375, "w":1.75},
+                {"x":6.75, "y":3.375},
+                {"x":8.5, "y":3.375},
+                {"x":9.5, "y":3.25},
+                {"x":10.5, "y":3.375},
+                {"x":11.5, "y":3.5},
+                {"x":14.75, "y":3.5},
+                {"x":15.75, "y":3.375},
+                {"x":16.75, "y":3.25},
+                {"x":17.75, "y":3.375},
+                {"x":19.5, "y":3.375},
+                {"x":20.5, "y":3.375},
+                {"x":21.5, "y":3.375},
+                {"x":22.5, "y":3.375, "w":1.25},
+
+                {"x":0, "y":4.375},
+                {"x":1, "y":4.375},
+                {"x":2, "y":4.375},
+                {"x":3, "y":4.375},
+                {"x":4.25, "y":4.375, "w":1.25},
+                {"x":5.25, "y":4.375},
+                {"x":6.25, "y":4.375},
+                {"x":8.5, "y":4.375},
+                {"x":9.5, "y":4.25},
+                {"x":10.5, "y":4.375},
+                {"x":11.5, "y":4.5},
+                {"x":12.5, "y":4.5},
+                {"x":13.75, "y":4.5},
+                {"x":14.75, "y":4.5},
+                {"x":15.75, "y":4.375},
+                {"x":16.75, "y":4.25},
+                {"x":17.75, "y":4.375},
+                {"x":19.75, "y":4.375},
+                {"x":20.75, "y":4.375},
+                {"x":21.75, "y":4.375, "w":1.25},
+                {"x":23, "y":4.375},
+
+                {"x":0, "y":5.375},
+                {"x":1, "y":5.375},
+                {"x":2, "y":5.375},
+                {"x":3, "y":5.375},
+                {"x":4.75, "y":5.375, "w":1.25},
+                {"x":6, "y":5.375, "w":1.25},
+                {"x":9, "y":5.375, "w":1.25},
+                {"x":10.25, "y":5.375, "w":1.25},
+                {"x":11.5, "y":5.5, "w":2},
+                {"x":13.75, "y":5.5, "w":2.75},
+                {"x":16.5, "y":5.375, "w":1.25},
+                {"x":19.5, "y":5.375, "w":1.25},
+                {"x":20.75, "y":5.375, "w":1.25},
+                {"x":22, "y":5.375},
+                {"x":23, "y":5.375},
+                {"x":24, "y":5.375}
             ]
         },
         "LAYOUT_rh": {
             "layout": [
-                {"x":0.75,      "y":0.25,  "label":"Esc"},
-                {"x":2.25,    "y":0.25,  "label":"F1"},
-                {"x":3.25,   "y":0.25,  "label":"F2"},
-                {"x":4.25,   "y":0.25,  "label":"F3"},
-                {"x":5.25,   "y":0.125, "label":"F4"},
-                {"x":6.25,   "y":0.25,  "label":"F5"},
-                {"x":7.25,   "y":0.375, "label":"F6"},
-                {"x":10.5,   "y":0.375, "label":"F7"},
-                {"x":11.5,   "y":0.25,  "label":"F8"},
-                {"x":12.5,   "y":0.125, "label":"F9"},
-                {"x":13.5,   "y":0.25,  "label":"F10"},
-                {"x":14.5,   "y":0.25,  "label":"F11"},
-                {"x":15.5,   "y":0.25,  "label":"F12"},
-                {"x":16.75,  "y":0.25,  "label":"Print"},
-                {"x":17.75,  "y":0.25,  "label":"Scroll"},
-                {"x":18.75,  "y":0.25,  "label":"Ins"},
-                {"x":19.75,  "y":0.25,  "label":"Del"},
-                {"x":21,     "y":0.25,  "label":"Home"},
-                {"x":22,     "y":0.25,  "label":"End"},
-                {"x":23,     "y":0.25,  "label":"PgUp"},
-                {"x":24,     "y":0.25,  "label":"PgDn"},
-                
-                {"x":2,      "y":1.5,   "label":"Grave"},
-                {"x":3,      "y":1.5,   "label":"1"},
-                {"x":4.25,   "y":1.5,   "label":"2"},
-                {"x":5.25,   "y":1.375, "label":"3"},
-                {"x":6.25,   "y":1.5,   "label":"4"},
-                {"x":7.25,   "y":1.625, "label":"5"},
-                {"x":10.5,   "y":1.625, "label":"6"},
-                {"x":11.5,   "y":1.5,   "label":"7"},
-                {"x":12.5,   "y":1.375, "label":"8"},
-                {"x":13.5,   "y":1.5,   "label":"9"},
-                {"x":14.75,  "y":1.5,   "label":"0"},
-                {"x":15.75,  "y":1.5,   "label":"Dash"},
-                {"x":16.75,  "y":1.5,   "label":"Equals"},
-                {"x":17.75,  "y":1.5,   "label":"Backspace"},
-                {"x":18.75,  "y":1.5,   "label":"Backspace"},
-                {"x":21,     "y":1.5,   "label":"NumLock"},
-                {"x":22,     "y":1.5,   "label":"P-Div"},
-                {"x":23,     "y":1.5,   "label":"P-Mult"},
-                {"x":24,     "y":1.5,   "label":"P-Minus"},
-                
-                {"x":1.25,   "y":2.5,   "w":1.5, "label":"Tab"},
-                {"x":2.75,   "y":2.5,   "label":"Q"},
-                {"x":4.25,   "y":2.5,   "label":"W"},
-                {"x":5.25,   "y":2.375, "label":"E"},
-                {"x":6.25,   "y":2.5,   "label":"R"},
-                {"x":7.25,   "y":2.625, "label":"T"},
-                {"x":10.5,   "y":2.625, "label":"Y"},
-                {"x":11.5,   "y":2.5,   "label":"U"},
-                {"x":12.5,   "y":2.375, "label":"I"},
-                {"x":13.5,   "y":2.5,   "label":"O"},
-                {"x":15,     "y":2.5,   "label":"P"},
-                {"x":16,     "y":2.5,   "label":"L bracket"},
-                {"x":17,     "y":2.5,   "label":"R bracket"},
-                {"x":18,     "y":2.5,   "w":1.5, "label":"ANSI Backslash"},
-                {"x":21,     "y":2.5,   "label":"P-7"},
-                {"x":22,     "y":2.5,   "label":"P-8"},
-                {"x":23,     "y":2.5,   "label":"P-9"},
-                {"x":24,     "y":2.5,   "label":"P-Plus"},
-                
-                {"x":0.75,   "y":3.5,   "w":1.75, "label":"Caps Lock"},
-                {"x":2.5,    "y":3.5,   "label":"A"},
-                {"x":4.25,   "y":3.5,   "label":"S"},
-                {"x":5.25,   "y":3.375, "label":"D"},
-                {"x":6.25,   "y":3.5,   "label":"F"},
-                {"x":7.25,   "y":3.625, "label":"G"},
-                {"x":10.5,   "y":3.625, "label":"H"},
-                {"x":11.5,   "y":3.5,   "label":"J"},
-                {"x":12.5,   "y":3.375, "label":"K"},
-                {"x":13.5,   "y":3.5,   "label":"L"},
-                {"x":15.25,  "y":3.5,   "label":"Semicolon"},
-                {"x":16.25,  "y":3.5,   "label":"Quote"},
-                {"x":17.25,  "y":3.5,   "label":"Non-US Hash"},
-                {"x":18.25,  "y":3.5,   "w":1.25, "label":"Enter"},
-                {"x":21,     "y":3.5,   "label":"P-4"},
-                {"x":22,     "y":3.5,   "label":"P-5"},
-                {"x":23,     "y":3.5,   "label":"P-6"},
-                {"x":24,     "y":3.5,   "label":"P-Plus"},
-                
-                {"x":0,      "y":4.5,   "w":1.25, "label":"Left Shift"},
-                {"x":1.25,   "y":4.5,   "label":"Non-US Backslash"},
-                {"x":2.25,   "y":4.5,   "label":"Z"},
-                {"x":4.25,   "y":4.5,   "label":"X"},
-                {"x":5.25,   "y":4.375, "label":"C"},
-                {"x":6.25,   "y":4.5,   "label":"V"},
-                {"x":7.25,   "y":4.625, "label":"B"},
-                {"x":8.25,   "y":4.625, "label":"Layer"},
-                {"x":9.5,    "y":4.625, "label":"Layer"},
-                {"x":10.5,   "y":4.625, "label":"N"},
-                {"x":11.5,   "y":4.5,   "label":"M"},
-                {"x":12.5,   "y":4.375, "label":"Comma"},
-                {"x":13.5,   "y":4.5,   "label":"Period"},
-                {"x":15.5,   "y":4.5,   "label":"Slash"},
-                {"x":16.5,   "y":4.5,   "label":"JIS Ro"},
-                {"x":17.5,   "y":4.5,   "w":1.25, "label":"Right Shift"},
-                {"x":18.75,  "y":4.5,   "label":"Up"},
-                {"x":21,     "y":4.5,   "label":"P-1"},
-                {"x":22,     "y":4.5,   "label":"P-2"},
-                {"x":23,     "y":4.5,   "label":"P-3"},
-                {"x":24,     "y":4.5,   "label":"P-Enter"},
-                
-                {"x":0.5,    "y":5.5,   "w":1.25, "label":"Left Ctrl"},
-                {"x":1.75,   "y":5.5,   "w":1.25, "label":"Left GUI"},
-                {"x":4.75,   "y":5.5,   "w":1.25, "label":"Left Alt"},
-                {"x":6,      "y":5.5,   "w":1.25, "label":"Menu"},
-                {"x":7.25,   "y":5.625, "w":2,    "label":"Space"},
-                {"x":9.5,    "y":5.625, "w":2.75, "label":"Space"},
-                {"x":12.25,  "y":5.5,   "w":1.25, "label":"Right Alt"},
-                {"x":15.25,  "y":5.5,   "w":1.25, "label":"Right GUI"},
-                {"x":16.5,   "y":5.5,   "w":1.25, "label":"Right Ctrl"},
-                {"x":17.75,  "y":5.5,   "label":"Left"},
-                {"x":18.75,  "y":5.5,   "label":"Down"},
-                {"x":19.75,  "y":5.5,   "label":"Right"},
-                {"x":21,     "y":5.5,   "label":"P-0"},
-                {"x":22,     "y":5.5,   "label":"P-00"},
-                {"x":23,     "y":5.5,   "label":"P-Decimal"},
-                {"x":24,     "y":5.5,   "label":"P-Enter"}
+                {"x":0.75, "y":0.125},
+                {"x":2.25, "y":0.125},
+                {"x":3.25, "y":0.125},
+                {"x":4.25, "y":0.125},
+                {"x":5.25, "y":0},
+                {"x":6.25, "y":0.125},
+                {"x":7.25, "y":0.25},
+                {"x":10.5, "y":0.25},
+                {"x":11.5, "y":0.125},
+                {"x":12.5, "y":0},
+                {"x":13.5, "y":0.125},
+                {"x":14.5, "y":0.125},
+                {"x":15.5, "y":0.125},
+                {"x":16.75, "y":0.125},
+                {"x":17.75, "y":0.125},
+                {"x":18.75, "y":0.125},
+                {"x":19.75, "y":0.125},
+                {"x":21, "y":0.125},
+                {"x":22, "y":0.125},
+                {"x":23, "y":0.125},
+                {"x":24, "y":0.125},
+
+                {"x":2, "y":1.375},
+                {"x":3, "y":1.375},
+                {"x":4.25, "y":1.375},
+                {"x":5.25, "y":1.25},
+                {"x":6.25, "y":1.375},
+                {"x":7.25, "y":1.5},
+                {"x":10.5, "y":1.5},
+                {"x":11.5, "y":1.375},
+                {"x":12.5, "y":1.25},
+                {"x":13.5, "y":1.375},
+                {"x":14.75, "y":1.375},
+                {"x":15.75, "y":1.375},
+                {"x":16.75, "y":1.375},
+                {"x":17.75, "y":1.375},
+                {"x":18.75, "y":1.375},
+                {"x":21, "y":1.375},
+                {"x":22, "y":1.375},
+                {"x":23, "y":1.375},
+                {"x":24, "y":1.375},
+
+                {"x":1.25, "y":2.375, "w":1.5},
+                {"x":2.75, "y":2.375},
+                {"x":4.25, "y":2.375},
+                {"x":5.25, "y":2.25},
+                {"x":6.25, "y":2.375},
+                {"x":7.25, "y":2.5},
+                {"x":10.5, "y":2.5},
+                {"x":11.5, "y":2.375},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.375},
+                {"x":15, "y":2.375},
+                {"x":16, "y":2.375},
+                {"x":17, "y":2.375},
+                {"x":18, "y":2.375, "w":1.5},
+                {"x":21, "y":2.375},
+                {"x":22, "y":2.375},
+                {"x":23, "y":2.375},
+                {"x":24, "y":2.375},
+
+                {"x":0.75, "y":3.375, "w":1.75},
+                {"x":2.5, "y":3.375},
+                {"x":4.25, "y":3.375},
+                {"x":5.25, "y":3.25},
+                {"x":6.25, "y":3.375},
+                {"x":7.25, "y":3.5},
+                {"x":10.5, "y":3.5},
+                {"x":11.5, "y":3.375},
+                {"x":12.5, "y":3.25},
+                {"x":13.5, "y":3.375},
+                {"x":15.25, "y":3.375},
+                {"x":16.25, "y":3.375},
+                {"x":17.25, "y":3.375},
+                {"x":18.25, "y":3.375, "w":1.25},
+                {"x":21, "y":3.375},
+                {"x":22, "y":3.375},
+                {"x":23, "y":3.375},
+                {"x":24, "y":3.375},
+
+                {"x":0, "y":4.375, "w":1.25},
+                {"x":1.25, "y":4.375},
+                {"x":2.25, "y":4.375},
+                {"x":4.25, "y":4.375},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.375},
+                {"x":7.25, "y":4.5},
+                {"x":8.25, "y":4.5},
+                {"x":9.5, "y":4.5},
+                {"x":10.5, "y":4.5},
+                {"x":11.5, "y":4.375},
+                {"x":12.5, "y":4.25},
+                {"x":13.5, "y":4.375},
+                {"x":15.5, "y":4.375},
+                {"x":16.5, "y":4.375},
+                {"x":17.5, "y":4.375, "w":1.25},
+                {"x":18.75, "y":4.375},
+                {"x":21, "y":4.375},
+                {"x":22, "y":4.375},
+                {"x":23, "y":4.375},
+                {"x":24, "y":4.375},
+
+                {"x":0.5, "y":5.375, "w":1.25},
+                {"x":1.75, "y":5.375, "w":1.25},
+                {"x":4.75, "y":5.375, "w":1.25},
+                {"x":6, "y":5.375, "w":1.25},
+                {"x":7.25, "y":5.5, "w":2},
+                {"x":9.5, "y":5.5, "w":2.75},
+                {"x":12.25, "y":5.375, "w":1.25},
+                {"x":15.25, "y":5.375, "w":1.25},
+                {"x":16.5, "y":5.375, "w":1.25},
+                {"x":17.75, "y":5.375},
+                {"x":18.75, "y":5.375},
+                {"x":19.75, "y":5.375},
+                {"x":21, "y":5.375},
+                {"x":22, "y":5.375},
+                {"x":23, "y":5.375},
+                {"x":24, "y":5.375}
             ]
         }
     }
diff --git a/keyboards/nopunin10did/jabberwocky/v2/v2.c b/keyboards/nopunin10did/jabberwocky/v2/v2.c
deleted file mode 100644
index 792093997b..0000000000
--- a/keyboards/nopunin10did/jabberwocky/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v2.h"
diff --git a/keyboards/nopunin10did/kastenwagen1840/config.h b/keyboards/nopunin10did/kastenwagen1840/config.h
index 80a7793edb..42a557e6a4 100644
--- a/keyboards/nopunin10did/kastenwagen1840/config.h
+++ b/keyboards/nopunin10did/kastenwagen1840/config.h
@@ -16,15 +16,7 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS     { B4, B5, B7, D5, C7, F1, F0, B6 }
-#define MATRIX_COL_PINS     { F4, F5, F6, F7, B1, B3, B2, E6, D7 }
-
 /* Indicator LEDs */
 #define LED_INDICATOR_TOP   B0
 #define LED_INDICATOR_MID   D4
 #define LED_INDICATOR_BOT   C6
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION     COL2ROW
diff --git a/keyboards/nopunin10did/kastenwagen1840/info.json b/keyboards/nopunin10did/kastenwagen1840/info.json
index bf6b9234b0..7612f52e1e 100644
--- a/keyboards/nopunin10did/kastenwagen1840/info.json
+++ b/keyboards/nopunin10did/kastenwagen1840/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4B57",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "E6", "D7"],
+        "rows": ["B4", "B5", "B7", "D5", "C7", "F1", "F0", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1"},
diff --git a/keyboards/nopunin10did/kastenwagen48/config.h b/keyboards/nopunin10did/kastenwagen48/config.h
index 555a0c488f..42a557e6a4 100644
--- a/keyboards/nopunin10did/kastenwagen48/config.h
+++ b/keyboards/nopunin10did/kastenwagen48/config.h
@@ -16,15 +16,7 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS     { B4, B5, B7, D5, C7, F1, F0, B6 }
-#define MATRIX_COL_PINS     { F4, F5, F6, F7, B1, B3, B2, E6 }
-
 /* Indicator LEDs */
 #define LED_INDICATOR_TOP   B0
 #define LED_INDICATOR_MID   D4
 #define LED_INDICATOR_BOT   C6
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION     COL2ROW
diff --git a/keyboards/nopunin10did/kastenwagen48/info.json b/keyboards/nopunin10did/kastenwagen48/info.json
index 00fe51e381..296b7c30c8 100644
--- a/keyboards/nopunin10did/kastenwagen48/info.json
+++ b/keyboards/nopunin10did/kastenwagen48/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4B30",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "E6"],
+        "rows": ["B4", "B5", "B7", "D5", "C7", "F1", "F0", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1"},
diff --git a/keyboards/nopunin10did/railroad/rev0/config.h b/keyboards/nopunin10did/railroad/rev0/config.h
index 114cec9e0f..15ea042da2 100644
--- a/keyboards/nopunin10did/railroad/rev0/config.h
+++ b/keyboards/nopunin10did/railroad/rev0/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D2, D3, D5, C6, C7, F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/nopunin10did/railroad/rev0/info.json b/keyboards/nopunin10did/railroad/rev0/info.json
index 8a89b6c287..752078f2f6 100644
--- a/keyboards/nopunin10did/railroad/rev0/info.json
+++ b/keyboards/nopunin10did/railroad/rev0/info.json
@@ -8,6 +8,11 @@
         "pid": "0x9111",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6"],
+        "rows": ["D2", "D3", "D5", "C6", "C7", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nopunin10did/railroad/rev0/rev0.c b/keyboards/nopunin10did/railroad/rev0/rev0.c
deleted file mode 100644
index f9a51af643..0000000000
--- a/keyboards/nopunin10did/railroad/rev0/rev0.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev0.h"
diff --git a/keyboards/novelkeys/nk1/config.h b/keyboards/novelkeys/nk1/config.h
index c168aca492..4abb4bd5da 100644
--- a/keyboards/novelkeys/nk1/config.h
+++ b/keyboards/novelkeys/nk1/config.h
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 9
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -35,7 +33,6 @@
     #define RGBLIGHT_EFFECT_RGB_TEST
     #define RGBLIGHT_EFFECT_ALTERNATING
     #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* There is only 1 Button so limiting VIA to 1 layer */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 1
diff --git a/keyboards/novelkeys/nk1/info.json b/keyboards/novelkeys/nk1/info.json
index 28f270038c..64f74e92f6 100755
--- a/keyboards/novelkeys/nk1/info.json
+++ b/keyboards/novelkeys/nk1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4E4D",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "matrix_pins": {
diff --git a/keyboards/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h
index fa4ac1b65e..23b8d2915a 100644
--- a/keyboards/novelkeys/nk20/config.h
+++ b/keyboards/novelkeys/nk20/config.h
@@ -17,16 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B12, A5, A3, A2, A1, A0 }
-#define MATRIX_COL_PINS { B13, B14, B15, A4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB options */
 
-#define RGB_DI_PIN A7
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json
index e50174c50a..2befadb5d0 100644
--- a/keyboards/novelkeys/nk20/info.json
+++ b/keyboards/novelkeys/nk20/info.json
@@ -8,6 +8,18 @@
         "pid": "0x4E4E",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B13", "B14", "B15", "A4"],
+        "rows": ["B12", "A5", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
@@ -15,7 +27,33 @@
     },
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "h":2}, {"x":0, "y":5, "w":2}, {"x":2, "y":5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5}
+            ]
         }
     }
 }
diff --git a/keyboards/novelkeys/nk20/nk20.c b/keyboards/novelkeys/nk20/nk20.c
index 207e2277da..23350e1037 100644
--- a/keyboards/novelkeys/nk20/nk20.c
+++ b/keyboards/novelkeys/nk20/nk20.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nk20.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 // clang-format off
diff --git a/keyboards/novelkeys/nk20/nk20.h b/keyboards/novelkeys/nk20/nk20.h
deleted file mode 100644
index a553a1af3e..0000000000
--- a/keyboards/novelkeys/nk20/nk20.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-
-#define LAYOUT( \
-    K00, K01, K02,      \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32,      \
-    K40, K41, K42, K43, \
-    K50,      K52       \
-) { \
-    { K00, K01, K02, XXX }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, XXX }, \
-    { K40, K41, K42, K43 }, \
-    { K50, XXX, K52, XXX }, \
-}
diff --git a/keyboards/novelkeys/nk20/rules.mk b/keyboards/novelkeys/nk20/rules.mk
index 96367c6a4c..131bc94a44 100644
--- a/keyboards/novelkeys/nk20/rules.mk
+++ b/keyboards/novelkeys/nk20/rules.mk
@@ -19,5 +19,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
-RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Drive
-WS2812_DRIVER = pwm         # Per-key RGB MCU Driver
diff --git a/keyboards/novelkeys/nk65/base/info.json b/keyboards/novelkeys/nk65/base/info.json
new file mode 100644
index 0000000000..fc547dc134
--- /dev/null
+++ b/keyboards/novelkeys/nk65/base/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/40percentclub/nano/keymaps/default/rules.mk b/keyboards/novelkeys/nk65/base/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/40percentclub/nano/keymaps/default/rules.mk
+++ b/keyboards/novelkeys/nk65/base/rules.mk
diff --git a/keyboards/novelkeys/nk65/config.h b/keyboards/novelkeys/nk65/config.h
index baca7223b4..1afa3fe95b 100755
--- a/keyboards/novelkeys/nk65/config.h
+++ b/keyboards/novelkeys/nk65/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3, A5 }
-// To enable debugger set A13 A14 -> A5 A7
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Backlight options */
 
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/novelkeys/nk65/info.json b/keyboards/novelkeys/nk65/info.json
index e223e11b5c..e385ff3b61 100755
--- a/keyboards/novelkeys/nk65/info.json
+++ b/keyboards/novelkeys/nk65/info.json
@@ -14,7 +14,80 @@
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page Down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/novelkeys/nk65/nk65.h b/keyboards/novelkeys/nk65/nk65.h
index 35aca2a64c..c75541be93 100755
--- a/keyboards/novelkeys/nk65/nk65.h
+++ b/keyboards/novelkeys/nk65/nk65.h
@@ -15,24 +15,6 @@
  */
 #pragma once
 
-#define XXX KC_NO
-
 #include "quantum.h"
 #include "../wilba_tech/wt_rgb_backlight_keycodes.h"
 #include "via.h"
-
-// This a shortcut to help you visually see your layout.
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk
index a231765dff..e9036ebb61 100755
--- a/keyboards/novelkeys/nk65/rules.mk
+++ b/keyboards/novelkeys/nk65/rules.mk
@@ -24,3 +24,5 @@ SRC =	keyboards/wilba_tech/wt_main.c \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c \
 		i2c_master.c
+
+DEFAULT_FOLDER = novelkeys/nk65/base
diff --git a/keyboards/novelkeys/nk65/v1_4/config.h b/keyboards/novelkeys/nk65/v1_4/config.h
deleted file mode 100755
index 88629e5c99..0000000000
--- a/keyboards/novelkeys/nk65/v1_4/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2021 Yiancar
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, B1, B0, A7, A0, A1, A2, A3, A5 }
-// To enable debugger set A13 A14 -> A5 A7
diff --git a/keyboards/novelkeys/nk65/v1_4/info.json b/keyboards/novelkeys/nk65/v1_4/info.json
new file mode 100644
index 0000000000..3233797019
--- /dev/null
+++ b/keyboards/novelkeys/nk65/v1_4/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B1", "B0", "A7", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h
index c5be387c16..a22f9b1685 100755
--- a/keyboards/novelkeys/nk65b/config.h
+++ b/keyboards/novelkeys/nk65b/config.h
@@ -17,16 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A0, A1, A2, B11, B6 }
-#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B12, B13, B14, B15, A8, A9 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB options */
 
-#define RGB_DI_PIN B4
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json
index 3e60bfd3a4..93700e6851 100755
--- a/keyboards/novelkeys/nk65b/info.json
+++ b/keyboards/novelkeys/nk65b/info.json
@@ -8,6 +8,18 @@
         "pid": "0x4E4F",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B4",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "A8", "A9"],
+        "rows": ["A0", "A1", "A2", "B11", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A14",
         "on_state": 0
@@ -16,7 +28,80 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_65_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page Down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/novelkeys/nk65b/nk65b.c b/keyboards/novelkeys/nk65b/nk65b.c
index f4ed25c2d1..370814aabd 100755
--- a/keyboards/novelkeys/nk65b/nk65b.c
+++ b/keyboards/novelkeys/nk65b/nk65b.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nk65b.h"
+#include "quantum.h"
 
 void led_init_ports(void) {
     // Set our LED pins as open drain outputs
diff --git a/keyboards/novelkeys/nk65b/nk65b.h b/keyboards/novelkeys/nk65b/nk65b.h
deleted file mode 100755
index 9fd75c26ab..0000000000
--- a/keyboards/novelkeys/nk65b/nk65b.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/novelkeys/nk65b/rules.mk b/keyboards/novelkeys/nk65b/rules.mk
index 96367c6a4c..131bc94a44 100755
--- a/keyboards/novelkeys/nk65b/rules.mk
+++ b/keyboards/novelkeys/nk65b/rules.mk
@@ -19,5 +19,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
-RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Drive
-WS2812_DRIVER = pwm         # Per-key RGB MCU Driver
diff --git a/keyboards/novelkeys/nk87/config.h b/keyboards/novelkeys/nk87/config.h
index f2ef6ea134..d0e973bb43 100755
--- a/keyboards/novelkeys/nk87/config.h
+++ b/keyboards/novelkeys/nk87/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A7, B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, B2, B0, A6, A0, A1, A2, A3, A5, B1, B10 }
-// To enable debugger set A13 A14 -> A5 A7
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Backlight options */
 
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/novelkeys/nk87/info.json b/keyboards/novelkeys/nk87/info.json
index 8a07b27277..25ea17abd3 100755
--- a/keyboards/novelkeys/nk87/info.json
+++ b/keyboards/novelkeys/nk87/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4E4C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B0", "A6", "A0", "A1", "A2", "A3", "A5", "B1", "B10"],
+        "rows": ["A7", "B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h
index ce7c5feded..49d3104c45 100644
--- a/keyboards/novelkeys/nk87b/config.h
+++ b/keyboards/novelkeys/nk87b/config.h
@@ -17,16 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B11, B10, B2, B1, A9, A5 }
-#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10, A14, A15, B3, B4, B5, B6, B7, B8, B9, A0, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB options */
 
-#define RGB_DI_PIN B0
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/info.json
index 6bcc03d93b..02abc5e142 100755
--- a/keyboards/novelkeys/nk87b/info.json
+++ b/keyboards/novelkeys/nk87b/info.json
@@ -8,6 +8,18 @@
         "pid": "0x4E50",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1"],
+        "rows": ["B11", "B10", "B2", "B1", "A9", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A2",
         "on_state": 0
diff --git a/keyboards/novelkeys/nk87b/rules.mk b/keyboards/novelkeys/nk87b/rules.mk
index 96367c6a4c..131bc94a44 100644
--- a/keyboards/novelkeys/nk87b/rules.mk
+++ b/keyboards/novelkeys/nk87b/rules.mk
@@ -19,5 +19,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
-RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Drive
-WS2812_DRIVER = pwm         # Per-key RGB MCU Driver
diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h
index ff56c34c91..8c82daf631 100755
--- a/keyboards/novelkeys/novelpad/config.h
+++ b/keyboards/novelkeys/novelpad/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C2, C4, C5, C6, C7 }
-#define MATRIX_COL_PINS { D7, D6, D5, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
      #define RGBLED_NUM 4
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/novelkeys/novelpad/info.json b/keyboards/novelkeys/novelpad/info.json
index ae77ec387c..e98746ab29 100644
--- a/keyboards/novelkeys/novelpad/info.json
+++ b/keyboards/novelkeys/novelpad/info.json
@@ -8,40 +8,51 @@
         "pid": "0x6070",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "D6", "D5", "D4"],
+        "rows": ["C2", "C4", "C5", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 10
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x4"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x4"
+    },
     "layouts": {
         "LAYOUT_ortho_5x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
             ]
         }
     }
diff --git a/keyboards/novelkeys/novelpad/novelpad.c b/keyboards/novelkeys/novelpad/novelpad.c
deleted file mode 100755
index 9f6ee7dae4..0000000000
--- a/keyboards/novelkeys/novelpad/novelpad.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "novelpad.h"
diff --git a/keyboards/novelkeys/novelpad/novelpad.h b/keyboards/novelkeys/novelpad/novelpad.h
deleted file mode 100755
index 6650a67223..0000000000
--- a/keyboards/novelkeys/novelpad/novelpad.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }, \
-    { K40,   K41,   K42,   K43 } \
-}
-
-#define LAYOUT LAYOUT_ortho_5x4
diff --git a/keyboards/noxary/220/220.c b/keyboards/noxary/220/220.c
index 0af57ff36d..caeb13a799 100644
--- a/keyboards/noxary/220/220.c
+++ b/keyboards/noxary/220/220.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "220.h"
+#include "quantum.h"
 
 // Optional override functions below.
 // You can leave any or all of these undefined.
diff --git a/keyboards/noxary/220/220.h b/keyboards/noxary/220/220.h
deleted file mode 100644
index 26419976c8..0000000000
--- a/keyboards/noxary/220/220.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 Rozakiin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_6x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33, \
-	K40, K41, K42, K43, \
-	K50, K51, K52, K53  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ K30,   K31,   K32,   K33 }, \
-	{ K40,   K41,   K42,   K43 }, \
-	{ K50,   K51,   K52,   K53 }  \
-}
diff --git a/keyboards/noxary/220/config.h b/keyboards/noxary/220/config.h
index 047c2712a2..b5b661bef2 100644
--- a/keyboards/noxary/220/config.h
+++ b/keyboards/noxary/220/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C4, B0, D3, D4, D5, D6 }
-#define MATRIX_COL_PINS { B4, C5, D2, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/noxary/220/info.json b/keyboards/noxary/220/info.json
index 5fe00edef0..9b47d9c040 100644
--- a/keyboards/noxary/220/info.json
+++ b/keyboards/noxary/220/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0899",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "C5", "D2", "D1"],
+        "rows": ["C4", "B0", "D3", "D4", "D5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
@@ -17,7 +22,37 @@
     "community_layouts": ["ortho_6x4"],
     "layouts": {
         "LAYOUT_ortho_6x4": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":0, "y":2.5}, {"x":1, "y":2.5}, {"x":2, "y":2.5}, {"x":3, "y":2.5}, {"x":0, "y":3.5}, {"x":1, "y":3.5}, {"x":2, "y":3.5}, {"x":3, "y":3.5}, {"x":0, "y":4.5}, {"x":1, "y":4.5}, {"x":2, "y":4.5}, {"x":3, "y":4.5}, {"x":0, "y":5.5}, {"x":1, "y":5.5}, {"x":2, "y":5.5}, {"x":3, "y":5.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": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1, "y": 5.5},
+                {"matrix": [5, 2], "x": 2, "y": 5.5},
+                {"matrix": [5, 3], "x": 3, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/noxary/260/260.c b/keyboards/noxary/260/260.c
deleted file mode 100644
index a2f76a38a7..0000000000
--- a/keyboards/noxary/260/260.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "260.h"
diff --git a/keyboards/noxary/260/config.h b/keyboards/noxary/260/config.h
index 4eb386df73..b5b661bef2 100644
--- a/keyboards/noxary/260/config.h
+++ b/keyboards/noxary/260/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, F6, F5, F0, B5 }
-#define MATRIX_COL_PINS { C7, C6, B6, F4, E6, D0, B4, D1, D2, D3, D7, D6, D4, F1, D5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/noxary/260/info.json b/keyboards/noxary/260/info.json
index 9e9763f4b0..ee6e460dd5 100644
--- a/keyboards/noxary/260/info.json
+++ b/keyboards/noxary/260/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0A29",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "F4", "E6", "D0", "B4", "D1", "D2", "D3", "D7", "D6", "D4", "F1", "D5"],
+        "rows": ["F7", "F6", "F5", "F0", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
diff --git a/keyboards/noxary/268/268.c b/keyboards/noxary/268/268.c
deleted file mode 100644
index 60ea6070d4..0000000000
--- a/keyboards/noxary/268/268.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Rozakiin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "268.h"
diff --git a/keyboards/noxary/268/config.h b/keyboards/noxary/268/config.h
index 0808bb996f..ef4a0a745d 100644
--- a/keyboards/noxary/268/config.h
+++ b/keyboards/noxary/268/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F5, F4, F0, F1, D0 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, E6, B0, D1, B2, B3, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/noxary/268/info.json b/keyboards/noxary/268/info.json
index 5c89fb242d..ae4810e9b3 100644
--- a/keyboards/noxary/268/info.json
+++ b/keyboards/noxary/268/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0A79",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "E6", "B0", "D1", "B2", "B3", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["F5", "F4", "F0", "F1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
diff --git a/keyboards/noxary/268_2/268_2.c b/keyboards/noxary/268_2/268_2.c
index 9a2b4432d3..60d54a681c 100644
--- a/keyboards/noxary/268_2/268_2.c
+++ b/keyboards/noxary/268_2/268_2.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "268_2.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   // put your keyboard start-up code here
diff --git a/keyboards/noxary/268_2/268_2.h b/keyboards/noxary/268_2/268_2.h
deleted file mode 100644
index e69ed88def..0000000000
--- a/keyboards/noxary/268_2/268_2.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright 2018 Rozakiin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_65_ansi_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                   K406,                   K409, K410,       K412, K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, K409,  K410,  KC_NO, K412,  KC_NO, K414,  K415 }  \
-}
-
-#define LAYOUT_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                   K406,                   K409, K410,       K412, K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, K409,  K410,  KC_NO, K412,  KC_NO, K414,  K415 }  \
-}
-
-#define LAYOUT_7u_space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                   K406,                         K410,       K412, K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412,  KC_NO, K414,  K415 }  \
-}
-
-#define LAYOUT_7u_space_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                   K406,                         K410,       K412, K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412,  KC_NO, K414,  K415 }  \
-}
diff --git a/keyboards/noxary/268_2/config.h b/keyboards/noxary/268_2/config.h
index b0c97a0c74..98d8ea885e 100644
--- a/keyboards/noxary/268_2/config.h
+++ b/keyboards/noxary/268_2/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, F6, F5, F0, B5 }
-#define MATRIX_COL_PINS { C6, B6, C7, F4, E6, D0, D7, D1, D2, B4, D6, D4, D5, F1, D3, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/noxary/268_2/info.json b/keyboards/noxary/268_2/info.json
index fcba339ef5..b96500aa31 100644
--- a/keyboards/noxary/268_2/info.json
+++ b/keyboards/noxary/268_2/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0A7A",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["C6", "B6", "C7", "F4", "E6", "D0", "D7", "D1", "D2", "B4", "D6", "D4", "D5", "F1", "D3", "B1"],
+    "rows": ["F7", "F6", "F5", "F0", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
@@ -17,286 +22,302 @@
   "layouts": {
     "LAYOUT_65_ansi_blocker": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6, "y":0},
-        {"x":7, "y":0},
-        {"x":8, "y":0},
-        {"x":9, "y":0},
-        {"x":10, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0, "w":2},
-        {"x":15, "y":0},
-        {"x":0, "y":1, "w":1.5},
-        {"x":1.5, "y":1},
-        {"x":2.5, "y":1},
-        {"x":3.5, "y":1},
-        {"x":4.5, "y":1},
-        {"x":5.5, "y":1},
-        {"x":6.5, "y":1},
-        {"x":7.5, "y":1},
-        {"x":8.5, "y":1},
-        {"x":9.5, "y":1},
-        {"x":10.5, "y":1},
-        {"x":11.5, "y":1},
-        {"x":12.5, "y":1},
-        {"x":13.5, "y":1, "w":1.5},
-        {"x":15, "y":1},
-        {"x":0, "y":2, "w":1.75},
-        {"x":1.75, "y":2},
-        {"x":2.75, "y":2},
-        {"x":3.75, "y":2},
-        {"x":4.75, "y":2},
-        {"x":5.75, "y":2},
-        {"x":6.75, "y":2},
-        {"x":7.75, "y":2},
-        {"x":8.75, "y":2},
-        {"x":9.75, "y":2},
-        {"x":10.75, "y":2},
-        {"x":11.75, "y":2},
-        {"x":12.75, "y":2, "w":2.25},
-        {"x":15, "y":2},
-        {"x":0, "y":3, "w":2.25},
-        {"x":2.25, "y":3},
-        {"x":3.25, "y":3},
-        {"x":4.25, "y":3},
-        {"x":5.25, "y":3},
-        {"x":6.25, "y":3},
-        {"x":7.25, "y":3},
-        {"x":8.25, "y":3},
-        {"x":9.25, "y":3},
-        {"x":10.25, "y":3},
-        {"x":11.25, "y":3},
-        {"x":12.25, "y":3, "w":1.75},
-        {"x":14, "y":3},
-        {"x":15, "y":3},
-        {"x":0, "y":4, "w":1.25},
-        {"x":1.25, "y":4, "w":1.25},
-        {"x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":6.25},
-        {"x":10, "y":4, "w":1.25},
-        {"x":11.25, "y":4, "w":1.25},
-        {"x":13, "y":4},
-        {"x":14, "y":4},
-        {"x":15, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_split_bs": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6, "y":0},
-        {"x":7, "y":0},
-        {"x":8, "y":0},
-        {"x":9, "y":0},
-        {"x":10, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0},
-        {"x":14, "y":0},
-        {"x":15, "y":0},
-        {"x":0, "y":1, "w":1.5},
-        {"x":1.5, "y":1},
-        {"x":2.5, "y":1},
-        {"x":3.5, "y":1},
-        {"x":4.5, "y":1},
-        {"x":5.5, "y":1},
-        {"x":6.5, "y":1},
-        {"x":7.5, "y":1},
-        {"x":8.5, "y":1},
-        {"x":9.5, "y":1},
-        {"x":10.5, "y":1},
-        {"x":11.5, "y":1},
-        {"x":12.5, "y":1},
-        {"x":13.5, "y":1, "w":1.5},
-        {"x":15, "y":1},
-        {"x":0, "y":2, "w":1.75},
-        {"x":1.75, "y":2},
-        {"x":2.75, "y":2},
-        {"x":3.75, "y":2},
-        {"x":4.75, "y":2},
-        {"x":5.75, "y":2},
-        {"x":6.75, "y":2},
-        {"x":7.75, "y":2},
-        {"x":8.75, "y":2},
-        {"x":9.75, "y":2},
-        {"x":10.75, "y":2},
-        {"x":11.75, "y":2},
-        {"x":12.75, "y":2, "w":2.25},
-        {"x":15, "y":2},
-        {"x":0, "y":3, "w":2.25},
-        {"x":2.25, "y":3},
-        {"x":3.25, "y":3},
-        {"x":4.25, "y":3},
-        {"x":5.25, "y":3},
-        {"x":6.25, "y":3},
-        {"x":7.25, "y":3},
-        {"x":8.25, "y":3},
-        {"x":9.25, "y":3},
-        {"x":10.25, "y":3},
-        {"x":11.25, "y":3},
-        {"x":12.25, "y":3, "w":1.75},
-        {"x":14, "y":3},
-        {"x":15, "y":3},
-        {"x":0, "y":4, "w":1.25},
-        {"x":1.25, "y":4, "w":1.25},
-        {"x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":6.25},
-        {"x":10, "y":4, "w":1.25},
-        {"x":11.25, "y":4, "w":1.25},
-        {"x":13, "y":4},
-        {"x":14, "y":4},
-        {"x":15, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_7u_space": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6, "y":0},
-        {"x":7, "y":0},
-        {"x":8, "y":0},
-        {"x":9, "y":0},
-        {"x":10, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0, "w":2},
-        {"x":15, "y":0},
-        {"x":0, "y":1, "w":1.5},
-        {"x":1.5, "y":1},
-        {"x":2.5, "y":1},
-        {"x":3.5, "y":1},
-        {"x":4.5, "y":1},
-        {"x":5.5, "y":1},
-        {"x":6.5, "y":1},
-        {"x":7.5, "y":1},
-        {"x":8.5, "y":1},
-        {"x":9.5, "y":1},
-        {"x":10.5, "y":1},
-        {"x":11.5, "y":1},
-        {"x":12.5, "y":1},
-        {"x":13.5, "y":1, "w":1.5},
-        {"x":15, "y":1},
-        {"x":0, "y":2, "w":1.75},
-        {"x":1.75, "y":2},
-        {"x":2.75, "y":2},
-        {"x":3.75, "y":2},
-        {"x":4.75, "y":2},
-        {"x":5.75, "y":2},
-        {"x":6.75, "y":2},
-        {"x":7.75, "y":2},
-        {"x":8.75, "y":2},
-        {"x":9.75, "y":2},
-        {"x":10.75, "y":2},
-        {"x":11.75, "y":2},
-        {"x":12.75, "y":2, "w":2.25},
-        {"x":15, "y":2},
-        {"x":0, "y":3, "w":2.25},
-        {"x":2.25, "y":3},
-        {"x":3.25, "y":3},
-        {"x":4.25, "y":3},
-        {"x":5.25, "y":3},
-        {"x":6.25, "y":3},
-        {"x":7.25, "y":3},
-        {"x":8.25, "y":3},
-        {"x":9.25, "y":3},
-        {"x":10.25, "y":3},
-        {"x":11.25, "y":3},
-        {"x":12.25, "y":3, "w":1.75},
-        {"x":14, "y":3},
-        {"x":15, "y":3},
-        {"x":0, "y":4, "w":1.5},
-        {"x":1.5, "y":4},
-        {"x":2.5, "y":4, "w":1.5},
-        {"x":4, "y":4, "w":7},
-        {"x":11, "y":4, "w":1.5},
-        {"x":13, "y":4},
-        {"x":14, "y":4},
-        {"x":15, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_7u_space_split_bs": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4, "y":0},
-        {"x":5, "y":0},
-        {"x":6, "y":0},
-        {"x":7, "y":0},
-        {"x":8, "y":0},
-        {"x":9, "y":0},
-        {"x":10, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0},
-        {"x":14, "y":0},
-        {"x":15, "y":0},
-        {"x":0, "y":1, "w":1.5},
-        {"x":1.5, "y":1},
-        {"x":2.5, "y":1},
-        {"x":3.5, "y":1},
-        {"x":4.5, "y":1},
-        {"x":5.5, "y":1},
-        {"x":6.5, "y":1},
-        {"x":7.5, "y":1},
-        {"x":8.5, "y":1},
-        {"x":9.5, "y":1},
-        {"x":10.5, "y":1},
-        {"x":11.5, "y":1},
-        {"x":12.5, "y":1},
-        {"x":13.5, "y":1, "w":1.5},
-        {"x":15, "y":1},
-        {"x":0, "y":2, "w":1.75},
-        {"x":1.75, "y":2},
-        {"x":2.75, "y":2},
-        {"x":3.75, "y":2},
-        {"x":4.75, "y":2},
-        {"x":5.75, "y":2},
-        {"x":6.75, "y":2},
-        {"x":7.75, "y":2},
-        {"x":8.75, "y":2},
-        {"x":9.75, "y":2},
-        {"x":10.75, "y":2},
-        {"x":11.75, "y":2},
-        {"x":12.75, "y":2, "w":2.25},
-        {"x":15, "y":2},
-        {"x":0, "y":3, "w":2.25},
-        {"x":2.25, "y":3},
-        {"x":3.25, "y":3},
-        {"x":4.25, "y":3},
-        {"x":5.25, "y":3},
-        {"x":6.25, "y":3},
-        {"x":7.25, "y":3},
-        {"x":8.25, "y":3},
-        {"x":9.25, "y":3},
-        {"x":10.25, "y":3},
-        {"x":11.25, "y":3},
-        {"x":12.25, "y":3, "w":1.75},
-        {"x":14, "y":3},
-        {"x":15, "y":3},
-        {"x":0, "y":4, "w":1.5},
-        {"x":1.5, "y":4},
-        {"x":2.5, "y":4, "w":1.5},
-        {"x":4, "y":4, "w":7},
-        {"x":11, "y":4, "w":1.5},
-        {"x":13, "y":4},
-        {"x":14, "y":4},
-        {"x":15, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     }
   }
diff --git a/keyboards/noxary/268_2_rgb/268_2_rgb.c b/keyboards/noxary/268_2_rgb/268_2_rgb.c
deleted file mode 100644
index 038d34c83c..0000000000
--- a/keyboards/noxary/268_2_rgb/268_2_rgb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Rozakiin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "268_2_rgb.h"
diff --git a/keyboards/noxary/268_2_rgb/268_2_rgb.h b/keyboards/noxary/268_2_rgb/268_2_rgb.h
deleted file mode 100644
index a302dccf21..0000000000
--- a/keyboards/noxary/268_2_rgb/268_2_rgb.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright 2018 Rozakiin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_65_ansi_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                         K407,             K410, K411, K412,       K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, K407,  KC_NO, KC_NO, K410,  K411,  K412,  KC_NO, K414,  K415 }  \
-}
-
-#define LAYOUT_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                         K407,             K410, K411, K412,       K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, K407,  KC_NO, KC_NO, K410,  K411,  K412,  KC_NO, K414,  K415 }  \
-}
-
-#define LAYOUT_7u_space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                         K407,                   K411, K412,       K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, K407,  KC_NO, KC_NO, KC_NO, K411,  K412,  KC_NO, K414,  K415 }  \
-}
-
-#define LAYOUT_7u_space_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                         K407,                   K411, K412,       K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, K407,  KC_NO, KC_NO, KC_NO, K411,  K412,  KC_NO, K414,  K415 }  \
-}
diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h
index c6460002a9..9abdc5c69b 100644
--- a/keyboards/noxary/268_2_rgb/config.h
+++ b/keyboards/noxary/268_2_rgb/config.h
@@ -14,26 +14,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F6, F5, F4, F0, B6 }
-#define MATRIX_COL_PINS { C6, C7, F7, F1, E6, B2, B1, D6, B4, D7, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812b options */
-#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 16
 #define RGBLIGHT_VAL_STEP 16
 /*#define RGBLIGHT_LIMIT_VAL 255 */
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/noxary/268_2_rgb/info.json b/keyboards/noxary/268_2_rgb/info.json
index 9016300e25..d1f57bc5fc 100644
--- a/keyboards/noxary/268_2_rgb/info.json
+++ b/keyboards/noxary/268_2_rgb/info.json
@@ -8,9 +8,17 @@
       "pid": "0x0A7C",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["C6", "C7", "F7", "F1", "E6", "B2", "B1", "D6", "B4", "D7", "D4", "D5", "D3", "D2", "D1", "D0"],
+      "rows": ["F6", "F5", "F4", "F0", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "B7"
     },
+    "ws2812": {
+      "pin": "B5"
+    },
     "indicators": {
       "caps_lock": "B0"
     },
@@ -19,286 +27,302 @@
     "layouts": {
       "LAYOUT_65_ansi_blocker": {
         "layout": [
-          {"x":0, "y":0},
-          {"x":1, "y":0},
-          {"x":2, "y":0},
-          {"x":3, "y":0},
-          {"x":4, "y":0},
-          {"x":5, "y":0},
-          {"x":6, "y":0},
-          {"x":7, "y":0},
-          {"x":8, "y":0},
-          {"x":9, "y":0},
-          {"x":10, "y":0},
-          {"x":11, "y":0},
-          {"x":12, "y":0},
-          {"x":13, "y":0, "w":2},
-          {"x":15, "y":0},
-          {"x":0, "y":1, "w":1.5},
-          {"x":1.5, "y":1},
-          {"x":2.5, "y":1},
-          {"x":3.5, "y":1},
-          {"x":4.5, "y":1},
-          {"x":5.5, "y":1},
-          {"x":6.5, "y":1},
-          {"x":7.5, "y":1},
-          {"x":8.5, "y":1},
-          {"x":9.5, "y":1},
-          {"x":10.5, "y":1},
-          {"x":11.5, "y":1},
-          {"x":12.5, "y":1},
-          {"x":13.5, "y":1, "w":1.5},
-          {"x":15, "y":1},
-          {"x":0, "y":2, "w":1.75},
-          {"x":1.75, "y":2},
-          {"x":2.75, "y":2},
-          {"x":3.75, "y":2},
-          {"x":4.75, "y":2},
-          {"x":5.75, "y":2},
-          {"x":6.75, "y":2},
-          {"x":7.75, "y":2},
-          {"x":8.75, "y":2},
-          {"x":9.75, "y":2},
-          {"x":10.75, "y":2},
-          {"x":11.75, "y":2},
-          {"x":12.75, "y":2, "w":2.25},
-          {"x":15, "y":2},
-          {"x":0, "y":3, "w":2.25},
-          {"x":2.25, "y":3},
-          {"x":3.25, "y":3},
-          {"x":4.25, "y":3},
-          {"x":5.25, "y":3},
-          {"x":6.25, "y":3},
-          {"x":7.25, "y":3},
-          {"x":8.25, "y":3},
-          {"x":9.25, "y":3},
-          {"x":10.25, "y":3},
-          {"x":11.25, "y":3},
-          {"x":12.25, "y":3, "w":1.75},
-          {"x":14, "y":3},
-          {"x":15, "y":3},
-          {"x":0, "y":4, "w":1.25},
-          {"x":1.25, "y":4, "w":1.25},
-          {"x":2.5, "y":4, "w":1.25},
-          {"x":3.75, "y":4, "w":6.25},
-          {"x":10, "y":4, "w":1.25},
-          {"x":11.25, "y":4, "w":1.25},
-          {"x":13, "y":4},
-          {"x":14, "y":4},
-          {"x":15, "y":4}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+          {"matrix": [0, 15], "x": 15, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+          {"matrix": [1, 15], "x": 15, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+          {"matrix": [2, 15], "x": 15, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+          {"matrix": [3, 14], "x": 14, "y": 3},
+          {"matrix": [3, 15], "x": 15, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+          {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 12], "x": 13, "y": 4},
+          {"matrix": [4, 14], "x": 14, "y": 4},
+          {"matrix": [4, 15], "x": 15, "y": 4}
         ]
       },
       "LAYOUT_split_bs": {
         "layout": [
-          {"x":0, "y":0},
-          {"x":1, "y":0},
-          {"x":2, "y":0},
-          {"x":3, "y":0},
-          {"x":4, "y":0},
-          {"x":5, "y":0},
-          {"x":6, "y":0},
-          {"x":7, "y":0},
-          {"x":8, "y":0},
-          {"x":9, "y":0},
-          {"x":10, "y":0},
-          {"x":11, "y":0},
-          {"x":12, "y":0},
-          {"x":13, "y":0},
-          {"x":14, "y":0},
-          {"x":15, "y":0},
-          {"x":0, "y":1, "w":1.5},
-          {"x":1.5, "y":1},
-          {"x":2.5, "y":1},
-          {"x":3.5, "y":1},
-          {"x":4.5, "y":1},
-          {"x":5.5, "y":1},
-          {"x":6.5, "y":1},
-          {"x":7.5, "y":1},
-          {"x":8.5, "y":1},
-          {"x":9.5, "y":1},
-          {"x":10.5, "y":1},
-          {"x":11.5, "y":1},
-          {"x":12.5, "y":1},
-          {"x":13.5, "y":1, "w":1.5},
-          {"x":15, "y":1},
-          {"x":0, "y":2, "w":1.75},
-          {"x":1.75, "y":2},
-          {"x":2.75, "y":2},
-          {"x":3.75, "y":2},
-          {"x":4.75, "y":2},
-          {"x":5.75, "y":2},
-          {"x":6.75, "y":2},
-          {"x":7.75, "y":2},
-          {"x":8.75, "y":2},
-          {"x":9.75, "y":2},
-          {"x":10.75, "y":2},
-          {"x":11.75, "y":2},
-          {"x":12.75, "y":2, "w":2.25},
-          {"x":15, "y":2},
-          {"x":0, "y":3, "w":2.25},
-          {"x":2.25, "y":3},
-          {"x":3.25, "y":3},
-          {"x":4.25, "y":3},
-          {"x":5.25, "y":3},
-          {"x":6.25, "y":3},
-          {"x":7.25, "y":3},
-          {"x":8.25, "y":3},
-          {"x":9.25, "y":3},
-          {"x":10.25, "y":3},
-          {"x":11.25, "y":3},
-          {"x":12.25, "y":3, "w":1.75},
-          {"x":14, "y":3},
-          {"x":15, "y":3},
-          {"x":0, "y":4, "w":1.25},
-          {"x":1.25, "y":4, "w":1.25},
-          {"x":2.5, "y":4, "w":1.25},
-          {"x":3.75, "y":4, "w":6.25},
-          {"x":10, "y":4, "w":1.25},
-          {"x":11.25, "y":4, "w":1.25},
-          {"x":13, "y":4},
-          {"x":14, "y":4},
-          {"x":15, "y":4}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 13], "x": 13, "y": 0},
+          {"matrix": [0, 14], "x": 14, "y": 0},
+          {"matrix": [0, 15], "x": 15, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+          {"matrix": [1, 15], "x": 15, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+          {"matrix": [2, 15], "x": 15, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+          {"matrix": [3, 14], "x": 14, "y": 3},
+          {"matrix": [3, 15], "x": 15, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+          {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 12], "x": 13, "y": 4},
+          {"matrix": [4, 14], "x": 14, "y": 4},
+          {"matrix": [4, 15], "x": 15, "y": 4}
         ]
       },
       "LAYOUT_7u_space": {
         "layout": [
-          {"x":0, "y":0},
-          {"x":1, "y":0},
-          {"x":2, "y":0},
-          {"x":3, "y":0},
-          {"x":4, "y":0},
-          {"x":5, "y":0},
-          {"x":6, "y":0},
-          {"x":7, "y":0},
-          {"x":8, "y":0},
-          {"x":9, "y":0},
-          {"x":10, "y":0},
-          {"x":11, "y":0},
-          {"x":12, "y":0},
-          {"x":13, "y":0, "w":2},
-          {"x":15, "y":0},
-          {"x":0, "y":1, "w":1.5},
-          {"x":1.5, "y":1},
-          {"x":2.5, "y":1},
-          {"x":3.5, "y":1},
-          {"x":4.5, "y":1},
-          {"x":5.5, "y":1},
-          {"x":6.5, "y":1},
-          {"x":7.5, "y":1},
-          {"x":8.5, "y":1},
-          {"x":9.5, "y":1},
-          {"x":10.5, "y":1},
-          {"x":11.5, "y":1},
-          {"x":12.5, "y":1},
-          {"x":13.5, "y":1, "w":1.5},
-          {"x":15, "y":1},
-          {"x":0, "y":2, "w":1.75},
-          {"x":1.75, "y":2},
-          {"x":2.75, "y":2},
-          {"x":3.75, "y":2},
-          {"x":4.75, "y":2},
-          {"x":5.75, "y":2},
-          {"x":6.75, "y":2},
-          {"x":7.75, "y":2},
-          {"x":8.75, "y":2},
-          {"x":9.75, "y":2},
-          {"x":10.75, "y":2},
-          {"x":11.75, "y":2},
-          {"x":12.75, "y":2, "w":2.25},
-          {"x":15, "y":2},
-          {"x":0, "y":3, "w":2.25},
-          {"x":2.25, "y":3},
-          {"x":3.25, "y":3},
-          {"x":4.25, "y":3},
-          {"x":5.25, "y":3},
-          {"x":6.25, "y":3},
-          {"x":7.25, "y":3},
-          {"x":8.25, "y":3},
-          {"x":9.25, "y":3},
-          {"x":10.25, "y":3},
-          {"x":11.25, "y":3},
-          {"x":12.25, "y":3, "w":1.75},
-          {"x":14, "y":3},
-          {"x":15, "y":3},
-          {"x":0, "y":4, "w":1.5},
-          {"x":1.5, "y":4},
-          {"x":2.5, "y":4, "w":1.5},
-          {"x":4, "y":4, "w":7},
-          {"x":11, "y":4, "w":1.5},
-          {"x":13, "y":4},
-          {"x":14, "y":4},
-          {"x":15, "y":4}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+          {"matrix": [0, 15], "x": 15, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+          {"matrix": [1, 15], "x": 15, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+          {"matrix": [2, 15], "x": 15, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+          {"matrix": [3, 14], "x": 14, "y": 3},
+          {"matrix": [3, 15], "x": 15, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+          {"matrix": [4, 1], "x": 1.5, "y": 4},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+          {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+          {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+          {"matrix": [4, 12], "x": 13, "y": 4},
+          {"matrix": [4, 14], "x": 14, "y": 4},
+          {"matrix": [4, 15], "x": 15, "y": 4}
         ]
       },
       "LAYOUT_7u_space_split_bs": {
         "layout": [
-          {"x":0, "y":0},
-          {"x":1, "y":0},
-          {"x":2, "y":0},
-          {"x":3, "y":0},
-          {"x":4, "y":0},
-          {"x":5, "y":0},
-          {"x":6, "y":0},
-          {"x":7, "y":0},
-          {"x":8, "y":0},
-          {"x":9, "y":0},
-          {"x":10, "y":0},
-          {"x":11, "y":0},
-          {"x":12, "y":0},
-          {"x":13, "y":0},
-          {"x":14, "y":0},
-          {"x":15, "y":0},
-          {"x":0, "y":1, "w":1.5},
-          {"x":1.5, "y":1},
-          {"x":2.5, "y":1},
-          {"x":3.5, "y":1},
-          {"x":4.5, "y":1},
-          {"x":5.5, "y":1},
-          {"x":6.5, "y":1},
-          {"x":7.5, "y":1},
-          {"x":8.5, "y":1},
-          {"x":9.5, "y":1},
-          {"x":10.5, "y":1},
-          {"x":11.5, "y":1},
-          {"x":12.5, "y":1},
-          {"x":13.5, "y":1, "w":1.5},
-          {"x":15, "y":1},
-          {"x":0, "y":2, "w":1.75},
-          {"x":1.75, "y":2},
-          {"x":2.75, "y":2},
-          {"x":3.75, "y":2},
-          {"x":4.75, "y":2},
-          {"x":5.75, "y":2},
-          {"x":6.75, "y":2},
-          {"x":7.75, "y":2},
-          {"x":8.75, "y":2},
-          {"x":9.75, "y":2},
-          {"x":10.75, "y":2},
-          {"x":11.75, "y":2},
-          {"x":12.75, "y":2, "w":2.25},
-          {"x":15, "y":2},
-          {"x":0, "y":3, "w":2.25},
-          {"x":2.25, "y":3},
-          {"x":3.25, "y":3},
-          {"x":4.25, "y":3},
-          {"x":5.25, "y":3},
-          {"x":6.25, "y":3},
-          {"x":7.25, "y":3},
-          {"x":8.25, "y":3},
-          {"x":9.25, "y":3},
-          {"x":10.25, "y":3},
-          {"x":11.25, "y":3},
-          {"x":12.25, "y":3, "w":1.75},
-          {"x":14, "y":3},
-          {"x":15, "y":3},
-          {"x":0, "y":4, "w":1.5},
-          {"x":1.5, "y":4},
-          {"x":2.5, "y":4, "w":1.5},
-          {"x":4, "y":4, "w":7},
-          {"x":11, "y":4, "w":1.5},
-          {"x":13, "y":4},
-          {"x":14, "y":4},
-          {"x":15, "y":4}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 13], "x": 13, "y": 0},
+          {"matrix": [0, 14], "x": 14, "y": 0},
+          {"matrix": [0, 15], "x": 15, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+          {"matrix": [1, 15], "x": 15, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+          {"matrix": [2, 15], "x": 15, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+          {"matrix": [3, 14], "x": 14, "y": 3},
+          {"matrix": [3, 15], "x": 15, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+          {"matrix": [4, 1], "x": 1.5, "y": 4},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+          {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+          {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+          {"matrix": [4, 12], "x": 13, "y": 4},
+          {"matrix": [4, 14], "x": 14, "y": 4},
+          {"matrix": [4, 15], "x": 15, "y": 4}
         ]
       }
     }
diff --git a/keyboards/noxary/280/config.h b/keyboards/noxary/280/config.h
index d46eb41347..b5b661bef2 100644
--- a/keyboards/noxary/280/config.h
+++ b/keyboards/noxary/280/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, E6, D6, D4, F6, F5, F4, F1, B2, D3, D2, D1}
-#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, B0, B3}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/noxary/280/info.json b/keyboards/noxary/280/info.json
index d606490b98..bb5ac51819 100644
--- a/keyboards/noxary/280/info.json
+++ b/keyboards/noxary/280/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0AF1",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "B0", "B3"],
+        "rows": ["F0", "E6", "D6", "D4", "F6", "F5", "F4", "F1", "B2", "D3", "D2", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
diff --git a/keyboards/noxary/378/378.c b/keyboards/noxary/378/378.c
deleted file mode 100644
index 10835509e3..0000000000
--- a/keyboards/noxary/378/378.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2015 �lvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "378.h"
diff --git a/keyboards/noxary/378/config.h b/keyboards/noxary/378/config.h
index bf285221bd..f608132b5a 100644
--- a/keyboards/noxary/378/config.h
+++ b/keyboards/noxary/378/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A7 , A3 , B9 , B8 , B7 , B6 , B5 , B4 , B3 , A15, A2 , A1 , A0 , F1 , F0 , C14 , C15 }
-#define MATRIX_ROW_PINS { A10, B11, A4 , A5 , A6 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/noxary/378/info.json b/keyboards/noxary/378/info.json
index 2663b46dfa..16d19c78cf 100644
--- a/keyboards/noxary/378/info.json
+++ b/keyboards/noxary/378/info.json
@@ -8,6 +8,11 @@
         "pid": "0x017A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A7", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A2", "A1", "A0", "F1", "F0", "C14", "C15"],
+        "rows": ["A10", "B11", "A4", "A5", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/noxary/valhalla/config.h b/keyboards/noxary/valhalla/config.h
index e6ff2a3cfe..f608132b5a 100644
--- a/keyboards/noxary/valhalla/config.h
+++ b/keyboards/noxary/valhalla/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B12, B11, B10, B2 , B1 , B0 , A10, B9 , B8 , B7 , B6 , B5 , B4 , B3 , A15 }
-#define MATRIX_ROW_PINS { A8 , A9 , B13, B14, B15 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/noxary/valhalla/info.json b/keyboards/noxary/valhalla/info.json
index cfa29e69b0..1b137e38d4 100644
--- a/keyboards/noxary/valhalla/info.json
+++ b/keyboards/noxary/valhalla/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5648",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B12", "B11", "B10", "B2", "B1", "B0", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["A8", "A9", "B13", "B14", "B15"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/noxary/valhalla/valhalla.c b/keyboards/noxary/valhalla/valhalla.c
deleted file mode 100644
index a8b2165091..0000000000
--- a/keyboards/noxary/valhalla/valhalla.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2015 �lvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "valhalla.h"
diff --git a/keyboards/noxary/vulcan/config.h b/keyboards/noxary/vulcan/config.h
index 515d67109d..50001e978c 100644
--- a/keyboards/noxary/vulcan/config.h
+++ b/keyboards/noxary/vulcan/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D1, D0, D2, F0, F1 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/noxary/vulcan/info.json b/keyboards/noxary/vulcan/info.json
index 4a5ee09d62..94ba75dad9 100644
--- a/keyboards/noxary/vulcan/info.json
+++ b/keyboards/noxary/vulcan/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0011",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["D1", "D0", "D2", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/noxary/vulcan/vulcan.c b/keyboards/noxary/vulcan/vulcan.c
deleted file mode 100644
index a36569ecbd..0000000000
--- a/keyboards/noxary/vulcan/vulcan.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "vulcan.h"
-
diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h
index f40f846d61..1a8211bc3a 100644
--- a/keyboards/noxary/x268/config.h
+++ b/keyboards/noxary/x268/config.h
@@ -17,26 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, F6, F5, F0, B4 }
-#define MATRIX_COL_PINS { C6, B6, C7, F4, E6, B2, D6, D0, D1, D7, D4, D5, D3, F1, D2, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812b options */
-#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 16
 #define RGBLIGHT_VAL_STEP 16
 /*#define RGBLIGHT_LIMIT_VAL 255 */
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/noxary/x268/info.json b/keyboards/noxary/x268/info.json
index ee616992dd..3b47943e97 100644
--- a/keyboards/noxary/x268/info.json
+++ b/keyboards/noxary/x268/info.json
@@ -8,9 +8,17 @@
     "pid": "0x0A7B",
     "device_version": "0.7.8"
   },
+  "matrix_pins": {
+    "cols": ["C6", "B6", "C7", "F4", "E6", "B2", "D6", "D0", "D1", "D7", "D4", "D5", "D3", "F1", "D2", "B1"],
+    "rows": ["F7", "F6", "F5", "F0", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
+  "ws2812": {
+    "pin": "B5"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/np12/config.h b/keyboards/np12/config.h
deleted file mode 100644
index 3a09f4060d..0000000000
--- a/keyboards/np12/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
- /* Copyright 2021 nut1414
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
-
-#pragma once
-
-#define MATRIX_ROW_PINS { D7, E6, B4, F7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, F6 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/np12/info.json b/keyboards/np12/info.json
index 7ae6325768..834c51f577 100644
--- a/keyboards/np12/info.json
+++ b/keyboards/np12/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4401",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D1", "D0", "D4", "C6", "F6"],
+    "rows": ["D7", "E6", "B4", "F7"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "F4", "pin_b": "F5"}
@@ -17,20 +22,23 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout":   [
-		{ "label": "k34", "x": 3, "y": 0 },
-        { "label": "k00", "x": 0, "y": 1 },
-        { "label": "k01", "x": 1, "y": 1 },
-        { "label": "k02", "x": 2, "y": 1 },
-        { "label": "k03", "x": 3, "y": 1 },
-        { "label": "k10", "x": 0, "y": 2 },
-        { "label": "k11", "x": 1, "y": 2 },
-        { "label": "k12", "x": 2, "y": 2 },
-        { "label": "k13", "x": 3, "y": 2 },
-        { "label": "k20", "x": 0, "y": 3 },
-        { "label": "k21", "x": 1, "y": 3 },
-        { "label": "k22", "x": 2, "y": 3 },
-        { "label": "k23", "x": 3, "y": 3 }
+      "layout": [
+        {"matrix": [3, 4], "x": 3, "y": 0},
+
+        {"matrix": [0, 0], "x": 0, "y": 1},
+        {"matrix": [0, 1], "x": 1, "y": 1},
+        {"matrix": [0, 2], "x": 2, "y": 1},
+        {"matrix": [0, 3], "x": 3, "y": 1},
+
+        {"matrix": [1, 0], "x": 0, "y": 2},
+        {"matrix": [1, 1], "x": 1, "y": 2},
+        {"matrix": [1, 2], "x": 2, "y": 2},
+        {"matrix": [1, 3], "x": 3, "y": 2},
+
+        {"matrix": [2, 0], "x": 0, "y": 3},
+        {"matrix": [2, 1], "x": 1, "y": 3},
+        {"matrix": [2, 2], "x": 2, "y": 3},
+        {"matrix": [2, 3], "x": 3, "y": 3}
       ]
     }
   }
diff --git a/keyboards/np12/np12.c b/keyboards/np12/np12.c
deleted file mode 100644
index 062bd9a833..0000000000
--- a/keyboards/np12/np12.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 nut1414 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
-
-#include "np12.h"
diff --git a/keyboards/np12/np12.h b/keyboards/np12/np12.h
deleted file mode 100644
index ee82786d83..0000000000
--- a/keyboards/np12/np12.h
+++ /dev/null
@@ -1,31 +0,0 @@
- /* Copyright 2021 nut1414 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-				   k34, \
-	k00, k01, k02, k03, \
-	k10, k11, k12, k13, \
-	k20, k21, k22, k23  \
-) { \
-	{ k00,   k01,   k02,   k03,   KC_NO}, \
-	{ k10,   k11,   k12,   k13,   KC_NO}, \
-	{ k20,   k21,   k22,   k23,   KC_NO}, \
-	{ KC_NO, KC_NO, KC_NO, KC_NO, k34  }  \
-}
diff --git a/keyboards/nullbitsco/nibble/config.h b/keyboards/nullbitsco/nibble/config.h
index af85027e64..5ef3783b87 100644
--- a/keyboards/nullbitsco/nibble/config.h
+++ b/keyboards/nullbitsco/nibble/config.h
@@ -39,7 +39,6 @@
 #define MATRIX_COL_PINS { }
 
 /* Optional SMT LED pins */
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 10
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/info.json
index 5c69cb0e7e..3fc0c3304f 100644
--- a/keyboards/nullbitsco/nibble/info.json
+++ b/keyboards/nullbitsco/nibble/info.json
@@ -12,6 +12,9 @@
             {"pin_a": "B5", "pin_b": "B4"}
         ]
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 10,
diff --git a/keyboards/nullbitsco/nibble/nibble.c b/keyboards/nullbitsco/nibble/nibble.c
index 8f462080f0..388d546a7e 100644
--- a/keyboards/nullbitsco/nibble/nibble.c
+++ b/keyboards/nullbitsco/nibble/nibble.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include QMK_KEYBOARD_H
+#include "nibble.h"
 
 // Use Bit-C LED to show CAPS LOCK status
 void led_update_ports(led_t led_state) {
diff --git a/keyboards/nullbitsco/snap/config.h b/keyboards/nullbitsco/snap/config.h
index ae0a5018be..24e9340c0e 100644
--- a/keyboards/nullbitsco/snap/config.h
+++ b/keyboards/nullbitsco/snap/config.h
@@ -58,7 +58,6 @@
 #define MATRIX_EXT_PIN_RIGHT B6
 
 /* Optional SMT LED pins */
-#define RGB_DI_PIN B2
 #define RGBLED_NUM 10
 #define RGBLED_SPLIT { 5, 5 }
 #define RGBLIGHT_LED_MAP { 8, 9, 0, 1, 2, 6, 7, 3, 4, 5 }  
diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/info.json
index 6567ccde85..ce69b4a559 100644
--- a/keyboards/nullbitsco/snap/info.json
+++ b/keyboards/nullbitsco/snap/info.json
@@ -7,6 +7,9 @@
         "pid": "0x6063",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B2"
+    },
     "debounce": 10,
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/nullbitsco/snap/snap.c b/keyboards/nullbitsco/snap/snap.c
index 1ec6e5cf00..c1005bc623 100644
--- a/keyboards/nullbitsco/snap/snap.c
+++ b/keyboards/nullbitsco/snap/snap.c
@@ -111,17 +111,3 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 
     return true;
 }
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/nullbitsco/tidbit/config.h b/keyboards/nullbitsco/tidbit/config.h
index 23b2f5f1a4..346a8fb8a8 100644
--- a/keyboards/nullbitsco/tidbit/config.h
+++ b/keyboards/nullbitsco/tidbit/config.h
@@ -22,15 +22,7 @@
 // Workaround for freezing after MacOS sleep
 #define USB_SUSPEND_WAKEUP_DELAY 200
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, E6, D7, C6, D4 }
-#define MATRIX_COL_PINS { NO_PIN, NO_PIN, F4, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Optional SMT LED pins */
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 8
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json
index cce2a2902c..e2e060aef0 100644
--- a/keyboards/nullbitsco/tidbit/info.json
+++ b/keyboards/nullbitsco/tidbit/info.json
@@ -7,6 +7,14 @@
         "pid": "0x6064",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "matrix_pins": {
+        "cols": [null, null, "F4", "F5", "F6", "F7"],
+        "rows": ["B1", "E6", "D7", "C6", "D4"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B3"},
diff --git a/keyboards/nullbitsco/tidbit/tidbit.c b/keyboards/nullbitsco/tidbit/tidbit.c
index fdfffaa933..d07ba12651 100644
--- a/keyboards/nullbitsco/tidbit/tidbit.c
+++ b/keyboards/nullbitsco/tidbit/tidbit.c
@@ -14,7 +14,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
+#include "tidbit.h"
 
 typedef struct PACKED {
     uint8_t r;
@@ -85,15 +85,11 @@ bool oled_task_kb(void) {
 #endif
 
 static void process_encoder_matrix(encodermap_t pos) {
-    action_exec((keyevent_t){
-        .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = true, .time = (timer_read() | 1) /* time should not be 0 */
-    });
+    action_exec(MAKE_KEYEVENT(pos.r, pos.c, true));
 #if TAP_CODE_DELAY > 0
     wait_ms(TAP_CODE_DELAY);
 #endif
-    action_exec((keyevent_t){
-        .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = false, .time = (timer_read() | 1) /* time should not be 0 */
-    });
+    action_exec(MAKE_KEYEVENT(pos.r, pos.c, false));
 }
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/numatreus/config.h b/keyboards/numatreus/config.h
index 95883526b1..96963e6721 100644
--- a/keyboards/numatreus/config.h
+++ b/keyboards/numatreus/config.h
@@ -14,23 +14,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D2, D1, D0, D4 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 // keyboard RGB LED support
 //    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
 #define RGBLED_NUM 6
diff --git a/keyboards/numatreus/info.json b/keyboards/numatreus/info.json
index 4ce325048a..c7e31c6c61 100644
--- a/keyboards/numatreus/info.json
+++ b/keyboards/numatreus/info.json
@@ -8,6 +8,14 @@
     "pid": "0xE80A",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D2", "D1", "D0", "D4"],
+    "rows": ["C6", "D7", "E6", "B4"]
+  },
+  "diode_direction": "ROW2COL",
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/numatreus/keymaps/like_jis/config.h b/keyboards/numatreus/keymaps/like_jis/config.h
index 961de83e42..70faffdf37 100644
--- a/keyboards/numatreus/keymaps/like_jis/config.h
+++ b/keyboards/numatreus/keymaps/like_jis/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef TAPPING_TERM
 #endif
 #define TAPPING_TERM 225
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef MOUSEKEY_ENABLE
   #undef MOUSEKEY_INTERVAL
diff --git a/keyboards/numatreus/numatreus.c b/keyboards/numatreus/numatreus.c
deleted file mode 100644
index 0338210e86..0000000000
--- a/keyboards/numatreus/numatreus.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "numatreus.h"
\ No newline at end of file
diff --git a/keyboards/nyhxis/nfr_70/info.json b/keyboards/nyhxis/nfr_70/info.json
index 4742e2f9bd..002c82f6b7 100644
--- a/keyboards/nyhxis/nfr_70/info.json
+++ b/keyboards/nyhxis/nfr_70/info.json
@@ -172,11 +172,11 @@
                 { "label": "/", "x": 11.25, "y": 4.25 },
                 { "x": 10, "y": 5.25 },
                 { "label": "LCTRL", "x": 0, "y": 5.25, "w": 1.5 },
-                { "label": "LWIN", "x": 1.5, "y": 5.25, "w": 1 },
+                { "label": "LWIN", "x": 1.5, "y": 5.25 },
                 { "label": "LALT", "x": 2.5, "y": 5.25, "w": 1.5 },
                 { "label": "SPACE", "x": 4, "y": 5.25, "w": 7 },
                 { "label": "RALT", "x": 11, "y": 5.25, "w": 1.5 },
-                { "label": "RWIN", "x": 12.5, "y": 5.25, "w": 1 },
+                { "label": "RWIN", "x": 12.5, "y": 5.25 },
                 { "label": "RCTRL", "x": 13.5, "y": 5.25, "w": 1.5 }
             ]
         }
diff --git a/keyboards/nyhxis/nfr_70/nfr_70.c b/keyboards/nyhxis/nfr_70/nfr_70.c
deleted file mode 100644
index 43d4a0e2c6..0000000000
--- a/keyboards/nyhxis/nfr_70/nfr_70.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Nyhxis (@nyhxis)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "nfr_70.h"
diff --git a/keyboards/obosob/arch_36/arch_36.c b/keyboards/obosob/arch_36/arch_36.c
deleted file mode 100644
index d707e64195..0000000000
--- a/keyboards/obosob/arch_36/arch_36.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Obosob <obosob@riseup.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "arch_36.h"
diff --git a/keyboards/obosob/arch_36/arch_36.h b/keyboards/obosob/arch_36/arch_36.h
deleted file mode 100644
index 11c5e2de22..0000000000
--- a/keyboards/obosob/arch_36/arch_36.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 Obosob <obosob@riseup.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x5_3( \
-    L00, L01, L02, L03, L04,    R05, R06, R07, R08, R09, \
-    L10, L11, L12, L13, L14,    R15, R16, R17, R18, R19, \
-    L20, L21, L22, L23, L24,    R25, R26, R27, R28, R29, \
-              L32, L33, L34,    R35, R36, R37 \
-) \
-{ \
-    { L00,   L01,   L02,   L03,   L04 }, \
-    { L10,   L11,   L12,   L13,   L14 }, \
-    { L20,   L21,   L22,   L23,   L24 }, \
-    { KC_NO, KC_NO, L32,   L33,   L34 }, \
-    { R09,   R08,   R07,   R06,   R05 }, \
-    { R19,   R18,   R17,   R16,   R15 }, \
-    { R29,   R28,   R27,   R26,   R25 }, \
-    { KC_NO, KC_NO, R37,   R36,   R35 }, \
-}
diff --git a/keyboards/obosob/arch_36/config.h b/keyboards/obosob/arch_36/config.h
index ae2913396b..068a231f43 100644
--- a/keyboards/obosob/arch_36/config.h
+++ b/keyboards/obosob/arch_36/config.h
@@ -17,15 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
 #define RGBLED_SPLIT { 6, 6 }
 #define RGBLED_NUM 12
 #define RGBLIGHT_LED_MAP {  0,  1,  2,  3,  4,  5, \
diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json
index 63736c9a21..d978080a2f 100644
--- a/keyboards/obosob/arch_36/info.json
+++ b/keyboards/obosob/arch_36/info.json
@@ -8,54 +8,66 @@
         "pid": "0x9CE3",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"x":0, "y":1},
-                {"x":1, "y":0.25},
-                {"x":2, "y":0},
-                {"x":3, "y":0.375},
-                {"x":4, "y":0.5},
-                {"x":9, "y":0.5},
-                {"x":10, "y":0.375},
-                {"x":11, "y":0},
-                {"x":12, "y":0.25},
-                {"x":13, "y":1},
+                {"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},
 
-                {"x":0, "y":2},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1},
-                {"x":3, "y":1.375},
-                {"x":4, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.375},
-                {"x":11, "y":1},
-                {"x":12, "y":1.25},
-                {"x":13, "y":2},
+                {"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},
 
-                {"x":0, "y":3},
-                {"x":1, "y":2.25},
-                {"x":2, "y":2},
-                {"x":3, "y":2.375},
-                {"x":4, "y":2.5},
-                {"x":9, "y":2.5},
-                {"x":10, "y":2.375},
-                {"x":11, "y":2},
-                {"x":12, "y":2.25},
-                {"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},
 
-                {"x":3.5, "y":3.5},
-                {"x":4.5, "y":3.7},
-                {"x":5.5, "y":4.1},
-                {"x":7.5, "y":4.1},
-                {"x":8.5, "y":3.7},
-                {"x":9.5, "y":3.5}
+                {"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/steal_this_keyboard/keymaps/default/config.h b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
index 3e3ba7a401..71b4813515 100644
--- a/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
+++ b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
@@ -35,5 +35,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Pick good defaults for enabling homerow modifiers
 #define TAPPING_TERM 200
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define QUICK_TAP_TERM 0
diff --git a/keyboards/ocean/addon/addon.c b/keyboards/ocean/addon/addon.c
deleted file mode 100644
index 01a815a279..0000000000
--- a/keyboards/ocean/addon/addon.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2022 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "addon.h"
diff --git a/keyboards/ocean/addon/config.h b/keyboards/ocean/addon/config.h
deleted file mode 100644
index abca0558eb..0000000000
--- a/keyboards/ocean/addon/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*Copyright 2022 Ocean
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/addon/info.json b/keyboards/ocean/addon/info.json
index fa7d1ab7fa..df9313dd49 100644
--- a/keyboards/ocean/addon/info.json
+++ b/keyboards/ocean/addon/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0012",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/ocean/gin_v2/config.h b/keyboards/ocean/gin_v2/config.h
deleted file mode 100644
index d19f0bce23..0000000000
--- a/keyboards/ocean/gin_v2/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*Copyright 2021 Ocean
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/gin_v2/gin_v2.c b/keyboards/ocean/gin_v2/gin_v2.c
deleted file mode 100644
index 3a8a328817..0000000000
--- a/keyboards/ocean/gin_v2/gin_v2.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "gin_v2.h"
diff --git a/keyboards/ocean/gin_v2/info.json b/keyboards/ocean/gin_v2/info.json
index 4a6b259909..5f1b1c6ce6 100644
--- a/keyboards/ocean/gin_v2/info.json
+++ b/keyboards/ocean/gin_v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/ocean/slamz/config.h b/keyboards/ocean/slamz/config.h
deleted file mode 100644
index 61a8050d05..0000000000
--- a/keyboards/ocean/slamz/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*Copyright 2021 Ocean
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS { D2, D1, D0, D4 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/slamz/info.json b/keyboards/ocean/slamz/info.json
index d15f271b1c..f03ee04361 100644
--- a/keyboards/ocean/slamz/info.json
+++ b/keyboards/ocean/slamz/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0011",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7"],
+        "rows": ["D2", "D1", "D0", "D4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/ocean/slamz/slamz.c b/keyboards/ocean/slamz/slamz.c
deleted file mode 100644
index fbfca8831a..0000000000
--- a/keyboards/ocean/slamz/slamz.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "slamz.h"
diff --git a/keyboards/ocean/stealth/config.h b/keyboards/ocean/stealth/config.h
deleted file mode 100644
index 3cc4f01a37..0000000000
--- a/keyboards/ocean/stealth/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*Copyright 2021 Ocean
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS { D1 }
-#define MATRIX_COL_PINS { D0, D4, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/stealth/info.json b/keyboards/ocean/stealth/info.json
index 4e17ba36a7..c6c7378eea 100644
--- a/keyboards/ocean/stealth/info.json
+++ b/keyboards/ocean/stealth/info.json
@@ -8,11 +8,20 @@
         "pid": "0x0010",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D4", "C6"],
+        "rows": ["D1"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0, "w":2.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 2.25},
+                {"matrix": [0, 1], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [0, 2], "x": 1.25, "y": 1}
+            ]
         }
     }
 }
diff --git a/keyboards/ocean/stealth/stealth.c b/keyboards/ocean/stealth/stealth.c
deleted file mode 100644
index 656701cfd2..0000000000
--- a/keyboards/ocean/stealth/stealth.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "stealth.h"
diff --git a/keyboards/ocean/stealth/stealth.h b/keyboards/ocean/stealth/stealth.h
deleted file mode 100644
index b86cd2f05f..0000000000
--- a/keyboards/ocean/stealth/stealth.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Ocean
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT(\
-  K00, K01, K02 \
-) \
-{ \
-  { K00, K01, K02 }, \
-}
diff --git a/keyboards/ocean/sus/config.h b/keyboards/ocean/sus/config.h
deleted file mode 100644
index 78ce643e07..0000000000
--- a/keyboards/ocean/sus/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*Copyright 2021 Ocean
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS { B5, B4, E6, D7 }
-#define MATRIX_COL_PINS { C6, D4, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/sus/info.json b/keyboards/ocean/sus/info.json
index 61ef3a50db..b68848fbb2 100644
--- a/keyboards/ocean/sus/info.json
+++ b/keyboards/ocean/sus/info.json
@@ -8,26 +8,31 @@
       "pid": "0x0009",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["C6", "D4", "D0"],
+      "rows": ["B5", "B4", "E6", "D7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_ortho_4x3": {
           "layout": [
-            {"x":0, "y":0}, 
-            {"x":1, "y":0},
-            {"x":2, "y":0},
+            {"matrix": [0, 0], "x": 0, "y": 0},
+            {"matrix": [0, 1], "x": 1, "y": 0},
+            {"matrix": [0, 2], "x": 2, "y": 0},
 
-            {"x":0, "y":1},
-            {"x":1, "y":1},
-            {"x":2, "y":1},
+            {"matrix": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1},
 
-            {"x":0, "y":2},
-            {"x":1, "y":2},
-            {"x":2, "y":2},
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1, "y": 2},
+            {"matrix": [2, 2], "x": 2, "y": 2},
 
-            {"x":0, "y":3},
-            {"x":1, "y":3}, 
-            {"x":2, "y":3}
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3}
           ]
         }
     }
diff --git a/keyboards/ocean/sus/sus.c b/keyboards/ocean/sus/sus.c
deleted file mode 100644
index d04a12bfba..0000000000
--- a/keyboards/ocean/sus/sus.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "sus.h"
diff --git a/keyboards/ocean/sus/sus.h b/keyboards/ocean/sus/sus.h
deleted file mode 100644
index cba5f3cbc8..0000000000
--- a/keyboards/ocean/sus/sus.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2021 Ocean
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x3(\
-  K00, K01, K02, \
-  K10, K11, K12, \
-  K20, K21, K22, \
-  K30, K31, K32  \
-) \
-{ \
-  { K00, K01, K02 }, \
-  { K10, K11, K12 }, \
-  { K20, K21, K22 }, \
-  { K30, K31, K32 }, \
-}
diff --git a/keyboards/ocean/wang_ergo/config.h b/keyboards/ocean/wang_ergo/config.h
deleted file mode 100644
index 2d9e95facd..0000000000
--- a/keyboards/ocean/wang_ergo/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*Copyright 2021 Ocean
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/wang_ergo/info.json b/keyboards/ocean/wang_ergo/info.json
index 904d622338..596bc46b1b 100644
--- a/keyboards/ocean/wang_ergo/info.json
+++ b/keyboards/ocean/wang_ergo/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0008",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layout_aliases": {
diff --git a/keyboards/ocean/wang_ergo/wang_ergo.c b/keyboards/ocean/wang_ergo/wang_ergo.c
deleted file mode 100644
index 339c8465ec..0000000000
--- a/keyboards/ocean/wang_ergo/wang_ergo.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "wang_ergo.h"
diff --git a/keyboards/ocean/wang_v2/config.h b/keyboards/ocean/wang_v2/config.h
deleted file mode 100644
index 5002ee22e5..0000000000
--- a/keyboards/ocean/wang_v2/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*Copyright 2021 Ocean
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/wang_v2/info.json b/keyboards/ocean/wang_v2/info.json
index cfa68f7cb4..ef44989c5a 100644
--- a/keyboards/ocean/wang_v2/info.json
+++ b/keyboards/ocean/wang_v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "D3"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/ocean/wang_v2/wang_v2.c b/keyboards/ocean/wang_v2/wang_v2.c
deleted file mode 100644
index b04df65bae..0000000000
--- a/keyboards/ocean/wang_v2/wang_v2.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "wang_v2.h"
diff --git a/keyboards/ocean/yuri/config.h b/keyboards/ocean/yuri/config.h
deleted file mode 100644
index 4c8aacdc0e..0000000000
--- a/keyboards/ocean/yuri/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*Copyright 2022 Ocean
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS {F4, F5, F6, F7}
-#define MATRIX_COL_PINS {D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/yuri/info.json b/keyboards/ocean/yuri/info.json
index 149434d76a..9bd45534c9 100644
--- a/keyboards/ocean/yuri/info.json
+++ b/keyboards/ocean/yuri/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/ocean/yuri/yuri.c b/keyboards/ocean/yuri/yuri.c
deleted file mode 100644
index f02e35dce7..0000000000
--- a/keyboards/ocean/yuri/yuri.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2022 Ocean
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "yuri.h"
diff --git a/keyboards/oddball/config.h b/keyboards/oddball/config.h
index 3666225a0e..71c4ecd4db 100644
--- a/keyboards/oddball/config.h
+++ b/keyboards/oddball/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Split Keyboard specific options */
 #define USE_I2C
 #define SPLIT_USB_DETECT
diff --git a/keyboards/oddball/v1/config.h b/keyboards/oddball/v1/config.h
deleted file mode 100644
index 7a33a7049a..0000000000
--- a/keyboards/oddball/v1/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F6, B5, B6, F7 }
-#define MATRIX_COL_PINS { D6, D7, B4, D3, C6, C7 }
diff --git a/keyboards/oddball/v1/info.json b/keyboards/oddball/v1/info.json
index 66ed86e13c..f2bc9062ed 100644
--- a/keyboards/oddball/v1/info.json
+++ b/keyboards/oddball/v1/info.json
@@ -1,3 +1,8 @@
 {
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "D3", "C6", "C7"],
+        "rows": ["F6", "B5", "B6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "bootloader": "halfkay"
 }
diff --git a/keyboards/oddball/v1/v1.c b/keyboards/oddball/v1/v1.c
deleted file mode 100644
index 932df2be2f..0000000000
--- a/keyboards/oddball/v1/v1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v1.h"
diff --git a/keyboards/oddball/v1/v1.h b/keyboards/oddball/v1/v1.h
deleted file mode 100644
index 08df4a7975..0000000000
--- a/keyboards/oddball/v1/v1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "oddball.h"
diff --git a/keyboards/oddball/v2/config.h b/keyboards/oddball/v2/config.h
deleted file mode 100644
index 793d305931..0000000000
--- a/keyboards/oddball/v2/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, E6, D7, C6 }
-#define MATRIX_COL_PINS { B7, B5, B4, F5, F6, F7 }
diff --git a/keyboards/oddball/v2/info.json b/keyboards/oddball/v2/info.json
index cc90702804..854f80649e 100644
--- a/keyboards/oddball/v2/info.json
+++ b/keyboards/oddball/v2/info.json
@@ -1,3 +1,8 @@
 {
+    "matrix_pins": {
+        "cols": ["B7", "B5", "B4", "F5", "F6", "F7"],
+        "rows": ["D4", "E6", "D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "bootloader": "qmk-dfu"
 }
diff --git a/keyboards/oddball/v2/v2.c b/keyboards/oddball/v2/v2.c
deleted file mode 100644
index 319592b53d..0000000000
--- a/keyboards/oddball/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v2.h"
diff --git a/keyboards/oddball/v2/v2.h b/keyboards/oddball/v2/v2.h
deleted file mode 100644
index 08df4a7975..0000000000
--- a/keyboards/oddball/v2/v2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "oddball.h"
diff --git a/keyboards/oddball/v2_1/config.h b/keyboards/oddball/v2_1/config.h
deleted file mode 100644
index 9f138d7d52..0000000000
--- a/keyboards/oddball/v2_1/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, E6, D7, C6 }
-#define MATRIX_COL_PINS { B6, B5, B4, F5, F6, F7 }
diff --git a/keyboards/oddball/v2_1/info.json b/keyboards/oddball/v2_1/info.json
index cc90702804..ef4a6de85d 100644
--- a/keyboards/oddball/v2_1/info.json
+++ b/keyboards/oddball/v2_1/info.json
@@ -1,3 +1,8 @@
 {
+    "matrix_pins": {
+        "cols": ["B6", "B5", "B4", "F5", "F6", "F7"],
+        "rows": ["D4", "E6", "D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "bootloader": "qmk-dfu"
 }
diff --git a/keyboards/oddball/v2_1/v2_1.c b/keyboards/oddball/v2_1/v2_1.c
deleted file mode 100644
index 4c2433b413..0000000000
--- a/keyboards/oddball/v2_1/v2_1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v2_1.h"
diff --git a/keyboards/oddball/v2_1/v2_1.h b/keyboards/oddball/v2_1/v2_1.h
deleted file mode 100644
index 08df4a7975..0000000000
--- a/keyboards/oddball/v2_1/v2_1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Alexander Tulloh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "oddball.h"
diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/info.json
index 06e71e1be2..713ea5186e 100644
--- a/keyboards/oddforge/vea/info.json
+++ b/keyboards/oddforge/vea/info.json
@@ -11,6 +11,9 @@
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "custom"
+    },
     "indicators": {
         "caps_lock": "D1",
         "num_lock": "D0",
diff --git a/keyboards/oddforge/vea/rules.mk b/keyboards/oddforge/vea/rules.mk
index ebcb8a1159..f616b9400e 100644
--- a/keyboards/oddforge/vea/rules.mk
+++ b/keyboards/oddforge/vea/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
 
 # custom matrix setup
 CUSTOM_MATRIX = lite
diff --git a/keyboards/oddforge/vea/vea.c b/keyboards/oddforge/vea/vea.c
deleted file mode 100644
index 220083e403..0000000000
--- a/keyboards/oddforge/vea/vea.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2021 MajorKoos <github.com/majorkoos>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "vea.h"
-
-void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) { vea_setleds(start_led, num_leds); }
-
-void vea_rgb_init(void) { i2c_init(); }
-
-// Setleds for standard RGB
-void vea_setleds(LED_TYPE *ledarray, uint16_t leds) {
-    static bool s_init = false;
-    if (!s_init) {
-        vea_rgb_init();
-        s_init = true;
-    }
-
-    i2c_transmit(WS2812_ADDRESS, (uint8_t *)ledarray, sizeof(LED_TYPE) * (leds >> 1), WS2812_TIMEOUT);
-    i2c_transmit(WS2812_ADDRESS_SPLIT, (uint8_t *)ledarray+(sizeof(LED_TYPE) * (leds >> 1)), sizeof(LED_TYPE) * (leds - (leds >> 1)), WS2812_TIMEOUT);
-};
diff --git a/keyboards/oddforge/vea/vea.h b/keyboards/oddforge/vea/vea.h
index 8e5851b84d..158b82d944 100644
--- a/keyboards/oddforge/vea/vea.h
+++ b/keyboards/oddforge/vea/vea.h
@@ -16,17 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-#include "quantum.h"
-#include "i2c_master.h"
-#include "rgblight.h"
-#include "ws2812.h"
-#include "led.h"
-
-#define WS2812_ADDRESS 0xb0
-#define WS2812_ADDRESS_SPLIT 0xb8
-#define WS2812_TIMEOUT 100
 
-void vea_setleds(LED_TYPE *ledarray, uint16_t leds);
+#include "quantum.h"
 
 /*
 LEFT
diff --git a/keyboards/oddforge/vea/ws2812_custom.c b/keyboards/oddforge/vea/ws2812_custom.c
new file mode 100644
index 0000000000..0dc5a2d0f1
--- /dev/null
+++ b/keyboards/oddforge/vea/ws2812_custom.c
@@ -0,0 +1,34 @@
+#include "ws2812.h"
+#include "i2c_master.h"
+
+#ifdef RGBW
+#    error "RGBW not supported"
+#endif
+
+#ifndef WS2812_I2C_ADDRESS
+#    define WS2812_I2C_ADDRESS 0xB0
+#endif
+
+#ifndef WS2812_I2C_ADDRESS_RIGHT
+#    define WS2812_I2C_ADDRESS_RIGHT 0xB8
+#endif
+
+#ifndef WS2812_I2C_TIMEOUT
+#    define WS2812_I2C_TIMEOUT 100
+#endif
+
+void ws2812_init(void) {
+    i2c_init();
+}
+
+// Setleds for standard RGB
+void ws2812_setleds(LED_TYPE *ledarray, uint16_t leds) {
+    static bool s_init = false;
+    if (!s_init) {
+        ws2812_init();
+        s_init = true;
+    }
+
+    i2c_transmit(WS2812_I2C_ADDRESS, (uint8_t *)ledarray, sizeof(LED_TYPE) * (leds >> 1), WS2812_I2C_TIMEOUT);
+    i2c_transmit(WS2812_I2C_ADDRESS_RIGHT, (uint8_t *)ledarray+(sizeof(LED_TYPE) * (leds >> 1)), sizeof(LED_TYPE) * (leds - (leds >> 1)), WS2812_I2C_TIMEOUT);
+}
diff --git a/keyboards/odelia/config.h b/keyboards/odelia/config.h
deleted file mode 100644
index 2d0d1b1a1c..0000000000
--- a/keyboards/odelia/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-
-#define MATRIX_ROW_PINS {B3, B7, B1, B2, B0, F4, F0, F1, D4, B6}
-#define MATRIX_COL_PINS {B5, B4, D7, D6, E6, D0, D1, D2, D3, D5}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/odelia/info.json b/keyboards/odelia/info.json
index 3d9ef9c4d4..d5deadbe53 100644
--- a/keyboards/odelia/info.json
+++ b/keyboards/odelia/info.json
@@ -8,6 +8,11 @@
         "pid": "0xA129",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "D7", "D6", "E6", "D0", "D1", "D2", "D3", "D5"],
+        "rows": ["B3", "B7", "B1", "B2", "B0", "F4", "F0", "F1", "D4", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/odelia/odelia.c b/keyboards/odelia/odelia.c
deleted file mode 100644
index 97cf8b49be..0000000000
--- a/keyboards/odelia/odelia.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "odelia.h"
diff --git a/keyboards/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h
index 8069bd427b..c6739d7f66 100644
--- a/keyboards/ogre/ergo_single/config.h
+++ b/keyboards/ogre/ergo_single/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 14
 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 13, 12,11, 10, 9, 8, 7}
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/ogre/ergo_single/ergo_single.c b/keyboards/ogre/ergo_single/ergo_single.c
deleted file mode 100644
index b48b0a02e2..0000000000
--- a/keyboards/ogre/ergo_single/ergo_single.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 ctrlshiftba
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ergo_single.h"
diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json
index 04db9ff8d5..b2f4493362 100644
--- a/keyboards/ogre/ergo_single/info.json
+++ b/keyboards/ogre/ergo_single/info.json
@@ -8,6 +8,14 @@
         "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",
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h
index 017d4792ff..92535947de 100644
--- a/keyboards/ogre/ergo_split/config.h
+++ b/keyboards/ogre/ergo_split/config.h
@@ -17,17 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN D1
 
-#define RGB_DI_PIN B6
 #define RGBLED_SPLIT { 7, 7 }
 #define RGBLED_NUM 14
 #define RGBLIGHT_LED_MAP { 6, 5, 4, 3, 2, 1, 0, 13, 12,11, 10, 9, 8, 7}
diff --git a/keyboards/ogre/ergo_split/ergo_split.c b/keyboards/ogre/ergo_split/ergo_split.c
deleted file mode 100644
index 0d83a5e8e4..0000000000
--- a/keyboards/ogre/ergo_split/ergo_split.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 ctrlshiftba
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ergo_split.h"
diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json
index 42cc158acf..84452270de 100644
--- a/keyboards/ogre/ergo_split/info.json
+++ b/keyboards/ogre/ergo_split/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D3"
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h
index 2dd38f77d0..f11b35919e 100644
--- a/keyboards/ok60/config.h
+++ b/keyboards/ok60/config.h
@@ -17,30 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ok60/info.json b/keyboards/ok60/info.json
index 08cb263a2e..e012d3b43c 100644
--- a/keyboards/ok60/info.json
+++ b/keyboards/ok60/info.json
@@ -8,10 +8,18 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"],
+    "rows": ["B5", "B4", "D7", "D6", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "levels": 5
   },
+  "ws2812": {
+    "pin": "F6"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["60_ansi", "60_iso", "60_hhkb"],
diff --git a/keyboards/ok60/ok60.c b/keyboards/ok60/ok60.c
deleted file mode 100644
index 052656205b..0000000000
--- a/keyboards/ok60/ok60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ok60.h"
diff --git a/keyboards/om60/config.h b/keyboards/om60/config.h
index 9af406eec5..16957f9a0a 100644
--- a/keyboards/om60/config.h
+++ b/keyboards/om60/config.h
@@ -34,9 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifndef RGBLED_NUM
   #define RGBLED_NUM 69
   #define RGBLIGHT_LED_MAP { \
diff --git a/keyboards/om60/info.json b/keyboards/om60/info.json
index c33231efe8..8eefadbb3c 100644
--- a/keyboards/om60/info.json
+++ b/keyboards/om60/info.json
@@ -13,6 +13,9 @@
       {"pin_a": "B4", "pin_b": "B5"}
     ]
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/om60/om60.c b/keyboards/om60/om60.c
deleted file mode 100644
index 9e66d6721c..0000000000
--- a/keyboards/om60/om60.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-Copyright 2022 jun10000
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "om60.h"
diff --git a/keyboards/omkbd/ergodash/ergodash.c b/keyboards/omkbd/ergodash/ergodash.c
deleted file mode 100644
index 51e6dbf08f..0000000000
--- a/keyboards/omkbd/ergodash/ergodash.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ergodash.h"
diff --git a/keyboards/omkbd/ergodash/ergodash.h b/keyboards/omkbd/ergodash/ergodash.h
deleted file mode 100644
index 8c8bd3cdc3..0000000000
--- a/keyboards/omkbd/ergodash/ergodash.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_omkbd_ergodash_rev1
-    #include "rev1.h"
-#endif // #ifdef KEYBOARD_ergodash_rev1
-
-#ifdef KEYBOARD_omkbd_ergodash_mini
-    #include "mini.h"
-#endif
diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h
index 6adcf7253c..c66f9ef044 100644
--- a/keyboards/omkbd/ergodash/mini/config.h
+++ b/keyboards/omkbd/ergodash/mini/config.h
@@ -18,14 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -37,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json
index 4b5bd3bb70..8020aec580 100644
--- a/keyboards/omkbd/ergodash/mini/info.json
+++ b/keyboards/omkbd/ergodash/mini/info.json
@@ -1,23 +1,99 @@
 {
-  "keyboard_name": "ErgoDash Mini",
-  "manufacturer": "Omkbd",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "1.0.0"
-  },
-  "backlight": {
-    "pin": "B6",
-    "levels": 7
-  },
-  "split": {
-    "soft_serial_pin": "D0"
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [{"label":"L00", "x":0, "y":1.375}, {"label":"L01", "x":1, "y":1.375}, {"label":"L02", "x":2, "y":1.125}, {"label":"L03", "x":3, "y":1}, {"label":"L04", "x":4, "y":1.125}, {"label":"L05", "x":5, "y":1.25}, {"label":"L06", "x":6, "y":1.75}, {"label":"R00", "x":11, "y":1.75}, {"label":"R01", "x":12, "y":1.25}, {"label":"R02", "x":13, "y":1.125}, {"label":"R03", "x":14, "y":1}, {"label":"R04", "x":15, "y":1.125}, {"label":"R05", "x":16, "y":1.375}, {"label":"R06", "x":17, "y":1.375}, {"label":"L10", "x":0, "y":2.375}, {"label":"L11", "x":1, "y":2.375}, {"label":"L12", "x":2, "y":2.125}, {"label":"L13", "x":3, "y":2}, {"label":"L14", "x":4, "y":2.125}, {"label":"L15", "x":5, "y":2.25}, {"label":"L16", "x":6, "y":2.75}, {"label":"R10", "x":11, "y":2.75}, {"label":"R11", "x":12, "y":2.25}, {"label":"R12", "x":13, "y":2.125}, {"label":"R13", "x":14, "y":2}, {"label":"R14", "x":15, "y":2.125}, {"label":"R15", "x":16, "y":2.375}, {"label":"R16", "x":17, "y":2.375}, {"label":"L20", "x":0, "y":3.375}, {"label":"L21", "x":1, "y":3.375}, {"label":"L22", "x":2, "y":3.125}, {"label":"L23", "x":3, "y":3}, {"label":"L24", "x":4, "y":3.125}, {"label":"L25", "x":5, "y":3.25}, {"label":"L26", "x":6.5, "y":4.25}, {"label":"R20", "x":10.5, "y":4.25}, {"label":"R21", "x":12, "y":3.25}, {"label":"R22", "x":13, "y":3.125}, {"label":"R23", "x":14, "y":3}, {"label":"R24", "x":15, "y":3.125}, {"label":"R25", "x":16, "y":3.375}, {"label":"R26", "x":17, "y":3.375}, {"label":"L30", "x":0, "y":4.375}, {"label":"L31", "x":1, "y":4.375}, {"label":"L32", "x":2, "y":4.125}, {"label":"L33", "x":3, "y":4}, {"label":"L34", "x":5.5, "y":5.25}, {"label":"L35", "x":6.5, "y":5.25}, {"label":"L36", "x":7.5, "y":4.25, "h":2}, {"label":"R30", "x":9.5, "y":4.25, "h":2}, {"label":"R31", "x":10.5, "y":5.25}, {"label":"R32", "x":11.5, "y":5.25}, {"label":"R33", "x":14, "y":4}, {"label":"R34", "x":15, "y":4.125}, {"label":"R35", "x":16, "y":4.375}, {"label":"R36", "x":17, "y":4.375}]
+    "keyboard_name": "ErgoDash Mini",
+    "manufacturer": "Omkbd",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 7
+    },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0.375},
+                {"x":1, "y":0.375},
+                {"x":2, "y":0.125},
+                {"x":3, "y":0},
+                {"x":4, "y":0.125},
+                {"x":5, "y":0.25},
+                {"x":6, "y":0.75},
+
+                {"x":11, "y":0.75},
+                {"x":12, "y":0.25},
+                {"x":13, "y":0.125},
+                {"x":14, "y":0},
+                {"x":15, "y":0.125},
+                {"x":16, "y":0.375},
+                {"x":17, "y":0.375},
+
+                {"x":0, "y":1.375},
+                {"x":1, "y":1.375},
+                {"x":2, "y":1.125},
+                {"x":3, "y":1},
+                {"x":4, "y":1.125},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.75},
+
+                {"x":11, "y":1.75},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.125},
+                {"x":14, "y":1},
+                {"x":15, "y":1.125},
+                {"x":16, "y":1.375},
+                {"x":17, "y":1.375},
+
+                {"x":0, "y":2.375},
+                {"x":1, "y":2.375},
+                {"x":2, "y":2.125},
+                {"x":3, "y":2},
+                {"x":4, "y":2.125},
+                {"x":5, "y":2.25},
+
+                {"x":6.5, "y":3.25},
+
+                {"x":10.5, "y":3.25},
+
+                {"x":12, "y":2.25},
+                {"x":13, "y":2.125},
+                {"x":14, "y":2},
+                {"x":15, "y":2.125},
+                {"x":16, "y":2.375},
+                {"x":17, "y":2.375},
+
+                {"x":0, "y":3.375},
+                {"x":1, "y":3.375},
+                {"x":2, "y":3.125},
+                {"x":3, "y":3},
+
+                {"x":5.5, "y":4.25},
+                {"x":6.5, "y":4.25},
+                {"x":7.5, "y":3.25, "h":2},
+
+                {"x":9.5, "y":3.25, "h":2},
+                {"x":10.5, "y":4.25},
+                {"x":11.5, "y":4.25},
+
+                {"x":14, "y":3},
+                {"x":15, "y":3.125},
+                {"x":16, "y":3.375},
+                {"x":17, "y":3.375}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/omkbd/ergodash/mini/mini.c b/keyboards/omkbd/ergodash/mini/mini.c
index 3aa9e74cce..e4a1c429f8 100644
--- a/keyboards/omkbd/ergodash/mini/mini.c
+++ b/keyboards/omkbd/ergodash/mini/mini.c
@@ -1,4 +1,4 @@
-#include "ergodash.h"
+#include "mini.h"
 
 #ifdef AUDIO_ENABLE
     float tone_startup[][2] = SONG(STARTUP_SOUND);
diff --git a/keyboards/omkbd/ergodash/mini/mini.h b/keyboards/omkbd/ergodash/mini/mini.h
index 4aca15775b..be69cce49b 100644
--- a/keyboards/omkbd/ergodash/mini/mini.h
+++ b/keyboards/omkbd/ergodash/mini/mini.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "ergodash.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h
index 21bd3d4f7b..03eea39fd6 100644
--- a/keyboards/omkbd/ergodash/rev1/config.h
+++ b/keyboards/omkbd/ergodash/rev1/config.h
@@ -18,14 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -37,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json
index d11b84b733..8e357b326b 100644
--- a/keyboards/omkbd/ergodash/rev1/info.json
+++ b/keyboards/omkbd/ergodash/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 7
@@ -15,363 +20,428 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT_4key": {
             "layout": [
-                {"y": 0.375, "x": 0.5, "label": "L00"},
-                {"y": 0.375, "x": 1.5, "label": "L01"},
-                {"y": 0.125, "x": 2.5, "label": "L02"},
-                {"y": 0, "x": 3.5, "label": "L03"},
-                {"y": 0.125, "x": 4.5, "label": "L04"},
-                {"y": 0.25, "x": 5.5, "label": "L05"},
-                {"y": 0.75, "x": 6.5, "label": "L06"},
-                {"y": 0.75, "x": 12, "label": "R00"},
-                {"y": 0.25, "x": 13, "label": "R01"},
-                {"y": 0.125, "x": 14, "label": "R02"},
-                {"y": 0, "x": 15, "label": "R03"},
-                {"y": 0.125, "x": 16, "label": "R04"},
-                {"y": 0.375, "x": 17, "label": "R05"},
-                {"y": 0.375, "x": 18, "label": "R06"},
-                {"y": 1.375, "x": 0.5, "label": "L10"},
-                {"y": 1.375, "x": 1.5, "label": "L11"},
-                {"y": 1.125, "x": 2.5, "label": "L12"},
-                {"y": 1, "x": 3.5, "label": "L13"},
-                {"y": 1.125, "x": 4.5, "label": "L14"},
-                {"y": 1.25, "x": 5.5, "label": "L15"},
-                {"y": 1.75, "x": 6.5, "label": "L16"},
-                {"y": 1.75, "x": 12, "label": "R10"},
-                {"y": 1.25, "x": 13, "label": "R11"},
-                {"y": 1.125, "x": 14, "label": "R12"},
-                {"y": 1, "x": 15, "label": "R13"},
-                {"y": 1.125, "x": 16, "label": "R14"},
-                {"y": 1.375, "x": 17, "label": "R15"},
-                {"y": 1.375, "x": 18, "label": "R16"},
-                {"y": 2.375, "x": 0.5, "label": "L20"},
-                {"y": 2.375, "x": 1.5, "label": "L21"},
-                {"y": 2.125, "x": 2.5, "label": "L22"},
-                {"y": 2, "x": 3.5, "label": "L23"},
-                {"y": 2.125, "x": 4.5, "label": "L24"},
-                {"y": 2.25, "x": 5.5, "label": "L25"},
-                {"y": 2.75, "x": 6.5, "label": "L26"},
-                {"y": 2.75, "x": 12, "label": "R20"},
-                {"y": 2.25, "x": 13, "label": "R21"},
-                {"y": 2.125, "x": 14, "label": "R22"},
-                {"y": 2, "x": 15, "label": "R23"},
-                {"y": 2.125, "x": 16, "label": "R24"},
-                {"y": 2.375, "x": 17, "label": "R25"},
-                {"y": 2.375, "x": 18, "label": "R26"},
-                {"y": 3.375, "x": 0.5, "label": "L30"},
-                {"y": 3.375, "x": 1.5, "label": "L31"},
-                {"y": 3.125, "x": 2.5, "label": "L32"},
-                {"y": 3, "x": 3.5, "label": "L33"},
-                {"y": 3.125, "x": 4.5, "label": "L34"},
-                {"y": 3.25, "x": 5.5, "label": "L35"},
-                {"y": 4, "x": 6.5, "label": "L36"},
-                {"y": 4, "x": 12, "label": "R30"},
-                {"y": 3.25, "x": 13, "label": "R31"},
-                {"y": 3.125, "x": 14, "label": "R32"},
-                {"y": 3, "x": 15, "label": "R33"},
-                {"y": 3.125, "x": 16, "label": "R34"},
-                {"y": 3.375, "x": 17, "label": "R35"},
-                {"y": 3.375, "x": 18, "label": "R36"},
-                {"y": 4.375, "x": 0.5, "label": "L40"},
-                {"y": 4.375, "x": 1.5, "label": "L41"},
-                {"y": 4.125, "x": 2.5, "label": "L42"},
-                {"y": 4, "x": 3.5, "label": "L43"},
-                {"y": 5, "x": 5.5, "label": "L44"},
-                {"y": 5, "x": 6.5, "label": "L45"},
-                {"h": 2, "y": 4, "x": 7.5, "label": "L46"},
-                {"h": 2, "y": 4, "x": 11, "label": "R40"},
-                {"y": 5, "x": 12, "label": "R41"},
-                {"y": 5, "x": 13, "label": "R42"},
-                {"y": 4, "x": 15, "label": "R43"},
-                {"y": 4.125, "x": 16, "label": "R44"},
-                {"y": 4.375, "x": 17, "label": "R45"},
-                {"y": 4.375, "x": 18, "label": "R46"}]
+                {"x": 0, "y": 0.375},
+                {"x": 1, "y": 0.375},
+                {"x": 2, "y": 0.125},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0.125},
+                {"x": 5, "y": 0.25},
+                {"x": 6, "y": 0.75},
+
+                {"x": 11.5, "y": 0.75},
+                {"x": 12.5, "y": 0.25},
+                {"x": 13.5, "y": 0.125},
+                {"x": 14.5, "y": 0},
+                {"x": 15.5, "y": 0.125},
+                {"x": 16.5, "y": 0.375},
+                {"x": 17.5, "y": 0.375},
+
+                {"x": 0, "y": 1.375},
+                {"x": 1, "y": 1.375},
+                {"x": 2, "y": 1.125},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1.125},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.75},
+
+                {"x": 11.5, "y": 1.75},
+                {"x": 12.5, "y": 1.25},
+                {"x": 13.5, "y": 1.125},
+                {"x": 14.5, "y": 1},
+                {"x": 15.5, "y": 1.125},
+                {"x": 16.5, "y": 1.375},
+                {"x": 17.5, "y": 1.375},
+
+                {"x": 0, "y": 2.375},
+                {"x": 1, "y": 2.375},
+                {"x": 2, "y": 2.125},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2.125},
+                {"x": 5, "y": 2.25},
+                {"x": 6, "y": 2.75},
+
+                {"x": 11.5, "y": 2.75},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.125},
+                {"x": 14.5, "y": 2},
+                {"x": 15.5, "y": 2.125},
+                {"x": 16.5, "y": 2.375},
+                {"x": 17.5, "y": 2.375},
+
+                {"x": 0, "y": 3.375},
+                {"x": 1, "y": 3.375},
+                {"x": 2, "y": 3.125},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3.125},
+                {"x": 5, "y": 3.25},
+                {"x": 6, "y": 4},
+
+                {"x": 11.5, "y": 4},
+                {"x": 12.5, "y": 3.25},
+                {"x": 13.5, "y": 3.125},
+                {"x": 14.5, "y": 3},
+                {"x": 15.5, "y": 3.125},
+                {"x": 16.5, "y": 3.375},
+                {"x": 17.5, "y": 3.375},
+
+                {"x": 0, "y": 4.375},
+                {"x": 1, "y": 4.375},
+                {"x": 2, "y": 4.125},
+                {"x": 3, "y": 4},
+
+                {"x": 5, "y": 5},
+                {"x": 6, "y": 5},
+                {"x": 7, "y": 4, "h": 2},
+
+                {"x": 10.5, "y": 4, "h": 2},
+                {"x": 11.5, "y": 5},
+                {"x": 12.5, "y": 5},
+
+                {"x": 14.5, "y": 4},
+                {"x": 15.5, "y": 4.125},
+                {"x": 16.5, "y": 4.375},
+                {"x": 17.5, "y": 4.375}
+            ]
         },
         "LAYOUT_4key_2u_inner": {
             "layout": [
-                {"y": 0.375, "x": 0.5, "label": "L00"},
-                {"y": 0.375, "x": 1.5, "label": "L01"},
-                {"y": 0.125, "x": 2.5, "label": "L02"},
-                {"y": 0, "x": 3.5, "label": "L03"},
-                {"y": 0.125, "x": 4.5, "label": "L04"},
-                {"y": 0.25, "x": 5.5, "label": "L05"},
-                {"y": 0.75, "x": 6.5, "label": "L06"},
-                {"y": 0.75, "x": 12, "label": "R00"},
-                {"y": 0.25, "x": 13, "label": "R01"},
-                {"y": 0.125, "x": 14, "label": "R02"},
-                {"y": 0, "x": 15, "label": "R03"},
-                {"y": 0.125, "x": 16, "label": "R04"},
-                {"y": 0.375, "x": 17, "label": "R05"},
-                {"y": 0.375, "x": 18, "label": "R06"},
-                {"y": 1.375, "x": 0.5, "label": "L10"},
-                {"y": 1.375, "x": 1.5, "label": "L11"},
-                {"y": 1.125, "x": 2.5, "label": "L12"},
-                {"y": 1, "x": 3.5, "label": "L13"},
-                {"y": 1.125, "x": 4.5, "label": "L14"},
-                {"y": 1.25, "x": 5.5, "label": "L15"},
-                {"y": 1.75, "x": 6.5, "label": "L16"},
-                {"y": 1.75, "x": 12, "label": "R10"},
-                {"y": 1.25, "x": 13, "label": "R11"},
-                {"y": 1.125, "x": 14, "label": "R12"},
-                {"y": 1, "x": 15, "label": "R13"},
-                {"y": 1.125, "x": 16, "label": "R14"},
-                {"y": 1.375, "x": 17, "label": "R15"},
-                {"y": 1.375, "x": 18, "label": "R16"},
-                {"y": 2.375, "x": 0.5, "label": "L20"},
-                {"y": 2.375, "x": 1.5, "label": "L21"},
-                {"y": 2.125, "x": 2.5, "label": "L22"},
-                {"y": 2, "x": 3.5, "label": "L23"},
-                {"y": 2.125, "x": 4.5, "label": "L24"},
-                {"y": 2.25, "x": 5.5, "label": "L25"},
-                {"y": 2.75, "x": 6.5, "label": "L26"},
-                {"y": 2.75, "x": 12, "label": "R20"},
-                {"y": 2.25, "x": 13, "label": "R21"},
-                {"y": 2.125, "x": 14, "label": "R22"},
-                {"y": 2, "x": 15, "label": "R23"},
-                {"y": 2.125, "x": 16, "label": "R24"},
-                {"y": 2.375, "x": 17, "label": "R25"},
-                {"y": 2.375, "x": 18, "label": "R26"},
-                {"y": 3.375, "x": 0.5, "label": "L30"},
-                {"y": 3.375, "x": 1.5, "label": "L31"},
-                {"y": 3.125, "x": 2.5, "label": "L32"},
-                {"y": 3, "x": 3.5, "label": "L33"},
-                {"y": 3.125, "x": 4.5, "label": "L34"},
-                {"y": 3.25, "x": 5.5, "label": "L35"},
-                {"y": 4, "x": 7.5, "label": "L36"},
-                {"y": 4, "x": 11, "label": "R30"},
-                {"y": 3.25, "x": 13, "label": "R31"},
-                {"y": 3.125, "x": 14, "label": "R32"},
-                {"y": 3, "x": 15, "label": "R33"},
-                {"y": 3.125, "x": 16, "label": "R34"},
-                {"y": 3.375, "x": 17, "label": "R35"},
-                {"y": 3.375, "x": 18, "label": "R36"},
-                {"y": 4.375, "x": 0.5, "label": "L40"},
-                {"y": 4.375, "x": 1.5, "label": "L41"},
-                {"y": 4.125, "x": 2.5, "label": "L42"},
-                {"y": 4, "x": 3.5, "label": "L43"},
-                {"y": 5, "x": 5.5, "label": "L44"},
-                {"h": 2, "y": 4, "x": 6.5, "label": "L45"},
-                {"y": 5, "x": 7.5, "label": "L46"},
-                {"y": 5, "x": 11, "label": "R40"},
-                {"h": 2, "y": 4, "x": 12, "label": "R41"},
-                {"y": 5, "x": 13, "label": "R42"},
-                {"y": 4, "x": 15, "label": "R43"},
-                {"y": 4.125, "x": 16, "label": "R44"},
-                {"y": 4.375, "x": 17, "label": "R45"},
-                {"y": 4.375, "x": 18, "label": "R46"}]
+                {"x": 0, "y": 0.375},
+                {"x": 1, "y": 0.375},
+                {"x": 2, "y": 0.125},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0.125},
+                {"x": 5, "y": 0.25},
+                {"x": 6, "y": 0.75},
+
+                {"x": 11.5, "y": 0.75},
+                {"x": 12.5, "y": 0.25},
+                {"x": 13.5, "y": 0.125},
+                {"x": 14.5, "y": 0},
+                {"x": 15.5, "y": 0.125},
+                {"x": 16.5, "y": 0.375},
+                {"x": 17.5, "y": 0.375},
+
+                {"x": 0, "y": 1.375},
+                {"x": 1, "y": 1.375},
+                {"x": 2, "y": 1.125},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1.125},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.75},
+
+                {"x": 11.5, "y": 1.75},
+                {"x": 12.5, "y": 1.25},
+                {"x": 13.5, "y": 1.125},
+                {"x": 14.5, "y": 1},
+                {"x": 15.5, "y": 1.125},
+                {"x": 16.5, "y": 1.375},
+                {"x": 17.5, "y": 1.375},
+
+                {"x": 0, "y": 2.375},
+                {"x": 1, "y": 2.375},
+                {"x": 2, "y": 2.125},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2.125},
+                {"x": 5, "y": 2.25},
+                {"x": 6, "y": 2.75},
+
+                {"x": 11.5, "y": 2.75},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.125},
+                {"x": 14.5, "y": 2},
+                {"x": 15.5, "y": 2.125},
+                {"x": 16.5, "y": 2.375},
+                {"x": 17.5, "y": 2.375},
+
+                {"x": 0, "y": 3.375},
+                {"x": 1, "y": 3.375},
+                {"x": 2, "y": 3.125},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3.125},
+                {"x": 5, "y": 3.25},
+
+                {"x": 7, "y": 4},
+
+                {"x": 10.5, "y": 4},
+
+                {"x": 12.5, "y": 3.25},
+                {"x": 13.5, "y": 3.125},
+                {"x": 14.5, "y": 3},
+                {"x": 15.5, "y": 3.125},
+                {"x": 16.5, "y": 3.375},
+                {"x": 17.5, "y": 3.375},
+
+                {"x": 0, "y": 4.375},
+                {"x": 1, "y": 4.375},
+                {"x": 2, "y": 4.125},
+                {"x": 3, "y": 4},
+
+                {"x": 5, "y": 5},
+                {"x": 6, "y": 4, "h": 2},
+                {"x": 7, "y": 5},
+
+                {"x": 10.5, "y": 5},
+                {"x": 11.5, "y": 4, "h": 2},
+                {"x": 12.5, "y": 5},
+
+                {"x": 14.5, "y": 4},
+                {"x": 15.5, "y": 4.125},
+                {"x": 16.5, "y": 4.375},
+                {"x": 17.5, "y": 4.375}
+            ]
         },
         "LAYOUT_3key_2us": {
             "layout": [
-                {"y": 0.375, "x": 0.5, "label": "L00"},
-                {"y": 0.375, "x": 1.5, "label": "L01"},
-                {"y": 0.125, "x": 2.5, "label": "L02"},
-                {"y": 0, "x": 3.5, "label": "L03"},
-                {"y": 0.125, "x": 4.5, "label": "L04"},
-                {"y": 0.25, "x": 5.5, "label": "L05"},
-                {"y": 0.75, "x": 6.5, "label": "L06"},
-                {"y": 0.75, "x": 12, "label": "R00"},
-                {"y": 0.25, "x": 13, "label": "R01"},
-                {"y": 0.125, "x": 14, "label": "R02"},
-                {"y": 0, "x": 15, "label": "R03"},
-                {"y": 0.125, "x": 16, "label": "R04"},
-                {"y": 0.375, "x": 17, "label": "R05"},
-                {"y": 0.375, "x": 18, "label": "R06"},
-                {"y": 1.375, "x": 0.5, "label": "L10"},
-                {"y": 1.375, "x": 1.5, "label": "L11"},
-                {"y": 1.125, "x": 2.5, "label": "L12"},
-                {"y": 1, "x": 3.5, "label": "L13"},
-                {"y": 1.125, "x": 4.5, "label": "L14"},
-                {"y": 1.25, "x": 5.5, "label": "L15"},
-                {"y": 1.75, "x": 6.5, "label": "L16"},
-                {"y": 1.75, "x": 12, "label": "R10"},
-                {"y": 1.25, "x": 13, "label": "R11"},
-                {"y": 1.125, "x": 14, "label": "R12"},
-                {"y": 1, "x": 15, "label": "R13"},
-                {"y": 1.125, "x": 16, "label": "R14"},
-                {"y": 1.375, "x": 17, "label": "R15"},
-                {"y": 1.375, "x": 18, "label": "R16"},
-                {"y": 2.375, "x": 0.5, "label": "L20"},
-                {"y": 2.375, "x": 1.5, "label": "L21"},
-                {"y": 2.125, "x": 2.5, "label": "L22"},
-                {"y": 2, "x": 3.5, "label": "L23"},
-                {"y": 2.125, "x": 4.5, "label": "L24"},
-                {"y": 2.25, "x": 5.5, "label": "L25"},
-                {"y": 2.75, "x": 6.5, "label": "L26"},
-                {"y": 2.75, "x": 12, "label": "R20"},
-                {"y": 2.25, "x": 13, "label": "R21"},
-                {"y": 2.125, "x": 14, "label": "R22"},
-                {"y": 2, "x": 15, "label": "R23"},
-                {"y": 2.125, "x": 16, "label": "R24"},
-                {"y": 2.375, "x": 17, "label": "R25"},
-                {"y": 2.375, "x": 18, "label": "R26"},
-                {"y": 3.375, "x": 0.5, "label": "L30"},
-                {"y": 3.375, "x": 1.5, "label": "L31"},
-                {"y": 3.125, "x": 2.5, "label": "L32"},
-                {"y": 3, "x": 3.5, "label": "L33"},
-                {"y": 3.125, "x": 4.5, "label": "L34"},
-                {"y": 3.25, "x": 5.5, "label": "L35"},
-                {"y": 3.25, "x": 13, "label": "R31"},
-                {"y": 3.125, "x": 14, "label": "R32"},
-                {"y": 3, "x": 15, "label": "R33"},
-                {"y": 3.125, "x": 16, "label": "R34"},
-                {"y": 3.375, "x": 17, "label": "R35"},
-                {"y": 3.375, "x": 18, "label": "R36"},
-                {"y": 4.375, "x": 0.5, "label": "L40"},
-                {"y": 4.375, "x": 1.5, "label": "L41"},
-                {"y": 4.125, "x": 2.5, "label": "L42"},
-                {"y": 4, "x": 3.5, "label": "L43"},
-                {"y": 5, "x": 5.5, "label": "L44"},
-                {"h": 2, "y": 4, "x": 6.5, "label": "L45"},
-                {"h": 2, "y": 4, "x": 7.5, "label": "L46"},
-                {"h": 2, "y": 4, "x": 11, "label": "R40"},
-                {"h": 2, "y": 4, "x": 12, "label": "R41"},
-                {"y": 5, "x": 13, "label": "R42"},
-                {"y": 4, "x": 15, "label": "R43"},
-                {"y": 4.125, "x": 16, "label": "R44"},
-                {"y": 4.375, "x": 17, "label": "R45"},
-                {"y": 4.375, "x": 18, "label": "R46"}]
+                {"x": 0, "y": 0.375},
+                {"x": 1, "y": 0.375},
+                {"x": 2, "y": 0.125},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0.125},
+                {"x": 5, "y": 0.25},
+                {"x": 6, "y": 0.75},
+
+                {"x": 11.5, "y": 0.75},
+                {"x": 12.5, "y": 0.25},
+                {"x": 13.5, "y": 0.125},
+                {"x": 14.5, "y": 0},
+                {"x": 15.5, "y": 0.125},
+                {"x": 16.5, "y": 0.375},
+                {"x": 17.5, "y": 0.375},
+
+                {"x": 0, "y": 1.375},
+                {"x": 1, "y": 1.375},
+                {"x": 2, "y": 1.125},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1.125},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.75},
+
+                {"x": 11.5, "y": 1.75},
+                {"x": 12.5, "y": 1.25},
+                {"x": 13.5, "y": 1.125},
+                {"x": 14.5, "y": 1},
+                {"x": 15.5, "y": 1.125},
+                {"x": 16.5, "y": 1.375},
+                {"x": 17.5, "y": 1.375},
+
+                {"x": 0, "y": 2.375},
+                {"x": 1, "y": 2.375},
+                {"x": 2, "y": 2.125},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2.125},
+                {"x": 5, "y": 2.25},
+                {"x": 6, "y": 2.75},
+
+                {"x": 11.5, "y": 2.75},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.125},
+                {"x": 14.5, "y": 2},
+                {"x": 15.5, "y": 2.125},
+                {"x": 16.5, "y": 2.375},
+                {"x": 17.5, "y": 2.375},
+
+                {"x": 0, "y": 3.375},
+                {"x": 1, "y": 3.375},
+                {"x": 2, "y": 3.125},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3.125},
+                {"x": 5, "y": 3.25},
+
+                {"x": 12.5, "y": 3.25},
+                {"x": 13.5, "y": 3.125},
+                {"x": 14.5, "y": 3},
+                {"x": 15.5, "y": 3.125},
+                {"x": 16.5, "y": 3.375},
+                {"x": 17.5, "y": 3.375},
+
+                {"x": 0, "y": 4.375},
+                {"x": 1, "y": 4.375},
+                {"x": 2, "y": 4.125},
+                {"x": 3, "y": 4},
+
+                {"x": 5, "y": 5},
+                {"x": 6, "y": 4, "h": 2},
+                {"x": 7, "y": 4, "h": 2},
+
+                {"x": 10.5, "y": 4, "h": 2},
+                {"x": 11.5, "y": 4, "h": 2},
+                {"x": 12.5, "y": 5},
+
+                {"x": 14.5, "y": 4},
+                {"x": 15.5, "y": 4.125},
+                {"x": 16.5, "y": 4.375},
+                {"x": 17.5, "y": 4.375}
+            ]
         },
         "LAYOUT_3key_1us": {
             "layout": [
-                {"y": 0.375, "x": 0.5, "label": "L00"},
-                {"y": 0.375, "x": 1.5, "label": "L01"},
-                {"y": 0.125, "x": 2.5, "label": "L02"},
-                {"y": 0, "x": 3.5, "label": "L03"},
-                {"y": 0.125, "x": 4.5, "label": "L04"},
-                {"y": 0.25, "x": 5.5, "label": "L05"},
-                {"y": 0.75, "x": 6.5, "label": "L06"},
-                {"y": 0.75, "x": 12, "label": "R00"},
-                {"y": 0.25, "x": 13, "label": "R01"},
-                {"y": 0.125, "x": 14, "label": "R02"},
-                {"y": 0, "x": 15, "label": "R03"},
-                {"y": 0.125, "x": 16, "label": "R04"},
-                {"y": 0.375, "x": 17, "label": "R05"},
-                {"y": 0.375, "x": 18, "label": "R06"},
-                {"y": 1.375, "x": 0.5, "label": "L10"},
-                {"y": 1.375, "x": 1.5, "label": "L11"},
-                {"y": 1.125, "x": 2.5, "label": "L12"},
-                {"y": 1, "x": 3.5, "label": "L13"},
-                {"y": 1.125, "x": 4.5, "label": "L14"},
-                {"y": 1.25, "x": 5.5, "label": "L15"},
-                {"y": 1.75, "x": 6.5, "label": "L16"},
-                {"y": 1.75, "x": 12, "label": "R10"},
-                {"y": 1.25, "x": 13, "label": "R11"},
-                {"y": 1.125, "x": 14, "label": "R12"},
-                {"y": 1, "x": 15, "label": "R13"},
-                {"y": 1.125, "x": 16, "label": "R14"},
-                {"y": 1.375, "x": 17, "label": "R15"},
-                {"y": 1.375, "x": 18, "label": "R16"},
-                {"y": 2.375, "x": 0.5, "label": "L20"},
-                {"y": 2.375, "x": 1.5, "label": "L21"},
-                {"y": 2.125, "x": 2.5, "label": "L22"},
-                {"y": 2, "x": 3.5, "label": "L23"},
-                {"y": 2.125, "x": 4.5, "label": "L24"},
-                {"y": 2.25, "x": 5.5, "label": "L25"},
-                {"y": 2.75, "x": 6.5, "label": "L26"},
-                {"y": 2.75, "x": 12, "label": "R20"},
-                {"y": 2.25, "x": 13, "label": "R21"},
-                {"y": 2.125, "x": 14, "label": "R22"},
-                {"y": 2, "x": 15, "label": "R23"},
-                {"y": 2.125, "x": 16, "label": "R24"},
-                {"y": 2.375, "x": 17, "label": "R25"},
-                {"y": 2.375, "x": 18, "label": "R26"},
-                {"y": 3.375, "x": 0.5, "label": "L30"},
-                {"y": 3.375, "x": 1.5, "label": "L31"},
-                {"y": 3.125, "x": 2.5, "label": "L32"},
-                {"y": 3, "x": 3.5, "label": "L33"},
-                {"y": 3.125, "x": 4.5, "label": "L34"},
-                {"y": 3.25, "x": 5.5, "label": "L35"},
-                {"y": 4, "x": 6.5, "label": "L36"},
-                {"y": 4, "x": 12, "label": "R30"},
-                {"y": 3.25, "x": 13, "label": "R31"},
-                {"y": 3.125, "x": 14, "label": "R32"},
-                {"y": 3, "x": 15, "label": "R33"},
-                {"y": 3.125, "x": 16, "label": "R34"},
-                {"y": 3.375, "x": 17, "label": "R35"},
-                {"y": 3.375, "x": 18, "label": "R36"},
-                {"y": 4.375, "x": 0.5, "label": "L40"},
-                {"y": 4.375, "x": 1.5, "label": "L41"},
-                {"y": 4.125, "x": 2.5, "label": "L42"},
-                {"y": 4, "x": 3.5, "label": "L43"},
-                {"y": 5, "x": 5.5, "label": "L44"},
-                {"y": 5, "x": 6.5, "label": "L45"},
-                {"y": 5, "x": 12, "label": "R41"},
-                {"y": 5, "x": 13, "label": "R42"},
-                {"y": 4, "x": 15, "label": "R43"},
-                {"y": 4.125, "x": 16, "label": "R44"},
-                {"y": 4.375, "x": 17, "label": "R45"},
-                {"y": 4.375, "x": 18, "label": "R46"}]
+                {"x": 0, "y": 0.375},
+                {"x": 1, "y": 0.375},
+                {"x": 2, "y": 0.125},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0.125},
+                {"x": 5, "y": 0.25},
+                {"x": 6, "y": 0.75},
+
+                {"x": 11.5, "y": 0.75},
+                {"x": 12.5, "y": 0.25},
+                {"x": 13.5, "y": 0.125},
+                {"x": 14.5, "y": 0},
+                {"x": 15.5, "y": 0.125},
+                {"x": 16.5, "y": 0.375},
+                {"x": 17.5, "y": 0.375},
+
+                {"x": 0, "y": 1.375},
+                {"x": 1, "y": 1.375},
+                {"x": 2, "y": 1.125},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1.125},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.75},
+
+                {"x": 11.5, "y": 1.75},
+                {"x": 12.5, "y": 1.25},
+                {"x": 13.5, "y": 1.125},
+                {"x": 14.5, "y": 1},
+                {"x": 15.5, "y": 1.125},
+                {"x": 16.5, "y": 1.375},
+                {"x": 17.5, "y": 1.375},
+
+                {"x": 0, "y": 2.375},
+                {"x": 1, "y": 2.375},
+                {"x": 2, "y": 2.125},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2.125},
+                {"x": 5, "y": 2.25},
+                {"x": 6, "y": 2.75},
+
+                {"x": 11.5, "y": 2.75},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.125},
+                {"x": 14.5, "y": 2},
+                {"x": 15.5, "y": 2.125},
+                {"x": 16.5, "y": 2.375},
+                {"x": 17.5, "y": 2.375},
+
+                {"x": 0, "y": 3.375},
+                {"x": 1, "y": 3.375},
+                {"x": 2, "y": 3.125},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3.125},
+                {"x": 5, "y": 3.25},
+                {"x": 6, "y": 4},
+
+                {"x": 11.5, "y": 4},
+                {"x": 12.5, "y": 3.25},
+                {"x": 13.5, "y": 3.125},
+                {"x": 14.5, "y": 3},
+                {"x": 15.5, "y": 3.125},
+                {"x": 16.5, "y": 3.375},
+                {"x": 17.5, "y": 3.375},
+
+                {"x": 0, "y": 4.375},
+                {"x": 1, "y": 4.375},
+                {"x": 2, "y": 4.125},
+                {"x": 3, "y": 4},
+
+                {"x": 5, "y": 5},
+                {"x": 6, "y": 5},
+
+                {"x": 11.5, "y": 5},
+                {"x": 12.5, "y": 5},
+
+                {"x": 14.5, "y": 4},
+                {"x": 15.5, "y": 4.125},
+                {"x": 16.5, "y": 4.375},
+                {"x": 17.5, "y": 4.375}
+            ]
         },
         "LAYOUT_2key": {
             "layout": [
-                {"y": 0.375, "x": 0.5, "label": "L00"},
-                {"y": 0.375, "x": 1.5, "label": "L01"},
-                {"y": 0.125, "x": 2.5, "label": "L02"},
-                {"y": 0, "x": 3.5, "label": "L03"},
-                {"y": 0.125, "x": 4.5, "label": "L04"},
-                {"y": 0.25, "x": 5.5, "label": "L05"},
-                {"y": 0.75, "x": 6.5, "label": "L06"},
-                {"y": 0.75, "x": 12, "label": "R00"},
-                {"y": 0.25, "x": 13, "label": "R01"},
-                {"y": 0.125, "x": 14, "label": "R02"},
-                {"y": 0, "x": 15, "label": "R03"},
-                {"y": 0.125, "x": 16, "label": "R04"},
-                {"y": 0.375, "x": 17, "label": "R05"},
-                {"y": 0.375, "x": 18, "label": "R06"},
-                {"y": 1.375, "x": 0.5, "label": "L10"},
-                {"y": 1.375, "x": 1.5, "label": "L11"},
-                {"y": 1.125, "x": 2.5, "label": "L12"},
-                {"y": 1, "x": 3.5, "label": "L13"},
-                {"y": 1.125, "x": 4.5, "label": "L14"},
-                {"y": 1.25, "x": 5.5, "label": "L15"},
-                {"y": 1.75, "x": 6.5, "label": "L16"},
-                {"y": 1.75, "x": 12, "label": "R10"},
-                {"y": 1.25, "x": 13, "label": "R11"},
-                {"y": 1.125, "x": 14, "label": "R12"},
-                {"y": 1, "x": 15, "label": "R13"},
-                {"y": 1.125, "x": 16, "label": "R14"},
-                {"y": 1.375, "x": 17, "label": "R15"},
-                {"y": 1.375, "x": 18, "label": "R16"},
-                {"y": 2.375, "x": 0.5, "label": "L20"},
-                {"y": 2.375, "x": 1.5, "label": "L21"},
-                {"y": 2.125, "x": 2.5, "label": "L22"},
-                {"y": 2, "x": 3.5, "label": "L23"},
-                {"y": 2.125, "x": 4.5, "label": "L24"},
-                {"y": 2.25, "x": 5.5, "label": "L25"},
-                {"y": 2.75, "x": 6.5, "label": "L26"},
-                {"y": 2.75, "x": 12, "label": "R20"},
-                {"y": 2.25, "x": 13, "label": "R21"},
-                {"y": 2.125, "x": 14, "label": "R22"},
-                {"y": 2, "x": 15, "label": "R23"},
-                {"y": 2.125, "x": 16, "label": "R24"},
-                {"y": 2.375, "x": 17, "label": "R25"},
-                {"y": 2.375, "x": 18, "label": "R26"},
-                {"y": 3.375, "x": 0.5, "label": "L30"},
-                {"y": 3.375, "x": 1.5, "label": "L31"},
-                {"y": 3.125, "x": 2.5, "label": "L32"},
-                {"y": 3, "x": 3.5, "label": "L33"},
-                {"y": 3.125, "x": 4.5, "label": "L34"},
-                {"y": 3.25, "x": 5.5, "label": "L35"},
-                {"y": 3.25, "x": 13, "label": "R31"},
-                {"y": 3.125, "x": 14, "label": "R32"},
-                {"y": 3, "x": 15, "label": "R33"},
-                {"y": 3.125, "x": 16, "label": "R34"},
-                {"y": 3.375, "x": 17, "label": "R35"},
-                {"y": 3.375, "x": 18, "label": "R36"},
-                {"y": 4.375, "x": 0.5, "label": "L40"},
-                {"y": 4.375, "x": 1.5, "label": "L41"},
-                {"y": 4.125, "x": 2.5, "label": "L42"},
-                {"y": 4, "x": 3.5, "label": "L43"},
-                {"y": 5, "x": 5.5, "label": "L44"},
-                {"h": 2, "y": 4, "x": 6.5, "label": "L45"},
-                {"h": 2, "y": 4, "x": 12, "label": "R41"},
-                {"y": 5, "x": 13, "label": "R42"},
-                {"y": 4, "x": 15, "label": "R43"},
-                {"y": 4.125, "x": 16, "label": "R44"},
-                {"y": 4.375, "x": 17, "label": "R45"},
-                {"y": 4.375, "x": 18, "label": "R46"}]
+                {"x": 0, "y": 0.375},
+                {"x": 1, "y": 0.375},
+                {"x": 2, "y": 0.125},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0.125},
+                {"x": 5, "y": 0.25},
+                {"x": 6, "y": 0.75},
+
+                {"x": 11.5, "y": 0.75},
+                {"x": 12.5, "y": 0.25},
+                {"x": 13.5, "y": 0.125},
+                {"x": 14.5, "y": 0},
+                {"x": 15.5, "y": 0.125},
+                {"x": 16.5, "y": 0.375},
+                {"x": 17.5, "y": 0.375},
+
+                {"x": 0, "y": 1.375},
+                {"x": 1, "y": 1.375},
+                {"x": 2, "y": 1.125},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1.125},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.75},
+
+                {"x": 11.5, "y": 1.75},
+                {"x": 12.5, "y": 1.25},
+                {"x": 13.5, "y": 1.125},
+                {"x": 14.5, "y": 1},
+                {"x": 15.5, "y": 1.125},
+                {"x": 16.5, "y": 1.375},
+                {"x": 17.5, "y": 1.375},
+
+                {"x": 0, "y": 2.375},
+                {"x": 1, "y": 2.375},
+                {"x": 2, "y": 2.125},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2.125},
+                {"x": 5, "y": 2.25},
+                {"x": 6, "y": 2.75},
+
+                {"x": 11.5, "y": 2.75},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.125},
+                {"x": 14.5, "y": 2},
+                {"x": 15.5, "y": 2.125},
+                {"x": 16.5, "y": 2.375},
+                {"x": 17.5, "y": 2.375},
+
+                {"x": 0, "y": 3.375},
+                {"x": 1, "y": 3.375},
+                {"x": 2, "y": 3.125},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3.125},
+                {"x": 5, "y": 3.25},
+
+                {"x": 12.5, "y": 3.25},
+                {"x": 13.5, "y": 3.125},
+                {"x": 14.5, "y": 3},
+                {"x": 15.5, "y": 3.125},
+                {"x": 16.5, "y": 3.375},
+                {"x": 17.5, "y": 3.375},
+
+                {"x": 0, "y": 4.375},
+                {"x": 1, "y": 4.375},
+                {"x": 2, "y": 4.125},
+                {"x": 3, "y": 4},
+
+                {"x": 5, "y": 5},
+                {"x": 6, "y": 4, "h": 2},
+
+                {"x": 11.5, "y": 4, "h": 2},
+                {"x": 12.5, "y": 5},
+
+                {"x": 14.5, "y": 4},
+                {"x": 15.5, "y": 4.125},
+                {"x": 16.5, "y": 4.375},
+                {"x": 17.5, "y": 4.375}
+            ]
         }
     }
 }
diff --git a/keyboards/omkbd/ergodash/rev1/rev1.c b/keyboards/omkbd/ergodash/rev1/rev1.c
index 00f81cae11..eb794f9ac7 100644
--- a/keyboards/omkbd/ergodash/rev1/rev1.c
+++ b/keyboards/omkbd/ergodash/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "ergodash.h"
+#include "rev1.h"
 
 #ifdef AUDIO_ENABLE
     float tone_startup[][2] = SONG(STARTUP_SOUND);
diff --git a/keyboards/omkbd/ergodash/rev1/rev1.h b/keyboards/omkbd/ergodash/rev1/rev1.h
index 7f094534cc..4a1ee020e7 100644
--- a/keyboards/omkbd/ergodash/rev1/rev1.h
+++ b/keyboards/omkbd/ergodash/rev1/rev1.h
@@ -1,17 +1,7 @@
 #pragma once
 
-#include "ergodash.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
 #define XXX KC_NO
 
 #ifndef FLIP_HALF
diff --git a/keyboards/omkbd/runner3680/3x6/3x6.c b/keyboards/omkbd/runner3680/3x6/3x6.c
deleted file mode 100644
index 1f375c3ecb..0000000000
--- a/keyboards/omkbd/runner3680/3x6/3x6.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "3x6.h"
diff --git a/keyboards/omkbd/runner3680/3x6/3x6.h b/keyboards/omkbd/runner3680/3x6/3x6.h
index c197c6de2c..3d9fd779d8 100644
--- a/keyboards/omkbd/runner3680/3x6/3x6.h
+++ b/keyboards/omkbd/runner3680/3x6/3x6.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "runner3680.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h
index 094caf7e7c..b54416a389 100644
--- a/keyboards/omkbd/runner3680/3x6/config.h
+++ b/keyboards/omkbd/runner3680/3x6/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 ,B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -32,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json
index 966b9018c6..4cd318a2ef 100644
--- a/keyboards/omkbd/runner3680/3x6/info.json
+++ b/keyboards/omkbd/runner3680/3x6/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/omkbd/runner3680/3x7/3x7.c b/keyboards/omkbd/runner3680/3x7/3x7.c
deleted file mode 100644
index 5246953b58..0000000000
--- a/keyboards/omkbd/runner3680/3x7/3x7.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "3x7.h"
diff --git a/keyboards/omkbd/runner3680/3x7/3x7.h b/keyboards/omkbd/runner3680/3x7/3x7.h
index 2e07bc3b35..db11b19c52 100644
--- a/keyboards/omkbd/runner3680/3x7/3x7.h
+++ b/keyboards/omkbd/runner3680/3x7/3x7.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "runner3680.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h
index 45b8ea2c5e..c70baa156f 100644
--- a/keyboards/omkbd/runner3680/3x7/config.h
+++ b/keyboards/omkbd/runner3680/3x7/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2 ,B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -32,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json
index 8e3e715c67..aec7fbcbef 100644
--- a/keyboards/omkbd/runner3680/3x7/info.json
+++ b/keyboards/omkbd/runner3680/3x7/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/omkbd/runner3680/3x8/3x8.c b/keyboards/omkbd/runner3680/3x8/3x8.c
deleted file mode 100644
index 8ea77001c5..0000000000
--- a/keyboards/omkbd/runner3680/3x8/3x8.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "3x8.h"
diff --git a/keyboards/omkbd/runner3680/3x8/3x8.h b/keyboards/omkbd/runner3680/3x8/3x8.h
index c5856d0034..cd3b81d973 100644
--- a/keyboards/omkbd/runner3680/3x8/3x8.h
+++ b/keyboards/omkbd/runner3680/3x8/3x8.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "runner3680.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h
index 3c2903c8d1..41740c62e4 100644
--- a/keyboards/omkbd/runner3680/3x8/config.h
+++ b/keyboards/omkbd/runner3680/3x8/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 ,B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -32,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json
index 1954b6daec..ccf59c180b 100644
--- a/keyboards/omkbd/runner3680/3x8/info.json
+++ b/keyboards/omkbd/runner3680/3x8/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/omkbd/runner3680/4x6/4x6.c b/keyboards/omkbd/runner3680/4x6/4x6.c
deleted file mode 100644
index 5e68c1a9fa..0000000000
--- a/keyboards/omkbd/runner3680/4x6/4x6.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x6.h"
diff --git a/keyboards/omkbd/runner3680/4x6/4x6.h b/keyboards/omkbd/runner3680/4x6/4x6.h
index dfc3a977b7..26bcca6de5 100644
--- a/keyboards/omkbd/runner3680/4x6/4x6.h
+++ b/keyboards/omkbd/runner3680/4x6/4x6.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "runner3680.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h
index 27c831a8c8..41740c62e4 100644
--- a/keyboards/omkbd/runner3680/4x6/config.h
+++ b/keyboards/omkbd/runner3680/4x6/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 ,B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -32,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json
index 9e3afe60f3..f2433c99b6 100644
--- a/keyboards/omkbd/runner3680/4x6/info.json
+++ b/keyboards/omkbd/runner3680/4x6/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/omkbd/runner3680/4x7/4x7.c b/keyboards/omkbd/runner3680/4x7/4x7.c
deleted file mode 100644
index 568fc2dacd..0000000000
--- a/keyboards/omkbd/runner3680/4x7/4x7.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x7.h"
diff --git a/keyboards/omkbd/runner3680/4x7/4x7.h b/keyboards/omkbd/runner3680/4x7/4x7.h
index 7bd43e1114..50fbe3a5ce 100644
--- a/keyboards/omkbd/runner3680/4x7/4x7.h
+++ b/keyboards/omkbd/runner3680/4x7/4x7.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "runner3680.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h
index db7591bc1b..03b4919378 100644
--- a/keyboards/omkbd/runner3680/4x7/config.h
+++ b/keyboards/omkbd/runner3680/4x7/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2 ,B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -32,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json
index 1e543d9527..17af0b601e 100644
--- a/keyboards/omkbd/runner3680/4x7/info.json
+++ b/keyboards/omkbd/runner3680/4x7/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/omkbd/runner3680/4x8/4x8.c b/keyboards/omkbd/runner3680/4x8/4x8.c
deleted file mode 100644
index 2667548078..0000000000
--- a/keyboards/omkbd/runner3680/4x8/4x8.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x8.h"
diff --git a/keyboards/omkbd/runner3680/4x8/4x8.h b/keyboards/omkbd/runner3680/4x8/4x8.h
index bc95b439b0..08fed12164 100644
--- a/keyboards/omkbd/runner3680/4x8/4x8.h
+++ b/keyboards/omkbd/runner3680/4x8/4x8.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "runner3680.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h
index 27ffd994bc..d3f8800e34 100644
--- a/keyboards/omkbd/runner3680/4x8/config.h
+++ b/keyboards/omkbd/runner3680/4x8/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 ,B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -32,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json
index 3ddd4e5791..f8fb9fa02c 100644
--- a/keyboards/omkbd/runner3680/4x8/info.json
+++ b/keyboards/omkbd/runner3680/4x8/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/omkbd/runner3680/5x6/5x6.c b/keyboards/omkbd/runner3680/5x6/5x6.c
deleted file mode 100644
index 0e9d5481c4..0000000000
--- a/keyboards/omkbd/runner3680/5x6/5x6.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "5x6.h"
diff --git a/keyboards/omkbd/runner3680/5x6/5x6.h b/keyboards/omkbd/runner3680/5x6/5x6.h
index 5a6e70c209..8047894606 100644
--- a/keyboards/omkbd/runner3680/5x6/5x6.h
+++ b/keyboards/omkbd/runner3680/5x6/5x6.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "runner3680.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h
index 71d98be2c8..8dbc8175aa 100644
--- a/keyboards/omkbd/runner3680/5x6/config.h
+++ b/keyboards/omkbd/runner3680/5x6/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 ,B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -32,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json
index be646896fb..dc9aa6f7f9 100644
--- a/keyboards/omkbd/runner3680/5x6/info.json
+++ b/keyboards/omkbd/runner3680/5x6/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
index afceac0a89..756f90db4b 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
+++ b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "runner3680.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h
index 30ef01e8cd..6c1d08fe32 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 ,B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -32,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #ifdef RGBLIGHT_ENABLE
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json
index 1e8bd452f3..fa4f30bd7e 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json
@@ -8,9 +8,20 @@
         "pid": "0x5658",
         "device_version": "0.0.5"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/rules.mk b/keyboards/omkbd/runner3680/5x6_5x8/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/rules.mk
+++ b/keyboards/omkbd/runner3680/5x6_5x8/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/omkbd/runner3680/5x7/5x7.c b/keyboards/omkbd/runner3680/5x7/5x7.c
deleted file mode 100644
index aae28e450c..0000000000
--- a/keyboards/omkbd/runner3680/5x7/5x7.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "5x7.h"
diff --git a/keyboards/omkbd/runner3680/5x7/5x7.h b/keyboards/omkbd/runner3680/5x7/5x7.h
index 451ecf6cd4..1fe3397c97 100644
--- a/keyboards/omkbd/runner3680/5x7/5x7.h
+++ b/keyboards/omkbd/runner3680/5x7/5x7.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "runner3680.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h
index 839bb063a8..f7457e18b4 100644
--- a/keyboards/omkbd/runner3680/5x7/config.h
+++ b/keyboards/omkbd/runner3680/5x7/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2 ,B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -32,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json
index 8eaccb2643..c7cc414c5d 100644
--- a/keyboards/omkbd/runner3680/5x7/info.json
+++ b/keyboards/omkbd/runner3680/5x7/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/omkbd/runner3680/5x8/5x8.c b/keyboards/omkbd/runner3680/5x8/5x8.c
deleted file mode 100644
index 3958702572..0000000000
--- a/keyboards/omkbd/runner3680/5x8/5x8.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "5x8.h"
diff --git a/keyboards/omkbd/runner3680/5x8/5x8.h b/keyboards/omkbd/runner3680/5x8/5x8.h
index de53a0eb29..b21b14259d 100644
--- a/keyboards/omkbd/runner3680/5x8/5x8.h
+++ b/keyboards/omkbd/runner3680/5x8/5x8.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "runner3680.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h
index 3d7110b306..193767245e 100644
--- a/keyboards/omkbd/runner3680/5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x8/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 ,B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 120
 
@@ -32,7 +25,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json
index 4ffa9576a5..5b4f3ad5cd 100644
--- a/keyboards/omkbd/runner3680/5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x8/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0000",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/omkbd/runner3680/runner3680.c b/keyboards/omkbd/runner3680/runner3680.c
deleted file mode 100644
index 7d8362363b..0000000000
--- a/keyboards/omkbd/runner3680/runner3680.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "runner3680.h"
diff --git a/keyboards/omkbd/runner3680/runner3680.h b/keyboards/omkbd/runner3680/runner3680.h
deleted file mode 100644
index 59afecfcfa..0000000000
--- a/keyboards/omkbd/runner3680/runner3680.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_omkbd_runner3680_5x8
-  #include "5x8.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_5x7
-  #include "5x7.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_5x6
-  #include "5x6.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_5x6_5x8
-  #include "5x6_5x8.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_4x8
-  #include "4x8.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_4x7
-  #include "4x7.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_4x6
-  #include "4x6.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_3x8
-  #include "3x8.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_3x7
-  #include "3x7.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_3x6
-  #include "3x6.h"
-#endif
diff --git a/keyboards/omnikeyish/config.h b/keyboards/omnikeyish/config.h
index cc80606a97..daacf8f8a6 100644
--- a/keyboards/omnikeyish/config.h
+++ b/keyboards/omnikeyish/config.h
@@ -23,23 +23,6 @@
 /* force n-key rollover*/
 #define FORCE_NKRO
 
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
-
 #define DYNAMIC_MACRO_COUNT 12
 #define DYNAMIC_MACRO_SIZE 48
 #define DYNAMIC_MACRO_EEPROM_STORAGE
diff --git a/keyboards/omnikeyish/dynamic_macro.c b/keyboards/omnikeyish/dynamic_macro.c
index 9dd0340099..b990a09a13 100644
--- a/keyboards/omnikeyish/dynamic_macro.c
+++ b/keyboards/omnikeyish/dynamic_macro.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "omnikeyish.h"
 #include <string.h>
 
 dynamic_macro_t dynamic_macros[DYNAMIC_MACRO_COUNT];
diff --git a/keyboards/onekeyco/dango40/config.h b/keyboards/onekeyco/dango40/config.h
index 70eb0ad47f..b7488fcb75 100644
--- a/keyboards/onekeyco/dango40/config.h
+++ b/keyboards/onekeyco/dango40/config.h
@@ -17,14 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { F4, F1, F0, C6 }
-#define MATRIX_COL_PINS { F7, F6, F5, D3, D5, D4, D6, D7, B4, B5, B6, C7, B0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
\ No newline at end of file
diff --git a/keyboards/onekeyco/dango40/dango40.c b/keyboards/onekeyco/dango40/dango40.c
index 8ca77545bf..2df82b0aa1 100644
--- a/keyboards/onekeyco/dango40/dango40.c
+++ b/keyboards/onekeyco/dango40/dango40.c
@@ -15,13 +15,3 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "dango40.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (clockwise) {
-        tap_code_delay(KC_VOLU, 10);
-    } else {
-        tap_code_delay(KC_VOLD, 10);
-    }
-    return true;
-} 
diff --git a/keyboards/onekeyco/dango40/info.json b/keyboards/onekeyco/dango40/info.json
index 2083651634..6081e8d72f 100644
--- a/keyboards/onekeyco/dango40/info.json
+++ b/keyboards/onekeyco/dango40/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE9B9",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C7", "B0"],
+        "rows": ["F4", "F1", "F0", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D1"}
diff --git a/keyboards/opendeck/32/info.json b/keyboards/opendeck/32/info.json
index 8e22d925b1..137a988c6d 100644
--- a/keyboards/opendeck/32/info.json
+++ b/keyboards/opendeck/32/info.json
@@ -5,46 +5,5 @@
         "vid": "0x4345",
         "pid": "0x2EC0",
         "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x8": {
-            "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-
-                { "x":0, "y":1 },
-                { "x":1, "y":1 },
-                { "x":2, "y":1 },
-                { "x":3, "y":1 },
-                { "x":4, "y":1 },
-                { "x":5, "y":1 },
-                { "x":6, "y":1 },
-                { "x":7, "y":1 },
-
-                { "x":0, "y":2 },
-                { "x":1, "y":2 },
-                { "x":2, "y":2 },
-                { "x":3, "y":2 },
-                { "x":4, "y":2 },
-                { "x":5, "y":2 },
-                { "x":6, "y":2 },
-                { "x":7, "y":2 },
-
-                { "x":0, "y":3 },
-                { "x":1, "y":3 },
-                { "x":2, "y":3 },
-                { "x":3, "y":3 },
-                { "x":4, "y":3 },
-                { "x":5, "y":3 },
-                { "x":6, "y":3 },
-                { "x":7, "y":3 }
-            ]
-        }
     }
 }
diff --git a/keyboards/opendeck/32/rev1/config.h b/keyboards/opendeck/32/rev1/config.h
index 356bc42571..fbea082c78 100644
--- a/keyboards/opendeck/32/rev1/config.h
+++ b/keyboards/opendeck/32/rev1/config.h
@@ -15,14 +15,6 @@
  */
 #pragma once
 
-
-// Key matrix (TtB, LtR)
-#define MATRIX_COL_PINS \
-    { B4, D7, D6, D4, F7, F6, F5, F4 }
-#define MATRIX_ROW_PINS \
-    { C7, C6, B6, B5 }
-#define DIODE_DIRECTION COL2ROW
-
 // RGB matrix
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_COUNT 1
diff --git a/keyboards/opendeck/32/rev1/info.json b/keyboards/opendeck/32/rev1/info.json
index 042c41f34d..e2491c8ef1 100644
--- a/keyboards/opendeck/32/rev1/info.json
+++ b/keyboards/opendeck/32/rev1/info.json
@@ -1,4 +1,53 @@
 {
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D6", "D4", "F7", "F6", "F5", "F4"],
+        "rows": ["C7", "C6", "B6", "B5"]
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_ortho_4x8": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3}
+            ]
+        }
+    }
 }
diff --git a/keyboards/opendeck/32/rev1/rev1.h b/keyboards/opendeck/32/rev1/rev1.h
index 9c208df8a8..69777d95ab 100644
--- a/keyboards/opendeck/32/rev1/rev1.h
+++ b/keyboards/opendeck/32/rev1/rev1.h
@@ -29,17 +29,3 @@
 // Note: The default is to not wrap and to send F13-F24 with combinations of shift/control/alt as these
 // are immediately usable in most software (e.g. OBS and DCSB for streaming) without using AHK.
 //#define KC_WRAPPER_KEY KC_F24
-
-// clang-format off
-#define LAYOUT_ortho_4x8( \
-    Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, \
-    Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q17, \
-    Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q27, \
-    Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37  \
-) { \
-    {Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07}, \
-    {Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q17}, \
-    {Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q27}, \
-    {Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37}  \
-}
-// clang-format on
diff --git a/keyboards/opendeck/32/rev1/rules.mk b/keyboards/opendeck/32/rev1/rules.mk
index 15bc9d0a1d..d6a08c8251 100644
--- a/keyboards/opendeck/32/rev1/rules.mk
+++ b/keyboards/opendeck/32/rev1/rules.mk
@@ -14,6 +14,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 
 LTO_ENABLE = yes
diff --git a/keyboards/orange75/config.h b/keyboards/orange75/config.h
index 3d9fe1d327..5f36081323 100644
--- a/keyboards/orange75/config.h
+++ b/keyboards/orange75/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6,F0, F1, F4, F5, F6, F7, C7, C6, B6, B4, D7, D4, D5, D6 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, B7, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/orange75/info.json b/keyboards/orange75/info.json
index 67fc8db76d..dba6b25208 100644
--- a/keyboards/orange75/info.json
+++ b/keyboards/orange75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "B7", "B3"],
+        "rows": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B4", "D7", "D4", "D5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5"
     },
diff --git a/keyboards/orange75/orange75.c b/keyboards/orange75/orange75.c
deleted file mode 100644
index 2d5f73048a..0000000000
--- a/keyboards/orange75/orange75.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "orange75.h"
\ No newline at end of file
diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h
index 44701c7e17..e2b275251d 100644
--- a/keyboards/org60/config.h
+++ b/keyboards/org60/config.h
@@ -17,27 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow
- * F6 PIN for Org60 that has pre-soldered WS2812 LEDs
  */
-#define RGB_DI_PIN F6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json
index 83da161e31..e71474ae2d 100644
--- a/keyboards/org60/info.json
+++ b/keyboards/org60/info.json
@@ -8,10 +8,18 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "F5",
         "levels": 6
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/ortho5by12/config.h b/keyboards/ortho5by12/config.h
index b11ecb7733..2e97980987 100644
--- a/keyboards/ortho5by12/config.h
+++ b/keyboards/ortho5by12/config.h
@@ -14,23 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-                          0   1   2   3   4   5   6   7   8   9     */
-#define MATRIX_ROW_PINS { B5, B1, B2, B3, B4, C0, D5, D6, D7, B0 }
-#define MATRIX_COL_PINS { C2, D0, D1, D4, C3, C1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/info.json
index cf87e52e48..fda913aa32 100644
--- a/keyboards/ortho5by12/info.json
+++ b/keyboards/ortho5by12/info.json
@@ -8,6 +8,11 @@
     "pid": "0x27DB",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["C2", "D0", "D1", "D4", "C3", "C1"],
+    "rows": ["B5", "B1", "B2", "B3", "B4", "C0", "D5", "D6", "D7", "B0"]
+  },
+  "diode_direction": "ROW2COL",
   "bootmagic": {
     "matrix": [7, 2]
   },
@@ -16,128 +21,138 @@
   "layouts": {
     "LAYOUT_ortho_5x12_1x2uC": {
       "layout": [ 
-        { "w": 1, "x": 0, "y": 0 }, 
-        { "w": 1, "x": 1, "y": 0 }, 
-        { "w": 1, "x": 2, "y": 0 }, 
-        { "w": 1, "x": 3, "y": 0 }, 
-        { "w": 1, "x": 4, "y": 0 }, 
-        { "w": 1, "x": 5, "y": 0 }, 
-        { "w": 1, "x": 6, "y": 0 }, 
-        { "w": 1, "x": 7, "y": 0 }, 
-        { "w": 1, "x": 8, "y": 0 }, 
-        { "w": 1, "x": 9, "y": 0 }, 
-        { "w": 1, "x": 10, "y": 0 }, 
-        { "w": 1, "x": 11, "y": 0 }, 
-        { "w": 1, "x": 0, "y": 1 }, 
-        { "w": 1, "x": 1, "y": 1 }, 
-        { "w": 1, "x": 2, "y": 1 }, 
-        { "w": 1, "x": 3, "y": 1 }, 
-        { "w": 1, "x": 4, "y": 1 }, 
-        { "w": 1, "x": 5, "y": 1 }, 
-        { "w": 1, "x": 6, "y": 1 }, 
-        { "w": 1, "x": 7, "y": 1 }, 
-        { "w": 1, "x": 8, "y": 1 }, 
-        { "w": 1, "x": 9, "y": 1 }, 
-        { "w": 1, "x": 10, "y": 1 }, 
-        { "w": 1, "x": 11, "y": 1 }, 
-        { "w": 1, "x": 0, "y": 2 }, 
-        { "w": 1, "x": 1, "y": 2 }, 
-        { "w": 1, "x": 2, "y": 2 }, 
-        { "w": 1, "x": 3, "y": 2 }, 
-        { "w": 1, "x": 4, "y": 2 }, 
-        { "w": 1, "x": 5, "y": 2 }, 
-        { "w": 1, "x": 6, "y": 2 }, 
-        { "w": 1, "x": 7, "y": 2 }, 
-        { "w": 1, "x": 8, "y": 2 }, 
-        { "w": 1, "x": 9, "y": 2 }, 
-        { "w": 1, "x": 10, "y": 2 }, 
-        { "w": 1, "x": 11, "y": 2 }, 
-        { "w": 1, "x": 0, "y": 3 }, 
-        { "w": 1, "x": 1, "y": 3 }, 
-        { "w": 1, "x": 2, "y": 3 }, 
-        { "w": 1, "x": 3, "y": 3 }, 
-        { "w": 1, "x": 4, "y": 3 }, 
-        { "w": 1, "x": 5, "y": 3 }, 
-        { "w": 1, "x": 6, "y": 3 }, 
-        { "w": 1, "x": 7, "y": 3 }, 
-        { "w": 1, "x": 8, "y": 3 }, 
-        { "w": 1, "x": 9, "y": 3 }, 
-        { "w": 1, "x": 10, "y": 3 }, 
-        { "w": 1, "x": 11, "y": 3 }, 
-        { "w": 1, "x": 0, "y": 4 }, 
-        { "w": 1, "x": 1, "y": 4 }, 
-        { "w": 1, "x": 2, "y": 4 }, 
-        { "w": 1, "x": 3, "y": 4 }, 
-        { "w": 1, "x": 4, "y": 4 }, 
-        { "w": 2, "x": 5, "y": 4 }, 
-        { "w": 1, "x": 7, "y": 4 }, 
-        { "w": 1, "x": 8, "y": 4 }, 
-        { "w": 1, "x": 9, "y": 4 }, 
-        { "w": 1, "x": 10, "y": 4 }, 
-        { "w": 1, "x": 11, "y": 4 } ]
+        {"matrix": [1, 0], "x": 0, "y": 0},
+        {"matrix": [0, 0], "x": 1, "y": 0},
+        {"matrix": [1, 1], "x": 2, "y": 0},
+        {"matrix": [0, 1], "x": 3, "y": 0},
+        {"matrix": [1, 2], "x": 4, "y": 0},
+        {"matrix": [0, 2], "x": 5, "y": 0},
+        {"matrix": [1, 3], "x": 6, "y": 0},
+        {"matrix": [0, 3], "x": 7, "y": 0},
+        {"matrix": [1, 4], "x": 8, "y": 0},
+        {"matrix": [0, 4], "x": 9, "y": 0},
+        {"matrix": [1, 5], "x": 10, "y": 0},
+        {"matrix": [0, 5], "x": 11, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+        {"matrix": [3, 0], "x": 1, "y": 1},
+        {"matrix": [2, 1], "x": 2, "y": 1},
+        {"matrix": [3, 1], "x": 3, "y": 1},
+        {"matrix": [2, 2], "x": 4, "y": 1},
+        {"matrix": [3, 2], "x": 5, "y": 1},
+        {"matrix": [2, 3], "x": 6, "y": 1},
+        {"matrix": [3, 3], "x": 7, "y": 1},
+        {"matrix": [2, 4], "x": 8, "y": 1},
+        {"matrix": [3, 4], "x": 9, "y": 1},
+        {"matrix": [2, 5], "x": 10, "y": 1},
+        {"matrix": [3, 5], "x": 11, "y": 1},
+
+        {"matrix": [5, 0], "x": 0, "y": 2},
+        {"matrix": [4, 0], "x": 1, "y": 2},
+        {"matrix": [5, 1], "x": 2, "y": 2},
+        {"matrix": [4, 1], "x": 3, "y": 2},
+        {"matrix": [5, 2], "x": 4, "y": 2},
+        {"matrix": [4, 2], "x": 5, "y": 2},
+        {"matrix": [5, 3], "x": 6, "y": 2},
+        {"matrix": [4, 3], "x": 7, "y": 2},
+        {"matrix": [5, 4], "x": 8, "y": 2},
+        {"matrix": [4, 4], "x": 9, "y": 2},
+        {"matrix": [5, 5], "x": 10, "y": 2},
+        {"matrix": [4, 5], "x": 11, "y": 2},
+
+        {"matrix": [6, 0], "x": 0, "y": 3},
+        {"matrix": [7, 0], "x": 1, "y": 3},
+        {"matrix": [6, 1], "x": 2, "y": 3},
+        {"matrix": [7, 1], "x": 3, "y": 3},
+        {"matrix": [6, 2], "x": 4, "y": 3},
+        {"matrix": [7, 2], "x": 5, "y": 3},
+        {"matrix": [6, 3], "x": 6, "y": 3},
+        {"matrix": [7, 3], "x": 7, "y": 3},
+        {"matrix": [6, 4], "x": 8, "y": 3},
+        {"matrix": [7, 4], "x": 9, "y": 3},
+        {"matrix": [6, 5], "x": 10, "y": 3},
+        {"matrix": [7, 5], "x": 11, "y": 3},
+
+        {"matrix": [9, 0], "x": 0, "y": 4},
+        {"matrix": [8, 0], "x": 1, "y": 4},
+        {"matrix": [9, 1], "x": 2, "y": 4},
+        {"matrix": [8, 1], "x": 3, "y": 4},
+        {"matrix": [9, 2], "x": 4, "y": 4},
+        {"matrix": [8, 2], "x": 5, "y": 4, "w": 2},
+        {"matrix": [8, 3], "x": 7, "y": 4},
+        {"matrix": [9, 4], "x": 8, "y": 4},
+        {"matrix": [8, 4], "x": 9, "y": 4},
+        {"matrix": [9, 5], "x": 10, "y": 4},
+        {"matrix": [8, 5], "x": 11, "y": 4}
+      ]
     },
     "LAYOUT_ortho_5x12": {
       "layout": [ 
-        { "w": 1, "x": 0, "y": 0 }, 
-        { "w": 1, "x": 1, "y": 0 }, 
-        { "w": 1, "x": 2, "y": 0 }, 
-        { "w": 1, "x": 3, "y": 0 }, 
-        { "w": 1, "x": 4, "y": 0 }, 
-        { "w": 1, "x": 5, "y": 0 }, 
-        { "w": 1, "x": 6, "y": 0 }, 
-        { "w": 1, "x": 7, "y": 0 }, 
-        { "w": 1, "x": 8, "y": 0 }, 
-        { "w": 1, "x": 9, "y": 0 }, 
-        { "w": 1, "x": 10, "y": 0 }, 
-        { "w": 1, "x": 11, "y": 0 }, 
-        { "w": 1, "x": 0, "y": 1 }, 
-        { "w": 1, "x": 1, "y": 1 }, 
-        { "w": 1, "x": 2, "y": 1 }, 
-        { "w": 1, "x": 3, "y": 1 }, 
-        { "w": 1, "x": 4, "y": 1 }, 
-        { "w": 1, "x": 5, "y": 1 }, 
-        { "w": 1, "x": 6, "y": 1 }, 
-        { "w": 1, "x": 7, "y": 1 }, 
-        { "w": 1, "x": 8, "y": 1 }, 
-        { "w": 1, "x": 9, "y": 1 }, 
-        { "w": 1, "x": 10, "y": 1 }, 
-        { "w": 1, "x": 11, "y": 1 }, 
-        { "w": 1, "x": 0, "y": 2 }, 
-        { "w": 1, "x": 1, "y": 2 }, 
-        { "w": 1, "x": 2, "y": 2 }, 
-        { "w": 1, "x": 3, "y": 2 }, 
-        { "w": 1, "x": 4, "y": 2 }, 
-        { "w": 1, "x": 5, "y": 2 }, 
-        { "w": 1, "x": 6, "y": 2 }, 
-        { "w": 1, "x": 7, "y": 2 }, 
-        { "w": 1, "x": 8, "y": 2 }, 
-        { "w": 1, "x": 9, "y": 2 }, 
-        { "w": 1, "x": 10, "y": 2 }, 
-        { "w": 1, "x": 11, "y": 2 }, 
-        { "w": 1, "x": 0, "y": 3 }, 
-        { "w": 1, "x": 1, "y": 3 }, 
-        { "w": 1, "x": 2, "y": 3 }, 
-        { "w": 1, "x": 3, "y": 3 }, 
-        { "w": 1, "x": 4, "y": 3 }, 
-        { "w": 1, "x": 5, "y": 3 }, 
-        { "w": 1, "x": 6, "y": 3 }, 
-        { "w": 1, "x": 7, "y": 3 }, 
-        { "w": 1, "x": 8, "y": 3 }, 
-        { "w": 1, "x": 9, "y": 3 }, 
-        { "w": 1, "x": 10, "y": 3 }, 
-        { "w": 1, "x": 11, "y": 3 },
-        { "w": 1, "x": 0, "y": 4 }, 
-        { "w": 1, "x": 1, "y": 4 }, 
-        { "w": 1, "x": 2, "y": 4 }, 
-        { "w": 1, "x": 3, "y": 4 }, 
-        { "w": 1, "x": 4, "y": 4 }, 
-        { "w": 1, "x": 5, "y": 4 }, 
-        { "w": 1, "x": 6, "y": 4 }, 
-        { "w": 1, "x": 7, "y": 4 }, 
-        { "w": 1, "x": 8, "y": 4 }, 
-        { "w": 1, "x": 9, "y": 4 }, 
-        { "w": 1, "x": 10, "y": 4 }, 
-        { "w": 1, "x": 11, "y": 4 } ]
+        {"matrix": [1, 0], "x": 0, "y": 0},
+        {"matrix": [0, 0], "x": 1, "y": 0},
+        {"matrix": [1, 1], "x": 2, "y": 0},
+        {"matrix": [0, 1], "x": 3, "y": 0},
+        {"matrix": [1, 2], "x": 4, "y": 0},
+        {"matrix": [0, 2], "x": 5, "y": 0},
+        {"matrix": [1, 3], "x": 6, "y": 0},
+        {"matrix": [0, 3], "x": 7, "y": 0},
+        {"matrix": [1, 4], "x": 8, "y": 0},
+        {"matrix": [0, 4], "x": 9, "y": 0},
+        {"matrix": [1, 5], "x": 10, "y": 0},
+        {"matrix": [0, 5], "x": 11, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+        {"matrix": [3, 0], "x": 1, "y": 1},
+        {"matrix": [2, 1], "x": 2, "y": 1},
+        {"matrix": [3, 1], "x": 3, "y": 1},
+        {"matrix": [2, 2], "x": 4, "y": 1},
+        {"matrix": [3, 2], "x": 5, "y": 1},
+        {"matrix": [2, 3], "x": 6, "y": 1},
+        {"matrix": [3, 3], "x": 7, "y": 1},
+        {"matrix": [2, 4], "x": 8, "y": 1},
+        {"matrix": [3, 4], "x": 9, "y": 1},
+        {"matrix": [2, 5], "x": 10, "y": 1},
+        {"matrix": [3, 5], "x": 11, "y": 1},
+
+        {"matrix": [5, 0], "x": 0, "y": 2},
+        {"matrix": [4, 0], "x": 1, "y": 2},
+        {"matrix": [5, 1], "x": 2, "y": 2},
+        {"matrix": [4, 1], "x": 3, "y": 2},
+        {"matrix": [5, 2], "x": 4, "y": 2},
+        {"matrix": [4, 2], "x": 5, "y": 2},
+        {"matrix": [5, 3], "x": 6, "y": 2},
+        {"matrix": [4, 3], "x": 7, "y": 2},
+        {"matrix": [5, 4], "x": 8, "y": 2},
+        {"matrix": [4, 4], "x": 9, "y": 2},
+        {"matrix": [5, 5], "x": 10, "y": 2},
+        {"matrix": [4, 5], "x": 11, "y": 2},
+
+        {"matrix": [6, 0], "x": 0, "y": 3},
+        {"matrix": [7, 0], "x": 1, "y": 3},
+        {"matrix": [6, 1], "x": 2, "y": 3},
+        {"matrix": [7, 1], "x": 3, "y": 3},
+        {"matrix": [6, 2], "x": 4, "y": 3},
+        {"matrix": [7, 2], "x": 5, "y": 3},
+        {"matrix": [6, 3], "x": 6, "y": 3},
+        {"matrix": [7, 3], "x": 7, "y": 3},
+        {"matrix": [6, 4], "x": 8, "y": 3},
+        {"matrix": [7, 4], "x": 9, "y": 3},
+        {"matrix": [6, 5], "x": 10, "y": 3},
+        {"matrix": [7, 5], "x": 11, "y": 3},
+
+        {"matrix": [9, 0], "x": 0, "y": 4},
+        {"matrix": [8, 0], "x": 1, "y": 4},
+        {"matrix": [9, 1], "x": 2, "y": 4},
+        {"matrix": [8, 1], "x": 3, "y": 4},
+        {"matrix": [9, 2], "x": 4, "y": 4},
+        {"matrix": [8, 2], "x": 5, "y": 4},
+        {"matrix": [9, 3], "x": 6, "y": 4},
+        {"matrix": [8, 3], "x": 7, "y": 4},
+        {"matrix": [9, 4], "x": 8, "y": 4},
+        {"matrix": [8, 4], "x": 9, "y": 4},
+        {"matrix": [9, 5], "x": 10, "y": 4},
+        {"matrix": [8, 5], "x": 11, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/ortho5by12/ortho5by12.c b/keyboards/ortho5by12/ortho5by12.c
index 615ab9d04e..29173749ae 100644
--- a/keyboards/ortho5by12/ortho5by12.c
+++ b/keyboards/ortho5by12/ortho5by12.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "ortho5by12.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     setPinOutput(C4);
diff --git a/keyboards/ortho5by12/ortho5by12.h b/keyboards/ortho5by12/ortho5by12.h
deleted file mode 100644
index 84f59859d8..0000000000
--- a/keyboards/ortho5by12/ortho5by12.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2019 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define XXX KC_NO
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12( \
-        K00,  K01,  K02,  K03,  K04,  K05,  K10,  K11,  K12,  K13,  K14,  K15, \
-        K20,  K21,  K22,  K23,  K24,  K25,  K30,  K31,  K32,  K33,  K34,  K35, \
-        K40,  K41,  K42,  K43,  K44,  K45,  K50,  K51,  K52,  K53,  K54,  K55, \
-        K60,  K61,  K62,  K63,  K64,  K65,  K70,  K71,  K72,  K73,  K74,  K75, \
-        K80,  K81,  K82,  K83,  K84,  K85,  K90,  K91,  K92,  K93,  K94,  K95  \
-) { \
-    { K01, K03, K05, K11, K13, K15 }, \
-    { K00, K02, K04, K10, K12, K14 }, \
-    { K20, K22, K24, K30, K32, K34 }, \
-    { K21, K23, K25, K31, K33, K35 }, \
-    { K41, K43, K45, K51, K53, K55 }, \
-    { K40, K42, K44, K50, K52, K54 }, \
-    { K60, K62, K64, K70, K72, K74 }, \
-    { K61, K63, K65, K71, K73, K75 }, \
-    { K81, K83, K85, K91, K93, K95 }, \
-    { K80, K82, K84, K90, K92, K94 }  \
-}
-
-#define LAYOUT_ortho_5x12_1x2uC( \
-        K00,  K01,  K02,  K03,  K04,  K05,  K10,  K11,  K12,  K13,  K14,  K15, \
-        K20,  K21,  K22,  K23,  K24,  K25,  K30,  K31,  K32,  K33,  K34,  K35, \
-        K40,  K41,  K42,  K43,  K44,  K45,  K50,  K51,  K52,  K53,  K54,  K55, \
-        K60,  K61,  K62,  K63,  K64,  K65,  K70,  K71,  K72,  K73,  K74,  K75, \
-        K80,  K81,  K82,  K83,  K84,     K85,     K91,  K92,  K93,  K94,  K95  \
-) { \
-    { K01, K03, K05, K11, K13, K15 }, \
-    { K00, K02, K04, K10, K12, K14 }, \
-    { K20, K22, K24, K30, K32, K34 }, \
-    { K21, K23, K25, K31, K33, K35 }, \
-    { K41, K43, K45, K51, K53, K55 }, \
-    { K40, K42, K44, K50, K52, K54 }, \
-    { K60, K62, K64, K70, K72, K74 }, \
-    { K61, K63, K65, K71, K73, K75 }, \
-    { K81, K83, K85, K91, K93, K95 }, \
-    { K80, K82, K84, XXX, K92, K94 }  \
-}
diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h
index b6a1f1d52c..3964ccec15 100644
--- a/keyboards/orthocode/config.h
+++ b/keyboards/orthocode/config.h
@@ -16,30 +16,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS {B0, B1, B2, B3, B4}
-#define MATRIX_COL_PINS {C4, C3, C2, C1, C0, D7, D6, A7, A4, A5, A6, A3, A2, A1, A0}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 #define TAP_CODE_DELAY 10
 
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 10  /*Change for the number of leds on the strip you attach*/
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -55,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //   #define RGBLIGHT_EFFECT_RGB_TEST
 //   #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json
index 578cb2b907..f01c75da91 100644
--- a/keyboards/orthocode/info.json
+++ b/keyboards/orthocode/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C4", "C3", "C2", "C1", "C0", "D7", "D6", "A7", "A4", "A5", "A6", "A3", "A2", "A1", "A0"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D1", "pin_b": "D0", "resolution": 1}
         ]
     },
+    "ws2812": {
+        "pin": "D5"
+    },
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "debounce": 0,
diff --git a/keyboards/orthocode/orthocode.c b/keyboards/orthocode/orthocode.c
index 8ddd32c396..1bfc431c78 100644
--- a/keyboards/orthocode/orthocode.c
+++ b/keyboards/orthocode/orthocode.c
@@ -44,16 +44,3 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     }
     return true;
 }
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    // Volume control
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h
index f17deefb4e..502f364719 100644
--- a/keyboards/orthodox/keymaps/drashna/config.h
+++ b/keyboards/orthodox/keymaps/drashna/config.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LALT)))
 
 #ifdef RGBLIGHT_ENABLE
-#    define RGB_DI_PIN D3
+#    define WS2812_DI_PIN D3
 #    define RGBLED_NUM 16  // Number of LEDs
 #    define RGBLED_SPLIT \
         { 8, 8 }
diff --git a/keyboards/orthodox/keymaps/rfvizarra/rules.mk b/keyboards/orthodox/keymaps/rfvizarra/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/orthodox/keymaps/rfvizarra/rules.mk
+++ /dev/null
diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h
index 5f20923107..7852878ee7 100644
--- a/keyboards/orthodox/keymaps/shaymdev/config.h
+++ b/keyboards/orthodox/keymaps/shaymdev/config.h
@@ -32,8 +32,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_KNIGHT
 
 // #define RGBLED_SPLIT { 5, 5 }
-#undef RGB_DI_PIN
-#define RGB_DI_PIN D3
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN D3
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 #define RGBLIGHT_SLEEP
@@ -50,5 +50,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define COMBO_COUNT 1
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 220
diff --git a/keyboards/orthodox/orthodox.c b/keyboards/orthodox/orthodox.c
deleted file mode 100644
index 0b366e9449..0000000000
--- a/keyboards/orthodox/orthodox.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "orthodox.h"
\ No newline at end of file
diff --git a/keyboards/orthodox/orthodox.h b/keyboards/orthodox/orthodox.h
deleted file mode 100644
index ebf13debb7..0000000000
--- a/keyboards/orthodox/orthodox.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_orthodox_rev1
-    #include "rev1.h"
-#endif
-#ifdef KEYBOARD_orthodox_rev3
-#include "rev3.h"
-#endif
-#ifdef KEYBOARD_orthodox_rev3_teensy
-#include "rev3_teensy.h"
-#endif
diff --git a/keyboards/orthodox/rev1/config.h b/keyboards/orthodox/rev1/config.h
index 9b479a5d0c..c4261a79fb 100644
--- a/keyboards/orthodox/rev1/config.h
+++ b/keyboards/orthodox/rev1/config.h
@@ -21,19 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-
-
-//PRO MICRO
-#define MATRIX_ROW_PINS { D4, B4, B5 }
-#define MATRIX_COL_PINS { D7, F4, F5, F6, F7, B1, B3, B2, B6 }
-//#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4, D7 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LGUI)) \
diff --git a/keyboards/orthodox/rev1/info.json b/keyboards/orthodox/rev1/info.json
index ea0a1692e4..0200ccdc5c 100644
--- a/keyboards/orthodox/rev1/info.json
+++ b/keyboards/orthodox/rev1/info.json
@@ -7,6 +7,11 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D4", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
diff --git a/keyboards/orthodox/rev1/rev1.c b/keyboards/orthodox/rev1/rev1.c
index 49deba4dbf..1101f4379b 100644
--- a/keyboards/orthodox/rev1/rev1.c
+++ b/keyboards/orthodox/rev1/rev1.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "orthodox.h"
+#include "rev1.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/orthodox/rev1/rev1.h b/keyboards/orthodox/rev1/rev1.h
index d9d0b78dfc..328cb46cc1 100644
--- a/keyboards/orthodox/rev1/rev1.h
+++ b/keyboards/orthodox/rev1/rev1.h
@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "orthodox.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/orthodox/rev3/config.h b/keyboards/orthodox/rev3/config.h
index acefd95383..c4261a79fb 100644
--- a/keyboards/orthodox/rev3/config.h
+++ b/keyboards/orthodox/rev3/config.h
@@ -21,22 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-
-//REV.3 PRO MICRO
-#define MATRIX_ROW_PINS { D2, B4, B5 }
-#define MATRIX_COL_PINS { D7, F4, F5, B6, B2, B3, B1, F7, F6 }
-
-/*/
-//REV.3 TEENSY
-#define MATRIX_ROW_PINS { B0, C6, C7 }
-#define MATRIX_COL_PINS { D2, F5, F6, D6, D7, B4, B5, B6, F7 }
-/*/
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LGUI)) \
diff --git a/keyboards/orthodox/rev3/info.json b/keyboards/orthodox/rev3/info.json
index a4525cc2f6..0681d736f9 100644
--- a/keyboards/orthodox/rev3/info.json
+++ b/keyboards/orthodox/rev3/info.json
@@ -7,6 +7,11 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "F4", "F5", "B6", "B2", "B3", "B1", "F7", "F6"],
+    "rows": ["D2", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
diff --git a/keyboards/orthodox/rev3/rev3.c b/keyboards/orthodox/rev3/rev3.c
index 49deba4dbf..79af5cd668 100644
--- a/keyboards/orthodox/rev3/rev3.c
+++ b/keyboards/orthodox/rev3/rev3.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "orthodox.h"
+#include "rev3.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/orthodox/rev3/rev3.h b/keyboards/orthodox/rev3/rev3.h
index d9d0b78dfc..328cb46cc1 100644
--- a/keyboards/orthodox/rev3/rev3.h
+++ b/keyboards/orthodox/rev3/rev3.h
@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "orthodox.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/orthodox/rev3_teensy/config.h b/keyboards/orthodox/rev3_teensy/config.h
index 27435df7fd..c4261a79fb 100644
--- a/keyboards/orthodox/rev3_teensy/config.h
+++ b/keyboards/orthodox/rev3_teensy/config.h
@@ -21,16 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-
-//REV.3 TEENSY
-#define MATRIX_ROW_PINS { B0, C6, C7 }
-#define MATRIX_COL_PINS { D2, F5, F6, D6, D7, B4, B5, B6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LGUI)) \
diff --git a/keyboards/orthodox/rev3_teensy/info.json b/keyboards/orthodox/rev3_teensy/info.json
index e6d6e98032..9a292b0f74 100644
--- a/keyboards/orthodox/rev3_teensy/info.json
+++ b/keyboards/orthodox/rev3_teensy/info.json
@@ -7,6 +7,11 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D2", "F5", "F6", "D6", "D7", "B4", "B5", "B6", "F7"],
+    "rows": ["B0", "C6", "C7"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.c b/keyboards/orthodox/rev3_teensy/rev3_teensy.c
index 49deba4dbf..9faf94fd9a 100644
--- a/keyboards/orthodox/rev3_teensy/rev3_teensy.c
+++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "orthodox.h"
+#include "rev3_teensy.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.h b/keyboards/orthodox/rev3_teensy/rev3_teensy.h
index d9d0b78dfc..328cb46cc1 100644
--- a/keyboards/orthodox/rev3_teensy/rev3_teensy.h
+++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.h
@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "orthodox.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/owlab/jelly_epoch/hotswap/config.h b/keyboards/owlab/jelly_epoch/hotswap/config.h
index ef70cdd810..b1176fc6b8 100644
--- a/keyboards/owlab/jelly_epoch/hotswap/config.h
+++ b/keyboards/owlab/jelly_epoch/hotswap/config.h
@@ -17,20 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, A15, B10 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, B11, B8, B9, C13 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* NKRO */
 #define FORCE_NKRO
 
 /* RGB Strip*/
-#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_CHRISTMAS
@@ -45,4 +35,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 10
 #    define RGBLIGHT_LIMIT_VAL 255    
-#endif
diff --git a/keyboards/owlab/jelly_epoch/hotswap/hotswap.c b/keyboards/owlab/jelly_epoch/hotswap/hotswap.c
deleted file mode 100644
index 55fbd3ea20..0000000000
--- a/keyboards/owlab/jelly_epoch/hotswap/hotswap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* 
-Copyright 2021 owlab
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "hotswap.h"
diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json
index 796aa995c3..63a884fc2c 100644
--- a/keyboards/owlab/jelly_epoch/hotswap/info.json
+++ b/keyboards/owlab/jelly_epoch/hotswap/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4A4C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "B11", "B8", "B9", "C13"],
+        "rows": ["B0", "B1", "B2", "B3", "A15", "B10"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/owlab/jelly_epoch/soldered/config.h b/keyboards/owlab/jelly_epoch/soldered/config.h
index ef70cdd810..b1176fc6b8 100644
--- a/keyboards/owlab/jelly_epoch/soldered/config.h
+++ b/keyboards/owlab/jelly_epoch/soldered/config.h
@@ -17,20 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, A15, B10 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, B11, B8, B9, C13 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* NKRO */
 #define FORCE_NKRO
 
 /* RGB Strip*/
-#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_CHRISTMAS
@@ -45,4 +35,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 10
 #    define RGBLIGHT_LIMIT_VAL 255    
-#endif
diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/info.json
index 9e80a4ff30..4e001d03c0 100644
--- a/keyboards/owlab/jelly_epoch/soldered/info.json
+++ b/keyboards/owlab/jelly_epoch/soldered/info.json
@@ -8,265 +8,288 @@
         "pid": "0x4A53",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "B11", "B8", "B9", "C13"],
+        "rows": ["B0", "B1", "B2", "B3", "A15", "B10"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15, "y":1.25},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15, "y":2.25},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-                {"x":15, "y":3.25},
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":13, "y":5.25},
-                {"x":14, "y":5.25},
-                {"x":15, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [4, 12], "x": 14, "y": 0},
+                {"matrix": [4, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [2, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+                {"matrix": [5, 11], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [5, 9], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [5, 13], "x": 14, "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": 6.25},
+                {"matrix": [5, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13, "y": 5.25},
+                {"matrix": [5, 8], "x": 14, "y": 5.25},
+                {"matrix": [5, 12], "x": 15, "y": 5.25}
             ]
         },
         "LAYOUT_75_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15, "y":1.25},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15, "y":2.25},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-                {"x":15, "y":3.25},
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":13, "y":5.25},
-                {"x":14, "y":5.25},
-                {"x":15, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [4, 12], "x": 14, "y": 0},
+                {"matrix": [4, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [5, 11], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [5, 9], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [5, 13], "x": 14, "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": 6.25},
+                {"matrix": [5, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13, "y": 5.25},
+                {"matrix": [5, 8], "x": 14, "y": 5.25},
+                {"matrix": [5, 12], "x": 15, "y": 5.25}
             ]
         },
         "LAYOUT_75_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15, "y":1.25},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":15, "y":2.25},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
-                {"x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"x":15, "y":3.25},
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":13, "y":5.25},
-                {"x":14, "y":5.25},
-                {"x":15, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [4, 12], "x": 14, "y": 0},
+                {"matrix": [4, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [5, 11], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 10], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [5, 9], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [5, 13], "x": 14, "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": 6.25},
+                {"matrix": [5, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13, "y": 5.25},
+                {"matrix": [5, 8], "x": 14, "y": 5.25},
+                {"matrix": [5, 12], "x": 15, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/owlab/jelly_epoch/soldered/soldered.c b/keyboards/owlab/jelly_epoch/soldered/soldered.c
deleted file mode 100644
index a1af466d29..0000000000
--- a/keyboards/owlab/jelly_epoch/soldered/soldered.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* 
-Copyright 2021 owlab
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "soldered.h"
diff --git a/keyboards/owlab/jelly_epoch/soldered/soldered.h b/keyboards/owlab/jelly_epoch/soldered/soldered.h
deleted file mode 100644
index e69e258027..0000000000
--- a/keyboards/owlab/jelly_epoch/soldered/soldered.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* 
-Copyright 2021 owlab
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_all( \
-	K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K412, K413, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K213, K113, K511, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K313, K510, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,    K312,    K509, \
-	K400, K503, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K513,       \
-	K500, K501, K502,                   K504,                   K505, K506, K507, K508, K512  \
-) { \
-	{ K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013}, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113}, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213}, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313}, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413}, \
-	{ K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513}  \
-}
-
-#define LAYOUT_75_ansi( \
-	K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K412, K413, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K511, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K313, K510, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,    K312,    K509, \
-	K400,       K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K513,       \
-	K500, K501, K502,                   K504,                   K505, K506, K507, K508, K512  \
-) { \
-	{ K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013}, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113}, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____}, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313}, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413}, \
-	{ K500, K501, K502, ____, K504, ____, K506, K507, K508, K509, K510, K511, K512, K513}  \
-}
-
-#define LAYOUT_75_iso( \
-	K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K412, K413, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K511, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K510, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K312, K509, \
-	K400, K503, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K513,       \
-	K500, K501, K502,                   K504,                   K505, K506, K507, K508, K512  \
-) { \
-	{ K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013}, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113}, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____}, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313}, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413}, \
-	{ K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513}  \
-}
diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h
index bd3ebf9b1e..c1dab1c71f 100644
--- a/keyboards/owlab/spring/config.h
+++ b/keyboards/owlab/spring/config.h
@@ -17,19 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, B7, D0, D1, D2 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F4, F7, F6, F5, F1, F0 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* NKRO */
 #define FORCE_NKRO 
 
 /* RGB Strip*/
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -47,6 +38,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_LIMIT_VAL 255    
 #    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
 #    define RGBLIGHT_DEFAULT_VAL RGBLIGHT_LIMIT_VAL/2
-#endif
-
-
diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json
index 5d94c0cff8..c6d40526cf 100644
--- a/keyboards/owlab/spring/info.json
+++ b/keyboards/owlab/spring/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5350",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"],
+        "rows": ["B0", "B7", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/owlab/suit80/ansi/ansi.c b/keyboards/owlab/suit80/ansi/ansi.c
deleted file mode 100644
index 7e75773f1d..0000000000
--- a/keyboards/owlab/suit80/ansi/ansi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 
-Copyright 2021 owlab
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "ansi.h"
diff --git a/keyboards/owlab/suit80/ansi/config.h b/keyboards/owlab/suit80/ansi/config.h
index 8d60f298d4..a62df28fc3 100644
--- a/keyboards/owlab/suit80/ansi/config.h
+++ b/keyboards/owlab/suit80/ansi/config.h
@@ -17,13 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { E6, B0, B7, D0, D1, D2 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F4, F7, F6, F5, F1, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* NKRO */
 #define FORCE_NKRO
diff --git a/keyboards/owlab/suit80/ansi/info.json b/keyboards/owlab/suit80/ansi/info.json
index cb8447107f..bb4d9f0243 100644
--- a/keyboards/owlab/suit80/ansi/info.json
+++ b/keyboards/owlab/suit80/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5355",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"],
+        "rows": ["E6", "B0", "B7", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/owlab/suit80/iso/config.h b/keyboards/owlab/suit80/iso/config.h
index 72206db610..a62df28fc3 100644
--- a/keyboards/owlab/suit80/iso/config.h
+++ b/keyboards/owlab/suit80/iso/config.h
@@ -17,13 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, B0, B7, D0, D1, D2 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F4, F7, F6, F5, F1, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* NKRO */
 #define FORCE_NKRO
diff --git a/keyboards/owlab/suit80/iso/info.json b/keyboards/owlab/suit80/iso/info.json
index 4cd35dff5e..8457db8a53 100644
--- a/keyboards/owlab/suit80/iso/info.json
+++ b/keyboards/owlab/suit80/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5349",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"],
+        "rows": ["E6", "B0", "B7", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/owlab/suit80/iso/iso.c b/keyboards/owlab/suit80/iso/iso.c
deleted file mode 100644
index e8f326d37e..0000000000
--- a/keyboards/owlab/suit80/iso/iso.c
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-/* 
-Copyright 2021 owlab
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "iso.h"
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index 9a1aacc4fa..76fc80e242 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/config.h
@@ -17,20 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, B1, B2, B10, B11 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A15, B8, B9, B12, B13 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* NKRO */
 #define FORCE_NKRO
 
 /* RGB stripe */
-#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_CHRISTMAS
@@ -46,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 10
 #    define RGBLIGHT_LIMIT_VAL 180
 #    define OWL_VOLUME_RANGE 50
-#endif
 
 /* RGB matrix */
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/owlab/voice65/hotswap/hotswap.h b/keyboards/owlab/voice65/hotswap/hotswap.h
index 64503f9ca6..6536af4c49 100644
--- a/keyboards/owlab/voice65/hotswap/hotswap.h
+++ b/keyboards/owlab/voice65/hotswap/hotswap.h
@@ -18,22 +18,6 @@
 
 #include "quantum.h"
 
-#define ____ KC_NO
-
-#define LAYOUT_65_ansi_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,    K212,    K214, \
-    K300,       K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \
-    K400, K401, K402,                   K405,                   K409, K410, K411, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, ____, K313, K314 }, \
-    { K400, K401, K402, ____, ____, K405, ____, ____, ____, K409, K410, K411, ____, K413, K414 }  \
-}
-
 typedef union {
     uint32_t raw;
     struct {
diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json
index 7a5215bf86..ea365441bd 100644
--- a/keyboards/owlab/voice65/hotswap/info.json
+++ b/keyboards/owlab/voice65/hotswap/info.json
@@ -8,11 +8,22 @@
         "pid": "0x564F",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"],
+        "rows": ["B0", "B1", "B2", "B10", "B11"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"}
         ]
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
@@ -22,73 +33,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "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/owlab/voice65/hotswap/rules.mk b/keyboards/owlab/voice65/hotswap/rules.mk
index 3cd81f231c..aa5f475033 100644
--- a/keyboards/owlab/voice65/hotswap/rules.mk
+++ b/keyboards/owlab/voice65/hotswap/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Rotary encoder
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index fc5aafd1ce..fa2291fb4f 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/config.h
@@ -17,20 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, B1, B2, B10, B11 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A15, B8, B9, B12, B13 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* NKRO */
 #define FORCE_NKRO
 
 /* RGB stripe */
-#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_CHRISTMAS
@@ -46,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 10
 #    define RGBLIGHT_LIMIT_VAL 180
 #    define OWL_VOLUME_RANGE 50
-#endif
 
 /* RGB matrix*/
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json
index 4a3c8a6936..587cdc80fb 100644
--- a/keyboards/owlab/voice65/soldered/info.json
+++ b/keyboards/owlab/voice65/soldered/info.json
@@ -8,446 +8,481 @@
         "pid": "0x5657",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"],
+        "rows": ["B0", "B1", "B2", "B10", "B11"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"}
         ]
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker", "65_iso_blocker_split_bs"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":2.25},
-                {"x":6, "y":4, "w":1.25},
-                {"x":7.25, "y":4, "w":2.75},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [2, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [2, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [2, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [2, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [2, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [2, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/owlab/voice65/soldered/rules.mk b/keyboards/owlab/voice65/soldered/rules.mk
index 3cd81f231c..aa5f475033 100644
--- a/keyboards/owlab/voice65/soldered/rules.mk
+++ b/keyboards/owlab/voice65/soldered/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Rotary encoder
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/owlab/voice65/soldered/soldered.h b/keyboards/owlab/voice65/soldered/soldered.h
index 0d50056002..2c10428cec 100644
--- a/keyboards/owlab/voice65/soldered/soldered.h
+++ b/keyboards/owlab/voice65/soldered/soldered.h
@@ -18,92 +18,6 @@
 
 #include "quantum.h"
 
-#define ____ KC_NO
-
-#define LAYOUT_all( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K213, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,    K212,    K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-    K400, K401, K402,       K403,       K404,       K406,       K409, K410, K411, K412, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, K403, K404, ____, K406, ____, ____, K409, K410, K411, K412, ____, K414 }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,    K212,    K214, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-    K400, K401, K402,                   K404,                   K409, K410, K411, K412, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____ }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, ____, K404, ____, ____, ____, ____, K409, K410, K411, K412, ____, K414 }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K213, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,    K212,    K214, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-    K400, K401, K402,                   K404,                   K409, K410, K411, K412, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, ____, K404, ____, ____, ____, ____, K409, K410, K411, K412, ____, K414 }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,    K212,    K214, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-    K400, K401, K402,                   K404,                         K410, K411, K412, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, ____, K404, ____, ____, ____, ____, ____, K410, K411, K412, ____, K414 }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K212, K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-    K400, K401, K402,                   K404,                   K409, K410, K411, K412, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____ }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, ____, K404, ____, ____, ____, ____, K409, K410, K411, K412, ____, K414 }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K213, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K212, K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-    K400, K401, K402,                   K404,                   K409, K410, K411, K412, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, ____, K404, ____, ____, ____, ____, K409, K410, K411, K412, ____, K414 }  \
-}
-
 typedef union {
   uint32_t raw;
   struct {
diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h
index 961897c4d6..2db0b8566c 100644
--- a/keyboards/p3d/glitch/config.h
+++ b/keyboards/p3d/glitch/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
-#define MATRIX_ROW_PINS { D5, D6, B6, D7, C7, B4, B5, D3, D4, C6 }
-#define MATRIX_COL_PINS { B2, D2, B3, B7, F5, F4, F1, F0 }
-
-#define RGB_DI_PIN B1
 #define RGBLED_NUM 25
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -46,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 400
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json
index 9aee029a07..6f6b51ef0d 100644
--- a/keyboards/p3d/glitch/info.json
+++ b/keyboards/p3d/glitch/info.json
@@ -8,91 +8,99 @@
         "pid": "0x3568",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "D2", "B3", "B7", "F5", "F4", "F1", "F0"],
+        "rows": ["D5", "D6", "B6", "D7", "C7", "B4", "B5", "D3", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F6", "pin_b": "F7", "resolution": 2}
         ]
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "ESC", "x": 0.5, "y": 0.5 },
-                { "label": "1", "x": 1.5, "y": 0.5 },
-                { "label": "2", "x": 3.25, "y": 1.0 },
-                { "label": "3", "x": 4.25, "y": 1.0 },
-                { "label": "4", "x": 5.25, "y": 1.0 },
-                { "label": "5", "x": 6.25, "y": 1.0 },
-                { "label": "6", "x": 7.25, "y": 1.0 },
-                { "label": "7", "x": 10, "y": 1.0 },
-                { "label": "8", "x": 11, "y": 1.0 },
-                { "label": "9", "x": 12, "y": 1.0 },
-                { "label": "0", "x": 13, "y": 1.0 },
-                { "label": "_", "x": 14.5, "y": 0.6 },
-                { "label": "+", "x": 15.5, "y": 0.6 },
-                { "label": "Back", "x": 16.5, "y": 0.6 },
-                { "label": "Del", "x": 17.5, "y": 0.6 },
-                { "x": 19.1, "y": 0.1 },
+                { "x": 0.5, "y": 0.5 },
+                { "x": 1.5, "y": 0.5 },
+                { "x": 3.25, "y": 0.5 },
+                { "x": 4.25, "y": 0.5 },
+                { "x": 5.25, "y": 0.5 },
+                { "x": 6.25, "y": 0.5 },
+                { "x": 7.25, "y": 0.5 },
+                { "x": 10, "y": 0.5 },
+                { "x": 11, "y": 0.5 },
+                { "x": 12, "y": 0.5 },
+                { "x": 13, "y": 0.5 },
+                { "x": 14.5, "y": 0.5 },
+                { "x": 15.5, "y": 0.5 },
+                { "x": 16.5, "y": 0.5 },
+                { "x": 17.5, "y": 0.5 },
+                { "x": 19, "y": 0 },
 
-                { "label": "TAB", "x": 0.15, "y": 1.5, "w": 1.5 },
-                { "label": "Q", "x": 1.65, "y": 1.5 },
-                { "label": "W", "x": 3.75, "y": 2.0 },
-                { "label": "E", "x": 4.75, "y": 2.0 },
-                { "label": "R", "x": 5.75, "y": 2.0 },
-                { "label": "T", "x": 6.75, "y": 2.0 },
-                { "label": "Y", "x": 9.5, "y": 2.0 },
-                { "label": "U", "x": 10.5, "y": 2.0 },
-                { "label": "I", "x": 11.5, "y": 2.0 },
-                { "label": "O", "x": 12.5, "y": 2.0 },
-                { "label": "P", "x": 14.35, "y": 1.6 },
-                { "label": "[", "x": 15.35, "y": 1.6 },
-                { "label": "]", "x": 16.35, "y": 1.6 },
-                { "label": "\\", "x": 17.35, "y": 1.6, "w": 1.5 },
-                { "x": 19.1, "y": 1.6 },
+                { "x": 0.15, "y": 1.5, "w": 1.5 },
+                { "x": 1.65, "y": 1.5 },
+                { "x": 3.75, "y": 1.5 },
+                { "x": 4.75, "y": 1.5 },
+                { "x": 5.75, "y": 1.5 },
+                { "x": 6.75, "y": 1.5 },
+                { "x": 9.5, "y": 1.5 },
+                { "x": 10.5, "y": 1.5 },
+                { "x": 11.5, "y": 1.5 },
+                { "x": 12.5, "y": 1.5 },
+                { "x": 14.25, "y": 1.5 },
+                { "x": 15.25, "y": 1.5 },
+                { "x": 16.25, "y": 1.5 },
+                { "x": 17.25, "y": 1.5, "w": 1.5 },
+                { "x": 19, "y": 1.5 },
 
-                { "label": "CAPS", "x": 0.15, "y": 2.5, "w": 1.75 },
-                { "label": "A", "x": 1.9, "y": 2.5 },
-                { "label": "S", "x": 4, "y": 3.0 },
-                { "label": "D", "x": 5, "y": 3.0 },
-                { "label": "F", "x": 6, "y": 3.0 },
-                { "label": "G", "x": 7, "y": 3.0 },
-                { "label": "H", "x": 9.75, "y": 3.0 },
-                { "label": "J", "x": 10.75, "y": 3.0 },
-                { "label": "K", "x": 11.75, "y": 3.0 },
-                { "label": "L", "x": 12.75, "y": 3.0 },
-                { "label": ";", "x": 14.6, "y": 2.6 },
-                { "label": "'", "x": 15.6, "y": 2.6 },
-                { "label": "ENTER", "x": 16.6, "y": 2.6, "w": 2.25 },
-                { "x": 19.1, "y": 2.6 },
+                { "x": 0.15, "y": 2.5, "w": 1.75 },
+                { "x": 1.9, "y": 2.5 },
+                { "x": 4, "y": 2.5 },
+                { "x": 5, "y": 2.5 },
+                { "x": 6, "y": 2.5 },
+                { "x": 7, "y": 2.5 },
+                { "x": 9.75, "y": 2.5 },
+                { "x": 10.75, "y": 2.5 },
+                { "x": 11.75, "y": 2.5 },
+                { "x": 12.75, "y": 2.5 },
+                { "x": 14.5, "y": 2.5 },
+                { "x": 15.5, "y": 2.5 },
+                { "x": 16.5, "y": 2.5, "w": 2.25 },
+                { "x": 19, "y": 2.5 },
 
-                { "label": "SHIFT", "x": 0, "y": 3.5, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3.5 },
-                { "label": "X", "x": 4.5, "y": 4.0 },
-                { "label": "C", "x": 5.5, "y": 4.0 },
-                { "label": "V", "x": 6.5, "y": 4.0 },
-                { "label": "B", "x": 7.5, "y": 4.0 },
-                { "label": "BEE", "x": 9.25, "y": 4.0 },
-                { "label": "N", "x": 10.25, "y": 4.0 },
-                { "label": "M", "x": 11.25, "y": 4.0 },
-                { "label": ",", "x": 12.25, "y": 4.0 },
-                { "label": ".", "x": 14.25, "y": 3.6 },
-                { "label": "?", "x": 15.25, "y": 3.6 },
-                { "label": "SHIFT", "x": 16.25, "y": 3.6, "w": 1.75 },
-                { "label": "UP", "x": 18.25, "y": 3.85 },
-                { "x": 19.5, "y": 3.6 },
+                { "x": 0, "y": 3.5, "w": 2.25 },
+                { "x": 2.25, "y": 3.5 },
+                { "x": 4.5, "y": 3.5 },
+                { "x": 5.5, "y": 3.5 },
+                { "x": 6.5, "y": 3.5 },
+                { "x": 7.5, "y": 3.5 },
+                { "x": 9.25, "y": 3.5 },
+                { "x": 10.25, "y": 3.5 },
+                { "x": 11.25, "y": 3.5 },
+                { "x": 12.25, "y": 3.5 },
+                { "x": 14.25, "y": 3.5 },
+                { "x": 15.25, "y": 3.5 },
+                { "x": 16.25, "y": 3.5, "w": 1.75 },
+                { "x": 18.25, "y": 3.75 },
+                { "x": 19.5, "y": 3.5 },
 
-                { "label": "CTRL", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "WIN", "x": 1.25, "y": 4.5, "w": 1.25 },
-                { "x": 4.75, "y": 5.0, "w": 2.75 },
-                { "label": "ALT", "x": 7.5, "y": 5.0, "w": 1.25 },
-                { "label": "ALT", "x": 9.5, "y": 5.0, "w": 1.25 },
-                { "x": 10.75, "y": 5.0, "w": 2.25 },
-                { "label": "WIN", "x": 15, "y": 4.6 },
-                { "label": "CTRL", "x": 16, "y": 4.6 },
-                { "label": "LEFT", "x": 17.25, "y": 4.85 },
-                { "label": "DOWN", "x": 18.25, "y": 4.85 },
-                { "label": "RIGHT", "x": 19.25, "y": 4.85 }
+                { "x": 0, "y": 4.5, "w": 1.25 },
+                { "x": 1.25, "y": 4.5, "w": 1.25 },
+                { "x": 4.75, "y": 4.5, "w": 2.75 },
+                { "x": 7.5, "y": 4.5, "w": 1.25 },
+                { "x": 9.5, "y": 4.5, "w": 1.25 },
+                { "x": 10.75, "y": 4.5, "w": 2.25 },
+                { "x": 15, "y": 4.5 },
+                { "x": 16, "y": 4.5 },
+                { "x": 17.25, "y": 4.75 },
+                { "x": 18.25, "y": 4.75 },
+                { "x": 19.25, "y": 4.75 }
             ]
         }
     }
diff --git a/keyboards/pabile/p18/config.h b/keyboards/pabile/p18/config.h
deleted file mode 100644
index 2b450e8fff..0000000000
--- a/keyboards/pabile/p18/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#pragma once
-
-
-/* pin-out for PROMICRO */
-#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { D2, D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p18/info.json b/keyboards/pabile/p18/info.json
index 3859d7852f..0a69a4a029 100644
--- a/keyboards/pabile/p18/info.json
+++ b/keyboards/pabile/p18/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6668",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D7", "E6", "B4", "B5"],
+        "rows": ["D1", "D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "F4"},
@@ -19,24 +24,27 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"x":1.25, "y":0}, 
-              {"x":2.25, "y":0}, 
-              {"x":3.25, "y":0}, 
-              {"x":4.25, "y":0}, 
-              {"x":1.25, "y":1}, 
-              {"x":2.25, "y":1}, 
-              {"x":3.25, "y":1}, 
-              {"x":4.25, "y":1}, 
-              {"x":0, "y":2}, 
-              {"x":1.25, "y":2}, 
-              {"x":2.25, "y":2}, 
-              {"x":3.25, "y":2}, 
-              {"x":4.25, "y":2}, 
-              {"x":0, "y":3}, 
-              {"x":1.25, "y":3}, 
-              {"x":2.25, "y":3}, 
-              {"x":3.25, "y":3}, 
-              {"x":4.25, "y":3}
+                {"matrix": [0, 4], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 1], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 4], "x": 1.25, "y": 1},
+                {"matrix": [1, 3], "x": 2.25, "y": 1},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 1], "x": 4.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 4], "x": 1.25, "y": 2},
+                {"matrix": [2, 3], "x": 2.25, "y": 2},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 1], "x": 4.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 1], "x": 4.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/pabile/p18/p18.c b/keyboards/pabile/p18/p18.c
deleted file mode 100644
index 94e74a8315..0000000000
--- a/keyboards/pabile/p18/p18.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "p18.h"
diff --git a/keyboards/pabile/p18/p18.h b/keyboards/pabile/p18/p18.h
deleted file mode 100644
index 3be26191ce..0000000000
--- a/keyboards/pabile/p18/p18.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-         k01, k02, k03, k04, \
-         k11, k12, k13, k14, \
-    k20, k21, k22, k23, k24, \
-    k30, k31, k32, k33, k34 \
-) \
-{ \
-    {KC_NO, k04, k03, k02, k01}, \
-    {KC_NO, k14, k13, k12, k11}, \
-    {k20,   k24, k23, k22, k21}, \
-    {k30,   k34, k33, k32, k31} \
-} 
diff --git a/keyboards/pabile/p20/info.json b/keyboards/pabile/p20/info.json
index 08288d0c5d..2584130637 100644
--- a/keyboards/pabile/p20/info.json
+++ b/keyboards/pabile/p20/info.json
@@ -6,60 +6,5 @@
         "vid": "0x6666",
         "pid": "0x6667"
     },
-    "community_layouts": ["ortho_5x4", "numpad_5x4"],
-    "layouts": {
-        "LAYOUT_ortho_5x4": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4}
-            ]
-        },
-        "LAYOUT_numpad_5x4": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":1, "h":2},
-
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-
-                {"x":0, "y":4, "w":2},
-                {"x":2, "y":4},
-                {"x":3, "y":3, "h":2}
-            ]
-        }
-    }
+    "community_layouts": ["ortho_5x4", "numpad_5x4"]
 }
diff --git a/keyboards/pabile/p20/ver1/config.h b/keyboards/pabile/p20/ver1/config.h
deleted file mode 100644
index 4505e2718e..0000000000
--- a/keyboards/pabile/p20/ver1/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* pin-out */
-#define MATRIX_ROW_PINS { B3, B4, B5, D7, E6 }
-#define MATRIX_COL_PINS { D0, B2, D4, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
\ No newline at end of file
diff --git a/keyboards/pabile/p20/ver1/info.json b/keyboards/pabile/p20/ver1/info.json
index 1c5781995f..07fce7c5f5 100644
--- a/keyboards/pabile/p20/ver1/info.json
+++ b/keyboards/pabile/p20/ver1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "B2", "D4", "B6"],
+        "rows": ["B3", "B4", "B5", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F6"},
@@ -10,5 +15,60 @@
         ]
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "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": [2, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
+            ]
+        },
+        "LAYOUT_ortho_5x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/pabile/p20/ver1/ver1.c b/keyboards/pabile/p20/ver1/ver1.c
deleted file mode 100644
index 65e11630bc..0000000000
--- a/keyboards/pabile/p20/ver1/ver1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ver1.h"
diff --git a/keyboards/pabile/p20/ver1/ver1.h b/keyboards/pabile/p20/ver1/ver1.h
deleted file mode 100644
index 36ec781fa1..0000000000
--- a/keyboards/pabile/p20/ver1/ver1.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43 \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43} \
-} 
-
-#define LAYOUT_numpad_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12,      \
-    k20, k21, k22, k23, \
-    k30, k31, k32,      \
-    k40,      k42, k43  \
-) \
-{ \
-    {k00, k01,   k02, k03}, \
-    {k10, k11,   k12, KC_NO}, \
-    {k20, k21,   k22, k23}, \
-    {k30, k31,   k32, KC_NO}, \
-    {k40, KC_NO, k42, k43} \
-}
diff --git a/keyboards/pabile/p20/ver2/config.h b/keyboards/pabile/p20/ver2/config.h
deleted file mode 100644
index ff82e3e1ad..0000000000
--- a/keyboards/pabile/p20/ver2/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* pin-out */
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { D1, D0, D4, B2 }
- 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p20/ver2/info.json b/keyboards/pabile/p20/ver2/info.json
index d3c8d8aafc..35a0dc8ec2 100644
--- a/keyboards/pabile/p20/ver2/info.json
+++ b/keyboards/pabile/p20/ver2/info.json
@@ -3,6 +3,66 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "B2"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "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": [2, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
+            ]
+        },
+        "LAYOUT_ortho_5x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/pabile/p20/ver2/ver2.c b/keyboards/pabile/p20/ver2/ver2.c
deleted file mode 100644
index fa7e1f2e39..0000000000
--- a/keyboards/pabile/p20/ver2/ver2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ver2.h"
diff --git a/keyboards/pabile/p20/ver2/ver2.h b/keyboards/pabile/p20/ver2/ver2.h
deleted file mode 100644
index 36ec781fa1..0000000000
--- a/keyboards/pabile/p20/ver2/ver2.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43 \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43} \
-} 
-
-#define LAYOUT_numpad_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12,      \
-    k20, k21, k22, k23, \
-    k30, k31, k32,      \
-    k40,      k42, k43  \
-) \
-{ \
-    {k00, k01,   k02, k03}, \
-    {k10, k11,   k12, KC_NO}, \
-    {k20, k21,   k22, k23}, \
-    {k30, k31,   k32, KC_NO}, \
-    {k40, KC_NO, k42, k43} \
-}
diff --git a/keyboards/pabile/p40/config.h b/keyboards/pabile/p40/config.h
deleted file mode 100644
index b8bc06ce43..0000000000
--- a/keyboards/pabile/p40/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* pin-out
-for PCB ver0.01 452019 */
-#define MATRIX_ROW_PINS { F6, B3, B2, B6 }
-#define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1 }
-/*
-for pro micro facing back of pcb
-#define MATRIX_ROW_PINS { D4, E6, B4, B5 }
-#define MATRIX_COL_PINS { D1, D0, B6, B2, B3, B1, F7, F6, F5, F4 }
-*/
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p40/info.json b/keyboards/pabile/p40/info.json
index 703a3b1f80..7d0234e20e 100644
--- a/keyboards/pabile/p40/info.json
+++ b/keyboards/pabile/p40/info.json
@@ -8,52 +8,61 @@
     	"pid": "0x6666",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["F6", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x10"],
     "layouts": {
         "LAYOUT_ortho_4x10": {
             "layout": [
-				{"w":1, "x":0, "y":0},
-				{"w":1, "x":1, "y":0}, 
-				{"w":1, "x":2, "y":0}, 
-				{"w":1, "x":3, "y":0}, 
-				{"w":1, "x":4, "y":0}, 
-				{"w":1, "x":5, "y":0}, 
-				{"w":1, "x":6, "y":0}, 
-				{"w":1, "x":7, "y":0}, 
-				{"w":1, "x":8, "y":0}, 
-				{"w":1, "x":9, "y":0}, 
-				{"w":1, "x":0.25, "y":1}, 
-				{"w":1, "x":1.25, "y":1}, 
-				{"w":1, "x":2.25, "y":1}, 
-				{"w":1, "x":3.25, "y":1}, 
-				{"w":1, "x":4.25, "y":1}, 
-				{"w":1, "x":5.25, "y":1}, 
-				{"w":1, "x":6.25, "y":1}, 
-				{"w":1, "x":7.25, "y":1}, 
-				{"w":1, "x":8.25, "y":1}, 
-				{"w":1, "x":9.25, "y":1}, 
-				{"w":1, "x":0.5, "y":2}, 
-				{"w":1, "x":1.5, "y":2}, 
-				{"w":1, "x":2.5, "y":2}, 
-				{"w":1, "x":3.5, "y":2}, 
-				{"w":1, "x":4.5, "y":2}, 
-				{"w":1, "x":5.5, "y":2}, 
-				{"w":1, "x":6.5, "y":2}, 
-				{"w":1, "x":7.5, "y":2}, 
-				{"w":1, "x":8.5, "y":2}, 
-				{"w":1, "x":9.5, "y":2}, 
-				{"w":1, "x":0.75, "y":3}, 
-				{"w":1, "x":1.75, "y":3}, 
-				{"w":1, "x":2.75, "y":3}, 
-				{"w":1, "x":3.75, "y":3}, 
-				{"w":1, "x":4.75, "y":3}, 
-				{"w":1, "x":5.75, "y":3}, 
-				{"w":1, "x":6.75, "y":3}, 
-				{"w":1, "x":7.75, "y":3}, 
-				{"w":1, "x":8.75, "y":3}, 
-				{"w":1, "x":9.75, "y":3}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/pabile/p40/p40.c b/keyboards/pabile/p40/p40.c
deleted file mode 100644
index b1bfb7de2b..0000000000
--- a/keyboards/pabile/p40/p40.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "p40.h"
diff --git a/keyboards/pabile/p40/p40.h b/keyboards/pabile/p40/p40.h
deleted file mode 100644
index 4e1e08a6fc..0000000000
--- a/keyboards/pabile/p40/p40.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x10( \
-      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-      k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-      k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 \
-) \
-{ \
-      {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \
-      {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \
-      {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29}, \
-      {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39} \
-}
diff --git a/keyboards/pabile/p40_ortho/config.h b/keyboards/pabile/p40_ortho/config.h
deleted file mode 100644
index 6759ee13fd..0000000000
--- a/keyboards/pabile/p40_ortho/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* pin-out */
-#define MATRIX_ROW_PINS { D1, D0, F4, F5 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B2, B3, B1, F7, F6 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p40_ortho/info.json b/keyboards/pabile/p40_ortho/info.json
index 72cfe178b1..890a08babe 100644
--- a/keyboards/pabile/p40_ortho/info.json
+++ b/keyboards/pabile/p40_ortho/info.json
@@ -7,51 +7,107 @@
         "pid": "0x6669",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B2", "B3", "B1", "F7", "F6"],
+        "rows": ["D1", "D0", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_ortho_4x10": {
             "layout": [
-                {"label":"Q", "x":0, "y":0}, 
-                {"label":"W", "x":1, "y":0}, 
-                {"label":"E", "x":2, "y":0}, 
-                {"label":"R", "x":3, "y":0}, 
-                {"label":"T", "x":4, "y":0}, 
-                {"label":"Y", "x":5, "y":0}, 
-                {"label":"U", "x":6, "y":0}, 
-                {"label":"I", "x":7, "y":0}, 
-                {"label":"O", "x":8, "y":0}, 
-                {"label":"P", "x":9, "y":0}, 
-                {"label":"A", "x":0, "y":1}, 
-                {"label":"S", "x":1, "y":1}, 
-                {"label":"D", "x":2, "y":1}, 
-                {"label":"F", "x":3, "y":1}, 
-                {"label":"G", "x":4, "y":1}, 
-                {"label":"H", "x":5, "y":1}, 
-                {"label":"J", "x":6, "y":1}, 
-                {"label":"K", "x":7, "y":1}, 
-                {"label":"L", "x":8, "y":1}, 
-                {"label":"-", "x":9, "y":1}, 
-                {"label":"Z", "x":0, "y":2}, 
-                {"label":"X", "x":1, "y":2}, 
-                {"label":"C", "x":2, "y":2}, 
-                {"label":"V", "x":3, "y":2}, 
-                {"label":"B", "x":4, "y":2}, 
-                {"label":"N", "x":5, "y":2}, 
-                {"label":"M", "x":6, "y":2}, 
-                {"label":",", "x":7, "y":2}, 
-                {"label":".", "x":8, "y":2}, 
-                {"label":"?", "x":9, "y":2}, 
-                {"label":"Ctrl", "x":0, "y":3}, 
-                {"label":"Win", "x":1, "y":3}, 
-                {"label":"Alt", "x":2, "y":3}, 
-                {"label":"Shift", "x":3, "y":3}, 
-                {"label":"&larr;", "x":4, "y":3}, 
-                {"x":5, "y":3}, 
-                {"label":"Enter", "x":6, "y":3}, 
-                {"label":"Alt", "x":7, "y":3}, 
-                {"label":"Super", "x":8, "y":3}, 
-                {"label":"Ctrl", "x":9, "y":3}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x10_1x2u_c": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3}
+            ]
         }
     }
+
 }
diff --git a/keyboards/pabile/p40_ortho/p40_ortho.c b/keyboards/pabile/p40_ortho/p40_ortho.c
deleted file mode 100644
index b6573bd802..0000000000
--- a/keyboards/pabile/p40_ortho/p40_ortho.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "p40_ortho.h"
diff --git a/keyboards/pabile/p40_ortho/p40_ortho.h b/keyboards/pabile/p40_ortho/p40_ortho.h
deleted file mode 100644
index dd2c899daa..0000000000
--- a/keyboards/pabile/p40_ortho/p40_ortho.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x10( \
-      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-      k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-      k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 \
-) \
-{ \
-      {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \
-      {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \
-      {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29}, \
-      {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39} \
-}
-#define LAYOUT_ortho_4x10_1x2u_c( \
-      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-      k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-      k30, k31, k32, k33,    k34,   k36, k37, k38, k39 \
-) \
-{ \
-      {k00, k01, k02, k03, k04, k05,   k06, k07, k08, k09}, \
-      {k10, k11, k12, k13, k14, k15,   k16, k17, k18, k19}, \
-      {k20, k21, k22, k23, k24, k25,   k26, k27, k28, k29}, \
-      {k30, k31, k32, k33, k34, KC_NO, k36, k37, k38, k39} \
-}
diff --git a/keyboards/pabile/p42/config.h b/keyboards/pabile/p42/config.h
deleted file mode 100644
index f4a236a0c0..0000000000
--- a/keyboards/pabile/p42/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 Pabile
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* pin-out for PROMICRO */
-#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5, D2, D3, F7, B1, B3, B2, B6 }
-
-/* pin-out for BLUEFRUIT 
-#define MATRIX_ROW_PINS { F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { F1, F0, B1, B2, B3, D2, C7, D6, B7, B6, B5 }
-*/
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p42/info.json b/keyboards/pabile/p42/info.json
index f1ef5eda34..464b10b4dd 100644
--- a/keyboards/pabile/p42/info.json
+++ b/keyboards/pabile/p42/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6670",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5", "D2", "D3", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D1", "D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/pabile/p42/p42.c b/keyboards/pabile/p42/p42.c
deleted file mode 100644
index 63bf51bd58..0000000000
--- a/keyboards/pabile/p42/p42.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "p42.h"
diff --git a/keyboards/palette1202/config.h b/keyboards/palette1202/config.h
index d3c5f5edc0..6c2ebfdc39 100644
--- a/keyboards/palette1202/config.h
+++ b/keyboards/palette1202/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B6, B2, B3 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Register custom font file */
 #ifdef OLED_ENABLE
   #define OLED_FONT_H "lib/glcdfont.c"
diff --git a/keyboards/palette1202/info.json b/keyboards/palette1202/info.json
index 6698af203b..99f43a73f2 100644
--- a/keyboards/palette1202/info.json
+++ b/keyboards/palette1202/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1202",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C6", "D7", "E6", "B4", "B5"],
+    "rows": ["B6", "B2", "B3"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "F4", "pin_b": "F5", "resolution": 2},
@@ -19,22 +24,22 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label":"Tab",     "x": 0, "y": 0.75 },
-        { "label":"GUI + A", "x": 1, "y": 0.25 },
-        { "label":"E",       "x": 2, "y": 0 },
-        { "label":"P",       "x": 3, "y": 0.5 },
-        { "label":"GUI + 0", "x": 4, "y": 0 },
+          {"matrix": [0, 0], "x": 0, "y": 0.75},
+          {"matrix": [0, 1], "x": 1, "y": 0.25},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0.5},
+          {"matrix": [0, 4], "x": 4, "y": 0},
 
-        { "label":"Fn",      "x": 0, "y": 1.75 },
-        { "label":"M",       "x": 1, "y": 1.25 },
-        { "label":"BackSP",  "x": 2, "y": 1 },
-        { "label":"B",       "x": 3, "y": 1.5 },
-        { "label":"HYPR",    "x": 4, "y": 1 },
+          {"matrix": [1, 0], "x": 0, "y": 1.75},
+          {"matrix": [1, 1], "x": 1, "y": 1.25},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1.5},
+          {"matrix": [1, 4], "x": 4, "y": 1},
 
-        { "label":"Shift",   "x": 1, "y": 2.5 },
-        { "label":"LGUI",    "x": 2, "y": 2.5 },
-        { "label":"GUI + Z", "x": 3, "y": 2.5 },
-        { "label":"Space",   "x": 4, "y": 2.5, "r": 15 }
+          {"matrix": [2, 1], "x": 1, "y": 2.5},
+          {"matrix": [2, 2], "x": 2, "y": 2.5},
+          {"matrix": [2, 3], "x": 3, "y": 2.5},
+          {"matrix": [2, 4], "x": 4, "y": 2.5, "r": 15}
       ]
     }
   }
diff --git a/keyboards/palette1202/lib/oled_helper.c b/keyboards/palette1202/lib/oled_helper.c
index 5fb3cc7539..38608e5a6c 100644
--- a/keyboards/palette1202/lib/oled_helper.c
+++ b/keyboards/palette1202/lib/oled_helper.c
@@ -1,8 +1,10 @@
-#ifdef OLED_ENABLE
-#include QMK_KEYBOARD_H
+#include "oled_helper.h"
+#include "quantum.h"
 #include <stdio.h>
 #include <string.h>
 
+#ifdef OLED_ENABLE
+
 // returns character cord of the logo by line number
 char *read_logo(int row) {
   static char logoLines[][18] = {
diff --git a/keyboards/palette1202/palette1202.c b/keyboards/palette1202/palette1202.c
index a193964e3e..b2712df906 100644
--- a/keyboards/palette1202/palette1202.c
+++ b/keyboards/palette1202/palette1202.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "palette1202.h"
+#include "quantum.h"
 
 // initialize OLED if OLED is enabled
 #ifdef OLED_ENABLE
diff --git a/keyboards/palette1202/palette1202.h b/keyboards/palette1202/palette1202.h
deleted file mode 100644
index 737e381f73..0000000000
--- a/keyboards/palette1202/palette1202.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 niltea
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04,       \
-    k10, k11, k12, k13, k14,       \
-         k21, k22, k23, k24        \
-)                                  \
-{                                  \
-    { k00,   k01, k02, k03, k04 }, \
-    { k10,   k11, k12, k13, k14 }, \
-    { KC_NO, k21, k22, k23, k24 }, \
-}
diff --git a/keyboards/panc40/config.h b/keyboards/panc40/config.h
index 422b15b864..edc623d08f 100644
--- a/keyboards/panc40/config.h
+++ b/keyboards/panc40/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5 }
-#define MATRIX_COL_PINS { F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D0, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/panc40/info.json b/keyboards/panc40/info.json
index db7a1ead86..31b9bc8093 100644
--- a/keyboards/panc40/info.json
+++ b/keyboards/panc40/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D0", "D1"],
+        "rows": ["F0", "F1", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/panc40/panc40.c b/keyboards/panc40/panc40.c
deleted file mode 100644
index 8f6bd92dfb..0000000000
--- a/keyboards/panc40/panc40.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "panc40.h"
diff --git a/keyboards/panc60/config.h b/keyboards/panc60/config.h
index 32e6c4bd38..d324ea3f81 100644
--- a/keyboards/panc60/config.h
+++ b/keyboards/panc60/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 12
 
-#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/panc60/info.json b/keyboards/panc60/info.json
index 4daeffe763..508292c103 100644
--- a/keyboards/panc60/info.json
+++ b/keyboards/panc60/info.json
@@ -8,9 +8,17 @@
     "pid": "0x422D",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1"
   },
diff --git a/keyboards/panc60/panc60.c b/keyboards/panc60/panc60.c
deleted file mode 100644
index 16f298eb8d..0000000000
--- a/keyboards/panc60/panc60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "panc60.h"
diff --git a/keyboards/panc60/rules.mk b/keyboards/panc60/rules.mk
index c9d4726eec..4a44d3a547 100644
--- a/keyboards/panc60/rules.mk
+++ b/keyboards/panc60/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = no
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/papercranekeyboards/gerald65/config.h b/keyboards/papercranekeyboards/gerald65/config.h
index 3350165040..7848476216 100644
--- a/keyboards/papercranekeyboards/gerald65/config.h
+++ b/keyboards/papercranekeyboards/gerald65/config.h
@@ -3,23 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B7, D6, E6, B4, B5 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D7, D4, D3, D2, D1, D0, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/papercranekeyboards/gerald65/gerald65.c b/keyboards/papercranekeyboards/gerald65/gerald65.c
deleted file mode 100644
index a33f05d8dc..0000000000
--- a/keyboards/papercranekeyboards/gerald65/gerald65.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "gerald65.h"
diff --git a/keyboards/papercranekeyboards/gerald65/info.json b/keyboards/papercranekeyboards/gerald65/info.json
index 63b5e325f3..80b8f115b2 100644
--- a/keyboards/papercranekeyboards/gerald65/info.json
+++ b/keyboards/papercranekeyboards/gerald65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1501",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D7", "D4", "D3", "D2", "D1", "D0", "B6", "C6", "C7"],
+        "rows": ["B7", "D6", "E6", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/paprikman/albacore/albacore.c b/keyboards/paprikman/albacore/albacore.c
index d90adce2bb..b6cf742a11 100644
--- a/keyboards/paprikman/albacore/albacore.c
+++ b/keyboards/paprikman/albacore/albacore.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "albacore.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/paprikman/albacore/albacore.h b/keyboards/paprikman/albacore/albacore.h
deleted file mode 100644
index b725eba8b8..0000000000
--- a/keyboards/paprikman/albacore/albacore.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 paprikman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define ___ KC_NO
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-      K01, K02, K03, \
-  K10, K11, K12, K13 \
-) { \
-  { ___, K01, K02, K03 }, \
-  { K10, K11, K12, K13 }  \
-}
diff --git a/keyboards/paprikman/albacore/config.h b/keyboards/paprikman/albacore/config.h
index 91c434bba4..ede3d42de5 100644
--- a/keyboards/paprikman/albacore/config.h
+++ b/keyboards/paprikman/albacore/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D5, C7 }
-#define MATRIX_COL_PINS { C6, B6, B5, B4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B3
-
 #ifdef RGB_MATRIX_ENABLE
   #define RGB_MATRIX_LED_COUNT 8
   #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json
index 8e36e83b94..8d62d0a247 100644
--- a/keyboards/paprikman/albacore/info.json
+++ b/keyboards/paprikman/albacore/info.json
@@ -8,22 +8,33 @@
         "pid": "0x000A",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "B6", "B5", "B4"],
+        "rows": ["D5", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [1, 0]
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0.75, "y": 0},
-                {"x": 1.75, "y": 0},
-                {"x": 2.75, "y": 0},
+                {"matrix": [0, 1], "x": 0.75, "y": 0},
+                {"matrix": [0, 2], "x": 1.75, "y": 0},
+                {"matrix": [0, 3], "x": 2.75, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1}
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1}
             ]
         }
     }
diff --git a/keyboards/paprikman/albacore/rules.mk b/keyboards/paprikman/albacore/rules.mk
index c982617812..bfe55f1941 100644
--- a/keyboards/paprikman/albacore/rules.mk
+++ b/keyboards/paprikman/albacore/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LTO_ENABLE = yes
diff --git a/keyboards/parallel/parallel_65/hotswap/config.h b/keyboards/parallel/parallel_65/hotswap/config.h
index 049325aeab..4dfd5e1d02 100644
--- a/keyboards/parallel/parallel_65/hotswap/config.h
+++ b/keyboards/parallel/parallel_65/hotswap/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/parallel/parallel_65/hotswap/hotswap.c b/keyboards/parallel/parallel_65/hotswap/hotswap.c
deleted file mode 100644
index 4189a8a80c..0000000000
--- a/keyboards/parallel/parallel_65/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Matthew Dias
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hotswap.h"
diff --git a/keyboards/parallel/parallel_65/hotswap/hotswap.h b/keyboards/parallel/parallel_65/hotswap/hotswap.h
deleted file mode 100644
index 3da75e2ce3..0000000000
--- a/keyboards/parallel/parallel_65/hotswap/hotswap.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2021 Matthew Dias
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │0F │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │49  │4B  │ │4C │4D │4F │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                k49, k4B,      k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                          k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
diff --git a/keyboards/parallel/parallel_65/hotswap/info.json b/keyboards/parallel/parallel_65/hotswap/info.json
index 25a8b75f04..e3159e6186 100644
--- a/keyboards/parallel/parallel_65/hotswap/info.json
+++ b/keyboards/parallel/parallel_65/hotswap/info.json
@@ -7,157 +7,162 @@
         "pid": "0x5069",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4, "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w":2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.5 },
-                { "x":1.5, "y":4, "w":1 },
-                { "x":2.5, "y":4, "w":1.5 },
-                { "x":4, "y":4, "w":7 },
-                { "x":11, "y":4,  "w":1.5 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/parallel/parallel_65/soldered/config.h b/keyboards/parallel/parallel_65/soldered/config.h
index 049325aeab..4dfd5e1d02 100644
--- a/keyboards/parallel/parallel_65/soldered/config.h
+++ b/keyboards/parallel/parallel_65/soldered/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/parallel/parallel_65/soldered/info.json b/keyboards/parallel/parallel_65/soldered/info.json
index 509d14b264..2b82c13819 100644
--- a/keyboards/parallel/parallel_65/soldered/info.json
+++ b/keyboards/parallel/parallel_65/soldered/info.json
@@ -7,463 +7,468 @@
         "pid": "0x5068",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"],
     "layouts": {
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4,  "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4,  "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.5 },
-                { "x":1.5, "y":4, "w":1 },
-                { "x":2.5, "y":4, "w":1.5 },
-                { "x":4, "y":4, "w":7 },
-                { "x":11, "y":4,  "w":1.5 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2 },
-                { "x":13.75, "y":1, "w":1.25, "h":2 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":1.25 },
-                { "x":1.25, "y":3 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4,  "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2 },
-                { "x":13.75, "y":1, "w":1.25, "h":2 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":1.25 },
-                { "x":1.25, "y":3 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4,  "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan_split_bs": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2 },
-                { "x":13.75, "y":1, "w":1.25, "h":2 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":1.25 },
-                { "x":1.25, "y":3 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.5 },
-                { "x":1.5, "y":4, "w":1 },
-                { "x":2.5, "y":4, "w":1.5 },
-                { "x":4, "y":4, "w":7 },
-                { "x":11, "y":4,  "w":1.5 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/parallel/parallel_65/soldered/soldered.c b/keyboards/parallel/parallel_65/soldered/soldered.c
deleted file mode 100644
index a74cd21dea..0000000000
--- a/keyboards/parallel/parallel_65/soldered/soldered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Matthew Dias
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "soldered.h"
diff --git a/keyboards/parallel/parallel_65/soldered/soldered.h b/keyboards/parallel/parallel_65/soldered/soldered.h
deleted file mode 100644
index b2ae9cbaac..0000000000
--- a/keyboards/parallel/parallel_65/soldered/soldered.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright 2021 Matthew Dias
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0E     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │      │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�2D  │ ISO Enter
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │   │2C │    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │49  │4B  │ │4C │4D │4F │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────�
- * │40   │41 │42   │46                         │4B   │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                          k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                          k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
diff --git a/keyboards/pauperboards/brick/brick.c b/keyboards/pauperboards/brick/brick.c
deleted file mode 100644
index 13df995e54..0000000000
--- a/keyboards/pauperboards/brick/brick.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2023 Jason Chestnut <pauperboards@gmail.com> @pauperboards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { 
-        return false; 
-    }
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-       tap_code(KC_VOLD);
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json
index 62a104a337..b5832b9a79 100644
--- a/keyboards/pauperboards/brick/info.json
+++ b/keyboards/pauperboards/brick/info.json
@@ -32,7 +32,6 @@
         ]
     },
     "rgblight": {
-        "pin": "D2",
         "led_count": 8,
         "hue_steps": 8,
         "brightness_steps": 8,
@@ -50,6 +49,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "layouts": {
         "LAYOUT_ortho_2x2u": {
             "layout": [
diff --git a/keyboards/pdxkbc/config.h b/keyboards/pdxkbc/config.h
index f471e135d5..2f8b6d1f5b 100644
--- a/keyboards/pdxkbc/config.h
+++ b/keyboards/pdxkbc/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F7, B6, F4 }
-#define MATRIX_COL_PINS { D1, E6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/pdxkbc/info.json b/keyboards/pdxkbc/info.json
index e86295207c..b6d93e7de1 100644
--- a/keyboards/pdxkbc/info.json
+++ b/keyboards/pdxkbc/info.json
@@ -8,11 +8,25 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "E6"],
+        "rows": ["F7", "B6", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"reddit", "x":0, "y":0}, {"label":"discord", "x":1, "y":0}, {"label":"badge", "x":0, "y":1}, {"label":"hack", "x":1, "y":1}, {"label":"volu", "x":0, "y":2}, {"label":"vold", "x":1, "y":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/pdxkbc/pdxkbc.c b/keyboards/pdxkbc/pdxkbc.c
deleted file mode 100644
index dd464c561a..0000000000
--- a/keyboards/pdxkbc/pdxkbc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Franklin Harding
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "pdxkbc.h"
diff --git a/keyboards/pdxkbc/pdxkbc.h b/keyboards/pdxkbc/pdxkbc.h
deleted file mode 100644
index 4700252a66..0000000000
--- a/keyboards/pdxkbc/pdxkbc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 Franklin Harding
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, \
-    k10, k11, \
-    k20, k21 \
-) \
-{ \
-    { k00, k01 }, \
-    { k10, k11 }, \
-    { k20, k21 }, \
-}
diff --git a/keyboards/pearl/config.h b/keyboards/pearl/config.h
index 51e4b85e74..2a51abdab2 100644
--- a/keyboards/pearl/config.h
+++ b/keyboards/pearl/config.h
@@ -28,8 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 12
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3}
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pearl/info.json b/keyboards/pearl/info.json
index 96357ad346..8ac8ef0a7e 100644
--- a/keyboards/pearl/info.json
+++ b/keyboards/pearl/info.json
@@ -7,9 +7,17 @@
     "pid": "0x0348",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3"],
+    "rows": ["B0", "B1", "B2", "B3"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1",
     "num_lock": "D0",
@@ -19,16 +27,156 @@
   "bootloader": "bootloadhid",
   "layouts": {
     "LAYOUT_all": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"{", "x":11, "y":0}, {"label":"Backspace", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"A", "x":1.5, "y":1}, {"label":"S", "x":2.5, "y":1}, {"label":"D", "x":3.5, "y":1}, {"label":"F", "x":4.5, "y":1}, {"label":"G", "x":5.5, "y":1}, {"label":"H", "x":6.5, "y":1}, {"label":"J", "x":7.5, "y":1}, {"label":"K", "x":8.5, "y":1}, {"label":"L", "x":9.5, "y":1}, {"label":":", "x":10.5, "y":1}, {"label":"\\", "x":11.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2, "w":1.25}, {"label":"Alt", "x":1.13, "y":3}, {"label":"Ctrl", "x":2.13, "y":3, "w":1.25}, {"label":"Win", "x":3.375, "y":3, "w":1.25}, {"label":"Shift", "x":4.625, "y":3, "w":2.25}, {"x":6.875, "y":3, "w":1.25}, {"x":8.125, "y":3, "w":1.5}, {"label":"Menu", "x":9.625, "y":3}, {"label":"Fn", "x":10.63, "y":3, "w":1.25}]
-    },
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
 
-    "LAYOUT_splits": {
-      "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"{", "x":11, "y":0}, {"label":"}", "x":12, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.5}, {"label":"A", "x":1.5, "y":1}, {"label":"S", "x":2.5, "y":1}, {"label":"D", "x":3.5, "y":1}, {"label":"F", "x":4.5, "y":1}, {"label":"G", "x":5.5, "y":1}, {"label":"H", "x":6.5, "y":1}, {"label":"J", "x":7.5, "y":1}, {"label":"K", "x":8.5, "y":1}, {"label":"L", "x":9.5, "y":1}, {"label":":", "x":10.5, "y":1}, {"label":"Enter", "x":11.5, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Win", "x":2, "y":3, "w":1.25}, {"label":"Alt", "x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3, "w":2.25}, {"label":"Alt", "x":6.75, "y":3, "w":2.75}, {"label":"Win", "x":9.5, "y":3, "w":1.25}, {"label":"Menu", "x":10.75, "y":3}]
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 1.13, "y": 3},
+        {"matrix": [3, 1], "x": 2.13, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 3.375, "y": 3, "w": 1.25},
+        {"matrix": [3, 4], "x": 4.625, "y": 3, "w": 2.25},
+        {"matrix": [3, 5], "x": 6.875, "y": 3, "w": 1.25},
+        {"matrix": [3, 7], "x": 8.125, "y": 3, "w": 1.5},
+        {"matrix": [3, 9], "x": 9.625, "y": 3},
+        {"matrix": [3, 10], "x": 10.63, "y": 3, "w": 1.25}
+      ]
     },
+    "LAYOUT_splits": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
 
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 1, "y": 3},
+        {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.25},
+        {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75},
+        {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3}
+      ]
+    },
     "LAYOUT_spacebar": {
-      "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"{", "x":11, "y":0}, {"label":"}", "x":12, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.5}, {"label":"A", "x":1.5, "y":1}, {"label":"S", "x":2.5, "y":1}, {"label":"D", "x":3.5, "y":1}, {"label":"F", "x":4.5, "y":1}, {"label":"G", "x":5.5, "y":1}, {"label":"H", "x":6.5, "y":1}, {"label":"J", "x":7.5, "y":1}, {"label":"K", "x":8.5, "y":1}, {"label":"L", "x":9.5, "y":1}, {"label":":", "x":10.5, "y":1}, {"label":"Enter", "x":11.5, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Win", "x":2, "y":3, "w":1.25}, {"x":3.25, "y":3, "w":6.25}, {"label":"Win", "x":9.5, "y":3, "w":1.25}, {"label":"Menu", "x":10.75, "y":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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
 
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 1, "y": 3},
+        {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+        {"matrix": [3, 5], "x": 3.25, "y": 3, "w": 6.25},
+        {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3}
+      ]
+    }
   }
 }
diff --git a/keyboards/pearl/pearl.c b/keyboards/pearl/pearl.c
deleted file mode 100644
index 18ed9835d8..0000000000
--- a/keyboards/pearl/pearl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pearl.h"
diff --git a/keyboards/pearl/pearl.h b/keyboards/pearl/pearl.h
deleted file mode 100644
index 72df1595de..0000000000
--- a/keyboards/pearl/pearl.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-#include "pearl.h"
-
-#define LAYOUT_all( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,\
-   K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,  K1B, \
-    K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,\
-       K30, K31, K32,   K34,  K35, K37,   K39, K3A\
-){ \
-  { K00, K01, K02, K03,   K04, K05, K06,   K07, K08,   K09, K0A, K0B,   K0C}, \
-  { K10, K11, K12, K13,   K14, K15, K16,   K17, K18,   K19, K1A, K1B,   KC_NO}, \
-  { K20, K21, K22, K23,   K24, K25, K26,   K27, K28,   K29, K2A, K2B,   KC_NO}, \
-  { K30, K31, K32, KC_NO, K34, K35, KC_NO, K37, KC_NO, K39, K3A, KC_NO, KC_NO}, \
-}
-
-#define LAYOUT_splits( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,\
-   K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,  K1B, \
-    K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,\
-       K30, K31, K32,   K34,   K37,   K39, K3A\
-){ \
-  { K00, K01, K02, K03,   K04, K05, K06,   K07, K08,   K09, K0A, K0B,   K0C}, \
-  { K10, K11, K12, K13,   K14, K15, K16,   K17, K18,   K19, K1A, K1B,   KC_NO}, \
-  { K20, K21, K22, K23,   K24, K25, K26,   K27, K28,   K29, K2A, K2B,   KC_NO}, \
-  { K30, K31, K32, KC_NO, K34, KC_NO, KC_NO, K37, KC_NO, K39, K3A, KC_NO, KC_NO}, \
-}
-
-#define LAYOUT_spacebar( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,\
-   K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,  K1B, \
-    K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,\
-           K30, K31,              K35,           K39, K3A\
-){ \
-  { K00, K01, K02,   K03,   K04, K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C}, \
-  { K10, K11, K12,   K13,   K14, K15, K16,   K17,   K18,   K19, K1A, K1B,   KC_NO}, \
-  { K20, K21, K22,   K23,   K24, K25, K26,   K27,   K28,   K29, K2A, K2B,   KC_NO}, \
-  { K30, K31, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, K39, K3A, KC_NO, KC_NO}, \
-}
diff --git a/keyboards/pearl/rules.mk b/keyboards/pearl/rules.mk
index 9a00928ea8..51df0b642e 100644
--- a/keyboards/pearl/rules.mk
+++ b/keyboards/pearl/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/pearlboards/atlas/atlas.c b/keyboards/pearlboards/atlas/atlas.c
index ff8577bde1..d8fcc8abb9 100644
--- a/keyboards/pearlboards/atlas/atlas.c
+++ b/keyboards/pearlboards/atlas/atlas.c
@@ -15,17 +15,3 @@
  */
 
 #include "atlas.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h
index 92cef2fde0..009f810b0c 100644
--- a/keyboards/pearlboards/atlas/config.h
+++ b/keyboards/pearlboards/atlas/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D6, E1, C0, C4, E3 }
-#define MATRIX_COL_PINS { D5, D4, C1, C2, C3, C5, C7, A7, A6, A5, A4, A3, A2, A1, A0, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Audio Function */
 #define AUDIO_CLICKY
 #define AUDIO_PIN C6
@@ -48,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /*== all animations enabled ==*/
 /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_CHRISTMAS
@@ -64,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json
index 77c129e79f..11967be065 100644
--- a/keyboards/pearlboards/atlas/info.json
+++ b/keyboards/pearlboards/atlas/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6964",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "C1", "C2", "C3", "C5", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7"],
+        "rows": ["D6", "E1", "C0", "C4", "E3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "E0", "pin_b": "D7", "resolution": 1}
@@ -19,6 +24,9 @@
         "scroll_lock": "F6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h
index c039db9a15..02fc30db97 100644
--- a/keyboards/pearlboards/pandora/config.h
+++ b/keyboards/pearlboards/pandora/config.h
@@ -17,29 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, D7, D6, B3, B0 }
-#define MATRIX_COL_PINS { D2, D1, D0, D3, D5, B5, B6, B7, D4, C6, C7, F0, F1, F4, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define DIP_SWITCH_PINS { B2, B5 }
 
 /*== all animations enabled ==*/
 /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_CHRISTMAS
@@ -54,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/pandora/info.json b/keyboards/pearlboards/pandora/info.json
index 0114fb8e78..b3d80109fe 100644
--- a/keyboards/pearlboards/pandora/info.json
+++ b/keyboards/pearlboards/pandora/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6963",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0", "D3", "D5", "B5", "B6", "B7", "D4", "C6", "C7", "F0", "F1", "F4", "F7"],
+        "rows": ["B4", "D7", "D6", "B3", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F6", "pin_b": "F5", "resolution": 1}
@@ -17,6 +22,9 @@
         "caps_lock": "E6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/pearlboards/pandora/pandora.c b/keyboards/pearlboards/pandora/pandora.c
index 608ee00edf..927f29f2f3 100644
--- a/keyboards/pearlboards/pandora/pandora.c
+++ b/keyboards/pearlboards/pandora/pandora.c
@@ -16,24 +16,6 @@
 
 #include "pandora.h"
 
-// Encoder rotate function
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    /* First encoder */
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_AUDIO_VOL_UP);
-        } else {
-            tap_code(KC_AUDIO_VOL_DOWN);
-        }
-    }
-    return true;
-}
-#endif
-
 // Encoder click function
 #ifdef DIP_SWITCH_ENABLE
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h
index 3faaca26a0..361c315929 100644
--- a/keyboards/pearlboards/pearl/config.h
+++ b/keyboards/pearlboards/pearl/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, F7, F0, E6 }
-#define MATRIX_COL_PINS { D2, F1, F4, F5, F6, C7, B6, B5, B4, D7, D6, D4, D5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Audio Function */
 #define AUDIO_CLICKY
 #define AUDIO_PIN C6
@@ -48,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /*== all animations enabled ==*/
 /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_CHRISTMAS
@@ -65,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json
index f6082c1d37..1a4b7f301c 100644
--- a/keyboards/pearlboards/pearl/info.json
+++ b/keyboards/pearlboards/pearl/info.json
@@ -8,12 +8,20 @@
         "pid": "0x6965",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "F1", "F4", "F5", "F6", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["D3", "F7", "F0", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0",
         "num_lock": "B1",
         "scroll_lock": "B2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 4,
diff --git a/keyboards/pearlboards/pearl/pearl.c b/keyboards/pearlboards/pearl/pearl.c
deleted file mode 100644
index f1ccf3fd9a..0000000000
--- a/keyboards/pearlboards/pearl/pearl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Koobaczech
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pearl.h"
diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h
index deb979dd06..102c43e168 100644
--- a/keyboards/pearlboards/zeus/config.h
+++ b/keyboards/pearlboards/zeus/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, C1, E1, E0, D7, D6 }
-#define MATRIX_COL_PINS { F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C7, C2, C0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Audio Function */
 #define AUDIO_CLICKY
 #define AUDIO_PIN C6
@@ -52,8 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /*== all animations enabled ==*/
 /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_CHRISTMAS
@@ -68,7 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json
index 3d2f44a892..6fbe41611e 100644
--- a/keyboards/pearlboards/zeus/info.json
+++ b/keyboards/pearlboards/zeus/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6966",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C2", "C0"],
+        "rows": ["F0", "C1", "E1", "E0", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "E7", "pin_b": "E6", "resolution": 1}
@@ -19,6 +24,9 @@
         "scroll_lock": "C3",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "D5"
+    },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/pearlboards/zeus/zeus.c b/keyboards/pearlboards/zeus/zeus.c
index cdb8d6125d..b6a7fe1f8e 100644
--- a/keyboards/pearlboards/zeus/zeus.c
+++ b/keyboards/pearlboards/zeus/zeus.c
@@ -15,20 +15,3 @@
  */
 
 #include "zeus.h"
-
-// Encoder rotate function
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }    /* First encoder */
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_AUDIO_VOL_UP);
-        } else {
-            tap_code(KC_AUDIO_VOL_DOWN);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h
index f61e11fca9..205cad6e32 100644
--- a/keyboards/pearlboards/zeuspad/config.h
+++ b/keyboards/pearlboards/zeuspad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D3, D5, F7, F4, F1 }
-#define MATRIX_COL_PINS { B0, F0, F5, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* OLED Settings */
 #define OLED_TIMEOUT 120000
 #define OLED_FADE_OUT
@@ -43,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /*== all animations enabled ==*/
 /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_CHRISTMAS
@@ -59,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/zeuspad/info.json b/keyboards/pearlboards/zeuspad/info.json
index 3258e758a8..c062ce5442 100644
--- a/keyboards/pearlboards/zeuspad/info.json
+++ b/keyboards/pearlboards/zeuspad/info.json
@@ -8,11 +8,19 @@
         "pid": "0x6967",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "F0", "F5", "F6"],
+        "rows": ["D2", "D3", "D5", "F7", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D6", "pin_b": "D4", "resolution": 1}
         ]
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 0,
diff --git a/keyboards/pearlboards/zeuspad/zeuspad.c b/keyboards/pearlboards/zeuspad/zeuspad.c
index 3f7367fb49..ffa504fa63 100644
--- a/keyboards/pearlboards/zeuspad/zeuspad.c
+++ b/keyboards/pearlboards/zeuspad/zeuspad.c
@@ -16,24 +16,6 @@
 
 #include "zeuspad.h"
 
-// Encoder rotate function
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    /* First encoder */
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_AUDIO_VOL_UP, 10);
-        } else {
-            tap_code_delay(KC_AUDIO_VOL_DOWN, 10);
-        }
-    }
-    return true;
-}
-#endif
-
 // 21 characters max
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/peej/lumberjack/config.h b/keyboards/peej/lumberjack/config.h
index 032cdf4e23..0079764d8e 100644
--- a/keyboards/peej/lumberjack/config.h
+++ b/keyboards/peej/lumberjack/config.h
@@ -16,11 +16,4 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1 }
-#define MATRIX_COL_PINS { B0, D7, D6, D5, D4, D1, D0, C1, C2, C3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/peej/lumberjack/info.json b/keyboards/peej/lumberjack/info.json
index 7e3878151f..c65c4bea47 100644
--- a/keyboards/peej/lumberjack/info.json
+++ b/keyboards/peej/lumberjack/info.json
@@ -8,72 +8,81 @@
     "pid": "0x0002",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "D7", "D6", "D5", "D4", "D1", "D0", "C1", "C2", "C3"],
+    "rows": ["C0", "B5", "B4", "B3", "B2", "B1"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega328p",
   "bootloader": "usbasploader",
   "community_layouts": ["ortho_5x12"],
   "layouts": {
     "LAYOUT_ortho_5x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 },
-        { "x": 0, "y": 4 },
-        { "x": 1, "y": 4 },
-        { "x": 2, "y": 4 },
-        { "x": 3, "y": 4 },
-        { "x": 4, "y": 4 },
-        { "x": 5, "y": 4 },
-        { "x": 6, "y": 4 },
-        { "x": 7, "y": 4 },
-        { "x": 8, "y": 4 },
-        { "x": 9, "y": 4 },
-        { "x": 10, "y": 4 },
-        { "x": 11, "y": 4 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [1, 4], "x": 5, "y": 0},
+        {"matrix": [1, 9], "x": 6, "y": 0},
+        {"matrix": [0, 9], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 7], "x": 9, "y": 0},
+        {"matrix": [0, 6], "x": 10, "y": 0},
+        {"matrix": [0, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [2, 3], "x": 4, "y": 1},
+        {"matrix": [2, 4], "x": 5, "y": 1},
+        {"matrix": [2, 9], "x": 6, "y": 1},
+        {"matrix": [2, 8], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 7], "x": 9, "y": 1},
+        {"matrix": [1, 6], "x": 10, "y": 1},
+        {"matrix": [1, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [3, 2], "x": 3, "y": 2},
+        {"matrix": [3, 3], "x": 4, "y": 2},
+        {"matrix": [3, 4], "x": 5, "y": 2},
+        {"matrix": [3, 9], "x": 6, "y": 2},
+        {"matrix": [3, 8], "x": 7, "y": 2},
+        {"matrix": [3, 7], "x": 8, "y": 2},
+        {"matrix": [2, 7], "x": 9, "y": 2},
+        {"matrix": [2, 6], "x": 10, "y": 2},
+        {"matrix": [2, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [4, 1], "x": 2, "y": 3},
+        {"matrix": [4, 2], "x": 3, "y": 3},
+        {"matrix": [4, 3], "x": 4, "y": 3},
+        {"matrix": [4, 4], "x": 5, "y": 3},
+        {"matrix": [4, 9], "x": 6, "y": 3},
+        {"matrix": [4, 8], "x": 7, "y": 3},
+        {"matrix": [4, 7], "x": 8, "y": 3},
+        {"matrix": [4, 6], "x": 9, "y": 3},
+        {"matrix": [3, 6], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [5, 0], "x": 1, "y": 4},
+        {"matrix": [5, 1], "x": 2, "y": 4},
+        {"matrix": [5, 2], "x": 3, "y": 4},
+        {"matrix": [5, 3], "x": 4, "y": 4},
+        {"matrix": [5, 4], "x": 5, "y": 4},
+        {"matrix": [5, 9], "x": 6, "y": 4},
+        {"matrix": [5, 8], "x": 7, "y": 4},
+        {"matrix": [5, 7], "x": 8, "y": 4},
+        {"matrix": [5, 6], "x": 9, "y": 4},
+        {"matrix": [5, 5], "x": 10, "y": 4},
+        {"matrix": [4, 5], "x": 11, "y": 4}
       ]
     }
   }
diff --git a/keyboards/peej/lumberjack/lumberjack.h b/keyboards/peej/lumberjack/lumberjack.h
index 785f13a903..b14f72d81e 100644
--- a/keyboards/peej/lumberjack/lumberjack.h
+++ b/keyboards/peej/lumberjack/lumberjack.h
@@ -18,21 +18,5 @@
 
 #include "quantum.h"
 
-#define LAYOUT_ortho_5x12( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k0b, k0a, k09, k08, k07 }, \
-	{ k10, k11, k12, k13, k05, k1b, k1a, k19, k18, k06 }, \
-	{ k20, k21, k22, k14, k15, k2b, k2a, k29, k17, k16 }, \
-	{ k30, k31, k23, k24, k25, k3b, k3a, k28, k27, k26 }, \
-	{ k40, k32, k33, k34, k35, k4b, k39, k38, k37, k36 }, \
-	{ k41, k42, k43, k44, k45, k4a, k49, k48, k47, k46 } \
-}
-
 #define LED1 C5
 #define LED2 C4
diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h
index 0bd9a069d0..18505def82 100644
--- a/keyboards/peej/rosaline/config.h
+++ b/keyboards/peej/rosaline/config.h
@@ -16,11 +16,7 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1, C3, D5 }
-#define MATRIX_COL_PINS { B0, D7, D6, C2, D4, D1, D0, C1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
+
+#define LED1 C5
+#define LED2 C4
diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json
index 2be28d4ef6..c175aafb42 100644
--- a/keyboards/peej/rosaline/ortho/info.json
+++ b/keyboards/peej/rosaline/ortho/info.json
@@ -8,71 +8,79 @@
     "pid": "0x0003",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
+    "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega328p",
   "bootloader": "usbasploader",
   "layouts": {
     "LAYOUT_ortho_4x15": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 12, "y": 0 },
-        { "x": 13, "y": 0 },
-        { "x": 14, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 12, "y": 1 },
-        { "x": 13, "y": 1 },
-        { "x": 14, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 12, "y": 2 },
-        { "x": 13, "y": 2 },
-        { "x": 14, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 },
-        { "x": 12, "y": 3 },
-        { "x": 13, "y": 3 },
-        { "x": 14, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [4, 0], "x": 1, "y": 0},
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [4, 1], "x": 3, "y": 0},
+        {"matrix": [0, 2], "x": 4, "y": 0},
+        {"matrix": [4, 2], "x": 5, "y": 0},
+        {"matrix": [0, 3], "x": 6, "y": 0},
+        {"matrix": [4, 3], "x": 7, "y": 0},
+        {"matrix": [0, 4], "x": 8, "y": 0},
+        {"matrix": [4, 4], "x": 9, "y": 0},
+        {"matrix": [0, 5], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+        {"matrix": [0, 6], "x": 12, "y": 0},
+        {"matrix": [4, 6], "x": 13, "y": 0},
+        {"matrix": [0, 7], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [5, 0], "x": 1, "y": 1},
+        {"matrix": [1, 1], "x": 2, "y": 1},
+        {"matrix": [5, 1], "x": 3, "y": 1},
+        {"matrix": [1, 2], "x": 4, "y": 1},
+        {"matrix": [5, 2], "x": 5, "y": 1},
+        {"matrix": [1, 3], "x": 6, "y": 1},
+        {"matrix": [5, 3], "x": 7, "y": 1},
+        {"matrix": [1, 4], "x": 8, "y": 1},
+        {"matrix": [5, 4], "x": 9, "y": 1},
+        {"matrix": [1, 5], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+        {"matrix": [1, 6], "x": 12, "y": 1},
+        {"matrix": [5, 6], "x": 13, "y": 1},
+        {"matrix": [1, 7], "x": 14, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [6, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [6, 1], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2},
+        {"matrix": [6, 2], "x": 5, "y": 2},
+        {"matrix": [2, 3], "x": 6, "y": 2},
+        {"matrix": [6, 3], "x": 7, "y": 2},
+        {"matrix": [2, 4], "x": 8, "y": 2},
+        {"matrix": [6, 4], "x": 9, "y": 2},
+        {"matrix": [2, 5], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+        {"matrix": [2, 6], "x": 12, "y": 2},
+        {"matrix": [6, 6], "x": 13, "y": 2},
+        {"matrix": [2, 7], "x": 14, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [7, 0], "x": 1, "y": 3},
+        {"matrix": [3, 1], "x": 2, "y": 3},
+        {"matrix": [7, 1], "x": 3, "y": 3},
+        {"matrix": [3, 2], "x": 4, "y": 3},
+        {"matrix": [7, 2], "x": 5, "y": 3},
+        {"matrix": [3, 3], "x": 6, "y": 3},
+        {"matrix": [7, 3], "x": 7, "y": 3},
+        {"matrix": [3, 4], "x": 8, "y": 3},
+        {"matrix": [7, 4], "x": 9, "y": 3},
+        {"matrix": [3, 5], "x": 10, "y": 3},
+        {"matrix": [7, 5], "x": 11, "y": 3},
+        {"matrix": [3, 6], "x": 12, "y": 3},
+        {"matrix": [7, 6], "x": 13, "y": 3},
+        {"matrix": [3, 7], "x": 14, "y": 3}
       ]
     }
   }
diff --git a/keyboards/peej/rosaline/ortho/ortho.h b/keyboards/peej/rosaline/ortho/ortho.h
deleted file mode 100644
index b3287784c3..0000000000
--- a/keyboards/peej/rosaline/ortho/ortho.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "rosaline.h"
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │40 │01 │41 │02 │42 │03 │43 │04 │44 │05 │45 │06 │46 │07 │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │10 │50 │11 │51 │12 │52 │13 │53 │14 │54 │15 │55 │16 │56 │17 │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │20 │60 │21 │61 │22 │62 │23 │63 │24 │64 │25 │65 │26 │66 │27 │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │30 │70 │31 │71 │32 │72 │33 │73 │34 │74 │35 │75 │36 │76 │37 │
- * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
- *                 ┌───────────────────────────�
- *                 │73                         │ 7u Space
- *                 └───────────────────────────┘
- *                 ┌───────�           ┌───────�
- *         2u Left │32     │           │35     │ 2u Right
- *                 └───────┘           └───────┘
- */
-
-#define LAYOUT_ortho_4x15( \
-	k00, k40, k01, k41, k02, k42, k03, k43, k04, k44, k05, k45, k06, k46, k07, \
-	k10, k50, k11, k51, k12, k52, k13, k53, k14, k54, k15, k55, k16, k56, k17, \
-	k20, k60, k21, k61, k22, k62, k23, k63, k24, k64, k25, k65, k26, k66, k27, \
-	k30, k70, k31, k71, k32, k72, k33, k73, k34, k74, k35, k75, k36, k76, k37  \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07 }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17 }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27 }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37 }, \
-	{ k40, k41, k42, k43, k44, k45, k46, XXX }, \
-	{ k50, k51, k52, k53, k54, k55, k56, XXX }, \
-	{ k60, k61, k62, k63, k64, k65, k66, XXX }, \
-	{ k70, k71, k72, k73, k74, k75, k76, XXX } \
-}
-
-#define LED1 C5
-#define LED2 C4
diff --git a/keyboards/peej/rosaline/rosaline.c b/keyboards/peej/rosaline/rosaline.c
index 57141e8064..df0594da44 100644
--- a/keyboards/peej/rosaline/rosaline.c
+++ b/keyboards/peej/rosaline/rosaline.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rosaline.h"
+#include "quantum.h"
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     writePin(LED1, record->event.pressed);
diff --git a/keyboards/peej/rosaline/rosaline.h b/keyboards/peej/rosaline/rosaline.h
deleted file mode 100644
index 22125f3188..0000000000
--- a/keyboards/peej/rosaline/rosaline.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#if defined(KEYBOARD_peej_rosaline_staggered)
-    #include "staggered.h"
-#elif defined(KEYBOARD_peej_rosaline_ortho)
-    #include "ortho.h"
-#endif
-
-#define LED1 C5
-#define LED2 C4
diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json
index f37e073fbd..f110f0e325 100644
--- a/keyboards/peej/rosaline/staggered/info.json
+++ b/keyboards/peej/rosaline/staggered/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
+        "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "layout_aliases": {
diff --git a/keyboards/peej/rosaline/staggered/staggered.h b/keyboards/peej/rosaline/staggered/staggered.h
index cc2703c834..98186320a5 100644
--- a/keyboards/peej/rosaline/staggered/staggered.h
+++ b/keyboards/peej/rosaline/staggered/staggered.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "rosaline.h"
+#include "quantum.h"
 
 /*
  * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────�
@@ -36,6 +36,8 @@
  *                 └──────────┴───┴────────┴───┘
  */
 
+#define XXX KC_NO
+
 #define LAYOUT_all( \
 	k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k06, k16, k07, k17, \
 	k20, k11, k21, k22, k32, k23, k33, k24, k15, k25, k26, k36,      k27, \
@@ -52,6 +54,3 @@
 	{ XXX, XXX, XXX, XXX, XXX, k65, k66, k67 }, \
 	{ XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
 }
-
-#define LED1 C5
-#define LED2 C4
diff --git a/keyboards/peej/tripel/config.h b/keyboards/peej/tripel/config.h
deleted file mode 100644
index 2d50ad8038..0000000000
--- a/keyboards/peej/tripel/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { C6, D4, D0, B4, E6, D7, D1, D2, D3 }
-#define MATRIX_COL_PINS { B5, B6, B2, B3, B1, F7, F6, F5 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/peej/tripel/info.json b/keyboards/peej/tripel/info.json
index 3816cf7592..15980f254a 100644
--- a/keyboards/peej/tripel/info.json
+++ b/keyboards/peej/tripel/info.json
@@ -8,81 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5"],
+        "rows": ["C6", "D4", "D0", "B4", "E6", "D7", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_ortho_7u": {
-            "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":0, "y":1 },
-                { "x":1, "y":1 },
-                { "x":2, "y":1 },
-                { "x":3, "y":1 },
-                { "x":4, "y":1 },
-                { "x":5, "y":1 },
-                { "x":6, "y":1 },
-                { "x":7, "y":1 },
-                { "x":8, "y":1 },
-                { "x":9, "y":1 },
-                { "x":10, "y":1 },
-                { "x":11, "y":1 },
-                { "x":12, "y":1 },
-                { "x":13, "y":1 },
-                { "x":14, "y":1 },
-                { "x":0, "y":2 },
-                { "x":1, "y":2 },
-                { "x":2, "y":2 },
-                { "x":3, "y":2 },
-                { "x":4, "y":2 },
-                { "x":5, "y":2 },
-                { "x":6, "y":2 },
-                { "x":7, "y":2 },
-                { "x":8, "y":2 },
-                { "x":9, "y":2 },
-                { "x":10, "y":2 },
-                { "x":11, "y":2 },
-                { "x":12, "y":2 },
-                { "x":13, "y":2 },
-                { "x":14, "y":2 },
-                { "x":0, "y":3 },
-                { "x":1, "y":3 },
-                { "x":2, "y":3 },
-                { "x":3, "y":3 },
-                { "x":4, "y":3 },
-                { "x":5, "y":3 },
-                { "x":6, "y":3 },
-                { "x":7, "y":3 },
-                { "x":8, "y":3 },
-                { "x":9, "y":3 },
-                { "x":10, "y":3 },
-                { "x":11, "y":3 },
-                { "x":12, "y":3 },
-                { "x":13, "y":3 },
-                { "x":14, "y":3 },
-                { "x":0, "y":4 },
-                { "x":1, "y":4 },
-                { "x":2, "y":4 },
-                { "x":3, "y":4 },
-                { "x":7, "y":4, "w":7 },
-                { "x":11, "y":4 },
-                { "x":12, "y":4 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 }
-            ]
-        }
-    }
+    "bootloader": "caterina"
 }
diff --git a/keyboards/peej/tripel/left/info.json b/keyboards/peej/tripel/left/info.json
new file mode 100644
index 0000000000..b938ef9b9a
--- /dev/null
+++ b/keyboards/peej/tripel/left/info.json
@@ -0,0 +1,81 @@
+{
+    "layouts": {
+        "LAYOUT_ortho_7u": {
+            "layout": [
+                {"matrix": [3, 0], "x": 0, "y": 0},
+                {"matrix": [3, 1], "x": 1, "y": 0},
+                {"matrix": [3, 2], "x": 2, "y": 0},
+                {"matrix": [3, 3], "x": 3, "y": 0},
+                {"matrix": [3, 4], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 2], "x": 7, "y": 0},
+                {"matrix": [6, 3], "x": 8, "y": 0},
+                {"matrix": [6, 4], "x": 9, "y": 0},
+                {"matrix": [0, 0], "x": 10, "y": 0},
+                {"matrix": [0, 1], "x": 11, "y": 0},
+                {"matrix": [0, 2], "x": 12, "y": 0},
+                {"matrix": [0, 3], "x": 13, "y": 0},
+                {"matrix": [0, 4], "x": 14, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [3, 5], "x": 4, "y": 1},
+                {"matrix": [7, 0], "x": 5, "y": 1},
+                {"matrix": [7, 1], "x": 6, "y": 1},
+                {"matrix": [7, 2], "x": 7, "y": 1},
+                {"matrix": [7, 3], "x": 8, "y": 1},
+                {"matrix": [6, 5], "x": 9, "y": 1},
+                {"matrix": [1, 0], "x": 10, "y": 1},
+                {"matrix": [1, 1], "x": 11, "y": 1},
+                {"matrix": [1, 2], "x": 12, "y": 1},
+                {"matrix": [1, 3], "x": 13, "y": 1},
+                {"matrix": [0, 5], "x": 14, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2},
+                {"matrix": [5, 1], "x": 1, "y": 2},
+                {"matrix": [5, 2], "x": 2, "y": 2},
+                {"matrix": [4, 4], "x": 3, "y": 2},
+                {"matrix": [3, 6], "x": 4, "y": 2},
+                {"matrix": [8, 0], "x": 5, "y": 2},
+                {"matrix": [8, 1], "x": 6, "y": 2},
+                {"matrix": [8, 2], "x": 7, "y": 2},
+                {"matrix": [7, 4], "x": 8, "y": 2},
+                {"matrix": [6, 6], "x": 9, "y": 2},
+                {"matrix": [2, 0], "x": 10, "y": 2},
+                {"matrix": [2, 1], "x": 11, "y": 2},
+                {"matrix": [2, 2], "x": 12, "y": 2},
+                {"matrix": [1, 4], "x": 13, "y": 2},
+                {"matrix": [0, 6], "x": 14, "y": 2},
+
+                {"matrix": [5, 5], "x": 0, "y": 3},
+                {"matrix": [5, 4], "x": 1, "y": 3},
+                {"matrix": [5, 3], "x": 2, "y": 3},
+                {"matrix": [4, 5], "x": 3, "y": 3},
+                {"matrix": [3, 7], "x": 4, "y": 3},
+                {"matrix": [8, 5], "x": 5, "y": 3},
+                {"matrix": [8, 4], "x": 6, "y": 3},
+                {"matrix": [8, 3], "x": 7, "y": 3},
+                {"matrix": [7, 5], "x": 8, "y": 3},
+                {"matrix": [6, 7], "x": 9, "y": 3},
+                {"matrix": [2, 5], "x": 10, "y": 3},
+                {"matrix": [2, 4], "x": 11, "y": 3},
+                {"matrix": [2, 3], "x": 12, "y": 3},
+                {"matrix": [1, 5], "x": 13, "y": 3},
+                {"matrix": [0, 7], "x": 14, "y": 3},
+
+                {"matrix": [5, 6], "x": 0, "y": 4},
+                {"matrix": [5, 7], "x": 1, "y": 4},
+                {"matrix": [4, 6], "x": 2, "y": 4},
+                {"matrix": [4, 7], "x": 3, "y": 4},
+                {"matrix": [7, 6], "x": 7, "y": 4, "w": 7},
+                {"matrix": [2, 7], "x": 11, "y": 4},
+                {"matrix": [1, 6], "x": 12, "y": 4},
+                {"matrix": [1, 7], "x": 13, "y": 4},
+                {"matrix": [2, 6], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/peej/tripel/left/left.h b/keyboards/peej/tripel/left/left.h
deleted file mode 100644
index 852a503e60..0000000000
--- a/keyboards/peej/tripel/left/left.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_7u( \
-    l11, l12, l13, l14, l15, m11, m12, m13, m14, m15, r11, r12, r13, r14, r15, \
-    l21, l22, l23, l24, l25, m21, m22, m23, m24, m25, r21, r22, r23, r24, r25, \
-    l31, l32, l33, l34, l35, m31, m32, m33, m34, m35, r31, r32, r33, r34, r35, \
-    l41, l42, l43, l44, l45, m41, m42, m43, m44, m45, r41, r42, r43, r44, r45, \
-    l51, l52, l53, l54,                m53,                r52, r53, r54, r51  \
-) \
-{ \
-    { r11, r12, r13, r14, r15, r25, r35, r45 }, \
-    { r21, r22, r23, r24, r34, r44, r53, r54 }, \
-    { r31, r32, r33, r43, r42, r41, r51, r52 }, \
-    { l11, l12, l13, l14, l15, l25, l35, l45 }, \
-    { l21, l22, l23, l24, l34, l44, l53, l54 }, \
-    { l31, l32, l33, l43, l42, l41, l51, l52 }, \
-    { m11, m12, m13, m14, m15, m25, m35, m45 }, \
-    { m21, m22, m23, m24, m34, m44, m53, KC_NO }, \
-    { m31, m32, m33, m43, m42, m41, KC_NO, KC_NO } \
-}
diff --git a/keyboards/peej/tripel/middle/info.json b/keyboards/peej/tripel/middle/info.json
new file mode 100644
index 0000000000..b1bdf10f82
--- /dev/null
+++ b/keyboards/peej/tripel/middle/info.json
@@ -0,0 +1,81 @@
+{
+    "layouts": {
+        "LAYOUT_ortho_7u": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+                {"matrix": [3, 1], "x": 6, "y": 0},
+                {"matrix": [3, 2], "x": 7, "y": 0},
+                {"matrix": [3, 3], "x": 8, "y": 0},
+                {"matrix": [3, 4], "x": 9, "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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [0, 5], "x": 4, "y": 1},
+                {"matrix": [4, 0], "x": 5, "y": 1},
+                {"matrix": [4, 1], "x": 6, "y": 1},
+                {"matrix": [4, 2], "x": 7, "y": 1},
+                {"matrix": [4, 3], "x": 8, "y": 1},
+                {"matrix": [3, 5], "x": 9, "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": [6, 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": [1, 4], "x": 3, "y": 2},
+                {"matrix": [0, 6], "x": 4, "y": 2},
+                {"matrix": [5, 0], "x": 5, "y": 2},
+                {"matrix": [5, 1], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [3, 6], "x": 9, "y": 2},
+                {"matrix": [8, 0], "x": 10, "y": 2},
+                {"matrix": [8, 1], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2},
+                {"matrix": [7, 4], "x": 13, "y": 2},
+                {"matrix": [6, 6], "x": 14, "y": 2},
+
+                {"matrix": [2, 5], "x": 0, "y": 3},
+                {"matrix": [2, 4], "x": 1, "y": 3},
+                {"matrix": [2, 3], "x": 2, "y": 3},
+                {"matrix": [1, 5], "x": 3, "y": 3},
+                {"matrix": [0, 7], "x": 4, "y": 3},
+                {"matrix": [5, 5], "x": 5, "y": 3},
+                {"matrix": [5, 4], "x": 6, "y": 3},
+                {"matrix": [5, 3], "x": 7, "y": 3},
+                {"matrix": [4, 5], "x": 8, "y": 3},
+                {"matrix": [3, 7], "x": 9, "y": 3},
+                {"matrix": [8, 5], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 3], "x": 12, "y": 3},
+                {"matrix": [7, 5], "x": 13, "y": 3},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+
+                {"matrix": [2, 6], "x": 0, "y": 4},
+                {"matrix": [2, 7], "x": 1, "y": 4},
+                {"matrix": [1, 6], "x": 2, "y": 4},
+                {"matrix": [1, 7], "x": 3, "y": 4},
+                {"matrix": [4, 6], "x": 7, "y": 4, "w": 7},
+                {"matrix": [8, 7], "x": 11, "y": 4},
+                {"matrix": [7, 6], "x": 12, "y": 4},
+                {"matrix": [7, 7], "x": 13, "y": 4},
+                {"matrix": [8, 6], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/peej/tripel/middle/middle.h b/keyboards/peej/tripel/middle/middle.h
deleted file mode 100644
index 450eb095c3..0000000000
--- a/keyboards/peej/tripel/middle/middle.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_7u( \
-    l11, l12, l13, l14, l15, m11, m12, m13, m14, m15, r11, r12, r13, r14, r15, \
-    l21, l22, l23, l24, l25, m21, m22, m23, m24, m25, r21, r22, r23, r24, r25, \
-    l31, l32, l33, l34, l35, m31, m32, m33, m34, m35, r31, r32, r33, r34, r35, \
-    l41, l42, l43, l44, l45, m41, m42, m43, m44, m45, r41, r42, r43, r44, r45, \
-    l51, l52, l53, l54,                m53,                r52, r53, r54, r51  \
-) \
-{ \
-    { l11, l12, l13, l14, l15, l25, l35, l45 }, \
-    { l21, l22, l23, l24, l34, l44, l53, l54 }, \
-    { l31, l32, l33, l43, l42, l41, l51, l52 }, \
-    { m11, m12, m13, m14, m15, m25, m35, m45 }, \
-    { m21, m22, m23, m24, m34, m44, m53, KC_NO }, \
-    { m31, m32, m33, m43, m42, m41, KC_NO, KC_NO }, \
-    { r11, r12, r13, r14, r15, r25, r35, r45 }, \
-    { r21, r22, r23, r24, r34, r44, r53, r54 }, \
-    { r31, r32, r33, r43, r42, r41, r51, r52 } \
-}
diff --git a/keyboards/peej/tripel/right/info.json b/keyboards/peej/tripel/right/info.json
new file mode 100644
index 0000000000..9916d317f2
--- /dev/null
+++ b/keyboards/peej/tripel/right/info.json
@@ -0,0 +1,81 @@
+{
+    "layouts": {
+        "LAYOUT_ortho_7u": {
+            "layout": [
+                {"matrix": [6, 0], "x": 0, "y": 0},
+                {"matrix": [6, 1], "x": 1, "y": 0},
+                {"matrix": [6, 2], "x": 2, "y": 0},
+                {"matrix": [6, 3], "x": 3, "y": 0},
+                {"matrix": [6, 4], "x": 4, "y": 0},
+                {"matrix": [0, 0], "x": 5, "y": 0},
+                {"matrix": [0, 1], "x": 6, "y": 0},
+                {"matrix": [0, 2], "x": 7, "y": 0},
+                {"matrix": [0, 3], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [3, 0], "x": 10, "y": 0},
+                {"matrix": [3, 1], "x": 11, "y": 0},
+                {"matrix": [3, 2], "x": 12, "y": 0},
+                {"matrix": [3, 3], "x": 13, "y": 0},
+                {"matrix": [3, 4], "x": 14, "y": 0},
+
+                {"matrix": [7, 0], "x": 0, "y": 1},
+                {"matrix": [7, 1], "x": 1, "y": 1},
+                {"matrix": [7, 2], "x": 2, "y": 1},
+                {"matrix": [7, 3], "x": 3, "y": 1},
+                {"matrix": [6, 5], "x": 4, "y": 1},
+                {"matrix": [1, 0], "x": 5, "y": 1},
+                {"matrix": [1, 1], "x": 6, "y": 1},
+                {"matrix": [1, 2], "x": 7, "y": 1},
+                {"matrix": [1, 3], "x": 8, "y": 1},
+                {"matrix": [0, 5], "x": 9, "y": 1},
+                {"matrix": [4, 0], "x": 10, "y": 1},
+                {"matrix": [4, 1], "x": 11, "y": 1},
+                {"matrix": [4, 2], "x": 12, "y": 1},
+                {"matrix": [4, 3], "x": 13, "y": 1},
+                {"matrix": [3, 5], "x": 14, "y": 1},
+
+                {"matrix": [8, 0], "x": 0, "y": 2},
+                {"matrix": [8, 1], "x": 1, "y": 2},
+                {"matrix": [8, 2], "x": 2, "y": 2},
+                {"matrix": [7, 4], "x": 3, "y": 2},
+                {"matrix": [6, 6], "x": 4, "y": 2},
+                {"matrix": [2, 0], "x": 5, "y": 2},
+                {"matrix": [2, 1], "x": 6, "y": 2},
+                {"matrix": [2, 2], "x": 7, "y": 2},
+                {"matrix": [1, 4], "x": 8, "y": 2},
+                {"matrix": [0, 6], "x": 9, "y": 2},
+                {"matrix": [5, 0], "x": 10, "y": 2},
+                {"matrix": [5, 1], "x": 11, "y": 2},
+                {"matrix": [5, 2], "x": 12, "y": 2},
+                {"matrix": [4, 4], "x": 13, "y": 2},
+                {"matrix": [3, 6], "x": 14, "y": 2},
+
+                {"matrix": [8, 5], "x": 0, "y": 3},
+                {"matrix": [8, 4], "x": 1, "y": 3},
+                {"matrix": [8, 3], "x": 2, "y": 3},
+                {"matrix": [7, 5], "x": 3, "y": 3},
+                {"matrix": [6, 7], "x": 4, "y": 3},
+                {"matrix": [2, 5], "x": 5, "y": 3},
+                {"matrix": [2, 4], "x": 6, "y": 3},
+                {"matrix": [2, 3], "x": 7, "y": 3},
+                {"matrix": [1, 5], "x": 8, "y": 3},
+                {"matrix": [0, 7], "x": 9, "y": 3},
+                {"matrix": [5, 5], "x": 10, "y": 3},
+                {"matrix": [5, 4], "x": 11, "y": 3},
+                {"matrix": [5, 3], "x": 12, "y": 3},
+                {"matrix": [4, 5], "x": 13, "y": 3},
+                {"matrix": [3, 7], "x": 14, "y": 3},
+
+                {"matrix": [8, 6], "x": 0, "y": 4},
+                {"matrix": [8, 7], "x": 1, "y": 4},
+                {"matrix": [7, 6], "x": 2, "y": 4},
+                {"matrix": [7, 7], "x": 3, "y": 4},
+                {"matrix": [1, 6], "x": 7, "y": 4, "w": 7},
+                {"matrix": [5, 7], "x": 11, "y": 4},
+                {"matrix": [4, 6], "x": 12, "y": 4},
+                {"matrix": [4, 7], "x": 13, "y": 4},
+                {"matrix": [5, 6], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/peej/tripel/right/right.h b/keyboards/peej/tripel/right/right.h
deleted file mode 100644
index 5fa38270c9..0000000000
--- a/keyboards/peej/tripel/right/right.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_7u( \
-    l11, l12, l13, l14, l15, m11, m12, m13, m14, m15, r11, r12, r13, r14, r15, \
-    l21, l22, l23, l24, l25, m21, m22, m23, m24, m25, r21, r22, r23, r24, r25, \
-    l31, l32, l33, l34, l35, m31, m32, m33, m34, m35, r31, r32, r33, r34, r35, \
-    l41, l42, l43, l44, l45, m41, m42, m43, m44, m45, r41, r42, r43, r44, r45, \
-    l51, l52, l53, l54,                m53,                r52, r53, r54, r51  \
-) \
-{ \
-    { m11, m12, m13, m14, m15, m25, m35, m45 }, \
-    { m21, m22, m23, m24, m34, m44, m53, KC_NO }, \
-    { m31, m32, m33, m43, m42, m41, KC_NO, KC_NO }, \
-    { r11, r12, r13, r14, r15, r25, r35, r45 }, \
-    { r21, r22, r23, r24, r34, r44, r53, r54 }, \
-    { r31, r32, r33, r43, r42, r41, r51, r52 }, \
-    { l11, l12, l13, l14, l15, l25, l35, l45 }, \
-    { l21, l22, l23, l24, l34, l44, l53, l54 }, \
-    { l31, l32, l33, l43, l42, l41, l51, l52 } \
-}
diff --git a/keyboards/pegasus/config.h b/keyboards/pegasus/config.h
index 78ade39d77..de6628cfbd 100644
--- a/keyboards/pegasus/config.h
+++ b/keyboards/pegasus/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, E6 }
-#define MATRIX_COL_PINS { D2, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/pegasus/info.json b/keyboards/pegasus/info.json
index d6663796f8..29b99c8e25 100644
--- a/keyboards/pegasus/info.json
+++ b/keyboards/pegasus/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5"],
+        "rows": ["F0", "F1", "F4", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1"},
@@ -19,95 +24,101 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"Backspace", "x":11, "y":0, "w":1.75},
-                {"label":"Control", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":":", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.5},
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":"<", "x":8.75, "y":2},
-                {"label":">", "x":9.75, "y":2},
-                {"label":"?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2},
-                {"label":"Fn", "x":0, "y":3, "w":1.25},
-                {"label":"Alt", "x":2, "y":3, "w":1.25},
-                {"x":3.25, "y":3, "w":6.25},
-                {"label":"Alt", "x":9.5, "y":3, "w":1.25},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.25, "y": 3, "w": 6.25},
+                {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_split": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"Backspace", "x":11, "y":0, "w":1.75},
-                {"label":"Control", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":":", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.5},
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":"<", "x":8.75, "y":2},
-                {"label":">", "x":9.75, "y":2},
-                {"label":"?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2},
-                {"label":"Fn", "x":0, "y":3, "w":1.25},
-                {"label":"Alt", "x":2, "y":3, "w":1.25},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3, "w":2},
-                {"x":6.25, "y":3, "w":2.25},
-                {"x":8.5, "y":3},
-                {"label":"Alt", "x":9.5, "y":3, "w":1.25},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/pegasus/pegasus.c b/keyboards/pegasus/pegasus.c
index 0800a36f9e..1ffcd50fae 100644
--- a/keyboards/pegasus/pegasus.c
+++ b/keyboards/pegasus/pegasus.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pegasus.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/pegasus/pegasus.h b/keyboards/pegasus/pegasus.h
deleted file mode 100644
index 4582b2ccab..0000000000
--- a/keyboards/pegasus/pegasus.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-
-#define XXX KC_NO
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31,                     K36,           K39,      K3B \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, XXX, XXX, XXX, XXX, K36, XXX, XXX, K39, XXX, K3B } \
-}
-
-#define LAYOUT_split( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32,      K34,       K36,     K38, K39,      K3B \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, XXX, K34, XXX, K36, XXX, K38, K39, XXX, K3B } \
-}
diff --git a/keyboards/percent/booster/booster.c b/keyboards/percent/booster/booster.c
deleted file mode 100644
index bbae5d6f4e..0000000000
--- a/keyboards/percent/booster/booster.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "booster.h"
diff --git a/keyboards/percent/booster/booster.h b/keyboards/percent/booster/booster.h
deleted file mode 100644
index be2d2cb12b..0000000000
--- a/keyboards/percent/booster/booster.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_5x4( \
-    K00, K01, K02, K03,    \
-    K10, K11, K12,         \
-    K20, K21, K22, K23,    \
-    K30, K31, K32,         \
-    K40,      K42, K33     \
-) { \
-    { K00,   K01,   K02,   K03   }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23   }, \
-    { K30,   K31,   K32,   K33   }, \
-    { K40,   KC_NO, K42,   KC_NO }, \
-}
diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h
index b452a0dcb6..2cfff5c7bf 100644
--- a/keyboards/percent/booster/config.h
+++ b/keyboards/percent/booster/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D1, D6, D7, B4, B5 }
-#define MATRIX_COL_PINS { C7, D4, D2, D0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 10
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -41,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json
index f92476c9f6..ba8be4a603 100644
--- a/keyboards/percent/booster/info.json
+++ b/keyboards/percent/booster/info.json
@@ -8,32 +8,44 @@
         "pid": "0x4253",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "D4", "D2", "D0"],
+        "rows": ["D1", "D6", "D7", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"label":"K00 (D1,C7)", "x":0, "y":0},
-                {"label":"K01 (D1,D4)", "x":1, "y":0},
-                {"label":"K02 (D1,D2)", "x":2, "y":0},
-                {"label":"K03 (D1,D0)", "x":3, "y":0},
-                {"label":"K10 (D6,C7)", "x":0, "y":1},
-                {"label":"K11 (D6,D4)", "x":1, "y":1},
-                {"label":"K12 (D6,D2)", "x":2, "y":1},
-                {"label":"K20 (D7,C7)", "x":0, "y":2},
-                {"label":"K21 (D7,D4)", "x":1, "y":2},
-                {"label":"K22 (D7,D2)", "x":2, "y":2},
-                {"label":"K23 (D7,D0)", "x":3, "y":1, "h":2},
-                {"label":"K30 (B4,C7)", "x":0, "y":3},
-                {"label":"K31 (B4,D4)", "x":1, "y":3},
-                {"label":"K32 (B4,D2)", "x":2, "y":3},
-                {"label":"K40 (B5,C7)", "x":0, "y":4, "w":2},
-                {"label":"K42 (B5,D2)", "x":2, "y":4},
-                {"label":"K33 (B4,D0)", "x":3, "y":3, "h":2}
+                {"matrix": [0, 0], "x": 0, "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": [2, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/percent/canoe/canoe.c b/keyboards/percent/canoe/canoe.c
deleted file mode 100644
index 572ff50b01..0000000000
--- a/keyboards/percent/canoe/canoe.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "canoe.h"
diff --git a/keyboards/percent/canoe/canoe.h b/keyboards/percent/canoe/canoe.h
deleted file mode 100644
index 83d7c08bb5..0000000000
--- a/keyboards/percent/canoe/canoe.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define _x_ KC_NO
-
-#define LAYOUT_65_iso_blocker( \
-  K0D, K0C, K0B, K0A, K09, K08, K07, K06, K05, K04, K03, K02, K01, K00, K0E, \
-  K1D, K1C, K1B, K1A, K19, K18, K17, K16, K15, K14, K13, K12, K11,      K1E, \
-  K2D, K2C, K2B, K2A, K29, K28, K27, K26, K25, K24, K23, K22, K10, K21, K2E, \
-  K3D, K4A, K3C, K3B, K3A, K39, K38, K37, K36, K35, K34, K33, K32, K30, K3E, \
-  K4D, K4C, K4B,                K48,                K44, K43, K42, K40, K4E  \
-){ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-  { _x_, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-  { K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-  { K40, _x_, K42, K43, K44, _x_, _x_, _x_, K48, _x_, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-  K0D, K0C, K0B, K0A, K09, K08, K07, K06, K05, K04, K03, K02, K01, K00, K0E, \
-  K1D, K1C, K1B, K1A, K19, K18, K17, K16, K15, K14, K13, K12, K11, K10, K1E, \
-  K2D, K2C, K2B, K2A, K29, K28, K27, K26, K25, K24, K23, K22,      K21, K2E, \
-  K3D,      K3C, K3B, K3A, K39, K38, K37, K36, K35, K34, K33, K32, K30, K3E, \
-  K4D, K4C, K4B,                K48,                K44, K43, K42, K40, K4E  \
-){ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-  { _x_, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-  { K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-  { K40, _x_, K42, K43, K44, _x_, _x_, _x_, K48, _x_, _x_, K4B, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT LAYOUT_65_ansi_blocker // added to not break existing checked in keymaps
-#define LAYOUT_iso LAYOUT_65_iso_blocker
diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h
index 69f53905fc..b7aa6ca2e9 100644
--- a/keyboards/percent/canoe/config.h
+++ b/keyboards/percent/canoe/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 2
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/percent/canoe/info.json b/keyboards/percent/canoe/info.json
index 951e55ec64..fcbdf6bac8 100644
--- a/keyboards/percent/canoe/info.json
+++ b/keyboards/percent/canoe/info.json
@@ -8,21 +8,178 @@
     "pid": "0x434E",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1"
   },
   "processor": "atmega32a",
   "bootloader": "bootloadhid",
   "community_layouts": ["65_ansi_blocker", "65_iso_blocker"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_65_ansi_blocker",
+    "LAYOUT_iso": "LAYOUT_65_iso_blocker"
+  },
   "layouts": {
     "LAYOUT_65_iso_blocker": {
-      "layout": [{"label":"K0D", "x":0, "y":0}, {"label":"K0C", "x":1, "y":0}, {"label":"K0B", "x":2, "y":0}, {"label":"K0A", "x":3, "y":0}, {"label":"K09", "x":4, "y":0}, {"label":"K08", "x":5, "y":0}, {"label":"K07", "x":6, "y":0}, {"label":"K06", "x":7, "y":0}, {"label":"K05", "x":8, "y":0}, {"label":"K04", "x":9, "y":0}, {"label":"K03", "x":10, "y":0}, {"label":"K02", "x":11, "y":0}, {"label":"K01", "x":12, "y":0}, {"label":"K00", "x":13, "y":0, "w":2}, {"label":"K0E", "x":15, "y":0}, {"label":"K1D", "x":0, "y":1, "w":1.5}, {"label":"K1C", "x":1.5, "y":1}, {"label":"K1B", "x":2.5, "y":1}, {"label":"K1A", "x":3.5, "y":1}, {"label":"K19", "x":4.5, "y":1}, {"label":"K18", "x":5.5, "y":1}, {"label":"K17", "x":6.5, "y":1}, {"label":"K16", "x":7.5, "y":1}, {"label":"K15", "x":8.5, "y":1}, {"label":"K14", "x":9.5, "y":1}, {"label":"K13", "x":10.5, "y":1}, {"label":"K12", "x":11.5, "y":1}, {"label":"K11", "x":12.5, "y":1}, {"label":"K1E", "x":15, "y":1}, {"label":"K2D", "x":0, "y":2, "w":1.75}, {"label":"K2C", "x":1.75, "y":2}, {"label":"K2B", "x":2.75, "y":2}, {"label":"K2A", "x":3.75, "y":2}, {"label":"K29", "x":4.75, "y":2}, {"label":"K28", "x":5.75, "y":2}, {"label":"K27", "x":6.75, "y":2}, {"label":"K26", "x":7.75, "y":2}, {"label":"K25", "x":8.75, "y":2}, {"label":"K24", "x":9.75, "y":2}, {"label":"K23", "x":10.75, "y":2}, {"label":"K22", "x":11.75, "y":2}, {"label":"K10", "x":12.75, "y":2}, {"label":"K21", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"K2E", "x":15, "y":2}, {"label":"K3D", "x":0, "y":3, "w":1.25}, {"label":"K4A", "x":1.25, "y":3}, {"label":"K3C", "x":2.25, "y":3}, {"label":"K3B", "x":3.25, "y":3}, {"label":"K3A", "x":4.25, "y":3}, {"label":"K39", "x":5.25, "y":3}, {"label":"K38", "x":6.25, "y":3}, {"label":"K37", "x":7.25, "y":3}, {"label":"K36", "x":8.25, "y":3}, {"label":"K35", "x":9.25, "y":3}, {"label":"K34", "x":10.25, "y":3}, {"label":"K33", "x":11.25, "y":3}, {"label":"K32", "x":12.25, "y":3, "w":1.75}, {"label":"K30", "x":14, "y":3}, {"label":"K3E", "x":15, "y":3}, {"label":"K4D", "x":0, "y":4, "w":1.25}, {"label":"K4C", "x":1.25, "y":4, "w":1.25}, {"label":"K4B", "x":2.5, "y":4, "w":1.25}, {"label":"K48", "x":3.75, "y":4, "w":6.25}, {"label":"K44", "x":10, "y":4, "w":1.25}, {"label":"K43", "x":11.25, "y":4, "w":1.25}, {"label":"K42", "x":13, "y":4}, {"label":"K40", "x":14, "y":4}, {"label":"K4E", "x":15, "y":4}]
+      "layout": [
+        {"label": "K0D", "matrix": [0, 13], "x": 0, "y": 0},
+        {"label": "K0C", "matrix": [0, 12], "x": 1, "y": 0},
+        {"label": "K0B", "matrix": [0, 11], "x": 2, "y": 0},
+        {"label": "K0A", "matrix": [0, 10], "x": 3, "y": 0},
+        {"label": "K09", "matrix": [0, 9], "x": 4, "y": 0},
+        {"label": "K08", "matrix": [0, 8], "x": 5, "y": 0},
+        {"label": "K07", "matrix": [0, 7], "x": 6, "y": 0},
+        {"label": "K06", "matrix": [0, 6], "x": 7, "y": 0},
+        {"label": "K05", "matrix": [0, 5], "x": 8, "y": 0},
+        {"label": "K04", "matrix": [0, 4], "x": 9, "y": 0},
+        {"label": "K03", "matrix": [0, 3], "x": 10, "y": 0},
+        {"label": "K02", "matrix": [0, 2], "x": 11, "y": 0},
+        {"label": "K01", "matrix": [0, 1], "x": 12, "y": 0},
+        {"label": "K00", "matrix": [0, 0], "x": 13, "y": 0, "w": 2},
+        {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
+
+        {"label": "K1D", "matrix": [1, 13], "x": 0, "y": 1, "w": 1.5},
+        {"label": "K1C", "matrix": [1, 12], "x": 1.5, "y": 1},
+        {"label": "K1B", "matrix": [1, 11], "x": 2.5, "y": 1},
+        {"label": "K1A", "matrix": [1, 10], "x": 3.5, "y": 1},
+        {"label": "K19", "matrix": [1, 9], "x": 4.5, "y": 1},
+        {"label": "K18", "matrix": [1, 8], "x": 5.5, "y": 1},
+        {"label": "K17", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "K16", "matrix": [1, 6], "x": 7.5, "y": 1},
+        {"label": "K15", "matrix": [1, 5], "x": 8.5, "y": 1},
+        {"label": "K14", "matrix": [1, 4], "x": 9.5, "y": 1},
+        {"label": "K13", "matrix": [1, 3], "x": 10.5, "y": 1},
+        {"label": "K12", "matrix": [1, 2], "x": 11.5, "y": 1},
+        {"label": "K11", "matrix": [1, 1], "x": 12.5, "y": 1},
+        {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
+
+        {"label": "K2D", "matrix": [2, 13], "x": 0, "y": 2, "w": 1.75},
+        {"label": "K2C", "matrix": [2, 12], "x": 1.75, "y": 2},
+        {"label": "K2B", "matrix": [2, 11], "x": 2.75, "y": 2},
+        {"label": "K2A", "matrix": [2, 10], "x": 3.75, "y": 2},
+        {"label": "K29", "matrix": [2, 9], "x": 4.75, "y": 2},
+        {"label": "K28", "matrix": [2, 8], "x": 5.75, "y": 2},
+        {"label": "K27", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "K26", "matrix": [2, 6], "x": 7.75, "y": 2},
+        {"label": "K25", "matrix": [2, 5], "x": 8.75, "y": 2},
+        {"label": "K24", "matrix": [2, 4], "x": 9.75, "y": 2},
+        {"label": "K23", "matrix": [2, 3], "x": 10.75, "y": 2},
+        {"label": "K22", "matrix": [2, 2], "x": 11.75, "y": 2},
+        {"label": "K10", "matrix": [1, 0], "x": 12.75, "y": 2},
+        {"label": "K21", "matrix": [2, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
+
+        {"label": "K3D", "matrix": [3, 13], "x": 0, "y": 3, "w": 1.25},
+        {"label": "K4A", "matrix": [4, 10], "x": 1.25, "y": 3},
+        {"label": "K3C", "matrix": [3, 12], "x": 2.25, "y": 3},
+        {"label": "K3B", "matrix": [3, 11], "x": 3.25, "y": 3},
+        {"label": "K3A", "matrix": [3, 10], "x": 4.25, "y": 3},
+        {"label": "K39", "matrix": [3, 9], "x": 5.25, "y": 3},
+        {"label": "K38", "matrix": [3, 8], "x": 6.25, "y": 3},
+        {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "K36", "matrix": [3, 6], "x": 8.25, "y": 3},
+        {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 3},
+        {"label": "K34", "matrix": [3, 4], "x": 10.25, "y": 3},
+        {"label": "K33", "matrix": [3, 3], "x": 11.25, "y": 3},
+        {"label": "K32", "matrix": [3, 2], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "K30", "matrix": [3, 0], "x": 14, "y": 3},
+        {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
+
+        {"label": "K4D", "matrix": [4, 13], "x": 0, "y": 4, "w": 1.25},
+        {"label": "K4C", "matrix": [4, 12], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "K4B", "matrix": [4, 11], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "K48", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+        {"label": "K44", "matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+        {"label": "K43", "matrix": [4, 3], "x": 11.25, "y": 4, "w": 1.25},
+        {"label": "K42", "matrix": [4, 2], "x": 13, "y": 4},
+        {"label": "K40", "matrix": [4, 0], "x": 14, "y": 4},
+        {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
+      ]
     },
     "LAYOUT_65_ansi_blocker": {
-      "layout": [{"label":"K0D", "x":0, "y":0}, {"label":"K0C", "x":1, "y":0}, {"label":"K0B", "x":2, "y":0}, {"label":"K0A", "x":3, "y":0}, {"label":"K09", "x":4, "y":0}, {"label":"K08", "x":5, "y":0}, {"label":"K07", "x":6, "y":0}, {"label":"K06", "x":7, "y":0}, {"label":"K05", "x":8, "y":0}, {"label":"K04", "x":9, "y":0}, {"label":"K03", "x":10, "y":0}, {"label":"K02", "x":11, "y":0}, {"label":"K01", "x":12, "y":0}, {"label":"K00", "x":13, "y":0, "w":2}, {"label":"K0E", "x":15, "y":0}, {"label":"K1D", "x":0, "y":1, "w":1.5}, {"label":"K1C", "x":1.5, "y":1}, {"label":"K1B", "x":2.5, "y":1}, {"label":"K1A", "x":3.5, "y":1}, {"label":"K19", "x":4.5, "y":1}, {"label":"K18", "x":5.5, "y":1}, {"label":"K17", "x":6.5, "y":1}, {"label":"K16", "x":7.5, "y":1}, {"label":"K15", "x":8.5, "y":1}, {"label":"K14", "x":9.5, "y":1}, {"label":"K13", "x":10.5, "y":1}, {"label":"K12", "x":11.5, "y":1}, {"label":"K11", "x":12.5, "y":1}, {"label":"K10", "x":13.5, "y":1, "w":1.5}, {"label":"K1E", "x":15, "y":1}, {"label":"K2D", "x":0, "y":2, "w":1.75}, {"label":"K2C", "x":1.75, "y":2}, {"label":"K2B", "x":2.75, "y":2}, {"label":"K2A", "x":3.75, "y":2}, {"label":"K29", "x":4.75, "y":2}, {"label":"K28", "x":5.75, "y":2}, {"label":"K27", "x":6.75, "y":2}, {"label":"K26", "x":7.75, "y":2}, {"label":"K25", "x":8.75, "y":2}, {"label":"K24", "x":9.75, "y":2}, {"label":"K23", "x":10.75, "y":2}, {"label":"K22", "x":11.75, "y":2}, {"label":"K21", "x":12.75, "y":2, "w":2.25}, {"label":"K2E", "x":15, "y":2}, {"label":"K3D", "x":0, "y":3, "w":2.25}, {"label":"K3C", "x":2.25, "y":3}, {"label":"K3B", "x":3.25, "y":3}, {"label":"K3A", "x":4.25, "y":3}, {"label":"K39", "x":5.25, "y":3}, {"label":"K38", "x":6.25, "y":3}, {"label":"K37", "x":7.25, "y":3}, {"label":"K36", "x":8.25, "y":3}, {"label":"K35", "x":9.25, "y":3}, {"label":"K34", "x":10.25, "y":3}, {"label":"K33", "x":11.25, "y":3}, {"label":"K32", "x":12.25, "y":3, "w":1.75}, {"label":"K30", "x":14, "y":3}, {"label":"K3E", "x":15, "y":3}, {"label":"K4D", "x":0, "y":4, "w":1.25}, {"label":"K4C", "x":1.25, "y":4, "w":1.25}, {"label":"K4B", "x":2.5, "y":4, "w":1.25}, {"label":"K48", "x":3.75, "y":4, "w":6.25}, {"label":"K44", "x":10, "y":4, "w":1.25}, {"label":"K43", "x":11.25, "y":4, "w":1.25}, {"label":"K42", "x":13, "y":4}, {"label":"K40", "x":14, "y":4}, {"label":"K4E", "x":15, "y":4}]
+      "layout": [
+        {"label": "K0D", "matrix": [0, 13], "x": 0, "y": 0},
+        {"label": "K0C", "matrix": [0, 12], "x": 1, "y": 0},
+        {"label": "K0B", "matrix": [0, 11], "x": 2, "y": 0},
+        {"label": "K0A", "matrix": [0, 10], "x": 3, "y": 0},
+        {"label": "K09", "matrix": [0, 9], "x": 4, "y": 0},
+        {"label": "K08", "matrix": [0, 8], "x": 5, "y": 0},
+        {"label": "K07", "matrix": [0, 7], "x": 6, "y": 0},
+        {"label": "K06", "matrix": [0, 6], "x": 7, "y": 0},
+        {"label": "K05", "matrix": [0, 5], "x": 8, "y": 0},
+        {"label": "K04", "matrix": [0, 4], "x": 9, "y": 0},
+        {"label": "K03", "matrix": [0, 3], "x": 10, "y": 0},
+        {"label": "K02", "matrix": [0, 2], "x": 11, "y": 0},
+        {"label": "K01", "matrix": [0, 1], "x": 12, "y": 0},
+        {"label": "K00", "matrix": [0, 0], "x": 13, "y": 0, "w": 2},
+        {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
+
+        {"label": "K1D", "matrix": [1, 13], "x": 0, "y": 1, "w": 1.5},
+        {"label": "K1C", "matrix": [1, 12], "x": 1.5, "y": 1},
+        {"label": "K1B", "matrix": [1, 11], "x": 2.5, "y": 1},
+        {"label": "K1A", "matrix": [1, 10], "x": 3.5, "y": 1},
+        {"label": "K19", "matrix": [1, 9], "x": 4.5, "y": 1},
+        {"label": "K18", "matrix": [1, 8], "x": 5.5, "y": 1},
+        {"label": "K17", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "K16", "matrix": [1, 6], "x": 7.5, "y": 1},
+        {"label": "K15", "matrix": [1, 5], "x": 8.5, "y": 1},
+        {"label": "K14", "matrix": [1, 4], "x": 9.5, "y": 1},
+        {"label": "K13", "matrix": [1, 3], "x": 10.5, "y": 1},
+        {"label": "K12", "matrix": [1, 2], "x": 11.5, "y": 1},
+        {"label": "K11", "matrix": [1, 1], "x": 12.5, "y": 1},
+        {"label": "K10", "matrix": [1, 0], "x": 13.5, "y": 1, "w": 1.5},
+        {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
+
+        {"label": "K2D", "matrix": [2, 13], "x": 0, "y": 2, "w": 1.75},
+        {"label": "K2C", "matrix": [2, 12], "x": 1.75, "y": 2},
+        {"label": "K2B", "matrix": [2, 11], "x": 2.75, "y": 2},
+        {"label": "K2A", "matrix": [2, 10], "x": 3.75, "y": 2},
+        {"label": "K29", "matrix": [2, 9], "x": 4.75, "y": 2},
+        {"label": "K28", "matrix": [2, 8], "x": 5.75, "y": 2},
+        {"label": "K27", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "K26", "matrix": [2, 6], "x": 7.75, "y": 2},
+        {"label": "K25", "matrix": [2, 5], "x": 8.75, "y": 2},
+        {"label": "K24", "matrix": [2, 4], "x": 9.75, "y": 2},
+        {"label": "K23", "matrix": [2, 3], "x": 10.75, "y": 2},
+        {"label": "K22", "matrix": [2, 2], "x": 11.75, "y": 2},
+        {"label": "K21", "matrix": [2, 1], "x": 12.75, "y": 2, "w": 2.25},
+        {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
+
+        {"label": "K3D", "matrix": [3, 13], "x": 0, "y": 3, "w": 2.25},
+        {"label": "K3C", "matrix": [3, 12], "x": 2.25, "y": 3},
+        {"label": "K3B", "matrix": [3, 11], "x": 3.25, "y": 3},
+        {"label": "K3A", "matrix": [3, 10], "x": 4.25, "y": 3},
+        {"label": "K39", "matrix": [3, 9], "x": 5.25, "y": 3},
+        {"label": "K38", "matrix": [3, 8], "x": 6.25, "y": 3},
+        {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "K36", "matrix": [3, 6], "x": 8.25, "y": 3},
+        {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 3},
+        {"label": "K34", "matrix": [3, 4], "x": 10.25, "y": 3},
+        {"label": "K33", "matrix": [3, 3], "x": 11.25, "y": 3},
+        {"label": "K32", "matrix": [3, 2], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "K30", "matrix": [3, 0], "x": 14, "y": 3},
+        {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
+
+        {"label": "K4D", "matrix": [4, 13], "x": 0, "y": 4, "w": 1.25},
+        {"label": "K4C", "matrix": [4, 12], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "K4B", "matrix": [4, 11], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "K48", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+        {"label": "K44", "matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+        {"label": "K43", "matrix": [4, 3], "x": 11.25, "y": 4, "w": 1.25},
+        {"label": "K42", "matrix": [4, 2], "x": 13, "y": 4},
+        {"label": "K40", "matrix": [4, 0], "x": 14, "y": 4},
+        {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/percent/canoe/rules.mk b/keyboards/percent/canoe/rules.mk
index 25437c442c..6b0cec85a4 100644
--- a/keyboards/percent/canoe/rules.mk
+++ b/keyboards/percent/canoe/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/percent/canoe_gen2/canoe_gen2.c b/keyboards/percent/canoe_gen2/canoe_gen2.c
index 47ade5dd4f..e5beff54a3 100644
--- a/keyboards/percent/canoe_gen2/canoe_gen2.c
+++ b/keyboards/percent/canoe_gen2/canoe_gen2.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "canoe_gen2.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
   setPinOutput(E6);
diff --git a/keyboards/percent/canoe_gen2/canoe_gen2.h b/keyboards/percent/canoe_gen2/canoe_gen2.h
deleted file mode 100644
index d4582eef25..0000000000
--- a/keyboards/percent/canoe_gen2/canoe_gen2.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2020 Evy Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-#include "quantum.h"
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_all LAYOUT_65_iso_blocker_split_bs
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d,           k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e, \
-    k40, k41, k42,                k46,                k49, k4a,      k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \
-    {k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, ___, k4c, k4d, k4e}  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e, \
-    k40, k41, k42,                k46,                k49, k4a,      k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, ___, k4c, k4d, k4e}  \
-}
diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h
index 7138fe3939..fe374cd794 100644
--- a/keyboards/percent/canoe_gen2/config.h
+++ b/keyboards/percent/canoe_gen2/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B1,B3,B2,F5,F4}
-#define MATRIX_COL_PINS {B0,D0,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,F6,F7}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -33,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Backlight configuration
  */
-#define RGB_DI_PIN B7
 #define RGB_MATRIX_LED_COUNT 77
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 
diff --git a/keyboards/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json
index e84a835991..8288368389 100644
--- a/keyboards/percent/canoe_gen2/info.json
+++ b/keyboards/percent/canoe_gen2/info.json
@@ -8,161 +8,175 @@
         "pid": "0x89F0",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"],
+        "rows": ["B1", "B3", "B2", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_iso_blocker_split_bs"
+    },
     "layouts": {
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-                
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/percent/canoe_gen2/rules.mk b/keyboards/percent/canoe_gen2/rules.mk
index 0be47ec5d1..d399c10822 100644
--- a/keyboards/percent/canoe_gen2/rules.mk
+++ b/keyboards/percent/canoe_gen2/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h
index 274d30df72..6907429c39 100644
--- a/keyboards/percent/skog/config.h
+++ b/keyboards/percent/skog/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/info.json
index 80c7d832c4..bc9543b951 100644
--- a/keyboards/percent/skog/info.json
+++ b/keyboards/percent/skog/info.json
@@ -8,10 +8,18 @@
       "pid": "0x422D",
       "device_version": "2.0.0"
     },
+    "matrix_pins": {
+      "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"],
+      "rows": ["B0", "B1", "B2", "B3", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "D4",
       "levels": 5
     },
+    "ws2812": {
+      "driver": "i2c"
+    },
     "indicators": {
       "caps_lock": "D1",
       "scroll_lock": "D6"
diff --git a/keyboards/percent/skog/rules.mk b/keyboards/percent/skog/rules.mk
index 25437c442c..6b0cec85a4 100644
--- a/keyboards/percent/skog/rules.mk
+++ b/keyboards/percent/skog/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/percent/skog/skog.c b/keyboards/percent/skog/skog.c
deleted file mode 100644
index c44f0373fb..0000000000
--- a/keyboards/percent/skog/skog.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2018 Jumail Mundekkat / MxBlue
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-ps2avrGB support code by Kenneth A. (bminiex/.[ch])
-*/
-
-#include "skog.h"
diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h
index b00a612cd7..75b78de22d 100644
--- a/keyboards/percent/skog_lite/config.h
+++ b/keyboards/percent/skog_lite/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 18
 
-//                         0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B5 }
-#define MATRIX_COL_PINS { C4, C2, D7, C7, C6, A0, A1, A2, A3, A7, A6, A4, A5, C5, C3}
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/percent/skog_lite/info.json b/keyboards/percent/skog_lite/info.json
index 74abc67bdc..4133d5c81b 100644
--- a/keyboards/percent/skog_lite/info.json
+++ b/keyboards/percent/skog_lite/info.json
@@ -8,9 +8,17 @@
         "pid": "0x422D",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["C4", "C2", "D7", "C7", "C6", "A0", "A1", "A2", "A3", "A7", "A6", "A4", "A5", "C5", "C3"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1",
         "scroll_lock": "D6"
@@ -21,273 +29,310 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0.5},
-                {"x":16.25, "y":0.5},
-                {"x":17.25, "y":0.5},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.75},
-                {"x":16.25, "y":1.75},
-                {"x":17.25, "y":1.75},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.75},
-                {"x":16.25, "y":2.75},
-                {"x":17.25, "y":2.75},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0.5},
+                {"matrix": [0, 14], "x": 16.25, "y": 0.5},
+                {"matrix": [6, 12], "x": 17.25, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 14], "x": 1, "y": 1.25},
+                {"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, 13], "x": 6, "y": 1.25},
+                {"matrix": [1, 5], "x": 7, "y": 1.25},
+                {"matrix": [1, 6], "x": 8, "y": 1.25},
+                {"matrix": [1, 7], "x": 9, "y": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1.25},
+                {"matrix": [1, 9], "x": 11, "y": 1.25},
+                {"matrix": [1, 10], "x": 12, "y": 1.25},
+                {"matrix": [1, 11], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 12], "x": 15.25, "y": 1.75},
+                {"matrix": [6, 11], "x": 16.25, "y": 1.75},
+                {"matrix": [6, 10], "x": 17.25, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 12], "x": 15.25, "y": 2.75},
+                {"matrix": [6, 9], "x": 16.25, "y": 2.75},
+                {"matrix": [6, 8], "x": 17.25, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 14], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 6], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 10], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 5.25}
             ]
         },
-
         "LAYOUT_tkl_7u_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0.5},
-                {"x":16.25, "y":0.5},
-                {"x":17.25, "y":0.5},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.75},
-                {"x":16.25, "y":1.75},
-                {"x":17.25, "y":1.75},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.75},
-                {"x":16.25, "y":2.75},
-                {"x":17.25, "y":2.75},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0.5},
+                {"matrix": [0, 14], "x": 16.25, "y": 0.5},
+                {"matrix": [6, 12], "x": 17.25, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 14], "x": 1, "y": 1.25},
+                {"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, 13], "x": 6, "y": 1.25},
+                {"matrix": [1, 5], "x": 7, "y": 1.25},
+                {"matrix": [1, 6], "x": 8, "y": 1.25},
+                {"matrix": [1, 7], "x": 9, "y": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1.25},
+                {"matrix": [1, 9], "x": 11, "y": 1.25},
+                {"matrix": [1, 10], "x": 12, "y": 1.25},
+                {"matrix": [1, 11], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 12], "x": 15.25, "y": 1.75},
+                {"matrix": [6, 11], "x": 16.25, "y": 1.75},
+                {"matrix": [6, 10], "x": 17.25, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 12], "x": 15.25, "y": 2.75},
+                {"matrix": [6, 9], "x": 16.25, "y": 2.75},
+                {"matrix": [6, 8], "x": 17.25, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 14], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 4], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 7], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 8], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 10], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 5.25}
             ]
         },
-
         "LAYOUT_tkl_7u_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0.5},
-                {"x":16.25, "y":0.5},
-                {"x":17.25, "y":0.5},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.75},
-                {"x":16.25, "y":1.75},
-                {"x":17.25, "y":1.75},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.75},
-                {"x":16.25, "y":2.75},
-                {"x":17.25, "y":2.75},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0.5},
+                {"matrix": [0, 14], "x": 16.25, "y": 0.5},
+                {"matrix": [6, 12], "x": 17.25, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 14], "x": 1, "y": 1.25},
+                {"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, 13], "x": 6, "y": 1.25},
+                {"matrix": [1, 5], "x": 7, "y": 1.25},
+                {"matrix": [1, 6], "x": 8, "y": 1.25},
+                {"matrix": [1, 7], "x": 9, "y": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1.25},
+                {"matrix": [1, 9], "x": 11, "y": 1.25},
+                {"matrix": [1, 10], "x": 12, "y": 1.25},
+                {"matrix": [1, 11], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 12], "x": 15.25, "y": 1.75},
+                {"matrix": [6, 11], "x": 16.25, "y": 1.75},
+                {"matrix": [6, 10], "x": 17.25, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 12], "x": 15.25, "y": 2.75},
+                {"matrix": [6, 9], "x": 16.25, "y": 2.75},
+                {"matrix": [6, 8], "x": 17.25, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 14], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 4], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 7], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 10], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/percent/skog_lite/rules.mk b/keyboards/percent/skog_lite/rules.mk
index 752df26315..747ea2aae3 100644
--- a/keyboards/percent/skog_lite/rules.mk
+++ b/keyboards/percent/skog_lite/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
diff --git a/keyboards/percent/skog_lite/skog_lite.c b/keyboards/percent/skog_lite/skog_lite.c
deleted file mode 100644
index c69843e617..0000000000
--- a/keyboards/percent/skog_lite/skog_lite.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "skog_lite.h"
diff --git a/keyboards/percent/skog_lite/skog_lite.h b/keyboards/percent/skog_lite/skog_lite.h
deleted file mode 100644
index 16dc70bf67..0000000000
--- a/keyboards/percent/skog_lite/skog_lite.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2019 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_tkl_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k6c,       \
-    k10, k1e, k11, k12, k13, k14, k1d, k15, k16, k17, k18, k19, k1a, k1b, k1c, k6b, k6a,  \
-    k20, k2e, k21, k22, k23, k24, k2d, k25, k26, k27, k28, k29, k2a, k2b, k2c, k69, k68,  \
-    k30, k3e, k31, k32, k33, k34, k3d, k35, k36, k37, k38, k39, k3a,                      \
-    k40, k4e, k41, k42, k43, k44, k4d, k45, k46, k47, k48, k4b, k4c,                      \
-    k50, k5e, k51, k54, k56, k57, k58, k5b, k5a, k5c, k67                                 \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e },  \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e },  \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e },  \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, ___, ___, k3d, k3e },  \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, ___, ___, k4b, k4c, k4d, k4e },  \
-    { k50, k51, ___, ___, k54, ___, k56, k57, k58, ___, k5a, k5b, k5c, ___, k5e },  \
-    { ___, ___, ___, ___, ___, ___, ___, k67, k68, k69, k6a, k6b, k6c, ___, ___ },  \
-}
-
-#define LAYOUT_tkl_7u_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k6c,       \
-    k10, k1e, k11, k12, k13, k14, k1d, k15, k16, k17, k18, k19, k1a, k1b, k1c, k6b, k6a,  \
-    k20, k2e, k21, k22, k23, k24, k2d, k25, k26, k27, k28, k29, k2a, k2b, k2c, k69, k68,  \
-    k30, k3e, k31, k32, k33, k34, k3d, k35, k36, k37, k38, k39, k3a,                      \
-    k40, k4e, k41, k42, k43, k44, k4d, k45, k46, k47, k48, k4b, k4c,                      \
-    k50, k5e, k51, k54, k57, k58, k5b, k5a, k5c, k67                                      \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e },  \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e },  \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e },  \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, ___, ___, k3d, k3e },  \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, ___, ___, k4b, k4c, k4d, k4e },  \
-    { k50, k51, ___, ___, k54, ___, ___, k57, k58, ___, k5a, k5b, k5c, ___, k5e },  \
-    { ___, ___, ___, ___, ___, ___, ___, k67, k68, k69, k6a, k6b, k6c, ___, ___ },  \
-}
-
-#define LAYOUT_tkl_7u_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k6c,       \
-    k10, k1e, k11, k12, k13, k14, k1d, k15, k16, k17, k18, k19, k1a, k1b, k1c, k6b, k6a,  \
-    k20, k2e, k21, k22, k23, k24, k2d, k25, k26, k27, k28, k29, k2a, k2b, k2c, k69, k68,  \
-    k30, k3e, k31, k32, k33, k34, k3d, k35, k36, k37, k38, k39, k3a,                      \
-    k40, k4e, k41, k42, k43, k44, k4d, k45, k46, k47, k48, k4b, k4c,                      \
-    k50, k51, k54, k57, k5b, k5a, k5c, k67                                                \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e },  \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e },  \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e },  \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, ___, ___, k3d, k3e },  \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, ___, ___, k4b, k4c, k4d, k4e },  \
-    { k50, k51, ___, ___, k54, ___, ___, k57, ___, ___, k5a, k5b, k5c, ___, ___ },  \
-    { ___, ___, ___, ___, ___, ___, ___, k67, k68, k69, k6a, k6b, k6c, ___, ___ },  \
-}
diff --git a/keyboards/phage_studio/pila87/config.h b/keyboards/phage_studio/pila87/config.h
index d3eee645bf..2f4f0fac76 100644
--- a/keyboards/phage_studio/pila87/config.h
+++ b/keyboards/phage_studio/pila87/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { A1, A2, A10, A9, A8, C9 }
-#define MATRIX_COL_PINS { B5, B4,  B6, C0, C1, C2, C3, B7, B3, D2, C12, C11, C10, A15, C15, C13, A3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT 91
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
@@ -32,9 +24,6 @@
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
-    /* RGB Matrix config */
-    #define RGB_DI_PIN A4
-
     /* RGB Matrix effect */
     #define ENABLE_RGB_MATRIX_ALPHAS_MODS
     #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json
index 5bba67c683..522cd9c548 100644
--- a/keyboards/phage_studio/pila87/info.json
+++ b/keyboards/phage_studio/pila87/info.json
@@ -8,106 +8,127 @@
         "pid": "0x5887",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "matrix_pins": {
+        "cols": ["B5", "B4", "B6", "C0", "C1", "C2", "C3", "B7", "B3", "D2", "C12", "C11", "C10", "A15", "C15", "C13", "A3"],
+        "rows": ["A1", "A2", "A10", "A9", "A8", "C9"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C14",
         "scroll_lock": "A0"
     },
+    "ws2812": {
+        "pin": "A4"
+    },
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
 
-                {"label":"`~", "x":0, "y":1.5},
-                {"label":"1!", "x":1, "y":1.5},
-                {"label":"2@", "x":2, "y":1.5},
-                {"label":"3#", "x":3, "y":1.5},
-                {"label":"4$", "x":4, "y":1.5},
-                {"label":"5%", "x":5, "y":1.5},
-                {"label":"6^", "x":6, "y":1.5},
-                {"label":"7&", "x":7, "y":1.5},
-                {"label":"8*", "x":8, "y":1.5},
-                {"label":"9(", "x":9, "y":1.5},
-                {"label":"0)", "x":10, "y":1.5},
-                {"label":"-_", "x":11, "y":1.5},
-                {"label":"=+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[{", "x":11.5, "y":2.5},
-                {"label":"]}", "x":12.5, "y":2.5},
-                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";:", "x":10.75, "y":3.5},
-                {"label":"'\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
 
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",<", "x":9.25, "y":4.5},
-                {"label":".>", "x":10.25, "y":4.5},
-                {"label":"/?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"App", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/phage_studio/pila87/pila87.c b/keyboards/phage_studio/pila87/pila87.c
index 23304c03bb..3425e0abf5 100644
--- a/keyboards/phage_studio/pila87/pila87.c
+++ b/keyboards/phage_studio/pila87/pila87.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pila87.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/phage_studio/pila87/pila87.h b/keyboards/phage_studio/pila87/pila87.h
deleted file mode 100644
index 771410333b..0000000000
--- a/keyboards/phage_studio/pila87/pila87.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2022 Phage Studio
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───�
- * │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4D        │     │4F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───�
- * │50  │51  │52  │55                      │5A  │5B  │5C  │5D  │ │5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,    K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,    K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,   K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                    \
-       K40,    K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4F,      \
-    K50,  K51,  K52,                K55,                K5A,  K5B,  K5C,  K5D,  K5E, K5F, K5G  \
-)\
-{\
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
diff --git a/keyboards/phage_studio/pila87/rules.mk b/keyboards/phage_studio/pila87/rules.mk
index ffe0bc9f39..05f967d7a8 100644
--- a/keyboards/phage_studio/pila87/rules.mk
+++ b/keyboards/phage_studio/pila87/rules.mk
@@ -1,15 +1,5 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-# Cannot use `BOOTLOADER = stm32duino` due to the need to override
-# `MCU_LDSCRIPT`, therefore all parameters need to be specified here manually.
-OPT_DEFS += -DBOOTLOADER_STM32DUINO
-MCU_LDSCRIPT = STM32F103xB_stm32duino_bootloader
-BOARD = STM32_F103_STM32DUINO
-BOOTLOADER_TYPE = stm32duino
-DFU_ARGS = -d 1EAF:0003 -a 2 -R
-DFU_SUFFIX_ARGS = -v 1EAF -p 0003
+# Configure for 128K flash
+MCU_LDSCRIPT = STM32F103xB
 
 # Build Options
 #   change yes to no to disable
@@ -29,7 +19,6 @@ OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Wear-levelling driver
 EEPROM_DRIVER = wear_leveling
diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h
index 37e5c3bcc3..9f5804745a 100644
--- a/keyboards/phantom/config.h
+++ b/keyboards/phantom/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, C7, C6, D4, D0, E6, F0, F1, F4, F5, F6, F7, D7, D6, D1, D2, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 20
 #    define RGBLIGHT_HUE_STEP 10
 #    define RGBLIGHT_SAT_STEP 17
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/phantom/info.json b/keyboards/phantom/info.json
index b246ac36fe..bf858eaf06 100644
--- a/keyboards/phantom/info.json
+++ b/keyboards/phantom/info.json
@@ -8,654 +8,662 @@
         "pid": "0x5B50",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"],
+        "rows": ["B5", "B4", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "B6",
         "scroll_lock": "B7"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "community_layouts": ["tkl_ansi", "tkl_iso"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
-
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"x": 16.25, "y": 4.5},
-
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.5},
+                {"matrix": [1, 0], "x": 1, "y": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1.5},
+                {"matrix": [1, 4], "x": 5, "y": 1.5},
+                {"matrix": [1, 5], "x": 6, "y": 1.5},
+                {"matrix": [1, 6], "x": 7, "y": 1.5},
+                {"matrix": [1, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 8], "x": 9, "y": 1.5},
+                {"matrix": [1, 9], "x": 10, "y": 1.5},
+                {"matrix": [1, 10], "x": 11, "y": 1.5},
+                {"matrix": [1, 11], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_plus_five": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
-
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"x": 15.25, "y": 3.5},
-                {"x": 16.25, "y": 3.5},
-                {"x": 17.25, "y": 3.5},
-
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"x": 15.25, "y": 4.5},
-                {"x": 16.25, "y": 4.5},
-                {"x": 17.25, "y": 4.5},
-
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.5},
+                {"matrix": [1, 0], "x": 1, "y": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1.5},
+                {"matrix": [1, 4], "x": 5, "y": 1.5},
+                {"matrix": [1, 5], "x": 6, "y": 1.5},
+                {"matrix": [1, 6], "x": 7, "y": 1.5},
+                {"matrix": [1, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 8], "x": 9, "y": 1.5},
+                {"matrix": [1, 9], "x": 10, "y": 1.5},
+                {"matrix": [1, 10], "x": 11, "y": 1.5},
+                {"matrix": [1, 11], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.5},
+                {"matrix": [3, 15], "x": 16.25, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
-
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"x": 16.25, "y": 4.5},
-
-                {"x": 0, "y": 5.5, "w": 1.5},
-                {"x": 1.5, "y": 5.5},
-                {"x": 2.5, "y": 5.5, "w": 1.5},
-                {"x": 4, "y": 5.5, "w": 7},
-                {"x": 11, "y": 5.5, "w": 1.5},
-                {"x": 12.5, "y": 5.5},
-                {"x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.5},
+                {"matrix": [1, 0], "x": 1, "y": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1.5},
+                {"matrix": [1, 4], "x": 5, "y": 1.5},
+                {"matrix": [1, 5], "x": 6, "y": 1.5},
+                {"matrix": [1, 6], "x": 7, "y": 1.5},
+                {"matrix": [1, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 8], "x": 9, "y": 1.5},
+                {"matrix": [1, 9], "x": 10, "y": 1.5},
+                {"matrix": [1, 10], "x": 11, "y": 1.5},
+                {"matrix": [1, 11], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5},
-                {"x": 14, "y": 1.5},
-
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5},
-                {"x": 13.75, "y": 3.5, "w": 1.25},
-
-                {"x": 15.25, "y": 3.5},
-                {"x": 16.25, "y": 3.5},
-                {"x": 17.25, "y": 3.5},
-
-                {"x": 0, "y": 4.5, "w": 1.25},
-                {"x": 1.25, "y": 4.5},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 1.75},
-                {"x": 14, "y": 4.5},
-
-                {"x": 15.25, "y": 4.5},
-                {"x": 16.25, "y": 4.5},
-                {"x": 17.25, "y": 4.5},
-
-                {"x": 0, "y": 5.5, "w": 1.5},
-                {"x": 1.5, "y": 5.5},
-                {"x": 2.5, "y": 5.5, "w": 1.5},
-                {"x": 4, "y": 5.5, "w": 1.5},
-                {"x": 5.5, "y": 5.5, "w": 1.5},
-                {"x": 7, "y": 5.5},
-                {"x": 8, "y": 5.5, "w": 1.5},
-                {"x": 9.5, "y": 5.5, "w": 1.5},
-                {"x": 11, "y": 5.5, "w": 1.5},
-                {"x": 12.5, "y": 5.5},
-                {"x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "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, 6], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.5},
+                {"matrix": [1, 0], "x": 1, "y": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1.5},
+                {"matrix": [1, 4], "x": 5, "y": 1.5},
+                {"matrix": [1, 5], "x": 6, "y": 1.5},
+                {"matrix": [1, 6], "x": 7, "y": 1.5},
+                {"matrix": [1, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 8], "x": 9, "y": 1.5},
+                {"matrix": [1, 9], "x": 10, "y": 1.5},
+                {"matrix": [1, 10], "x": 11, "y": 1.5},
+                {"matrix": [1, 11], "x": 12, "y": 1.5},
+                {"matrix": [1, 12], "x": 13, "y": 1.5},
+                {"matrix": [1, 13], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.5},
+                {"matrix": [3, 15], "x": 16.25, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 4, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 5.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 7, "y": 5.5},
+                {"matrix": [5, 8], "x": 8, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 10], "x": 9.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso_wkl": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
-
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5},
-                {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 4.5, "w": 1.25},
-                {"x": 1.25, "y": 4.5},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"x": 16.25, "y": 4.5},
-
-                {"x": 0, "y": 5.5, "w": 1.5},
-                {"x": 1.5, "y": 5.5},
-                {"x": 2.5, "y": 5.5, "w": 1.5},
-                {"x": 4, "y": 5.5, "w": 7},
-                {"x": 11, "y": 5.5, "w": 1.5},
-                {"x": 12.5, "y": 5.5},
-                {"x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.5},
+                {"matrix": [1, 0], "x": 1, "y": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1.5},
+                {"matrix": [1, 4], "x": 5, "y": 1.5},
+                {"matrix": [1, 5], "x": 6, "y": 1.5},
+                {"matrix": [1, 6], "x": 7, "y": 1.5},
+                {"matrix": [1, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 8], "x": 9, "y": 1.5},
+                {"matrix": [1, 9], "x": 10, "y": 1.5},
+                {"matrix": [1, 10], "x": 11, "y": 1.5},
+                {"matrix": [1, 11], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
-
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5},
-                {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 4.5, "w": 1.25},
-                {"x": 1.25, "y": 4.5},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"x": 16.25, "y": 4.5},
-
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.5},
+                {"matrix": [1, 0], "x": 1, "y": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1.5},
+                {"matrix": [1, 4], "x": 5, "y": 1.5},
+                {"matrix": [1, 5], "x": 6, "y": 1.5},
+                {"matrix": [1, 6], "x": 7, "y": 1.5},
+                {"matrix": [1, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 8], "x": 9, "y": 1.5},
+                {"matrix": [1, 9], "x": 10, "y": 1.5},
+                {"matrix": [1, 10], "x": 11, "y": 1.5},
+                {"matrix": [1, 11], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/phantom/phantom.c b/keyboards/phantom/phantom.c
deleted file mode 100644
index 5c478f82aa..0000000000
--- a/keyboards/phantom/phantom.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2017 Mathias Andersson <wraul@dbox.se>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "phantom.h"
diff --git a/keyboards/phantom/phantom.h b/keyboards/phantom/phantom.h
deleted file mode 100644
index 8e09e218d9..0000000000
--- a/keyboards/phantom/phantom.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright 2017 Mathias Andersson <wraul@dbox.se>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// Keymap utilizing all the possible keys on the PCB.
-#define LAYOUT_all( \
-    k00, k53, k02, k03, k04, k05, k56, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \
-    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,      k3E, k3F, k3G, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D,      k4E, k4F, k4G, \
-    k50, k51, k52, k54,      k55, k57, k58,           k5A, k5B, k5C, k5D,      k5E, k5F, k5G \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
-}
-
-// Keymap for a standard ANSI layout.
-#define LAYOUT_tkl_ansi( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D,      k1E, k1F, k1G, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,           k4F, \
-    k50, k51, k52,                k57,                k5A, k5B, k5C, k5D,      k5E, k5F, k5G \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, XXX }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, XXX, k4F, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, XXX, k57, XXX, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
-}
-
-// Keymap for a standard ANSI layout plus the five extra keys
-// above the arrow block.
-#define LAYOUT_tkl_ansi_plus_five( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D,      k1E, k1F, k1G, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,      k3E, k3F, k3G, \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,      k4E, k4F, k4G, \
-    k50, k51, k52,                k57,                k5A, k5B, k5C, k5D,      k5E, k5F, k5G \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F, k3G }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, k4E, k4F, k4G }, \
-    { k50, k51, k52, XXX, XXX, XXX, XXX, k57, XXX, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
-}
-
-#define LAYOUT_tkl_ansi_wkl( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D,      k1E, k1F, k1G, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,           k4F, \
-    k50, k51, k52,                k57,                     k5B, k5C, k5D,      k5E, k5F, k5G \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, XXX }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, XXX, k4F, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, XXX, k57, XXX, XXX, XXX, k5B, k5C, k5D, k5E, k5F, k5G } \
-}
-
-#define LAYOUT_tkl_iso( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D,      k1E, k1F, k1G, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,           k2E, k2F, k2G, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,           k4F, \
-    k50, k51, k52,                k57,                k5A, k5B, k5C, k5D,      k5E, k5F, k5G \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, XXX, k4F, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, XXX, k57, XXX, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
-}
-
-#define LAYOUT_tkl_iso_wkl( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D,      k1E, k1F, k1G, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,           k2E, k2F, k2G, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,           k4F, \
-    k50, k51, k52,                k57,                     k5B, k5C, k5D,      k5E, k5F, k5G \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, XXX, k4F, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, XXX, k57, XXX, XXX, XXX, k5B, k5C, k5D, k5E, k5F, k5G } \
-}
-
-#define LAYOUT_7bit LAYOUT_all
diff --git a/keyboards/phase_studio/titan65/hotswap/config.h b/keyboards/phase_studio/titan65/hotswap/config.h
index cf2ab2ffcb..8724fc556d 100644
--- a/keyboards/phase_studio/titan65/hotswap/config.h
+++ b/keyboards/phase_studio/titan65/hotswap/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, B5, B6, C6, F7 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, D5, F0, F1, C7, F4, F5, F6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
 #define RGB_MATRIX_LED_COUNT 67
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json
index d1e2b0e58b..c7429ca65c 100644
--- a/keyboards/phase_studio/titan65/hotswap/info.json
+++ b/keyboards/phase_studio/titan65/hotswap/info.json
@@ -8,6 +8,17 @@
         "pid": "0xBB91",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"],
+        "rows": ["B4", "B5", "B6", "C6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/phase_studio/titan65/hotswap/rules.mk b/keyboards/phase_studio/titan65/hotswap/rules.mk
index 4f7d24eafc..a3b3ae4eaa 100644
--- a/keyboards/phase_studio/titan65/hotswap/rules.mk
+++ b/keyboards/phase_studio/titan65/hotswap/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-
 
 AUDIO_SUPPORTED = no
 RGBLIGHT_SUPPORTED = no
diff --git a/keyboards/phase_studio/titan65/soldered/config.h b/keyboards/phase_studio/titan65/soldered/config.h
deleted file mode 100644
index a53a1ea4ce..0000000000
--- a/keyboards/phase_studio/titan65/soldered/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, C6, C7, F7, E6 }
-#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, F6, F5, F4, F1, F0, B0, B1, B2, B3 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/phase_studio/titan65/soldered/info.json b/keyboards/phase_studio/titan65/soldered/info.json
index ba7d9f9354..0973cfba05 100644
--- a/keyboards/phase_studio/titan65/soldered/info.json
+++ b/keyboards/phase_studio/titan65/soldered/info.json
@@ -8,6 +8,11 @@
         "pid": "0xBB92",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"],
+        "rows": ["B6", "C6", "C7", "F7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/phase_studio/titan65/soldered/soldered.c b/keyboards/phase_studio/titan65/soldered/soldered.c
deleted file mode 100644
index 65aee33f6b..0000000000
--- a/keyboards/phase_studio/titan65/soldered/soldered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "soldered.h"
diff --git a/keyboards/phoenix/config.h b/keyboards/phoenix/config.h
index 2ada33779d..76ac0edf2c 100644
--- a/keyboards/phoenix/config.h
+++ b/keyboards/phoenix/config.h
@@ -23,14 +23,9 @@
 #define MOUSEKEY_MAX_SPEED   7
 #define MOUSEKEY_WHEEL_DELAY 0
 
-#define DIODE_DIRECTION ROW2COL
-
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define MATRIX_ROW_PINS { B1, B0, A7, A6, A5, B7 }
-#define MATRIX_COL_PINS { B10, B12, B13, B14, B15, A8, A10 }
-
 #define HAL_USE_SERIAL TRUE
 #define SPLIT_HAND_PIN B9
 #define SERIAL_USART_DRIVER SD1
diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/info.json
index c9147ab8d8..2079750678 100644
--- a/keyboards/phoenix/info.json
+++ b/keyboards/phoenix/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B12", "B13", "B14", "B15", "A8", "A10"],
+        "rows": ["B1", "B0", "A7", "A6", "A5", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "A9"
     },
@@ -17,49 +22,191 @@
     "layouts": {
         "LAYOUT_ergodox": {
             "layout": [
-              {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-              {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-              {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-              {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-                     {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [5, 3], "x": 6, "y": 5},
+                {"matrix": [5, 4], "x": 7, "y": 5},
+
+                {"matrix": [5, 5], "x": 7, "y": 6},
+                {"matrix": [5, 0], "x": 5, "y": 6, "h": 2},
+                {"matrix": [5, 1], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [5, 2], "x": 7, "y": 7},
+
+                {"matrix": [6, 6], "x": 9.5, "y": 0.25},
+                {"matrix": [6, 5], "x": 10.5, "y": 0.25},
+                {"matrix": [6, 4], "x": 11.5, "y": 0.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+                {"matrix": [6, 2], "x": 13.5, "y": 0.125},
+                {"matrix": [6, 1], "x": 14.5, "y": 0.375},
+                {"matrix": [6, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [7, 6], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [7, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 1.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 1},
+                {"matrix": [7, 2], "x": 13.5, "y": 1.125},
+                {"matrix": [7, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [7, 0], "x": 15.5, "y": 1.375, "w": 1.5},
 
-                                            {"x":6, "y":5}, {"x":7, "y":5},
-                                                            {"x":7, "y":6},
-              {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
+                {"matrix": [8, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 4], "x": 11.5, "y": 2.125},
+                {"matrix": [8, 3], "x": 12.5, "y": 2},
+                {"matrix": [8, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [8, 1], "x": 14.5, "y": 2.375},
+                {"matrix": [8, 0], "x": 15.5, "y": 2.375, "w": 1.5},
+                {"matrix": [9, 6], "x": 9.5, "y": 2.75, "h": 1.5},
 
+                {"matrix": [9, 5], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 4], "x": 11.5, "y": 3.125},
+                {"matrix": [9, 3], "x": 12.5, "y": 3},
+                {"matrix": [9, 2], "x": 13.5, "y": 3.125},
+                {"matrix": [9, 1], "x": 14.5, "y": 3.375},
+                {"matrix": [9, 0], "x": 15.5, "y": 3.375, "w": 1.5},
 
-                         {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-                {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-                                              {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-                {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-                                                                    {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [10, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 4},
+                {"matrix": [10, 2], "x": 13.5, "y": 4.125},
+                {"matrix": [10, 1], "x": 14.5, "y": 4.375},
+                {"matrix": [10, 0], "x": 15.5, "y": 4.375},
 
+                {"matrix": [11, 4], "x": 9, "y": 5},
+                {"matrix": [11, 3], "x": 10, "y": 5},
 
-              {"x":9, "y":5}, {"x":10, "y":5},
-              {"x":9, "y":6},
-              {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+                {"matrix": [11, 5], "x": 9, "y": 6},
+
+                {"matrix": [11, 2], "x": 9, "y": 7},
+
+                {"matrix": [11, 1], "x": 10, "y": 6, "h": 2},
+                {"matrix": [11, 0], "x": 11, "y": 6, "h": 2}
             ]
         },
         "LAYOUT_ergodox_pretty": {
             "layout": [
-              {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-              {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [6, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [6, 1], "x": 10.5, "y": 0.25},
+                {"matrix": [6, 2], "x": 11.5, "y": 0.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+                {"matrix": [6, 4], "x": 13.5, "y": 0.125},
+                {"matrix": [6, 5], "x": 14.5, "y": 0.375},
+                {"matrix": [6, 6], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [7, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [7, 2], "x": 11.5, "y": 1.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 1},
+                {"matrix": [7, 4], "x": 13.5, "y": 1.125},
+                {"matrix": [7, 5], "x": 14.5, "y": 1.375},
+                {"matrix": [7, 6], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.125},
+                {"matrix": [8, 2], "x": 12.5, "y": 2},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.125},
+                {"matrix": [8, 4], "x": 14.5, "y": 2.375},
+                {"matrix": [8, 5], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [9, 0], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [9, 1], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 3.125},
+                {"matrix": [9, 3], "x": 12.5, "y": 3},
+                {"matrix": [9, 4], "x": 13.5, "y": 3.125},
+                {"matrix": [9, 5], "x": 14.5, "y": 3.375},
+                {"matrix": [9, 6], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
 
-              {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-              {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+                {"matrix": [10, 0], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 4},
+                {"matrix": [10, 2], "x": 13.5, "y": 4.125},
+                {"matrix": [10, 3], "x": 14.5, "y": 4.375},
+                {"matrix": [10, 4], "x": 15.5, "y": 4.375},
 
-              {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-              {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+                {"matrix": [5, 3], "x": 6, "y": 5},
+                {"matrix": [5, 4], "x": 7, "y": 5},
+                {"matrix": [11, 4], "x": 9, "y": 5},
+                {"matrix": [11, 3], "x": 10, "y": 5},
 
-              {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-              {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+                {"matrix": [5, 5], "x": 7, "y": 6},
+                {"matrix": [11, 5], "x": 9, "y": 6},
+                {"matrix": [5, 0], "x": 5, "y": 6, "h": 2},
+                {"matrix": [5, 1], "x": 6, "y": 6, "h": 2},
 
-                     {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-                                                                    {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [5, 2], "x": 7, "y": 7},
+                {"matrix": [11, 2], "x": 9, "y": 7},
 
-                                            {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
-                                                            {"x":7, "y":6},      {"x":9, "y":6},
-              {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+                {"matrix": [11, 1], "x": 10, "y": 6, "h": 2},
+                {"matrix": [11, 0], "x": 11, "y": 6, "h": 2}
             ]
         }
     }
diff --git a/keyboards/phoenix/phoenix.h b/keyboards/phoenix/phoenix.h
index bd8e4a30ab..22a25bb4bd 100644
--- a/keyboards/phoenix/phoenix.h
+++ b/keyboards/phoenix/phoenix.h
@@ -28,67 +28,3 @@ inline void led3_on(void) { led_pin_on(6); };
 inline void led1_off(void) { led_pin_off(8); };
 inline void led2_off(void) { led_pin_off(5); };
 inline void led3_off(void) { led_pin_off(6); };
-
-#define LAYOUT_ergodox(                    \
-    k00,k01,k02,k03,k04,k05,k06,           \
-    k10,k11,k12,k13,k14,k15,k16,           \
-    k20,k21,k22,k23,k24,k25,               \
-    k30,k31,k32,k33,k34,k35,k36,           \
-    k40,k41,k42,k43,k44,                   \
-                            k55,k56,       \
-                                k54,       \
-                        k53,k52,k51,       \
-                                           \
-        k07,k08,k09,k0A,k0B,k0C,k0D,       \
-        k17,k18,k19,k1A,k1B,k1C,k1D,       \
-            k28,k29,k2A,k2B,k2C,k2D,       \
-        k37,k38,k39,k3A,k3B,k3C,k3D,       \
-                k49,k4A,k4B,k4C,k4D,       \
-    k57,k58,                               \
-    k59,                                   \
-    k5C,k5B,k5A )                          \
-                                           \
-   /* matrix positions */                  \
-   {                                       \
-    { k00, k01, k02, k03, k04, k05, k06 }, \
-    { k10, k11, k12, k13, k14, k15, k16 }, \
-    { k20, k21, k22, k23, k24, k25 },      \
-    { k30, k31, k32, k33, k34, k35, k36 }, \
-    { k40, k41, k42, k43, k44 },           \
-    { k53, k52, k51, k55, k56, k54 },      \
-                                           \
-    { k0D, k0C, k0B, k0A, k09, k08, k07 }, \
-    { k1D, k1C, k1B, k1A, k19, k18, k17 }, \
-    { k2D, k2C, k2B, k2A, k29, k28 },      \
-    { k3D, k3C, k3B, k3A, k39, k38, k37 }, \
-    { k4D, k4C, k4B, k4A, k49  },          \
-    { k5A, k5B, k5C, k58, k57, k59 },      \
-   }
-
-/*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */
-#define LAYOUT_ergodox_pretty(                                           \
-    L00,L01,L02,L03,L04,L05,L06,           R00,R01,R02,R03,R04,R05,R06,  \
-    L10,L11,L12,L13,L14,L15,L16,           R10,R11,R12,R13,R14,R15,R16,  \
-    L20,L21,L22,L23,L24,L25,                   R21,R22,R23,R24,R25,R26,  \
-    L30,L31,L32,L33,L34,L35,L36,           R30,R31,R32,R33,R34,R35,R36,  \
-    L40,L41,L42,L43,L44,                           R42,R43,R44,R45,R46,  \
-                            L55,L56,   R50,R51,                          \
-                                L54,   R52,                              \
-                        L53,L52,L51,   R55,R54,R53 )                     \
-                                          \
-   /* matrix positions */                 \
-    {                                     \
-    { L00, L10, L02, L03, L04, L05, L06 },\
-    { L10, L11, L12, L13, L14, L15, L16 },\
-    { L20, L21, L22, L23, L24, L25 },     \
-    { L30, L31, L32, L33, L34, L35, L36 },\
-    { L40, L41, L42, L43, L44 },          \
-    { L53, L52, L51, L55, L56, L54 },     \
-                                          \
-    { R00, R01, R02, R03, R04, R05, R06 },\
-    { R10, R11, R12, R13, R14, R15, R16 },\
-    { R20, R21, R22, R23, R24, R25 },     \
-    { R30, R31, R32, R33, R34, R35, R36 },\
-    { R40, R41, R42, R43, R44 },          \
-    { R53, R54, R55, R51, R50, R52 },     \
-    }
diff --git a/keyboards/phrygian/ph100/config.h b/keyboards/phrygian/ph100/config.h
deleted file mode 100644
index e4ceee2d48..0000000000
--- a/keyboards/phrygian/ph100/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Phrygian Design
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, A8, A9 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/phrygian/ph100/info.json b/keyboards/phrygian/ph100/info.json
index 961488898a..5930a8266f 100644
--- a/keyboards/phrygian/ph100/info.json
+++ b/keyboards/phrygian/ph100/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0C61",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B15",
         "num_lock": "B14"
diff --git a/keyboards/phrygian/ph100/ph100.c b/keyboards/phrygian/ph100/ph100.c
deleted file mode 100644
index 45c2426961..0000000000
--- a/keyboards/phrygian/ph100/ph100.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Phrygian Design
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ph100.h"
-
-//Put software here
\ No newline at end of file
diff --git a/keyboards/pica40/keymaps/zzeneg/config.h b/keyboards/pica40/keymaps/zzeneg/config.h
index ec422c4d8e..f29f5ba1a7 100644
--- a/keyboards/pica40/keymaps/zzeneg/config.h
+++ b/keyboards/pica40/keymaps/zzeneg/config.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_FORCE_HOLD
 #define TAPPING_FORCE_HOLD_PER_KEY
 #define TAPPING_TERM 150
diff --git a/keyboards/pica40/rev1/info.json b/keyboards/pica40/rev1/info.json
index 8e4e64618d..e491dd798a 100644
--- a/keyboards/pica40/rev1/info.json
+++ b/keyboards/pica40/rev1/info.json
@@ -19,12 +19,14 @@
     },
     "rgblight": {
         "led_count": 1,
-        "pin": "D3",
         "layers": {
             "enabled": true,
             "max": 3
         }
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "encoder": {
         "rotary": [{ "pin_a": "C6", "pin_b": "D4" }]
     },
diff --git a/keyboards/pica40/rev1/rev1.c b/keyboards/pica40/rev1/rev1.c
index f008e4857a..f8a03dde3b 100644
--- a/keyboards/pica40/rev1/rev1.c
+++ b/keyboards/pica40/rev1/rev1.c
@@ -77,15 +77,3 @@ bool oled_task_kb(void) {
 }
 
 #endif // OLED_ENABLE
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-
-    tap_code(clockwise ? KC_VOLU : KC_VOLD);
-
-    return false;
-}
-
-#endif // ENCODER_ENABLE
diff --git a/keyboards/pica40/rev2/info.json b/keyboards/pica40/rev2/info.json
index dbef8254ef..7d92343c09 100644
--- a/keyboards/pica40/rev2/info.json
+++ b/keyboards/pica40/rev2/info.json
@@ -24,13 +24,16 @@
     },
     "rgblight": {
         "led_count": 1,
-        "pin": "GP12",
         "split": true,
         "layers": {
             "enabled": true,
             "max": 3
         }
     },
+    "ws2812": {
+        "pin": "GP12",
+        "driver": "vendor"
+    },
     "split": {
         "enabled": true,
         "encoder": {
diff --git a/keyboards/pica40/rev2/rules.mk b/keyboards/pica40/rev2/rules.mk
index 8fb51ec82d..161ec22b16 100644
--- a/keyboards/pica40/rev2/rules.mk
+++ b/keyboards/pica40/rev2/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/pico/65keys/65keys.c b/keyboards/pico/65keys/65keys.c
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/pico/65keys/65keys.c
+++ /dev/null
diff --git a/keyboards/pico/65keys/65keys.h b/keyboards/pico/65keys/65keys.h
index 61e32efd2c..444d8d2ee5 100644
--- a/keyboards/pico/65keys/65keys.h
+++ b/keyboards/pico/65keys/65keys.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "pico.h"
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/pico/65keys/config.h b/keyboards/pico/65keys/config.h
index 7a97d2c42d..7506090b1e 100644
--- a/keyboards/pico/65keys/config.h
+++ b/keyboards/pico/65keys/config.h
@@ -16,23 +16,11 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/pico/65keys/info.json b/keyboards/pico/65keys/info.json
index 53389861e8..c591f0fe47 100644
--- a/keyboards/pico/65keys/info.json
+++ b/keyboards/pico/65keys/info.json
@@ -8,9 +8,17 @@
         "pid": "0x9692",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/pico/70keys/70keys.c b/keyboards/pico/70keys/70keys.c
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/pico/70keys/70keys.c
+++ /dev/null
diff --git a/keyboards/pico/70keys/70keys.h b/keyboards/pico/70keys/70keys.h
index 67f7161ca5..6235d8e136 100644
--- a/keyboards/pico/70keys/70keys.h
+++ b/keyboards/pico/70keys/70keys.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "pico.h"
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/pico/70keys/config.h b/keyboards/pico/70keys/config.h
index 7a97d2c42d..7506090b1e 100644
--- a/keyboards/pico/70keys/config.h
+++ b/keyboards/pico/70keys/config.h
@@ -16,23 +16,11 @@
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #undef RGBLED_NUM
 #define RGBLED_NUM 14    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/pico/70keys/info.json b/keyboards/pico/70keys/info.json
index 5dc25ede27..0cd5afb0ca 100644
--- a/keyboards/pico/70keys/info.json
+++ b/keyboards/pico/70keys/info.json
@@ -8,9 +8,17 @@
         "pid": "0x9692",
         "device_version": "1.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/pico/pico.c b/keyboards/pico/pico.c
deleted file mode 100644
index 7a7a7a6457..0000000000
--- a/keyboards/pico/pico.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "pico.h"
diff --git a/keyboards/pico/pico.h b/keyboards/pico/pico.h
deleted file mode 100644
index 72024efd80..0000000000
--- a/keyboards/pico/pico.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef KEYBOARD_pico_65keys
-    #include "65keys.h"
-#endif
-#ifdef KEYBOARD_pico_70keys
-    #include "70keys.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/picolab/frusta_fundamental/config.h b/keyboards/picolab/frusta_fundamental/config.h
index 75857b0155..1bd318c9ad 100644
--- a/keyboards/picolab/frusta_fundamental/config.h
+++ b/keyboards/picolab/frusta_fundamental/config.h
@@ -16,25 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B2, B3, B7, D5, D3, D2, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCING 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,4 +36,3 @@
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/picolab/frusta_fundamental/frusta_fundamental.c b/keyboards/picolab/frusta_fundamental/frusta_fundamental.c
deleted file mode 100644
index 17d5df8090..0000000000
--- a/keyboards/picolab/frusta_fundamental/frusta_fundamental.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 PicoLab
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "frusta_fundamental.h"
diff --git a/keyboards/picolab/frusta_fundamental/info.json b/keyboards/picolab/frusta_fundamental/info.json
index 130b1839bf..2296712e1e 100644
--- a/keyboards/picolab/frusta_fundamental/info.json
+++ b/keyboards/picolab/frusta_fundamental/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["D4", "D6", "D7", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/pierce/info.json b/keyboards/pierce/info.json
index b2dd54c57e..971b9939cf 100644
--- a/keyboards/pierce/info.json
+++ b/keyboards/pierce/info.json
@@ -14,46 +14,49 @@
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1, "y":0.13},
-                {"x":2, "y":0.0},
-                {"x":3, "y":0.13},
-                {"x":4, "y":0.25},
-                {"x":7, "y":0.25},
-                {"x":8, "y":0.13},
-                {"x":9, "y":0.0},
-                {"x":10, "y":0.13},
-                {"x":11, "y":0.5},
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.13},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.13},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
 
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.13},
-                {"x":2, "y":1.0},
-                {"x":3, "y":1.13},
-                {"x":4, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.13},
-                {"x":9, "y":1.0},
-                {"x":10, "y":1.13},
-                {"x":11, "y":1.5},
+                {"matrix": [0, 5], "x": 7, "y": 0.25},
+                {"matrix": [0, 6], "x": 8, "y": 0.13},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0.13},
+                {"matrix": [0, 9], "x": 11, "y": 0.5},
 
-                {"x":0, "y":2.5},
-                {"x":1, "y":2.13},
-                {"x":2, "y":2.0},
-                {"x":3, "y":2.13},
-                {"x":4, "y":2.25},
-                {"x":7, "y":2.25},
-                {"x":8, "y":2.13},
-                {"x":9, "y":2.0},
-                {"x":10, "y":2.13},
-                {"x":11, "y":2.5},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.13},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.13},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
 
-                {"x":2.5, "y":3.16},
-                {"x":3.5, "y":3.5},
-                {"x":4.5, "y":3.75},
+                {"matrix": [1, 5], "x": 7, "y": 1.25},
+                {"matrix": [1, 6], "x": 8, "y": 1.13},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1.13},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
 
-                {"x":6.5, "y":3.75},
-                {"x":7.5, "y":3.5},
-                {"x":8.5, "y":3.16}
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.13},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.13},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [2, 5], "x": 7, "y": 2.25},
+                {"matrix": [2, 6], "x": 8, "y": 2.13},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2.13},
+                {"matrix": [2, 9], "x": 11, "y": 2.5},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3.16},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.75},
+
+                {"matrix": [3, 5], "x": 6.5, "y": 3.75},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.5},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.16}
             ]
         }
     }
diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h
index 7049a692ed..8ff2df3709 100644
--- a/keyboards/pierce/keymaps/durken1/config.h
+++ b/keyboards/pierce/keymaps/durken1/config.h
@@ -19,9 +19,6 @@
 // default but important
 #define TAPPING_TERM 220
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
 
diff --git a/keyboards/pierce/pierce.c b/keyboards/pierce/pierce.c
deleted file mode 100644
index 085ca9cdec..0000000000
--- a/keyboards/pierce/pierce.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 durken (https://github.com/durken1/)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pierce.h"
diff --git a/keyboards/pierce/pierce.h b/keyboards/pierce/pierce.h
deleted file mode 100644
index edb4151740..0000000000
--- a/keyboards/pierce/pierce.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2022 durken (https://github.com/durken1/)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_split_3x5_3( \
-	K00, K01, K02, K03, K04,	K05, K06, K07, K08, K09, \
-	K10, K11, K12, K13, K14,	K15, K16, K17, K18, K19, \
-	K20, K21, K22, K23, K24,	K25, K26, K27, K28, K29, \
-	            K32, K33, K34,    K35, K36, K37  \
-) { \
-	{ K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09 }, \
-	{ K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19 }, \
-	{ K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29 }, \
-	{ KC_NO, KC_NO, K32,  K33,  K34,  K35,  K36,  K37,  KC_NO, KC_NO }  \
-}
diff --git a/keyboards/pimentoso/paddino02/rev1/config.h b/keyboards/pimentoso/paddino02/rev1/config.h
index e29507dde7..5f36081323 100755
--- a/keyboards/pimentoso/paddino02/rev1/config.h
+++ b/keyboards/pimentoso/paddino02/rev1/config.h
@@ -1,34 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, D0, D4 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/pimentoso/paddino02/rev1/info.json b/keyboards/pimentoso/paddino02/rev1/info.json
index f7fbee01d1..1ee1a11399 100644
--- a/keyboards/pimentoso/paddino02/rev1/info.json
+++ b/keyboards/pimentoso/paddino02/rev1/info.json
@@ -8,23 +8,28 @@
         "pid": "0x0020",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5"],
+        "rows": ["D1", "D0", "D4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1, "y":0.25},
-                {"x":2, "y":0},
-                {"x":3, "y":0.25},
+                {"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},
 
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1},
-                {"x":3, "y":1.25},
+                {"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},
 
-                {"x":2, "y":2.75},
-                {"x":3, "y":2.75}
+                {"matrix": [2, 2], "x": 2, "y": 2.75},
+                {"matrix": [2, 3], "x": 3, "y": 2.75}
             ]
         }
     }
diff --git a/keyboards/pimentoso/paddino02/rev1/rev1.c b/keyboards/pimentoso/paddino02/rev1/rev1.c
deleted file mode 100644
index 9ebd22df79..0000000000
--- a/keyboards/pimentoso/paddino02/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Michele Ferri <zomgsako@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/pimentoso/paddino02/rev1/rev1.h b/keyboards/pimentoso/paddino02/rev1/rev1.h
deleted file mode 100755
index cca4a3c263..0000000000
--- a/keyboards/pimentoso/paddino02/rev1/rev1.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	          K22, K23  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ KC_NO, KC_NO, K22,   K23 }  \
-}
diff --git a/keyboards/pimentoso/paddino02/rev2/left/config.h b/keyboards/pimentoso/paddino02/rev2/left/config.h
index 976f02f261..5f36081323 100755
--- a/keyboards/pimentoso/paddino02/rev2/left/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/left/config.h
@@ -1,34 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D4, D1 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/pimentoso/paddino02/rev2/left/info.json b/keyboards/pimentoso/paddino02/rev2/left/info.json
index 90d7e4e90d..f297903f68 100644
--- a/keyboards/pimentoso/paddino02/rev2/left/info.json
+++ b/keyboards/pimentoso/paddino02/rev2/left/info.json
@@ -8,23 +8,28 @@
         "pid": "0x0021",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5"],
+        "rows": ["D0", "D4", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1, "y":0.25},
-                {"x":2, "y":0},
-                {"x":3, "y":0.25},
+                {"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},
 
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1},
-                {"x":3, "y":1.25},
+                {"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},
 
-                {"x":2, "y":2.75},
-                {"x":3, "y":2.75}
+                {"matrix": [2, 2], "x": 2, "y": 2.75},
+                {"matrix": [2, 3], "x": 3, "y": 2.75}
             ]
         }
     }
diff --git a/keyboards/pimentoso/paddino02/rev2/left/left.c b/keyboards/pimentoso/paddino02/rev2/left/left.c
deleted file mode 100644
index 26e31efb89..0000000000
--- a/keyboards/pimentoso/paddino02/rev2/left/left.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Michele Ferri <zomgsako@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "left.h"
diff --git a/keyboards/pimentoso/paddino02/rev2/left/left.h b/keyboards/pimentoso/paddino02/rev2/left/left.h
deleted file mode 100755
index cca4a3c263..0000000000
--- a/keyboards/pimentoso/paddino02/rev2/left/left.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	          K22, K23  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ KC_NO, KC_NO, K22,   K23 }  \
-}
diff --git a/keyboards/pimentoso/paddino02/rev2/right/config.h b/keyboards/pimentoso/paddino02/rev2/right/config.h
index 206f0a5429..5f36081323 100755
--- a/keyboards/pimentoso/paddino02/rev2/right/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/right/config.h
@@ -1,34 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F6, F5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/pimentoso/paddino02/rev2/right/info.json b/keyboards/pimentoso/paddino02/rev2/right/info.json
index 3e361839f3..385ee96af9 100644
--- a/keyboards/pimentoso/paddino02/rev2/right/info.json
+++ b/keyboards/pimentoso/paddino02/rev2/right/info.json
@@ -8,23 +8,28 @@
         "pid": "0x0022",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1"],
+        "rows": ["F4", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.25},
-                {"x":1, "y":0},
-                {"x":2, "y":0.25},
-                {"x":3, "y":0.5},
+                {"matrix": [0, 3], "x": 0, "y": 0.25},
+                {"matrix": [0, 2], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0.25},
+                {"matrix": [0, 0], "x": 3, "y": 0.5},
 
-                {"x":0, "y":1.25},
-                {"x":1, "y":1},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.5},
+                {"matrix": [1, 3], "x": 0, "y": 1.25},
+                {"matrix": [1, 2], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 0], "x": 3, "y": 1.5},
 
-                {"x":0, "y":2.75},
-                {"x":1, "y":2.75}
+                {"matrix": [2, 1], "x": 0, "y": 2.75},
+                {"matrix": [2, 0], "x": 1, "y": 2.75}
             ]
         }
     }
diff --git a/keyboards/pimentoso/paddino02/rev2/right/right.c b/keyboards/pimentoso/paddino02/rev2/right/right.c
deleted file mode 100644
index 872541271a..0000000000
--- a/keyboards/pimentoso/paddino02/rev2/right/right.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Michele Ferri <zomgsako@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "right.h"
diff --git a/keyboards/pimentoso/paddino02/rev2/right/right.h b/keyboards/pimentoso/paddino02/rev2/right/right.h
deleted file mode 100755
index ac7ed847de..0000000000
--- a/keyboards/pimentoso/paddino02/rev2/right/right.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21  \
-) { \
-	{ K03,   K02,   K01,   K00 }, \
-	{ K13,   K12,   K11,   K10 }, \
-	{ K21,   K20,   KC_NO, KC_NO }  \
-}
diff --git a/keyboards/pimentoso/touhoupad/config.h b/keyboards/pimentoso/touhoupad/config.h
index ce44b3ad20..6ded752fcc 100644
--- a/keyboards/pimentoso/touhoupad/config.h
+++ b/keyboards/pimentoso/touhoupad/config.h
@@ -15,14 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D4 }
-#define MATRIX_COL_PINS { C6,D7,E6,B4,B6,B2,B3,B1,F7,F6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 12
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -33,4 +25,3 @@
   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json
index 755b1cf6ba..4e35191761 100644
--- a/keyboards/pimentoso/touhoupad/info.json
+++ b/keyboards/pimentoso/touhoupad/info.json
@@ -8,24 +8,32 @@
         "pid": "0x0031",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6"],
+        "rows": ["D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"esc", "x":5.25, "y":0},
-                {"label":"enter", "x":6.25, "y":0},
+                {"matrix": [0, 9], "x": 5.25, "y": 0},
+                {"matrix": [0, 8], "x": 6.25, "y": 0},
 
-                {"label":"slow", "x":0, "y":1},
-                {"label":"fire", "x":1, "y":1},
-                {"label":"rapid", "x":2, "y":1},
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 1},
 
-                {"label":"up", "x":6.25, "y":1.75},
-                {"label":"left", "x":5.25, "y":2.75},
-                {"label":"down", "x":6.25, "y":2.75},
-                {"label":"right", "x":7.25, "y":2.75},
+                {"matrix": [0, 7], "x": 6.25, "y": 1.75},
+                {"matrix": [0, 4], "x": 5.25, "y": 2.75},
+                {"matrix": [0, 5], "x": 6.25, "y": 2.75},
+                {"matrix": [0, 6], "x": 7.25, "y": 2.75},
 
-                {"label":"bomb", "x":3.25, "y":3}
+                {"matrix": [0, 3], "x": 3.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/pimentoso/touhoupad/touhoupad.c b/keyboards/pimentoso/touhoupad/touhoupad.c
deleted file mode 100644
index a7c7fa073f..0000000000
--- a/keyboards/pimentoso/touhoupad/touhoupad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Michele Ferri <zomgsako@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "touhoupad.h"
diff --git a/keyboards/pimentoso/touhoupad/touhoupad.h b/keyboards/pimentoso/touhoupad/touhoupad.h
deleted file mode 100644
index 8c7bfc36e1..0000000000
--- a/keyboards/pimentoso/touhoupad/touhoupad.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Michele Ferri <zomgsako@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-                             k09, k08,      \
-    k00, k01, k02,                          \
-                                  k07,      \
-                             k04, k05, k06, \
-                   k03                      \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 } \
-}
diff --git a/keyboards/pinky/3/3.c b/keyboards/pinky/3/3.c
deleted file mode 100644
index 200510d0aa..0000000000
--- a/keyboards/pinky/3/3.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "pinky.h"
diff --git a/keyboards/pinky/3/3.h b/keyboards/pinky/3/3.h
deleted file mode 100644
index add202537a..0000000000
--- a/keyboards/pinky/3/3.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "../pinky.h"
-
-#include "quantum.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT_split_3x7_4( \
-  L00, L01, L02, L03, L04, L05, L06,  R00, R01, R02, R03, R04, R05, R06, \
-  L10, L11, L12, L13, L14, L15, L16,  R10, R11, R12, R13, R14, R15, R16, \
-  L20, L21, L22, L23, L24, L25, L26,  R20, R21, R22, R23, R24, R25, R26, \
-                 L30, L31, L32, L33,  R30, R31, R32, R33 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25, L26 }, \
-    { KC_NO, KC_NO, KC_NO, L30, L31, L32, L33 }, \
-    { R06, R05, R04, R03, R02, R01, R00 }, \
-    { R16, R15, R14, R13, R12, R11, R10 }, \
-    { R26, R25, R24, R23, R22, R21, R20 }, \
-    { KC_NO, KC_NO, KC_NO, R33, R32, R31, R30 } \
-  }
-
-#define LAYOUT LAYOUT_split_3x7_4
diff --git a/keyboards/pinky/3/config.h b/keyboards/pinky/3/config.h
deleted file mode 100644
index bd8fa8fb69..0000000000
--- a/keyboards/pinky/3/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2018 'Masayuki Sunahara'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-
-// wiring of each half
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/pinky/3/info.json b/keyboards/pinky/3/info.json
index 4c96ddfc87..770d368399 100644
--- a/keyboards/pinky/3/info.json
+++ b/keyboards/pinky/3/info.json
@@ -8,67 +8,79 @@
         "pid": "0x7033",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x7_4"
+    },
     "layouts": {
         "LAYOUT_split_3x7_4": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0.3},
-                {"label":"Q", "x":1, "y":0.3},
-                {"label":"W", "x":2, "y":0.2},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0.2},
-                {"label":"T", "x":5, "y":0.4},
-                {"label":"(", "x":6, "y":0.6},
-                {"label":")", "x":9, "y":0.6},
-                {"label":"Y", "x":10, "y":0.4},
-                {"label":"U", "x":11, "y":0.2},
-                {"label":"I", "x":12, "y":0},
-                {"label":"O", "x":13, "y":0.2},
-                {"label":"P", "x":14, "y":0.3},
-                {"label":"Backspace", "x":15, "y":0.3},
+                {"matrix": [0, 0], "x": 0, "y": 0.3},
+                {"matrix": [0, 1], "x": 1, "y": 0.3},
+                {"matrix": [0, 2], "x": 2, "y": 0.2},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.2},
+                {"matrix": [0, 5], "x": 5, "y": 0.4},
+                {"matrix": [0, 6], "x": 6, "y": 0.6},
+
+                {"matrix": [4, 6], "x": 9, "y": 0.6},
+                {"matrix": [4, 5], "x": 10, "y": 0.4},
+                {"matrix": [4, 4], "x": 11, "y": 0.2},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 2], "x": 13, "y": 0.2},
+                {"matrix": [4, 1], "x": 14, "y": 0.3},
+                {"matrix": [4, 0], "x": 15, "y": 0.3},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.3},
+                {"matrix": [1, 1], "x": 1, "y": 1.3},
+                {"matrix": [1, 2], "x": 2, "y": 1.2},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.2},
+                {"matrix": [1, 5], "x": 5, "y": 1.4},
+                {"matrix": [1, 6], "x": 6, "y": 1.6},
+
+                {"matrix": [5, 6], "x": 9, "y": 1.6},
+                {"matrix": [5, 5], "x": 10, "y": 1.4},
+                {"matrix": [5, 4], "x": 11, "y": 1.2},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 2], "x": 13, "y": 1.2},
+                {"matrix": [5, 1], "x": 14, "y": 1.3},
+                {"matrix": [5, 0], "x": 15, "y": 1.3},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.3},
+                {"matrix": [2, 1], "x": 1, "y": 2.3},
+                {"matrix": [2, 2], "x": 2, "y": 2.2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.2},
+                {"matrix": [2, 5], "x": 5, "y": 2.4},
+                {"matrix": [2, 6], "x": 6, "y": 3},
 
-                {"label":"Ctrl / Tab", "x":0, "y":1.3},
-                {"label":"A", "x":1, "y":1.3},
-                {"label":"S", "x":2, "y":1.2},
-                {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1.2},
-                {"label":"G", "x":5, "y":1.4},
-                {"label":"[", "x":6, "y":1.6},
-                {"label":"]", "x":9, "y":1.6},
-                {"label":"H", "x":10, "y":1.4},
-                {"label":"J", "x":11, "y":1.2},
-                {"label":"K", "x":12, "y":1},
-                {"label":"L", "x":13, "y":1.2},
-                {"label":":", "x":14, "y":1.3},
-                {"label":"\"", "x":15, "y":1.3},
+                {"matrix": [6, 6], "x": 9, "y": 3},
+                {"matrix": [6, 5], "x": 10, "y": 2.4},
+                {"matrix": [6, 4], "x": 11, "y": 2.2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 2], "x": 13, "y": 2.2},
+                {"matrix": [6, 1], "x": 14, "y": 2.3},
+                {"matrix": [6, 0], "x": 15, "y": 2.3},
 
-                {"label":"Shift", "x":0, "y":2.3},
-                {"label":"Z", "x":1, "y":2.3},
-                {"label":"X", "x":2, "y":2.2},
-                {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2.2},
-                {"label":"B", "x":5, "y":2.4},
-                {"label":"MO(_ADJUST)", "x":6, "y":3},
-                {"label":"MO(_ADJUST)", "x":9, "y":3},
-                {"label":"N", "x":10, "y":2.4},
-                {"label":"M", "x":11, "y":2.2},
-                {"label":"<", "x":12, "y":2},
-                {"label":">", "x":13, "y":2.2},
-                {"label":"?", "x":14, "y":2.3},
-                {"label":"Enter", "x":15, "y":2.3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.7},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.8},
+                {"matrix": [3, 5], "x": 5.5, "y": 4},
+                {"matrix": [3, 6], "x": 6.5, "y": 4.3},
 
-                {"label":"Alt", "x":3.5, "y":3.7},
-                {"label":"MO(_LOWER)", "x":4.5, "y":3.8},
-                {"label":"GUI", "x":5.5, "y":4},
-                {"label":"Space", "x":6.5, "y":4.3},
-                {"label":"Space", "x":8.5, "y":4.3},
-                {"label":"GUI", "x":9.5, "y":4},
-                {"label":"MO(_RAISE)", "x":10.5, "y":3.8},
-                {"label":"Alt", "x":11.5, "y":3.7}
+                {"matrix": [7, 6], "x": 8.5, "y": 4.3},
+                {"matrix": [7, 5], "x": 9.5, "y": 4},
+                {"matrix": [7, 4], "x": 10.5, "y": 3.8},
+                {"matrix": [7, 3], "x": 11.5, "y": 3.7}
             ]
         }
     }
diff --git a/keyboards/pinky/4/4.c b/keyboards/pinky/4/4.c
deleted file mode 100644
index 200510d0aa..0000000000
--- a/keyboards/pinky/4/4.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "pinky.h"
diff --git a/keyboards/pinky/4/4.h b/keyboards/pinky/4/4.h
deleted file mode 100644
index 9420a320ff..0000000000
--- a/keyboards/pinky/4/4.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "../pinky.h"
-
-#include "quantum.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT_split_4x7_4( \
-  L00, L01, L02, L03, L04, L05, L06,  R00, R01, R02, R03, R04, R05, R06, \
-  L10, L11, L12, L13, L14, L15, L16,  R10, R11, R12, R13, R14, R15, R16, \
-  L20, L21, L22, L23, L24, L25, L26,  R20, R21, R22, R23, R24, R25, R26, \
-  L30, L31, L32, L33, L34, L35, L36,  R30, R31, R32, R33, R34, R35, R36, \
-                 L40, L41, L42, L43,  R40, R41, R42, R43 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25, L26 }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { KC_NO, KC_NO, KC_NO, L40, L41, L42, L43 }, \
-    { R06, R05, R04, R03, R02, R01, R00 }, \
-    { R16, R15, R14, R13, R12, R11, R10 }, \
-    { R26, R25, R24, R23, R22, R21, R20 }, \
-    { R36, R35, R34, R33, R32, R31, R30 }, \
-    { KC_NO, KC_NO, KC_NO, R43, R42, R41, R40 } \
-  }
-
-#define LAYOUT LAYOUT_split_4x7_4
diff --git a/keyboards/pinky/4/config.h b/keyboards/pinky/4/config.h
deleted file mode 100644
index c0185d3446..0000000000
--- a/keyboards/pinky/4/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2018 'Masayuki Sunahara'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-
-// wiring of each half
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/pinky/4/info.json b/keyboards/pinky/4/info.json
index cc1bbb1edd..01e44a647b 100644
--- a/keyboards/pinky/4/info.json
+++ b/keyboards/pinky/4/info.json
@@ -8,82 +8,95 @@
         "pid": "0x7034",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_4x7_4"
+    },
     "layouts": {
         "LAYOUT_split_4x7_4": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0.3},
-                {"label":"1", "x":1, "y":0.3},
-                {"label":"2", "x":2, "y":0.2},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0.2},
-                {"label":"5", "x":5, "y":0.4},
-                {"label":"(", "x":6, "y":0.6},
-                {"label":")", "x":9, "y":0.6},
-                {"label":"6", "x":10, "y":0.4},
-                {"label":"7", "x":11, "y":0.2},
-                {"label":"8", "x":12, "y":0},
-                {"label":"9", "x":13, "y":0.2},
-                {"label":"0", "x":14, "y":0.3},
-                {"label":"Backspace", "x":15, "y":0.3},
+                {"matrix": [0, 0], "x": 0, "y": 0.3},
+                {"matrix": [0, 1], "x": 1, "y": 0.3},
+                {"matrix": [0, 2], "x": 2, "y": 0.2},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.2},
+                {"matrix": [0, 5], "x": 5, "y": 0.4},
+                {"matrix": [0, 6], "x": 6, "y": 0.6},
+
+                {"matrix": [5, 6], "x": 9, "y": 0.6},
+                {"matrix": [5, 5], "x": 10, "y": 0.4},
+                {"matrix": [5, 4], "x": 11, "y": 0.2},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0.2},
+                {"matrix": [5, 1], "x": 14, "y": 0.3},
+                {"matrix": [5, 0], "x": 15, "y": 0.3},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.3},
+                {"matrix": [1, 1], "x": 1, "y": 1.3},
+                {"matrix": [1, 2], "x": 2, "y": 1.2},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.2},
+                {"matrix": [1, 5], "x": 5, "y": 1.4},
+                {"matrix": [1, 6], "x": 6, "y": 1.6},
+
+                {"matrix": [6, 6], "x": 9, "y": 1.6},
+                {"matrix": [6, 5], "x": 10, "y": 1.4},
+                {"matrix": [6, 4], "x": 11, "y": 1.2},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 2], "x": 13, "y": 1.2},
+                {"matrix": [6, 1], "x": 14, "y": 1.3},
+                {"matrix": [6, 0], "x": 15, "y": 1.3},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.3},
+                {"matrix": [2, 1], "x": 1, "y": 2.3},
+                {"matrix": [2, 2], "x": 2, "y": 2.2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.2},
+                {"matrix": [2, 5], "x": 5, "y": 2.4},
+                {"matrix": [2, 6], "x": 6, "y": 2.6},
+
+                {"matrix": [7, 6], "x": 9, "y": 2.6},
+                {"matrix": [7, 5], "x": 10, "y": 2.4},
+                {"matrix": [7, 4], "x": 11, "y": 2.2},
+                {"matrix": [7, 3], "x": 12, "y": 2},
+                {"matrix": [7, 2], "x": 13, "y": 2.2},
+                {"matrix": [7, 1], "x": 14, "y": 2.3},
+                {"matrix": [7, 0], "x": 15, "y": 2.3},
 
-                {"label":"Tab", "x":0, "y":1.3},
-                {"label":"Q", "x":1, "y":1.3},
-                {"label":"W", "x":2, "y":1.2},
-                {"label":"E", "x":3, "y":1},
-                {"label":"R", "x":4, "y":1.2},
-                {"label":"T", "x":5, "y":1.4},
-                {"label":"[", "x":6, "y":1.6},
-                {"label":"]", "x":9, "y":1.6},
-                {"label":"Y", "x":10, "y":1.4},
-                {"label":"U", "x":11, "y":1.2},
-                {"label":"I", "x":12, "y":1},
-                {"label":"O", "x":13, "y":1.2},
-                {"label":"P", "x":14, "y":1.3},
-                {"label":"\\", "x":15, "y":1.3},
+                {"matrix": [3, 0], "x": 0, "y": 3.3},
+                {"matrix": [3, 1], "x": 1, "y": 3.3},
+                {"matrix": [3, 2], "x": 2, "y": 3.2},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.2},
+                {"matrix": [3, 5], "x": 5, "y": 3.4},
+                {"matrix": [3, 6], "x": 6, "y": 4},
 
-                {"label":"Ctrl / Tab", "x":0, "y":2.3},
-                {"label":"A", "x":1, "y":2.3},
-                {"label":"S", "x":2, "y":2.2},
-                {"label":"D", "x":3, "y":2},
-                {"label":"F", "x":4, "y":2.2},
-                {"label":"G", "x":5, "y":2.4},
-                {"label":"{", "x":6, "y":2.6},
-                {"label":"}", "x":9, "y":2.6},
-                {"label":"H", "x":10, "y":2.4},
-                {"label":"J", "x":11, "y":2.2},
-                {"label":"K", "x":12, "y":2},
-                {"label":"L", "x":13, "y":2.2},
-                {"label":":", "x":14, "y":2.3},
-                {"label":"\"", "x":15, "y":2.3},
+                {"matrix": [8, 6], "x": 9, "y": 4},
+                {"matrix": [8, 5], "x": 10, "y": 3.4},
+                {"matrix": [8, 4], "x": 11, "y": 3.2},
+                {"matrix": [8, 3], "x": 12, "y": 3},
+                {"matrix": [8, 2], "x": 13, "y": 3.2},
+                {"matrix": [8, 1], "x": 14, "y": 3.3},
+                {"matrix": [8, 0], "x": 15, "y": 3.3},
 
-                {"label":"Shift", "x":0, "y":3.3},
-                {"label":"Z", "x":1, "y":3.3},
-                {"label":"X", "x":2, "y":3.2},
-                {"label":"C", "x":3, "y":3},
-                {"label":"V", "x":4, "y":3.2},
-                {"label":"B", "x":5, "y":3.4},
-                {"label":"MO(_ADJUST)", "x":6, "y":4},
-                {"label":"MO(_ADJUST)", "x":9, "y":4},
-                {"label":"N", "x":10, "y":3.4},
-                {"label":"M", "x":11, "y":3.2},
-                {"label":"<", "x":12, "y":3},
-                {"label":">", "x":13, "y":3.2},
-                {"label":"?", "x":14, "y":3.3},
-                {"label":"Enter", "x":15, "y":3.3},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.7},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.8},
+                {"matrix": [4, 5], "x": 5.5, "y": 5},
+                {"matrix": [4, 6], "x": 6.5, "y": 5.3},
 
-                {"label":"Alt", "x":3.5, "y":4.7},
-                {"label":"MO(_LOWER)", "x":4.5, "y":4.8},
-                {"label":"GUI", "x":5.5, "y":5},
-                {"label":"Space", "x":6.5, "y":5.3},
-                {"label":"Space", "x":8.5, "y":5.3},
-                {"label":"GUI", "x":9.5, "y":5},
-                {"label":"MO(_RAISE)", "x":10.5, "y":4.8},
-                {"label":"Alt", "x":11.5, "y":4.7}
+                {"matrix": [9, 6], "x": 8.5, "y": 5.3},
+                {"matrix": [9, 5], "x": 9.5, "y": 5},
+                {"matrix": [9, 4], "x": 10.5, "y": 4.8},
+                {"matrix": [9, 3], "x": 11.5, "y": 4.7}
             ]
         }
     }
diff --git a/keyboards/pinky/pinky.c b/keyboards/pinky/pinky.c
deleted file mode 100644
index aa873c7a72..0000000000
--- a/keyboards/pinky/pinky.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 'Masayuki Sunahara'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "pinky.h"
diff --git a/keyboards/pinky/pinky.h b/keyboards/pinky/pinky.h
deleted file mode 100644
index 67dfbe3370..0000000000
--- a/keyboards/pinky/pinky.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2018 'Masayuki Sunahara'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_pinky_3)
-#    include "3.h"
-#elif defined(KEYBOARD_pinky_4)
-#    include "4.h"
-#endif
diff --git a/keyboards/pisces/config.h b/keyboards/pisces/config.h
index 01210f2a0f..4cb5aaf54e 100644
--- a/keyboards/pisces/config.h
+++ b/keyboards/pisces/config.h
@@ -21,22 +21,6 @@
 #define MATRIX_MASKED
 #define SPLIT_USB_DETECT
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C4, B0, C7 }
-#define MATRIX_COL_PINS { B1, B2, B3, B4, B5, B6, B7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/pisces/info.json b/keyboards/pisces/info.json
index e7243bfc8d..e3dfef5ab7 100644
--- a/keyboards/pisces/info.json
+++ b/keyboards/pisces/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B3", "B4", "B5", "B6", "B7"],
+        "rows": ["C4", "B0", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
@@ -16,9 +21,49 @@
     "layouts": {
         "LAYOUT_split_3x6_1": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},                                 {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1},                                 {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1},
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "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/keymaps/default/config.h b/keyboards/pisces/keymaps/default/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/pisces/keymaps/default/config.h
+++ b/keyboards/pisces/keymaps/default/config.h
@@ -17,4 +17,3 @@
 #pragma once
 
 #define TAPPING_TERM    175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/pisces/keymaps/via/config.h b/keyboards/pisces/keymaps/via/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/pisces/keymaps/via/config.h
+++ b/keyboards/pisces/keymaps/via/config.h
@@ -17,4 +17,3 @@
 #pragma once
 
 #define TAPPING_TERM    175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/pisces/pisces.c b/keyboards/pisces/pisces.c
index 18814c4744..ca2016280d 100644
--- a/keyboards/pisces/pisces.c
+++ b/keyboards/pisces/pisces.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pisces.h"
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[MATRIX_ROWS] = {
 //  87654321
diff --git a/keyboards/pisces/pisces.h b/keyboards/pisces/pisces.h
deleted file mode 100644
index b2d61c17c3..0000000000
--- a/keyboards/pisces/pisces.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 knaruo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_split_3x6_1( \
-    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, L26, R26, R20, R21, R22, R23, R24, R25  \
-) { \
-    { L00, L01, L02, L03, L04, L05, KC_NO }, \
-    { L10, L11, L12, L13, L14, L15, KC_NO }, \
-    { L20, L21, L22, L23, L24, L25, L26 }, \
-    { R05, R04, R03, R02, R01, R00, KC_NO }, \
-    { R15, R14, R13, R12, R11, R10, KC_NO }, \
-    { R25, R24, R23, R22, R21, R20, R26 } \
-}
diff --git a/keyboards/pixelspace/capsule65i/capsule65i.c b/keyboards/pixelspace/capsule65i/capsule65i.c
deleted file mode 100644
index 30c1fed88e..0000000000
--- a/keyboards/pixelspace/capsule65i/capsule65i.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 PixelSpace 295033045@qq.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "capsule65i.h"
diff --git a/keyboards/pixelspace/capsule65i/capsule65i.h b/keyboards/pixelspace/capsule65i/capsule65i.h
deleted file mode 100644
index 0e0d125cfa..0000000000
--- a/keyboards/pixelspace/capsule65i/capsule65i.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/* Copyright 2022 PixelSpace 295033045@qq.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�1D  │ ISO Enter
- *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │2F │   │2C │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴┬──┴────┬───┼───┤   └───┴────┘
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B│3C     │3D │3F │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┼───┬───┼───┼───┤
- *              │40  │41  │42  │45                      │49 │4A │4B │4C │4D │4F │
- *              └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- *              ┌────┬────┬────┬────────────────────────┬────┬────�
- *              │40  │41  │42  │45                      │49  │4A  │ Blocker
- *              └────┴────┴────┴────────────────────────┴────┴────┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────�
- *              │40   │41 │42   │45                         │4A   │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                     K4A,      K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                     K4A,      K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \
-    K40, K41, K42,           K45,                     K4A,      K4C, K4D, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,      K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42,           K45,                     K4A,      K4C, K4D,      K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, XXX, K4C, K4D, XXX, K4F }, \
-}
diff --git a/keyboards/pixelspace/capsule65i/config.h b/keyboards/pixelspace/capsule65i/config.h
index 43026552e1..c6dd26a46a 100644
--- a/keyboards/pixelspace/capsule65i/config.h
+++ b/keyboards/pixelspace/capsule65i/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, D1, B7, D0, F5 }
-#define MATRIX_COL_PINS { D5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, E2, B3, B1, B0, B2 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/pixelspace/capsule65i/info.json b/keyboards/pixelspace/capsule65i/info.json
index f63ec17aee..b2ac8f8528 100644
--- a/keyboards/pixelspace/capsule65i/info.json
+++ b/keyboards/pixelspace/capsule65i/info.json
@@ -8,9 +8,17 @@
         "pid": "0xE66E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D2", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "B3", "B1", "B0", "B2"],
+        "rows": ["F4", "D1", "B7", "D0", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F6"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -20,988 +28,992 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "K00 (F4,D5)", "x": 0, "y": 0 },
-                { "label": "K01 (F4,D2)", "x": 1, "y": 0 },
-                { "label": "K02 (F4,D3)", "x": 2, "y": 0 },
-                { "label": "K03 (F4,D4)", "x": 3, "y": 0 },
-                { "label": "K04 (F4,D6)", "x": 4, "y": 0 },
-                { "label": "K05 (F4,D7)", "x": 5, "y": 0 },
-                { "label": "K06 (F4,B4)", "x": 6, "y": 0 },
-                { "label": "K07 (F4,B5)", "x": 7, "y": 0 },
-                { "label": "K08 (F4,B6)", "x": 8, "y": 0 },
-                { "label": "K09 (F4,C6)", "x": 9, "y": 0 },
-                { "label": "K0A (F4,C7)", "x": 10, "y": 0 },
-                { "label": "K0B (F4,E2)", "x": 11, "y": 0 },
-                { "label": "K0C (F4,B3)", "x": 12, "y": 0 },
-                { "label": "K0D (F4,B1)", "x": 13, "y": 0 },
-                { "label": "K0E (F4,B0)", "x": 14, "y": 0 },
-                { "label": "K0F (F4,B2)", "x": 15, "y": 0 },
-                { "label": "K10 (D1,D5)", "x": 0, "y": 1 ,"w":1.5},
-                { "label": "K11 (D1,D2)", "x": 1.5, "y": 1},
-                { "label": "K12 (D1,D3)", "x": 2.5, "y": 1 },
-                { "label": "K13 (D1,D4)", "x": 3.5, "y": 1 },
-                { "label": "K14 (D1,D6)", "x": 4.5, "y": 1 },
-                { "label": "K15 (D1,D7)", "x": 5.5, "y": 1 },
-                { "label": "K16 (D1,B4)", "x": 6.5, "y": 1 },
-                { "label": "K17 (D1,B5)", "x": 7.5, "y": 1 },
-                { "label": "K18 (D1,B6)", "x": 8.5, "y": 1 },
-                { "label": "K19 (D1,C6)", "x": 9.5, "y": 1 },
-                { "label": "K1A (D1,C7)", "x": 10.5, "y": 1 },
-                { "label": "K1B (D1,E2)", "x": 11.5, "y": 1 },
-                { "label": "K1C (D1,B3)", "x": 12.5, "y": 1 },
-                { "label": "K1D (D1,B1)", "x": 13.5, "y": 1 ,"w":1.5},
-                { "label": "K1F (D1,B2)", "x": 15, "y": 1 },
-                { "label": "K20 (B7,D5)", "x": 0, "y": 2,"w":1.75 },
-                { "label": "K21 (B7,D2)", "x": 1.75, "y": 2 },
-                { "label": "K22 (B7,D3)", "x": 2.75, "y": 2 },
-                { "label": "K23 (B7,D4)", "x": 3.75, "y": 2 },
-                { "label": "K24 (B7,D6)", "x": 4.75, "y": 2 },
-                { "label": "K25 (B7,D7)", "x": 5.75, "y": 2 },
-                { "label": "K26 (B7,B4)", "x": 6.75, "y": 2 },
-                { "label": "K27 (B7,B5)", "x": 7.75, "y": 2 },
-                { "label": "K28 (B7,B6)", "x": 8.75, "y": 2 },
-                { "label": "K29 (B7,C6)", "x": 9.75, "y": 2 },
-                { "label": "K2A (B7,C7)", "x": 10.75, "y": 2 },
-                { "label": "K2B (B7,E2)", "x": 11.75, "y": 2 },
-                { "label": "K2C (B7,B3)", "x": 12.75, "y": 2 ,"w":2.25},
-                { "label": "K2F (B7,B2)", "x": 15, "y": 2 },
-                { "label": "K30 (D0,D5)", "x": 0, "y": 3 ,"w":1.25},
-                { "label": "K31 (D0,D2)", "x": 1.25, "y": 3 },
-                { "label": "K32 (D0,D3)", "x": 2.25, "y": 3 },
-                { "label": "K33 (D0,D4)", "x": 3.25, "y": 3 },
-                { "label": "K34 (D0,D6)", "x": 4.25, "y": 3 },
-                { "label": "K35 (D0,D7)", "x": 5.25, "y": 3 },
-                { "label": "K36 (D0,B4)", "x": 6.25, "y": 3 },
-                { "label": "K37 (D0,B5)", "x": 7.25, "y": 3 },
-                { "label": "K38 (D0,B6)", "x": 8.25, "y": 3 },
-                { "label": "K39 (D0,C6)", "x": 9.25, "y": 3 },
-                { "label": "K3A (D0,C7)", "x": 10.25, "y": 3 },
-                { "label": "K3B (D0,E2)", "x": 11.25, "y": 3 },
-                { "label": "K3C (D0,B3)", "x": 12.25, "y": 3 ,"w":1.75 },
-                { "label": "K3D (D0,B1)", "x": 14, "y": 3 },
-                { "label": "K3F (D0,B2)", "x": 15, "y": 3 },
-                { "label": "K40 (F5,D5)", "x": 0, "y": 4 ,"w":1.25},
-                { "label": "K41 (F5,D2)", "x": 1.25, "y": 4 ,"w":1.25},
-                { "label": "K42 (F5,D3)", "x": 2.5, "y": 4 ,"w":1.25},
-                { "label": "K45 (F5,D7)", "x": 3.75, "y": 4,"w":6.25 },
-                { "label": "K49 (F5,C6)", "x": 10, "y": 4 },
-                { "label": "K4A (F5,C7)", "x": 11, "y": 4 },
-                { "label": "K4B (F5,E2)", "x": 12, "y": 4 },
-                { "label": "K4C (F5,B3)", "x": 13, "y": 4 },
-                { "label": "K4D (F5,B1)", "x": 14, "y": 4 },
-                { "label": "K4F (F5,B2)", "x": 15, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4},
-                {"label":"Ctrl", "x":11, "y":4},
-                {"label":"RGB Toggle", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4},
-                {"label":"Ctrl", "x":11, "y":4},
-                {"label":"RGB Toggle", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4},
-                {"label":"Ctrl", "x":11, "y":4},
-                {"label":"RGB Toggle", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4},
-                {"label":"Ctrl", "x":11, "y":4},
-                {"label":"RGB Toggle", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgUp", "x":15, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/pizzakeyboards/pizza65/config.h b/keyboards/pizzakeyboards/pizza65/config.h
index 3c36c8ca6f..1500ab9b88 100644
--- a/keyboards/pizzakeyboards/pizza65/config.h
+++ b/keyboards/pizzakeyboards/pizza65/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B15, A10, F1, A0, A1 }
-#define MATRIX_COL_PINS { A9, A8, F0, A2, A3, A4, B9, B8, B7, B6, B5, B4, B3, A15, A14, A13}
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/pizzakeyboards/pizza65/info.json b/keyboards/pizzakeyboards/pizza65/info.json
index bbba5ae0e9..76ad8fda50 100644
--- a/keyboards/pizzakeyboards/pizza65/info.json
+++ b/keyboards/pizzakeyboards/pizza65/info.json
@@ -8,311 +8,316 @@
         "pid": "0x707A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A9", "A8", "F0", "A2", "A3", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A13"],
+        "rows": ["B15", "A10", "F1", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0, "w":2},
-                {"label": "r1_15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "r3_14", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
-                {"label": "r4_02", "x": 2.25, "y": 3},
-                {"label": "r4_03", "x": 3.25, "y": 3},
-                {"label": "r4_04", "x": 4.25, "y": 3},
-                {"label": "r4_05", "x": 5.25, "y": 3},
-                {"label": "r4_06", "x": 6.25, "y": 3},
-                {"label": "r4_07", "x": 7.25, "y": 3},
-                {"label": "r4_08", "x": 8.25, "y": 3},
-                {"label": "r4_09", "x": 9.25, "y": 3},
-                {"label": "r4_10", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0, "w":2},
-                {"label": "r1_15", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2},
-                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"label": "r3_15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
-                {"label": "r4_02", "x": 1.25, "y": 3},
-                {"label": "r4_03", "x": 2.25, "y": 3},
-                {"label": "r4_04", "x": 3.25, "y": 3},
-                {"label": "r4_05", "x": 4.25, "y": 3},
-                {"label": "r4_06", "x": 5.25, "y": 3},
-                {"label": "r4_07", "x": 6.25, "y": 3},
-                {"label": "r4_08", "x": 7.25, "y": 3},
-                {"label": "r4_09", "x": 8.25, "y": 3},
-                {"label": "r4_10", "x": 9.25, "y": 3},
-                {"label": "r4_11", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0},
-                {"label": "r1_15", "x": 14, "y": 0},
-                {"label": "r1_16", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "r3_14", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
-                {"label": "r4_02", "x": 2.25, "y": 3},
-                {"label": "r4_03", "x": 3.25, "y": 3},
-                {"label": "r4_04", "x": 4.25, "y": 3},
-                {"label": "r4_05", "x": 5.25, "y": 3},
-                {"label": "r4_06", "x": 6.25, "y": 3},
-                {"label": "r4_07", "x": 7.25, "y": 3},
-                {"label": "r4_08", "x": 8.25, "y": 3},
-                {"label": "r4_09", "x": 9.25, "y": 3},
-                {"label": "r4_10", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0},
-                {"label": "r1_15", "x": 14, "y": 0},
-                {"label": "r1_16", "x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2},
-                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"label": "r3_15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
-                {"label": "r4_02", "x": 1.25, "y": 3},
-                {"label": "r4_03", "x": 2.25, "y": 3},
-                {"label": "r4_04", "x": 3.25, "y": 3},
-                {"label": "r4_05", "x": 4.25, "y": 3},
-                {"label": "r4_06", "x": 5.25, "y": 3},
-                {"label": "r4_07", "x": 6.25, "y": 3},
-                {"label": "r4_08", "x": 7.25, "y": 3},
-                {"label": "r4_09", "x": 8.25, "y": 3},
-                {"label": "r4_10", "x": 9.25, "y": 3},
-                {"label": "r4_11", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/pizzakeyboards/pizza65/pizza65.c b/keyboards/pizzakeyboards/pizza65/pizza65.c
deleted file mode 100644
index 93d832af2b..0000000000
--- a/keyboards/pizzakeyboards/pizza65/pizza65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 mmonte
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pizza65.h"
diff --git a/keyboards/pizzakeyboards/pizza65/pizza65.h b/keyboards/pizzakeyboards/pizza65/pizza65.h
deleted file mode 100644
index 74f1223be2..0000000000
--- a/keyboards/pizzakeyboards/pizza65/pizza65.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2020 mmonte
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E, K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E, K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K2D, K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-    { K30, K31,   K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K2D, K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-    { K30, K31,   K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
-}
diff --git a/keyboards/pjb/eros/config.h b/keyboards/pjb/eros/config.h
deleted file mode 100644
index 932c66ba01..0000000000
--- a/keyboards/pjb/eros/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 PJB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { B2, B1, B0, D7, B7, D1 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D5, B4, D3, D2, E6, B3 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pjb/eros/eros.c b/keyboards/pjb/eros/eros.c
deleted file mode 100644
index 6dd56bfa7b..0000000000
--- a/keyboards/pjb/eros/eros.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 PJB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "eros.h"
diff --git a/keyboards/pjb/eros/eros.h b/keyboards/pjb/eros/eros.h
deleted file mode 100644
index 22e6692bd3..0000000000
--- a/keyboards/pjb/eros/eros.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Copyright 2022 PJB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,                   \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,       K415,       \
-	K500, K501, K502,             K505,                   K509, K510, K511,       K513, K514, K515, K516  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,  K011, K012,   K013, K014,  K015,  K016 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,  K111, K112,   K113, K114,  K115,  K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,  K211, K212,   K213, K214,  K215,  K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,  K311, K312,  K313, KC_NO, KC_NO, KC_NO }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,  K411, KC_NO,  K413, KC_NO, K415,  KC_NO }, \
-	{ K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510,  K511, KC_NO,  K513, K514,  K515,  K516 }, \
-}
-
-#define LAYOUT_tkl_f13_ansi( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                    \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,                   K415,       \
-	K500, K501, K502,             K505,                   K509, K510, K511,       K513, K514, K515, K516  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,  K011, K012,   K013, K014,  K015,  K016 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,  K111, K112,   K113, K114,  K115,  K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,  K211, K212,   K213, K214,  K215,  K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,  K311, KC_NO,  K313, KC_NO, KC_NO, KC_NO }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,  K411, KC_NO,  KC_NO, KC_NO, K415,  KC_NO }, \
-	{ K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510,  K511, KC_NO,  K513, K514,  K515,  K516 }, \
-}
-
-#define LAYOUT_tkl_f13_ansi_split_rshift( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                    \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,             K415,       \
-	K500, K501, K502,             K505,                   K509, K510, K511,       K513, K514, K515, K516  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,  K011, K012,   K013, K014,  K015,  K016 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,  K111, K112,   K113, K114,  K115,  K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,  K211, K212,   K213, K214,  K215,  K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,  K311, KC_NO,  K313, KC_NO, KC_NO, KC_NO }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,  K411, KC_NO,  K413, KC_NO, K415,  KC_NO }, \
-	{ K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510,  K511, KC_NO,  K513, K514,  K515,  K516 }, \
-}
-
-#define LAYOUT_tkl_f13_ansi_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,                    \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,                   K415,       \
-	K500, K501, K502,             K505,                   K509, K510, K511,       K513, K514, K515, K516  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,  K011, K012,   K013, K014,  K015,  K016 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,  K111, K112,   K113, K114,  K115,  K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,  K211, K212,   K213, K214,  K215,  K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,  K311, K312,   K313, KC_NO, KC_NO, KC_NO }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,  K411, KC_NO,  KC_NO, KC_NO, K415,  KC_NO }, \
-	{ K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510,  K511, KC_NO,  K513, K514,  K515,  K516 }, \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                   \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,                   K415,       \
-	K500, K501, K502,             K505,                         K510, K511,       K513, K514, K515, K516  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,  K011, K012,   K013, K014,  K015,  K016 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,  K111, K112,   K113, K114,  K115,  K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,  K211, K212,   K213, K214,  K215,  K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,  K311, KC_NO,  K313, KC_NO, KC_NO, KC_NO }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,  K411, KC_NO,  KC_NO, KC_NO, K415,  KC_NO }, \
-	{ K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, KC_NO, K510,  K511, KC_NO,  K513, K514,  K515,  K516 }, \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan_split_rshift( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                   \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,                K415,       \
-	K500, K501, K502,             K505,                         K510, K511,       K513, K514, K515, K516  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,  K011, K012,   K013, K014,  K015,  K016 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,  K111, K112,   K113, K114,  K115,  K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,  K211, K212,   K213, K214,  K215,  K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,  K311, KC_NO,  K313, KC_NO, KC_NO, KC_NO }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,  K411, KC_NO,  K413, KC_NO, K415,  KC_NO }, \
-	{ K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, KC_NO, K510,  K511, KC_NO,  K513, K514,  K515,  K516 }, \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,                  \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,                   K415,       \
-	K500, K501, K502,             K505,                         K510, K511,       K513, K514, K515, K516  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,  K011, K012,   K013, K014,  K015,  K016 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,  K111, K112,   K113, K114,  K115,  K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,  K211, K212,   K213, K214,  K215,  K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,  K311, K312,   K313, KC_NO, KC_NO, KC_NO }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,  K411, KC_NO,  KC_NO, KC_NO, K415,  KC_NO }, \
-	{ K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, KC_NO, K510,  K511, KC_NO,  K513, K514,  K515,  K516 }, \
-}
diff --git a/keyboards/pjb/eros/info.json b/keyboards/pjb/eros/info.json
index cbba6dcecc..e336b9e2f4 100644
--- a/keyboards/pjb/eros/info.json
+++ b/keyboards/pjb/eros/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4552",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "D4", "D5", "B4", "D3", "D2", "E6", "B3"],
+        "rows": ["B2", "B1", "B0", "D7", "B7", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D6",
         "scroll_lock": "D0",
@@ -28,684 +33,747 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 12], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_split_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 12], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan_split_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 12], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/pkb65/config.h b/keyboards/pkb65/config.h
index fa0a4567f9..7f37e40119 100644
--- a/keyboards/pkb65/config.h
+++ b/keyboards/pkb65/config.h
@@ -21,35 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C7, C6, B6, B7, F0 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/pkb65/info.json b/keyboards/pkb65/info.json
index 50be7dff7d..41438841db 100644
--- a/keyboards/pkb65/info.json
+++ b/keyboards/pkb65/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+    "rows": ["C7", "C6", "B6", "B7", "F0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/pkb65/pkb65.c b/keyboards/pkb65/pkb65.c
deleted file mode 100644
index 3e07960320..0000000000
--- a/keyboards/pkb65/pkb65.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-
-Copyright 2021 MCKeebs <mckeebdesign@gmail.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-*/
-#include "pkb65.h"
diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h
index ff4b7bb3aa..84c2fd11dc 100644
--- a/keyboards/planck/config.h
+++ b/keyboards/planck/config.h
@@ -17,17 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { D0, D5, B5, B6 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-
 #define AUDIO_VOICES
 #define AUDIO_PIN C6
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index 04bfc314ce..3b10a2b753 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -18,23 +18,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 }
-
 #define MUSIC_MAP
 #undef AUDIO_VOICES
 #undef AUDIO_PIN
@@ -128,8 +111,6 @@
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#define IGNORE_MOD_TAP_INTERRUPT
-
 #define TAPPING_TOGGLE  1
 
 #define MOUSEKEY_INTERVAL           20
diff --git a/keyboards/planck/ez/ez.h b/keyboards/planck/ez/ez.h
index 3e1a682f68..695b14d9ad 100644
--- a/keyboards/planck/ez/ez.h
+++ b/keyboards/planck/ez/ez.h
@@ -17,48 +17,7 @@
  */
 #pragma once
 
-#include "planck.h"
-
-#ifdef KEYBOARD_planck_ez_glow
-#    include "glow.h"
-#endif
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05   }, \
-    { k10, k11, k12, k13, k14, k15   }, \
-    { k20, k21, k22, k23, k24, k25   }, \
-    { k30, k31, k32, k3a, k3b, KC_NO }, \
-    { k06, k07, k08, k09, k0a, k0b   }, \
-    { k16, k17, k18, k19, k1a, k1b   }, \
-    { k26, k27, k28, k29, k2a, k2b   }, \
-    { k37, k38, k39, k33, k34, k35   } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k3a, k3b, k36 }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k37, k38, k39, k33, k34, k35 } \
-}
-
-#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
-#define LAYOUT_planck_grid LAYOUT_ortho_4x12
+#include "quantum.h"
 
 void planck_ez_right_led_on(void);
 void planck_ez_right_led_off(void);
diff --git a/keyboards/planck/ez/glow/glow.c b/keyboards/planck/ez/glow/glow.c
deleted file mode 100644
index c6733bbe50..0000000000
--- a/keyboards/planck/ez/glow/glow.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- * Copyright 2015 ZSA Technology Labs Inc (@zsa)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "glow.h"
diff --git a/keyboards/planck/ez/glow/glow.h b/keyboards/planck/ez/glow/glow.h
deleted file mode 100644
index cfc26b5e03..0000000000
--- a/keyboards/planck/ez/glow/glow.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- * Copyright 2015 ZSA Technology Labs Inc (@zsa)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "ez.h"
diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json
index ae67be691d..370a19357f 100644
--- a/keyboards/planck/ez/info.json
+++ b/keyboards/planck/ez/info.json
@@ -6,6 +6,14 @@
     "vid": "0x3297",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "IS31FL3737"
+  },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B12", "pin_b": "B13"}
@@ -14,108 +22,118 @@
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
   "layouts": {
     "LAYOUT_planck_1x2uC": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3, "w": 2 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [7, 0], "x": 7, "y": 3},
+        {"matrix": [7, 1], "x": 8, "y": 3},
+        {"matrix": [7, 2], "x": 9, "y": 3},
+        {"matrix": [3, 3], "x": 10, "y": 3},
+        {"matrix": [3, 4], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 5], "x": 5, "y": 3},
+        {"matrix": [3, 5], "x": 6, "y": 3},
+        {"matrix": [7, 0], "x": 7, "y": 3},
+        {"matrix": [7, 1], "x": 8, "y": 3},
+        {"matrix": [7, 2], "x": 9, "y": 3},
+        {"matrix": [3, 3], "x": 10, "y": 3},
+        {"matrix": [3, 4], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk
index 0bfe083b6c..a19a4fceaa 100644
--- a/keyboards/planck/ez/rules.mk
+++ b/keyboards/planck/ez/rules.mk
@@ -13,7 +13,6 @@ AUDIO_DRIVER = dac_additive
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
 ENCODER_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3737
 
 LAYOUTS_HAS_RGB = no
 
diff --git a/keyboards/planck/info.json b/keyboards/planck/info.json
index cc57b6da60..3f92fa168d 100644
--- a/keyboards/planck/info.json
+++ b/keyboards/planck/info.json
@@ -1,107 +1,4 @@
 {
   "url": "https://olkb.com/planck",
-  "maintainer": "jackhumbert",
-  "layouts": {
-    "LAYOUT_planck_1x2uC": {
-      "layout": [
-        { "w": 1, "x": 0, "y": 0 },
-        { "w": 1, "x": 1, "y": 0 },
-        { "w": 1, "x": 2, "y": 0 },
-        { "w": 1, "x": 3, "y": 0 },
-        { "w": 1, "x": 4, "y": 0 },
-        { "w": 1, "x": 5, "y": 0 },
-        { "w": 1, "x": 6, "y": 0 },
-        { "w": 1, "x": 7, "y": 0 },
-        { "w": 1, "x": 8, "y": 0 },
-        { "w": 1, "x": 9, "y": 0 },
-        { "w": 1, "x": 10, "y": 0 },
-        { "w": 1, "x": 11, "y": 0 },
-        { "w": 1, "x": 0, "y": 1 },
-        { "w": 1, "x": 1, "y": 1 },
-        { "w": 1, "x": 2, "y": 1 },
-        { "w": 1, "x": 3, "y": 1 },
-        { "w": 1, "x": 4, "y": 1 },
-        { "w": 1, "x": 5, "y": 1 },
-        { "w": 1, "x": 6, "y": 1 },
-        { "w": 1, "x": 7, "y": 1 },
-        { "w": 1, "x": 8, "y": 1 },
-        { "w": 1, "x": 9, "y": 1 },
-        { "w": 1, "x": 10, "y": 1 },
-        { "w": 1, "x": 11, "y": 1 },
-        { "w": 1, "x": 0, "y": 2 },
-        { "w": 1, "x": 1, "y": 2 },
-        { "w": 1, "x": 2, "y": 2 },
-        { "w": 1, "x": 3, "y": 2 },
-        { "w": 1, "x": 4, "y": 2 },
-        { "w": 1, "x": 5, "y": 2 },
-        { "w": 1, "x": 6, "y": 2 },
-        { "w": 1, "x": 7, "y": 2 },
-        { "w": 1, "x": 8, "y": 2 },
-        { "w": 1, "x": 9, "y": 2 },
-        { "w": 1, "x": 10, "y": 2 },
-        { "w": 1, "x": 11, "y": 2 },
-        { "w": 1, "x": 0, "y": 3 },
-        { "w": 1, "x": 1, "y": 3 },
-        { "w": 1, "x": 2, "y": 3 },
-        { "w": 1, "x": 3, "y": 3 },
-        { "w": 1, "x": 4, "y": 3 },
-        { "w": 2, "x": 5, "y": 3 },
-        { "w": 1, "x": 7, "y": 3 },
-        { "w": 1, "x": 8, "y": 3 },
-        { "w": 1, "x": 9, "y": 3 },
-        { "w": 1, "x": 10, "y": 3 },
-        { "w": 1, "x": 11, "y": 3 } ]
-    },
-    "LAYOUT_ortho_4x12": {
-      "layout": [
-        { "w": 1, "x": 0, "y": 0 },
-        { "w": 1, "x": 1, "y": 0 },
-        { "w": 1, "x": 2, "y": 0 },
-        { "w": 1, "x": 3, "y": 0 },
-        { "w": 1, "x": 4, "y": 0 },
-        { "w": 1, "x": 5, "y": 0 },
-        { "w": 1, "x": 6, "y": 0 },
-        { "w": 1, "x": 7, "y": 0 },
-        { "w": 1, "x": 8, "y": 0 },
-        { "w": 1, "x": 9, "y": 0 },
-        { "w": 1, "x": 10, "y": 0 },
-        { "w": 1, "x": 11, "y": 0 },
-        { "w": 1, "x": 0, "y": 1 },
-        { "w": 1, "x": 1, "y": 1 },
-        { "w": 1, "x": 2, "y": 1 },
-        { "w": 1, "x": 3, "y": 1 },
-        { "w": 1, "x": 4, "y": 1 },
-        { "w": 1, "x": 5, "y": 1 },
-        { "w": 1, "x": 6, "y": 1 },
-        { "w": 1, "x": 7, "y": 1 },
-        { "w": 1, "x": 8, "y": 1 },
-        { "w": 1, "x": 9, "y": 1 },
-        { "w": 1, "x": 10, "y": 1 },
-        { "w": 1, "x": 11, "y": 1 },
-        { "w": 1, "x": 0, "y": 2 },
-        { "w": 1, "x": 1, "y": 2 },
-        { "w": 1, "x": 2, "y": 2 },
-        { "w": 1, "x": 3, "y": 2 },
-        { "w": 1, "x": 4, "y": 2 },
-        { "w": 1, "x": 5, "y": 2 },
-        { "w": 1, "x": 6, "y": 2 },
-        { "w": 1, "x": 7, "y": 2 },
-        { "w": 1, "x": 8, "y": 2 },
-        { "w": 1, "x": 9, "y": 2 },
-        { "w": 1, "x": 10, "y": 2 },
-        { "w": 1, "x": 11, "y": 2 },
-        { "w": 1, "x": 0, "y": 3 },
-        { "w": 1, "x": 1, "y": 3 },
-        { "w": 1, "x": 2, "y": 3 },
-        { "w": 1, "x": 3, "y": 3 },
-        { "w": 1, "x": 4, "y": 3 },
-        { "w": 1, "x": 5, "y": 3 },
-        { "w": 1, "x": 6, "y": 3 },
-        { "w": 1, "x": 7, "y": 3 },
-        { "w": 1, "x": 8, "y": 3 },
-        { "w": 1, "x": 9, "y": 3 },
-        { "w": 1, "x": 10, "y": 3 },
-        { "w": 1, "x": 11, "y": 3 } ]
-    }
-  }
+  "maintainer": "jackhumbert"
 }
diff --git a/keyboards/planck/keymaps/altgr/config.h b/keyboards/planck/keymaps/altgr/config.h
index e517a8b24b..b6c010a825 100644
--- a/keyboards/planck/keymaps/altgr/config.h
+++ b/keyboards/planck/keymaps/altgr/config.h
@@ -36,7 +36,6 @@
 #define HOME_MODS
 // fix dual function timing
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
 #define BEAKLGR
diff --git a/keyboards/planck/keymaps/andylikescandy/rules.mk b/keyboards/planck/keymaps/andylikescandy/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/andylikescandy/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/antosha417/config.h b/keyboards/planck/keymaps/antosha417/config.h
index 9bbb1192c7..3ad322687a 100644
--- a/keyboards/planck/keymaps/antosha417/config.h
+++ b/keyboards/planck/keymaps/antosha417/config.h
@@ -29,6 +29,5 @@
 #define ENCODER_RESOLUTION 4
 
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 #define COMBO_TERM 30
 
diff --git a/keyboards/planck/keymaps/ariccb/config.h b/keyboards/planck/keymaps/ariccb/config.h
index 464a8cd5db..e9fcc865fa 100644
--- a/keyboards/planck/keymaps/ariccb/config.h
+++ b/keyboards/planck/keymaps/ariccb/config.h
@@ -41,8 +41,6 @@
 
 #define TAPPING_TERM 150
 #define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
-// #define IGNORE_MOD_TAP_INTERRUPT
 // #define HOLD_ON_OTHER_KEY_PRESS
 
 #define COMBO_TERM 20
diff --git a/keyboards/planck/keymaps/coloneljesus/rules.mk b/keyboards/planck/keymaps/coloneljesus/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/coloneljesus/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/experimental/config.h b/keyboards/planck/keymaps/experimental/config.h
index 450addbd99..9ee7d9fac4 100644
--- a/keyboards/planck/keymaps/experimental/config.h
+++ b/keyboards/planck/keymaps/experimental/config.h
@@ -7,7 +7,7 @@
 #define BACKLIGHT_BREATHING
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN B1
+#define WS2812_DI_PIN B1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/planck/keymaps/hiea/config.h b/keyboards/planck/keymaps/hiea/config.h
index eb86704578..65845fe3e7 100644
--- a/keyboards/planck/keymaps/hiea/config.h
+++ b/keyboards/planck/keymaps/hiea/config.h
@@ -36,7 +36,6 @@
 #define HOME_MODS
 // fix dual function timing
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
 #define DEFAULT
diff --git a/keyboards/planck/keymaps/hieax/config.h b/keyboards/planck/keymaps/hieax/config.h
index eb86704578..65845fe3e7 100644
--- a/keyboards/planck/keymaps/hieax/config.h
+++ b/keyboards/planck/keymaps/hieax/config.h
@@ -36,7 +36,6 @@
 #define HOME_MODS
 // fix dual function timing
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
 #define DEFAULT
diff --git a/keyboards/planck/keymaps/hvp/config.h b/keyboards/planck/keymaps/hvp/config.h
index 009a8f7122..472320ed68 100644
--- a/keyboards/planck/keymaps/hvp/config.h
+++ b/keyboards/planck/keymaps/hvp/config.h
@@ -1,6 +1,5 @@
 #pragma once
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/planck/keymaps/jirgn/rules.mk b/keyboards/planck/keymaps/jirgn/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/jirgn/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/jweickm/config.h b/keyboards/planck/keymaps/jweickm/config.h
index bd34fca202..2b7a3b02d6 100644
--- a/keyboards/planck/keymaps/jweickm/config.h
+++ b/keyboards/planck/keymaps/jweickm/config.h
@@ -57,7 +57,6 @@
 #define TAPPING_TERM 160 // 200 ms is the default value
 #define TAPPING_TERM_PER_KEY
 //#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define QUICK_TAP_TERM_PER_KEY
 
 // settings for LEADER key
diff --git a/keyboards/planck/keymaps/kelorean/rules.mk b/keyboards/planck/keymaps/kelorean/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/kelorean/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/mattly/config.h b/keyboards/planck/keymaps/mattly/config.h
index 46fe973417..31c47c85b4 100644
--- a/keyboards/planck/keymaps/mattly/config.h
+++ b/keyboards/planck/keymaps/mattly/config.h
@@ -34,7 +34,6 @@
 // Most tactile encoders have detents every 4 stages
 #define ENCODER_RESOLUTION 4
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 #define TAPPING_TOGGLE 2
 #define TAPPING_TERM 200
diff --git a/keyboards/planck/keymaps/mjt/rules.mk b/keyboards/planck/keymaps/mjt/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/mjt/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/mjtnumsym/rules.mk b/keyboards/planck/keymaps/mjtnumsym/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/mjtnumsym/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/motform/rules.mk b/keyboards/planck/keymaps/motform/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/motform/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/muppetjones/config.h b/keyboards/planck/keymaps/muppetjones/config.h
index 1a05bfc837..88331e71f6 100644
--- a/keyboards/planck/keymaps/muppetjones/config.h
+++ b/keyboards/planck/keymaps/muppetjones/config.h
@@ -49,8 +49,5 @@
 // Change "hold" time (default is 200 ms)
 #define TAPPING_TERM 200
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
diff --git a/keyboards/planck/keymaps/mwpeterson/config.h b/keyboards/planck/keymaps/mwpeterson/config.h
index 2665bd7c56..657ffda599 100644
--- a/keyboards/planck/keymaps/mwpeterson/config.h
+++ b/keyboards/planck/keymaps/mwpeterson/config.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef AUDIO_ENABLE
     #define STARTUP_SONG SONG(ONE_UP_SOUND)
diff --git a/keyboards/planck/keymaps/myoung34/config.h b/keyboards/planck/keymaps/myoung34/config.h
index 92ad42f0fa..f69cb62280 100644
--- a/keyboards/planck/keymaps/myoung34/config.h
+++ b/keyboards/planck/keymaps/myoung34/config.h
@@ -39,7 +39,7 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 2
 
-#define RGB_DI_PIN B2     // The pin the LED strip is connected to (PB2 by default)
+#define WS2812_DI_PIN B2     // The pin the LED strip is connected to (PB2 by default)
 #define RGBLED_NUM 3      // Number of LEDs in your strip
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/planck/keymaps/narze/config.h b/keyboards/planck/keymaps/narze/config.h
index 9ab1637306..fddd9cd376 100644
--- a/keyboards/planck/keymaps/narze/config.h
+++ b/keyboards/planck/keymaps/narze/config.h
@@ -26,7 +26,6 @@
 #define COMBO_TERM 20
 #define COMBO_COUNT 1
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 
 #define SUPER_DUPER_SOUND S__NOTE(_B1)
diff --git a/keyboards/planck/keymaps/originerd/rules.mk b/keyboards/planck/keymaps/originerd/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/originerd/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/paget/rules.mk b/keyboards/planck/keymaps/paget/rules.mk
deleted file mode 100755
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/paget/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/phreed/rules.mk b/keyboards/planck/keymaps/phreed/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/phreed/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/sdothum/config.h b/keyboards/planck/keymaps/sdothum/config.h
index 903bbe8095..6afcc69064 100644
--- a/keyboards/planck/keymaps/sdothum/config.h
+++ b/keyboards/planck/keymaps/sdothum/config.h
@@ -36,7 +36,6 @@
 #define HOME_MODS
 // fix dual function timing
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
 #define BEAKLSP
diff --git a/keyboards/planck/keymaps/smt/rules.mk b/keyboards/planck/keymaps/smt/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/smt/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/snowkuma/config.h b/keyboards/planck/keymaps/snowkuma/config.h
index 694245582d..c61d252804 100644
--- a/keyboards/planck/keymaps/snowkuma/config.h
+++ b/keyboards/planck/keymaps/snowkuma/config.h
@@ -36,7 +36,6 @@
 
 // Settings for homerow mods
 #define TAPPING_TERM 250
-#define IGNORE_MOD_TAP_INTERRUPT
 
 
 // Add the leader key feature
diff --git a/keyboards/planck/keymaps/tehwalris/rules.mk b/keyboards/planck/keymaps/tehwalris/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/tehwalris/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/tk/keymap.c b/keyboards/planck/keymaps/tk/keymap.c
index 68f0f82a3d..cb512b73a3 100644
--- a/keyboards/planck/keymaps/tk/keymap.c
+++ b/keyboards/planck/keymaps/tk/keymap.c
@@ -318,7 +318,7 @@ void keyboard_post_init_user(void) {
 
 static bool prerecord_clicky = false;
 
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
     prerecord_clicky = is_clicky_on();
     if (!prerecord_clicky) {
         clicky_on();
diff --git a/keyboards/planck/keymaps/tylerwince/config.h b/keyboards/planck/keymaps/tylerwince/config.h
index 52c1494a1d..d0fb8680e3 100644
--- a/keyboards/planck/keymaps/tylerwince/config.h
+++ b/keyboards/planck/keymaps/tylerwince/config.h
@@ -13,6 +13,5 @@
   See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
 */
 #define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define EECONFIG_RGB_MATRIX (uint32_t *)16
diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h
index 7a64f87174..d4001dd80b 100644
--- a/keyboards/planck/light/config.h
+++ b/keyboards/planck/light/config.h
@@ -1,14 +1,5 @@
 #pragma once
 
-
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS \
-    { B0, E7, F0, F1 }
-#define MATRIX_COL_PINS \
-    { E6, E3, E4, D3, D4, D5, C0, A7, A6, E1, E0, D7 }
-
 #define AUDIO_PIN     C6
 #define AUDIO_PIN_ALT B5
 
diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json
index c2ab19563e..64d9fdcd85 100644
--- a/keyboards/planck/light/info.json
+++ b/keyboards/planck/light/info.json
@@ -8,114 +8,133 @@
     "pid": "0xBEA2",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
+  "matrix_pins": {
+    "cols": ["E6", "E3", "E4", "D3", "D4", "D5", "C0", "A7", "A6", "E1", "E0", "D7"],
+    "rows": ["B0", "E7", "F0", "F1"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "A5"
   },
   "processor": "at90usb1286",
   "bootloader": "atmel-dfu",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
   "layouts": {
     "LAYOUT_planck_1x2uC": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3, "w": 2 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/planck/light/light.c b/keyboards/planck/light/light.c
index c2c241fab4..e9d2f7c3d8 100644
--- a/keyboards/planck/light/light.c
+++ b/keyboards/planck/light/light.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "light.h"
+#include "quantum.h"
 
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
diff --git a/keyboards/planck/light/light.h b/keyboards/planck/light/light.h
deleted file mode 100644
index 623ffa707d..0000000000
--- a/keyboards/planck/light/light.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2017 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "planck.h"
-#include "rgb_matrix.h"
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3A, k3B } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
-#define LAYOUT_planck_grid LAYOUT_ortho_4x12
diff --git a/keyboards/planck/light/rules.mk b/keyboards/planck/light/rules.mk
index 6a6a846ded..dbc992922b 100644
--- a/keyboards/planck/light/rules.mk
+++ b/keyboards/planck/light/rules.mk
@@ -12,6 +12,5 @@ MIDI_ENABLE = yes           # MIDI support
 AUDIO_ENABLE = yes           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 
 LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c
index 20db22055c..4be96986a7 100644
--- a/keyboards/planck/planck.c
+++ b/keyboards/planck/planck.c
@@ -1,4 +1,5 @@
-#include "planck.h"
+#include "quantum.h"
+#include QMK_KEYBOARD_H
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
diff --git a/keyboards/planck/planck.h b/keyboards/planck/planck.h
deleted file mode 100644
index 4b04dfec51..0000000000
--- a/keyboards/planck/planck.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_planck_ez)
-#    include "ez.h"
-#elif defined(KEYBOARD_planck_light)
-#    include "light.h"
-#elif defined(KEYBOARD_planck_thk)
-#    include "thk.h"
-#elif defined(KEYBOARD_planck_rev1)
-#    include "rev1.h"
-#elif defined(KEYBOARD_planck_rev2)
-#    include "rev2.h"
-#elif defined(KEYBOARD_planck_rev3)
-#    include "rev3.h"
-#elif defined(KEYBOARD_planck_rev4)
-#    include "rev4.h"
-#elif defined(KEYBOARD_planck_rev5)
-#    include "rev5.h"
-#elif defined(KEYBOARD_planck_rev6)
-#    include "rev6.h"
-#elif defined(KEYBOARD_planck_rev6_drop)
-#    include "rev6_drop.h"
-#endif  // Planck revisions
diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/info.json
index ebf11c9c8b..72646ac6bf 100644
--- a/keyboards/planck/rev1/info.json
+++ b/keyboards/planck/rev1/info.json
@@ -8,114 +8,130 @@
     "pid": "0xAE01",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+    "rows": ["D0", "D5", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
   "layouts": {
     "LAYOUT_planck_1x2uC": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3, "w": 2 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/planck/rev1/rev1.c b/keyboards/planck/rev1/rev1.c
index e37e11cf98..ee8a6bf533 100644
--- a/keyboards/planck/rev1/rev1.c
+++ b/keyboards/planck/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "planck.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/planck/rev1/rev1.h b/keyboards/planck/rev1/rev1.h
deleted file mode 100644
index db4c6b368d..0000000000
--- a/keyboards/planck/rev1/rev1.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "planck.h"
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
-#define LAYOUT_planck_grid LAYOUT_ortho_4x12
diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/info.json
index b7a3a31628..2bbc5760c2 100644
--- a/keyboards/planck/rev2/info.json
+++ b/keyboards/planck/rev2/info.json
@@ -8,114 +8,130 @@
     "pid": "0xAE01",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+    "rows": ["D0", "D5", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
   "layouts": {
     "LAYOUT_planck_1x2uC": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3, "w": 2 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/planck/rev2/rev2.c b/keyboards/planck/rev2/rev2.c
index e37e11cf98..ee8a6bf533 100644
--- a/keyboards/planck/rev2/rev2.c
+++ b/keyboards/planck/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "planck.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/planck/rev2/rev2.h b/keyboards/planck/rev2/rev2.h
deleted file mode 100644
index db4c6b368d..0000000000
--- a/keyboards/planck/rev2/rev2.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "planck.h"
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
-#define LAYOUT_planck_grid LAYOUT_ortho_4x12
diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/info.json
index 4ba0085cda..17f07d58f3 100644
--- a/keyboards/planck/rev3/info.json
+++ b/keyboards/planck/rev3/info.json
@@ -8,114 +8,130 @@
     "pid": "0xAE01",
     "device_version": "0.0.3"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+    "rows": ["D0", "D5", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
   "layouts": {
     "LAYOUT_planck_1x2uC": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3, "w": 2 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/planck/rev3/rev3.c b/keyboards/planck/rev3/rev3.c
index e37e11cf98..ee8a6bf533 100644
--- a/keyboards/planck/rev3/rev3.c
+++ b/keyboards/planck/rev3/rev3.c
@@ -1,4 +1,4 @@
-#include "planck.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/planck/rev3/rev3.h b/keyboards/planck/rev3/rev3.h
deleted file mode 100644
index db4c6b368d..0000000000
--- a/keyboards/planck/rev3/rev3.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "planck.h"
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
-#define LAYOUT_planck_grid LAYOUT_ortho_4x12
diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/info.json
index 46513d8248..5eaf58e14c 100644
--- a/keyboards/planck/rev4/info.json
+++ b/keyboards/planck/rev4/info.json
@@ -8,114 +8,130 @@
     "pid": "0xAE01",
     "device_version": "0.0.4"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+    "rows": ["D0", "D5", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
   "layouts": {
     "LAYOUT_planck_1x2uC": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3, "w": 2 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/planck/rev4/rev4.c b/keyboards/planck/rev4/rev4.c
index e37e11cf98..ee8a6bf533 100644
--- a/keyboards/planck/rev4/rev4.c
+++ b/keyboards/planck/rev4/rev4.c
@@ -1,4 +1,4 @@
-#include "planck.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/planck/rev4/rev4.h b/keyboards/planck/rev4/rev4.h
deleted file mode 100644
index db4c6b368d..0000000000
--- a/keyboards/planck/rev4/rev4.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "planck.h"
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
-#define LAYOUT_planck_grid LAYOUT_ortho_4x12
diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json
index 9fb2ae811e..f9265e1409 100644
--- a/keyboards/planck/rev5/info.json
+++ b/keyboards/planck/rev5/info.json
@@ -8,6 +8,11 @@
     "pid": "0xAE01",
     "device_version": "0.0.5"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+    "rows": ["D0", "D5", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
@@ -20,108 +25,119 @@
   "processor": "atmega32u4",
   "bootloader": "qmk-dfu",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
   "layouts": {
     "LAYOUT_planck_1x2uC": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3, "w": 2 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/planck/rev5/rev5.c b/keyboards/planck/rev5/rev5.c
index e37e11cf98..ee8a6bf533 100644
--- a/keyboards/planck/rev5/rev5.c
+++ b/keyboards/planck/rev5/rev5.c
@@ -1,4 +1,4 @@
-#include "planck.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/planck/rev5/rev5.h b/keyboards/planck/rev5/rev5.h
deleted file mode 100644
index db4c6b368d..0000000000
--- a/keyboards/planck/rev5/rev5.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "planck.h"
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
-#define LAYOUT_planck_grid LAYOUT_ortho_4x12
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index a60c086b5b..1d029dae69 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -17,23 +17,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-/* Note: These are not used for arm boards. They're here purely as documentation. */
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 }
-
 #define DIP_SWITCH_PINS { B14, A15, A0, B9 }
 
 #define MUSIC_MAP
@@ -62,7 +45,6 @@
 /*
  * WS2812 Underglow Matrix options
  */
-#define RGB_DI_PIN A1
 #define RGBLED_NUM 9
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json
index 9cc60ab5f0..c1e4e527ce 100644
--- a/keyboards/planck/rev6/info.json
+++ b/keyboards/planck/rev6/info.json
@@ -8,6 +8,18 @@
     "pid": "0xA4F9",
     "device_version": "0.0.6"
   },
+  "ws2812": {
+    "pin": "A1",
+    "driver": "pwm"
+  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B12", "pin_b": "B13"}
@@ -17,260 +29,280 @@
   "bootloader": "stm32-dfu",
   "board": "QMK_PROTON_C",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 5], "x": 5, "y": 3},
+        {"matrix": [7, 0], "x": 6, "y": 3},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_1x2uC": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3, "w": 2 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 0], "x": 5, "y": 3, "w": 2},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_1x2uL": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3, "w": 2 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
+        {"matrix": [7, 0], "x": 6, "y": 3},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_1x2uR": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3, "w": 2 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 5], "x": 5, "y": 3},
+        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_2x2u": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3, "w": 2 },
-        { "x": 6, "y": 3, "w": 2 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
+        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/planck/rev6/rev6.c b/keyboards/planck/rev6/rev6.c
index 59a6b7e279..30cb2cb9c7 100644
--- a/keyboards/planck/rev6/rev6.c
+++ b/keyboards/planck/rev6/rev6.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev6.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/planck/rev6/rev6.h b/keyboards/planck/rev6/rev6.h
deleted file mode 100644
index 9bf3603ed7..0000000000
--- a/keyboards/planck/rev6/rev6.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "planck.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \
-    k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \
-    k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \
-    k30, k31, k32, k73, k74,    k70,   k71, k72, k33, k34, k35 \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k40, k41, k42, k43, k44, k45 }, \
-    { k50, k51, k52, k53, k54, k55 }, \
-    { k60, k61, k62, k63, k64, k65 }, \
-    { k70, k71, k72, k73, k74, XXX } \
-}
-
-#define LAYOUT_planck_1x2uR( \
-    k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \
-    k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \
-    k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \
-    k30, k31, k32, k73, k74, k75,   k71,    k72, k33, k34, k35 \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k40, k41, k42, k43, k44, k45 }, \
-    { k50, k51, k52, k53, k54, k55 }, \
-    { k60, k61, k62, k63, k64, k65 }, \
-    { XXX, k71, k72, k73, k74, k75 } \
-}
-
-#define LAYOUT_planck_1x2uL( \
-    k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \
-    k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \
-    k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \
-    k30, k31, k32, k73,   k75,    k70, k71, k72, k33, k34, k35 \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k40, k41, k42, k43, k44, k45 }, \
-    { k50, k51, k52, k53, k54, k55 }, \
-    { k60, k61, k62, k63, k64, k65 }, \
-    { k70, k71, k72, k73, XXX, k75 } \
-}
-
-#define LAYOUT_planck_2x2u( \
-    k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \
-    k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \
-    k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \
-    k30, k31, k32, k73,   k75,      k71,    k72, k33, k34, k35 \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k40, k41, k42, k43, k44, k45 }, \
-    { k50, k51, k52, k53, k54, k55 }, \
-    { k60, k61, k62, k63, k64, k65 }, \
-    { XXX, k71, k72, k73, XXX, k75 } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \
-    k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \
-    k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \
-    k30, k31, k32, k73, k74, k75, k70, k71, k72, k33, k34, k35 \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k40, k41, k42, k43, k44, k45 }, \
-    { k50, k51, k52, k53, k54, k55 }, \
-    { k60, k61, k62, k63, k64, k65 }, \
-    { k70, k71, k72, k73, k74, k75 } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
-#define LAYOUT_planck_grid LAYOUT_ortho_4x12
diff --git a/keyboards/planck/rev6/rules.mk b/keyboards/planck/rev6/rules.mk
index 2ab8a36fe0..048b723c4c 100644
--- a/keyboards/planck/rev6/rules.mk
+++ b/keyboards/planck/rev6/rules.mk
@@ -10,10 +10,8 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes           # Audio output
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
-WS2812_DRIVER = pwm
 
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
 
diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h
index 192d3fc6d8..ff15e9628d 100644
--- a/keyboards/planck/rev6_drop/config.h
+++ b/keyboards/planck/rev6_drop/config.h
@@ -17,25 +17,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/* Note: These are not used for arm boards. They're here purely as documentation. */
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS \
-    { A10, A9, A8, B15, C13, C14, C15, A2 }
-#define MATRIX_COL_PINS \
-    { B11, B10, B2, B1, A7, B0 }
-
 #define DIP_SWITCH_PINS \
     { B14, A15, A0, B9 }
 
@@ -65,7 +46,6 @@
 /*
  * WS2812 Underglow Matrix options
  */
-#define RGB_DI_PIN A1
 #define RGBLED_NUM 9
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json
index 828f0c20b8..00f1fab14e 100644
--- a/keyboards/planck/rev6_drop/info.json
+++ b/keyboards/planck/rev6_drop/info.json
@@ -8,6 +8,18 @@
     "pid": "0xA4F9",
     "device_version": "0.0.6"
   },
+  "ws2812": {
+    "pin": "A1",
+    "driver": "pwm"
+  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B12", "pin_b": "B13"}
@@ -16,260 +28,280 @@
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
   "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 5], "x": 5, "y": 3},
+        {"matrix": [7, 0], "x": 6, "y": 3},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_1x2uC": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3, "w": 2 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 0], "x": 5, "y": 3, "w": 2},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_1x2uL": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3, "w": 2 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
+        {"matrix": [7, 0], "x": 6, "y": 3},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_1x2uR": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3, "w": 2 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 5], "x": 5, "y": 3},
+        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_2x2u": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 6, "y": 0 },
-        { "x": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 6, "y": 1 },
-        { "x": 7, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3, "w": 2 },
-        { "x": 6, "y": 3, "w": 2 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
+        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/planck/rev6_drop/rev6_drop.c b/keyboards/planck/rev6_drop/rev6_drop.c
index e5d8ad9901..049db9cec0 100644
--- a/keyboards/planck/rev6_drop/rev6_drop.c
+++ b/keyboards/planck/rev6_drop/rev6_drop.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev6_drop.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 // clang-format off
diff --git a/keyboards/planck/rev6_drop/rev6_drop.h b/keyboards/planck/rev6_drop/rev6_drop.h
deleted file mode 100644
index bc9434a026..0000000000
--- a/keyboards/planck/rev6_drop/rev6_drop.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "planck.h"
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k36,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05   }, \
-    { k10, k11, k12, k13, k14, k15   }, \
-    { k20, k21, k22, k23, k24, k25   }, \
-    { k30, k31, k32, k39, k3a, k3b   }, \
-    { k06, k07, k08, k09, k0a, k0b   }, \
-    { k16, k17, k18, k19, k1a, k1b   }, \
-    { k26, k27, k28, k29, k2a, k2b   }, \
-    { k36, k37, k38, k33, k34, KC_NO } \
-}
-
-#define LAYOUT_planck_1x2uR( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35,   k37,    k38, k39, k3a, k3b \
-) \
-{ \
-    { k00,   k01, k02, k03, k04, k05 }, \
-    { k10,   k11, k12, k13, k14, k15 }, \
-    { k20,   k21, k22, k23, k24, k25 }, \
-    { k30,   k31, k32, k39, k3a, k3b }, \
-    { k06,   k07, k08, k09, k0a, k0b }, \
-    { k16,   k17, k18, k19, k1a, k1b }, \
-    { k26,   k27, k28, k29, k2a, k2b }, \
-    { KC_NO, k37, k38, k33, k34, k35 } \
-}
-
-#define LAYOUT_planck_1x2uL( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33,   k35,    k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04,   k05 }, \
-    { k10, k11, k12, k13, k14,   k15 }, \
-    { k20, k21, k22, k23, k24,   k25 }, \
-    { k30, k31, k32, k39, k3a,   k3b }, \
-    { k06, k07, k08, k09, k0a,   k0b }, \
-    { k16, k17, k18, k19, k1a,   k1b }, \
-    { k26, k27, k28, k29, k2a,   k2b }, \
-    { k36, k37, k38, k33, KC_NO, k35 } \
-}
-
-#define LAYOUT_planck_2x2u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33,   k35,      k37,    k38, k39, k3a, k3b \
-) \
-{ \
-    { k00,   k01, k02, k03, k04,   k05 }, \
-    { k10,   k11, k12, k13, k14,   k15 }, \
-    { k20,   k21, k22, k23, k24,   k25 }, \
-    { k30,   k31, k32, k39, k3a,   k3b }, \
-    { k06,   k07, k08, k09, k0a,   k0b }, \
-    { k16,   k17, k18, k19, k1a,   k1b }, \
-    { k26,   k27, k28, k29, k2a,   k2b }, \
-    { KC_NO, k37, k38, k33, KC_NO, k35 } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k39, k3a, k3b }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k33, k34, k35 } \
-}
-
-
-#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
-#define LAYOUT_planck_grid LAYOUT_ortho_4x12
diff --git a/keyboards/planck/rev6_drop/rules.mk b/keyboards/planck/rev6_drop/rules.mk
index 5fdf117649..e20d33831d 100644
--- a/keyboards/planck/rev6_drop/rules.mk
+++ b/keyboards/planck/rev6_drop/rules.mk
@@ -10,11 +10,9 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
-WS2812_DRIVER = pwm
 CUSTOM_MATRIX = yes
 # Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
 
diff --git a/keyboards/planck/thk/config.h b/keyboards/planck/thk/config.h
index bd93164345..832fb0789c 100644
--- a/keyboards/planck/thk/config.h
+++ b/keyboards/planck/thk/config.h
@@ -18,14 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// THK has a different pin-out
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-#define MATRIX_ROW_PINS { A7, A6, A5, A4 }
-#define MATRIX_COL_PINS { D7, C2, C3, C4, C5, C6, C7, A3, A2, A1, A0, B0 }
-
 #define TAPPING_TOGGLE 3
 
 #define DIP_SWITCH_PINS { D0, D1, D4, D6 }
diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json
index 50ee36da3b..e7321ba697 100644
--- a/keyboards/planck/thk/info.json
+++ b/keyboards/planck/thk/info.json
@@ -8,6 +8,11 @@
     "pid": "0x25A7",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A3", "A2", "A1", "A0", "B0"],
+    "rows": ["A7", "A6", "A5", "A4"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B4", "pin_b": "B3"},
@@ -24,105 +29,105 @@
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [
-        { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-        { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-        { "label": "k0a", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-        { "label": "k0b", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-        { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
-        { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 },
-        { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
-        { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 },
-        { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 },
-        { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1 },
-        { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1 },
-        { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1 },
-        { "label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1 },
-        { "label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1 },
-        { "label": "k1a", "matrix": [1, 10], "w": 1, "x": 10, "y": 1 },
-        { "label": "k1b", "matrix": [1, 11], "w": 1, "x": 11, "y": 1 },
-        { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
-        { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
-        { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
-        { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 },
-        { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 },
-        { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 },
-        { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 },
-        { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 },
-        { "label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 },
-        { "label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 },
-        { "label": "k2a", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 },
-        { "label": "k2b", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 },
-        { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
-        { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 },
-        { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 },
-        { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 },
-        { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 },
-        { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5, "y": 3 },
-        { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6, "y": 3 },
-        { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3 },
-        { "label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3 },
-        { "label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3 },
-        { "label": "k3a", "matrix": [3, 10], "w": 1, "x": 10, "y": 3 },
-        { "label": "k3b", "matrix": [3, 11], "w": 1, "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_1x2uC": {
       "layout": [
-        { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-        { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-        { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-        { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-        { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-        { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-        { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-        { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-        { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-        { "label": "k0a", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-        { "label": "k0b", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-        { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
-        { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 },
-        { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
-        { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 },
-        { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 },
-        { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1 },
-        { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1 },
-        { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1 },
-        { "label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1 },
-        { "label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1 },
-        { "label": "k1a", "matrix": [1, 10], "w": 1, "x": 10, "y": 1 },
-        { "label": "k1b", "matrix": [1, 11], "w": 1, "x": 11, "y": 1 },
-        { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
-        { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
-        { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
-        { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 },
-        { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 },
-        { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 },
-        { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 },
-        { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 },
-        { "label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 },
-        { "label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 },
-        { "label": "k2a", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 },
-        { "label": "k2b", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 },
-        { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
-        { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 },
-        { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 },
-        { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 },
-        { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 },
-        { "label": "k35", "matrix": [3, 6], "w": 2, "x": 5, "y": 3 },
-        { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3 },
-        { "label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3 },
-        { "label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3 },
-        { "label": "k3a", "matrix": [3, 10], "w": 1, "x": 10, "y": 3 },
-        { "label": "k3b", "matrix": [3, 11], "w": 1, "x": 11, "y": 3 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/planck/thk/thk.c b/keyboards/planck/thk/thk.c
index bd5e1a0342..42836f0f11 100644
--- a/keyboards/planck/thk/thk.c
+++ b/keyboards/planck/thk/thk.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "thk.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/planck/thk/thk.h b/keyboards/planck/thk/thk.h
deleted file mode 100644
index 6cbbf7262c..0000000000
--- a/keyboards/planck/thk/thk.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- * Copyright 2021 Erovia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "planck.h"
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
-#define LAYOUT_planck_grid LAYOUT_ortho_4x12
diff --git a/keyboards/playkbtw/ca66/ca66.c b/keyboards/playkbtw/ca66/ca66.c
deleted file mode 100644
index 91f4826f99..0000000000
--- a/keyboards/playkbtw/ca66/ca66.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ca66.h"
diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h
index 1c1085c9a1..9bcb20ae88 100644
--- a/keyboards/playkbtw/ca66/config.h
+++ b/keyboards/playkbtw/ca66/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins         0   1   2   3   4   5   6   7   8   9  10  11  12  13  14*/
-#define MATRIX_ROW_PINS { F5, F4, F1, B0, B3 }
-#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, F6, B7, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json
index 809eaa0c39..4363e0c618 100644
--- a/keyboards/playkbtw/ca66/info.json
+++ b/keyboards/playkbtw/ca66/info.json
@@ -8,9 +8,17 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "F6", "B7", "E6"],
+        "rows": ["F5", "F4", "F1", "B0", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "F0"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
     "indicators": {
         "caps_lock": "D1"
     },
diff --git a/keyboards/playkbtw/helen80/config.h b/keyboards/playkbtw/helen80/config.h
index b91943278f..89199f511e 100644
--- a/keyboards/playkbtw/helen80/config.h
+++ b/keyboards/playkbtw/helen80/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, D4, F0, D6, D7 }
-#define MATRIX_COL_PINS { D1, D0, F7, F6, F5, D5, D3, D2, C7, C6, B5, F4, F1, B4, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 87
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -50,4 +32,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/playkbtw/helen80/helen80.c b/keyboards/playkbtw/helen80/helen80.c
deleted file mode 100644
index 0401d92738..0000000000
--- a/keyboards/playkbtw/helen80/helen80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Play Keyboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "helen80.h"
diff --git a/keyboards/playkbtw/helen80/helen80.h b/keyboards/playkbtw/helen80/helen80.h
deleted file mode 100644
index ffb6275a61..0000000000
--- a/keyboards/playkbtw/helen80/helen80.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Play Keyboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,   K0D, K0E, K3D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E,   K5B, K5C, K3E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K5D, K5E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                  \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4B,        K4C,      \
-    K50, K51, K52,                K53,                K54, K55, K56, K57,   K58, K59, K5A  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4C   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E   }, \
-}
diff --git a/keyboards/playkbtw/helen80/info.json b/keyboards/playkbtw/helen80/info.json
index 2efe949d75..6b68149977 100644
--- a/keyboards/playkbtw/helen80/info.json
+++ b/keyboards/playkbtw/helen80/info.json
@@ -8,104 +8,125 @@
     "pid": "0x4845",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"],
+    "rows": ["E6", "B7", "D4", "F0", "D6", "D7"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "B3",
     "scroll_lock": "B2",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["tkl_ansi"],
   "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"K00 (E6,D1)", "x":0, "y":0},
-                {"label":"K01 (E6,D0)", "x":2, "y":0},
-                {"label":"K02 (E6,F7)", "x":3, "y":0},
-                {"label":"K03 (E6,F6)", "x":4, "y":0},
-                {"label":"K04 (E6,F5)", "x":5, "y":0},
-                {"label":"K05 (E6,D5)", "x":6.5, "y":0},
-                {"label":"K06 (E6,D3)", "x":7.5, "y":0},
-                {"label":"K07 (E6,D2)", "x":8.5, "y":0},
-                {"label":"K08 (E6,C7)", "x":9.5, "y":0},
-                {"label":"K09 (E6,C6)", "x":11, "y":0},
-                {"label":"K0A (E6,B5)", "x":12, "y":0},
-                {"label":"K0B (E6,F4)", "x":13, "y":0},
-                {"label":"K0C (E6,F1)", "x":14, "y":0},
-                {"label":"K0D (E6,B4)", "x":15.25, "y":0},
-                {"label":"K0E (E6,B0)", "x":16.25, "y":0},
-                {"label":"K3D (F0,B4)", "x":17.25, "y":0},
-                {"label":"K10 (B7,D1)", "x":0, "y":1.5},
-                {"label":"K11 (B7,D0)", "x":1, "y":1.5},
-                {"label":"K12 (B7,F7)", "x":2, "y":1.5},
-                {"label":"K13 (B7,F6)", "x":3, "y":1.5},
-                {"label":"K14 (B7,F5)", "x":4, "y":1.5},
-                {"label":"K15 (B7,D5)", "x":5, "y":1.5},
-                {"label":"K16 (B7,D3)", "x":6, "y":1.5},
-                {"label":"K17 (B7,D2)", "x":7, "y":1.5},
-                {"label":"K18 (B7,C7)", "x":8, "y":1.5},
-                {"label":"K19 (B7,C6)", "x":9, "y":1.5},
-                {"label":"K1A (B7,B5)", "x":10, "y":1.5},
-                {"label":"K1B (B7,F4)", "x":11, "y":1.5},
-                {"label":"K1C (B7,F1)", "x":12, "y":1.5},
-                {"label":"K1E (B7,B0)", "x":13, "y":1.5, "w":2},
-                {"label":"K5B (D7,F4)", "x":15.25, "y":1.5},
-                {"label":"K5C (D7,F1)", "x":16.25, "y":1.5},
-                {"label":"K3E (F0,B0)", "x":17.25, "y":1.5},
-                {"label":"K20 (D4,D1)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (D4,D0)", "x":1.5, "y":2.5},
-                {"label":"K22 (D4,F7)", "x":2.5, "y":2.5},
-                {"label":"K23 (D4,F6)", "x":3.5, "y":2.5},
-                {"label":"K24 (D4,F5)", "x":4.5, "y":2.5},
-                {"label":"K25 (D4,D5)", "x":5.5, "y":2.5},
-                {"label":"K26 (D4,D3)", "x":6.5, "y":2.5},
-                {"label":"K27 (D4,D2)", "x":7.5, "y":2.5},
-                {"label":"K28 (D4,C7)", "x":8.5, "y":2.5},
-                {"label":"K29 (D4,C6)", "x":9.5, "y":2.5},
-                {"label":"K2A (D4,B5)", "x":10.5, "y":2.5},
-                {"label":"K2B (D4,F4)", "x":11.5, "y":2.5},
-                {"label":"K2C (D4,F1)", "x":12.5, "y":2.5},
-                {"label":"K2D (D4,B4)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K2E (D4,B0)", "x":15.25, "y":2.5},
-                {"label":"K5D (D7,B4)", "x":16.25, "y":2.5},
-                {"label":"K5E (D7,B0)", "x":17.25, "y":2.5},
-                {"label":"K30 (F0,D1)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (F0,D0)", "x":1.75, "y":3.5},
-                {"label":"K32 (F0,F7)", "x":2.75, "y":3.5},
-                {"label":"K33 (F0,F6)", "x":3.75, "y":3.5},
-                {"label":"K34 (F0,F5)", "x":4.75, "y":3.5},
-                {"label":"K35 (F0,D5)", "x":5.75, "y":3.5},
-                {"label":"K36 (F0,D3)", "x":6.75, "y":3.5},
-                {"label":"K37 (F0,D2)", "x":7.75, "y":3.5},
-                {"label":"K38 (F0,C7)", "x":8.75, "y":3.5},
-                {"label":"K39 (F0,C6)", "x":9.75, "y":3.5},
-                {"label":"K3A (F0,B5)", "x":10.75, "y":3.5},
-                {"label":"K3B (F0,F4)", "x":11.75, "y":3.5},
-                {"label":"K3C (F0,F1)", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":2.25},
-                {"label":"K42 (D6,F7)", "x":2.25, "y":4.5},
-                {"label":"K43 (D6,F6)", "x":3.25, "y":4.5},
-                {"label":"K44 (D6,F5)", "x":4.25, "y":4.5},
-                {"label":"K45 (D6,D5)", "x":5.25, "y":4.5},
-                {"label":"K46 (D6,D3)", "x":6.25, "y":4.5},
-                {"label":"K47 (D6,D2)", "x":7.25, "y":4.5},
-                {"label":"K48 (D6,C7)", "x":8.25, "y":4.5},
-                {"label":"K49 (D6,C6)", "x":9.25, "y":4.5},
-                {"label":"K4A (D6,B5)", "x":10.25, "y":4.5},
-                {"label":"K4B (D6,F4)", "x":11.25, "y":4.5},
-                {"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"K4E (D6,B0)", "x":16.25, "y":4.5},
-                {"label":"K50 (D7,D1)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K51 (D7,D0)", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K52 (D7,F7)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K53 (D7,F6)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K54 (D7,F5)", "x":10, "y":5.5, "w":1.25},
-                {"label":"K55 (D7,D5)", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"K56 (D7,D3)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"K57 (D7,D2)", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"K58 (D7,C7)", "x":15.25, "y":5.5},
-                {"label":"K59 (D7,C6)", "x":16.25, "y":5.5},
-                {"label":"K5A (D7,B5)", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [3, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [5, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [5, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h
index 42f15b3352..8471167fcd 100644
--- a/keyboards/playkbtw/pk60/config.h
+++ b/keyboards/playkbtw/pk60/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/playkbtw/pk60/info.json b/keyboards/playkbtw/pk60/info.json
index 5909204f29..a3cb5549e1 100644
--- a/keyboards/playkbtw/pk60/info.json
+++ b/keyboards/playkbtw/pk60/info.json
@@ -8,10 +8,18 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"],
+    "rows": ["D0", "D1", "D2", "D3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "levels": 5
   },
+  "ws2812": {
+    "pin": "E2"
+  },
   "indicators": {
     "caps_lock": "F4",
     "on_state": 0
diff --git a/keyboards/playkbtw/pk60/pk60.c b/keyboards/playkbtw/pk60/pk60.c
deleted file mode 100644
index 909230def2..0000000000
--- a/keyboards/playkbtw/pk60/pk60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "pk60.h"
diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h
index 91cba0f8e3..3b2087c5b8 100644
--- a/keyboards/playkbtw/pk64rgb/config.h
+++ b/keyboards/playkbtw/pk64rgb/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, D6, D5, D3, D2 }
-#define MATRIX_COL_PINS { B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, B1, B2, B3, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 	#define RGB_MATRIX_KEYPRESSES
 	#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
@@ -57,8 +40,6 @@
 #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
 #endif
 
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -73,7 +54,6 @@
 #    define RGBLIGHT_SAT_STEP 5
 #    define RGBLIGHT_VAL_STEP 5
 #    define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/playkbtw/pk64rgb/info.json b/keyboards/playkbtw/pk64rgb/info.json
index 7cb2950d6a..13fc6dd0ea 100644
--- a/keyboards/playkbtw/pk64rgb/info.json
+++ b/keyboards/playkbtw/pk64rgb/info.json
@@ -8,6 +8,17 @@
         "pid": "0x3634",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"],
+        "rows": ["D7", "D6", "D5", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["64_ansi"],
diff --git a/keyboards/playkbtw/pk64rgb/rules.mk b/keyboards/playkbtw/pk64rgb/rules.mk
index e18aaeaa8a..f199d19d31 100644
--- a/keyboards/playkbtw/pk64rgb/rules.mk
+++ b/keyboards/playkbtw/pk64rgb/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 
 AUDIO_ENABLE = no           # Audio output
 
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index c7fcc504e3..bc7e587ee7 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -30,7 +30,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define RGB_DI_PIN B5
 #define RGBLED_NUM 4
 #define RGBLIGHT_LIMIT_VAL 40
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index c8889f59f9..96b91d89a6 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -11,6 +11,9 @@
     "bootmagic": {
         "matrix": [0, 3]
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "matrix_pins": {
diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/mouse/mouse.c
index 275c02214e..e2dada4a15 100644
--- a/keyboards/ploopyco/mouse/mouse.c
+++ b/keyboards/ploopyco/mouse/mouse.c
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "mouse.h"
 
 #ifndef OPT_DEBOUNCE
 #    define OPT_DEBOUNCE 5  // (ms) 			Time between scroll events
diff --git a/keyboards/ploopyco/trackball/rev1/rev1.h b/keyboards/ploopyco/trackball/rev1/rev1.h
deleted file mode 100644
index a82c20a116..0000000000
--- a/keyboards/ploopyco/trackball/rev1/rev1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "trackball.h"
diff --git a/keyboards/ploopyco/trackball/rev1_005/config.h b/keyboards/ploopyco/trackball/rev1_005/config.h
index fcf51c4c1b..66a453dcb8 100644
--- a/keyboards/ploopyco/trackball/rev1_005/config.h
+++ b/keyboards/ploopyco/trackball/rev1_005/config.h
@@ -23,8 +23,6 @@
 #define UNUSABLE_PINS \
     { D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }
 
-// If board has a debug LED, you can enable it by defining this
-#define RGB_DI_PIN B5
 #define RGBLED_NUM 3
 #define RGBLIGHT_LIMIT_VAL 40
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/ploopyco/trackball/rev1_005/info.json b/keyboards/ploopyco/trackball/rev1_005/info.json
index b963f8842a..91574c5c4b 100644
--- a/keyboards/ploopyco/trackball/rev1_005/info.json
+++ b/keyboards/ploopyco/trackball/rev1_005/info.json
@@ -5,5 +5,8 @@
         "direct": [
             ["D4", "D2", "E6", "B6", "D7"]
         ]
+    },
+    "ws2812": {
+        "pin": "B5"
     }
 }
diff --git a/keyboards/ploopyco/trackball/rev1_005/rev1_005.h b/keyboards/ploopyco/trackball/rev1_005/rev1_005.h
deleted file mode 100644
index a82c20a116..0000000000
--- a/keyboards/ploopyco/trackball/rev1_005/rev1_005.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "trackball.h"
diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h
index 4cdae526aa..f4516222e0 100644
--- a/keyboards/ploopyco/trackball/trackball.h
+++ b/keyboards/ploopyco/trackball/trackball.h
@@ -21,11 +21,6 @@
 #include "quantum.h"
 #include "analog.h"
 #include "opt_encoder.h"
-#if defined(KEYBOARD_ploopyco_trackball_rev1)
-#    include "rev1.h"
-#elif defined(KEYBOARD_ploopyco_trackball_rev1_005)
-#    include "rev1_005.h"
-#endif
 
 // Sensor defs
 #define OPT_ENC1 F0
diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h
deleted file mode 100644
index 4f34e17dd4..0000000000
--- a/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2019 Hiroyuki Okada
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "trackball_mini.h"
diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h b/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h
deleted file mode 100644
index 4f34e17dd4..0000000000
--- a/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2019 Hiroyuki Okada
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "trackball_mini.h"
diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h
deleted file mode 100644
index 4f34e17dd4..0000000000
--- a/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2019 Hiroyuki Okada
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "trackball_mini.h"
diff --git a/keyboards/ploopyco/trackball_thumb/info.json b/keyboards/ploopyco/trackball_thumb/info.json
index 3cf2d0ca37..3b9404b401 100644
--- a/keyboards/ploopyco/trackball_thumb/info.json
+++ b/keyboards/ploopyco/trackball_thumb/info.json
@@ -23,12 +23,12 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix":[0,0], "x":0, "y":0, "h": 1},
+                {"matrix":[0,0], "x":0, "y":0},
                 {"matrix":[0,2], "x":1, "y":0, "h":2},
                 {"matrix":[0,3],"x":2.5, "y":0.25, "h":1.5},
-                {"matrix":[0,4],"x":4, "y":0, "h":2},
-                {"matrix":[0,5],"x":5, "y":0.5, "h":1},
-                {"matrix":[0,1],"x":0, "y":1, "h":1}
+                {"matrix":[0,4],"x":4, "y":0},
+                {"matrix":[0,5],"x":5, "y":0.5},
+                {"matrix":[0,1],"x":0, "y":1}
             ]
         }
     }
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/info.json b/keyboards/ploopyco/trackball_thumb/rev1_001/info.json
index 80951b5b2d..602692866c 100644
--- a/keyboards/ploopyco/trackball_thumb/rev1_001/info.json
+++ b/keyboards/ploopyco/trackball_thumb/rev1_001/info.json
@@ -8,13 +8,14 @@
     },
     "rgblight": {
         "led_count": 3,
-        "pin": "B5",
         "max_brightness": 40,
         "animations": {
             "breathing": true,
             "rainbow_mood": true,
             "rainbow_swirl": true
         }
+    },
+    "ws2812": {
+        "pin": "B5"
     }
-
 }
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h
deleted file mode 100644
index f43818665c..0000000000
--- a/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "trackball_thumb.h"
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
index 356b8902db..8ee17634f1 100644
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
@@ -21,9 +21,6 @@
 #include "quantum.h"
 #include "analog.h"
 #include "opt_encoder.h"
-#if defined(KEYBOARD_ploopyco_trackball_thumb_rev1_001)
-#    include "rev1_001.h"
-#endif
 
 // Sensor defs
 #define OPT_ENC1 F4
diff --git a/keyboards/pluckey/config.h b/keyboards/pluckey/config.h
index 21c01e89ee..fc758dec34 100644
--- a/keyboards/pluckey/config.h
+++ b/keyboards/pluckey/config.h
@@ -17,20 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, F5, F6, B6, B5 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, F7 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json
index faeb0df2f4..5b559d48b7 100644
--- a/keyboards/pluckey/info.json
+++ b/keyboards/pluckey/info.json
@@ -8,6 +8,11 @@
         "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}
diff --git a/keyboards/plume/plume65/config.h b/keyboards/plume/plume65/config.h
index 3e9f66e3d3..3169b059f8 100644
--- a/keyboards/plume/plume65/config.h
+++ b/keyboards/plume/plume65/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D2, D5, E6, D0, D1 }
-#define MATRIX_COL_PINS { B7, F7, C7, C6, B6, F0, B5, F1, B4, F4, D7, F5, D6, F6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
- #define RGB_DI_PIN B0
    #define RGBLED_NUM 10
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/plume/plume65/info.json b/keyboards/plume/plume65/info.json
index 1937223b02..aaf3ae1225 100644
--- a/keyboards/plume/plume65/info.json
+++ b/keyboards/plume/plume65/info.json
@@ -8,6 +8,14 @@
         "pid": "0x22CF",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "F7", "C7", "C6", "B6", "F0", "B5", "F1", "B4", "F4", "D7", "F5", "D6", "F6", "D4"],
+        "rows": ["D2", "D5", "E6", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "D2",
         "esc_output": "B7"
diff --git a/keyboards/plume/plume65/plume65.c b/keyboards/plume/plume65/plume65.c
deleted file mode 100644
index 991a989af3..0000000000
--- a/keyboards/plume/plume65/plume65.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "plume65.h"
diff --git a/keyboards/plut0nium/0x3e/0x3e.c b/keyboards/plut0nium/0x3e/0x3e.c
deleted file mode 100644
index 2f3683d8bc..0000000000
--- a/keyboards/plut0nium/0x3e/0x3e.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 plut0nium
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "0x3e.h"
-
diff --git a/keyboards/plut0nium/0x3e/config.h b/keyboards/plut0nium/0x3e/config.h
index 63cc719d84..09d996e930 100644
--- a/keyboards/plut0nium/0x3e/config.h
+++ b/keyboards/plut0nium/0x3e/config.h
@@ -17,21 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D5, D4, D6, D7, B4, B5, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /*
  * RGB Underglow
  */
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 6
   #define RGBLIGHT_HUE_STEP 12
   #define RGBLIGHT_SAT_STEP 8
@@ -47,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //  #define RGBLIGHT_EFFECT_RGB_TEST
 //  #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/plut0nium/0x3e/info.json b/keyboards/plut0nium/0x3e/info.json
index 52ad743a0a..65c4567c4e 100644
--- a/keyboards/plut0nium/0x3e/info.json
+++ b/keyboards/plut0nium/0x3e/info.json
@@ -8,11 +8,19 @@
         "pid": "0x3E01",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D5", "D4", "D6", "D7", "B4", "B5", "B6"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "C6",
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/plx/config.h b/keyboards/plx/config.h
deleted file mode 100644
index f878ff1e51..0000000000
--- a/keyboards/plx/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 Peac Design and Basekeys
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* key matrix pins */
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D4, D6, D7, B4, B5, B6, C6, C7, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
diff --git a/keyboards/plx/info.json b/keyboards/plx/info.json
index fe0e02d299..0e153d81f0 100644
--- a/keyboards/plx/info.json
+++ b/keyboards/plx/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE972",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/plx/plx.c b/keyboards/plx/plx.c
deleted file mode 100644
index 65e4dfd28b..0000000000
--- a/keyboards/plx/plx.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Peac Design and Basekeys
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "plx.h"
diff --git a/keyboards/plywrks/ahgase/ahgase.c b/keyboards/plywrks/ahgase/ahgase.c
deleted file mode 100644
index 871101a97e..0000000000
--- a/keyboards/plywrks/ahgase/ahgase.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ahgase.h"
diff --git a/keyboards/plywrks/ahgase/ahgase.h b/keyboards/plywrks/ahgase/ahgase.h
deleted file mode 100644
index 1b31bad48a..0000000000
--- a/keyboards/plywrks/ahgase/ahgase.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2022 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// ANSI layout
-// Full backspace
-// Full right shift
-// Full left shift
-// 6.25u bottom row
-#define LAYOUT_tkl_f13_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                \
-    k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,                k4f,      \
-    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \
-    { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// ISO layout
-// Full backspace
-// Full right shift
-// Split left shift
-// 6.25u bottom row
-#define LAYOUT_tkl_f13_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2d,                \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,                k4f,      \
-    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// Layout for VIA
-// Split backspace
-// Split left shift
-// Split right shift
-// 6.25u bottom row
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
-    k50, k51, k52,                     k57,           k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
diff --git a/keyboards/plywrks/ahgase/config.h b/keyboards/plywrks/ahgase/config.h
index d11082a188..06b97ae4ab 100644
--- a/keyboards/plywrks/ahgase/config.h
+++ b/keyboards/plywrks/ahgase/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B2, B3, B7, D6, D3, D2 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D5, B0, B1, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/plywrks/ahgase/info.json b/keyboards/plywrks/ahgase/info.json
index 02c5e0c8b2..2949aec9c6 100644
--- a/keyboards/plywrks/ahgase/info.json
+++ b/keyboards/plywrks/ahgase/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7902",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D5", "B0", "B1", "D1"],
+        "rows": ["B2", "B3", "B7", "D6", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -21,297 +26,324 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
-                {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/plywrks/allaro/info.json b/keyboards/plywrks/allaro/info.json
index aa56aa1103..d9d5c73d82 100644
--- a/keyboards/plywrks/allaro/info.json
+++ b/keyboards/plywrks/allaro/info.json
@@ -26,7 +26,6 @@
     },
     "rgblight": {
         "led_count": 16,
-        "pin": "E2",
         "hue_steps": 10,
         "saturation_steps": 17,
         "brightness_steps": 17,
@@ -43,6 +42,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "layouts": {
         "LAYOUT_arisu": {
             "layout": [
@@ -63,7 +65,7 @@
                 { "matrix": [0, 13], "x": 15.75, "y": 0.1 },
                 { "matrix": [0, 14], "x": 16.75, "y": 0.1 },
 
-                { "matrix": [1, 0], "x": 0.2, "y": 1.0 },
+                { "matrix": [1, 0], "x": 0.2, "y": 1 },
                 { "matrix": [1, 1], "w": 1.5, "x": 1.35, "y": 1.1 },
                 { "matrix": [1, 2], "x": 2.85, "y": 1.1 },
                 { "matrix": [1, 3], "x": 3.85, "y": 1.1 },
@@ -79,7 +81,7 @@
                 { "matrix": [1, 13], "x": 15.45, "y": 1.1 },
                 { "matrix": [1, 14], "w": 1.5, "x": 16.45, "y": 1.1 },
 
-                { "matrix": [2, 0], "x": 0, "y": 2.0 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
                 { "matrix": [2, 1], "w": 1.75, "x": 1.15, "y": 2.1 },
                 { "matrix": [2, 2], "x": 2.9, "y": 2.1 },
                 { "matrix": [2, 3], "x": 3.9, "y": 2.1 },
diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h
index 6e6827f0e8..9dca983f22 100644
--- a/keyboards/plywrks/lune/config.h
+++ b/keyboards/plywrks/lune/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F1, F0, B7, B0, B6, B5, D7, B4, D6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, D4, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 8
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/plywrks/lune/info.json b/keyboards/plywrks/lune/info.json
index 2061b282e4..694044ba4f 100644
--- a/keyboards/plywrks/lune/info.json
+++ b/keyboards/plywrks/lune/info.json
@@ -8,6 +8,14 @@
         "pid": "0x7901",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "D4", "D5", "D3", "D2"],
+        "rows": ["F1", "F0", "B7", "B0", "B6", "B5", "D7", "B4", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/plywrks/lune/lune.h b/keyboards/plywrks/lune/lune.h
index 444f855123..46fd71c775 100644
--- a/keyboards/plywrks/lune/lune.h
+++ b/keyboards/plywrks/lune/lune.h
@@ -42,6 +42,6 @@
     { k40, k41, k42, k43, k44, k45, k46, ___ }, \
     { k50, k51, k52, ___, k54, k55, k56, k57 }, \
     { ___, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, ___, k74, k75, k75, k77 }, \
+    { k70, k71, k72, ___, k74, k75, k76, k77 }, \
     { k80, k81, k82, k83, k84, k85, ___, k87 }, \
 }
diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h
index 12721a16b0..aadf46e198 100644
--- a/keyboards/pohjolaworks/louhi/config.h
+++ b/keyboards/pohjolaworks/louhi/config.h
@@ -17,32 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D7, C6, B4, E6 }
-#define MATRIX_COL_PINS { D4, B6, F4, F5, F6, F7, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 14
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 230 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pohjolaworks/louhi/info.json b/keyboards/pohjolaworks/louhi/info.json
index 0185fe83bb..d6c6fc31f0 100644
--- a/keyboards/pohjolaworks/louhi/info.json
+++ b/keyboards/pohjolaworks/louhi/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "B6", "F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D3", "D2", "D1", "D0", "D7", "C6", "B4", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B3"}
         ]
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/pohjolaworks/louhi/louhi.c b/keyboards/pohjolaworks/louhi/louhi.c
deleted file mode 100644
index d5bb648b62..0000000000
--- a/keyboards/pohjolaworks/louhi/louhi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Erkki Halinen
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "louhi.h"
diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h
index 3332d62aa6..cd3cd3a3c9 100644
--- a/keyboards/poker87c/config.h
+++ b/keyboards/poker87c/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, D4, F0, D6, D7 }
-#define MATRIX_COL_PINS { D1, D0, F7, F6, F5, D5, D3, D2, C7, C6, B5, F4, F1, B4, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 95
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -50,4 +32,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/poker87c/info.json b/keyboards/poker87c/info.json
index 04c16583a6..a250fd25f4 100644
--- a/keyboards/poker87c/info.json
+++ b/keyboards/poker87c/info.json
@@ -8,9 +8,17 @@
         "pid": "0x087C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"],
+        "rows": ["E6", "B7", "D4", "F0", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "B3",
         "num_lock": "B1",
@@ -25,197 +33,213 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (E6,D1)", "x":0, "y":0},
-                {"label":"K01 (E6,D0)", "x":2, "y":0},
-                {"label":"K02 (E6,F7)", "x":3, "y":0},
-                {"label":"K03 (E6,F6)", "x":4, "y":0},
-                {"label":"K04 (E6,F5)", "x":5, "y":0},
-                {"label":"K05 (E6,D5)", "x":6.5, "y":0},
-                {"label":"K06 (E6,D3)", "x":7.5, "y":0},
-                {"label":"K07 (E6,D2)", "x":8.5, "y":0},
-                {"label":"K08 (E6,C7)", "x":9.5, "y":0},
-                {"label":"K09 (E6,C6)", "x":11, "y":0},
-                {"label":"K0A (E6,B5)", "x":12, "y":0},
-                {"label":"K0B (E6,F4)", "x":13, "y":0},
-                {"label":"K0C (E6,F1)", "x":14, "y":0},
-                {"label":"K0D (E6,B4)", "x":15.25, "y":0},
-                {"label":"K0E (E6,B0)", "x":16.25, "y":0},
-                {"label":"K3D (F0,B4)", "x":17.25, "y":0},
-
-                {"label":"K10 (B7,D1)", "x":0, "y":1.5},
-                {"label":"K11 (B7,D0)", "x":1, "y":1.5},
-                {"label":"K12 (B7,F7)", "x":2, "y":1.5},
-                {"label":"K13 (B7,F6)", "x":3, "y":1.5},
-                {"label":"K14 (B7,F5)", "x":4, "y":1.5},
-                {"label":"K15 (B7,D5)", "x":5, "y":1.5},
-                {"label":"K16 (B7,D3)", "x":6, "y":1.5},
-                {"label":"K17 (B7,D2)", "x":7, "y":1.5},
-                {"label":"K18 (B7,C7)", "x":8, "y":1.5},
-                {"label":"K19 (B7,C6)", "x":9, "y":1.5},
-                {"label":"K1A (B7,B5)", "x":10, "y":1.5},
-                {"label":"K1B (B7,F4)", "x":11, "y":1.5},
-                {"label":"K1C (B7,F1)", "x":12, "y":1.5},
-                {"label":"K1D (B7,B4)", "x":13, "y":1.5},
-                {"label":"K1E (B7,B0)", "x":14, "y":1.5},
-                {"label":"K5B (D7,F4)", "x":15.25, "y":1.5},
-                {"label":"K5C (D7,F1)", "x":16.25, "y":1.5},
-                {"label":"K3E (F0,B0)", "x":17.25, "y":1.5},
-
-                {"label":"K20 (D4,D1)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (D4,D0)", "x":1.5, "y":2.5},
-                {"label":"K22 (D4,F7)", "x":2.5, "y":2.5},
-                {"label":"K23 (D4,F6)", "x":3.5, "y":2.5},
-                {"label":"K24 (D4,F5)", "x":4.5, "y":2.5},
-                {"label":"K25 (D4,D5)", "x":5.5, "y":2.5},
-                {"label":"K26 (D4,D3)", "x":6.5, "y":2.5},
-                {"label":"K27 (D4,D2)", "x":7.5, "y":2.5},
-                {"label":"K28 (D4,C7)", "x":8.5, "y":2.5},
-                {"label":"K29 (D4,C6)", "x":9.5, "y":2.5},
-                {"label":"K2A (D4,B5)", "x":10.5, "y":2.5},
-                {"label":"K2B (D4,F4)", "x":11.5, "y":2.5},
-                {"label":"K2C (D4,F1)", "x":12.5, "y":2.5},
-                {"label":"K2D (D4,B4)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K2E (D4,B0)", "x":15.25, "y":2.5},
-                {"label":"K5D (D7,B4)", "x":16.25, "y":2.5},
-                {"label":"K5E (D7,B0)", "x":17.25, "y":2.5},
-
-                {"label":"K30 (F0,D1)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (F0,D0)", "x":1.75, "y":3.5},
-                {"label":"K32 (F0,F7)", "x":2.75, "y":3.5},
-                {"label":"K33 (F0,F6)", "x":3.75, "y":3.5},
-                {"label":"K34 (F0,F5)", "x":4.75, "y":3.5},
-                {"label":"K35 (F0,D5)", "x":5.75, "y":3.5},
-                {"label":"K36 (F0,D3)", "x":6.75, "y":3.5},
-                {"label":"K37 (F0,D2)", "x":7.75, "y":3.5},
-                {"label":"K38 (F0,C7)", "x":8.75, "y":3.5},
-                {"label":"K39 (F0,C6)", "x":9.75, "y":3.5},
-                {"label":"K3A (F0,B5)", "x":10.75, "y":3.5},
-                {"label":"K3B (F0,F4)", "x":11.75, "y":3.5},
-                {"label":"K3C (F0,F1)", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":1.25},
-                {"label":"K41 (D6,D0)", "x":1.25, "y":4.5},
-                {"label":"K42 (D6,F7)", "x":2.25, "y":4.5},
-                {"label":"K43 (D6,F6)", "x":3.25, "y":4.5},
-                {"label":"K44 (D6,F5)", "x":4.25, "y":4.5},
-                {"label":"K45 (D6,D5)", "x":5.25, "y":4.5},
-                {"label":"K46 (D6,D3)", "x":6.25, "y":4.5},
-                {"label":"K47 (D6,D2)", "x":7.25, "y":4.5},
-                {"label":"K48 (D6,C7)", "x":8.25, "y":4.5},
-                {"label":"K49 (D6,C6)", "x":9.25, "y":4.5},
-                {"label":"K4A (D6,B5)", "x":10.25, "y":4.5},
-                {"label":"K4B (D6,F4)", "x":11.25, "y":4.5},
-                {"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":1.75},
-                {"label":"K4D (D6,B4)", "x":14, "y":4.5},
-                {"label":"K4E (D6,B0)", "x":16.25, "y":4.5},
-
-                {"label":"K50 (D7,D1)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K51 (D7,D0)", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K52 (D7,F7)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K53 (D7,F6)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K54 (D7,F5)", "x":10, "y":5.5, "w":1.25},
-                {"label":"K55 (D7,D5)", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"K56 (D7,D3)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"K57 (D7,D2)", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"K58 (D7,C7)", "x":15.25, "y":5.5},
-                {"label":"K59 (D7,C6)", "x":16.25, "y":5.5},
-                {"label":"K5A (D7,B5)", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [3, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+
+                {"matrix": [5, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [5, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
-                {"x": 16.25, "y": 4.5},
-
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [3, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [5, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [5, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/poker87c/poker87c.c b/keyboards/poker87c/poker87c.c
deleted file mode 100644
index 6009ce112d..0000000000
--- a/keyboards/poker87c/poker87c.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 water <mfkiiyd@163.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "poker87c.h"
-
-
diff --git a/keyboards/poker87c/poker87c.h b/keyboards/poker87c/poker87c.h
deleted file mode 100644
index c8cdccf442..0000000000
--- a/keyboards/poker87c/poker87c.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2021 water <mfkiiyd@163.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0D, K0E, K3D,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,  K5B, K5C, K3E,  \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,     K2E, K5D, K5E,  \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                         \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,     K4D,       K4E,       \
-    K50,  K51,  K52,              K53,                K54,  K55,  K56,  K57,    K58, K59, K5A   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E   }, \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0D, K0E, K3D,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E,  K5B, K5C, K3E,  \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,     K2E, K5D, K5E,  \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                         \
-    K40,       K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,          K4C,       K4E,       \
-    K50,  K51,  K52,              K53,                K54,  K55,  K56,  K57,    K58, K59, K5A   \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \
-}
diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h
index fbee1e1858..03b43fcee2 100644
--- a/keyboards/poker87d/config.h
+++ b/keyboards/poker87d/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, D4, F0, D6, D7 }
-#define MATRIX_COL_PINS { D1, D0, F7, F6, F5, D5, D3, D2, C7, C6, B5, F4, F1, B4, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 125
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -50,4 +32,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json
index 22a09c541e..b955d147d4 100644
--- a/keyboards/poker87d/info.json
+++ b/keyboards/poker87d/info.json
@@ -8,6 +8,11 @@
         "pid": "0x087D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"],
+        "rows": ["E6", "B7", "D4", "F0", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6"
     },
@@ -16,6 +21,9 @@
         "num_lock": "B1",
         "scroll_lock": "B2"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -25,198 +33,214 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (E6,D1)", "x":0, "y":0},
-                {"label":"K01 (E6,D0)", "x":2, "y":0},
-                {"label":"K02 (E6,F7)", "x":3, "y":0},
-                {"label":"K03 (E6,F6)", "x":4, "y":0},
-                {"label":"K04 (E6,F5)", "x":5, "y":0},
-                {"label":"K05 (E6,D5)", "x":6.5, "y":0},
-                {"label":"K06 (E6,D3)", "x":7.5, "y":0},
-                {"label":"K07 (E6,D2)", "x":8.5, "y":0},
-                {"label":"K08 (E6,C7)", "x":9.5, "y":0},
-                {"label":"K09 (E6,C6)", "x":11, "y":0},
-                {"label":"K0A (E6,B5)", "x":12, "y":0},
-                {"label":"K0B (E6,F4)", "x":13, "y":0},
-                {"label":"K0C (E6,F1)", "x":14, "y":0},
-                {"label":"K0D (E6,B4)", "x":15.25, "y":0},
-                {"label":"K0E (E6,B0)", "x":16.25, "y":0},
-                {"label":"K3D (F0,B4)", "x":17.25, "y":0},
-
-                {"label":"K10 (B7,D1)", "x":0, "y":1.5},
-                {"label":"K11 (B7,D0)", "x":1, "y":1.5},
-                {"label":"K12 (B7,F7)", "x":2, "y":1.5},
-                {"label":"K13 (B7,F6)", "x":3, "y":1.5},
-                {"label":"K14 (B7,F5)", "x":4, "y":1.5},
-                {"label":"K15 (B7,D5)", "x":5, "y":1.5},
-                {"label":"K16 (B7,D3)", "x":6, "y":1.5},
-                {"label":"K17 (B7,D2)", "x":7, "y":1.5},
-                {"label":"K18 (B7,C7)", "x":8, "y":1.5},
-                {"label":"K19 (B7,C6)", "x":9, "y":1.5},
-                {"label":"K1A (B7,B5)", "x":10, "y":1.5},
-                {"label":"K1B (B7,F4)", "x":11, "y":1.5},
-                {"label":"K1C (B7,F1)", "x":12, "y":1.5},
-                {"label":"K1D (B7,B4)", "x":13, "y":1.5},
-                {"label":"K1E (B7,B0)", "x":14, "y":1.5},
-                {"label":"K5B (D7,F4)", "x":15.25, "y":1.5},
-                {"label":"K5C (D7,F1)", "x":16.25, "y":1.5},
-                {"label":"K3E (F0,B0)", "x":17.25, "y":1.5},
-
-                {"label":"K20 (D4,D1)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (D4,D0)", "x":1.5, "y":2.5},
-                {"label":"K22 (D4,F7)", "x":2.5, "y":2.5},
-                {"label":"K23 (D4,F6)", "x":3.5, "y":2.5},
-                {"label":"K24 (D4,F5)", "x":4.5, "y":2.5},
-                {"label":"K25 (D4,D5)", "x":5.5, "y":2.5},
-                {"label":"K26 (D4,D3)", "x":6.5, "y":2.5},
-                {"label":"K27 (D4,D2)", "x":7.5, "y":2.5},
-                {"label":"K28 (D4,C7)", "x":8.5, "y":2.5},
-                {"label":"K29 (D4,C6)", "x":9.5, "y":2.5},
-                {"label":"K2A (D4,B5)", "x":10.5, "y":2.5},
-                {"label":"K2B (D4,F4)", "x":11.5, "y":2.5},
-                {"label":"K2C (D4,F1)", "x":12.5, "y":2.5, "w":1.25},
-                {"label":"K2E (D4,B0)", "x":15.25, "y":2.5},
-                {"label":"K5D (D7,B4)", "x":16.25, "y":2.5},
-                {"label":"K5E (D7,B0)", "x":17.25, "y":2.5},
-
-                {"label":"K30 (F0,D1)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (F0,D0)", "x":1.75, "y":3.5},
-                {"label":"K32 (F0,F7)", "x":2.75, "y":3.5},
-                {"label":"K33 (F0,F6)", "x":3.75, "y":3.5},
-                {"label":"K34 (F0,F5)", "x":4.75, "y":3.5},
-                {"label":"K35 (F0,D5)", "x":5.75, "y":3.5},
-                {"label":"K36 (F0,D3)", "x":6.75, "y":3.5},
-                {"label":"K37 (F0,D2)", "x":7.75, "y":3.5},
-                {"label":"K38 (F0,C7)", "x":8.75, "y":3.5},
-                {"label":"K39 (F0,C6)", "x":9.75, "y":3.5},
-                {"label":"K3A (F0,B5)", "x":10.75, "y":3.5},
-                {"label":"K3B (F0,F4)", "x":11.75, "y":3.5},
-                {"label":"K2D (D4,B4)", "x":12.75, "y":3.5},
-                {"label":"K3C (F0,F1)", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":1.25},
-                {"label":"K41 (D6,D0)", "x":1.25, "y":4.5},
-                {"label":"K42 (D6,F7)", "x":2.25, "y":4.5},
-                {"label":"K43 (D6,F6)", "x":3.25, "y":4.5},
-                {"label":"K44 (D6,F5)", "x":4.25, "y":4.5},
-                {"label":"K45 (D6,D5)", "x":5.25, "y":4.5},
-                {"label":"K46 (D6,D3)", "x":6.25, "y":4.5},
-                {"label":"K47 (D6,D2)", "x":7.25, "y":4.5},
-                {"label":"K48 (D6,C7)", "x":8.25, "y":4.5},
-                {"label":"K49 (D6,C6)", "x":9.25, "y":4.5},
-                {"label":"K4A (D6,B5)", "x":10.25, "y":4.5},
-                {"label":"K4B (D6,F4)", "x":11.25, "y":4.5},
-                {"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":1.75},
-                {"label":"K4D (D6,B4)", "x":14, "y":4.5},
-                {"label":"K4E (D6,B0)", "x":16.25, "y":4.5},
-
-                {"label":"K50 (D7,D1)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K51 (D7,D0)", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K52 (D7,F7)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K53 (D7,F6)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K54 (D7,F5)", "x":10, "y":5.5, "w":1.25},
-                {"label":"K55 (D7,D5)", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"K56 (D7,D3)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"K57 (D7,D2)", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"K58 (D7,C7)", "x":15.25, "y":5.5},
-                {"label":"K59 (D7,C6)", "x":16.25, "y":5.5},
-                {"label":"K5A (D7,B5)", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [3, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+
+                {"matrix": [5, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [5, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5, "w": 1.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
-
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5},
-                {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"x": 0, "y": 4.5, "w": 1.25},
-                {"x": 1.25, "y": 4.5},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
-                {"x": 16.25, "y": 4.5},
-
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [3, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [5, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [5, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/poker87d/poker87d.c b/keyboards/poker87d/poker87d.c
deleted file mode 100644
index 8faf286cff..0000000000
--- a/keyboards/poker87d/poker87d.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021  water <mfkiiyd@163.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "poker87d.h"
-
-
diff --git a/keyboards/poker87d/poker87d.h b/keyboards/poker87d/poker87d.h
deleted file mode 100644
index 8ea11b0127..0000000000
--- a/keyboards/poker87d/poker87d.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2021  water <mfkiiyd@163.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0D, K0E, K3D,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,  K5B, K5C, K3E,  \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          K2E, K5D, K5E,  \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D,   K3C,                  \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,     K4D,       K4E,       \
-    K50,  K51,  K52,              K53,                K54,  K55,  K56,  K57,    K58, K59, K5A   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E   }, \
-}
-
-#define LAYOUT_tkl_iso( \
-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0D, K0E, K3D,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E,  K5B, K5C, K3E,  \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          K2E, K5D, K5E,  \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D,   K3C,                  \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,          K4C,       K4E,       \
-    K50,  K51,  K52,              K53,                K54,  K55,  K56,  K57,    K58, K59, K5A   \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \
-}
diff --git a/keyboards/polilla/info.json b/keyboards/polilla/info.json
index 7bae2abb0d..3c04775b36 100644
--- a/keyboards/polilla/info.json
+++ b/keyboards/polilla/info.json
@@ -1,321 +1,93 @@
 {
-  "keyboard_name": "Polilla",
-  "manufacturer": "elagil",
-  "url": "",
-  "maintainer": "elagil",
-  "usb": {
-    "vid": "0x6166",
-    "pid": "0x0010",
-    "device_version": "0.0.1"
-  },
-  "processor": "STM32F042",
-  "bootloader": "stm32-dfu",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {
-          "label": "0,0",
-          "x": 0.5,
-          "y": 0.5
-        },
-        {
-          "label": "0,1",
-          "x": 1.5,
-          "y": 0.5
-        },
-        {
-          "label": "0,2",
-          "x": 2.5,
-          "y": 0.375
-        },
-        {
-          "label": "0,3",
-          "x": 3.5,
-          "y": 0.25
-        },
-        {
-          "label": "0,4",
-          "x": 4.5,
-          "y": 0.25
-        },
-        {
-          "label": "0,5",
-          "x": 5.5,
-          "y": 0.25
-        },
-        {
-          "label": "0,6",
-          "x": 10,
-          "y": 0.25
-        },
-        {
-          "label": "0,7",
-          "x": 11,
-          "y": 0.25
-        },
-        {
-          "label": "0,8",
-          "x": 12,
-          "y": 0.25
-        },
-        {
-          "label": "0,9",
-          "x": 13,
-          "y": 0.375
-        },
-        {
-          "label": "0,10",
-          "x": 14,
-          "y": 0.5
-        },
-        {
-          "label": "0,11",
-          "x": 15,
-          "y": 0.5
-        },
-        {
-          "label": "1,0",
-          "x": 0.5,
-          "y": 1.5
-        },
-        {
-          "label": "1,1",
-          "x": 1.5,
-          "y": 1.5
-        },
-        {
-          "label": "1,2",
-          "x": 2.5,
-          "y": 1.375
-        },
-        {
-          "label": "1,3",
-          "x": 3.5,
-          "y": 1.25
-        },
-        {
-          "label": "1,4",
-          "x": 4.5,
-          "y": 1.25
-        },
-        {
-          "label": "1,5",
-          "x": 5.5,
-          "y": 1.25
-        },
-        {
-          "label": "1,6",
-          "x": 10,
-          "y": 1.25
-        },
-        {
-          "label": "1,7",
-          "x": 11,
-          "y": 1.25
-        },
-        {
-          "label": "1,8",
-          "x": 12,
-          "y": 1.25
-        },
-        {
-          "label": "1,9",
-          "x": 13,
-          "y": 1.375
-        },
-        {
-          "label": "1,10",
-          "x": 14,
-          "y": 1.5
-        },
-        {
-          "label": "1,11",
-          "x": 15,
-          "y": 1.5
-        },
-        {
-          "label": "2,0",
-          "x": 0.5,
-          "y": 2.5
-        },
-        {
-          "label": "2,1",
-          "x": 1.5,
-          "y": 2.5
-        },
-        {
-          "label": "2,2",
-          "x": 2.5,
-          "y": 2.375
-        },
-        {
-          "label": "2,3",
-          "x": 3.5,
-          "y": 2.25
-        },
-        {
-          "label": "2,4",
-          "x": 4.5,
-          "y": 2.25
-        },
-        {
-          "label": "2,5",
-          "x": 5.5,
-          "y": 2.25
-        },
-        {
-          "label": "2,6",
-          "x": 10,
-          "y": 2.25
-        },
-        {
-          "label": "2,7",
-          "x": 11,
-          "y": 2.25
-        },
-        {
-          "label": "2,8",
-          "x": 12,
-          "y": 2.25
-        },
-        {
-          "label": "2,9",
-          "x": 13,
-          "y": 2.375
-        },
-        {
-          "label": "2,10",
-          "x": 14,
-          "y": 2.5
-        },
-        {
-          "label": "2,11",
-          "x": 15,
-          "y": 2.5
-        },
-        {
-          "label": "3,0",
-          "x": 0.5,
-          "y": 3.5
-        },
-        {
-          "label": "3,1",
-          "x": 1.5,
-          "y": 3.5
-        },
-        {
-          "label": "3,2",
-          "x": 2.5,
-          "y": 3.375
-        },
-        {
-          "label": "3,3",
-          "x": 3.5,
-          "y": 3.25
-        },
-        {
-          "label": "3,4",
-          "x": 4.5,
-          "y": 3.25
-        },
-        {
-          "label": "3,5",
-          "x": 5.5,
-          "y": 3.25
-        },
-        {
-          "label": "3,6",
-          "x": 10,
-          "y": 3.25
-        },
-        {
-          "label": "3,7",
-          "x": 11,
-          "y": 3.25
-        },
-        {
-          "label": "3,8",
-          "x": 12,
-          "y": 3.25
-        },
-        {
-          "label": "3,9",
-          "x": 13,
-          "y": 3.375
-        },
-        {
-          "label": "3,10",
-          "x": 14,
-          "y": 3.5
-        },
-        {
-          "label": "3,11",
-          "x": 15,
-          "y": 3.5
-        },
-        {
-          "label": "4,0",
-          "x": 2.5,
-          "y": 4.375
-        },
-        {
-          "label": "4,1",
-          "x": 3.5,
-          "y": 4.25
-        },
-        {
-          "label": "4,2",
-          "x": 4.5,
-          "y": 4.25
-        },
-        {
-          "label": "4,3",
-          "x": 5.5,
-          "y": 4.25
-        },
-        {
-          "label": "4,4",
-          "x": 6.5,
-          "y": 4,
-          "h": 1.5
-        },
-        {
-          "label": "4,5",
-          "x": 6.5,
-          "y": 3
-        },
-        {
-          "label": "4,6",
-          "x": 9,
-          "y": 3
-        },
-        {
-          "label": "4,7",
-          "x": 9,
-          "y": 4,
-          "h": 1.5
-        },
-        {
-          "label": "4,8",
-          "x": 10,
-          "y": 4.25
-        },
-        {
-          "label": "4,9",
-          "x": 11,
-          "y": 4.25
-        },
-        {
-          "label": "4,10",
-          "x": 12,
-          "y": 4.25
-        },
-        {
-          "label": "4,11",
-          "x": 13,
-          "y": 4.375
+    "keyboard_name": "Polilla",
+    "manufacturer": "elagil",
+    "url": "",
+    "maintainer": "elagil",
+    "usb": {
+        "vid": "0x6166",
+        "pid": "0x0010",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "F0", "B7", "B6", "B5", "B4", "B3"],
+        "rows": ["B1", "B0", "A7", "F1", "A0"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "STM32F042",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0.25},
+                {"x": 1, "y": 0.25},
+                {"x": 2, "y": 0.125},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 9.5, "y": 0},
+                {"x": 10.5, "y": 0},
+                {"x": 11.5, "y": 0},
+                {"x": 12.5, "y": 0.125},
+                {"x": 13.5, "y": 0.25},
+                {"x": 14.5, "y": 0.25},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.125},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1.125},
+                {"x": 13.5, "y": 1.25},
+                {"x": 14.5, "y": 1.25},
+
+                {"x": 0, "y": 2.25},
+                {"x": 1, "y": 2.25},
+                {"x": 2, "y": 2.125},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+
+                {"x": 9.5, "y": 2},
+                {"x": 10.5, "y": 2},
+                {"x": 11.5, "y": 2},
+                {"x": 12.5, "y": 2.125},
+                {"x": 13.5, "y": 2.25},
+                {"x": 14.5, "y": 2.25},
+
+                {"x": 0, "y": 3.25},
+                {"x": 1, "y": 3.25},
+                {"x": 2, "y": 3.125},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+
+                {"x": 9.5, "y": 3},
+                {"x": 10.5, "y": 3},
+                {"x": 11.5, "y": 3},
+                {"x": 12.5, "y": 3.125},
+                {"x": 13.5, "y": 3.25},
+                {"x": 14.5, "y": 3.25},
+
+                {"x": 2, "y": 4.125},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+                {"x": 6, "y": 3.75, "h": 1.5},
+                {"x": 6, "y": 2.75},
+
+                {"x": 8.5, "y": 2.75},
+                {"x": 8.5, "y": 3.75, "h": 1.5},
+                {"x": 9.5, "y": 4},
+                {"x": 10.5, "y": 4},
+                {"x": 11.5, "y": 4},
+                {"x": 12.5, "y": 4.125}
+            ]
         }
-      ]
     }
-  }
 }
diff --git a/keyboards/polilla/polilla.c b/keyboards/polilla/polilla.c
deleted file mode 100644
index b8bfba2d9e..0000000000
--- a/keyboards/polilla/polilla.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 elagil
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "polilla.h"
\ No newline at end of file
diff --git a/keyboards/polilla/rev1/config.h b/keyboards/polilla/rev1/config.h
index e53b6d28d1..3b3b9b0fb7 100644
--- a/keyboards/polilla/rev1/config.h
+++ b/keyboards/polilla/rev1/config.h
@@ -19,23 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B0, A7, F1, A0 }
-#define MATRIX_COL_PINS { A6, A5, A4, A3, A2, A1, F0, B7, B6, B5, B4, B3 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/polycarbdiet/s20/config.h b/keyboards/polycarbdiet/s20/config.h
index 6cb2e62308..e61b67307f 100644
--- a/keyboards/polycarbdiet/s20/config.h
+++ b/keyboards/polycarbdiet/s20/config.h
@@ -16,15 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-//                         1   2   3   4   5
-#define MATRIX_ROW_PINS { B7, E6, D0, D1, D5 }
-#define MATRIX_COL_PINS { C6, C7, D4, D6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN B3
 #define RGBLED_NUM 4
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/info.json
index 5c2ce53150..19b1a71864 100644
--- a/keyboards/polycarbdiet/s20/info.json
+++ b/keyboards/polycarbdiet/s20/info.json
@@ -8,91 +8,100 @@
         "pid": "0x7320",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "D4", "D6"],
+        "rows": ["B7", "E6", "D0", "D1", "D5"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x4", "numpad_5x4"],
     "layouts": {
         "LAYOUT_ortho_5x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
             ]
         },
         "LAYOUT_numpad_5x4":{
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "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},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"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},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":1, "h":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"x":0, "y":4, "w":2},
-                {"x":2, "y":4},
-                {"x":3, "y":3, "h":2}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         },
         "LAYOUT_enter": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4}
             ]
         }
     }
diff --git a/keyboards/polycarbdiet/s20/s20.c b/keyboards/polycarbdiet/s20/s20.c
deleted file mode 100644
index f7b3fa9036..0000000000
--- a/keyboards/polycarbdiet/s20/s20.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Muhammad Galib (polycarbdiet) <pd.keyboards@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "s20.h"
diff --git a/keyboards/polycarbdiet/s20/s20.h b/keyboards/polycarbdiet/s20/s20.h
deleted file mode 100644
index 0e3eec12e0..0000000000
--- a/keyboards/polycarbdiet/s20/s20.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2020 Muhammad Galib (polycarbdiet) <pd.keyboards@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4(   \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43  \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, K33 }, \
-    { K40, K41, K42, K43 }  \
-}
-
-#define LAYOUT_numpad_5x4(   \
-    K00, K01, K02, K03,  \
-    K10, K11, K12,       \
-    K20, K21, K22, K13,  \
-    K30, K31, K32,       \
-    K40,    K42,   K33   \
-) { \
-    { K00, K01,   K02, K03   }, \
-    { K10, K11,   K12, K13   }, \
-    { K20, K21,   K22, KC_NO }, \
-    { K30, K31,   K32, K33   }, \
-    { K40, KC_NO, K42, KC_NO }  \
-}
-
-#define LAYOUT_enter(    \
-    K00, K01, K02, K03,  \
-    K10, K11, K12, K13,  \
-    K20, K21, K22, K23,  \
-    K30, K31, K32, K33,  \
-    K40, K41, K42        \
-) { \
-    { K00, K01, K02, K03   },  \
-    { K10, K11, K12, K13   },  \
-    { K20, K21, K22, K23   },  \
-    { K30, K31, K32, K33   },  \
-    { K40, K41, K42, KC_NO }   \
-}
diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h
index e59d45ca45..4c85d73c7a 100644
--- a/keyboards/pom_keyboards/tnln95/config.h
+++ b/keyboards/pom_keyboards/tnln95/config.h
@@ -16,31 +16,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6, B4, B0, D7, E6, D4, F5, D6, C6, B5 }
-#define MATRIX_COL_PINS { F4, F1, F0, F6, F7, D0, D1, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* RGB Configs */
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 14
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -61,4 +42,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //    #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 //    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 225 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 //    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
-#endif
diff --git a/keyboards/pom_keyboards/tnln95/info.json b/keyboards/pom_keyboards/tnln95/info.json
index ea829767ba..22b115fb8f 100644
--- a/keyboards/pom_keyboards/tnln95/info.json
+++ b/keyboards/pom_keyboards/tnln95/info.json
@@ -8,11 +8,19 @@
         "pid": "0x3931",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "F6", "F7", "D0", "D1", "D2", "D3", "D5"],
+        "rows": ["B6", "B4", "B0", "D7", "E6", "D4", "F5", "D6", "C6", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B7",
         "levels": 10,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "bootmagic": {
         "matrix": [0, 4]
     },
diff --git a/keyboards/portal_66/hotswap/config.h b/keyboards/portal_66/hotswap/config.h
index 049325aeab..4dfd5e1d02 100644
--- a/keyboards/portal_66/hotswap/config.h
+++ b/keyboards/portal_66/hotswap/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/portal_66/hotswap/hotswap.c b/keyboards/portal_66/hotswap/hotswap.c
deleted file mode 100644
index 4189a8a80c..0000000000
--- a/keyboards/portal_66/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Matthew Dias
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hotswap.h"
diff --git a/keyboards/portal_66/hotswap/hotswap.h b/keyboards/portal_66/hotswap/hotswap.h
deleted file mode 100644
index 484594b9cb..0000000000
--- a/keyboards/portal_66/hotswap/hotswap.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 Matthew Dias
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │0F │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │49  │4B  │ │4C │4D │4F │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                k49, k4B,      k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
diff --git a/keyboards/portal_66/hotswap/info.json b/keyboards/portal_66/hotswap/info.json
index 3951d86e3f..2d4bbb9b16 100644
--- a/keyboards/portal_66/hotswap/info.json
+++ b/keyboards/portal_66/hotswap/info.json
@@ -7,6 +7,11 @@
         "pid": "0x5067",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -16,77 +21,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4, "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/portal_66/soldered/config.h b/keyboards/portal_66/soldered/config.h
index 049325aeab..4dfd5e1d02 100644
--- a/keyboards/portal_66/soldered/config.h
+++ b/keyboards/portal_66/soldered/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/portal_66/soldered/info.json b/keyboards/portal_66/soldered/info.json
index 3e7955e193..8905751329 100644
--- a/keyboards/portal_66/soldered/info.json
+++ b/keyboards/portal_66/soldered/info.json
@@ -7,6 +7,11 @@
         "pid": "0x5066",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -19,457 +24,457 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4,  "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4,  "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":13.5, "y":1, "w":1.5 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2, "w":2.25 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":2.25 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.5 },
-                { "x":1.5, "y":4, "w":1 },
-                { "x":2.5, "y":4, "w":1.5 },
-                { "x":4, "y":4, "w":7 },
-                { "x":11, "y":4,  "w":1.5 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2 },
-                { "x":13.75, "y":1, "w":1.25, "h":2 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":1.25 },
-                { "x":1.25, "y":3 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4,  "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0, "w": 2 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2 },
-                { "x":13.75, "y":1, "w":1.25, "h":2 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":1.25 },
-                { "x":1.25, "y":3 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.25 },
-                { "x":1.25, "y":4, "w":1.25 },
-                { "x":2.5, "y":4, "w":1.25 },
-                { "x":3.75, "y":4, "w":6.25 },
-                { "x":10, "y":4, "w":1.25 },
-                { "x":11.25, "y":4,  "w":1.25 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan_split_bs": {
             "layout": [
-                { "x":0, "y":0 },
-                { "x":1, "y":0 },
-                { "x":2, "y":0 },
-                { "x":3, "y":0 },
-                { "x":4, "y":0 },
-                { "x":5, "y":0 },
-                { "x":6, "y":0 },
-                { "x":7, "y":0 },
-                { "x":8, "y":0 },
-                { "x":9, "y":0 },
-                { "x":10, "y":0 },
-                { "x":11, "y":0 },
-                { "x":12, "y":0 },
-                { "x":13, "y":0 },
-                { "x":14, "y":0 },
-                { "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "x":0, "y":1, "w":1.5 },
-                { "x":1.5, "y":1 },
-                { "x":2.5, "y":1 },
-                { "x":3.5, "y":1 },
-                { "x":4.5, "y":1 },
-                { "x":5.5, "y":1 },
-                { "x":6.5, "y":1 },
-                { "x":7.5, "y":1 },
-                { "x":8.5, "y":1 },
-                { "x":9.5, "y":1 },
-                { "x":10.5, "y":1 },
-                { "x":11.5, "y":1 },
-                { "x":12.5, "y":1 },
-                { "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "x":0, "y":2, "w":1.75 },
-                { "x":1.75, "y":2 },
-                { "x":2.75, "y":2 },
-                { "x":3.75, "y":2 },
-                { "x":4.75, "y":2 },
-                { "x":5.75, "y":2 },
-                { "x":6.75, "y":2 },
-                { "x":7.75, "y":2 },
-                { "x":8.75, "y":2 },
-                { "x":9.75, "y":2 },
-                { "x":10.75, "y":2 },
-                { "x":11.75, "y":2 },
-                { "x":12.75, "y":2 },
-                { "x":13.75, "y":1, "w":1.25, "h":2 },
-                { "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "x":0, "y":3, "w":1.25 },
-                { "x":1.25, "y":3 },
-                { "x":2.25, "y":3 },
-                { "x":3.25, "y":3 },
-                { "x":4.25, "y":3 },
-                { "x":5.25, "y":3 },
-                { "x":6.25, "y":3 },
-                { "x":7.25, "y":3 },
-                { "x":8.25, "y":3 },
-                { "x":9.25, "y":3 },
-                { "x":10.25, "y":3 },
-                { "x":11.25, "y":3 },
-                { "x":12.25, "y":3, "w":1.75 },
-                { "x":14, "y":3 },
-                { "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "x":0, "y":4, "w":1.5 },
-                { "x":1.5, "y":4, "w":1 },
-                { "x":2.5, "y":4, "w":1.5 },
-                { "x":4, "y":4, "w":7 },
-                { "x":11, "y":4,  "w":1.5 },
-                { "x":13, "y":4 },
-                { "x":14, "y":4 },
-                { "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/portal_66/soldered/soldered.c b/keyboards/portal_66/soldered/soldered.c
deleted file mode 100644
index a74cd21dea..0000000000
--- a/keyboards/portal_66/soldered/soldered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Matthew Dias
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "soldered.h"
diff --git a/keyboards/portal_66/soldered/soldered.h b/keyboards/portal_66/soldered/soldered.h
deleted file mode 100644
index b2ae9cbaac..0000000000
--- a/keyboards/portal_66/soldered/soldered.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright 2021 Matthew Dias
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0E     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │      │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�2D  │ ISO Enter
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │   │2C │    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │49  │4B  │ │4C │4D │4F │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────�
- * │40   │41 │42   │46                         │4B   │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                          k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
-    k40, k41, k42,                k46,                          k4B, k4C, k4D, k4F  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D, XXX, k4F }  \
-}
diff --git a/keyboards/pos78/config.h b/keyboards/pos78/config.h
index 25070624db..4739dcb2ad 100644
--- a/keyboards/pos78/config.h
+++ b/keyboards/pos78/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B2, B1, D2, D3, D1, D0, C6, E6, B5, B6, B7, D6, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/pos78/info.json b/keyboards/pos78/info.json
index 6e8788300f..f7f56a46de 100644
--- a/keyboards/pos78/info.json
+++ b/keyboards/pos78/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7878",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "D2", "D3", "D1", "D0", "C6", "E6", "B5", "B6", "B7", "D6", "C7"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "D4",
         "num_lock": "D2"
@@ -17,12 +22,89 @@
     "layouts": {
         "LAYOUT_ortho_6x13": {
             "layout": [
-				{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0},
-				{"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1},
-				{"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2},
-				{"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3},
-				{"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4},
-				{"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":5}, {"x":4, "y":5}, {"x":5, "y":5}, {"x":6, "y":5}, {"x":7, "y":5}, {"x":8, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":11, "y":5}, {"x":12, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [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": [5, 9], "x": 9, "y": 5},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5}
             ]
         }
     }
diff --git a/keyboards/pos78/pos78.c b/keyboards/pos78/pos78.c
deleted file mode 100644
index f2e98aba0f..0000000000
--- a/keyboards/pos78/pos78.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 smssmssms
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pos78.h"
diff --git a/keyboards/pos78/pos78.h b/keyboards/pos78/pos78.h
deleted file mode 100644
index 2d5681addd..0000000000
--- a/keyboards/pos78/pos78.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 smssmssms
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_6x13( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \
-    k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, \
-    k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, \
-    k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, \
-    k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, \
-    k65, k66, k67, k68, k69, k70, k71, k72, k73, k74, k75, k76, k77  \
-) { \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12}, \
-    {k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25}, \
-    {k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38}, \
-    {k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51}, \
-    {k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64}, \
-    {k65, k66, k67, k68, k69, k70, k71, k72, k73, k74, k75, k76, k77}  \
-}
diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h
index c3a49487ef..5301e26ab3 100644
--- a/keyboards/preonic/config.h
+++ b/keyboards/preonic/config.h
@@ -17,17 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-
 #define AUDIO_VOICES
 #define AUDIO_PIN C6
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/preonic/info.json b/keyboards/preonic/info.json
index 76571d7ce8..8b58bc260c 100644
--- a/keyboards/preonic/info.json
+++ b/keyboards/preonic/info.json
@@ -1,141 +1,4 @@
 {
     "url": "https://olkb.com/preonic",
-    "maintainer": "jackhumbert",
-    "layouts": {
-        "LAYOUT_preonic_1x2uC": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4, "w": 2},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
-            ]
-        },
-        "LAYOUT_ortho_5x12": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
-            ]
-        }
-    }
+    "maintainer": "jackhumbert"
 }
diff --git a/keyboards/preonic/keymaps/blake-newman/rules.mk b/keyboards/preonic/keymaps/blake-newman/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/blake-newman/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/boy314/rules.mk b/keyboards/preonic/keymaps/boy314/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/boy314/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/egstad/config.h b/keyboards/preonic/keymaps/egstad/config.h
index 4f4fbfe05c..16a4c267e5 100644
--- a/keyboards/preonic/keymaps/egstad/config.h
+++ b/keyboards/preonic/keymaps/egstad/config.h
@@ -1,6 +1,5 @@
 #pragma once
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 
 
diff --git a/keyboards/preonic/keymaps/ekis_isa/rules.mk b/keyboards/preonic/keymaps/ekis_isa/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/ekis_isa/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/fig-r/rules.mk b/keyboards/preonic/keymaps/fig-r/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/fig-r/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/laurentlaurent/config.h b/keyboards/preonic/keymaps/laurentlaurent/config.h
index 2c1b1a7059..20ce699a19 100644
--- a/keyboards/preonic/keymaps/laurentlaurent/config.h
+++ b/keyboards/preonic/keymaps/laurentlaurent/config.h
@@ -33,6 +33,4 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 2
 
-// Fix Home Row mod keys
-#define IGNORE_MOD_TAP_INTERRUPT
-//#define RETRO_TAPPING
\ No newline at end of file
+//#define RETRO_TAPPING
diff --git a/keyboards/preonic/keymaps/nikchi/rules.mk b/keyboards/preonic/keymaps/nikchi/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/nikchi/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/pitty/rules.mk b/keyboards/preonic/keymaps/pitty/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/pitty/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/seph/config.h b/keyboards/preonic/keymaps/seph/config.h
index 0267852335..18812886f7 100644
--- a/keyboards/preonic/keymaps/seph/config.h
+++ b/keyboards/preonic/keymaps/seph/config.h
@@ -7,8 +7,8 @@
 #define BACKLIGHT_LEVELS 8
 
 /* ws2812 RGB LED */
-#undef RGB_DI_PIN
-#define RGB_DI_PIN B3
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN B3
 #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/preonic/keymaps/smt/rules.mk b/keyboards/preonic/keymaps/smt/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/smt/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/preonic.c b/keyboards/preonic/preonic.c
index 2b56805202..fd2fbd8c77 100644
--- a/keyboards/preonic/preonic.c
+++ b/keyboards/preonic/preonic.c
@@ -1,4 +1,5 @@
-#include "preonic.h"
+#include "quantum.h"
+#include QMK_KEYBOARD_H
 
 const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_preonic_grid(
   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
diff --git a/keyboards/preonic/preonic.h b/keyboards/preonic/preonic.h
deleted file mode 100644
index 6b10a425ab..0000000000
--- a/keyboards/preonic/preonic.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/**************************************************
-** Include headers specific to keyboard revision **
-**************************************************/
-#if defined(KEYBOARD_preonic_rev1)
-#    include "rev1.h"
-#elif defined(KEYBOARD_preonic_rev2)
-#    include "rev2.h"
-#elif defined(KEYBOARD_preonic_rev3)
-#    include "rev3.h"
-#elif defined(KEYBOARD_preonic_rev3_drop)
-#    include "rev3_drop.h"
-#endif
-
-
-/**************************************************
-** Layout macros aliases common to all revisions **
-**                                               **
-**      Name of Alias     Matrix Name:           **
-******* ----------------- ------------------- ****/
-#define LAYOUT_preonic_grid LAYOUT_ortho_5x12
diff --git a/keyboards/preonic/rev1/info.json b/keyboards/preonic/rev1/info.json
index 340c178635..e25c41d9b0 100644
--- a/keyboards/preonic/rev1/info.json
+++ b/keyboards/preonic/rev1/info.json
@@ -6,10 +6,155 @@
         "pid": "0x67F3",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+        "rows": ["D2", "D5", "B5", "B6", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "community_layouts": ["ortho_5x12"]
+    "community_layouts": ["ortho_5x12"],
+    "layout_aliases": {
+        "LAYOUT_preonic_grid": "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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_preonic_1x2uC": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/preonic/rev1/rev1.c b/keyboards/preonic/rev1/rev1.c
index bf83743605..2d56f037f4 100644
--- a/keyboards/preonic/rev1/rev1.c
+++ b/keyboards/preonic/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev1.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
 
diff --git a/keyboards/preonic/rev1/rev1.h b/keyboards/preonic/rev1/rev1.h
deleted file mode 100644
index 003bb5cee0..0000000000
--- a/keyboards/preonic/rev1/rev1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "preonic.h"
-
-#define LAYOUT_preonic_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
-}
-
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
-}
diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/info.json
index 3da1615c2d..8f644f8f6c 100644
--- a/keyboards/preonic/rev2/info.json
+++ b/keyboards/preonic/rev2/info.json
@@ -6,6 +6,11 @@
         "pid": "0x67F3",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+        "rows": ["D2", "D5", "B5", "B6", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
@@ -17,5 +22,145 @@
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
-    "community_layouts": ["ortho_5x12"]
+    "community_layouts": ["ortho_5x12"],
+    "layout_aliases": {
+        "LAYOUT_preonic_grid": "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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_preonic_1x2uC": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/preonic/rev2/rev2.c b/keyboards/preonic/rev2/rev2.c
index a3929249d0..2d56f037f4 100644
--- a/keyboards/preonic/rev2/rev2.c
+++ b/keyboards/preonic/rev2/rev2.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev2.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
 
diff --git a/keyboards/preonic/rev2/rev2.h b/keyboards/preonic/rev2/rev2.h
deleted file mode 100644
index 003bb5cee0..0000000000
--- a/keyboards/preonic/rev2/rev2.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "preonic.h"
-
-#define LAYOUT_preonic_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
-}
-
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
-}
diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h
index 2269aef97f..2f55894ae6 100644
--- a/keyboards/preonic/rev3/config.h
+++ b/keyboards/preonic/rev3/config.h
@@ -17,11 +17,6 @@
 
 #pragma once
 
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2, A3, A6 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 }
-
 #define DIP_SWITCH_PINS { B14, A15, A0, B9 }
 
 #define MUSIC_MAP
@@ -50,7 +45,6 @@
 /*
  * WS2812 Underglow Matrix options
  */
-#define RGB_DI_PIN A1
 #define RGBLED_NUM 9
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json
index cc3b944471..d6d494e005 100644
--- a/keyboards/preonic/rev3/info.json
+++ b/keyboards/preonic/rev3/info.json
@@ -6,6 +6,18 @@
         "pid": "0xA649",
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+        "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B12", "pin_b": "B13"}
@@ -15,340 +27,343 @@
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
     "community_layouts": ["ortho_5x12"],
+    "layout_aliases": {
+        "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
+    },
     "layouts": {
         "LAYOUT_preonic_1x2uC": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4, "w": 2},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 5], "x": 5, "y": 4, "w": 2},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_preonic_1x2uR": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4, "w": 2},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 5], "x": 5, "y": 4},
+                {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_preonic_1x2uL": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4, "w": 2},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4, "w": 2},
+                {"matrix": [9, 0], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_preonic_2x2u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                 {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4, "w": 2},
-                {"x": 6, "y": 4, "w": 2},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4, "w": 2},
+                {"matrix": [9, 0], "x": 6, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 5], "x": 5, "y": 4},
+                {"matrix": [9, 0], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/preonic/rev3/rev3.c b/keyboards/preonic/rev3/rev3.c
index 4739a1d2d8..5cca62521c 100644
--- a/keyboards/preonic/rev3/rev3.c
+++ b/keyboards/preonic/rev3/rev3.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev3.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/preonic/rev3/rev3.h b/keyboards/preonic/rev3/rev3.h
deleted file mode 100644
index e6462d5b75..0000000000
--- a/keyboards/preonic/rev3/rev3.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "preonic.h"
-
-#define LAYOUT_preonic_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k49, k4a, k4b }, \
-    { k45, k47, k48, k43, k44, k45 } \
-}
-
-#define LAYOUT_preonic_1x2uR( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45,   k47,    k48, k49, k4a, k4b \
-  ) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k49, k4a, k4b }, \
-    { k47, k47, k48, k43, k44, k45 } \
-}
-
-#define LAYOUT_preonic_1x2uL( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43,   k44,    k46, k47, k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k49, k4a, k4b }, \
-    { k46, k47, k48, k43, k44, k44 } \
-}
-
-#define LAYOUT_preonic_2x2u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43,   k44,      k46,    k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k49, k4a, k4b }, \
-    { k46, k46, k48, k43, k44, k44 } \
-}
-
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k49, k4a, k4b }, \
-    { k46, k47, k48, k43, k44, k45 } \
-}
diff --git a/keyboards/preonic/rev3/rules.mk b/keyboards/preonic/rev3/rules.mk
index e4c6852526..6836d19541 100644
--- a/keyboards/preonic/rev3/rules.mk
+++ b/keyboards/preonic/rev3/rules.mk
@@ -10,11 +10,9 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes           # Audio output
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
-WS2812_DRIVER = pwm
 
 # Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h
index 4d1bfe67b9..ac584dfbfe 100644
--- a/keyboards/preonic/rev3_drop/config.h
+++ b/keyboards/preonic/rev3_drop/config.h
@@ -17,11 +17,6 @@
 
 #pragma once
 
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-#define MATRIX_ROW_PINS { A10, A9, A8, B15, C13, C14, C15, A2, A3, A6 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, A7, B0 }
-
 #define DIP_SWITCH_PINS { B14, A15, A0, B9 }
 
 #define MUSIC_MAP
@@ -50,7 +45,6 @@
 /*
  * WS2812 Underglow Matrix options
  */
-#define RGB_DI_PIN A1
 #define RGBLED_NUM 9
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json
index 3f32a10b36..a3eac4eaf4 100644
--- a/keyboards/preonic/rev3_drop/info.json
+++ b/keyboards/preonic/rev3_drop/info.json
@@ -6,6 +6,18 @@
         "pid": "0xA649",
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+        "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B12", "pin_b": "B13"}
@@ -14,340 +26,343 @@
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "community_layouts": ["ortho_5x12"],
+    "layout_aliases": {
+        "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
+    },
     "layouts": {
         "LAYOUT_preonic_1x2uC": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4, "w": 2},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 5], "x": 5, "y": 4, "w": 2},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_preonic_1x2uR": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4, "w": 2},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 5], "x": 5, "y": 4},
+                {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_preonic_1x2uL": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4, "w": 2},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [9, 0], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_preonic_2x2u": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4, "w": 2},
-                {"x": 6, "y": 4, "w": 2},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [9, 0], "x": 6, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x12": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 5], "x": 5, "y": 4},
+                {"matrix": [9, 0], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
             ]
         }
     }
diff --git a/keyboards/preonic/rev3_drop/rev3_drop.c b/keyboards/preonic/rev3_drop/rev3_drop.c
index 279f367876..5cca62521c 100644
--- a/keyboards/preonic/rev3_drop/rev3_drop.c
+++ b/keyboards/preonic/rev3_drop/rev3_drop.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev3_drop.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/preonic/rev3_drop/rev3_drop.h b/keyboards/preonic/rev3_drop/rev3_drop.h
deleted file mode 100644
index 3cb9368757..0000000000
--- a/keyboards/preonic/rev3_drop/rev3_drop.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "preonic.h"
-
-// clang-format off
-#define LAYOUT_preonic_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k49, k4a, k4b }, \
-    { k45, k47, k48, k43, k44, k45 } \
-}
-
-#define LAYOUT_preonic_1x2uR( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45,   k47,    k48, k49, k4a, k4b \
-  ) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k49, k4a, k4b }, \
-    { k47, k47, k48, k43, k44, k45 } \
-}
-
-#define LAYOUT_preonic_1x2uL( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43,   k44,    k46, k47, k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k49, k4a, k4b }, \
-    { k46, k47, k48, k43, k44, k44 } \
-}
-
-#define LAYOUT_preonic_2x2u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43,   k44,      k46,    k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k49, k4a, k4b }, \
-    { k46, k46, k48, k43, k44, k44 } \
-}
-
-#define LAYOUT_ortho_5x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k39, k3a, k3b }, \
-    { k40, k41, k42, k49, k4a, k4b }, \
-    { k46, k47, k48, k43, k44, k45 } \
-}
diff --git a/keyboards/preonic/rev3_drop/rules.mk b/keyboards/preonic/rev3_drop/rules.mk
index e3f9e52110..d3ff068813 100644
--- a/keyboards/preonic/rev3_drop/rules.mk
+++ b/keyboards/preonic/rev3_drop/rules.mk
@@ -10,13 +10,11 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
-WS2812_DRIVER = pwm
 CUSTOM_MATRIX = yes
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
 
 # Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 
 SRC += matrix.c
diff --git a/keyboards/primekb/meridian/config.h b/keyboards/primekb/meridian/config.h
index 03379a660d..0633f8948e 100644
--- a/keyboards/primekb/meridian/config.h
+++ b/keyboards/primekb/meridian/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, B9, B8, B7, B6, B5, B4, B3, A15 }
-#define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 }
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 3
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/primekb/meridian/info.json b/keyboards/primekb/meridian/info.json
index ab16646490..e5192d6c49 100644
--- a/keyboards/primekb/meridian/info.json
+++ b/keyboards/primekb/meridian/info.json
@@ -8,14 +8,167 @@
         "pid": "0x004D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["A6", "A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_unified_bs_rshift": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0, "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": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "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.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "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": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25}
+            ]
         },
         "LAYOUT_split_bs_rshift": {
-            "layout":[{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Del", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.75}, {"label":"Fn", "x":15.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+
+                {"matrix": [2, 12], "x": 15.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "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.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/primekb/meridian/ktr1010/config.h b/keyboards/primekb/meridian/ktr1010/config.h
index e2e4e55992..e28306587d 100644
--- a/keyboards/primekb/meridian/ktr1010/config.h
+++ b/keyboards/primekb/meridian/ktr1010/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 3
 // Special timing definitions for KTR101
 #define WS2812_TIMING 1325
diff --git a/keyboards/primekb/meridian/ktr1010/info.json b/keyboards/primekb/meridian/ktr1010/info.json
new file mode 100644
index 0000000000..3a330b7306
--- /dev/null
+++ b/keyboards/primekb/meridian/ktr1010/info.json
@@ -0,0 +1,5 @@
+{
+    "ws2812": {
+        "pin": "B15"
+    }
+}
diff --git a/keyboards/primekb/meridian/ktr1010/rules.mk b/keyboards/primekb/meridian/ktr1010/rules.mk
index 1bc213906f..e69de29bb2 100644
--- a/keyboards/primekb/meridian/ktr1010/rules.mk
+++ b/keyboards/primekb/meridian/ktr1010/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = bitbang
diff --git a/keyboards/primekb/meridian/meridian.c b/keyboards/primekb/meridian/meridian.c
index 8d94faf9ea..c2f740dd14 100644
--- a/keyboards/primekb/meridian/meridian.c
+++ b/keyboards/primekb/meridian/meridian.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "meridian.h"
+#include "quantum.h"
 
 //Initialize B12 for in-switch caps lock
 void keyboard_pre_init_kb(void){
diff --git a/keyboards/primekb/meridian/meridian.h b/keyboards/primekb/meridian/meridian.h
deleted file mode 100644
index e6a155ddec..0000000000
--- a/keyboards/primekb/meridian/meridian.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright 2020 Holten Campbell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define K_NO KC_NO
-
-#define LAYOUT_unified_bs_rshift( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K312, \
-	K400, K401,             K402, K404,       K407, K409,                   K411, K412, K413  \
-) \
-{ \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K_NO, K213 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K_NO}, \
-	{ K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 }  \
-}
-
-#define LAYOUT_split_bs_rshift( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K312, K313, \
-	K400, K401,             K402, K404,       K407, K409,                   K411, K412, K413  \
-) \
-{ \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
-	{ K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 }  \
-}
diff --git a/keyboards/primekb/meridian/rules.mk b/keyboards/primekb/meridian/rules.mk
index ead22f6c15..8b14acaf19 100644
--- a/keyboards/primekb/meridian/rules.mk
+++ b/keyboards/primekb/meridian/rules.mk
@@ -13,3 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+DEFAULT_FOLDER = primekb/meridian/ktr1010
diff --git a/keyboards/primekb/meridian/ws2812/config.h b/keyboards/primekb/meridian/ws2812/config.h
index 92ac0a089f..0633f8948e 100644
--- a/keyboards/primekb/meridian/ws2812/config.h
+++ b/keyboards/primekb/meridian/ws2812/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 3
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/primekb/meridian/ws2812/info.json b/keyboards/primekb/meridian/ws2812/info.json
new file mode 100644
index 0000000000..9870232117
--- /dev/null
+++ b/keyboards/primekb/meridian/ws2812/info.json
@@ -0,0 +1,6 @@
+{
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    }
+}
diff --git a/keyboards/primekb/meridian/ws2812/rules.mk b/keyboards/primekb/meridian/ws2812/rules.mk
index c09c0d5fa4..e69de29bb2 100644
--- a/keyboards/primekb/meridian/ws2812/rules.mk
+++ b/keyboards/primekb/meridian/ws2812/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = spi
diff --git a/keyboards/primekb/meridian_rgb/config.h b/keyboards/primekb/meridian_rgb/config.h
index 58186b3e6d..ce5c51f120 100644
--- a/keyboards/primekb/meridian_rgb/config.h
+++ b/keyboards/primekb/meridian_rgb/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, F7, D4, B7, B3, D5, D3, D2, D1, D0 }
-#define MATRIX_ROW_PINS { E6, F0, F6, D7, D6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F1
 #define RGBLED_NUM 64
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/primekb/meridian_rgb/info.json b/keyboards/primekb/meridian_rgb/info.json
index c3dcca05e8..d3422ffec9 100644
--- a/keyboards/primekb/meridian_rgb/info.json
+++ b/keyboards/primekb/meridian_rgb/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0042",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "D4", "B7", "B3", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["E6", "F0", "F6", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B1",
         "num_lock": "B0",
         "scroll_lock": "B2"
     },
+    "ws2812": {
+        "pin": "F1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/primekb/meridian_rgb/meridian_rgb.c b/keyboards/primekb/meridian_rgb/meridian_rgb.c
deleted file mode 100644
index 95bb63a91b..0000000000
--- a/keyboards/primekb/meridian_rgb/meridian_rgb.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Holten Campbell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "meridian_rgb.h"
diff --git a/keyboards/primekb/prime_e/config.h b/keyboards/primekb/prime_e/config.h
index 4baa1963f2..e3e1572d99 100644
--- a/keyboards/primekb/prime_e/config.h
+++ b/keyboards/primekb/prime_e/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { E6, C7, B5, B4 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json
index 8046f233e9..51847d82a7 100644
--- a/keyboards/primekb/prime_e/info.json
+++ b/keyboards/primekb/prime_e/info.json
@@ -5,14 +5,19 @@
   "usb": {
     "vid": "0x5052"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+    "rows": ["E6", "C7", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
       "LAYOUT": {
-          "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":7,"y":0,"w":1,"h":1}, {"x":8,"y":0,"w":1,"h":1}, {"x":9,"y":0,"w":1,"h":1}, {"x":10,"y":0,"w":1,"h":1}, {"x":11,"y":0,"w":1,"h":1}, {"x":12,"y":0,"w":1,"h":1}, {"x":13,"y":0,"w":1,"h":1},
-					 {"x":0,"y":1,"w":1.25,"h":1}, {"x":1.25,"y":1,"w":1,"h":1}, {"x":2.25,"y":1,"w":1,"h":1}, {"x":3.25,"y":1,"w":1,"h":1}, {"x":4.25,"y":1,"w":1,"h":1}, {"x":5.25,"y":1,"w":1,"h":1}, {"x":7.25,"y":1,"w":1,"h":1}, {"x":8.25,"y":1,"w":1,"h":1}, {"x":9.25,"y":1,"w":1,"h":1}, {"x":10.25,"y":1,"w":1,"h":1}, {"x":11.25,"y":1,"w":1,"h":1}, {"x":12.25,"y":1,"w":1.75,"h":1}, 
-					 {"x":0,"y":2,"w":1.75,"h":1}, {"x":1.75,"y":2,"w":1,"h":1}, {"x":2.75,"y":2,"w":1,"h":1}, {"x":3.75,"y":2,"w":1,"h":1}, {"x":4.75,"y":2,"w":1,"h":1}, {"x":5.75,"y":2,"w":1,"h":1}, {"x":6.75,"y":2,"w":1,"h":1}, {"x":7.75,"y":2,"w":1,"h":1}, {"x":8.75,"y":2,"w":1,"h":1}, {"x":9.75,"y":2,"w":1,"h":1}, {"x":10.75,"y":2,"w":1,"h":1}, {"x":11.75,"y":2,"w":1,"h":1}, {"x":12.75,"y":2,"w":1.25,"h":1},
-					 {"x":0,"y":3,"w":1.25,"h":1}, {"x":1.25,"y":3,"w":1.25,"h":1}, {"x":3.5,"y":3,"w":1.25,"h":1}, {"x":4.75,"y":3,"w":2,"h":1}, {"x":6.75,"y":3,"w":2.25,"h":1}, {"x":9,"y":3,"w":1.25,"h":1}, {"x":11.5,"y":3,"w":1.25,"h":1}, {"x":12.75,"y":3,"w":1.25,"h":1}
+          "layout": [{"x":0,"y":0}, {"x":1,"y":0}, {"x":2,"y":0}, {"x":3,"y":0}, {"x":4,"y":0}, {"x":5,"y":0}, {"x":7,"y":0}, {"x":8,"y":0}, {"x":9,"y":0}, {"x":10,"y":0}, {"x":11,"y":0}, {"x":12,"y":0}, {"x":13,"y":0},
+					 {"x":0,"y":1,"w":1.25}, {"x":1.25,"y":1}, {"x":2.25,"y":1}, {"x":3.25,"y":1}, {"x":4.25,"y":1}, {"x":5.25,"y":1}, {"x":7.25,"y":1}, {"x":8.25,"y":1}, {"x":9.25,"y":1}, {"x":10.25,"y":1}, {"x":11.25,"y":1}, {"x":12.25,"y":1,"w":1.75}, 
+					 {"x":0,"y":2,"w":1.75}, {"x":1.75,"y":2}, {"x":2.75,"y":2}, {"x":3.75,"y":2}, {"x":4.75,"y":2}, {"x":5.75,"y":2}, {"x":6.75,"y":2}, {"x":7.75,"y":2}, {"x":8.75,"y":2}, {"x":9.75,"y":2}, {"x":10.75,"y":2}, {"x":11.75,"y":2}, {"x":12.75,"y":2,"w":1.25},
+					 {"x":0,"y":3,"w":1.25}, {"x":1.25,"y":3,"w":1.25}, {"x":3.5,"y":3,"w":1.25}, {"x":4.75,"y":3,"w":2}, {"x":6.75,"y":3,"w":2.25}, {"x":9,"y":3,"w":1.25}, {"x":11.5,"y":3,"w":1.25}, {"x":12.75,"y":3,"w":1.25}
 					 ]
       }
   }
diff --git a/keyboards/primekb/prime_e/prime_e.c b/keyboards/primekb/prime_e/prime_e.c
deleted file mode 100644
index 8e30f3c5f4..0000000000
--- a/keyboards/primekb/prime_e/prime_e.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Holten Campbell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "prime_e.h"
diff --git a/keyboards/primekb/prime_e/rgb/config.h b/keyboards/primekb/prime_e/rgb/config.h
index 57fbc6182d..6610d03f04 100644
--- a/keyboards/primekb/prime_e/rgb/config.h
+++ b/keyboards/primekb/prime_e/rgb/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define RGB_DI_PIN B7
 #define RGBLED_NUM 8
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/primekb/prime_e/rgb/info.json b/keyboards/primekb/prime_e/rgb/info.json
index 1d40389e87..189e448ed9 100644
--- a/keyboards/primekb/prime_e/rgb/info.json
+++ b/keyboards/primekb/prime_e/rgb/info.json
@@ -3,5 +3,8 @@
     "usb": {
         "pid": "0x0052",
         "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "B7"
     }
 }
diff --git a/keyboards/primekb/prime_l/config.h b/keyboards/primekb/prime_l/config.h
index f32722311a..053bc6236a 100644
--- a/keyboards/primekb/prime_l/config.h
+++ b/keyboards/primekb/prime_l/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/primekb/prime_l/prime_l.c b/keyboards/primekb/prime_l/prime_l.c
deleted file mode 100644
index 5a7a0a1008..0000000000
--- a/keyboards/primekb/prime_l/prime_l.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- * Copyright 2020 Holten Campbell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "prime_l.h"
\ No newline at end of file
diff --git a/keyboards/primekb/prime_l/prime_l.h b/keyboards/primekb/prime_l/prime_l.h
deleted file mode 100644
index 10b587b6a0..0000000000
--- a/keyboards/primekb/prime_l/prime_l.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- * Copyright 2020 Holten Campbell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_primekb_prime_l_v1)
-  #include "v1.h"
-#elif defined(KEYBOARD_primekb_prime_l_v2)
-  #include "v2.h"
-#endif
diff --git a/keyboards/primekb/prime_l/v1/config.h b/keyboards/primekb/prime_l/v1/config.h
deleted file mode 100644
index 553674692a..0000000000
--- a/keyboards/primekb/prime_l/v1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2018 Jumail Mundekkat
-Copyright 2020 Holten Campbell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D1, D0, B7, B3, B2 }
-#define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, C7, C6, F7, F6, F5, F4, F1, F0 }
diff --git a/keyboards/primekb/prime_l/v1/info.json b/keyboards/primekb/prime_l/v1/info.json
index 967939ccbc..079c39571b 100644
--- a/keyboards/primekb/prime_l/v1/info.json
+++ b/keyboards/primekb/prime_l/v1/info.json
@@ -6,6 +6,11 @@
     "pid": "0x504C",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"],
+    "rows": ["D1", "D0", "B7", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "levels": 4
diff --git a/keyboards/primekb/prime_l/v1/v1.h b/keyboards/primekb/prime_l/v1/v1.h
index bb82bacf5b..4ee291679f 100644
--- a/keyboards/primekb/prime_l/v1/v1.h
+++ b/keyboards/primekb/prime_l/v1/v1.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "prime_l.h"
+#include "quantum.h"
 
 #define LAYOUT( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
diff --git a/keyboards/primekb/prime_l/v2/config.h b/keyboards/primekb/prime_l/v2/config.h
deleted file mode 100644
index c622fe023c..0000000000
--- a/keyboards/primekb/prime_l/v2/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 Holten Campbell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { E6, B2, B1, B0, B6 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, D4, D0, D1, D2, D3, D5, B7, B3 }
diff --git a/keyboards/primekb/prime_l/v2/info.json b/keyboards/primekb/prime_l/v2/info.json
index 7199de33f6..a97809736e 100644
--- a/keyboards/primekb/prime_l/v2/info.json
+++ b/keyboards/primekb/prime_l/v2/info.json
@@ -6,6 +6,11 @@
     "pid": "0x5042",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D4", "D0", "D1", "D2", "D3", "D5", "B7", "B3"],
+    "rows": ["E6", "B2", "B1", "B0", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "layouts": {
       "LAYOUT": {
           "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, 
diff --git a/keyboards/primekb/prime_l/v2/v2.h b/keyboards/primekb/prime_l/v2/v2.h
index ebac56e76c..b0924d5d79 100644
--- a/keyboards/primekb/prime_l/v2/v2.h
+++ b/keyboards/primekb/prime_l/v2/v2.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "prime_l.h"
+#include "quantum.h"
 
 #define LAYOUT( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
diff --git a/keyboards/primekb/prime_m/config.h b/keyboards/primekb/prime_m/config.h
index 46995b1d31..053bc6236a 100644
--- a/keyboards/primekb/prime_m/config.h
+++ b/keyboards/primekb/prime_m/config.h
@@ -18,14 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { C5, B5, B2, D5, D3 }
-#define MATRIX_COL_PINS { B3, C7, C6, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/primekb/prime_m/info.json b/keyboards/primekb/prime_m/info.json
index ace8f6b52a..aa8e3e3668 100644
--- a/keyboards/primekb/prime_m/info.json
+++ b/keyboards/primekb/prime_m/info.json
@@ -8,6 +8,11 @@
     "pid": "0x504D",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B3", "C7", "C6", "D2", "D1", "D0"],
+    "rows": ["C5", "B5", "B2", "D5", "D3"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "levels": 4
@@ -17,41 +22,76 @@
   "community_layouts": ["numpad_5x6"],
   "layouts": {
       "LAYOUT_ortho_5x6": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":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": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1},
+            {"matrix": [1, 3], "x": 3, "y": 1},
+            {"matrix": [1, 4], "x": 4, "y": 1},
+            {"matrix": [1, 5], "x": 5, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1, "y": 2},
+            {"matrix": [2, 2], "x": 2, "y": 2},
+            {"matrix": [2, 3], "x": 3, "y": 2},
+            {"matrix": [2, 4], "x": 4, "y": 2},
+            {"matrix": [2, 5], "x": 5, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3},
+            {"matrix": [3, 3], "x": 3, "y": 3},
+            {"matrix": [3, 4], "x": 4, "y": 3},
+            {"matrix": [3, 5], "x": 5, "y": 3},
+
+            {"matrix": [4, 0], "x": 0, "y": 4},
+            {"matrix": [4, 1], "x": 1, "y": 4},
+            {"matrix": [4, 2], "x": 2, "y": 4},
+            {"matrix": [4, 3], "x": 3, "y": 4},
+            {"matrix": [4, 4], "x": 4, "y": 4},
+            {"matrix": [4, 5], "x": 5, "y": 4}
+          ]
       },
       "LAYOUT_numpad_5x6": {
         "layout": [
-          {"x":0, "y":0},
-          {"x":1, "y":0},
-          {"x":2, "y":0},
-          {"x":3, "y":0},
-          {"x":4, "y":0},
-          {"x":5, "y":0},
-
-          {"x":0, "y":1},
-          {"x":1, "y":1},
-          {"x":2, "y":1},
-          {"x":3, "y":1},
-          {"x":4, "y":1},
-
-          {"x":0, "y":2},
-          {"x":1, "y":2},
-          {"x":2, "y":2},
-          {"x":3, "y":2},
-          {"x":4, "y":2},
-          {"x":5, "y":1, "h":2},
-
-          {"x":0, "y":3},
-          {"x":1, "y":3},
-          {"x":2, "y":3},
-          {"x":3, "y":3},
-          {"x":4, "y":3},
-
-          {"x":0, "y":4},
-          {"x":1, "y":4},
-          {"x":2, "y":4, "w":2},
-          {"x":4, "y":4},
-          {"x":5, "y":3, "h":2}
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [1, 5], "x": 5, "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": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4, "w": 2},
+          {"matrix": [4, 4], "x": 4, "y": 4},
+          {"matrix": [3, 5], "x": 5, "y": 3, "h": 2}
         ]
       }
 }
diff --git a/keyboards/primekb/prime_m/prime_m.c b/keyboards/primekb/prime_m/prime_m.c
deleted file mode 100644
index 168fec4edf..0000000000
--- a/keyboards/primekb/prime_m/prime_m.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- * Copyright 2020 Holten Campbell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "prime_m.h"
diff --git a/keyboards/primekb/prime_m/prime_m.h b/keyboards/primekb/prime_m/prime_m.h
deleted file mode 100644
index 58d17eb6f6..0000000000
--- a/keyboards/primekb/prime_m/prime_m.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-#define LAYOUT_ortho_5x6( \
-	K00, K01, K02, K03, K04, K05, \
-	K10, K11, K12, K13, K14, K15, \
-	K20, K21, K22, K23, K24, K25, \
-	K30, K31, K32, K33, K34, K35, \
-	K40, K41, K42, K43, K44, K45  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15 }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25 }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35 }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45 }  \
-}
-
-#define LAYOUT_numpad_5x6( \
-	K00, K01, K02, K03, K04, K05, \
-	K10, K11, K12, K13, K14,      \
-	K20, K21, K22, K23, K24, K15, \
-	K30, K31, K32, K33, K34,      \
-	K40, K41,   K42,    K44, K35 \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15 }, \
-	{ K20,   K21,   K22,   K23,   K24,   ___ }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35 }, \
-	{ K40,   K41,   K42,   ___,   K44,   ___ }  \
-}
diff --git a/keyboards/primekb/prime_o/config.h b/keyboards/primekb/prime_o/config.h
index b67af66f47..9c9e5754a9 100644
--- a/keyboards/primekb/prime_o/config.h
+++ b/keyboards/primekb/prime_o/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D4, D6, B1, C5, B4, B3, C4, B2, B0, D5 }
-#define MATRIX_COL_PINS { B6, B5, C7, C6, D2, D1, D0, C2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/primekb/prime_o/info.json b/keyboards/primekb/prime_o/info.json
index 774dbc6523..b826606770 100644
--- a/keyboards/primekb/prime_o/info.json
+++ b/keyboards/primekb/prime_o/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4024",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B6", "B5", "C7", "C6", "D2", "D1", "D0", "C2"],
+    "rows": ["D4", "D6", "B1", "C5", "B4", "B3", "C4", "B2", "B0", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "levels": 4
diff --git a/keyboards/primekb/prime_o/prime_o.c b/keyboards/primekb/prime_o/prime_o.c
deleted file mode 100644
index 369347cf4c..0000000000
--- a/keyboards/primekb/prime_o/prime_o.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "prime_o.h"
diff --git a/keyboards/primekb/prime_r/config.h b/keyboards/primekb/prime_r/config.h
index d86696aef1..2baa495f2c 100644
--- a/keyboards/primekb/prime_r/config.h
+++ b/keyboards/primekb/prime_r/config.h
@@ -17,33 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, D0, B7, B3, B2 }
-#define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, C7, C6, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/primekb/prime_r/info.json b/keyboards/primekb/prime_r/info.json
index e2e597c793..e081dc388c 100644
--- a/keyboards/primekb/prime_r/info.json
+++ b/keyboards/primekb/prime_r/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"],
+    "rows": ["D1", "D0", "B7", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "levels": 5
diff --git a/keyboards/primekb/prime_r/prime_r.c b/keyboards/primekb/prime_r/prime_r.c
deleted file mode 100644
index 3a08bed591..0000000000
--- a/keyboards/primekb/prime_r/prime_r.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Andrew Heaston
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "prime_r.h"
diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h
index 261ebaca5b..9120905d7a 100644
--- a/keyboards/program_yoink/config.h
+++ b/keyboards/program_yoink/config.h
@@ -17,26 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D3, B1, B0 }
-#define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, B2, D6, C2, D5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /*RGB*/
-#define RGB_DI_PIN D4
- #ifdef RGB_DI_PIN
    #define RGBLED_NUM 5
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
    //#define RGBLIGHT_EFFECT_RGB_TEST
    //#define RGBLIGHT_EFFECT_ALTERNATING
- #endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/info.json
index eeab79d169..ef5492bd52 100644
--- a/keyboards/program_yoink/ortho/info.json
+++ b/keyboards/program_yoink/ortho/info.json
@@ -8,6 +8,14 @@
         "pid": "0xF10C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "D6", "C2", "D5"],
+        "rows": ["D2", "D3", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D1", "pin_b": "D0"}
@@ -18,111 +26,111 @@
     "layouts": {
         "LAYOUT_ortho": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12.5, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11.25, "y":2.25},
-                {"x":12.5, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3, "w":7},
-                {"x":9, "y":3},
-                {"x":10.25, "y":3.25},
-                {"x":11.25, "y":3.25},
-                {"x":12.25, "y":3.25}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 5], "x": 2, "y": 3, "w": 7},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.25, "y": 3.25}
             ]
         },
         "LAYOUT_ortho_split": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12.5, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11.25, "y":2.25},
-                {"x":12.5, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "w":2.75},
-                {"x":5.75, "y":3, "w":2.25},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10.25, "y":3.25},
-                {"x":11.25, "y":3.25},
-                {"x":12.25, "y":3.25}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 4], "x": 3, "y": 3, "w": 2.75},
+                {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.25, "y": 3.25}
             ]
         }
     }
diff --git a/keyboards/program_yoink/ortho/ortho.c b/keyboards/program_yoink/ortho/ortho.c
deleted file mode 100644
index a8e1b732a9..0000000000
--- a/keyboards/program_yoink/ortho/ortho.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ortho.h"
diff --git a/keyboards/program_yoink/ortho/ortho.h b/keyboards/program_yoink/ortho/ortho.h
deleted file mode 100644
index 964c0e363b..0000000000
--- a/keyboards/program_yoink/ortho/ortho.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "program_yoink.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define XXX KC_NO
-
-#define LAYOUT_ortho( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
-    K30, K31,                K35,                K39, K3A, K3B, K3C \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
-    { K30, K31, XXX, XXX, XXX, K35, XXX, XXX, XXX, K39, K3A, K3B, K3C } \
-}
-
-#define LAYOUT_ortho_split( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
-    K30, K31, K32,      K34,           K37, K38, K39, K3A, K3B, K3C \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
-    { K30, K31, K32, XXX, K34, XXX, XXX, K37, K38, K39, K3A, K3B, K3C } \
-}
diff --git a/keyboards/program_yoink/program_yoink.c b/keyboards/program_yoink/program_yoink.c
deleted file mode 100644
index 7733aa2ad5..0000000000
--- a/keyboards/program_yoink/program_yoink.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "program_yoink.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/program_yoink/program_yoink.h b/keyboards/program_yoink/program_yoink.h
deleted file mode 100644
index d6a1d33b53..0000000000
--- a/keyboards/program_yoink/program_yoink.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_program_yoink_staggered)
-    #include "staggered.h"
-#elif defined(KEYBOARD_program_yoink_ortho)
-    #include "ortho.h"
-#endif
diff --git a/keyboards/program_yoink/staggered/info.json b/keyboards/program_yoink/staggered/info.json
index 252a110e8b..1b028593e3 100644
--- a/keyboards/program_yoink/staggered/info.json
+++ b/keyboards/program_yoink/staggered/info.json
@@ -8,6 +8,14 @@
         "pid": "0xF10B",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "D6", "C2", "D5"],
+        "rows": ["D2", "D3", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D1", "pin_b": "D0"}
@@ -18,107 +26,117 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12.5, "y":0},
-
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1, "w":1.75},
-                {"x":12.5, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2, "w":1.25},
-                {"x":11.25, "y":2.25},
-                {"x":12.5, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3, "w":1.25},
-                {"x":2.5, "y":3, "w":6.25},
-                {"x":8.75, "y":3, "w":1.25},
-                {"x":10.25, "y":3.25},
-                {"x":11.25, "y":3.25},
-                {"x":12.25, "y":3.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25},
+
+                {"matrix": [2, 10], "x": 11.25, "y": 2.25},
+
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 6.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25},
+
+                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.25, "y": 3.25}
             ]
         },
         "LAYOUT_split_bar": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12.5, "y":0},
-
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1, "w":1.75},
-                {"x":12.5, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2, "w":1.25},
-                {"x":11.25, "y":2.25},
-                {"x":12.5, "y":2},
-
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "w":2.75},
-                {"x":5.75, "y":3, "w":2.25},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10.25, "y":3.25},
-                {"x":11.25, "y":3.25},
-                {"x":12.25, "y":3.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25},
+
+                {"matrix": [2, 10], "x": 11.25, "y": 2.25},
+
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "w": 2.75},
+                {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+
+                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.25, "y": 3.25}
             ]
         }
     }
diff --git a/keyboards/program_yoink/staggered/staggered.c b/keyboards/program_yoink/staggered/staggered.c
deleted file mode 100644
index 1bdb4a2162..0000000000
--- a/keyboards/program_yoink/staggered/staggered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "staggered.h"
diff --git a/keyboards/program_yoink/staggered/staggered.h b/keyboards/program_yoink/staggered/staggered.h
deleted file mode 100644
index 1b35e28da7..0000000000
--- a/keyboards/program_yoink/staggered/staggered.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "program_yoink.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define XXX KC_NO
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,      K1C, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,      K2C, \
-    K30, K31,           K34,                K38, K39, K3A,      K3C \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C }, \
-    { K30, K31, XXX, XXX, K34, XXX, XXX, XXX, K38, K39, K3A, XXX, K3C } \
-}
-
-#define LAYOUT_split_bar( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,      K1C, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,      K2C, \
-    K30, K31, K32, K33,      K35,      K37, K38, K39, K3A,      K3C \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C }, \
-    { K30, K31, K32, K33, XXX, K35, XXX, K37, K38, K39, K3A, XXX, K3C } \
-}
diff --git a/keyboards/projectcain/relic/config.h b/keyboards/projectcain/relic/config.h
index baa5b5263b..199375c173 100644
--- a/keyboards/projectcain/relic/config.h
+++ b/keyboards/projectcain/relic/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, B2, B6, B5 }
-#define MATRIX_COL_PINS { D3, D5, B0, F0, F1, F4, F5, F6, C7, C6, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/projectcain/relic/info.json b/keyboards/projectcain/relic/info.json
index 9d0820b4e6..2e4fcd6dbd 100644
--- a/keyboards/projectcain/relic/info.json
+++ b/keyboards/projectcain/relic/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "B0", "F0", "F1", "F4", "F5", "F6", "C7", "C6", "B4"],
+        "rows": ["D7", "B2", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D4", "pin_b": "D6"}
@@ -17,16 +22,196 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"BACK <BR> SPACE", "x":11, "y":0}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":";", "x":10.25, "y":1, "w":1.75}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"/", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0.25, "y":3, "w":1.25}, {"label":"Alt", "x":1.5, "y":3, "w":1.25}, {"label":"MO(1)", "x":9.25, "y":3, "w":1.25}, {"label":"MO(2)", "x":10.5, "y":3, "w":1.25}, {"label":"LGUI", "x":3, "y":3.25}, {"label":"BACK <BR> SPACE", "x":4, "y":3.25, "w":1.5}, {"label":"Space", "x":5.5, "y":3.25}, {"label":"Space", "x":6.5, "y":3.25, "w":1.5}, {"label":"RGUI", "x":8, "y":3.25}]
-       },    
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+
+                {"matrix": [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": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+                {"matrix": [1, 7], "x": 8.25, "y": 1},
+                {"matrix": [1, 8], "x": 9.25, "y": 1},
+                {"matrix": [1, 9], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 9.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3, "y": 3.25},
+                {"matrix": [3, 6], "x": 4, "y": 3.25, "w": 1.5},
+                {"matrix": [3, 7], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 6.5, "y": 3.25, "w": 1.5},
+                {"matrix": [3, 9], "x": 8, "y": 3.25}
+            ]
+        },
         "LAYOUT_full_space": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"BACK <BR> SPACE", "x":11, "y":0}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":";", "x":10.25, "y":1, "w":1.75}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"/", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0.25, "y":3, "w":1.25}, {"label":"Alt", "x":1.5, "y":3, "w":1.25}, {"label":"MO(1)", "x":9.25, "y":3, "w":1.25}, {"label":"MO(2)", "x":10.5, "y":3, "w":1.25}, {"label":"Space", "x":3, "y":3.25, "w":6}]
-       },
-       "LAYOUT_split_2space": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"BACK <BR> SPACE", "x":11, "y":0}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":";", "x":10.25, "y":1, "w":1.75}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"/", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0.25, "y":3, "w":1.25}, {"label":"Alt", "x":1.5, "y":3, "w":1.25}, {"label":"MO(1)", "x":9.25, "y":3, "w":1.25}, {"label":"MO(2)", "x":10.5, "y":3, "w":1.25}, {"label":"BACK <BR> SPACE", "x":3, "y":3.25, "w":3}, {"label":"Space", "x":6, "y":3.25, "w":3}]
-       },
-       "LAYOUT_split_4space": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"BACK <BR> SPACE", "x":11, "y":0}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":";", "x":10.25, "y":1, "w":1.75}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"/", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0.25, "y":3, "w":1.25}, {"label":"Alt", "x":1.5, "y":3, "w":1.25}, {"label":"MO(1)", "x":9.25, "y":3, "w":1.25}, {"label":"MO(2)", "x":10.5, "y":3, "w":1.25}, {"label":"Lgui", "x":3, "y":3.25}, {"label":"BACK <BR> SPACE", "x":4, "y":3.25, "w":2}, {"label":"Space", "x":6, "y":3.25, "w":2}, {"label":"Rgui", "x":8, "y":3.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+
+                {"matrix": [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": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+                {"matrix": [1, 7], "x": 8.25, "y": 1},
+                {"matrix": [1, 8], "x": 9.25, "y": 1},
+                {"matrix": [1, 9], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 9.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 3, "y": 3.25, "w": 6}
+            ]
+        },
+        "LAYOUT_split_2space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+
+                {"matrix": [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": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+                {"matrix": [1, 7], "x": 8.25, "y": 1},
+                {"matrix": [1, 8], "x": 9.25, "y": 1},
+                {"matrix": [1, 9], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 9.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 3, "y": 3.25, "w": 3},
+                {"matrix": [3, 9], "x": 6, "y": 3.25, "w": 3}
+            ]
+        },
+        "LAYOUT_split_4space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+
+                {"matrix": [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": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+                {"matrix": [1, 7], "x": 8.25, "y": 1},
+                {"matrix": [1, 8], "x": 9.25, "y": 1},
+                {"matrix": [1, 9], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 9.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3, "y": 3.25},
+                {"matrix": [3, 7], "x": 4, "y": 3.25, "w": 2},
+                {"matrix": [3, 8], "x": 6, "y": 3.25, "w": 2},
+                {"matrix": [3, 9], "x": 8, "y": 3.25}
+            ]
         }
     }
 }
diff --git a/keyboards/projectcain/relic/relic.c b/keyboards/projectcain/relic/relic.c
index f72250847d..673ca8586c 100644
--- a/keyboards/projectcain/relic/relic.c
+++ b/keyboards/projectcain/relic/relic.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "relic.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/projectcain/relic/relic.h b/keyboards/projectcain/relic/relic.h
deleted file mode 100644
index 45ae28a97f..0000000000
--- a/keyboards/projectcain/relic/relic.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2021 projectcain
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_all( \
-   K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-   K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-   K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-   K300, K301,       K303, K304, K305, K306, K307, K308, K309  \
-) \
- { \
-   { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-   { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-   { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-   { K300,  K301,  KC_NO, K303,  K304,  K305,  K306,  K307,  K308,  K309,  KC_NO }  \
-}
-
-#define LAYOUT_full_space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-    K300, K301,                   K305,             K308, K309  \
-) \
- { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { K300,  K301,  KC_NO, KC_NO, KC_NO, K305,  KC_NO, KC_NO, K308,  K309,  KC_NO }  \
-}
-
-#define LAYOUT_split_2space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-    K300, K301,             K304,       K306,       K308, K309  \
-) \
- { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { K300,  K301,  KC_NO, KC_NO, K304,  KC_NO, K306,  KC_NO, K308,  K309,  KC_NO }  \
-}
-
-#define LAYOUT_split_4space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-    K300, K301,       K303, K304,       K306, K307, K308, K309  \
-) \
- { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { K300,  K301,  KC_NO, K303,  K304,  KC_NO, K306,  K307,  K308,  K309,  KC_NO }  \
-}
diff --git a/keyboards/projectcain/vault35/config.h b/keyboards/projectcain/vault35/config.h
index 457e2f0ab3..7abf6b197c 100644
--- a/keyboards/projectcain/vault35/config.h
+++ b/keyboards/projectcain/vault35/config.h
@@ -14,23 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, D4, B0, C7 }
-#define MATRIX_COL_PINS { B1, D3, F0, F1, F4, F5, F6, F7, C6, B6, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/projectcain/vault35/info.json b/keyboards/projectcain/vault35/info.json
index 488d81b6b8..0a8e9ebad2 100644
--- a/keyboards/projectcain/vault35/info.json
+++ b/keyboards/projectcain/vault35/info.json
@@ -8,6 +8,11 @@
       "pid": "0x6060",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["B1", "D3", "F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5"],
+      "rows": ["B4", "D4", "B0", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "D6", "pin_b": "D7", "resolution": 2}
@@ -16,20 +21,175 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
-    "LAYOUT_split_4space": {
-   "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"BACK<br>SPACE", "x":10, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"ENTER", "x":9.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":"<", "x":7.75, "y":2}, {"label":">", "x":8.75, "y":2}, {"label":"SHIFT", "x":9.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.5, "y":3}, {"label":"LOWER", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3, "w":1.75}, {"label":"RAISE", "x":7.25, "y":3, "w":1.25}, {"label":"ALT", "x":8.5, "y":3}]
-    },
+        "LAYOUT_split_4space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
 
-    "LAYOUT_split_3space": {
-      "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"BACK<br>SPACE", "x":10, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"ENTER", "x":9.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":"<", "x":7.75, "y":2}, {"label":">", "x":8.75, "y":2}, {"label":"SHIFT", "x":9.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.5, "y":3}, {"x":2.5, "y":3, "w":2.25}, {"label":"FN", "x":4.75, "y":3}, {"x":5.75, "y":3, "w":2.75}, {"label":"ALT", "x":8.5, "y":3}]
-    },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
 
-    "LAYOUT_split_2space": {
-      "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"BACK<br>SPACE", "x":10, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"ENTER", "x":9.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":"<", "x":7.75, "y":2}, {"label":">", "x":8.75, "y":2}, {"label":"SHIFT", "x":9.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.5, "y":3}, {"x":2.5, "y":3, "w":3}, {"x":5.5, "y":3, "w":3}, {"label":"ALT", "x":8.5, "y":3}]
-    },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 6], "x": 7.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3}
+            ]
+        },
+        "LAYOUT_split_3space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 7], "x": 8.5, "y": 3}
+            ]
+        },
+        "LAYOUT_split_2space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 8.5, "y": 3}
+            ]
+        },
+        "LAYOUT_full_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25},
 
-    "LAYOUT_full_space": {
-      "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"BACK<br>SPACE", "x":10, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"ENTER", "x":9.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":"<", "x":7.75, "y":2}, {"label":">", "x":8.75, "y":2}, {"label":"SHIFT", "x":9.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.5, "y":3}, {"x":2.5, "y":3, "w":6}, {"label":"ALT", "x":8.5, "y":3}]
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 6},
+                {"matrix": [3, 7], "x": 8.5, "y": 3}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/projectcain/vault35/vault35.c b/keyboards/projectcain/vault35/vault35.c
index 2bb1675a1f..14aac7fdf7 100644
--- a/keyboards/projectcain/vault35/vault35.c
+++ b/keyboards/projectcain/vault35/vault35.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "vault35.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/projectcain/vault35/vault35.h b/keyboards/projectcain/vault35/vault35.h
deleted file mode 100644
index af5577f314..0000000000
--- a/keyboards/projectcain/vault35/vault35.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2021 projectcain
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_split_4space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-          K301, K302, K303,       K305, K306, K307  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { KC_NO, K301,  K302,  K303,  KC_NO, K305,  K306,  K307,  KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_split_3space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-          K301,       K303, K304, K305,       K307  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { KC_NO, K301,  KC_NO, K303,  K304,  K305,  KC_NO, K307,  KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_split_2space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-          K301,       K303,       K305,       K307  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { KC_NO, K301,  KC_NO, K303,  KC_NO, K305,  KC_NO, K307,  KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_full_space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-          K301,             K304,             K307  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { KC_NO, K301,  KC_NO, KC_NO, K304,  KC_NO, KC_NO, K307,  KC_NO, KC_NO, KC_NO }  \
-} 
diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h
index b70109bfa3..199375c173 100644
--- a/keyboards/projectcain/vault45/config.h
+++ b/keyboards/projectcain/vault45/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, B6, B5, C7 }
-#define MATRIX_COL_PINS { B0, D5, D4, D6, D7, B4, D3, F0, F1, F4, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/projectcain/vault45/info.json b/keyboards/projectcain/vault45/info.json
index ecfa953fd4..9695631cc9 100644
--- a/keyboards/projectcain/vault45/info.json
+++ b/keyboards/projectcain/vault45/info.json
@@ -8,6 +8,11 @@
       "pid": "0x6060",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "D5", "D4", "D6", "D7", "B4", "D3", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["C6", "B6", "B5", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "B3", "pin_b": "B2", "resolution": 2},
@@ -20,24 +25,260 @@
         "LAYOUT": "LAYOUT_all"
     },
     "layouts": {
-    "LAYOUT_all": {
-      "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"DEL", "x":11, "y":0}, {"label":"BACK<br>SPACE", "x":12, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"ENTER", "x":11.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"SHIFT", "x":11.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.25, "y":3}, {"label":"ALT", "x":2.25, "y":3, "w":1.25}, {"label":"SYS", "x":3.5, "y":3, "w":1.25}, {"x":4.75, "y":3, "w":1.25}, {"x":6, "y":3}, {"x":7, "y":3, "w":1.25}, {"label":"FN", "x":8.25, "y":3, "w":1.25}, {"label":"ALT", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3}]
-    },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
 
-    "LAYOUT_split_4space": {
-   "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"DEL", "x":11, "y":0}, {"label":"BACK<br>SPACE", "x":12, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"ENTER", "x":11.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"SHIFT", "x":11.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.25, "y":3}, {"label":"ALT", "x":2.25, "y":3, "w":1.25}, {"label":"SYS", "x":3.5, "y":3, "w":1.25}, {"x":4.75, "y":3, "w":1.75}, {"x":6.5, "y":3, "w":1.75}, {"label":"FN", "x":8.25, "y":3, "w":1.25}, {"label":"ALT", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3}]
-    },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
 
-    "LAYOUT_split_3space": {
-      "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"DEL", "x":11, "y":0}, {"label":"BACK<br>SPACE", "x":12, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"ENTER", "x":11.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"SHIFT", "x":11.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.25, "y":3}, {"label":"ALT", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":2.25}, {"x":5.75, "y":3}, {"x":6.75, "y":3, "w":2.75}, {"label":"ALT", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3}]
-    },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25},
 
-    "LAYOUT_split_2space": {
-      "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"DEL", "x":11, "y":0}, {"label":"BACK<br>SPACE", "x":12, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"ENTER", "x":11.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"SHIFT", "x":11.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.25, "y":3}, {"label":"ALT", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":3}, {"x":6.5, "y":3, "w":3}, {"label":"ALT", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3}]
-    },
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3}
+            ]
+        },
+        "LAYOUT_split_4space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 6.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3}
+            ]
+        },
+        "LAYOUT_split_3space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3}
+            ]
+        },
+        "LAYOUT_split_2space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.5, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 6.5, "y": 3, "w": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3}
+            ]
+        },
+        "LAYOUT_full_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25},
 
-    "LAYOUT_full_space": {
-      "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"DEL", "x":11, "y":0}, {"label":"BACK<br>SPACE", "x":12, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"ENTER", "x":11.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"SHIFT", "x":11.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.25, "y":3}, {"label":"ALT", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":6}, {"label":"ALT", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3}]
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/projectcain/vault45/vault45.c b/keyboards/projectcain/vault45/vault45.c
index fa82335492..05908ba9d7 100644
--- a/keyboards/projectcain/vault45/vault45.c
+++ b/keyboards/projectcain/vault45/vault45.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "vault45.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/projectcain/vault45/vault45.h b/keyboards/projectcain/vault45/vault45.h
deleted file mode 100644
index b1217d6d06..0000000000
--- a/keyboards/projectcain/vault45/vault45.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2021 projectcain
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_all( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       K112, \
-    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-          K301, K302,       K304, K305, K306, K307, K308,       K310, K311  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  KC_NO, K112 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212 }, \
-    { KC_NO, K301,  K302,  KC_NO, K304,  K305,  K306,  K307,  K308,  KC_NO, K310,  K311,  KC_NO }  \
-}
-
-#define LAYOUT_split_4space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       K112, \
-    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-          K301, K302,       K304, K305,       K307, K308,       K310, K311  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  KC_NO, K112 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212 }, \
-    { KC_NO, K301,  K302,  KC_NO, K304,  K305,  KC_NO, K307,  K308,  KC_NO, K310,  K311,  KC_NO }  \
-}
-#define LAYOUT_split_3space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       K112, \
-    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-          K301, K302,             K305, K306, K307,             K310, K311  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  KC_NO, K112 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212 }, \
-    { KC_NO, K301,  K302,  KC_NO, KC_NO, K305,  K306,  K307,  KC_NO, KC_NO, K310,  K311,  KC_NO }  \
-}
-#define LAYOUT_split_2space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       K112, \
-    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-          K301, K302,             K305,       K307,             K310, K311  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  KC_NO, K112 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212 }, \
-    { KC_NO, K301,  K302,  KC_NO, KC_NO, K305,  KC_NO, K307,  KC_NO, KC_NO, K310,  K311,  KC_NO }  \
-}
-#define LAYOUT_full_space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       K112, \
-    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-          K301, K302,                   K306,                   K310, K311  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  KC_NO, K112 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212 }, \
-    { KC_NO, K301,  K302,  KC_NO, KC_NO, KC_NO, K306,  KC_NO, KC_NO, KC_NO, K310,  K311,  KC_NO }  \
-}
diff --git a/keyboards/projectkb/alice/alice.c b/keyboards/projectkb/alice/alice.c
index aacf448bff..5e5687f7e8 100644
--- a/keyboards/projectkb/alice/alice.c
+++ b/keyboards/projectkb/alice/alice.c
@@ -1,4 +1,4 @@
-#include "alice.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinOutput(INDICATOR_PIN_0);
diff --git a/keyboards/projectkb/alice/alice.h b/keyboards/projectkb/alice/alice.h
deleted file mode 100644
index 19052c43fc..0000000000
--- a/keyboards/projectkb/alice/alice.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define KNO KC_NO
-#define LAYOUT_default LAYOUT_alice_split_bs
-
-#define LAYOUT_alice_split_bs( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-  K10, K11, K12, K13, K14, K15, K16,      K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-  K20, K21, K22, K23, K24, K25, K26,      K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-       K31, K32, K33, K34, K35, K36,      K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,         \
-       K41,      K43, K44,      K46,           K49,      K4B,                K4F \
-) { \
-  {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F  }, \
-  {  K10, K11, K12, K13, K14, K15, K16, KNO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, KNO, K28, K29, K2A, K2B, K2C, K2D, KNO, K2F  }, \
-  {  KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F  }, \
-  {  KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F  }  \
-}
-
-#define LAYOUT_alice( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
-  K10, K11, K12, K13, K14, K15, K16,      K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-  K20, K21, K22, K23, K24, K25, K26,      K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-       K31, K32, K33, K34, K35, K36,      K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,         \
-       K41,      K43, K44,      K46,           K49,      K4B,                K4F \
-) { \
-  {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KNO, K0F  }, \
-  {  K10, K11, K12, K13, K14, K15, K16, KNO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, KNO, K28, K29, K2A, K2B, K2C, K2D, KNO, K2F  }, \
-  {  KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F  }, \
-  {  KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F  }  \
-}
diff --git a/keyboards/projectkb/alice/info.json b/keyboards/projectkb/alice/info.json
index 746a4ea9ca..498818cfbf 100644
--- a/keyboards/projectkb/alice/info.json
+++ b/keyboards/projectkb/alice/info.json
@@ -16,152 +16,168 @@
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_default": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Del", "x":17, "y":0.25},
-                {"label":"Backspace", "x":18, "y":0.25},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 14], "x": 17, "y": 0.25},
+                {"matrix": [0, 15], "x": 18, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "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.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "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": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 15], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 15], "x": 18, "y": 4.25, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Backspace", "x":17, "y":0.25, "w":2},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"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": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 15], "x": 17, "y": 0.25, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "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.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "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": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 15], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 15], "x": 18, "y": 4.25, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h
index 54918d2b49..bcb9ffbb09 100644
--- a/keyboards/projectkb/alice/rev1/config.h
+++ b/keyboards/projectkb/alice/rev1/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B2, B10, B11, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15, B12 }
-#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -40,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/projectkb/alice/rev1/info.json b/keyboards/projectkb/alice/rev1/info.json
new file mode 100644
index 0000000000..4ed9926907
--- /dev/null
+++ b/keyboards/projectkb/alice/rev1/info.json
@@ -0,0 +1,11 @@
+{
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B10", "B11", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15", "B12"],
+        "rows": ["B1", "B0", "A7", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/projectkb/alice/rev1/rules.mk b/keyboards/projectkb/alice/rev1/rules.mk
index e1e604dfc5..ab88066b0a 100644
--- a/keyboards/projectkb/alice/rev1/rules.mk
+++ b/keyboards/projectkb/alice/rev1/rules.mk
@@ -10,8 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = spi
-
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h
index 1ac58753c7..95f845c931 100644
--- a/keyboards/projectkb/alice/rev2/config.h
+++ b/keyboards/projectkb/alice/rev2/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B1, B0, A7, A1, A5, A4, A3, A10, B9, B8, B7, B6, B5, B4, B3, A15 }
-#define MATRIX_ROW_PINS { B2, B10, B11, A2, A0 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
@@ -40,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/projectkb/alice/rev2/info.json b/keyboards/projectkb/alice/rev2/info.json
new file mode 100644
index 0000000000..57113b1e3c
--- /dev/null
+++ b/keyboards/projectkb/alice/rev2/info.json
@@ -0,0 +1,11 @@
+{
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A1", "A5", "A4", "A3", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B2", "B10", "B11", "A2", "A0"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/projectkb/alice/rev2/rules.mk b/keyboards/projectkb/alice/rev2/rules.mk
index e1e604dfc5..ab88066b0a 100644
--- a/keyboards/projectkb/alice/rev2/rules.mk
+++ b/keyboards/projectkb/alice/rev2/rules.mk
@@ -10,8 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = spi
-
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/projectkb/signature65/config.h b/keyboards/projectkb/signature65/config.h
index 2972b51fa1..4d31d4b095 100644
--- a/keyboards/projectkb/signature65/config.h
+++ b/keyboards/projectkb/signature65/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                        1    2   3   4   5   6   7   8    9    10   11  12  13  14  15  16
-#define MATRIX_COL_PINS { B14, A2, B9, B8, B5, B4, B3, A15, B11, B10, B2, A3, B1, B0, A4, A5 }
-//                        1   2   3    4   5
-#define MATRIX_ROW_PINS { A8, A9, B13, A6, A7 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/projectkb/signature65/info.json b/keyboards/projectkb/signature65/info.json
index 2f0f01621b..6b7229d7e6 100644
--- a/keyboards/projectkb/signature65/info.json
+++ b/keyboards/projectkb/signature65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0165",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B14", "A2", "B9", "B8", "B5", "B4", "B3", "A15", "B11", "B10", "B2", "A3", "B1", "B0", "A4", "A5"],
+        "rows": ["A8", "A9", "B13", "A6", "A7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/projectkb/signature65/signature65.c b/keyboards/projectkb/signature65/signature65.c
deleted file mode 100644
index c5255dddb9..0000000000
--- a/keyboards/projectkb/signature65/signature65.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2022 Project Keyboard
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include "signature65.h"
diff --git a/keyboards/projectkb/signature87/config.h b/keyboards/projectkb/signature87/config.h
index 394e5ac706..4d31d4b095 100644
--- a/keyboards/projectkb/signature87/config.h
+++ b/keyboards/projectkb/signature87/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                         0   1     2    3    4   5    6   7   8   9    A   B
-#define MATRIX_COL_PINS { A7,  A6,  A5,  A4,  A3, A2, A15, B3, B4 }
-#define MATRIX_ROW_PINS { B13, B12, A8, B15, A10, A9, B9,  B8, B1, B0, B10, B2 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/projectkb/signature87/info.json b/keyboards/projectkb/signature87/info.json
index 76ff092fb2..5b9f0b6074 100644
--- a/keyboards/projectkb/signature87/info.json
+++ b/keyboards/projectkb/signature87/info.json
@@ -8,24 +8,432 @@
         "pid": "0x0187",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A7", "A6", "A5", "A4", "A3", "A2", "A15", "B3", "B4"],
+        "rows": ["B13", "B12", "A8", "B15", "A10", "A9", "B9", "B8", "B1", "B0", "B10", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":12.5, "y":5.25, "w":1.25}, {"x":13.75, "y":5.25, "w":1.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
-        },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-        "LAYOUT_tkl_ansi": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":12.5, "y":5.25, "w":1.25}, {"x":13.75, "y":5.25, "w":1.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 2], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
         },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-        "LAYOUT_tkl_tsangan_ansi": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 2], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
         },
+        "LAYOUT_tkl_tsangan_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 2], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
 
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
         "LAYOUT_wkl_ansi": {
-            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 2], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/projectkb/signature87/signature87.c b/keyboards/projectkb/signature87/signature87.c
deleted file mode 100644
index e210f67de9..0000000000
--- a/keyboards/projectkb/signature87/signature87.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "signature87.h"
\ No newline at end of file
diff --git a/keyboards/projectkb/signature87/signature87.h b/keyboards/projectkb/signature87/signature87.h
deleted file mode 100644
index b97570ef95..0000000000
--- a/keyboards/projectkb/signature87/signature87.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define KNO KC_NO
-
-#define LAYOUT_all( \
-  K00,      K11, K01, K12, K02, K13, K03, K14, K04,      K15, K06, K16, K07,   K17, K08, K18, \
-  K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,   K37, K28, K38, \
-  K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K57,   K47, K58, K48, \
-  K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,           K66,                  \
-  K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85,           K96, K86,        K98,      \
-  KA0, KB0, KA1,           KB2,                          KA4, KB5, KA6, KB6,   KA7, KB8, KA8  \
-) { \
-  {  K00, K01, K02, K03, K04, KNO, K06, K07, K08  }, \
-  {  KNO, K11, K12, K13, K14, K15, K16, K17, K18  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, K27, K28  }, \
-  {  K30, K31, K32, K33, K34, K35, K36, K37, K38  }, \
-  {  K40, K41, K42, K43, K44, K45, K46, K47, K48  }, \
-  {  K50, K51, K52, K53, K54, K55, KNO, K57, K58  }, \
-  {  K60, K61, K62, K63, K64, K65, K66, KNO, KNO  }, \
-  {  K70, K71, K72, K73, K74, K75, KNO, KNO, KNO  }, \
-  {  K80, K81, K82, K83, K84, K85, K86, KNO, KNO  }, \
-  {  K90, K91, K92, K93, K94, KNO, K96, KNO, K98  }, \
-  {  KA0, KA1, KNO, KNO, KA4, KNO, KA6, KA7, KA8  }, \
-  {  KB0, KNO, KB2, KNO, KNO, KB5, KB6, KNO, KB8  } \
-}
-
-#define LAYOUT_tkl_ansi( \
-  K00,      K11, K01, K12, K02, K13, K03, K14, K04,      K15, K06, K16, K07,   K17, K08, K18, \
-  K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26,    K36,     K37, K28, K38, \
-  K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K57,   K47, K58, K48, \
-  K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,           K66,                  \
-  K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85,           K96,             K98,      \
-  KA0, KB0, KA1,           KB2,                          KA4, KB5, KA6, KB6,   KA7, KB8, KA8  \
-) { \
-  {  K00, K01, K02, K03, K04, KNO, K06, K07, K08  }, \
-  {  KNO, K11, K12, K13, K14, K15, K16, K17, K18  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, KNO, K28  }, \
-  {  K30, K31, K32, K33, K34, K35, K36, K37, K38  }, \
-  {  K40, K41, K42, K43, K44, K45, K46, K47, K48  }, \
-  {  K50, K51, K52, K53, K54, K55, KNO, K57, K58  }, \
-  {  K60, K61, K62, K63, K64, K65, K66, KNO, KNO  }, \
-  {  K70, K71, K72, K73, K74, K75, KNO, KNO, KNO  }, \
-  {  K80, K81, K82, K83, K84, K85, KNO, KNO, KNO  }, \
-  {  K90, K91, K92, K93, K94, KNO, K96, KNO, K98  }, \
-  {  KA0, KA1, KNO, KNO, KA4, KNO, KA6, KA7, KA8  }, \
-  {  KB0, KNO, KB2, KNO, KNO, KB5, KB6, KNO, KB8  } \
-}
-
-#define LAYOUT_tkl_tsangan_ansi( \
-  K00,      K11, K01, K12, K02, K13, K03, K14, K04,      K15, K06, K16, K07,   K17, K08, K18, \
-  K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,   K37, K28, K38, \
-  K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K57,   K47, K58, K48, \
-  K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,           K66,                  \
-  K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85,           K96, K86,        K98,      \
-  KA0, KB0, KA1,           KB2,                               KB5, KA6, KB6,   KA7, KB8, KA8  \
-) { \
-  {  K00, K01, K02, K03, K04, KNO, K06, K07, K08  }, \
-  {  KNO, K11, K12, K13, K14, K15, K16, K17, K18  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, K27, K28  }, \
-  {  K30, K31, K32, K33, K34, K35, K36, K37, K38  }, \
-  {  K40, K41, K42, K43, K44, K45, K46, K47, K48  }, \
-  {  K50, K51, K52, K53, K54, K55, KNO, K57, K58  }, \
-  {  K60, K61, K62, K63, K64, K65, K66, KNO, KNO  }, \
-  {  K70, K71, K72, K73, K74, K75, KNO, KNO, KNO  }, \
-  {  K80, K81, K82, K83, K84, K85, K86, KNO, KNO  }, \
-  {  K90, K91, K92, K93, K94, KNO, K96, KNO, K98  }, \
-  {  KA0, KA1, KNO, KNO, KNO, KNO, KA6, KA7, KA8  }, \
-  {  KB0, KNO, KB2, KNO, KNO, KB5, KB6, KNO, KB8  } \
-}
-
-#define LAYOUT_wkl_ansi( \
-  K00,      K11, K01, K12, K02, K13, K03, K14, K04,      K15, K06, K16, k07,   K17, K08, K18, \
-  K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,   K37, K28, K38, \
-  K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K57,   K47, K58, K48, \
-  K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,           K66,                  \
-  K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85,           K96, K86,        K98,      \
-  KA0,      KA1,           KB2,                               KB5,      KB6,   KA7, KB8, KA8  \
-) { \
-  {  K00, K01, K02, K03, K04, KNO, K06, K07, K08  }, \
-  {  KNO, K11, K12, K13, K14, K15, K16, K17, K18  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, K27, K28  }, \
-  {  K30, K31, K32, K33, K34, K35, K36, K37, K38  }, \
-  {  K40, K41, K42, K43, K44, K45, K46, K47, K48  }, \
-  {  K50, K51, K52, K53, K54, K55, KNO, K57, K58  }, \
-  {  K60, K61, K62, K63, K64, K65, K66, KNO, KNO  }, \
-  {  K70, K71, K72, K73, K74, K75, KNO, KNO, KNO  }, \
-  {  K80, K81, K82, K83, K84, K85, K86, KNO, KNO  }, \
-  {  K90, K91, K92, K93, K94, KNO, K96, KNO, K98  }, \
-  {  KA0, KA1, KNO, KNO, KNO, KNO, KNO, KA7, KA8  }, \
-  {  KNO, KNO, KB2, KNO, KNO, KB5, KB6, KNO, KB8  } \
-}
diff --git a/keyboards/prototypist/allison/allison.c b/keyboards/prototypist/allison/allison.c
deleted file mode 100644
index 4ca8bd07de..0000000000
--- a/keyboards/prototypist/allison/allison.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "allison.h"
diff --git a/keyboards/prototypist/allison/config.h b/keyboards/prototypist/allison/config.h
index 95e391b036..9765ad6b1a 100644
--- a/keyboards/prototypist/allison/config.h
+++ b/keyboards/prototypist/allison/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D1, D0, B1, B2, D3}
-#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/prototypist/allison/info.json b/keyboards/prototypist/allison/info.json
index c8423baf41..d37ffbcaf4 100644
--- a/keyboards/prototypist/allison/info.json
+++ b/keyboards/prototypist/allison/info.json
@@ -8,6 +8,11 @@
         "pid": "0x414D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "F1", "F0"],
+        "rows": ["D2", "D1", "D0", "B1", "B2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 4,
diff --git a/keyboards/prototypist/allison_numpad/allison_numpad.c b/keyboards/prototypist/allison_numpad/allison_numpad.c
deleted file mode 100644
index 16f36e3140..0000000000
--- a/keyboards/prototypist/allison_numpad/allison_numpad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "allison_numpad.h"
diff --git a/keyboards/prototypist/allison_numpad/allison_numpad.h b/keyboards/prototypist/allison_numpad/allison_numpad.h
deleted file mode 100644
index 9295e68668..0000000000
--- a/keyboards/prototypist/allison_numpad/allison_numpad.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2020 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43, \
-    K50, K51, K52, K53  \
-) \
-{ \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, K33 }, \
-    { K40, K41, K42, K43 }, \
-    { K50, K51, K52, K53 }  \
-}
-
-#define LAYOUT_numpad_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22,      \
-    K30, K31, K32, K33, \
-    K40, K41, K42,      \
-    K50,      K52, K53  \
-) \
-{ \
-    { K00, K01,   K02, K03   }, \
-    { K10, K11,   K12, K13   }, \
-    { K20, K21,   K22, KC_NO }, \
-    { K30, K31,   K32, K33   }, \
-    { K40, K41,   K42, KC_NO }, \
-    { K50, KC_NO, K52, K53   }  \
-}
diff --git a/keyboards/prototypist/allison_numpad/config.h b/keyboards/prototypist/allison_numpad/config.h
index c26d0b1e19..9765ad6b1a 100644
--- a/keyboards/prototypist/allison_numpad/config.h
+++ b/keyboards/prototypist/allison_numpad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS { F6, F5, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/prototypist/allison_numpad/info.json b/keyboards/prototypist/allison_numpad/info.json
index 8931ff2dc4..9e20788a12 100644
--- a/keyboards/prototypist/allison_numpad/info.json
+++ b/keyboards/prototypist/allison_numpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x414E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F1", "F0"],
+        "rows": ["F4", "C7", "C6", "B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 4,
@@ -19,65 +24,65 @@
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,3", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"1,0", "x":0, "y":1.25},
-                {"label":"1,1", "x":1, "y":1.25},
-                {"label":"1,2", "x":2, "y":1.25},
-                {"label":"1,3", "x":3, "y":1.25},
+                {"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},
 
-                {"label":"2,0", "x":0, "y":2.25},
-                {"label":"2,1", "x":1, "y":2.25},
-                {"label":"2,2", "x":2, "y":2.25},
-                {"label":"2,3", "x":3, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
 
-                {"label":"3,0", "x":0, "y":3.25},
-                {"label":"3,1", "x":1, "y":3.25},
-                {"label":"3,2", "x":2, "y":3.25},
-                {"label":"3,3", "x":3, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
 
-                {"label":"4,0", "x":0, "y":4.25},
-                {"label":"4,1", "x":1, "y":4.25},
-                {"label":"4,2", "x":2, "y":4.25},
-                {"label":"4,3", "x":3, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
 
-                {"label":"5,0", "x":0, "y":5.25},
-                {"label":"5,1", "x":1, "y":5.25},
-                {"label":"5,2", "x":2, "y":5.25},
-                {"label":"5,3", "x":3, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,3", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"1,0", "x":0, "y":1.25},
-                {"label":"1,1", "x":1, "y":1.25},
-                {"label":"1,2", "x":2, "y":1.25},
-                {"label":"1,3", "x":3, "y":1.25},
+                {"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},
 
-                {"label":"2,0", "x":0, "y":2.25},
-                {"label":"2,1", "x":1, "y":2.25},
-                {"label":"2,2", "x":2, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
 
-                {"label":"3,0", "x":0, "y":3.25},
-                {"label":"3,1", "x":1, "y":3.25},
-                {"label":"3,2", "x":2, "y":3.25},
-                {"label":"3,3", "x":3, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
 
-                {"label":"4,0", "x":0, "y":4.25},
-                {"label":"4,1", "x":1, "y":4.25},
-                {"label":"4,2", "x":2, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
 
-                {"label":"5,0", "x":0, "y":5.25, "w":2},
-                {"label":"5,2", "x":2, "y":5.25},
-                {"label":"5,3", "x":3, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/prototypist/j01/config.h b/keyboards/prototypist/j01/config.h
index 4f003e3cfe..1d22c074e2 100644
--- a/keyboards/prototypist/j01/config.h
+++ b/keyboards/prototypist/j01/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, B2, B0, F6, F5 }
-#define MATRIX_COL_PINS { B1, F0, F7, F1, F4, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/prototypist/j01/info.json b/keyboards/prototypist/j01/info.json
index a5bf0c836a..513e923190 100644
--- a/keyboards/prototypist/j01/info.json
+++ b/keyboards/prototypist/j01/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6A31",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "F0", "F7", "F1", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B3", "B2", "B0", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
diff --git a/keyboards/prototypist/j01/j01.c b/keyboards/prototypist/j01/j01.c
deleted file mode 100644
index 4ebe2d351c..0000000000
--- a/keyboards/prototypist/j01/j01.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Shaun Mitchell (Flex)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "j01.h"
diff --git a/keyboards/prototypist/oceanographer/info.json b/keyboards/prototypist/oceanographer/info.json
index 1f589a540b..4fdaca429a 100644
--- a/keyboards/prototypist/oceanographer/info.json
+++ b/keyboards/prototypist/oceanographer/info.json
@@ -19,9 +19,11 @@
         ]
     },
 
+    "ws2812": {
+        "pin": "B3"
+    },
     "rgblight" : {
         "led_count": 3,
-        "pin": "B3",
         "sleep": true,
         "hue_steps": 10,
         "saturation_steps": 17,
diff --git a/keyboards/protozoa/cassini/config.h b/keyboards/protozoa/cassini/config.h
index ed52fe560d..3c86d94887 100644
--- a/keyboards/protozoa/cassini/config.h
+++ b/keyboards/protozoa/cassini/config.h
@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 }
-#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/protozoa/cassini/info.json b/keyboards/protozoa/cassini/info.json
index 422bb0ac71..26408ff1af 100644
--- a/keyboards/protozoa/cassini/info.json
+++ b/keyboards/protozoa/cassini/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4341",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "on_state": 0
diff --git a/keyboards/protozoa/p01/config.h b/keyboards/protozoa/p01/config.h
index e3f3faca9c..19bddd08a4 100644
--- a/keyboards/protozoa/p01/config.h
+++ b/keyboards/protozoa/p01/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B1, B2, B10, B11, B12, B13 }
-#define MATRIX_COL_PINS { A14, A15, B3, B4, B5, B6, B7, B8, B9, A0, A1, A2, A3, A4, A5, A6, A7, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Light */
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 2
@@ -31,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM5
 #define WS2812_DMA_CHANNEL 5  
 
-#define RGB_DI_PIN A9
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/protozoa/p01/info.json b/keyboards/protozoa/p01/info.json
index 77e1449458..6293b4342c 100644
--- a/keyboards/protozoa/p01/info.json
+++ b/keyboards/protozoa/p01/info.json
@@ -8,6 +8,15 @@
         "pid": "0x5031",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A9",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
+        "rows": ["B1", "B2", "B10", "B11", "B12", "B13"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B15", "pin_b": "B14"}
diff --git a/keyboards/protozoa/p01/p01.c b/keyboards/protozoa/p01/p01.c
deleted file mode 100644
index b0a14e1212..0000000000
--- a/keyboards/protozoa/p01/p01.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "p01.h"
diff --git a/keyboards/protozoa/p01/rules.mk b/keyboards/protozoa/p01/rules.mk
index 931b88745f..a9e8e0f92e 100644
--- a/keyboards/protozoa/p01/rules.mk
+++ b/keyboards/protozoa/p01/rules.mk
@@ -17,6 +17,5 @@ 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
-WS2812_DRIVER = pwm         # Driver for RGB uderglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Encoder support
diff --git a/keyboards/psuieee/pluto12/config.h b/keyboards/psuieee/pluto12/config.h
index 91922c6d95..cabf72507f 100644
--- a/keyboards/psuieee/pluto12/config.h
+++ b/keyboards/psuieee/pluto12/config.h
@@ -3,14 +3,6 @@
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D0, D4, C6 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/psuieee/pluto12/info.json b/keyboards/psuieee/pluto12/info.json
index 752b2ab97f..d997f60cfa 100644
--- a/keyboards/psuieee/pluto12/info.json
+++ b/keyboards/psuieee/pluto12/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7012",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5"],
+        "rows": ["D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "B2"}
@@ -18,18 +23,20 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "M1", "x": 0, "y": 0 },
-                { "label": "M2", "x": 1, "y": 0 },
-                { "label": "M3", "x": 2, "y": 0 },
-                { "label": "M4", "x": 3, "y": 0 },
-                { "label": "M5", "x": 0, "y": 1 },
-                { "label": "M6", "x": 1, "y": 1 },
-                { "label": "M7", "x": 2, "y": 1 },
-                { "label": "M8", "x": 3, "y": 1 },
-                { "label": "M9", "x": 0, "y": 2 },
-                { "label": "M10", "x": 1, "y": 2 },
-                { "label": "M11", "x": 2, "y": 2 },
-                { "label": "M12", "x": 3, "y": 2 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2}
             ]
         }
     }
diff --git a/keyboards/psuieee/pluto12/pluto12.c b/keyboards/psuieee/pluto12/pluto12.c
deleted file mode 100644
index 15d5fad99f..0000000000
--- a/keyboards/psuieee/pluto12/pluto12.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021-22 Will McGloughlin (@wymcg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "pluto12.h"
diff --git a/keyboards/psuieee/pluto12/pluto12.h b/keyboards/psuieee/pluto12/pluto12.h
deleted file mode 100644
index fc3f391156..0000000000
--- a/keyboards/psuieee/pluto12/pluto12.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2021-22 Will McGloughlin (@wymcg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23 \
-) { \
-    {K00, K01, K02, K03}, \
-    {K10, K11, K12, K13}, \
-    {K20, K21, K22, K23} \
-}
diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h
index be1de23f83..d661f794cc 100644
--- a/keyboards/pteron36/config.h
+++ b/keyboards/pteron36/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, D7, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3,  B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -59,5 +42,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DYNAMIC_KEYMAP_LAYER_COUNT 7
 
 //RGB Underglow
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 10
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json
index c65b15cfb2..bb5a8ee1eb 100644
--- a/keyboards/pteron36/info.json
+++ b/keyboards/pteron36/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5054",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2"],
+        "rows": ["E6", "D7", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F4"}
@@ -23,96 +28,107 @@
             }
         }
     },
+    "ws2812": {
+        "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"x":0, "y":1},
-                {"x":1, "y":0.5},
-                {"x":2, "y":0},
-                {"x":3, "y":0.5},
-                {"x":4, "y":0.75},
-                {"x":10, "y":0.75},
-                {"x":11, "y":0.5},
-                {"x":12, "y":0},
-                {"x":13, "y":0.5},
-                {"x":14, "y":1},
+                {"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},
 
-                {"x":0, "y":2},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.75},
-                {"x":10, "y":1.75},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1},
-                {"x":13, "y":1.5},
-                {"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},
 
-                {"x":0, "y":3},
-                {"x":1, "y":2.5},
-                {"x":2, "y":2},
-                {"x":3, "y":2.5},
-                {"x":4, "y":2.75},
-                {"x":10, "y":2.75},
-                {"x":11, "y":2.5},
-                {"x":12, "y":2},
-                {"x":13, "y":2.5},
-                {"x":14, "y":3},
+                {"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},
 
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4},
-                {"x":10, "y":4}
+                {"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": [
-                {"x":0, "y":1},
-                {"x":1, "y":0.5},
-                {"x":2, "y":0},
-                {"x":3, "y":0.5},
-                {"x":4, "y":0.75},
-                {"x":10, "y":0.75},
-                {"x":11, "y":0.5},
-                {"x":12, "y":0},
-                {"x":13, "y":0.5},
-                {"x":14, "y":1},
+                {"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},
 
-                {"x":0, "y":2},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.75},
-                {"x":10, "y":1.75},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1},
-                {"x":13, "y":1.5},
-                {"x":14, "y":2},
+                {"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},
 
-                {"x":0, "y":3},
-                {"x":1, "y":2.5},
-                {"x":2, "y":2},
-                {"x":3, "y":2.5},
-                {"x":4, "y":2.75},
-                {"label":"enc1", "x":5.5, "y":2.75},
-                {"label":"enc2", "x":8.5, "y":2.75},
-                {"x":10, "y":2.75},
-                {"x":11, "y":2.5},
-                {"x":12, "y":2},
-                {"x":13, "y":2.5},
-                {"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},
 
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4},
-                {"x":10, "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/pteron36.c b/keyboards/pteron36/pteron36.c
index 4c14e6ebd5..fbcc64b706 100644
--- a/keyboards/pteron36/pteron36.c
+++ b/keyboards/pteron36/pteron36.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pteron36.h"
+#include "quantum.h"
 
 //common encoder setup
 
diff --git a/keyboards/pteron36/pteron36.h b/keyboards/pteron36/pteron36.h
deleted file mode 100644
index 113e7270db..0000000000
--- a/keyboards/pteron36/pteron36.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2021 Harshit Goel
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_split_3x5_3( \
-     L00, L01, L02,L03, L04 ,            R04, R03, R02, R01, R00,\
-     L10, L11, L12,L13, L14 ,             R14, R13, R12, R11, R10,\
-     L20, L21, L22,L23, L24 ,             R24, R23, R22, R21, R20, \
-                L30, L31, L32,   R32, R31, R30\
-) {\
-     {L00, L01, L02,L03, L04 },\
-     {L10, L11, L12,L13, L14 },\
-    {L20, L21, L22,L23, L24 },\
-    {L30, L31, L32, KC_NO, KC_NO },\
-    {R00, R01, R02,R03, R04 },\
-    {R10, R11, R12,R13, R14 },\
-    {R20, R21, R22,R23, R24 },\
-    {R30, R31, R32,KC_NO, KC_NO }\
-}
-#define LAYOUT_split_3x5_3_encoder(\
-     L00, L01, L02,L03, L04 ,            R04, R03, R02, R01, R00,\
-     L10, L11, L12,L13, L14 ,             R14, R13, R12, R11, R10,\
-     L20, L21, L22,L23, L24 ,L34,       R34,R24, R23, R22, R21, R20, \
-                L30, L31, L32,   R32, R31, R30\
-){\
-     {L00, L01, L02,L03, L04 },\
-     {L10, L11, L12,L13, L14 },\
-    {L20, L21, L22,L23, L24 },\
-    {L30, L31, L32, KC_NO, L34 },\
-    {R00, R01, R02,R03, R04 },\
-    {R10, R11, R12,R13, R14 },\
-    {R20, R21, R22,R23, R24 },\
-    {R30, R31, R32,KC_NO, R34 }\
-}
diff --git a/keyboards/puck/config.h b/keyboards/puck/config.h
index 26dda7d8fa..2f38776326 100644
--- a/keyboards/puck/config.h
+++ b/keyboards/puck/config.h
@@ -1,11 +1,4 @@
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D2, D3, C6, C7 }
-#define MATRIX_COL_PINS { B4, D7, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/puck/info.json b/keyboards/puck/info.json
index f56b1ceef8..25abece192 100644
--- a/keyboards/puck/info.json
+++ b/keyboards/puck/info.json
@@ -8,23 +8,31 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B4", "D7", "D6"],
+    "rows": ["D2", "D3", "C6", "C7"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"SW1", "x":0, "y":0}, 
-        {"label":"SW2", "x":1, "y":0}, 
-        {"label":"SW3", "x":2, "y":0}, 
-        {"label":"SW4", "x":0, "y":1}, 
-        {"label":"SW5", "x":1, "y":1}, 
-        {"label":"SW6", "x":2, "y":1}, 
-        {"label":"SW7", "x":0, "y":2}, 
-        {"label":"SW8", "x":1, "y":2}, 
-        {"label":"SW9", "x":2, "y":2}, 
-        {"label":"SW10", "x":0, "y":3}, 
-        {"label":"SW11", "x":1, "y":3}, 
-        {"label":"SW12", "x":2, "y":3}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3}
       ]
     }
   }
diff --git a/keyboards/puck/puck.c b/keyboards/puck/puck.c
deleted file mode 100644
index 0e26b9c3cd..0000000000
--- a/keyboards/puck/puck.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "puck.h"
diff --git a/keyboards/puck/puck.h b/keyboards/puck/puck.h
deleted file mode 100644
index 31fff79555..0000000000
--- a/keyboards/puck/puck.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22, \
-    k30, k31, k32 \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 }, \
-    { k30, k31, k32 } \
-}
diff --git a/keyboards/punk75/config.h b/keyboards/punk75/config.h
index ba9c6fdc71..a8b9af7999 100644
--- a/keyboards/punk75/config.h
+++ b/keyboards/punk75/config.h
@@ -17,24 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D6, D5, C1, C0, D7 }
-#define MATRIX_COL_PINS { C2, C3, C6, C5, C4, A7, A6, A5, A4, B4, A3, B3, A2, B2, A1 }
 #define LED A0
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 500
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/punk75/info.json b/keyboards/punk75/info.json
index b232007bb2..81f2bcc818 100644
--- a/keyboards/punk75/info.json
+++ b/keyboards/punk75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C2", "C3", "C6", "C5", "C4", "A7", "A6", "A5", "A4", "B4", "A3", "B3", "A2", "B2", "A1"],
+        "rows": ["D6", "D5", "C1", "C0", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1"},
@@ -20,85 +25,85 @@
     "layouts": {
         "LAYOUT_ortho_5x15": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":7, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/punk75/punk75.c b/keyboards/punk75/punk75.c
index 045e3c2669..aaabefb5aa 100644
--- a/keyboards/punk75/punk75.c
+++ b/keyboards/punk75/punk75.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "punk75.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     // Set our LED pin as output
diff --git a/keyboards/punk75/punk75.h b/keyboards/punk75/punk75.h
deleted file mode 100644
index 6e89e5d2a7..0000000000
--- a/keyboards/punk75/punk75.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 dsanchezseco
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x15( \
-    k01, k06, k11, k16, k21, k26, k31, k36, k41, k46, k51, k56, k61, k66, k71, \
-    k02, k07, k12, k17, k22, k27, k32, k37, k42, k47, k52, k57, k62, k67, k72, \
-    k03, k08, k13, k18, k23, k28, k33, k38, k43, k48, k53, k58, k63, k68, k73, \
-    k04, k09, k14, k19, k24, k29, k34, k39, k44, k49, k54, k59, k64, k69, k74, \
-    k05, k10, k15, k20, k25, k30, k35, k40, k45, k50, k55, k60, k65, k70, k75 \
-) { \
-    { k01, k06, k11, k16, k21, k26, k31, k36, k41, k46, k51, k56, k61, k66, k71 }, \
-    { k02, k07, k12, k17, k22, k27, k32, k37, k42, k47, k52, k57, k62, k67, k72 }, \
-    { k03, k08, k13, k18, k23, k28, k33, k38, k43, k48, k53, k58, k63, k68, k73 }, \
-    { k04, k09, k14, k19, k24, k29, k34, k39, k44, k49, k54, k59, k64, k69, k74 }, \
-    { k05, k10, k15, k20, k25, k30, k35, k40, k45, k50, k55, k60, k65, k70, k75 } \
-}
-
-//TODO: other layouts with the 2u keys
diff --git a/keyboards/q4z/config.h b/keyboards/q4z/config.h
index eea6fcc076..67553a4432 100644
--- a/keyboards/q4z/config.h
+++ b/keyboards/q4z/config.h
@@ -15,23 +15,6 @@
  */ 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { D1, D0, D4, B6, B2, B3, B1, F7, F6, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/q4z/info.json b/keyboards/q4z/info.json
index aed372df94..3e000db2d2 100644
--- a/keyboards/q4z/info.json
+++ b/keyboards/q4z/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "B6", "B2", "B3", "B1", "F7", "F6", "F5"],
+        "rows": ["F4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/q4z/keymaps/default/config.h b/keyboards/q4z/keymaps/default/config.h
index ac3a08778d..c129199230 100644
--- a/keyboards/q4z/keymaps/default/config.h
+++ b/keyboards/q4z/keymaps/default/config.h
@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods
-
 #ifdef COMBO_ENABLE
 #define COMBO_COUNT 5
 #define COMBO_TERM 200
diff --git a/keyboards/q4z/keymaps/rjboone/config.h b/keyboards/q4z/keymaps/rjboone/config.h
index 9921a19178..7530b24262 100644
--- a/keyboards/q4z/keymaps/rjboone/config.h
+++ b/keyboards/q4z/keymaps/rjboone/config.h
@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods
-
 #undef TAPPING_TERM
 #define TAPPING_TERM 300
 
diff --git a/keyboards/q4z/q4z.c b/keyboards/q4z/q4z.c
deleted file mode 100644
index 537f1f5780..0000000000
--- a/keyboards/q4z/q4z.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 rjboone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "q4z.h"
diff --git a/keyboards/qpockets/eggman/config.h b/keyboards/qpockets/eggman/config.h
deleted file mode 100644
index eac213400a..0000000000
--- a/keyboards/qpockets/eggman/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Alan Lehners
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#pragma once
-
-
-#define MATRIX_ROW_PINS { C4, C5, C2, D0, B5, B6, D6 }
-#define MATRIX_COL_PINS { B7, B4, B3, B2, D3, D2, D1 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/qpockets/eggman/eggman.c b/keyboards/qpockets/eggman/eggman.c
deleted file mode 100644
index 2287b9e278..0000000000
--- a/keyboards/qpockets/eggman/eggman.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Alan Lehners
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "eggman.h"
diff --git a/keyboards/qpockets/eggman/eggman.h b/keyboards/qpockets/eggman/eggman.h
deleted file mode 100644
index 4d4c4a1241..0000000000
--- a/keyboards/qpockets/eggman/eggman.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Alan Lehners
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_default( \
-				        K02,      K04, \
-	K10, K00, K11, K01, K12, K13, K14, K05, K15, K06, K16, \
-	K30, K20, K31, K21, K32, K33, K34, K25, K35, K26, K36, \
-	K50, K40, K51, K41, K52, K53, K54, K45, K55, K46, K56, \
-              K61, K62,      K64, K65 \
-) \
-{ \
-{ K00, K01, K02, XXX, K04, K05, K06 }, \
-{ K10, K11, K12, K13, K14, K15, K16 }, \
-{ K20, K21, XXX, XXX, XXX, K25, K26 }, \
-{ K30, K31, K32, K33, K34, K35, K36 }, \
-{ K40, K41, XXX, XXX, XXX, K45, K46 }, \
-{ K50, K51, K52, K53, K54, K55, K56 }, \
-{ XXX, K61, K62, XXX, K64, K65, XXX }, \
-}
-
diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json
index 989402411d..1dbf27825c 100644
--- a/keyboards/qpockets/eggman/info.json
+++ b/keyboards/qpockets/eggman/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x656D",
     	"device_version": "10.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B4", "B3", "B2", "D3", "D2", "D1"],
+        "rows": ["C4", "C5", "C2", "D0", "B5", "B6", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
     	"rotary": [
     		{"pin_a": "C6", "pin_b": "C7"},
@@ -19,45 +24,51 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-			{"label":"RE", "x":4.25, "y":0}, 
-			{"label":"RE", "x":6.25, "y":0}, 
-			{"label":"Q", "x":0, "y":0.75}, 
-			{"label":"W", "x":1, "y":0.5}, 
-			{"label":"E", "x":2, "y":0.25}, 
-			{"label":"R", "x":3, "y":0.75}, 
-			{"label":"T", "x":4, "y":1}, 
-			{"label":"Delete", "x":5, "y":1, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":1}, 
-			{"label":"U", "x":7.5, "y":0.75}, 
-			{"label":"I", "x":8.5, "y":0.25}, 
-			{"label":"O", "x":9.5, "y":0.5}, 
-			{"label":"P", "x":10.5, "y":0.75}, 
-			{"label":"A", "x":0, "y":1.75}, 
-			{"label":"S", "x":1, "y":1.5},  
-			{"label":"D", "x":2, "y":1.25}, 
-			{"label":"F", "x":3, "y":1.75}, 
-			{"label":"G", "x":4, "y":2}, 
-			{"label":"Tab", "x":5, "y":2, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":2}, 
-			{"label":"J", "x":7.5, "y":1.75}, 
-			{"label":"K", "x":8.5, "y":1.25}, 
-			{"label":"L", "x":9.5, "y":1.5}, 
-			{"label":"\"", "x":10.5, "y":1.75}, 
-			{"label":"Z", "x":0, "y":2.75}, 
-			{"label":"X", "x":1, "y":2.5}, 
-			{"label":"C", "x":2, "y":2.25}, 
-			{"label":"V", "x":3, "y":2.75}, 
-			{"label":"B", "x":4, "y":3}, 
-			{"label":"Shift", "x":5, "y":3, "w":1.5},  
-			{"label":"N", "x":6.5, "y":3}, 
-			{"label":"M", "x":7.5, "y":2.75}, 
-			{"label":"<", "x":8.5, "y":2.25}, 
-			{"label":">", "x":9.5, "y":2.5}, 
-			{"label":"?", "x":10.5, "y":2.75}, 
-			{"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, 
-			{"label":"Backspace", "x":3.75, "y":4, "w":2}, 
-			{"label":"Space", "x":5.75, "y":4, "w":2}, 
-			{"label":"Alt", "x":7.75, "y":4, "w":1.25}] 
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 0], "x": 1, "y": 0.5},
+                {"matrix": [1, 1], "x": 2, "y": 0.25},
+                {"matrix": [0, 1], "x": 3, "y": 0.75},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1, "w": 1.5},
+                {"matrix": [1, 4], "x": 6.5, "y": 1},
+                {"matrix": [0, 5], "x": 7.5, "y": 0.75},
+                {"matrix": [1, 5], "x": 8.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 9.5, "y": 0.5},
+                {"matrix": [1, 6], "x": 10.5, "y": 0.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 1.75},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 1], "x": 2, "y": 1.25},
+                {"matrix": [2, 1], "x": 3, "y": 1.75},
+                {"matrix": [3, 2], "x": 4, "y": 2},
+                {"matrix": [3, 3], "x": 5, "y": 2, "w": 1.5},
+                {"matrix": [3, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 1.75},
+                {"matrix": [3, 5], "x": 8.5, "y": 1.25},
+                {"matrix": [2, 6], "x": 9.5, "y": 1.5},
+                {"matrix": [3, 6], "x": 10.5, "y": 1.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 2.75},
+                {"matrix": [4, 0], "x": 1, "y": 2.5},
+                {"matrix": [5, 1], "x": 2, "y": 2.25},
+                {"matrix": [4, 1], "x": 3, "y": 2.75},
+                {"matrix": [5, 2], "x": 4, "y": 3},
+                {"matrix": [5, 3], "x": 5, "y": 3, "w": 1.5},
+                {"matrix": [5, 4], "x": 6.5, "y": 3},
+                {"matrix": [4, 5], "x": 7.5, "y": 2.75},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 10.5, "y": 2.75},
+
+                {"matrix": [6, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [6, 2], "x": 3.75, "y": 4, "w": 2},
+                {"matrix": [6, 4], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [6, 5], "x": 7.75, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/qpockets/eggman/keymaps/default/config.h b/keyboards/qpockets/eggman/keymaps/default/config.h
index dd1d9753fd..90d12ee7da 100644
--- a/keyboards/qpockets/eggman/keymaps/default/config.h
+++ b/keyboards/qpockets/eggman/keymaps/default/config.h
@@ -18,7 +18,6 @@
 
 /*Modtaps*/
 #define TAPPING_TERM 175
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*Combos*/
 #ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h
index 22c2bc73de..3caf7fdbcb 100644
--- a/keyboards/qpockets/space_space/rev1/config.h
+++ b/keyboards/qpockets/space_space/rev1/config.h
@@ -16,14 +16,4 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { F1, F4, F5, C7 }
-#define MATRIX_COL_PINS \
-    { D4, B4, B5, B6, C6, F7, F6, F0, B0, E6, B1 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json
index cd9dcb56a8..32d744c0a9 100644
--- a/keyboards/qpockets/space_space/rev1/info.json
+++ b/keyboards/qpockets/space_space/rev1/info.json
@@ -8,6 +8,11 @@
   	"pid": "0x7373",
   	"device_version": "30.0.0"
   },
+  "matrix_pins": {
+    "cols": ["D4", "B4", "B5", "B6", "C6", "F7", "F6", "F0", "B0", "E6", "B1"],
+    "rows": ["F1", "F4", "F5", "C7"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
   	"rotary": [
   		{"pin_a": "B3", "pin_b": "B2", "resolution": 3},
@@ -19,86 +24,92 @@
   "debounce": 7,
   "layouts": {
     "LAYOUT_default": {
-	  "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Fn", "x":2.5, "y":3.35}, 
-			{"label":"Backspace", "x":3.5, "y":3.35, "w":2}, 
-			{"label":"Space", "x":5.5, "y":3.35, "w":2.25}, 
-			{"label":"Gui", "x":7.75, "y":3.35}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0, "w": 1.5},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+        {"matrix": [0, 10], "x": 10.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, "w": 1.5},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.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, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 3], "x": 2.5, "y": 3.35},
+        {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2},
+        {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.35},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
       ]
     },
-	    "LAYOUT_big_space": {
+    "LAYOUT_big_space": {
       "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Space", "x":2.5, "y":3.35, "w":6.25}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0, "w": 1.5},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+        {"matrix": [0, 10], "x": 10.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, "w": 1.5},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.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, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
       ]
     }
   }
diff --git a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
index ffc2124e1b..fd24168f47 100644
--- a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
+++ b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
@@ -18,7 +18,6 @@
 
 /*Modtaps*/
 #define TAPPING_TERM 175
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*Combos*/
 #ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
index ffc2124e1b..fd24168f47 100644
--- a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
+++ b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
@@ -18,7 +18,6 @@
 
 /*Modtaps*/
 #define TAPPING_TERM 175
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*Combos*/
 #ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/space_space/rev1/rev1.c b/keyboards/qpockets/space_space/rev1/rev1.c
deleted file mode 100644
index e639552cfb..0000000000
--- a/keyboards/qpockets/space_space/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-/* Copyright 2020 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/qpockets/space_space/rev1/rev1.h b/keyboards/qpockets/space_space/rev1/rev1.h
deleted file mode 100644
index e56068ec42..0000000000
--- a/keyboards/qpockets/space_space/rev1/rev1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2020 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32, K33, K34,      K36, K37, K38 \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-    {XXX, XXX, K32, K33, K34, XXX, K36, K37, K38, XXX, XXX} \
-}
-
-#define LAYOUT_big_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32,           K35,           K38 \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-    {XXX, XXX, K32, XXX, XXX, K35, XXX, XXX, K38, XXX, XXX} \
-}
diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
index 26b85360c4..6603c0e153 100644
--- a/keyboards/qpockets/space_space/rev2/config.h
+++ b/keyboards/qpockets/space_space/rev2/config.h
@@ -16,19 +16,8 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { B1, B0, D5, B6 }
-#define MATRIX_COL_PINS \
-    { C6, F6, F1, F4, F5, E6, D6, B2, B5, D3, D2 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 
-#define RGB_DI_PIN F0
 #define RGBLED_NUM 4
 
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
index 580ab0a4d5..949b80bd3b 100644
--- a/keyboards/qpockets/space_space/rev2/info.json
+++ b/keyboards/qpockets/space_space/rev2/info.json
@@ -8,96 +8,110 @@
   	"pid": "0x7373",
   	"device_version": "30.0.2"
   },
+  "matrix_pins": {
+    "cols": ["C6", "F6", "F1", "F4", "F5", "E6", "D6", "B2", "B5", "D3", "D2"],
+    "rows": ["B1", "B0", "D5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
   	"rotary": [
   		{"pin_a": "B4", "pin_b": "D7", "resolution": 3},
   		{"pin_a": "C7", "pin_b": "F7", "resolution": 3}
   	]
   },
+  "ws2812": {
+  	"pin": "F0"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_default": {
-	  "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Fn", "x":2.5, "y":3.35}, 
-			{"label":"Backspace", "x":3.5, "y":3.35, "w":2}, 
-			{"label":"Space", "x":5.5, "y":3.35, "w":2.25}, 
-			{"label":"Gui", "x":7.75, "y":3.35}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0, "w": 1.5},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+        {"matrix": [0, 10], "x": 10.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, "w": 1.5},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.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, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 3], "x": 2.5, "y": 3.35},
+        {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2},
+        {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.35},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
       ]
     },
-	    "LAYOUT_big_space": {
+    "LAYOUT_big_space": {
       "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Space", "x":2.5, "y":3.35, "w":6.25}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0, "w": 1.5},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+        {"matrix": [0, 10], "x": 10.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, "w": 1.5},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.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, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
       ]
     }
   }
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
index ffc2124e1b..fd24168f47 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
+++ b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
@@ -18,7 +18,6 @@
 
 /*Modtaps*/
 #define TAPPING_TERM 175
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*Combos*/
 #ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
index 0b0e89fa1f..7fdb8504a6 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
+++ b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
@@ -18,7 +18,6 @@
 
 /*Modtaps*/
 #define TAPPING_TERM 165
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*Combos*/
 #ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
index bf8c47eb3e..31291ecc8f 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
+++ b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
@@ -18,7 +18,6 @@
 
 /*Modtaps*/
 #define TAPPING_TERM 145
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*Combos*/
 #ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/space_space/rev2/rev2.c b/keyboards/qpockets/space_space/rev2/rev2.c
index 07b93b36aa..e6053afb75 100644
--- a/keyboards/qpockets/space_space/rev2/rev2.c
+++ b/keyboards/qpockets/space_space/rev2/rev2.c
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev2.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/qpockets/space_space/rev2/rev2.h b/keyboards/qpockets/space_space/rev2/rev2.h
deleted file mode 100644
index 99362b900f..0000000000
--- a/keyboards/qpockets/space_space/rev2/rev2.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32, K33, K34,      K36, K37, K38 \
-) \
-{ \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-    {XXX, XXX, K32, K33, K34, XXX, K36, K37, K38, XXX, XXX} \
-} \
-
-#define LAYOUT_big_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32,           K35,           K38 \
-) \
-{ \
-   {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-   {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-   {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-   {XXX, XXX, K32, XXX, XXX, K35, XXX, XXX, K38, XXX, XXX} \
-}
-
-
diff --git a/keyboards/qpockets/wanten/config.h b/keyboards/qpockets/wanten/config.h
deleted file mode 100644
index a811be9a74..0000000000
--- a/keyboards/qpockets/wanten/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2021 qpockets
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F7, B3, D5 }
-#define MATRIX_COL_PINS { F4, F1, B5, B6, C6, C7, D4, E6, D2, B1, B2, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/qpockets/wanten/info.json b/keyboards/qpockets/wanten/info.json
index e35237a358..4cb26a4365 100644
--- a/keyboards/qpockets/wanten/info.json
+++ b/keyboards/qpockets/wanten/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x7774",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "B5", "B6", "C6", "C7", "D4", "E6", "D2", "B1", "B2", "D3"],
+        "rows": ["F0", "F7", "B3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
     	"rotary": [
     		{"pin_a": "F5", "pin_b": "F6"},
@@ -20,148 +25,155 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-			{"label":"Play", "x":0, "y":0}, 
-			{"label":"q", "x":1, "y":0}, 
-			{"label":"w", "x":2, "y":0}, 
-			{"label":"e", "x":3, "y":0}, 
-			{"label":"r", "x":4, "y":0}, 
-			{"label":"t", "x":5, "y":0}, 
-			{"label":"Del", "x":6, "y":0, "w":1.75}, 
-			{"label":"y", "x":7.75, "y":0}, 
-			{"label":"u", "x":8.75, "y":0}, 
-			{"label":"i", "x":9.75, "y":0}, 
-			{"label":"o", "x":10.75, "y":0}, 
-			{"label":"p", "x":11.75, "y":0}, 
-			{"label":"Next", "x":0, "y":1}, 
-			{"label":"a", "x":1, "y":1}, 
-			{"label":"s", "x":2, "y":1}, 
-			{"label":"d", "x":3, "y":1}, 
-			{"label":"f", "x":4, "y":1}, 
-			{"label":"g", "x":5, "y":1}, 
-			{"label":"Tab", "x":6, "y":1, "w":1.75}, 
-			{"label":"h", "x":7.75, "y":1}, 
-			{"label":"j", "x":8.75, "y":1}, 
-			{"label":"k", "x":9.75, "y":1}, 
-			{"label":"l", "x":10.75, "y":1}, 
-			{"label":"\"", "x":11.75, "y":1}, 
-			{"label":"Prev", "x":0, "y":2}, 
-			{"label":"z", "x":1, "y":2}, 
-			{"label":"x", "x":2, "y":2}, 
-			{"label":"c", "x":3, "y":2}, 
-			{"label":"v", "x":4, "y":2}, 
-			{"label":"b", "x":5, "y":2}, 
-			{"label":"Shift", "x":6, "y":2, "w":1.75}, 
-			{"label":"n", "x":7.75, "y":2}, 
-			{"label":"m", "x":8.75, "y":2}, 
-			{"label":"<", "x":9.75, "y":2}, 
-			{"label":">", "x":10.75, "y":2}, 
-			{"label":"?", "x":11.75, "y":2}, 
-			{"label":"LCtrl", "x":0, "y":3, "w":1.25}, 
-			{"label":"LGui", "x":1.25, "y":3, "w":1.25}, 
-			{"label":"LAlt", "x":2.5, "y":3, "w":1.25}, 
-			{"label":"Back", "x":3.75, "y":3, "w":3}, 
-			{"label":"Space", "x":6.75, "y":3, "w":3}, 
-			{"label":"RCtrl", "x":9.75, "y":3}, 
-			{"label":"RGui", "x":10.75, "y":3}, 
-			{"label":"RAlt", "x":11.75, "y":3}
-			]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0, "w": 1.75},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "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, "w": 1.75},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "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, "w": 1.75},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.75, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
+            ]
         },
-		
-		"LAYOUT_2u_bars": {
+        "LAYOUT_2u_bars": {
             "layout": [
-			{"label":"Play", "x":0, "y":0}, 
-			{"label":"q", "x":1, "y":0}, 
-			{"label":"w", "x":2, "y":0}, 
-			{"label":"e", "x":3, "y":0}, 
-			{"label":"r", "x":4, "y":0}, 
-			{"label":"t", "x":5, "y":0}, 
-			{"label":"Del", "x":6, "y":0, "w":1.75}, 
-			{"label":"y", "x":7.75, "y":0}, 
-			{"label":"u", "x":8.75, "y":0}, 
-			{"label":"i", "x":9.75, "y":0}, 
-			{"label":"o", "x":10.75, "y":0}, 
-			{"label":"p", "x":11.75, "y":0}, 
-			{"label":"Next", "x":0, "y":1}, 
-			{"label":"a", "x":1, "y":1}, 
-			{"label":"s", "x":2, "y":1}, 
-			{"label":"d", "x":3, "y":1}, 
-			{"label":"f", "x":4, "y":1}, 
-			{"label":"g", "x":5, "y":1}, 
-			{"label":"Tab", "x":6, "y":1, "w":1.75}, 
-			{"label":"h", "x":7.75, "y":1}, 
-			{"label":"j", "x":8.75, "y":1}, 
-			{"label":"k", "x":9.75, "y":1}, 
-			{"label":"l", "x":10.75, "y":1}, 
-			{"label":"\"", "x":11.75, "y":1}, 
-			{"label":"Prev", "x":0, "y":2}, 
-			{"label":"z", "x":1, "y":2}, 
-			{"label":"x", "x":2, "y":2}, 
-			{"label":"c", "x":3, "y":2}, 
-			{"label":"v", "x":4, "y":2}, 
-			{"label":"b", "x":5, "y":2}, 
-			{"label":"Shift", "x":6, "y":2, "w":1.75}, 
-			{"label":"n", "x":7.75, "y":2}, 
-			{"label":"m", "x":8.75, "y":2}, 
-			{"label":"<", "x":9.75, "y":2}, 
-			{"label":">", "x":10.75, "y":2}, 
-			{"label":"?", "x":11.75, "y":2}, 
-			{"label":"PSCR", "x":0, "y":3, "w":1.25}, 
-			{"label":"LAlt", "x":1.25, "y":3, "w":1.25}, 
-			{"label":"LGui", "x":2.5, "y":3, "w":1.25}, 
-			{"label":"LCtl", "x":3.75, "y":3}, 
-			{"label":"Back", "x":4.75, "y":3, "w":2}, 
-			{"label":"Space", "x":6.75, "y":3, "w":2.25}, 
-			{"label":"RCtrl", "x":9, "y":3}, 
-			{"label":"RGui", "x":10, "y":3, "w":1.25}, 
-			{"label":"RAlt", "x":11.25, "y":3, "w":1.5}
-			]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0, "w": 1.75},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "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, "w": 1.75},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "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, "w": 1.75},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5}
+            ]
         },
-		
         "LAYOUT_625_bar": {
             "layout": [
-			{"label":"Play", "x":0, "y":0},
-			{"label":"q", "x":1, "y":0},
-			{"label":"w", "x":2, "y":0},
-			{"label":"e", "x":3, "y":0},
-			{"label":"r", "x":4, "y":0},
-			{"label":"t", "x":5, "y":0},
-			{"label":"Del", "x":6, "y":0, "w":1.75},
-			{"label":"y", "x":7.75, "y":0},
-			{"label":"u", "x":8.75, "y":0},
-			{"label":"i", "x":9.75, "y":0},
-			{"label":"o", "x":10.75, "y":0},
-			{"label":"p", "x":11.75, "y":0},
-			{"label":"Next", "x":0, "y":1},
-			{"label":"a", "x":1, "y":1},
-			{"label":"s", "x":2, "y":1},
-			{"label":"d", "x":3, "y":1},
-			{"label":"f", "x":4, "y":1},
-			{"label":"g", "x":5, "y":1},
-			{"label":"Tab", "x":6, "y":1, "w":1.75},
-			{"label":"h", "x":7.75, "y":1},
-			{"label":"j", "x":8.75, "y":1},
-			{"label":"k", "x":9.75, "y":1},
-			{"label":"l", "x":10.75, "y":1},
-			{"label":"\"", "x":11.75, "y":1},
-			{"label":"Prev", "x":0, "y":2},
-			{"label":"z", "x":1, "y":2},
-			{"label":"x", "x":2, "y":2},
-			{"label":"c", "x":3, "y":2},
-			{"label":"v", "x":4, "y":2},
-			{"label":"b", "x":5, "y":2},
-			{"label":"Shift", "x":6, "y":2, "w":1.75},
-			{"label":"n", "x":7.75, "y":2},
-			{"label":"m", "x":8.75, "y":2},
-			{"label":"<", "x":9.75, "y":2},
-			{"label":">", "x":10.75, "y":2},
-			{"label":"?", "x":11.75, "y":2},
-			{"label":"LAlt", "x":0, "y":3, "w":1.25},
-			{"label":"LGui", "x":1.25, "y":3, "w":1.25},
-			{"label":"LCtrl", "x":2.5, "y":3, "w":1.25},
-			{"label":"Space", "x":3.75, "y":3, "w":6.25},
-			{"label":"RAlt", "x":10, "y":3, "w":1.25},
-			{"label":"RCtrl", "x":11.25, "y":3, "w":1.5}
-			]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0, "w": 1.75},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "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, "w": 1.75},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "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, "w": 1.75},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.75, "y": 3, "w": 6.25},
+                {"matrix": [3, 9], "x": 10, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5}
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
index 51e54382af..072519ff6c 100644
--- a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
+++ b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
@@ -18,7 +18,6 @@
 
 /*Modtaps*/
 #define TAPPING_TERM 145
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*Combos*/
 #ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/config.h b/keyboards/qpockets/wanten/keymaps/625_bar/config.h
index 51e54382af..072519ff6c 100644
--- a/keyboards/qpockets/wanten/keymaps/625_bar/config.h
+++ b/keyboards/qpockets/wanten/keymaps/625_bar/config.h
@@ -18,7 +18,6 @@
 
 /*Modtaps*/
 #define TAPPING_TERM 145
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*Combos*/
 #ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/wanten/keymaps/default/config.h b/keyboards/qpockets/wanten/keymaps/default/config.h
index 51e54382af..072519ff6c 100644
--- a/keyboards/qpockets/wanten/keymaps/default/config.h
+++ b/keyboards/qpockets/wanten/keymaps/default/config.h
@@ -18,7 +18,6 @@
 
 /*Modtaps*/
 #define TAPPING_TERM 145
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*Combos*/
 #ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/wanten/wanten.c b/keyboards/qpockets/wanten/wanten.c
deleted file mode 100644
index 15f3e64cb8..0000000000
--- a/keyboards/qpockets/wanten/wanten.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wanten.h"
diff --git a/keyboards/qpockets/wanten/wanten.h b/keyboards/qpockets/wanten/wanten.h
deleted file mode 100644
index e6db44fea6..0000000000
--- a/keyboards/qpockets/wanten/wanten.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_default( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \
-	k30, k31, k32,           k35,      k37,      k39, k80, k81  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \
-	{ k30, k31, k32, XXX, XXX, k35, XXX, k37, XXX, k39, k80, k81, } \
-}
-
-#define LAYOUT_625_bar( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \
-	k30, k31, k32,                k36,           k39,      k81  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \
-	{ k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, k39, XXX, k81, } \
-}
-
-#define LAYOUT_2u_bars( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, \
-	k30, k31, k32,      k34, k35,      k37, k38, k39,      k81  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k50, k51, }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k60, k61, }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k70, k71, }, \
-	{ k30, k31, k32, XXX, k34, k35, XXX, k37, k38, k39, XXX, k81, } \
-}
diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h
index b3a4bf279e..e7d231ffba 100644
--- a/keyboards/quad_h/lb75/config.h
+++ b/keyboards/quad_h/lb75/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D3, D5, F0, E6 }
-#define MATRIX_COL_PINS { D2, D1, D0, F1, F4, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 16
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -53,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json
index 386ba46067..2a69607316 100644
--- a/keyboards/quad_h/lb75/info.json
+++ b/keyboards/quad_h/lb75/info.json
@@ -8,10 +8,18 @@
     	"pid": "0x0007",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D3", "D5", "F0", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+    	"pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/quantrik/kyuu/config.h b/keyboards/quantrik/kyuu/config.h
index bd74b09133..44c3746d29 100644
--- a/keyboards/quantrik/kyuu/config.h
+++ b/keyboards/quantrik/kyuu/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6, B5, B4, D7, D6 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, C6, F0, B7, D0, D5, D3, D2, D1, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/quantrik/kyuu/info.json b/keyboards/quantrik/kyuu/info.json
index da19670161..ea8b3da4fa 100644
--- a/keyboards/quantrik/kyuu/info.json
+++ b/keyboards/quantrik/kyuu/info.json
@@ -8,6 +8,11 @@
       "pid": "0x0009",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "F0", "B7", "D0", "D5", "D3", "D2", "D1", "B3"],
+        "rows": ["B6", "B5", "B4", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/quantrik/kyuu/kyuu.c b/keyboards/quantrik/kyuu/kyuu.c
deleted file mode 100644
index 7f7d2fcc82..0000000000
--- a/keyboards/quantrik/kyuu/kyuu.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "kyuu.h"
diff --git a/keyboards/quarkeys/z40/config.h b/keyboards/quarkeys/z40/config.h
index 1ca7a35849..2f70b1e53b 100644
--- a/keyboards/quarkeys/z40/config.h
+++ b/keyboards/quarkeys/z40/config.h
@@ -14,11 +14,6 @@
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { E6, B3, C7, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B6, B5, B4, D7, D6, D0, B1, B0 }
-#define RGB_DI_PIN F1
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_LED_COUNT 47
 #define RGB_MATRIX_KEYPRESSES                       // Reacts to Keypresses
diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json
index 57159669a4..bde8a576b9 100644
--- a/keyboards/quarkeys/z40/info.json
+++ b/keyboards/quarkeys/z40/info.json
@@ -8,6 +8,17 @@
           "pid": "0x2801",
           "device_version": "0.0.1"
       },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
+    "matrix_pins": {
+      "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"],
+      "rows": ["E6", "B3", "C7", "C6"]
+    },
+    "ws2812": {
+      "pin": "F1"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/quarkeys/z40/rules.mk b/keyboards/quarkeys/z40/rules.mk
index 89107d24a8..4554ab2970 100644
--- a/keyboards/quarkeys/z40/rules.mk
+++ b/keyboards/quarkeys/z40/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no	    # Enable this and unable RGB_MATRIX_ENABLE to use RGB light effect
 
 RGB_MATRIX_ENABLE = yes		# Enable this and unable RGBLIGHT_ENABLE to use RGB Matrix effect 
-RGB_MATRIX_DRIVER = WS2812	# Comment out this line when RGBLIGHTING is enabled
diff --git a/keyboards/quarkeys/z60/hotswap/config.h b/keyboards/quarkeys/z60/hotswap/config.h
index b23030ad5c..d1456a07f8 100644
--- a/keyboards/quarkeys/z60/hotswap/config.h
+++ b/keyboards/quarkeys/z60/hotswap/config.h
@@ -14,12 +14,6 @@
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 }
-
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 80
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/quarkeys/z60/hotswap/hotswap.c b/keyboards/quarkeys/z60/hotswap/hotswap.c
deleted file mode 100644
index b45286e8ba..0000000000
--- a/keyboards/quarkeys/z60/hotswap/hotswap.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 
-/ Copyright 2022 quarkeys
-/ This program is free software: you can redistribute it and/or modify
-/ it under the terms of the GNU General Public License as published by
-/ the Free Software Foundation, either version 2 of the License, or
-/ (at your option) any later version.
-/ This program is distributed in the hope that it will be useful,
-/ but WITHOUT ANY WARRANTY; without even the implied warranty of
-/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/ GNU General Public License for more details.
-/ You should have received a copy of the GNU General Public License
-/ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "hotswap.h"
diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json
index c142c01b7e..3924726711 100644
--- a/keyboards/quarkeys/z60/hotswap/info.json
+++ b/keyboards/quarkeys/z60/hotswap/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3C02",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "ws2812": {
+        "pin": "D6"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/quarkeys/z60/solder/config.h b/keyboards/quarkeys/z60/solder/config.h
index a66ebdd550..bf95108da3 100644
--- a/keyboards/quarkeys/z60/solder/config.h
+++ b/keyboards/quarkeys/z60/solder/config.h
@@ -14,13 +14,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 }
-
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 77
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json
index e5ec227c7e..daffbb0220 100644
--- a/keyboards/quarkeys/z60/solder/info.json
+++ b/keyboards/quarkeys/z60/solder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3C01",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "ws2812": {
+        "pin": "D6"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/quarkeys/z60/solder/solder.c b/keyboards/quarkeys/z60/solder/solder.c
deleted file mode 100644
index 1aacc5168e..0000000000
--- a/keyboards/quarkeys/z60/solder/solder.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 
-/ Copyright 2022 quarkeys
-/ This program is free software: you can redistribute it and/or modify
-/ it under the terms of the GNU General Public License as published by
-/ the Free Software Foundation, either version 2 of the License, or
-/ (at your option) any later version.
-/ This program is distributed in the hope that it will be useful,
-/ but WITHOUT ANY WARRANTY; without even the implied warranty of
-/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/ GNU General Public License for more details.
-/ You should have received a copy of the GNU General Public License
-/ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "solder.h"
diff --git a/keyboards/quarkeys/z67/hotswap/config.h b/keyboards/quarkeys/z67/hotswap/config.h
index 3e3ce2b0a2..2b4eb0f8e4 100644
--- a/keyboards/quarkeys/z67/hotswap/config.h
+++ b/keyboards/quarkeys/z67/hotswap/config.h
@@ -14,12 +14,6 @@
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, B7, D5, D1, D2, D3, D4, D0, D6, D7, B4 }
-
-#define RGB_DI_PIN F0
 #define RGBLED_NUM 77
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/quarkeys/z67/hotswap/hotswap.c b/keyboards/quarkeys/z67/hotswap/hotswap.c
deleted file mode 100644
index b45286e8ba..0000000000
--- a/keyboards/quarkeys/z67/hotswap/hotswap.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 
-/ Copyright 2022 quarkeys
-/ This program is free software: you can redistribute it and/or modify
-/ it under the terms of the GNU General Public License as published by
-/ the Free Software Foundation, either version 2 of the License, or
-/ (at your option) any later version.
-/ This program is distributed in the hope that it will be useful,
-/ but WITHOUT ANY WARRANTY; without even the implied warranty of
-/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/ GNU General Public License for more details.
-/ You should have received a copy of the GNU General Public License
-/ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "hotswap.h"
diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/info.json
index c31a37325d..5daf2e0d16 100644
--- a/keyboards/quarkeys/z67/hotswap/info.json
+++ b/keyboards/quarkeys/z67/hotswap/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4102",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/quarkeys/z67/solder/config.h b/keyboards/quarkeys/z67/solder/config.h
index 18ed997500..a4c6bd7153 100644
--- a/keyboards/quarkeys/z67/solder/config.h
+++ b/keyboards/quarkeys/z67/solder/config.h
@@ -14,12 +14,6 @@
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
-#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D4, D5, D6, D7, B5, B4 }
-
-#define RGB_DI_PIN F0
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/info.json
index af8c81f9d2..4e0e697fd9 100644
--- a/keyboards/quarkeys/z67/solder/info.json
+++ b/keyboards/quarkeys/z67/solder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4101",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "B4"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/quarkeys/z67/solder/solder.c b/keyboards/quarkeys/z67/solder/solder.c
deleted file mode 100644
index 1aacc5168e..0000000000
--- a/keyboards/quarkeys/z67/solder/solder.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 
-/ Copyright 2022 quarkeys
-/ This program is free software: you can redistribute it and/or modify
-/ it under the terms of the GNU General Public License as published by
-/ the Free Software Foundation, either version 2 of the License, or
-/ (at your option) any later version.
-/ This program is distributed in the hope that it will be useful,
-/ but WITHOUT ANY WARRANTY; without even the implied warranty of
-/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/ GNU General Public License for more details.
-/ You should have received a copy of the GNU General Public License
-/ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "solder.h"
diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h
index 830b5364a5..e9b5f0d0e0 100644
--- a/keyboards/qvex/lynepad/config.h
+++ b/keyboards/qvex/lynepad/config.h
@@ -17,17 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Basic matrix config */
-#define MATRIX_ROW_PINS { C7, F7, F6}
-#define MATRIX_COL_PINS { F0, F1, F4, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* LEDs */
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -43,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 240
-#endif
 
 /* Definitions for encoder tilt/press support */
 #define ENC_TILT_THRESHOLD 1
diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json
index f2930137d2..984fa3f96c 100644
--- a/keyboards/qvex/lynepad/info.json
+++ b/keyboards/qvex/lynepad/info.json
@@ -8,17 +8,39 @@
       "pid": "0x4C50",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5"],
+        "rows": ["C7", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "D0", "pin_b": "D1"},
         {"pin_a": "B5", "pin_b": "D6"},
       ]
     },
+    "ws2812": {
+      "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
       "LAYOUT": {
-        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2}
+        ]
       }
     }
   }
diff --git a/keyboards/qvex/lynepad/lynepad.c b/keyboards/qvex/lynepad/lynepad.c
index 33620d9da3..cc69e12240 100644
--- a/keyboards/qvex/lynepad/lynepad.c
+++ b/keyboards/qvex/lynepad/lynepad.c
@@ -11,7 +11,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "lynepad.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Encoder pins
diff --git a/keyboards/qvex/lynepad/lynepad.h b/keyboards/qvex/lynepad/lynepad.h
deleted file mode 100644
index 2a3015ceea..0000000000
--- a/keyboards/qvex/lynepad/lynepad.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 KemoNine
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03,           \
-    k10, k11, k12, k13,           \
-    k20, k21, k22                 \
-) \
-{ \
-    { k00,   k01,   k02,   k03   }, \
-    { k10,   k11,   k12,   k13   }, \
-    { k20,   k21,   k22,   KC_NO }  \
-}
diff --git a/keyboards/qwertlekeys/calice/calice.c b/keyboards/qwertlekeys/calice/calice.c
deleted file mode 100644
index d284544964..0000000000
--- a/keyboards/qwertlekeys/calice/calice.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*  copyright 2021 Joah Nelson (jels)
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 2 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERAHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "calice.h"
diff --git a/keyboards/qwertlekeys/calice/config.h b/keyboards/qwertlekeys/calice/config.h
index 4de51720ea..a15f35c444 100644
--- a/keyboards/qwertlekeys/calice/config.h
+++ b/keyboards/qwertlekeys/calice/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/*Define Matrix Pins */
-#define MATRIX_ROW_PINS {F0, F1, F5, F4, C6, C7, B5, B6, D4, D2, D5, D3}
-#define MATRIX_COL_PINS {D7, B4, F7, F6, D1, B7, B3, B2} 
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/qwertlekeys/calice/info.json b/keyboards/qwertlekeys/calice/info.json
index 5a425f97a8..dc6f25f02c 100644
--- a/keyboards/qwertlekeys/calice/info.json
+++ b/keyboards/qwertlekeys/calice/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "B4", "F7", "F6", "D1", "B7", "B3", "B2"],
+        "rows": ["F0", "F1", "F5", "F4", "C6", "C7", "B5", "B6", "D4", "D2", "D5", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "B1"}
@@ -23,89 +28,109 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"1,0", "x":0.5, "y":0},
-                {"label":"0,0", "x":1.75, "y":0},
-                {"label":"1,1", "x":2.75, "y":0},
-                {"label":"0,1", "x":3.75, "y":0},
-                {"label":"1,2", "x":4.75, "y":0},
-                {"label":"0,2", "x":6.25, "y":0},
-                {"label":"1,3", "x":7.25, "y":0},
-                {"label":"0,4", "x":8.25, "y":0},
-                {"label":"1,4", "x":9.25, "y":0},
-                {"label":"0,5", "x":10.75, "y":0},
-                {"label":"1,5", "x":11.75, "y":0},
-                {"label":"0,6", "x":12.75, "y":0},
-                {"label":"1,6", "x":13.75, "y":0},
-                {"label":"0,7", "x":15, "y":0},
-                {"label":"1,7", "x":16.75, "y":0},
-                {"label":"3,7", "x":17, "y":1},
-                {"label":"3,0", "x":1.25, "y":1.25},
-                {"label":"2,0", "x":2.25, "y":1.25},
-                {"label":"3,1", "x":3.25, "y":1.25},
-                {"label":"2,1", "x":4.25, "y":1.25},
-                {"label":"3,2", "x":5.25, "y":1.25},
-                {"label":"2,2", "x":6.25, "y":1.25},
-                {"label":"3,3", "x":7.25, "y":1.25},
-                {"label":"2,4", "x":8.75, "y":1.25},
-                {"label":"3,4", "x":9.75, "y":1.25},
-                {"label":"2,5", "x":10.75, "y":1.25},
-                {"label":"3,5", "x":11.75, "y":1.25},
-                {"label":"2,6", "x":12.75, "y":1.25},
-                {"label":"3,6", "x":13.75, "y":1.25},
-                {"label":"5,6", "x":14.75, "y":1.25},
-                {"label":"2,7", "x":15.75, "y":1.25},
-                {"label":"5,7", "x":17.25, "y":2},
-                {"label":"5,0", "x":1, "y":2.25, "w":1.5},
-                {"label":"4,0", "x":2.5, "y":2.25},
-                {"label":"5,1", "x":3.5, "y":2.25},
-                {"label":"4,1", "x":4.5, "y":2.25},
-                {"label":"5,2", "x":5.5, "y":2.25},
-                {"label":"4,2", "x":6.5, "y":2.25},
-                {"label":"5,3", "x":8.5, "y":2.25},
-                {"label":"4,4", "x":9.5, "y":2.25},
-                {"label":"5,4", "x":10.5, "y":2.25},
-                {"label":"4,5", "x":11.5, "y":2.25},
-                {"label":"5,5", "x":12.5, "y":2.25},
-                {"label":"4,6", "x":13.5, "y":2.25},
-                {"label":"7,6", "x":14.5, "y":2.25},
-                {"label":"4,7", "x":15.5, "y":2.25, "w":1.5},
-                {"label":"7,7", "x":17.5, "y":3},
-                {"label":"7,0", "x":0.75, "y":3.25, "w":1.75},
-                {"label":"6,0", "x":2.5, "y":3.25},
-                {"label":"7,1", "x":3.5, "y":3.25},
-                {"label":"6,1", "x":4.5, "y":3.25},
-                {"label":"7,2", "x":5.5, "y":3.25},
-                {"label":"6,2", "x":6.5, "y":3.25},
-                {"label":"7,3", "x":9, "y":3.25},
-                {"label":"6,4", "x":10, "y":3.25},
-                {"label":"7,4", "x":11, "y":3.25},
-                {"label":"6,5", "x":12, "y":3.25},
-                {"label":"7,5", "x":13, "y":3.25},
-                {"label":"6,6", "x":14, "y":3.25},
-                {"label":"6,7", "x":15, "y":3.25, "w":2.25},
-                {"label":"9,0", "x":0.5, "y":4.25, "w":2.25},
-                {"label":"8,0", "x":2.75, "y":4.25},
-                {"label":"9,1", "x":3.75, "y":4.25},
-                {"label":"8,1", "x":4.75, "y":4.25},
-                {"label":"9,2", "x":5.75, "y":4.25},
-                {"label":"8,2", "x":6.75, "y":4.25},
-                {"label":"9,3", "x":8.75, "y":4.25},
-                {"label":"8,4", "x":9.75, "y":4.25},
-                {"label":"9,4", "x":10.75, "y":4.25},
-                {"label":"8,5", "x":11.75, "y":4.25},
-                {"label":"9,5", "x":12.75, "y":4.25},
-                {"label":"8,6", "x":13.75, "y":4.25},
-                {"label":"9,6", "x":14.75, "y":4.25, "w":1.75},
-                {"label":"8,7", "x":16.5, "y":4.25},
-                {"label":"11,0", "x":0.5, "y":5.25, "w":1.5},
-                {"label":"10,0", "x":3.25, "y":5.25, "w":1.5},
-                {"label":"11,2", "x":4.75, "y":5.25, "w":2.25},
-                {"label":"10,2", "x":7, "y":5.25},
-                {"label":"10,4", "x":8.25, "y":5.25, "w":2.75},
-                {"label":"10,5", "x":11, "y":5.25, "w":1.5},
-                {"label":"11,6", "x":15.5, "y":5.25},
-                {"label":"10,7", "x":16.5, "y":5.25},
-                {"label":"11,7", "x":17.5, "y":5.25}]
-            }
+            "layout": [
+                {"x":0, "y":0},
+
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+
+                {"x":5.75, "y":0},
+                {"x":6.75, "y":0},
+                {"x":7.75, "y":0},
+                {"x":8.75, "y":0},
+
+                {"x":10.25, "y":0},
+                {"x":11.25, "y":0},
+                {"x":12.25, "y":0},
+                {"x":13.25, "y":0},
+
+                {"x":14.5, "y":0},
+                {"x":16.25, "y":0},
+
+                {"x":0.75, "y":1.25},
+                {"x":1.75, "y":1.25},
+                {"x":2.75, "y":1.25},
+                {"x":3.75, "y":1.25},
+                {"x":4.75, "y":1.25},
+                {"x":5.75, "y":1.25},
+                {"x":6.75, "y":1.25},
+
+                {"x":8.25, "y":1.25},
+                {"x":9.25, "y":1.25},
+                {"x":10.25, "y":1.25},
+                {"x":11.25, "y":1.25},
+                {"x":12.25, "y":1.25},
+                {"x":13.25, "y":1.25},
+                {"x":14.25, "y":1.25},
+                {"x":15.25, "y":1.25},
+
+                {"x":16.5, "y":1},
+
+                {"x":0.5, "y":2.25, "w":1.5},
+                {"x":2, "y":2.25},
+                {"x":3, "y":2.25},
+                {"x":4, "y":2.25},
+                {"x":5, "y":2.25},
+                {"x":6, "y":2.25},
+
+                {"x":8, "y":2.25},
+                {"x":9, "y":2.25},
+                {"x":10, "y":2.25},
+                {"x":11, "y":2.25},
+                {"x":12, "y":2.25},
+                {"x":13, "y":2.25},
+                {"x":14, "y":2.25},
+                {"x":15, "y":2.25, "w":1.5},
+
+                {"x":16.75, "y":2},
+
+                {"x":0.25, "y":3.25, "w":1.75},
+                {"x":2, "y":3.25},
+                {"x":3, "y":3.25},
+                {"x":4, "y":3.25},
+                {"x":5, "y":3.25},
+                {"x":6, "y":3.25},
+
+                {"x":8.5, "y":3.25},
+                {"x":9.5, "y":3.25},
+                {"x":10.5, "y":3.25},
+                {"x":11.5, "y":3.25},
+                {"x":12.5, "y":3.25},
+                {"x":13.5, "y":3.25},
+                {"x":14.5, "y":3.25, "w":2.25},
+
+                {"x":17, "y":3},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25},
+                {"x":13.25, "y":4.25},
+                {"x":14.25, "y":4.25, "w":1.75},
+                {"x":16, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":2.75, "y":5.25, "w":1.5},
+                {"x":4.25, "y":5.25, "w":2.25},
+                {"x":6.5, "y":5.25},
+
+                {"x":7.75, "y":5.25, "w":2.75},
+                {"x":10.5, "y":5.25, "w":1.5},
+
+                {"x":15, "y":5.25},
+                {"x":16, "y":5.25},
+                {"x":17, "y":5.25}
+            ]
         }
+    }
 }
diff --git a/keyboards/qwertykeys/qk65/hotswap/config.h b/keyboards/qwertykeys/qk65/hotswap/config.h
index 346e51a157..916485e60b 100644
--- a/keyboards/qwertykeys/qk65/hotswap/config.h
+++ b/keyboards/qwertykeys/qk65/hotswap/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, B7, D0, D1, D2 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* NKRO */
 #define FORCE_NKRO 
 
diff --git a/keyboards/qwertykeys/qk65/hotswap/hotswap.c b/keyboards/qwertykeys/qk65/hotswap/hotswap.c
deleted file mode 100644
index 78de3ff275..0000000000
--- a/keyboards/qwertykeys/qk65/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 
-Copyright 2022 qwertykeys
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "hotswap.h"
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/hotswap/hotswap.h b/keyboards/qwertykeys/qk65/hotswap/hotswap.h
deleted file mode 100644
index daa7ffd5f3..0000000000
--- a/keyboards/qwertykeys/qk65/hotswap/hotswap.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 
-Copyright 2022 qwertykeys
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT_65_ansi_blocker( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-	K400, K401, K402,       K404,             K407, K408,                   K412, K413, K414  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \
-	{ K400,  K401,  K402,  KC_NO, K404,  KC_NO, KC_NO, K407,  K408,  KC_NO, KC_NO, KC_NO, K412,  K413,  K414 }  \
-}
-
diff --git a/keyboards/qwertykeys/qk65/hotswap/info.json b/keyboards/qwertykeys/qk65/hotswap/info.json
index 9f7664ea51..78bbe74ecd 100644
--- a/keyboards/qwertykeys/qk65/hotswap/info.json
+++ b/keyboards/qwertykeys/qk65/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0x514B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B7", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -17,73 +22,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-		        {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/qwertykeys/qk65/solder/config.h b/keyboards/qwertykeys/qk65/solder/config.h
index 40eddea86f..6561379dbe 100644
--- a/keyboards/qwertykeys/qk65/solder/config.h
+++ b/keyboards/qwertykeys/qk65/solder/config.h
@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, B7, D0, D1, D2 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* NKRO */
 #define FORCE_NKRO
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/solder/info.json b/keyboards/qwertykeys/qk65/solder/info.json
index 0e85073f59..3481ffd2bb 100644
--- a/keyboards/qwertykeys/qk65/solder/info.json
+++ b/keyboards/qwertykeys/qk65/solder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5153",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B7", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -18,683 +23,683 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 12], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 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.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 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.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 12], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 12], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 12], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 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.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_tsangan_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.5},
-                {"x":1.5, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4, "w":7},
-                {"x":11, "y":4, "w":1.5},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 12], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 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.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/qwertykeys/qk65/solder/solder.c b/keyboards/qwertykeys/qk65/solder/solder.c
deleted file mode 100644
index fc95c768fd..0000000000
--- a/keyboards/qwertykeys/qk65/solder/solder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 
-Copyright 2022 qwertykeys
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "solder.h"
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/solder/solder.h b/keyboards/qwertykeys/qk65/solder/solder.h
deleted file mode 100644
index 418bf45edd..0000000000
--- a/keyboards/qwertykeys/qk65/solder/solder.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-Copyright 2022 qwertykeys
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │1D │0D │0E │    │0D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�2D  │ ISO Enter
- *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │2C │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │30      │   │30  │3C │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B    │3D │3E │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- *              │40  │41  │42  │44                      │47  │48  │ │4C │4D │4E │
- *              └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────�
- *              │40   │41 │42   │44                         │48   │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E,      \
-    K30, K3C, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E,      \
-    K40, K41, K42,                K44,           K47, K48,      K4C, K4D, K4E       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, K44, ___, ___, K47, K48, ___, ___, ___, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K44,           K47, K48,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
-    { K40, K41, K42, ___, K44, ___, ___, K47, K48, ___, ___, ___, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K44,           K47, K48,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
-    { K40, K41, K42, ___, K44, ___, ___, K47, K48, ___, ___, ___, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K44,                K48,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
-    { K40, K41, K42, ___, K44, ___, ___, ___, K48, ___, ___, ___, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K44,                K48,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
-    { K40, K41, K42, ___, K44, ___, ___, ___, K48, ___, ___, ___, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K3C, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K44,           K47, K48,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, K44, ___, ___, K47, K48, ___, ___, ___, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K3C, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K44,           K47, K48,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, K44, ___, ___, K47, K48, ___, ___, ___, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K3C, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K44,                K48,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, K44, ___, ___, ___, K48, ___, ___, ___, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_iso_blocker_tsangan_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K3C, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,                K44,                K48,      K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, K44, ___, ___, ___, K48, ___, ___, ___, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
index 5ea65094f9..d47dcae187 100644
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-// wiring of each half
-#define MATRIX_ROW_PINS { B6, B2, B3, B1 }
-#define MATRIX_COL_PINS { F7, F6, F5, C6, D7, D4, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D6
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 12
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -53,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json
index df34cd9fa7..0a0a9a551e 100644
--- a/keyboards/qwertyydox/info.json
+++ b/keyboards/qwertyydox/info.json
@@ -9,6 +9,14 @@
     "pid": "0x1256",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"],
+    "rows": ["B6", "B2", "B3", "B1"]
+  },
+  "ws2812": {
+    "pin": "D6"
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
diff --git a/keyboards/qwertyydox/qwertyydox.c b/keyboards/qwertyydox/qwertyydox.c
deleted file mode 100644
index 53c3eca648..0000000000
--- a/keyboards/qwertyydox/qwertyydox.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "qwertyydox.h"
diff --git a/keyboards/qwertyydox/qwertyydox.h b/keyboards/qwertyydox/qwertyydox.h
deleted file mode 100644
index 9eb4073dfe..0000000000
--- a/keyboards/qwertyydox/qwertyydox.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_qwertyydox_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/qwertyydox/rev1/rev1.c b/keyboards/qwertyydox/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/qwertyydox/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/qwertyydox/rev1/rev1.h b/keyboards/qwertyydox/rev1/rev1.h
index a7b30b648f..d1c5588606 100644
--- a/keyboards/qwertyydox/rev1/rev1.h
+++ b/keyboards/qwertyydox/rev1/rev1.h
@@ -1,14 +1,6 @@
 #pragma once
 
-#include "qwertyydox.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
+#include "quantum.h"
 
 #define LAYOUT( \
     L00, L01, L02, L03, L04, L05, L06,       R00, R01, R02, R03, R04, R05, R06, \
diff --git a/keyboards/rabbit/rabbit68/config.h b/keyboards/rabbit/rabbit68/config.h
index 0c182d253f..a7cfc593ae 100644
--- a/keyboards/rabbit/rabbit68/config.h
+++ b/keyboards/rabbit/rabbit68/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, D7, D0, B3, B7 }
-#define MATRIX_COL_PINS { D6, D1, B4, D2, B5, F7, F6, F5, F4, F1, F0, B0, B1, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rabbit/rabbit68/info.json b/keyboards/rabbit/rabbit68/info.json
index 8dc29bc387..d50b5eb14a 100644
--- a/keyboards/rabbit/rabbit68/info.json
+++ b/keyboards/rabbit/rabbit68/info.json
@@ -8,6 +8,11 @@
         "pid": "0x68F1",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D1", "B4", "D2", "B5", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2"],
+        "rows": ["B6", "D7", "D0", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "layouts": {
diff --git a/keyboards/rabbit/rabbit68/rabbit68.c b/keyboards/rabbit/rabbit68/rabbit68.c
deleted file mode 100644
index 652d8417e7..0000000000
--- a/keyboards/rabbit/rabbit68/rabbit68.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kai Eckert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rabbit68.h"
diff --git a/keyboards/rad/config.h b/keyboards/rad/config.h
deleted file mode 100644
index 0cf49d6c0f..0000000000
--- a/keyboards/rad/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D7, C6, B6, D0 }
-#define MATRIX_COL_PINS { B5, B4, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rad/info.json b/keyboards/rad/info.json
index 09f0d94059..e134a31147 100644
--- a/keyboards/rad/info.json
+++ b/keyboards/rad/info.json
@@ -6,6 +6,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B5", "B4", "E6"],
+    "rows": ["D7", "C6", "B6", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "bootmagic": {
     "matrix": [0, 2]
   },
@@ -14,50 +19,20 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {
-          "x": 1,
-          "y": 0
-        },
-        {
-          "x": 2,
-          "y": 0
-        },
-        {
-          "x": 0,
-          "y": 1
-        },
-        {
-          "x": 1,
-          "y": 1
-        },
-        {
-          "x": 2,
-          "y": 1
-        },
-        {
-          "x": 0,
-          "y": 2
-        },
-        {
-          "x": 1,
-          "y": 2
-        },
-        {
-          "x": 2,
-          "y": 2
-        },
-        {
-          "x": 0,
-          "y": 3
-        },
-        {
-          "x": 1,
-          "y": 3
-        },
-        {
-          "x": 2,
-          "y": 3
-        }
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3}
       ]
     }
   }
diff --git a/keyboards/rad/rad.c b/keyboards/rad/rad.c
deleted file mode 100644
index b3fed54696..0000000000
--- a/keyboards/rad/rad.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rad.h"
diff --git a/keyboards/rad/rad.h b/keyboards/rad/rad.h
deleted file mode 100644
index a9d669c929..0000000000
--- a/keyboards/rad/rad.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-         K01, K02, \
-    K10, K11, K12, \
-    K20, K21, K22, \
-    K30, K31, K32  \
-) { \
-    { KC_NO, K01,   K02 }, \
-    { K10,   K11,   K12 }, \
-    { K20,   K21,   K22 }, \
-    { K30,   K31,   K32 }  \
-}
diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h
index 5dc90ee6e3..3f9d574f77 100644
--- a/keyboards/rainkeebs/delilah/config.h
+++ b/keyboards/rainkeebs/delilah/config.h
@@ -15,23 +15,12 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B6, C6, C7 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F0, E6, D5, D3, D4, D6, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -46,4 +35,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/rainkeebs/delilah/info.json b/keyboards/rainkeebs/delilah/info.json
index f9e876b548..fe8d6f9286 100644
--- a/keyboards/rainkeebs/delilah/info.json
+++ b/keyboards/rainkeebs/delilah/info.json
@@ -8,6 +8,14 @@
         "pid": "0x645C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F0", "E6", "D5", "D3", "D4", "D6", "D7", "B4"],
+        "rows": ["B5", "B6", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
@@ -56,9 +64,9 @@
                 {"x":2.25, "y":3, "matrix": [3, 2]},
                 {"x":3.25, "y":3, "w":2.25, "matrix": [3, 3]},
                 {"x":5.5, "y":3, "w":2.75, "matrix": [3, 6]},
-                {"x":9.0, "y":3, "matrix": [3, 8]},
-                {"x":10.0, "y":3, "matrix": [3, 9]},
-                {"x":11.0, "y":3, "w":1.25, "matrix": [3, 11]}
+                {"x":9, "y":3, "matrix": [3, 8]},
+                {"x":10, "y":3, "matrix": [3, 9]},
+                {"x":11, "y":3, "w":1.25, "matrix": [3, 11]}
             ]
         }
     }
diff --git a/keyboards/rainkeebs/rainkeeb/config.h b/keyboards/rainkeebs/rainkeeb/config.h
index d26c7024d9..f01175abd8 100644
--- a/keyboards/rainkeebs/rainkeeb/config.h
+++ b/keyboards/rainkeebs/rainkeeb/config.h
@@ -15,14 +15,6 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/rainkeebs/rainkeeb/info.json b/keyboards/rainkeebs/rainkeeb/info.json
index bddacf6ddb..1ac96eea69 100644
--- a/keyboards/rainkeebs/rainkeeb/info.json
+++ b/keyboards/rainkeebs/rainkeeb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x726B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B6"}
diff --git a/keyboards/rainkeebs/rainkeeb/rainkeeb.c b/keyboards/rainkeebs/rainkeeb/rainkeeb.c
deleted file mode 100644
index b13ecb2483..0000000000
--- a/keyboards/rainkeebs/rainkeeb/rainkeeb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Regan Palmer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rainkeeb.h"
\ No newline at end of file
diff --git a/keyboards/rainkeebs/yasui/config.h b/keyboards/rainkeebs/yasui/config.h
index 9bb2cbcb5f..5033c1ceac 100644
--- a/keyboards/rainkeebs/yasui/config.h
+++ b/keyboards/rainkeebs/yasui/config.h
@@ -15,26 +15,12 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, C6, B5, E6 }
-#define MATRIX_COL_PINS { D7, B4, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCING 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D1
-
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,4 +35,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/rainkeebs/yasui/info.json b/keyboards/rainkeebs/yasui/info.json
index ea7d883995..4ef45e2c46 100644
--- a/keyboards/rainkeebs/yasui/info.json
+++ b/keyboards/rainkeebs/yasui/info.json
@@ -8,6 +8,14 @@
         "pid": "0x7973",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "matrix_pins": {
+        "cols": ["D7", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D4", "C6", "B5", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/rainkeebs/yasui/yasui.c b/keyboards/rainkeebs/yasui/yasui.c
deleted file mode 100644
index a87f7482a0..0000000000
--- a/keyboards/rainkeebs/yasui/yasui.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Regan Palmer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "yasui.h"
diff --git a/keyboards/ramlord/witf/info.json b/keyboards/ramlord/witf/info.json
index e74343a072..36cd1dcef5 100644
--- a/keyboards/ramlord/witf/info.json
+++ b/keyboards/ramlord/witf/info.json
@@ -31,32 +31,32 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [1, 0], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "matrix": [1, 1], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 5.25, "y": 0.0 },
-                { "matrix": [1, 2], "x": 6.75, "y": 0.0 },
-                { "matrix": [0, 3], "x": 7.75, "y": 0.0 },
-                { "matrix": [1, 3], "x": 8.75, "y": 0.0 },
-                { "matrix": [0, 4], "x": 9.75, "y": 0.0 },
-                { "matrix": [1, 5], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 12.0, "y": 0.0 },
-                { "matrix": [1, 6], "x": 14.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 15.5, "y": 0.0 },
-                { "matrix": [1, 7], "x": 17.25, "y": 0.0 },
-                { "matrix": [0, 8], "x": 18.25, "y": 0.0 },
-                { "matrix": [1, 8], "x": 19.25, "y": 0.0 },
-                { "matrix": [0, 9], "x": 20.25, "y": 0.0 },
-                { "matrix": [1, 9], "x": 22.25, "y": 0.0 },
-                { "matrix": [0, 10], "x": 23.25, "y": 0.0 },
-                { "matrix": [1, 10], "x": 24.25, "y": 0.0 },
-                { "matrix": [0, 11], "x": 25.5, "y": 0.0 },
-                { "matrix": [1, 11], "x": 26.5, "y": 0.0 },
-                { "matrix": [2, 0], "x": 0.0, "y": 1.5 },
-                { "matrix": [3, 0], "x": 1.0, "y": 1.5 },
-                { "matrix": [2, 1], "x": 2.0, "y": 1.5 },
-                { "matrix": [3, 1], "x": 3.0, "y": 1.5 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [1, 0], "x": 1, "y": 0 },
+                { "matrix": [0, 1], "x": 2, "y": 0 },
+                { "matrix": [1, 1], "x": 3, "y": 0 },
+                { "matrix": [0, 2], "x": 5.25, "y": 0 },
+                { "matrix": [1, 2], "x": 6.75, "y": 0 },
+                { "matrix": [0, 3], "x": 7.75, "y": 0 },
+                { "matrix": [1, 3], "x": 8.75, "y": 0 },
+                { "matrix": [0, 4], "x": 9.75, "y": 0 },
+                { "matrix": [1, 5], "x": 11, "y": 0 },
+                { "matrix": [0, 6], "x": 12, "y": 0 },
+                { "matrix": [1, 6], "x": 14.5, "y": 0 },
+                { "matrix": [0, 7], "x": 15.5, "y": 0 },
+                { "matrix": [1, 7], "x": 17.25, "y": 0 },
+                { "matrix": [0, 8], "x": 18.25, "y": 0 },
+                { "matrix": [1, 8], "x": 19.25, "y": 0 },
+                { "matrix": [0, 9], "x": 20.25, "y": 0 },
+                { "matrix": [1, 9], "x": 22.25, "y": 0 },
+                { "matrix": [0, 10], "x": 23.25, "y": 0 },
+                { "matrix": [1, 10], "x": 24.25, "y": 0 },
+                { "matrix": [0, 11], "x": 25.5, "y": 0 },
+                { "matrix": [1, 11], "x": 26.5, "y": 0 },
+                { "matrix": [2, 0], "x": 0, "y": 1.5 },
+                { "matrix": [3, 0], "x": 1, "y": 1.5 },
+                { "matrix": [2, 1], "x": 2, "y": 1.5 },
+                { "matrix": [3, 1], "x": 3, "y": 1.5 },
                 { "matrix": [2, 2], "x": 5.25, "y": 1.5 },
                 { "matrix": [3, 2], "x": 6.25, "y": 1.5 },
                 { "matrix": [2, 3], "x": 7.25, "y": 1.5 },
@@ -77,32 +77,32 @@
                 { "matrix": [3, 10], "x": 24.25, "y": 1.5 },
                 { "matrix": [2, 11], "x": 25.5, "y": 1.5 },
                 { "matrix": [3, 11], "x": 26.5, "y": 1.5 },
-                { "matrix": [4, 0], "x": 0.0, "y": 2.5 },
-                { "matrix": [5, 0], "x": 1.0, "y": 2.5 },
-                { "matrix": [4, 1], "x": 2.0, "y": 2.5 },
-                { "h": 2.0, "matrix": [5, 1], "x": 3.0, "y": 2.5 },
-                { "matrix": [4, 2], "w": 1.5, "x": 5.0, "y": 2.5 },
+                { "matrix": [4, 0], "x": 0, "y": 2.5 },
+                { "matrix": [5, 0], "x": 1, "y": 2.5 },
+                { "matrix": [4, 1], "x": 2, "y": 2.5 },
+                { "h": 2, "matrix": [5, 1], "x": 3, "y": 2.5 },
+                { "matrix": [4, 2], "w": 1.5, "x": 5, "y": 2.5 },
                 { "matrix": [5, 2], "x": 6.5, "y": 2.5 },
                 { "matrix": [4, 3], "x": 7.5, "y": 2.5 },
                 { "matrix": [5, 3], "x": 8.5, "y": 2.5 },
                 { "matrix": [4, 4], "x": 9.5, "y": 2.5 },
                 { "matrix": [5, 4], "x": 10.5, "y": 2.5 },
-                { "matrix": [4, 5], "x": 13.0, "y": 2.5 },
-                { "matrix": [4, 6], "x": 14.0, "y": 2.5 },
-                { "matrix": [5, 6], "x": 15.0, "y": 2.5 },
-                { "matrix": [4, 7], "x": 16.0, "y": 2.5 },
-                { "matrix": [5, 7], "x": 17.0, "y": 2.5 },
-                { "matrix": [4, 8], "x": 18.0, "y": 2.5 },
-                { "matrix": [5, 8], "x": 19.0, "y": 2.5 },
-                { "matrix": [4, 9], "w": 1.5, "x": 20.0, "y": 2.5 },
+                { "matrix": [4, 5], "x": 13, "y": 2.5 },
+                { "matrix": [4, 6], "x": 14, "y": 2.5 },
+                { "matrix": [5, 6], "x": 15, "y": 2.5 },
+                { "matrix": [4, 7], "x": 16, "y": 2.5 },
+                { "matrix": [5, 7], "x": 17, "y": 2.5 },
+                { "matrix": [4, 8], "x": 18, "y": 2.5 },
+                { "matrix": [5, 8], "x": 19, "y": 2.5 },
+                { "matrix": [4, 9], "w": 1.5, "x": 20, "y": 2.5 },
                 { "matrix": [5, 9], "x": 22.25, "y": 2.5 },
                 { "matrix": [4, 10], "x": 23.25, "y": 2.5 },
                 { "matrix": [5, 10], "x": 24.25, "y": 2.5 },
                 { "matrix": [4, 11], "x": 25.5, "y": 2.5 },
                 { "matrix": [5, 11], "x": 26.5, "y": 2.5 },
-                { "matrix": [6, 0], "x": 0.0, "y": 3.5 },
-                { "matrix": [7, 0], "x": 1.0, "y": 3.5 },
-                { "matrix": [6, 1], "x": 2.0, "y": 3.5 },
+                { "matrix": [6, 0], "x": 0, "y": 3.5 },
+                { "matrix": [7, 0], "x": 1, "y": 3.5 },
+                { "matrix": [6, 1], "x": 2, "y": 3.5 },
                 { "matrix": [6, 2], "w": 1.75, "x": 4.75, "y": 3.5 },
                 { "matrix": [7, 2], "x": 6.5, "y": 3.5 },
                 { "matrix": [6, 3], "x": 7.5, "y": 3.5 },
@@ -118,36 +118,36 @@
                 { "matrix": [6, 9], "w": 2.25, "x": 19.25, "y": 3.5 },
                 { "matrix": [6, 11], "x": 25.5, "y": 3.5 },
                 { "matrix": [7, 11], "x": 26.5, "y": 3.5 },
-                { "matrix": [8, 0], "x": 0.0, "y": 4.5 },
-                { "matrix": [9, 0], "x": 1.0, "y": 4.5 },
-                { "matrix": [8, 1], "x": 2.0, "y": 4.5 },
-                { "h": 2.0, "matrix": [9, 1], "x": 3.0, "y": 4.5 },
+                { "matrix": [8, 0], "x": 0, "y": 4.5 },
+                { "matrix": [9, 0], "x": 1, "y": 4.5 },
+                { "matrix": [8, 1], "x": 2, "y": 4.5 },
+                { "h": 2, "matrix": [9, 1], "x": 3, "y": 4.5 },
                 { "matrix": [8, 2], "w": 2.25, "x": 4.5, "y": 4.5 },
                 { "matrix": [9, 2], "x": 6.75, "y": 4.5 },
                 { "matrix": [8, 3], "x": 7.75, "y": 4.5 },
                 { "matrix": [9, 3], "x": 8.75, "y": 4.5 },
                 { "matrix": [8, 4], "x": 9.75, "y": 4.5 },
                 { "matrix": [9, 4], "x": 10.75, "y": 4.5 },
-                { "matrix": [9, 5], "x": 13.0, "y": 4.5 },
-                { "matrix": [8, 6], "x": 14.0, "y": 4.5 },
-                { "matrix": [9, 6], "x": 15.0, "y": 4.5 },
-                { "matrix": [8, 7], "x": 16.0, "y": 4.5 },
-                { "matrix": [9, 7], "x": 17.0, "y": 4.5 },
-                { "matrix": [8, 8], "x": 18.0, "y": 4.5 },
-                { "matrix": [8, 9], "w": 1.75, "x": 19.0, "y": 4.5 },
+                { "matrix": [9, 5], "x": 13, "y": 4.5 },
+                { "matrix": [8, 6], "x": 14, "y": 4.5 },
+                { "matrix": [9, 6], "x": 15, "y": 4.5 },
+                { "matrix": [8, 7], "x": 16, "y": 4.5 },
+                { "matrix": [9, 7], "x": 17, "y": 4.5 },
+                { "matrix": [8, 8], "x": 18, "y": 4.5 },
+                { "matrix": [8, 9], "w": 1.75, "x": 19, "y": 4.5 },
                 { "matrix": [9, 8], "x": 20.75, "y": 4.5 },
                 { "matrix": [8, 10], "x": 23.25, "y": 4.5 },
                 { "matrix": [8, 11], "x": 25.5, "y": 4.5 },
                 { "matrix": [9, 11], "x": 26.5, "y": 4.5 },
-                { "matrix": [10, 0], "x": 0.0, "y": 5.5 },
-                { "matrix": [11, 0], "x": 1.0, "y": 5.5 },
-                { "matrix": [10, 1], "x": 2.0, "y": 5.5 },
-                { "matrix": [11, 1], "x": 3.0, "y": 5.5 },
+                { "matrix": [10, 0], "x": 0, "y": 5.5 },
+                { "matrix": [11, 0], "x": 1, "y": 5.5 },
+                { "matrix": [10, 1], "x": 2, "y": 5.5 },
+                { "matrix": [11, 1], "x": 3, "y": 5.5 },
                 { "matrix": [10, 2], "w": 1.5, "x": 4.5, "y": 5.5 },
                 { "matrix": [10, 3], "w": 1.5, "x": 7.75, "y": 5.5 },
                 { "matrix": [10, 4], "w": 2.25, "x": 9.25, "y": 5.5 },
                 { "matrix": [11, 4], "x": 11.5, "y": 5.5 },
-                { "matrix": [10, 6], "w": 2.75, "x": 13.0, "y": 5.5 },
+                { "matrix": [10, 6], "w": 2.75, "x": 13, "y": 5.5 },
                 { "matrix": [10, 7], "w": 1.5, "x": 15.75, "y": 5.5 },
                 { "matrix": [10, 9], "w": 1.5, "x": 20.25, "y": 5.5 },
                 { "matrix": [11, 9], "x": 22.25, "y": 5.5 },
diff --git a/keyboards/rart/rart45/config.h b/keyboards/rart/rart45/config.h
index f6557db1ff..2039f083f1 100644
--- a/keyboards/rart/rart45/config.h
+++ b/keyboards/rart/rart45/config.h
@@ -15,13 +15,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D1, C2, C1, B1, D0, C3, C0, D7, B0 }
-#define MATRIX_COL_PINS { D6, D4, B2, B5, B4, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rart/rart45/info.json b/keyboards/rart/rart45/info.json
index 3a3b42f1f6..74cbf358c1 100644
--- a/keyboards/rart/rart45/info.json
+++ b/keyboards/rart/rart45/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0045",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D6", "D4", "B2", "B5", "B4", "B3"],
+    "rows": ["D1", "C2", "C1", "B1", "D0", "C3", "C0", "D7", "B0"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "D5",
     "on_state": 0
diff --git a/keyboards/rart/rart45/rart45.c b/keyboards/rart/rart45/rart45.c
deleted file mode 100644
index 480b05a808..0000000000
--- a/keyboards/rart/rart45/rart45.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2020 Alabahuy
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rart45.h"
diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h
index d884b12680..031e003c04 100644
--- a/keyboards/rart/rart4x4/config.h
+++ b/keyboards/rart/rart4x4/config.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, B6, B3, B1 }
-#define MATRIX_COL_PINS { F7, B2, B5, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,4 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 240
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json
index ac3014fe7a..b53e79e484 100644
--- a/keyboards/rart/rart4x4/info.json
+++ b/keyboards/rart/rart4x4/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "B2", "B5", "B4"],
+        "rows": ["F4", "B6", "B3", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F6", "pin_b": "F5"},
@@ -20,25 +28,25 @@
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/rart/rart4x4/rart4x4.c b/keyboards/rart/rart4x4/rart4x4.c
deleted file mode 100644
index 0d5e2dbade..0000000000
--- a/keyboards/rart/rart4x4/rart4x4.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2020 Alabahuy
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rart4x4.h"
diff --git a/keyboards/rart/rart4x4/rart4x4.h b/keyboards/rart/rart4x4/rart4x4.h
deleted file mode 100644
index 8160420aa2..0000000000
--- a/keyboards/rart/rart4x4/rart4x4.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 Alabahuy
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) \
-{ \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }, \
-}
diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h
index 1c96e49268..f2b7e045da 100644
--- a/keyboards/rart/rart67/config.h
+++ b/keyboards/rart/rart67/config.h
@@ -17,21 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, B0 }
-#define MATRIX_COL_PINS { B3, B2, B1, D5, D4, D6, D7, B4, B5, F0, F7, F6, F5, F4, F1, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,4 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 240
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/rart/rart67/info.json b/keyboards/rart/rart67/info.json
index ea1788f669..0ec558c67b 100644
--- a/keyboards/rart/rart67/info.json
+++ b/keyboards/rart/rart67/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0067",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B1", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F7", "F6", "F5", "F4", "F1", "E6"],
+        "rows": ["D0", "D1", "D2", "D3", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/rart/rart67/rart67.c b/keyboards/rart/rart67/rart67.c
deleted file mode 100644
index 0ca3e00f22..0000000000
--- a/keyboards/rart/rart67/rart67.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Alabahuy
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rart67.h"
-
-
diff --git a/keyboards/rart/rart67m/config.h b/keyboards/rart/rart67m/config.h
index 5fa69d08ba..3541d6d9ca 100644
--- a/keyboards/rart/rart67m/config.h
+++ b/keyboards/rart/rart67m/config.h
@@ -16,24 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS { D3, D2, D4, F6, B3, B4, B2, B5 }
-#define MATRIX_COL_PINS { F4, F5, C6, F7, D7, B1, E6, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rart/rart67m/info.json b/keyboards/rart/rart67m/info.json
index 4db76f2bbb..0a20310392 100644
--- a/keyboards/rart/rart67m/info.json
+++ b/keyboards/rart/rart67m/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6067",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "C6", "F7", "D7", "B1", "E6", "B6"],
+        "rows": ["D3", "D2", "D4", "F6", "B3", "B4", "B2", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/rart/rart67m/rart67m.c b/keyboards/rart/rart67m/rart67m.c
deleted file mode 100644
index 4aa99c5203..0000000000
--- a/keyboards/rart/rart67m/rart67m.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Alabahuy
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rart67m.h"
diff --git a/keyboards/rart/rart75/config.h b/keyboards/rart/rart75/config.h
index eb5b0be422..42556799eb 100644
--- a/keyboards/rart/rart75/config.h
+++ b/keyboards/rart/rart75/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, F4, F6, C7, D4, D0 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, C6, B6, B5, B4, D7, D6, B3, B1, F7, F5, B2, B7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/rart/rart75/info.json b/keyboards/rart/rart75/info.json
index 40c5f39beb..82f28fe1f8 100644
--- a/keyboards/rart/rart75/info.json
+++ b/keyboards/rart/rart75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0075",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "C6", "B6", "B5", "B4", "D7", "D6", "B3", "B1", "F7", "F5", "B2", "B7"],
+        "rows": ["F1", "F4", "F6", "C7", "D4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "E6", "pin_b": "B0"}
diff --git a/keyboards/rart/rart75/rart75.c b/keyboards/rart/rart75/rart75.c
deleted file mode 100644
index 15ae54f9e8..0000000000
--- a/keyboards/rart/rart75/rart75.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2020 Alabahuy
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rart75.h"
diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
index f6817e71ce..803f0c79ec 100644
--- a/keyboards/rart/rart75hs/config.h
+++ b/keyboards/rart/rart75hs/config.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D5, D6, D7, D0, C5, C4 }
-#define MATRIX_COL_PINS { B4, B3, B2, B1, B0, A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN C0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -46,4 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 240
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json
index 27984a03d7..7003bb36a6 100644
--- a/keyboards/rart/rart75hs/info.json
+++ b/keyboards/rart/rart75hs/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5575",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B3", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C3"],
+        "rows": ["D5", "D6", "D7", "D0", "C5", "C4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C1", "pin_b": "C2"}
@@ -17,6 +22,9 @@
         "caps_lock": "D4",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "C0"
+    },
     "bootmagic": {
         "matrix": [0, 1]
     },
diff --git a/keyboards/rart/rart75hs/rart75hs.c b/keyboards/rart/rart75hs/rart75hs.c
index 6c1c408a8b..58f43c87e3 100644
--- a/keyboards/rart/rart75hs/rart75hs.c
+++ b/keyboards/rart/rart75hs/rart75hs.c
@@ -13,19 +13,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rart75hs.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    switch (index) {
-        case 0:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        break;
-    }
-    return true;
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/rart/rart75m/config.h b/keyboards/rart/rart75m/config.h
index 0b08f0322f..3541d6d9ca 100644
--- a/keyboards/rart/rart75m/config.h
+++ b/keyboards/rart/rart75m/config.h
@@ -16,24 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS { C7, B3, B1, B0, D3, D2 }
-#define MATRIX_COL_PINS { B2, D4, F0, C6, F1, D7, F4, E6, F5, B4, F6, B5, F7, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rart/rart75m/info.json b/keyboards/rart/rart75m/info.json
index 1d0f0e2358..41142d0f73 100644
--- a/keyboards/rart/rart75m/info.json
+++ b/keyboards/rart/rart75m/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6075",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "D4", "F0", "C6", "F1", "D7", "F4", "E6", "F5", "B4", "F6", "B5", "F7", "B6"],
+        "rows": ["C7", "B3", "B1", "B0", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B7", "pin_b": "D6", "resolution": 2}
diff --git a/keyboards/rart/rart75m/rart75m.c b/keyboards/rart/rart75m/rart75m.c
index 87a12a9a1f..7c9014386e 100644
--- a/keyboards/rart/rart75m/rart75m.c
+++ b/keyboards/rart/rart75m/rart75m.c
@@ -14,22 +14,6 @@
  */
 #include "rart75m.h"
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    switch (index) {
-        case 0:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        break;
-    }
-    return true;
-}
-#endif
-
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
     if (!oled_task_user()) {
diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h
index ae69705fec..42f78d3efe 100644
--- a/keyboards/rart/rart80/config.h
+++ b/keyboards/rart/rart80/config.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, A1, B0, C3, D0, D1 }
-#define MATRIX_COL_PINS { A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C2, C1, C0, D7, B4, B2, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -46,4 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 240
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/info.json
index 28775d7b51..22ff437b2c 100644
--- a/keyboards/rart/rart80/info.json
+++ b/keyboards/rart/rart80/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0080",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7", "B4", "B2", "B1"],
+        "rows": ["B3", "A1", "B0", "C3", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D4",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "D5"
+    },
     "bootmagic": {
         "matrix": [0, 1]
     },
diff --git a/keyboards/rart/rart80/rart80.c b/keyboards/rart/rart80/rart80.c
deleted file mode 100644
index 8eeb608a42..0000000000
--- a/keyboards/rart/rart80/rart80.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2022 Alabahuy
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rart80.h"
\ No newline at end of file
diff --git a/keyboards/rart/rartand/config.h b/keyboards/rart/rartand/config.h
index b134d9e1fc..5ae5dc84a3 100644
--- a/keyboards/rart/rartand/config.h
+++ b/keyboards/rart/rartand/config.h
@@ -15,13 +15,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { C3, B2, C2, B1, C1, D7, C0, B0 }
-#define MATRIX_COL_PINS { D0, D1, B4, B5, B3, D4, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rart/rartand/info.json b/keyboards/rart/rartand/info.json
index eeb99a3cd4..d50a593b02 100644
--- a/keyboards/rart/rartand/info.json
+++ b/keyboards/rart/rartand/info.json
@@ -8,6 +8,11 @@
     "pid": "0x5050",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "B4", "B5", "B3", "D4", "D6"],
+    "rows": ["C3", "B2", "C2", "B1", "C1", "D7", "C0", "B0"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "D5",
     "on_state": 0
diff --git a/keyboards/rart/rartand/rartand.c b/keyboards/rart/rartand/rartand.c
deleted file mode 100644
index e9cff88ba5..0000000000
--- a/keyboards/rart/rartand/rartand.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Alabahuy
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rartand.h"
diff --git a/keyboards/rart/rartland/config.h b/keyboards/rart/rartland/config.h
index aee0fdd862..79c27d8171 100644
--- a/keyboards/rart/rartland/config.h
+++ b/keyboards/rart/rartland/config.h
@@ -16,24 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS { B4, A7, A5, A6, C3 }
-#define MATRIX_COL_PINS { B0, A1, B1, A2, B2, A3, B3, A4, C7, C6, D0, C5, D1, C4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rart/rartland/info.json b/keyboards/rart/rartland/info.json
index 5cfc6b7b70..c02687ed11 100644
--- a/keyboards/rart/rartland/info.json
+++ b/keyboards/rart/rartland/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6065",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "C7", "C6", "D0", "C5", "D1", "C4"],
+        "rows": ["B4", "A7", "A5", "A6", "C3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D5", "pin_b": "C2", "resolution": 2}
@@ -22,233 +27,234 @@
     "community_layouts": ["65_ansi", "65_iso"],
     "layouts": {
         "LAYOUT_all": {
-          "layout": [
-            {"x":0, "y":0}, 
-            {"x":1, "y":0},
-            {"x":2, "y":0},
-            {"x":3, "y":0},
-            {"x":4, "y":0},
-            {"x":5, "y":0},
-            {"x":6, "y":0},
-            {"x":7, "y":0},
-            {"x":8, "y":0},
-            {"x":9, "y":0},
-            {"x":10, "y":0},
-            {"x":11, "y":0},
-            {"x":12, "y":0},
-            {"x":13, "y":0},
-            {"x":14, "y":0},
-            {"x":15, "y":0},
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+                {"matrix": [4, 13], "x": 15, "y": 0},
 
-            {"x":0, "y":1, "w":1.5},
-            {"x":1.5, "y":1},
-            {"x":2.5, "y":1},
-            {"x":3.5, "y":1},
-            {"x":4.5, "y":1},
-            {"x":5.5, "y":1},
-            {"x":6.5, "y":1},
-            {"x":7.5, "y":1},
-            {"x":8.5, "y":1},
-            {"x":9.5, "y":1},
-            {"x":10.5, "y":1},
-            {"x":11.5, "y":1},
-            {"x":12.5, "y":1},
-            {"x":13.5, "y":1, "w":1.5},
-            {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 12], "x": 15, "y": 1},
 
-            {"x":0, "y":2, "w":1.75},
-            {"x":1.75, "y":2},
-            {"x":2.75, "y":2},
-            {"x":3.75, "y":2},
-            {"x":4.75, "y":2},
-            {"x":5.75, "y":2},
-            {"x":6.75, "y":2},
-            {"x":7.75, "y":2},
-            {"x":8.75, "y":2},
-            {"x":9.75, "y":2},
-            {"x":10.75, "y":2},
-            {"x":11.75, "y":2},
-            {"x":12.75, "y":2, "w":2.25},
-            {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 11], "x": 15, "y": 2},
 
-            {"x":0, "y":3, "w":1.25},
-            {"x":1.25, "y":3}, 
-            {"x":2.25, "y":3},
-            {"x":3.25, "y":3},
-            {"x":4.25, "y":3}, 
-            {"x":5.25, "y":3}, 
-            {"x":6.25, "y":3}, 
-            {"x":7.25, "y":3}, 
-            {"x":8.25, "y":3}, 
-            {"x":9.25, "y":3},
-            {"x":10.25, "y":3},
-            {"x":11.25, "y":3}, 
-            {"x":12.25, "y":3, "w":1.75},
-            {"x":14, "y":3}, 
-            {"x":15, "y":3}, 
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 10], "x": 15, "y": 3},
 
-            {"x":0, "y":4, "w":1.25}, 
-            {"x":1.25, "y":4, "w":1.25}, 
-            {"x":2.5, "y":4, "w":1.25}, 
-            {"x":3.75, "y":4, "w":6.25},
-            {"x":10, "y":4},
-            {"x":11, "y":4},
-            {"x":12, "y":4},
-            {"x":13, "y":4},
-            {"x":14, "y":4},
-            {"x":15, "y":4}]
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 4], "x": 10, "y": 4},
+                {"matrix": [4, 5], "x": 11, "y": 4},
+                {"matrix": [4, 6], "x": 12, "y": 4},
+                {"matrix": [4, 7], "x": 13, "y": 4},
+                {"matrix": [4, 8], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [4, 13], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 12], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 11], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 10], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 4], "x": 10, "y": 4},
+                {"matrix": [4, 5], "x": 11, "y": 4},
+                {"matrix": [4, 6], "x": 12, "y": 4},
+                {"matrix": [4, 7], "x": 13, "y": 4},
+                {"matrix": [4, 8], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [4, 13], "x": 15, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [4, 12], "x": 15, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 11], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 10], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 4], "x": 10, "y": 4},
+                {"matrix": [4, 5], "x": 11, "y": 4},
+                {"matrix": [4, 6], "x": 12, "y": 4},
+                {"matrix": [4, 7], "x": 13, "y": 4},
+                {"matrix": [4, 8], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/rart/rartland/rartland.c b/keyboards/rart/rartland/rartland.c
index e4a555d128..158b85ab69 100644
--- a/keyboards/rart/rartland/rartland.c
+++ b/keyboards/rart/rartland/rartland.c
@@ -12,23 +12,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rartland.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    switch (index) {
-        case 0:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        break;
-    }
-    return true;
-}
-#endif
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/rart/rartland/rartland.h b/keyboards/rart/rartland/rartland.h
deleted file mode 100644
index 5abfab87ad..0000000000
--- a/keyboards/rart/rartland/rartland.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2021 Alabahuy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- *                                                                  ┌────────�
- *                                                     2u Backspace │0D      │
- *                                                                  └────────┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │4D │
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌─────�
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2D   │4C │      │     │ ISO
- * 2.25u        ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�2D  │ Enter
- * LShift       │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │4B │   │2C │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │4A │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- *              │40  │41  │42  │43                      │44 │45 │46 │47 │48 │49 │
- *              └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- *               └────────────────(a)──────────────────┘└────(b)────┘
- *
- *            (a) 1.5 / 1.5 / 7                         (b)
- *            ┌─────┬─────┬───────────────────────────� ┌─────┬─────�
- *            │40   │41   │43                         │ │44   │46   │ 1.5 / 1.5
- *            └─────┴─────┴───────────────────────────┘ └─────┴─────┘
- *                                                      ┌────┬────�
- *                                                      │44  │45  │ 1.25 / 1.25 (0.5u gap)
- *                                                      └────┴────┘
- */
-
-#define LAYOUT_all( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K4D, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D,      K4C, \
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K4B, \
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K4A, \
-   K40, K41, K42,                K43,                K44, K45, K46, K47, K48, K49 \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D } \
-}
-
-#define LAYOUT_65_ansi( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4D, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D, K4C, \
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K4B, \
-   K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K4A, \
-   K40, K41, K42,                K43,           K44, K45, K46, K47, K48, K49 \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-  { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D } \
-}
-
-#define LAYOUT_65_iso( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4D, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K4C, \
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K4B, \
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K4A, \
-   K40, K41, K42,                K43,           K44, K45, K46, K47, K48, K49 \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D } \
-}
diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h
index b6c3af7f7f..b242e63013 100644
--- a/keyboards/rart/rartlice/config.h
+++ b/keyboards/rart/rartlice/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B12, B8, B5, B4, B3, B11, B10, B1, B0, A7, A6, A5, A3, A4, A1 }
-#define MATRIX_ROW_PINS { B13, A15, B9, A2, A0 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -36,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 11
 #define WS2812_SPI SPID2
 
diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json
index dccdcf2132..c8b2497285 100644
--- a/keyboards/rart/rartlice/info.json
+++ b/keyboards/rart/rartlice/info.json
@@ -8,12 +8,21 @@
         "pid": "0x0065",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B12", "B8", "B5", "B4", "B3", "B11", "B10", "B1", "B0", "A7", "A6", "A5", "A3", "A4", "A1"],
+        "rows": ["B13", "A15", "B9", "A2", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B14",
         "num_lock": "A8",
         "scroll_lock": "A9",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
diff --git a/keyboards/rart/rartlice/rartlice.c b/keyboards/rart/rartlice/rartlice.c
deleted file mode 100644
index a970e96867..0000000000
--- a/keyboards/rart/rartlice/rartlice.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Alabahuy
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rartlice.h"
diff --git a/keyboards/rart/rartlice/rules.mk b/keyboards/rart/rartlice/rules.mk
index 2be366363a..49179d2fb9 100644
--- a/keyboards/rart/rartlice/rules.mk
+++ b/keyboards/rart/rartlice/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 
diff --git a/keyboards/rart/rartlite/config.h b/keyboards/rart/rartlite/config.h
index 0bb282f1d6..d2937838f6 100644
--- a/keyboards/rart/rartlite/config.h
+++ b/keyboards/rart/rartlite/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, D2, B2, B4, B6, B5, D0, D1 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B3, F7, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/rart/rartlite/info.json b/keyboards/rart/rartlite/info.json
index 1bbde23999..2b8a420eeb 100644
--- a/keyboards/rart/rartlite/info.json
+++ b/keyboards/rart/rartlite/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4040",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B3", "F7", "D3"],
+        "rows": ["F4", "D2", "B2", "B4", "B6", "B5", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F5",
         "num_lock": "F6",
diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h
index 4a8e14be49..25467cdd3a 100644
--- a/keyboards/rart/rartpad/config.h
+++ b/keyboards/rart/rartpad/config.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B6, F6, D0, D4, C6 }
-#define MATRIX_COL_PINS { B2, D1, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,4 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 240
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json
index 016b0c49c8..77d99deeb6 100644
--- a/keyboards/rart/rartpad/info.json
+++ b/keyboards/rart/rartpad/info.json
@@ -8,6 +8,11 @@
       "pid": "0x0050",
       "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B2", "D1", "D2", "D3"],
+    "rows": ["B6", "F6", "D0", "D4", "C6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B3", "pin_b": "B1"},
@@ -17,61 +22,64 @@
   "indicators": {
       "caps_lock": "D7"
   },
+  "ws2812": {
+    "pin": "F7"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_5x4", "numpad_5x4"],
   "layouts": {
       "LAYOUT_ortho_5x4": {
             "layout": [
-                {"label": "Numlock", "x": 0, "y": 0},
-                {"label": "/", "x": 1, "y": 0},
-                {"label": "*", "x": 2, "y": 0},
-                {"label": "-", "x": 3, "y": 0},
-                
-                {"label": "7", "x": 0, "y": 1},
-                {"label": "8", "x": 1, "y": 1},
-                {"label": "9", "x": 2, "y": 1},
-                {"label": "=", "x": 3, "y": 1},
-                
-                {"label": "4", "x": 0, "y": 2},
-                {"label": "5", "x": 1, "y": 2},
-                {"label": "6", "x": 2, "y": 2},
-                {"label": "+", "x": 3, "y": 2},
-                
-                {"label": "1", "x": 0, "y": 3},
-                {"label": "2", "x": 1, "y": 3},
-                {"label": "3", "x": 2, "y": 3},
-                {"label": "Esc", "x": 3, "y": 3},
-                
-                {"label": "0", "x": 0, "y": 4},
-                {"label": "00", "x": 1, "y": 4},
-                {"label": ".", "x": 2, "y": 4},
-                {"label": "Enter", "x": 3, "y": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
             ]
       },
       "LAYOUT_numpad_5x4": {
             "layout": [
-                {"label": "Numlock", "x": 0, "y": 0},
-                {"label": "/", "x": 1, "y": 0},
-                {"label": "*", "x": 2, "y": 0},
-                {"label": "-", "x": 3, "y": 0},
-                
-                {"label": "7", "x": 0, "y": 1},
-                {"label": "8", "x": 1, "y": 1},
-                {"label": "9", "x": 2, "y": 1},
-                
-                {"label": "4", "x": 0, "y": 2},
-                {"label": "5", "x": 1, "y": 2},
-                {"label": "6", "x": 2, "y": 2},
-                {"label": "+", "x": 3, "y": 1, "h": 2},
-                
-                {"label": "1", "x": 0, "y": 3},
-                {"label": "2", "x": 1, "y": 3},
-                {"label": "3", "x": 2, "y": 3},
-                
-                {"label": "0", "x": 0, "y": 4, "w": 2},
-                {"label": ".", "x": 2, "y": 4},
-                {"label": "Enter", "x": 3, "y": 3, "h": 2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
                 ]
         }
   }
diff --git a/keyboards/rart/rartpad/rartpad.c b/keyboards/rart/rartpad/rartpad.c
deleted file mode 100644
index 4b5a9eb0c2..0000000000
--- a/keyboards/rart/rartpad/rartpad.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2020 Alabahuy
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rartpad.h"
\ No newline at end of file
diff --git a/keyboards/rart/rartpad/rartpad.h b/keyboards/rart/rartpad/rartpad.h
deleted file mode 100644
index 2e516e2cfe..0000000000
--- a/keyboards/rart/rartpad/rartpad.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43  \
-) \
-{ \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }, \
-    { K40,   K41,   K42,   K43 }, \
-}
-#define LAYOUT_numpad_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K13, \
-    K30, K31, K32,      \
-    K40,      K42, K33  \
-) \
-{ \
-    { K00,   K01,   K02,   K03   }, \
-    { K10,   K11,   K12,   K13   }, \
-    { K20,   K21,   K22,   KC_NO }, \
-    { K30,   K31,   K32,   K33   }, \
-    { K40,   KC_NO, K42,   KC_NO }, \
-}
diff --git a/keyboards/rate/pistachio/info.json b/keyboards/rate/pistachio/info.json
index 109e2fa50c..e07d02061d 100644
--- a/keyboards/rate/pistachio/info.json
+++ b/keyboards/rate/pistachio/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "pistachio", 
+    "keyboard_name": "pistachio",
     "manufacturer": "rate",
-    "url": "", 
-    "maintainer": "rate", 
+    "url": "",
+    "maintainer": "rate",
     "usb": {
         "vid": "0x5255",
         "pid": "0xD0C2",
@@ -12,98 +12,105 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"ESC", "x":1.25, "y":0.25},
-            {"label":"F1", "x":2.75, "y":0.25}, 
-            {"label":"F2", "x":3.75, "y":0.25}, 
-            {"label":"F3", "x":4.75, "y":0.25}, 
-            {"label":"F4", "x":5.75, "y":0.25}, 
-            {"label":"DEL", "x":7.25, "y":0.25}, 
-            {"label":"F5", "x":9.5, "y":0.25}, 
-            {"label":"F6", "x":10.5, "y":0.25}, 
-            {"label":"F7", "x":11.5, "y":0.25}, 
-            {"label":"F8", "x":12.5, "y":0.25}, 
-            {"label":"F9", "x":14, "y":0.25}, 
-            {"label":"F10", "x":15, "y":0.25}, 
-            {"label":"F11", "x":16, "y":0.25}, 
-            {"label":"F12", "x":17, "y":0.25}, 
-            {"label":"\u25b6\u25b6|", "x":0, "y":1.75}, 
-            {"label":"E/J", "x":1.25, "y":1.75}, 
-            {"label":"!", "x":2.25, "y":1.75}, 
-            {"label":"\"", "x":3.25, "y":1.75}, 
-            {"label":"#", "x":4.25, "y":1.75}, 
-            {"label":"$", "x":5.25, "y":1.75}, 
-            {"label":"%", "x":6.25, "y":1.75}, 
-            {"label":"&", "x":7.25, "y":1.75}, 
-            {"label":"'", "x":10, "y":1.75}, 
-            {"label":"(", "x":11, "y":1.75}, 
-            {"label":")", "x":12, "y":1.75}, 
-            {"label":"", "x":13, "y":1.75}, 
-            {"label":"=", "x":14, "y":1.75}, 
-            {"label":"~", "x":15, "y":1.75}, 
-            {"label":"\\", "x":16, "y":1.75}, 
-            {"label":"\u2190", "x":17, "y":1.75}, 
-            {"label":"Delete", "x":18.25, "y":1.75}, 
-            {"label":"\u25b6||", "x":0, "y":2.75}, 
-            {"label":"Tab", "x":1.25, "y":2.75, "w":1.5}, 
-            {"label":"Q", "x":2.75, "y":2.75}, 
-            {"label":"W", "x":3.75, "y":2.75}, 
-            {"label":"E", "x":4.75, "y":2.75}, 
-            {"label":"R", "x":5.75, "y":2.75}, 
-            {"label":"T", "x":6.75, "y":2.75}, 
-            {"label":"Y", "x":9.5, "y":2.75}, 
-            {"label":"U", "x":10.5, "y":2.75}, 
-            {"label":"I", "x":11.5, "y":2.75}, 
-            {"label":"O", "x":12.5, "y":2.75}, 
-            {"label":"P", "x":13.5, "y":2.75}, 
-            {"label":"`", "x":14.5, "y":2.75}, 
-            {"label":"{", "x":15.5, "y":2.75}, 
-            {"label":"Home", "x":18.25, "y":2.75}, 
-            {"label":"\ud83d\udd07", "x":0, "y":3.75}, 
-            {"label":"CapsLock", "x":1.25, "y":3.75, "w":1.75}, 
-            {"label":"A", "x":3, "y":3.75}, 
-            {"label":"S", "x":4, "y":3.75}, 
-            {"label":"D", "x":5, "y":3.75}, 
-            {"label":"F", "x":6, "y":3.75}, 
-            {"label":"G", "x":7, "y":3.75}, 
-            {"label":"H", "x":9.75, "y":3.75}, 
-            {"label":"J", "x":10.75, "y":3.75}, 
-            {"label":"K", "x":11.75, "y":3.75}, 
-            {"label":"L", "x":12.75, "y":3.75}, 
-            {"label":"+", "x":13.75, "y":3.75}, 
-            {"label":"*", "x":14.75, "y":3.75}, 
-            {"label":"}", "x":15.75, "y":3.75}, 
-            {"label":"Enter", "x":16.75, "y":2.75, "w":1.25, "h":2}, 
-            {"label":"End", "x":18.25, "y":3.75}, 
-            {"label":"VolUP", "x":0, "y":4.75}, 
-            {"label":"Shift", "x":1.25, "y":4.75, "w":2.25}, 
-            {"label":"Z", "x":3.5, "y":4.75}, 
-            {"label":"X", "x":4.5, "y":4.75}, 
-            {"label":"C", "x":5.5, "y":4.75}, 
-            {"label":"V", "x":6.5, "y":4.75}, 
-            {"label":"B", "x":7.5, "y":4.75}, 
-            {"label":"N", "x":10.25, "y":4.75}, 
-            {"label":"M", "x":11.25, "y":4.75}, 
-            {"label":"<", "x":12.25, "y":4.75}, 
-            {"label":">", "x":13.25, "y":4.75}, 
-            {"label":"?", "x":14.25, "y":4.75}, 
-            {"label":"_", "x":15.25, "y":4.75}, 
-            {"label":"Shift", "x":16.25, "y":4.75, "w":1.75}, 
-            {"label":"Page", "x":18.25, "y":4.75}, 
-            {"label":"VolDW", "x":0, "y":5.75}, 
-            {"label":"Ctrl", "x":1.25, "y":5.75, "w":1.25}, 
-            {"label":"Win", "x":2.5, "y":5.75}, 
-            {"label":"Alt", "x":3.5, "y":5.75, "w":1.25}, 
-            {"label":"Enter", "x":4.75, "y":5.75}, 
-            {"label":"\u7121\u5909\u63db", "x":5.75, "y":5.75}, 
-            {"x":6.75, "y":5.75, "w":1.25}, 
-            {"x":10.5, "y":5.75, "w":1.25}, 
-            {"label":"\u5909\u63db", "x":11.75, "y":5.75}, 
-            {"label":"\u5de6\u30af\u30ea\u30c3\u30af", "x":12.75, "y":5.75}, 
-            {"label":"Insert", "x":13.75, "y":5.75}, 
-            {"label":"Alt", "x":14.75, "y":5.75}, 
-            {"label":"Menu", "x":15.75, "y":5.75}, 
-            {"label":"Ctrl", "x":16.75, "y":5.75, "w":1.25}, 
-            {"label":"Page", "x":18.25, "y":5.75}]
+            "layout": [
+                {"x":1.25, "y":0},
+                {"x":2.75, "y":0},
+                {"x":3.75, "y":0},
+                {"x":4.75, "y":0},
+                {"x":5.75, "y":0},
+                {"x":7.25, "y":0},
+                {"x":9.5, "y":0},
+                {"x":10.5, "y":0},
+                {"x":11.5, "y":0},
+                {"x":12.5, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+                {"x":16, "y":0},
+                {"x":17, "y":0},
+
+                {"x":0, "y":1.5},
+                {"x":1.25, "y":1.5},
+                {"x":2.25, "y":1.5},
+                {"x":3.25, "y":1.5},
+                {"x":4.25, "y":1.5},
+                {"x":5.25, "y":1.5},
+                {"x":6.25, "y":1.5},
+                {"x":7.25, "y":1.5},
+                {"x":10, "y":1.5},
+                {"x":11, "y":1.5},
+                {"x":12, "y":1.5},
+                {"x":13, "y":1.5},
+                {"x":14, "y":1.5},
+                {"x":15, "y":1.5},
+                {"x":16, "y":1.5},
+                {"x":17, "y":1.5},
+                {"x":18.25, "y":1.5},
+
+                {"x":0, "y":2.5},
+                {"x":1.25, "y":2.5, "w":1.5},
+                {"x":2.75, "y":2.5},
+                {"x":3.75, "y":2.5},
+                {"x":4.75, "y":2.5},
+                {"x":5.75, "y":2.5},
+                {"x":6.75, "y":2.5},
+                {"x":9.5, "y":2.5},
+                {"x":10.5, "y":2.5},
+                {"x":11.5, "y":2.5},
+                {"x":12.5, "y":2.5},
+                {"x":13.5, "y":2.5},
+                {"x":14.5, "y":2.5},
+                {"x":15.5, "y":2.5},
+                {"x":18.25, "y":2.5},
+
+                {"x":0, "y":3.5},
+                {"x":1.25, "y":3.5, "w":1.75},
+                {"x":3, "y":3.5},
+                {"x":4, "y":3.5},
+                {"x":5, "y":3.5},
+                {"x":6, "y":3.5},
+                {"x":7, "y":3.5},
+                {"x":9.75, "y":3.5},
+                {"x":10.75, "y":3.5},
+                {"x":11.75, "y":3.5},
+                {"x":12.75, "y":3.5},
+                {"x":13.75, "y":3.5},
+                {"x":14.75, "y":3.5},
+                {"x":15.75, "y":3.5},
+                {"x":16.75, "y":2.5, "w":1.25, "h":2},
+                {"x":18.25, "y":3.5},
+
+                {"x":0, "y":4.5},
+                {"x":1.25, "y":4.5, "w":2.25},
+                {"x":3.5, "y":4.5},
+                {"x":4.5, "y":4.5},
+                {"x":5.5, "y":4.5},
+                {"x":6.5, "y":4.5},
+                {"x":7.5, "y":4.5},
+                {"x":10.25, "y":4.5},
+                {"x":11.25, "y":4.5},
+                {"x":12.25, "y":4.5},
+                {"x":13.25, "y":4.5},
+                {"x":14.25, "y":4.5},
+                {"x":15.25, "y":4.5},
+                {"x":16.25, "y":4.5, "w":1.75},
+                {"x":18.25, "y":4.5},
+
+                {"x":0, "y":5.5},
+                {"x":1.25, "y":5.5, "w":1.25},
+                {"x":2.5, "y":5.5},
+                {"x":3.5, "y":5.5, "w":1.25},
+                {"x":4.75, "y":5.5},
+                {"x":5.75, "y":5.5},
+                {"x":6.75, "y":5.5, "w":1.25},
+                {"x":10.5, "y":5.5, "w":1.25},
+                {"x":11.75, "y":5.5},
+                {"x":12.75, "y":5.5},
+                {"x":13.75, "y":5.5},
+                {"x":14.75, "y":5.5},
+                {"x":15.75, "y":5.5},
+                {"x":16.75, "y":5.5, "w":1.25},
+                {"x":18.25, "y":5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/rate/pistachio/pistachio.c b/keyboards/rate/pistachio/pistachio.c
deleted file mode 100644
index 2a850f64a4..0000000000
--- a/keyboards/rate/pistachio/pistachio.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 rate
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pistachio.h"
-
diff --git a/keyboards/rate/pistachio/pistachio.h b/keyboards/rate/pistachio/pistachio.h
deleted file mode 100644
index 7bf2c59ad6..0000000000
--- a/keyboards/rate/pistachio/pistachio.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 rate
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_rate_pistachio_rev1)
-#    include "rev1.h"
-#elif defined(KEYBOARD_rate_pistachio_rev2)
-#    include "rev2.h"
-#endif
diff --git a/keyboards/rate/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h
index cd6121de45..b2d36827bb 100644
--- a/keyboards/rate/pistachio/rev1/config.h
+++ b/keyboards/rate/pistachio/rev1/config.h
@@ -17,26 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D3}
-
 #define USE_I2C
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D2
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 1, 1 }
 #define RGBLED_NUM 2
diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json
new file mode 100644
index 0000000000..c57493f8fe
--- /dev/null
+++ b/keyboards/rate/pistachio/rev1/info.json
@@ -0,0 +1,10 @@
+{
+    "ws2812": {
+        "pin": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D3"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/rate/pistachio/rev1/rev1.c b/keyboards/rate/pistachio/rev1/rev1.c
deleted file mode 100644
index 5824157f53..0000000000
--- a/keyboards/rate/pistachio/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 rate
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "rev1.h"
diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h
index 5a7c35a936..95898ac2c1 100644
--- a/keyboards/rate/pistachio/rev2/config.h
+++ b/keyboards/rate/pistachio/rev2/config.h
@@ -17,29 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D3}
-
 #define USE_I2C
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Split hand configration */
 #define SPLIT_HAND_MATRIX_GRID D4,D3
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D2
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 38, 46 }
 #define RGBLED_NUM 84
diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json
new file mode 100644
index 0000000000..a98938f559
--- /dev/null
+++ b/keyboards/rate/pistachio/rev2/info.json
@@ -0,0 +1,10 @@
+{
+    "ws2812": {
+        "pin": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"],
+        "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/rate/pistachio/rev2/rev2.c b/keyboards/rate/pistachio/rev2/rev2.c
deleted file mode 100644
index c6e64a526d..0000000000
--- a/keyboards/rate/pistachio/rev2/rev2.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 rate
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "rev2.h"
diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h
index 948c87264a..b788bd2bc1 100644
--- a/keyboards/rate/pistachio_mp/config.h
+++ b/keyboards/rate/pistachio_mp/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, E6, D7, C6, D4 }
-#define MATRIX_COL_PINS { B3, B1, F7, F6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN D2
 #define RGBLED_NUM 3
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json
index cab8ef68b4..0aca3a3f8e 100644
--- a/keyboards/rate/pistachio_mp/info.json
+++ b/keyboards/rate/pistachio_mp/info.json
@@ -8,6 +8,14 @@
         "pid": "0xE212",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6"],
+        "rows": ["B4", "E6", "D7", "C6", "D4"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "F4", "pin_b": "F5"}
diff --git a/keyboards/rate/pistachio_mp/keymaps/via/keymap.c b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
index 293da4f569..f459a76970 100644
--- a/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
@@ -87,7 +87,8 @@ void encoder_action_unregister(void) {
         keyevent_t encoder_event = (keyevent_t) {
             .key = encoder_state >> 1 ? ENC_CW : ENC_CCW,
             .pressed = false,
-            .time = (timer_read() | 1)
+            .time = timer_read(),
+            .type = KEY_EVENT
         };
         encoder_state = 0;
         action_exec(encoder_event);
@@ -99,7 +100,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? ENC_CW : ENC_CCW,
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/rate/pistachio_mp/pistachio_mp.c b/keyboards/rate/pistachio_mp/pistachio_mp.c
deleted file mode 100644
index 40e75fe1b0..0000000000
--- a/keyboards/rate/pistachio_mp/pistachio_mp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 rate
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pistachio_mp.h"
diff --git a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
index 3e390d442f..b5b8e3c440 100644
--- a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
@@ -135,7 +135,8 @@ void encoder_action_unregister(void) {
         keyevent_t encoder_event = (keyevent_t) {
             .key = encoder_state >> 1 ? ENC_CW : ENC_CCW,
             .pressed = false,
-            .time = (timer_read() | 1)
+            .time = timer_read(),
+            .type = KEY_EVENT
         };
         encoder_state = 0;
         action_exec(encoder_event);
@@ -146,7 +147,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? ENC_CW : ENC_CCW,
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/rate/pistachio_pro/pistachio_pro.c b/keyboards/rate/pistachio_pro/pistachio_pro.c
deleted file mode 100644
index fda14471b7..0000000000
--- a/keyboards/rate/pistachio_pro/pistachio_pro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 rate
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pistachio_pro.h"
diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h
index 1d483f8d77..17ec1a2bab 100644
--- a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h
+++ b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h
@@ -16,16 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {D1,D0,D5,D4,C7,B7,C6,C5,B0,B1}
-#define MATRIX_COL_PINS {C2,D2,B6,B5,B4,B3,B2,D6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 18
 
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
index 71253c2113..381e690fa8 100644
--- a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
+++ b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["C2", "D2", "B6", "B5", "B4", "B3", "B2", "D6"],
+        "rows": ["D1", "D0", "D5", "D4", "C7", "B7", "C6", "C5", "B0", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "D1",
         "esc_output": "C2"
diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/rev_a.c b/keyboards/rationalist/ratio65_hotswap/rev_a/rev_a.c
deleted file mode 100644
index dc6c727fb7..0000000000
--- a/keyboards/rationalist/ratio65_hotswap/rev_a/rev_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "rev_a.h"
diff --git a/keyboards/rationalist/ratio65_solder/rev_a/config.h b/keyboards/rationalist/ratio65_solder/rev_a/config.h
index dba1363b48..c3f781ab7c 100644
--- a/keyboards/rationalist/ratio65_solder/rev_a/config.h
+++ b/keyboards/rationalist/ratio65_solder/rev_a/config.h
@@ -16,16 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {D1,D0,D5,D4,C7,B7,C6,C5,B0,B1}
-#define MATRIX_COL_PINS {C2,D2,B6,B5,B4,B3,B2,D6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 18
 
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/rationalist/ratio65_solder/rev_a/info.json b/keyboards/rationalist/ratio65_solder/rev_a/info.json
index 1fa6dc2b91..0d0dcd57b8 100644
--- a/keyboards/rationalist/ratio65_solder/rev_a/info.json
+++ b/keyboards/rationalist/ratio65_solder/rev_a/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["C2", "D2", "B6", "B5", "B4", "B3", "B2", "D6"],
+        "rows": ["D1", "D0", "D5", "D4", "C7", "B7", "C6", "C5", "B0", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "D1",
         "esc_output": "C2"
diff --git a/keyboards/rationalist/ratio65_solder/rev_a/rev_a.c b/keyboards/rationalist/ratio65_solder/rev_a/rev_a.c
deleted file mode 100644
index dc6c727fb7..0000000000
--- a/keyboards/rationalist/ratio65_solder/rev_a/rev_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "rev_a.h"
diff --git a/keyboards/recompile_keys/choco60/choco60.c b/keyboards/recompile_keys/choco60/choco60.c
deleted file mode 100644
index fc56c68ac8..0000000000
--- a/keyboards/recompile_keys/choco60/choco60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Naoto Takai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "choco60.h"
diff --git a/keyboards/recompile_keys/choco60/rev1/config.h b/keyboards/recompile_keys/choco60/rev1/config.h
index 20fefc2180..ba9e3a474e 100644
--- a/keyboards/recompile_keys/choco60/rev1/config.h
+++ b/keyboards/recompile_keys/choco60/rev1/config.h
@@ -17,20 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN D0
diff --git a/keyboards/recompile_keys/choco60/rev1/info.json b/keyboards/recompile_keys/choco60/rev1/info.json
index 81738c4d47..3960f575ab 100644
--- a/keyboards/recompile_keys/choco60/rev1/info.json
+++ b/keyboards/recompile_keys/choco60/rev1/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D3"
     },
diff --git a/keyboards/recompile_keys/choco60/rev1/rev1.c b/keyboards/recompile_keys/choco60/rev1/rev1.c
deleted file mode 100644
index fe60477e34..0000000000
--- a/keyboards/recompile_keys/choco60/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Naoto Takai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/recompile_keys/choco60/rev1/rev1.h b/keyboards/recompile_keys/choco60/rev1/rev1.h
deleted file mode 100644
index fa161f267e..0000000000
--- a/keyboards/recompile_keys/choco60/rev1/rev1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/recompile_keys/choco60/rev2/config.h b/keyboards/recompile_keys/choco60/rev2/config.h
index 0540d16151..e081d748ce 100644
--- a/keyboards/recompile_keys/choco60/rev2/config.h
+++ b/keyboards/recompile_keys/choco60/rev2/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C5, C4, B6, B7, C7 }
-#define MATRIX_ROW_PINS_RIGHT { D3, D2, D5, D6, B0 }
-/* The last three NO_PIN are dummies to make the same size as MATRIX_ROW_PINS_RIGHT. */
-#define MATRIX_COL_PINS { C6, B4, B3, B2, B1, B0, NO_PIN, NO_PIN, NO_PIN }
-#define MATRIX_COL_PINS_RIGHT { C7, B7, B6, B5, B4, B3, B2, C6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN D1
 
 #define SPLIT_USB_DETECT
diff --git a/keyboards/recompile_keys/choco60/rev2/info.json b/keyboards/recompile_keys/choco60/rev2/info.json
index a768c060db..c03e8678f6 100644
--- a/keyboards/recompile_keys/choco60/rev2/info.json
+++ b/keyboards/recompile_keys/choco60/rev2/info.json
@@ -1,6 +1,17 @@
 {
+    "matrix_pins": {
+        "cols": ["C6", "B4", "B3", "B2", "B1", "B0", null, null, null],
+        "rows": ["C5", "C4", "B6", "B7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["C7", "B7", "B6", "B5", "B4", "B3", "B2", "C6", "D4"],
+                "rows": ["D3", "D2", "D5", "D6", "B0"]
+            }
+        }
     },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu"
diff --git a/keyboards/recompile_keys/choco60/rev2/rev2.c b/keyboards/recompile_keys/choco60/rev2/rev2.c
deleted file mode 100644
index 5eabb33ac6..0000000000
--- a/keyboards/recompile_keys/choco60/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/recompile_keys/choco60/rev2/rev2.h b/keyboards/recompile_keys/choco60/rev2/rev2.h
deleted file mode 100644
index fa161f267e..0000000000
--- a/keyboards/recompile_keys/choco60/rev2/rev2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/recompile_keys/cocoa40/cocoa40.c b/keyboards/recompile_keys/cocoa40/cocoa40.c
deleted file mode 100644
index fdc9f9c0ea..0000000000
--- a/keyboards/recompile_keys/cocoa40/cocoa40.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 'Naoto Takai'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "cocoa40.h"
diff --git a/keyboards/recompile_keys/cocoa40/config.h b/keyboards/recompile_keys/cocoa40/config.h
index 5a62dae4f8..976a698c5d 100644
--- a/keyboards/recompile_keys/cocoa40/config.h
+++ b/keyboards/recompile_keys/cocoa40/config.h
@@ -17,21 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D4, D0, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN D3
diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json
index 4de66d2aea..b72f109cf6 100644
--- a/keyboards/recompile_keys/cocoa40/info.json
+++ b/keyboards/recompile_keys/cocoa40/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/recompile_keys/mio/config.h b/keyboards/recompile_keys/mio/config.h
index 9ecc3fd593..d91130ed89 100644
--- a/keyboards/recompile_keys/mio/config.h
+++ b/keyboards/recompile_keys/mio/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F1, F0, F4, F7, F6, F5 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 8
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json
index 7523573159..8843ad5739 100644
--- a/keyboards/recompile_keys/mio/info.json
+++ b/keyboards/recompile_keys/mio/info.json
@@ -8,6 +8,14 @@
     "pid": "0x4D41",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B3"
+  },
+  "matrix_pins": {
+    "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+    "rows": ["F1", "F0", "F4", "F7", "F6", "F5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/recompile_keys/mio/mio.c b/keyboards/recompile_keys/mio/mio.c
deleted file mode 100644
index 154a89d26f..0000000000
--- a/keyboards/recompile_keys/mio/mio.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 recompile keys
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mio.h"
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
index 8861dc5396..e7ca3c1760 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // place overrides here
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
 #define TAPPING_TERM_PER_KEY
@@ -59,7 +58,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // LED Setting: if you have KUMO you can use RGBLIGHT_ENABLE = yes
 #ifdef RGBLIGHT_ENABLE
-  #define RGB_DI_PIN B5
+  #define WS2812_DI_PIN B5
   #define RGBLIGHT_TIMER
 
   #define RGBLED_NUM 6
diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
index 8861dc5396..e7ca3c1760 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
+++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // place overrides here
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
 #define TAPPING_TERM_PER_KEY
@@ -59,7 +58,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // LED Setting: if you have KUMO you can use RGBLIGHT_ENABLE = yes
 #ifdef RGBLIGHT_ENABLE
-  #define RGB_DI_PIN B5
+  #define WS2812_DI_PIN B5
   #define RGBLIGHT_TIMER
 
   #define RGBLED_NUM 6
diff --git a/keyboards/recompile_keys/nomu30/nomu30.c b/keyboards/recompile_keys/nomu30/nomu30.c
deleted file mode 100644
index 37a8614c11..0000000000
--- a/keyboards/recompile_keys/nomu30/nomu30.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Naoto Takai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "nomu30.h"
diff --git a/keyboards/recompile_keys/nomu30/nomu30.h b/keyboards/recompile_keys/nomu30/nomu30.h
index 964eb2a65f..1b33c17be1 100644
--- a/keyboards/recompile_keys/nomu30/nomu30.h
+++ b/keyboards/recompile_keys/nomu30/nomu30.h
@@ -16,11 +16,6 @@
 #pragma once
 
 #include "quantum.h"
-#ifdef KEYBOARD_recompile_keys_nomu30_rev1
-    #include "rev1.h"
-#elif KEYBOARD_recompile_keys_nomu30_rev2
-    #include "rev2.h"
-#endif
 
 #define LAYOUT( \
         K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
diff --git a/keyboards/recompile_keys/nomu30/rev1/config.h b/keyboards/recompile_keys/nomu30/rev1/config.h
deleted file mode 100644
index e9ef483924..0000000000
--- a/keyboards/recompile_keys/nomu30/rev1/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2019 Naoto Takai
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D1, D0, D4 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/recompile_keys/nomu30/rev1/info.json b/keyboards/recompile_keys/nomu30/rev1/info.json
index 4369a04103..815f200cd8 100644
--- a/keyboards/recompile_keys/nomu30/rev1/info.json
+++ b/keyboards/recompile_keys/nomu30/rev1/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/recompile_keys/nomu30/rev1/rev1.c b/keyboards/recompile_keys/nomu30/rev1/rev1.c
deleted file mode 100644
index 8adf9859f8..0000000000
--- a/keyboards/recompile_keys/nomu30/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/recompile_keys/nomu30/rev1/rev1.h b/keyboards/recompile_keys/nomu30/rev1/rev1.h
deleted file mode 100644
index fa161f267e..0000000000
--- a/keyboards/recompile_keys/nomu30/rev1/rev1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/recompile_keys/nomu30/rev2/config.h b/keyboards/recompile_keys/nomu30/rev2/config.h
index ef4d48e163..ff4630d838 100644
--- a/keyboards/recompile_keys/nomu30/rev2/config.h
+++ b/keyboards/recompile_keys/nomu30/rev2/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B2, B1, B0 }
-#define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, D5, D4, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/recompile_keys/nomu30/rev2/info.json b/keyboards/recompile_keys/nomu30/rev2/info.json
index dd190d18ee..70730415a5 100644
--- a/keyboards/recompile_keys/nomu30/rev2/info.json
+++ b/keyboards/recompile_keys/nomu30/rev2/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "D5", "D4", "D3"],
+        "rows": ["B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/recompile_keys/nomu30/rev2/rev2.c b/keyboards/recompile_keys/nomu30/rev2/rev2.c
deleted file mode 100644
index 5eabb33ac6..0000000000
--- a/keyboards/recompile_keys/nomu30/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/recompile_keys/nomu30/rev2/rev2.h b/keyboards/recompile_keys/nomu30/rev2/rev2.h
deleted file mode 100644
index fa161f267e..0000000000
--- a/keyboards/recompile_keys/nomu30/rev2/rev2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/rect44/config.h b/keyboards/rect44/config.h
index 55dd3f951d..6fb0d430fb 100644
--- a/keyboards/rect44/config.h
+++ b/keyboards/rect44/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, F5, F4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, D1, D0, D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 12
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/rect44/info.json b/keyboards/rect44/info.json
index 2bb04a7f8b..da406586fd 100644
--- a/keyboards/rect44/info.json
+++ b/keyboards/rect44/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4DD7",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["D3", "D2", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/rect44/rect44.c b/keyboards/rect44/rect44.c
deleted file mode 100644
index b36aa7d40d..0000000000
--- a/keyboards/rect44/rect44.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020-2021 koshinoya
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rect44.h"
diff --git a/keyboards/redox/keymaps/eightbitraptor/config.h b/keyboards/redox/keymaps/eightbitraptor/config.h
index 9697f561da..045b6a2165 100644
--- a/keyboards/redox/keymaps/eightbitraptor/config.h
+++ b/keyboards/redox/keymaps/eightbitraptor/config.h
@@ -39,4 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 
 #define RETRO_TAPPING
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/redox/keymaps/finex/config.h b/keyboards/redox/keymaps/finex/config.h
index f155c6900c..e65e610046 100644
--- a/keyboards/redox/keymaps/finex/config.h
+++ b/keyboards/redox/keymaps/finex/config.h
@@ -39,5 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 
 // #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 200
diff --git a/keyboards/redox/keymaps/thattolleyguy/config.h b/keyboards/redox/keymaps/thattolleyguy/config.h
index cf32745193..f3b73d8974 100644
--- a/keyboards/redox/keymaps/thattolleyguy/config.h
+++ b/keyboards/redox/keymaps/thattolleyguy/config.h
@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #undef RGBLED_NUM
-#undef RGB_DI_PIN
-#define RGB_DI_PIN C6
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN C6
 #define RGBLED_NUM 14    // Number of LEDs
 #define RGBLED_SPLIT { 7, 7 }
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/redox/redox.c b/keyboards/redox/redox.c
deleted file mode 100644
index 7fa3545a47..0000000000
--- a/keyboards/redox/redox.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "redox.h"
diff --git a/keyboards/redox/redox.h b/keyboards/redox/redox.h
deleted file mode 100644
index 4160096b28..0000000000
--- a/keyboards/redox/redox.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#if defined(KEYBOARD_redox_rev1)
-#     include "rev1.h"
-#elif defined(KEYBOARD_redox_media)
-#    include "media.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json
index d65f0e2b1b..e0d1433115 100644
--- a/keyboards/redox/rev1/base/info.json
+++ b/keyboards/redox/rev1/base/info.json
@@ -2,9 +2,17 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h
index b768d2f19f..5b44f7541f 100644
--- a/keyboards/redox/rev1/config.h
+++ b/keyboards/redox/rev1/config.h
@@ -17,23 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 14    // Number of LEDs
 
 #define RGBLIGHT_SPLIT   // sync LEDs between RIGHT and LEFT hand
diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h
index 71d3470569..08a74aef2c 100644
--- a/keyboards/redox/rev1/proton_c/config.h
+++ b/keyboards/redox/rev1/proton_c/config.h
@@ -3,13 +3,6 @@
 
 #pragma once
 
-
-// wiring of each half
-#undef MATRIX_ROW_PINS
-#define MATRIX_ROW_PINS { B5, B3, B2, B1, B0 }
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { A1, A0, B8, B13, B14, B15, B9 }
-
 // //we are using hardware serial, so lets undef the softserial used otherwise
 
 /* serial.c configuration for split keyboard */
@@ -32,10 +25,6 @@
 #define SERIAL_USART_RX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 #define SERIAL_USART_TIMEOUT 20    // USART driver timeout. default 20
 
-/* ws2812 RGB LED */
-#undef RGB_DI_PIN
-#define RGB_DI_PIN A9
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json
index 4f6bae6891..7fec1e7950 100644
--- a/keyboards/redox/rev1/proton_c/info.json
+++ b/keyboards/redox/rev1/proton_c/info.json
@@ -2,6 +2,14 @@
     "usb": {
         "device_version": "1.0.1"
     },
+    "ws2812": {
+        "pin": "A9"
+    },
+    "matrix_pins": {
+        "cols": ["A1", "A0", "B8", "B13", "B14", "B15", "B9"],
+        "rows": ["B5", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C"
diff --git a/keyboards/redox/rev1/proton_c/proton_c.c b/keyboards/redox/rev1/proton_c/proton_c.c
deleted file mode 100644
index 796e2c8c3d..0000000000
--- a/keyboards/redox/rev1/proton_c/proton_c.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 xerootg
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "proton_c.h"
diff --git a/keyboards/redox/rev1/proton_c/proton_c.h b/keyboards/redox/rev1/proton_c/proton_c.h
deleted file mode 100644
index d8813d9c4d..0000000000
--- a/keyboards/redox/rev1/proton_c/proton_c.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 xerootg
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "rev1.h"
diff --git a/keyboards/redox/rev1/rev1.c b/keyboards/redox/rev1/rev1.c
deleted file mode 100644
index b1ab15df32..0000000000
--- a/keyboards/redox/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "redox.h"
diff --git a/keyboards/redox/rev1/rev1.h b/keyboards/redox/rev1/rev1.h
index 5a24122048..4ad423d897 100644
--- a/keyboards/redox/rev1/rev1.h
+++ b/keyboards/redox/rev1/rev1.h
@@ -1,21 +1,7 @@
 #pragma once
 
-#include "redox.h"
-
-#if defined(KEYBOARD_redox_rev1_proton_c)
-#    include "proton_c.h"
-#endif
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-  #include <avr/io.h>
-  #include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
   k00, k01, k02, k03, k04, k05,                          k08, k09, k10, k11, k12, k13, \
   k14, k15, k16, k17, k18, k19, k06,                k07, k22, k23, k24, k25, k26, k27, \
diff --git a/keyboards/redox_media/config.h b/keyboards/redox_media/config.h
index c39e49f375..ca325c381e 100644
--- a/keyboards/redox_media/config.h
+++ b/keyboards/redox_media/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/redox_media/info.json b/keyboards/redox_media/info.json
index 9f4442885c..ca90fcc2d2 100644
--- a/keyboards/redox_media/info.json
+++ b/keyboards/redox_media/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "D1"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F4", "pin_b": "F5"}
diff --git a/keyboards/redox_w/keymaps/danielo515/config.h b/keyboards/redox_w/keymaps/danielo515/config.h
index 43d4ff9cb2..df14c8c269 100644
--- a/keyboards/redox_w/keymaps/danielo515/config.h
+++ b/keyboards/redox_w/keymaps/danielo515/config.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 200
 #undef ONESHOT_TIMEOUT
 #define ONESHOT_TIMEOUT 1500
diff --git a/keyboards/redscarf_i/config.h b/keyboards/redscarf_i/config.h
deleted file mode 100644
index c9ee89dbe8..0000000000
--- a/keyboards/redscarf_i/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2019 Ben Weakley
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D4, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/redscarf_i/info.json b/keyboards/redscarf_i/info.json
index 620c7e457a..573d7dcaea 100644
--- a/keyboards/redscarf_i/info.json
+++ b/keyboards/redscarf_i/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5959",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7"],
+        "rows": ["D0", "D1", "D2", "D3", "D4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5"
     },
@@ -17,100 +22,118 @@
     "layouts": {
         "LAYOUT_ortho_5x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
             ]
         },
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":0, "y":5},
-                {"x":1, "y":5},
-                {"x":2, "y":5},
-                {"x":3, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"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}
             ]
         },
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":1, "h":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":0, "y":4, "w":2},
-                {"x":2, "y":4},
-                {"x":3, "y":3, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":2, "h":2},
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":0, "y":5, "w":2},
-                {"x":2, "y":5},
-                {"x":3, "y":4, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
             ]
         }
     }
diff --git a/keyboards/redscarf_i/redscarf_i.c b/keyboards/redscarf_i/redscarf_i.c
index 039e20664d..fac3e245fb 100644
--- a/keyboards/redscarf_i/redscarf_i.c
+++ b/keyboards/redscarf_i/redscarf_i.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "redscarf_i.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
   // initialize top row leds
diff --git a/keyboards/redscarf_i/redscarf_i.h b/keyboards/redscarf_i/redscarf_i.h
deleted file mode 100644
index 44e4689347..0000000000
--- a/keyboards/redscarf_i/redscarf_i.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2019 Ben Weakley
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-    k50, k51, k52, k53  \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 }, \
-    { k50, k51, k52, k53 }  \
-}
-
-#define LAYOUT_ortho_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43  \
-) \
-{ \
-    { k00,   k01,   k02,   k03   }, \
-    { k10,   k11,   k12,   k13   }, \
-    { k20,   k21,   k22,   k23   }, \
-    { k30,   k31,   k32,   k33   }, \
-    { k40,   k41,   k42,   k43   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_numpad_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k23, \
-    k40, k41, k42,      \
-    k50,      k52, k43  \
-) \
-{ \
-    { k00, k01,   k02, k03   }, \
-    { k10, k11,   k12, k13   }, \
-    { k20, k21,   k22, k23   }, \
-    { k30, k31,   k32, KC_NO }, \
-    { k40, k41,   k42, k43   }, \
-    { k50, KC_NO, k52, KC_NO }  \
-}
-
-#define LAYOUT_numpad_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12,      \
-    k20, k21, k22, k13, \
-    k30, k31, k32,      \
-    k40,      k42, k33  \
-) \
-{ \
-    { k00,   k01,   k02,   k03   }, \
-    { k10,   k11,   k12,   k13   }, \
-    { k20,   k21,   k22,   KC_NO }, \
-    { k30,   k31,   k32,   k33   }, \
-    { k40,   KC_NO, k42,   KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
diff --git a/keyboards/redscarf_iiplus/verb/verb.c b/keyboards/redscarf_iiplus/verb/verb.c
deleted file mode 100755
index 9313b2a792..0000000000
--- a/keyboards/redscarf_iiplus/verb/verb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "verb.h"
diff --git a/keyboards/redscarf_iiplus/verc/info.json b/keyboards/redscarf_iiplus/verc/info.json
index cd8470a5ce..b81802999e 100644
--- a/keyboards/redscarf_iiplus/verc/info.json
+++ b/keyboards/redscarf_iiplus/verc/info.json
@@ -21,11 +21,157 @@
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 7], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         },
-        
         "LAYOUT_65_iso": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 0], "x": 15, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [1, 13], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 7], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/redscarf_iiplus/verc/verc.c b/keyboards/redscarf_iiplus/verc/verc.c
deleted file mode 100755
index 09edb5f1cd..0000000000
--- a/keyboards/redscarf_iiplus/verc/verc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "verc.h"
diff --git a/keyboards/redscarf_iiplus/verc/verc.h b/keyboards/redscarf_iiplus/verc/verc.h
deleted file mode 100755
index c548bbe8b8..0000000000
--- a/keyboards/redscarf_iiplus/verc/verc.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2E, \
-	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E, \
-	K40, K41, K42,                K49,           K4A, K4B, K47, K4C, K4D,      K4E  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, XXX, K47, XXX, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }  \
-}
-
-#define LAYOUT_65_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2D,      K2E, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E, \
-	K40, K41, K42,                K49,           K4A, K4B, K47, K4C, K4D,      K4E  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, XXX, K47, XXX, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }  \
-}
-
diff --git a/keyboards/redscarf_iiplus/verd/verd.c b/keyboards/redscarf_iiplus/verd/verd.c
deleted file mode 100644
index fa5ef6bd2b..0000000000
--- a/keyboards/redscarf_iiplus/verd/verd.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2019 Andy Lee <alee@alittlepeacemusic.com>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "verd.h"
diff --git a/keyboards/reedskeebs/alish40/alish40.c b/keyboards/reedskeebs/alish40/alish40.c
deleted file mode 100644
index 685eae8de8..0000000000
--- a/keyboards/reedskeebs/alish40/alish40.c
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2023 QMK Contributors (@qmk)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "quantum.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    switch (index) {
-        case 0:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-            break;
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/reedskeebs/alish40/info.json b/keyboards/reedskeebs/alish40/info.json
index a4f862bec9..d916d4173b 100644
--- a/keyboards/reedskeebs/alish40/info.json
+++ b/keyboards/reedskeebs/alish40/info.json
@@ -40,9 +40,11 @@
         "brightness_steps": 17,
         "hue_steps": 10,
         "led_count": 10,
-        "pin": "F5",
         "saturation_steps": 17
     },
+    "ws2812": {
+        "pin": "F5"
+    },
     "url": "https://mechwild.com/product/alish/",
     "usb": {
         "device_version": "1.3.0",
diff --git a/keyboards/retro_75/config.h b/keyboards/retro_75/config.h
index c05e2f5d7b..38d0e5dd61 100644
--- a/keyboards/retro_75/config.h
+++ b/keyboards/retro_75/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A8, B15, B14, B13, B12, B8 }
-#define MATRIX_COL_PINS { A5, A4, A3, F0, C15, C14, C13, A6, B11, B10, B2, B1, B0, A7, A14, A15 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN A9
 #define RGBLED_NUM 18
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/retro_75/info.json b/keyboards/retro_75/info.json
index 95a09b613d..a9645528cb 100644
--- a/keyboards/retro_75/info.json
+++ b/keyboards/retro_75/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5275",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A9"
+    },
+    "matrix_pins": {
+        "cols": ["A5", "A4", "A3", "F0", "C15", "C14", "C13", "A6", "B11", "B10", "B2", "B1", "B0", "A7", "A14", "A15"],
+        "rows": ["A8", "B15", "B14", "B13", "B12", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/retro_75/retro_75.c b/keyboards/retro_75/retro_75.c
deleted file mode 100644
index d47def3720..0000000000
--- a/keyboards/retro_75/retro_75.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "retro_75.h"
diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h
index 0cd6866c40..a730f35d8c 100644
--- a/keyboards/reversestudio/decadepad/config.h
+++ b/keyboards/reversestudio/decadepad/config.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* NIU Mini PCB default pin-out */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -47,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/reversestudio/decadepad/decadepad.c b/keyboards/reversestudio/decadepad/decadepad.c
deleted file mode 100644
index 699a4476bb..0000000000
--- a/keyboards/reversestudio/decadepad/decadepad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "decadepad.h"
diff --git a/keyboards/reversestudio/decadepad/decadepad.h b/keyboards/reversestudio/decadepad/decadepad.h
deleted file mode 100644
index 7da10094c7..0000000000
--- a/keyboards/reversestudio/decadepad/decadepad.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#define LAYOUT_numpad_6x4( \
-   k01, k02, k03, k04, \
-   k11, k12, k13, k14, \
-   k21, k22, k23,      \
-   k31, k32, k33, k34, \
-   k41, k42, k43,      \
-   k51,      k53, k54  \
-) \
-{ \
-    { k01, k02,   k03, k04     }, \
-    { k11, k12,   k13, k14     }, \
-    { k21, k22,   k23, KC_NO   }, \
-    { k31, k32,   k33, k34     }, \
-    { k41, k42,   k43, KC_NO   }, \
-    { k51, KC_NO, k53, k54     }, \
-}
diff --git a/keyboards/reversestudio/decadepad/info.json b/keyboards/reversestudio/decadepad/info.json
index 11a57ea4fd..3b56eb8c53 100644
--- a/keyboards/reversestudio/decadepad/info.json
+++ b/keyboards/reversestudio/decadepad/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4450",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "num_lock": "D4",
         "on_state": 0
@@ -18,32 +26,32 @@
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 2, "h": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":2, "h":2},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                
-                {"x":0, "y":5, "w":2},
-                {"x":2, "y":5},
-                {"x":3, "y":4, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 4, "h": 2}
             ]
         }
     }
diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h
index 9b798af9dc..64334bb2d9 100644
--- a/keyboards/reviung/reviung33/config.h
+++ b/keyboards/reviung/reviung33/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7}
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B1, B3, B2, B6, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 5
 #    define RGBLIGHT_HUE_STEP 16
 #    define RGBLIGHT_SAT_STEP 16
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/reviung/reviung33/info.json b/keyboards/reviung/reviung33/info.json
index 32097d284d..addfdf057c 100644
--- a/keyboards/reviung/reviung33/info.json
+++ b/keyboards/reviung/reviung33/info.json
@@ -8,6 +8,14 @@
         "pid": "0x516D",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B1", "B3", "B2", "B6", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/reviung/reviung33/reviung33.c b/keyboards/reviung/reviung33/reviung33.c
deleted file mode 100644
index 7684cb72c8..0000000000
--- a/keyboards/reviung/reviung33/reviung33.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 gtips
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "reviung33.h"
diff --git a/keyboards/reviung/reviung34/config.h b/keyboards/reviung/reviung34/config.h
index 52c8f79ee7..72befe1da1 100755
--- a/keyboards/reviung/reviung34/config.h
+++ b/keyboards/reviung/reviung34/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4, F5, F6, F7}
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/reviung/reviung34/info.json b/keyboards/reviung/reviung34/info.json
index 643f647c07..973a2e517b 100755
--- a/keyboards/reviung/reviung34/info.json
+++ b/keyboards/reviung/reviung34/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4E03",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B1", "B3", "B2", "B6"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": [
diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
index 3ac57603a6..e4d91482c9 100644
--- a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
+++ b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
@@ -18,8 +18,7 @@
 
 // place overrides here
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN D3
   #define RGBLED_NUM 9
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
@@ -37,4 +36,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
index 3ac57603a6..e4d91482c9 100644
--- a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
+++ b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
@@ -18,8 +18,7 @@
 
 // place overrides here
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN D3
   #define RGBLED_NUM 9
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
@@ -37,4 +36,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/reviung/reviung34/reviung34.c b/keyboards/reviung/reviung34/reviung34.c
deleted file mode 100755
index 00862d73e9..0000000000
--- a/keyboards/reviung/reviung34/reviung34.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 gtips
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "reviung34.h"
diff --git a/keyboards/reviung/reviung39/config.h b/keyboards/reviung/reviung39/config.h
index 5c27a3b832..72befe1da1 100644
--- a/keyboards/reviung/reviung39/config.h
+++ b/keyboards/reviung/reviung39/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/reviung/reviung39/info.json b/keyboards/reviung/reviung39/info.json
index 3ad398f2e7..fbb2861f51 100644
--- a/keyboards/reviung/reviung39/info.json
+++ b/keyboards/reviung/reviung39/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5F10",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layout_aliases": {
diff --git a/keyboards/reviung/reviung39/keymaps/default/config.h b/keyboards/reviung/reviung39/keymaps/default/config.h
index 11a0609742..d868c539e4 100644
--- a/keyboards/reviung/reviung39/keymaps/default/config.h
+++ b/keyboards/reviung/reviung39/keymaps/default/config.h
@@ -18,8 +18,7 @@
 
 // place overrides here
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN D3
   #define RGBLED_NUM 11
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
@@ -36,4 +35,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/reviung/reviung39/keymaps/default_s/config.h b/keyboards/reviung/reviung39/keymaps/default_s/config.h
index a18a508371..c44a5f9d7c 100644
--- a/keyboards/reviung/reviung39/keymaps/default_s/config.h
+++ b/keyboards/reviung/reviung39/keymaps/default_s/config.h
@@ -18,8 +18,7 @@
 
 // place overrides here
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN D3
   #define RGBLED_NUM 6
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
@@ -36,4 +35,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
index d27f9ee4a8..a947a6c67f 100644
--- a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
+++ b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
@@ -18,8 +18,7 @@
 
 // place overrides here
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN D3
   #define RGBLED_NUM 11
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
@@ -42,4 +41,3 @@
 //   /*==== use exp() and sin() ====*/
 //   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
 //   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-#endif
diff --git a/keyboards/reviung/reviung39/reviung39.c b/keyboards/reviung/reviung39/reviung39.c
deleted file mode 100644
index 0948106e9d..0000000000
--- a/keyboards/reviung/reviung39/reviung39.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 gtips
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "reviung39.h"
diff --git a/keyboards/reviung/reviung41/config.h b/keyboards/reviung/reviung41/config.h
index 23b05ea16c..9eb9f83f9c 100644
--- a/keyboards/reviung/reviung41/config.h
+++ b/keyboards/reviung/reviung41/config.h
@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1, B3, B2 }
-#define MATRIX_COL_PINS \
-    { D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 11
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
@@ -54,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/reviung/reviung41/info.json b/keyboards/reviung/reviung41/info.json
index b7fea0f89f..a138636dc0 100644
--- a/keyboards/reviung/reviung41/info.json
+++ b/keyboards/reviung/reviung41/info.json
@@ -8,6 +8,14 @@
         "pid": "0xDCCB",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layout_aliases": {
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
index 4e26907640..1d7ad67a62 100644
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
+++ b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
@@ -16,12 +16,10 @@
 
 #pragma once
 #define RGBLIGHT_LAYERS
-#ifdef RGB_DI_PIN
     // /*== or choose animations ==*/
     #define RGBLIGHT_EFFECT_BREATHING
     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#endif
 
 #define TAPPING_TERM 200
 #define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/reviung/reviung41/reviung41.c b/keyboards/reviung/reviung41/reviung41.c
deleted file mode 100644
index 05bb42160a..0000000000
--- a/keyboards/reviung/reviung41/reviung41.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 gtips
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "reviung41.h"
diff --git a/keyboards/reviung/reviung5/config.h b/keyboards/reviung/reviung5/config.h
index aceb9655f6..1ec887464e 100644
--- a/keyboards/reviung/reviung5/config.h
+++ b/keyboards/reviung/reviung5/config.h
@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { F4 }
-#define MATRIX_COL_PINS \
-    { D4, C6, D7, E6, B4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM         4
 #    define RGBLIGHT_HUE_STEP  16
 #    define RGBLIGHT_SAT_STEP  16
@@ -54,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/reviung/reviung5/info.json b/keyboards/reviung/reviung5/info.json
index 622c880a42..59ca122b11 100644
--- a/keyboards/reviung/reviung5/info.json
+++ b/keyboards/reviung/reviung5/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4F0D",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1"}
@@ -21,11 +29,11 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0.25},
-                {"label": "k02", "x": 2, "y": 0.25},
-                {"label": "k03", "x": 3, "y": 0.25},
-                {"label": "k04", "x": 4, "y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0}
             ]
         }
     }
diff --git a/keyboards/reviung/reviung5/reviung5.c b/keyboards/reviung/reviung5/reviung5.c
deleted file mode 100644
index a8f98f0627..0000000000
--- a/keyboards/reviung/reviung5/reviung5.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 gtips
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "reviung5.h"
diff --git a/keyboards/reviung/reviung5/reviung5.h b/keyboards/reviung/reviung5/reviung5.h
deleted file mode 100644
index f58f755800..0000000000
--- a/keyboards/reviung/reviung5/reviung5.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 gtips
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K00, K01, K02, K03, K04 \
-) { \
-    { K00, K01, K02, K03, K04 } \
-}
diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h
index c654abc335..174384a675 100644
--- a/keyboards/reviung/reviung53/config.h
+++ b/keyboards/reviung/reviung53/config.h
@@ -3,25 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 10
 #define RGBLIGHT_HUE_STEP 16
 #define RGBLIGHT_SAT_STEP 16
@@ -38,7 +19,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/reviung/reviung53/info.json b/keyboards/reviung/reviung53/info.json
index 86e4d054a1..4d3b7c1354 100644
--- a/keyboards/reviung/reviung53/info.json
+++ b/keyboards/reviung/reviung53/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4E09",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layout_aliases": {
diff --git a/keyboards/reviung/reviung53/reviung53.c b/keyboards/reviung/reviung53/reviung53.c
deleted file mode 100644
index e2190aeccf..0000000000
--- a/keyboards/reviung/reviung53/reviung53.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 gtips (@gtips)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "reviung53.h"
diff --git a/keyboards/reviung/reviung61/config.h b/keyboards/reviung/reviung61/config.h
index 8f3883af19..2e9cb65b56 100644
--- a/keyboards/reviung/reviung61/config.h
+++ b/keyboards/reviung/reviung61/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/reviung/reviung61/info.json b/keyboards/reviung/reviung61/info.json
index 5bb430d6a1..6ac0d48751 100644
--- a/keyboards/reviung/reviung61/info.json
+++ b/keyboards/reviung/reviung61/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7C1A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
index 280fd92954..854af5142d 100644
--- a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
+++ b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
@@ -19,8 +19,7 @@
 // place overrides here
 
 // ---  RGB underglow  ---
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN B7
   #define RGBLED_NUM 12
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
@@ -37,5 +36,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-#endif
diff --git a/keyboards/reviung/reviung61/reviung61.c b/keyboards/reviung/reviung61/reviung61.c
deleted file mode 100644
index 3cd69bf27f..0000000000
--- a/keyboards/reviung/reviung61/reviung61.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 gtips
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "reviung61.h"
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index 8f961078bd..5b411a8c52 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -9,10 +9,6 @@
 
 #pragma once
 
-
-// Last pins reserved for encoder / touch encoder support
-#define MATRIX_ROW_PINS { A1, A3, B3, A13, B15, NO_PIN, NO_PIN }
-#define MATRIX_COL_PINS { A0, B11, B0, B10, B12, B2, A8 }
 #define MATRIX_IO_DELAY 5
 
 #define BUSY_WAIT
@@ -25,9 +21,6 @@
 #define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster
 #define TOUCH_SEGMENTS 3
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* CRC Configuration */
 #define CRC8_OPTIMIZE_SPEED
 #define CRC8_USE_TABLE
@@ -56,7 +49,6 @@
 #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
 
 /* RGB LED Configuration */
-#define RGB_DI_PIN B5
 #define RGBLED_NUM 98
 #define RGBLED_SPLIT { 49, 49 }
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index b68a1586c5..b447c4b58d 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -8,6 +8,18 @@
         "pid": "0x3505",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "B11", "B0", "B10", "B12", "B2", "A8"],
+        "rows": ["A1", "A3", "B3", "A13", "B15", null, null]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B8", "pin_b": "A14"},
diff --git a/keyboards/rgbkb/mun/rev1/rev1.c b/keyboards/rgbkb/mun/rev1/rev1.c
index c7604510da..564ce4dfb9 100644
--- a/keyboards/rgbkb/mun/rev1/rev1.c
+++ b/keyboards/rgbkb/mun/rev1/rev1.c
@@ -37,15 +37,11 @@ const encodermap_t touch_encoder_map[NUMBER_OF_TOUCH_ENCODERS][TOUCH_ENCODER_OPT
 };
 
 static void process_encoder_matrix(encodermap_t pos) {
-    action_exec((keyevent_t){
-        .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = true, .time = (timer_read() | 1) /* time should not be 0 */
-    });
+    action_exec(MAKE_KEYEVENT(pos.r, pos.c, true));
 #if TAP_CODE_DELAY > 0
     wait_ms(TAP_CODE_DELAY);
 #endif
-    action_exec((keyevent_t){
-        .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = false, .time = (timer_read() | 1) /* time should not be 0 */
-    });
+    action_exec(MAKE_KEYEVENT(pos.r, pos.c, false));
 }
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index 0958dd2130..0862bde4e5 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -15,10 +15,8 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no           # Audio output
 
-WS2812_DRIVER = pwm
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306    # Enable the OLED Driver
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index 05d446d05d..f1b323bc17 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_LIMIT_VAL 120
 #define USB_MAX_POWER_CONSUMPTION 500
 
diff --git a/keyboards/rgbkb/pan/info.json b/keyboards/rgbkb/pan/info.json
index e12e7717eb..d151fd68d6 100644
--- a/keyboards/rgbkb/pan/info.json
+++ b/keyboards/rgbkb/pan/info.json
@@ -8,6 +8,9 @@
         "pid": "0x8C9C",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c
index fab3cac785..023c766de6 100644
--- a/keyboards/rgbkb/pan/pan.c
+++ b/keyboards/rgbkb/pan/pan.c
@@ -27,7 +27,6 @@ LED_TYPE rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT];
 static void init(void) {}
 
 static void flush(void) {
-    // Assumes use of RGB_DI_PIN
     ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT);
 }
 
diff --git a/keyboards/rgbkb/pan/rev1/32a/config.h b/keyboards/rgbkb/pan/rev1/32a/config.h
deleted file mode 100644
index 5e7c4babbd..0000000000
--- a/keyboards/rgbkb/pan/rev1/32a/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*Copyright 2020 RGBKB
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MATRIX_ROW_PINS { D7, D1, D5, D6, C2 }
-#define MATRIX_COL_PINS { C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0 }
-
-#define RGB_DI_PIN B3
diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/info.json
index 1f7ece37eb..e4ac3eeecb 100644
--- a/keyboards/rgbkb/pan/rev1/32a/info.json
+++ b/keyboards/rgbkb/pan/rev1/32a/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+        "rows": ["D7", "D1", "D5", "D6", "C2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "encoder": {
@@ -6,5 +11,8 @@
             {"pin_a": "B0", "pin_b": "B1"},
             {"pin_a": "D0", "pin_b": "B2"}
         ]
+    },
+    "ws2812": {
+        "pin": "B3"
     }
 }
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/config.h b/keyboards/rgbkb/pan/rev1/proton_c/config.h
deleted file mode 100644
index f25713b2be..0000000000
--- a/keyboards/rgbkb/pan/rev1/proton_c/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*Copyright 2020 RGBKB
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MATRIX_ROW_PINS { A15, B10, A14, A13, A7 }
-#define MATRIX_COL_PINS { A8, A6, B0, B1, B2, B4, B5, A1, A2, B3, B9, A10, A9 }
-
-#define RGB_DI_PIN A3
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/info.json
index 5fd7124b9c..ff81cd1092 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/info.json
+++ b/keyboards/rgbkb/pan/rev1/proton_c/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["A8", "A6", "B0", "B1", "B2", "B4", "B5", "A1", "A2", "B3", "B9", "A10", "A9"],
+        "rows": ["A15", "B10", "A14", "A13", "A7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
@@ -7,5 +12,8 @@
             {"pin_a": "B14", "pin_b": "B15"},
             {"pin_a": "B11", "pin_b": "B12"}
         ]
+    },
+    "ws2812": {
+        "pin": "A3"
     }
 }
diff --git a/keyboards/rgbkb/pan/rev1/rules.mk b/keyboards/rgbkb/pan/rev1/rules.mk
index 667c290059..4d3c0f6679 100644
--- a/keyboards/rgbkb/pan/rev1/rules.mk
+++ b/keyboards/rgbkb/pan/rev1/rules.mk
@@ -1,5 +1,2 @@
 # The default configuration is a atmega32a
 DEFAULT_FOLDER = rgbkb/pan/rev1/32a
-
-RGB_MATRIX_DRIVER = custom
-WS2812_DRIVER_REQUIRED := yes
diff --git a/keyboards/rgbkb/pan/rules.mk b/keyboards/rgbkb/pan/rules.mk
index 464dfecf6f..775fa48e12 100644
--- a/keyboards/rgbkb/pan/rules.mk
+++ b/keyboards/rgbkb/pan/rules.mk
@@ -9,8 +9,6 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = bitbang
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
@@ -21,3 +19,5 @@ STAGGERED_LAYOUT = no # If you soldered R1-A12 and R4-A12, enable this.
 
 # Default to revision 1
 DEFAULT_FOLDER = rgbkb/pan/rev1
+
+WS2812_DRIVER_REQUIRED := yes
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h
index b2e5f2b0d3..5c327fd760 100644
--- a/keyboards/rgbkb/sol/config.h
+++ b/keyboards/rgbkb/sol/config.h
@@ -23,13 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EE_HANDS
 
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, E6}
-
-// wiring of each half
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 40
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 40
diff --git a/keyboards/rgbkb/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h
index fcef317e1f..a41959a88b 100644
--- a/keyboards/rgbkb/sol/rev1/config.h
+++ b/keyboards/rgbkb/sol/rev1/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN B3
-
 #ifdef LED_MIRRORED
   #define RGBLED_NUM 35
 #else
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index eb742972b1..b93857eb51 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D6"}
@@ -16,6 +24,9 @@
     "split": {
         "soft_serial_pin": "D3"
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/rgbkb/sol/rev1/rev1.h b/keyboards/rgbkb/sol/rev1/rev1.h
deleted file mode 100644
index 6f70f09bee..0000000000
--- a/keyboards/rgbkb/sol/rev1/rev1.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/rgbkb/sol/rev1/rules.mk b/keyboards/rgbkb/sol/rev1/rules.mk
index cef623df1a..af9b588b7a 100644
--- a/keyboards/rgbkb/sol/rev1/rules.mk
+++ b/keyboards/rgbkb/sol/rev1/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE         = yes       # Enable global lighting effects. Do not ena
 LED_MIRRORED            = yes       # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 
 RGB_MATRIX_ENABLE       = no        # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_DRIVER       = WS2812
 RGB_MATRIX_KEYPRESSES   = no        # Enable reactive per-key effects.
 RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap.
 
diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h
index 874ec536b1..19680c84b3 100644
--- a/keyboards/rgbkb/sol/rev2/config.h
+++ b/keyboards/rgbkb/sol/rev2/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN B7
-
 // Underglow / DIY Tent Glow are parallel to the top row leds, no separate define
 // Full Hand case adds 24 LEDs, Star Fighter case adds 38 LEDs
 // For mirrored LED control (each MCU controls half the LEDs), total LED counts are divided in half
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index 264f21d02b..2daee64be4 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -8,9 +8,20 @@
         "pid": "0x3060",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D3"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/rgbkb/sol/rev2/rev2.h b/keyboards/rgbkb/sol/rev2/rev2.h
deleted file mode 100644
index 6f70f09bee..0000000000
--- a/keyboards/rgbkb/sol/rev2/rev2.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/rgbkb/sol/rev2/rules.mk b/keyboards/rgbkb/sol/rev2/rules.mk
index 681a3e0993..53aeba76ae 100644
--- a/keyboards/rgbkb/sol/rev2/rules.mk
+++ b/keyboards/rgbkb/sol/rev2/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE         = no        # Enable global lighting effects. Do not ena
 LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 
 RGB_MATRIX_ENABLE = yes             # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_KEYPRESSES   = no        # Enable reactive per-key effects.
 RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap.
 
diff --git a/keyboards/rgbkb/sol/sol.c b/keyboards/rgbkb/sol/sol.c
deleted file mode 100644
index 5945cc60a4..0000000000
--- a/keyboards/rgbkb/sol/sol.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "sol.h"
diff --git a/keyboards/rgbkb/sol/sol.h b/keyboards/rgbkb/sol/sol.h
index e885dc78c4..695dc6db61 100644
--- a/keyboards/rgbkb/sol/sol.h
+++ b/keyboards/rgbkb/sol/sol.h
@@ -1,12 +1,6 @@
 #pragma once
 
 #include "quantum.h"
-#ifdef KEYBOARD_rgbkb_sol_rev1
-#include "rev1.h"
-#else
-#include "rev2.h"
-#endif
-
 
 #define LAYOUT( \
   L00, L01, L02, L03, L04, L05, L06, R06, R00, R01, R02, R03, R04, R05, \
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 727947ef0b..9cc0134249 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -9,13 +9,6 @@
 
 #pragma once
 
-
-// Last pins reserved for encoder / touch encoder support
-#define MATRIX_ROW_PINS       { B15,  A8, A15, B12, A3, NO_PIN }
-#define MATRIX_ROW_PINS_RIGHT { B15, B14,  A8, A13, A7, NO_PIN }
-// Empty matrix entries used for encoder / touch encoder support
-#define MATRIX_COL_PINS       { A6, A7, B0, B2, B1,  B9,  B3,  B4 }
-#define MATRIX_COL_PINS_RIGHT { B9, B8, B4, A6, A3, B10, B12, B11 }
 #define MATRIX_IO_DELAY 5
 
 #define BUSY_WAIT
@@ -28,9 +21,6 @@
 #define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster
 #define TOUCH_SEGMENTS 3
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* CRC Configuration */
 #define CRC8_OPTIMIZE_SPEED
 #define CRC8_USE_TABLE
@@ -63,7 +53,6 @@
 #define DIP_SWITCH_PINS_RIGHT { A14, B0 }
 
 /* RGB LED Configuration */
-#define RGB_DI_PIN B5
 #define RGBLED_NUM 156
 #define RGBLED_SPLIT { 78, 78 }
 #define RGBLIGHT_LIMIT_VAL 255
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index 046a56f390..3dd7404c44 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -8,6 +8,18 @@
         "pid": "0x3510",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "B2", "B1", "B9", "B3", "B4"],
+        "rows": ["B15", "A8", "A15", "B12", "A3", null]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A1", "pin_b": "A2"},
@@ -25,6 +37,12 @@
                     {"pin_a": "B3", "pin_b": "B13"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B9", "B8", "B4", "A6", "A3", "B10", "B12", "B11"],
+                "rows": ["B15", "B14", "A8", "A13", "A7", null]
+            }
         }
     },
     "processor": "STM32F303",
diff --git a/keyboards/rgbkb/sol3/rev1/rev1.c b/keyboards/rgbkb/sol3/rev1/rev1.c
index de5836e061..ff330a83d6 100644
--- a/keyboards/rgbkb/sol3/rev1/rev1.c
+++ b/keyboards/rgbkb/sol3/rev1/rev1.c
@@ -57,10 +57,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
         }
         case 1: {
             // Handle RGB Encoder switch press
-            action_exec((keyevent_t){
-                .key = (keypos_t){.row = isLeftHand ? 4 : 10, .col = 6},
-                .pressed = active, .time = (timer_read() | 1) /* time should not be 0 */
-            });
+            action_exec(MAKE_KEYEVENT(isLeftHand ? 4 : 10, 6, active));
             break;
         }
     }
@@ -68,15 +65,11 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
 }
 
 static void process_encoder_matrix(encodermap_t pos) {
-    action_exec((keyevent_t){
-        .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = true, .time = (timer_read() | 1) /* time should not be 0 */
-    });
+    action_exec(MAKE_KEYEVENT(pos.r, pos.c, true));
 #if TAP_CODE_DELAY > 0
     wait_ms(TAP_CODE_DELAY);
 #endif
-    action_exec((keyevent_t){
-        .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = false, .time = (timer_read() | 1) /* time should not be 0 */
-    });
+    action_exec(MAKE_KEYEVENT(pos.r, pos.c, false));
 }
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index f761d71be2..382b858f46 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -19,10 +19,8 @@ AUDIO_DRIVER = dac_additive
 DYNAMIC_MACRO_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
 
-WS2812_DRIVER = pwm
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306    # Enable the OLED Driver
diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h
index 327fe840c3..88951a1b44 100644
--- a/keyboards/rgbkb/zen/rev1/config.h
+++ b/keyboards/rgbkb/zen/rev1/config.h
@@ -17,22 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, D4, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D1
-
 #define RGBLED_NUM 16    // Number of LEDs
 
 /*
diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json
index 33b8334958..013b56764f 100644
--- a/keyboards/rgbkb/zen/rev1/info.json
+++ b/keyboards/rgbkb/zen/rev1/info.json
@@ -8,9 +8,17 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B2", "B3", "B1", "F7", "F6", "D4", "B6"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
+  "ws2812": {
+    "pin": "D1"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/rgbkb/zen/rev1/rev1.c b/keyboards/rgbkb/zen/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/rgbkb/zen/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index 85b6a68b79..394fd1630b 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// Proton-C does pin conversion
-#define MATRIX_ROW_PINS { C6, E6, B5, D7, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B3, B1, B2 }
-
-#define RGB_DI_PIN         B6
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json
index cc25a74b73..ef91fd30d1 100644
--- a/keyboards/rgbkb/zen/rev2/info.json
+++ b/keyboards/rgbkb/zen/rev2/info.json
@@ -8,6 +8,11 @@
       "pid": "0x3061",
       "device_version": "0.0.2"
     },
+    "matrix_pins": {
+      "cols": ["F4", "F5", "F6", "F7", "B3", "B1", "B2"],
+      "rows": ["C6", "E6", "B5", "D7", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "D4", "pin_b": "D2"}
@@ -16,6 +21,9 @@
     "split": {
       "soft_serial_pin": "D3"
     },
+    "ws2812": {
+      "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index df9875ed47..022e361de1 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -21,15 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Select hand configuration */
 #define EE_HANDS
 
-#define MATRIX_ROW_PINS { F1, F5, F7, B5, B4 }
-
-// wiring of each half
-#define MATRIX_COL_PINS { F4, F6, C7, C6, B6, D4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN B7
 #ifndef RGBLIGHT_SPLIT_ENABLE
     #define RGBLED_NUM 30
 #else
diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json
index 7bf6fe4b0d..4be3dd61d3 100644
--- a/keyboards/rgbkb/zygomorph/rev1/info.json
+++ b/keyboards/rgbkb/zygomorph/rev1/info.json
@@ -8,6 +8,14 @@
       "pid": "0x3060",
       "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
+    "matrix_pins": {
+      "cols": ["F4", "F6", "C7", "C6", "B6", "D4"],
+      "rows": ["F1", "F5", "F7", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "D2", "pin_b": "D7"}
@@ -16,21 +24,204 @@
     "split": {
       "soft_serial_pin": "D3"
     },
+    "ws2812": {
+      "pin": "B7"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["ortho_4x12", "ortho_5x12"],
     "layouts": {
       "LAYOUT_ortho_5x12": {
-        "layout": [{"label":"`", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":7, "y":0}, {"label":"7", "x":8, "y":0}, {"label":"8", "x":9, "y":0}, {"label":"9", "x":10, "y":0}, {"label":"0", "x":11, "y":0}, {"label":"BKSP", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Y", "x":7, "y":1}, {"label":"U", "x":8, "y":1}, {"label":"I", "x":9, "y":1}, {"label":"O", "x":10, "y":1}, {"label":"P", "x":11, "y":1}, {"label":"\\|", "x":12, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":7, "y":2}, {"label":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":";:", "x":11, "y":2}, {"label":"'\"", "x":12, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":",<", "x":9, "y":3}, {"label":".>", "x":10, "y":3}, {"label":"/?", "x":11, "y":3}, {"label":"Enter", "x":12, "y":3}, {"label":"Ctrl", "x":0, "y":4}, {"label":"Alt", "x":1, "y":4}, {"label":"Super", "x":2, "y":4}, {"label":"RGB", "x":3, "y":4}, {"label":"&dArr;", "x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"label":"FN", "x":8, "y":4}, {"label":"Left", "x":9, "y":4}, {"label":"Down", "x":10, "y":4}, {"label":"Up", "x":11, "y":4}, {"label":"Right", "x":12, "y":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": [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": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"\\|", "x":12, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";:", "x":11, "y":1}, {"label":"'\"", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",<", "x":9, "y":2}, {"label":".>", "x":10, "y":2}, {"label":"/?", "x":11, "y":2}, {"label":"Enter", "x":12, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"Super", "x":2, "y":3}, {"label":"RGB", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"label":"FN", "x":8, "y":3}, {"label":"Left", "x":9, "y":3}, {"label":"Down", "x":10, "y":3}, {"label":"Up", "x":11, "y":3}, {"label":"Right", "x":12, "y":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": 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}
+          ]
       },
         "LAYOUT_ortho_5x6": {
-          "layout": [{"label":"`", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1, "y":4}, {"label":"Alt", "x":2, "y":4}, {"label":"Super", "x":3, "y":4}, {"label":"&dArr;", "x":4, "y":4}, {"x":5, "y":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": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1},
+            {"matrix": [1, 3], "x": 3, "y": 1},
+            {"matrix": [1, 4], "x": 4, "y": 1},
+            {"matrix": [1, 5], "x": 5, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1, "y": 2},
+            {"matrix": [2, 2], "x": 2, "y": 2},
+            {"matrix": [2, 3], "x": 3, "y": 2},
+            {"matrix": [2, 4], "x": 4, "y": 2},
+            {"matrix": [2, 5], "x": 5, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3},
+            {"matrix": [3, 3], "x": 3, "y": 3},
+            {"matrix": [3, 4], "x": 4, "y": 3},
+            {"matrix": [3, 5], "x": 5, "y": 3},
+
+            {"matrix": [4, 0], "x": 0, "y": 4},
+            {"matrix": [4, 1], "x": 1, "y": 4},
+            {"matrix": [4, 2], "x": 2, "y": 4},
+            {"matrix": [4, 3], "x": 3, "y": 4},
+            {"matrix": [4, 4], "x": 4, "y": 4},
+            {"matrix": [4, 5], "x": 5, "y": 4}
+          ]
       },
         "LAYOUT_ortho_4x6": {
-          "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":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": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1},
+            {"matrix": [1, 3], "x": 3, "y": 1},
+            {"matrix": [1, 4], "x": 4, "y": 1},
+            {"matrix": [1, 5], "x": 5, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1, "y": 2},
+            {"matrix": [2, 2], "x": 2, "y": 2},
+            {"matrix": [2, 3], "x": 3, "y": 2},
+            {"matrix": [2, 4], "x": 4, "y": 2},
+            {"matrix": [2, 5], "x": 5, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3},
+            {"matrix": [3, 3], "x": 3, "y": 3},
+            {"matrix": [3, 4], "x": 4, "y": 3},
+            {"matrix": [3, 5], "x": 5, "y": 3}
+          ]
         }
     }
 }
diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.c b/keyboards/rgbkb/zygomorph/rev1/rev1.c
index 1fb1716a09..7588ffc75f 100644
--- a/keyboards/rgbkb/zygomorph/rev1/rev1.c
+++ b/keyboards/rgbkb/zygomorph/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "zygomorph.h"
+#include "quantum.h"
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.h b/keyboards/rgbkb/zygomorph/rev1/rev1.h
deleted file mode 100644
index c667088d05..0000000000
--- a/keyboards/rgbkb/zygomorph/rev1/rev1.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-
-#include "zygomorph.h"
-#include "quantum.h"
-
-#ifdef RGBLIGHT_ENABLE
-//rgb led driver
-#include "ws2812.h"
-#endif
-
-#define LAYOUT_ortho_5x6( \
-  L00, L01, L02, L03, L04, L05, \
-  L10, L11, L12, L13, L14, L15, \
-  L20, L21, L22, L23, L24, L25, \
-  L30, L31, L32, L33, L34, L35, \
-  L40, L41, L42, L43, L44, L45 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-  }
-
-#define LAYOUT_ortho_5x12( \
-  L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-  L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
-  L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45 }, \
-    { R00, R01, R02, R03, R04, R05 }, \
-    { R10, R11, R12, R13, R14, R15 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { R40, R41, R42, R43, R44, R45 } \
-  }
-
-#define LAYOUT_ortho_4x6( \
-  L00, L01, L02, L03, L04, L05, \
-  L10, L11, L12, L13, L14, L15, \
-  L20, L21, L22, L23, L24, L25, \
-  L30, L31, L32, L33, L34, L35 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-  }
-
-#define LAYOUT_ortho_4x12( \
-  L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-  L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { R00, R01, R02, R03, R04, R05 }, \
-    { R10, R11, R12, R13, R14, R15 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-  }
diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk
index e926ec7641..bc168c3983 100644
--- a/keyboards/rgbkb/zygomorph/rules.mk
+++ b/keyboards/rgbkb/zygomorph/rules.mk
@@ -10,7 +10,6 @@ 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
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
diff --git a/keyboards/rgbkb/zygomorph/zygomorph.c b/keyboards/rgbkb/zygomorph/zygomorph.c
deleted file mode 100644
index 9f029813bc..0000000000
--- a/keyboards/rgbkb/zygomorph/zygomorph.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zygomorph.h"
diff --git a/keyboards/rgbkb/zygomorph/zygomorph.h b/keyboards/rgbkb/zygomorph/zygomorph.h
deleted file mode 100644
index 24198ed4c9..0000000000
--- a/keyboards/rgbkb/zygomorph/zygomorph.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "rev1.h"
-#include "quantum.h"
diff --git a/keyboards/ristretto/config.h b/keyboards/ristretto/config.h
index 290aad3ae7..de203ddc4e 100644
--- a/keyboards/ristretto/config.h
+++ b/keyboards/ristretto/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, B2, B3, D3 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, B7, F0, F1, F4, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/ristretto/info.json b/keyboards/ristretto/info.json
index ac6d80c3c7..5906cc9f14 100644
--- a/keyboards/ristretto/info.json
+++ b/keyboards/ristretto/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7273",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "B7", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["B1", "B2", "B3", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D4", "pin_b": "D6"}
diff --git a/keyboards/ristretto/ristretto.c b/keyboards/ristretto/ristretto.c
index b73e5043c3..d004b3dffe 100644
--- a/keyboards/ristretto/ristretto.c
+++ b/keyboards/ristretto/ristretto.c
@@ -23,18 +23,6 @@ enum layers {
 	_ADJUST
 };
 
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-	if(index == 0) {
-		if (clockwise) {
-			tap_code(KC_VOLD);
-		} else {
-			tap_code(KC_VOLU);
-			}
-		}
-	return true;
-}
-
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
     return OLED_ROTATION_270;
diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json
index f318019dd6..dc49a6943f 100644
--- a/keyboards/rkg68/info.json
+++ b/keyboards/rkg68/info.json
@@ -14,13 +14,15 @@
 		"cols": [ "F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4" ],
 		"rows": [ "D0", "D1", "D2", "D3", "D5" ]
 	},
+	"ws2812": {
+		"pin": "B3"
+	},
 	"rgblight": {
 		"animations": {
 			"knight": true,
 			"rainbow_swirl": true
 		},
-		"led_count": 4,
-		"pin": "B3"
+		"led_count": 4
 	},
 	"url": "http://en.rkgaming.com/",
 	"usb": {
diff --git a/keyboards/rmi_kb/aelith/aelith.c b/keyboards/rmi_kb/aelith/aelith.c
deleted file mode 100644
index e2153f7645..0000000000
--- a/keyboards/rmi_kb/aelith/aelith.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "aelith.h"
diff --git a/keyboards/rmi_kb/aelith/aelith.h b/keyboards/rmi_kb/aelith/aelith.h
deleted file mode 100644
index 47fe9a90ed..0000000000
--- a/keyboards/rmi_kb/aelith/aelith.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2020 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define XXX KC_NO
-
-// Split backspace
-// Split right shift
-#define LAYOUT_alice_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
-    k10, k11, k12, k13, k14, k15, k16,      k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
-    k20, k21, k22, k23, k24, k25, k26,      k28, k29, k2a, k2b, k2c, k2d,      k2f, \
-         k31, k32, k33, k34, k35, k36,      k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
-         k41,      k43, k44,      k46,           k49,      k4b,                k4f \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { XXX, k41, XXX, k43, k44, XXX, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \
-}
-
-// 2u backspace
-// Split right shift
-#define LAYOUT_alice( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,   k0f, \
-    k10, k11, k12, k13, k14, k15, k16,      k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
-    k20, k21, k22, k23, k24, k25, k26,      k28, k29, k2a, k2b, k2c, k2d,      k2f, \
-         k31, k32, k33, k34, k35, k36,      k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
-         k41,      k43, k44,      k46,           k49,      k4b,                k4f \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX, k0f }, \
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { XXX, k41, XXX, k43, k44, XXX, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \
-}
diff --git a/keyboards/rmi_kb/aelith/config.h b/keyboards/rmi_kb/aelith/config.h
index 3456e2618a..d5f4fd90db 100644
--- a/keyboards/rmi_kb/aelith/config.h
+++ b/keyboards/rmi_kb/aelith/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D5, D1, D0, D6, A7 }
-#define MATRIX_COL_PINS { D7, C0, C1, C2, C3, C4, C5, C6, C7, A6, A5, A0, A1, A2, A3, A4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rmi_kb/aelith/info.json b/keyboards/rmi_kb/aelith/info.json
index 87c491a7bd..269839dfe5 100644
--- a/keyboards/rmi_kb/aelith/info.json
+++ b/keyboards/rmi_kb/aelith/info.json
@@ -8,169 +8,174 @@
         "pid": "0xE460",
         "device_version": "0.1.2"
     },
+    "matrix_pins": {
+        "cols": ["D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A6", "A5", "A0", "A1", "A2", "A3", "A4"],
+        "rows": ["D5", "D1", "D0", "D6", "A7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "community_layouts": ["alice", "alice_split_bs"],
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"x":0.5, "y":0},
-
-                {"x":1.75, "y":0},
-                {"x":2.75, "y":0},
-                {"x":3.75, "y":0},
-                {"x":4.75, "y":0},
-                {"x":5.75, "y":0},
-                {"x":6.75, "y":0},
-                {"x":7.75, "y":0},
-
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":16, "y":0},
-                {"x":17, "y":0},
-                {"x":18, "y":0},
-
-                {"x":0.25, "y":1},
-                {"x":1.75, "y":1, "w":1.5},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1},
-                {"x":14.5, "y":1},
-                {"x":15.5, "y":1},
-                {"x":16.5, "y":1},
-                {"x":17.5, "y":1, "w":1.5},
-
-                {"x":0, "y":2},
-
-                {"x":1.75, "y":2, "w":1.75},
-                {"x":3.5, "y":2},
-                {"x":4.5, "y":2},
-                {"x":5.5, "y":2},
-                {"x":6.5, "y":2},
-                {"x":7.5, "y":2},
-
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":2},
-                {"x":14.75, "y":2},
-                {"x":15.75, "y":2},
-                {"x":16.75, "y":2, "w":2.25},
-
-                {"x":1.75, "y":3, "w":2.25},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3},
-                {"x":13.25, "y":3},
-                {"x":14.25, "y":3},
-                {"x":15.25, "y":3},
-                {"x":16.25, "y":3, "w":1.75},
-                {"x":18, "y":3},
-
-                {"x":1.75, "y":4, "w":1.5},
-                {"x":4.5, "y":4, "w":1.5},
-                {"x":6, "y":4, "w":2.25},
-                {"x":8.25, "y":4},
-
-                {"x":10.25, "y":4, "w":2.75},
-                {"x":13, "y":4, "w":1.5},
-                {"x":17.5, "y":4, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 14], "x": 17, "y": 0},
+                {"matrix": [0, 15], "x": 18, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.25, "y": 1},
+                {"matrix": [1, 4], "x": 5.25, "y": 1},
+                {"matrix": [1, 5], "x": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1},
+                {"matrix": [1, 14], "x": 16.5, "y": 1},
+                {"matrix": [1, 15], "x": 17.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [2, 6], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 12], "x": 14.75, "y": 2},
+                {"matrix": [2, 13], "x": 15.75, "y": 2},
+                {"matrix": [2, 15], "x": 16.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+                {"matrix": [3, 11], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3},
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+                {"matrix": [3, 14], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 18, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4, "w": 1.5},
+                {"matrix": [4, 15], "x": 17.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"x":0.5, "y":0},
-
-                {"x":1.75, "y":0},
-                {"x":2.75, "y":0},
-                {"x":3.75, "y":0},
-                {"x":4.75, "y":0},
-                {"x":5.75, "y":0},
-                {"x":6.75, "y":0},
-                {"x":7.75, "y":0},
-
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                {"x":16, "y":0},
-                {"x":17, "y":0, "w":2},
-
-                {"x":0.25, "y":1},
-                {"x":1.75, "y":1, "w":1.5},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1},
-                {"x":14.5, "y":1},
-                {"x":15.5, "y":1},
-                {"x":16.5, "y":1},
-                {"x":17.5, "y":1, "w":1.5},
-
-                {"x":0, "y":2},
-
-                {"x":1.75, "y":2, "w":1.75},
-                {"x":3.5, "y":2},
-                {"x":4.5, "y":2},
-                {"x":5.5, "y":2},
-                {"x":6.5, "y":2},
-                {"x":7.5, "y":2},
-
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":2},
-                {"x":14.75, "y":2},
-                {"x":15.75, "y":2},
-                {"x":16.75, "y":2, "w":2.25},
-
-                {"x":1.75, "y":3, "w":2.25},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3},
-                {"x":13.25, "y":3},
-                {"x":14.25, "y":3},
-                {"x":15.25, "y":3},
-                {"x":16.25, "y":3, "w":1.75},
-                {"x":18, "y":3},
-
-                {"x":1.75, "y":4, "w":1.5},
-                {"x":4.5, "y":4, "w":1.5},
-                {"x":6, "y":4, "w":2.25},
-                {"x":8.25, "y":4},
-
-                {"x":10.25, "y":4, "w":2.75},
-                {"x":13, "y":4, "w":1.5},
-                {"x":17.5, "y":4, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 15], "x": 17, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.25, "y": 1},
+                {"matrix": [1, 4], "x": 5.25, "y": 1},
+                {"matrix": [1, 5], "x": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1},
+                {"matrix": [1, 14], "x": 16.5, "y": 1},
+                {"matrix": [1, 15], "x": 17.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [2, 6], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 12], "x": 14.75, "y": 2},
+                {"matrix": [2, 13], "x": 15.75, "y": 2},
+                {"matrix": [2, 15], "x": 16.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+                {"matrix": [3, 11], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3},
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+                {"matrix": [3, 14], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 18, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4, "w": 1.5},
+                {"matrix": [4, 15], "x": 17.5, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/rmi_kb/chevron/chevron.c b/keyboards/rmi_kb/chevron/chevron.c
deleted file mode 100644
index 5b15d3324c..0000000000
--- a/keyboards/rmi_kb/chevron/chevron.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "chevron.h"
diff --git a/keyboards/rmi_kb/chevron/config.h b/keyboards/rmi_kb/chevron/config.h
index cd4c43391b..7cc6ae4689 100644
--- a/keyboards/rmi_kb/chevron/config.h
+++ b/keyboards/rmi_kb/chevron/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D5, D6, C0, D7, NO_PIN }
-#define MATRIX_COL_PINS { A5, A6, A7, C7, C6, C5, C4, C3, C2, C1, A4, A3, A2, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -57,4 +40,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* QoL improvements */
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/rmi_kb/chevron/info.json b/keyboards/rmi_kb/chevron/info.json
index bdca6506f1..796fc0702f 100644
--- a/keyboards/rmi_kb/chevron/info.json
+++ b/keyboards/rmi_kb/chevron/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC4EE",
         "device_version": "0.1.2"
     },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "A4", "A3", "A2", "B4"],
+        "rows": ["D5", "D6", "C0", "D7", null]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A0", "pin_b": "A1"}
diff --git a/keyboards/rmi_kb/chevron/keymaps/via/keymap.c b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
index 190a39e257..8651a3dee7 100644
--- a/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
@@ -48,24 +48,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 keyevent_t encoder_ccw = {
     .key = (keypos_t){.row = 4, .col = 0},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder_cw = {
     .key = (keypos_t){.row = 4, .col = 1},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 void matrix_scan_user(void) {
-    if (IS_PRESSED(encoder_ccw)) {
+    if (encoder_ccw.pressed) {
         encoder_ccw.pressed = false;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
     }
 
-    if (IS_PRESSED(encoder_cw)) {
+    if (encoder_cw.pressed) {
         encoder_cw.pressed = false;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
     }
 }
@@ -73,12 +75,12 @@ void matrix_scan_user(void) {
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (clockwise) {
         encoder_cw.pressed = true;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
         wait_ms(20);
     } else {
         encoder_ccw.pressed = true;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
         wait_ms(20);
     }
diff --git a/keyboards/rmi_kb/herringbone/pro/config.h b/keyboards/rmi_kb/herringbone/pro/config.h
index ddf1d3199d..27cd8fb6b6 100644
--- a/keyboards/rmi_kb/herringbone/pro/config.h
+++ b/keyboards/rmi_kb/herringbone/pro/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C4, C5, C6, C7, A7, A6, NO_PIN }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -41,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Small QoL improvements */
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*
  * Feature disable options
diff --git a/keyboards/rmi_kb/herringbone/pro/info.json b/keyboards/rmi_kb/herringbone/pro/info.json
index 5eebdf3b79..8545cfc95d 100644
--- a/keyboards/rmi_kb/herringbone/pro/info.json
+++ b/keyboards/rmi_kb/herringbone/pro/info.json
@@ -8,6 +8,11 @@
         "pid": "0x440B",
         "device_version": "0.1.2"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"],
+        "rows": ["C4", "C5", "C6", "C7", "A7", "A6", null]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C3", "pin_b": "C2"}
diff --git a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
index 71622cddcf..dbf282b68f 100644
--- a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
@@ -54,24 +54,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 keyevent_t encoder_ccw = {
     .key = (keypos_t){.row = 6, .col = 0},
-    .pressed = false
-};
+    .pressed = false,
+    .type = KEY_EVENT
+ };
 
 keyevent_t encoder_cw = {
     .key = (keypos_t){.row = 6, .col = 1},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 void matrix_scan_user(void) {
-    if (IS_PRESSED(encoder_ccw)) {
+    if (encoder_ccw.pressed) {
         encoder_ccw.pressed = false;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
     }
 
-    if (IS_PRESSED(encoder_cw)) {
+    if (encoder_cw.pressed) {
         encoder_cw.pressed = false;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
     }
 }
@@ -86,14 +88,14 @@ uint8_t current_frame = 0;
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (clockwise) {
         encoder_cw.pressed = true;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
         wait_ms(20);
         anim_sleep = timer_read32();
         oled_on();
     } else {
         encoder_ccw.pressed = true;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
         wait_ms(20);
         anim_sleep = timer_read32();
diff --git a/keyboards/rmi_kb/herringbone/pro/pro.c b/keyboards/rmi_kb/herringbone/pro/pro.c
deleted file mode 100644
index 4c11baefcc..0000000000
--- a/keyboards/rmi_kb/herringbone/pro/pro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pro.h"
diff --git a/keyboards/rmi_kb/herringbone/v1/config.h b/keyboards/rmi_kb/herringbone/v1/config.h
index f5ea6b0f4e..27cd8fb6b6 100644
--- a/keyboards/rmi_kb/herringbone/v1/config.h
+++ b/keyboards/rmi_kb/herringbone/v1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C4, C5, C6, C7, A7, A6 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -41,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Small QoL improvements */
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*
  * Feature disable options
diff --git a/keyboards/rmi_kb/herringbone/v1/info.json b/keyboards/rmi_kb/herringbone/v1/info.json
index 2e12362994..f81f47813a 100644
--- a/keyboards/rmi_kb/herringbone/v1/info.json
+++ b/keyboards/rmi_kb/herringbone/v1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x04E5",
         "device_version": "0.1.2"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"],
+        "rows": ["C4", "C5", "C6", "C7", "A7", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "layouts": {
diff --git a/keyboards/rmi_kb/herringbone/v1/v1.c b/keyboards/rmi_kb/herringbone/v1/v1.c
deleted file mode 100644
index 4bdb5fad38..0000000000
--- a/keyboards/rmi_kb/herringbone/v1/v1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v1.h"
diff --git a/keyboards/rmi_kb/mona/v1/config.h b/keyboards/rmi_kb/mona/v1/config.h
index fb03ca121c..b53bfc1554 100644
--- a/keyboards/rmi_kb/mona/v1/config.h
+++ b/keyboards/rmi_kb/mona/v1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D5, B7, F0, F1 }
-#define MATRIX_COL_PINS { D0, D3, D2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rmi_kb/mona/v1/info.json b/keyboards/rmi_kb/mona/v1/info.json
index 84ed48762d..58f34b1677 100644
--- a/keyboards/rmi_kb/mona/v1/info.json
+++ b/keyboards/rmi_kb/mona/v1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x404A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D3", "D2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D1", "D5", "B7", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/rmi_kb/mona/v1/v1.c b/keyboards/rmi_kb/mona/v1/v1.c
deleted file mode 100644
index d55373272d..0000000000
--- a/keyboards/rmi_kb/mona/v1/v1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v1.h"
diff --git a/keyboards/rmi_kb/mona/v1_1/config.h b/keyboards/rmi_kb/mona/v1_1/config.h
deleted file mode 100644
index d73274fb1c..0000000000
--- a/keyboards/rmi_kb/mona/v1_1/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Ramon Imbao
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D5, B7, F0, F1 }
-#define MATRIX_COL_PINS { D0, D3, D2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rmi_kb/mona/v1_1/info.json b/keyboards/rmi_kb/mona/v1_1/info.json
index f59541cd83..ebf76b88d3 100644
--- a/keyboards/rmi_kb/mona/v1_1/info.json
+++ b/keyboards/rmi_kb/mona/v1_1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x404B",
         "device_version": "0.1.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D3", "D2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D1", "D5", "B7", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B3"
     },
diff --git a/keyboards/rmi_kb/mona/v1_1/v1_1.c b/keyboards/rmi_kb/mona/v1_1/v1_1.c
deleted file mode 100644
index d6ebf98053..0000000000
--- a/keyboards/rmi_kb/mona/v1_1/v1_1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v1_1.h"
diff --git a/keyboards/rmi_kb/mona/v32a/config.h b/keyboards/rmi_kb/mona/v32a/config.h
deleted file mode 100644
index 2593026a78..0000000000
--- a/keyboards/rmi_kb/mona/v32a/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Ramon Imbao
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C2, C3, D6, D1, A6 }
-#define MATRIX_COL_PINS { B4, B3, B2, B1, B0, A0, A1, A2, A5, A4, A3, A7, D5, C7, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rmi_kb/mona/v32a/info.json b/keyboards/rmi_kb/mona/v32a/info.json
index 03d2dfa9f6..d7695d15bb 100644
--- a/keyboards/rmi_kb/mona/v32a/info.json
+++ b/keyboards/rmi_kb/mona/v32a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4032",
         "device_version": "0.1.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B3", "B2", "B1", "B0", "A0", "A1", "A2", "A5", "A4", "A3", "A7", "D5", "C7", "C6"],
+        "rows": ["C2", "C3", "D6", "D1", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C1"
     },
diff --git a/keyboards/rmi_kb/mona/v32a/v32a.c b/keyboards/rmi_kb/mona/v32a/v32a.c
deleted file mode 100644
index cc35f4d5ff..0000000000
--- a/keyboards/rmi_kb/mona/v32a/v32a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v32a.h"
diff --git a/keyboards/rmi_kb/squishy65/config.h b/keyboards/rmi_kb/squishy65/config.h
index ab44a877f7..b4efbc241c 100644
--- a/keyboards/rmi_kb/squishy65/config.h
+++ b/keyboards/rmi_kb/squishy65/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A9, B9, B7, B6, B5, B4, B2, B1, B0, A7, A6, A5, A4, A10, A3, A2 }
-#define MATRIX_ROW_PINS { A15, B3, A0, B10, B11 }
-#define DIODE_DIRECTION COL2ROW
-
-// RGB B4
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 18
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/rmi_kb/squishy65/info.json b/keyboards/rmi_kb/squishy65/info.json
index 6e374d5f2b..5b87e81e98 100644
--- a/keyboards/rmi_kb/squishy65/info.json
+++ b/keyboards/rmi_kb/squishy65/info.json
@@ -8,6 +8,14 @@
         "pid": "0x10B5",
         "device_version": "0.6.5"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "matrix_pins": {
+        "cols": ["A9", "B9", "B7", "B6", "B5", "B4", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A10", "A3", "A2"],
+        "rows": ["A15", "B3", "A0", "B10", "B11"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/rmi_kb/squishy65/squishy65.c b/keyboards/rmi_kb/squishy65/squishy65.c
deleted file mode 100644
index 6d9fb24196..0000000000
--- a/keyboards/rmi_kb/squishy65/squishy65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "squishy65.h"
diff --git a/keyboards/rmi_kb/squishy65/squishy65.h b/keyboards/rmi_kb/squishy65/squishy65.h
index 25480c8748..270153a1b1 100644
--- a/keyboards/rmi_kb/squishy65/squishy65.h
+++ b/keyboards/rmi_kb/squishy65/squishy65.h
@@ -35,7 +35,7 @@
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \
     { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \
-    { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \
 }
 
 // ISO
@@ -52,7 +52,7 @@
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \
-    { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, XXX, XXX, k4e, k4f }, \
 }
 
 // Exposed
@@ -69,5 +69,5 @@
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, k3f }, \
-    { k40, k4a, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, XXX, k4e, k4f }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, XXX, k4e, k4f }, \
 }
diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h
index e84edd8c87..69522b8362 100644
--- a/keyboards/rmi_kb/squishyfrl/config.h
+++ b/keyboards/rmi_kb/squishyfrl/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B9, B8, A0, A1, A9, A8, B11, A6, A5}
-#define MATRIX_COL_PINS { A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C15
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
@@ -53,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
@@ -78,4 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* QoL improvements */
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/rmi_kb/squishyfrl/info.json b/keyboards/rmi_kb/squishyfrl/info.json
index f2dc2ebd24..7f68631da7 100644
--- a/keyboards/rmi_kb/squishyfrl/info.json
+++ b/keyboards/rmi_kb/squishyfrl/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4BE5",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C15"
+    },
+    "matrix_pins": {
+        "cols": ["A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"],
+        "rows": ["B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
diff --git a/keyboards/rmi_kb/squishyfrl/squishyfrl.c b/keyboards/rmi_kb/squishyfrl/squishyfrl.c
deleted file mode 100644
index db2a2ae933..0000000000
--- a/keyboards/rmi_kb/squishyfrl/squishyfrl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "squishyfrl.h"
diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index 20e98b3d53..69522b8362 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, B4, B5, C13, B9, B8, A0, A1, A9, A8, B11, A6, A5, C0 }
-#define MATRIX_COL_PINS { A15, C10, C11, C12, D2, A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C15
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
@@ -53,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
@@ -78,4 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* QoL improvements */
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json
index 17236053ca..aa49ed4af3 100644
--- a/keyboards/rmi_kb/squishytkl/info.json
+++ b/keyboards/rmi_kb/squishytkl/info.json
@@ -8,6 +8,14 @@
         "pid": "0x00B1",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "C15"
+    },
+    "matrix_pins": {
+        "cols": ["A15", "C10", "C11", "C12", "D2", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"],
+        "rows": ["B3", "B4", "B5", "C13", "B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5", "C0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "B7", "resolution": 1}
diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
index 7bd524f9d9..2c33b4869c 100644
--- a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
@@ -29,24 +29,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 keyevent_t encoder_ccw = {
     .key = (keypos_t){.row = 13, .col = 0},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder_cw = {
     .key = (keypos_t){.row = 13, .col = 1},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 void matrix_scan_user(void) {
-    if (IS_PRESSED(encoder_ccw)) {
+    if (encoder_ccw.pressed) {
         encoder_ccw.pressed = false;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
     }
 
-    if (IS_PRESSED(encoder_cw)) {
+    if (encoder_cw.pressed) {
         encoder_cw.pressed = false;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
     }
 }
@@ -54,11 +56,11 @@ void matrix_scan_user(void) {
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (clockwise) {
         encoder_cw.pressed = true;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
     } else {
         encoder_ccw.pressed = true;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
     }
     return true;
diff --git a/keyboards/rmi_kb/squishytkl/squishytkl.c b/keyboards/rmi_kb/squishytkl/squishytkl.c
deleted file mode 100644
index 9a63c81364..0000000000
--- a/keyboards/rmi_kb/squishytkl/squishytkl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "squishytkl.h"
diff --git a/keyboards/rmi_kb/tkl_ff/config.h b/keyboards/rmi_kb/tkl_ff/config.h
index a2939dda1e..656deab55a 100644
--- a/keyboards/rmi_kb/tkl_ff/config.h
+++ b/keyboards/rmi_kb/tkl_ff/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B2, B3, B7, D6, D3, D2 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D5, B0, B1, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rmi_kb/tkl_ff/info.json b/keyboards/rmi_kb/tkl_ff/info.json
index 5f263352ac..739135decf 100644
--- a/keyboards/rmi_kb/tkl_ff/info.json
+++ b/keyboards/rmi_kb/tkl_ff/info.json
@@ -7,6 +7,11 @@
         "vid": "0xB16B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D5", "B0", "B1", "D1"],
+        "rows": ["B2", "B3", "B7", "D6", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -20,297 +25,324 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
-                {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/rmi_kb/tkl_ff/tkl_ff.c b/keyboards/rmi_kb/tkl_ff/tkl_ff.c
deleted file mode 100644
index 4a4b7c204a..0000000000
--- a/keyboards/rmi_kb/tkl_ff/tkl_ff.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "tkl_ff.h"
diff --git a/keyboards/rmi_kb/tkl_ff/tkl_ff.h b/keyboards/rmi_kb/tkl_ff/tkl_ff.h
deleted file mode 100644
index cdc4ab60cb..0000000000
--- a/keyboards/rmi_kb/tkl_ff/tkl_ff.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define ___ KC_NO
-
-// ANSI layout
-// Full backspace
-// Full right shift
-// Full left shift
-// 6.25u bottom row
-#define LAYOUT_tkl_f13_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                \
-    k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,                k4f,      \
-    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \
-    { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// ISO layout
-// Full backspace
-// Full right shift
-// Split left shift
-// 6.25u bottom row
-#define LAYOUT_tkl_f13_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2d,                \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,                k4f,      \
-    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// Layout for VIA
-// Split backspace
-// Split left shift
-// Split right shift
-// 6.25u bottom row
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
-    k50, k51, k52,                     k57,           k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
diff --git a/keyboards/rmi_kb/tkl_ff/v2/config.h b/keyboards/rmi_kb/tkl_ff/v2/config.h
index dd3984c869..d3e7eed02c 100644
--- a/keyboards/rmi_kb/tkl_ff/v2/config.h
+++ b/keyboards/rmi_kb/tkl_ff/v2/config.h
@@ -19,8 +19,6 @@
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 26
 #    define RGBLIGHT_HUE_STEP 32
 #    define RGBLIGHT_SAT_STEP 32
@@ -36,4 +34,3 @@
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/rmi_kb/tkl_ff/v2/info.json b/keyboards/rmi_kb/tkl_ff/v2/info.json
index ed70ec408c..a7617b5f30 100644
--- a/keyboards/rmi_kb/tkl_ff/v2/info.json
+++ b/keyboards/rmi_kb/tkl_ff/v2/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "pid": "0x10FF"
+    },
+    "ws2812": {
+        "pin": "E2"
     }
 }
diff --git a/keyboards/rmi_kb/tkl_ff/v2/v2.c b/keyboards/rmi_kb/tkl_ff/v2/v2.c
deleted file mode 100644
index de5f32e3ca..0000000000
--- a/keyboards/rmi_kb/tkl_ff/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v2.h"
diff --git a/keyboards/rmi_kb/tkl_ff/v2/v2.h b/keyboards/rmi_kb/tkl_ff/v2/v2.h
deleted file mode 100644
index 7c4566defb..0000000000
--- a/keyboards/rmi_kb/tkl_ff/v2/v2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/rmi_kb/wete/v1/config.h b/keyboards/rmi_kb/wete/v1/config.h
index 4fa5e6e18b..c4d0637afe 100644
--- a/keyboards/rmi_kb/wete/v1/config.h
+++ b/keyboards/rmi_kb/wete/v1/config.h
@@ -17,16 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B13, B14, B15, A8, B0, A7, A5, A4, A3, B9, C13, C14, C15, F0, F1, A0, A1, A2, B8, B7 }
-#define MATRIX_ROW_PINS { A9, B12, B11, B10, B2, B1 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
 
-// RGB B4
-#define RGB_DI_PIN B4
 #define RGBLED_NUM 24
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/rmi_kb/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/info.json
index cf17e5966d..1ae2b9c993 100644
--- a/keyboards/rmi_kb/wete/v1/info.json
+++ b/keyboards/rmi_kb/wete/v1/info.json
@@ -8,11 +8,19 @@
         "pid": "0x00B5",
         "device_version": "0.1.2"
     },
+    "matrix_pins": {
+        "cols": ["B13", "B14", "B15", "A8", "B0", "A7", "A5", "A4", "A3", "B9", "C13", "C14", "C15", "F0", "F1", "A0", "A1", "A2", "B8", "B7"],
+        "rows": ["A9", "B12", "B11", "B10", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 24,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B4"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/rmi_kb/wete/v1/v1.h b/keyboards/rmi_kb/wete/v1/v1.h
index 55bb035b8b..24250e8fb0 100644
--- a/keyboards/rmi_kb/wete/v1/v1.h
+++ b/keyboards/rmi_kb/wete/v1/v1.h
@@ -188,7 +188,7 @@
          k51,    k52,     k54,  k55,  k56, k57,       k5a,     k5b, k5c, k5d,  k5e,  k5f,  k5h, k5i, k5j \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \
     { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \
     { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \
@@ -213,7 +213,7 @@
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \
     { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \
-    { k50, XXX, k52, XXX, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \
+    { k50, k51, k52, k53, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \
 }
 
 //////////////////////////////// EXPOSED ////////////////////////////////
diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h
index baf134e5e9..bbf7d911ad 100644
--- a/keyboards/rmi_kb/wete/v2/config.h
+++ b/keyboards/rmi_kb/wete/v2/config.h
@@ -17,28 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, B2, B6, C6, C7, E6, F7, F6, F5, F4, F1, F0, NO_PIN }
-#define MATRIX_COL_PINS { B1, B0, B7, B5, B4, D7, D6, D4, D5, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 18
 #    define RGBLIGHT_HUE_STEP 32
 #    define RGBLIGHT_SAT_STEP 32
@@ -54,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
@@ -79,4 +59,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // QoL improvements
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/rmi_kb/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/info.json
index c477304658..53d64f2696 100644
--- a/keyboards/rmi_kb/wete/v2/info.json
+++ b/keyboards/rmi_kb/wete/v2/info.json
@@ -8,11 +8,19 @@
         "pid": "0x00B3",
         "device_version": "35.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "B7", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B3", "B2", "B6", "C6", "C7", "E6", "F7", "F6", "F5", "F4", "F1", "F0", null]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D1"}
         ]
     },
+    "ws2812": {
+        "pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
index 8afc6f9c25..05df87fc94 100644
--- a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
@@ -37,24 +37,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 keyevent_t encoder_ccw = {
     .key = (keypos_t){.row = 12, .col = 0},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 keyevent_t encoder_cw = {
     .key = (keypos_t){.row = 12, .col = 1},
-    .pressed = false
+    .pressed = false,
+    .type = KEY_EVENT
 };
 
 void matrix_scan_user(void) {
-    if (IS_PRESSED(encoder_ccw)) {
+    if (encoder_ccw.pressed) {
         encoder_ccw.pressed = false;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
     }
 
-    if (IS_PRESSED(encoder_cw)) {
+    if (encoder_cw.pressed) {
         encoder_cw.pressed = false;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
     }
 }
@@ -62,11 +64,11 @@ void matrix_scan_user(void) {
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (clockwise) {
         encoder_cw.pressed = true;
-        encoder_cw.time = (timer_read() | 1);
+        encoder_cw.time = timer_read();
         action_exec(encoder_cw);
     } else {
         encoder_ccw.pressed = true;
-        encoder_ccw.time = (timer_read() | 1);
+        encoder_ccw.time = timer_read();
         action_exec(encoder_ccw);
     }
     return true;
diff --git a/keyboards/rmi_kb/wete/v2/v2.c b/keyboards/rmi_kb/wete/v2/v2.c
deleted file mode 100644
index de5f32e3ca..0000000000
--- a/keyboards/rmi_kb/wete/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v2.h"
diff --git a/keyboards/rmi_kb/wete/v2/v2.h b/keyboards/rmi_kb/wete/v2/v2.h
index 75c9430c02..0a8ceed571 100644
--- a/keyboards/rmi_kb/wete/v2/v2.h
+++ b/keyboards/rmi_kb/wete/v2/v2.h
@@ -46,7 +46,7 @@ void adjust_leds(void);
     { k70, ___, k72, k73, k74, k75, k76, k77, k78, k79 }, \
     { k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \
     { k90, k91, ___, k93, k94, k95, k96, k97, k98, k99 }, \
-    { ka0, ___, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
+    { ka0, ka1, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
     { ___, ___, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \
     { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
 }
@@ -74,7 +74,7 @@ void adjust_leds(void);
     { k70, ___, k72, k73, k74, k75, k76, k77, k78, k79 }, \
     { k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \
     { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99 }, \
-    { ka0, ___, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
+    { ka0, ka1, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
     { ___, ___, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \
     { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
 }
@@ -96,7 +96,7 @@ void adjust_leds(void);
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, ___, k08, k09 }, \
     { k10, k11, k12, k13, ___, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, ___ }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
     { k30 ,k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
     { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
     { k50, k51, k52, k53, k54, k55, k56, k57, ___, k59 }, \
diff --git a/keyboards/rmkeebs/rm_numpad/config.h b/keyboards/rmkeebs/rm_numpad/config.h
deleted file mode 100644
index c2462c1619..0000000000
--- a/keyboards/rmkeebs/rm_numpad/config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2021 RuckerMachine
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B4, F7, C7, C6, F1, F0  }
-#define MATRIX_COL_PINS { F4, F5, F6, B5, B6 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/rmkeebs/rm_numpad/info.json b/keyboards/rmkeebs/rm_numpad/info.json
index 520829d07e..c6ab31ece1 100644
--- a/keyboards/rmkeebs/rm_numpad/info.json
+++ b/keyboards/rmkeebs/rm_numpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x524E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "B5", "B6"],
+        "rows": ["B4", "F7", "C7", "C6", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D7", "pin_b": "D4"}
@@ -17,98 +22,130 @@
     "bootloader": "atmel-dfu",
     "community_layouts": ["numpad_6x4", "ortho_6x4"],
     "layouts": {
+        "LAYOUT_big_enter_6x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 2], "x": 1, "y": 5.25},
+                {"matrix": [5, 3], "x": 2, "y": 5.25},
+                {"matrix": [4, 4], "x": 3, "y": 4.25, "h": 2}
+            ]
+        },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"label": "Pause", "x": 0, "y": 0.25},
-                {"label": "Prev", "x": 1, "y": 0.25},
-                {"label": "Next", "x": 2, "y": 0.25},
-                {"label": "Mute", "x": 3.5, "y": 0},
-		
-                {"label": "Num_Lock", "x": 0, "y": 1.25},
-                {"label": "/", "x": 1, "y": 1.25},
-                {"label": "*", "x": 2, "y": 1.25},
-                {"label": "-", "x": 3, "y": 1.25},
-		
-                {"label": "7", "x": 0, "y": 2.25},
-                {"label": "8", "x": 1, "y": 2.25},
-                {"label": "9", "x": 2, "y": 2.25},
-		
-                {"label": "4", "x": 0, "y": 3.25},
-                {"label": "5", "x": 1, "y": 3.25},
-                {"label": "6", "x": 2, "y": 3.25},
-                {"label": "+", "x": 3, "y": 2.25, "h": 2},
-		
-                {"label": "1", "x": 0, "y": 4.25},
-                {"label": "2", "x": 1, "y": 4.25},
-                {"label": "3", "x": 2, "y": 4.25},
-		
-                {"label": "0", "x": 0, "y": 5.25, "w": 2},
-                {"label": ".", "x": 2, "y": 5.25},
-                {"label": "Enter", "x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [2, 4], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 3], "x": 2, "y": 5.25},
+                {"matrix": [4, 4], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_split_plus_6x4": {
             "layout": [
-                {"label": "Pause", "x": 0, "y": 0.25},
-                {"label": "Prev", "x": 1, "y": 0.25},
-                {"label": "Next", "x": 2, "y": 0.25},
-                {"label": "Mute", "x": 3.5, "y": 0},
-
-                {"label": "Num_Lock", "x": 0, "y": 1.25},
-                {"label": "/", "x": 1, "y": 1.25},
-                {"label": "*", "x": 2, "y": 1.25},
-                {"label": "-", "x": 3, "y": 1.25},
-
-                {"label": "7", "x": 0, "y": 2.25},
-                {"label": "8", "x": 1, "y": 2.25},
-                {"label": "9", "x": 2, "y": 2.25},
-                {"label": "=", "x": 3, "y": 2.25}, 
-
-                {"label": "4", "x": 0, "y": 3.25},
-                {"label": "5", "x": 1, "y": 3.25},
-                {"label": "6", "x": 2, "y": 3.25},
-                {"label": "+", "x": 3, "y": 3.25},
-
-                {"label": "1", "x": 0, "y": 4.25},
-                {"label": "2", "x": 1, "y": 4.25},
-                {"label": "3", "x": 2, "y": 4.25},
-
-                {"label": "0", "x": 0, "y": 5.25, "w": 2},
-                {"label": ".", "x": 2, "y": 5.25},
-                {"label": "Enter", "x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 3], "x": 2, "y": 5.25},
+                {"matrix": [4, 4], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"label": "Pause", "x": 0, "y": 0.25},
-                {"label": "Prev", "x": 1, "y": 0.25},
-                {"label": "Next", "x": 2, "y": 0.25},
-                {"label": "Mute", "x": 3.5, "y": 0},
-
-                {"label": "Num_Lock", "x": 0, "y": 1.25},
-                {"label": "/", "x": 1, "y": 1.25},
-                {"label": "*", "x": 2, "y": 1.25},
-                {"label": "-", "x": 3, "y": 1.25},
-
-                {"label": "7", "x": 0, "y": 2.25},
-                {"label": "8", "x": 1, "y": 2.25},
-                {"label": "9", "x": 2, "y": 2.25},
-                {"label": "=", "x": 3, "y": 2.25},
-
-                {"label": "4", "x": 0, "y": 3.25},
-                {"label": "5", "x": 1, "y": 3.25},
-                {"label": "6", "x": 2, "y": 3.25},
-                {"label": "+", "x": 3, "y": 3.25},
-
-                {"label": "1", "x": 0, "y": 4.25},
-                {"label": "2", "x": 1, "y": 4.25},
-                {"label": "3", "x": 2, "y": 4.25},
-                {"label": "Enter", "x": 3, "y": 4.25},
-
-                {"label": "0", "x": 0, "y": 5.25},
-                {"label": "00", "x": 1, "y": 5.25},
-                {"label": ".", "x": 2, "y": 5.25},
-                {"label": "Delete", "x": 3, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 2], "x": 1, "y": 5.25},
+                {"matrix": [5, 3], "x": 2, "y": 5.25},
+                {"matrix": [5, 4], "x": 3, "y": 5.25}
             ]
         }
 
diff --git a/keyboards/rmkeebs/rm_numpad/rm_numpad.c b/keyboards/rmkeebs/rm_numpad/rm_numpad.c
deleted file mode 100644
index 03dc9025c9..0000000000
--- a/keyboards/rmkeebs/rm_numpad/rm_numpad.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2021 RuckerMachine
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rm_numpad.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/rmkeebs/rm_numpad/rm_numpad.h b/keyboards/rmkeebs/rm_numpad/rm_numpad.h
deleted file mode 100644
index 77537f4570..0000000000
--- a/keyboards/rmkeebs/rm_numpad/rm_numpad.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Copyright 2021 RuckerMachine
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* rm_numpad default layout
- * .-------------------.
- * |PAUS|PREV|NEXT|MUTE|
- * |-------------------|
- * |NLCK|   /|   *|   -|
- * |-------------------|
- * |   7|   8|   9|    |
- * |--------------|    |
- * |   4|   5|   6|   +|
- * |-------------------|
- * |   1|   2|   3|    |
- * |--------------|    |
- * |        0|   .| Ent|
- * '-------------------'
- */
-
-#define LAYOUT_numpad_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, \
-    k30, k31, k32, k24,\
-    k40, k41, k42, \
-       k51,   k53, k44 \
-) { \
-    { k00, k01, k02, k03, ___ }, \
-    { k10, k11, k12, k13, ___ }, \
-    { k20, k21, k22, ___, k24 }, \
-    { k30, k31, k32, ___, ___ }, \
-    { k40, k41, k42, ___, k44 }, \
-    { ___, k51, ___, k53, ___ } \
-}
-
-/* rm_numpad ortho layout
- * .-------------------.
- * |PAUS|PREV|NEXT|MUTE|
- * |-------------------|
- * |NLCK|   /|   *|   -|
- * |-------------------|
- * |   7|   8|   9|   =|
- * |-------------------|
- * |   4|   5|   6|   +|
- * |-------------------|
- * |   1|   2|   3| Ent|
- * |-------------------|
- * |   0|  00|   .| Del|
- * '-------------------'
- */
-
-#define LAYOUT_ortho_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-    k50, k52, k53, k54 \
-) { \
-    { k00, k01, k02, k03, ___ }, \
-    { k10, k11, k12, k13, ___ }, \
-    { k20, k21, k22, k23, ___ }, \
-    { k30, k31, k32, k33, ___ }, \
-    { k40, k41, k42, k43, ___ }, \
-    { k50, ___, k52, k53, k54 } \
-}
-
-
-/* rm_numpad split plus layout
- * .-------------------.
- * |PAUS|PREV|NEXT|MUTE|
- * |-------------------|
- * |NLCK|   /|   *|   -|
- * |-------------------|
- * |   7|   8|   9|   =|
- * |-------------------|
- * |   4|   5|   6|   +|
- * |-------------------|
- * |   1|   2|   3| Ent|
- * |--------------|    |
- * |        0|   .|    |
- * '-------------------'
- */
-
-#define LAYOUT_split_plus_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, \
-    k51,      k53, k44 \
-) { \
-    { k00, k01, k02, k03, ___ }, \
-    { k10, k11, k12, k13, ___ }, \
-    { k20, k21, k22, k23, ___ }, \
-    { k30, k31, k32, k33, ___ }, \
-    { k40, k41, k42, ___, k44 }, \
-    { ___, k51, ___, k53, ___ } \
-}
-
-/* rm_numpad big enter layout
- * .-------------------.
- * |PAUS|PREV|NEXT|MUTE|
- * |-------------------|
- * |NLCK|   /|   *|   -|
- * |-------------------|
- * |   7|   8|   9|   =|
- * |-------------------|
- * |   4|   5|   6|   +|
- * |-------------------|
- * |   1|   2|   3| Ent|
- * |--------------|    |
- * |   0|  00|   .|    |
- * '-------------------'
- */
-
-#define LAYOUT_big_enter_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, \
-    k50, k52, k53, k44 \
-) { \
-    { k00, k01, k02, k03, ___ }, \
-    { k10, k11, k12, k13, ___ }, \
-    { k20, k21, k22, k23, ___ }, \
-    { k30, k31, k32, k33, ___ }, \
-    { k40, k41, k42, ___, k44 }, \
-    { k50, ___, k52, k53, ___ } \
-}
diff --git a/keyboards/rocketboard_16/config.h b/keyboards/rocketboard_16/config.h
index b6d39fd63d..64c493ace8 100644
--- a/keyboards/rocketboard_16/config.h
+++ b/keyboards/rocketboard_16/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A9, B13, B14, B15, B3 }
-#define MATRIX_COL_PINS { B8, B9, B10, B11 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -31,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN A4
 #define RGBLED_NUM 16
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json
index 793bad257c..00006749d8 100644
--- a/keyboards/rocketboard_16/info.json
+++ b/keyboards/rocketboard_16/info.json
@@ -8,6 +8,13 @@
         "pid": "0xFF16",
         "device_version": "0.0.1"
     },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "matrix_pins": {
+        "cols": ["B8", "B9", "B10", "B11"],
+        "rows": ["A9", "B13", "B14", "B15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A0", "pin_b": "A1"},
@@ -17,34 +24,37 @@
     "bootmagic": {
         "matrix": [4, 1]
     },
+    "ws2812": {
+        "pin": "A4"
+    },
     "layout_aliases": {
         "LAYOUT_default": "LAYOUT"
     },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
             ]
         }
     }
diff --git a/keyboards/rocketboard_16/rocketboard_16.c b/keyboards/rocketboard_16/rocketboard_16.c
deleted file mode 100644
index a2710083df..0000000000
--- a/keyboards/rocketboard_16/rocketboard_16.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rocketboard_16.h"
diff --git a/keyboards/rocketboard_16/rocketboard_16.h b/keyboards/rocketboard_16/rocketboard_16.h
deleted file mode 100644
index 927e21f7e6..0000000000
--- a/keyboards/rocketboard_16/rocketboard_16.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define KNO KC_NO
-
-#define LAYOUT( \
-  K00,           K01, \
-  K02, K03, K04, K05, \
-  K06, K07, K08, K09, \
-  K0A, K0B, K0C, K0D, \
-  K0E, K0F, K10, K11  \
-) { \
-  {  K00,  KC_NO, KC_NO, K01  }, \
-  {  K02,  K03,   K04,   K05  }, \
-  {  K06,  K07,   K08,   K09  }, \
-  {  K0A,  K0B,   K0C,   K0D  }, \
-  {  K0E,  K0F,   K10,   K11  }  \
-}
diff --git a/keyboards/rocketboard_16/rules.mk b/keyboards/rocketboard_16/rules.mk
index c07ebff427..dd493f5f18 100644
--- a/keyboards/rocketboard_16/rules.mk
+++ b/keyboards/rocketboard_16/rules.mk
@@ -1,16 +1,5 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-# BOOTLOADER = stm32duino
-
-# Custom loader configuration
-MCU_LDSCRIPT = STM32F103xB_stm32duino_bootloader
-OPT_DEFS += -DBOOTLOADER_STM32DUINO
-BOARD = STM32_F103_STM32DUINO
-BOOTLOADER_TYPE = stm32duino
-DFU_ARGS = -d 1EAF:0003 -a 2 -R
-DFU_SUFFIX_ARGS = -v 1EAF -p 0003
+# Configure for 128K flash
+MCU_LDSCRIPT = STM32F103xB
 
 # Extra include
 SRC += keycode_lookup.c
diff --git a/keyboards/rominronin/katana60/rev1/config.h b/keyboards/rominronin/katana60/rev1/config.h
index fb00ad9279..6c1b144b58 100644
--- a/keyboards/rominronin/katana60/rev1/config.h
+++ b/keyboards/rominronin/katana60/rev1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F5, F6, F4, F1, D0 }
-#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, C7, D1, D2, C6, B6, B5, B4, D4, D6, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rominronin/katana60/rev1/info.json b/keyboards/rominronin/katana60/rev1/info.json
index 8421147017..8f91d5863e 100644
--- a/keyboards/rominronin/katana60/rev1/info.json
+++ b/keyboards/rominronin/katana60/rev1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0C2C",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B7", "B3", "B2", "B1", "B0", "C7", "D1", "D2", "C6", "B6", "B5", "B4", "D4", "D6", "D7"],
+    "rows": ["F5", "F6", "F4", "F1", "D0"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/rominronin/katana60/rev1/rev1.c b/keyboards/rominronin/katana60/rev1/rev1.c
deleted file mode 100644
index e57ae2bbcb..0000000000
--- a/keyboards/rominronin/katana60/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 Baris Tosun
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/rominronin/katana60/rev2/config.h b/keyboards/rominronin/katana60/rev2/config.h
index c37f1d0544..0de481d0de 100644
--- a/keyboards/rominronin/katana60/rev2/config.h
+++ b/keyboards/rominronin/katana60/rev2/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, E6, D5, B4, B5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, D6, D4, D3, D2, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rominronin/katana60/rev2/info.json b/keyboards/rominronin/katana60/rev2/info.json
index a036d85384..2dcc257e62 100644
--- a/keyboards/rominronin/katana60/rev2/info.json
+++ b/keyboards/rominronin/katana60/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0xF03B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "D6", "D4", "D3", "D2", "D1", "D0"],
+        "rows": ["B0", "E6", "D5", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/rominronin/katana60/rev2/rev2.c b/keyboards/rominronin/katana60/rev2/rev2.c
deleted file mode 100644
index 3336fd0dc7..0000000000
--- a/keyboards/rominronin/katana60/rev2/rev2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 rominronin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev2.h"
diff --git a/keyboards/roseslite/config.h b/keyboards/roseslite/config.h
index 5001da5590..3cf449a32b 100644
--- a/keyboards/roseslite/config.h
+++ b/keyboards/roseslite/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/roseslite/info.json b/keyboards/roseslite/info.json
index 81572eac9f..69766a6d8b 100644
--- a/keyboards/roseslite/info.json
+++ b/keyboards/roseslite/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/roseslite/roseslite.c b/keyboards/roseslite/roseslite.c
deleted file mode 100644
index fa3a93fed7..0000000000
--- a/keyboards/roseslite/roseslite.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Fate
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "roseslite.h"
diff --git a/keyboards/rotor/config.h b/keyboards/rotor/config.h
deleted file mode 100644
index 26277fd5f7..0000000000
--- a/keyboards/rotor/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Densus Design and Basekeys.jp
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* key matrix pins */
-
-#define MATRIX_ROW_PINS { B7, B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D2, D5, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
diff --git a/keyboards/rotor/info.json b/keyboards/rotor/info.json
index 4be09da18a..d9494ccdf4 100644
--- a/keyboards/rotor/info.json
+++ b/keyboards/rotor/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE8BE",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D5", "D3"],
+        "rows": ["B7", "B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/rotor/rotor.c b/keyboards/rotor/rotor.c
deleted file mode 100644
index 2a21ed9b4f..0000000000
--- a/keyboards/rotor/rotor.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Densus Design and Basekeys.jp
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rotor.h"
diff --git a/keyboards/rotr/config.h b/keyboards/rotr/config.h
index 65a32fc355..5f36081323 100644
--- a/keyboards/rotr/config.h
+++ b/keyboards/rotr/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6 }
-#define MATRIX_COL_PINS { D1, D0, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/rotr/info.json b/keyboards/rotr/info.json
index b893720ddf..ce744d32f1 100644
--- a/keyboards/rotr/info.json
+++ b/keyboards/rotr/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4"],
+        "rows": ["E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C6", "pin_b": "D7", "resolution": 2}
@@ -17,7 +22,11 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0}
+            ]
         }
     }
 }
diff --git a/keyboards/rotr/rotr.c b/keyboards/rotr/rotr.c
deleted file mode 100644
index b7c551075d..0000000000
--- a/keyboards/rotr/rotr.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "rotr.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return true;
-}
diff --git a/keyboards/rotr/rotr.h b/keyboards/rotr/rotr.h
deleted file mode 100644
index bf2ff12929..0000000000
--- a/keyboards/rotr/rotr.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02  \
-) { \
-	{ K00,   K01,   K02 }  \
-}
diff --git a/keyboards/rpiguy9907/southpaw66/config.h b/keyboards/rpiguy9907/southpaw66/config.h
index 0379348801..99fb7f54ea 100644
--- a/keyboards/rpiguy9907/southpaw66/config.h
+++ b/keyboards/rpiguy9907/southpaw66/config.h
@@ -19,14 +19,6 @@
 
 #define TAPPING_TERM 400
 
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D7, C6, D4, D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { E6, B4, B5, F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rpiguy9907/southpaw66/info.json b/keyboards/rpiguy9907/southpaw66/info.json
index 656f4b9568..c16624d8ed 100644
--- a/keyboards/rpiguy9907/southpaw66/info.json
+++ b/keyboards/rpiguy9907/southpaw66/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5366",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D7", "C6", "D4", "D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [1, 0]
     },
diff --git a/keyboards/rpiguy9907/southpaw66/southpaw66.c b/keyboards/rpiguy9907/southpaw66/southpaw66.c
deleted file mode 100644
index ef61984b9d..0000000000
--- a/keyboards/rpiguy9907/southpaw66/southpaw66.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2020  gooberpsycho
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include "southpaw66.h"
diff --git a/keyboards/rubi/config.h b/keyboards/rubi/config.h
index d80fa7ec35..725e6e29f4 100644
--- a/keyboards/rubi/config.h
+++ b/keyboards/rubi/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B3, B2, B1, F7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rubi/info.json b/keyboards/rubi/info.json
index c9120a2f48..d61ef34548 100644
--- a/keyboards/rubi/info.json
+++ b/keyboards/rubi/info.json
@@ -8,6 +8,11 @@
       "pid": "0x5242",
       "device_version": "0.0.1"
    },
+   "matrix_pins": {
+      "cols": ["B3", "B2", "B1", "F7"],
+      "rows": ["F0", "F1", "F4", "F5", "F6"]
+   },
+   "diode_direction": "COL2ROW",
    "encoder": {
       "rotary": [
          {"pin_a": "D7", "pin_b": "D6"}
@@ -18,24 +23,29 @@
    "layouts": {
       "LAYOUT": {
          "layout": [
-            {"x":3, "y":0},
-            {"x":0, "y":1.25},
-            {"x":1, "y":1.25},
-            {"x":2, "y":1.25},
-            {"x":3, "y":1.25},
-            {"x":0, "y":2.25},
-            {"x":1, "y":2.25},
-            {"x":2, "y":2.25},
-            {"x":3, "y":2.25, "h":2},
-            {"x":0, "y":3.25},
-            {"x":1, "y":3.25},
-            {"x":2, "y":3.25},
-            {"x":0, "y":4.25},
-            {"x":1, "y":4.25},
-            {"x":2, "y":4.25},
-            {"x":3, "y":4.25, "h":2},
-            {"x":0, "y":5.25, "w":2},
-            {"x":2, "y":5.25}
+            {"matrix": [2, 3], "x": 3, "y": 0},
+
+            {"matrix": [0, 0], "x": 0, "y": 1.25},
+            {"matrix": [0, 1], "x": 1, "y": 1.25},
+            {"matrix": [0, 2], "x": 2, "y": 1.25},
+            {"matrix": [0, 3], "x": 3, "y": 1.25},
+
+            {"matrix": [1, 0], "x": 0, "y": 2.25},
+            {"matrix": [1, 1], "x": 1, "y": 2.25},
+            {"matrix": [1, 2], "x": 2, "y": 2.25},
+            {"matrix": [1, 3], "x": 3, "y": 2.25, "h": 2},
+
+            {"matrix": [2, 0], "x": 0, "y": 3.25},
+            {"matrix": [2, 1], "x": 1, "y": 3.25},
+            {"matrix": [2, 2], "x": 2, "y": 3.25},
+
+            {"matrix": [3, 0], "x": 0, "y": 4.25},
+            {"matrix": [3, 1], "x": 1, "y": 4.25},
+            {"matrix": [3, 2], "x": 2, "y": 4.25},
+            {"matrix": [3, 3], "x": 3, "y": 4.25, "h": 2},
+
+            {"matrix": [4, 1], "x": 0, "y": 5.25, "w": 2},
+            {"matrix": [4, 2], "x": 2, "y": 5.25}
          ]
       }
    }
diff --git a/keyboards/rubi/lib/oled.c b/keyboards/rubi/lib/oled.c
index 9534cdd9b7..9297cddf0e 100644
--- a/keyboards/rubi/lib/oled.c
+++ b/keyboards/rubi/lib/oled.c
@@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
-#include "./lib/oled.h"
+#include "oled.h"
+#include "rubi.h"
 
 bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
     return process_record_user(keycode, record);
diff --git a/keyboards/rubi/lib/oled.h b/keyboards/rubi/lib/oled.h
index 1737541c96..8af48c667b 100644
--- a/keyboards/rubi/lib/oled.h
+++ b/keyboards/rubi/lib/oled.h
@@ -17,6 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include <stdbool.h>
+#include <stdint.h>
+#include "progmem.h"
+
 #define OLED_FRAME_TIMEOUT (1000 / 30)  // 30 fps
 #define OLED_LOGO_TIMEOUT 3000          // 3 sec
 
diff --git a/keyboards/rubi/rubi.c b/keyboards/rubi/rubi.c
index 50e5fcf782..b125ff34a5 100644
--- a/keyboards/rubi/rubi.c
+++ b/keyboards/rubi/rubi.c
@@ -72,8 +72,3 @@ bool led_update_kb(led_t led_state) {
     }
     return true;
 }
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    return true;
-}
diff --git a/keyboards/rubi/rubi.h b/keyboards/rubi/rubi.h
index 17454c8c79..e7c8ae137a 100644
--- a/keyboards/rubi/rubi.h
+++ b/keyboards/rubi/rubi.h
@@ -60,42 +60,3 @@ uint16_t handle_encoder_press(void);
 void calcUpdate(void);
 void calcInput(char input);
 void calcOperands(void);
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* Rubi matrix layout
- * ,---------------.
- * |             23|
- * |---------------|
- * | 00| 01| 02| 03|
- * |---------------|
- * | 10| 11| 12|   |
- * |-----------| 13|
- * | 20| 21| 22|   |
- * |---------------|
- * | 30| 31| 32|   |
- * |-----------| 33|
- * |   41  | 42|   |
- * `---------------'
- */
-#define LAYOUT( \
-                       k23, \
-        k00, k01, k02, k03, \
-        k10, k11, k12, k13, \
-        k20, k21, k22, \
-        k30, k31, k32, k33, \
-             k41, k42 \
-) { \
-    { k00,   k01, k02, k03   }, \
-    { k10,   k11, k12, k13   }, \
-    { k20,   k21, k22, k23   }, \
-    { k30,   k31, k32, k33   }, \
-    { KC_NO, k41, k42, KC_NO }  \
-}
diff --git a/keyboards/runes/skjoldr/config.h b/keyboards/runes/skjoldr/config.h
index 74eddd6f55..7d6b574b96 100644
--- a/keyboards/runes/skjoldr/config.h
+++ b/keyboards/runes/skjoldr/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D6, D7, B4, B5, B0 }
-#define MATRIX_COL_PINS { B7, D0, D1, D2, D3, B3, E6, D5, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define FORCE_NKRO
 
 /*
diff --git a/keyboards/runes/skjoldr/info.json b/keyboards/runes/skjoldr/info.json
index 0560b512c4..c3e2488596 100644
--- a/keyboards/runes/skjoldr/info.json
+++ b/keyboards/runes/skjoldr/info.json
@@ -8,6 +8,11 @@
         "pid": "0x736B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "D0", "D1", "D2", "D3", "B3", "E6", "D5", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D6", "D7", "B4", "B5", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/runes/skjoldr/skjoldr.c b/keyboards/runes/skjoldr/skjoldr.c
deleted file mode 100644
index 2a8f003fc4..0000000000
--- a/keyboards/runes/skjoldr/skjoldr.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Vicktor
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "skjoldr.h"
diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h
index 1c7e33e966..e503d296c0 100644
--- a/keyboards/runes/vaengr/config.h
+++ b/keyboards/runes/vaengr/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, B7, B0, F7, C6 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, D0, D1, D6, D4, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 17
 // #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 #define FORCE_NKRO
 
diff --git a/keyboards/runes/vaengr/info.json b/keyboards/runes/vaengr/info.json
index a96ade853c..fb23385a49 100644
--- a/keyboards/runes/vaengr/info.json
+++ b/keyboards/runes/vaengr/info.json
@@ -8,6 +8,14 @@
         "pid": "0x7661",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "D0", "D1", "D6", "D4", "D2", "D3", "D5"],
+        "rows": ["B3", "B7", "B0", "F7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/runes/vaengr/vaengr.c b/keyboards/runes/vaengr/vaengr.c
deleted file mode 100644
index 7bea621495..0000000000
--- a/keyboards/runes/vaengr/vaengr.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Vicktor
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vaengr.h"
diff --git a/keyboards/rura66/rev1/config.h b/keyboards/rura66/rev1/config.h
index 1a6ca8ac73..3ca7920978 100644
--- a/keyboards/rura66/rev1/config.h
+++ b/keyboards/rura66/rev1/config.h
@@ -17,28 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Split hand configration */
 #define MASTER_LEFT
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGB_DI_PIN D3
   #define RGBLED_NUM 66 // Number of LEDs
   #define RGBLIGHT_SPLIT
   #define RGBLED_SPLIT { 33, 33 }
diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json
index fc4f1793bc..33557ff84f 100644
--- a/keyboards/rura66/rev1/info.json
+++ b/keyboards/rura66/rev1/info.json
@@ -8,9 +8,20 @@
     "pid": "0x0200",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+    "rows": ["D4", "C6", "D7", "E6", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/rura66/rev1/oled_display.c b/keyboards/rura66/rev1/oled_display.c
index 137fd188c7..d2e3422bf9 100644
--- a/keyboards/rura66/rev1/oled_display.c
+++ b/keyboards/rura66/rev1/oled_display.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "rev1.h"
 
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
diff --git a/keyboards/rura66/rev1/rev1.c b/keyboards/rura66/rev1/rev1.c
index f42bdad44b..d1b6a4ff6a 100644
--- a/keyboards/rura66/rev1/rev1.c
+++ b/keyboards/rura66/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rura66.h"
+#include "rev1.h"
 
 bool is_mac_mode(void) {
     return keymap_config.swap_lalt_lgui == false;
diff --git a/keyboards/rura66/rev1/rules.mk b/keyboards/rura66/rev1/rules.mk
index 5130195b44..0f2fb66a80 100644
--- a/keyboards/rura66/rev1/rules.mk
+++ b/keyboards/rura66/rev1/rules.mk
@@ -2,7 +2,6 @@ EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes    # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = no
 LTO_ENABLE = yes
diff --git a/keyboards/rura66/rules.mk b/keyboards/rura66/rules.mk
index 41795ddcb4..c7eacfa19a 100644
--- a/keyboards/rura66/rules.mk
+++ b/keyboards/rura66/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 DEFAULT_FOLDER = rura66/rev1
diff --git a/keyboards/rura66/rura66.c b/keyboards/rura66/rura66.c
deleted file mode 100644
index 641643ef25..0000000000
--- a/keyboards/rura66/rura66.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2021 T.Shinohara
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#include "rura66.h"
diff --git a/keyboards/rura66/rura66.h b/keyboards/rura66/rura66.h
deleted file mode 100644
index 9df9980b82..0000000000
--- a/keyboards/rura66/rura66.h
+++ /dev/null
@@ -1,22 +0,0 @@
- /* Copyright 2021 T.Shinohara
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#pragma once
-
-#include "quantum.h"
-#if defined(KEYBOARD_rura66_rev1)
-#    include "rev1.h"
-#endif
diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h
index 8fde291d58..835872aed5 100644
--- a/keyboards/ryanbaekr/rb18/config.h
+++ b/keyboards/ryanbaekr/rb18/config.h
@@ -17,26 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { B2, B6, B5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Underglow options */
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_HUE_STEP 8
 #define RGBLED_SAT_STEP 8
 #define RGBLED_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/info.json
index 4302522a49..2ee0967486 100644
--- a/keyboards/ryanbaekr/rb18/info.json
+++ b/keyboards/ryanbaekr/rb18/info.json
@@ -8,32 +8,40 @@
         "pid": "0x0018",
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B6", "B5", "B4"],
+        "rows": ["B1", "F7", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":1, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [3, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [4, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"x":0, "y":4, "w":2},
-                {"x":2, "y":4},
-                {"x":3, "y":3, "h":2}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/ryanbaekr/rb18/rb18.c b/keyboards/ryanbaekr/rb18/rb18.c
deleted file mode 100644
index 366364e42f..0000000000
--- a/keyboards/ryanbaekr/rb18/rb18.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 ryanbaekr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rb18.h"
diff --git a/keyboards/ryanbaekr/rb18/rb18.h b/keyboards/ryanbaekr/rb18/rb18.h
deleted file mode 100644
index 2dd2d61e86..0000000000
--- a/keyboards/ryanbaekr/rb18/rb18.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 ryanbaekr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_numpad_5x4(         \
-    k00, k11, k02, k03, \
-    k10, k21, k12,      \
-    k20, k31, k22, k13, \
-    k30, k41, k32,      \
-    k40,      k42, k33  \
-){ \
-    { k00, ___, k02, k03 },  \
-    { k10, k11, k12, k13 },  \
-    { k20, k21, k22, ___ },  \
-    { k30, k31, k32, k33 },  \
-    { k40, k41, k42, ___ }   \
-}
diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h
index 2aab8b1c24..5614dfa100 100644
--- a/keyboards/ryanbaekr/rb69/config.h
+++ b/keyboards/ryanbaekr/rb69/config.h
@@ -17,26 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, C6, D4, D0, D1 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, F0, F1, B4, B5, B7, D5, C7, E6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Underglow options */
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_HUE_STEP 8
 #define RGBLED_SAT_STEP 8
 #define RGBLED_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json
index de96dc8aed..a0340ed599 100644
--- a/keyboards/ryanbaekr/rb69/info.json
+++ b/keyboards/ryanbaekr/rb69/info.json
@@ -8,11 +8,98 @@
         "pid": "0x0069",
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "B4", "B5", "B7", "D5", "C7", "E6"],
+        "rows": ["D7", "C6", "D4", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.25, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.5}, {"x":15.25, "y":4.25}, {"x":14, "y":4.5}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25, "w":1.25}, {"x":2.75, "y":5.25, "w":1.25}, {"x":4, "y":5.25, "w":6.25}, {"x":10.25, "y":5.25, "w":1.25}, {"x":11.5, "y":5.25, "w":1.25}, {"x":13, "y":5.5}, {"x":14, "y":5.5}, {"x":15, "y":5.5}]
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":15.25, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":15.25, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.5},
+
+                {"x":14, "y":3.25},
+
+                {"x":15.25, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4, "w":1.25},
+                {"x":2.75, "y":4, "w":1.25},
+                {"x":4, "y":4, "w":6.25},
+                {"x":10.25, "y":4, "w":1.25},
+                {"x":11.5, "y":4, "w":1.25},
+
+                {"x":13, "y":4.25},
+                {"x":14, "y":4.25},
+                {"x":15, "y":4.25}
+            ]
         }
     }
 }
diff --git a/keyboards/ryanbaekr/rb69/rb69.c b/keyboards/ryanbaekr/rb69/rb69.c
deleted file mode 100644
index 68d27ce39a..0000000000
--- a/keyboards/ryanbaekr/rb69/rb69.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 ryanbaekr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rb69.h"
diff --git a/keyboards/ryanbaekr/rb86/config.h b/keyboards/ryanbaekr/rb86/config.h
index 5b29fa938e..2e802ba363 100644
--- a/keyboards/ryanbaekr/rb86/config.h
+++ b/keyboards/ryanbaekr/rb86/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, D7 }
-#define MATRIX_COL_PINS { B6, B5, D5, C7, F1, F0, D3, D2, D1, D0, D4, E6, B7, C6, F4, F5, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ryanbaekr/rb86/info.json b/keyboards/ryanbaekr/rb86/info.json
index 771862f612..5407b5dff4 100644
--- a/keyboards/ryanbaekr/rb86/info.json
+++ b/keyboards/ryanbaekr/rb86/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0086",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "D5", "C7", "F1", "F0", "D3", "D2", "D1", "D0", "D4", "E6", "B7", "C6", "F4", "F5", "F6"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layout_aliases": {
diff --git a/keyboards/ryanbaekr/rb86/rb86.c b/keyboards/ryanbaekr/rb86/rb86.c
deleted file mode 100644
index b3375cb4fc..0000000000
--- a/keyboards/ryanbaekr/rb86/rb86.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 ryanbaekr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rb86.h"
diff --git a/keyboards/ryanbaekr/rb87/config.h b/keyboards/ryanbaekr/rb87/config.h
index 4e4839cdf7..ca1f8284c5 100644
--- a/keyboards/ryanbaekr/rb87/config.h
+++ b/keyboards/ryanbaekr/rb87/config.h
@@ -17,26 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D7, C6, D4, D0, D1 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, F0, F1, C7, E6, B4, B5, B7, D5, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Underglow options */
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_HUE_STEP 8
 #define RGBLED_SAT_STEP 8
 #define RGBLED_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ryanbaekr/rb87/info.json b/keyboards/ryanbaekr/rb87/info.json
index f9401bac65..777cd1e7a0 100644
--- a/keyboards/ryanbaekr/rb87/info.json
+++ b/keyboards/ryanbaekr/rb87/info.json
@@ -10,6 +10,14 @@
         "pid": "0x0087",
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "C7", "E6", "B4", "B5", "B7", "D5", "D3"],
+        "rows": ["D2", "D7", "C6", "D4", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.25, "y":3.25}, {"x":16.25, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":15.25, "y":4.5}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25, "w":1.25}, {"x":2.75, "y":5.25, "w":1.25}, {"x":4, "y":5.25, "w":6.25}, {"x":10.25, "y":5.25, "w":1.25}, {"x":11.5, "y":5.25, "w":1.25}, {"x":12.75, "y":5.25, "w":1.25}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}]
diff --git a/keyboards/ryanbaekr/rb87/rb87.c b/keyboards/ryanbaekr/rb87/rb87.c
deleted file mode 100644
index 4fd8a3decd..0000000000
--- a/keyboards/ryanbaekr/rb87/rb87.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 ryanbaekr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rb87.h"
diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h
index 08a3180510..5e38b1f36a 100644
--- a/keyboards/ryanskidmore/rskeys100/config.h
+++ b/keyboards/ryanskidmore/rskeys100/config.h
@@ -27,8 +27,6 @@
  * the diode direction is COL(umn) to ROW */
 #define DIODE_DIRECTION COL2ROW
 
-/* RGB Data Pin */
-#define RGB_DI_PIN C7
 /* The number of RGB LEDs connected */
 #define RGB_MATRIX_LED_COUNT 105
 /* Set the maximum brightness to 110 to avoid going over 500 mA.
diff --git a/keyboards/ryanskidmore/rskeys100/info.json b/keyboards/ryanskidmore/rskeys100/info.json
index 5bf34ad5e6..3549d99b3f 100644
--- a/keyboards/ryanskidmore/rskeys100/info.json
+++ b/keyboards/ryanskidmore/rskeys100/info.json
@@ -6,6 +6,12 @@
         "pid": "0x0064",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "url": "",
@@ -14,116 +20,129 @@
     "layouts": {
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25, "h":2},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25, "h":2},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25, "w":2},
-                {"label":".", "x":20.5, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [1, 19], "x": 20.5, "y": 1.25},
+                {"matrix": [1, 20], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [2, 19], "x": 20.5, "y": 2.25},
+                {"matrix": [2, 20], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 19], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 19], "x": 20.5, "y": 4.25},
+                {"matrix": [4, 20], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25},
+
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 19], "x": 20.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/ryanskidmore/rskeys100/rskeys100.c b/keyboards/ryanskidmore/rskeys100/rskeys100.c
index 242ca8641d..4be811b1e2 100644
--- a/keyboards/ryanskidmore/rskeys100/rskeys100.c
+++ b/keyboards/ryanskidmore/rskeys100/rskeys100.c
@@ -1,8 +1,7 @@
 // Copyright 2021 Ryan Skidmore (@ryanskidmore, rskeys@ryanskidmore.co.uk)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "rskeys100.h"
-
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
diff --git a/keyboards/ryanskidmore/rskeys100/rskeys100.h b/keyboards/ryanskidmore/rskeys100/rskeys100.h
deleted file mode 100644
index 12b568d23e..0000000000
--- a/keyboards/ryanskidmore/rskeys100/rskeys100.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2021 Ryan Skidmore (@ryanskidmore, rskeys@ryanskidmore.co.uk)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_fullsize_iso( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, K218, K219, K220, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K213,                   K317, K318, K319, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,       K415,       K417, K418, K419, K420, \
-	K500,       K502, K503,             K506,                   K510, K511, K512, K513, K514, K515, K516, K517,       K519 \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014,  K015,  K016,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118,  K119,  K120,  KC_NO, KC_NO, KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,  K220,  KC_NO, KC_NO, KC_NO }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, KC_NO, KC_NO, KC_NO, K317,  K318,  K319,  KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  KC_NO, K415,  KC_NO, K417,  K418,  K419,  K420,  KC_NO, KC_NO, KC_NO }, \
-    { K500,  KC_NO, K502,  K503,  KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  K513,  K514,  K515,  K516,  K517,  KC_NO, K519,  KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
diff --git a/keyboards/ryanskidmore/rskeys100/rules.mk b/keyboards/ryanskidmore/rskeys100/rules.mk
index fe929e6ad6..8db3728a22 100644
--- a/keyboards/ryanskidmore/rskeys100/rules.mk
+++ b/keyboards/ryanskidmore/rskeys100/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no            # Audio output
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h
index a0625ed46f..fb4c0774ef 100755
--- a/keyboards/ryloo_studio/m0110/config.h
+++ b/keyboards/ryloo_studio/m0110/config.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,4 +38,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 123
-#endif
diff --git a/keyboards/ryloo_studio/m0110/info.json b/keyboards/ryloo_studio/m0110/info.json
index 251737d61e..ef523dcc18 100644
--- a/keyboards/ryloo_studio/m0110/info.json
+++ b/keyboards/ryloo_studio/m0110/info.json
@@ -8,10 +8,18 @@
         "pid": "0x1000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_hhkb"],
diff --git a/keyboards/ryloo_studio/m0110/m0110.c b/keyboards/ryloo_studio/m0110/m0110.c
deleted file mode 100755
index c7bae90e15..0000000000
--- a/keyboards/ryloo_studio/m0110/m0110.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 newtonapple
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "m0110.h"
diff --git a/keyboards/s_ol/0xc_pad/0xc_pad.h b/keyboards/s_ol/0xc_pad/0xc_pad.h
index 52c9c3adfd..013f4c89dc 100644
--- a/keyboards/s_ol/0xc_pad/0xc_pad.h
+++ b/keyboards/s_ol/0xc_pad/0xc_pad.h
@@ -17,18 +17,6 @@
 
 #include "quantum.h"
 
-#define LAYOUT(         \
-         k01, k05,      \
-       k02, k06, k10,   \
-    k03, k07, k11, k15, \
-       k08, k12, k16    \
-) { \
-    { k01,   k05, KC_NO, KC_NO }, \
-    { k02,   k06, k10,   KC_NO }, \
-    { k03,   k07, k11,   k15   }, \
-    { KC_NO, k08, k12,   k16   }  \
-}
-
 #define LED_LAYOUT(                                             \
                                                                 \
     k01, k05, k02, k06, k10, k03, k07, k11, k15, k08, k12, k16) \
diff --git a/keyboards/s_ol/0xc_pad/config.h b/keyboards/s_ol/0xc_pad/config.h
index d99a5188bf..865ab45d31 100644
--- a/keyboards/s_ol/0xc_pad/config.h
+++ b/keyboards/s_ol/0xc_pad/config.h
@@ -17,7 +17,6 @@
 
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN C7
 #define RGB_MATRIX_LED_COUNT 12
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #define RGB_MATRIX_CENTER \
diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/info.json
index decf0ae1cb..a35c054900 100644
--- a/keyboards/s_ol/0xc_pad/info.json
+++ b/keyboards/s_ol/0xc_pad/info.json
@@ -6,21 +6,30 @@
       "rows": ["B7", "B6", "B5", "B4"],
       "cols": ["D4", "D3", "D2", "D1"]
     },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":0.5, "y":1},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":0.5, "y":3},
-                {"x":1.5, "y":3},
-                {"x":2.5, "y":3}
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.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": [3, 1], "x": 0.5, "y": 3},
+                {"matrix": [3, 2], "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "x": 2.5, "y": 3}
             ]
         }
     },
diff --git a/keyboards/s_ol/0xc_pad/rules.mk b/keyboards/s_ol/0xc_pad/rules.mk
index d17272fe99..972d696cec 100644
--- a/keyboards/s_ol/0xc_pad/rules.mk
+++ b/keyboards/s_ol/0xc_pad/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = bitbang
diff --git a/keyboards/saevus/cor_tkl/config.h b/keyboards/saevus/cor_tkl/config.h
index b10c977af4..b42ece99a6 100644
--- a/keyboards/saevus/cor_tkl/config.h
+++ b/keyboards/saevus/cor_tkl/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* RGB Matrix setup */
-#define RGB_DI_PIN GP19
 #define RGB_MATRIX_LED_COUNT 2
 #define RGBLED_NUM 2
 #define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
diff --git a/keyboards/saevus/cor_tkl/cor_tkl.c b/keyboards/saevus/cor_tkl/cor_tkl.c
index f7b39471db..d4f0ec0082 100644
--- a/keyboards/saevus/cor_tkl/cor_tkl.c
+++ b/keyboards/saevus/cor_tkl/cor_tkl.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cor_tkl.h"
+#include "quantum.h"
 
 led_config_t g_led_config = {{
     // Key Matrix to LED Index
diff --git a/keyboards/saevus/cor_tkl/cor_tkl.h b/keyboards/saevus/cor_tkl/cor_tkl.h
deleted file mode 100644
index e629f7e741..0000000000
--- a/keyboards/saevus/cor_tkl/cor_tkl.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright 2022 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-// ANSI layout
-// Full backspace
-// Full right shift
-// Full left shift
-#define LAYOUT_tkl_f13_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                \
-    k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,                k4f,      \
-    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \
-    { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// ANSI layout
-// Split backspace
-// Split right shift
-// Full left shift
-#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                     \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
-    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \
-    { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// ISO layout
-// Full backspace
-// Full right shift
-// Split left shift
-#define LAYOUT_tkl_f13_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2d,                \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,                k4f,      \
-    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// ISO layout
-// Split backspace
-// Split right shift
-// Split left shift
-#define LAYOUT_tkl_f13_iso_split_bs_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k2d,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
-    k50, k51, k52,                k57,                k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }, \
-}
-
-// Layout for VIA
-// Split backspace
-// Split left shift
-// Split right shift
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
-    k50, k51, k52,                     k57,           k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, ___, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, ___ }, \
-    { k50, k51, k52, ___, ___, ___, ___, k57, ___, ___, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
-}
diff --git a/keyboards/saevus/cor_tkl/info.json b/keyboards/saevus/cor_tkl/info.json
index 6c00c7830e..54451c1077 100644
--- a/keyboards/saevus/cor_tkl/info.json
+++ b/keyboards/saevus/cor_tkl/info.json
@@ -37,499 +37,550 @@
     "rgb_matrix": {
       "driver": "WS2812"
     },
+    "ws2812": {
+        "pin": "GP19",
+        "driver": "vendor"
+    },
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
-                {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_f13_iso_split_bs_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
-                {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"x":14, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/saevus/cor_tkl/keymaps/iso/keymap.c b/keyboards/saevus/cor_tkl/keymaps/iso/keymap.c
index 8b6de5f386..76263034ed 100644
--- a/keyboards/saevus/cor_tkl/keymaps/iso/keymap.c
+++ b/keyboards/saevus/cor_tkl/keymaps/iso/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_tkl_f13_iso_tsangan(
+    [0] = LAYOUT_tkl_f13_iso(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/saevus/cor_tkl/rules.mk b/keyboards/saevus/cor_tkl/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/saevus/cor_tkl/rules.mk
+++ b/keyboards/saevus/cor_tkl/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/salicylic_acid3/7skb/7skb.c b/keyboards/salicylic_acid3/7skb/7skb.c
deleted file mode 100644
index 3044e02233..0000000000
--- a/keyboards/salicylic_acid3/7skb/7skb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "7skb.h"
diff --git a/keyboards/salicylic_acid3/7skb/7skb.h b/keyboards/salicylic_acid3/7skb/7skb.h
deleted file mode 100644
index 5043a46747..0000000000
--- a/keyboards/salicylic_acid3/7skb/7skb.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_7skb_rev1
-  #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h
index b85eee3da2..573efb81c7 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/config.h
+++ b/keyboards/salicylic_acid3/7skb/rev1/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN B6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -31,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifndef RGBLED_NUM
   #define RGBLED_NUM 12
   #define RGBLIGHT_SPLIT
diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json
index 242135b16c..3aab930399 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/info.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/info.json
@@ -8,9 +8,17 @@
         "pid": "0xEB5F",
         "device_version": "0.0.7"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.c b/keyboards/salicylic_acid3/7skb/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/salicylic_acid3/7skb/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.h b/keyboards/salicylic_acid3/7skb/rev1/rev1.h
index 8ab845240d..d523bf96e5 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/7skb/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "7skb.h"
-
 #include "quantum.h"
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/keyboards/salicylic_acid3/7splus/7splus.c b/keyboards/salicylic_acid3/7splus/7splus.c
deleted file mode 100644
index ca94ab0efa..0000000000
--- a/keyboards/salicylic_acid3/7splus/7splus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "7splus.h"
diff --git a/keyboards/salicylic_acid3/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h
index 23eae6dac4..82eec4a306 100644
--- a/keyboards/salicylic_acid3/7splus/config.h
+++ b/keyboards/salicylic_acid3/7splus/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN B6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -31,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifndef RGBLED_NUM
   #define RGBLED_NUM 31
   #define RGBLIGHT_SPLIT
diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
index 7762132ec0..47f3bcc5c2 100644
--- a/keyboards/salicylic_acid3/7splus/info.json
+++ b/keyboards/salicylic_acid3/7splus/info.json
@@ -8,9 +8,17 @@
         "pid": "0xEAE7",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/salicylic_acid3/ajisai74/ajisai74.c b/keyboards/salicylic_acid3/ajisai74/ajisai74.c
deleted file mode 100644
index 3c9342e6f7..0000000000
--- a/keyboards/salicylic_acid3/ajisai74/ajisai74.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ajisai74.h"
diff --git a/keyboards/salicylic_acid3/ajisai74/config.h b/keyboards/salicylic_acid3/ajisai74/config.h
index aa568db0a6..8f24db085d 100644
--- a/keyboards/salicylic_acid3/ajisai74/config.h
+++ b/keyboards/salicylic_acid3/ajisai74/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5, D3 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN B6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json
index e9b4d6e60e..8378a1cd5d 100644
--- a/keyboards/salicylic_acid3/ajisai74/info.json
+++ b/keyboards/salicylic_acid3/ajisai74/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEB54",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D3"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/salicylic_acid3/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h
index c64ee24098..dcbdb0f537 100644
--- a/keyboards/salicylic_acid3/ergoarrows/config.h
+++ b/keyboards/salicylic_acid3/ergoarrows/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN B6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -31,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifndef RGBLED_NUM
   #define RGBLED_NUM 86
   #define RGBLIGHT_SPLIT
diff --git a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.c b/keyboards/salicylic_acid3/ergoarrows/ergoarrows.c
deleted file mode 100644
index 7d2c11e6ec..0000000000
--- a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ergoarrows.h"
diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
index 9396eca367..415a7e1945 100644
--- a/keyboards/salicylic_acid3/ergoarrows/info.json
+++ b/keyboards/salicylic_acid3/ergoarrows/info.json
@@ -8,9 +8,17 @@
         "pid": "0xEA54",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/salicylic_acid3/getta25/getta25.c b/keyboards/salicylic_acid3/getta25/getta25.c
deleted file mode 100644
index 4f8cc63b42..0000000000
--- a/keyboards/salicylic_acid3/getta25/getta25.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "getta25.h"
diff --git a/keyboards/salicylic_acid3/getta25/getta25.h b/keyboards/salicylic_acid3/getta25/getta25.h
deleted file mode 100644
index 67632bba4d..0000000000
--- a/keyboards/salicylic_acid3/getta25/getta25.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_getta25_rev1
-  #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h
index 479aa6c3f7..cdc803a98c 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/config.h
+++ b/keyboards/salicylic_acid3/getta25/rev1/config.h
@@ -18,21 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B2 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 9    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json
index 7443540704..c63baa8942 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/info.json
+++ b/keyboards/salicylic_acid3/getta25/rev1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3060",
         "device_version": "0.1.3"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.c b/keyboards/salicylic_acid3/getta25/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/salicylic_acid3/getta25/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.h b/keyboards/salicylic_acid3/getta25/rev1/rev1.h
index 98f4318a6a..f2c5b9b8ed 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/getta25/rev1/rev1.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "getta25.h"
+#include "quantum.h"
 
 /*
  * ,-----------------------.
diff --git a/keyboards/salicylic_acid3/guide68/info.json b/keyboards/salicylic_acid3/guide68/info.json
index 3bd04677b7..8cf8504aba 100644
--- a/keyboards/salicylic_acid3/guide68/info.json
+++ b/keyboards/salicylic_acid3/guide68/info.json
@@ -26,7 +26,6 @@
     },
     "rgblight": {
         "led_count": 12,
-        "pin": "D3",
         "animations": {
                "alternating": true,
                "breathing": true,
@@ -44,6 +43,9 @@
         "split": true,
         "split_count": [ 6, 6 ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "split": {
         "enabled": true,
         "transport": {
diff --git a/keyboards/salicylic_acid3/jisplit89/jisplit89.c b/keyboards/salicylic_acid3/jisplit89/jisplit89.c
deleted file mode 100644
index 0f03aa4ce2..0000000000
--- a/keyboards/salicylic_acid3/jisplit89/jisplit89.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "jisplit89.h"
diff --git a/keyboards/salicylic_acid3/jisplit89/jisplit89.h b/keyboards/salicylic_acid3/jisplit89/jisplit89.h
deleted file mode 100644
index 8de2326de6..0000000000
--- a/keyboards/salicylic_acid3/jisplit89/jisplit89.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2020 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#ifdef KEYBOARD_salicylic_acid3_jisplit89_rev1
-  #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
index 65b373f168..51b6d454e5 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN B6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -30,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifndef RGBLED_NUM
   #define RGBLED_NUM 32
   #define RGBLIGHT_SPLIT
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
index 53f61f87f2..c362ba54e1 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
@@ -8,9 +8,17 @@
         "pid": "0xEB4F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c
deleted file mode 100644
index 13e201e63a..0000000000
--- a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "rev1.h"
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
index 71515f5ef6..7a1887dc2d 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "jisplit89.h"
-
 #include "quantum.h"
 
 /*
diff --git a/keyboards/salicylic_acid3/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h
index f9312912ce..94d44bfce8 100644
--- a/keyboards/salicylic_acid3/nafuda/config.h
+++ b/keyboards/salicylic_acid3/nafuda/config.h
@@ -18,21 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D4 }
-#define MATRIX_COL_PINS { F4, F5, F6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 7    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json
index 05cf322ccf..cbcc9f54fa 100644
--- a/keyboards/salicylic_acid3/nafuda/info.json
+++ b/keyboards/salicylic_acid3/nafuda/info.json
@@ -8,18 +8,26 @@
         "pid": "0x3060",
         "device_version": "0.1.2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6"],
+        "rows": ["D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Mouse", "x":1, "y":0},
-                {"label":"Backspace", "x":0, "y":0.5},
-                {"label":"\u2191", "x":1, "y":1},
-                {"label":"Browser", "x":2, "y":0.5},
-                {"label":"\u2190", "x":0, "y":1.5},
-                {"label":"\u2193", "x":1, "y":2},
-                {"label":"\u2192", "x":2, "y":1.5}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 0.5},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 0.5},
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 1.5}
             ]
         }
     }
diff --git a/keyboards/salicylic_acid3/nafuda/nafuda.c b/keyboards/salicylic_acid3/nafuda/nafuda.c
deleted file mode 100644
index 334b3dab27..0000000000
--- a/keyboards/salicylic_acid3/nafuda/nafuda.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "nafuda.h"
diff --git a/keyboards/salicylic_acid3/nafuda/nafuda.h b/keyboards/salicylic_acid3/nafuda/nafuda.h
deleted file mode 100644
index 008a9c16f4..0000000000
--- a/keyboards/salicylic_acid3/nafuda/nafuda.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-/*
- * ,-----------------.
- * |     | L01 |     |
- * |-----------------+
- * | L10 | L11 | L12 |
- * |-----------------+
- * | L20 | L21 | L22 |
- * |-----------------'
- */
-
-#define LAYOUT( \
-         L01,      \
-    L10, L11, L12, \
-    L20, L21, L22  \
-  ) \
-  { \
-    {KC_NO,  L01,KC_NO  },  \
-    {  L10,  L11,  L12  },  \
-    {  L20,  L21,  L22  }   \
-  }
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk
+++ /dev/null
diff --git a/keyboards/salicylic_acid3/naked48/naked48.c b/keyboards/salicylic_acid3/naked48/naked48.c
deleted file mode 100644
index c2a10ed3e6..0000000000
--- a/keyboards/salicylic_acid3/naked48/naked48.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "naked48.h"
diff --git a/keyboards/salicylic_acid3/naked48/naked48.h b/keyboards/salicylic_acid3/naked48/naked48.h
deleted file mode 100644
index bbfa6d2e84..0000000000
--- a/keyboards/salicylic_acid3/naked48/naked48.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_naked48_rev1
-  #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h
index 8adf11f4df..c7246fad76 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked48/rev1/config.h
@@ -17,23 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D7, E6, B4, B5 }
-// When using Nafuda, comment out MATRIX_ROW_PINS_RIGHT and MATRIX_COL_PINS_RIGHT.
-#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5, B2, B2 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifndef RGBLED_NUM
   #define RGBLED_NUM 48
 #endif
diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index 5dc05a02d0..968965e51c 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -8,8 +8,25 @@
         "pid": "0xE8BA",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "B4", "B5"],
+        "rows": ["D1", "D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"],
+                "rows": ["D4", "C6", "D7", "E6"]
+            }
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.c b/keyboards/salicylic_acid3/naked48/rev1/rev1.c
index 0129b6c1a3..5c9d8035c0 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/rev1.c
+++ b/keyboards/salicylic_acid3/naked48/rev1/rev1.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "naked48.h"
+#include "rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
     led_config_t g_led_config = { {
diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.h b/keyboards/salicylic_acid3/naked48/rev1/rev1.h
index eee5c4185f..d43e9f4fb3 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/naked48/rev1/rev1.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "naked48.h"
-
 #include "quantum.h"
 #ifdef RGBLIGHT_ENABLE
 //rgb led driver
 #include "ws2812.h"
 #endif
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 //////////////////////////////////////////////////////////////////////////////
 // When only use Naked48.
 //////////////////////////////////////////////////////////////////////////////
diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
index 956ae2cefc..033ade5a49 100644
--- a/keyboards/salicylic_acid3/naked48/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
diff --git a/keyboards/salicylic_acid3/naked60/naked60.c b/keyboards/salicylic_acid3/naked60/naked60.c
deleted file mode 100644
index d1d46394f6..0000000000
--- a/keyboards/salicylic_acid3/naked60/naked60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "naked60.h"
diff --git a/keyboards/salicylic_acid3/naked60/naked60.h b/keyboards/salicylic_acid3/naked60/naked60.h
deleted file mode 100644
index 9ad73df67f..0000000000
--- a/keyboards/salicylic_acid3/naked60/naked60.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_naked60_rev1
-  #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/naked60/rev1/config.h b/keyboards/salicylic_acid3/naked60/rev1/config.h
index d7e3f223ea..2f62289261 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked60/rev1/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// Rows are doubled-up
-#define MATRIX_ROW_PINS { B6, D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D7, E6, B4, B5, D3 }
-// When using Setta21
-#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B2 }
-#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5, B2, B2 }
-// When using Nafuda
-//#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, B6 }
-//#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, D7, E6, B4, B5, D3 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json
index 2f46e127ea..92da4070a5 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/info.json
@@ -8,8 +8,19 @@
         "pid": "0xEB5C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D7", "E6", "B4", "B5", "D3"],
+        "rows": ["B6", "D1", "D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"],
+                "rows": ["D4", "C6", "D7", "E6", "B2"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/salicylic_acid3/naked60/rev1/rev1.c b/keyboards/salicylic_acid3/naked60/rev1/rev1.c
deleted file mode 100644
index d1d46394f6..0000000000
--- a/keyboards/salicylic_acid3/naked60/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "naked60.h"
diff --git a/keyboards/salicylic_acid3/naked60/rev1/rev1.h b/keyboards/salicylic_acid3/naked60/rev1/rev1.h
index 12798022e9..fcb26d5fc2 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/naked60/rev1/rev1.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "naked60.h"
-
 #include "quantum.h"
 
 
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk
+++ /dev/null
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk
+++ /dev/null
diff --git a/keyboards/salicylic_acid3/naked64/naked64.c b/keyboards/salicylic_acid3/naked64/naked64.c
deleted file mode 100644
index a2863f0477..0000000000
--- a/keyboards/salicylic_acid3/naked64/naked64.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "naked64.h"
diff --git a/keyboards/salicylic_acid3/naked64/naked64.h b/keyboards/salicylic_acid3/naked64/naked64.h
deleted file mode 100644
index cb73e2142d..0000000000
--- a/keyboards/salicylic_acid3/naked64/naked64.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_naked64_rev1
-  #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h
index 11031a4f25..33ee2b5030 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked64/rev1/config.h
@@ -18,22 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D3 }
-#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4, B5, B2, B2 }
-#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN B6
-
 #define RGBLED_NUM 12    // Number of LEDs
 #define RGBLIGHT_LED_MAP { 0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7 }
 
diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json
index 52a7c2906e..7eed51635b 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/info.json
@@ -8,8 +8,22 @@
         "pid": "0x3060",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+                "rows": ["D4", "C6", "D7", "E6", "B4", "B5", "B2", "B2"]
+            }
+        }
+    },
+    "ws2812": {
+        "pin": "B6"
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/salicylic_acid3/naked64/rev1/rev1.c b/keyboards/salicylic_acid3/naked64/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/salicylic_acid3/naked64/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/salicylic_acid3/naked64/rev1/rev1.h b/keyboards/salicylic_acid3/naked64/rev1/rev1.h
index 0ac804ee0f..d8965556c7 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/naked64/rev1/rev1.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "naked64.h"
+#include "quantum.h"
 
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/keyboards/salicylic_acid3/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h
index 43e7cfb222..9f39d06f61 100644
--- a/keyboards/salicylic_acid3/nknl7en/config.h
+++ b/keyboards/salicylic_acid3/nknl7en/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5, D2 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN B6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -31,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifndef RGBLED_NUM
   #define RGBLED_NUM 21
   #define RGBLIGHT_SPLIT
diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
index 06d915c2f4..0777289c5c 100644
--- a/keyboards/salicylic_acid3/nknl7en/info.json
+++ b/keyboards/salicylic_acid3/nknl7en/info.json
@@ -8,9 +8,17 @@
         "pid": "0xEA56",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/salicylic_acid3/nknl7en/nknl7en.c b/keyboards/salicylic_acid3/nknl7en/nknl7en.c
deleted file mode 100644
index 1f06cb7336..0000000000
--- a/keyboards/salicylic_acid3/nknl7en/nknl7en.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "nknl7en.h"
diff --git a/keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h
index 69ef56fe6e..65091cadc0 100644
--- a/keyboards/salicylic_acid3/nknl7jp/config.h
+++ b/keyboards/salicylic_acid3/nknl7jp/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5, D2 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN B6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -31,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #ifndef RGBLED_NUM
   #define RGBLED_NUM 20
   #define RGBLIGHT_SPLIT
diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
index 7338cb15fe..83505e513c 100644
--- a/keyboards/salicylic_acid3/nknl7jp/info.json
+++ b/keyboards/salicylic_acid3/nknl7jp/info.json
@@ -8,9 +8,17 @@
         "pid": "0xEA55",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.c b/keyboards/salicylic_acid3/nknl7jp/nknl7jp.c
deleted file mode 100644
index 0395a3b678..0000000000
--- a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "nknl7jp.h"
diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h
index 6672b0014c..eb9e0b5b1d 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/config.h
+++ b/keyboards/salicylic_acid3/setta21/rev1/config.h
@@ -18,20 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 21    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json
index a798c25e63..642bde6298 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/info.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/info.json
@@ -8,38 +8,49 @@
         "pid": "0x3060",
         "device_version": "0.1.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["numpad_6x4"],
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"label":"ESC", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"\uff1d", "x":2, "y":0},
-                {"label":"Del", "x":3, "y":0},
+                {"matrix": [0, 5], "x": 0, "y": 0},
+                {"matrix": [1, 5], "x": 1, "y": 0},
+                {"matrix": [2, 5], "x": 2, "y": 0},
+                {"matrix": [3, 5], "x": 3, "y": 0},
 
-                {"label":"Num Lock", "x":0, "y":1.25},
-                {"label":"/", "x":1, "y":1.25},
-                {"label":"*", "x":2, "y":1.25},
-                {"label":"-", "x":3, "y":1.25},
+                {"matrix": [0, 4], "x": 0, "y": 1.25},
+                {"matrix": [1, 4], "x": 1, "y": 1.25},
+                {"matrix": [2, 4], "x": 2, "y": 1.25},
+                {"matrix": [3, 4], "x": 3, "y": 1.25},
 
-                {"label":"7", "x":0, "y":2.25},
-                {"label":"8", "x":1, "y":2.25},
-                {"label":"9", "x":2, "y":2.25},
+                {"matrix": [0, 3], "x": 0, "y": 2.25},
+                {"matrix": [1, 3], "x": 1, "y": 2.25},
+                {"matrix": [2, 3], "x": 2, "y": 2.25},
 
-                {"label":"4", "x":0, "y":3.25},
-                {"label":"5", "x":1, "y":3.25},
-                {"label":"6", "x":2, "y":3.25},
-                {"label":"+", "x":3, "y":2.25, "h":2},
+                {"matrix": [0, 2], "x": 0, "y": 3.25},
+                {"matrix": [1, 2], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 2], "x": 3, "y": 2.25, "h": 2},
 
-                {"label":"1", "x":0, "y":4.25},
-                {"label":"2", "x":1, "y":4.25},
-                {"label":"3", "x":2, "y":4.25},
+                {"matrix": [0, 1], "x": 0, "y": 4.25},
+                {"matrix": [1, 1], "x": 1, "y": 4.25},
+                {"matrix": [2, 1], "x": 2, "y": 4.25},
 
-                {"label":"0", "x":0, "y":5.25, "w":2},
-                {"label":".", "x":2, "y":5.25},
-                {"label":"Enter", "x":3, "y":4.25, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [2, 0], "x": 2, "y": 5.25},
+                {"matrix": [3, 0], "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.c b/keyboards/salicylic_acid3/setta21/rev1/rev1.c
index b377452770..c31fe5c8f3 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/rev1.c
+++ b/keyboards/salicylic_acid3/setta21/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "rev1.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
     led_config_t g_led_config = { {
diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.h b/keyboards/salicylic_acid3/setta21/rev1/rev1.h
deleted file mode 100644
index 772c843c57..0000000000
--- a/keyboards/salicylic_acid3/setta21/rev1/rev1.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "setta21.h"
-
-#define LAYOUT_numpad_6x4( \
-       L05, L15, L25, L35, \
-       L04, L14, L24, L34, \
-       L03, L13, L23,      \
-       L02, L12, L22, L32, \
-       L01, L11, L21,      \
-       L00,      L20, L30  \
-  ) \
-  { \
-    {  L00,  L01,  L02,  L03,  L04,  L05  },  \
-    {KC_NO,  L11,  L12,  L13,  L14,  L15  },  \
-    {  L20,  L21,  L22,  L23,  L24,  L25  },  \
-    {  L30,KC_NO,  L32,KC_NO,  L34,  L35  }   \
-  }
diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk
index ee8bd4cc40..d4aab3ee3f 100644
--- a/keyboards/salicylic_acid3/setta21/rules.mk
+++ b/keyboards/salicylic_acid3/setta21/rules.mk
@@ -13,6 +13,5 @@ RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 OLED_ENABLE = no
 USE_I2C = no
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 
 DEFAULT_FOLDER = salicylic_acid3/setta21/rev1
diff --git a/keyboards/salicylic_acid3/setta21/setta21.c b/keyboards/salicylic_acid3/setta21/setta21.c
deleted file mode 100644
index 73c07682f7..0000000000
--- a/keyboards/salicylic_acid3/setta21/setta21.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "setta21.h"
diff --git a/keyboards/salicylic_acid3/setta21/setta21.h b/keyboards/salicylic_acid3/setta21/setta21.h
deleted file mode 100644
index 9e5b17e2c3..0000000000
--- a/keyboards/salicylic_acid3/setta21/setta21.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_setta21_rev1
-  #include "rev1.h"
-#endif
diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h
index 0a235bd36c..3792f94db7 100644
--- a/keyboards/sam/s80/config.h
+++ b/keyboards/sam/s80/config.h
@@ -16,30 +16,12 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 20
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 100 /* The maximum brightness level */
 //#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
+
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json
index ab0cde43a1..ff069c000e 100644
--- a/keyboards/sam/s80/info.json
+++ b/keyboards/sam/s80/info.json
@@ -8,9 +8,17 @@
         "pid": "0x3830",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/sam/s80/s80.c b/keyboards/sam/s80/s80.c
deleted file mode 100644
index 7b56bd854e..0000000000
--- a/keyboards/sam/s80/s80.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "s80.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h
index 7cfba55dc8..0d5714a68f 100644
--- a/keyboards/sam/sg81m/config.h
+++ b/keyboards/sam/sg81m/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B7, B6, B5, B4, C7, C6, D0, D1, D2, D3, D4, D5, D6, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6 //reserved pin for potential underglow rgb
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 10
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -49,4 +32,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index ebf5dda947..f4d6c5749b 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -8,9 +8,17 @@
         "pid": "0x3831",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4", "C7", "C6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/sam/sg81m/sg81m.c b/keyboards/sam/sg81m/sg81m.c
deleted file mode 100644
index 81f829c8be..0000000000
--- a/keyboards/sam/sg81m/sg81m.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "sg81m.h"
diff --git a/keyboards/sanctified/dystopia/config.h b/keyboards/sanctified/dystopia/config.h
deleted file mode 100644
index 1ab243f5ed..0000000000
--- a/keyboards/sanctified/dystopia/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Quentin Melis
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B2, B3, E6, D5, D3 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D6, D7, B4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sanctified/dystopia/dystopia.c b/keyboards/sanctified/dystopia/dystopia.c
deleted file mode 100644
index 64ad5abc82..0000000000
--- a/keyboards/sanctified/dystopia/dystopia.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Quentin Melis
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "dystopia.h"
diff --git a/keyboards/sanctified/dystopia/dystopia.h b/keyboards/sanctified/dystopia/dystopia.h
deleted file mode 100644
index 6f82093126..0000000000
--- a/keyboards/sanctified/dystopia/dystopia.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 Quentin Melis
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_split_bs( \
-    K00, K01, K11, K02, K03, K04, K05,        K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
-    K10, K21, K12, K13, K14, K15,        K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K3D, \
-    K20, K31, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B,      K2C,      K4D, \
-    K30,      K41, K32, K33, K34, K35,        K36, K37, K47, K38, K39, K3A, K3B, K3C,      \
-    K40,      K42,           K44, K45,        K46,           K48, K49,      K4A, K4B, K4C  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-    { K40, K41, K42, ___, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D } \
-}
diff --git a/keyboards/sanctified/dystopia/info.json b/keyboards/sanctified/dystopia/info.json
index 3c0814074e..1c6fa25e0c 100644
--- a/keyboards/sanctified/dystopia/info.json
+++ b/keyboards/sanctified/dystopia/info.json
@@ -8,16 +8,98 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "D4", "D6", "D7", "B4"],
+        "rows": ["B2", "B3", "E6", "D5", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.25, "y":0}, {"label":"*", "x":9.25, "y":0}, {"label":"(", "x":10.25, "y":0}, {"label":")", "x":11.25, "y":0}, {"label":"_", "x":12.25, "y":0}, {"label":"+", "x":13.25, "y":0}, {"label":"~", "x":14.25, "y":0}, {"label":"|", "x":15.25, "y":0}, {"label":"Insert", "x":16.5, "y":0}, 
-                {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":7.75, "y":1}, {"label":"U", "x":8.75, "y":1}, {"label":"I", "x":9.75, "y":1}, {"label":"O", "x":10.75, "y":1}, {"label":"P", "x":11.75, "y":1}, {"label":"{", "x":12.75, "y":1}, {"label":"}", "x":13.75, "y":1}, {"label":"Delete", "x":14.75, "y":1, "w":1.5}, {"label":"PgUp", "x":16.5, "y":1}, 
-                {"label":"Caps", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8, "y":2}, {"label":"J", "x":9, "y":2}, {"label":"K", "x":10, "y":2}, {"label":"L", "x":11, "y":2}, {"label":":", "x":12, "y":2}, {"label":"\"", "x":13, "y":2}, {"label":"Enter", "x":14, "y":2, "w":2.25}, {"label":"PgDn", "x":16.5, "y":2}, 
-                {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":8.5, "y":3}, {"label":"M", "x":9.5, "y":3}, {"label":"<", "x":10.5, "y":3}, {"label":">", "x":11.5, "y":3}, {"label":"?", "x":12.5, "y":3}, {"label":"Shift", "x":13.5, "y":3, "w":1.75}, {"label":"Up", "x":15.25, "y":3}, 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"label":"Space", "x":4, "y":4, "w":2.25}, {"label":"Fn", "x":6.25, "y":4}, {"label":"Backspace", "x":7.5, "y":4, "w":2.75}, {"label":"Alt", "x":10.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":12.75, "y":4, "w":1.5}, {"label":"Left", "x":14.25, "y":4}, {"label":"Down", "x":15.25, "y":4}, {"label":"Right", "x":16.25, "y":4}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+                {"matrix": [0, 7], "x": 9.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+
+                {"matrix": [2, 13], "x": 16.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [1, 10], "x": 11.75, "y": 1},
+                {"matrix": [1, 11], "x": 12.75, "y": 1},
+                {"matrix": [1, 12], "x": 13.75, "y": 1},
+                {"matrix": [1, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 16.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+                {"matrix": [2, 12], "x": 14, "y": 2, "w": 2.25},
+
+                {"matrix": [4, 13], "x": 16.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [4, 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.5, "y": 3},
+                {"matrix": [3, 7], "x": 8.5, "y": 3},
+                {"matrix": [4, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+                {"matrix": [4, 6], "x": 7.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 14.25, "y": 4},
+                {"matrix": [4, 11], "x": 15.25, "y": 4},
+                {"matrix": [4, 12], "x": 16.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h
index d12d01cb38..fdd0cd8c86 100644
--- a/keyboards/sandwich/keeb68/config.h
+++ b/keyboards/sandwich/keeb68/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B6, C6, F7, E6, B7, D0, D1, D2, D3, D4, D6, D7, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/sandwich/keeb68/info.json b/keyboards/sandwich/keeb68/info.json
index ed30bd810a..ec09badedf 100644
--- a/keyboards/sandwich/keeb68/info.json
+++ b/keyboards/sandwich/keeb68/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "F7", "E6", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "C7",
         "levels": 5,
@@ -19,78 +24,78 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"ESC", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [4, 6], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 13], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"DEL", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [4, 7], "x": 12.5, "y": 1},
+                {"matrix": [1, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 13], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PG UP", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PG DN", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/sandwich/keeb68/keeb68.c b/keyboards/sandwich/keeb68/keeb68.c
deleted file mode 100644
index c040d1a976..0000000000
--- a/keyboards/sandwich/keeb68/keeb68.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 sandwich
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "keeb68.h"
diff --git a/keyboards/sandwich/keeb68/keeb68.h b/keyboards/sandwich/keeb68/keeb68.h
deleted file mode 100644
index fd5510cc3f..0000000000
--- a/keyboards/sandwich/keeb68/keeb68.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 sandwich
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K46, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K47, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2D, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-    K40, K41, K42,                K45,           K48, K49, K4A, K4B, K4C, K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-    { K40, K41, K42, ___, ___, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D }  \
-}
diff --git a/keyboards/satt/comet46/comet46.c b/keyboards/satt/comet46/comet46.c
deleted file mode 100644
index 7c7edba93e..0000000000
--- a/keyboards/satt/comet46/comet46.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "comet46.h"
diff --git a/keyboards/satt/comet46/info.json b/keyboards/satt/comet46/info.json
index fd47ad9924..e8169348b6 100644
--- a/keyboards/satt/comet46/info.json
+++ b/keyboards/satt/comet46/info.json
@@ -17,10 +17,10 @@
                 {"label":"Q", "x":1, "y":0.45},
                 {"label":"W", "x":2, "y":0.15},
                 {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0.30},
+                {"label":"R", "x":4, "y":0.3},
                 {"label":"T", "x":5, "y":0.45},
                 {"label":"Y", "x":9, "y":0.45},
-                {"label":"U", "x":10, "y":0.30},
+                {"label":"U", "x":10, "y":0.3},
                 {"label":"I", "x":11, "y":0},
                 {"label":"O", "x":12, "y":0.15},
                 {"label":"P", "x":13, "y":0.45},
@@ -30,12 +30,12 @@
                 {"label":"A", "x":1, "y":1.45},
                 {"label":"S", "x":2, "y":1.15},
                 {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1.30},
+                {"label":"F", "x":4, "y":1.3},
                 {"label":"G", "x":5, "y":1.45},
                 {"label":"ESC", "x":6, "y":1},
                 {"label":"DEL", "x":8, "y":1},
                 {"label":"H", "x":9, "y":1.45},
-                {"label":"J", "x":10, "y":1.30},
+                {"label":"J", "x":10, "y":1.3},
                 {"label":"K", "x":11, "y":1},
                 {"label":"L", "x":12, "y":1.15},
                 {"label":"SCLN", "x":13, "y":1.45},
@@ -45,12 +45,12 @@
                 {"label":"Z", "x":1, "y":2.45},
                 {"label":"X", "x":2, "y":2.15},
                 {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2.30},
+                {"label":"V", "x":4, "y":2.3},
                 {"label":"B", "x":5, "y":2.45},
                 {"label":"LCBR", "x":6, "y":2},
                 {"label":"RCBR", "x":8, "y":2},
                 {"label":"N", "x":9, "y":2.45},
-                {"label":"M", "x":10, "y":2.30},
+                {"label":"M", "x":10, "y":2.3},
                 {"label":"COMM", "x":11, "y":2},
                 {"label":"DOT", "x":12, "y":2.15},
                 {"label":"SLSH", "x":13, "y":2.45},
diff --git a/keyboards/satt/vision/config.h b/keyboards/satt/vision/config.h
index 6617b6ef13..4b007cf387 100644
--- a/keyboards/satt/vision/config.h
+++ b/keyboards/satt/vision/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B1, B0, A7, A6, A5, A4, A3, B8, B7, B6, B5, B4, B3, A15 }
-#define MATRIX_ROW_PINS { B12, B2, A2, A1 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/satt/vision/info.json b/keyboards/satt/vision/info.json
index fcca710f19..15977a5892 100644
--- a/keyboards/satt/vision/info.json
+++ b/keyboards/satt/vision/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5649",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A6", "A5", "A4", "A3", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B12", "B2", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/satt/vision/vision.c b/keyboards/satt/vision/vision.c
deleted file mode 100644
index ef23c5b1d1..0000000000
--- a/keyboards/satt/vision/vision.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 SatT
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vision.h"
diff --git a/keyboards/sauce/mild/config.h b/keyboards/sauce/mild/config.h
index abe4886633..037c0b0a23 100644
--- a/keyboards/sauce/mild/config.h
+++ b/keyboards/sauce/mild/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C13, C14, C15, A15, F0, F1 }
-#define MATRIX_COL_PINS { A10, A9, A8, B11, B10, B2, B1, B0, A7, A5, A4, A3, A2, A1, B6, B5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/sauce/mild/info.json b/keyboards/sauce/mild/info.json
index 90b36d48f8..71179445ee 100644
--- a/keyboards/sauce/mild/info.json
+++ b/keyboards/sauce/mild/info.json
@@ -8,6 +8,11 @@
     "pid": "0x7783",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["A10", "A9", "A8", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "B6", "B5", "B4"],
+    "rows": ["C13", "C14", "C15", "A15", "F0", "F1"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "A6",
     "scroll_lock": "B14"
diff --git a/keyboards/sauce/mild/mild.c b/keyboards/sauce/mild/mild.c
deleted file mode 100644
index 963cbede9e..0000000000
--- a/keyboards/sauce/mild/mild.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Andy Yong (Sauce)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mild.h"
diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h
index 53a07a179c..1cca19e506 100644
--- a/keyboards/sawnsprojects/amber80/solder/config.h
+++ b/keyboards/sawnsprojects/amber80/solder/config.h
@@ -16,25 +16,7 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B2, B3, B7, D0, D1, F1, F0, D7, B4, D5, D3 }
-#define MATRIX_COL_PINS { F4, F6, F7, C7, C6, B6, B5, D6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB */
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 22
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -51,4 +33,3 @@
     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
     #define RGBLIGHT_EFFECT_RGB_TEST
     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json
index 1e9870fa90..f7892d0286 100644
--- a/keyboards/sawnsprojects/amber80/solder/info.json
+++ b/keyboards/sawnsprojects/amber80/solder/info.json
@@ -8,11 +8,19 @@
         "pid": "0xA801",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F6", "F7", "C7", "C6", "B6", "B5", "D6", "D4"],
+        "rows": ["B1", "B2", "B3", "B7", "D0", "D1", "F1", "F0", "D7", "B4", "D5", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F5",
         "scroll_lock": "B0",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/sawnsprojects/amber80/solder/solder.c b/keyboards/sawnsprojects/amber80/solder/solder.c
deleted file mode 100644
index b7dbe1e558..0000000000
--- a/keyboards/sawnsprojects/amber80/solder/solder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 SawnsProjects
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "solder.h"
diff --git a/keyboards/sawnsprojects/eclipse/eclipse60/info.json b/keyboards/sawnsprojects/eclipse/eclipse60/info.json
index 4793b44a41..b2a8de9593 100644
--- a/keyboards/sawnsprojects/eclipse/eclipse60/info.json
+++ b/keyboards/sawnsprojects/eclipse/eclipse60/info.json
@@ -28,7 +28,6 @@
         "key_lock": false
     },
     "rgblight": {
-        "pin": "B0",
         "led_count": 18,
         "hue_steps": 8,
         "saturation_steps": 8,
@@ -48,6 +47,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/sawnsprojects/eclipse/tinyneko/info.json b/keyboards/sawnsprojects/eclipse/tinyneko/info.json
index 40ad2b7f80..7e7fe5a43e 100644
--- a/keyboards/sawnsprojects/eclipse/tinyneko/info.json
+++ b/keyboards/sawnsprojects/eclipse/tinyneko/info.json
@@ -28,7 +28,6 @@
         "key_lock": false
     },
     "rgblight": {
-        "pin": "B0",
         "led_count": 18,
         "hue_steps": 8,
         "saturation_steps": 8,
@@ -48,6 +47,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h
index 76f4acfbf6..936a988139 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 20
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -42,4 +33,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json
index a54172480d..4c6e26dc54 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json
@@ -8,10 +8,18 @@
         "pid": "0x6B32",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3"],
+        "rows": ["B1", "B2", "D1", "D2", "D4", "D6", "F6", "F7", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F0",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/solder.c b/keyboards/sawnsprojects/krush/krush60/solder/solder.c
deleted file mode 100644
index 2fb9b24f8c..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/solder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "solder.h"
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
index 8a947093dc..602670158b 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
@@ -16,21 +16,12 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, B2, D4, F1, F0 }
-#define MATRIX_COL_PINS { B7, B3, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D0, D5, D6, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Encoders */
 
 #define ENCODERS_CW_KEY  { { 12, 3 } }
 #define ENCODERS_CCW_KEY { { 12, 4 } }
 
 /* RGB */
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 20
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -48,4 +39,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c b/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c
index 8a91dde19a..96fcc9a614 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c
@@ -30,7 +30,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -42,10 +43,11 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.c b/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.c
index 8fd9a2fa14..824e7364be 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.c
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.c
@@ -15,17 +15,3 @@
  */
 
 #include "hotswap.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
index 3872047ef8..481b503520 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5B31",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B3", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D0", "D5", "D6", "D3"],
+        "rows": ["B1", "B2", "D4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D1", "pin_b": "D2"}
@@ -17,6 +22,9 @@
         "caps_lock": "B0",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h
index 76f4acfbf6..146d07f1fe 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 20
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -41,5 +32,4 @@
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#endif
\ No newline at end of file
+#define RGBLIGHT_EFFECT_TWINKLE
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json
index 9666127299..0d9dc6d58c 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6B31",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3"],
+        "rows": ["B1", "B2", "D1", "D2", "D4", "D6", "F6", "F7", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "B3"}
@@ -17,6 +22,9 @@
         "caps_lock": "F0",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -26,231 +34,231 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker_split_bs_sp": {
             "layout": [
-                {"label":"K00 (B1,C7)", "x":0, "y":0},
-                {"label":"K10 (B2,C7)", "x":1, "y":0},
-                {"label":"K01 (B1,C6)", "x":2, "y":0},
-                {"label":"K11 (B2,C6)", "x":3, "y":0},
-                {"label":"K02 (B1,B6)", "x":4, "y":0},
-                {"label":"K12 (B2,B6)", "x":5, "y":0},
-                {"label":"K03 (B1,B5)", "x":6, "y":0},
-                {"label":"K13 (B2,B5)", "x":7, "y":0},
-                {"label":"K04 (B1,B4)", "x":8, "y":0},
-                {"label":"K14 (B2,B4)", "x":9, "y":0},
-                {"label":"K05 (B1,D7)", "x":10, "y":0},
-                {"label":"K15 (B2,D7)", "x":11, "y":0},
-                {"label":"K06 (B1,D5)", "x":12, "y":0},
-                {"label":"K26 (D1,D5)", "x":13, "y":0},
-                {"label":"K17 (B2,D3)", "x":14, "y":0},
-                {"label":"K07 (B1,D3)", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [2, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15, "y": 0},
 
-                {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
-                {"label":"K30 (D2,C7)", "x":1.5, "y":1},
-                {"label":"K21 (D1,C6)", "x":2.5, "y":1},
-                {"label":"K31 (D2,C6)", "x":3.5, "y":1},
-                {"label":"K22 (D1,B6)", "x":4.5, "y":1},
-                {"label":"K32 (D2,B6)", "x":5.5, "y":1},
-                {"label":"K23 (D1,B5)", "x":6.5, "y":1},
-                {"label":"K33 (D2,B5)", "x":7.5, "y":1},
-                {"label":"K24 (D1,B4)", "x":8.5, "y":1},
-                {"label":"K34 (D2,B4)", "x":9.5, "y":1},
-                {"label":"K25 (D1,D7)", "x":10.5, "y":1},
-                {"label":"K35 (D2,D7)", "x":11.5, "y":1},
-                {"label":"K36 (D2,D5)", "x":12.5, "y":1},
-                {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K37 (D2,D3)", "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
-                {"label":"K50 (D6,C7)", "x":1.75, "y":2},
-                {"label":"K41 (D4,C6)", "x":2.75, "y":2},
-                {"label":"K51 (D6,C6)", "x":3.75, "y":2},
-                {"label":"K42 (D4,B6)", "x":4.75, "y":2},
-                {"label":"K52 (D6,B6)", "x":5.75, "y":2},
-                {"label":"K43 (D4,B5)", "x":6.75, "y":2},
-                {"label":"K53 (D6,B5)", "x":7.75, "y":2},
-                {"label":"K44 (D4,B4)", "x":8.75, "y":2},
-                {"label":"K54 (D6,B4)", "x":9.75, "y":2},
-                {"label":"K45 (D4,D7)", "x":10.75, "y":2},
-                {"label":"K55 (D6,D7)", "x":11.75, "y":2},
-                {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K57 (D6,D3)", "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
-                {"label":"K70 (F7,C7)", "x":2.25, "y":3},
-                {"label":"K61 (F6,C6)", "x":3.25, "y":3},
-                {"label":"K71 (F7,C6)", "x":4.25, "y":3},
-                {"label":"K62 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K72 (F7,B6)", "x":6.25, "y":3},
-                {"label":"K63 (F6,B5)", "x":7.25, "y":3},
-                {"label":"K73 (F7,B5)", "x":8.25, "y":3},
-                {"label":"K64 (F6,B4)", "x":9.25, "y":3},
-                {"label":"K74 (F7,B4)", "x":10.25, "y":3},
-                {"label":"K65 (F6,D7)", "x":11.25, "y":3},
-                {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K77 (F7,D3)", "x":14, "y":3},
-                {"label":"K67 (F6,D3)", "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 1], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 3], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 7], "x": 15, "y": 3},
 
-                {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
-                {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K82 (F5,B6)", "x":3.75, "y":4, "w":2.25},
-                {"label":"K92 (F4,B6)", "x":6, "y":4, "w":1.25},
-                {"label":"K93 (F4,B5)", "x":7.25, "y":4, "w":2.75},
-                {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
-                {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K95 (F4,D7)", "x":13, "y":4},
-                {"label":"K97 (F4,D3)", "x":14, "y":4},
-                {"label":"K87 (F5,D3)", "x":15, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [9, 2], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 13, "y": 4},
+                {"matrix": [9, 7], "x": 14, "y": 4},
+                {"matrix": [8, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"K00 (B1,C7)", "x":0, "y":0},
-                {"label":"K10 (B2,C7)", "x":1, "y":0},
-                {"label":"K01 (B1,C6)", "x":2, "y":0},
-                {"label":"K11 (B2,C6)", "x":3, "y":0},
-                {"label":"K02 (B1,B6)", "x":4, "y":0},
-                {"label":"K12 (B2,B6)", "x":5, "y":0},
-                {"label":"K03 (B1,B5)", "x":6, "y":0},
-                {"label":"K13 (B2,B5)", "x":7, "y":0},
-                {"label":"K04 (B1,B4)", "x":8, "y":0},
-                {"label":"K14 (B2,B4)", "x":9, "y":0},
-                {"label":"K05 (B1,D7)", "x":10, "y":0},
-                {"label":"K15 (B2,D7)", "x":11, "y":0},
-                {"label":"K06 (B1,D5)", "x":12, "y":0},
-                {"label":"K26 (D1,D5)", "x":13, "y":0, "w":2},
-                {"label":"K07 (B1,D3)", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [2, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15, "y": 0},
 
-                {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
-                {"label":"K30 (D2,C7)", "x":1.5, "y":1},
-                {"label":"K21 (D1,C6)", "x":2.5, "y":1},
-                {"label":"K31 (D2,C6)", "x":3.5, "y":1},
-                {"label":"K22 (D1,B6)", "x":4.5, "y":1},
-                {"label":"K32 (D2,B6)", "x":5.5, "y":1},
-                {"label":"K23 (D1,B5)", "x":6.5, "y":1},
-                {"label":"K33 (D2,B5)", "x":7.5, "y":1},
-                {"label":"K24 (D1,B4)", "x":8.5, "y":1},
-                {"label":"K34 (D2,B4)", "x":9.5, "y":1},
-                {"label":"K25 (D1,D7)", "x":10.5, "y":1},
-                {"label":"K35 (D2,D7)", "x":11.5, "y":1},
-                {"label":"K36 (D2,D5)", "x":12.5, "y":1},
-                {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K37 (D2,D3)", "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
-                {"label":"K50 (D6,C7)", "x":1.75, "y":2},
-                {"label":"K41 (D4,C6)", "x":2.75, "y":2},
-                {"label":"K51 (D6,C6)", "x":3.75, "y":2},
-                {"label":"K42 (D4,B6)", "x":4.75, "y":2},
-                {"label":"K52 (D6,B6)", "x":5.75, "y":2},
-                {"label":"K43 (D4,B5)", "x":6.75, "y":2},
-                {"label":"K53 (D6,B5)", "x":7.75, "y":2},
-                {"label":"K44 (D4,B4)", "x":8.75, "y":2},
-                {"label":"K54 (D6,B4)", "x":9.75, "y":2},
-                {"label":"K45 (D4,D7)", "x":10.75, "y":2},
-                {"label":"K55 (D6,D7)", "x":11.75, "y":2},
-                {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K57 (D6,D3)", "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
-                {"label":"K70 (F7,C7)", "x":2.25, "y":3},
-                {"label":"K61 (F6,C6)", "x":3.25, "y":3},
-                {"label":"K71 (F7,C6)", "x":4.25, "y":3},
-                {"label":"K62 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K72 (F7,B6)", "x":6.25, "y":3},
-                {"label":"K63 (F6,B5)", "x":7.25, "y":3},
-                {"label":"K73 (F7,B5)", "x":8.25, "y":3},
-                {"label":"K64 (F6,B4)", "x":9.25, "y":3},
-                {"label":"K74 (F7,B4)", "x":10.25, "y":3},
-                {"label":"K65 (F6,D7)", "x":11.25, "y":3},
-                {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K77 (F7,D3)", "x":14, "y":3},
-                {"label":"K67 (F6,D3)", "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 1], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 3], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 7], "x": 15, "y": 3},
 
-                {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
-                {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K92 (F4,B6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
-                {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K95 (F4,D7)", "x":13, "y":4},
-                {"label":"K97 (F4,D3)", "x":14, "y":4},
-                {"label":"K87 (F5,D3)", "x":15, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 13, "y": 4},
+                {"matrix": [9, 7], "x": 14, "y": 4},
+                {"matrix": [8, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"K00 (B1,C7)", "x":0, "y":0},
-                {"label":"K10 (B2,C7)", "x":1, "y":0},
-                {"label":"K01 (B1,C6)", "x":2, "y":0},
-                {"label":"K11 (B2,C6)", "x":3, "y":0},
-                {"label":"K02 (B1,B6)", "x":4, "y":0},
-                {"label":"K12 (B2,B6)", "x":5, "y":0},
-                {"label":"K03 (B1,B5)", "x":6, "y":0},
-                {"label":"K13 (B2,B5)", "x":7, "y":0},
-                {"label":"K04 (B1,B4)", "x":8, "y":0},
-                {"label":"K14 (B2,B4)", "x":9, "y":0},
-                {"label":"K05 (B1,D7)", "x":10, "y":0},
-                {"label":"K15 (B2,D7)", "x":11, "y":0},
-                {"label":"K06 (B1,D5)", "x":12, "y":0},
-                {"label":"K26 (D1,D5)", "x":13, "y":0},
-                {"label":"K17 (B2,D3)", "x":14, "y":0},
-                {"label":"K07 (B1,D3)", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [2, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15, "y": 0},
 
-                {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
-                {"label":"K30 (D2,C7)", "x":1.5, "y":1},
-                {"label":"K21 (D1,C6)", "x":2.5, "y":1},
-                {"label":"K31 (D2,C6)", "x":3.5, "y":1},
-                {"label":"K22 (D1,B6)", "x":4.5, "y":1},
-                {"label":"K32 (D2,B6)", "x":5.5, "y":1},
-                {"label":"K23 (D1,B5)", "x":6.5, "y":1},
-                {"label":"K33 (D2,B5)", "x":7.5, "y":1},
-                {"label":"K24 (D1,B4)", "x":8.5, "y":1},
-                {"label":"K34 (D2,B4)", "x":9.5, "y":1},
-                {"label":"K25 (D1,D7)", "x":10.5, "y":1},
-                {"label":"K35 (D2,D7)", "x":11.5, "y":1},
-                {"label":"K36 (D2,D5)", "x":12.5, "y":1},
-                {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K37 (D2,D3)", "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
-                {"label":"K50 (D6,C7)", "x":1.75, "y":2},
-                {"label":"K41 (D4,C6)", "x":2.75, "y":2},
-                {"label":"K51 (D6,C6)", "x":3.75, "y":2},
-                {"label":"K42 (D4,B6)", "x":4.75, "y":2},
-                {"label":"K52 (D6,B6)", "x":5.75, "y":2},
-                {"label":"K43 (D4,B5)", "x":6.75, "y":2},
-                {"label":"K53 (D6,B5)", "x":7.75, "y":2},
-                {"label":"K44 (D4,B4)", "x":8.75, "y":2},
-                {"label":"K54 (D6,B4)", "x":9.75, "y":2},
-                {"label":"K45 (D4,D7)", "x":10.75, "y":2},
-                {"label":"K55 (D6,D7)", "x":11.75, "y":2},
-                {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K57 (D6,D3)", "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
-                {"label":"K70 (F7,C7)", "x":2.25, "y":3},
-                {"label":"K61 (F6,C6)", "x":3.25, "y":3},
-                {"label":"K71 (F7,C6)", "x":4.25, "y":3},
-                {"label":"K62 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K72 (F7,B6)", "x":6.25, "y":3},
-                {"label":"K63 (F6,B5)", "x":7.25, "y":3},
-                {"label":"K73 (F7,B5)", "x":8.25, "y":3},
-                {"label":"K64 (F6,B4)", "x":9.25, "y":3},
-                {"label":"K74 (F7,B4)", "x":10.25, "y":3},
-                {"label":"K65 (F6,D7)", "x":11.25, "y":3},
-                {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K77 (F7,D3)", "x":14, "y":3},
-                {"label":"K67 (F6,D3)", "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 1], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 3], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 7], "x": 15, "y": 3},
 
-                {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
-                {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K92 (F4,B6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
-                {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K95 (F4,D7)", "x":13, "y":4},
-                {"label":"K97 (F4,D3)", "x":14, "y":4},
-                {"label":"K87 (F5,D3)", "x":15, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 13, "y": 4},
+                {"matrix": [9, 7], "x": 14, "y": 4},
+                {"matrix": [8, 7], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/solder.c b/keyboards/sawnsprojects/krush/krush65/solder/solder.c
index 501d70d1bd..db6fec3950 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/solder.c
+++ b/keyboards/sawnsprojects/krush/krush65/solder/solder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "solder.h"
+#include "quantum.h"
 
    /*  Custom encoder control - handles CW/CCW turning of encoder
      *  Default behavior:
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/solder.h b/keyboards/sawnsprojects/krush/krush65/solder/solder.h
deleted file mode 100644
index 11140aac9c..0000000000
--- a/keyboards/sawnsprojects/krush/krush65/solder/solder.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�      ┌───────�
- * │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │26 │17 │07 │      │26     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      └─┬─────┤
- * │20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │36 │46   │37 │        │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤     ┌──┴�47  │ ISO Enter
- * │40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │47      │57 │     │46 │    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤     └───┴────┘
- * │60      │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75    │77 │67 │
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │80  │90  │81  │82      │92  │93        │94  │85  │ │95 │97 │87 │ Split Spacebar
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
- * ┌────┬────┬────┬────────────────────────┬────┬────�
- * │80  │90  │81  │92                      │94  │85  │ Standard
- * └────┴────┴────┴────────────────────────┴────┴────┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────�
- * │80   │90 │81   │92                         │85   │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K07, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
-    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
-    K80, K90, K81,                K92,           K94, K85,      K95, K97, K87  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
-    { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, XXX, XXX, XXX, K85, XXX, K87 }, \
-    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
-}
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
-    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
-    K80, K90, K81,                K92,           K94, K85,      K95, K97, K87  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
-    { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, XXX, XXX, XXX, K85, XXX, K87 }, \
-    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
-}
-#define LAYOUT_65_ansi_blocker_split_bs_sp( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
-    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
-    K80, K90, K81,           K82, K92, K93,      K94, K85,      K95, K97, K87  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
-    { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, K82, XXX, XXX, K85, XXX, K87 }, \
-    { K90, XXX, K92, K93, K94, K95, XXX, K97 }, \
-}
diff --git a/keyboards/sawnsprojects/plaque80/info.json b/keyboards/sawnsprojects/plaque80/info.json
index d45f9a3896..d4afc35bfc 100644
--- a/keyboards/sawnsprojects/plaque80/info.json
+++ b/keyboards/sawnsprojects/plaque80/info.json
@@ -25,7 +25,6 @@
         "rgblight": true
     },
     "rgblight": {
-        "pin": "F0",
         "led_count": 30,
         "sleep": true,
         "animations": {
@@ -41,6 +40,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "indicators": {
         "caps_lock": "E6",
         "scroll_lock": "D2"
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
index f0c527387d..d180a0b733 100644
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ b/keyboards/sawnsprojects/satxri6key/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F7, F6 }
-#define MATRIX_COL_PINS { F1, F4, F5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 6
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -50,7 +32,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 #define RGB_MATRIX_LED_COUNT 6
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json
index 50c304dda2..642f813a67 100644
--- a/keyboards/sawnsprojects/satxri6key/info.json
+++ b/keyboards/sawnsprojects/satxri6key/info.json
@@ -8,17 +8,26 @@
         "pid": "0x0727",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5"],
+        "rows": ["F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (F7,F1)", "x":0, "y":1},
-                {"label":"K01 (F7,F4)", "x":1, "y":1},
-                {"label":"K02 (F7,F5)", "x":2, "y":1},
-                {"label":"K10 (F6,F1)", "x":0, "y":2},
-                {"label":"K11 (F6,F4)", "x":1, "y":2},
-                {"label":"K12 (F6,F5)", "x":2, "y":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
             ]
         }
     }
diff --git a/keyboards/sawnsprojects/satxri6key/satxri6key.c b/keyboards/sawnsprojects/satxri6key/satxri6key.c
index a1b988de8d..c335e0d3ef 100644
--- a/keyboards/sawnsprojects/satxri6key/satxri6key.c
+++ b/keyboards/sawnsprojects/satxri6key/satxri6key.c
@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "satxri6key.h"
+#include "quantum.h"
+
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
   //Key Matrix to LED Indexccxxz
diff --git a/keyboards/sawnsprojects/satxri6key/satxri6key.h b/keyboards/sawnsprojects/satxri6key/satxri6key.h
deleted file mode 100644
index 2f5dca0e37..0000000000
--- a/keyboards/sawnsprojects/satxri6key/satxri6key.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT(\
-    K00, K01, K02,\
-    K10, K11, K12\
-     ) { \
-    { K00,   K01,   K02   },\
-    { K10,   K11,   K12   } \
-}
diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h
index bd4258f12a..c18b8e95f1 100644
--- a/keyboards/sawnsprojects/vcl65/solder/config.h
+++ b/keyboards/sawnsprojects/vcl65/solder/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F6, F7, F0, F4, B1 }
-#define MATRIX_COL_PINS { B2, B5, F5, C7, B4, C6, D7, D6, D4, D5, D3, D2, B6, D1, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 20
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -43,4 +34,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json
index 1b0c638ecc..d91101d107 100644
--- a/keyboards/sawnsprojects/vcl65/solder/info.json
+++ b/keyboards/sawnsprojects/vcl65/solder/info.json
@@ -8,10 +8,18 @@
         "pid": "0x1727",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B5", "F5", "C7", "B4", "C6", "D7", "D6", "D4", "D5", "D3", "D2", "B6", "D1", "D0"],
+        "rows": ["F6", "F7", "F0", "F4", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F1",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/sawnsprojects/vcl65/solder/solder.c b/keyboards/sawnsprojects/vcl65/solder/solder.c
deleted file mode 100644
index 2fb9b24f8c..0000000000
--- a/keyboards/sawnsprojects/vcl65/solder/solder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "solder.h"
\ No newline at end of file
diff --git a/keyboards/scatter42/config.h b/keyboards/scatter42/config.h
index 564a2451fd..2021cca3b0 100644
--- a/keyboards/scatter42/config.h
+++ b/keyboards/scatter42/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/scatter42/info.json b/keyboards/scatter42/info.json
index f928b4c24c..748093a516 100644
--- a/keyboards/scatter42/info.json
+++ b/keyboards/scatter42/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3B47",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/scatter42/scatter42.c b/keyboards/scatter42/scatter42.c
deleted file mode 100644
index 4126382df6..0000000000
--- a/keyboards/scatter42/scatter42.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 bbrfkr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "scatter42.h"
diff --git a/keyboards/sck/gtm/config.h b/keyboards/sck/gtm/config.h
index f4961f2242..c95d84b30d 100644
--- a/keyboards/sck/gtm/config.h
+++ b/keyboards/sck/gtm/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C4, C5, D1 }
-#define MATRIX_COL_PINS { B4, B5, B6, B7, C7, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -16,7 +8,6 @@
 
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/sck/gtm/gtm.c b/keyboards/sck/gtm/gtm.c
deleted file mode 100644
index 6adb9b39b6..0000000000
--- a/keyboards/sck/gtm/gtm.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "gtm.h"
diff --git a/keyboards/sck/gtm/gtm.h b/keyboards/sck/gtm/gtm.h
deleted file mode 100644
index 47625f417f..0000000000
--- a/keyboards/sck/gtm/gtm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, K04, \
-	K10, K11, K12, K13, K14, K25 \
-) { \
-	{ K00,    K01,    K02,    K03,    K04,    KC_NO }, \
-	{ K10,    K11,    K12,    K13,    K14,    KC_NO }, \
-    { KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K25 }, \
-}
diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json
index 3f254f2c77..422fb0c0f1 100644
--- a/keyboards/sck/gtm/info.json
+++ b/keyboards/sck/gtm/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6090",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B7", "C7", "D0"],
+        "rows": ["C4", "C5", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D3", "resolution": 1}
@@ -18,18 +26,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K15", "x":4, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
 
-                {"label":"K10", "x":0, "y":1},
-                {"label":"K11", "x":1, "y":1},
-                {"label":"K12", "x":2, "y":1},
-                {"label":"K13", "x":3, "y":1},
-                {"label":"K14", "x":4, "y":1},
-                {"label":"K16", "x":5.5, "y":0.5}
+                {"matrix": [2, 5], "x": 5.5, "y": 0.5}
             ]
         }
     }
diff --git a/keyboards/sck/m0116b/config.h b/keyboards/sck/m0116b/config.h
index f76b93ff68..a3c400ab47 100644
--- a/keyboards/sck/m0116b/config.h
+++ b/keyboards/sck/m0116b/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { D5, D3, D2, D0, B3, B2, B1, B0, E6, B5, B6, C6, C7, F7, D4, D6, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/sck/m0116b/info.json b/keyboards/sck/m0116b/info.json
index 8588e9d605..8a2c4d109a 100644
--- a/keyboards/sck/m0116b/info.json
+++ b/keyboards/sck/m0116b/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D5", "D3", "D2", "D0", "B3", "B2", "B1", "B0", "E6", "B5", "B6", "C6", "C7", "F7", "D4", "D6", "D7", "B4"],
+    "rows": ["D1", "F0", "F1", "F4", "F5", "F6"]
+  },
+  "diode_direction": "COL2ROW",
   "bootmagic": {
     "matrix": [0, 6]
   },
diff --git a/keyboards/sck/m0116b/m0116b.c b/keyboards/sck/m0116b/m0116b.c
deleted file mode 100644
index 368bc3eafd..0000000000
--- a/keyboards/sck/m0116b/m0116b.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "m0116b.h"
diff --git a/keyboards/sck/neiso/config.h b/keyboards/sck/neiso/config.h
index 21a4f0d60c..a3c400ab47 100644
--- a/keyboards/sck/neiso/config.h
+++ b/keyboards/sck/neiso/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { F4 }
-#define MATRIX_COL_PINS \
-    { B3, D2, F5, F7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/sck/neiso/info.json b/keyboards/sck/neiso/info.json
index 3140669af5..c7b75dbbc3 100644
--- a/keyboards/sck/neiso/info.json
+++ b/keyboards/sck/neiso/info.json
@@ -8,11 +8,22 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "D2", "F5", "F7", "B4"],
+        "rows": ["F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0.25, "y":0, "w":2, "h":1.25}, {"x":2.75, "y":0.25, "w":1.25, "h":2}, {"x":1.5, "y":1.5}, {"x":0, "y":1.75, "w":1.25, "h":2}, {"x":1.75, "y":2.75, "w":2, "h":1.25}]
+            "layout": [
+                {"matrix": [0, 1], "x": 0.25, "y": 0, "w": 2, "h": 1.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25, "w": 1.25, "h": 2},
+                {"matrix": [0, 0], "x": 1.5, "y": 1.5},
+                {"matrix": [0, 3], "x": 0, "y": 1.75, "w": 1.25, "h": 2},
+                {"matrix": [0, 4], "x": 1.75, "y": 2.75, "w": 2, "h": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/sck/neiso/neiso.c b/keyboards/sck/neiso/neiso.c
deleted file mode 100644
index 8fe008e28b..0000000000
--- a/keyboards/sck/neiso/neiso.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "neiso.h"
diff --git a/keyboards/sck/neiso/neiso.h b/keyboards/sck/neiso/neiso.h
deleted file mode 100644
index 7058fab5bf..0000000000
--- a/keyboards/sck/neiso/neiso.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-              k01,      k02, \
-                   k00,      \
-              k03,      k04  \
-) \
-    { {k00, k01, k02, k03, k04} }
diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h
index 801a7fdc16..f5bb154b9a 100644
--- a/keyboards/sck/osa/config.h
+++ b/keyboards/sck/osa/config.h
@@ -17,32 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { B4, D7, D5, D3, D2, D0, D1, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-   #define RGB_DI_PIN D4
-   #ifdef RGB_DI_PIN
    #define RGBLED_NUM 9
    #define RGBLIGHT_HUE_STEP 10
    #define RGBLIGHT_SAT_STEP 17
    #define RGBLIGHT_VAL_STEP 17
    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-   #endif
 
 /*
  * Feature disable options
diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json
index c919d3b6e8..ae63add062 100644
--- a/keyboards/sck/osa/info.json
+++ b/keyboards/sck/osa/info.json
@@ -8,26 +8,346 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D5", "D3", "D2", "D0", "D1", "B5"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C6",
         "num_lock": "C7",
         "scroll_lock": "B6"
     },
+    "ws2812": {
+        "pin": "D4"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs",
+        "LAYOUT_split_right_shift": "LAYOUT_alice"
+    },
     "layouts": {
-    "LAYOUT_default_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+        "LAYOUT_default_ansi": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 7], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 7], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         },
         "LAYOUT_split_backspace": {
-            "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 0], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 7], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         },
         "LAYOUT_alice": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 7], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         },
         "LAYOUT_alice_split_bs": {
-            "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 0], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/sck/osa/osa.c b/keyboards/sck/osa/osa.c
deleted file mode 100644
index 7f144035e5..0000000000
--- a/keyboards/sck/osa/osa.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "osa.h"
diff --git a/keyboards/sck/osa/osa.h b/keyboards/sck/osa/osa.h
deleted file mode 100644
index d6ac51c7be..0000000000
--- a/keyboards/sck/osa/osa.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* LAYOUT
- * ┌───� ┌───┬───┬───┬───┬───┬───┬───�         ┌───┬───┬───┬───┬───┬───┬───┬───�┌────────�
- * │10 │ │00 │01 │02 │03 │04 │05 │06 │         │56 │55 │54 │53 │52 │51 │50 │57 ││57      │
- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤└────────┘
- * │20 │ │11   │12 │13 │14 │15 │16 │         │66 │65 │64 │63 │62 │61 │60 │67   │
- * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴�        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │30 │ │21    │22 │23 │24 │25 │26 │         │76 │75 │74 │73 │72 │71 │77      │
- * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─�     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤┌──────────�
- *       │31      │32 │33 │34 │35 │36 │     │86 │85 │84 │83 │82 │81 │80    │87 ││87        │
- *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─�   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤└──────────┘
- *       │41   │     │43   │45     │46  │   │95        │93   │           │90   │
- *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
- */
-#define LAYOUT_default_ansi( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51,      K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81,      K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { KC_NO, K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-#define LAYOUT_split_backspace( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51, K50, K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81,      K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-#define LAYOUT_alice( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51,      K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81, K80, K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { KC_NO, K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-#define LAYOUT_alice_split_bs( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51, K50, K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81, K80, K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-
-#define LAYOUT_split_right_shift LAYOUT_alice
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/sendyyeah/75pixels/75pixels.c b/keyboards/sendyyeah/75pixels/75pixels.c
deleted file mode 100644
index 62ec8df82c..0000000000
--- a/keyboards/sendyyeah/75pixels/75pixels.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 sendyyeah
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include "75pixels.h"
diff --git a/keyboards/sendyyeah/75pixels/75pixels.h b/keyboards/sendyyeah/75pixels/75pixels.h
deleted file mode 100644
index 9ac0f763d9..0000000000
--- a/keyboards/sendyyeah/75pixels/75pixels.h
+++ /dev/null
@@ -1,38 +0,0 @@
- /* Copyright 2021 sendyyeah
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x15(\
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K87 \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, KC_NO }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, K56, KC_NO }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { K70, K71, K72, K73, K74, K75, K76, KC_NO }, \
-    { K80, K81, K82, K83, K84, K85, K86, K87 }, \
-    { K90, K91, K92, K93, K94, K95, K96, KC_NO } \
-}
diff --git a/keyboards/sendyyeah/75pixels/config.h b/keyboards/sendyyeah/75pixels/config.h
deleted file mode 100644
index 5f5bc38b34..0000000000
--- a/keyboards/sendyyeah/75pixels/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* Copyright 2021 sendyyeah
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B6, F4, F5, F6, F7, B1, B3, B2, B4, B5 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sendyyeah/75pixels/info.json b/keyboards/sendyyeah/75pixels/info.json
index 81ced955d6..9ccc1a8dfb 100644
--- a/keyboards/sendyyeah/75pixels/info.json
+++ b/keyboards/sendyyeah/75pixels/info.json
@@ -8,87 +8,96 @@
         "pid": "0x3735",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"],
+        "rows": ["B6", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_5x15"],
     "layouts": {
         "LAYOUT_ortho_5x15": {
             "layout": [
-                {"label": "Esc", "x": 0, "y": 0},
-                {"label": "1", "x": 1, "y": 0},
-                {"label": "2", "x": 2, "y": 0},
-                {"label": "3", "x": 3, "y": 0},
-                {"label": "4", "x": 4, "y": 0},
-                {"label": "5", "x": 5, "y": 0},
-                {"label": "6", "x": 6, "y": 0},
-                {"label": "7", "x": 7, "y": 0},
-                {"label": "8", "x": 8, "y": 0},
-                {"label": "9", "x": 9, "y": 0},
-                {"label": "0", "x": 10, "y": 0},
-                {"label": "Bkspc", "x": 11, "y": 0},
-                {"label": "NumLock", "x": 12, "y": 0},
-                {"label": "/", "x": 13, "y": 0},
-                {"label": "*", "x": 14, "y": 0},
-                {"label": "Tab", "x": 0, "y": 1},
-                {"label": "Q", "x": 1, "y": 1},
-                {"label": "W", "x": 2, "y": 1},
-                {"label": "E", "x": 3, "y": 1},
-                {"label": "R", "x": 4, "y": 1},
-                {"label": "T", "x": 5, "y": 1},
-                {"label": "Y", "x": 6, "y": 1},
-                {"label": "U", "x": 7, "y": 1},
-                {"label": "I", "x": 8, "y": 1},
-                {"label": "O", "x": 9, "y": 1},
-                {"label": "P", "x": 10, "y": 1},
-                {"label": "|", "x": 11, "y": 1},
-                {"label": "7", "x": 12, "y": 1},
-                {"label": "8", "x": 13, "y": 1},
-                {"label": "9", "x": 14, "y": 1},
-                {"label": "Caps", "x": 0, "y": 2},
-                {"label": "A", "x": 1, "y": 2},
-                {"label": "S", "x": 2, "y": 2},
-                {"label": "D", "x": 3, "y": 2},
-                {"label": "F", "x": 4, "y": 2},
-                {"label": "G", "x": 5, "y": 2},
-                {"label": "H", "x": 6, "y": 2},
-                {"label": "J", "x": 7, "y": 2},
-                {"label": "K", "x": 8, "y": 2},
-                {"label": "L", "x": 9, "y": 2},
-                {"label": ":", "x": 10, "y": 2},
-                {"label": "Enter", "x": 11, "y": 2},
-                {"label": "4", "x": 12, "y": 2},
-                {"label": "5", "x": 13, "y": 2},
-                {"label": "6", "x": 14, "y": 2},
-                {"label": "Shift", "x": 0, "y": 3},
-                {"label": "Z", "x": 1, "y": 3},
-                {"label": "X", "x": 2, "y": 3},
-                {"label": "C", "x": 3, "y": 3},
-                {"label": "V", "x": 4, "y": 3},
-                {"label": "B", "x": 5, "y": 3},
-                {"label": "N", "x": 6, "y": 3},
-                {"label": "M", "x": 7, "y": 3},
-                {"label": "<", "x": 8, "y": 3},
-                {"label": ">", "x": 9, "y": 3},
-                {"label": "?", "x": 10, "y": 3},
-                {"label": "Shift", "x": 11, "y": 3},
-                {"label": "1", "x": 12, "y": 3},
-                {"label": "2", "x": 13, "y": 3},
-                {"label": "3", "x": 14, "y": 3},
-                {"label": "Ctrl", "x": 0, "y": 4},
-                {"label": "Win", "x": 1, "y": 4},
-                {"label": "Alt", "x": 2, "y": 4},
-                {"label": "Fn", "x": 3, "y": 4},
-                {"label": "Lower", "x": 4, "y": 4},
-                {"label": "Space", "x": 5, "y": 4},
-                {"label": "Space", "x": 6, "y": 4},
-                {"label": "Raise", "x": 7, "y": 4},
-                {"label": "Alt", "x": 8, "y": 4},
-                {"label": "Win", "x": 9, "y": 4},
-                {"label": "Menu", "x": 10, "y": 4},
-                {"label": "Ctrl", "x": 11, "y": 4},
-                {"label": "0", "x": 12, "y": 4},
-                {"label": ".", "x": 13, "y": 4},
-                {"label": "Enter", "x": 14, "y": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1},
+                {"matrix": [2, 7], "x": 14, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [4, 5], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+                {"matrix": [5, 6], "x": 13, "y": 2},
+                {"matrix": [4, 7], "x": 14, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+                {"matrix": [6, 2], "x": 4, "y": 3},
+                {"matrix": [7, 2], "x": 5, "y": 3},
+                {"matrix": [6, 3], "x": 6, "y": 3},
+                {"matrix": [7, 3], "x": 7, "y": 3},
+                {"matrix": [6, 4], "x": 8, "y": 3},
+                {"matrix": [7, 4], "x": 9, "y": 3},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3},
+                {"matrix": [7, 6], "x": 13, "y": 3},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+                {"matrix": [8, 1], "x": 2, "y": 4},
+                {"matrix": [9, 1], "x": 3, "y": 4},
+                {"matrix": [8, 2], "x": 4, "y": 4},
+                {"matrix": [9, 2], "x": 5, "y": 4},
+                {"matrix": [8, 3], "x": 6, "y": 4},
+                {"matrix": [9, 3], "x": 7, "y": 4},
+                {"matrix": [8, 4], "x": 8, "y": 4},
+                {"matrix": [9, 4], "x": 9, "y": 4},
+                {"matrix": [8, 5], "x": 10, "y": 4},
+                {"matrix": [9, 5], "x": 11, "y": 4},
+                {"matrix": [8, 6], "x": 12, "y": 4},
+                {"matrix": [9, 6], "x": 13, "y": 4},
+                {"matrix": [8, 7], "x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/sendyyeah/bevi/bevi.c b/keyboards/sendyyeah/bevi/bevi.c
deleted file mode 100644
index c5bf0fbe17..0000000000
--- a/keyboards/sendyyeah/bevi/bevi.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 sendyyeah
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include "bevi.h"
diff --git a/keyboards/sendyyeah/bevi/config.h b/keyboards/sendyyeah/bevi/config.h
deleted file mode 100644
index 7ef151b3bd..0000000000
--- a/keyboards/sendyyeah/bevi/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* Copyright 2021 sendyyeah
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B3, B2, D3, D2, D1, D0, D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sendyyeah/bevi/info.json b/keyboards/sendyyeah/bevi/info.json
index 355fe1f850..b4a62656a2 100644
--- a/keyboards/sendyyeah/bevi/info.json
+++ b/keyboards/sendyyeah/bevi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4256",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B6", "B4", "B5"],
+        "rows": ["B3", "B2", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h
index 5bbc6a38f9..2030d914d6 100644
--- a/keyboards/sendyyeah/pix/config.h
+++ b/keyboards/sendyyeah/pix/config.h
@@ -27,8 +27,6 @@
 
 #define USB_MAX_POWER_CONSUMPTION 500
 
-#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 15
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
@@ -47,4 +45,3 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYER_BLINK
-#endif
diff --git a/keyboards/sendyyeah/pix/info.json b/keyboards/sendyyeah/pix/info.json
index 178d763b0d..fda8bc8309 100644
--- a/keyboards/sendyyeah/pix/info.json
+++ b/keyboards/sendyyeah/pix/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4E34",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B3"}
diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h
index a5da1ed51e..44f0121915 100644
--- a/keyboards/senselessclay/ck60/config.h
+++ b/keyboards/senselessclay/ck60/config.h
@@ -17,16 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B3, B2, F1, F4, F5 }
-#define MATRIX_COL_PINS { F0, D5, D3, D2, D1, D0, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB matrix lighting */ 
-#define RGB_DI_PIN B1
 #define RGB_MATRIX_LED_COUNT 62
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json
index d089aa333c..841c8fb429 100644
--- a/keyboards/senselessclay/ck60/info.json
+++ b/keyboards/senselessclay/ck60/info.json
@@ -8,6 +8,17 @@
         "pid": "0x0601",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B3", "B2", "F1", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/senselessclay/ck60/rules.mk b/keyboards/senselessclay/ck60/rules.mk
index 5dadd1cf0e..c33aa21c4b 100644
--- a/keyboards/senselessclay/ck60/rules.mk
+++ b/keyboards/senselessclay/ck60/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes     # RGB matrix lighting
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/senselessclay/ck65/ck65.c b/keyboards/senselessclay/ck65/ck65.c
deleted file mode 100644
index 77128d9bf8..0000000000
--- a/keyboards/senselessclay/ck65/ck65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Hadi Iskandarani
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ck65.h"
\ No newline at end of file
diff --git a/keyboards/senselessclay/ck65/ck65.h b/keyboards/senselessclay/ck65/ck65.h
deleted file mode 100644
index cd33e428ba..0000000000
--- a/keyboards/senselessclay/ck65/ck65.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Hadi Iskandarani
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_65_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h
index 5aeeee7a74..b3f2707dde 100644
--- a/keyboards/senselessclay/ck65/config.h
+++ b/keyboards/senselessclay/ck65/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/* rev0 */
-#define MATRIX_ROW_PINS { B3, B2, F1, F4, F5 }
-#define MATRIX_COL_PINS { F0, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -58,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 /* RGB Backlighting */
-#define RGB_DI_PIN B1
 #define RGBLED_NUM 69
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/info.json
index cb596c21e2..8ed8af77e5 100644
--- a/keyboards/senselessclay/ck65/info.json
+++ b/keyboards/senselessclay/ck65/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0651",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B3", "B2", "F1", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -17,79 +25,79 @@
     "layouts": {
         "LAYOUT_65_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"End", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'@", "x":11.75, "y":2},
-                {"label":"#~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"GUI", "x":11, "y":4},
-                {"label":"Fn", "x":12, "y":4},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h
index 22dadfed74..d395b76ecc 100644
--- a/keyboards/senselessclay/gos65/config.h
+++ b/keyboards/senselessclay/gos65/config.h
@@ -17,30 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/* rev0 */
-/*
-#define MATRIX_ROW_PINS { B1, B2, F6, F5, F4 }
-#define MATRIX_COL_PINS { F1, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-*/
-/* rev1 */
-#define MATRIX_ROW_PINS { B1, B2, F1, F6, F5 }
-#define MATRIX_COL_PINS { F4, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -63,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 /* RGB Backlighting */
-#define RGB_DI_PIN B0
 #define RGBLED_NUM 68
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json
index b1007fe065..d35d088a8b 100644
--- a/keyboards/senselessclay/gos65/info.json
+++ b/keyboards/senselessclay/gos65/info.json
@@ -8,6 +8,14 @@
       "pid": "0x0650",
       "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "B0"
+    },
+    "matrix_pins": {
+      "cols": ["F4", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+      "rows": ["B1", "B2", "F1", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/senselessclay/had60/config.h b/keyboards/senselessclay/had60/config.h
index 01d85c0517..bdeea958dc 100644
--- a/keyboards/senselessclay/had60/config.h
+++ b/keyboards/senselessclay/had60/config.h
@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-/* rev0 */ 
-//#define MATRIX_ROW_PINS { F0, D0, D4, F5, F4 }
-//#define MATRIX_COL_PINS { F1, D5, D3, D2, D1, F6, F7, C7, C6, B6, B5, B4, D7, D6 }
-/* rev1 */ 
-#define MATRIX_ROW_PINS { F1, F0, F7, F6, F5 }
-#define MATRIX_COL_PINS { F4, D5, D3, D2, D1, D0, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/senselessclay/had60/had60.c b/keyboards/senselessclay/had60/had60.c
deleted file mode 100644
index b90b89193e..0000000000
--- a/keyboards/senselessclay/had60/had60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Hadi Iskandarani
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "had60.h"
diff --git a/keyboards/senselessclay/had60/info.json b/keyboards/senselessclay/had60/info.json
index a5a46d0cd5..f76a1355ee 100644
--- a/keyboards/senselessclay/had60/info.json
+++ b/keyboards/senselessclay/had60/info.json
@@ -8,6 +8,11 @@
       "pid": "0x060F",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["F4", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+      "rows": ["F1", "F0", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h
index 0d96be0baf..e6ad038b12 100644
--- a/keyboards/sentraq/number_pad/config.h
+++ b/keyboards/sentraq/number_pad/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F5, F0, B5, D6, D4 }
-#define MATRIX_COL_PINS { C7, D5, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 13
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json
index 5b7af3fb0f..61b085d86f 100644
--- a/keyboards/sentraq/number_pad/info.json
+++ b/keyboards/sentraq/number_pad/info.json
@@ -7,6 +7,14 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B0"
+  },
+  "matrix_pins": {
+    "cols": ["C7", "D5", "D1", "D0"],
+    "rows": ["F5", "F0", "B5", "D6", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
@@ -16,20 +24,55 @@
   "layouts": {
     "LAYOUT_numpad_5x4": {
       "layout": [
-        {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0},
-        {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1},
-        {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":1, "h":2},
-        {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3},
-        {"x":0, "y":4, "w":2}, {"x":2, "y":4}, {"x":3, "y":3, "h":2}
+        {"matrix": [0, 0], "x": 0, "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": [2, 3], "x": 3, "y": 1, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
       ]
     },
     "LAYOUT_ortho_5x4": {
       "layout": [
-        {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0},
-        {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1},
-        {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2},
-        {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3},
-        {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4}
       ]
     }
   }
diff --git a/keyboards/sentraq/number_pad/number_pad.c b/keyboards/sentraq/number_pad/number_pad.c
deleted file mode 100644
index f323648714..0000000000
--- a/keyboards/sentraq/number_pad/number_pad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 QMK Community
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "number_pad.h"
diff --git a/keyboards/sentraq/number_pad/number_pad.h b/keyboards/sentraq/number_pad/number_pad.h
deleted file mode 100644
index 05bcd527cd..0000000000
--- a/keyboards/sentraq/number_pad/number_pad.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2019 QMK Community
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_numpad_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, \
-    K40,      K42, K43 \
-) \
-{ \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, KC_NO }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, KC_NO }, \
-    { K40, KC_NO, K42, K43 } \
-}
-
-#define LAYOUT_ortho_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43  \
-) \
-{ \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, K33 }, \
-    { K40, K41, K42, K43 }  \
-}
diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h
index 01ce1f2e65..1fa22a6e9d 100644
--- a/keyboards/sentraq/s60_x/default/config.h
+++ b/keyboards/sentraq/s60_x/default/config.h
@@ -1,19 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F1 }
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
diff --git a/keyboards/sentraq/s60_x/default/default.c b/keyboards/sentraq/s60_x/default/default.c
deleted file mode 100644
index 2a5bcfdd6d..0000000000
--- a/keyboards/sentraq/s60_x/default/default.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "default.h"
diff --git a/keyboards/sentraq/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/info.json
index ae5728a679..78e8827c00 100644
--- a/keyboards/sentraq/s60_x/default/info.json
+++ b/keyboards/sentraq/s60_x/default/info.json
@@ -1,5 +1,10 @@
 {
     "keyboard_name": "S60-X",
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E6", "F1"],
+        "rows": ["B7", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h
index 2332b484e1..da4d3257a6 100644
--- a/keyboards/sentraq/s60_x/rgb/config.h
+++ b/keyboards/sentraq/s60_x/rgb/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json
index 6420a8069a..9d224d2c85 100644
--- a/keyboards/sentraq/s60_x/rgb/info.json
+++ b/keyboards/sentraq/s60_x/rgb/info.json
@@ -1,9 +1,17 @@
 {
     "keyboard_name": "S60-X-RGB",
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"],
+        "rows": ["B5", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing":  true
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/sentraq/s60_x/rgb/rgb.c b/keyboards/sentraq/s60_x/rgb/rgb.c
deleted file mode 100644
index 0117e14ae5..0000000000
--- a/keyboards/sentraq/s60_x/rgb/rgb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rgb.h"
diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h
index 3b8323074f..900ea0aa40 100644
--- a/keyboards/sentraq/s65_plus/config.h
+++ b/keyboards/sentraq/s65_plus/config.h
@@ -1,11 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 }
-
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -22,9 +16,6 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json
index 3d9f6d1f21..7873b364ce 100644
--- a/keyboards/sentraq/s65_plus/info.json
+++ b/keyboards/sentraq/s65_plus/info.json
@@ -8,9 +8,17 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "indicators": {
     "caps_lock": "B7",
     "on_state": 0
diff --git a/keyboards/sentraq/s65_plus/s65_plus.c b/keyboards/sentraq/s65_plus/s65_plus.c
deleted file mode 100644
index 7b20ee0696..0000000000
--- a/keyboards/sentraq/s65_plus/s65_plus.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "s65_plus.h"
diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h
index e8d1cb933d..7b388614f4 100644
--- a/keyboards/sentraq/s65_x/config.h
+++ b/keyboards/sentraq/s65_x/config.h
@@ -1,11 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS { F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 }
-
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -23,9 +17,6 @@
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
 #define RGBLIGHT_SLEEP
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json
index a37852080c..d87a6873ca 100644
--- a/keyboards/sentraq/s65_x/info.json
+++ b/keyboards/sentraq/s65_x/info.json
@@ -8,158 +8,174 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "levels": 5,
     "as_caps_lock": true
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["65_ansi", "65_iso"],
   "layouts": {
     "LAYOUT_65_ansi": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"1", "x":1, "y":0},
-        {"label":"2", "x":2, "y":0},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0},
-        {"label":"5", "x":5, "y":0},
-        {"label":"6", "x":6, "y":0},
-        {"label":"7", "x":7, "y":0},
-        {"label":"8", "x":8, "y":0},
-        {"label":"9", "x":9, "y":0},
-        {"label":"0", "x":10, "y":0},
-        {"label":"-", "x":11, "y":0},
-        {"label":"=", "x":12, "y":0},
-        {"label":"Backspace", "x":13, "y":0, "w":2},
-        {"label":"Delete", "x":15, "y":0},
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-        {"label":"Y", "x":6.5, "y":1},
-        {"label":"U", "x":7.5, "y":1},
-        {"label":"I", "x":8.5, "y":1},
-        {"label":"O", "x":9.5, "y":1},
-        {"label":"P", "x":10.5, "y":1},
-        {"label":"[", "x":11.5, "y":1},
-        {"label":"]", "x":12.5, "y":1},
-        {"label":"\\", "x":13.5, "y":1, "w":1.5},
-        {"label":"Page Up", "x":15, "y":1},
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-        {"label":"H", "x":6.75, "y":2},
-        {"label":"J", "x":7.75, "y":2},
-        {"label":"K", "x":8.75, "y":2},
-        {"label":"L", "x":9.75, "y":2},
-        {"label":";", "x":10.75, "y":2},
-        {"label":"'", "x":11.75, "y":2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-        {"label":"Page Down", "x":15, "y":2},
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
-        {"label":"N", "x":7.25, "y":3},
-        {"label":"M", "x":8.25, "y":3},
-        {"label":",", "x":9.25, "y":3},
-        {"label":".", "x":10.25, "y":3},
-        {"label":"/", "x":11.25, "y":3},
-        {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-        {"label":"Up", "x":14, "y":3},
-        {"label":"End", "x":15, "y":3},
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"label":"Space", "x":3.75, "y":4, "w":6.25},
-        {"label":"Alt", "x":10, "y":4},
-        {"label":"Fn", "x":11, "y":4},
-        {"label":"Ctrl", "x":12, "y":4},
-        {"label":"Left", "x":13, "y":4},
-        {"label":"Down", "x":14, "y":4},
-        {"label":"Right", "x":15, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4},
+        {"matrix": [4, 12], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_65_iso": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"1", "x":1, "y":0},
-        {"label":"2", "x":2, "y":0},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0},
-        {"label":"5", "x":5, "y":0},
-        {"label":"6", "x":6, "y":0},
-        {"label":"7", "x":7, "y":0},
-        {"label":"8", "x":8, "y":0},
-        {"label":"9", "x":9, "y":0},
-        {"label":"0", "x":10, "y":0},
-        {"label":"-", "x":11, "y":0},
-        {"label":"=", "x":12, "y":0},
-        {"label":"Backspace", "x":13, "y":0, "w":2},
-        {"label":"Delete", "x":15, "y":0},
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-        {"label":"Y", "x":6.5, "y":1},
-        {"label":"U", "x":7.5, "y":1},
-        {"label":"I", "x":8.5, "y":1},
-        {"label":"O", "x":9.5, "y":1},
-        {"label":"P", "x":10.5, "y":1},
-        {"label":"[", "x":11.5, "y":1},
-        {"label":"]", "x":12.5, "y":1},
-        {"label":"Page Up", "x":15, "y":1},
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-        {"label":"H", "x":6.75, "y":2},
-        {"label":"J", "x":7.75, "y":2},
-        {"label":"K", "x":8.75, "y":2},
-        {"label":"L", "x":9.75, "y":2},
-        {"label":";", "x":10.75, "y":2},
-        {"label":"'", "x":11.75, "y":2},
-        {"label":"#", "x":12.75, "y":2},
-        {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-        {"label":"Page Down", "x":15, "y":2},
-        {"label":"Shift", "x":0, "y":3, "w":1.25},
-        {"label":"ISO \\", "x":1.25, "y":3},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
-        {"label":"N", "x":7.25, "y":3},
-        {"label":"M", "x":8.25, "y":3},
-        {"label":",", "x":9.25, "y":3},
-        {"label":".", "x":10.25, "y":3},
-        {"label":"/", "x":11.25, "y":3},
-        {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-        {"label":"Up", "x":14, "y":3},
-        {"label":"End", "x":15, "y":3},
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"Win", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"label":"Space", "x":3.75, "y":4, "w":6.25},
-        {"label":"AltGr", "x":10, "y":4},
-        {"label":"Fn", "x":11, "y":4},
-        {"label":"Ctrl", "x":12, "y":4},
-        {"label":"Left", "x":13, "y":4},
-        {"label":"Down", "x":14, "y":4},
-        {"label":"Right", "x":15, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2},
+        {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4},
+        {"matrix": [4, 12], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     }
   }
diff --git a/keyboards/sentraq/s65_x/s65_x.c b/keyboards/sentraq/s65_x/s65_x.c
deleted file mode 100644
index 09ce310b07..0000000000
--- a/keyboards/sentraq/s65_x/s65_x.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "s65_x.h"
diff --git a/keyboards/sentraq/s65_x/s65_x.h b/keyboards/sentraq/s65_x/s65_x.h
deleted file mode 100644
index aef9205754..0000000000
--- a/keyboards/sentraq/s65_x/s65_x.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-/* LAYOUT_65_ansi
- * ANSI has more standard width shift, delete, and enter keys, doesn't use all of the 1U keys
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│014    │015│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │100  │102│103│104│105│106│107│108│109│110│111│112│113│114  │115│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │200   │202│203│204│205│206│207│208│209│210│211│212│214     │215│
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │301     │302│303│304│305│306│307│308│309│310│311│313   │314│315│
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- * │400 │401 │402 │408                     │410│411│412│413│414│415│
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_65_ansi( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
-  K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-  K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
-  K301,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-  K400, K401, K402,                   K408,                   K410, K411, K412, K413, K414, K415  \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014, K015 }, \
-  { K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114, K115 }, \
-  { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214, K215 }, \
-  { KC_NO, K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314, K315 }, \
-  { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K408,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  K414, K415 }  \
-}
-
-
-/* LAYOUT_65_iso
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│014    │015│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │100  │102│103│104│105│106│107│108│109│110│111│112│113│     │115│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�114 ├───┤
- * │200   │202│203│204│205│206│207│208│209│210│211│212│213│    │215│
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │300 │301│302│303│304│305│306│307│308│309│310│311│313   │314│315│
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- * │400 │401 │402 │408                     │410│411│412│413│414│415│
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_65_iso( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
-  K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-  K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K114, K215, \
-  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, K315, \
-  K400, K401, K402,                   K408,                   K410, K411, K412, K413, K414, K415  \
-) { \
-  { K000, K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014,  K015 }, \
-  { K100, KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-  { K200, KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-  { K300, K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
-  { K400, K401,  K402,  KC_NO, KC_NO, KC_NO, K408,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  K414,  K415 }  \
-}
-
-
-void matrix_init_user(void);
-void matrix_scan_user(void);
diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h
index bd71fdfc2f..46245213c9 100644
--- a/keyboards/sets3n/kk980/config.h
+++ b/keyboards/sets3n/kk980/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B2, B3, D3, D4, D5, D6 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, B1, B0, D0, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -52,8 +33,6 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 102
 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,\
 	12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, \
@@ -69,7 +48,6 @@
 #define RGBLIGHT_LIMIT_VAL 230
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#endif
 
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/sets3n/kk980/info.json b/keyboards/sets3n/kk980/info.json
index d4132bf736..b71dff3ec8 100644
--- a/keyboards/sets3n/kk980/info.json
+++ b/keyboards/sets3n/kk980/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B1", "B0", "D0", "D1"],
+        "rows": ["B2", "B3", "D3", "D4", "D5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/sets3n/kk980/kk980.c b/keyboards/sets3n/kk980/kk980.c
deleted file mode 100644
index d5254b3fc0..0000000000
--- a/keyboards/sets3n/kk980/kk980.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Sets3n
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "kk980.h"
diff --git a/keyboards/shambles/config.h b/keyboards/shambles/config.h
index 95acbd4600..5f36081323 100644
--- a/keyboards/shambles/config.h
+++ b/keyboards/shambles/config.h
@@ -1,35 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, B3, B1, F7 }
-#define MATRIX_COL_PINS { D3, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, F4, F6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-
-
-#ifdef RGB_DI_PIN
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_SNAKE
-#    define RGBLIGHT_EFFECT_KNIGHT
-#    define RGBLIGHT_EFFECT_CHRISTMAS
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_RGB_TEST
-#    define RGBLIGHT_EFFECT_ALTERNATING
-#    define RGBLIGHT_EFFECT_TWINKLE
-#    define RGBLED_NUM 0
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/shambles/info.json b/keyboards/shambles/info.json
index a82614f0ae..b57cdd3a00 100644
--- a/keyboards/shambles/info.json
+++ b/keyboards/shambles/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0F42",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D3", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "F4", "F6"],
+    "rows": ["F5", "B3", "B1", "F7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/shambles/shambles.c b/keyboards/shambles/shambles.c
deleted file mode 100644
index b0ef6b8f99..0000000000
--- a/keyboards/shambles/shambles.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "shambles.h"
diff --git a/keyboards/shapeshifter4060/config.h b/keyboards/shapeshifter4060/config.h
index 981222dbe8..514076daf8 100644
--- a/keyboards/shapeshifter4060/config.h
+++ b/keyboards/shapeshifter4060/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D0, D1, B1, B3, B2, B6, B5, B4, E6, D7, C6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/shapeshifter4060/info.json b/keyboards/shapeshifter4060/info.json
index 7a23820e24..13c77a9618 100644
--- a/keyboards/shapeshifter4060/info.json
+++ b/keyboards/shapeshifter4060/info.json
@@ -8,6 +8,11 @@
         "pid": "0xA1F1",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/shapeshifter4060/shapeshifter4060.c b/keyboards/shapeshifter4060/shapeshifter4060.c
deleted file mode 100644
index abe6d65e76..0000000000
--- a/keyboards/shapeshifter4060/shapeshifter4060.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Chuck "@vosechu" Lauer Vose <vosechu@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "shapeshifter4060.h"
diff --git a/keyboards/shiro/config.h b/keyboards/shiro/config.h
index 8e2a8a7974..e962d78666 100644
--- a/keyboards/shiro/config.h
+++ b/keyboards/shiro/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/shiro/info.json b/keyboards/shiro/info.json
index a28a2fd905..a67261dfd2 100644
--- a/keyboards/shiro/info.json
+++ b/keyboards/shiro/info.json
@@ -8,26 +8,35 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6"],
+    "rows": ["D4", "C6", "D7", "E6", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x": 0, "y": 0},
-        {"x": 1, "y": 0},
-        {"x": 2, "y": 0},
-        {"x": 0, "y": 1},
-        {"x": 1, "y": 1},
-        {"x": 2, "y": 1},
-        {"x": 0, "y": 2},
-        {"x": 1, "y": 2},
-        {"x": 2, "y": 2},
-        {"x": 0, "y": 3},
-        {"x": 1, "y": 3},
-        {"x": 2, "y": 3},
-        {"x": 0, "y": 4},
-        {"x": 1, "y": 4},
-        {"x": 2, "y": 4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4}
       ]
     }
   }
diff --git a/keyboards/shiro/shiro.c b/keyboards/shiro/shiro.c
deleted file mode 100644
index 3f92c54a0b..0000000000
--- a/keyboards/shiro/shiro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 T.Shinohara
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "shiro.h"
diff --git a/keyboards/shiro/shiro.h b/keyboards/shiro/shiro.h
deleted file mode 100644
index 9e088ba555..0000000000
--- a/keyboards/shiro/shiro.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 T.Shinohara
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22, \
-    k30, k31, k32, \
-    k40, k41, k42 \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 }, \
-    { k30, k31, k32 }, \
-    { k40, k41, k42 } \
-}
diff --git a/keyboards/shk9/config.h b/keyboards/shk9/config.h
index 5079642e46..deabfc9973 100644
--- a/keyboards/shk9/config.h
+++ b/keyboards/shk9/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, B1, B2 }
-#define MATRIX_COL_PINS { B3, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/shk9/info.json b/keyboards/shk9/info.json
index 444736778b..5974ce3703 100644
--- a/keyboards/shk9/info.json
+++ b/keyboards/shk9/info.json
@@ -8,20 +8,27 @@
       "pid": "0x4B39",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["B3", "B4", "B5"],
+      "rows": ["B0", "B1", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_3x3": {
           "layout": [
-            {"label":"7", "x":0, "y":0},
-            {"label":"8", "x":1, "y":0},
-            {"label":"9", "x":2, "y":0},
-            {"label":"4", "x":0, "y":1},
-            {"label":"5", "x":1, "y":1},
-            {"label":"6", "x":2, "y":1},
-            {"label":"1", "x":0, "y":2},
-            {"label":"2", "x":1, "y":2},
-            {"label":"3", "x":2, "y":2}
+            {"matrix": [0, 0], "x": 0, "y": 0},
+            {"matrix": [0, 1], "x": 1, "y": 0},
+            {"matrix": [0, 2], "x": 2, "y": 0},
+
+            {"matrix": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1, "y": 2},
+            {"matrix": [2, 2], "x": 2, "y": 2}
           ]
         }
     }
diff --git a/keyboards/shk9/shk9.c b/keyboards/shk9/shk9.c
deleted file mode 100644
index 7608dcd424..0000000000
--- a/keyboards/shk9/shk9.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Sam Hudson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "shk9.h"
diff --git a/keyboards/shk9/shk9.h b/keyboards/shk9/shk9.h
deleted file mode 100644
index d2c63a49c1..0000000000
--- a/keyboards/shk9/shk9.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 Sam Hudson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_3x3( \
-    K00, K01, K02,  \
-    K10, K11, K12,  \
-    K20, K21, K22   \
-) { \
-    { K00, K01, K02 }, \
-    { K10, K11, K12 }, \
-    { K20, K21, K22 }  \
-}
diff --git a/keyboards/shoc/config.h b/keyboards/shoc/config.h
index 8190ac773a..beb5d63a40 100644
--- a/keyboards/shoc/config.h
+++ b/keyboards/shoc/config.h
@@ -18,10 +18,3 @@
 
 #define OLED_DISPLAY_128X64
 #define OLED_TIMEOUT 300000
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B6, B2 }
-#define MATRIX_COL_PINS { D3, D2, D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/shoc/info.json b/keyboards/shoc/info.json
index d398e67956..8a4196375c 100644
--- a/keyboards/shoc/info.json
+++ b/keyboards/shoc/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/shoc/shoc.c b/keyboards/shoc/shoc.c
deleted file mode 100644
index eabb767d28..0000000000
--- a/keyboards/shoc/shoc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 JannikB5825
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "shoc.h"
diff --git a/keyboards/sidderskb/majbritt/rev1/config.h b/keyboards/sidderskb/majbritt/rev1/config.h
deleted file mode 100644
index 9a8b654abf..0000000000
--- a/keyboards/sidderskb/majbritt/rev1/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2020 MechMerlin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-
-#define DIODE_DIRECTION COL2ROW
-
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sidderskb/majbritt/rev1/info.json b/keyboards/sidderskb/majbritt/rev1/info.json
index 890bb5a5cb..aad1ca1a1e 100644
--- a/keyboards/sidderskb/majbritt/rev1/info.json
+++ b/keyboards/sidderskb/majbritt/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/sidderskb/majbritt/rev1/rev1.c b/keyboards/sidderskb/majbritt/rev1/rev1.c
deleted file mode 100644
index 79b2c9e601..0000000000
--- a/keyboards/sidderskb/majbritt/rev1/rev1.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
-
-
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sidderskb/majbritt/rev2/config.h b/keyboards/sidderskb/majbritt/rev2/config.h
index c0c6902e3b..ced239c833 100644
--- a/keyboards/sidderskb/majbritt/rev2/config.h
+++ b/keyboards/sidderskb/majbritt/rev2/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-                        //0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10, 11, 12, 13, 14 ,15
-#define MATRIX_ROW_PINS { B0, B1, F7, C6, B5}
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, C7, B6, D6, B4, D4, D7, D5 ,D3, D2, D1, D0}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/sidderskb/majbritt/rev2/info.json b/keyboards/sidderskb/majbritt/rev2/info.json
index 2ba227e4a8..574f882247 100644
--- a/keyboards/sidderskb/majbritt/rev2/info.json
+++ b/keyboards/sidderskb/majbritt/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "C7", "B6", "D6", "B4", "D4", "D7", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B0", "B1", "F7", "C6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B7"}
diff --git a/keyboards/sidderskb/majbritt/rev2/rev2.c b/keyboards/sidderskb/majbritt/rev2/rev2.c
deleted file mode 100644
index f9120ab2a1..0000000000
--- a/keyboards/sidderskb/majbritt/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Sleepdealer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
diff --git a/keyboards/signum/3_0/3_0.c b/keyboards/signum/3_0/3_0.c
deleted file mode 100644
index 2775713bf6..0000000000
--- a/keyboards/signum/3_0/3_0.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Stan Gurenkov <rococo04_fox@icloud.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "3_0.h"
diff --git a/keyboards/signum/3_0/3_0.h b/keyboards/signum/3_0/3_0.h
deleted file mode 100644
index c857afd7c5..0000000000
--- a/keyboards/signum/3_0/3_0.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Stan Gurenkov <rococo04_fox@icloud.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-# define LAYOUT_ortho_4x12( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }  \
-}
-// clang-format on
diff --git a/keyboards/signum/3_0/config.h b/keyboards/signum/3_0/config.h
deleted file mode 100644
index b554c93b85..0000000000
--- a/keyboards/signum/3_0/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Stan Gurenkov <rococo04_fox@icloud.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/signum/3_0/elitec/config.h b/keyboards/signum/3_0/elitec/config.h
deleted file mode 100644
index 7373bfab66..0000000000
--- a/keyboards/signum/3_0/elitec/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D2, D1, F5, B5 }
-#define MATRIX_COL_PINS { B4, D7, D0, E6, D4, F6, F4, F7, B1, B3, C6, B2 }
diff --git a/keyboards/signum/3_0/elitec/info.json b/keyboards/signum/3_0/elitec/info.json
new file mode 100644
index 0000000000..84336ac59f
--- /dev/null
+++ b/keyboards/signum/3_0/elitec/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D0", "E6", "D4", "F6", "F4", "F7", "B1", "B3", "C6", "B2"],
+        "rows": ["D2", "D1", "F5", "B5"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/signum/3_0/info.json b/keyboards/signum/3_0/info.json
index 9b134ed610..c8bab9d5c3 100644
--- a/keyboards/signum/3_0/info.json
+++ b/keyboards/signum/3_0/info.json
@@ -17,59 +17,61 @@
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5, "r": 15},
+                {"matrix": [0, 1], "x": 1, "y": 0.5, "r": 15},
+                {"matrix": [0, 2], "x": 2, "y": 0.25, "r": 15},
+                {"matrix": [0, 3], "x": 3, "y": 0, "r": 15},
+                {"matrix": [0, 4], "x": 4, "y": 0.25, "r": 15},
+                {"matrix": [0, 5], "x": 5, "y": 0.5, "r": 15},
 
-                { "x": 0, "y": 0.5, "r": 15 },
-                { "x": 1, "y": 0.5, "r": 15 },
-                { "x": 2, "y": 0.25, "r": 15 },
-                { "x": 3, "y": 0, "r": 15 },
-                { "x": 4, "y": 0.25, "r": 15 },
-                { "x": 5, "y": 0.5, "r": 15 },
-                { "x": 9, "y": 0.5, "r": -15 },
-                { "x": 10, "y": 0.25, "r": -15 },
-                { "x": 11, "y": 0, "r": -15 },
-                { "x": 12, "y": 0.25, "r": -15 },
-                { "x": 13, "y": 0.5, "r": -15 },
-                { "x": 14, "y": 0.5, "r": -15 },
+                {"matrix": [0, 6], "x": 9, "y": 0.5, "r": -15},
+                {"matrix": [0, 7], "x": 10, "y": 0.25, "r": -15},
+                {"matrix": [0, 8], "x": 11, "y": 0, "r": -15},
+                {"matrix": [0, 9], "x": 12, "y": 0.25, "r": -15},
+                {"matrix": [0, 10], "x": 13, "y": 0.5, "r": -15},
+                {"matrix": [0, 11], "x": 14, "y": 0.5, "r": -15},
 
-                { "x": 0, "y": 1.5, "r": 15 },
-                { "x": 1, "y": 1.5, "r": 15 },
-                { "x": 2, "y": 1.25, "r": 15 },
-                { "x": 3, "y": 1, "r": 15 },
-                { "x": 4, "y": 1.25, "r": 15 },
-                { "x": 5, "y": 1.5, "r": 15 },
-                { "x": 9, "y": 1.5, "r": -15 },
-                { "x": 10, "y": 1.25, "r": -15 },
-                { "x": 11, "y": 1, "r": -15 },
-                { "x": 12, "y": 1.25, "r": -15 },
-                { "x": 13, "y": 1.5, "r": -15 },
-                { "x": 14, "y": 1.5, "r": -15 },
+                {"matrix": [1, 0], "x": 0, "y": 1.5, "r": 15},
+                {"matrix": [1, 1], "x": 1, "y": 1.5, "r": 15},
+                {"matrix": [1, 2], "x": 2, "y": 1.25, "r": 15},
+                {"matrix": [1, 3], "x": 3, "y": 1, "r": 15},
+                {"matrix": [1, 4], "x": 4, "y": 1.25, "r": 15},
+                {"matrix": [1, 5], "x": 5, "y": 1.5, "r": 15},
 
-                { "x": 0, "y": 2.5, "r": 15 },
-                { "x": 1, "y": 2.5, "r": 15 },
-                { "x": 2, "y": 2.25, "r": 15 },
-                { "x": 3, "y": 2, "r": 15 },
-                { "x": 4, "y": 2.25, "r": 15 },
-                { "x": 5, "y": 2.5, "r": 15 },
-                { "x": 9, "y": 2.5, "r": -15 },
-                { "x": 10, "y": 2.25, "r": -15 },
-                { "x": 11, "y": 2, "r": -15 },
-                { "x": 12, "y": 2.25, "r": -15 },
-                { "x": 13, "y": 2.5, "r": -15 },
-                { "x": 14, "y": 2.5, "r": -15 },
+                {"matrix": [1, 6], "x": 9, "y": 1.5, "r": -15},
+                {"matrix": [1, 7], "x": 10, "y": 1.25, "r": -15},
+                {"matrix": [1, 8], "x": 11, "y": 1, "r": -15},
+                {"matrix": [1, 9], "x": 12, "y": 1.25, "r": -15},
+                {"matrix": [1, 10], "x": 13, "y": 1.5, "r": -15},
+                {"matrix": [1, 11], "x": 14, "y": 1.5, "r": -15},
 
-                { "x": 0, "y": 4, "r": 15 },
-                { "x": 1, "y": 3.5, "r": 15 },
-                { "x": 2, "y": 3.25, "r": 15 },
-                { "x": 4, "y": 4.25, "r": 15, "h": 1.5 },
-                { "x": 5, "y": 4, "r": 15, "h": 2 },
-                { "x": 6, "y": 4.25, "r": 15, "h": 1.5 },
-                { "x": 8, "y": 4.25, "r": -15, "h": 1.5 },
-                { "x": 9, "y": 4, "r": -15, "h": 2 },
-                { "x": 10, "y": 4.25, "r": -15, "h": 1.5 },
-                { "x": 12, "y": 3.25, "r": -15 },
-                { "x": 13, "y": 3.5, "r": -15 },
-                { "x": 14, "y": 4, "r": -15 }
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "r": 15},
+                {"matrix": [2, 1], "x": 1, "y": 2.5, "r": 15},
+                {"matrix": [2, 2], "x": 2, "y": 2.25, "r": 15},
+                {"matrix": [2, 3], "x": 3, "y": 2, "r": 15},
+                {"matrix": [2, 4], "x": 4, "y": 2.25, "r": 15},
+                {"matrix": [2, 5], "x": 5, "y": 2.5, "r": 15},
 
+                {"matrix": [2, 6], "x": 9, "y": 2.5, "r": -15},
+                {"matrix": [2, 7], "x": 10, "y": 2.25, "r": -15},
+                {"matrix": [2, 8], "x": 11, "y": 2, "r": -15},
+                {"matrix": [2, 9], "x": 12, "y": 2.25, "r": -15},
+                {"matrix": [2, 10], "x": 13, "y": 2.5, "r": -15},
+                {"matrix": [2, 11], "x": 14, "y": 2.5, "r": -15},
+
+                {"matrix": [3, 0], "x": 0, "y": 4, "r": 15},
+                {"matrix": [3, 1], "x": 1, "y": 3.5, "r": 15},
+                {"matrix": [3, 2], "x": 2, "y": 3.25, "r": 15},
+                {"matrix": [3, 3], "x": 4, "y": 4.25, "h": 1.5, "r": 15},
+                {"matrix": [3, 4], "x": 5, "y": 4, "h": 2, "r": 15},
+                {"matrix": [3, 5], "x": 6, "y": 4.25, "h": 1.5, "r": 15},
+
+                {"matrix": [3, 6], "x": 8, "y": 4.25, "h": 1.5, "r": -15},
+                {"matrix": [3, 7], "x": 9, "y": 4, "h": 2, "r": -15},
+                {"matrix": [3, 8], "x": 10, "y": 4.25, "h": 1.5, "r": -15},
+                {"matrix": [3, 9], "x": 12, "y": 3.25, "r": -15},
+                {"matrix": [3, 10], "x": 13, "y": 3.5, "r": -15},
+                {"matrix": [3, 11], "x": 14, "y": 4, "r": -15}
             ]
         }
     }
diff --git a/keyboards/signum/3_0/keymaps/sgurenkov/config.h b/keyboards/signum/3_0/keymaps/sgurenkov/config.h
index 7d164aa3a9..17f6d09479 100644
--- a/keyboards/signum/3_0/keymaps/sgurenkov/config.h
+++ b/keyboards/signum/3_0/keymaps/sgurenkov/config.h
@@ -23,9 +23,6 @@
 // default but used in macros
 #define TAPPING_TERM 300
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Auto Shift and Retro Shift (Auto Shift for Tap Hold).
 #define AUTO_SHIFT_TIMEOUT TAPPING_TERM
 
diff --git a/keyboards/signum/3_0/teensy/config.h b/keyboards/signum/3_0/teensy/config.h
deleted file mode 100644
index 2a81c0f565..0000000000
--- a/keyboards/signum/3_0/teensy/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Stan Gurenkov <rococo04_fox@icloud.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-/* key matrix pins */
-// clang-format off
-#define MATRIX_ROW_PINS { B0, B3, F6, C7 }
-#define MATRIX_COL_PINS { C6, D2, B7, D3, D0, F7, F5, B6, B5, B4, D1, D7 }
-// clang-format on
diff --git a/keyboards/signum/3_0/teensy/info.json b/keyboards/signum/3_0/teensy/info.json
new file mode 100644
index 0000000000..7eae115323
--- /dev/null
+++ b/keyboards/signum/3_0/teensy/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["C6", "D2", "B7", "D3", "D0", "F7", "F5", "B6", "B5", "B4", "D1", "D7"],
+        "rows": ["B0", "B3", "F6", "C7"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h
index 378fe0b2a6..2b6e5807a6 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/config.h
@@ -17,27 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define MASTER_RIGHT
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   //#define RGBLIGHT_SPLIT
   #define RGBLED_SPLIT {26, 26}
   #define RGBLED_NUM 52
@@ -83,7 +64,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*== customize knight effect ==*/
     #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 6
   #endif
-#endif
 
 /* Audio */
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
index 18d9889666..de86324dd9 100644
--- a/keyboards/silverbullet44/info.json
+++ b/keyboards/silverbullet44/info.json
@@ -8,6 +8,17 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk
index fa56d060bf..ed06e173de 100644
--- a/keyboards/silverbullet44/rules.mk
+++ b/keyboards/silverbullet44/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = yes          # Audio output
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
diff --git a/keyboards/singa/config.h b/keyboards/singa/config.h
index 3e9694ca36..75b78de22d 100644
--- a/keyboards/singa/config.h
+++ b/keyboards/singa/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 18
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/singa/info.json b/keyboards/singa/info.json
index 3784c7232a..6b3148b6ef 100644
--- a/keyboards/singa/info.json
+++ b/keyboards/singa/info.json
@@ -8,9 +8,17 @@
       "pid": "0x7575",
       "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "D4"
     },
+    "ws2812": {
+      "driver": "i2c"
+    },
     "indicators": {
       "caps_lock": "D1"
     },
@@ -18,7 +26,7 @@
     "bootloader": "bootloadhid",
     "layouts": {
       "LAYOUT": {
-        "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1}, {"label":"KE4", "x":14, "y":1}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3}, {"label":"KD2", "x":13.75, "y":3, "w":1.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":1.25}, {"label":"K01", "x":1.25, "y":4}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K00", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5, "w":1}, {"label":"K56", "x":4.75, "y":5, "w":1.25}, {"label":"K20", "x":6, "y":5, "w":1.75}, {"label":"K56", "x":7.75, "y":5, "w":1.25}, {"label":"K56", "x":9, "y":5, "w":1}, {"label":"K57", "x":10, "y":5}, {"label":"K57", "x":11, "y":5}, {"label":"K57", "x":12, "y":5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}]
+        "layout": [{"label":"K05", "x":0, "y":0}, {"label":"K25", "x":1, "y":0}, {"label":"K35", "x":2, "y":0}, {"label":"K45", "x":3, "y":0}, {"label":"K55", "x":4, "y":0}, {"label":"K06", "x":5, "y":0}, {"label":"KA6", "x":6, "y":0}, {"label":"KA7", "x":7, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"KB5", "x":9, "y":0}, {"label":"KC5", "x":10, "y":0}, {"label":"KD5", "x":11, "y":0}, {"label":"KE5", "x":12, "y":0}, {"label":"KD1", "x":13, "y":0}, {"label":"KE1", "x":14, "y":0}, {"label":"KE2", "x":15, "y":0}, {"label":"K04", "x":0, "y":1}, {"label":"K14", "x":1, "y":1}, {"label":"K24", "x":2, "y":1}, {"label":"K34", "x":3, "y":1}, {"label":"K44", "x":4, "y":1}, {"label":"K54", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"KB6", "x":7, "y":1}, {"label":"KB7", "x":8, "y":1}, {"label":"K17", "x":9, "y":1}, {"label":"KA4", "x":10, "y":1}, {"label":"KB4", "x":11, "y":1}, {"label":"KC4", "x":12, "y":1}, {"label":"KE4", "x":13, "y":1}, {"label":"KE4", "x":14, "y":1}, {"label":"KD0", "x":15, "y":1}, {"label":"K03", "x":0, "y":2, "w":1.5}, {"label":"K13", "x":1.5, "y":2}, {"label":"K23", "x":2.5, "y":2}, {"label":"K33", "x":3.5, "y":2}, {"label":"K43", "x":4.5, "y":2}, {"label":"K53", "x":5.5, "y":2}, {"label":"K26", "x":6.5, "y":2}, {"label":"KC6", "x":7.5, "y":2}, {"label":"KC7", "x":8.5, "y":2}, {"label":"K27", "x":9.5, "y":2}, {"label":"KA3", "x":10.5, "y":2}, {"label":"KB3", "x":11.5, "y":2}, {"label":"KC3", "x":12.5, "y":2}, {"label":"KD3", "x":13.5, "y":2, "w":1.5}, {"label":"K67", "x":15, "y":2}, {"label":"K02", "x":0, "y":3, "w":1.75}, {"label":"K12", "x":1.75, "y":3}, {"label":"K22", "x":2.75, "y":3}, {"label":"K32", "x":3.75, "y":3}, {"label":"K42", "x":4.75, "y":3}, {"label":"K52", "x":5.75, "y":3}, {"label":"K36", "x":6.75, "y":3}, {"label":"KD6", "x":7.75, "y":3}, {"label":"KD7", "x":8.75, "y":3}, {"label":"K37", "x":9.75, "y":3}, {"label":"KA2", "x":10.75, "y":3}, {"label":"KB2", "x":11.75, "y":3}, {"label":"KD2", "x":12.75, "y":3}, {"label":"KD2", "x":13.75, "y":3, "w":1.25}, {"label":"KE0", "x":15, "y":3}, {"label":"K01", "x":0, "y":4, "w":1.25}, {"label":"K01", "x":1.25, "y":4}, {"label":"K11", "x":2.25, "y":4}, {"label":"K21", "x":3.25, "y":4}, {"label":"K31", "x":4.25, "y":4}, {"label":"K41", "x":5.25, "y":4}, {"label":"K51", "x":6.25, "y":4}, {"label":"K46", "x":7.25, "y":4}, {"label":"KE6", "x":8.25, "y":4}, {"label":"KE7", "x":9.25, "y":4}, {"label":"K47", "x":10.25, "y":4}, {"label":"KA1", "x":11.25, "y":4}, {"label":"KB1", "x":12.25, "y":4, "w":1.75}, {"label":"K86", "x":14, "y":4}, {"label":"K77", "x":15, "y":4}, {"label":"K00", "x":0, "y":5, "w":1.25}, {"label":"K00", "x":1.25, "y":5, "w":1.25}, {"label":"K20", "x":2.5, "y":5, "w":1.25}, {"label":"K56", "x":3.75, "y":5}, {"label":"K56", "x":4.75, "y":5, "w":1.25}, {"label":"K20", "x":6, "y":5, "w":1.75}, {"label":"K56", "x":7.75, "y":5, "w":1.25}, {"label":"K56", "x":9, "y":5}, {"label":"K57", "x":10, "y":5}, {"label":"K57", "x":11, "y":5}, {"label":"K57", "x":12, "y":5}, {"label":"K66", "x":13, "y":5}, {"label":"K76", "x":14, "y":5}, {"label":"K96", "x":15, "y":5}]
       },
 
       "LAYOUT_wkl": {
diff --git a/keyboards/singa/keymaps/amnesia0287/rules.mk b/keyboards/singa/keymaps/amnesia0287/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/singa/keymaps/amnesia0287/rules.mk
+++ /dev/null
diff --git a/keyboards/singa/rules.mk b/keyboards/singa/rules.mk
index 03a618b76d..166b3d3ec8 100644
--- a/keyboards/singa/rules.mk
+++ b/keyboards/singa/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/singa/singa.c b/keyboards/singa/singa.c
deleted file mode 100644
index 8605d6f471..0000000000
--- a/keyboards/singa/singa.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 amnesia0287
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "singa.h"
diff --git a/keyboards/sirius/unigo66/unigo66.c b/keyboards/sirius/unigo66/unigo66.c
deleted file mode 100644
index 6a2d2632bd..0000000000
--- a/keyboards/sirius/unigo66/unigo66.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "unigo66.h"
diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/info.json
index 26c3a2894a..2aefe3e8b9 100644
--- a/keyboards/sixkeyboard/info.json
+++ b/keyboards/sixkeyboard/info.json
@@ -13,7 +13,15 @@
   "community_layouts": ["ortho_2x3"],
   "layouts": {
     "LAYOUT_ortho_2x3": {
-      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1}
+      ]
     }
   }
 }
diff --git a/keyboards/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c
index 17d51a8885..ddbd41ac55 100644
--- a/keyboards/sixkeyboard/matrix.c
+++ b/keyboards/sixkeyboard/matrix.c
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
-#include "sixkeyboard.h"
+#include "timer.h"
 #include <string.h>
 
 /* matrix state(1:on, 0:off) */
diff --git a/keyboards/sixkeyboard/sixkeyboard.c b/keyboards/sixkeyboard/sixkeyboard.c
index 85190f6167..7667ee7f44 100644
--- a/keyboards/sixkeyboard/sixkeyboard.c
+++ b/keyboards/sixkeyboard/sixkeyboard.c
@@ -1,4 +1,4 @@
-#include "sixkeyboard.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
diff --git a/keyboards/sixkeyboard/sixkeyboard.h b/keyboards/sixkeyboard/sixkeyboard.h
deleted file mode 100644
index 3f563af6d1..0000000000
--- a/keyboards/sixkeyboard/sixkeyboard.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-/*
- * ┌───┬───┬───�
- * │ A │ B │ C │
- * ├───┼───┼───┤
- * │ D │ E │ F │
- * └───┴───┴───┘
- */
-#define LAYOUT_ortho_2x3( \
-    k00, k01, k02, \
-    k10, k11, k12 \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 } \
-}
diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h
index 5307bcd65a..21dc04a727 100644
--- a/keyboards/skeletn87/hotswap/config.h
+++ b/keyboards/skeletn87/hotswap/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -43,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/skeletn87/hotswap/hotswap.c b/keyboards/skeletn87/hotswap/hotswap.c
deleted file mode 100644
index 8b26d5cd84..0000000000
--- a/keyboards/skeletn87/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hotswap.h"
diff --git a/keyboards/skeletn87/hotswap/hotswap.h b/keyboards/skeletn87/hotswap/hotswap.h
deleted file mode 100644
index c014d05db0..0000000000
--- a/keyboards/skeletn87/hotswap/hotswap.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_tkl_ansi( \
-    k000,       k001, k011, k002, k012, k003, k013, k004, k014, k005, k015, k006, k016,    k007, k017, k008, \
-    k020, k030, k021, k031, k022, k032, k023, k033, k024, k034, k025, k035, k026, k036,    k027, k037, k028, \
-    k040, k050, k041, k051, k042, k052, k043, k053, k044, k054, k045, k055, k046, k056,    k047, k057, k048, \
-    k060, k070, k061, k071, k062, k072, k063, k073, k064, k074, k065, k075,    k066,                         \
-       k080,    k090, k081, k091, k082, k092, k083, k093, k084, k094, k085,    k086,             k097,       \
-    k100, k110, k101,                   k112,                   k114, k105, k115, k106,    k107, k117, k108  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008 }, \
-    { ____, k011, k012, k013, k014, k015, k016, k017, ____ }, \
-    { k020, k021, k022, k023, k024, k025, k026, k027, k028 }, \
-    { k030, k031, k032, k033, k034, k035, k036, k037, ____ }, \
-    { k040, k041, k042, k043, k044, k045, k046, k047, k048 }, \
-    { k050, k051, k052, k053, k054, k055, k056, k057, ____ }, \
-    { k060, k061, k062, k063, k064, k065, k066, ____, ____ }, \
-    { k070, k071, k072, k073, k074, k075, ____, ____, ____ }, \
-    { k080, k081, k082, k083, k084, k085, k086, ____, ____ }, \
-    { k090, k091, k092, k093, k094, ____, ____, k097, ____ }, \
-    { k100, k101, ____, ____, ____, k105, k106, k107, k108 }, \
-    { k110, ____, k112, ____, k114, k115, ____, k117, ____ }  \
-}
diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json
index 39b296a679..18c918d331 100644
--- a/keyboards/skeletn87/hotswap/info.json
+++ b/keyboards/skeletn87/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB5E9",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 8,
@@ -17,99 +22,115 @@
         "caps_lock": "E6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 2], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h
index 095b95d13c..21dc04a727 100644
--- a/keyboards/skeletn87/soldered/config.h
+++ b/keyboards/skeletn87/soldered/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -43,4 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json
index 32ed0e6f0e..f428a78225 100644
--- a/keyboards/skeletn87/soldered/info.json
+++ b/keyboards/skeletn87/soldered/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB5E8",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 8,
@@ -17,374 +22,429 @@
         "caps_lock": "E6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi", "tkl_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"x":16.25, "y":4.25},
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [10, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 5], "x": 12.5, "y": 5.25},
+                {"matrix": [10, 6], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
-                {"x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
-                {"x":0, "y":5.25, "w":1.25},
-                {"x":1.25, "y":5.25, "w":1.25},
-                {"x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"x":10, "y":5.25, "w":1.25},
-                {"x":11.25, "y":5.25, "w":1.25},
-                {"x":12.5, "y":5.25, "w":1.25},
-                {"x":13.75, "y":5.25, "w":1.25},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [5, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/skeletn87/soldered/soldered.c b/keyboards/skeletn87/soldered/soldered.c
deleted file mode 100644
index b99b94e08a..0000000000
--- a/keyboards/skeletn87/soldered/soldered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "soldered.h"
diff --git a/keyboards/skeletn87/soldered/soldered.h b/keyboards/skeletn87/soldered/soldered.h
deleted file mode 100644
index c815d7643d..0000000000
--- a/keyboards/skeletn87/soldered/soldered.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_all( \
-    k000,       k001, k011, k002, k012, k003, k013, k004, k014, k005, k015, k006, k016,    k007, k017, k008, \
-    k020, k030, k021, k031, k022, k032, k023, k033, k024, k034, k025, k035, k026, k036,    k027, k037, k028, \
-    k040, k050, k041, k051, k042, k052, k043, k053, k044, k054, k045, k055, k046, k056,    k047, k057, k048, \
-    k060, k070, k061, k071, k062, k072, k063, k073, k064, k074, k065, k075,    k066,                         \
-    k080, k090, k081, k091, k082, k092, k083, k093, k084, k094, k085, k095, k086, k096,          k097,       \
-    k100, k110, k101,                   k113,                   k114, k105, k115, k106,    k107, k117, k108  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008 }, \
-    { ____, k011, k012, k013, k014, k015, k016, k017, ____ }, \
-    { k020, k021, k022, k023, k024, k025, k026, k027, k028 }, \
-    { k030, k031, k032, k033, k034, k035, k036, k037, ____ }, \
-    { k040, k041, k042, k043, k044, k045, k046, k047, k048 }, \
-    { k050, k051, k052, k053, k054, k055, k056, k057, ____ }, \
-    { k060, k061, k062, k063, k064, k065, k066, ____, ____ }, \
-    { k070, k071, k072, k073, k074, k075, ____, ____, ____ }, \
-    { k080, k081, k082, k083, k084, k085, k086, ____, ____ }, \
-    { k090, k091, k092, k093, k094, k095, k096, k097, ____ }, \
-    { k100, k101, ____, ____, ____, k105, k106, k107, k108 }, \
-    { k110, ____, ____, k113, k114, k115, ____, k117, ____ }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k000,       k001, k011, k002, k012, k003, k013, k004, k014, k005, k015, k006, k016,    k007, k017, k008, \
-    k020, k030, k021, k031, k022, k032, k023, k033, k024, k034, k025, k035, k026, k036,    k027, k037, k028, \
-    k040, k050, k041, k051, k042, k052, k043, k053, k044, k054, k045, k055, k046, k056,    k047, k057, k048, \
-    k060, k070, k061, k071, k062, k072, k063, k073, k064, k074, k065, k075,    k066,                         \
-       k080,    k081, k091, k082, k092, k083, k093, k084, k094, k085, k095,    k086,             k097,       \
-    k100, k110, k101,                   k113,                   k114, k105, k115, k106,    k107, k117, k108  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008 }, \
-    { ____, k011, k012, k013, k014, k015, k016, k017, ____ }, \
-    { k020, k021, k022, k023, k024, k025, k026, k027, k028 }, \
-    { k030, k031, k032, k033, k034, k035, k036, k037, ____ }, \
-    { k040, k041, k042, k043, k044, k045, k046, k047, k048 }, \
-    { k050, k051, k052, k053, k054, k055, k056, k057, ____ }, \
-    { k060, k061, k062, k063, k064, k065, k066, ____, ____ }, \
-    { k070, k071, k072, k073, k074, k075, ____, ____, ____ }, \
-    { k080, k081, k082, k083, k084, k085, k086, ____, ____ }, \
-    { ____, k091, k092, k093, k094, k095, ____, k097, ____ }, \
-    { k100, k101, ____, ____, ____, k105, k106, k107, k108 }, \
-    { k110, ____, ____, k113, k114, k115, ____, k117, ____ }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    k000,       k001, k011, k002, k012, k003, k013, k004, k014, k005, k015, k006, k016,    k007, k017, k008, \
-    k020, k030, k021, k031, k022, k032, k023, k033, k024, k034, k025, k035, k026, k036,    k027, k037, k028, \
-    k040, k050, k041, k051, k042, k052, k043, k053, k044, k054, k045, k055, k046, k056,    k047, k057, k048, \
-    k060, k070, k061, k071, k062, k072, k063, k073, k064, k074, k065, k075,    k066,                         \
-       k080,    k081, k091, k082, k092, k083, k093, k084, k094, k085, k095,    k086,             k097,       \
-    k100, k110, k101,                   k113,                         k105, k115, k106,    k107, k117, k108  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008 }, \
-    { ____, k011, k012, k013, k014, k015, k016, k017, ____ }, \
-    { k020, k021, k022, k023, k024, k025, k026, k027, k028 }, \
-    { k030, k031, k032, k033, k034, k035, k036, k037, ____ }, \
-    { k040, k041, k042, k043, k044, k045, k046, k047, k048 }, \
-    { k050, k051, k052, k053, k054, k055, k056, k057, ____ }, \
-    { k060, k061, k062, k063, k064, k065, k066, ____, ____ }, \
-    { k070, k071, k072, k073, k074, k075, ____, ____, ____ }, \
-    { k080, k081, k082, k083, k084, k085, k086, ____, ____ }, \
-    { ____, k091, k092, k093, k094, k095, ____, k097, ____ }, \
-    { k100, k101, ____, ____, ____, k105, k106, k107, k108 }, \
-    { k110, ____, ____, k113, ____, k115, ____, k117, ____ }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    k000,       k001, k011, k002, k012, k003, k013, k004, k014, k005, k015, k006, k016,    k007, k017, k008, \
-    k020, k030, k021, k031, k022, k032, k023, k033, k024, k034, k025, k035, k026, k036,    k027, k037, k028, \
-    k040, k050, k041, k051, k042, k052, k043, k053, k044, k054, k045, k055, k046,          k047, k057, k048, \
-    k060, k070, k061, k071, k062, k072, k063, k073, k064, k074, k065, k075, k066, k056,                      \
-    k080, k090, k081, k091, k082, k092, k083, k093, k084, k094, k085, k095,    k086,             k097,       \
-    k100, k110, k101,                   k113,                   k114, k105, k115, k106,    k107, k117, k108  \
-) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008 }, \
-    { ____, k011, k012, k013, k014, k015, k016, k017, ____ }, \
-    { k020, k021, k022, k023, k024, k025, k026, k027, k028 }, \
-    { k030, k031, k032, k033, k034, k035, k036, k037, ____ }, \
-    { k040, k041, k042, k043, k044, k045, k046, k047, k048 }, \
-    { k050, k051, k052, k053, k054, k055, k056, k057, ____ }, \
-    { k060, k061, k062, k063, k064, k065, k066, ____, ____ }, \
-    { k070, k071, k072, k073, k074, k075, ____, ____, ____ }, \
-    { k080, k081, k082, k083, k084, k085, k086, ____, ____ }, \
-    { k090, k091, k092, k093, k094, k095, ____, k097, ____ }, \
-    { k100, k101, ____, ____, ____, k105, k106, k107, k108 }, \
-    { k110, ____, ____, k113, k114, k115, ____, k117, ____ }  \
-}
diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h
index 7814933e42..d30c5891ba 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/config.h
+++ b/keyboards/skeletonkbd/skeletonnumpad/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, C6, C7, F7, F6 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D4
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 17
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/info.json
index c637cbfffc..8ea3a9dd66 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/info.json
+++ b/keyboards/skeletonkbd/skeletonnumpad/info.json
@@ -8,32 +8,40 @@
         "pid": "0x6E70",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5"],
+        "rows": ["B6", "C6", "C7", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"label":"Num Lock", "x":0, "y":0},
-                {"label":"/", "x":1, "y":0},
-                {"label":"*", "x":2, "y":0},
-                {"label":"-", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"+", "x":3, "y":1, "h":2},
+                {"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},
 
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"label":"0", "x":0, "y":4, "w":2},
-                {"label":".", "x":2, "y":4},
-                {"label":"Enter", "x":3, "y":3, "h":2}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.c b/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.c
deleted file mode 100644
index 38c78ca56e..0000000000
--- a/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 SkeletonKBD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "skeletonnumpad.h"
diff --git a/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.h b/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.h
deleted file mode 100644
index 9782090efe..0000000000
--- a/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2022 SkeletonKBD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_numpad_5x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12,      \
-	K20, K21, K22, K13, \
-	K30, K31, K32,      \
-	K40,      K42, K33  \
-) { \
-	{ K00,   K01,   K02,   K03 },  \
-	{ K10,   K11,   K12,   K13 },  \
-	{ K20,   K21,   K22,   KC_NO },\
-	{ K30,   K31,   K32,   K33 },  \
-	{ K40,   KC_NO, K42,   KC_NO } \
-}
diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h
index 9d5633e574..a463c64167 100644
--- a/keyboards/skergo/config.h
+++ b/keyboards/skergo/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B4, B3, B2, B1 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C2, C1, C0, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json
index 01572f630f..0e68b6aedd 100644
--- a/keyboards/skergo/info.json
+++ b/keyboards/skergo/info.json
@@ -8,6 +8,11 @@
         "pid": "0x534B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7"],
+        "rows": ["B0", "B4", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "layout_aliases": {
@@ -16,153 +21,173 @@
     "layouts": {
         "LAYOUT_2u_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0.25},
-                {"label":"1!", "x":1.5, "y":0.25},
-                {"label":"2@", "x":2.5, "y":0.25},
-                {"label":"3#", "x":3.5, "y":0.25},
-                {"label":"4$", "x":4.5, "y":0.25},
-                {"label":"5%", "x":5.5, "y":0.25},
-                {"label":"6^", "x":6.5, "y":0.25},
-                {"label":"7&", "x":8.75, "y":0.25},
-                {"label":"8*", "x":9.75, "y":0.25},
-                {"label":"9(", "x":10.75, "y":0.25},
-                {"label":"0)", "x":11.75, "y":0.25},
-                {"label":"-_", "x":12.75, "y":0.25},
-                {"label":"=+", "x":13.75, "y":0.25},
-                {"label":"Backspace", "x":14.75, "y":0.25, "w":2},
-                {"label":"Page Up", "x":17, "y":0},
-
-                {"label":"Tab", "w":1.5, "x":0.25, "y":1.25},
-                {"label":"Q", "x":1.75, "y":1.25},
-                {"label":"W", "x":2.75, "y":1.25},
-                {"label":"E", "x":3.75, "y":1.25},
-                {"label":"R", "x":4.75, "y":1.25},
-                {"label":"T", "x":5.75, "y":1.25},
-                {"label":"Y", "x":8.4, "y":1.25},
-                {"label":"U", "x":9.4, "y":1.25},
-                {"label":"I", "x":10.4, "y":1.25},
-                {"label":"O", "x":11.4, "y":1.25},
-                {"label":"P", "x":12.4, "y":1.25},
-                {"label":"[{", "x":13.4, "y":1.25},
-                {"label":"]}", "x":14.4, "y":1.25},
-                {"label":"\\|", "w":1.5, "x":15.4, "y":1.25},
-                {"label":"Page Down", "x":17.15, "y":1},
-
-                {"label":"Caps Lock", "w":1.75, "x":0.15, "y":2.25},
-                {"label":"A", "x":1.9, "y":2.25},
-                {"label":"S", "x":2.9, "y":2.25},
-                {"label":"D", "x":3.9, "y":2.25},
-                {"label":"F", "x":4.9, "y":2.25},
-                {"label":"G", "x":5.9, "y":2.25},
-                {"label":"H", "x":8.75, "y":2.25},
-                {"label":"J", "x":9.75, "y":2.25},
-                {"label":"K", "x":10.75, "y":2.25},
-                {"label":"L", "x":11.75, "y":2.25},
-                {"label":";:", "x":12.75, "y":2.25},
-                {"label":"'\"", "x":13.75, "y":2.25},
-                {"label":"Enter", "w":2.25, "x":14.75, "y":2.25},
-                {"label":"End", "x":17.25, "y":2},
-
-                {"label":"Shift", "w":2.25, "x":0, "y":3.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":3.25, "y":3.25},
-                {"label":"C", "x":4.25, "y":3.25},
-                {"label":"V", "x":5.25, "y":3.25},
-                {"label":"B", "x":6.25, "y":3.25},
-                {"label":"B", "x":8.25, "y":3.25},
-                {"label":"N", "x":9.25, "y":3.25},
-                {"label":"M", "x":10.25, "y":3.25},
-                {"label":",<", "x":11.25, "y":3.25},
-                {"label":".>", "x":12.25, "y":3.25},
-                {"label":"/?", "x":13.25, "y":3.25},
-                {"label":"Shift", "w":1.75, "x":14.25, "y":3.25},
-                {"label":"\u2191", "x":16.25, "y":3.5},
-
-                {"label":"Ctrl", "w":1.5, "x":0, "y":4.25},
-                {"label":"Alt", "w":1.5, "x":3.25, "y":4.25},
-                {"label":"Space", "w":2, "x":4.75, "y":4.25},
-                {"label":"GUI", "x":6.75, "y":4.25},
-                {"label":"Space", "w":2.75, "x":8.75, "y":4.25},
-                {"label":"Fn", "w":1.5, "x":11.5, "y":4.25},
-                {"label":"\u2190", "x":15.25, "y":4.5},
-                {"label":"\u2193", "x":16.25, "y":4.5},
-                {"label":"\u2192", "x":17.25, "y":4.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
+                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
+                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
+                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
+                {"matrix": [0, 11], "x": 12.75, "y": 0.25},
+                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+                {"matrix": [0, 14], "x": 14.75, "y": 0.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
+                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17.15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+
+                {"matrix": [4, 6], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
+                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
             ]
         },
         "LAYOUT_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0.25},
-                {"label":"1!", "x":1.5, "y":0.25},
-                {"label":"2@", "x":2.5, "y":0.25},
-                {"label":"3#", "x":3.5, "y":0.25},
-                {"label":"4$", "x":4.5, "y":0.25},
-                {"label":"5%", "x":5.5, "y":0.25},
-                {"label":"6^", "x":6.5, "y":0.25},
-                {"label":"7&", "x":8.75, "y":0.25},
-                {"label":"8*", "x":9.75, "y":0.25},
-                {"label":"9(", "x":10.75, "y":0.25},
-                {"label":"0)", "x":11.75, "y":0.25},
-                {"label":"-_", "x":12.75, "y":0.25},
-                {"label":"=+", "x":13.75, "y":0.25},
-                {"label":"Backspace", "x":14.75, "y":0.25},
-                {"label":"Backspace", "x":15.75, "y":0.25},
-                {"label":"Page Up", "x":17, "y":0},
-
-                {"label":"Tab", "w":1.5, "x":0.25, "y":1.25},
-                {"label":"Q", "x":1.75, "y":1.25},
-                {"label":"W", "x":2.75, "y":1.25},
-                {"label":"E", "x":3.75, "y":1.25},
-                {"label":"R", "x":4.75, "y":1.25},
-                {"label":"T", "x":5.75, "y":1.25},
-                {"label":"Y", "x":8.4, "y":1.25},
-                {"label":"U", "x":9.4, "y":1.25},
-                {"label":"I", "x":10.4, "y":1.25},
-                {"label":"O", "x":11.4, "y":1.25},
-                {"label":"P", "x":12.4, "y":1.25},
-                {"label":"[{", "x":13.4, "y":1.25},
-                {"label":"]}", "x":14.4, "y":1.25},
-                {"label":"\\|", "w":1.5, "x":15.4, "y":1.25},
-                {"label":"Page Down", "x":17.15, "y":1},
-
-                {"label":"Caps Lock", "w":1.75, "x":0.15, "y":2.25},
-                {"label":"A", "x":1.9, "y":2.25},
-                {"label":"S", "x":2.9, "y":2.25},
-                {"label":"D", "x":3.9, "y":2.25},
-                {"label":"F", "x":4.9, "y":2.25},
-                {"label":"G", "x":5.9, "y":2.25},
-                {"label":"H", "x":8.75, "y":2.25},
-                {"label":"J", "x":9.75, "y":2.25},
-                {"label":"K", "x":10.75, "y":2.25},
-                {"label":"L", "x":11.75, "y":2.25},
-                {"label":";:", "x":12.75, "y":2.25},
-                {"label":"'\"", "x":13.75, "y":2.25},
-                {"label":"Enter", "w":2.25, "x":14.75, "y":2.25},
-                {"label":"End", "x":17.25, "y":2},
-
-                {"label":"Shift", "w":2.25, "x":0, "y":3.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":3.25, "y":3.25},
-                {"label":"C", "x":4.25, "y":3.25},
-                {"label":"V", "x":5.25, "y":3.25},
-                {"label":"B", "x":6.25, "y":3.25},
-                {"label":"B", "x":8.25, "y":3.25},
-                {"label":"N", "x":9.25, "y":3.25},
-                {"label":"M", "x":10.25, "y":3.25},
-                {"label":",<", "x":11.25, "y":3.25},
-                {"label":".>", "x":12.25, "y":3.25},
-                {"label":"/?", "x":13.25, "y":3.25},
-                {"label":"Shift", "w":1.75, "x":14.25, "y":3.25},
-                {"label":"\u2191", "x":16.25, "y":3.5},
-
-                {"label":"Ctrl", "w":1.5, "x":0, "y":4.25},
-                {"label":"Alt", "w":1.5, "x":3.25, "y":4.25},
-                {"label":"Space", "w":2, "x":4.75, "y":4.25},
-                {"label":"GUI", "x":6.75, "y":4.25},
-                {"label":"Space", "w":2.75, "x":8.75, "y":4.25},
-                {"label":"Fn", "w":1.5, "x":11.5, "y":4.25},
-                {"label":"\u2190", "x":15.25, "y":4.5},
-                {"label":"\u2193", "x":16.25, "y":4.5},
-                {"label":"\u2192", "x":17.25, "y":4.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
+                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
+                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
+                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
+                {"matrix": [0, 11], "x": 12.75, "y": 0.25},
+                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+                {"matrix": [0, 13], "x": 14.75, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.75, "y": 0.25},
+
+                {"matrix": [1, 14], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
+                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17.15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+
+                {"matrix": [4, 6], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
+                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/skergo/skergo.c b/keyboards/skergo/skergo.c
deleted file mode 100644
index 2d2f2b47ae..0000000000
--- a/keyboards/skergo/skergo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (C) 2021  Keyz.io Ltd.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "skergo.h"
diff --git a/keyboards/skergo/skergo.h b/keyboards/skergo/skergo.h
deleted file mode 100644
index cee1c4c656..0000000000
--- a/keyboards/skergo/skergo.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (C) 2021  Keyz.io Ltd.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*                                                                      ┌───�
- * ┌───┬───┬───┬───┬───┬───┬───�       ┌───┬───┬───┬───┬───┬───┬───┬───�│1E │   ┌───────�
- * │00 │01 │02 │03 │04 │05 │06 │       │07 │08 │09 │0A │0B │0C │0D │0E │├───┤   │0E     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤│2E │   └───────┘
- * │10   │11 │12 │13 │14 │15 │       │16 │17 │18 │19 │1A │1B │1C │1D   │├───┤
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴�      └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤│3E │
- * │20    │21 │22 │23 │24 │25 │       │26 │27 │28 │29 │2A │2B │2C      │└───┘
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─�   ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
- * │30      │31 │32 │33 │34 │35 │   │46 │36 │37 │38 │39 │3A │3B    │┌───�
- * ├────┬───┴───┼───┴─┬─┴───┴─┬─┴─� └─┬─┴───┴───┴┬──┴──┬┴───┴──────┘│3D │
- * │40  │       │42   │44     │45 │   │47        │49   │        ┌───┼───┼───�
- * └────┘       └─────┴───────┴───┘   └──────────┴─────┘        │4C │4D │4E │
- *                                                              └───┴───┴───┘
- * - Position K46 (secondary B key) is optional
- */
-
-#define LAYOUT_2u_bs( \
-	K00, K01, K02, K03, K04, K05, K06,        K07, K08, K09, K0A, K0B, K0C, K0E,   K1E, \
-	K10, K11, K12, K13, K14, K15,        K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, \
-	K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B,      K2C,   K3E, \
-	K30, K31, K32, K33, K34, K35,        K46, K36, K37, K38, K39, K3A, K3B, K3D,        \
-	K40,      K42,      K44, K45,        K47,           K49,           K4C, K4D, K4E    \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
-	{ K40, ___, K42, ___, K44, K45, K46, K47, ___, K49, ___, ___, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_split_bs( \
-	K00, K01, K02, K03, K04, K05, K06,        K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   K1E, \
-	K10, K11, K12, K13, K14, K15,        K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K2E, \
-	K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B,      K2C,        K3E, \
-	K30, K31, K32, K33, K34, K35,        K46, K36, K37, K38, K39, K3A, K3B, K3D,             \
-	K40,      K42,      K44, K45,        K47,           K49,           K4C, K4D, K4E         \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
-	{ K40, ___, K42, ___, K44, K45, K46, K47, ___, K49, ___, ___, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h
index 2f32ae1375..9e6239f67f 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/config.h
+++ b/keyboards/skippys_custom_pcs/rooboard65/config.h
@@ -17,30 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 68
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json
index 497b5a0e7f..cf666c3c40 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/info.json
+++ b/keyboards/skippys_custom_pcs/rooboard65/info.json
@@ -8,84 +8,92 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
-                {"x": 15, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [1, 14], "x": 15, "y": 2},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-                
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/skippys_custom_pcs/rooboard65/rooboard65.c b/keyboards/skippys_custom_pcs/rooboard65/rooboard65.c
deleted file mode 100644
index a97cc2307b..0000000000
--- a/keyboards/skippys_custom_pcs/rooboard65/rooboard65.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "rooboard65.h"
diff --git a/keyboards/skippys_custom_pcs/rooboard65/rooboard65.h b/keyboards/skippys_custom_pcs/rooboard65/rooboard65.h
deleted file mode 100644
index 434d156688..0000000000
--- a/keyboards/skippys_custom_pcs/rooboard65/rooboard65.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* TF60 ANSI Keymap Definitions */
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D, K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D, K0E }, \
-    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D, K2E }, \
-    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B,   KC_NO, K2D, K1E }, \
-    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, KC_NO, K3C,   K3D, K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, K4B,   K4C,   K4D, K4E }  \
-}
diff --git a/keyboards/skippys_custom_pcs/roopad/config.h b/keyboards/skippys_custom_pcs/roopad/config.h
index 7c4946f423..f787da4012 100644
--- a/keyboards/skippys_custom_pcs/roopad/config.h
+++ b/keyboards/skippys_custom_pcs/roopad/config.h
@@ -17,26 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B5, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { F0, B4, D7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 21
 #define RGBLIGHT_SLEEP
 
diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json
index 9b7c079765..2a5d8f8e7a 100644
--- a/keyboards/skippys_custom_pcs/roopad/info.json
+++ b/keyboards/skippys_custom_pcs/roopad/info.json
@@ -8,11 +8,45 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B4", "D7", "D6", "D4"],
+        "rows": ["B5", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Num Lock", "x":1.5, "y":0}, {"label":"/", "x":2.5, "y":0}, {"label":"*", "x":3.5, "y":0}, {"label":"-", "x":4.5, "y":0}, {"x":0, "y":1}, {"label":"7", "x":1.5, "y":1}, {"label":"8", "x":2.5, "y":1}, {"label":"9", "x":3.5, "y":1}, {"label":"+", "x":4.5, "y":1, "h":2}, {"x":0, "y":2}, {"label":"4", "x":1.5, "y":2}, {"label":"5", "x":2.5, "y":2}, {"label":"6", "x":3.5, "y":2}, {"x":0, "y":3}, {"label":"1", "x":1.5, "y":3}, {"label":"2", "x":2.5, "y":3}, {"label":"3", "x":3.5, "y":3}, {"label":"Enter", "x":4.5, "y":3, "h":2}, {"x":0, "y":4}, {"label":"0", "x":1.5, "y":4, "w":2}, {"label":".", "x":3.5, "y":4}]
+            "layout": [
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 2},
+                {"matrix": [4, 3], "x": 3.5, "y": 4}
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/keyboards/skippys_custom_pcs/roopad/roopad.c b/keyboards/skippys_custom_pcs/roopad/roopad.c
deleted file mode 100644
index 408d7d56f1..0000000000
--- a/keyboards/skippys_custom_pcs/roopad/roopad.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "roopad.h"
diff --git a/keyboards/skippys_custom_pcs/roopad/roopad.h b/keyboards/skippys_custom_pcs/roopad/roopad.h
deleted file mode 100644
index f520383339..0000000000
--- a/keyboards/skippys_custom_pcs/roopad/roopad.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* RooPad Keymap Definitions */
-#define LAYOUT( \
-         K01, K02, K03, K04, \
-    K10, K11, K12, K13, K14, \
-    K20, K21, K22, K23,      \
-    K30, K31, K32, K33, K34, \
-    K40, K41,      K43       \
-) { \
-    { KC_NO, K01, K02,   K03, K04    }, \
-    { K10,   K11, K12,   K13, K14    }, \
-    { K20,   K21, K22,   K23, KC_NO  }, \
-    { K30,   K31, K32,   K33, K34    }, \
-    { K40,   K41, KC_NO, K43, KC_NO  }  \
-}
diff --git a/keyboards/skme/zeno/info.json b/keyboards/skme/zeno/info.json
index c701f0b795..bc35967537 100644
--- a/keyboards/skme/zeno/info.json
+++ b/keyboards/skme/zeno/info.json
@@ -27,72 +27,81 @@
     "layouts": {
         "LAYOUT_default": {
            "layout": [
-            {"matrix":[0,0], "x":0.6, "y":0.25},
-            {"matrix":[0,1], "x":1.6, "y":0.25},
-            {"matrix":[0,2], "x":2.6, "y":0.235},
-            {"matrix":[0,3], "x":0, "y":1.3001},
-            {"matrix":[0,4], "x":1, "y":1.3001},
-            {"matrix":[0,5], "x":2, "y":1.3001},
-            {"matrix":[0,6], "x":3, "y":1.3001},
-            {"matrix":[0,7], "x":-3.75, "y":3.3},
-            {"matrix":[0,8], "x":-2.75, "y":3.3},
-            {"matrix":[0,9], "x":-1.75, "y":3.3},
-            {"matrix":[0,10], "x":-0.75, "y":3.3},
-            {"matrix":[0,11], "x":12.75, "y":0.28},
-            {"matrix":[0,12], "x":13.75, "y":0.3001},
-            {"matrix":[0,13], "x":14.75, "y":0.3001},
-            {"matrix":[1,14], "x":15.75, "y":0.3001},
-            {"matrix":[1,0], "x":0.5, "y":1.25, "w":1.5},
-            {"matrix":[1,1], "x":2, "y":1.25},
-            {"matrix":[1,2], "x":-0.5, "y":2.3001},
-            {"matrix":[1,3], "x":0.5, "y":2.3001},
-            {"matrix":[1,4], "x":1.5, "y":2.3001},
-            {"matrix":[1,5], "x":2.5, "y":2.3001},
-            {"matrix":[1,6], "x":-4.25, "y":4.3},
-            {"matrix":[1,7], "x":-3.25, "y":4.3},
-            {"matrix":[1,8], "x":-2.25, "y":4.3},
-            {"matrix":[1,9], "x":-1.25, "y":4.3},
-            {"matrix":[1,10], "x":12.4, "y":1.28},
-            {"matrix":[1,11], "x":13.4, "y":1.3},
-            {"matrix":[1,12], "x":14.4, "y":1.3},
-            {"matrix":[1,13], "x":15.4, "y":1.3, "w":1.5},
-            {"matrix":[2,0], "x":0.4, "y":2.25, "w":1.75},
-            {"matrix":[2,1], "x":2.15, "y":2.25},
-            {"matrix":[2,2], "x":-0.25, "y":3.3001},
-            {"matrix":[2,3], "x":0.75, "y":3.3001},
-            {"matrix":[2,4], "x":1.75, "y":3.3001},
-            {"matrix":[2,5], "x":2.75, "y":3.3001},
-            {"matrix":[2,6], "x":-3.95, "y":5.3},
-            {"matrix":[2,7], "x":-2.95, "y":5.3},
-            {"matrix":[2,8], "x":-1.9501, "y":5.3},
-            {"matrix":[2,9], "x":-0.9501, "y":5.3},
-            {"matrix":[2,10], "x":12.8, "y":2.3001},
-            {"matrix":[2,11], "x":13.8, "y":2.3001},
-            {"matrix":[2,12], "x":14.8, "y":2.3001, "w":2.25},
-            {"matrix":[3,0], "x":0.25, "y":3.25, "w":2.25},
-            {"matrix":[3,1], "x":2.5, "y":3.25},
-            {"matrix":[3,2], "x":0.25, "y":4.3},
-            {"matrix":[3,3], "x":1.25, "y":4.3},
-            {"matrix":[3,4], "x":2.25, "y":4.3},
-            {"matrix":[3,5], "x":3.25, "y":4.3},
-            {"matrix":[3,6], "x":-4.45, "y":6.3},
-            {"matrix":[3,7], "x":-3.45, "y":6.3},
-            {"matrix":[3,8], "x":-2.45, "y":6.3},
-            {"matrix":[3,9], "x":-1.4501, "y":6.3},
-            {"matrix":[3,10], "x":12.4, "y":3.3001},
-            {"matrix":[3,11], "x":13.4, "y":3.3001},
-            {"matrix":[3,12], "x":14.4, "y":3.3001, "w":1.75},
-            {"matrix":[3,14], "x":16.15, "y":3.3001},
-            {"matrix":[4,0], "x":0.25, "y":4.3, "w":1.25},
-            {"matrix":[4,1], "x":1.5, "y":4.3, "w":1.25},
-            {"matrix":[4,3], "x":0.5, "y":5.3},
-            {"matrix":[4,5], "x":-7.8, "y":8.45, "w":2.75},
-            {"matrix":[4,7], "x":-4.45, "y":7.3, "w":2},
-            {"matrix":[4,8], "x":-2.45, "y":7.3},
-            {"matrix":[4,9], "x":-1.4501, "y":7.3, "w":1.25},
-            {"matrix":[4,12], "x":14.65, "y":4.3, "w":1.25},
-            {"matrix":[4,14], "x":15.9, "y":4.3, "w":1.25}
-        ]
+                {"matrix": [0, 0], "x": 0.75, "y": 0},
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [1, 14], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+
+                {"matrix": [1, 6], "x": 8.75, "y": 1},
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+
+                {"matrix": [2, 6], "x": 9.25, "y": 2},
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2, "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": 9, "y": 3},
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 15, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 16.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 9, "y": 4, "w": 2},
+                {"matrix": [4, 8], "x": 11, "y": 4},
+                {"matrix": [4, 9], "x": 12, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 15.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/skmt/15k/config.h b/keyboards/skmt/15k/config.h
index e1f021159e..63b3758737 100644
--- a/keyboards/skmt/15k/config.h
+++ b/keyboards/skmt/15k/config.h
@@ -21,7 +21,6 @@
 
 #define FORCE_NKRO
 
-#define RGB_DI_PIN GP1 // RGB LED pin
 #define RGBLED_NUM 15 // Number of LEDs
 #define RGB_MATRIX_LED_COUNT 15 // Number of LEDs
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/skmt/15k/info.json b/keyboards/skmt/15k/info.json
index 71f3bc24d7..5b7fdfc481 100644
--- a/keyboards/skmt/15k/info.json
+++ b/keyboards/skmt/15k/info.json
@@ -64,5 +64,9 @@
             { "flags": 4, "matrix": [0, 1], "x": 56, "y": 0 },
             { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }
         ]
+    },
+    "ws2812": {
+        "pin": "GP1",
+        "driver": "vendor"
     }
 }
diff --git a/keyboards/skmt/15k/rules.mk b/keyboards/skmt/15k/rules.mk
index 848cfec5a3..4da205a168 100644
--- a/keyboards/skmt/15k/rules.mk
+++ b/keyboards/skmt/15k/rules.mk
@@ -1,3 +1 @@
-WS2812_DRIVER = vendor
-
 LTO_ENABLE = yes
diff --git a/keyboards/slz40/config.h b/keyboards/slz40/config.h
index b55916fe15..e66e3202cc 100644
--- a/keyboards/slz40/config.h
+++ b/keyboards/slz40/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, B5, B3, B2, B6 }
-#define MATRIX_COL_PINS { F4, D2, F5, D1, F6, D0, F7, D4, B1, C6, E6, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/slz40/info.json b/keyboards/slz40/info.json
index dcbd0c73b2..25d250e848 100644
--- a/keyboards/slz40/info.json
+++ b/keyboards/slz40/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "D2", "F5", "D1", "F6", "D0", "F7", "D4", "B1", "C6", "E6", "D7"],
+        "rows": ["B4", "B5", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
@@ -67,11 +72,11 @@
                 
                 {"label": "ctrl", "x": 0, "y": 4, "w": 1.25},
                 {"label": "qui", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "alt", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "alt", "x": 2.5, "y": 4, "w": 1.25},
                 {"label": "del", "x": 3.75, "y": 4, "w": 1.25},
                 {"label": "enter", "x": 5, "y": 4, "w": 1.75},
                 {"label": "space", "x": 6.75, "y": 4, "w": 1.75},
-                {"label": "'", "x": 8.50, "y": 4, "w": 1.5},
+                {"label": "'", "x": 8.5, "y": 4, "w": 1.5},
                 {"label": "left", "x": 10, "y": 4},
                 {"label": "down", "x": 11, "y": 4},
                 {"label": "right", "x": 12, "y": 4}
diff --git a/keyboards/slz40/slz40.c b/keyboards/slz40/slz40.c
deleted file mode 100644
index 261b0bd892..0000000000
--- a/keyboards/slz40/slz40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 SithLord
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "slz40.h"
diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h
index 570607c3ca..4bee1c3663 100644
--- a/keyboards/smallkeyboard/config.h
+++ b/keyboards/smallkeyboard/config.h
@@ -17,23 +17,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS {C7, C6 }
-#define MATRIX_COL_PINS {F7, F6, F5}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json
index 11a96f5af6..a19bf29597 100644
--- a/keyboards/smallkeyboard/info.json
+++ b/keyboards/smallkeyboard/info.json
@@ -8,18 +8,27 @@
     "pid": "0x736B",
     "device_version": "0.0.1"
   },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5"],
+    "rows": ["C7", "C6"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "debounce": 3,
   "layouts": {
     "LAYOUT_ortho_2x3": {
       "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1}
       ]
     }
   }
diff --git a/keyboards/smallkeyboard/rules.mk b/keyboards/smallkeyboard/rules.mk
index 9202e8acf7..1dcdf89155 100644
--- a/keyboards/smallkeyboard/rules.mk
+++ b/keyboards/smallkeyboard/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 
 RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/smallkeyboard/smallkeyboard.c b/keyboards/smallkeyboard/smallkeyboard.c
index 40cf3fc71a..7ea6f2c40a 100644
--- a/keyboards/smallkeyboard/smallkeyboard.c
+++ b/keyboards/smallkeyboard/smallkeyboard.c
@@ -13,7 +13,7 @@
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
-#include "smallkeyboard.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/smallkeyboard/smallkeyboard.h b/keyboards/smallkeyboard/smallkeyboard.h
deleted file mode 100644
index 7741772be5..0000000000
--- a/keyboards/smallkeyboard/smallkeyboard.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 zhouqiong198401189
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x3( \
-    K00, K01, K02,\
-    K10, K11, K12 \
-) { \
-    { K00, K01, K02 }, \
-    { K10, K11, K12 }  \
-}
diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/info.json
index 0c28862068..b8184da064 100644
--- a/keyboards/smithrune/iron160/iron160_h/info.json
+++ b/keyboards/smithrune/iron160/iron160_h/info.json
@@ -14,10 +14,12 @@
        "cols": ["A3" , "B9" , "B8" , "B5" , "B4", "B3" , "A6" , "A5" , "A4" , "A2" , "A1" , "A0" , "C15" , "C14"],
        "rows": ["A10", "A15", "C13", "A7" , "B0"]
    },
-   "rgblight": {
-       "led_count": 1,
+   "ws2812": {
        "pin": "B15"
    },
+   "rgblight": {
+       "led_count": 1
+   },
    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/smithrune/iron165r2/config.h b/keyboards/smithrune/iron165r2/config.h
index d8e7bc64d8..9749d68d72 100644
--- a/keyboards/smithrune/iron165r2/config.h
+++ b/keyboards/smithrune/iron165r2/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { A3 , B8 , B9 , B1 , B0 , B5 , B4 , B3 , A15, A8 , A1 , A0 , C15, C14, C13}
-#define MATRIX_ROW_PINS { B10, A10, A2 , A5 , A7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
diff --git a/keyboards/smithrune/iron165r2/f072/config.h b/keyboards/smithrune/iron165r2/f072/config.h
index 21702a94a6..9f86b9e55c 100644
--- a/keyboards/smithrune/iron165r2/f072/config.h
+++ b/keyboards/smithrune/iron165r2/f072/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 22
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/info.json
index a4171d423e..8ced3df775 100644
--- a/keyboards/smithrune/iron165r2/f072/info.json
+++ b/keyboards/smithrune/iron165r2/f072/info.json
@@ -4,6 +4,9 @@
         "levels": 20,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/smithrune/iron165r2/f411/config.h b/keyboards/smithrune/iron165r2/f411/config.h
index 88ff1d167a..fa904fdabb 100644
--- a/keyboards/smithrune/iron165r2/f411/config.h
+++ b/keyboards/smithrune/iron165r2/f411/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      2
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 22
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/info.json
index e3a63f8764..7fd45874f2 100644
--- a/keyboards/smithrune/iron165r2/f411/info.json
+++ b/keyboards/smithrune/iron165r2/f411/info.json
@@ -4,6 +4,10 @@
         "levels": 20,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "pwm"
+    },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk
index b5b0582d5d..5d4fe45457 100644
--- a/keyboards/smithrune/iron165r2/f411/rules.mk
+++ b/keyboards/smithrune/iron165r2/f411/rules.mk
@@ -13,7 +13,6 @@ LTO_ENABLE = no
 ENCODER_ENABLE = no
 EEPROM_DRIVER = i2c
 BACKLIGHT_ENABLE = yes
-WS2812_DRIVER = pwm
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/smithrune/iron165r2/info.json b/keyboards/smithrune/iron165r2/info.json
index ed24e0e63c..cff9a97cb7 100644
--- a/keyboards/smithrune/iron165r2/info.json
+++ b/keyboards/smithrune/iron165r2/info.json
@@ -8,386 +8,391 @@
         "pid": "0x1652",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A3", "B8", "B9", "B1", "B0", "B5", "B4", "B3", "A15", "A8", "A1", "A0", "C15", "C14", "C13"],
+        "rows": ["B10", "A10", "A2", "A5", "A7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A4"
     },
-    "layouts": {
+     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,3", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,10", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,12", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0},
-                {"label":"0,14", "x":14, "y":0},
-                {"label":"4,14", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
 
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
-                {"label":"1,14", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2},
-                {"label":"2,13", "x":13.75, "y":2, "w":1.25},
-                {"label":"2,14", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"3,0", "x":0, "y":3, "w":1.25},
-                {"label":"3,1", "x":1.25, "y":3},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"4,0", "x":0, "y":4, "w":1.25},
-                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
-                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
-                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
-                {"label":"4,9", "x":10, "y":4, "w":1.25},
-                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
-                {"label":"4,11", "x":13, "y":4},
-                {"label":"4,12", "x":14, "y":4},
-                {"label":"4,13", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_cb_blocker": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,3", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,10", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,12", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
-                {"label":"1,14", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,13", "x":12.75, "y":2, "w":2.25},
-                {"label":"2,14", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"3,0", "x":0, "y":3, "w":2.25},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"4,0", "x":0, "y":4, "w":1.25},
-                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
-                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
-                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
-                {"label":"4,9", "x":10, "y":4, "w":1.25},
-                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
-                {"label":"4,11", "x":13, "y":4},
-                {"label":"4,12", "x":14, "y":4},
-                {"label":"4,13", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,3", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,10", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,12", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0, "w":2},
-                {"label":"4,14", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [4, 14], "x": 15, "y": 0},
 
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
-                {"label":"1,14", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,13", "x":12.75, "y":2, "w":2.25},
-                {"label":"2,14", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"3,0", "x":0, "y":3, "w":2.25},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"4,0", "x":0, "y":4, "w":1.25},
-                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
-                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
-                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
-                {"label":"4,9", "x":10, "y":4, "w":1.25},
-                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
-                {"label":"4,11", "x":13, "y":4},
-                {"label":"4,12", "x":14, "y":4},
-                {"label":"4,13", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_cb_blocker": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,3", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,10", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,12", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,14", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2},
-                {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"2,14", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"3,0", "x":0, "y":3, "w":1.25},
-                {"label":"3,1", "x":1.25, "y":3},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"4,0", "x":0, "y":4, "w":1.25},
-                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
-                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
-                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
-                {"label":"4,9", "x":10, "y":4, "w":1.25},
-                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
-                {"label":"4,11", "x":13, "y":4},
-                {"label":"4,12", "x":14, "y":4},
-                {"label":"4,13", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,3", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,10", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,12", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0, "w":2},
-                {"label":"4,14", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [4, 14], "x": 15, "y": 0},
 
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,14", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2},
-                {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"2,14", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"3,0", "x":0, "y":3, "w":1.25},
-                {"label":"3,1", "x":1.25, "y":3},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"4,0", "x":0, "y":4, "w":1.25},
-                {"label":"4,1", "x":1.25, "y":4, "w":1.25},
-                {"label":"4,2", "x":2.5, "y":4, "w":1.25},
-                {"label":"4,6", "x":3.75, "y":4, "w":6.25},
-                {"label":"4,9", "x":10, "y":4, "w":1.25},
-                {"label":"4,10", "x":11.25, "y":4, "w":1.25},
-                {"label":"4,11", "x":13, "y":4},
-                {"label":"4,12", "x":14, "y":4},
-                {"label":"4,13", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/smithrune/iron165r2/iron165r2.c b/keyboards/smithrune/iron165r2/iron165r2.c
index c13c362556..7406c0029c 100644
--- a/keyboards/smithrune/iron165r2/iron165r2.c
+++ b/keyboards/smithrune/iron165r2/iron165r2.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "iron165r2.h"
+#include "quantum.h"
 
 void board_init(void) {
     setPinInput(B6);
diff --git a/keyboards/smithrune/iron165r2/iron165r2.h b/keyboards/smithrune/iron165r2/iron165r2.h
deleted file mode 100644
index 8bb349d874..0000000000
--- a/keyboards/smithrune/iron165r2/iron165r2.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright 2022 Gondolindrim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define ___ KC_NO
-
-#include "quantum.h"
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │    │0D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�2D  │ ISO Enter
- *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │2C │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- *              │40  │41  │42  │46                      │49  │4A  │ │4B │4C │4D │
- *              └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────�
- *              │40   │41 │42   │46                         │4A   │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┘
- *
- * Position K4E exists on the PCB, but is physically unavailable with the Iron165R2 case.
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A,           K4B, K4C, K4D )\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_ansi_cb_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
-) {\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, ___ }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
-) {\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E }, \
-    { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_iso_cb_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
-) {\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, ___ }  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49, K4A,      K4B, K4C, K4D  \
-) {\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___ }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/smithrune/iron180/config.h b/keyboards/smithrune/iron180/config.h
index 92c28d5719..7506922b00 100644
--- a/keyboards/smithrune/iron180/config.h
+++ b/keyboards/smithrune/iron180/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B7 , B6 , B5 , B4 , B3 , A10, A9 , A8 , B15, B14, B13, B12, B11, B2 , A4 , B1 , A3 }
-#define MATRIX_ROW_PINS { B9 , B8 , A15, B0 , A7 , A5 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/smithrune/iron180/info.json b/keyboards/smithrune/iron180/info.json
index 0f8c436240..17febf6be5 100644
--- a/keyboards/smithrune/iron180/info.json
+++ b/keyboards/smithrune/iron180/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1180",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"],
+        "rows": ["B9", "B8", "A15", "B0", "A7", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
diff --git a/keyboards/smithrune/iron180/iron180.c b/keyboards/smithrune/iron180/iron180.c
deleted file mode 100644
index 236f8176f6..0000000000
--- a/keyboards/smithrune/iron180/iron180.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 �lvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "iron180.h"
diff --git a/keyboards/smk60/config.h b/keyboards/smk60/config.h
index a4aa26d5d5..9cc3f8601e 100644
--- a/keyboards/smk60/config.h
+++ b/keyboards/smk60/config.h
@@ -4,12 +4,6 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, F0, F1, F5, B2 }
-#define MATRIX_COL_PINS { B4, B5, B6, C6, C7, F6, F7, F4, B1, B3, D0, D1, D2, D3, D5}
-#define DIODE_DIRECTION COL2ROW
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -28,7 +22,6 @@
 
 //rgb light setting
 #define RGBLED_NUM      4
-#define RGB_DI_PIN      E6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/smk60/info.json b/keyboards/smk60/info.json
index 9e356ef6c8..5773958ea9 100644
--- a/keyboards/smk60/info.json
+++ b/keyboards/smk60/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6585",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "C6", "C7", "F6", "F7", "F4", "B1", "B3", "D0", "D1", "D2", "D3", "D5"],
+        "rows": ["B0", "F0", "F1", "F5", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_hhkb", "60_iso"],
diff --git a/keyboards/smk60/smk60.c b/keyboards/smk60/smk60.c
deleted file mode 100644
index 947bec03a0..0000000000
--- a/keyboards/smk60/smk60.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * smk60.c
- */
-
-#include "smk60.h"
diff --git a/keyboards/snampad/config.h b/keyboards/snampad/config.h
index 9c0f2de65b..63349588ec 100644
--- a/keyboards/snampad/config.h
+++ b/keyboards/snampad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3  }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/snampad/info.json b/keyboards/snampad/info.json
index a8f8997593..e5eb0272bb 100644
--- a/keyboards/snampad/info.json
+++ b/keyboards/snampad/info.json
@@ -8,33 +8,43 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["numpad_6x4"],
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Tab", "x":1, "y":0},
-                {"label":"Fn", "x":2, "y":0},
-                {"label":"Back", "x":3, "y":0},
-                {"label":"Num Lock", "x":0, "y":1},
-                {"label":"/", "x":1, "y":1},
-                {"label":"*", "x":2, "y":1},
-                {"label":"-", "x":3, "y":1},
-                {"label":"7", "x":0, "y":2},
-                {"label":"8", "x":1, "y":2},
-                {"label":"9", "x":2, "y":2},
-                {"label":"4", "x":0, "y":3},
-                {"label":"5", "x":1, "y":3},
-                {"label":"6", "x":2, "y":3},
-                {"label":"+", "x":3, "y":2, "h":2},
-                {"label":"1", "x":0, "y":4},
-                {"label":"2", "x":1, "y":4},
-                {"label":"3", "x":2, "y":4},
-                {"label":"0", "x":0, "y":5, "w":2},
-                {"label":".", "x":2, "y":5},
-                {"label":"Enter", "x":3, "y":4, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+                {"matrix": [3, 1], "x": 1, "y": 2},
+                {"matrix": [3, 2], "x": 2, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 4},
+                {"matrix": [1, 1], "x": 1, "y": 4},
+                {"matrix": [1, 2], "x": 2, "y": 4},
+
+                {"matrix": [0, 1], "x": 0, "y": 5, "w": 2},
+                {"matrix": [0, 2], "x": 2, "y": 5},
+                {"matrix": [1, 3], "x": 3, "y": 4, "h": 2}
             ]
         }
     }
diff --git a/keyboards/snampad/snampad.c b/keyboards/snampad/snampad.c
deleted file mode 100644
index 58413d0af5..0000000000
--- a/keyboards/snampad/snampad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Peter Tillemans
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "snampad.h"
diff --git a/keyboards/snampad/snampad.h b/keyboards/snampad/snampad.h
deleted file mode 100644
index ec7a779a4c..0000000000
--- a/keyboards/snampad/snampad.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 Peter Tillemans
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_numpad_6x4( \
-               k00, k01, k02, k03,      \
-               k10, k11, k12, k13,      \
-               k20, k21, k22,           \
-               k30, k31, k32, k23,      \
-               k40, k41, k42,           \
-                 k51,    k52, k43       \
-) \
-{ \
-  { KC_NO, k51,   k52 , KC_NO},  \
-  { k40, k41,   k42 , k43},  \
-  { k30, k31,   k32 , KC_NO},  \
-  { k20, k21,   k22 , k23},  \
-  { k10, k11,   k12 , k13},  \
-  { k00, k01,   k02 , k03} \
-}
diff --git a/keyboards/sneakbox/aliceclone/aliceclone.c b/keyboards/sneakbox/aliceclone/aliceclone.c
index 9cfb4e551d..9ddc198db8 100644
--- a/keyboards/sneakbox/aliceclone/aliceclone.c
+++ b/keyboards/sneakbox/aliceclone/aliceclone.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "aliceclone.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinOutput(D7);
diff --git a/keyboards/sneakbox/aliceclone/aliceclone.h b/keyboards/sneakbox/aliceclone/aliceclone.h
deleted file mode 100644
index 49d227fdcf..0000000000
--- a/keyboards/sneakbox/aliceclone/aliceclone.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2020 Bryan Ong
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all LAYOUT_alice_split_bs
-
-#define LAYOUT_alice_split_bs( \
-	K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015, K016, K017, \
-	K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
-	K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
-	        K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
-	        K081,                   K083, K085, K086,       K091, K093,                               K097  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  KC_NO }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
-	{ KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  KC_NO }, \
-	{ KC_NO, K091,  KC_NO, K093,  KC_NO, KC_NO, KC_NO, K097 }  \
-}
-
-#define LAYOUT_alice( \
-    K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015,       K016, \
-    K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
-    K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
-            K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
-            K081,                   K083, K085, K086,       K091, K093,                               K097  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO }, \
-    { K010,  K011,  K012,  K013,  K014,  K015,  K016,  KC_NO }, \
-    { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
-    { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO }, \
-    { K050,  K051,  K052,  K053,  K054,  K055,  K056,  KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO }, \
-    { K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
-    { KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  KC_NO }, \
-    { KC_NO, K091,  KC_NO, K093,  KC_NO, KC_NO, KC_NO, K097 }  \
-}
diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h
index cae120ac7e..7c7cad2390 100644
--- a/keyboards/sneakbox/aliceclone/config.h
+++ b/keyboards/sneakbox/aliceclone/config.h
@@ -17,33 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 }
-#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json
index 6890765f7f..e53b80f14e 100644
--- a/keyboards/sneakbox/aliceclone/info.json
+++ b/keyboards/sneakbox/aliceclone/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"],
+    "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "F7", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "D3", "pin_b": "D2", "resolution": 1}
@@ -19,24 +24,167 @@
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["alice", "alice_split_bs"],
+  "layout_aliases": {
+    "LAYOUT_all": "LAYOUT_alice_split_bs"
+  },
   "layouts": {
-      "LAYOUT_alice_split_bs": {
-          "layout": [
-              {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0},
-              {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
-              {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
-              {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
-              {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
-			]
-      },
-      "LAYOUT_alice": {
-          "layout": [
-              {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0, "w":2},
-              {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
-              {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
-              {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
-              {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
-            ]
-      }
+    "LAYOUT_alice": {
+      "layout": [
+        {"matrix": [2, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 10.25, "y": 0},
+        {"matrix": [1, 1], "x": 11.25, "y": 0},
+        {"matrix": [1, 2], "x": 12.25, "y": 0},
+        {"matrix": [1, 3], "x": 13.25, "y": 0},
+        {"matrix": [1, 4], "x": 14.25, "y": 0},
+        {"matrix": [1, 5], "x": 15.25, "y": 0},
+        {"matrix": [1, 6], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 1},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [2, 2], "x": 2.75, "y": 1},
+        {"matrix": [2, 3], "x": 3.75, "y": 1},
+        {"matrix": [2, 4], "x": 4.75, "y": 1},
+        {"matrix": [2, 5], "x": 5.75, "y": 1},
+        {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [3, 0], "x": 9.75, "y": 1},
+        {"matrix": [3, 1], "x": 10.75, "y": 1},
+        {"matrix": [3, 2], "x": 11.75, "y": 1},
+        {"matrix": [3, 3], "x": 12.75, "y": 1},
+        {"matrix": [3, 4], "x": 13.75, "y": 1},
+        {"matrix": [3, 5], "x": 14.75, "y": 1},
+        {"matrix": [3, 6], "x": 15.75, "y": 1},
+        {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 2},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [4, 2], "x": 3, "y": 2},
+        {"matrix": [4, 3], "x": 4, "y": 2},
+        {"matrix": [4, 4], "x": 5, "y": 2},
+        {"matrix": [4, 5], "x": 6, "y": 2},
+        {"matrix": [4, 6], "x": 7, "y": 2},
+
+        {"matrix": [5, 0], "x": 10, "y": 2},
+        {"matrix": [5, 1], "x": 11, "y": 2},
+        {"matrix": [5, 2], "x": 12, "y": 2},
+        {"matrix": [5, 3], "x": 13, "y": 2},
+        {"matrix": [5, 4], "x": 14, "y": 2},
+        {"matrix": [5, 5], "x": 15, "y": 2},
+        {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [6, 2], "x": 3.5, "y": 3},
+        {"matrix": [6, 3], "x": 4.5, "y": 3},
+        {"matrix": [6, 4], "x": 5.5, "y": 3},
+        {"matrix": [6, 5], "x": 6.5, "y": 3},
+        {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [7, 0], "x": 9.5, "y": 3},
+        {"matrix": [7, 1], "x": 10.5, "y": 3},
+        {"matrix": [7, 2], "x": 11.5, "y": 3},
+        {"matrix": [7, 3], "x": 12.5, "y": 3},
+        {"matrix": [7, 4], "x": 13.5, "y": 3},
+        {"matrix": [7, 5], "x": 14.5, "y": 3},
+        {"matrix": [7, 6], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [7, 7], "x": 17.25, "y": 3},
+
+        {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [8, 3], "x": 4, "y": 4, "w": 1.5},
+        {"matrix": [8, 5], "x": 5.5, "y": 4, "w": 2.25},
+        {"matrix": [8, 6], "x": 7.75, "y": 4},
+        {"matrix": [9, 1], "x": 9.75, "y": 4, "w": 2.75},
+        {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+        {"matrix": [9, 7], "x": 16.75, "y": 4, "w": 1.5}
+      ]
+    },
+    "LAYOUT_alice_split_bs": {
+      "layout": [
+        {"matrix": [2, 0], "x": 0, "y": 0},
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 10.25, "y": 0},
+        {"matrix": [1, 1], "x": 11.25, "y": 0},
+        {"matrix": [1, 2], "x": 12.25, "y": 0},
+        {"matrix": [1, 3], "x": 13.25, "y": 0},
+        {"matrix": [1, 4], "x": 14.25, "y": 0},
+        {"matrix": [1, 5], "x": 15.25, "y": 0},
+        {"matrix": [1, 6], "x": 16.25, "y": 0},
+        {"matrix": [1, 7], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 0], "x": 0, "y": 1},
+        {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [2, 2], "x": 2.75, "y": 1},
+        {"matrix": [2, 3], "x": 3.75, "y": 1},
+        {"matrix": [2, 4], "x": 4.75, "y": 1},
+        {"matrix": [2, 5], "x": 5.75, "y": 1},
+        {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [3, 0], "x": 9.75, "y": 1},
+        {"matrix": [3, 1], "x": 10.75, "y": 1},
+        {"matrix": [3, 2], "x": 11.75, "y": 1},
+        {"matrix": [3, 3], "x": 12.75, "y": 1},
+        {"matrix": [3, 4], "x": 13.75, "y": 1},
+        {"matrix": [3, 5], "x": 14.75, "y": 1},
+        {"matrix": [3, 6], "x": 15.75, "y": 1},
+        {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 2},
+        {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [4, 2], "x": 3, "y": 2},
+        {"matrix": [4, 3], "x": 4, "y": 2},
+        {"matrix": [4, 4], "x": 5, "y": 2},
+        {"matrix": [4, 5], "x": 6, "y": 2},
+        {"matrix": [4, 6], "x": 7, "y": 2},
+
+        {"matrix": [5, 0], "x": 10, "y": 2},
+        {"matrix": [5, 1], "x": 11, "y": 2},
+        {"matrix": [5, 2], "x": 12, "y": 2},
+        {"matrix": [5, 3], "x": 13, "y": 2},
+        {"matrix": [5, 4], "x": 14, "y": 2},
+        {"matrix": [5, 5], "x": 15, "y": 2},
+        {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [6, 2], "x": 3.5, "y": 3},
+        {"matrix": [6, 3], "x": 4.5, "y": 3},
+        {"matrix": [6, 4], "x": 5.5, "y": 3},
+        {"matrix": [6, 5], "x": 6.5, "y": 3},
+        {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [7, 0], "x": 9.5, "y": 3},
+        {"matrix": [7, 1], "x": 10.5, "y": 3},
+        {"matrix": [7, 2], "x": 11.5, "y": 3},
+        {"matrix": [7, 3], "x": 12.5, "y": 3},
+        {"matrix": [7, 4], "x": 13.5, "y": 3},
+        {"matrix": [7, 5], "x": 14.5, "y": 3},
+        {"matrix": [7, 6], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [7, 7], "x": 17.25, "y": 3},
+
+        {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [8, 3], "x": 4, "y": 4, "w": 1.5},
+        {"matrix": [8, 5], "x": 5.5, "y": 4, "w": 2.25},
+        {"matrix": [8, 6], "x": 7.75, "y": 4},
+        {"matrix": [9, 1], "x": 9.75, "y": 4, "w": 2.75},
+        {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+        {"matrix": [9, 7], "x": 16.75, "y": 4, "w": 1.5}
+      ]
+    }
   }
 }
diff --git a/keyboards/sneakbox/aliceclonergb/aliceclonergb.c b/keyboards/sneakbox/aliceclonergb/aliceclonergb.c
deleted file mode 100644
index e2136312d3..0000000000
--- a/keyboards/sneakbox/aliceclonergb/aliceclonergb.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "aliceclonergb.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index,clockwise)) { return false; }
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_DOWN);
-        } else {
-            tap_code(KC_UP);
-        }
-    } 
-    return true;
-}
-#endif
diff --git a/keyboards/sneakbox/aliceclonergb/aliceclonergb.h b/keyboards/sneakbox/aliceclonergb/aliceclonergb.h
deleted file mode 100644
index a946202ba4..0000000000
--- a/keyboards/sneakbox/aliceclonergb/aliceclonergb.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all LAYOUT_alice_split_bs
-
-#define LAYOUT_alice_split_bs( \
-	K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015, K016, K017, \
-	K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
-	K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
-	        K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
-	        K081,                   K083, K085, K086,       K091, K093,                               K097  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  KC_NO }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
-	{ KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  KC_NO }, \
-	{ KC_NO, K091,  KC_NO, K093,  KC_NO, KC_NO, KC_NO, K097 }  \
-}
-
-#define LAYOUT_alice( \
-    K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015,       K016, \
-    K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
-    K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
-            K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
-            K081,                   K083, K085, K086,       K091, K093,                               K097  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO }, \
-    { K010,  K011,  K012,  K013,  K014,  K015,  K016,  KC_NO }, \
-    { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
-    { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO }, \
-    { K050,  K051,  K052,  K053,  K054,  K055,  K056,  KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO }, \
-    { K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
-    { KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  KC_NO }, \
-    { KC_NO, K091,  KC_NO, K093,  KC_NO, KC_NO, KC_NO, K097 }  \
-}
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
index 26bddb382a..ceccc0915b 100644
--- a/keyboards/sneakbox/aliceclonergb/config.h
+++ b/keyboards/sneakbox/aliceclonergb/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 }
-#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json
index cb7226ae81..e16645e735 100644
--- a/keyboards/sneakbox/aliceclonergb/info.json
+++ b/keyboards/sneakbox/aliceclonergb/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0006",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"],
+    "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "F7", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "D3", "pin_b": "D2", "resolution": 1}
@@ -21,27 +26,176 @@
   "bootmagic": {
     "matrix": [2, 0]
   },
+  "ws2812": {
+    "pin": "D5"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["alice", "alice_split_bs"],
+  "layout_aliases": {
+    "LAYOUT_all": "LAYOUT_alice_split_bs"
+  },
   "layouts": {
-      "LAYOUT_alice_split_bs": {
-          "layout": [
-              {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0},
-              {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
-              {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
-              {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
-              {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
-			]
-      },
-      "LAYOUT_alice": {
-          "layout": [
-              {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0, "w":2},
-              {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
-              {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
-              {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
-              {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
-            ]
-      }
+    "LAYOUT_alice_split_bs": {
+      "layout": [
+        {"matrix": [2, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 10.25, "y": 0},
+        {"matrix": [1, 1], "x": 11.25, "y": 0},
+        {"matrix": [1, 2], "x": 12.25, "y": 0},
+        {"matrix": [1, 3], "x": 13.25, "y": 0},
+        {"matrix": [1, 4], "x": 14.25, "y": 0},
+        {"matrix": [1, 5], "x": 15.25, "y": 0},
+        {"matrix": [1, 6], "x": 16.25, "y": 0},
+        {"matrix": [1, 7], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 0], "x": 0, "y": 1},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [2, 2], "x": 2.75, "y": 1},
+        {"matrix": [2, 3], "x": 3.75, "y": 1},
+        {"matrix": [2, 4], "x": 4.75, "y": 1},
+        {"matrix": [2, 5], "x": 5.75, "y": 1},
+        {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [3, 0], "x": 9.75, "y": 1},
+        {"matrix": [3, 1], "x": 10.75, "y": 1},
+        {"matrix": [3, 2], "x": 11.75, "y": 1},
+        {"matrix": [3, 3], "x": 12.75, "y": 1},
+        {"matrix": [3, 4], "x": 13.75, "y": 1},
+        {"matrix": [3, 5], "x": 14.75, "y": 1},
+        {"matrix": [3, 6], "x": 15.75, "y": 1},
+        {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 2},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [4, 2], "x": 3, "y": 2},
+        {"matrix": [4, 3], "x": 4, "y": 2},
+        {"matrix": [4, 4], "x": 5, "y": 2},
+        {"matrix": [4, 5], "x": 6, "y": 2},
+        {"matrix": [4, 6], "x": 7, "y": 2},
+
+        {"matrix": [5, 0], "x": 10, "y": 2},
+        {"matrix": [5, 1], "x": 11, "y": 2},
+        {"matrix": [5, 2], "x": 12, "y": 2},
+        {"matrix": [5, 3], "x": 13, "y": 2},
+        {"matrix": [5, 4], "x": 14, "y": 2},
+        {"matrix": [5, 5], "x": 15, "y": 2},
+        {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [6, 2], "x": 3.5, "y": 3},
+        {"matrix": [6, 3], "x": 4.5, "y": 3},
+        {"matrix": [6, 4], "x": 5.5, "y": 3},
+        {"matrix": [6, 5], "x": 6.5, "y": 3},
+        {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [7, 0], "x": 9.5, "y": 3},
+        {"matrix": [7, 1], "x": 10.5, "y": 3},
+        {"matrix": [7, 2], "x": 11.5, "y": 3},
+        {"matrix": [7, 3], "x": 12.5, "y": 3},
+        {"matrix": [7, 4], "x": 13.5, "y": 3},
+        {"matrix": [7, 5], "x": 14.5, "y": 3},
+        {"matrix": [7, 6], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [7, 7], "x": 17.25, "y": 3},
+
+        {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [8, 3], "x": 4, "y": 4, "w": 1.5},
+        {"matrix": [8, 5], "x": 5.5, "y": 4, "w": 2.25},
+        {"matrix": [8, 6], "x": 7.75, "y": 4},
+        {"matrix": [9, 1], "x": 9.75, "y": 4, "w": 2.75},
+        {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+        {"matrix": [9, 7], "x": 16.75, "y": 4, "w": 1.5}
+      ]
+    },
+    "LAYOUT_alice": {
+      "layout": [
+        {"matrix": [2, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+        {"matrix": [1, 0], "x": 10.25, "y": 0},
+        {"matrix": [1, 1], "x": 11.25, "y": 0},
+        {"matrix": [1, 2], "x": 12.25, "y": 0},
+        {"matrix": [1, 3], "x": 13.25, "y": 0},
+        {"matrix": [1, 4], "x": 14.25, "y": 0},
+        {"matrix": [1, 5], "x": 15.25, "y": 0},
+        {"matrix": [1, 6], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 1},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [2, 2], "x": 2.75, "y": 1},
+        {"matrix": [2, 3], "x": 3.75, "y": 1},
+        {"matrix": [2, 4], "x": 4.75, "y": 1},
+        {"matrix": [2, 5], "x": 5.75, "y": 1},
+        {"matrix": [2, 6], "x": 6.75, "y": 1},
+        {"matrix": [3, 0], "x": 9.75, "y": 1},
+
+        {"matrix": [3, 1], "x": 10.75, "y": 1},
+        {"matrix": [3, 2], "x": 11.75, "y": 1},
+        {"matrix": [3, 3], "x": 12.75, "y": 1},
+        {"matrix": [3, 4], "x": 13.75, "y": 1},
+        {"matrix": [3, 5], "x": 14.75, "y": 1},
+        {"matrix": [3, 6], "x": 15.75, "y": 1},
+        {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 2},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [4, 2], "x": 3, "y": 2},
+        {"matrix": [4, 3], "x": 4, "y": 2},
+        {"matrix": [4, 4], "x": 5, "y": 2},
+        {"matrix": [4, 5], "x": 6, "y": 2},
+        {"matrix": [4, 6], "x": 7, "y": 2},
+
+        {"matrix": [5, 0], "x": 10, "y": 2},
+        {"matrix": [5, 1], "x": 11, "y": 2},
+        {"matrix": [5, 2], "x": 12, "y": 2},
+        {"matrix": [5, 3], "x": 13, "y": 2},
+        {"matrix": [5, 4], "x": 14, "y": 2},
+        {"matrix": [5, 5], "x": 15, "y": 2},
+        {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [6, 2], "x": 3.5, "y": 3},
+        {"matrix": [6, 3], "x": 4.5, "y": 3},
+        {"matrix": [6, 4], "x": 5.5, "y": 3},
+        {"matrix": [6, 5], "x": 6.5, "y": 3},
+        {"matrix": [6, 6], "x": 7.5, "y": 3},
+        {"matrix": [7, 0], "x": 9.5, "y": 3},
+
+        {"matrix": [7, 1], "x": 10.5, "y": 3},
+        {"matrix": [7, 2], "x": 11.5, "y": 3},
+        {"matrix": [7, 3], "x": 12.5, "y": 3},
+        {"matrix": [7, 4], "x": 13.5, "y": 3},
+        {"matrix": [7, 5], "x": 14.5, "y": 3},
+        {"matrix": [7, 6], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [7, 7], "x": 17.25, "y": 3},
+
+        {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [8, 3], "x": 4, "y": 4, "w": 1.5},
+        {"matrix": [8, 5], "x": 5.5, "y": 4, "w": 2.25},
+        {"matrix": [8, 6], "x": 7.75, "y": 4},
+        {"matrix": [9, 1], "x": 9.75, "y": 4, "w": 2.75},
+        {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+        {"matrix": [9, 7], "x": 16.75, "y": 4, "w": 1.5}
+      ]
+    }
   }
 }
diff --git a/keyboards/sneakbox/ava/ava.c b/keyboards/sneakbox/ava/ava.c
index c1b7c76cda..807943c0e9 100644
--- a/keyboards/sneakbox/ava/ava.c
+++ b/keyboards/sneakbox/ava/ava.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ava.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index,clockwise)) { return false; }
diff --git a/keyboards/sneakbox/ava/ava.h b/keyboards/sneakbox/ava/ava.h
deleted file mode 100644
index f3aae119d0..0000000000
--- a/keyboards/sneakbox/ava/ava.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-	K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015, K016, K017, \
-	K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
-	K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
-	K007,   K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
-	        K027, K047,             K057, K067,                   K081, K083,             K085, K086, K087  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067	}, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
-	{ KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  K087 }  \
-}
-
-#define LAYOUT_alice( \
-	K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015,       K017, \
-	K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
-	K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
-	K007,   K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
-	        K027, K047,             K057, K067,                   K081, K083,             K085, K086, K087  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  KC_NO, K017 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067	}, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
-	{ KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  K087 }  \
-}
-
diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h
index 23a0132305..a97d34f7f2 100644
--- a/keyboards/sneakbox/ava/config.h
+++ b/keyboards/sneakbox/ava/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, B7 }
-#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json
index 723fe70fb9..693794e031 100644
--- a/keyboards/sneakbox/ava/info.json
+++ b/keyboards/sneakbox/ava/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0004",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"],
+    "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "D3", "pin_b": "D2", "resolution": 1}
@@ -17,6 +22,9 @@
     "caps_lock": "D6",
     "num_lock": "D4"
   },
+  "ws2812": {
+    "pin": "F7"
+  },
   "bootmagic": {
     "matrix": [2, 0]
   },
@@ -28,23 +36,174 @@
     "LAYOUT_ava": "LAYOUT_alice"
   },
   "layouts": {
-      "LAYOUT_alice_split_bs": {
-          "layout": [
-              {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0},
-              {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
-              {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
-              {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.65, "y":3.25}, {"x":16.75, "y":3, "w":1.5},
-              {"x":1.25, "y":4, "w":1.5}, {"x":2.75, "y":4}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25}
-			]
-      },
-      "LAYOUT_alice": {
-          "layout": [
-              {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0, "w":2},
-              {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
-              {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
-              {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.65, "y":3.25}, {"x":16.75, "y":3, "w":1.5},
-              {"x":1.25, "y":4, "w":1.5}, {"x":2.75, "y":4}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25}
-            ]
-      }
+    "LAYOUT_alice_split_bs": {
+      "layout": [
+        {"matrix": [2, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 10.25, "y": 0},
+        {"matrix": [1, 1], "x": 11.25, "y": 0},
+        {"matrix": [1, 2], "x": 12.25, "y": 0},
+        {"matrix": [1, 3], "x": 13.25, "y": 0},
+        {"matrix": [1, 4], "x": 14.25, "y": 0},
+        {"matrix": [1, 5], "x": 15.25, "y": 0},
+        {"matrix": [1, 6], "x": 16.25, "y": 0},
+        {"matrix": [1, 7], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 0], "x": 0, "y": 1},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [2, 2], "x": 2.75, "y": 1},
+        {"matrix": [2, 3], "x": 3.75, "y": 1},
+        {"matrix": [2, 4], "x": 4.75, "y": 1},
+        {"matrix": [2, 5], "x": 5.75, "y": 1},
+        {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [3, 0], "x": 9.75, "y": 1},
+        {"matrix": [3, 1], "x": 10.75, "y": 1},
+        {"matrix": [3, 2], "x": 11.75, "y": 1},
+        {"matrix": [3, 3], "x": 12.75, "y": 1},
+        {"matrix": [3, 4], "x": 13.75, "y": 1},
+        {"matrix": [3, 5], "x": 14.75, "y": 1},
+        {"matrix": [3, 6], "x": 15.75, "y": 1},
+        {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 2},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [4, 2], "x": 3, "y": 2},
+        {"matrix": [4, 3], "x": 4, "y": 2},
+        {"matrix": [4, 4], "x": 5, "y": 2},
+        {"matrix": [4, 5], "x": 6, "y": 2},
+        {"matrix": [4, 6], "x": 7, "y": 2},
+
+        {"matrix": [5, 0], "x": 10, "y": 2},
+        {"matrix": [5, 1], "x": 11, "y": 2},
+        {"matrix": [5, 2], "x": 12, "y": 2},
+        {"matrix": [5, 3], "x": 13, "y": 2},
+        {"matrix": [5, 4], "x": 14, "y": 2},
+        {"matrix": [5, 5], "x": 15, "y": 2},
+        {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [0, 7], "x": 0, "y": 3},
+
+        {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [6, 2], "x": 3.5, "y": 3},
+        {"matrix": [6, 3], "x": 4.5, "y": 3},
+        {"matrix": [6, 4], "x": 5.5, "y": 3},
+        {"matrix": [6, 5], "x": 6.5, "y": 3},
+        {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [7, 0], "x": 9.5, "y": 3},
+        {"matrix": [7, 1], "x": 10.5, "y": 3},
+        {"matrix": [7, 2], "x": 11.5, "y": 3},
+        {"matrix": [7, 3], "x": 12.5, "y": 3},
+        {"matrix": [7, 4], "x": 13.5, "y": 3},
+        {"matrix": [7, 5], "x": 14.5, "y": 3},
+        {"matrix": [7, 6], "x": 15.65, "y": 3.25},
+        {"matrix": [7, 7], "x": 16.75, "y": 3, "w": 1.5},
+
+        {"matrix": [2, 7], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 2.75, "y": 4},
+        {"matrix": [5, 7], "x": 5, "y": 4, "w": 1.5},
+        {"matrix": [6, 7], "x": 6.5, "y": 4, "w": 2.25},
+        {"matrix": [8, 1], "x": 9.75, "y": 4, "w": 2.75},
+        {"matrix": [8, 3], "x": 12.5, "y": 4},
+        {"matrix": [8, 5], "x": 14.65, "y": 4.25},
+        {"matrix": [8, 6], "x": 15.65, "y": 4.25},
+        {"matrix": [8, 7], "x": 16.65, "y": 4.25}
+      ]
+    },
+    "LAYOUT_alice": {
+      "layout": [
+        {"matrix": [2, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 10.25, "y": 0},
+        {"matrix": [1, 1], "x": 11.25, "y": 0},
+        {"matrix": [1, 2], "x": 12.25, "y": 0},
+        {"matrix": [1, 3], "x": 13.25, "y": 0},
+        {"matrix": [1, 4], "x": 14.25, "y": 0},
+        {"matrix": [1, 5], "x": 15.25, "y": 0},
+        {"matrix": [1, 7], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 1},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [2, 2], "x": 2.75, "y": 1},
+        {"matrix": [2, 3], "x": 3.75, "y": 1},
+        {"matrix": [2, 4], "x": 4.75, "y": 1},
+        {"matrix": [2, 5], "x": 5.75, "y": 1},
+        {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [3, 0], "x": 9.75, "y": 1},
+        {"matrix": [3, 1], "x": 10.75, "y": 1},
+        {"matrix": [3, 2], "x": 11.75, "y": 1},
+        {"matrix": [3, 3], "x": 12.75, "y": 1},
+        {"matrix": [3, 4], "x": 13.75, "y": 1},
+        {"matrix": [3, 5], "x": 14.75, "y": 1},
+        {"matrix": [3, 6], "x": 15.75, "y": 1},
+        {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 2},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [4, 2], "x": 3, "y": 2},
+        {"matrix": [4, 3], "x": 4, "y": 2},
+        {"matrix": [4, 4], "x": 5, "y": 2},
+        {"matrix": [4, 5], "x": 6, "y": 2},
+        {"matrix": [4, 6], "x": 7, "y": 2},
+
+        {"matrix": [5, 0], "x": 10, "y": 2},
+        {"matrix": [5, 1], "x": 11, "y": 2},
+        {"matrix": [5, 2], "x": 12, "y": 2},
+        {"matrix": [5, 3], "x": 13, "y": 2},
+        {"matrix": [5, 4], "x": 14, "y": 2},
+        {"matrix": [5, 5], "x": 15, "y": 2},
+        {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [0, 7], "x": 0, "y": 3},
+
+        {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [6, 2], "x": 3.5, "y": 3},
+        {"matrix": [6, 3], "x": 4.5, "y": 3},
+        {"matrix": [6, 4], "x": 5.5, "y": 3},
+        {"matrix": [6, 5], "x": 6.5, "y": 3},
+        {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [7, 0], "x": 9.5, "y": 3},
+        {"matrix": [7, 1], "x": 10.5, "y": 3},
+        {"matrix": [7, 2], "x": 11.5, "y": 3},
+        {"matrix": [7, 3], "x": 12.5, "y": 3},
+        {"matrix": [7, 4], "x": 13.5, "y": 3},
+        {"matrix": [7, 5], "x": 14.5, "y": 3},
+        {"matrix": [7, 6], "x": 15.65, "y": 3.25},
+        {"matrix": [7, 7], "x": 16.75, "y": 3, "w": 1.5},
+
+        {"matrix": [2, 7], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 2.75, "y": 4},
+        {"matrix": [5, 7], "x": 5, "y": 4, "w": 1.5},
+        {"matrix": [6, 7], "x": 6.5, "y": 4, "w": 2.25},
+        {"matrix": [8, 1], "x": 9.75, "y": 4, "w": 2.75},
+        {"matrix": [8, 3], "x": 12.5, "y": 4},
+        {"matrix": [8, 5], "x": 14.65, "y": 4.25},
+        {"matrix": [8, 6], "x": 15.65, "y": 4.25},
+        {"matrix": [8, 7], "x": 16.65, "y": 4.25}
+      ]
+    }
   }
 }
diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h
index 78b024604c..25382dd5f1 100644
--- a/keyboards/sneakbox/disarray/ortho/config.h
+++ b/keyboards/sneakbox/disarray/ortho/config.h
@@ -17,32 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, B0}
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/info.json
index 65c8ff41d1..d832b56a73 100644
--- a/keyboards/sneakbox/disarray/ortho/info.json
+++ b/keyboards/sneakbox/disarray/ortho/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0003",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
+    "rows": ["B7", "D0", "D1", "D2", "D3", "B0"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B3", "pin_b": "B2", "resolution": 1}
diff --git a/keyboards/sneakbox/disarray/ortho/ortho.c b/keyboards/sneakbox/disarray/ortho/ortho.c
deleted file mode 100644
index d11c36b74c..0000000000
--- a/keyboards/sneakbox/disarray/ortho/ortho.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Bryan Ong
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ortho.h"
diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h
index 486442bcf1..25382dd5f1 100644
--- a/keyboards/sneakbox/disarray/staggered/config.h
+++ b/keyboards/sneakbox/disarray/staggered/config.h
@@ -17,32 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3}
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/sneakbox/disarray/staggered/info.json b/keyboards/sneakbox/disarray/staggered/info.json
index 1a788b77ec..a69447365a 100644
--- a/keyboards/sneakbox/disarray/staggered/info.json
+++ b/keyboards/sneakbox/disarray/staggered/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0002",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6"],
+    "rows": ["B7", "D0", "D1", "D2", "D3"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B3", "pin_b": "B2", "resolution": 1}
diff --git a/keyboards/sneakbox/disarray/staggered/staggered.c b/keyboards/sneakbox/disarray/staggered/staggered.c
deleted file mode 100644
index 247fc6eb5e..0000000000
--- a/keyboards/sneakbox/disarray/staggered/staggered.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "staggered.h"
-
diff --git a/keyboards/soda/cherish/cherish.c b/keyboards/soda/cherish/cherish.c
deleted file mode 100644
index 76b2481d25..0000000000
--- a/keyboards/soda/cherish/cherish.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2015 �lvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "cherish.h"
diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h
index 95d332cf95..9d07bd0dce 100644
--- a/keyboards/soda/cherish/config.h
+++ b/keyboards/soda/cherish/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A14, A15, B3, B4, B5, B6, B7, B8}
-#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -42,8 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define RGB_DI_PIN A13
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -58,4 +52,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
\ No newline at end of file
diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json
index 713356f944..447dcffa42 100644
--- a/keyboards/soda/cherish/info.json
+++ b/keyboards/soda/cherish/info.json
@@ -8,6 +8,14 @@
         "pid": "0xEB52",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A13"
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+        "rows": ["A7", "B0", "B1", "B2", "B10", "B11"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
diff --git a/keyboards/soda/pocket/config.h b/keyboards/soda/pocket/config.h
index 4b6ff7b4ab..053083f230 100644
--- a/keyboards/soda/pocket/config.h
+++ b/keyboards/soda/pocket/config.h
@@ -15,11 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { A2, A1, B14, B4, B5, B6, B7}
-#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 }
-#define DIODE_DIRECTION ROW2COL
-
 #define LED_NUM_LOCK_PIN B15
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -28,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 // enable NKRO_ENABLE
 #define FORCE_NKRO
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN C15
 // The number of LEDs connected
 
 #define RGB_MATRIX_LED_COUNT 34
diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json
index b91f795b04..dca3dfe4be 100644
--- a/keyboards/soda/pocket/info.json
+++ b/keyboards/soda/pocket/info.json
@@ -8,184 +8,66 @@
         "pid": "0x4F51",
         "device_version": "1.0.2"
     },
+    "ws2812": {
+        "pin": "C15"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"],
+        "rows": ["A7", "B0", "B1", "B2", "B10", "B11"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT": {
              "layout": [
-                {
-                    "label": "PrtSc",
-                    "x": 0,
-                    "y": 0.25
-                },
-                {
-                    "label": "Scroll Lock",
-                    "x": 1,
-                    "y": 0.25
-                },
-                {
-                    "label": "Pause",
-                    "x": 2,
-                    "y": 0.25
-                },
-                {
-                    "label": "Num Lock",
-                    "x": 3.25,
-                    "y": 0.25
-                },
-                {
-                    "label": "/",
-                    "x": 4.25,
-                    "y": 0.25
-                },
-                {
-                    "label": "*",
-                    "x": 5.25,
-                    "y": 0.25
-                },
-                {
-                    "label": "-",
-                    "x": 6.25,
-                    "y": 0.25
-                },
-                {
-                    "label": "Insert",
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "label": "Home",
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "label": "PgUp",
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "label": "Num Lock",
-                    "x": 3.25,
-                    "y": 1.5
-                },
-                {
-                    "label": "/",
-                    "x": 4.25,
-                    "y": 1.5
-                },
-                {
-                    "label": "*",
-                    "x": 5.25,
-                    "y": 1.5
-                },
-                {
-                    "label": "-",
-                    "x": 6.25,
-                    "y": 1.5
-                },
-                {
-                    "label": "Delete",
-                    "x": 0,
-                    "y": 2.5
-                },
-                {
-                    "label": "End",
-                    "x": 1,
-                    "y": 2.5
-                },
-                {
-                    "label": "PgDn",
-                    "x": 2,
-                    "y": 2.5
-                },
-                {
-                    "label": "7",
-                    "x": 3.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "8",
-                    "x": 4.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "9",
-                    "x": 5.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "+",
-                    "x": 6.25,
-                    "y": 2.5,
-                    "h": 2
-                },
-                {
-                    "label": "4",
-                    "x": 3.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "5",
-                    "x": 4.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "6",
-                    "x": 5.25,
-                    "y": 3.5
-                },
-                {
-                    "label": "\u2191",
-                    "x": 1,
-                    "y": 4.5
-                },
-                {
-                    "label": "1",
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "2",
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "3",
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "Enter",
-                    "x": 6.25,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "label": "\u2190",
-                    "x": 0,
-                    "y": 5.5
-                },
-                {
-                    "label": "\u2193",
-                    "x": 1,
-                    "y": 5.5
-                },
-                {
-                    "label": "\u2192",
-                    "x": 2,
-                    "y": 5.5
-                },
-                {
-                    "label": "0",
-                    "x": 3.25,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "label": ".",
-                    "x": 5.25,
-                    "y": 5.5
-                }
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+
+                {"x": 3.25, "y": 0},
+                {"x": 4.25, "y": 0},
+                {"x": 5.25, "y": 0},
+                {"x": 6.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+
+                {"x": 3.25, "y": 1.25},
+                {"x": 4.25, "y": 1.25},
+                {"x": 5.25, "y": 1.25},
+                {"x": 6.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25},
+                {"x": 1, "y": 2.25},
+                {"x": 2, "y": 2.25},
+
+                {"x": 3.25, "y": 2.25},
+                {"x": 4.25, "y": 2.25},
+                {"x": 5.25, "y": 2.25},
+                {"x": 6.25, "y": 2.25, "h": 2},
+
+                {"x": 3.25, "y": 3.25},
+                {"x": 4.25, "y": 3.25},
+                {"x": 5.25, "y": 3.25},
+
+                {"x": 1, "y": 4.25},
+
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25, "h": 2},
+
+                {"x": 0, "y": 5.25},
+                {"x": 1, "y": 5.25},
+                {"x": 2, "y": 5.25},
+
+                {"x": 3.25, "y": 5.25, "w": 2},
+                {"x": 5.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/soda/pocket/rules.mk b/keyboards/soda/pocket/rules.mk
index d8724cc6e6..27092ddbc6 100644
--- a/keyboards/soda/pocket/rules.mk
+++ b/keyboards/soda/pocket/rules.mk
@@ -1,5 +1,4 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h
index c65caad1de..80ad4912cb 100755
--- a/keyboards/sofle/keyhive/config.h
+++ b/keyboards/sofle/keyhive/config.h
@@ -18,14 +18,6 @@
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS       { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS       { B6, B2, B3, B1, F7, F6, NO_PIN } // A virtual pin is needed for the encoder key matrix in via.
-#define MATRIX_ROW_PINS_RIGHT { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { F6, F7, B1, B3, B2, B6, NO_PIN } // A virtual pin is needed for the encoder key matrix in via.
-
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY  10
 
 // OLED settings
@@ -39,7 +31,6 @@
 // Add RGB underglow
 // by defining in the keyboard, incompatible keymaps will fail to compile.
 #ifdef RGBLIGHT_ENABLE
-#    define RGB_DI_PIN D3
 #    define RGBLED_NUM 74
 #    define RGBLED_SPLIT {37,37}
 #    define RGBLIGHT_LIMIT_VAL 100 // LED Brightness, high power draw may exceed the USB limitations of 0.6A and cause a crash.
diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json
index f1d76cb788..dfbe30f133 100644
--- a/keyboards/sofle/keyhive/info.json
+++ b/keyboards/sofle/keyhive/info.json
@@ -6,6 +6,14 @@
         "pid": "0x1287",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", null],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F4"}
@@ -19,6 +27,12 @@
                     {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F6", "F7", "B1", "B3", "B2", "B6", null],
+                "rows": ["C6", "D7", "E6", "B4", "B5"]
+            }
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/sofle/keyhive/keyhive.c b/keyboards/sofle/keyhive/keyhive.c
deleted file mode 100755
index 72e2d583f1..0000000000
--- a/keyboards/sofle/keyhive/keyhive.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright
- *   2021 solartempest
- *   2021 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "keyhive.h"
diff --git a/keyboards/sofle/keymaps/bastien-baloup_fr/config.h b/keyboards/sofle/keymaps/bastien-baloup_fr/config.h
index f15cd7b8fb..dd3b6d8f5a 100644
--- a/keyboards/sofle/keymaps/bastien-baloup_fr/config.h
+++ b/keyboards/sofle/keymaps/bastien-baloup_fr/config.h
@@ -40,7 +40,7 @@
     #if defined(KEYBOARD_sofle_rev1)
 	    #define RGBLED_NUM 70
 	    // D3 for ws2812 RGB LED
-	    #define RGB_DI_PIN D3
+	    #define WS2812_DI_PIN D3
     #endif
 #endif
 
diff --git a/keyboards/sofle/keymaps/devdev/config.h b/keyboards/sofle/keymaps/devdev/config.h
index 6564238bba..7d14c6e337 100644
--- a/keyboards/sofle/keymaps/devdev/config.h
+++ b/keyboards/sofle/keymaps/devdev/config.h
@@ -45,7 +45,7 @@
 #define RGBLIGHT_LAYERS
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/sofle/keymaps/keyhive_via/encoder.c b/keyboards/sofle/keymaps/keyhive_via/encoder.c
index 0883c4a48a..7775cb7b86 100644
--- a/keyboards/sofle/keymaps/keyhive_via/encoder.c
+++ b/keyboards/sofle/keymaps/keyhive_via/encoder.c
@@ -26,7 +26,7 @@
     void encoder_action_unregister(void) {
         for (int index = 0; index < 2; ++index) {
             if (encoder_state[index]) {
-                keyevent_t encoder_event = (keyevent_t){.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, .time = (timer_read() | 1)};
+                keyevent_t encoder_event = (keyevent_t){.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, .time = timer_read(), .type = KEY_EVENT};
                 encoder_state[index] = 0;
                 action_exec(encoder_event);
             }
@@ -34,7 +34,7 @@
     }
 
     void encoder_action_register(uint8_t index, bool clockwise) {
-        keyevent_t encoder_event = (keyevent_t){.key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, .time = (timer_read() | 1)};
+        keyevent_t encoder_event = (keyevent_t){.key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, .time = timer_read(), .type = KEY_EVENT};
         encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
         action_exec(encoder_event);
     }
@@ -46,4 +46,3 @@
         return false;
     };
 #endif
-
diff --git a/keyboards/sofle/keymaps/killmaster/config.h b/keyboards/sofle/keymaps/killmaster/config.h
index e4649cc5be..10c9ea450e 100644
--- a/keyboards/sofle/keymaps/killmaster/config.h
+++ b/keyboards/sofle/keymaps/killmaster/config.h
@@ -20,7 +20,7 @@ see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness
 for more options.
 */
 
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h
index 6564238bba..7d14c6e337 100644
--- a/keyboards/sofle/keymaps/rgb_default/config.h
+++ b/keyboards/sofle/keymaps/rgb_default/config.h
@@ -45,7 +45,7 @@
 #define RGBLIGHT_LAYERS
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/sofle/keymaps/via/config.h b/keyboards/sofle/keymaps/via/config.h
index 2806b70b0f..d4bf95b710 100644
--- a/keyboards/sofle/keymaps/via/config.h
+++ b/keyboards/sofle/keymaps/via/config.h
@@ -24,7 +24,7 @@ for more options.
 
 #if defined(KEYBOARD_sofle_rev1)
 // Add RGB underglow and top facing lighting
-#    define RGB_DI_PIN D3
+#    define WS2812_DI_PIN D3
 #    define RGBLED_NUM 70
 #    define RGBLED_SPLIT \
         { 36, 36 }
diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h
index 34886b3be1..be64549748 100644
--- a/keyboards/sofle/rev1/config.h
+++ b/keyboards/sofle/rev1/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 100
 
 #define TAP_CODE_DELAY 10
diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/info.json
index 4a113ec2f2..1f9829426e 100644
--- a/keyboards/sofle/rev1/info.json
+++ b/keyboards/sofle/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0287",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
diff --git a/keyboards/sofle/rev1/rev1.c b/keyboards/sofle/rev1/rev1.c
index 88a28e6a40..567f8301e3 100644
--- a/keyboards/sofle/rev1/rev1.c
+++ b/keyboards/sofle/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sofle.h"
+#include "rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
   // Physical Layout
diff --git a/keyboards/sofle/sofle.c b/keyboards/sofle/sofle.c
index cdb8c1671a..bd3f3e157c 100644
--- a/keyboards/sofle/sofle.c
+++ b/keyboards/sofle/sofle.c
@@ -1,4 +1,4 @@
-#include "sofle.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 
diff --git a/keyboards/sofle/sofle.h b/keyboards/sofle/sofle.h
deleted file mode 100644
index 90ee00bfd7..0000000000
--- a/keyboards/sofle/sofle.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_sofle_rev1)
-#    include "rev1.h"
-#elif defined(KEYBOARD_sofle_keyhive)
-#    include "keyhive.h"
-#endif
diff --git a/keyboards/soup10/config.h b/keyboards/soup10/config.h
index fd11a7d1a9..f479b15794 100644
--- a/keyboards/soup10/config.h
+++ b/keyboards/soup10/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-//                        0   1   2   3
-#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { D7, E6, B4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/soup10/info.json b/keyboards/soup10/info.json
index e96e371d3e..7c22c087da 100644
--- a/keyboards/soup10/info.json
+++ b/keyboards/soup10/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4"],
+        "rows": ["D1", "D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [0, 1]
     },
@@ -16,16 +21,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K01 (D1,E6)", "x":1, "y":0},
-                {"label":"K10 (D0,D7)", "x":0, "y":1},
-                {"label":"K11 (D0,E6)", "x":1, "y":1},
-                {"label":"K12 (D0,B4)", "x":2, "y":1},
-                {"label":"K20 (D4,D7)", "x":0, "y":2},
-                {"label":"K21 (D4,E6)", "x":1, "y":2},
-                {"label":"K22 (D4,B4)", "x":2, "y":2},
-                {"label":"K30 (C6,D7)", "x":0, "y":3},
-                {"label":"K31 (C6,E6)", "x":1, "y":3},
-                {"label":"K32 (C6,B4)", "x":2, "y":3}
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3}
             ]
         }
     }
diff --git a/keyboards/soup10/soup10.c b/keyboards/soup10/soup10.c
deleted file mode 100644
index c08681392a..0000000000
--- a/keyboards/soup10/soup10.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 icesoup
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "soup10.h"
diff --git a/keyboards/soup10/soup10.h b/keyboards/soup10/soup10.h
deleted file mode 100644
index b4a2c14568..0000000000
--- a/keyboards/soup10/soup10.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 icesoup
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-         K01,      \
-    K10, K11, K12, \
-    K20, K21, K22, \
-    K30, K31, K32  \
-) { \
-    { KC_NO, K01,   KC_NO }, \
-    { K10,   K11,   K12 }, \
-    { K20,   K21,   K22 }, \
-    { K30,   K31,   K32 }  \
-}
diff --git a/keyboards/sowbug/68keys/68keys.c b/keyboards/sowbug/68keys/68keys.c
index d26a6bab56..8c7394d75b 100644
--- a/keyboards/sowbug/68keys/68keys.c
+++ b/keyboards/sowbug/68keys/68keys.c
@@ -14,9 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// 68keys.c
-
-#include "68keys.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/sowbug/68keys/68keys.h b/keyboards/sowbug/68keys/68keys.h
deleted file mode 100644
index 6f455154f1..0000000000
--- a/keyboards/sowbug/68keys/68keys.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Mike Tsao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// 68keys.h
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15, C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, E0, E1, E2, E3, E4, E5, E6, E7, E8, E9) \
-{ \
-    { A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15 }, \
-    { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15 }, \
-    { C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, KC_NO, KC_NO, KC_NO }, \
-    { D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, KC_NO, KC_NO, KC_NO }, \
-    { E0, E1, E2, E3, E4, E5, E6, E7, E8, E9, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
-
-#define LAYOUT LAYOUT_default
diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h
index 265cb24f07..04b1fced2b 100644
--- a/keyboards/sowbug/68keys/config.h
+++ b/keyboards/sowbug/68keys/config.h
@@ -18,16 +18,6 @@
 
 #pragma once
 
-
-// key matrix pins
-#define MATRIX_ROW_PINS { C14, C15, A0, A1, A2 }
-#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B10, B11, B12, B13, B14, B15, A8, A9, A10 }
-
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B9
-
 #define RGB_MATRIX_KEYPRESSES
 #define RGBLED_NUM 68
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json
index fef199e6cd..801140e04a 100644
--- a/keyboards/sowbug/68keys/info.json
+++ b/keyboards/sowbug/68keys/info.json
@@ -8,79 +8,101 @@
         "pid": "0x8888",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B9"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
+        "rows": ["C14", "C15", "A0", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_default"
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0},
-                {"label":"K05", "x":5, "y":0},
-                {"label":"K06", "x":6, "y":0},
-                {"label":"K07", "x":7, "y":0},
-                {"label":"K08", "x":8, "y":0},
-                {"label":"K09", "x":9, "y":0},
-                {"label":"K0A", "x":10, "y":0},
-                {"label":"K0B", "x":11, "y":0},
-                {"label":"K0C", "x":12, "y":0},
-                {"label":"K0E", "x":13, "y":0, "w":2},
-                {"label":"K0F", "x":15.25, "y":0},
-                {"label":"K0G", "x":16.25, "y":0},
-                {"label":"K10", "x":0, "y":1, "w":1.5},
-                {"label":"K12", "x":1.5, "y":1},
-                {"label":"K13", "x":2.5, "y":1},
-                {"label":"K14", "x":3.5, "y":1},
-                {"label":"K15", "x":4.5, "y":1},
-                {"label":"K16", "x":5.5, "y":1},
-                {"label":"K17", "x":6.5, "y":1},
-                {"label":"K18", "x":7.5, "y":1},
-                {"label":"K19", "x":8.5, "y":1},
-                {"label":"K1A", "x":9.5, "y":1},
-                {"label":"K1B", "x":10.5, "y":1},
-                {"label":"K1C", "x":11.5, "y":1},
-                {"label":"K1D", "x":12.5, "y":1},
-                {"label":"K1E", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F", "x":15.25, "y":1},
-                {"label":"K1G", "x":16.25, "y":1},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K22", "x":1.75, "y":2},
-                {"label":"K23", "x":2.75, "y":2},
-                {"label":"K24", "x":3.75, "y":2},
-                {"label":"K25", "x":4.75, "y":2},
-                {"label":"K26", "x":5.75, "y":2},
-                {"label":"K27", "x":6.75, "y":2},
-                {"label":"K28", "x":7.75, "y":2},
-                {"label":"K29", "x":8.75, "y":2},
-                {"label":"K2A", "x":9.75, "y":2},
-                {"label":"K2B", "x":10.75, "y":2},
-                {"label":"K2C", "x":11.75, "y":2},
-                {"label":"K2D", "x":12.75, "y":2, "w":2.25},
-                {"label":"K31", "x":0, "y":3, "w":2.25},
-                {"label":"K32", "x":2.25, "y":3},
-                {"label":"K33", "x":3.25, "y":3},
-                {"label":"K34", "x":4.25, "y":3},
-                {"label":"K35", "x":5.25, "y":3},
-                {"label":"K36", "x":6.25, "y":3},
-                {"label":"K37", "x":7.25, "y":3},
-                {"label":"K38", "x":8.25, "y":3},
-                {"label":"K39", "x":9.25, "y":3},
-                {"label":"K3A", "x":10.25, "y":3},
-                {"label":"K3B", "x":11.25, "y":3},
-                {"label":"K3D", "x":12.25, "y":3, "w":2.75},
-                {"label":"K3F", "x":15.25, "y":3},
-                {"label":"K40", "x":0, "y":4, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4, "w":1.25},
-                {"label":"K43", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A", "x":10, "y":4, "w":1.25},
-                {"label":"K4B", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E", "x":14.25, "y":4},
-                {"label":"K4F", "x":15.25, "y":4},
-                {"label":"K4G", "x":16.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 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": 2.75},
+
+                {"matrix": [3, 12], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 7], "x": 14.25, "y": 4},
+                {"matrix": [4, 8], "x": 15.25, "y": 4},
+                {"matrix": [4, 9], "x": 16.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/sowbug/68keys/rules.mk b/keyboards/sowbug/68keys/rules.mk
index 38a6bb6887..b7807ae418 100644
--- a/keyboards/sowbug/68keys/rules.mk
+++ b/keyboards/sowbug/68keys/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/sowbug/ansi_tkl/ansi_tkl.c b/keyboards/sowbug/ansi_tkl/ansi_tkl.c
index dc24631a8c..284cd612dd 100644
--- a/keyboards/sowbug/ansi_tkl/ansi_tkl.c
+++ b/keyboards/sowbug/ansi_tkl/ansi_tkl.c
@@ -14,9 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// ansi_tkl.c
-
-#include "ansi_tkl.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {{
diff --git a/keyboards/sowbug/ansi_tkl/ansi_tkl.h b/keyboards/sowbug/ansi_tkl/ansi_tkl.h
deleted file mode 100644
index bf32fc18ce..0000000000
--- a/keyboards/sowbug/ansi_tkl/ansi_tkl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Mike Tsao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// ansi_tkl.h
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15, B16, C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15, C16, D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, E0, E1, E2, E3, E4, E5, E6, E7, E8, E9, E10, E11, E12, F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10) \
-{ \
-    { A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, KC_NO }, \
-    { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15, B16 }, \
-    { C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15, C16 }, \
-    { D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { E0, E1, E2, E3, E4, E5, E6, E7, E8, E9, E10, E11, E12, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
-
-#define LAYOUT LAYOUT_default
diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h
index 770a48b14d..08c01e662d 100644
--- a/keyboards/sowbug/ansi_tkl/config.h
+++ b/keyboards/sowbug/ansi_tkl/config.h
@@ -18,17 +18,6 @@
 
 #pragma once
 
-
-// key matrix pins
-#define MATRIX_ROW_PINS \
-    { C14, C15, A0, A1, A2, A3 }
-#define MATRIX_COL_PINS \
-    { A4, A5, A6, A7, B0, B1, B10, B11, B12, B13, B14, B15, A8, A9, A10, A15, B3 }
-
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B9
 #define RGB_MATRIX_KEYPRESSES
 #define RGBLED_NUM 87
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json
index 30cef14f70..221c591738 100644
--- a/keyboards/sowbug/ansi_tkl/info.json
+++ b/keyboards/sowbug/ansi_tkl/info.json
@@ -8,98 +8,125 @@
         "pid": "0x8889",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B9"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3"],
+        "rows": ["C14", "C15", "A0", "A1", "A2", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_default"
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0},
-                {"label":"K05", "x":5, "y":0},
-                {"label":"K07", "x":6.5, "y":0},
-                {"label":"K08", "x":7.5, "y":0},
-                {"label":"K09", "x":8.5, "y":0},
-                {"label":"K0A", "x":9.5, "y":0},
-                {"label":"K0B", "x":11, "y":0},
-                {"label":"K0C", "x":12, "y":0},
-                {"label":"K0D", "x":13, "y":0},
-                {"label":"K0E", "x":14, "y":0},
-                {"label":"K0F", "x":15.25, "y":0},
-                {"label":"K0G", "x":16.25, "y":0},
-                {"label":"K0H", "x":17.25, "y":0},
-                {"label":"K20", "x":0, "y":1.5},
-                {"label":"K21", "x":1, "y":1.5},
-                {"label":"K22", "x":2, "y":1.5},
-                {"label":"K23", "x":3, "y":1.5},
-                {"label":"K24", "x":4, "y":1.5},
-                {"label":"K25", "x":5, "y":1.5},
-                {"label":"K26", "x":6, "y":1.5},
-                {"label":"K27", "x":7, "y":1.5},
-                {"label":"K28", "x":8, "y":1.5},
-                {"label":"K29", "x":9, "y":1.5},
-                {"label":"K2A", "x":10, "y":1.5},
-                {"label":"K2B", "x":11, "y":1.5},
-                {"label":"K2C", "x":12, "y":1.5},
-                {"label":"K2E", "x":13, "y":1.5, "w":2},
-                {"label":"K2F", "x":15.25, "y":1.5},
-                {"label":"K2G", "x":16.25, "y":1.5},
-                {"label":"K2H", "x":17.25, "y":1.5},
-                {"label":"K30", "x":0, "y":2.5, "w":1.5},
-                {"label":"K32", "x":1.5, "y":2.5},
-                {"label":"K33", "x":2.5, "y":2.5},
-                {"label":"K34", "x":3.5, "y":2.5},
-                {"label":"K35", "x":4.5, "y":2.5},
-                {"label":"K36", "x":5.5, "y":2.5},
-                {"label":"K37", "x":6.5, "y":2.5},
-                {"label":"K38", "x":7.5, "y":2.5},
-                {"label":"K39", "x":8.5, "y":2.5},
-                {"label":"K3A", "x":9.5, "y":2.5},
-                {"label":"K3B", "x":10.5, "y":2.5},
-                {"label":"K3C", "x":11.5, "y":2.5},
-                {"label":"K3D", "x":12.5, "y":2.5},
-                {"label":"K3E", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K3F", "x":15.25, "y":2.5},
-                {"label":"K3G", "x":16.25, "y":2.5},
-                {"label":"K3H", "x":17.25, "y":2.5},
-                {"label":"K40", "x":0, "y":3.5, "w":1.75},
-                {"label":"K42", "x":1.75, "y":3.5},
-                {"label":"K43", "x":2.75, "y":3.5},
-                {"label":"K44", "x":3.75, "y":3.5},
-                {"label":"K45", "x":4.75, "y":3.5},
-                {"label":"K46", "x":5.75, "y":3.5},
-                {"label":"K47", "x":6.75, "y":3.5},
-                {"label":"K48", "x":7.75, "y":3.5},
-                {"label":"K49", "x":8.75, "y":3.5},
-                {"label":"K4A", "x":9.75, "y":3.5},
-                {"label":"K4B", "x":10.75, "y":3.5},
-                {"label":"K4C", "x":11.75, "y":3.5},
-                {"label":"K4D", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K51", "x":0, "y":4.5, "w":2.25},
-                {"label":"K52", "x":2.25, "y":4.5},
-                {"label":"K53", "x":3.25, "y":4.5},
-                {"label":"K54", "x":4.25, "y":4.5},
-                {"label":"K55", "x":5.25, "y":4.5},
-                {"label":"K56", "x":6.25, "y":4.5},
-                {"label":"K57", "x":7.25, "y":4.5},
-                {"label":"K58", "x":8.25, "y":4.5},
-                {"label":"K59", "x":9.25, "y":4.5},
-                {"label":"K5A", "x":10.25, "y":4.5},
-                {"label":"K5B", "x":11.25, "y":4.5},
-                {"label":"K5D", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"K5G", "x":16.25, "y":4.5},
-                {"label":"K60", "x":0, "y":5.5, "w":1.25},
-                {"label":"K61", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K63", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K66", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K6A", "x":10, "y":5.5, "w":1.25},
-                {"label":"K6B", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"K6D", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"K6E", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"K6F", "x":15.25, "y":5.5},
-                {"label":"K6G", "x":16.25, "y":5.5},
-                {"label":"K6H", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/sowbug/ansi_tkl/rules.mk b/keyboards/sowbug/ansi_tkl/rules.mk
index 38a6bb6887..b7807ae418 100644
--- a/keyboards/sowbug/ansi_tkl/rules.mk
+++ b/keyboards/sowbug/ansi_tkl/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h
index 19ca0d46e5..14fc40cd62 100644
--- a/keyboards/soy20/config.h
+++ b/keyboards/soy20/config.h
@@ -16,33 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, B6, B7, C7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/soy20/info.json b/keyboards/soy20/info.json
index 4add710d13..717a3245af 100644
--- a/keyboards/soy20/info.json
+++ b/keyboards/soy20/info.json
@@ -8,32 +8,41 @@
         "pid": "0x534F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B7", "C7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x4"],
     "layouts": {
         "LAYOUT_ortho_5x4": {
             "layout": [
-                {"label":"K00 (B0,B5)", "x":0, "y":0},
-                {"label":"K01 (B0,B6)", "x":1, "y":0},
-                {"label":"K02 (B0,B7)", "x":2, "y":0},
-                {"label":"K03 (B0,C7)", "x":3, "y":0},
-                {"label":"K10 (B1,B5)", "x":0, "y":1},
-                {"label":"K11 (B1,B6)", "x":1, "y":1},
-                {"label":"K12 (B1,B7)", "x":2, "y":1},
-                {"label":"K13 (B1,C7)", "x":3, "y":1},
-                {"label":"K20 (B2,B5)", "x":0, "y":2},
-                {"label":"K21 (B2,B6)", "x":1, "y":2},
-                {"label":"K22 (B2,B7)", "x":2, "y":2},
-                {"label":"K23 (B2,C7)", "x":3, "y":2},
-                {"label":"K30 (B3,B5)", "x":0, "y":3},
-                {"label":"K31 (B3,B6)", "x":1, "y":3},
-                {"label":"K32 (B3,B7)", "x":2, "y":3},
-                {"label":"K33 (B3,C7)", "x":3, "y":3},
-                {"label":"K40 (B4,B5)", "x":0, "y":4},
-                {"label":"K41 (B4,B6)", "x":1, "y":4},
-                {"label":"K42 (B4,B7)", "x":2, "y":4},
-                {"label":"K43 (B4,C7)", "x":3, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
             ]
         }
     }
diff --git a/keyboards/soy20/soy20.c b/keyboards/soy20/soy20.c
deleted file mode 100644
index 1b259e8d88..0000000000
--- a/keyboards/soy20/soy20.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Soy20 PCB}}
-Copyright (C) {{ 2020 }}  {{ Drewkeys }}
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
-
-
-#include "soy20.h"
diff --git a/keyboards/soy20/soy20.h b/keyboards/soy20/soy20.h
deleted file mode 100644
index c29b04f93d..0000000000
--- a/keyboards/soy20/soy20.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Soy20 PCB}}
-Copyright (C) {{ 2020 }}  {{ Drewkeys }}
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33, \
-	K40, K41, K42, K43  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ K30,   K31,   K32,   K33 }, \
-	{ K40,   K41,   K42,   K43 }  \
-}
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index fb56b1ddda..bfebbd8f5e 100755
--- a/keyboards/spaceholdings/nebula12/config.h
+++ b/keyboards/spaceholdings/nebula12/config.h
@@ -24,13 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LSE clock */
 #define STM32_LSECLK 32768
 
-#define MATRIX_ROW_PINS { A8, C15, A0, A1 }
-#define MATRIX_COL_PINS { A9, C13, C14 }
-// To enable debugger set A13 A14 -> A5 A7
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
@@ -47,8 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI_SCK_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN B13
 
-#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 10 /* If number is smaller, buffer updates too fast causing glitches */
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -64,7 +55,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Backlight options */
 
diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json
index fac12196b1..aa5dbc1873 100755
--- a/keyboards/spaceholdings/nebula12/info.json
+++ b/keyboards/spaceholdings/nebula12/info.json
@@ -8,26 +8,35 @@
         "pid": "0x5337",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["A9", "C13", "C14"],
+        "rows": ["A8", "C15", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ortho_4x3": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3}
             ]
         }
     }
diff --git a/keyboards/spaceholdings/nebula12/nebula12.h b/keyboards/spaceholdings/nebula12/nebula12.h
index cc08bce5e6..24d2bd6545 100755
--- a/keyboards/spaceholdings/nebula12/nebula12.h
+++ b/keyboards/spaceholdings/nebula12/nebula12.h
@@ -15,21 +15,5 @@
  */
 #pragma once
 
-#define XXX KC_NO
-
 #include "quantum.h"
 #include "../wilba_tech/wt_rgb_backlight_keycodes.h"
-
-// This a shortcut to help you visually see your layout.
-
-#define LAYOUT_ortho_4x3( \
-    K00, K01, K02, \
-    K10, K11, K12, \
-    K20, K21, K22, \
-    K30, K31, K32 \
-) { \
-    { K00, K01, K02 }, \
-    { K10, K11, K12 }, \
-    { K20, K21, K22 }, \
-    { K30, K31, K32 }  \
-}
diff --git a/keyboards/spaceholdings/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk
index 23693f972a..1c8b41fea7 100755
--- a/keyboards/spaceholdings/nebula12/rules.mk
+++ b/keyboards/spaceholdings/nebula12/rules.mk
@@ -16,7 +16,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no                  # Audio output
 NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
 RGBLIGHT_ENABLE = yes              # Underglow RGB
-WS2812_DRIVER = spi                # Underglow RGB Driver
 
 CIE1931_CURVE = yes
 
diff --git a/keyboards/spaceholdings/nebula12b/config.h b/keyboards/spaceholdings/nebula12b/config.h
index 9c44c01b7a..aba496d469 100755
--- a/keyboards/spaceholdings/nebula12b/config.h
+++ b/keyboards/spaceholdings/nebula12b/config.h
@@ -17,16 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B7, B4, F7, F6 }
-#define MATRIX_COL_PINS { F4, F5, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB options */
 
-#define RGB_DI_PIN D5
 #define RGB_MATRIX_LED_COUNT 16
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/info.json
index 400e5790c9..5b64474b70 100755
--- a/keyboards/spaceholdings/nebula12b/info.json
+++ b/keyboards/spaceholdings/nebula12b/info.json
@@ -8,6 +8,17 @@
         "pid": "0x5332",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "D7"],
+        "rows": ["B7", "B4", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/spaceholdings/nebula12b/rules.mk b/keyboards/spaceholdings/nebula12b/rules.mk
index e9b6e9fb5c..f89d2a5f9b 100755
--- a/keyboards/spaceholdings/nebula12b/rules.mk
+++ b/keyboards/spaceholdings/nebula12b/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
-RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Driver
 
 LTO_ENABLE = yes
diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index 5e9d0a58e5..fa9000b282 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/config.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3, A5 }
-// To enable debugger set A13 A14 -> A5 A7
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #define WS2812_PWM_CHANNEL 2  // default: 2
 #define WS2812_PWM_PAL_MODE 2  // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #define WS2812_DMA_CHANNEL 3  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 
-#define RGB_DI_PIN A7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 10
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -48,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Backlight options */
 
diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json
index 77bda023d3..21675a37c9 100755
--- a/keyboards/spaceholdings/nebula68/info.json
+++ b/keyboards/spaceholdings/nebula68/info.json
@@ -8,6 +8,15 @@
         "pid": "0x5336",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
@@ -15,78 +24,82 @@
     "layouts": {
         "LAYOUT_68_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [2, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [3, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15.25, "y":1},
-                {"x":16.25, "y":1},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":2.75},
-                {"x":15.25, "y":3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":14.25, "y":4},
-                {"x":15.25, "y":4},
-                {"x":16.25, "y":4}
+                {"matrix": [4, 12], "x": 14.25, "y": 4},
+                {"matrix": [4, 13], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/spaceholdings/nebula68/nebula68.h b/keyboards/spaceholdings/nebula68/nebula68.h
index db9c7f26cb..24d2bd6545 100755
--- a/keyboards/spaceholdings/nebula68/nebula68.h
+++ b/keyboards/spaceholdings/nebula68/nebula68.h
@@ -15,23 +15,5 @@
  */
 #pragma once
 
-#define XXX KC_NO
-
 #include "quantum.h"
 #include "../wilba_tech/wt_rgb_backlight_keycodes.h"
-
-// This a shortcut to help you visually see your layout.
-
-#define LAYOUT_68_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, K3E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,           \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           \
-    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/spaceholdings/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk
index 00fca103d4..7880744fff 100755
--- a/keyboards/spaceholdings/nebula68/rules.mk
+++ b/keyboards/spaceholdings/nebula68/rules.mk
@@ -16,7 +16,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no                  # Audio output
 NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
 RGBLIGHT_ENABLE = yes              # Underglow RGB
-WS2812_DRIVER = pwm                # Underglow RGB Driver
 
 CIE1931_CURVE = yes
 
diff --git a/keyboards/spaceholdings/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h
index ee00fb233c..4da2b5894a 100755
--- a/keyboards/spaceholdings/nebula68b/config.h
+++ b/keyboards/spaceholdings/nebula68b/config.h
@@ -17,16 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D4, D6, D7, B4, E6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB options */
 
-#define RGB_DI_PIN B7
 #define RGB_MATRIX_LED_COUNT 79
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/spaceholdings/nebula68b/hs/hs.c b/keyboards/spaceholdings/nebula68b/hs/hs.c
index e411f64196..7ac8da2e0d 100755
--- a/keyboards/spaceholdings/nebula68b/hs/hs.c
+++ b/keyboards/spaceholdings/nebula68b/hs/hs.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nebula68b.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 // clang-format off
diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json
index b1ca0f0fd0..89ee727172 100755
--- a/keyboards/spaceholdings/nebula68b/info.json
+++ b/keyboards/spaceholdings/nebula68b/info.json
@@ -8,84 +8,99 @@
         "pid": "0x5338",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D4", "D6", "D7", "B4", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_68_ansi_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [2, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [3, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15.25, "y":1},
-                {"x":16.25, "y":1},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":2.75},
-                {"x":15.25, "y":3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":14.25, "y":4},
-                {"x":15.25, "y":4},
-                {"x":16.25, "y":4}
+                {"matrix": [4, 12], "x": 14.25, "y": 4},
+                {"matrix": [4, 13], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/spaceholdings/nebula68b/nebula68b.c b/keyboards/spaceholdings/nebula68b/nebula68b.c
index f7b292ded9..b99777ff5b 100755
--- a/keyboards/spaceholdings/nebula68b/nebula68b.c
+++ b/keyboards/spaceholdings/nebula68b/nebula68b.c
@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nebula68b.h"
-#include <lib/lib8tion/lib8tion.h>
+#include "quantum.h"
 
 #ifndef KEYBOARD_spaceholdings_nebula68b_hs
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/spaceholdings/nebula68b/nebula68b.h b/keyboards/spaceholdings/nebula68b/nebula68b.h
deleted file mode 100755
index dd3469c54e..0000000000
--- a/keyboards/spaceholdings/nebula68b/nebula68b.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-
-#define LAYOUT_68_ansi_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, K2E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      K1E, K3E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,                \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                \
-    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E            \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/spaceholdings/nebula68b/rules.mk b/keyboards/spaceholdings/nebula68b/rules.mk
index e9b6e9fb5c..f89d2a5f9b 100755
--- a/keyboards/spaceholdings/nebula68b/rules.mk
+++ b/keyboards/spaceholdings/nebula68b/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
-RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Driver
 
 LTO_ENABLE = yes
diff --git a/keyboards/spaceman/2_milk/config.h b/keyboards/spaceman/2_milk/config.h
index 59ffda45c0..6a3ec9c5c1 100644
--- a/keyboards/spaceman/2_milk/config.h
+++ b/keyboards/spaceman/2_milk/config.h
@@ -16,6 +16,5 @@
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 1
 #endif
diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json
index daba0b9851..5e8d0207af 100644
--- a/keyboards/spaceman/2_milk/info.json
+++ b/keyboards/spaceman/2_milk/info.json
@@ -8,6 +8,9 @@
     "pid": "0x3225",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B6"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "matrix_pins": {
diff --git a/keyboards/spaceman/pancake/rev1/config.h b/keyboards/spaceman/pancake/rev1/config.h
deleted file mode 100644
index 5c72d34933..0000000000
--- a/keyboards/spaceman/pancake/rev1/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/spaceman/pancake/rev1/feather/config.h b/keyboards/spaceman/pancake/rev1/feather/config.h
index ea6af6336d..9ff72156da 100644
--- a/keyboards/spaceman/pancake/rev1/feather/config.h
+++ b/keyboards/spaceman/pancake/rev1/feather/config.h
@@ -15,8 +15,4 @@
  */
 #pragma once
 
-/* Pancake default pinout */
-#define MATRIX_ROW_PINS { B5, D7, C6, D0 }
-#define MATRIX_COL_PINS { C7, D6, B7, B6, F0, D2, D3, F1, F4, F5, F6, F7 }
-
 #define VIA_HAS_BROKEN_KEYCODES
diff --git a/keyboards/spaceman/pancake/rev1/feather/info.json b/keyboards/spaceman/pancake/rev1/feather/info.json
new file mode 100644
index 0000000000..2d8072e7f1
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev1/feather/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["C7", "D6", "B7", "B6", "F0", "D2", "D3", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["B5", "D7", "C6", "D0"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/spaceman/pancake/rev1/info.json b/keyboards/spaceman/pancake/rev1/info.json
index 723b6c1054..9162370c4c 100644
--- a/keyboards/spaceman/pancake/rev1/info.json
+++ b/keyboards/spaceman/pancake/rev1/info.json
@@ -14,104 +14,112 @@
   "layouts": {
     "LAYOUT_planck_mit": {
       "layout": [ 
-        { "w": 1, "x": 0, "y": 0 }, 
-        { "w": 1, "x": 1, "y": 0 }, 
-        { "w": 1, "x": 2, "y": 0 }, 
-        { "w": 1, "x": 3, "y": 0 }, 
-        { "w": 1, "x": 4, "y": 0 }, 
-        { "w": 1, "x": 5, "y": 0 }, 
-        { "w": 1, "x": 6, "y": 0 }, 
-        { "w": 1, "x": 7, "y": 0 }, 
-        { "w": 1, "x": 8, "y": 0 }, 
-        { "w": 1, "x": 9, "y": 0 }, 
-        { "w": 1, "x": 10, "y": 0 }, 
-        { "w": 1, "x": 11, "y": 0 }, 
-        { "w": 1, "x": 0, "y": 1 }, 
-        { "w": 1, "x": 1, "y": 1 }, 
-        { "w": 1, "x": 2, "y": 1 }, 
-        { "w": 1, "x": 3, "y": 1 }, 
-        { "w": 1, "x": 4, "y": 1 }, 
-        { "w": 1, "x": 5, "y": 1 }, 
-        { "w": 1, "x": 6, "y": 1 }, 
-        { "w": 1, "x": 7, "y": 1 }, 
-        { "w": 1, "x": 8, "y": 1 }, 
-        { "w": 1, "x": 9, "y": 1 }, 
-        { "w": 1, "x": 10, "y": 1 }, 
-        { "w": 1, "x": 11, "y": 1 }, 
-        { "w": 1, "x": 0, "y": 2 }, 
-        { "w": 1, "x": 1, "y": 2 }, 
-        { "w": 1, "x": 2, "y": 2 }, 
-        { "w": 1, "x": 3, "y": 2 }, 
-        { "w": 1, "x": 4, "y": 2 }, 
-        { "w": 1, "x": 5, "y": 2 }, 
-        { "w": 1, "x": 6, "y": 2 }, 
-        { "w": 1, "x": 7, "y": 2 }, 
-        { "w": 1, "x": 8, "y": 2 }, 
-        { "w": 1, "x": 9, "y": 2 }, 
-        { "w": 1, "x": 10, "y": 2 }, 
-        { "w": 1, "x": 11, "y": 2 }, 
-        { "w": 1, "x": 0, "y": 3 }, 
-        { "w": 1, "x": 1, "y": 3 }, 
-        { "w": 1, "x": 2, "y": 3 }, 
-        { "w": 1, "x": 3, "y": 3 }, 
-        { "w": 1, "x": 4, "y": 3 }, 
-        { "w": 2, "x": 5, "y": 3 }, 
-        { "w": 1, "x": 7, "y": 3 }, 
-        { "w": 1, "x": 8, "y": 3 }, 
-        { "w": 1, "x": 9, "y": 3 }, 
-        { "w": 1, "x": 10, "y": 3 }, 
-        { "w": 1, "x": 11, "y": 3 } ]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
 		"LAYOUT_ortho_4x12": {
       "layout": [ 
-        { "w": 1, "x": 0, "y": 0 }, 
-        { "w": 1, "x": 1, "y": 0 }, 
-        { "w": 1, "x": 2, "y": 0 }, 
-        { "w": 1, "x": 3, "y": 0 }, 
-        { "w": 1, "x": 4, "y": 0 }, 
-        { "w": 1, "x": 5, "y": 0 }, 
-        { "w": 1, "x": 6, "y": 0 }, 
-        { "w": 1, "x": 7, "y": 0 }, 
-        { "w": 1, "x": 8, "y": 0 }, 
-        { "w": 1, "x": 9, "y": 0 }, 
-        { "w": 1, "x": 10, "y": 0 }, 
-        { "w": 1, "x": 11, "y": 0 }, 
-        { "w": 1, "x": 0, "y": 1 }, 
-        { "w": 1, "x": 1, "y": 1 }, 
-        { "w": 1, "x": 2, "y": 1 }, 
-        { "w": 1, "x": 3, "y": 1 }, 
-        { "w": 1, "x": 4, "y": 1 }, 
-        { "w": 1, "x": 5, "y": 1 }, 
-        { "w": 1, "x": 6, "y": 1 }, 
-        { "w": 1, "x": 7, "y": 1 }, 
-        { "w": 1, "x": 8, "y": 1 }, 
-        { "w": 1, "x": 9, "y": 1 }, 
-        { "w": 1, "x": 10, "y": 1 }, 
-        { "w": 1, "x": 11, "y": 1 }, 
-        { "w": 1, "x": 0, "y": 2 }, 
-        { "w": 1, "x": 1, "y": 2 }, 
-        { "w": 1, "x": 2, "y": 2 }, 
-        { "w": 1, "x": 3, "y": 2 }, 
-        { "w": 1, "x": 4, "y": 2 }, 
-        { "w": 1, "x": 5, "y": 2 }, 
-        { "w": 1, "x": 6, "y": 2 }, 
-        { "w": 1, "x": 7, "y": 2 }, 
-        { "w": 1, "x": 8, "y": 2 }, 
-        { "w": 1, "x": 9, "y": 2 }, 
-        { "w": 1, "x": 10, "y": 2 }, 
-        { "w": 1, "x": 11, "y": 2 }, 
-        { "w": 1, "x": 0, "y": 3 }, 
-        { "w": 1, "x": 1, "y": 3 }, 
-        { "w": 1, "x": 2, "y": 3 }, 
-        { "w": 1, "x": 3, "y": 3 }, 
-        { "w": 1, "x": 4, "y": 3 }, 
-        { "w": 1, "x": 5, "y": 3 }, 
-        { "w": 1, "x": 6, "y": 3 }, 
-        { "w": 1, "x": 7, "y": 3 }, 
-        { "w": 1, "x": 8, "y": 3 }, 
-        { "w": 1, "x": 9, "y": 3 }, 
-        { "w": 1, "x": 10, "y": 3 }, 
-        { "w": 1, "x": 11, "y": 3 } ]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/spaceman/pancake/rev1/promicro/config.h b/keyboards/spaceman/pancake/rev1/promicro/config.h
deleted file mode 100644
index 3024db4d46..0000000000
--- a/keyboards/spaceman/pancake/rev1/promicro/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-/* Pancake default pinout */
-#define MATRIX_ROW_PINS { B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, E6, B4, B5, D7, C6, D4, D0, D1 }
diff --git a/keyboards/spaceman/pancake/rev1/promicro/info.json b/keyboards/spaceman/pancake/rev1/promicro/info.json
new file mode 100644
index 0000000000..47ab8fdcd0
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev1/promicro/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "E6", "B4", "B5", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/spaceman/pancake/rev1/rev1.c b/keyboards/spaceman/pancake/rev1/rev1.c
deleted file mode 100644
index d226653296..0000000000
--- a/keyboards/spaceman/pancake/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/spaceman/pancake/rev1/rev1.h b/keyboards/spaceman/pancake/rev1/rev1.h
deleted file mode 100644
index 312d789b42..0000000000
--- a/keyboards/spaceman/pancake/rev1/rev1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_planck_mit( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
-    k300, k301, k302, k303, k304,    k305,    k307, k308, k309, k310, k311 \
-) \
-{ \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \
-    { k300, k301, k302, k303, k304, k305, k305, k307, k308, k309, k310, k311 } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 \
-) \
-{ \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 } \
-}
diff --git a/keyboards/spaceman/pancake/rev2/config.h b/keyboards/spaceman/pancake/rev2/config.h
deleted file mode 100644
index 294f9cc663..0000000000
--- a/keyboards/spaceman/pancake/rev2/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { C7, C6, B6, B5 }
-#define MATRIX_COL_PINS { B7, B3, B2, B1 ,B0, E6, F0, F1, F4, F5, F6, F7 }
diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json
index 22da63e5f2..22c2b2e78d 100644
--- a/keyboards/spaceman/pancake/rev2/info.json
+++ b/keyboards/spaceman/pancake/rev2/info.json
@@ -8,60 +8,68 @@
     "pid": "0x5032",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"],
+    "rows": ["C7", "C6", "B6", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["ortho_4x12"],
   "layouts": {
 		"LAYOUT_ortho_4x12": {
       "layout": [ 
-        {"x":0, "y":0},  
-        {"x":1, "y":0},  
-        {"x":2, "y":0},  
-        {"x":3, "y":0},  
-        {"x":4, "y":0},  
-        {"x":5, "y":0},  
-        {"x":7, "y":0},  
-        {"x":8, "y":0},  
-        {"x":9, "y":0},  
-        {"x":10, "y":0},  
-        {"x":11, "y":0},  
-        {"x":12, "y":0},  
-        {"x":0, "y":1},  
-        {"x":1, "y":1},  
-        {"x":2, "y":1},  
-        {"x":3, "y":1},  
-        {"x":4, "y":1},  
-        {"x":5, "y":1},  
-        {"x":7, "y":1},  
-        {"x":8, "y":1},  
-        {"x":9, "y":1},  
-        {"x":10, "y":1},  
-        {"x":11, "y":1},  
-        {"x":12, "y":1},  
-        {"x":0, "y":2},  
-        {"x":1, "y":2},  
-        {"x":2, "y":2},  
-        {"x":3, "y":2},  
-        {"x":4, "y":2},  
-        {"x":5, "y":2},  
-        {"x":7, "y":2},  
-        {"x":8, "y":2},  
-        {"x":9, "y":2},  
-        {"x":10, "y":2},  
-        {"x":11, "y":2},  
-        {"x":12, "y":2},  
-        {"x":0, "y":3},  
-        {"x":1, "y":3},  
-        {"x":2, "y":3},  
-        {"x":3, "y":3},  
-        {"x":4, "y":3},  
-        {"x":5, "y":3, "w":1.5},  
-        {"x":6.5, "y":3, "w":1.5},  
-        {"x":8, "y":3},  
-        {"x":9, "y":3},  
-        {"x":10, "y":3},  
-        {"x":11, "y":3},  
-        {"x":12, "y":3}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 7, "y": 0},
+        {"matrix": [0, 7], "x": 8, "y": 0},
+        {"matrix": [0, 8], "x": 9, "y": 0},
+        {"matrix": [0, 9], "x": 10, "y": 0},
+        {"matrix": [0, 10], "x": 11, "y": 0},
+        {"matrix": [0, 11], "x": 12, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 7, "y": 1},
+        {"matrix": [1, 7], "x": 8, "y": 1},
+        {"matrix": [1, 8], "x": 9, "y": 1},
+        {"matrix": [1, 9], "x": 10, "y": 1},
+        {"matrix": [1, 10], "x": 11, "y": 1},
+        {"matrix": [1, 11], "x": 12, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 1.5},
+        {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 1.5},
+        {"matrix": [3, 7], "x": 8, "y": 3},
+        {"matrix": [3, 8], "x": 9, "y": 3},
+        {"matrix": [3, 9], "x": 10, "y": 3},
+        {"matrix": [3, 10], "x": 11, "y": 3},
+        {"matrix": [3, 11], "x": 12, "y": 3}
       ]
     }
   }
diff --git a/keyboards/spaceman/pancake/rev2/rev2.c b/keyboards/spaceman/pancake/rev2/rev2.c
index 9b186192c5..cc1c2019da 100644
--- a/keyboards/spaceman/pancake/rev2/rev2.c
+++ b/keyboards/spaceman/pancake/rev2/rev2.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev2.h"
+#include "quantum.h"
 
 
 #ifdef OLED_ENABLE
diff --git a/keyboards/spaceman/pancake/rev2/rev2.h b/keyboards/spaceman/pancake/rev2/rev2.h
deleted file mode 100644
index 628b1b39ac..0000000000
--- a/keyboards/spaceman/pancake/rev2/rev2.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-    k000, k001, k002, k003, k004, k005,       k006, k007, k008, k009, k010, k011, \
-    k100, k101, k102, k103, k104, k105,       k106, k107, k108, k109, k110, k111, \
-    k200, k201, k202, k203, k204, k205,       k206, k207, k208, k209, k210, k211, \
-    k300, k301, k302, k303, k304,   k305,   k306,   k307, k308, k309, k310, k311 \
-) \
-{ \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 } \
-}
diff --git a/keyboards/spaceman/yun65/config.h b/keyboards/spaceman/yun65/config.h
deleted file mode 100644
index b8900721e4..0000000000
--- a/keyboards/spaceman/yun65/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { E6, D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D4, D6, D7, B4, B5, B6, C6, C7, D5, B3 }
-
diff --git a/keyboards/spaceman/yun65/info.json b/keyboards/spaceman/yun65/info.json
index 1103a08c72..5ffd5772f6 100644
--- a/keyboards/spaceman/yun65/info.json
+++ b/keyboards/spaceman/yun65/info.json
@@ -8,6 +8,11 @@
     "pid": "0x594E",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D5", "B3"],
+    "rows": ["E6", "D3", "D2", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/spaceman/yun65/yun65.c b/keyboards/spaceman/yun65/yun65.c
deleted file mode 100644
index c93cb7094b..0000000000
--- a/keyboards/spaceman/yun65/yun65.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "yun65.h"
diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h
index 22fced8d29..b7ece10f6c 100644
--- a/keyboards/spacetime/config.h
+++ b/keyboards/spacetime/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json
index 2e44803f32..c82bd6ecbb 100644
--- a/keyboards/spacetime/info.json
+++ b/keyboards/spacetime/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0A0C",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
@@ -61,14 +66,14 @@
           {"label":"R25", "x":12, "y":2},
           {"label":"R26", "x":13, "y":2},
  
-          {"label":"L30", "x":0, "y":3, "w":1},
-          {"label":"L34", "x":4, "y":3, "w":1},
+          {"label":"L30", "x":0, "y":3},
+          {"label":"L34", "x":4, "y":3},
           {"label":"L35", "x":5, "y":3, "h":2},
           {"label":"L36", "x":6, "y":3, "h":2},
           {"label":"R30", "x":7, "y":3, "h":2},
           {"label":"R31", "x":8, "y":3, "h":2},
-          {"label":"R32", "x":9, "y":3, "w":1},
-          {"label":"R36", "x":13, "y":3, "w":1}
+          {"label":"R32", "x":9, "y":3},
+          {"label":"R36", "x":13, "y":3}
       ]
     }
   }
diff --git a/keyboards/spacetime/rev1/rev1.c b/keyboards/spacetime/rev1/rev1.c
deleted file mode 100644
index b9942a3511..0000000000
--- a/keyboards/spacetime/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kyle Terry
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/spacetime/spacetime.c b/keyboards/spacetime/spacetime.c
deleted file mode 100644
index 7db11f1bc4..0000000000
--- a/keyboards/spacetime/spacetime.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "spacetime.h"
diff --git a/keyboards/spacetime/spacetime.h b/keyboards/spacetime/spacetime.h
deleted file mode 100644
index 0235c2b254..0000000000
--- a/keyboards/spacetime/spacetime.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_spacetime_rev1
-    #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_spacetime_rev2
-    #include "rev2.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/spacey/config.h b/keyboards/spacey/config.h
deleted file mode 100644
index 411f2c2578..0000000000
--- a/keyboards/spacey/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2021 vanilla
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- */
-#define MATRIX_ROW_PINS { D4, C6, F6, F5, F4 }
-#define MATRIX_COL_PINS { D5, B7, B5, B4, E6, D7, C7, B3, B2, B6, F0, F1, B1, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/spacey/info.json b/keyboards/spacey/info.json
index c24d46d753..881efb60d6 100644
--- a/keyboards/spacey/info.json
+++ b/keyboards/spacey/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2045",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "B7", "B5", "B4", "E6", "D7", "C7", "B3", "B2", "B6", "F0", "F1", "B1", "F7"],
+        "rows": ["D4", "C6", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1"}
diff --git a/keyboards/spacey/spacey.c b/keyboards/spacey/spacey.c
index 32f1e4dd9c..a83f1f8990 100644
--- a/keyboards/spacey/spacey.c
+++ b/keyboards/spacey/spacey.c
@@ -15,15 +15,3 @@
  */
 
 #include "spacey.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise){
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if(clockwise) {
-            tap_code(KC_VOLD);
-        } else {
-            tap_code(KC_VOLU);
-        }
-    }
-    return true;
-} 
diff --git a/keyboards/sparrow62/config.h b/keyboards/sparrow62/config.h
index 45d0711d85..3f234d31cb 100644
--- a/keyboards/sparrow62/config.h
+++ b/keyboards/sparrow62/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN F4
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/info.json
index c3d8a099e5..62e9d019c3 100644
--- a/keyboards/sparrow62/info.json
+++ b/keyboards/sparrow62/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7461",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/sparrow62/sparrow62.c b/keyboards/sparrow62/sparrow62.c
deleted file mode 100644
index 3fc7f62bdf..0000000000
--- a/keyboards/sparrow62/sparrow62.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Atsushi Morimoto @74th
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "sparrow62.h"
diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h
index a987f5782f..490ac5e5c0 100644
--- a/keyboards/specskeys/config.h
+++ b/keyboards/specskeys/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/specskeys/info.json b/keyboards/specskeys/info.json
index 8a4ff0d90b..eb92e6f34f 100644
--- a/keyboards/specskeys/info.json
+++ b/keyboards/specskeys/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0080",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 1
@@ -24,98 +29,106 @@
     "layouts": {
         "LAYOUT_tkl_iso_tsangan": {
             "layout": [
-                {"label":"ESC", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Druck", "x":15.5, "y":0},
-                {"label":"Rollen", "x":16.5, "y":0},
-                {"label":"Pause", "x":17.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.5, "y": 0},
+                {"matrix": [0, 14], "x": 16.5, "y": 0},
+                {"matrix": [0, 15], "x": 17.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 0, "y": 2},
+                {"matrix": [1, 0], "x": 1, "y": 2},
+                {"matrix": [1, 1], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 3, "y": 2},
+                {"matrix": [1, 3], "x": 4, "y": 2},
+                {"matrix": [1, 4], "x": 5, "y": 2},
+                {"matrix": [1, 5], "x": 6, "y": 2},
+                {"matrix": [1, 6], "x": 7, "y": 2},
+                {"matrix": [1, 7], "x": 8, "y": 2},
+                {"matrix": [1, 8], "x": 9, "y": 2},
+                {"matrix": [1, 9], "x": 10, "y": 2},
+                {"matrix": [1, 10], "x": 11, "y": 2},
+                {"matrix": [1, 11], "x": 12, "y": 2},
+                {"matrix": [1, 12], "x": 13, "y": 2, "w": 2},
+
+                {"matrix": [1, 13], "x": 15.5, "y": 2},
+                {"matrix": [1, 14], "x": 16.5, "y": 2},
+                {"matrix": [1, 15], "x": 17.5, "y": 2},
+
+                {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 3},
+                {"matrix": [2, 1], "x": 2.5, "y": 3},
+                {"matrix": [2, 2], "x": 3.5, "y": 3},
+                {"matrix": [2, 3], "x": 4.5, "y": 3},
+                {"matrix": [2, 4], "x": 5.5, "y": 3},
+                {"matrix": [2, 5], "x": 6.5, "y": 3},
+                {"matrix": [2, 6], "x": 7.5, "y": 3},
+                {"matrix": [2, 7], "x": 8.5, "y": 3},
+                {"matrix": [2, 8], "x": 9.5, "y": 3},
+                {"matrix": [2, 9], "x": 10.5, "y": 3},
+                {"matrix": [2, 10], "x": 11.5, "y": 3},
+                {"matrix": [2, 11], "x": 12.5, "y": 3},
+
+                {"matrix": [2, 13], "x": 15.5, "y": 3},
+                {"matrix": [2, 14], "x": 16.5, "y": 3},
+                {"matrix": [2, 15], "x": 17.5, "y": 3},
 
-                {"label":"\u00b0", "x":0, "y":2},
-                {"label":"!", "x":1, "y":2},
-                {"label":"\"", "x":2, "y":2},
-                {"label":"\u00a7", "x":3, "y":2},
-                {"label":"$", "x":4, "y":2},
-                {"label":"%", "x":5, "y":2},
-                {"label":"&", "x":6, "y":2},
-                {"label":"/", "x":7, "y":2},
-                {"label":"(", "x":8, "y":2},
-                {"label":")", "x":9, "y":2},
-                {"label":"=", "x":10, "y":2},
-                {"label":"?", "x":11, "y":2},
-                {"label":"`", "x":12, "y":2},
-                {"label":"\u2b60", "x":13, "y":2, "w":2},
-                {"label":"Einfg", "x":15.5, "y":2},
-                {"label":"Pos1", "x":16.5, "y":2},
-                {"label":"Bild", "x":17.5, "y":2},
+                {"matrix": [5, 2], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [3, 0], "x": 1.75, "y": 4},
+                {"matrix": [3, 1], "x": 2.75, "y": 4},
+                {"matrix": [3, 2], "x": 3.75, "y": 4},
+                {"matrix": [3, 3], "x": 4.75, "y": 4},
+                {"matrix": [3, 4], "x": 5.75, "y": 4},
+                {"matrix": [3, 5], "x": 6.75, "y": 4},
+                {"matrix": [3, 6], "x": 7.75, "y": 4},
+                {"matrix": [3, 7], "x": 8.75, "y": 4},
+                {"matrix": [3, 8], "x": 9.75, "y": 4},
+                {"matrix": [3, 9], "x": 10.75, "y": 4},
+                {"matrix": [3, 10], "x": 11.75, "y": 4},
+                {"matrix": [3, 11], "x": 12.75, "y": 4},
+                {"matrix": [2, 12], "x": 13.75, "y": 3, "w": 1.25, "h": 2},
 
-                {"label":"\u2b7e", "x":0, "y":3, "w":1.5},
-                {"label":"Q", "x":1.5, "y":3},
-                {"label":"W", "x":2.5, "y":3},
-                {"label":"E", "x":3.5, "y":3},
-                {"label":"R", "x":4.5, "y":3},
-                {"label":"T", "x":5.5, "y":3},
-                {"label":"Z", "x":6.5, "y":3},
-                {"label":"U", "x":7.5, "y":3},
-                {"label":"I", "x":8.5, "y":3},
-                {"label":"O", "x":9.5, "y":3},
-                {"label":"P", "x":10.5, "y":3},
-                {"label":"\u00dc", "x":11.5, "y":3},
-                {"label":"*", "x":12.5, "y":3},
-                {"label":"Entf", "x":15.5, "y":3},
-                {"label":"Ende", "x":16.5, "y":3},
-                {"label":"Bild", "x":17.5, "y":3},
+                {"matrix": [5, 3], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [4, 0], "x": 1.25, "y": 5},
+                {"matrix": [4, 1], "x": 2.25, "y": 5},
+                {"matrix": [4, 2], "x": 3.25, "y": 5},
+                {"matrix": [4, 3], "x": 4.25, "y": 5},
+                {"matrix": [4, 4], "x": 5.25, "y": 5},
+                {"matrix": [4, 5], "x": 6.25, "y": 5},
+                {"matrix": [4, 6], "x": 7.25, "y": 5},
+                {"matrix": [4, 7], "x": 8.25, "y": 5},
+                {"matrix": [4, 8], "x": 9.25, "y": 5},
+                {"matrix": [4, 9], "x": 10.25, "y": 5},
+                {"matrix": [4, 10], "x": 11.25, "y": 5},
+                {"matrix": [4, 11], "x": 12.25, "y": 5, "w": 2.75},
 
-                {"x":0, "y":4, "w":1.75},
-                {"label":"A", "x":1.75, "y":4},
-                {"label":"S", "x":2.75, "y":4},
-                {"label":"D", "x":3.75, "y":4},
-                {"label":"F", "x":4.75, "y":4},
-                {"label":"G", "x":5.75, "y":4},
-                {"label":"H", "x":6.75, "y":4},
-                {"label":"J", "x":7.75, "y":4},
-                {"label":"K", "x":8.75, "y":4},
-                {"label":"L", "x":9.75, "y":4},
-                {"label":"\u00d6", "x":10.75, "y":4},
-                {"label":"\u00c4", "x":11.75, "y":4},
-                {"label":"'", "x":12.75, "y":4},
-                {"label":"\u2ba0", "x":13.75, "y":3, "w":1.25, "h":2},
+                {"matrix": [4, 14], "x": 16.5, "y": 5},
 
-                {"label":"\u21e7", "x":0, "y":5, "w":1.25},
-                {"label":">", "x":1.25, "y":5},
-                {"label":"Y", "x":2.25, "y":5},
-                {"label":"X", "x":3.25, "y":5},
-                {"label":"C", "x":4.25, "y":5},
-                {"label":"V", "x":5.25, "y":5},
-                {"label":"B", "x":6.25, "y":5},
-                {"label":"N", "x":7.25, "y":5},
-                {"label":"M", "x":8.25, "y":5},
-                {"label":";", "x":9.25, "y":5},
-                {"label":":", "x":10.25, "y":5},
-                {"label":"_", "x":11.25, "y":5},
-                {"label":"\u21e7", "x":12.25, "y":5, "w":2.75},
-                {"label":"\u2191", "x":16.5, "y":5},
+                {"matrix": [5, 4], "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 6},
+                {"matrix": [5, 6], "x": 2.5, "y": 6, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 6, "w": 7},
+                {"matrix": [5, 9], "x": 11, "y": 6, "w": 1.5},
+                {"matrix": [5, 10], "x": 12.5, "y": 6},
+                {"matrix": [5, 11], "x": 13.5, "y": 6, "w": 1.5},
 
-                {"label":"Strg", "x":0, "y":6, "w":1.5},
-                {"label":"\u2630", "x":1.5, "y":6},
-                {"label":"Alt", "x":2.5, "y":6, "w":1.5},
-                {"x":4, "y":6, "w":7},
-                {"label":"Alt Gr", "x":11, "y":6, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":6},
-                {"label":"Strg", "x":13.5, "y":6, "w":1.5},
-                {"label":"\u2190", "x":15.5, "y":6},
-                {"label":"\u2193", "x":16.5, "y":6},
-                {"label":"\u2192", "x":17.5, "y":6}
+                {"matrix": [5, 13], "x": 15.5, "y": 6},
+                {"matrix": [5, 14], "x": 16.5, "y": 6},
+                {"matrix": [5, 15], "x": 17.5, "y": 6}
             ]
         }
     }
diff --git a/keyboards/specskeys/specskeys.c b/keyboards/specskeys/specskeys.c
deleted file mode 100644
index 36b1dbc311..0000000000
--- a/keyboards/specskeys/specskeys.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Nico
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "specskeys.h"
diff --git a/keyboards/specskeys/specskeys.h b/keyboards/specskeys/specskeys.h
deleted file mode 100644
index 68665dc478..0000000000
--- a/keyboards/specskeys/specskeys.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 Nico
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_tkl_iso_tsangan( \
-      K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013, K014, K015, \
-      K500, K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, K114, K115, \
-      K501, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213, K214, K215, \
-      K502, K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K212,                         \
-      K503, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,                   K412,       \
-      K504, K505, K506,                   K507,                         K508, K509, K510,       K512, K513, K514  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,     K013,  K014,  K015  }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,     K113,  K114,  K115  }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,     K213,  K214,  K215  }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO,    KC_NO, KC_NO, KC_NO }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO,    KC_NO, K412,  KC_NO }, \
-    { K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  KC_NO, K508,  K509,  K510,  KC_NO,    K512,  K513,  K514  }  \
-}
diff --git a/keyboards/spiderisland/split78/info.json b/keyboards/spiderisland/split78/info.json
index 74a49c57e3..baf9d91f13 100644
--- a/keyboards/spiderisland/split78/info.json
+++ b/keyboards/spiderisland/split78/info.json
@@ -12,6 +12,9 @@
         "pin": "D4",
         "breathing": true
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "debounce": 50,
diff --git a/keyboards/spiderisland/split78/rules.mk b/keyboards/spiderisland/split78/rules.mk
index 0f27d32c81..e77cf060be 100644
--- a/keyboards/spiderisland/split78/rules.mk
+++ b/keyboards/spiderisland/split78/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
 DEBOUNCE_TYPE = sym_eager_pr
 
 # custom matrix setup
diff --git a/keyboards/spiderisland/split78/split78.c b/keyboards/spiderisland/split78/split78.c
deleted file mode 100644
index 0301012749..0000000000
--- a/keyboards/spiderisland/split78/split78.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 unrelenting.technology
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "split78.h"
diff --git a/keyboards/splitish/config.h b/keyboards/splitish/config.h
index 7f7b41f58c..f3fe3850d7 100644
--- a/keyboards/splitish/config.h
+++ b/keyboards/splitish/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { F4 , F5 , F6 , F7 , B1 , B3 , C6 , D4 , D0 , D1 , D2 , D3 }
-#define MATRIX_ROW_PINS { B4 , B5 , B2 , B6 }
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/splitish/info.json b/keyboards/splitish/info.json
index 067b20c8cf..d973c34eba 100644
--- a/keyboards/splitish/info.json
+++ b/keyboards/splitish/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6464",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"],
+        "rows": ["B4", "B5", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/splitkb/aurora/corne/keymaps/x123/config.h b/keyboards/splitkb/aurora/corne/keymaps/x123/config.h
index 12ca322b04..29d2337f10 100644
--- a/keyboards/splitkb/aurora/corne/keymaps/x123/config.h
+++ b/keyboards/splitkb/aurora/corne/keymaps/x123/config.h
@@ -21,5 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TOGGLE 1
 #define TAPPING_TERM 280
-#define IGNORE_MOD_TAP_INTERRUPT
-#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
\ No newline at end of file
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/info.json
index 64da285877..2051020895 100644
--- a/keyboards/splitkb/aurora/corne/rev1/info.json
+++ b/keyboards/splitkb/aurora/corne/rev1/info.json
@@ -105,12 +105,14 @@
         }
     },
     "rgblight": {
-        "pin": "D3",
         "led_count": 54,
         "split": true,
         "split_count": [27, 27],
         "max_brightness": 128
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
diff --git a/keyboards/splitkb/aurora/corne/rev1/rev1.c b/keyboards/splitkb/aurora/corne/rev1/rev1.c
index 1fdbbf93f1..31ea13fb53 100644
--- a/keyboards/splitkb/aurora/corne/rev1/rev1.c
+++ b/keyboards/splitkb/aurora/corne/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 // clang-format off
diff --git a/keyboards/splitkb/aurora/lily58/rev1/info.json b/keyboards/splitkb/aurora/lily58/rev1/info.json
index 4c00eedbeb..0341189830 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/info.json
+++ b/keyboards/splitkb/aurora/lily58/rev1/info.json
@@ -116,12 +116,14 @@
         }
     },
     "rgblight": {
-        "pin": "D3",
         "led_count": 68,
         "split": true,
         "split_count": [34, 34],
         "max_brightness": 128
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
diff --git a/keyboards/splitkb/aurora/lily58/rev1/rev1.c b/keyboards/splitkb/aurora/lily58/rev1/rev1.c
index d6f0a1153b..34de643c1d 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/rev1.c
+++ b/keyboards/splitkb/aurora/lily58/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 // clang-format off
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json b/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
index b62202d2b4..ade21d5ece 100644
--- a/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
+++ b/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
@@ -79,7 +79,6 @@
     "tapping": {
         "term": 200,
         "permissive_hold": true,
-        "ignore_mod_tap_interrupt": true,
         "force_hold": true
     }
 }
diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/info.json
index dc1cfeea82..d044b243b2 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/info.json
+++ b/keyboards/splitkb/aurora/sweep/rev1/info.json
@@ -108,12 +108,14 @@
         }
     },
     "rgblight": {
-        "pin": "D3",
         "led_count": 46,
         "split": true,
         "split_count": [23, 23],
         "max_brightness": 128
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
diff --git a/keyboards/splitkb/aurora/sweep/rev1/rev1.c b/keyboards/splitkb/aurora/sweep/rev1/rev1.c
index 43c2d12a67..a6b1a6796d 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/rev1.c
+++ b/keyboards/splitkb/aurora/sweep/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 // clang-format off
diff --git a/keyboards/splitkb/kyria/keymaps/artflag/config.h b/keyboards/splitkb/kyria/keymaps/artflag/config.h
index 5607926cd3..de044c8d29 100644
--- a/keyboards/splitkb/kyria/keymaps/artflag/config.h
+++ b/keyboards/splitkb/kyria/keymaps/artflag/config.h
@@ -18,6 +18,3 @@
 
 #define TAPPING_TERM 175
 #define TAPPING_TOGGLE 2
-
-// Lets you roll mod-tap keys
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/splitkb/kyria/keymaps/cameronjlarsen/config.h b/keyboards/splitkb/kyria/keymaps/cameronjlarsen/config.h
index efd8c8fe24..bcbdbac9e2 100644
--- a/keyboards/splitkb/kyria/keymaps/cameronjlarsen/config.h
+++ b/keyboards/splitkb/kyria/keymaps/cameronjlarsen/config.h
@@ -33,8 +33,6 @@
 #    define RGBLIGHT_LIMIT_VAL 150
 #endif
 
-// Lets you roll mod-tap keys
-#define IGNORE_MOD_TAP_INTERRUPT
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define TAPPING_FORCE_HOLD
 // Configure the global tapping term (default: 200ms)
diff --git a/keyboards/splitkb/kyria/keymaps/default/config.h b/keyboards/splitkb/kyria/keymaps/default/config.h
index 00be07e2fa..3fcf25be13 100644
--- a/keyboards/splitkb/kyria/keymaps/default/config.h
+++ b/keyboards/splitkb/kyria/keymaps/default/config.h
@@ -35,5 +35,3 @@
 #    endif
 #endif
 
-// Lets you roll mod-tap keys
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/config.h b/keyboards/splitkb/kyria/keymaps/gotham/config.h
index 1b0ba183d0..8feb6042f5 100644
--- a/keyboards/splitkb/kyria/keymaps/gotham/config.h
+++ b/keyboards/splitkb/kyria/keymaps/gotham/config.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // Fix for Elite C rev3
 #define SPLIT_USB_DETECT
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/thumbstick.c b/keyboards/splitkb/kyria/keymaps/gotham/thumbstick.c
index ec08fb07d4..bb307b149f 100644
--- a/keyboards/splitkb/kyria/keymaps/gotham/thumbstick.c
+++ b/keyboards/splitkb/kyria/keymaps/gotham/thumbstick.c
@@ -146,7 +146,7 @@ void update_keycode_status(uint16_t keycode, bool last, bool current) {
 
 void pointing_device_init(void) { thumbstick_init(); }
 
-void pointing_device_task(void) {
+bool pointing_device_task(void) {
     report_mouse_t report = pointing_device_get_report();
 
     if (!isLeftHand) {
@@ -191,5 +191,5 @@ void pointing_device_task(void) {
     }
 
     pointing_device_set_report(report);
-    pointing_device_send();
+    return pointing_device_send();
 }
diff --git a/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h b/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h
deleted file mode 100644
index 217e97f931..0000000000
--- a/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Lets you roll mod-tap keys
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/splitkb/kyria/keymaps/lw/config.h b/keyboards/splitkb/kyria/keymaps/lw/config.h
index 6766ab5cdb..efacab2ffe 100644
--- a/keyboards/splitkb/kyria/keymaps/lw/config.h
+++ b/keyboards/splitkb/kyria/keymaps/lw/config.h
@@ -16,11 +16,8 @@
 
 #pragma once
 
-// Lets you roll mod-tap keys
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // If you are using an Elite C rev3 on the slave side, uncomment the lines below:
 // #define SPLIT_USB_DETECT
 // #define NO_USB_STARTUP_CHECK
 
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE // support for Linux and Windows unicode 
\ No newline at end of file
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE // support for Linux and Windows unicode 
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h b/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
index 1a4c64ed13..e4146661c6 100644
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
@@ -33,8 +33,6 @@
 #    define RGBLIGHT_LIMIT_VAL 150
 #endif
 
-// Lets you roll mod-tap keys
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // If you are using an Elite C rev3 on the slave side, uncomment the lines below:
 // #define SPLIT_USB_DETECT
diff --git a/keyboards/splitkb/kyria/keymaps/muppetjones/config.h b/keyboards/splitkb/kyria/keymaps/muppetjones/config.h
index b6351869fe..210beee0ed 100644
--- a/keyboards/splitkb/kyria/keymaps/muppetjones/config.h
+++ b/keyboards/splitkb/kyria/keymaps/muppetjones/config.h
@@ -39,9 +39,6 @@
 // -- defined in user namespace
 // #define TAPPING_TERM 200
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
 
diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/config.h b/keyboards/splitkb/kyria/keymaps/ohlin/config.h
index 4451ff731c..6e07be170b 100644
--- a/keyboards/splitkb/kyria/keymaps/ohlin/config.h
+++ b/keyboards/splitkb/kyria/keymaps/ohlin/config.h
@@ -23,7 +23,5 @@
 
 // Configure the global tapping term (default: 200ms)
 #define TAPPING_TERM 175
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h
index b4f3f32255..280e6b1d12 100644
--- a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h
+++ b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h
@@ -43,7 +43,6 @@
 
 #define TAPPING_TERM 200
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define QUICK_TAP_TERM 0
 // Allows to use either side as the master. Look at the documentation for info:
 // https://docs.qmk.fm/#/config_options?id=setting-handedness
diff --git a/keyboards/splitkb/kyria/keymaps/via/config.h b/keyboards/splitkb/kyria/keymaps/via/config.h
index f4449ac7a0..9d1c0eee5c 100644
--- a/keyboards/splitkb/kyria/keymaps/via/config.h
+++ b/keyboards/splitkb/kyria/keymaps/via/config.h
@@ -18,7 +18,6 @@
 
 #define LAYER_STATE_8BIT
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/config.h b/keyboards/splitkb/kyria/keymaps/winternebs/config.h
index f0632e90ae..95e2a04152 100755
--- a/keyboards/splitkb/kyria/keymaps/winternebs/config.h
+++ b/keyboards/splitkb/kyria/keymaps/winternebs/config.h
@@ -28,4 +28,3 @@
 #define NO_ACTION_FUNCTION
 #define NO_ACTION_ONESHOT
 #define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/config.h b/keyboards/splitkb/kyria/keymaps/zigotica/config.h
index 8c4e8dfece..9376550cab 100644
--- a/keyboards/splitkb/kyria/keymaps/zigotica/config.h
+++ b/keyboards/splitkb/kyria/keymaps/zigotica/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // these should work better for homerow modifiers
 #define TAPPING_TERM 350
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define QUICK_TAP_TERM 0
 
 #define LEADER_PER_KEY_TIMING
diff --git a/keyboards/splitkb/kyria/kyria.h b/keyboards/splitkb/kyria/kyria.h
deleted file mode 100644
index 9018220eba..0000000000
--- a/keyboards/splitkb/kyria/kyria.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_splitkb_kyria_rev1)
-#    include "rev1.h"
-#endif
-#if defined(KEYBOARD_splitkb_kyria_rev2)
-#    include "rev2.h"
-#endif
diff --git a/keyboards/splitkb/kyria/rev1/base/info.json b/keyboards/splitkb/kyria/rev1/base/info.json
new file mode 100644
index 0000000000..9f75b9c218
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev1/base/info.json
@@ -0,0 +1,5 @@
+{
+    "build": {
+        "lto": true
+    }
+}
diff --git a/keyboards/ergotravel/keymaps/ian/rules.mk b/keyboards/splitkb/kyria/rev1/base/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/ergotravel/keymaps/ian/rules.mk
+++ b/keyboards/splitkb/kyria/rev1/base/rules.mk
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 8ca0d50ea6..3f7655d431 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring
-#define MATRIX_ROW_PINS \
-    { B4, E6, D7, D4 }
-#define MATRIX_COL_PINS \
-    { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
@@ -38,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define SERIAL_USART_TX_PIN      D3
 #    define SERIAL_USART_RX_PIN      D2
 
-#    define RGB_DI_PIN               PAL_LINE(GPIOA, 3)
+#    define WS2812_DI_PIN            PAL_LINE(GPIOA, 3)
 #    define WS2812_PWM_DRIVER        PWMD2                  // default: PWMD2
 #    define WS2812_PWM_CHANNEL       4                      // default: 2
 #    define WS2812_PWM_PAL_MODE      1                      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
@@ -46,7 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define WS2812_DMA_CHANNEL       2                      // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #    define WS2812_DMAMUX_ID         STM32_DMAMUX1_TIM2_UP  // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
 #else
-#    define RGB_DI_PIN D3
+#    define WS2812_DI_PIN D3
 #    define SOFT_SERIAL_PIN D2
 #endif
 
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 895f9283ac..2e380145a0 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -4,6 +4,14 @@
         "pid": "0x9D9D",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B4", "E6", "D7", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C6", "pin_b": "B5"}
@@ -18,59 +26,130 @@
             }
         }
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x6_5"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_3x6_5": {
+            "layout": [
+                {"matrix": [0, 7], "x": 0, "y": 0.75},
+                {"matrix": [0, 6], "x": 1, "y": 0.75},
+                {"matrix": [0, 5], "x": 2, "y": 0.25},
+                {"matrix": [0, 4], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 2], "x": 5, "y": 0.5},
+
+                {"matrix": [4, 2], "x": 10.5, "y": 0.5},
+                {"matrix": [4, 3], "x": 11.5, "y": 0.25},
+                {"matrix": [4, 4], "x": 12.5, "y": 0},
+                {"matrix": [4, 5], "x": 13.5, "y": 0.25},
+                {"matrix": [4, 6], "x": 14.5, "y": 0.75},
+                {"matrix": [4, 7], "x": 15.5, "y": 0.75},
+
+                {"matrix": [1, 7], "x": 0, "y": 1.75},
+                {"matrix": [1, 6], "x": 1, "y": 1.75},
+                {"matrix": [1, 5], "x": 2, "y": 1.25},
+                {"matrix": [1, 4], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1.25},
+                {"matrix": [1, 2], "x": 5, "y": 1.5},
+
+                {"matrix": [5, 2], "x": 10.5, "y": 1.5},
+                {"matrix": [5, 3], "x": 11.5, "y": 1.25},
+                {"matrix": [5, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1.25},
+                {"matrix": [5, 6], "x": 14.5, "y": 1.75},
+                {"matrix": [5, 7], "x": 15.5, "y": 1.75},
+
+                {"matrix": [2, 7], "x": 0, "y": 2.75},
+                {"matrix": [2, 6], "x": 1, "y": 2.75},
+                {"matrix": [2, 5], "x": 2, "y": 2.25},
+                {"matrix": [2, 4], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2.25},
+                {"matrix": [2, 2], "x": 5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6, "y": 3},
+                {"matrix": [2, 0], "x": 7, "y": 3.25},
+
+                {"matrix": [6, 0], "x": 8.5, "y": 3.25},
+                {"matrix": [6, 1], "x": 9.5, "y": 3},
+                {"matrix": [6, 2], "x": 10.5, "y": 2.5},
+                {"matrix": [6, 3], "x": 11.5, "y": 2.25},
+                {"matrix": [6, 4], "x": 12.5, "y": 2},
+                {"matrix": [6, 5], "x": 13.5, "y": 2.25},
+                {"matrix": [6, 6], "x": 14.5, "y": 2.75},
+                {"matrix": [6, 7], "x": 15.5, "y": 2.75},
+
+                {"matrix": [3, 4], "x": 2.5, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 5.5, "y": 4},
+                {"matrix": [3, 0], "x": 6.5, "y": 4.25},
+
+                {"matrix": [7, 0], "x": 9, "y": 4.25},
+                {"matrix": [7, 1], "x": 10, "y": 4},
+                {"matrix": [7, 2], "x": 11, "y": 3.5},
+                {"matrix": [7, 3], "x": 12, "y": 3.25},
+                {"matrix": [7, 4], "x": 13, "y": 3.25}
+            ]
+        },
+        "LAYOUT_stack": {
             "layout": [
-                {"x":0, "y":0.75},
-                {"x":1, "y":0.75},
-                {"x":2, "y":0.25},
-                {"x":3, "y":0},
-                {"x":4, "y":0.25},
-                {"x":5, "y":0.5},
-                {"x":10.5, "y":0.5},
-                {"x":11.5, "y":0.25},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0.25},
-                {"x":14.5, "y":0.75},
-                {"x":15.5, "y":0.75},
-                {"x":0, "y":1.75},
-                {"x":1, "y":1.75},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.5},
-                {"x":10.5, "y":1.5},
-                {"x":11.5, "y":1.25},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1.25},
-                {"x":14.5, "y":1.75},
-                {"x":15.5, "y":1.75},
-                {"x":0, "y":2.75},
-                {"x":1, "y":2.75},
-                {"x":2, "y":2.25},
-                {"x":3, "y":2},
-                {"x":4, "y":2.25},
-                {"x":5, "y":2.5},
-                {"x":6, "y":3},
-                {"x":7, "y":3.25},
-                {"x":8.5, "y":3.25},
-                {"x":9.5, "y":3},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2},
-                {"x":13.5, "y":2.25},
-                {"x":14.5, "y":2.75},
-                {"x":15.5, "y":2.75},
-                {"x":2.5, "y":3.25},
-                {"x":3.5, "y":3.25},
-                {"x":4.5, "y":3.5},
-                {"x":5.5, "y":4},
-                {"x":6.5, "y":4.25},
-                {"x":9, "y":4.25},
-                {"x":10, "y":4},
-                {"x":11, "y":3.5},
-                {"x":12, "y":3.25},
-                {"x":13, "y":3.25}
+                {"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": [1, 7], "x": 6, "y": 0},
+                {"matrix": [1, 6], "x": 7, "y": 0},
+                {"matrix": [1, 5], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [1, 3], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+
+                {"matrix": [2, 7], "x": 12, "y": 0},
+                {"matrix": [2, 6], "x": 13, "y": 0},
+                {"matrix": [2, 5], "x": 14, "y": 0},
+                {"matrix": [2, 4], "x": 15, "y": 0},
+                {"matrix": [2, 3], "x": 16, "y": 0},
+                {"matrix": [2, 2], "x": 17, "y": 0},
+                {"matrix": [2, 1], "x": 18, "y": 0},
+                {"matrix": [2, 0], "x": 19, "y": 0},
+
+                {"matrix": [3, 4], "x": 20, "y": 0},
+                {"matrix": [3, 3], "x": 21, "y": 0},
+                {"matrix": [3, 2], "x": 22, "y": 0},
+                {"matrix": [3, 1], "x": 23, "y": 0},
+                {"matrix": [3, 0], "x": 24, "y": 0},
+
+                {"matrix": [4, 2], "x": 25, "y": 0},
+                {"matrix": [4, 3], "x": 26, "y": 0},
+                {"matrix": [4, 4], "x": 27, "y": 0},
+                {"matrix": [4, 5], "x": 28, "y": 0},
+                {"matrix": [4, 6], "x": 29, "y": 0},
+                {"matrix": [4, 7], "x": 30, "y": 0},
+
+                {"matrix": [5, 2], "x": 31, "y": 0},
+                {"matrix": [5, 3], "x": 32, "y": 0},
+                {"matrix": [5, 4], "x": 33, "y": 0},
+                {"matrix": [5, 5], "x": 34, "y": 0},
+                {"matrix": [5, 6], "x": 35, "y": 0},
+                {"matrix": [5, 7], "x": 36, "y": 0},
+
+                {"matrix": [6, 0], "x": 37, "y": 0},
+                {"matrix": [6, 1], "x": 38, "y": 0},
+                {"matrix": [6, 2], "x": 39, "y": 0},
+                {"matrix": [6, 3], "x": 40, "y": 0},
+                {"matrix": [6, 4], "x": 41, "y": 0},
+                {"matrix": [6, 5], "x": 42, "y": 0},
+                {"matrix": [6, 6], "x": 43, "y": 0},
+                {"matrix": [6, 7], "x": 44, "y": 0},
+
+                {"matrix": [7, 0], "x": 45, "y": 0},
+                {"matrix": [7, 1], "x": 46, "y": 0},
+                {"matrix": [7, 2], "x": 47, "y": 0},
+                {"matrix": [7, 3], "x": 48, "y": 0},
+                {"matrix": [7, 4], "x": 49, "y": 0}
             ]
         }
     }
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/info.json b/keyboards/splitkb/kyria/rev1/proton_c/info.json
new file mode 100644
index 0000000000..6cc38d4a21
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev1/proton_c/info.json
@@ -0,0 +1,5 @@
+{
+    "ws2812": {
+        "driver": "pwm"
+    }
+}
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c b/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c
deleted file mode 100644
index 628fabb2e5..0000000000
--- a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "proton_c.h"
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h b/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h
deleted file mode 100644
index 718f5636ff..0000000000
--- a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "rev1.h"
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
index 8c22db19ee..a58b20c575 100644
--- a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
+++ b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
@@ -1,5 +1,2 @@
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
-AUDIO_ENABLE = no
-LTO_ENABLE = no
 CONVERT_TO = proton_c
diff --git a/keyboards/splitkb/kyria/rev1/rev1.c b/keyboards/splitkb/kyria/rev1/rev1.c
index 52a62ccef8..db14411933 100644
--- a/keyboards/splitkb/kyria/rev1/rev1.c
+++ b/keyboards/splitkb/kyria/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev1.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 // clang-format off
diff --git a/keyboards/splitkb/kyria/rev1/rev1.h b/keyboards/splitkb/kyria/rev1/rev1.h
deleted file mode 100644
index 8a5fbeb21d..0000000000
--- a/keyboards/splitkb/kyria/rev1/rev1.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "kyria.h"
-#ifdef KEYBOARD_splitkb_kyria_rev1_proton_c
-#    include "proton_c.h"
-#endif
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05,                     R06, R07, R08, R09, R10, R11, \
-    L12, L13, L14, L15, L16, L17,                     R18, R19, R20, R21, R22, R23, \
-    L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \
-                   L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
-) \
-{ \
-    { KC_NO, KC_NO, L05,   L04,   L03,   L02,   L01,   L00   }, \
-    { KC_NO, KC_NO, L17,   L16,   L15,   L14,   L13,   L12   }, \
-    { L31,   L30,   L29,   L28,   L27,   L26,   L25,   L24   }, \
-    { L44,   L43,   L42,   L41,   L40,   KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, R06,   R07,   R08,   R09,   R10,   R11   }, \
-    { KC_NO, KC_NO, R18,   R19,   R20,   R21,   R22,   R23   }, \
-    { R32,   R33,   R34,   R35,   R36,   R37,   R38,   R39   }, \
-    { R45,   R46,   R47,   R48,   R49,   KC_NO, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_stack(                               \
-    L00, L01, L02, L03, L04, L05,                   \
-    L12, L13, L14, L15, L16, L17,                   \
-    L24, L25, L26, L27, L28, L29, L30, L31,         \
-                   L40, L41, L42, L43, L44,         \
-                                                    \
-                  R06, R07, R08, R09, R10, R11,     \
-                  R18, R19, R20, R21, R22, R23,     \
-        R32, R33, R34, R35, R36, R37, R38, R39,     \
-        R45, R46, R47, R48, R49                     \
-)                                               \
-{                                               \
-    { KC_NO, KC_NO, L05,   L04,   L03,   L02,   L01,   L00   }, \
-    { KC_NO, KC_NO, L17,   L16,   L15,   L14,   L13,   L12   }, \
-    { L31,   L30,   L29,   L28,   L27,   L26,   L25,   L24   }, \
-    { L44,   L43,   L42,   L41,   L40,   KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, R06,   R07,   R08,   R09,   R10,   R11   }, \
-    { KC_NO, KC_NO, R18,   R19,   R20,   R21,   R22,   R23   }, \
-    { R32,   R33,   R34,   R35,   R36,   R37,   R38,   R39   }, \
-    { R45,   R46,   R47,   R48,   R49,   KC_NO, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_split_3x6_5 LAYOUT
diff --git a/keyboards/splitkb/kyria/rev1/rules.mk b/keyboards/splitkb/kyria/rev1/rules.mk
index cb26f6210d..c4c82d05aa 100644
--- a/keyboards/splitkb/kyria/rev1/rules.mk
+++ b/keyboards/splitkb/kyria/rev1/rules.mk
@@ -11,4 +11,3 @@ OLED_ENABLE = yes          # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = no     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
diff --git a/keyboards/splitkb/kyria/rev2/base/info.json b/keyboards/splitkb/kyria/rev2/base/info.json
new file mode 100644
index 0000000000..9f75b9c218
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/base/info.json
@@ -0,0 +1,5 @@
+{
+    "build": {
+        "lto": true
+    }
+}
diff --git a/keyboards/ergotravel/keymaps/rs/rules.mk b/keyboards/splitkb/kyria/rev2/base/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/ergotravel/keymaps/rs/rules.mk
+++ b/keyboards/splitkb/kyria/rev2/base/rules.mk
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 1799c6aa49..1e8dd02727 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -17,19 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring
-#define MATRIX_ROW_PINS \
-    { F6, F7, B1, B3 }
-#define MATRIX_COL_PINS \
-    { B2, B6, B5, B4, E6, D7, C6, D4 }
-#define MATRIX_ROW_PINS_RIGHT \
-    { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS_RIGHT \
-    { B4, B5, B6, B2, B3, B1, F7, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 // Side detection
 // col 4 row 3 on right-hand-side
 #define SPLIT_HAND_MATRIX_GRID E6, B3 // row first because the board is col2row
@@ -48,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define SERIAL_USART_TX_PIN      D3
 #    define SERIAL_USART_RX_PIN      D2
 
-#    define RGB_DI_PIN               PAL_LINE(GPIOA, 3)
+#    define WS2812_DI_PIN            PAL_LINE(GPIOA, 3)
 #    define WS2812_PWM_DRIVER        PWMD2                  // default: PWMD2
 #    define WS2812_PWM_CHANNEL       4                      // default: 2
 #    define WS2812_PWM_PAL_MODE      1                      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
@@ -56,7 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define WS2812_DMA_CHANNEL       2                      // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #    define WS2812_DMAMUX_ID         STM32_DMAMUX1_TIM2_UP  // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
 #else
-#    define RGB_DI_PIN D3
+#    define WS2812_DI_PIN D3
 #    define SOFT_SERIAL_PIN D2
 #endif
 
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index d21d820804..9b745dc906 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -4,6 +4,14 @@
         "pid": "0x9D9D",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
+        "rows": ["F6", "F7", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F4", "pin_b": "F5"}
@@ -16,61 +24,138 @@
                     {"pin_a": "F5", "pin_b": "F4"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
+                "rows": ["D4", "C6", "D7", "E6"]
+            }
         }
     },
+    "layout_aliases": {
+        "LAYOUT_split_3x6_5": "LAYOUT"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.75},
-                {"x":1, "y":0.75},
-                {"x":2, "y":0.25},
-                {"x":3, "y":0},
-                {"x":4, "y":0.25},
-                {"x":5, "y":0.5},
-                {"x":10.5, "y":0.5},
-                {"x":11.5, "y":0.25},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0.25},
-                {"x":14.5, "y":0.75},
-                {"x":15.5, "y":0.75},
-                {"x":0, "y":1.75},
-                {"x":1, "y":1.75},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.5},
-                {"x":10.5, "y":1.5},
-                {"x":11.5, "y":1.25},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1.25},
-                {"x":14.5, "y":1.75},
-                {"x":15.5, "y":1.75},
-                {"x":0, "y":2.75},
-                {"x":1, "y":2.75},
-                {"x":2, "y":2.25},
-                {"x":3, "y":2},
-                {"x":4, "y":2.25},
-                {"x":5, "y":2.5},
-                {"x":6, "y":3},
-                {"x":7, "y":3.25},
-                {"x":8.5, "y":3.25},
-                {"x":9.5, "y":3},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2},
-                {"x":13.5, "y":2.25},
-                {"x":14.5, "y":2.75},
-                {"x":15.5, "y":2.75},
-                {"x":2.5, "y":3.25},
-                {"x":3.5, "y":3.25},
-                {"x":4.5, "y":3.5},
-                {"x":5.5, "y":4},
-                {"x":6.5, "y":4.25},
-                {"x":9, "y":4.25},
-                {"x":10, "y":4},
-                {"x":11, "y":3.5},
-                {"x":12, "y":3.25},
-                {"x":13, "y":3.25}
+                {"matrix": [0, 7], "x": 0, "y": 0.75},
+                {"matrix": [0, 6], "x": 1, "y": 0.75},
+                {"matrix": [0, 5], "x": 2, "y": 0.25},
+                {"matrix": [0, 4], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 2], "x": 5, "y": 0.5},
+
+                {"matrix": [4, 2], "x": 10.5, "y": 0.5},
+                {"matrix": [4, 3], "x": 11.5, "y": 0.25},
+                {"matrix": [4, 4], "x": 12.5, "y": 0},
+                {"matrix": [4, 5], "x": 13.5, "y": 0.25},
+                {"matrix": [4, 6], "x": 14.5, "y": 0.75},
+                {"matrix": [4, 7], "x": 15.5, "y": 0.75},
+
+                {"matrix": [1, 7], "x": 0, "y": 1.75},
+                {"matrix": [1, 6], "x": 1, "y": 1.75},
+                {"matrix": [1, 5], "x": 2, "y": 1.25},
+                {"matrix": [1, 4], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1.25},
+                {"matrix": [1, 2], "x": 5, "y": 1.5},
+
+                {"matrix": [5, 2], "x": 10.5, "y": 1.5},
+                {"matrix": [5, 3], "x": 11.5, "y": 1.25},
+                {"matrix": [5, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1.25},
+                {"matrix": [5, 6], "x": 14.5, "y": 1.75},
+                {"matrix": [5, 7], "x": 15.5, "y": 1.75},
+
+                {"matrix": [2, 7], "x": 0, "y": 2.75},
+                {"matrix": [2, 6], "x": 1, "y": 2.75},
+                {"matrix": [2, 5], "x": 2, "y": 2.25},
+                {"matrix": [2, 4], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2.25},
+                {"matrix": [2, 2], "x": 5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6, "y": 3},
+                {"matrix": [2, 0], "x": 7, "y": 3.25},
+
+                {"matrix": [6, 0], "x": 8.5, "y": 3.25},
+                {"matrix": [6, 1], "x": 9.5, "y": 3},
+                {"matrix": [6, 2], "x": 10.5, "y": 2.5},
+                {"matrix": [6, 3], "x": 11.5, "y": 2.25},
+                {"matrix": [6, 4], "x": 12.5, "y": 2},
+                {"matrix": [6, 5], "x": 13.5, "y": 2.25},
+                {"matrix": [6, 6], "x": 14.5, "y": 2.75},
+                {"matrix": [6, 7], "x": 15.5, "y": 2.75},
+
+                {"matrix": [3, 5], "x": 2.5, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 5.5, "y": 4},
+                {"matrix": [3, 0], "x": 6.5, "y": 4.25},
+
+                {"matrix": [7, 0], "x": 9, "y": 4.25},
+                {"matrix": [7, 1], "x": 10, "y": 4},
+                {"matrix": [7, 2], "x": 11, "y": 3.5},
+                {"matrix": [7, 3], "x": 12, "y": 3.25},
+                {"matrix": [7, 5], "x": 13, "y": 3.25}
+            ]
+        },
+        "LAYOUT_stack": {
+            "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": [1, 7], "x": 6, "y": 0},
+                {"matrix": [1, 6], "x": 7, "y": 0},
+                {"matrix": [1, 5], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [1, 3], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+
+                {"matrix": [2, 7], "x": 12, "y": 0},
+                {"matrix": [2, 6], "x": 13, "y": 0},
+                {"matrix": [2, 5], "x": 14, "y": 0},
+                {"matrix": [2, 4], "x": 15, "y": 0},
+                {"matrix": [2, 3], "x": 16, "y": 0},
+                {"matrix": [2, 2], "x": 17, "y": 0},
+                {"matrix": [2, 1], "x": 18, "y": 0},
+                {"matrix": [2, 0], "x": 19, "y": 0},
+
+                {"matrix": [3, 5], "x": 20, "y": 0},
+                {"matrix": [3, 3], "x": 21, "y": 0},
+                {"matrix": [3, 2], "x": 22, "y": 0},
+                {"matrix": [3, 1], "x": 23, "y": 0},
+                {"matrix": [3, 0], "x": 24, "y": 0},
+
+                {"matrix": [4, 2], "x": 25, "y": 0},
+                {"matrix": [4, 3], "x": 26, "y": 0},
+                {"matrix": [4, 4], "x": 27, "y": 0},
+                {"matrix": [4, 5], "x": 28, "y": 0},
+                {"matrix": [4, 6], "x": 29, "y": 0},
+                {"matrix": [4, 7], "x": 30, "y": 0},
+
+                {"matrix": [5, 2], "x": 31, "y": 0},
+                {"matrix": [5, 3], "x": 32, "y": 0},
+                {"matrix": [5, 4], "x": 33, "y": 0},
+                {"matrix": [5, 5], "x": 34, "y": 0},
+                {"matrix": [5, 6], "x": 35, "y": 0},
+                {"matrix": [5, 7], "x": 36, "y": 0},
+
+                {"matrix": [6, 0], "x": 37, "y": 0},
+                {"matrix": [6, 1], "x": 38, "y": 0},
+                {"matrix": [6, 2], "x": 39, "y": 0},
+                {"matrix": [6, 3], "x": 40, "y": 0},
+                {"matrix": [6, 4], "x": 41, "y": 0},
+                {"matrix": [6, 5], "x": 42, "y": 0},
+                {"matrix": [6, 6], "x": 43, "y": 0},
+                {"matrix": [6, 7], "x": 44, "y": 0},
+
+                {"matrix": [7, 0], "x": 45, "y": 0},
+                {"matrix": [7, 1], "x": 46, "y": 0},
+                {"matrix": [7, 2], "x": 47, "y": 0},
+                {"matrix": [7, 3], "x": 48, "y": 0},
+                {"matrix": [7, 5], "x": 49, "y": 0}
             ]
         }
     }
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/info.json b/keyboards/splitkb/kyria/rev2/proton_c/info.json
new file mode 100644
index 0000000000..6cc38d4a21
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/proton_c/info.json
@@ -0,0 +1,5 @@
+{
+    "ws2812": {
+        "driver": "pwm"
+    }
+}
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c b/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c
deleted file mode 100644
index 9c74b45f77..0000000000
--- a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "proton_c.h"
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h b/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h
deleted file mode 100644
index 143b9e39dd..0000000000
--- a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "rev2.h"
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/rules.mk b/keyboards/splitkb/kyria/rev2/proton_c/rules.mk
index 8c22db19ee..a58b20c575 100644
--- a/keyboards/splitkb/kyria/rev2/proton_c/rules.mk
+++ b/keyboards/splitkb/kyria/rev2/proton_c/rules.mk
@@ -1,5 +1,2 @@
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
-AUDIO_ENABLE = no
-LTO_ENABLE = no
 CONVERT_TO = proton_c
diff --git a/keyboards/splitkb/kyria/rev2/rev2.c b/keyboards/splitkb/kyria/rev2/rev2.c
index 3ec4aa37f0..37300c8188 100644
--- a/keyboards/splitkb/kyria/rev2/rev2.c
+++ b/keyboards/splitkb/kyria/rev2/rev2.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev2.h"
+#include "quantum.h"
 
 // Mask out handedness diode to prevent it
 // from keeping the keyboard awake
diff --git a/keyboards/splitkb/kyria/rev2/rev2.h b/keyboards/splitkb/kyria/rev2/rev2.h
deleted file mode 100644
index ed4169b0ed..0000000000
--- a/keyboards/splitkb/kyria/rev2/rev2.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "kyria.h"
-#ifdef KEYBOARD_splitkb_kyria_rev2_proton_c
-#    include "proton_c.h"
-#endif
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05,                     R06, R07, R08, R09, R10, R11, \
-    L12, L13, L14, L15, L16, L17,                     R18, R19, R20, R21, R22, R23, \
-    L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \
-                   L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
-) \
-{ \
-    { KC_NO, KC_NO, L05,   L04,   L03,   L02,   L01,   L00   }, \
-    { KC_NO, KC_NO, L17,   L16,   L15,   L14,   L13,   L12   }, \
-    { L31,   L30,   L29,   L28,   L27,   L26,   L25,   L24   }, \
-    { L44,   L43,   L42,   L41,   KC_NO, L40,   KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, R06,   R07,   R08,   R09,   R10,   R11   }, \
-    { KC_NO, KC_NO, R18,   R19,   R20,   R21,   R22,   R23   }, \
-    { R32,   R33,   R34,   R35,   R36,   R37,   R38,   R39   }, \
-    { R45,   R46,   R47,   R48,   KC_NO, R49,   KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_stack(                               \
-    L00, L01, L02, L03, L04, L05,                   \
-    L12, L13, L14, L15, L16, L17,                   \
-    L24, L25, L26, L27, L28, L29, L30, L31,         \
-                   L40, L41, L42, L43, L44,         \
-                                                    \
-                  R06, R07, R08, R09, R10, R11,     \
-                  R18, R19, R20, R21, R22, R23,     \
-        R32, R33, R34, R35, R36, R37, R38, R39,     \
-        R45, R46, R47, R48, R49                     \
-)                                               \
-{                                               \
-    { KC_NO, KC_NO, L05,   L04,   L03,   L02,   L01,   L00   }, \
-    { KC_NO, KC_NO, L17,   L16,   L15,   L14,   L13,   L12   }, \
-    { L31,   L30,   L29,   L28,   L27,   L26,   L25,   L24   }, \
-    { L44,   L43,   L42,   L41,   KC_NO, L40,   KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, R06,   R07,   R08,   R09,   R10,   R11   }, \
-    { KC_NO, KC_NO, R18,   R19,   R20,   R21,   R22,   R23   }, \
-    { R32,   R33,   R34,   R35,   R36,   R37,   R38,   R39   }, \
-    { R45,   R46,   R47,   R48,   KC_NO, R49,   KC_NO, KC_NO }, \
-}
-
-#define LAYOUT_split_3x6_5 LAYOUT
diff --git a/keyboards/splitkb/kyria/rev2/rules.mk b/keyboards/splitkb/kyria/rev2/rules.mk
index cb26f6210d..c4c82d05aa 100644
--- a/keyboards/splitkb/kyria/rev2/rules.mk
+++ b/keyboards/splitkb/kyria/rev2/rules.mk
@@ -11,4 +11,3 @@ OLED_ENABLE = yes          # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = no     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json
index 71191323a6..57d8d19130 100644
--- a/keyboards/splitkb/kyria/rev3/info.json
+++ b/keyboards/splitkb/kyria/rev3/info.json
@@ -6,6 +6,9 @@
     "bootmagic": {
         "matrix": [0, 6]
     },
+    "build": {
+        "lto": true
+    },
     "features": {
         "mousekey": true,
         "bootmagic": true,
@@ -171,12 +174,14 @@
         }
     },
     "rgblight": {
-        "pin": "D3",
         "led_count": 62,
         "split": true,
         "split_count": [31, 31],
         "max_brightness": 128
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
diff --git a/keyboards/splitkb/kyria/rev3/rev3.c b/keyboards/splitkb/kyria/rev3/rev3.c
index 4ff592ef55..3dc5299377 100644
--- a/keyboards/splitkb/kyria/rev3/rev3.c
+++ b/keyboards/splitkb/kyria/rev3/rev3.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 // clang-format off
diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h
index c06c192e0d..840cc8e679 100644
--- a/keyboards/splitkb/zima/config.h
+++ b/keyboards/splitkb/zima/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_CLICKY
 #define NO_MUSIC_MODE
 
-#define RGB_DI_PIN         B5
 #define RGBLED_NUM         5
 #define RGBLIGHT_HUE_STEP  8
 #define RGBLIGHT_SAT_STEP  8
diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
index 077421904c..7fd39cf607 100644
--- a/keyboards/splitkb/zima/info.json
+++ b/keyboards/splitkb/zima/info.json
@@ -8,6 +8,9 @@
         "pid": "0xF75B",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "D7", "resolution": 2}
@@ -26,18 +29,18 @@
     "layouts": {
         "LAYOUT_ortho_4x3": {
             "layout": [
-                {"x":0, "y":1, "matrix": [0, 0]},
-                {"x":1, "y":1, "matrix": [0, 1]},
-                {"x":2, "y":1, "matrix": [0, 2]},
-                {"x":0, "y":2, "matrix": [1, 0]},
-                {"x":1, "y":2, "matrix": [1, 1]},
-                {"x":2, "y":2, "matrix": [1, 2]},
-                {"x":0, "y":3, "matrix": [2, 0]},
-                {"x":1, "y":3, "matrix": [2, 1]},
-                {"x":2, "y":3, "matrix": [2, 2]},
-                {"x":0, "y":4, "matrix": [3, 0]},
-                {"x":1, "y":4, "matrix": [3, 1]},
-                {"x":2, "y":4, "matrix": [3, 2]}
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]}
             ]
         }
     }
diff --git a/keyboards/splitography/splitography.c b/keyboards/splitography/splitography.c
deleted file mode 100644
index 4fe3452ef2..0000000000
--- a/keyboards/splitography/splitography.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Alexis Jeandeau
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "splitography.h"
diff --git a/keyboards/splitty/config.h b/keyboards/splitty/config.h
index 3056705bb2..e190122bc8 100644
--- a/keyboards/splitty/config.h
+++ b/keyboards/splitty/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
-    { F0, F1, D4, D5, D6 }
-#define MATRIX_COL_PINS \
-    { B0, B1, B2, B3, B4, B5, B6 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Split Keyboard specific options. */
 #define USE_I2C
 #define EE_HANDS
diff --git a/keyboards/splitty/info.json b/keyboards/splitty/info.json
index bdcb13d044..a2983474be 100644
--- a/keyboards/splitty/info.json
+++ b/keyboards/splitty/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6052",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"],
+    "rows": ["F0", "F1", "D4", "D5", "D6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/splitty/rev1/rev1.c b/keyboards/splitty/rev1/rev1.c
deleted file mode 100644
index 0cf9a1d9c3..0000000000
--- a/keyboards/splitty/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Nicolas Schodet
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "splitty.h"
diff --git a/keyboards/splitty/rev1/rev1.h b/keyboards/splitty/rev1/rev1.h
index 9205165730..7d9e9e09dc 100644
--- a/keyboards/splitty/rev1/rev1.h
+++ b/keyboards/splitty/rev1/rev1.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include QMK_KEYBOARD_H
+#include "splitty.h"
 
 // clang-format off
 #define LAYOUT( \
diff --git a/keyboards/sporewoh/banime40/banime40.c b/keyboards/sporewoh/banime40/banime40.c
deleted file mode 100644
index 4e55c6116e..0000000000
--- a/keyboards/sporewoh/banime40/banime40.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 sporewoh
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "banime40.h"
diff --git a/keyboards/sporewoh/banime40/banime40.h b/keyboards/sporewoh/banime40/banime40.h
deleted file mode 100644
index 98b2bcd098..0000000000
--- a/keyboards/sporewoh/banime40/banime40.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2022 sporewoh
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x10( \
-      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-      k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-      k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 \
-) \
-{ \
-      {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \
-      {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \
-      {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29}, \
-      {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39} \
-}
diff --git a/keyboards/sporewoh/banime40/config.h b/keyboards/sporewoh/banime40/config.h
index 5059ce5d4e..75882003aa 100644
--- a/keyboards/sporewoh/banime40/config.h
+++ b/keyboards/sporewoh/banime40/config.h
@@ -17,13 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* pin-out for PCB */
-#define MATRIX_ROW_PINS { E6, D7, C6, D4 }
-#define MATRIX_COL_PINS { B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
diff --git a/keyboards/sporewoh/banime40/info.json b/keyboards/sporewoh/banime40/info.json
index a99be6bf29..6dba060131 100644
--- a/keyboards/sporewoh/banime40/info.json
+++ b/keyboards/sporewoh/banime40/info.json
@@ -8,52 +8,61 @@
      	"pid": "0x0001",
      	"device_version": "0.0.1"
      },
+     "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["E6", "D7", "C6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x10"],
     "layouts": {
         "LAYOUT_ortho_4x10": {
             "layout": [
-				{"w":1, "x":0, "y":0},
-				{"w":1, "x":1, "y":0}, 
-				{"w":1, "x":2, "y":0}, 
-				{"w":1, "x":3, "y":0}, 
-				{"w":1, "x":4, "y":0}, 
-				{"w":1, "x":5, "y":0}, 
-				{"w":1, "x":6, "y":0}, 
-				{"w":1, "x":7, "y":0}, 
-				{"w":1, "x":8, "y":0}, 
-				{"w":1, "x":9, "y":0}, 
-				{"w":1, "x":0, "y":1}, 
-				{"w":1, "x":1, "y":1}, 
-				{"w":1, "x":2, "y":1}, 
-				{"w":1, "x":3, "y":1}, 
-				{"w":1, "x":4, "y":1}, 
-				{"w":1, "x":5, "y":1}, 
-				{"w":1, "x":6, "y":1}, 
-				{"w":1, "x":7, "y":1}, 
-				{"w":1, "x":8, "y":1}, 
-				{"w":1, "x":9, "y":1}, 
-				{"w":1, "x":0, "y":2}, 
-				{"w":1, "x":1, "y":2}, 
-				{"w":1, "x":2, "y":2}, 
-				{"w":1, "x":3, "y":2}, 
-				{"w":1, "x":4, "y":2}, 
-				{"w":1, "x":5, "y":2}, 
-				{"w":1, "x":6, "y":2}, 
-				{"w":1, "x":7, "y":2}, 
-				{"w":1, "x":8, "y":2}, 
-				{"w":1, "x":9, "y":2}, 
-				{"w":1, "x":0, "y":3}, 
-				{"w":1, "x":1, "y":3}, 
-				{"w":1, "x":2, "y":3}, 
-				{"w":1, "x":3, "y":3}, 
-				{"w":1, "x":4, "y":3}, 
-				{"w":1, "x":5, "y":3}, 
-				{"w":1, "x":6, "y":3}, 
-				{"w":1, "x":7, "y":3}, 
-				{"w":1, "x":8, "y":3}, 
-				{"w":1, "x":9, "y":3}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h
index e616210705..559dd046b7 100644
--- a/keyboards/star75/config.h
+++ b/keyboards/star75/config.h
@@ -3,23 +3,12 @@ Copyright 2022 Horns Lyn (@hornslyn)
 SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B3
-
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -38,4 +27,3 @@ SPDX-License-Identifier: GPL-2.0-or-later */
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 180
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#endif
diff --git a/keyboards/star75/info.json b/keyboards/star75/info.json
index 4bf206e4e5..0105fac71d 100644
--- a/keyboards/star75/info.json
+++ b/keyboards/star75/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
+        "rows": ["B7", "D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B1"}
diff --git a/keyboards/star75/star75.c b/keyboards/star75/star75.c
deleted file mode 100644
index abadba8625..0000000000
--- a/keyboards/star75/star75.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* 
-Copyright 2022 Horns Lyn (@hornslyn)
-SPDX-License-Identifier: GPL-2.0-or-later */
-#include "star75.h"
diff --git a/keyboards/stello65/beta/config.h b/keyboards/stello65/beta/config.h
index 4efc0635a1..61ebee945d 100644
--- a/keyboards/stello65/beta/config.h
+++ b/keyboards/stello65/beta/config.h
@@ -3,23 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, E6, D0, D1, C6, F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { C7, B6, B5, B4, D7, D6, D4, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define ENCODERS_CW_KEY  { { 4, 7 } }
 #define ENCODERS_CCW_KEY { { 4, 6 } }
 
diff --git a/keyboards/stello65/beta/encoder_actions.c b/keyboards/stello65/beta/encoder_actions.c
index 72970a2ffc..87a53676e6 100644
--- a/keyboards/stello65/beta/encoder_actions.c
+++ b/keyboards/stello65/beta/encoder_actions.c
@@ -29,7 +29,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -41,7 +42,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/stello65/beta/info.json b/keyboards/stello65/beta/info.json
index d4e73eba1d..e01f7399eb 100644
--- a/keyboards/stello65/beta/info.json
+++ b/keyboards/stello65/beta/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h
index d076264be9..d1563065b0 100644
--- a/keyboards/stello65/hs_rev1/config.h
+++ b/keyboards/stello65/hs_rev1/config.h
@@ -3,25 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F1, F0, D1, D2, B6, C6, C7, F7, F6, F5 }
-#define MATRIX_COL_PINS { E6, B5, B4, D7, D6, D4, D5, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 4
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
@@ -39,7 +20,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/stello65/hs_rev1/hs_rev1.c b/keyboards/stello65/hs_rev1/hs_rev1.c
deleted file mode 100644
index 527613abb0..0000000000
--- a/keyboards/stello65/hs_rev1/hs_rev1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 @wekey (@wekey)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "hs_rev1.h"
diff --git a/keyboards/stello65/hs_rev1/info.json b/keyboards/stello65/hs_rev1/info.json
index 218f2657ad..6c19cfb7fe 100644
--- a/keyboards/stello65/hs_rev1/info.json
+++ b/keyboards/stello65/hs_rev1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["F1", "F0", "D1", "D2", "B6", "C6", "C7", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h
index de25e1504f..d1563065b0 100644
--- a/keyboards/stello65/sl_rev1/config.h
+++ b/keyboards/stello65/sl_rev1/config.h
@@ -3,25 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, E6, D0, D1, C6, F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { C7, B4, D7, D6, D4, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 4
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
@@ -39,7 +20,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/stello65/sl_rev1/info.json b/keyboards/stello65/sl_rev1/info.json
index 647afe2e9c..523a5c0dbb 100644
--- a/keyboards/stello65/sl_rev1/info.json
+++ b/keyboards/stello65/sl_rev1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/stello65/sl_rev1/sl_rev1.c b/keyboards/stello65/sl_rev1/sl_rev1.c
deleted file mode 100644
index 502c376948..0000000000
--- a/keyboards/stello65/sl_rev1/sl_rev1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 @wekey (@wekey)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "sl_rev1.h"
diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/config.h b/keyboards/stenokeyboards/the_uni/pro_micro/config.h
index 860b809ef3..bf5b37166a 100644
--- a/keyboards/stenokeyboards/the_uni/pro_micro/config.h
+++ b/keyboards/stenokeyboards/the_uni/pro_micro/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, B2, B6 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B5, B4, E6, D7, C6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/info.json b/keyboards/stenokeyboards/the_uni/pro_micro/info.json
index e1dda21feb..40dd660d09 100644
--- a/keyboards/stenokeyboards/the_uni/pro_micro/info.json
+++ b/keyboards/stenokeyboards/the_uni/pro_micro/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B5", "B4", "E6", "D7", "C6", "D4"],
+        "rows": ["F4", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/pro_micro.c b/keyboards/stenokeyboards/the_uni/pro_micro/pro_micro.c
deleted file mode 100644
index 3d5b3b23bb..0000000000
--- a/keyboards/stenokeyboards/the_uni/pro_micro/pro_micro.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Peter C. Park <peter@stenokeyboards.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pro_micro.h"
diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/config.h b/keyboards/stenokeyboards/the_uni/rp_2040/config.h
index 46c8a81a84..a2c060d424 100644
--- a/keyboards/stenokeyboards/the_uni/rp_2040/config.h
+++ b/keyboards/stenokeyboards/the_uni/rp_2040/config.h
@@ -16,15 +16,10 @@
 
 #pragma once
 
-#define MATRIX_COL_PINS { GP24, GP23, GP21, GP20, GP19, GP6, GP5, GP4, GP3, GP2, GP1 }
-#define MATRIX_ROW_PINS { GP25, GP18, GP17 }
 // #define DEBUG_MATRIX_SCAN_RATE
 
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 //#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define FORCE_NKRO
diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/info.json b/keyboards/stenokeyboards/the_uni/rp_2040/info.json
index 6425514687..c48ad290f4 100644
--- a/keyboards/stenokeyboards/the_uni/rp_2040/info.json
+++ b/keyboards/stenokeyboards/the_uni/rp_2040/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.4"
     },
+    "matrix_pins": {
+        "cols": ["GP24", "GP23", "GP21", "GP20", "GP19", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"],
+        "rows": ["GP25", "GP18", "GP17"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.c b/keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.c
deleted file mode 100644
index b032a22f42..0000000000
--- a/keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Stefan Kerkmann
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rp_2040.h"
-
diff --git a/keyboards/stenokeyboards/the_uni/usb_c/config.h b/keyboards/stenokeyboards/the_uni/usb_c/config.h
index 94fa1c6b63..bf5b37166a 100644
--- a/keyboards/stenokeyboards/the_uni/usb_c/config.h
+++ b/keyboards/stenokeyboards/the_uni/usb_c/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D6, C7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, D5, D3, D2, D1, D0, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/stenokeyboards/the_uni/usb_c/info.json b/keyboards/stenokeyboards/the_uni/usb_c/info.json
index 14c0e6d7cb..ef761abe8a 100644
--- a/keyboards/stenokeyboards/the_uni/usb_c/info.json
+++ b/keyboards/stenokeyboards/the_uni/usb_c/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "D5", "D3", "D2", "D1", "D0", "D4"],
+        "rows": ["B7", "D6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/stenokeyboards/the_uni/usb_c/usb_c.c b/keyboards/stenokeyboards/the_uni/usb_c/usb_c.c
deleted file mode 100644
index e690d0a886..0000000000
--- a/keyboards/stenokeyboards/the_uni/usb_c/usb_c.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Peter C. Park <peter@stenokeyboards.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "usb_c.h"
diff --git a/keyboards/sthlmkb/lagom/info.json b/keyboards/sthlmkb/lagom/info.json
index 410d22512e..2d2ca47305 100644
--- a/keyboards/sthlmkb/lagom/info.json
+++ b/keyboards/sthlmkb/lagom/info.json
@@ -21,379 +21,409 @@
      },
     "layouts": {
         "LAYOUT_base": {
-             "layout": [
-                     {"label":"Esc", "x":0, "y":0},
-                     {"label":"1", "x":1, "y":0},
-                     {"label":"2", "x":2, "y":0},
-                     {"label":"3", "x":3, "y":0},
-                     {"label":"4", "x":4, "y":0},
-                     {"label":"5", "x":5, "y":0},
-                     {"label":"6", "x":6, "y":0},
-                     {"label":"7", "x":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0, "w":2},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "y":0},
-                     {"label":"Tab", "x":0, "y":1, "w":1.5},
-                     {"label":"Q", "x":1.5, "y":1},
-                     {"label":"W", "x":2.5, "y":1},
-                     {"label":"E", "x":3.5, "y":1},
-                     {"label":"R", "x":4.5, "y":1},
-                     {"label":"T", "x":5.5, "y":1},
-                     {"label":"Y", "x":6.5, "y":1},
-                     {"label":"U", "x":7.5, "y":1},
-                     {"label":"I", "x":8.5, "y":1},
-                     {"label":"O", "x":9.5, "y":1},
-                     {"label":"P", "x":10.5, "y":1},
-                     {"label":"{", "x":11.5, "y":1},
-                     {"label":"}", "x":12.5, "y":1},
-                     {"label":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "y":1},
-                     {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                     {"label":"A", "x":1.75, "y":2},
-                     {"label":"S", "x":2.75, "y":2},
-                     {"label":"D", "x":3.75, "y":2},
-                     {"label":"F", "x":4.75, "y":2},
-                     {"label":"G", "x":5.75, "y":2},
-                     {"label":"H", "x":6.75, "y":2},
-                     {"label":"J", "x":7.75, "y":2},
-                     {"label":"K", "x":8.75, "y":2},
-                     {"label":"L", "x":9.75, "y":2},
-                     {"label":";", "x":10.75, "y":2},
-                     {"label":"\"", "x":11.75, "y":2},
-                     {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":2.25},
-                     {"label":"Z", "x":2.25, "y":3},
-                     {"label":"X", "x":3.25, "y":3},
-                     {"label":"C", "x":4.25, "y":3},
-                     {"label":"V", "x":5.25, "y":3},
-                     {"label":"B", "x":6.25, "y":3},
-                     {"label":"N", "x":7.25, "y":3},
-                     {"label":"M", "x":8.25, "y":3},
-                     {"label":"<", "x":9.25, "y":3},
-                     {"label":">", "x":10.25, "y":3},
-                     {"label":"?", "x":11.25, "y":3},
-                     {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                     {"label":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
         "LAYOUT_splits": {
-             "layout": [
-                     {"label":"Esc", "x":0, "y":0},
-                     {"label":"1", "x":1, "y":0},
-                     {"label":"2", "x":2, "y":0},
-                     {"label":"3", "x":3, "y":0},
-                     {"label":"4", "x":4, "y":0},
-                     {"label":"5", "x":5, "y":0},
-                     {"label":"6", "x":6, "y":0},
-                     {"label":"7", "x":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0},
-                     {"label":"Delete", "x":14, "y":0},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "y":0},
-                     {"label":"Tab", "x":0, "y":1, "w":1.5},
-                     {"label":"Q", "x":1.5, "y":1},
-                     {"label":"W", "x":2.5, "y":1},
-                     {"label":"E", "x":3.5, "y":1},
-                     {"label":"R", "x":4.5, "y":1},
-                     {"label":"T", "x":5.5, "y":1},
-                     {"label":"Y", "x":6.5, "y":1},
-                     {"label":"U", "x":7.5, "y":1},
-                     {"label":"I", "x":8.5, "y":1},
-                     {"label":"O", "x":9.5, "y":1},
-                     {"label":"P", "x":10.5, "y":1},
-                     {"label":"{", "x":11.5, "y":1},
-                     {"label":"}", "x":12.5, "y":1},
-                     {"label":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "y":1},
-                     {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                     {"label":"A", "x":1.75, "y":2},
-                     {"label":"S", "x":2.75, "y":2},
-                     {"label":"D", "x":3.75, "y":2},
-                     {"label":"F", "x":4.75, "y":2},
-                     {"label":"G", "x":5.75, "y":2},
-                     {"label":"H", "x":6.75, "y":2},
-                     {"label":"J", "x":7.75, "y":2},
-                     {"label":"K", "x":8.75, "y":2},
-                     {"label":"L", "x":9.75, "y":2},
-                     {"label":";", "x":10.75, "y":2},
-                     {"label":"\"", "x":11.75, "y":2},
-                     {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"label":"Z", "x":2.25, "y":3},
-                     {"label":"X", "x":3.25, "y":3},
-                     {"label":"C", "x":4.25, "y":3},
-                     {"label":"V", "x":5.25, "y":3},
-                     {"label":"B", "x":6.25, "y":3},
-                     {"label":"N", "x":7.25, "y":3},
-                     {"label":"M", "x":8.25, "y":3},
-                     {"label":"<", "x":9.25, "y":3},
-                     {"label":">", "x":10.25, "y":3},
-                     {"label":"?", "x":11.25, "y":3},
-                     {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                     {"label":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
         "LAYOUT_iso": {
-             "layout": [
-                     {"label":"Esc", "x":0, "y":0},
-                     {"label":"1", "x":1, "y":0},
-                     {"label":"2", "x":2, "y":0},
-                     {"label":"3", "x":3, "y":0},
-                     {"label":"4", "x":4, "y":0},
-                     {"label":"5", "x":5, "y":0},
-                     {"label":"6", "x":6, "y":0},
-                     {"label":"7", "x":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0, "w":2},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "y":0},
-                     {"label":"Tab", "x":0, "y":1, "w":1.5},
-                     {"label":"Q", "x":1.5, "y":1},
-                     {"label":"W", "x":2.5, "y":1},
-                     {"label":"E", "x":3.5, "y":1},
-                     {"label":"R", "x":4.5, "y":1},
-                     {"label":"T", "x":5.5, "y":1},
-                     {"label":"Y", "x":6.5, "y":1},
-                     {"label":"U", "x":7.5, "y":1},
-                     {"label":"I", "x":8.5, "y":1},
-                     {"label":"O", "x":9.5, "y":1},
-                     {"label":"P", "x":10.5, "y":1},
-                     {"label":"{", "x":11.5, "y":1},
-                     {"label":"}", "x":12.5, "y":1},
-                     {"label":"Delete", "x":15, "y":1},
-                     {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                     {"label":"A", "x":1.75, "y":2},
-                     {"label":"S", "x":2.75, "y":2},
-                     {"label":"D", "x":3.75, "y":2},
-                     {"label":"F", "x":4.75, "y":2},
-                     {"label":"G", "x":5.75, "y":2},
-                     {"label":"H", "x":6.75, "y":2},
-                     {"label":"J", "x":7.75, "y":2},
-                     {"label":"K", "x":8.75, "y":2},
-                     {"label":"L", "x":9.75, "y":2},
-                     {"label":";", "x":10.75, "y":2},
-                     {"label":"\"", "x":11.75, "y":2},
-                     {"label":"|", "x":12.75, "y":2},
-                     {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"label":"Z", "x":2.25, "y":3},
-                     {"label":"X", "x":3.25, "y":3},
-                     {"label":"C", "x":4.25, "y":3},
-                     {"label":"V", "x":5.25, "y":3},
-                     {"label":"B", "x":6.25, "y":3},
-                     {"label":"N", "x":7.25, "y":3},
-                     {"label":"M", "x":8.25, "y":3},
-                     {"label":"<", "x":9.25, "y":3},
-                     {"label":">", "x":10.25, "y":3},
-                     {"label":"?", "x":11.25, "y":3},
-                     {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                     {"label":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 14], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 15], "x": 12.5, "y": 1},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 12], "x": 11.75, "y": 2},
+                {"label": "|", "matrix": [2, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
         "LAYOUT_split_space": {
-             "layout": [
-                     {"label":"Esc", "x":0, "y":0},
-                     {"label":"1", "x":1, "y":0},
-                     {"label":"2", "x":2, "y":0},
-                     {"label":"3", "x":3, "y":0},
-                     {"label":"4", "x":4, "y":0},
-                     {"label":"5", "x":5, "y":0},
-                     {"label":"6", "x":6, "y":0},
-                     {"label":"7", "x":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0},
-                     {"label":"Delete", "x":14, "y":0},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "y":0},
-                     {"label":"Tab", "x":0, "y":1, "w":1.5},
-                     {"label":"Q", "x":1.5, "y":1},
-                     {"label":"W", "x":2.5, "y":1},
-                     {"label":"E", "x":3.5, "y":1},
-                     {"label":"R", "x":4.5, "y":1},
-                     {"label":"T", "x":5.5, "y":1},
-                     {"label":"Y", "x":6.5, "y":1},
-                     {"label":"U", "x":7.5, "y":1},
-                     {"label":"I", "x":8.5, "y":1},
-                     {"label":"O", "x":9.5, "y":1},
-                     {"label":"P", "x":10.5, "y":1},
-                     {"label":"{", "x":11.5, "y":1},
-                     {"label":"}", "x":12.5, "y":1},
-                     {"label":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "y":1},
-                     {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                     {"label":"A", "x":1.75, "y":2},
-                     {"label":"S", "x":2.75, "y":2},
-                     {"label":"D", "x":3.75, "y":2},
-                     {"label":"F", "x":4.75, "y":2},
-                     {"label":"G", "x":5.75, "y":2},
-                     {"label":"H", "x":6.75, "y":2},
-                     {"label":"J", "x":7.75, "y":2},
-                     {"label":"K", "x":8.75, "y":2},
-                     {"label":"L", "x":9.75, "y":2},
-                     {"label":";", "x":10.75, "y":2},
-                     {"label":"\"", "x":11.75, "y":2},
-                     {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"label":"Z", "x":2.25, "y":3},
-                     {"label":"X", "x":3.25, "y":3},
-                     {"label":"C", "x":4.25, "y":3},
-                     {"label":"V", "x":5.25, "y":3},
-                     {"label":"B", "x":6.25, "y":3},
-                     {"label":"N", "x":7.25, "y":3},
-                     {"label":"M", "x":8.25, "y":3},
-                     {"label":"<", "x":9.25, "y":3},
-                     {"label":">", "x":10.25, "y":3},
-                     {"label":"?", "x":11.25, "y":3},
-                     {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                     {"label":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":2.25},
-                     {"label":"Super", "x":6, "y":4, "w":1.25},
-                     {"label":"Space", "x":7.25, "y":4, "w":2.75},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
-        "LAYOUT_7u_space": {
-             "layout": [
-                     {"label":"Esc", "x":0, "y":0},
-                     {"label":"1", "x":1, "y":0},
-                     {"label":"2", "x":2, "y":0},
-                     {"label":"3", "x":3, "y":0},
-                     {"label":"4", "x":4, "y":0},
-                     {"label":"5", "x":5, "y":0},
-                     {"label":"6", "x":6, "y":0},
-                     {"label":"7", "x":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0},
-                     {"label":"Delete", "x":14, "y":0},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "y":0},
-                     {"label":"Tab", "x":0, "y":1, "w":1.5},
-                     {"label":"Q", "x":1.5, "y":1},
-                     {"label":"W", "x":2.5, "y":1},
-                     {"label":"E", "x":3.5, "y":1},
-                     {"label":"R", "x":4.5, "y":1},
-                     {"label":"T", "x":5.5, "y":1},
-                     {"label":"Y", "x":6.5, "y":1},
-                     {"label":"U", "x":7.5, "y":1},
-                     {"label":"I", "x":8.5, "y":1},
-                     {"label":"O", "x":9.5, "y":1},
-                     {"label":"P", "x":10.5, "y":1},
-                     {"label":"{", "x":11.5, "y":1},
-                     {"label":"}", "x":12.5, "y":1},
-                     {"label":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "y":1},
-                     {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                     {"label":"A", "x":1.75, "y":2},
-                     {"label":"S", "x":2.75, "y":2},
-                     {"label":"D", "x":3.75, "y":2},
-                     {"label":"F", "x":4.75, "y":2},
-                     {"label":"G", "x":5.75, "y":2},
-                     {"label":"H", "x":6.75, "y":2},
-                     {"label":"J", "x":7.75, "y":2},
-                     {"label":"K", "x":8.75, "y":2},
-                     {"label":"L", "x":9.75, "y":2},
-                     {"label":";", "x":10.75, "y":2},
-                     {"label":"\"", "x":11.75, "y":2},
-                     {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"label":"Z", "x":2.25, "y":3},
-                     {"label":"X", "x":3.25, "y":3},
-                     {"label":"C", "x":4.25, "y":3},
-                     {"label":"V", "x":5.25, "y":3},
-                     {"label":"B", "x":6.25, "y":3},
-                     {"label":"N", "x":7.25, "y":3},
-                     {"label":"M", "x":8.25, "y":3},
-                     {"label":"<", "x":9.25, "y":3},
-                     {"label":">", "x":10.25, "y":3},
-                     {"label":"?", "x":11.25, "y":3},
-                     {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                     {"label":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                     {"label":"Alt", "x":1.5, "y":4},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.5},
-                     {"label":"Space", "x":4, "y":4, "w":7},
-                     {"label":"Cmd", "x":11, "y":4, "w":1.5},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             }
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"label": "Super", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
         },
+        "LAYOUT_7u_space": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Cmd", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    },
     "encoder": {
         "rotary": [
             { "pin_a": "D4", "pin_b": "C6" },
diff --git a/keyboards/sthlmkb/lagom/lagom.c b/keyboards/sthlmkb/lagom/lagom.c
index d26fd1e7f4..10ad6c0c32 100644
--- a/keyboards/sthlmkb/lagom/lagom.c
+++ b/keyboards/sthlmkb/lagom/lagom.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "lagom.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/sthlmkb/lagom/lagom.h b/keyboards/sthlmkb/lagom/lagom.h
deleted file mode 100644
index c27c90bd2e..0000000000
--- a/keyboards/sthlmkb/lagom/lagom.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright 2022 mohoyt
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-
-#define LAYOUT_base( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,\
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, K2F,\
-   K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F, }, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, }, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, }, \
-  {K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_splits( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,\
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, }, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, }, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_iso( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F,\
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F, }, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F, }, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_split_space( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,\
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, }, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, }, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_7u_space( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,\
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                     K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, }, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, }, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, ___, K4B, K4C, K4D, K4E, ___, }  \
-}
diff --git a/keyboards/sthlmkb/litl/litl.c b/keyboards/sthlmkb/litl/litl.c
index 40aedfbe27..230d4db52a 100644
--- a/keyboards/sthlmkb/litl/litl.c
+++ b/keyboards/sthlmkb/litl/litl.c
@@ -14,17 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "litl.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/stratos/config.h b/keyboards/stratos/config.h
index 6cec383ec9..e9168d07fd 100644
--- a/keyboards/stratos/config.h
+++ b/keyboards/stratos/config.h
@@ -17,17 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB LEDs */
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D2
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/stratos/info.json b/keyboards/stratos/info.json
index 2f278e18e7..bef0a7cd14 100644
--- a/keyboards/stratos/info.json
+++ b/keyboards/stratos/info.json
@@ -8,6 +8,14 @@
         "pid": "0x992D",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"],
diff --git a/keyboards/stratos/stratos.c b/keyboards/stratos/stratos.c
deleted file mode 100644
index 5de05cbc9d..0000000000
--- a/keyboards/stratos/stratos.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "stratos.h"
diff --git a/keyboards/studiokestra/bourgeau/bourgeau.c b/keyboards/studiokestra/bourgeau/bourgeau.c
deleted file mode 100644
index 87368df509..0000000000
--- a/keyboards/studiokestra/bourgeau/bourgeau.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Studio Kestra
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "bourgeau.h"
diff --git a/keyboards/studiokestra/bourgeau/bourgeau.h b/keyboards/studiokestra/bourgeau/bourgeau.h
deleted file mode 100644
index 170b7eb329..0000000000
--- a/keyboards/studiokestra/bourgeau/bourgeau.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Copyright 2021 Studio Kestra
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_75_ansi_rwkl( \
-	K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015, \
-	K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,         K114,  K115, \
-	K200,         K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215, \
-	K300,         K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,         K314,  K315, \
-	K400,         K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,         K413,  K414,  K415, \
-	K500,  K501,  K502,                       K506,                       K510,         K512,  K513,  K514,  K515  \
-) \
-{ \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414,  K415 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  KC_NO, K512,  K513,  K514,  K515 }  \
-}
-
diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h
index 45c78b063f..21b9804761 100644
--- a/keyboards/studiokestra/bourgeau/config.h
+++ b/keyboards/studiokestra/bourgeau/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D4, D6, D7, D5, B1, F0 }
-#define MATRIX_COL_PINS { E6, B0, D2, D1, D0, D3, B6, F1, F4, F5, F6, F7, C7, C6, B5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 24
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -44,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json
index 0cde6da684..835b0e60a8 100644
--- a/keyboards/studiokestra/bourgeau/info.json
+++ b/keyboards/studiokestra/bourgeau/info.json
@@ -8,6 +8,14 @@
         "pid": "0x7501",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "D2", "D1", "D0", "D3", "B6", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B5", "B4"],
+        "rows": ["D4", "D6", "D7", "D5", "B1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -16,89 +24,94 @@
     "layouts": {
         "LAYOUT_75_ansi_rwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":1, "y":0}, 
-                {"label":"F2", "x":2, "y":0}, 
-                {"label":"F3", "x":3, "y":0}, 
-                {"label":"F4", "x":4, "y":0}, 
-                {"label":"F5", "x":5, "y":0}, 
-                {"label":"F6", "x":6, "y":0}, 
-                {"label":"F7", "x":7, "y":0}, 
-                {"label":"F8", "x":8, "y":0}, 
-                {"label":"F9", "x":9, "y":0}, 
-                {"label":"F10", "x":10, "y":0}, 
-                {"label":"F11", "x":11, "y":0}, 
-                {"label":"F12", "x":12, "y":0}, 
-                {"label":"PrtSc", "x":13, "y":0}, 
-                {"label":"Insert", "x":14, "y":0}, 
-                {"label":"Delete", "x":15, "y":0}, 
-                {"label":"~", "x":0, "y":1}, 
-                {"label":"!", "x":1, "y":1}, 
-                {"label":"@", "x":2, "y":1}, 
-                {"label":"#", "x":3, "y":1}, 
-                {"label":"$", "x":4, "y":1}, 
-                {"label":"%", "x":5, "y":1}, 
-                {"label":"^", "x":6, "y":1}, 
-                {"label":"&", "x":7, "y":1}, 
-                {"label":"*", "x":8, "y":1}, 
-                {"label":"(", "x":9, "y":1}, 
-                {"label":")", "x":10, "y":1}, 
-                {"label":"_", "x":11, "y":1}, 
-                {"label":"+", "x":12, "y":1}, 
-                {"label":"Backspace", "x":13, "y":1, "w":2}, 
-                {"label":"Home", "x":15, "y":1}, 
-                {"label":"Tab", "x":0, "y":2, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2}, 
-                {"label":"W", "x":2.5, "y":2}, 
-                {"label":"E", "x":3.5, "y":2}, 
-                {"label":"R", "x":4.5, "y":2}, 
-                {"label":"T", "x":5.5, "y":2}, 
-                {"label":"Y", "x":6.5, "y":2}, 
-                {"label":"U", "x":7.5, "y":2}, 
-                {"label":"I", "x":8.5, "y":2}, 
-                {"label":"O", "x":9.5, "y":2}, 
-                {"label":"P", "x":10.5, "y":2}, 
-                {"label":"{", "x":11.5, "y":2}, 
-                {"label":"}", "x":12.5, "y":2}, 
-                {"label":"|", "x":13.5, "y":2, "w":1.5}, 
-                {"label":"PgUp", "x":15, "y":2}, 
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3}, 
-                {"label":"S", "x":2.75, "y":3}, 
-                {"label":"D", "x":3.75, "y":3}, 
-                {"label":"F", "x":4.75, "y":3}, 
-                {"label":"G", "x":5.75, "y":3}, 
-                {"label":"H", "x":6.75, "y":3}, 
-                {"label":"J", "x":7.75, "y":3}, 
-                {"label":"K", "x":8.75, "y":3}, 
-                {"label":"L", "x":9.75, "y":3}, 
-                {"label":":", "x":10.75, "y":3}, 
-                {"label":"\"", "x":11.75, "y":3}, 
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25}, 
-                {"label":"PgDn", "x":15, "y":3}, 
-                {"label":"Shift", "x":0, "y":4, "w":2.25}, 
-                {"label":"Z", "x":2.25, "y":4}, 
-                {"label":"X", "x":3.25, "y":4}, 
-                {"label":"C", "x":4.25, "y":4}, 
-                {"label":"V", "x":5.25, "y":4}, 
-                {"label":"B", "x":6.25, "y":4}, 
-                {"label":"N", "x":7.25, "y":4}, 
-                {"label":"M", "x":8.25, "y":4}, 
-                {"label":"<", "x":9.25, "y":4}, 
-                {"label":">", "x":10.25, "y":4}, 
-                {"label":"?", "x":11.25, "y":4}, 
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75}, 
-                {"label":"\u2191", "x":14, "y":4}, 
-                {"label":"End", "x":15, "y":4}, 
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25}, 
-                {"x":3.75, "y":5, "w":6.25}, 
-                {"label":"Fn", "x":10, "y":5, "w":1.5}, 
-                {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, 
-                {"label":"\u2190", "x":13, "y":5}, 
-                {"label":"\u2193", "x":14, "y":5}, 
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/studiokestra/cascade/cascade.c b/keyboards/studiokestra/cascade/cascade.c
deleted file mode 100644
index e5c4ba279c..0000000000
--- a/keyboards/studiokestra/cascade/cascade.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Studio Kestra
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "cascade.h"
diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h
index 1ef5926c8e..2c3ce711d3 100644
--- a/keyboards/studiokestra/cascade/config.h
+++ b/keyboards/studiokestra/cascade/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, B1, D4, F4, F1 }
-#define MATRIX_COL_PINS { E6, D5, D1, D0, F5, F6, F7, C7, C6, B6, B5, B4, D6, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 16
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -43,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/info.json
index 096e20a27b..0e14c96158 100644
--- a/keyboards/studiokestra/cascade/info.json
+++ b/keyboards/studiokestra/cascade/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "D1", "D0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D6", "D7"],
+        "rows": ["F0", "B1", "D4", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/studiokestra/frl84/config.h b/keyboards/studiokestra/frl84/config.h
index 3413465027..670578869f 100644
--- a/keyboards/studiokestra/frl84/config.h
+++ b/keyboards/studiokestra/frl84/config.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN B0
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/studiokestra/frl84/info.json b/keyboards/studiokestra/frl84/info.json
index 9520e2bd1b..3cff311132 100644
--- a/keyboards/studiokestra/frl84/info.json
+++ b/keyboards/studiokestra/frl84/info.json
@@ -17,6 +17,9 @@
         "cols": ["D3", "D5", "D0", "F0", "F1", "F4", "F5", "F6", "F7"],
         "rows": ["D6", "D4", "B4", "D7", "B6", "B5", "C7", "C6", "D2", "D1"]
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "url": "",
     "usb": {
diff --git a/keyboards/studiokestra/galatea/config.h b/keyboards/studiokestra/galatea/config.h
index 4dbaafd5e4..c37d8a5ad2 100644
--- a/keyboards/studiokestra/galatea/config.h
+++ b/keyboards/studiokestra/galatea/config.h
@@ -6,4 +6,4 @@
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
\ No newline at end of file
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json
index 37d3e19cc7..36b0ffa4b9 100644
--- a/keyboards/studiokestra/galatea/rev1/info.json
+++ b/keyboards/studiokestra/galatea/rev1/info.json
@@ -31,98 +31,324 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                
-                { "matrix": [0,0], "x":0, "y":0}, 
-                { "matrix": [1,0], "x":1.25, "y":0}, 
-                { "matrix": [0,1], "x":2.25, "y":0}, 
-                { "matrix": [0,2], "x":3.25, "y":0}, 
-                { "matrix": [1,2], "x":4.25, "y":0}, 
-                { "matrix": [0,3], "x":5.5, "y":0}, 
-                { "matrix": [1,3], "x":6.5, "y":0}, 
-                { "matrix": [0,4], "x":7.5, "y":0}, 
-                { "matrix": [1,4], "x":8.5, "y":0}, 
-                { "matrix": [0,5], "x":9.75, "y":0}, 
-                { "matrix": [1,5], "x":10.75, "y":0}, 
-                { "matrix": [0,6], "x":11.75, "y":0}, 
-                { "matrix": [1,6], "x":12.75, "y":0}, 
-                { "matrix": [0,7], "x":14, "y":0}, 
-                { "matrix": [1,7], "x":15.25, "y":0}, 
-                { "matrix": [0,8], "x":16.25, "y":0}, 
-                { "matrix": [1,8], "x":17.25, "y":0}, 
-                { "matrix": [2,0], "x":0, "y":1.25}, 
-                { "matrix": [3,0], "x":1, "y":1.25}, 
-                { "matrix": [2,1], "x":2, "y":1.25}, 
-                { "matrix": [3,1], "x":3, "y":1.25}, 
-                { "matrix": [2,2], "x":4, "y":1.25}, 
-                { "matrix": [3,2], "x":5, "y":1.25}, 
-                { "matrix": [2,3], "x":6, "y":1.25}, 
-                { "matrix": [3,3], "x":7, "y":1.25}, 
-                { "matrix": [2,4], "x":8, "y":1.25}, 
-                { "matrix": [3,4], "x":9, "y":1.25}, 
-                { "matrix": [2,5], "x":10, "y":1.25}, 
-                { "matrix": [3,5], "x":11, "y":1.25}, 
-                { "matrix": [2,6], "x":12, "y":1.25}, 
-                { "matrix": [3,6], "x":13, "y":1.25}, 
-                { "matrix": [2,7], "x":14, "y":1.25}, 
-                { "matrix": [3,7], "x":15.25, "y":1.25}, 
-                { "matrix": [2,8], "x":16.25, "y":1.25}, 
-                { "matrix": [3,8], "x":17.25, "y":1.25}, 
-                { "matrix": [4,0], "x":0, "y":2.25, "w":1.5}, 
-                { "matrix": [5,0], "x":1.5, "y":2.25}, 
-                { "matrix": [4,1], "x":2.5, "y":2.25}, 
-                { "matrix": [5,1], "x":3.5, "y":2.25}, 
-                { "matrix": [4,2], "x":4.5, "y":2.25}, 
-                { "matrix": [5,2], "x":5.5, "y":2.25}, 
-                { "matrix": [4,3], "x":6.5, "y":2.25}, 
-                { "matrix": [5,3], "x":7.5, "y":2.25}, 
-                { "matrix": [4,4], "x":8.5, "y":2.25}, 
-                { "matrix": [5,4], "x":9.5, "y":2.25}, 
-                { "matrix": [4,5], "x":10.5, "y":2.25}, 
-                { "matrix": [5,5], "x":11.5, "y":2.25}, 
-                { "matrix": [4,6], "x":12.5, "y":2.25}, 
-                { "matrix": [4,7], "x":13.5, "y":2.25, "w":1.5}, 
-                { "matrix": [5,7], "x":15.25, "y":2.25}, 
-                { "matrix": [4,8], "x":16.25, "y":2.25}, 
-                { "matrix": [5,8], "x":17.25, "y":2.25}, 
-                { "matrix": [6,0], "x":0, "y":3.25, "w":1.75}, 
-                { "matrix": [7,0], "x":1.75, "y":3.25}, 
-                { "matrix": [6,1], "x":2.75, "y":3.25}, 
-                { "matrix": [7,1], "x":3.75, "y":3.25}, 
-                { "matrix": [6,2], "x":4.75, "y":3.25}, 
-                { "matrix": [7,2], "x":5.75, "y":3.25}, 
-                { "matrix": [6,3], "x":6.75, "y":3.25}, 
-                { "matrix": [7,3], "x":7.75, "y":3.25}, 
-                { "matrix": [6,4], "x":8.75, "y":3.25}, 
-                { "matrix": [7,4], "x":9.75, "y":3.25}, 
-                { "matrix": [6,5], "x":10.75, "y":3.25}, 
-                { "matrix": [7,5], "x":11.75, "y":3.25}, 
-                { "matrix": [6,6], "x":12.75, "y":3.25, "w":2.25}, 
-                { "matrix": [8,0], "x":0, "y":4.25, "w":1.25}, 
-                { "matrix": [9,0], "x":1.25, "y":4.25}, 
-                { "matrix": [8,1], "x":2.25, "y":4.25}, 
-                { "matrix": [9,1], "x":3.25, "y":4.25}, 
-                { "matrix": [8,2], "x":4.25, "y":4.25},
-                { "matrix": [9,2], "x":5.25, "y":4.25}, 
-                { "matrix": [8,3], "x":6.25, "y":4.25}, 
-                { "matrix": [9,3], "x":7.25, "y":4.25}, 
-                { "matrix": [8,4], "x":8.25, "y":4.25}, 
-                { "matrix": [9,4], "x":9.25, "y":4.25}, 
-                { "matrix": [8,5], "x":10.25, "y":4.25}, 
-                { "matrix": [9,5], "x":11.25, "y":4.25}, 
-                { "matrix": [8,6], "x":12.25, "y":4.25, "w":1.75},
-                { "matrix": [8,7], "x":14, "y":4.25}, 
-                { "matrix": [8,8], "x":16.25, "y":4.25}, 
-                { "matrix": [10,0], "x":0, "y":5.25, "w":1.25}, 
-                { "matrix": [11,0], "x":1.25, "y":5.25, "w":1.25}, 
-                { "matrix": [10,1], "x":2.5, "y":5.25, "w":1.25}, 
-                { "matrix": [10,3], "x":3.75, "y":5.25, "w":6.25}, 
-                { "matrix": [10,5], "x":10, "y":5.25, "w":1.25}, 
-                { "matrix": [11,5], "x":11.25, "y":5.25, "w":1.25}, 
-                { "matrix": [10,6], "x":12.5, "y":5.25, "w":1.25}, 
-                { "matrix": [10,7], "x":13.75, "y":5.25, "w":1.25}, 
-                { "matrix": [11,7], "x":15.25, "y":5.25}, 
-                { "matrix": [10,8], "x":16.25, "y":5.25}, 
-                { "matrix": [11,8], "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [4, 7], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/studiokestra/galatea/rev2/config.h b/keyboards/studiokestra/galatea/rev2/config.h
index 40c94daf62..5502b3787d 100644
--- a/keyboards/studiokestra/galatea/rev2/config.h
+++ b/keyboards/studiokestra/galatea/rev2/config.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN D4
 #define RGBLED_NUM 24
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json
index b3af7d934f..9cc8f3a266 100644
--- a/keyboards/studiokestra/galatea/rev2/info.json
+++ b/keyboards/studiokestra/galatea/rev2/info.json
@@ -29,101 +29,330 @@
         "scroll_lock": "D2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "D4"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                
-                { "matrix": [0,0], "x":0, "y":0}, 
-                { "matrix": [1,0], "x":1.25, "y":0}, 
-                { "matrix": [0,1], "x":2.25, "y":0}, 
-                { "matrix": [0,2], "x":3.25, "y":0}, 
-                { "matrix": [1,2], "x":4.25, "y":0}, 
-                { "matrix": [0,3], "x":5.5, "y":0}, 
-                { "matrix": [1,3], "x":6.5, "y":0}, 
-                { "matrix": [0,4], "x":7.5, "y":0}, 
-                { "matrix": [1,4], "x":8.5, "y":0}, 
-                { "matrix": [0,5], "x":9.75, "y":0}, 
-                { "matrix": [1,5], "x":10.75, "y":0}, 
-                { "matrix": [0,6], "x":11.75, "y":0}, 
-                { "matrix": [1,6], "x":12.75, "y":0}, 
-                { "matrix": [0,7], "x":14, "y":0}, 
-                { "matrix": [1,7], "x":15.25, "y":0}, 
-                { "matrix": [0,8], "x":16.25, "y":0}, 
-                { "matrix": [1,8], "x":17.25, "y":0}, 
-                { "matrix": [2,0], "x":0, "y":1.25}, 
-                { "matrix": [3,0], "x":1, "y":1.25}, 
-                { "matrix": [2,1], "x":2, "y":1.25}, 
-                { "matrix": [3,1], "x":3, "y":1.25}, 
-                { "matrix": [2,2], "x":4, "y":1.25}, 
-                { "matrix": [3,2], "x":5, "y":1.25}, 
-                { "matrix": [2,3], "x":6, "y":1.25}, 
-                { "matrix": [3,3], "x":7, "y":1.25}, 
-                { "matrix": [2,4], "x":8, "y":1.25}, 
-                { "matrix": [3,4], "x":9, "y":1.25}, 
-                { "matrix": [2,5], "x":10, "y":1.25}, 
-                { "matrix": [3,5], "x":11, "y":1.25}, 
-                { "matrix": [2,6], "x":12, "y":1.25}, 
-                { "matrix": [3,6], "x":13, "y":1.25}, 
-                { "matrix": [2,7], "x":14, "y":1.25}, 
-                { "matrix": [3,7], "x":15.25, "y":1.25}, 
-                { "matrix": [2,8], "x":16.25, "y":1.25}, 
-                { "matrix": [3,8], "x":17.25, "y":1.25}, 
-                { "matrix": [4,0], "x":0, "y":2.25, "w":1.5}, 
-                { "matrix": [5,0], "x":1.5, "y":2.25}, 
-                { "matrix": [4,1], "x":2.5, "y":2.25}, 
-                { "matrix": [5,1], "x":3.5, "y":2.25}, 
-                { "matrix": [4,2], "x":4.5, "y":2.25}, 
-                { "matrix": [5,2], "x":5.5, "y":2.25}, 
-                { "matrix": [4,3], "x":6.5, "y":2.25}, 
-                { "matrix": [5,3], "x":7.5, "y":2.25}, 
-                { "matrix": [4,4], "x":8.5, "y":2.25}, 
-                { "matrix": [5,4], "x":9.5, "y":2.25}, 
-                { "matrix": [4,5], "x":10.5, "y":2.25}, 
-                { "matrix": [5,5], "x":11.5, "y":2.25}, 
-                { "matrix": [4,6], "x":12.5, "y":2.25}, 
-                { "matrix": [4,7], "x":13.5, "y":2.25, "w":1.5}, 
-                { "matrix": [5,7], "x":15.25, "y":2.25}, 
-                { "matrix": [4,8], "x":16.25, "y":2.25}, 
-                { "matrix": [5,8], "x":17.25, "y":2.25}, 
-                { "matrix": [6,0], "x":0, "y":3.25, "w":1.75}, 
-                { "matrix": [7,0], "x":1.75, "y":3.25}, 
-                { "matrix": [6,1], "x":2.75, "y":3.25}, 
-                { "matrix": [7,1], "x":3.75, "y":3.25}, 
-                { "matrix": [6,2], "x":4.75, "y":3.25}, 
-                { "matrix": [7,2], "x":5.75, "y":3.25}, 
-                { "matrix": [6,3], "x":6.75, "y":3.25}, 
-                { "matrix": [7,3], "x":7.75, "y":3.25}, 
-                { "matrix": [6,4], "x":8.75, "y":3.25}, 
-                { "matrix": [7,4], "x":9.75, "y":3.25}, 
-                { "matrix": [6,5], "x":10.75, "y":3.25}, 
-                { "matrix": [7,5], "x":11.75, "y":3.25}, 
-                { "matrix": [6,6], "x":12.75, "y":3.25, "w":2.25}, 
-                { "matrix": [8,0], "x":0, "y":4.25, "w":1.25}, 
-                { "matrix": [9,0], "x":1.25, "y":4.25}, 
-                { "matrix": [8,1], "x":2.25, "y":4.25}, 
-                { "matrix": [9,1], "x":3.25, "y":4.25}, 
-                { "matrix": [8,2], "x":4.25, "y":4.25},
-                { "matrix": [9,2], "x":5.25, "y":4.25}, 
-                { "matrix": [8,3], "x":6.25, "y":4.25}, 
-                { "matrix": [9,3], "x":7.25, "y":4.25}, 
-                { "matrix": [8,4], "x":8.25, "y":4.25}, 
-                { "matrix": [9,4], "x":9.25, "y":4.25}, 
-                { "matrix": [8,5], "x":10.25, "y":4.25}, 
-                { "matrix": [9,5], "x":11.25, "y":4.25}, 
-                { "matrix": [8,6], "x":12.25, "y":4.25, "w":1.75},
-                { "matrix": [8,7], "x":14, "y":4.25}, 
-                { "matrix": [8,8], "x":16.25, "y":4.25}, 
-                { "matrix": [10,0], "x":0, "y":5.25, "w":1.25}, 
-                { "matrix": [11,0], "x":1.25, "y":5.25, "w":1.25}, 
-                { "matrix": [10,1], "x":2.5, "y":5.25, "w":1.25}, 
-                { "matrix": [10,3], "x":3.75, "y":5.25, "w":6.25}, 
-                { "matrix": [10,5], "x":10, "y":5.25, "w":1.25}, 
-                { "matrix": [11,5], "x":11.25, "y":5.25, "w":1.25}, 
-                { "matrix": [10,6], "x":12.5, "y":5.25, "w":1.25}, 
-                { "matrix": [10,7], "x":13.75, "y":5.25, "w":1.25}, 
-                { "matrix": [11,7], "x":15.25, "y":5.25}, 
-                { "matrix": [10,8], "x":16.25, "y":5.25}, 
-                { "matrix": [11,8], "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [4, 7], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/studiokestra/nascent/config.h b/keyboards/studiokestra/nascent/config.h
index 5bb31afde5..f1b419a3e2 100644
--- a/keyboards/studiokestra/nascent/config.h
+++ b/keyboards/studiokestra/nascent/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { D2, D3, D7, D6, D4, D5, B0, E6 }
-#define MATRIX_ROW_PINS { F5, F4, F7, F6, C6, C7, B4, B5, D0, D1 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/studiokestra/nascent/info.json b/keyboards/studiokestra/nascent/info.json
index 43aba81924..950b6836be 100644
--- a/keyboards/studiokestra/nascent/info.json
+++ b/keyboards/studiokestra/nascent/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0165",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "D7", "D6", "D4", "D5", "B0", "E6"],
+        "rows": ["F5", "F4", "F7", "F6", "C6", "C7", "B4", "B5", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "on_state": 0
@@ -23,379 +28,379 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Bksp", "x":13, "y":0},
-                {"label":"Bksp", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Home", "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":3},
-                {"label":"Space", "x":7, "y":4},
-                {"label":"Alt", "x":8, "y":4, "w":3},
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 2], "x": 4, "y": 4, "w": 3},
+                {"matrix": [8, 3], "x": 7, "y": 4},
+                {"matrix": [8, 4], "x": 8, "y": 4, "w": 3},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13, "y": 4},
+                {"matrix": [8, 7], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Bksp", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [0, 7], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 7], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Home", "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13, "y": 4},
+                {"matrix": [8, 7], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Bksp", "x":13, "y":0},
-                {"label":"Bksp", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Home", "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13, "y": 4},
+                {"matrix": [8, 7], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Bksp", "x":13, "y":0, "w":2},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [0, 7], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 7], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Home", "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13, "y": 4},
+                {"matrix": [8, 7], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                {"label":"`~", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2@", "x":2, "y":0},
-                {"label":"3#", "x":3, "y":0},
-                {"label":"4$", "x":4, "y":0},
-                {"label":"5%", "x":5, "y":0},
-                {"label":"6^", "x":6, "y":0},
-                {"label":"7&", "x":7, "y":0},
-                {"label":"8*", "x":8, "y":0},
-                {"label":"9(", "x":9, "y":0},
-                {"label":"0)", "x":10, "y":0},
-                {"label":"-_", "x":11, "y":0},
-                {"label":"=+", "x":12, "y":0},
-                {"label":"Bksp", "x":13, "y":0},
-                {"label":"Bksp", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[{", "x":11.5, "y":1},
-                {"label":"]}", "x":12.5, "y":1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Home", "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";:", "x":10.75, "y":2},
-                {"label":"'\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgUp", "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",<", "x":9.25, "y":3},
-                {"label":".>", "x":10.25, "y":3},
-                {"label":"/?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"PgDn", "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Win", "x":1.5, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
-                {"label":"Space", "x":4, "y":4, "w":7},
-                {"label":"Ctrl", "x":11, "y":4, "w":1.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13, "y": 4},
+                {"matrix": [8, 7], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/studiokestra/nascent/nascent.c b/keyboards/studiokestra/nascent/nascent.c
deleted file mode 100644
index d7458be127..0000000000
--- a/keyboards/studiokestra/nascent/nascent.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Studio Kestra
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "nascent.h"
diff --git a/keyboards/studiokestra/nascent/nascent.h b/keyboards/studiokestra/nascent/nascent.h
deleted file mode 100644
index e8e4c18561..0000000000
--- a/keyboards/studiokestra/nascent/nascent.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Copyright 2022 Studio Kestra
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�   ┌───────�
- * │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │16 │07 │17 │   │07     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤   └───────┘
- * │20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │27   │37 │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │47      │57 │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │60      │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66    │67 │77 │
- * ├─────┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
- * │80   │90 │81   │82         │83 │84         │85   │ │86 │87 │97 │
- * └─────┴───┴─────┴───────────┴───┴───────────┴─────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────�
- * │80   │90 │81   │83                         │85   │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- * ┌────┬────┬────┬────────────────────────┬────┬────�
- * │80  │90  │81  │83                      │84  │85  │ Standard
- * └────┴────┴────┴────────────────────────┴────┴────┘
- */
-
-#define LAYOUT_all(\
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K27, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
-    K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, \
-    K80, K90, K81,           K82, K83, K84,           K85,      K86, K87, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
-    { K40, K41, K42, K43, K44, K45, ___, K47 }, \
-    { K50, K51, K52, K53, K54, K55, ___, K57 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { ___, K71, K72, K73, K74, K75, ___, K77 }, \
-    { K80, K81, K82, K83, K84, K85, K86, K87 }, \
-    { K90, ___, ___, ___, ___, ___, ___, K97 } \
-}
-
-#define LAYOUT_65_ansi_blocker(\
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K07, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K27, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
-    K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, \
-    K80, K90, K81,                K83,           K84, K85,      K86, K87, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, ___, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
-    { K40, K41, K42, K43, K44, K45, ___, K47 }, \
-    { K50, K51, K52, K53, K54, K55, ___, K57 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { ___, K71, K72, K73, K74, K75, ___, K77 }, \
-    { K80, K81, ___, K83, K84, K85, K86, K87 }, \
-    { K90, ___, ___, ___, ___, ___, ___, K97 } \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs(\
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K27, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
-    K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, \
-    K80, K90, K81,                K83,           K84, K85,      K86, K87, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
-    { K40, K41, K42, K43, K44, K45, ___, K47 }, \
-    { K50, K51, K52, K53, K54, K55, ___, K57 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { ___, K71, K72, K73, K74, K75, ___, K77 }, \
-    { K80, K81, ___, K83, K84, K85, K86, K87 }, \
-    { K90, ___, ___, ___, ___, ___, ___, K97 } \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan(\
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K07, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K27, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
-    K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, \
-    K80, K90, K81,                K83,                K85,      K86, K87, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, ___, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
-    { K40, K41, K42, K43, K44, K45, ___, K47 }, \
-    { K50, K51, K52, K53, K54, K55, ___, K57 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { ___, K71, K72, K73, K74, K75, ___, K77 }, \
-    { K80, K81, ___, K83, ___, K85, K86, K87 }, \
-    { K90, ___, ___, ___, ___, ___, ___, K97 } \
-}
-
-#define LAYOUT_65_ansi_blocker_tsangan_split_bs(\
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K27, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
-    K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, \
-    K80, K90, K81,                K83,                K85,      K86, K87, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
-    { K40, K41, K42, K43, K44, K45, ___, K47 }, \
-    { K50, K51, K52, K53, K54, K55, ___, K57 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { ___, K71, K72, K73, K74, K75, ___, K77 }, \
-    { K80, K81, ___, K83, ___, K85, K86, K87 }, \
-    { K90, ___, ___, ___, ___, ___, ___, K97 } \
-}
diff --git a/keyboards/studiokestra/nue/config.h b/keyboards/studiokestra/nue/config.h
index 0165b7cef4..e2d4270dd6 100644
--- a/keyboards/studiokestra/nue/config.h
+++ b/keyboards/studiokestra/nue/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { F0, F6, F7, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define MATRIX_ROW_PINS { B0, B7, F1, F5, F4}
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/studiokestra/nue/info.json b/keyboards/studiokestra/nue/info.json
index bff06e269d..c4cbd11a7b 100644
--- a/keyboards/studiokestra/nue/info.json
+++ b/keyboards/studiokestra/nue/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0701",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F6", "F7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["B0", "B7", "F1", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/studiokestra/nue/nue.c b/keyboards/studiokestra/nue/nue.c
deleted file mode 100644
index 869aaaa483..0000000000
--- a/keyboards/studiokestra/nue/nue.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Studio Kestra
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "nue.h"
diff --git a/keyboards/suavity/ehan/config.h b/keyboards/suavity/ehan/config.h
index 6041beba7f..befff72ca8 100644
--- a/keyboards/suavity/ehan/config.h
+++ b/keyboards/suavity/ehan/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, C14, B7, B6, B5,  B4,  B3,  A15, C13, B9, B8 }
-// Matrix Column Pins:     C0  C1  C2   C3   C4   C5   C6   C7  C8  C9  C10  C11  C12  C13  C14  C15  C16
-#define MATRIX_ROW_PINS { A7, B0, A3, A4, A5, A6 }
-// Matrix Row Pins:       R0  R1  R2  R3  R4  R5
-#define DIODE_DIRECTION COL2ROW
-// Current flow out of the diodes are from rows to columns
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/suavity/ehan/ehan.c b/keyboards/suavity/ehan/ehan.c
deleted file mode 100644
index cc5a9fdc4a..0000000000
--- a/keyboards/suavity/ehan/ehan.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2021 Henry Lum (@suavity)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "ehan.h"
diff --git a/keyboards/suavity/ehan/info.json b/keyboards/suavity/ehan/info.json
index 350202f29f..330809655c 100755
--- a/keyboards/suavity/ehan/info.json
+++ b/keyboards/suavity/ehan/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4548",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "C14", "B7", "B6", "B5", "B4", "B3", "A15", "C13", "B9", "B8"],
+        "rows": ["A7", "B0", "A3", "A4", "A5", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B11",
         "scroll_lock": "F1"
@@ -110,7 +115,7 @@
                 {"label":"Space", "x":5.25, "y":5.5, "w":2},
                 {"label":"Space", "x":8.25, "y":5.5, "w":3},
                 {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
-                {"label":"GUI", "x":12.75, "y":5.5, "w":1},
+                {"label":"GUI", "x":12.75, "y":5.5},
                 {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
                 {"label":"\u2190", "x":17.25, "y":5.5},
                 {"label":"\u2193", "x":18.25, "y":5.5},
@@ -210,7 +215,7 @@
                 {"label":"Space", "x":5.25, "y":5.5, "w":2},
                 {"label":"Space", "x":8.25, "y":5.5, "w":3},
                 {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
-                {"label":"GUI", "x":12.75, "y":5.5, "w":1},
+                {"label":"GUI", "x":12.75, "y":5.5},
                 {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
                 {"label":"\u2190", "x":17.25, "y":5.5},
                 {"label":"\u2193", "x":18.25, "y":5.5},
@@ -311,7 +316,7 @@
                 {"label":"Space", "x":5.25, "y":5.5, "w":2},
                 {"label":"Space", "x":8.25, "y":5.5, "w":3},
                 {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
-                {"label":"GUI", "x":12.75, "y":5.5, "w":1},
+                {"label":"GUI", "x":12.75, "y":5.5},
                 {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
                 {"label":"\u2190", "x":17.25, "y":5.5},
                 {"label":"\u2193", "x":18.25, "y":5.5},
diff --git a/keyboards/subatomic/config.h b/keyboards/subatomic/config.h
index 058b582c36..b0c6bce36a 100644
--- a/keyboards/subatomic/config.h
+++ b/keyboards/subatomic/config.h
@@ -17,17 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, C6, C5 }
-
 // #define AUDIO_VOICES
 // #define AUDIO_PIN C6
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/subatomic/info.json b/keyboards/subatomic/info.json
index 99af17a9b7..f8250299f0 100644
--- a/keyboards/subatomic/info.json
+++ b/keyboards/subatomic/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6063",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "C6", "C5"],
+    "rows": ["D2", "D5", "B5", "B6", "D3"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
@@ -16,223 +21,235 @@
   "layouts": {
     "LAYOUT_ortho_5x14": {
       "layout": [
-        {"label":"k00", "x":0, "y":0},
-        {"label":"k01", "x":1, "y":0},
-        {"label":"k02", "x":2, "y":0},
-        {"label":"k03", "x":3, "y":0},
-        {"label":"k04", "x":4, "y":0},
-        {"label":"k05", "x":5, "y":0},
-        {"label":"k06", "x":6, "y":0},
-        {"label":"k07", "x":7, "y":0},
-        {"label":"k08", "x":8, "y":0},
-        {"label":"k09", "x":9, "y":0},
-        {"label":"k0a", "x":10, "y":0},
-        {"label":"k0b", "x":11, "y":0},
-        {"label":"k0c", "x":12, "y":0},
-        {"label":"k0d", "x":13, "y":0},
-        {"label":"k10", "x":0, "y":1},
-        {"label":"k11", "x":1, "y":1},
-        {"label":"k12", "x":2, "y":1},
-        {"label":"k13", "x":3, "y":1},
-        {"label":"k14", "x":4, "y":1},
-        {"label":"k15", "x":5, "y":1},
-        {"label":"k16", "x":6, "y":1},
-        {"label":"k17", "x":7, "y":1},
-        {"label":"k18", "x":8, "y":1},
-        {"label":"k19", "x":9, "y":1},
-        {"label":"k1a", "x":10, "y":1},
-        {"label":"k1b", "x":11, "y":1},
-        {"label":"k1c", "x":12, "y":1},
-        {"label":"k1d", "x":13, "y":1},
-        {"label":"k20", "x":0, "y":2},
-        {"label":"k21", "x":1, "y":2},
-        {"label":"k22", "x":2, "y":2},
-        {"label":"k23", "x":3, "y":2},
-        {"label":"k24", "x":4, "y":2},
-        {"label":"k25", "x":5, "y":2},
-        {"label":"k26", "x":6, "y":2},
-        {"label":"k27", "x":7, "y":2},
-        {"label":"k28", "x":8, "y":2},
-        {"label":"k29", "x":9, "y":2},
-        {"label":"k2a", "x":10, "y":2},
-        {"label":"k2b", "x":11, "y":2},
-        {"label":"k2c", "x":12, "y":2},
-        {"label":"k2d", "x":13, "y":2},
-        {"label":"k30", "x":0, "y":3},
-        {"label":"k31", "x":1, "y":3},
-        {"label":"k32", "x":2, "y":3},
-        {"label":"k33", "x":3, "y":3},
-        {"label":"k34", "x":4, "y":3},
-        {"label":"k35", "x":5, "y":3},
-        {"label":"k36", "x":6, "y":3},
-        {"label":"k37", "x":7, "y":3},
-        {"label":"k38", "x":8, "y":3},
-        {"label":"k39", "x":9, "y":3},
-        {"label":"k3a", "x":10, "y":3},
-        {"label":"k3b", "x":11, "y":3},
-        {"label":"k3c", "x":12, "y":3},
-        {"label":"k3d", "x":13, "y":3},
-        {"label":"k40", "x":0, "y":4},
-        {"label":"k41", "x":1, "y":4},
-        {"label":"k42", "x":2, "y":4},
-        {"label":"k43", "x":3, "y":4},
-        {"label":"k44", "x":4, "y":4},
-        {"label":"k45", "x":5, "y":4},
-        {"label":"k46", "x":6, "y":4},
-        {"label":"k47", "x":7, "y":4},
-        {"label":"k48", "x":8, "y":4},
-        {"label":"k49", "x":9, "y":4},
-        {"label":"k4a", "x":10, "y":4},
-        {"label":"k4b", "x":11, "y":4},
-        {"label":"k4c", "x":12, "y":4},
-        {"label":"k4d", "x":13, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+        {"matrix": [1, 12], "x": 12, "y": 1},
+        {"matrix": [1, 13], "x": 13, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+        {"matrix": [2, 12], "x": 12, "y": 2},
+        {"matrix": [2, 13], "x": 13, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3},
+        {"matrix": [3, 12], "x": 12, "y": 3},
+        {"matrix": [3, 13], "x": 13, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
+        {"matrix": [4, 7], "x": 7, "y": 4},
+        {"matrix": [4, 8], "x": 8, "y": 4},
+        {"matrix": [4, 9], "x": 9, "y": 4},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4},
+        {"matrix": [4, 12], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4}
       ]
     },
 
     "LAYOUT_ortho_5x14_1x2uC": {
       "layout": [
-        {"label":"k00", "x":0, "y":0},
-        {"label":"k01", "x":1, "y":0},
-        {"label":"k02", "x":2, "y":0},
-        {"label":"k03", "x":3, "y":0},
-        {"label":"k04", "x":4, "y":0},
-        {"label":"k05", "x":5, "y":0},
-        {"label":"k06", "x":6, "y":0},
-        {"label":"k07", "x":7, "y":0},
-        {"label":"k08", "x":8, "y":0},
-        {"label":"k09", "x":9, "y":0},
-        {"label":"k0a", "x":10, "y":0},
-        {"label":"k0b", "x":11, "y":0},
-        {"label":"k0c", "x":12, "y":0},
-        {"label":"k0d", "x":13, "y":0},
-        {"label":"k10", "x":0, "y":1},
-        {"label":"k11", "x":1, "y":1},
-        {"label":"k12", "x":2, "y":1},
-        {"label":"k13", "x":3, "y":1},
-        {"label":"k14", "x":4, "y":1},
-        {"label":"k15", "x":5, "y":1},
-        {"label":"k16", "x":6, "y":1},
-        {"label":"k17", "x":7, "y":1},
-        {"label":"k18", "x":8, "y":1},
-        {"label":"k19", "x":9, "y":1},
-        {"label":"k1a", "x":10, "y":1},
-        {"label":"k1b", "x":11, "y":1},
-        {"label":"k1c", "x":12, "y":1},
-        {"label":"k1d", "x":13, "y":1},
-        {"label":"k20", "x":0, "y":2},
-        {"label":"k21", "x":1, "y":2},
-        {"label":"k22", "x":2, "y":2},
-        {"label":"k23", "x":3, "y":2},
-        {"label":"k24", "x":4, "y":2},
-        {"label":"k25", "x":5, "y":2},
-        {"label":"k26", "x":6, "y":2},
-        {"label":"k27", "x":7, "y":2},
-        {"label":"k28", "x":8, "y":2},
-        {"label":"k29", "x":9, "y":2},
-        {"label":"k2a", "x":10, "y":2},
-        {"label":"k2b", "x":11, "y":2},
-        {"label":"k2c", "x":12, "y":2},
-        {"label":"k2d", "x":13, "y":2},
-        {"label":"k30", "x":0, "y":3},
-        {"label":"k31", "x":1, "y":3},
-        {"label":"k32", "x":2, "y":3},
-        {"label":"k33", "x":3, "y":3},
-        {"label":"k34", "x":4, "y":3},
-        {"label":"k35", "x":5, "y":3},
-        {"label":"k36", "x":6, "y":3},
-        {"label":"k37", "x":7, "y":3},
-        {"label":"k38", "x":8, "y":3},
-        {"label":"k39", "x":9, "y":3},
-        {"label":"k3a", "x":10, "y":3},
-        {"label":"k3b", "x":11, "y":3},
-        {"label":"k3c", "x":12, "y":3},
-        {"label":"k3d", "x":13, "y":3},
-        {"label":"k40", "x":0, "y":4},
-        {"label":"k41", "x":1, "y":4},
-        {"label":"k42", "x":2, "y":4},
-        {"label":"k43", "x":3, "y":4},
-        {"label":"k44", "x":4, "y":4},
-        {"label":"k45", "x":5, "y":4},
-        {"label":"k46", "x":6, "y":4, "w":2},
-        {"label":"k48", "x":8, "y":4},
-        {"label":"k49", "x":9, "y":4},
-        {"label":"k4a", "x":10, "y":4},
-        {"label":"k4b", "x":11, "y":4},
-        {"label":"k4c", "x":12, "y":4},
-        {"label":"k4d", "x":13, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+        {"matrix": [1, 12], "x": 12, "y": 1},
+        {"matrix": [1, 13], "x": 13, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+        {"matrix": [2, 12], "x": 12, "y": 2},
+        {"matrix": [2, 13], "x": 13, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3},
+        {"matrix": [3, 12], "x": 12, "y": 3},
+        {"matrix": [3, 13], "x": 13, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4, "w": 2},
+        {"matrix": [4, 8], "x": 8, "y": 4},
+        {"matrix": [4, 9], "x": 9, "y": 4},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4},
+        {"matrix": [4, 12], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4}
       ]
     },
 
     "LAYOUT_ortho_5x14_2x2u": {
       "layout": [
-        {"label":"k00", "x":0, "y":0},
-        {"label":"k01", "x":1, "y":0},
-        {"label":"k02", "x":2, "y":0},
-        {"label":"k03", "x":3, "y":0},
-        {"label":"k04", "x":4, "y":0},
-        {"label":"k05", "x":5, "y":0},
-        {"label":"k06", "x":6, "y":0},
-        {"label":"k07", "x":7, "y":0},
-        {"label":"k08", "x":8, "y":0},
-        {"label":"k09", "x":9, "y":0},
-        {"label":"k0a", "x":10, "y":0},
-        {"label":"k0b", "x":11, "y":0},
-        {"label":"k0c", "x":12, "y":0},
-        {"label":"k0d", "x":13, "y":0},
-        {"label":"k10", "x":0, "y":1},
-        {"label":"k11", "x":1, "y":1},
-        {"label":"k12", "x":2, "y":1},
-        {"label":"k13", "x":3, "y":1},
-        {"label":"k14", "x":4, "y":1},
-        {"label":"k15", "x":5, "y":1},
-        {"label":"k16", "x":6, "y":1},
-        {"label":"k17", "x":7, "y":1},
-        {"label":"k18", "x":8, "y":1},
-        {"label":"k19", "x":9, "y":1},
-        {"label":"k1a", "x":10, "y":1},
-        {"label":"k1b", "x":11, "y":1},
-        {"label":"k1c", "x":12, "y":1},
-        {"label":"k1d", "x":13, "y":1},
-        {"label":"k20", "x":0, "y":2},
-        {"label":"k21", "x":1, "y":2},
-        {"label":"k22", "x":2, "y":2},
-        {"label":"k23", "x":3, "y":2},
-        {"label":"k24", "x":4, "y":2},
-        {"label":"k25", "x":5, "y":2},
-        {"label":"k26", "x":6, "y":2},
-        {"label":"k27", "x":7, "y":2},
-        {"label":"k28", "x":8, "y":2},
-        {"label":"k29", "x":9, "y":2},
-        {"label":"k2a", "x":10, "y":2},
-        {"label":"k2b", "x":11, "y":2},
-        {"label":"k2c", "x":12, "y":2},
-        {"label":"k2d", "x":13, "y":2},
-        {"label":"k30", "x":0, "y":3},
-        {"label":"k31", "x":1, "y":3},
-        {"label":"k32", "x":2, "y":3},
-        {"label":"k33", "x":3, "y":3},
-        {"label":"k34", "x":4, "y":3},
-        {"label":"k35", "x":5, "y":3},
-        {"label":"k36", "x":6, "y":3},
-        {"label":"k37", "x":7, "y":3},
-        {"label":"k38", "x":8, "y":3},
-        {"label":"k39", "x":9, "y":3},
-        {"label":"k3a", "x":10, "y":3},
-        {"label":"k3b", "x":11, "y":3},
-        {"label":"k3c", "x":12, "y":3},
-        {"label":"k3d", "x":13, "y":3},
-        {"label":"k40", "x":0, "y":4},
-        {"label":"k41", "x":1, "y":4},
-        {"label":"k42", "x":2, "y":4},
-        {"label":"k43", "x":3, "y":4},
-        {"label":"k44", "x":4, "y":4},
-        {"label":"k45", "x":5, "y":4, "w":2},
-        {"label":"k47", "x":7, "y":4, "w":2},
-        {"label":"k49", "x":9, "y":4},
-        {"label":"k4a", "x":10, "y":4},
-        {"label":"k4b", "x":11, "y":4},
-        {"label":"k4c", "x":12, "y":4},
-        {"label":"k4d", "x":13, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+        {"matrix": [1, 12], "x": 12, "y": 1},
+        {"matrix": [1, 13], "x": 13, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+        {"matrix": [2, 12], "x": 12, "y": 2},
+        {"matrix": [2, 13], "x": 13, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3},
+        {"matrix": [3, 12], "x": 12, "y": 3},
+        {"matrix": [3, 13], "x": 13, "y": 3},
+
+        {"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, "w": 2},
+        {"matrix": [4, 7], "x": 7, "y": 4, "w": 2},
+        {"matrix": [4, 9], "x": 9, "y": 4},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4},
+        {"matrix": [4, 12], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4}
       ]
     }
   }
diff --git a/keyboards/subatomic/subatomic.c b/keyboards/subatomic/subatomic.c
deleted file mode 100644
index f2120721c8..0000000000
--- a/keyboards/subatomic/subatomic.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "subatomic.h"
\ No newline at end of file
diff --git a/keyboards/subatomic/subatomic.h b/keyboards/subatomic/subatomic.h
deleted file mode 100644
index 5fbc599f83..0000000000
--- a/keyboards/subatomic/subatomic.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-
-/* Subatomic Grid layout
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │▓▓▓│▓▓▓│   │   │   │   │   │   │   │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│   │   │   │   │   │   │   │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│   │   │   │ • │   │   │ • │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│   │   │   │   │   │   │   │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│   │   │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│
- * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_ortho_5x14( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d  \
-  ) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d }  \
-}
-
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │▓▓▓│▓▓▓│   │   │   │   │   │   │   │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│   │   │   │   │   │   │   │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│   │   │   │ • │   │   │ • │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│   │   │   │   │   │   │   │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│       │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│
- * └───┴───┴───┴───┴───┴───┴───────┴───┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_ortho_5x14_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
-    k40, k41, k42, k43, k44, k45,    k46,   k48, k49, k4a, k4b, k4c, k4d  \
-  ) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k40, k41, k42, k43, k44, k45, k46, XXX, k48, k49, k4a, k4b, k4c, k4d }  \
-}
-
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │▓▓▓│▓▓▓│   │   │   │   │   │   │   │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│   │   │   │   │   │   │   │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│   │   │   │ • │   │   │ • │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│   │   │   │   │   │   │   │   │   │   │▓▓▓│▓▓▓│
- * ├───┼───┼───┼───┼───┼───┴───┼───┴───┼───┼───┼───┼───┼───┤
- * │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│       │       │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│
- * └───┴───┴───┴───┴───┴───────┴───────┴───┴───┴───┴───┴───┘
- */
-#define LAYOUT_ortho_5x14_2x2u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
-    k40, k41, k42, k43, k44,   k45,      k47,    k49, k4a, k4b, k4c, k4d  \
-  ) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
-    { k40, k41, k42, k43, k44, k45, XXX, k47, XXX, k49, k4a, k4b, k4c, k4d }  \
-}
diff --git a/keyboards/subrezon/la_nc/config.h b/keyboards/subrezon/la_nc/config.h
deleted file mode 100644
index 7e45963ed7..0000000000
--- a/keyboards/subrezon/la_nc/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2022 Daniel Osipishin (@subrezon)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-
-// key matrix
-#define MATRIX_ROW_PINS {D3, F4, D2, B2, B5, B6}
-
-#define MATRIX_COL_PINS {B3, B1, F7, F6, F5, D4, C6, D7, E6, B4}
-
-#define DIODE_DIRECTION COL2ROW
-
-// uncomment to reduce firmware size
-//#define NO_DEBUG
-//#define NO_PRINT
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/subrezon/la_nc/info.json b/keyboards/subrezon/la_nc/info.json
index b0a8eb7daa..3d73586815 100644
--- a/keyboards/subrezon/la_nc/info.json
+++ b/keyboards/subrezon/la_nc/info.json
@@ -6,6 +6,11 @@
         "pid": "0x1A7C",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F5", "D4", "C6", "D7", "E6", "B4"],
+        "rows": ["D3", "F4", "D2", "B2", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/superuser/ext/config.h b/keyboards/superuser/ext/config.h
deleted file mode 100644
index 0bcd052fed..0000000000
--- a/keyboards/superuser/ext/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 superuser
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { B2, B1, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/superuser/ext/ext.c b/keyboards/superuser/ext/ext.c
deleted file mode 100644
index 0715f7d808..0000000000
--- a/keyboards/superuser/ext/ext.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 superuser
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ext.h"
diff --git a/keyboards/superuser/ext/info.json b/keyboards/superuser/ext/info.json
index 57d4ccbb18..990e210f02 100644
--- a/keyboards/superuser/ext/info.json
+++ b/keyboards/superuser/ext/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4558",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7"
     },
diff --git a/keyboards/superuser/frl/config.h b/keyboards/superuser/frl/config.h
deleted file mode 100644
index 607133eaf8..0000000000
--- a/keyboards/superuser/frl/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 superuser
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/superuser/frl/frl.c b/keyboards/superuser/frl/frl.c
deleted file mode 100644
index 4ccf168cfa..0000000000
--- a/keyboards/superuser/frl/frl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 superuser
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "frl.h"
diff --git a/keyboards/superuser/frl/frl.h b/keyboards/superuser/frl/frl.h
deleted file mode 100644
index 9d1af5068e..0000000000
--- a/keyboards/superuser/frl/frl.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 superuser
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_tkl(\
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K312,    K114, K115, K116,  \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,          K214, K215, K216,  \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                             \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,                K415,        \
-    K500, K501, K502,                   K506,                         K511, K512, K513,          K514, K515, K516   \
-) { \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116  }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216  }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, KC_NO, KC_NO }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  KC_NO, K415,  KC_NO }, \
-    { K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, KC_NO, K511,  K512,  K513,  K514,  K515,  K516  }  \
-}
diff --git a/keyboards/superuser/frl/info.json b/keyboards/superuser/frl/info.json
index 14c7b1e54f..b4b31d04d8 100644
--- a/keyboards/superuser/frl/info.json
+++ b/keyboards/superuser/frl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4652",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7"
     },
@@ -15,7 +20,89 @@
     "bootloader": "qmk-dfu",
     "layouts": {
         "LAYOUT_tkl": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Bksp", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Insert", "x":15.25, "y":0}, {"label":"Home", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"End", "x":16.25, "y":1}, {"label":"PgDn", "x":17.25, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/superuser/tkl/config.h b/keyboards/superuser/tkl/config.h
deleted file mode 100644
index 665276c79d..0000000000
--- a/keyboards/superuser/tkl/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 superuser
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B2, D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/superuser/tkl/info.json b/keyboards/superuser/tkl/info.json
index 6e94c7a28e..d4bbcf2bf7 100644
--- a/keyboards/superuser/tkl/info.json
+++ b/keyboards/superuser/tkl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x544B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
+        "rows": ["B2", "D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7"
     },
@@ -19,486 +24,526 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":13, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Win", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Win", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":13, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Win", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Win", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":13, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Win", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/superuser/tkl/tkl.c b/keyboards/superuser/tkl/tkl.c
deleted file mode 100644
index b59a26f44e..0000000000
--- a/keyboards/superuser/tkl/tkl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 superuser
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "tkl.h"
diff --git a/keyboards/superuser/tkl/tkl.h b/keyboards/superuser/tkl/tkl.h
deleted file mode 100644
index e84cd59737..0000000000
--- a/keyboards/superuser/tkl/tkl.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2021 superuser
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-/*
- *              ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- *              │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │0G │
- *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───┬───�      ┌───────�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3C │ │1E │1F │1G │      │1D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
- *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴�3D  │ ISO Enter
- *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                   │2D │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───�       ┌─┴───┴────┤
- * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │     │4F │       │4C        │ 2.75u RShift
- * └────────┘   ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───�   └──────────┘
- *              │50   │51 │52   │56                         │5B   │5C │5D   │ │5E │5F │5G │
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_all(\
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                       \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,        K5E, K5F, K5G  \
-) { \
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, ___, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, ___, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                       \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,        K5E, K5F, K5G  \
-) { \
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, ___, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_iso_tsangan( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, ___, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_tkl_iso_tsangan_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                       \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,        K5E, K5F, K5G  \
-) { \
-    { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
-    { K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, ___, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h
index f963856c97..b737022959 100644
--- a/keyboards/swiftrax/retropad/config.h
+++ b/keyboards/swiftrax/retropad/config.h
@@ -17,17 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { C7, C6, B5 }
-#define MATRIX_COL_PINS { B4, D2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B7
-#ifdef  RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -42,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json
index ea43a71b12..2c18990f02 100644
--- a/keyboards/swiftrax/retropad/info.json
+++ b/keyboards/swiftrax/retropad/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEB0C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "D2"],
+        "rows": ["C7", "C6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1"}
@@ -16,11 +21,22 @@
     "bootmagic": {
         "matrix": [1, 0]
     },
+    "ws2812": {
+        "pin": "B7"
+    },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"0,1", "x":0.5, "y":0}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,1", "x":1, "y":1.5}, {"label":"2,0", "x":0, "y":2.5}, {"label":"2,1", "x":1, "y":2.5}]
+            "layout": [
+                {"matrix": [0, 1], "x": 0.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5}
+            ]
         }
     }
 }
diff --git a/keyboards/swiftrax/retropad/retropad.c b/keyboards/swiftrax/retropad/retropad.c
deleted file mode 100644
index 3ffe29528f..0000000000
--- a/keyboards/swiftrax/retropad/retropad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "retropad.h"
\ No newline at end of file
diff --git a/keyboards/swiftrax/retropad/retropad.h b/keyboards/swiftrax/retropad/retropad.h
deleted file mode 100644
index e7527d5c00..0000000000
--- a/keyboards/swiftrax/retropad/retropad.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
-       K001,    \
-    K100, K101, \
-    K200, K201  \
-) { \
-    {  XXX,  K001, }, \
-    { K100,  K101, }, \
-    { K200,  K201, }  \
-}
diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h
index 598ac367b3..790d70d9c8 100644
--- a/keyboards/switchplate/southpaw_65/config.h
+++ b/keyboards/switchplate/southpaw_65/config.h
@@ -21,23 +21,6 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 19
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-//#define MATRIX_ROW_PINS { D0, D5 }
-//#define MATRIX_COL_PINS { F1, F0, B0 }
-
-/* COL2ROW, ROW2COL */
-//#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 9
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/switchplate/southpaw_65/info.json b/keyboards/switchplate/southpaw_65/info.json
index 97cff66a16..c44ef51cff 100644
--- a/keyboards/switchplate/southpaw_65/info.json
+++ b/keyboards/switchplate/southpaw_65/info.json
@@ -12,6 +12,9 @@
         "pin": "B5",
         "levels": 10
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/switchplate/southpaw_fullsize/config.h b/keyboards/switchplate/southpaw_fullsize/config.h
index 92247d7951..8abadb9522 100644
--- a/keyboards/switchplate/southpaw_fullsize/config.h
+++ b/keyboards/switchplate/southpaw_fullsize/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E1, C0, C1, C2, C3, C4 }
-#define MATRIX_COL_PINS { A7, C7, C6, C5, F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, E0, D7, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/switchplate/southpaw_fullsize/info.json b/keyboards/switchplate/southpaw_fullsize/info.json
index 1b1cda7d2f..756ee84906 100644
--- a/keyboards/switchplate/southpaw_fullsize/info.json
+++ b/keyboards/switchplate/southpaw_fullsize/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0017",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A7", "C7", "C6", "C5", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "E0", "D7", "D6"],
+        "rows": ["E1", "C0", "C1", "C2", "C3", "C4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
diff --git a/keyboards/switchplate/switchplate910/config.h b/keyboards/switchplate/switchplate910/config.h
index adb547468a..ef90a43c6f 100644
--- a/keyboards/switchplate/switchplate910/config.h
+++ b/keyboards/switchplate/switchplate910/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, D1 }
-#define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, B3, B2, B0, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/switchplate/switchplate910/info.json b/keyboards/switchplate/switchplate910/info.json
index 5807471094..b324cc6415 100644
--- a/keyboards/switchplate/switchplate910/info.json
+++ b/keyboards/switchplate/switchplate910/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2065",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "B3", "B2", "B0", "B1"],
+        "rows": ["F4", "F5", "F6", "F7", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
diff --git a/keyboards/switchplate/switchplate910/switchplate910.c b/keyboards/switchplate/switchplate910/switchplate910.c
deleted file mode 100644
index fce0d30723..0000000000
--- a/keyboards/switchplate/switchplate910/switchplate910.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Stefan Karsch
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "switchplate910.h"
-
diff --git a/keyboards/sx60/info.json b/keyboards/sx60/info.json
index 9c0b6bcf9a..183e37b974 100644
--- a/keyboards/sx60/info.json
+++ b/keyboards/sx60/info.json
@@ -20,19 +20,351 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"\\|", "x":15.25, "y":0, "w":1}, {"label":"`~", "x":16.25, "y":0, "w":1}, {"label":"M1", "x":0, "y":1, "w":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2, "w":1}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"ANSIEnter", "x":15, "y":2, "w":1}, {"label":"ISOEnter", "x":16, "y":2, "w":1.25}, {"label":"M3", "x":0, "y":3, "w":1}, {"label":"Shift", "x":1.25, "y":3, "w":1.25}, {"label":"\\|", "x":2.5, "y":3, "w":1}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3, "w":1}, {"label":"M4", "x":0, "y":4, "w":1}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4, "w":1}, {"label":"Ctrl", "x":15.25, "y":4, "w":1}, {"label":"Fn2", "x":16.25, "y":4, "w":1}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
         },
 
         "LAYOUT_ansi_split_bs_rshift": {
-            "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"\\|", "x":15.25, "y":0, "w":1}, {"label":"`~", "x":16.25, "y":0, "w":1}, {"label":"M1", "x":0, "y":1, "w":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2, "w":1}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"M3", "x":0, "y":3, "w":1}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3, "w":1}, {"label":"M4", "x":0, "y":4, "w":1}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4, "w":1}, {"label":"Ctrl", "x":15.25, "y":4, "w":1}, {"label":"Fn2", "x":16.25, "y":4, "w":1}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
         },
 
         "LAYOUT_ansi_split_bs": {
-            "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"\\|", "x":15.25, "y":0, "w":1}, {"label":"`~", "x":16.25, "y":0, "w":1}, {"label":"M1", "x":0, "y":1, "w":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2, "w":1}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"M3", "x":0, "y":3, "w":1}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":2.75}, {"label":"M4", "x":0, "y":4, "w":1}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4, "w":1}, {"label":"Ctrl", "x":15.25, "y":4, "w":1}, {"label":"Fn", "x":16.25, "y":4, "w":1}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
         },
 
         "LAYOUT_ansi_split_rshift": {
-            "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1!", "x":2.25, "y":0}, {"label":"2@", "x":3.25, "y":0}, {"label":"3#", "x":4.25, "y":0}, {"label":"4$", "x":5.25, "y":0}, {"label":"5%", "x":6.25, "y":0}, {"label":"6^", "x":7.25, "y":0}, {"label":"7&", "x":9.25, "y":0}, {"label":"8*", "x":10.25, "y":0}, {"label":"9(", "x":11.25, "y":0}, {"label":"0)", "x":12.25, "y":0}, {"label":"-_", "x":13.25, "y":0}, {"label":"=+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"M1", "x":0, "y":1, "w":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"\\|", "x":15.75, "y":1, "w":1.5}, {"label":"M2", "x":0, "y":2, "w":1}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"M3", "x":0, "y":3, "w":1}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"Fn", "x":16.25, "y":3, "w":1}, {"label":"M4", "x":0, "y":4, "w":1}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Win", "x":2.5, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.25}, {"label":"Win", "x":13, "y":4, "w":1.25}, {"label":"Menu", "x":14.25, "y":4, "w":1}, {"label":"Ctrl", "x":15.25, "y":4, "w":1}, {"label":"Fn2", "x":16.25, "y":4, "w":1}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/sx60/keymaps/amnobis/rules.mk b/keyboards/sx60/keymaps/amnobis/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/sx60/keymaps/amnobis/rules.mk
+++ /dev/null
diff --git a/keyboards/sx60/sx60.h b/keyboards/sx60/sx60.h
index 605b6fe78d..6e72005421 100755
--- a/keyboards/sx60/sx60.h
+++ b/keyboards/sx60/sx60.h
@@ -21,61 +21,3 @@
 extern uint8_t mcp23018_status;
 
 uint8_t init_mcp23018(void);
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-          k00, k01, k02, k03, k04, k05, k06,    k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10,  k11,    k12, k13, k14, k15, k16,    k18, k19, k1A, k1B, k1C, k1D, k1E,  k1F, \
-    k20,    k21,    k22, k23, k24, k25, k26,    k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \
-    k30,   k31,  k32, k33, k34, k35, k36, k37,    k38, k39, k3A, k3B, k3C,  k3D,   k3E, \
-    k40,  k41,   k42,   k43,   k44,   k45,       k48,     k49,    k4A,   k4B, k4C, k4D \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3E }, \
-    { k40, k41, k42, k43, k44, k45, XXX, XXX, k48, k49, k4A, k4B, k4C, k4D, XXX, XXX } \
-}
-
-#define LAYOUT_ansi_split_bs_rshift( \
-          k00, k01, k02, k03, k04, k05, k06,    k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10,  k11,   k12, k13, k14, k15, k16,    k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F, \
-    k20,    k21,  k22, k23, k24, k25, k26,    k28, k29, k2A, k2B, k2C, k2D,      k2E, \
-    k30,     k31,   k33, k34, k35, k36, k37,    k38, k39, k3A, k3B, k3C,   k3D,    k3E, \
-    k40,  k41,   k42,   k43,   k44,   k45,        k48,     k49,   k4A,   k4B, k4C, k4E \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \
-    { k30, k31, XXX, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3E }, \
-    { k40, k41, k42, k43, k44, k45, XXX, XXX, k48, k49, k4A, k4B, k4C, k4E, XXX, XXX } \
-}
-
-#define LAYOUT_ansi_split_bs( \
-          k00, k01, k02, k03, k04, k05, k06,    k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
-    k10,  k11,   k12, k13, k14, k15, k16,    k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F, \
-    k20,    k21,  k22, k23, k24, k25, k26,    k28, k29, k2A, k2B, k2C, k2D,      k2E, \
-    k30,     k31,   k33, k34, k35, k36, k37,    k38, k39, k3A, k3B, k3C,     k3D, \
-    k40,  k41,   k42,   k43,   k44,   k45,        k48,     k49,   k4A,   k4B, k4C, k4D \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \
-    { k30, k31, XXX, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, XXX, XXX, k48, k49, k4A, k4B, k4C, k4D, XXX, XXX } \
-}
-
-#define LAYOUT_ansi_split_rshift( \
-         k00, k01, k02, k03, k04, k05, k06,    k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10,  k11,   k12, k13, k14, k15, k16,    k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F, \
-    k20,    k21,  k22, k23, k24, k25, k26,    k28, k29, k2A, k2B, k2C, k2D,      k2E, \
-    k30,     k31,   k33, k34, k35, k36, k37,    k38, k39, k3A, k3B, k3C,   k3D,    k3E, \
-    k40,  k41,   k42,   k43,   k44,   k45,        k48,     k49,   k4A,   k4B, k4C, k4D \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \
-    { k30, k31, XXX, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3E }, \
-    { k40, k41, k42, k43, k44, k45, XXX, XXX, k48, k49, k4A, k4B, k4C, k4D, XXX, XXX } \
-}
diff --git a/keyboards/synapse/config.h b/keyboards/synapse/config.h
index f9b40cedee..9f86bdabd7 100644
--- a/keyboards/synapse/config.h
+++ b/keyboards/synapse/config.h
@@ -16,14 +16,4 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { E6, B0, F4, F1 }
-#define MATRIX_COL_PINS \
-    { F0, D4, F5, B1, B2, B3, B7, D0, D1, D2, D3, B6 }
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/synapse/info.json b/keyboards/synapse/info.json
index ff629b48c5..06ace305e6 100644
--- a/keyboards/synapse/info.json
+++ b/keyboards/synapse/info.json
@@ -8,6 +8,11 @@
   	"pid": "0x5359",
   	"device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F0", "D4", "F5", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "B6"],
+    "rows": ["E6", "B0", "F4", "F1"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
   	"rotary": [
   		{"pin_a": "D7", "pin_b": "D6"},
@@ -17,94 +22,100 @@
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
+    "LAYOUT_7u_space": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.5},
+        {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 7},
+        {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.5},
+        {"matrix": [3, 10], "x": 11, "y": 3}
+      ]
+    },
     "LAYOUT_default": {
-	  "layout": [
-			{"x":0, "y":0},
-			{"x":1, "y":0},
-			{"x":2, "y":0},
-			{"x":3, "y":0},
-			{"x":4, "y":0},
-			{"x":5, "y":0},
-			{"x":6, "y":0}, 
-			{"x":7, "y":0},
-			{"x":8, "y":0},
-			{"x":9, "y":0},
-			{"x":10, "y":0},
-			{"x":11, "y":0},
-			{"x":0, "y":1, "w":1.25},
-			{"x":1.25, "y":1},
-			{"x":2.25, "y":1},
-			{"x":3.25, "y":1},
-			{"x":4.25, "y":1},
-			{"x":5.25, "y":1},
-			{"x":6.25, "y":1},
-			{"x":7.25, "y":1},
-			{"x":8.25, "y":1},
-			{"x":9.25, "y":1},
-			{"x":10.25, "y":1, "w":1.75},
-			{"x":0, "y":2, "w":1.75},
-			{"x":1.75, "y":2},
-			{"x":2.75, "y":2},
-			{"x":3.75, "y":2},
-			{"x":4.75, "y":2},
-			{"x":5.75, "y":2},
-			{"x":6.75, "y":2},
-			{"x":7.75, "y":2},
-			{"x":8.75, "y":2},
-			{"x":9.75, "y":2},
-			{"x":10.75, "y":2, "w":1.25},
-			{"x":0, "y":3},
-			{"x":1, "y":3},
-			{"x":2, "y":3},
-			{"x":3, "y":3, "w":3},
-			{"x":6, "y":3, "w":3},
-			{"x":9, "y":3},
-			{"x":10, "y":3},
-			{"x":11, "y":3}
-			]
-        },
-			"LAYOUT_7u_space": {
       "layout": [
-			{"x":0, "y":0},
-			{"x":1, "y":0},
-			{"x":2, "y":0},
-			{"x":3, "y":0},
-			{"x":4, "y":0},
-			{"x":5, "y":0},
-			{"x":6, "y":0},
-			{"x":7, "y":0},
-			{"x":8, "y":0},
-			{"x":9, "y":0}, 
-			{"x":10, "y":0},
-			{"x":11, "y":0},
-			{"x":0, "y":1, "w":1.25},
-			{"x":1.25, "y":1},
-			{"x":2.25, "y":1},
-			{"x":3.25, "y":1},
-			{"x":4.25, "y":1},
-			{"x":5.25, "y":1},
-			{"x":6.25, "y":1},
-			{"x":7.25, "y":1},
-			{"x":8.25, "y":1},
-			{"x":9.25, "y":1},
-			{"x":10.25, "y":1, "w":1.75},
-			{"x":0, "y":2, "w":1.75},
-			{"x":1.75, "y":2},
-			{"x":2.75, "y":2},
-			{"x":3.75, "y":2},
-			{"x":4.75, "y":2},
-			{"x":5.75, "y":2},
-			{"x":6.75, "y":2},
-			{"x":7.75, "y":2},
-			{"x":8.75, "y":2},
-			{"x":9.75, "y":2},
-			{"x":10.75, "y":2, "w":1.25},
-			{"x":0, "y":3},
-			{"x":1, "y":3, "w":1.5},
-			{"x":2.5, "y":3, "w":7},
-			{"x":9.5, "y":3, "w":1.5},
-			{"x":11, "y":3}
-			]
-        }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3, "w": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3, "w": 3},
+        {"matrix": [3, 8], "x": 9, "y": 3},
+        {"matrix": [3, 9], "x": 10, "y": 3},
+        {"matrix": [3, 10], "x": 11, "y": 3}
+      ]
     }
+  }
 }
diff --git a/keyboards/synapse/keymaps/7u_space/config.h b/keyboards/synapse/keymaps/7u_space/config.h
index 0b0e89fa1f..7fdb8504a6 100644
--- a/keyboards/synapse/keymaps/7u_space/config.h
+++ b/keyboards/synapse/keymaps/7u_space/config.h
@@ -18,7 +18,6 @@
 
 /*Modtaps*/
 #define TAPPING_TERM 165
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*Combos*/
 #ifdef COMBO_ENABLE
diff --git a/keyboards/synapse/keymaps/default/config.h b/keyboards/synapse/keymaps/default/config.h
index 0b0e89fa1f..7fdb8504a6 100644
--- a/keyboards/synapse/keymaps/default/config.h
+++ b/keyboards/synapse/keymaps/default/config.h
@@ -18,7 +18,6 @@
 
 /*Modtaps*/
 #define TAPPING_TERM 165
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /*Combos*/
 #ifdef COMBO_ENABLE
diff --git a/keyboards/synapse/synapse.c b/keyboards/synapse/synapse.c
index ac9c50ceb1..0b532eaab6 100644
--- a/keyboards/synapse/synapse.c
+++ b/keyboards/synapse/synapse.c
@@ -13,7 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "synapse.h"
+
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/synapse/synapse.h b/keyboards/synapse/synapse.h
deleted file mode 100644
index a126e450ec..0000000000
--- a/keyboards/synapse/synapse.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-    K30, K31, K32, K33,           K36,      K38, K39, K53 \
-) \
-{ \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, XXX}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, XXX}, \
-    {K30, K31, K32, K33, XXX, XXX, K36, XXX, K38, K39, K53, XXX} \
-} \
-
-#define LAYOUT_7u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-    K30, K31,	   K33,                     	 K39, K53 \
-) \
-{ \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K60}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, XXX}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, XXX}, \
-    {K30, K31, XXX, K33, XXX, XXX, XXX, XXX, XXX, K39, K53, XXX} \
-} 
-
diff --git a/keyboards/synthlabs/060/config.h b/keyboards/synthlabs/060/config.h
index 60dfb6ad51..16c2aae950 100644
--- a/keyboards/synthlabs/060/config.h
+++ b/keyboards/synthlabs/060/config.h
@@ -8,8 +8,6 @@
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
-#define RGB_DI_PIN E6
-
 // RGB Matrix Animation modes
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/info.json
index aee8d16713..75d503b883 100644
--- a/keyboards/synthlabs/060/info.json
+++ b/keyboards/synthlabs/060/info.json
@@ -16,6 +16,9 @@
     "rgblight": false,
     "rgb_matrix": true
   },
+  "ws2812": {
+    "pin": "E6"
+  },
   "matrix_pins": {
     "cols": [ "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D4", "D5", "D3", "D2", "D1", "D0", "B7" ],
     "rows": [ "F0", "F1", "F4", "F5", "F6" ]
diff --git a/keyboards/synthlabs/solo/keymaps/via/keymap.c b/keyboards/synthlabs/solo/keymaps/via/keymap.c
index c6634c42d4..84f99df9ab 100644
--- a/keyboards/synthlabs/solo/keymaps/via/keymap.c
+++ b/keyboards/synthlabs/solo/keymaps/via/keymap.c
@@ -37,7 +37,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -49,7 +50,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h
index 886b5e2b78..27e3025fe3 100644
--- a/keyboards/system76/launch_1/config.h
+++ b/keyboards/system76/launch_1/config.h
@@ -17,24 +17,7 @@
 
 #pragma once
 
-
-/*
- * Key matrix pins
- * ROWS: AVR pins used for rows, top to bottom
- * COLS: AVR pins used for columns, left to right
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D7, C7, C6, B6, B5, B4, D6, D4, E6, D5, D3, D2, B7, B0 }
-
-/*
- * Diode Direction
- * COL2ROW = COL => Anode (+), ROW => Cathode (-)
- * ROW2COL = ROW => Anode (+), COL => Cathode (-)
- */
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DI_PIN E2
 #    define RGB_MATRIX_LED_COUNT 84
 #    define RGB_MATRIX_KEYPRESSES                                      // Reacts to keypresses
 // #    define RGB_MATRIX_KEYRELEASES                                     // Reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json
index e61caec07c..db5912e381 100644
--- a/keyboards/system76/launch_1/info.json
+++ b/keyboards/system76/launch_1/info.json
@@ -7,6 +7,17 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/system76/launch_1/rules.mk b/keyboards/system76/launch_1/rules.mk
index e20aa1fd58..7dbc07ced0 100644
--- a/keyboards/system76/launch_1/rules.mk
+++ b/keyboards/system76/launch_1/rules.mk
@@ -17,7 +17,6 @@ RAW_ENABLE = yes            # Raw HID commands (used by Keyboard Configurator)
 BACKLIGHT_ENABLE = no       # RGB backlight (conflicts with RGB matrix)
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # RGB matrix
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_CUSTOM_KB = yes  # Custom keyboard effects
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Link-time optimization for smaller binary
diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h
index e99d3e1255..b9449c4714 100755
--- a/keyboards/tada68/config.h
+++ b/keyboards/tada68/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {D0,D1,F6,F7,D5}
-#define MATRIX_COL_PINS {F0,F1,E6,C7,C6,B7,D4,B1,B0,B5,B4,D7,D6,B3,F4}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/tada68/info.json b/keyboards/tada68/info.json
index 73dd33330b..1311017d36 100644
--- a/keyboards/tada68/info.json
+++ b/keyboards/tada68/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+        "rows": ["D0", "D1", "F6", "F7", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "levels": 4,
@@ -20,235 +25,239 @@
     "processor": "atmega32u4",
     "bootloader": "lufa-ms",
     "community_layouts": ["65_ansi", "65_iso"],
+    "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_65_ansi",
+        "LAYOUT_iso": "LAYOUT_65_iso"
+    },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"~", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"Delete", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"@", "x":11.75, "y":2},
-                {"label":"~", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"Page Up", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"|", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"Page Down", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Fn", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_ansi_split_enter": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0, "w":2},
-                {"label":"k0e", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k11", "x":1.5, "y":1},
-                {"label":"k12", "x":2.5, "y":1},
-                {"label":"k13", "x":3.5, "y":1},
-                {"label":"k14", "x":4.5, "y":1},
-                {"label":"k15", "x":5.5, "y":1},
-                {"label":"k16", "x":6.5, "y":1},
-                {"label":"k17", "x":7.5, "y":1},
-                {"label":"k18", "x":8.5, "y":1},
-                {"label":"k19", "x":9.5, "y":1},
-                {"label":"k1a", "x":10.5, "y":1},
-                {"label":"k1b", "x":11.5, "y":1},
-                {"label":"k1c", "x":12.5, "y":1},
-                {"label":"k1d", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1e", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k21", "x":1.75, "y":2},
-                {"label":"k22", "x":2.75, "y":2},
-                {"label":"k23", "x":3.75, "y":2},
-                {"label":"k24", "x":4.75, "y":2},
-                {"label":"k25", "x":5.75, "y":2},
-                {"label":"k26", "x":6.75, "y":2},
-                {"label":"k27", "x":7.75, "y":2},
-                {"label":"k28", "x":8.75, "y":2},
-                {"label":"k29", "x":9.75, "y":2},
-                {"label":"k2a", "x":10.75, "y":2},
-                {"label":"k2b", "x":11.75, "y":2},
-                {"label":"k2c", "x":12.75, "y":2},
-                {"label":"k2d", "x":13.75, "y":2, "w":1.25},
-                {"label":"k2e", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"k30", "x":0, "y":3, "w":2.25},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3d", "x":14, "y":3},
-                {"label":"k3e", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k42", "x":2.5, "y":4, "w":1.25},
-                {"label":"k45", "x":3.75, "y":4, "w":6.25},
-                {"label":"k49", "x":10, "y":4},
-                {"label":"k4a", "x":11, "y":4},
-                {"label":"k4b", "x":12, "y":4},
-                {"label":"k4c", "x":13, "y":4},
-                {"label":"k4d", "x":14, "y":4},
-                {"label":"k4e", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h
index 2653ab0a49..f902184d82 100755
--- a/keyboards/tada68/keymaps/rgb/config.h
+++ b/keyboards/tada68/keymaps/rgb/config.h
@@ -1,7 +1,7 @@
 #include "../../config.h"
 
 /* WS2812B RGB Underglow LED */
-#define RGB_DI_PIN F5   // See readme.md for wiring your led's
+#define WS2812_DI_PIN F5   // See readme.md for wiring your led's
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tada68/tada68.c b/keyboards/tada68/tada68.c
deleted file mode 100755
index 34534de747..0000000000
--- a/keyboards/tada68/tada68.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tada68.h"
diff --git a/keyboards/tada68/tada68.h b/keyboards/tada68/tada68.h
deleted file mode 100755
index 6bc3cdccf3..0000000000
--- a/keyboards/tada68/tada68.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-/* TADA68 ANSI layout
-   * ,----------------------------------------------------------------.
-   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
-   * |----------------------------------------------------------------|
-   * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d | 1e |
-   * |----------------------------------------------------------------|
-   * | 20    | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d    | 2e |
-   * |----------------------------------------------------------------|
-   * | 30     | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
-   * |----------------------------------------------------------------|
-   * | 40 | 41 | 42 |        45             | 49| 4a|  4b| 4c| 4d| 4e |
-   * `----------------------------------------------------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,           k45,                k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \
-    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e}  \
-}
-
-#define LAYOUT_ansi LAYOUT_65_ansi
-
-/* TADA68 ISO layout
-   * ,----------------------------------------------------------------.
-   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
-   * |----------------------------------------------------------------|
-   * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|     | 1e |
-   * |------------------------------------------------------.    -----|
-   * | 20   | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c|  2d| 2e |
-   * |----------------------------------------------------------------|
-   * | 30 | 31| 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
-   * |----------------------------------------------------------------|
-   * | 40 | 41 | 42 |        45             | 49| 4a|  4b| 4c| 4d| 4e |
-   * `----------------------------------------------------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_65_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k1d, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,           k45,                k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e}  \
-}
-
-#define LAYOUT_iso LAYOUT_65_iso
-
-/* TADA68 ANSI layout with Split Enter key
-   * ,----------------------------------------------------------------.
-   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
-   * |----------------------------------------------------------------|
-   * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d | 1e |
-   * |----------------------------------------------------------------|
-   * | 20   | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c|  2d| 2e |
-   * |----------------------------------------------------------------|
-   * | 30     | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
-   * |----------------------------------------------------------------|
-   * | 40 | 41 | 42 |        45              | 49| 4a| 4b| 4c| 4d| 4e |
-   * `----------------------------------------------------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ansi_split_enter( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,           k45,                k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \
-    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e}  \
-}
diff --git a/keyboards/takashicompany/center_enter/center_enter.c b/keyboards/takashicompany/center_enter/center_enter.c
deleted file mode 100644
index 4973e6a643..0000000000
--- a/keyboards/takashicompany/center_enter/center_enter.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 takashicompany
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "center_enter.h"
diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h
index f77a42f59f..6610fca8bf 100644
--- a/keyboards/takashicompany/center_enter/config.h
+++ b/keyboards/takashicompany/center_enter/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D7, B2, B6, D0, D4, C6}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 6
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json
index 7c268e3f63..e7930bdb01 100644
--- a/keyboards/takashicompany/center_enter/info.json
+++ b/keyboards/takashicompany/center_enter/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0012",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D7", "B2", "B6", "D0", "D4", "C6"],
+        "rows": ["E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D1", "resolution": 1}
diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h
index 3f6f011524..90d19444ad 100644
--- a/keyboards/takashicompany/compacx/config.h
+++ b/keyboards/takashicompany/compacx/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 12
 #    define RGBLED_SPLIT {6, 6}
 #    define RGBLIGHT_HUE_STEP 8
@@ -53,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json
index bcd4489a98..f67abdbd3f 100644
--- a/keyboards/takashicompany/compacx/info.json
+++ b/keyboards/takashicompany/compacx/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0014",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D1", "D0", "D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "E6", "pin_b": "B4"},
diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h
index 4048cb9bf6..f71ff71726 100644
--- a/keyboards/takashicompany/dogtag/config.h
+++ b/keyboards/takashicompany/dogtag/config.h
@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B2, B6, B3 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-#define MATRIX_ROW_PINS_RIGHT { B2, B6, B3 }
-#define MATRIX_COL_PINS_RIGHT { B1, F7, F6, F5, F4 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 4 * 2
 #    define RGBLED_SPLIT { 4, 4 }
 #    define RGBLIGHT_HUE_STEP 8
@@ -56,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json
index caa007fcc5..2a91bd48f0 100644
--- a/keyboards/takashicompany/dogtag/info.json
+++ b/keyboards/takashicompany/dogtag/info.json
@@ -8,13 +8,27 @@
         "pid": "0x0018",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["B2", "B6", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D4", "pin_b": "C6"}
         ]
     },
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["B1", "F7", "F6", "F5", "F4"],
+                "rows": ["B2", "B6", "B3"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h
index 8dd55ecf0d..59c63c91fd 100644
--- a/keyboards/takashicompany/endzone34/config.h
+++ b/keyboards/takashicompany/endzone34/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, B2, B6, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D4, C6, D7, E6, B4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 9
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -53,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json
index 60ca453e13..e9c9437902 100644
--- a/keyboards/takashicompany/endzone34/info.json
+++ b/keyboards/takashicompany/endzone34/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "D4", "C6", "D7", "E6", "B4"],
+        "rows": ["B3", "B2", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/takashicompany/goat51/info.json b/keyboards/takashicompany/goat51/info.json
index b87b08161e..04a29143bf 100644
--- a/keyboards/takashicompany/goat51/info.json
+++ b/keyboards/takashicompany/goat51/info.json
@@ -48,7 +48,6 @@
     },
     "rgblight": {
         "led_count": 11,
-        "pin": "D3",
         "hue_steps": 10,
         "saturation_steps": 17,
         "brightness_steps": 17,
@@ -65,6 +64,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h
index 5bdc664832..a4685b9d06 100644
--- a/keyboards/takashicompany/heavy_left/config.h
+++ b/keyboards/takashicompany/heavy_left/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 6 * 2
 #    define RGBLED_SPLIT {6, 6}
 #    define RGBLIGHT_HUE_STEP 8
@@ -53,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/heavy_left/heavy_left.c b/keyboards/takashicompany/heavy_left/heavy_left.c
deleted file mode 100644
index 2af6d3fe61..0000000000
--- a/keyboards/takashicompany/heavy_left/heavy_left.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 takashicompany
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "heavy_left.h"
diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json
index 2fa8ac7a05..95ecb65e1b 100644
--- a/keyboards/takashicompany/heavy_left/info.json
+++ b/keyboards/takashicompany/heavy_left/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0015",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1", "D0"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h
index 4cd3ae6b65..6f631456ea 100644
--- a/keyboards/takashicompany/minizone/config.h
+++ b/keyboards/takashicompany/minizone/config.h
@@ -3,25 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 11
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -37,7 +18,6 @@
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //#    define RGBLIGHT_EFFECT_RGB_TEST
 //#    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json
index 882a8ebdd5..c591487e7b 100644
--- a/keyboards/takashicompany/minizone/info.json
+++ b/keyboards/takashicompany/minizone/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0021",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h
index 726f4507c8..6610fca8bf 100644
--- a/keyboards/takashicompany/qoolee/config.h
+++ b/keyboards/takashicompany/qoolee/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D0, D4, C6, D7}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 6
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -51,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json
index 6f92e86c88..d7e9e2271e 100644
--- a/keyboards/takashicompany/qoolee/info.json
+++ b/keyboards/takashicompany/qoolee/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0013",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D0", "D4", "C6", "D7"],
+        "rows": ["E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D1", "resolution": 1}
diff --git a/keyboards/takashicompany/qoolee/qoolee.c b/keyboards/takashicompany/qoolee/qoolee.c
deleted file mode 100644
index 5a86c3c5bf..0000000000
--- a/keyboards/takashicompany/qoolee/qoolee.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 takashicompany
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "qoolee.h"
diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h
index 8843ff81f0..39e1d8df5b 100644
--- a/keyboards/takashicompany/radialex/config.h
+++ b/keyboards/takashicompany/radialex/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 12
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json
index 1ed37283e7..d9b0e1aaa0 100644
--- a/keyboards/takashicompany/radialex/info.json
+++ b/keyboards/takashicompany/radialex/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0019",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["B6", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/takashicompany/radialex/radialex.c b/keyboards/takashicompany/radialex/radialex.c
deleted file mode 100644
index 9146106973..0000000000
--- a/keyboards/takashicompany/radialex/radialex.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 takashicompany
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "radialex.h"
diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/info.json
index 16450db96e..161ed5ed60 100644
--- a/keyboards/takashicompany/spreadwriter/info.json
+++ b/keyboards/takashicompany/spreadwriter/info.json
@@ -47,7 +47,6 @@
     },
     "rgblight": {
         "led_count": 53,
-        "pin": "D3",
         "hue_steps": 10,
         "saturation_steps": 17,
         "brightness_steps": 17,
@@ -64,6 +63,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c b/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c
index e04c1fea0d..c0d4a0003d 100644
--- a/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c
@@ -98,7 +98,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -110,7 +111,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
@@ -124,4 +126,4 @@ void matrix_scan_kb(void) {
 bool encoder_update_user(uint8_t index, bool clockwise) {
     encoder_action_register(index, clockwise);
     return true;
-};
\ No newline at end of file
+};
diff --git a/keyboards/takashicompany/tightwriter/info.json b/keyboards/takashicompany/tightwriter/info.json
index 7918682c20..891968963c 100644
--- a/keyboards/takashicompany/tightwriter/info.json
+++ b/keyboards/takashicompany/tightwriter/info.json
@@ -39,7 +39,6 @@
     },
     "rgblight": {
         "led_count": 10,
-        "pin": "D3",
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -53,6 +52,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
index ff769451d2..ac6c077f6b 100644
--- a/keyboards/takashiski/hecomi/alpha/config.h
+++ b/keyboards/takashiski/hecomi/alpha/config.h
@@ -17,27 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C6,D7,E6,B4,B5 }
-#define MATRIX_COL_PINS { F4,F5,F6,F7,B1,B3,B2,B6 }
-
 //#define USE_I2C
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
- #define RGB_DI_PIN D4
- #ifdef RGB_DI_PIN
    #define RGBLED_NUM 16 
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //   #define RGBLIGHT_EFFECT_RGB_TEST
 //   #define RGBLIGHT_EFFECT_ALTERNATING
- #endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json
index 040e26dcd0..eecf812a68 100644
--- a/keyboards/takashiski/hecomi/alpha/info.json
+++ b/keyboards/takashiski/hecomi/alpha/info.json
@@ -8,9 +8,17 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D1"
   },
+  "ws2812": {
+    "pin": "D4"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/takashiski/hecomi/hecomi.c b/keyboards/takashiski/hecomi/hecomi.c
deleted file mode 100644
index d527547119..0000000000
--- a/keyboards/takashiski/hecomi/hecomi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 takashiski
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "hecomi.h"
-#include "split_util.h"
diff --git a/keyboards/takashiski/namecard2x4/info.json b/keyboards/takashiski/namecard2x4/info.json
index d1aa7848fc..f64d385270 100644
--- a/keyboards/takashiski/namecard2x4/info.json
+++ b/keyboards/takashiski/namecard2x4/info.json
@@ -12,7 +12,17 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"1", "x":0, "y":0}, {"label":"2", "x":1, "y":0}, {"label":"3", "x":2, "y":0}, {"label":"4", "x":3, "y":0}, {"label":"5", "x":0, "y":1}, {"label":"6", "x":1, "y":1}, {"label":"7", "x":2, "y":1}, {"label":"8", "x":3, "y":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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1}
+            ]
         }
     }
 }
diff --git a/keyboards/takashiski/namecard2x4/namecard2x4.c b/keyboards/takashiski/namecard2x4/namecard2x4.c
deleted file mode 100644
index 091b55c10d..0000000000
--- a/keyboards/takashiski/namecard2x4/namecard2x4.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 takashiski
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "namecard2x4.h"
diff --git a/keyboards/takashiski/namecard2x4/namecard2x4.h b/keyboards/takashiski/namecard2x4/namecard2x4.h
deleted file mode 100644
index f3f6992703..0000000000
--- a/keyboards/takashiski/namecard2x4/namecard2x4.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2018 takashiski
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 } \
-}
diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
index 39b488c42a..c4a349580c 100644
--- a/keyboards/takashiski/namecard2x4/rev1/config.h
+++ b/keyboards/takashiski/namecard2x4/rev1/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B4,B5 }
-#define MATRIX_COL_PINS { E6,D7,C6,D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
 #define RGBLED_NUM 4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/takashiski/namecard2x4/rev1/info.json b/keyboards/takashiski/namecard2x4/rev1/info.json
new file mode 100644
index 0000000000..28781bcd0a
--- /dev/null
+++ b/keyboards/takashiski/namecard2x4/rev1/info.json
@@ -0,0 +1,10 @@
+{
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "D7", "C6", "D4"],
+        "rows": ["B4", "B5"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h
index e6897e7311..f90b4e073c 100644
--- a/keyboards/takashiski/namecard2x4/rev2/config.h
+++ b/keyboards/takashiski/namecard2x4/rev2/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B2,B6 }
-#define MATRIX_COL_PINS { D7,E6,B4,B5 }
-
-/* COL2ROW, ROW2COL */
-//#define DIODE_DIRECTION COL2ROW
-#define DIODE_DIRECTION ROW2COL
-#define RGB_DI_PIN D4
 #define RGBLED_NUM 8
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/takashiski/namecard2x4/rev2/info.json b/keyboards/takashiski/namecard2x4/rev2/info.json
new file mode 100644
index 0000000000..51fe26c555
--- /dev/null
+++ b/keyboards/takashiski/namecard2x4/rev2/info.json
@@ -0,0 +1,10 @@
+{
+    "ws2812": {
+        "pin": "D4"
+    },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5"],
+        "rows": ["B2", "B6"]
+    },
+    "diode_direction": "ROW2COL"
+}
diff --git a/keyboards/takashiski/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h
index 2919d7f0cc..b43d9c74c8 100644
--- a/keyboards/takashiski/otaku_split/rev0/config.h
+++ b/keyboards/takashiski/otaku_split/rev0/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B5,B4,E6,D7,C6 }
-#define MATRIX_COL_PINS { B6,B2,B3,B1,F7,F6,F5,F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json
index 825cf08d2a..438cddcf30 100644
--- a/keyboards/takashiski/otaku_split/rev0/info.json
+++ b/keyboards/takashiski/otaku_split/rev0/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B5", "B4", "E6", "D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/takashiski/otaku_split/rev0/rev0.c b/keyboards/takashiski/otaku_split/rev0/rev0.c
deleted file mode 100644
index 6ec80aabb6..0000000000
--- a/keyboards/takashiski/otaku_split/rev0/rev0.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 takashiski
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev0.h"
diff --git a/keyboards/takashiski/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h
index 63658aa6d4..6a81e8ddcb 100644
--- a/keyboards/takashiski/otaku_split/rev1/config.h
+++ b/keyboards/takashiski/otaku_split/rev1/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C6,D7,E6,B4,B5 }
-#define MATRIX_COL_PINS { F4,F5,F6,F7,B1,B3,B2,B6 }
-#define MATRIX_ROW_PINS_RIGHT { B5,B4,E6,D7,C6 }
-#define MATRIX_COL_PINS_RIGHT { B6,B2,B3,B1,F7,F6,F5,F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define SPLIT_HAND_PIN D2 //fix pin. HIGH is left, LOW is right
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json
index 42c66376ec..5bdf4048a7 100644
--- a/keyboards/takashiski/otaku_split/rev1/info.json
+++ b/keyboards/takashiski/otaku_split/rev1/info.json
@@ -8,8 +8,19 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "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",
diff --git a/keyboards/takashiski/otaku_split/rev1/rev1.c b/keyboards/takashiski/otaku_split/rev1/rev1.c
deleted file mode 100644
index b63bb047aa..0000000000
--- a/keyboards/takashiski/otaku_split/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 takashiski
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h
index ac0ea7c338..b62209abaa 100644
--- a/keyboards/taleguers/taleguers75/config.h
+++ b/keyboards/taleguers/taleguers75/config.h
@@ -16,23 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B3, B2, B1, E6, B7, C7, C6, D4, D6, D7, B4, D0, D1, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,4 +38,3 @@
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/taleguers/taleguers75/info.json b/keyboards/taleguers/taleguers75/info.json
index 936086beb3..1152f381e4 100644
--- a/keyboards/taleguers/taleguers75/info.json
+++ b/keyboards/taleguers/taleguers75/info.json
@@ -8,11 +8,19 @@
         "pid": "0x0075",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B1", "E6", "B7", "C7", "C6", "D4", "D6", "D7", "B4", "D0", "D1", "F7"],
+        "rows": ["B0", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "B5"}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/taleguers/taleguers75/taleguers75.c b/keyboards/taleguers/taleguers75/taleguers75.c
index 97664effde..b51d9443bc 100644
--- a/keyboards/taleguers/taleguers75/taleguers75.c
+++ b/keyboards/taleguers/taleguers75/taleguers75.c
@@ -15,14 +15,3 @@
  */
 
 #include "taleguers75.h"
-
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-	if (!clockwise) {
-		tap_code(KC_AUDIO_VOL_DOWN);
-	} else {
-		tap_code(KC_AUDIO_VOL_UP);
-	}
-    return true;
-}
diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h
index 0e6121ec48..305eacfd35 100644
--- a/keyboards/tanuki/config.h
+++ b/keyboards/tanuki/config.h
@@ -17,19 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS {  B3 , B2 , B6 , B5 , B4 , E6 , D7 , C6 , F4 , F5 , F6 }
-#define MATRIX_ROW_PINS {  F7 , B1 , D4 , D0 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -45,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
 #define RGBLIGHT_SLEEP
-#endif
 
 #define TAPPING_TERM 200
 /*
diff --git a/keyboards/tanuki/info.json b/keyboards/tanuki/info.json
index 6dbc793b7f..fa6101de64 100644
--- a/keyboards/tanuki/info.json
+++ b/keyboards/tanuki/info.json
@@ -8,6 +8,14 @@
     "pid": "0x6464",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D1"
+  },
+  "matrix_pins": {
+    "cols": ["B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "F4", "F5", "F6"],
+    "rows": ["F7", "B1", "D4", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json
index dca1387203..979cc9e10c 100644
--- a/keyboards/tau4/info.json
+++ b/keyboards/tau4/info.json
@@ -56,10 +56,12 @@
         },
         "led_count": 10,
         "max_brightness": 128,
-        "pin": "B2",
         "saturation_steps": 16,
         "sleep": true
     },
+    "ws2812": {
+        "pin": "B2"
+    },
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
diff --git a/keyboards/tau4/tau4.c b/keyboards/tau4/tau4.c
index aa508aae2c..c93d73f2b4 100644
--- a/keyboards/tau4/tau4.c
+++ b/keyboards/tau4/tau4.c
@@ -17,20 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
-#endif
-
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
     if (!oled_task_user()) { return false; }
diff --git a/keyboards/teahouse/ayleen/config.h b/keyboards/teahouse/ayleen/config.h
index e172b87ae2..cb3b80349d 100644
--- a/keyboards/teahouse/ayleen/config.h
+++ b/keyboards/teahouse/ayleen/config.h
@@ -3,10 +3,6 @@
 
 #pragma once
 
-
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 2
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -15,7 +11,6 @@
     #define RGBLIGHT_LAYERS 2
     #define RGBLIGHT_LAYER_BLINK
     #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json
index 03ce63beaf..db4d36088c 100644
--- a/keyboards/teahouse/ayleen/info.json
+++ b/keyboards/teahouse/ayleen/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Ayleen",
-    "manufacturer": "Teahouse"
+    "manufacturer": "Teahouse",
     "url": "https://keyspensory.store/products/fcfs-ayleen-tkl-by-teahouse-extra-parts?_pos=1&_sid=e33d5f339&_ss=r",
     "maintainer": "Freather",
     "processor": "atmega32u4",
@@ -29,6 +29,9 @@
         "B6"
       ]
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "usb":{
       "vid":      "0x5448",
       "pid":      "0x4141",
diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h
index fc5c288264..6c72720ab2 100644
--- a/keyboards/team0110/p1800fl/config.h
+++ b/keyboards/team0110/p1800fl/config.h
@@ -17,26 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, B5, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, E6, B0, B1, B2, B3, D0, D1, D2}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Lighting */
-#define RGB_DI_PIN C6
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -53,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255
 #    define RGBLIGHT_SLEEP
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/team0110/p1800fl/info.json b/keyboards/team0110/p1800fl/info.json
index 118299101b..2dba562fd3 100644
--- a/keyboards/team0110/p1800fl/info.json
+++ b/keyboards/team0110/p1800fl/info.json
@@ -8,11 +8,19 @@
         "pid": "0x3EAE",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2"],
+        "rows": ["B6", "B5", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "C6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/technika/config.h b/keyboards/technika/config.h
index d1666ec15b..58a533406e 100644
--- a/keyboards/technika/config.h
+++ b/keyboards/technika/config.h
@@ -17,16 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { A10, A9 , A8 , B14, B12, B2 , B1 , B0 , A7 , A6 , A3 , B9 , B8 , B7}
-#define MATRIX_ROW_PINS { B11, B10, A5 , A4 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 16
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/technika/info.json b/keyboards/technika/info.json
index b20ebe6c7c..cfe8492c45 100644
--- a/keyboards/technika/info.json
+++ b/keyboards/technika/info.json
@@ -8,11 +8,19 @@
         "pid": "0x6049",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B14", "B12", "B2", "B1", "B0", "A7", "A6", "A3", "B9", "B8", "B7"],
+        "rows": ["B11", "B10", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B3",
         "num_lock": "A15",
         "scroll_lock": "B4"
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/teleport/native/ansi/ansi.c b/keyboards/teleport/native/ansi/ansi.c
index 8b243d8a07..9c4ea99f40 100644
--- a/keyboards/teleport/native/ansi/ansi.c
+++ b/keyboards/teleport/native/ansi/ansi.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/teleport/native/info.json b/keyboards/teleport/native/info.json
index 16c0603e43..1e1d591512 100644
--- a/keyboards/teleport/native/info.json
+++ b/keyboards/teleport/native/info.json
@@ -10,6 +10,9 @@
         "vid": "0x7470",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
     "features": {
         "bootmagic": true,
         "command": false,
diff --git a/keyboards/teleport/native/iso/iso.c b/keyboards/teleport/native/iso/iso.c
index f3bfbfb3a1..5acbffe8f9 100644
--- a/keyboards/teleport/native/iso/iso.c
+++ b/keyboards/teleport/native/iso/iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/teleport/native/rules.mk b/keyboards/teleport/native/rules.mk
index f60d3a26fb..31c83c8eed 100644
--- a/keyboards/teleport/native/rules.mk
+++ b/keyboards/teleport/native/rules.mk
@@ -1,5 +1,4 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 RGB_MATRIX_CUSTOM_KB = yes
 
 DEFAULT_FOLDER = teleport/native/iso
diff --git a/keyboards/teleport/numpad/config.h b/keyboards/teleport/numpad/config.h
deleted file mode 100644
index 1641098027..0000000000
--- a/keyboards/teleport/numpad/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Moritz Plattner
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { D7, D4, D6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F5, F7, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/teleport/numpad/info.json b/keyboards/teleport/numpad/info.json
index a600c0f44b..50ab7d0d70 100644
--- a/keyboards/teleport/numpad/info.json
+++ b/keyboards/teleport/numpad/info.json
@@ -7,29 +7,38 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F6", "F5", "F7", "F4"],
+    "rows": ["D7", "D4", "D6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["numpad_5x4"],
   "layouts": {
     "LAYOUT_numpad_5x4": {
       "layout": [
-        {"label":"Num Lock", "x":0, "y":0}, 
-        {"label":"/", "x":1, "y":0}, 
-        {"label":"*", "x":2, "y":0}, 
-        {"label":"-", "x":3, "y":0}, 
-        {"label":"7", "x":0, "y":1}, 
-        {"label":"8", "x":1, "y":1}, 
-        {"label":"9", "x":2, "y":1}, 
-        {"label":"4", "x":0, "y":2}, 
-        {"label":"5", "x":1, "y":2}, 
-        {"label":"6", "x":2, "y":2}, 
-        {"label":"+", "x":3, "y":1, "h":2}, 
-        {"label":"1", "x":0, "y":3}, 
-        {"label":"2", "x":1, "y":3}, 
-        {"label":"3", "x":2, "y":3}, 
-        {"label":"0", "x":0, "y":4, "w":2}, 
-        {"label":",", "x":2, "y":4}, 
-        {"label":"Enter", "x":3, "y":3, "h":2}
+        {"matrix": [0, 0], "x": 0, "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": [4, 2], "x": 3, "y": 3, "h": 2}
       ]
     }
   }
diff --git a/keyboards/teleport/numpad/numpad.c b/keyboards/teleport/numpad/numpad.c
deleted file mode 100644
index 375e240589..0000000000
--- a/keyboards/teleport/numpad/numpad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "numpad.h"
diff --git a/keyboards/teleport/numpad/numpad.h b/keyboards/teleport/numpad/numpad.h
deleted file mode 100644
index 9c7413cd8e..0000000000
--- a/keyboards/teleport/numpad/numpad.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_5x4(    \
-      K00,  K01,  K02,  K03,  \
-      K10,  K11,  K12,        \
-      K20,  K21,  K22,  K13,  \
-      K30,  K31,  K32,        \
-         K40,     K41,  K42   \
-) { \
-    { K00,  K01,  K02,  K03   }, \
-    { K10,  K11,  K12,  K13   }, \
-    { K20,  K21,  K22,  KC_NO }, \
-    { K30,  K31,  K32,  KC_NO }, \
-    { K40,  K41,  K42,  KC_NO }, \
-}
diff --git a/keyboards/telophase/info.json b/keyboards/telophase/info.json
index 8e1a2c62f7..2dd6c5dc78 100644
--- a/keyboards/telophase/info.json
+++ b/keyboards/telophase/info.json
@@ -11,64 +11,63 @@
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x12"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
 
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
 
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/telophase/telophase.h b/keyboards/telophase/telophase.h
index 8ca6744176..112ba79504 100644
--- a/keyboards/telophase/telophase.h
+++ b/keyboards/telophase/telophase.h
@@ -34,20 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define set_led_magenta red_led_on;  grn_led_off; blu_led_on
 #define set_led_cyan    red_led_off; grn_led_on;  blu_led_on
 #define set_led_white   red_led_on;  grn_led_on;  blu_led_on
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05,      k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15,      k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25,      k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35,      k36, k37, k38, k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05,      k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15,      k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25,      k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35,      k36, k37, k38, k39, k3A, k3B } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
diff --git a/keyboards/tempo_turtle/bradpad/bradpad.c b/keyboards/tempo_turtle/bradpad/bradpad.c
deleted file mode 100644
index 073f37a4cf..0000000000
--- a/keyboards/tempo_turtle/bradpad/bradpad.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-Copyright 2021 v3ritas <v3ritas@tempoturtle.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "bradpad.h"
diff --git a/keyboards/tempo_turtle/bradpad/bradpad.h b/keyboards/tempo_turtle/bradpad/bradpad.h
deleted file mode 100644
index 69955a5da6..0000000000
--- a/keyboards/tempo_turtle/bradpad/bradpad.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 v3ritas <v3ritas@tempoturtle.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-         k41, k42\
-) { \
-    { k00, k01, k02, k03, }, \
-    { k10, k11, k12, k13, }, \
-    { k20, k21, k22, k23, }, \
-    { k30, k31, k32, k33, }, \
-    { KC_NO, k41, k42, KC_NO } \
-}
-// clang-format on
diff --git a/keyboards/tempo_turtle/bradpad/info.json b/keyboards/tempo_turtle/bradpad/info.json
index 834e0c46c4..4237f63ac9 100644
--- a/keyboards/tempo_turtle/bradpad/info.json
+++ b/keyboards/tempo_turtle/bradpad/info.json
@@ -18,11 +18,28 @@
     "layouts": {
         "LAYOUT": {
             "layout":[
-                {"x": 0, "y":0},{"x": 1, "y":0},{"x": 2, "y":0},{"x": 3, "y":0},
-                {"x": 0, "y":1},{"x": 1, "y":1},{"x": 2, "y":1},{"x": 3, "y":1},
-                {"x": 0, "y":2},{"x": 1, "y":2},{"x": 2, "y":2},{"x": 3, "y":2},
-                {"x": 0, "y":3},{"x": 1, "y":3},{"x": 2, "y":3},{"x": 3, "y":3},
-                {"x": 0, "y":4, "w":2},{"x": 2, "y":4,"w":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4, "w": 2}
             ]
         }
     }
diff --git a/keyboards/tender/macrowo_pad/config.h b/keyboards/tender/macrowo_pad/config.h
deleted file mode 100644
index bd578550fd..0000000000
--- a/keyboards/tender/macrowo_pad/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, D7 }
-#define MATRIX_COL_PINS { E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tender/macrowo_pad/info.json b/keyboards/tender/macrowo_pad/info.json
index 5d9184a87e..869d4f16a1 100644
--- a/keyboards/tender/macrowo_pad/info.json
+++ b/keyboards/tender/macrowo_pad/info.json
@@ -8,11 +8,41 @@
         "pid": "0xE936",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B5", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"0,1", "x":1, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,0", "x":0, "y":0.5}, {"label":"0,2", "x":2, "y":0.5}, {"label":"0,7", "x":8.5, "y":0.5}, {"label":"0,9", "x":10.5, "y":0.5}, {"label":"0,4", "x":3.75, "y":1}, {"label":"0,5", "x":6.75, "y":1}, {"label":"1,4", "x":5.25, "y":1.25}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,2", "x":2, "y":1.5}, {"label":"1,7", "x":8.5, "y":1.5}, {"label":"1,9", "x":10.5, "y":1.5}, {"label":"1,1", "x":1, "y":2}, {"label":"1,3", "x":4.25, "y":2}, {"label":"1,5", "x":6.25, "y":2}, {"label":"1,8", "x":9.5, "y":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 7.25, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 0, "y": 0.5},
+                {"matrix": [0, 5], "x": 2, "y": 0.5},
+                {"matrix": [0, 6], "x": 8.5, "y": 0.5},
+                {"matrix": [0, 7], "x": 10.5, "y": 0.5},
+
+                {"matrix": [0, 8], "x": 3.75, "y": 1},
+                {"matrix": [0, 9], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 0], "x": 5.25, "y": 1.25},
+
+                {"matrix": [1, 1], "x": 0, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 10.5, "y": 1.5},
+
+                {"matrix": [1, 5], "x": 1, "y": 2},
+                {"matrix": [1, 7], "x": 4.25, "y": 2},
+                {"matrix": [1, 8], "x": 6.25, "y": 2},
+                {"matrix": [1, 9], "x": 9.5, "y": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/tender/macrowo_pad/macrowo_pad.c b/keyboards/tender/macrowo_pad/macrowo_pad.c
deleted file mode 100644
index 4dd6441e58..0000000000
--- a/keyboards/tender/macrowo_pad/macrowo_pad.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "macrowo_pad.h"
- 
\ No newline at end of file
diff --git a/keyboards/tender/macrowo_pad/macrowo_pad.h b/keyboards/tender/macrowo_pad/macrowo_pad.h
deleted file mode 100644
index b095c037a7..0000000000
--- a/keyboards/tender/macrowo_pad/macrowo_pad.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,  \
-	K10,   K11,   K12,   K13,   K14,   K15,          K17,   K18,   K19   \
-) \
-{ \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09  }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   KC_NO, K17,   K18,   K19  }  \
-}
diff --git a/keyboards/tenki/config.h b/keyboards/tenki/config.h
index fef051fb71..2b7b6435ec 100644
--- a/keyboards/tenki/config.h
+++ b/keyboards/tenki/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, B4, F6, B6, B2 }
-#define MATRIX_COL_PINS { F4, F5, D4, D0 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -15,7 +8,6 @@
 
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tenki/info.json b/keyboards/tenki/info.json
index 560adac6b6..2979362a61 100644
--- a/keyboards/tenki/info.json
+++ b/keyboards/tenki/info.json
@@ -8,12 +8,45 @@
         "pid": "0x5445",
         "device_version": "10.0.1"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "D4", "D0"],
+        "rows": ["B1", "B4", "F6", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_5x4"],
     "layouts": {
         "LAYOUT_ortho_5x4": { 
-			"layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Bspc", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"=", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"PrtScr", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/tenki/tenki.c b/keyboards/tenki/tenki.c
deleted file mode 100644
index 318f8d4757..0000000000
--- a/keyboards/tenki/tenki.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tenki.h"
diff --git a/keyboards/tenki/tenki.h b/keyboards/tenki/tenki.h
deleted file mode 100644
index 29ec6303ab..0000000000
--- a/keyboards/tenki/tenki.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4( \
-    K00,   K01,   K02,   K03, \
-    K10,   K11,   K12,   K13, \
-    K20,   K21,   K22,   K23, \
-    K30,   K31,   K32,   K33, \
-    K40,   K41,   K42,   K43  \
-) { \
-	{ K00,   K01,   K02,   K03}, \
-	{ K10,   K11,   K12,   K13}, \
-	{ K20,   K21,   K22,   K23}, \
-	{ K30,   K31,   K32,   K33}, \
-	{ K40,   K41,   K42,   K43} \
-}
-
diff --git a/keyboards/terrazzo/config.h b/keyboards/terrazzo/config.h
index 6c0cbb80b9..0c7a09033d 100644
--- a/keyboards/terrazzo/config.h
+++ b/keyboards/terrazzo/config.h
@@ -15,16 +15,6 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-
-// SWAP FOR PRO MICRO
-// #define MATRIX_ROW_PINS { D2, D7, E6, B4, B5, B6, B2, B3 }
-#define MATRIX_ROW_PINS { D2, D7, E6, B4, B5, B6, B2, B3, F0 }
-#define MATRIX_COL_PINS { D3, F4, F5, F6, F7, B1 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef LED_MATRIX_ENABLE
 
 #define LED_DRIVER_ADDR_1 0x74
diff --git a/keyboards/terrazzo/info.json b/keyboards/terrazzo/info.json
index fb59374d1d..f493960049 100644
--- a/keyboards/terrazzo/info.json
+++ b/keyboards/terrazzo/info.json
@@ -8,6 +8,11 @@
         "pid": "0x545A",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D3", "F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D2", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C6", "pin_b": "D4", "resolution": 2},
@@ -15,39 +20,229 @@
             {"pin_a": "C7", "pin_b": "F1", "resolution": 2}
         ]
     },
+    "led_matrix": {
+        "driver": "IS31FL3731"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"Q", "x":3.5, "y":0}, {"label":"W", "x":4.5, "y":0}, {"label":"E", "x":5.5, "y":0}, {"label":"R", "x":6.5, "y":0}, {"label":"T", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"Back", "x":13.5, "y":0},
-                {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Control", "x":2.5, "y":1, "w":1.25}, {"label":"A", "x":3.75, "y":1}, {"label":"S", "x":4.75, "y":1}, {"label":"D", "x":5.75, "y":1}, {"label":"F", "x":6.75, "y":1}, {"label":"G", "x":7.75, "y":1}, {"label":"H", "x":8.75, "y":1}, {"label":"J", "x":9.75, "y":1}, {"label":"K", "x":10.75, "y":1}, {"label":"L", "x":11.75, "y":1}, {"label":"Enter", "x":12.75, "y":1, "w":1.75},
-                {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2, "w":1.75}, {"label":"Z", "x":4.25, "y":2}, {"label":"X", "x":5.25, "y":2}, {"label":"C", "x":6.25, "y":2}, {"label":"V", "x":7.25, "y":2}, {"label":"B", "x":8.25, "y":2}, {"label":"N", "x":9.25, "y":2}, {"label":"M", "x":10.25, "y":2}, {"label":"<", "x":11.25, "y":2}, {"label":">", "x":12.25, "y":2}, {"label":"Shift", "x":13.25, "y":2, "w":1.25},
-                {"label":"TZ Off", "x":0, "y":3}, {"label":"Win", "x":3.5, "y":3}, {"label":"Alt", "x":4.5, "y":3, "w":1.5}, {"label":"Space", "x":6, "y":3, "w":2.25}, {"label":"Space", "x":8.25, "y":3, "w":2.75}, {"label":"Fn", "x":11, "y":3, "w":1.5}, {"label":"Fn1", "x":12.5, "y":3}
+                {"matrix": [0, 0], "x": 0, "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": [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.5, "y": 0},
+                {"matrix": [7, 4], "x": 11.5, "y": 0},
+                {"matrix": [7, 5], "x": 12.5, "y": 0},
+                {"matrix": [6, 5], "x": 13.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 3.75, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [6, 0], "x": 7.75, "y": 1},
+                {"matrix": [6, 1], "x": 8.75, "y": 1},
+                {"matrix": [6, 2], "x": 9.75, "y": 1},
+                {"matrix": [6, 3], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [5, 5], "x": 12.75, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 2.5, "y": 2, "w": 1.75},
+                {"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": [5, 0], "x": 8.25, "y": 2},
+                {"matrix": [5, 1], "x": 9.25, "y": 2},
+                {"matrix": [5, 2], "x": 10.25, "y": 2},
+                {"matrix": [5, 3], "x": 11.25, "y": 2},
+                {"matrix": [5, 4], "x": 12.25, "y": 2},
+                {"matrix": [4, 5], "x": 13.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [4, 0], "x": 8.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 2], "x": 11, "y": 3, "w": 1.5},
+                {"matrix": [4, 3], "x": 12.5, "y": 3}
             ]
         },
         "LAYOUT_ortho": {
             "layout": [
-                {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"Q", "x":3.5, "y":0}, {"label":"W", "x":4.5, "y":0}, {"label":"E", "x":5.5, "y":0}, {"label":"R", "x":6.5, "y":0}, {"label":"T", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"Back", "x":13.5, "y":0},
-                {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Ctrl", "x":2.5, "y":1}, {"label":"A", "x":3.5, "y":1}, {"label":"S", "x":4.5, "y":1}, {"label":"D", "x":5.5, "y":1}, {"label":"F", "x":6.5, "y":1}, {"label":"G", "x":7.5, "y":1}, {"label":"H", "x":8.5, "y":1}, {"label":"J", "x":9.5, "y":1}, {"label":"K", "x":10.5, "y":1}, {"label":"L", "x":11.5, "y":1}, {"label":";", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1},
-                {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"/", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2},
-                {"label":"TZ Off", "x":0, "y":3}, {"label":"Win", "x":3.5, "y":3}, {"label":"Alt", "x":4.5, "y":3}, {"label":"Lower", "x":5.5, "y":3}, {"label":"Space", "x":6.5, "y":3, "w":2}, {"label":"Space", "x":8.5, "y":3, "w":2}, {"label":"Raise", "x":10.5, "y":3}, {"label":"Nav", "x":11.5, "y":3}, {"label":"Fn", "x":12.5, "y":3}
+                {"matrix": [0, 0], "x": 0, "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": [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.5, "y": 0},
+                {"matrix": [7, 4], "x": 11.5, "y": 0},
+                {"matrix": [7, 5], "x": 12.5, "y": 0},
+                {"matrix": [6, 5], "x": 13.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 6.5, "y": 1},
+                {"matrix": [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": [5, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 2.5, "y": 2},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [5, 0], "x": 7.5, "y": 2},
+                {"matrix": [5, 1], "x": 8.5, "y": 2},
+                {"matrix": [5, 2], "x": 9.5, "y": 2},
+                {"matrix": [5, 3], "x": 10.5, "y": 2},
+                {"matrix": [4, 3], "x": 11.5, "y": 2},
+                {"matrix": [4, 4], "x": 12.5, "y": 2},
+                {"matrix": [4, 5], "x": 13.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3, "w": 2},
+                {"matrix": [3, 5], "x": 8.5, "y": 3, "w": 2},
+                {"matrix": [4, 0], "x": 10.5, "y": 3},
+                {"matrix": [4, 1], "x": 11.5, "y": 3},
+                {"matrix": [4, 2], "x": 12.5, "y": 3}
             ]
         },
         "LAYOUT_ortho_mit": {
             "layout": [
-                {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"Q", "x":3.5, "y":0}, {"label":"W", "x":4.5, "y":0}, {"label":"E", "x":5.5, "y":0}, {"label":"R", "x":6.5, "y":0}, {"label":"T", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"Back", "x":13.5, "y":0},
-                {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Ctrl", "x":2.5, "y":1}, {"label":"A", "x":3.5, "y":1}, {"label":"S", "x":4.5, "y":1}, {"label":"D", "x":5.5, "y":1}, {"label":"F", "x":6.5, "y":1}, {"label":"G", "x":7.5, "y":1}, {"label":"H", "x":8.5, "y":1}, {"label":"J", "x":9.5, "y":1}, {"label":"K", "x":10.5, "y":1}, {"label":"L", "x":11.5, "y":1}, {"label":";", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1},
-                {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"/", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2},
-                {"label":"TZ Off", "x":0, "y":3}, {"label":"Tab", "x":3.5, "y":3}, {"label":"Win", "x":4.5, "y":3}, {"label":"Alt", "x":5.5, "y":3}, {"label":"Lower", "x":6.5, "y":3}, {"label":"Space", "x":7.5, "y":3, "w":2}, {"label":"Raise", "x":9.5, "y":3}, {"label":"Nav", "x":10.5, "y":3}, {"label":"Fn", "x":11.5, "y":3}, {"label":"Del", "x":12.5, "y":3}
+                {"matrix": [0, 0], "x": 0, "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": [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.5, "y": 0},
+                {"matrix": [7, 4], "x": 11.5, "y": 0},
+                {"matrix": [7, 5], "x": 12.5, "y": 0},
+                {"matrix": [6, 5], "x": 13.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 6.5, "y": 1},
+                {"matrix": [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": [5, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 2.5, "y": 2},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [5, 0], "x": 7.5, "y": 2},
+                {"matrix": [5, 1], "x": 8.5, "y": 2},
+                {"matrix": [5, 2], "x": 9.5, "y": 2},
+                {"matrix": [5, 3], "x": 10.5, "y": 2},
+                {"matrix": [4, 3], "x": 11.5, "y": 2},
+                {"matrix": [4, 4], "x": 12.5, "y": 2},
+                {"matrix": [4, 5], "x": 13.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [8, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3, "w": 2},
+                {"matrix": [8, 5], "x": 9.5, "y": 3},
+                {"matrix": [4, 0], "x": 10.5, "y": 3},
+                {"matrix": [4, 1], "x": 11.5, "y": 3},
+                {"matrix": [4, 2], "x": 12.5, "y": 3}
             ]
         },
         "LAYOUT_ortho_all": {
             "layout": [
-                {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"Q", "x":3.5, "y":0}, {"label":"W", "x":4.5, "y":0}, {"label":"E", "x":5.5, "y":0}, {"label":"R", "x":6.5, "y":0}, {"label":"T", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"Back", "x":13.5, "y":0},
-                {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Ctrl", "x":2.5, "y":1}, {"label":"A", "x":3.5, "y":1}, {"label":"S", "x":4.5, "y":1}, {"label":"D", "x":5.5, "y":1}, {"label":"F", "x":6.5, "y":1}, {"label":"G", "x":7.5, "y":1}, {"label":"H", "x":8.5, "y":1}, {"label":"J", "x":9.5, "y":1}, {"label":"K", "x":10.5, "y":1}, {"label":"L", "x":11.5, "y":1}, {"label":";", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1},
-                {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"/", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2},
-                {"label":"TZ Off", "x":0, "y":3}, {"label":"Tab", "x":3.5, "y":3}, {"label":"Win", "x":4.5, "y":3}, {"label":"Alt", "x":5.5, "y":3}, {"label":"Lower", "x":6.5, "y":3}, {"label":"Space", "x":7.5, "y":3}, {"label":"Space", "x":8.5, "y":3}, {"label":"Raise", "x":9.5, "y":3}, {"label":"Nav", "x":10.5, "y":3}, {"label":"Fn", "x":11.5, "y":3}, {"label":"Del", "x":12.5, "y":3}
+                {"matrix": [0, 0], "x": 0, "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": [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.5, "y": 0},
+                {"matrix": [7, 4], "x": 11.5, "y": 0},
+                {"matrix": [7, 5], "x": 12.5, "y": 0},
+                {"matrix": [6, 5], "x": 13.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 6.5, "y": 1},
+                {"matrix": [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": [5, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 2.5, "y": 2},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [5, 0], "x": 7.5, "y": 2},
+                {"matrix": [5, 1], "x": 8.5, "y": 2},
+                {"matrix": [5, 2], "x": 9.5, "y": 2},
+                {"matrix": [5, 3], "x": 10.5, "y": 2},
+                {"matrix": [4, 3], "x": 11.5, "y": 2},
+                {"matrix": [4, 4], "x": 12.5, "y": 2},
+                {"matrix": [4, 5], "x": 13.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [8, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 4], "x": 7.5, "y": 3},
+                {"matrix": [3, 5], "x": 8.5, "y": 3},
+                {"matrix": [8, 5], "x": 9.5, "y": 3},
+                {"matrix": [4, 0], "x": 10.5, "y": 3},
+                {"matrix": [4, 1], "x": 11.5, "y": 3},
+                {"matrix": [4, 2], "x": 12.5, "y": 3}
             ]
         }
     }
diff --git a/keyboards/terrazzo/rules.mk b/keyboards/terrazzo/rules.mk
index ae42fe8a2f..e996c29fbc 100644
--- a/keyboards/terrazzo/rules.mk
+++ b/keyboards/terrazzo/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = IS31FL3731
 ENCODER_ENABLE = yes
 WPM_ENABLE = yes
diff --git a/keyboards/terrazzo/terrazzo.h b/keyboards/terrazzo/terrazzo.h
index 85b35e3050..c27a372088 100644
--- a/keyboards/terrazzo/terrazzo.h
+++ b/keyboards/terrazzo/terrazzo.h
@@ -18,82 +18,6 @@
 
 #include "quantum.h"
 
-/* Default staggered layout
-   Bottom row: 1u 1.5u 2.25u 2.75u 1.5u 1u */
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \
-    K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K55, \
-    K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K54, K45, \
-    K30, K31, K32, K33, K40, K42, K43 \
-){ \
-    { K00, K01, K02, K03, K04, K05,},    \
-    { K10, K11, K12, K13, K14, K15,},    \
-    { K20, K21, K22, K23, K24, K25,},    \
-    { K30, K31, K32, K33, KC_NO, KC_NO,},\
-    { K40, KC_NO, K42, K43, KC_NO, K45,},\
-    { K50, K51, K52, K53, K54, K55,},    \
-    { K60, K61, K62, K63, K64, K65,},    \
-    { K70, K71, K72, K73, K74, K75, }    \
-}
-
-/* Default ortho layout
-   Bottom row: 1u 1u 1u 2u 2u 1u 1u 1u */
-#define LAYOUT_ortho( \
-    K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \
-    K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K54, K55, \
-    K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K43, K44, K45, \
-    K30,      K31, K32, K33, K34, K35, K40, K41, K42  \
-){ \
-    { K00, K01, K02, K03, K04, K05,},    \
-    { K10, K11, K12, K13, K14, K15,},    \
-    { K20, K21, K22, K23, K24, K25,},    \
-    { K30, K31, K32, K33, K34, K35,},    \
-    { K40, K41, K42, K43, K44, K45,},    \
-    { K50, K51, K52, K53, K54, K55,},    \
-    { K60, K61, K62, K63, K64, K65,},    \
-    { K70, K71, K72, K73, K74, K75, },    \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, } \
-}
-
-/* MIT ortho layout
-   Bottom row: 1u 1u 1u 1u 2u 1u 1u 1u 1u */
-#define LAYOUT_ortho_mit( \
-    K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \
-    K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K54, K55, \
-    K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K43, K44, K45, \
-    K30,      K31, K32, K33, K84,   K35,    K85, K40, K41, K42  \
-){ \
-    { K00, K01, K02, K03, K04, K05,},    \
-    { K10, K11, K12, K13, K14, K15,},    \
-    { K20, K21, K22, K23, K24, K25,},    \
-    { K30, K31, K32, K33, KC_NO, K35,},    \
-    { K40, K41, K42, K43, K44, K45,},    \
-    { K50, K51, K52, K53, K54, K55,},    \
-    { K60, K61, K62, K63, K64, K65,},    \
-    { K70, K71, K72, K73, K74, K75, },    \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K84, K85, } \
-}
-
-/* All 1u ortho layout
-   Bottom row: 1u 1u 1u 1u 1u 1u 1u 1u 1u 1u */
-#define LAYOUT_ortho_all( \
-    K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \
-    K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K54, K55, \
-    K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K43, K44, K45, \
-    K30,      K31, K32, K33, K84, K34, K35, K85, K40, K41, K42  \
-){ \
-    { K00, K01, K02, K03, K04, K05,},    \
-    { K10, K11, K12, K13, K14, K15,},    \
-    { K20, K21, K22, K23, K24, K25,},    \
-    { K30, K31, K32, K33, K34, K35,},    \
-    { K40, K41, K42, K43, K44, K45,},    \
-    { K50, K51, K52, K53, K54, K55,},    \
-    { K60, K61, K62, K63, K64, K65,},    \
-    { K70, K71, K72, K73, K74, K75, },    \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K84, K85, } \
-}
-
-
 enum terrazzo_matrix_effects {
     TERRAZZO_NONE = 0,
 // --------------------------------------
diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h
index 5cb9e23c57..3f0378e73c 100755
--- a/keyboards/tetris/config.h
+++ b/keyboards/tetris/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, E6 }
-#define MATRIX_COL_PINS { D7, B4, B6, C6, C7, F6, F7, D4, D2, D3, D5, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -20,7 +12,6 @@
   #define NO_MUSIC_MODE
 #endif
 
-#define RGB_DI_PIN F5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tetris/info.json b/keyboards/tetris/info.json
index 382c4b2861..058226ba3f 100644
--- a/keyboards/tetris/info.json
+++ b/keyboards/tetris/info.json
@@ -8,6 +8,14 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F5"
+  },
+  "matrix_pins": {
+    "cols": ["D7", "B4", "B6", "C6", "C7", "F6", "F7", "D4", "D2", "D3", "D5", "D6"],
+    "rows": ["B3", "B2", "B1", "B0", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "D1", "pin_b": "D0"},
diff --git a/keyboards/tetris/tetris.c b/keyboards/tetris/tetris.c
deleted file mode 100755
index f78de2f7be..0000000000
--- a/keyboards/tetris/tetris.c
+++ /dev/null
@@ -1 +0,0 @@
-#include QMK_KEYBOARD_H
diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h
index 2002014617..4cc46acbbb 100644
--- a/keyboards/tg4x/config.h
+++ b/keyboards/tg4x/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
- //                        0   1   2   3   4   5   6   7
-#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4, D0, D1 }
-#define MATRIX_COL_PINS { D3, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 6
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -53,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tg4x/info.json b/keyboards/tg4x/info.json
index 775367c426..4250d9b8dc 100644
--- a/keyboards/tg4x/info.json
+++ b/keyboards/tg4x/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0458",
         "device_version": "0.2.1"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/tg4x/tg4x.c b/keyboards/tg4x/tg4x.c
deleted file mode 100644
index fa7a970d5e..0000000000
--- a/keyboards/tg4x/tg4x.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "tg4x.h"
diff --git a/keyboards/tgr/910/910.c b/keyboards/tgr/910/910.c
deleted file mode 100644
index 8e0c785385..0000000000
--- a/keyboards/tgr/910/910.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 halfenergized
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "910.h"
diff --git a/keyboards/tgr/910/config.h b/keyboards/tgr/910/config.h
index fdc08d244c..2021d94bb4 100644
--- a/keyboards/tgr/910/config.h
+++ b/keyboards/tgr/910/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 19
 
-//                         0   1   2   3   4   5   6   7   8   9   A   B   C   D
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6 }
-#define MATRIX_COL_PINS { D7, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A1, A0 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tgr/910/info.json b/keyboards/tgr/910/info.json
index 65aabe6ca8..1cd2dc51c2 100644
--- a/keyboards/tgr/910/info.json
+++ b/keyboards/tgr/910/info.json
@@ -8,9 +8,17 @@
         "pid": "0x9100",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A1", "A0"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1",
         "num_lock": "D0",
diff --git a/keyboards/tgr/910/rules.mk b/keyboards/tgr/910/rules.mk
index 9a00928ea8..51df0b642e 100644
--- a/keyboards/tgr/910/rules.mk
+++ b/keyboards/tgr/910/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/tgr/910ce/910ce.c b/keyboards/tgr/910ce/910ce.c
deleted file mode 100644
index 7538158c89..0000000000
--- a/keyboards/tgr/910ce/910ce.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "910ce.h"
diff --git a/keyboards/tgr/910ce/910ce.h b/keyboards/tgr/910ce/910ce.h
deleted file mode 100644
index 2d8f113e21..0000000000
--- a/keyboards/tgr/910ce/910ce.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2020 mechmerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k5e,  \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,       \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e,       \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e,       \
-    k40, k41, k42, k44, k45, k47, k48, k49, k4c, k4d, k4e                            \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e },  \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e },  \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e },  \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e },  \
-    { k40, k41, k42, ___, k44, k45, ___, k47, k48, k49, ___, ___, k4c, k4d, k4e },  \
-    { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5e },  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k5e,  \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k2e,       \
-    k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e,       \
-    k40, k41, k42, k45, k48, k49, k4c, k4d, k4e                                 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, ___ },  \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e },  \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, k2e },  \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e },  \
-    { k40, k41, k42, ___, ___, k45, ___, ___, k48, k49, ___, ___, k4c, k4d, k4e },  \
-    { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5e },  \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k5e,  \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e,       \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e,  \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e,  \
-    k40, k41, k42, k45, k48, k49, k4c, k4d, k4e                                 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, ___ },  \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e },  \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e },  \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e },  \
-    { k40, k41, k42, ___, ___, k45, ___, ___, k48, k49, ___, ___, k4c, k4d, k4e },  \
-    { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, k5e },  \
-}
-
-
diff --git a/keyboards/tgr/910ce/config.h b/keyboards/tgr/910ce/config.h
index 5e5d28d5af..44fff35e61 100644
--- a/keyboards/tgr/910ce/config.h
+++ b/keyboards/tgr/910ce/config.h
@@ -20,12 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 18
 
-//                         0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
-#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5, B6 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tgr/910ce/info.json b/keyboards/tgr/910ce/info.json
index 2c5fcb40d9..626cc682ae 100644
--- a/keyboards/tgr/910ce/info.json
+++ b/keyboards/tgr/910ce/info.json
@@ -8,9 +8,17 @@
         "pid": "0x910C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B1", "B2", "B3", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1"
     },
@@ -19,15 +27,237 @@
     "community_layouts": ["65_ansi_blocker", "65_iso_blocker"],
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [5, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         },
 
         "LAYOUT_65_ansi_blocker": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [5, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         },
 
         "LAYOUT_65_iso_blocker": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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": [5, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/tgr/910ce/rules.mk b/keyboards/tgr/910ce/rules.mk
index 78a6bee271..7dd71d89ed 100644
--- a/keyboards/tgr/910ce/rules.mk
+++ b/keyboards/tgr/910ce/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
diff --git a/keyboards/tgr/alice/alice.c b/keyboards/tgr/alice/alice.c
deleted file mode 100644
index 39aed2cf56..0000000000
--- a/keyboards/tgr/alice/alice.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "alice.h"
diff --git a/keyboards/tgr/alice/alice.h b/keyboards/tgr/alice/alice.h
deleted file mode 100644
index 8525fd85f7..0000000000
--- a/keyboards/tgr/alice/alice.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2019 Felipe Coury <felipe.coury@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* Layout
- * ┌───� ┌───┬───┬───┬───┬───┬───┬───�         ┌───┬───┬───┬───┬───┬───┬───┬───�
- * │50 │ │00 │01 │02 │03 │04 │05 │06 │         │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │51 │ │10   │11 │12 │13 │14 │15 │         │16 │17 │18 │19 │1A │1B │1C │1D   │
- * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴�        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │52 │ │20    │21 │22 │23 │24 │25 │         │26 │27 │28 │29 │2A │2B │2C      │
- * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─�     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- *       │30      │31 │32 │33 │34 │35 │     │36 │37 │38 │39 │4A │4B │4C    │4D │
- *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─�   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
- *       │40   │     │41   │42     │43  │   │46        │47   │           │48   │
- *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
- */
-#define LAYOUT_alice_split_bs( \
-  K50,   K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K51,   K10, K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-  K52,   K20, K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A, K2B,      K2C,      \
-         K30, K31, K32, K33, K34, K35,      K36, K37, K38, K39, K4A, K4B, K4C, K4D,      \
-         K40,      K41,      K42, K43,           K46,      K47,                K48       \
-) \
-{ \
-  { K00  , K01  , K02  , K03  , K04  , K05  , K06  , K07  , K08  , K09  , K0A  , K0B  , K0C  , K0D  , K0E   }, \
-  { K10  , K11  , K12  , K13  , K14  , K15  , K16  , K17  , K18  , K19  , K1A  , K1B  , K1C  , K1D  , KC_NO }, \
-  { K20  , K21  , K22  , K23  , K24  , K25  , K26  , K27  , K28  , K29  , K2A  , K2B  , K2C  , KC_NO, KC_NO }, \
-  { K30  , K31  , K32  , K33  , K34  , K35  , K36  , K37  , K38  , K39  , K4A  , K4B  , K4C  , K4D  , KC_NO }, \
-  { K40  , K41  , K42  , K43  , KC_NO, KC_NO, K46  , K47  , K48  , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-  { K50  , K51  , K52  , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT LAYOUT_alice_split_bs
diff --git a/keyboards/tgr/alice/config.h b/keyboards/tgr/alice/config.h
index d2e2f41a62..cf8aa33045 100644
--- a/keyboards/tgr/alice/config.h
+++ b/keyboards/tgr/alice/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 18
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/info.json
index 67cbcad7ea..7d6a0fbc14 100644
--- a/keyboards/tgr/alice/info.json
+++ b/keyboards/tgr/alice/info.json
@@ -8,9 +8,17 @@
     "pid": "0x422E",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1",
     "num_lock": "D0",
@@ -19,75 +27,88 @@
   "processor": "atmega32a",
   "bootloader": "bootloadhid",
   "community_layouts": ["alice_split_bs"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_alice_split_bs"
+  },
   "layouts": {
     "LAYOUT_alice_split_bs": {
       "layout": [
-        {"label":"K63", "x":0, "y":0},
-        {"label":"K00", "x":1.25, "y":0},
-        {"label":"K01", "x":2.25, "y":0},
-        {"label":"K02", "x":3.25, "y":0},
-        {"label":"K03", "x":4.25, "y":0},
-        {"label":"K04", "x":5.25, "y":0},
-        {"label":"K05", "x":6.25, "y":0},
-        {"label":"K06", "x":7.25, "y":0},
-        {"label":"K07", "x":10.25, "y":0},
-        {"label":"K08", "x":11.25, "y":0},
-        {"label":"K09", "x":12.25, "y":0},
-        {"label":"K10", "x":13.25, "y":0},
-        {"label":"K11", "x":14.25, "y":0},
-        {"label":"K12", "x":15.25, "y":0},
-        {"label":"K13", "x":16.25, "y":0},
-        {"label":"K14", "x":17.25, "y":0},
-        {"label":"K64", "x":0, "y":1},
-        {"label":"K15", "x":1.25, "y":1, "w":1.5},
-        {"label":"K16", "x":2.75, "y":1},
-        {"label":"K17", "x":3.75, "y":1},
-        {"label":"K18", "x":4.75, "y":1},
-        {"label":"K19", "x":5.75, "y":1},
-        {"label":"K20", "x":6.75, "y":1},
-        {"label":"K21", "x":9.75, "y":1},
-        {"label":"K22", "x":10.75, "y":1},
-        {"label":"K23", "x":11.75, "y":1},
-        {"label":"K24", "x":12.75, "y":1},
-        {"label":"K25", "x":13.75, "y":1},
-        {"label":"K26", "x":14.75, "y":1},
-        {"label":"K27", "x":15.75, "y":1},
-        {"label":"K28", "x":16.75, "y":1, "w":1.5},
-        {"label":"K65", "x":0, "y":2},
-        {"label":"K29", "x":1.25, "y":2, "w":1.75},
-        {"label":"K30", "x":3, "y":2},
-        {"label":"K31", "x":4, "y":2},
-        {"label":"K32", "x":5, "y":2},
-        {"label":"K33", "x":6, "y":2},
-        {"label":"K34", "x":7, "y":2},
-        {"label":"K35", "x":10, "y":2},
-        {"label":"K36", "x":11, "y":2},
-        {"label":"K37", "x":12, "y":2},
-        {"label":"K38", "x":13, "y":2},
-        {"label":"K39", "x":14, "y":2},
-        {"label":"K40", "x":15, "y":2},
-        {"label":"K41", "x":16, "y":2, "w":2.25},
-        {"label":"K42", "x":1.25, "y":3, "w":2.25},
-        {"label":"K43", "x":3.5, "y":3},
-        {"label":"K44", "x":4.5, "y":3},
-        {"label":"K45", "x":5.5, "y":3},
-        {"label":"K46", "x":6.5, "y":3},
-        {"label":"K47", "x":7.5, "y":3},
-        {"label":"K48", "x":9.5, "y":3},
-        {"label":"K49", "x":10.5, "y":3},
-        {"label":"K50", "x":11.5, "y":3},
-        {"label":"K51", "x":12.5, "y":3},
-        {"label":"K52", "x":13.5, "y":3},
-        {"label":"K53", "x":14.5, "y":3},
-        {"label":"K54", "x":15.5, "y":3, "w":1.75},
-        {"label":"K55", "x":17.25, "y":3},
-        {"label":"K56", "x":1.25, "y":4, "w":1.5},
-        {"label":"K57", "x":4.25, "y":4, "w":1.5},
-        {"label":"K58", "x":5.75, "y":4, "w":2},
-        {"label":"K59", "x":7.75, "y":4, "w":1.25},
-        {"label":"K60", "x":9.5, "y":4, "w":2.75},
-        {"label":"K61", "x":12.25, "y":4, "w":1.5},
-        {"label":"K62", "x":16.75, "y":4, "w":1.5}
+        {"matrix": [5, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 13], "x": 16.25, "y": 0},
+        {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+        {"matrix": [5, 1], "x": 0, "y": 1},
+
+        {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 2.75, "y": 1},
+        {"matrix": [1, 2], "x": 3.75, "y": 1},
+        {"matrix": [1, 3], "x": 4.75, "y": 1},
+        {"matrix": [1, 4], "x": 5.75, "y": 1},
+        {"matrix": [1, 5], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 6], "x": 9.75, "y": 1},
+        {"matrix": [1, 7], "x": 10.75, "y": 1},
+        {"matrix": [1, 8], "x": 11.75, "y": 1},
+        {"matrix": [1, 9], "x": 12.75, "y": 1},
+        {"matrix": [1, 10], "x": 13.75, "y": 1},
+        {"matrix": [1, 11], "x": 14.75, "y": 1},
+        {"matrix": [1, 12], "x": 15.75, "y": 1},
+        {"matrix": [1, 13], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [5, 2], "x": 0, "y": 2},
+        {"matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2},
+        {"matrix": [2, 3], "x": 5, "y": 2},
+        {"matrix": [2, 4], "x": 6, "y": 2},
+        {"matrix": [2, 5], "x": 7, "y": 2},
+
+        {"matrix": [2, 6], "x": 10, "y": 2},
+        {"matrix": [2, 7], "x": 11, "y": 2},
+        {"matrix": [2, 8], "x": 12, "y": 2},
+        {"matrix": [2, 9], "x": 13, "y": 2},
+        {"matrix": [2, 10], "x": 14, "y": 2},
+        {"matrix": [2, 11], "x": 15, "y": 2},
+        {"matrix": [2, 12], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 3.5, "y": 3},
+        {"matrix": [3, 2], "x": 4.5, "y": 3},
+        {"matrix": [3, 3], "x": 5.5, "y": 3},
+        {"matrix": [3, 4], "x": 6.5, "y": 3},
+        {"matrix": [3, 5], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 6], "x": 9.5, "y": 3},
+        {"matrix": [3, 7], "x": 10.5, "y": 3},
+        {"matrix": [3, 8], "x": 11.5, "y": 3},
+        {"matrix": [3, 9], "x": 12.5, "y": 3},
+        {"matrix": [3, 10], "x": 13.5, "y": 3},
+        {"matrix": [3, 11], "x": 14.5, "y": 3},
+        {"matrix": [3, 12], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 2], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 3], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 8], "x": 16.75, "y": 4, "w": 1.5}
       ]
     }
   }
diff --git a/keyboards/tgr/alice/rules.mk b/keyboards/tgr/alice/rules.mk
index 25437c442c..6b0cec85a4 100644
--- a/keyboards/tgr/alice/rules.mk
+++ b/keyboards/tgr/alice/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/tgr/jane/v2/config.h b/keyboards/tgr/jane/v2/config.h
deleted file mode 100644
index fa8fe1d455..0000000000
--- a/keyboards/tgr/jane/v2/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-//                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tgr/jane/v2/info.json b/keyboards/tgr/jane/v2/info.json
index 4351782e57..78f41f3149 100644
--- a/keyboards/tgr/jane/v2/info.json
+++ b/keyboards/tgr/jane/v2/info.json
@@ -8,9 +8,17 @@
     "pid": "0x4A4E",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1",
     "scroll_lock": "D6"
@@ -19,24 +27,535 @@
   "bootloader": "bootloadhid",
   "community_layouts": ["tkl_ansi", "tkl_iso"],
   "layouts": {
-      "LAYOUT_all": {
-          "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5}, {"x":2.25, "y":5.5}, {"x":3.25, "y":5.5, "w":1.25}, {"x":4.5, "y":5.5, "w":1.25}, {"x":5.75, "y":5.5, "w":1.25}, {"x":7, "y":5.5, "w":1.25}, {"x":8.25, "y":5.5, "w":1.25}, {"x":9.5, "y":5.5, "w":1.25}, {"x":10.75, "y":5.5}, {"x":11.75, "y":5.5}, {"x":12.75, "y":5.5}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
-      },
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5},
+        {"matrix": [1, 14], "x": 14, "y": 1.5},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 1.5},
+        {"matrix": [6, 13], "x": 16.25, "y": 1.5},
+        {"matrix": [6, 14], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [7, 12], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 13], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+        {"matrix": [2, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+        {"matrix": [5, 2], "x": 2.25, "y": 5.5},
+        {"matrix": [5, 3], "x": 3.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 7], "x": 7, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 8], "x": 8.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 9], "x": 9.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 10.75, "y": 5.5},
+        {"matrix": [5, 11], "x": 11.75, "y": 5.5},
+        {"matrix": [5, 12], "x": 12.75, "y": 5.5},
+        {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+        {"matrix": [4, 14], "x": 17.25, "y": 5.5}
+      ]
+    },
+    "LAYOUT_tkl_ansi": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 1.5},
+        {"matrix": [6, 13], "x": 16.25, "y": 1.5},
+        {"matrix": [6, 14], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [7, 12], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 13], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [2, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 9], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+        {"matrix": [4, 14], "x": 17.25, "y": 5.5}
+      ]
+    },
+    "LAYOUT_tkl_ansi_tsangan": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 1.25},
+        {"matrix": [6, 13], "x": 16.25, "y": 1.25},
+        {"matrix": [6, 14], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [7, 12], "x": 15.25, "y": 2.25},
+        {"matrix": [7, 13], "x": 16.25, "y": 2.25},
+        {"matrix": [7, 14], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [2, 14], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 8], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 9], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 10], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [3, 14], "x": 16.25, "y": 5.25},
+        {"matrix": [4, 14], "x": 17.25, "y": 5.25}
+      ]
+    },
+    "LAYOUT_tkl_iso": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 1.5},
+        {"matrix": [6, 13], "x": 16.25, "y": 1.5},
+        {"matrix": [6, 14], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+        {"matrix": [7, 12], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 13], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [2, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 9], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+        {"matrix": [4, 14], "x": 17.25, "y": 5.5}
+      ]
+    },
+    "LAYOUT_tkl_iso_tsangan": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 1.25},
+        {"matrix": [6, 13], "x": 16.25, "y": 1.25},
+        {"matrix": [6, 14], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [7, 12], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+        {"matrix": [7, 13], "x": 15.25, "y": 2.25},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.25},
+        {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.25},
 
-      "LAYOUT_tkl_ansi": {
-        "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
-      },
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
 
-      "LAYOUT_tkl_ansi_tsangan": {
-        "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
-      },
+        {"matrix": [2, 14], "x": 16.25, "y": 4.25},
 
-      "LAYOUT_tkl_iso": {
-        "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
-      },
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 8], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 9], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 10], "x": 13.5, "y": 5.25, "w": 1.5},
 
-      "LAYOUT_tkl_iso_tsangan": {
-        "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.75, "y":2.25, "w":1.25, "h":2}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
-      }
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [3, 14], "x": 16.25, "y": 5.25},
+        {"matrix": [4, 14], "x": 17.25, "y": 5.25}
+      ]
+    }
   }
 }
diff --git a/keyboards/tgr/jane/v2/rules.mk b/keyboards/tgr/jane/v2/rules.mk
index 4ba2386220..88711b2127 100644
--- a/keyboards/tgr/jane/v2/rules.mk
+++ b/keyboards/tgr/jane/v2/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = no
-WS2812_DRIVER = i2c
diff --git a/keyboards/tgr/jane/v2/v2.c b/keyboards/tgr/jane/v2/v2.c
deleted file mode 100644
index 3d98748516..0000000000
--- a/keyboards/tgr/jane/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v2.h"
diff --git a/keyboards/tgr/jane/v2/v2.h b/keyboards/tgr/jane/v2/v2.h
deleted file mode 100644
index 9691ea589f..0000000000
--- a/keyboards/tgr/jane/v2/v2.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_all( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k6B,           \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k6C, k6D, k6E, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k7C, k7D, k7E,      \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,                     \
-  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k2E,                \
-  k50, k51, k52, k53, k54, k55, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k3E, k4E            \
-){ \
-  { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C, k0D, k0E }, \
-  { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C, k1D, k1E }, \
-  { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C, k2D, k2E }, \
-  { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C, k3D, k3E }, \
-  { k40,   k41,   k42,   k43,   k44,   k45,   k46,   k47,   k48,   k49,   k4A,   k4B,   k4C, k4D, k4E }, \
-  { k50,   k51,   k52,   k53,   k54,   k55,   KC_NO, k57,   k58,   k59,   k5A,   k5B,   k5C, k5D, k5E }, \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k6B,   k6C, k6D, k6E }, \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k7C, k7D, k7E }, \
-}
-
-
-#define LAYOUT_tkl_ansi( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k6B,      \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k6C, k6D, k6E, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k7C, k7D, k7E, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D,                     \
-  k40, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k2E,                     \
-  k50, k51, k52, k55, k58, k59, k5A, k5D, k5E, k3E, k4E                                \
-){ \
-  { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   k0E },   \
-  { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   KC_NO }, \
-  { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C,   k2D,   k2E },   \
-  { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   KC_NO, k3D,   k3E },   \
-  { k40,   KC_NO, k42,   k43,   k44,   k45,   k46,   k47,   k48,   k49,   k4A,   k4B,   k4C,   KC_NO, k4E },   \
-  { k50,   k51,   k52,   KC_NO, KC_NO, k55,   KC_NO, KC_NO, k58,   k59,   k5A,   KC_NO, KC_NO, k5D,   k5E },   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k6B,   k6C,   k6D,   k6E },   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k7C,   k7D,   k7E },   \
-}
-
-#define LAYOUT_tkl_ansi_tsangan( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k6B,      \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k6C, k6D, k6E, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k7C, k7D, k7E, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D,                     \
-  k40, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k2E,                \
-  k50, k51, k52, k55, k58, k59, k5A, k5E, k3E, k4E                                \
-){ \
-  { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   k0E },   \
-  { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   KC_NO }, \
-  { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C,   k2D,   k2E },   \
-  { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   KC_NO, k3D,   k3E },   \
-  { k40,   KC_NO, k42,   k43,   k44,   k45,   k46,   k47,   k48,   k49,   k4A,   k4B,   k4C,   k4D,   k4E },   \
-  { k50,   k51,   k52,   KC_NO, KC_NO, k55,   KC_NO, KC_NO, k58,   k59,   k5A,   KC_NO, KC_NO, KC_NO, k5E },   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k6B,   k6C,   k6D,   k6E },   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k7C,   k7D,   k7E },   \
-}
-
-#define LAYOUT_tkl_iso( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k6B,      \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k6C, k6D, k6E, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k7C, k7D, k7E,      \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,                \
-  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k2E,                \
-  k50, k51, k52, k55, k58, k59, k5A, k5D, k5E, k3E, k4E                                \
-){ \
-  { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   k0E },   \
-  { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   KC_NO }, \
-  { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C,   KC_NO, k2E },   \
-  { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C,   k3D,   k3E },   \
-  { k40,   k41,   k42,   k43,   k44,   k45,   k46,   k47,   k48,   k49,   k4A,   k4B,   k4C,   KC_NO, k4E },   \
-  { k50,   k51,   k52,   KC_NO, KC_NO, k55,   KC_NO, KC_NO, k58,   k59,   k5A,   KC_NO, KC_NO, k5D,   k5E },   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k6B,   k6C,   k6D,   k6E },   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k7C,   k7D,   k7E },   \
-}
-
-#define LAYOUT_tkl_iso_tsangan( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k6B,      \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k6C, k6D, k6E, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k7C, k7D, k7E,      \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,                \
-  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k2E,                \
-  k50, k51, k52, k55, k58, k59, k5A, k5E, k3E, k4E                                \
-){ \
-  { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   k0E },   \
-  { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   KC_NO }, \
-  { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C,   KC_NO, k2E },   \
-  { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   k3C,   k3D,   k3E },   \
-  { k40,   k41,   k42,   k43,   k44,   k45,   k46,   k47,   k48,   k49,   k4A,   k4B,   k4C,   k4D,   k4E },   \
-  { k50,   k51,   k52,   KC_NO, KC_NO, k55,   KC_NO, KC_NO, k58,   k59,   k5A,   KC_NO, KC_NO, KC_NO, k5E },   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k6B,   k6C,   k6D,   k6E },   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k7C,   k7D,   k7E },   \
-}
diff --git a/keyboards/tgr/jane/v2ce/config.h b/keyboards/tgr/jane/v2ce/config.h
deleted file mode 100644
index 485a2416e9..0000000000
--- a/keyboards/tgr/jane/v2ce/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-//                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tgr/jane/v2ce/info.json b/keyboards/tgr/jane/v2ce/info.json
index b27eaf8e92..df82cdc6cf 100644
--- a/keyboards/tgr/jane/v2ce/info.json
+++ b/keyboards/tgr/jane/v2ce/info.json
@@ -8,9 +8,17 @@
         "pid": "0x4A43",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1",
         "num_lock": "D6"
@@ -21,691 +29,754 @@
     "layouts": {
         "LAYOUT_all_f13": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5},
-                {"x":14, "y":1.5},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5},
-                {"x":13.75, "y":3.5, "w":1.25},
-
-                {"x":0, "y":4.5, "w":1.25},
-                {"x":1.25, "y":4.5},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":1.75},
-                {"x":14, "y":4.5},
-                {"x":16.25, "y":4.5},
-
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5},
-                {"x":2.25, "y":5.5},
-                {"x":3.25, "y":5.5, "w":1.25},
-                {"x":4.5, "y":5.5, "w":1.25},
-                {"x":5.75, "y":5.5, "w":1.25},
-                {"x":7, "y":5.5, "w":1.25},
-                {"x":8.25, "y":5.5, "w":1.25},
-                {"x":9.5, "y":5.5, "w":1.25},
-                {"x":10.75, "y":5.5},
-                {"x":11.75, "y":5.5},
-                {"x":12.75, "y":5.5},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [6, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+
+                {"matrix": [6, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [2, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 7, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 8.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 9.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 10.75, "y": 5.5},
+                {"matrix": [5, 11], "x": 11.75, "y": 5.5},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [6, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [2, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":1.5, "y":5.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":12.5, "y":5.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [6, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [2, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan_split_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":13.5, "y":2.5, "w":1.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5, "w":2.25},
-
-                {"x":0, "y":4.5, "w":2.25},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":1.75},
-                {"x":14, "y":4.5},
-                {"x":16.25, "y":4.5},
-
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":1.5, "y":5.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":12.5, "y":5.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [6, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [2, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5},
-                {"x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"x":0, "y":4.5, "w":1.25},
-                {"x":1.25, "y":4.5},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-
-                {"x":0, "y":5.5, "w":1.25},
-                {"x":1.25, "y":5.5, "w":1.25},
-                {"x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"x":10, "y":5.5, "w":1.25},
-                {"x":11.25, "y":5.5, "w":1.25},
-                {"x":12.5, "y":5.5, "w":1.25},
-                {"x":13.75, "y":5.5, "w":1.25},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [6, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [2, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_iso_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5},
-                {"x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"x":0, "y":4.5, "w":1.25},
-                {"x":1.25, "y":4.5},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":2.75},
-                {"x":16.25, "y":4.5},
-
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":1.5, "y":5.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":12.5, "y":5.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [6, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [2, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_iso_tsangan_split_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
-
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.5},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1.5},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.5},
-                {"x":6, "y":1.5},
-                {"x":7, "y":1.5},
-                {"x":8, "y":1.5},
-                {"x":9, "y":1.5},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1.5},
-                {"x":12, "y":1.5},
-                {"x":13, "y":1.5, "w":2},
-                {"x":15.25, "y":1.5},
-                {"x":16.25, "y":1.5},
-                {"x":17.25, "y":1.5},
-
-                {"x":0, "y":2.5, "w":1.5},
-                {"x":1.5, "y":2.5},
-                {"x":2.5, "y":2.5},
-                {"x":3.5, "y":2.5},
-                {"x":4.5, "y":2.5},
-                {"x":5.5, "y":2.5},
-                {"x":6.5, "y":2.5},
-                {"x":7.5, "y":2.5},
-                {"x":8.5, "y":2.5},
-                {"x":9.5, "y":2.5},
-                {"x":10.5, "y":2.5},
-                {"x":11.5, "y":2.5},
-                {"x":12.5, "y":2.5},
-                {"x":15.25, "y":2.5},
-                {"x":16.25, "y":2.5},
-                {"x":17.25, "y":2.5},
-
-                {"x":0, "y":3.5, "w":1.75},
-                {"x":1.75, "y":3.5},
-                {"x":2.75, "y":3.5},
-                {"x":3.75, "y":3.5},
-                {"x":4.75, "y":3.5},
-                {"x":5.75, "y":3.5},
-                {"x":6.75, "y":3.5},
-                {"x":7.75, "y":3.5},
-                {"x":8.75, "y":3.5},
-                {"x":9.75, "y":3.5},
-                {"x":10.75, "y":3.5},
-                {"x":11.75, "y":3.5},
-                {"x":12.75, "y":3.5},
-                {"x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"x":0, "y":4.5, "w":1.25},
-                {"x":1.25, "y":4.5},
-                {"x":2.25, "y":4.5},
-                {"x":3.25, "y":4.5},
-                {"x":4.25, "y":4.5},
-                {"x":5.25, "y":4.5},
-                {"x":6.25, "y":4.5},
-                {"x":7.25, "y":4.5},
-                {"x":8.25, "y":4.5},
-                {"x":9.25, "y":4.5},
-                {"x":10.25, "y":4.5},
-                {"x":11.25, "y":4.5},
-                {"x":12.25, "y":4.5, "w":1.75},
-                {"x":14, "y":4.5},
-                {"x":16.25, "y":4.5},
-
-                {"x":0, "y":5.5, "w":1.5},
-                {"x":1.5, "y":5.5},
-                {"x":2.5, "y":5.5, "w":1.5},
-                {"x":4, "y":5.5, "w":7},
-                {"x":11, "y":5.5, "w":1.5},
-                {"x":12.5, "y":5.5},
-                {"x":13.5, "y":5.5, "w":1.5},
-                {"x":15.25, "y":5.5},
-                {"x":16.25, "y":5.5},
-                {"x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [6, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [2, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/tgr/jane/v2ce/rules.mk b/keyboards/tgr/jane/v2ce/rules.mk
index ea1cd4ec4f..7663aa664f 100644
--- a/keyboards/tgr/jane/v2ce/rules.mk
+++ b/keyboards/tgr/jane/v2ce/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
diff --git a/keyboards/tgr/jane/v2ce/v2ce.c b/keyboards/tgr/jane/v2ce/v2ce.c
deleted file mode 100644
index 6d478efce9..0000000000
--- a/keyboards/tgr/jane/v2ce/v2ce.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v2ce.h"
diff --git a/keyboards/tgr/jane/v2ce/v2ce.h b/keyboards/tgr/jane/v2ce/v2ce.h
deleted file mode 100644
index 5c37dffa12..0000000000
--- a/keyboards/tgr/jane/v2ce/v2ce.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Copyright 2021 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- *              ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───� ┌───┬───┬───�
- *              │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││6A │ │0D │0E │6B │
- *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───┬───�      ┌───────�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │6C │6D │6E │      │1D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
- *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │7C │7D │7E │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴�3D  │ ISO Enter
- *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                   │3C │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───�       ┌─┴───┴────┤
- * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │     │2E │       │4C        │ 2.75u RShift
- * └────────┘   ├────┼───┼───┼───┴┬──┴─┬─┴──┬┴───┼───┴┬──┴─┬─┴─┬─┴─┬───┬┴───┤ ┌───┼───┼───�   └──────────┘
- *              │50  │51 │52 │53  │54  │55  │57  │58  │59  │5A │5B │5C │5D  │ │5E │3E │4E │
- *              └────┴───┴───┴────┴────┴────┴────┴────┴────┴───┴───┴───┴────┘ └───┴───┴───┘
- *              ┌────┬────┬────┬────────────────────────┬────┬────┬────┬────�
- *              │50  │51  │52  │55                      │58  │59  │5A  │5D  │ Standard
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *              │50   │51 │52   │55                         │58   │59 │5A   │ Tsangan/WKL
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- *
- * I'm not entirely convinced the LAYOUT_all bottom row is accurate, but it's
- * what was already in the code.
- *                                                               - @noroadsleft
- *                                                                 2022-12-07
- */
-
-#define LAYOUT_all_f13( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k6A,        k0D, k0E, k6B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k6C, k6D, k6E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k7C, k7D, k7E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,                       \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D,             k2E,      \
-    k50, k51, k52, k53, k54, k55,      k57, k58, k59, k5A, k5B, k5C, k5D,        k5E, k3E, k4E  \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E }, \
-    { k50, k51, k52, k53, k54, k55, XXX, k57, k58, k59, k5A, k5B, k5C, k5D, k5E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k6A, k6B, k6C, k6D, k6E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k7C, k7D, k7E }  \
-}
-
-
-#define LAYOUT_tkl_f13_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k6A,   k0D, k0E, k6B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k6C, k6D, k6E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,   k7C, k7D, k7E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,                  \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4C,        k2E,      \
-    k50, k51, k52,                k55,                k58, k59, k5A, k5D,   k5E, k3E, k4E  \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, k4E }, \
-    { k50, k51, k52, XXX, XXX, k55, XXX, XXX, k58, k59, k5A, XXX, XXX, k5D, k5E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k6A, k6B, k6C, k6D, k6E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k7C, k7D, k7E }  \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k6A,   k0D, k0E, k6B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k6C, k6D, k6E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,   k7C, k7D, k7E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,                  \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4C,        k2E,      \
-    k50, k51, k52,                k55,                     k58, k59, k5A,   k5E, k3E, k4E  \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, k4E }, \
-    { k50, k51, k52, XXX, XXX, k55, XXX, XXX, k58, k59, k5A, XXX, XXX, XXX, k5E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k6A, k6B, k6C, k6D, k6E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k7C, k7D, k7E }  \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan_split_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k6A,   k0D, k0E, k6B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k6C, k6D, k6E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,   k7C, k7D, k7E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,                  \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D,        k2E,      \
-    k50, k51, k52,                k55,                     k58, k59, k5A,   k5E, k3E, k4E  \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E }, \
-    { k50, k51, k52, XXX, XXX, k55, XXX, XXX, k58, k59, k5A, XXX, XXX, XXX, k5E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k6A, k6B, k6C, k6D, k6E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k7C, k7D, k7E }  \
-}
-
-#define LAYOUT_tkl_f13_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k6A,   k0D, k0E, k6B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k6C, k6D, k6E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,        k7C, k7D, k7E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,                  \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4C,        k2E,      \
-    k50, k51, k52,                k55,                k58, k59, k5A, k5D,   k5E, k3E, k4E  \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, k4E }, \
-    { k50, k51, k52, XXX, XXX, k55, XXX, XXX, k58, k59, k5A, XXX, XXX, k5D, k5E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k6A, k6B, k6C, k6D, k6E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k7C, k7D, k7E }  \
-}
-
-#define LAYOUT_tkl_f13_iso_tsangan( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k6A,   k0D, k0E, k6B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k6C, k6D, k6E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,        k7C, k7D, k7E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,                  \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4C,        k2E,      \
-    k50, k51, k52,                k55,                     k58, k59, k5A,   k5E, k3E, k4E  \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, k4E }, \
-    { k50, k51, k52, XXX, XXX, k55, XXX, XXX, k58, k59, k5A, XXX, XXX, XXX, k5E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k6A, k6B, k6C, k6D, k6E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k7C, k7D, k7E }  \
-}
-
-#define LAYOUT_tkl_f13_iso_tsangan_split_rshift( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k6A,   k0D, k0E, k6B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k6C, k6D, k6E, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,        k7C, k7D, k7E, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,                  \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D,        k2E,      \
-    k50, k51, k52,                k55,                     k58, k59, k5A,   k5E, k3E, k4E  \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E }, \
-    { k50, k51, k52, XXX, XXX, k55, XXX, XXX, k58, k59, k5A, XXX, XXX, XXX, k5E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k6A, k6B, k6C, k6D, k6E }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k7C, k7D, k7E }  \
-}
diff --git a/keyboards/tgr/tris/config.h b/keyboards/tgr/tris/config.h
index db1d1e1625..f517c91d19 100644
--- a/keyboards/tgr/tris/config.h
+++ b/keyboards/tgr/tris/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { A3, A2, A1, A0 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/tgr/tris/info.json b/keyboards/tgr/tris/info.json
index 91cce43327..b8697805dd 100644
--- a/keyboards/tgr/tris/info.json
+++ b/keyboards/tgr/tris/info.json
@@ -8,9 +8,17 @@
         "pid": "0x5452",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A3", "A2", "A1", "A0"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "num_lock": "D0"
     },
@@ -19,11 +27,68 @@
     "community_layouts": ["numpad_6x4", "ortho_6x4"],
     "layouts": {
         "LAYOUT_ortho_6x4": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
+            ]
         },
 
         "LAYOUT_numpad_6x4": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":2.25, "h":2}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":0, "y":5.25, "w":2}, {"x":2, "y":5.25}, {"x":3, "y":4.25, "h":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25, "h": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/tgr/tris/rules.mk b/keyboards/tgr/tris/rules.mk
index 9a00928ea8..51df0b642e 100644
--- a/keyboards/tgr/tris/rules.mk
+++ b/keyboards/tgr/tris/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/tgr/tris/tris.c b/keyboards/tgr/tris/tris.c
deleted file mode 100644
index c2147b29c6..0000000000
--- a/keyboards/tgr/tris/tris.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 halfenergized
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "tris.h"
diff --git a/keyboards/tgr/tris/tris.h b/keyboards/tgr/tris/tris.h
deleted file mode 100644
index 5ba1865d3b..0000000000
--- a/keyboards/tgr/tris/tris.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 halfenergized
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define ___ KC_NO
-
-#define LAYOUT_ortho_6x4( \
-    k00, k01, k02, k03,  \
-    k10, k11, k12, k13,  \
-    k20, k21, k22, k23,  \
-    k30, k31, k32, k33,  \
-    k40, k41, k42, k43,  \
-    k50, k51, k52, k53   \
-)\
-{ \
-    { k00, k01, k02, k03 },  \
-    { k10, k11, k12, k13 },  \
-    { k20, k21, k22, k23 },  \
-    { k30, k31, k32, k33 },  \
-    { k40, k41, k42, k43 },  \
-    { k50, k51, k52, k53 }   \
-}
-
-#define LAYOUT_numpad_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-    k50,      k52, k43  \
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, ___ }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 }, \
-    { k50, ___, k52, ___ }  \
-}
diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h
index 351589a086..02c222b2b8 100644
--- a/keyboards/the_royal/liminal/config.h
+++ b/keyboards/the_royal/liminal/config.h
@@ -1,19 +1,11 @@
 #pragma once
 
-
-#define MATRIX_ROW_PINS { C6, B6, B7, C7 }
-#define MATRIX_COL_PINS { D6, C4, D3, D2, D1, D0, C2, B0, B1, B2, B3, B4, D5, C5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D4
 #define RGBLED_NUM 1   // Number of LEDs
 
 #define RGBLIGHT_HUE_STEP 6
diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json
index a1480dc5ff..eadbb7a027 100644
--- a/keyboards/the_royal/liminal/info.json
+++ b/keyboards/the_royal/liminal/info.json
@@ -8,54 +8,62 @@
     "pid": "0x0003",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D4"
+  },
+  "matrix_pins": {
+    "cols": ["D6", "C4", "D3", "D2", "D1", "D0", "C2", "B0", "B1", "B2", "B3", "B4", "D5", "C5"],
+    "rows": ["C6", "B6", "B7", "C7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_base_kit_all": {
       "layout": [
-        {"label":"k01", "x":0, "y":0, "w":1},
+        {"label":"k01", "x":0, "y":0},
         {"label":"k02", "x":1, "y":0, "w":1.5},
-        {"label":"k03", "x":2.5, "y":0, "w":1},
-        {"label":"k04", "x":3.5, "y":0, "w":1},
-        {"label":"k05", "x":4.5, "y":0, "w":1},
-        {"label":"k06", "x":5.5, "y":0, "w":1},
-        {"label":"k07", "x":6.5, "y":0, "w":1},
-        {"label":"k08", "x":7.5, "y":0, "w":1},
-        {"label":"k09", "x":8.5, "y":0, "w":1},
-        {"label":"k010", "x":9.5, "y":0, "w":1},
-        {"label":"k011", "x":10.5, "y":0, "w":1},
-        {"label":"k012", "x":11.5, "y":0, "w":1},
-        {"label":"k013", "x":12.5, "y":0, "w":1},
+        {"label":"k03", "x":2.5, "y":0},
+        {"label":"k04", "x":3.5, "y":0},
+        {"label":"k05", "x":4.5, "y":0},
+        {"label":"k06", "x":5.5, "y":0},
+        {"label":"k07", "x":6.5, "y":0},
+        {"label":"k08", "x":7.5, "y":0},
+        {"label":"k09", "x":8.5, "y":0},
+        {"label":"k010", "x":9.5, "y":0},
+        {"label":"k011", "x":10.5, "y":0},
+        {"label":"k012", "x":11.5, "y":0},
+        {"label":"k013", "x":12.5, "y":0},
         {"label":"k014", "x":13.5, "y":0, "w":1.5},
-        {"label":"k11", "x":0, "y":1, "w":1},
+        {"label":"k11", "x":0, "y":1},
         {"label":"k12", "x":1, "y":1, "w":1.75},
-        {"label":"k13", "x":2.75, "y":1, "w":1},
-        {"label":"k14", "x":3.75, "y":1, "w":1},
-        {"label":"k15", "x":4.75, "y":1, "w":1},
-        {"label":"k16", "x":5.75, "y":1, "w":1},
-        {"label":"k17", "x":6.75, "y":1, "w":1},
-        {"label":"k18", "x":7.75, "y":1, "w":1},
-        {"label":"k19", "x":8.75, "y":1, "w":1},
-        {"label":"k110", "x":9.75, "y":1, "w":1},
-        {"label":"k111", "x":10.75, "y":1, "w":1},
-        {"label":"k112", "x":11.75, "y":1, "w":1},
-        {"label":"k113", "x":12.75, "y":1, "w":1},
+        {"label":"k13", "x":2.75, "y":1},
+        {"label":"k14", "x":3.75, "y":1},
+        {"label":"k15", "x":4.75, "y":1},
+        {"label":"k16", "x":5.75, "y":1},
+        {"label":"k17", "x":6.75, "y":1},
+        {"label":"k18", "x":7.75, "y":1},
+        {"label":"k19", "x":8.75, "y":1},
+        {"label":"k110", "x":9.75, "y":1},
+        {"label":"k111", "x":10.75, "y":1},
+        {"label":"k112", "x":11.75, "y":1},
+        {"label":"k113", "x":12.75, "y":1},
         {"label":"k114", "x":13.75, "y":1, "w":1.25},
-        {"label":"k21", "x":0, "y":2, "w":1},
+        {"label":"k21", "x":0, "y":2},
         {"label":"k22", "x":1, "y":2, "w":1.25},
-        {"label":"k23", "x":2.25, "y":2, "w":1},
-        {"label":"k24", "x":3.25, "y":2, "w":1},
-        {"label":"k25", "x":4.25, "y":2, "w":1},
-        {"label":"k26", "x":5.25, "y":2, "w":1},
-        {"label":"k27", "x":6.25, "y":2, "w":1},
-        {"label":"k28", "x":7.25, "y":2, "w":1},
-        {"label":"k29", "x":8.25, "y":2, "w":1},
-        {"label":"k210", "x":9.25, "y":2, "w":1},
-        {"label":"k211", "x":10.25, "y":2, "w":1},
-        {"label":"k212", "x":11.25, "y":2, "w":1},
-        {"label":"k213", "x":12.25, "y":2, "w":1},
+        {"label":"k23", "x":2.25, "y":2},
+        {"label":"k24", "x":3.25, "y":2},
+        {"label":"k25", "x":4.25, "y":2},
+        {"label":"k26", "x":5.25, "y":2},
+        {"label":"k27", "x":6.25, "y":2},
+        {"label":"k28", "x":7.25, "y":2},
+        {"label":"k29", "x":8.25, "y":2},
+        {"label":"k210", "x":9.25, "y":2},
+        {"label":"k211", "x":10.25, "y":2},
+        {"label":"k212", "x":11.25, "y":2},
+        {"label":"k213", "x":12.25, "y":2},
         {"label":"k214", "x":13.25, "y":2, "w":1.75},
-        {"label":"k31", "x":0, "y":3, "w":1},
+        {"label":"k31", "x":0, "y":3},
         {"label":"k32", "x":1, "y":3, "w":1.5},
         {"label":"k33", "x":2.5, "y":3, "w":1.25},
         {"label":"k34", "x":3.75, "y":3, "w":1.5},
diff --git a/keyboards/the_royal/liminal/liminal.c b/keyboards/the_royal/liminal/liminal.c
deleted file mode 100644
index 6e1e935d44..0000000000
--- a/keyboards/the_royal/liminal/liminal.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "liminal.h"
\ No newline at end of file
diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h
index 0c6341af0f..8cfda8f8e5 100644
--- a/keyboards/the_royal/schwann/config.h
+++ b/keyboards/the_royal/schwann/config.h
@@ -1,19 +1,11 @@
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F6, C7 }
-#define MATRIX_COL_PINS { F4, F5, D5, D3, D2, C6, B6, B5, B4, D7, D6, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN B3
 #define RGBLED_NUM 8    // Number of LEDs
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json
index 97d10f6edc..85b6afb369 100644
--- a/keyboards/the_royal/schwann/info.json
+++ b/keyboards/the_royal/schwann/info.json
@@ -8,6 +8,14 @@
       "pid": "0x3521",
       "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B3"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "D5", "D3", "D2", "C6", "B6", "B5", "B4", "D7", "D6", "D1"],
+    "rows": ["F0", "F1", "F6", "C7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/the_royal/schwann/schwann.c b/keyboards/the_royal/schwann/schwann.c
deleted file mode 100644
index 1ef8c93974..0000000000
--- a/keyboards/the_royal/schwann/schwann.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "schwann.h"
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/config.h b/keyboards/themadnoodle/ncc1701kb/v2/config.h
index a9b6cfc37d..3c3b68d782 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/config.h
+++ b/keyboards/themadnoodle/ncc1701kb/v2/config.h
@@ -17,13 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* NCC-1701-KB PCB default pin-out */
-#define MATRIX_ROW_PINS { D4, D6, D7 }
-#define MATRIX_COL_PINS { B4, B5, B6 }
-
 /* RGB BackLight */
-#define RGB_DI_PIN B7
 #define RGBLED_NUM 4
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
@@ -36,6 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/info.json
index 63ebced12b..e769b23f12 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/info.json
+++ b/keyboards/themadnoodle/ncc1701kb/v2/info.json
@@ -8,25 +8,35 @@
     "pid": "0x1701",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["B4", "B5", "B6"],
+    "rows": ["D4", "D6", "D7"]
+  },
+  "diode_direction": "ROW2COL",
   "encoder": {
     "rotary": [
       {"pin_a": "D0", "pin_b": "D1"}
     ]
   },
+  "ws2812": {
+    "pin": "B7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_ortho_3x3": {
       "layout": [
-        {"x":0, "y":0}, 
-        {"label":"Encoder", "x":1, "y":0}, 
-        {"x":2, "y":0}, 
-        {"x":0, "y":1}, 
-        {"x":1, "y":1}, 
-        {"x":2, "y":1},
-        {"x":0, "y":2}, 
-        {"x":1, "y":2}, 
-        {"x":2, "y":2}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2}
       ]
     }
   }
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/v2.c b/keyboards/themadnoodle/ncc1701kb/v2/v2.c
deleted file mode 100644
index caf7c6f0f2..0000000000
--- a/keyboards/themadnoodle/ncc1701kb/v2/v2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "v2.h"
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/v2.h b/keyboards/themadnoodle/ncc1701kb/v2/v2.h
deleted file mode 100644
index 5d3b65be56..0000000000
--- a/keyboards/themadnoodle/ncc1701kb/v2/v2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 The Mad Noodle (Jesse Leventhal)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x3( \
-      k00, k01, k02, \
-      k10, k11, k12, \
-      k20, k21, k22  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 } \
-} 
-
diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h
index a9b6cfc37d..3c3b68d782 100644
--- a/keyboards/themadnoodle/noodlepad/config.h
+++ b/keyboards/themadnoodle/noodlepad/config.h
@@ -17,13 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* NCC-1701-KB PCB default pin-out */
-#define MATRIX_ROW_PINS { D4, D6, D7 }
-#define MATRIX_COL_PINS { B4, B5, B6 }
-
 /* RGB BackLight */
-#define RGB_DI_PIN B7
 #define RGBLED_NUM 4
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
@@ -36,6 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/themadnoodle/noodlepad/info.json b/keyboards/themadnoodle/noodlepad/info.json
index 487680f137..e605034697 100644
--- a/keyboards/themadnoodle/noodlepad/info.json
+++ b/keyboards/themadnoodle/noodlepad/info.json
@@ -8,25 +8,35 @@
     "pid": "0x1701",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B4", "B5", "B6"],
+    "rows": ["D4", "D6", "D7"]
+  },
+  "diode_direction": "ROW2COL",
   "encoder": {
     "rotary": [
       {"pin_a": "D0", "pin_b": "D1"}
     ]
   },
+  "ws2812": {
+    "pin": "B7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_ortho_3x3": {
       "layout": [
-        {"x":0, "y":0}, 
-        {"label":"Encoder", "x":1, "y":0}, 
-        {"x":2, "y":0}, 
-        {"x":0, "y":1}, 
-        {"x":1, "y":1}, 
-        {"x":2, "y":1},
-        {"x":0, "y":2}, 
-        {"x":1, "y":2}, 
-        {"x":2, "y":2}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2}
       ]
     }
   }
diff --git a/keyboards/themadnoodle/noodlepad/noodlepad.c b/keyboards/themadnoodle/noodlepad/noodlepad.c
deleted file mode 100644
index afabf78629..0000000000
--- a/keyboards/themadnoodle/noodlepad/noodlepad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "noodlepad.h"
diff --git a/keyboards/themadnoodle/noodlepad/noodlepad.h b/keyboards/themadnoodle/noodlepad/noodlepad.h
deleted file mode 100644
index e1aa5d2a6f..0000000000
--- a/keyboards/themadnoodle/noodlepad/noodlepad.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 The Mad Noodle (Jesse Leventhal)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x3( \
-      k00, k01, k02, \
-      k10, k11, k12, \
-      k20, k21, k22  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 } \
-} 
diff --git a/keyboards/thepanduuh/degenpad/config.h b/keyboards/thepanduuh/degenpad/config.h
deleted file mode 100644
index 49f53eff7a..0000000000
--- a/keyboards/thepanduuh/degenpad/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2023 ThePanduuh <thepanduuh.kb@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D5, D6, D7, B4, B5, B6 }
-#define MATRIX_COL_PINS { F4, F5, B1, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/thepanduuh/degenpad/degenpad.c b/keyboards/thepanduuh/degenpad/degenpad.c
deleted file mode 100644
index d70c8b8c1a..0000000000
--- a/keyboards/thepanduuh/degenpad/degenpad.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2023 ThePanduuh <thepanduuh.kb@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "degenpad.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/thepanduuh/degenpad/degenpad.h b/keyboards/thepanduuh/degenpad/degenpad.h
deleted file mode 100644
index 53f949a79f..0000000000
--- a/keyboards/thepanduuh/degenpad/degenpad.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-Copyright 2023 ThePanduuh <thepanduuh.kb@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-#define LAYOUT_ortho_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-    k50, k51, k52, k53 \
-) { \
-	{k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43}, \
-    {k50, k51, k52, k53}  \
-}
-
-#define LAYOUT_numpad_6x4(  \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, KC_NO}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, KC_NO}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_plus( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, KC_NO}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_zero( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-    k50, k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03},   \
-    {k10, k11, k12, k13},   \
-    {k20, k21, k22, KC_NO}, \
-    {k30, k31, k32, k33},   \
-    {k40, k41, k42, KC_NO}, \
-    {k50, k51, k52, k53}    \
-}
-
-#define LAYOUT_split_enter( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, KC_NO}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_enter_plus( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_zero_plus( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-    k50, k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, KC_NO}, \
-    {k50, k51, k52, k53}  \
-}
diff --git a/keyboards/thepanduuh/degenpad/info.json b/keyboards/thepanduuh/degenpad/info.json
index 999de9648c..2eb86b1b7b 100644
--- a/keyboards/thepanduuh/degenpad/info.json
+++ b/keyboards/thepanduuh/degenpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4447",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "B1", "D3"],
+        "rows": ["D5", "D6", "D7", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F0"}
@@ -18,222 +23,222 @@
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 2.25, "h": 2},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_split_plus": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_split_zero": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 2.25, "h": 2},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_split_enter": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 2.25, "h": 2},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_split_enter_plus": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_split_zero_plus": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/thevankeyboards/bananasplit/bananasplit.c b/keyboards/thevankeyboards/bananasplit/bananasplit.c
deleted file mode 100644
index 88917cb74d..0000000000
--- a/keyboards/thevankeyboards/bananasplit/bananasplit.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 MechMerlin <mechmerlin@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bananasplit.h"
diff --git a/keyboards/thevankeyboards/bananasplit/config.h b/keyboards/thevankeyboards/bananasplit/config.h
index ab5f20d40a..d9dc5a8401 100644
--- a/keyboards/thevankeyboards/bananasplit/config.h
+++ b/keyboards/thevankeyboards/bananasplit/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, B2, B4, B5, B6 }
-#define MATRIX_COL_PINS { F5, B1, F0, F1, F4, B3, D7, D6, D4, D5, D3, D2, D1, D0 }
-
-#define DIODE_DIRECTION ROW2COL
-
 #define TAPPING_TERM      175
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/thevankeyboards/bananasplit/info.json b/keyboards/thevankeyboards/bananasplit/info.json
index 1824e945cf..925331a581 100644
--- a/keyboards/thevankeyboards/bananasplit/info.json
+++ b/keyboards/thevankeyboards/bananasplit/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8870",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "B1", "F0", "F1", "F4", "B3", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B0", "B2", "B4", "B5", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B7"
     },
diff --git a/keyboards/thevankeyboards/caravan/caravan.c b/keyboards/thevankeyboards/caravan/caravan.c
deleted file mode 100644
index c4fa14f0c1..0000000000
--- a/keyboards/thevankeyboards/caravan/caravan.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "caravan.h"
diff --git a/keyboards/thevankeyboards/caravan/config.h b/keyboards/thevankeyboards/caravan/config.h
index 5f2d34cd5b..5070f05156 100644
--- a/keyboards/thevankeyboards/caravan/config.h
+++ b/keyboards/thevankeyboards/caravan/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { F1, F4, F5, B4, B5, B6, B7, D2, D3, D5, D4, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/thevankeyboards/caravan/info.json b/keyboards/thevankeyboards/caravan/info.json
index 43a1f7ed70..4c18b47cc8 100644
--- a/keyboards/thevankeyboards/caravan/info.json
+++ b/keyboards/thevankeyboards/caravan/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8844",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "B4", "B5", "B6", "B7", "D2", "D3", "D5", "D4", "D6"],
+        "rows": ["B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/thevankeyboards/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h
index 8d0b2668e7..e8aca5e862 100644
--- a/keyboards/thevankeyboards/jetvan/config.h
+++ b/keyboards/thevankeyboards/jetvan/config.h
@@ -17,32 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { D7, B5, F7, D4 }
-#define MATRIX_COL_PINS { D2, D3, D5, D6, B4, B6, F6, F5, F4, F1, F0, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* Define RGB Underglow */
-#define RGB_DI_PIN D0
 #define RGBLED_NUM 10
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/info.json
index 022ac65f5c..cd40690d7a 100644
--- a/keyboards/thevankeyboards/jetvan/info.json
+++ b/keyboards/thevankeyboards/jetvan/info.json
@@ -8,8 +8,16 @@
         "pid": "0x8858",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"],
+        "rows": ["D7", "B5", "F7", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/thevankeyboards/jetvan/jetvan.c b/keyboards/thevankeyboards/jetvan/jetvan.c
deleted file mode 100644
index 750c200afd..0000000000
--- a/keyboards/thevankeyboards/jetvan/jetvan.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <terry@terrymathews.net>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "jetvan.h"
diff --git a/keyboards/thevankeyboards/minivan/config.h b/keyboards/thevankeyboards/minivan/config.h
index f75e8e7ced..44b61b7458 100644
--- a/keyboards/thevankeyboards/minivan/config.h
+++ b/keyboards/thevankeyboards/minivan/config.h
@@ -17,29 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D7, B5, F7, D4 }
-#define MATRIX_COL_PINS { D2, D3, D5, D6, B4, B6, F6, F5, F4, F1, F0, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 /* RGB Setup */
-#define RGB_DI_PIN D0
 #define RGBLED_NUM 3
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/thevankeyboards/minivan/info.json b/keyboards/thevankeyboards/minivan/info.json
index 563bcc73ed..be95cdaf5a 100644
--- a/keyboards/thevankeyboards/minivan/info.json
+++ b/keyboards/thevankeyboards/minivan/info.json
@@ -8,6 +8,14 @@
     "pid": "0x8844",
     "device_version": "0.0.2"
   },
+  "ws2812": {
+    "pin": "D0"
+  },
+  "matrix_pins": {
+    "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"],
+    "rows": ["D7", "B5", "F7", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/thevankeyboards/minivan/keymaps/budi/config.h b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h
index dc36b73808..e6c4f24877 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/budi/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h
@@ -17,6 +17,5 @@
 #define MOUSEKEY_WHEEL_TIME_TO_MAX  120
 #define TAPPING_TOGGLE         1
 #define TAPPING_TERM           200
-#define IGNORE_MOD_TAP_INTERRUPT
 #define FORCE_NKRO
 #endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk
+++ /dev/null
diff --git a/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h b/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h
index c6404f8ce5..958b0cdaf5 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h
@@ -14,7 +14,7 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGB_DI_PIN D0
+  #define WS2812_DI_PIN D0
   #define RGBLED_NUM 3
   #define RGBLIGHT_EFFECT_BREATHING
 #endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h b/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h
index cd2aa46c44..8b64f40337 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h
@@ -1,5 +1,4 @@
 #pragma once
 
 #define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
index 4c4e6d37b5..49d7d463aa 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
@@ -2,7 +2,6 @@
 
 // place overrides here
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM_PER_KEY
 
 #ifdef MOUSEKEY_ENABLE
@@ -37,7 +36,7 @@
 
 // LED Setting: if you have KUMO you can use RGBLIGHT_ENABLE = yes
 #ifdef RGBLIGHT_ENABLE
-  #define RGB_DI_PIN D0
+  #define WS2812_DI_PIN D0
   #define RGBLIGHT_TIMER
   #define RGBLED_NUM 3
 #endif
diff --git a/keyboards/thevankeyboards/minivan/minivan.c b/keyboards/thevankeyboards/minivan/minivan.c
deleted file mode 100644
index 19996f9208..0000000000
--- a/keyboards/thevankeyboards/minivan/minivan.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "minivan.h"
diff --git a/keyboards/thevankeyboards/roadkit/config.h b/keyboards/thevankeyboards/roadkit/config.h
index ea9b30cab7..b9449c4714 100644
--- a/keyboards/thevankeyboards/roadkit/config.h
+++ b/keyboards/thevankeyboards/roadkit/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F5, D7, B4 }
-#define MATRIX_COL_PINS { F1, F4, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/thevankeyboards/roadkit/info.json b/keyboards/thevankeyboards/roadkit/info.json
index 7f71bb7abd..9323281a32 100644
--- a/keyboards/thevankeyboards/roadkit/info.json
+++ b/keyboards/thevankeyboards/roadkit/info.json
@@ -8,15 +8,57 @@
     "pid": "0x8846",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F4", "D6", "D4"],
+    "rows": ["F0", "F5", "D7", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["numpad_4x4", "ortho_4x4"],
   "layouts": {
     "LAYOUT_numpad_4x4": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "y":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, "h": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+        {"matrix": [3, 2], "x": 2, "y": 3}
+      ]
     },
     "LAYOUT_ortho_4x4": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/thevankeyboards/roadkit/roadkit.c b/keyboards/thevankeyboards/roadkit/roadkit.c
deleted file mode 100644
index 0f3d7f6916..0000000000
--- a/keyboards/thevankeyboards/roadkit/roadkit.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "roadkit.h"
diff --git a/keyboards/thevankeyboards/roadkit/roadkit.h b/keyboards/thevankeyboards/roadkit/roadkit.h
deleted file mode 100644
index f367c88ff4..0000000000
--- a/keyboards/thevankeyboards/roadkit/roadkit.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// This is a shortcut to help you visually see your layout.
-#define LAYOUT_numpad_4x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, \
-    k20, k21, k22, k23, \
-    k30,      k32 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, XXX }, \
-    { k20, k21, k22, k23 }, \
-    { k30, XXX, k32, XXX } \
-}
-
-#define LAYOUT_ortho_4x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 } \
-}
diff --git a/keyboards/tkc/california/california.c b/keyboards/tkc/california/california.c
deleted file mode 100644
index 002732208f..0000000000
--- a/keyboards/tkc/california/california.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Terry Mathews
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "california.h"
diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h
index 01959c10ad..a9909d1001 100644
--- a/keyboards/tkc/california/config.h
+++ b/keyboards/tkc/california/config.h
@@ -20,22 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C7, C6, B6, D4, D3, D0, E6, B0, B1, B2, D2, B3 }
-#define MATRIX_COL_PINS { B5, B4, D7, D6, F7, F6, F5, D5, D1, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/tkc/california/info.json b/keyboards/tkc/california/info.json
index d7c95747c9..2d62b0ff4f 100644
--- a/keyboards/tkc/california/info.json
+++ b/keyboards/tkc/california/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0009",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "D7", "D6", "F7", "F6", "F5", "D5", "D1", "F4"],
+        "rows": ["C7", "C6", "B6", "D4", "D3", "D0", "E6", "B0", "B1", "B2", "D2", "B3"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B7",
         "breathing": true
diff --git a/keyboards/tkc/candybar/lefty/config.h b/keyboards/tkc/candybar/lefty/config.h
deleted file mode 100644
index ebd4742ee3..0000000000
--- a/keyboards/tkc/candybar/lefty/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2018 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROW_PINS { A8, A9, A10, A13 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15 }
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-// #define WS2812_LED_N 2
-// #define RGBLED_NUM WS2812_LED_N
-// #define WS2812_TIM_N 2
-// #define WS2812_TIM_CH 2
-// #define PORT_WS2812     GPIOA
-// #define PIN_WS2812      1
-// #define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection)
-//#define WS2812_DMA_CHANNEL 7                  // DMA channel for TIMx_UP
-//#define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/tkc/candybar/lefty/info.json b/keyboards/tkc/candybar/lefty/info.json
index 53ed1e97dc..cfa286972b 100644
--- a/keyboards/tkc/candybar/lefty/info.json
+++ b/keyboards/tkc/candybar/lefty/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.6"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
+        "rows": ["A8", "A9", "A10", "A13"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/tkc/candybar/lefty/lefty.c b/keyboards/tkc/candybar/lefty/lefty.c
deleted file mode 100644
index 6bda3805c7..0000000000
--- a/keyboards/tkc/candybar/lefty/lefty.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "lefty.h"
diff --git a/keyboards/tkc/candybar/lefty_r3/config.h b/keyboards/tkc/candybar/lefty_r3/config.h
deleted file mode 100644
index a9b8550193..0000000000
--- a/keyboards/tkc/candybar/lefty_r3/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 Terry Mathews
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROW_PINS { F1, F0, D0, D2 }
-#define MATRIX_COL_PINS { B5, B6, C6, C7, F7, F6, F5, F4, D5, B3, B0, B1, B2, D4, D6, D7, B4 }
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-// #define WS2812_LED_N 2
-// #define RGBLED_NUM WS2812_LED_N
-// #define WS2812_TIM_N 2
-// #define WS2812_TIM_CH 2
-// #define PORT_WS2812     GPIOA
-// #define PIN_WS2812      1
-// #define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection)
-//#define WS2812_DMA_CHANNEL 7                  // DMA channel for TIMx_UP
-//#define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/tkc/candybar/lefty_r3/info.json b/keyboards/tkc/candybar/lefty_r3/info.json
index a6e14261aa..678e7e60f1 100644
--- a/keyboards/tkc/candybar/lefty_r3/info.json
+++ b/keyboards/tkc/candybar/lefty_r3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.6"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "D5", "B3", "B0", "B1", "B2", "D4", "D6", "D7", "B4"],
+        "rows": ["F1", "F0", "D0", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/tkc/candybar/lefty_r3/lefty_r3.c b/keyboards/tkc/candybar/lefty_r3/lefty_r3.c
deleted file mode 100644
index e5a821b7a9..0000000000
--- a/keyboards/tkc/candybar/lefty_r3/lefty_r3.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Terry Mathews
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "lefty_r3.h"
-
diff --git a/keyboards/tkc/candybar/righty/config.h b/keyboards/tkc/candybar/righty/config.h
deleted file mode 100644
index ebd4742ee3..0000000000
--- a/keyboards/tkc/candybar/righty/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2018 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROW_PINS { A8, A9, A10, A13 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15 }
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-// #define WS2812_LED_N 2
-// #define RGBLED_NUM WS2812_LED_N
-// #define WS2812_TIM_N 2
-// #define WS2812_TIM_CH 2
-// #define PORT_WS2812     GPIOA
-// #define PIN_WS2812      1
-// #define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection)
-//#define WS2812_DMA_CHANNEL 7                  // DMA channel for TIMx_UP
-//#define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/tkc/candybar/righty/info.json b/keyboards/tkc/candybar/righty/info.json
index e964fb2384..555b7c9cc0 100644
--- a/keyboards/tkc/candybar/righty/info.json
+++ b/keyboards/tkc/candybar/righty/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.6"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
+        "rows": ["A8", "A9", "A10", "A13"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
@@ -16,7 +21,7 @@
 				{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0},
 				{"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1},
 				{"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"&uarr;", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2},
-				{"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3, "w":1}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"&larr;", "x":11, "y":3}, {"label":"&darr;", "x":12, "y":3}, {"label":"&rarr;", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}]
+				{"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"&larr;", "x":11, "y":3}, {"label":"&darr;", "x":12, "y":3}, {"label":"&rarr;", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}]
         }
     }
 }
diff --git a/keyboards/tkc/candybar/righty/righty.c b/keyboards/tkc/candybar/righty/righty.c
deleted file mode 100644
index c3b6115747..0000000000
--- a/keyboards/tkc/candybar/righty/righty.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "righty.h"
diff --git a/keyboards/tkc/candybar/righty_r3/config.h b/keyboards/tkc/candybar/righty_r3/config.h
deleted file mode 100644
index 5a719c6600..0000000000
--- a/keyboards/tkc/candybar/righty_r3/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 Terry Mathews
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROW_PINS { F6, F7, D0, D2 }
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D5, B1, B3, B2, B0, F0, F1, F4, F5 }
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-// #define WS2812_LED_N 2
-// #define RGBLED_NUM WS2812_LED_N
-// #define WS2812_TIM_N 2
-// #define WS2812_TIM_CH 2
-// #define PORT_WS2812     GPIOA
-// #define PIN_WS2812      1
-// #define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection)
-//#define WS2812_DMA_CHANNEL 7                  // DMA channel for TIMx_UP
-//#define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/tkc/candybar/righty_r3/info.json b/keyboards/tkc/candybar/righty_r3/info.json
index 1a93578325..ca65a990b9 100644
--- a/keyboards/tkc/candybar/righty_r3/info.json
+++ b/keyboards/tkc/candybar/righty_r3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.6"
     },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D5", "B1", "B3", "B2", "B0", "F0", "F1", "F4", "F5"],
+        "rows": ["F6", "F7", "D0", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
@@ -16,7 +21,7 @@
 				{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0},
 				{"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1},
 				{"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"&uarr;", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2},
-				{"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3, "w":1}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"&larr;", "x":11, "y":3}, {"label":"&darr;", "x":12, "y":3}, {"label":"&rarr;", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}]
+				{"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"&larr;", "x":11, "y":3}, {"label":"&darr;", "x":12, "y":3}, {"label":"&rarr;", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}]
         }
     }
 }
diff --git a/keyboards/tkc/candybar/righty_r3/righty_r3.c b/keyboards/tkc/candybar/righty_r3/righty_r3.c
deleted file mode 100644
index 193c228f96..0000000000
--- a/keyboards/tkc/candybar/righty_r3/righty_r3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Terry Mathews
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "righty_r3.h"
diff --git a/keyboards/tkc/godspeed75/config.h b/keyboards/tkc/godspeed75/config.h
index 9fb6aa69dd..e995bb1c7c 100644
--- a/keyboards/tkc/godspeed75/config.h
+++ b/keyboards/tkc/godspeed75/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROW_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, A9, A10 }
-#define MATRIX_COL_PINS { A0, A1, A2, B12, B13, B14, B15, A8 }
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -37,7 +32,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define RGB_DI_PIN A13
 #define RGBLED_NUM 14
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/tkc/godspeed75/godspeed75.c b/keyboards/tkc/godspeed75/godspeed75.c
deleted file mode 100644
index e440ada48d..0000000000
--- a/keyboards/tkc/godspeed75/godspeed75.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "godspeed75.h"
diff --git a/keyboards/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/info.json
index f892202a39..6aac8e45e0 100644
--- a/keyboards/tkc/godspeed75/info.json
+++ b/keyboards/tkc/godspeed75/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A13"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "B12", "B13", "B14", "B15", "A8"],
+        "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A9", "A10"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index 7c09119e17..6ac2777073 100644
--- a/keyboards/tkc/m0lly/config.h
+++ b/keyboards/tkc/m0lly/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F2, F1, F0, E1, E0 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, C1, C0, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D7
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 30
 #    define RGBLIGHT_HUE_STEP 5
 #    define RGBLIGHT_SAT_STEP 10
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tkc/m0lly/info.json b/keyboards/tkc/m0lly/info.json
index 8f6d63a74d..a7dca24d36 100644
--- a/keyboards/tkc/m0lly/info.json
+++ b/keyboards/tkc/m0lly/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "F5", "F6", "F7"],
+        "rows": ["F2", "F1", "F0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6",
         "breathing": true
@@ -22,6 +27,9 @@
         "num_lock": "D2",
         "scroll_lock": "D4"
     },
+    "ws2812": {
+        "pin": "D7"
+    },
     "processor": "at90usb1286",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h
index b8f2806ef1..799a43cbbb 100644
--- a/keyboards/tkc/osav2/config.h
+++ b/keyboards/tkc/osav2/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { B4, D7, D5, D3, D2, D0, D1, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-   #define RGB_DI_PIN D4
-   #ifdef RGB_DI_PIN
    #define RGBLED_NUM 9
 //   #define RGBLIGHT_HUE_STEP 10
 //   #define RGBLIGHT_SAT_STEP 17
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-   #endif
 
 /*
  * Feature disable options
diff --git a/keyboards/tkc/osav2/info.json b/keyboards/tkc/osav2/info.json
index ed842b4b51..78cad2daf2 100644
--- a/keyboards/tkc/osav2/info.json
+++ b/keyboards/tkc/osav2/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D5", "D3", "D2", "D0", "D1", "B5"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D6",
         "breathing": true
@@ -15,18 +23,330 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs",
+        "LAYOUT_split_right_shift": "LAYOUT_alice"
+    },
     "layouts": {
-    "LAYOUT_default_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+        "LAYOUT_default_ansi": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 7], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 7], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         },
         "LAYOUT_split_backspace": {
-            "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 0], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 7], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         },
         "LAYOUT_alice": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 7], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         },
         "LAYOUT_alice_split_bs": {
-            "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 6], "x": 10.25, "y": 0},
+                {"matrix": [5, 5], "x": 11.25, "y": 0},
+                {"matrix": [5, 4], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 2], "x": 14.25, "y": 0},
+                {"matrix": [5, 1], "x": 15.25, "y": 0},
+                {"matrix": [5, 0], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [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, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 6], "x": 9.5, "y": 3},
+                {"matrix": [8, 5], "x": 10.5, "y": 3},
+                {"matrix": [8, 4], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3},
+                {"matrix": [8, 1], "x": 14.5, "y": 3},
+                {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 16.75, "y": 4, "w": 1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/tkc/osav2/osav2.c b/keyboards/tkc/osav2/osav2.c
index 4d8b901498..51f4ac0e04 100644
--- a/keyboards/tkc/osav2/osav2.c
+++ b/keyboards/tkc/osav2/osav2.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "osav2.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinOutput(C7);
diff --git a/keyboards/tkc/osav2/osav2.h b/keyboards/tkc/osav2/osav2.h
deleted file mode 100644
index d6ac51c7be..0000000000
--- a/keyboards/tkc/osav2/osav2.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* LAYOUT
- * ┌───� ┌───┬───┬───┬───┬───┬───┬───�         ┌───┬───┬───┬───┬───┬───┬───┬───�┌────────�
- * │10 │ │00 │01 │02 │03 │04 │05 │06 │         │56 │55 │54 │53 │52 │51 │50 │57 ││57      │
- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤└────────┘
- * │20 │ │11   │12 │13 │14 │15 │16 │         │66 │65 │64 │63 │62 │61 │60 │67   │
- * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴�        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │30 │ │21    │22 │23 │24 │25 │26 │         │76 │75 │74 │73 │72 │71 │77      │
- * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─�     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤┌──────────�
- *       │31      │32 │33 │34 │35 │36 │     │86 │85 │84 │83 │82 │81 │80    │87 ││87        │
- *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─�   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤└──────────┘
- *       │41   │     │43   │45     │46  │   │95        │93   │           │90   │
- *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
- */
-#define LAYOUT_default_ansi( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51,      K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81,      K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { KC_NO, K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-#define LAYOUT_split_backspace( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51, K50, K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81,      K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-#define LAYOUT_alice( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51,      K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81, K80, K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { KC_NO, K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-#define LAYOUT_alice_split_bs( \
-  K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51, K50, K57, \
-  K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
-  K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
-       K31, K32, K33, K34, K35, K36,        K86, K85, K84, K83, K82, K81, K80, K87, \
-       K41,      K43,      K45, K46,        K95,           K93,                K90  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO  }, \
-    { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   K46,   KC_NO  }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57    }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67    }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76,   K77    }, \
-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
-    { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
-}
-
-#define LAYOUT_split_right_shift LAYOUT_alice
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h
index 97991af340..c9a25e843c 100644
--- a/keyboards/tkc/portico/config.h
+++ b/keyboards/tkc/portico/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B6, C6, C7, F7, D2 }
-#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, F6, F5, F4, F1, B0, B1, B2, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
index 6fd68e21ea..f4f2e15e84 100644
--- a/keyboards/tkc/portico/info.json
+++ b/keyboards/tkc/portico/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0008",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
+        "rows": ["B6", "C6", "C7", "F7", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
@@ -18,77 +26,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"<i class='kb kb-Arrows-Left'></i>", "x":13, "y":4},
-                {"label":"<i class='kb kb-Arrows-Down'></i>", "x":14, "y":4},
-                {"label":"<i class='kb kb-Arrows-Right'></i>", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/tkc/portico/portico.h b/keyboards/tkc/portico/portico.h
index 71b28074dd..b93c7f8d3c 100644
--- a/keyboards/tkc/portico/portico.h
+++ b/keyboards/tkc/portico/portico.h
@@ -22,19 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
 #include "via.h"
 #endif
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk
index 278b7fd572..4e382541f4 100644
--- a/keyboards/tkc/portico/rules.mk
+++ b/keyboards/tkc/portico/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = IS31FL3731
 CIE1931_CURVE = yes
 
 # project specific files
diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h
index 27dd9249e7..fd0191d101 100644
--- a/keyboards/tkc/portico68v2/config.h
+++ b/keyboards/tkc/portico68v2/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B6, C6, C7, F7, D2 }
-#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, F6, F5, F4, F1, B0, B1, B2, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 82
diff --git a/keyboards/tkc/portico68v2/info.json b/keyboards/tkc/portico68v2/info.json
index 844a727864..b37f02ecc9 100644
--- a/keyboards/tkc/portico68v2/info.json
+++ b/keyboards/tkc/portico68v2/info.json
@@ -8,83 +8,91 @@
         "pid": "0x0012",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
+        "rows": ["B6", "C6", "C7", "F7", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
-                {"label":"<i class='kb kb-Arrows-Left'></i>", "x":13, "y":4},
-                {"label":"<i class='kb kb-Arrows-Down'></i>", "x":14, "y":4},
-                {"label":"<i class='kb kb-Arrows-Right'></i>", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/tkc/portico68v2/portico68v2.c b/keyboards/tkc/portico68v2/portico68v2.c
index 32c8f50894..83a365f7c0 100644
--- a/keyboards/tkc/portico68v2/portico68v2.c
+++ b/keyboards/tkc/portico68v2/portico68v2.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "portico68v2.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/tkc/portico68v2/portico68v2.h b/keyboards/tkc/portico68v2/portico68v2.h
deleted file mode 100644
index 3cbe46d560..0000000000
--- a/keyboards/tkc/portico68v2/portico68v2.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2022 Terry Mathews
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E,\
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/tkc/portico68v2/rules.mk b/keyboards/tkc/portico68v2/rules.mk
index c96ee7d13a..82b94419c1 100644
--- a/keyboards/tkc/portico68v2/rules.mk
+++ b/keyboards/tkc/portico68v2/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 LTO_ENABLE = yes			   # Compile-time optimizations
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
\ No newline at end of file
diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h
index 04abd8bcc1..e72c95981b 100644
--- a/keyboards/tkc/portico75/config.h
+++ b/keyboards/tkc/portico75/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { B0, E6, F0, F1, D3, D2 }
-#define MATRIX_COL_PINS \
-    { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, B3, B7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json
index bac10fbe13..a7b7a7d1ed 100644
--- a/keyboards/tkc/portico75/info.json
+++ b/keyboards/tkc/portico75/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0011",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B3", "B7"],
+        "rows": ["B0", "E6", "F0", "F1", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B2", "resolution": 2}
@@ -18,7 +26,184 @@
     "debounce": 3,
     "layouts": {
         "LAYOUT_75_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Mute", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Home", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Fn", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"<i class='kb kb-Arrows-Left'></i>", "x":13.25, "y":5.5}, {"label":"<i class='kb kb-Arrows-Down'></i>", "x":14.25, "y":5.5}, {"label":"<i class='kb kb-Arrows-Right'></i>", "x":15.25, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 12], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 12], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_75_via": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+
+                {"matrix": [2, 0], "x": 30, "y": 0},
+                {"matrix": [2, 1], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 13], "x": 43, "y": 0},
+                {"matrix": [2, 14], "x": 44, "y": 0},
+
+                {"matrix": [3, 0], "x": 45, "y": 0},
+                {"matrix": [3, 1], "x": 46, "y": 0},
+                {"matrix": [3, 2], "x": 47, "y": 0},
+                {"matrix": [3, 3], "x": 48, "y": 0},
+                {"matrix": [3, 4], "x": 49, "y": 0},
+                {"matrix": [3, 5], "x": 50, "y": 0},
+                {"matrix": [3, 6], "x": 51, "y": 0},
+                {"matrix": [3, 7], "x": 52, "y": 0},
+                {"matrix": [3, 8], "x": 53, "y": 0},
+                {"matrix": [3, 9], "x": 54, "y": 0},
+                {"matrix": [3, 10], "x": 55, "y": 0},
+                {"matrix": [3, 11], "x": 56, "y": 0},
+                {"matrix": [3, 12], "x": 57, "y": 0},
+                {"matrix": [3, 14], "x": 58, "y": 0},
+
+                {"matrix": [4, 0], "x": 59, "y": 0},
+                {"matrix": [4, 1], "x": 60, "y": 0},
+                {"matrix": [4, 2], "x": 61, "y": 0},
+                {"matrix": [4, 3], "x": 62, "y": 0},
+                {"matrix": [4, 4], "x": 63, "y": 0},
+                {"matrix": [4, 5], "x": 64, "y": 0},
+                {"matrix": [4, 6], "x": 65, "y": 0},
+                {"matrix": [4, 7], "x": 66, "y": 0},
+                {"matrix": [4, 8], "x": 67, "y": 0},
+                {"matrix": [4, 9], "x": 68, "y": 0},
+                {"matrix": [4, 10], "x": 69, "y": 0},
+                {"matrix": [4, 11], "x": 70, "y": 0},
+                {"matrix": [4, 12], "x": 71, "y": 0},
+                {"matrix": [4, 14], "x": 72, "y": 0},
+
+                {"matrix": [5, 0], "x": 73, "y": 0},
+                {"matrix": [5, 1], "x": 74, "y": 0},
+                {"matrix": [5, 2], "x": 75, "y": 0},
+                {"matrix": [5, 5], "x": 76, "y": 0},
+                {"matrix": [5, 9], "x": 77, "y": 0},
+                {"matrix": [5, 10], "x": 78, "y": 0},
+                {"matrix": [5, 11], "x": 79, "y": 0},
+                {"matrix": [5, 12], "x": 80, "y": 0},
+                {"matrix": [5, 13], "x": 81, "y": 0}
+            ]
         }
     }
 }
diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c
index 299af2f305..568f75901f 100644
--- a/keyboards/tkc/portico75/portico75.c
+++ b/keyboards/tkc/portico75/portico75.c
@@ -171,19 +171,3 @@ bool rgb_matrix_indicators_kb(void) {
     return true;
 }
 #endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/tkc/portico75/portico75.h b/keyboards/tkc/portico75/portico75.h
index 019fb07f75..a9c26f4d8b 100644
--- a/keyboards/tkc/portico75/portico75.h
+++ b/keyboards/tkc/portico75/portico75.h
@@ -24,37 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
 #include "via.h"
 #endif
-
-#define XXX KC_NO
-
-#define LAYOUT_75_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           \
-    K50, K51, K52,           K55,                K59, K5A, K5B, K5C, K5D       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, XXX }, \
-    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, K5A, K5B, K5C, K5D, XXX }  \
-}
-
-#define LAYOUT_75_via( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, \
-    K50, K51, K52,           K55,                K59, K5A, K5B, K5C, K5D       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E }, \
-    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, K5A, K5B, K5C, K5D, XXX }  \
-}
diff --git a/keyboards/tkc/portico75/rules.mk b/keyboards/tkc/portico75/rules.mk
index cdc33f0c09..36e22b992d 100644
--- a/keyboards/tkc/portico75/rules.mk
+++ b/keyboards/tkc/portico75/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 CIE1931_CURVE = yes
 ENCODER_ENABLE = yes
diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
index 747db6bf03..dd6631f545 100644
--- a/keyboards/tkc/tkc1800/config.h
+++ b/keyboards/tkc/tkc1800/config.h
@@ -17,21 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-/* Row pin configuration
-*/
-#define MATRIX_ROW_PINS { F4, F3, F2, F1, F0, E1, E0 }
-/* Column pin configuration
- */
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, C1, C0, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Underlight configuration
  */
-#define RGB_DI_PIN D7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json
index ad57eb1aa5..f9c20e4b4d 100644
--- a/keyboards/tkc/tkc1800/info.json
+++ b/keyboards/tkc/tkc1800/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0001",
     "device_version": "0.0.3"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "F5", "F6", "F7"],
+    "rows": ["F4", "F3", "F2", "F1", "F0", "E1", "E0"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
     "breathing": true
@@ -22,6 +27,9 @@
     "num_lock": "D2",
     "scroll_lock": "D4"
   },
+  "ws2812": {
+    "pin": "D7"
+  },
   "processor": "at90usb1286",
   "bootloader": "qmk-dfu",
   "layouts": {
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index ed701d2aa1..e01e92ccf2 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@@ -20,24 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B1, F5, F7, B0, B2, B3 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F6, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 22
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -54,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json
index 6c610a6007..9a65d8e1e1 100644
--- a/keyboards/tkc/tkl_ab87/info.json
+++ b/keyboards/tkc/tkl_ab87/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0007",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E6", "F6", "F4"],
+        "rows": ["B1", "F5", "F7", "B0", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
     	"pin": "B7",
     	"breathing": true
@@ -16,6 +21,9 @@
     	"caps_lock": "F1",
     	"scroll_lock": "F0"
     },
+    "ws2812": {
+    	"pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/tkc/tkl_ab87/tkl_ab87.c b/keyboards/tkc/tkl_ab87/tkl_ab87.c
deleted file mode 100644
index 5d1b2d98a4..0000000000
--- a/keyboards/tkc/tkl_ab87/tkl_ab87.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Terry Mathews
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "tkl_ab87.h"
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h
index 16d91b69a2..b6fc3a66a2 100644
--- a/keyboards/tkw/grandiceps/config.h
+++ b/keyboards/tkw/grandiceps/config.h
@@ -15,20 +15,11 @@
  */
 #pragma once
 
-
-#define MATRIX_COL_PINS { B0, A7, A3, A5, A4, A2 }
-#define MATRIX_ROW_PINS { B12, A6, B13, B9, B8 }
-#define MATRIX_COL_PINS_RIGHT { B0, A7, A3, A5, A4, A2 }
-#define MATRIX_ROW_PINS_RIGHT  { B12, A6, B13, B9, B8 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 
 #define MATRIX_IO_DELAY 5
 #define TAP_CODE_DELAY 10
 
-#define RGB_DI_PIN B1
 #define RGBLED_NUM 16
 #define RGBLED_SPLIT { 8,8 }
 #define RGBLIGHT_LIMIT_VAL 120
diff --git a/keyboards/tkw/grandiceps/grandiceps.c b/keyboards/tkw/grandiceps/grandiceps.c
deleted file mode 100644
index bfb67dfc2c..0000000000
--- a/keyboards/tkw/grandiceps/grandiceps.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Thys de Wet
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "grandiceps.h"
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index 4d91a00c84..c6d658e00a 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -6,13 +6,28 @@
         "vid": "0xFEED",
         "pid": "0x7812"
     },
+    "ws2812": {
+        "pin": "B1",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "A7", "A3", "A5", "A4", "A2"],
+        "rows": ["B12", "A6", "B13", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B14", "pin_b": "B15"}
         ]
     },
     "split": {
-        "soft_serial_pin": "A15"
+        "soft_serial_pin": "A15",
+        "matrix_pins": {
+            "right": {
+                "cols": ["B0", "A7", "A3", "A5", "A4", "A2"],
+                "rows": ["B12", "A6", "B13", "B9", "B8"]
+            }
+        }
     },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk
index 1b481a9e1e..2565f116a1 100644
--- a/keyboards/tkw/grandiceps/rules.mk
+++ b/keyboards/tkw/grandiceps/rules.mk
@@ -17,7 +17,6 @@ SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
-WS2812_DRIVER = pwm
 OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
 
 DEFAULT_FOLDER = tkw/grandiceps/rev1
diff --git a/keyboards/tkw/stoutgat/v1/config.h b/keyboards/tkw/stoutgat/v1/config.h
index 1eda8feab4..b168318aa0 100644
--- a/keyboards/tkw/stoutgat/v1/config.h
+++ b/keyboards/tkw/stoutgat/v1/config.h
@@ -18,8 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #define TAP_CODE_DELAY 10
-
-#define MATRIX_ROW_PINS { D1, D0, A0, A1, A2 }
-#define MATRIX_COL_PINS { D6, D5, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json
index e94e896858..eda564e4ed 100644
--- a/keyboards/tkw/stoutgat/v1/info.json
+++ b/keyboards/tkw/stoutgat/v1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7811",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"],
+        "rows": ["D1", "D0", "A0", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B3"},
@@ -18,84 +23,238 @@
     "bootloader": "usbasploader",
     "community_layouts": ["65_iso", "65_ansi"],
     "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 16, "y": 0},
+                {"label": "K12", "matrix": [1, 2], "x": 17, "y": 0},
+                {"label": "K13", "matrix": [1, 3], "x": 18, "y": 0},
+                {"label": "K14", "matrix": [1, 4], "x": 19, "y": 0},
+                {"label": "K15", "matrix": [1, 5], "x": 20, "y": 0},
+                {"label": "K16", "matrix": [1, 6], "x": 21, "y": 0},
+                {"label": "K17", "matrix": [1, 7], "x": 22, "y": 0},
+                {"label": "K18", "matrix": [1, 8], "x": 23, "y": 0},
+                {"label": "K19", "matrix": [1, 9], "x": 24, "y": 0},
+                {"label": "K1A", "matrix": [1, 10], "x": 25, "y": 0},
+                {"label": "K1B", "matrix": [1, 11], "x": 26, "y": 0},
+                {"label": "K1C", "matrix": [1, 12], "x": 27, "y": 0},
+                {"label": "K1D", "matrix": [1, 13], "x": 28, "y": 0},
+                {"label": "K1E", "matrix": [1, 14], "x": 29, "y": 0},
+
+                {"label": "K20", "matrix": [2, 0], "x": 30, "y": 0},
+                {"label": "K21", "matrix": [2, 1], "x": 31, "y": 0},
+                {"label": "K22", "matrix": [2, 2], "x": 32, "y": 0},
+                {"label": "K23", "matrix": [2, 3], "x": 33, "y": 0},
+                {"label": "K24", "matrix": [2, 4], "x": 34, "y": 0},
+                {"label": "K25", "matrix": [2, 5], "x": 35, "y": 0},
+                {"label": "K26", "matrix": [2, 6], "x": 36, "y": 0},
+                {"label": "K27", "matrix": [2, 7], "x": 37, "y": 0},
+                {"label": "K28", "matrix": [2, 8], "x": 38, "y": 0},
+                {"label": "K29", "matrix": [2, 9], "x": 39, "y": 0},
+                {"label": "K2A", "matrix": [2, 10], "x": 40, "y": 0},
+                {"label": "K2B", "matrix": [2, 11], "x": 41, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 42, "y": 0},
+                {"label": "K2E", "matrix": [2, 14], "x": 43, "y": 0},
+
+                {"label": "K30", "matrix": [3, 0], "x": 44, "y": 0},
+                {"label": "K32", "matrix": [3, 2], "x": 45, "y": 0},
+                {"label": "K33", "matrix": [3, 3], "x": 46, "y": 0},
+                {"label": "K34", "matrix": [3, 4], "x": 47, "y": 0},
+                {"label": "K35", "matrix": [3, 5], "x": 48, "y": 0},
+                {"label": "K36", "matrix": [3, 6], "x": 49, "y": 0},
+                {"label": "K37", "matrix": [3, 7], "x": 50, "y": 0},
+                {"label": "K38", "matrix": [3, 8], "x": 51, "y": 0},
+                {"label": "K39", "matrix": [3, 9], "x": 52, "y": 0},
+                {"label": "K3A", "matrix": [3, 10], "x": 53, "y": 0},
+                {"label": "K3B", "matrix": [3, 11], "x": 54, "y": 0},
+                {"label": "K3C", "matrix": [3, 12], "x": 55, "y": 0},
+                {"label": "K3D", "matrix": [3, 13], "x": 56, "y": 0},
+                {"label": "K3E", "matrix": [3, 14], "x": 57, "y": 0},
+
+                {"label": "K40", "matrix": [4, 0], "x": 58, "y": 0},
+                {"label": "K41", "matrix": [4, 1], "x": 59, "y": 0},
+                {"label": "K42", "matrix": [4, 2], "x": 60, "y": 0},
+                {"label": "K46", "matrix": [4, 6], "x": 61, "y": 0},
+                {"label": "K49", "matrix": [4, 9], "x": 62, "y": 0},
+                {"label": "K4A", "matrix": [4, 10], "x": 63, "y": 0},
+                {"label": "K4B", "matrix": [4, 11], "x": 64, "y": 0},
+                {"label": "K4C", "matrix": [4, 12], "x": 65, "y": 0},
+                {"label": "K4D", "matrix": [4, 13], "x": 66, "y": 0},
+                {"label": "K4E", "matrix": [4, 14], "x": 67, "y": 0}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 16, "y": 0},
+                {"label": "K12", "matrix": [1, 2], "x": 17, "y": 0},
+                {"label": "K13", "matrix": [1, 3], "x": 18, "y": 0},
+                {"label": "K14", "matrix": [1, 4], "x": 19, "y": 0},
+                {"label": "K15", "matrix": [1, 5], "x": 20, "y": 0},
+                {"label": "K16", "matrix": [1, 6], "x": 21, "y": 0},
+                {"label": "K17", "matrix": [1, 7], "x": 22, "y": 0},
+                {"label": "K18", "matrix": [1, 8], "x": 23, "y": 0},
+                {"label": "K19", "matrix": [1, 9], "x": 24, "y": 0},
+                {"label": "K1A", "matrix": [1, 10], "x": 25, "y": 0},
+                {"label": "K1B", "matrix": [1, 11], "x": 26, "y": 0},
+                {"label": "K1C", "matrix": [1, 12], "x": 27, "y": 0},
+                {"label": "K1E", "matrix": [1, 14], "x": 28, "y": 0},
+
+                {"label": "K20", "matrix": [2, 0], "x": 29, "y": 0},
+                {"label": "K21", "matrix": [2, 1], "x": 30, "y": 0},
+                {"label": "K22", "matrix": [2, 2], "x": 31, "y": 0},
+                {"label": "K23", "matrix": [2, 3], "x": 32, "y": 0},
+                {"label": "K24", "matrix": [2, 4], "x": 33, "y": 0},
+                {"label": "K25", "matrix": [2, 5], "x": 34, "y": 0},
+                {"label": "K26", "matrix": [2, 6], "x": 35, "y": 0},
+                {"label": "K27", "matrix": [2, 7], "x": 36, "y": 0},
+                {"label": "K28", "matrix": [2, 8], "x": 37, "y": 0},
+                {"label": "K29", "matrix": [2, 9], "x": 38, "y": 0},
+                {"label": "K2A", "matrix": [2, 10], "x": 39, "y": 0},
+                {"label": "K2B", "matrix": [2, 11], "x": 40, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 41, "y": 0},
+                {"label": "K1D", "matrix": [1, 13], "x": 42, "y": 0},
+                {"label": "K2E", "matrix": [2, 14], "x": 43, "y": 0},
+
+                {"label": "K30", "matrix": [3, 0], "x": 44, "y": 0},
+                {"label": "K31", "matrix": [3, 1], "x": 45, "y": 0},
+                {"label": "K32", "matrix": [3, 2], "x": 46, "y": 0},
+                {"label": "K33", "matrix": [3, 3], "x": 47, "y": 0},
+                {"label": "K34", "matrix": [3, 4], "x": 48, "y": 0},
+                {"label": "K35", "matrix": [3, 5], "x": 49, "y": 0},
+                {"label": "K36", "matrix": [3, 6], "x": 50, "y": 0},
+                {"label": "K37", "matrix": [3, 7], "x": 51, "y": 0},
+                {"label": "K38", "matrix": [3, 8], "x": 52, "y": 0},
+                {"label": "K39", "matrix": [3, 9], "x": 53, "y": 0},
+                {"label": "K3A", "matrix": [3, 10], "x": 54, "y": 0},
+                {"label": "K3B", "matrix": [3, 11], "x": 55, "y": 0},
+                {"label": "K3C", "matrix": [3, 12], "x": 56, "y": 0},
+                {"label": "K3D", "matrix": [3, 13], "x": 57, "y": 0},
+                {"label": "K3E", "matrix": [3, 14], "x": 58, "y": 0},
+
+                {"label": "K40", "matrix": [4, 0], "x": 59, "y": 0},
+                {"label": "K41", "matrix": [4, 1], "x": 60, "y": 0},
+                {"label": "K42", "matrix": [4, 2], "x": 61, "y": 0},
+                {"label": "K46", "matrix": [4, 6], "x": 62, "y": 0},
+                {"label": "K49", "matrix": [4, 9], "x": 63, "y": 0},
+                {"label": "K4A", "matrix": [4, 10], "x": 64, "y": 0},
+                {"label": "K4B", "matrix": [4, 11], "x": 65, "y": 0},
+                {"label": "K4C", "matrix": [4, 12], "x": 66, "y": 0},
+                {"label": "K4D", "matrix": [4, 13], "x": 67, "y": 0},
+                {"label": "K4E", "matrix": [4, 14], "x": 68, "y": 0}
+            ]
+        },
         "LAYOUT_encoder": {
             "layout": [
-                {"x": 1,"y": 0},
-                {"x": 14,"y": 0},
+                {"label": "K44", "matrix": [4, 4], "x": 1, "y": 0},
+
+                {"label": "K48", "matrix": [4, 8], "x": 14, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1, "w": 2},
-                {"x": 15, "y": 1},
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 1, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 15, "y": 2},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"x": 15, "y": 3},
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 3},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 1.75},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 4},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 4},
 
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 6.25},
-                {"x": 10, "y": 5},
-                {"x": 11, "y": 5},
-                {"x": 12, "y": 5},
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5}
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 5},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 5},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 5},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/tkw/stoutgat/v1/v1.c b/keyboards/tkw/stoutgat/v1/v1.c
deleted file mode 100644
index 10c82fd9f9..0000000000
--- a/keyboards/tkw/stoutgat/v1/v1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Thys de Wet
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#include QMK_KEYBOARD_H
diff --git a/keyboards/tkw/stoutgat/v1/v1.h b/keyboards/tkw/stoutgat/v1/v1.h
deleted file mode 100644
index 7c8c715748..0000000000
--- a/keyboards/tkw/stoutgat/v1/v1.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2020 Thys de Wet
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-
-#define _x_ KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_encoder( \
-       K44,                                                        K48, \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, K44, _x_, K46, _x_, K48, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_65_iso( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_65_ansi( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h
index 8161a873e5..b6a0586598 100644
--- a/keyboards/tkw/stoutgat/v2/config.h
+++ b/keyboards/tkw/stoutgat/v2/config.h
@@ -15,16 +15,9 @@
  */
 #pragma once
 
-
-#define MATRIX_COL_PINS { B0, A7, A6, A5, A4, A3, A1, A0, C15, C14, C13, A15, B3, B4, B5}
-#define MATRIX_ROW_PINS { B6, A2, B7, B9, B8 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define MATRIX_IO_DELAY 5
 #define TAP_CODE_DELAY 10
 
-#define RGB_DI_PIN B1
 #define RGBLED_NUM 13
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index 0b0877b38b..5cc58677d5 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -8,6 +8,15 @@
         "pid": "0x7811",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "B1",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "A7", "A6", "A5", "A4", "A3", "A1", "A0", "C15", "C14", "C13", "A15", "B3", "B4", "B5"],
+        "rows": ["B6", "A2", "B7", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B14", "pin_b": "B15"},
@@ -16,83 +25,310 @@
     },
     "community_layouts": ["65_iso", "65_ansi"],
     "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+
+                {"matrix": [2, 0], "x": 30, "y": 0},
+                {"matrix": [2, 1], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 13], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+
+                {"matrix": [3, 0], "x": 44, "y": 0},
+                {"matrix": [3, 2], "x": 45, "y": 0},
+                {"matrix": [3, 3], "x": 46, "y": 0},
+                {"matrix": [3, 4], "x": 47, "y": 0},
+                {"matrix": [3, 5], "x": 48, "y": 0},
+                {"matrix": [3, 6], "x": 49, "y": 0},
+                {"matrix": [3, 7], "x": 50, "y": 0},
+                {"matrix": [3, 8], "x": 51, "y": 0},
+                {"matrix": [3, 9], "x": 52, "y": 0},
+                {"matrix": [3, 10], "x": 53, "y": 0},
+                {"matrix": [3, 11], "x": 54, "y": 0},
+                {"matrix": [3, 12], "x": 55, "y": 0},
+                {"matrix": [3, 13], "x": 56, "y": 0},
+                {"matrix": [3, 14], "x": 57, "y": 0},
+
+                {"matrix": [4, 0], "x": 58, "y": 0},
+                {"matrix": [4, 1], "x": 59, "y": 0},
+                {"matrix": [4, 2], "x": 60, "y": 0},
+                {"matrix": [4, 6], "x": 61, "y": 0},
+                {"matrix": [4, 9], "x": 62, "y": 0},
+                {"matrix": [4, 10], "x": 63, "y": 0},
+                {"matrix": [4, 11], "x": 64, "y": 0},
+                {"matrix": [4, 12], "x": 65, "y": 0},
+                {"matrix": [4, 13], "x": 66, "y": 0},
+                {"matrix": [4, 14], "x": 67, "y": 0}
+            ]
+        },
+        "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},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+
+                {"matrix": [2, 0], "x": 30, "y": 0},
+                {"matrix": [2, 1], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+
+                {"matrix": [3, 0], "x": 44, "y": 0},
+                {"matrix": [3, 2], "x": 45, "y": 0},
+                {"matrix": [3, 3], "x": 46, "y": 0},
+                {"matrix": [3, 4], "x": 47, "y": 0},
+                {"matrix": [3, 5], "x": 48, "y": 0},
+                {"matrix": [3, 6], "x": 49, "y": 0},
+                {"matrix": [3, 7], "x": 50, "y": 0},
+                {"matrix": [3, 8], "x": 51, "y": 0},
+                {"matrix": [3, 9], "x": 52, "y": 0},
+                {"matrix": [3, 10], "x": 53, "y": 0},
+                {"matrix": [3, 11], "x": 54, "y": 0},
+                {"matrix": [3, 12], "x": 55, "y": 0},
+                {"matrix": [3, 13], "x": 56, "y": 0},
+                {"matrix": [3, 14], "x": 57, "y": 0},
+
+                {"matrix": [4, 0], "x": 58, "y": 0},
+                {"matrix": [4, 1], "x": 59, "y": 0},
+                {"matrix": [4, 2], "x": 60, "y": 0},
+                {"matrix": [4, 6], "x": 61, "y": 0},
+                {"matrix": [4, 9], "x": 62, "y": 0},
+                {"matrix": [4, 11], "x": 63, "y": 0},
+                {"matrix": [4, 12], "x": 64, "y": 0},
+                {"matrix": [4, 13], "x": 65, "y": 0},
+                {"matrix": [4, 14], "x": 66, "y": 0}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 14], "x": 28, "y": 0},
+
+                {"matrix": [2, 0], "x": 29, "y": 0},
+                {"matrix": [2, 1], "x": 30, "y": 0},
+                {"matrix": [2, 2], "x": 31, "y": 0},
+                {"matrix": [2, 3], "x": 32, "y": 0},
+                {"matrix": [2, 4], "x": 33, "y": 0},
+                {"matrix": [2, 5], "x": 34, "y": 0},
+                {"matrix": [2, 6], "x": 35, "y": 0},
+                {"matrix": [2, 7], "x": 36, "y": 0},
+                {"matrix": [2, 8], "x": 37, "y": 0},
+                {"matrix": [2, 9], "x": 38, "y": 0},
+                {"matrix": [2, 10], "x": 39, "y": 0},
+                {"matrix": [2, 11], "x": 40, "y": 0},
+                {"matrix": [2, 12], "x": 41, "y": 0},
+                {"matrix": [1, 13], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+
+                {"matrix": [3, 0], "x": 44, "y": 0},
+                {"matrix": [3, 1], "x": 45, "y": 0},
+                {"matrix": [3, 2], "x": 46, "y": 0},
+                {"matrix": [3, 3], "x": 47, "y": 0},
+                {"matrix": [3, 4], "x": 48, "y": 0},
+                {"matrix": [3, 5], "x": 49, "y": 0},
+                {"matrix": [3, 6], "x": 50, "y": 0},
+                {"matrix": [3, 7], "x": 51, "y": 0},
+                {"matrix": [3, 8], "x": 52, "y": 0},
+                {"matrix": [3, 9], "x": 53, "y": 0},
+                {"matrix": [3, 10], "x": 54, "y": 0},
+                {"matrix": [3, 11], "x": 55, "y": 0},
+                {"matrix": [3, 12], "x": 56, "y": 0},
+                {"matrix": [3, 13], "x": 57, "y": 0},
+                {"matrix": [3, 14], "x": 58, "y": 0},
+
+                {"matrix": [4, 0], "x": 59, "y": 0},
+                {"matrix": [4, 1], "x": 60, "y": 0},
+                {"matrix": [4, 2], "x": 61, "y": 0},
+                {"matrix": [4, 6], "x": 62, "y": 0},
+                {"matrix": [4, 9], "x": 63, "y": 0},
+                {"matrix": [4, 10], "x": 64, "y": 0},
+                {"matrix": [4, 11], "x": 65, "y": 0},
+                {"matrix": [4, 12], "x": 66, "y": 0},
+                {"matrix": [4, 13], "x": 67, "y": 0},
+                {"matrix": [4, 14], "x": 68, "y": 0}
+            ]
+        },
         "LAYOUT_encoder": {
             "layout": [
-                {"x": 1.25, "y": 0},
-                {"x": 2.25, "y": 0},
-                {"x": 3.25, "y": 0},
-                {"x": 4.25, "y": 0},
-                {"x": 5.25, "y": 0},
-                {"x": 6.25, "y": 0},
-                {"x": 7.25, "y": 0},
-                {"x": 8.25, "y": 0},
-                {"x": 9.25, "y": 0},
-                {"x": 10.25, "y": 0},
-                {"x": 11.25, "y": 0},
-                {"x": 12.25, "y": 0},
-                {"x": 13.25, "y": 0},
-                {"x": 14.25, "y": 0, "w": 2},
-                {"x": 16.25, "y": 0},
-
-                {"x": 1.25, "y": 1, "w": 1.5},
-                {"x": 2.75, "y": 1},
-                {"x": 3.75, "y": 1},
-                {"x": 4.75, "y": 1},
-                {"x": 5.75, "y": 1},
-                {"x": 6.75, "y": 1},
-                {"x": 7.75, "y": 1},
-                {"x": 8.75, "y": 1},
-                {"x": 9.75, "y": 1},
-                {"x": 10.75, "y": 1},
-                {"x": 11.75, "y": 1},
-                {"x": 12.75, "y": 1},
-                {"x": 13.75, "y": 1},
-                {"x": 16.25, "y": 1},
-
-                {"x": 1.25, "y": 2, "w": 1.75},
-                {"x": 3.0, "y": 2},
-                {"x": 4.0, "y": 2},
-                {"x": 5.0, "y": 2},
-                {"x": 6.0, "y": 2},
-                {"x": 7.0, "y": 2},
-                {"x": 8.0, "y": 2},
-                {"x": 9.0, "y": 2},
-                {"x": 10.0, "y": 2},
-                {"x": 11.0, "y": 2},
-                {"x": 12.0, "y": 2},
-                {"x": 13.0, "y": 2},
-                {"x": 14.0, "y": 2},
-                {"x": 15.0, "y": 1, "w": 1.25, "h": 2},
-                {"x": 16.25, "y": 2},
-
-                {"x": 0, "y": 3},
-
-                {"x": 1.25, "y": 3, "w": 1.25},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3, "w": 1.75},
-                {"x": 15.25, "y": 3},
-                {"x": 16.25, "y": 3},
-
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 1.25},
-                {"x": 5.0, "y": 4, "w": 6.25},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4},
-                {"x": 13.25, "y": 4},
-                {"x": 14.25, "y": 4},
-                {"x": 15.25, "y": 4},
-                {"x": 16.25, "y": 4}
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2.75, "y": 1},
+                {"matrix": [1, 2], "x": 3.75, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [1, 10], "x": 11.75, "y": 1},
+                {"matrix": [1, 11], "x": 12.75, "y": 1},
+                {"matrix": [1, 12], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [2, 3], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 6, "y": 2},
+                {"matrix": [2, 5], "x": 7, "y": 2},
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+                {"matrix": [2, 12], "x": 14, "y": 2},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 16.25, "y": 2},
+
+                {"matrix": [4, 4], "x": 0, "y": 3},
+                {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 2.5, "y": 3},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+                {"matrix": [3, 7], "x": 8.5, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+                {"matrix": [3, 14], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4},
+                {"matrix": [4, 10], "x": 12.25, "y": 4},
+                {"matrix": [4, 11], "x": 13.25, "y": 4},
+                {"matrix": [4, 12], "x": 14.25, "y": 4},
+                {"matrix": [4, 13], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/tkw/stoutgat/v2/rules.mk b/keyboards/tkw/stoutgat/v2/rules.mk
index 6dc2e4a634..477d680add 100644
--- a/keyboards/tkw/stoutgat/v2/rules.mk
+++ b/keyboards/tkw/stoutgat/v2/rules.mk
@@ -13,7 +13,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes        # Enable rotary encoder support
 AUDIO_ENABLE = no           # Audio output
 
-WS2812_DRIVER = pwm
 OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
 
 DEFAULT_FOLDER = tkw/stoutgat/v2/f411
diff --git a/keyboards/tkw/stoutgat/v2/v2.c b/keyboards/tkw/stoutgat/v2/v2.c
deleted file mode 100644
index 030f056abf..0000000000
--- a/keyboards/tkw/stoutgat/v2/v2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Thys de Wet
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "v2.h"
diff --git a/keyboards/tkw/stoutgat/v2/v2.h b/keyboards/tkw/stoutgat/v2/v2.h
deleted file mode 100644
index ff44742ff5..0000000000
--- a/keyboards/tkw/stoutgat/v2/v2.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2020 Thys de Wet
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_encoder( \
-          K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-          K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-          K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-    K44,  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-          K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, _x_, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, K44, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-#define LAYOUT_65_iso( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, _x_, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_65_ansi( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49,      K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, _x_, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, _x_, K4B, K4C, K4D, K4E} \
-}
diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h
index 1aac9574f8..4870446be4 100644
--- a/keyboards/tmo50/config.h
+++ b/keyboards/tmo50/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D5, D3, D2, D0 }
-#define MATRIX_COL_PINS { D1, D4, F0, F1, F4, F5, F6, F7, D6, D7, B4, B5, B6, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 10
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tmo50/info.json b/keyboards/tmo50/info.json
index 29b19aa513..2eafe3ecfb 100644
--- a/keyboards/tmo50/info.json
+++ b/keyboards/tmo50/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0050",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D4", "F0", "F1", "F4", "F5", "F6", "F7", "D6", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["D5", "D3", "D2", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h
index a77e6beece..5f36081323 100644
--- a/keyboards/toad/config.h
+++ b/keyboards/toad/config.h
@@ -1,32 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B3, B2, B1, E6, B7, C7, C6, D4, D6, D7, B4, D0, D1, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/toad/info.json b/keyboards/toad/info.json
index 637dc40422..dae8e33f11 100644
--- a/keyboards/toad/info.json
+++ b/keyboards/toad/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6776",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B3", "B2", "B1", "E6", "B7", "C7", "C6", "D4", "D6", "D7", "B4", "D0", "D1", "F7"],
+    "rows": ["B0", "F6", "F5", "F4", "F1", "F0"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "B6",
     "scroll_lock": "B5",
diff --git a/keyboards/toffee_studio/blueberry/config.h b/keyboards/toffee_studio/blueberry/config.h
index ca65d24ae1..b18dd40ccd 100644
--- a/keyboards/toffee_studio/blueberry/config.h
+++ b/keyboards/toffee_studio/blueberry/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
 #   define RGBLED_NUM 22
 
 /* RGB LED logical order map */
@@ -38,7 +36,6 @@
 #    define RGBLIGHT_EFFECT_CHRISTMAS
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/toffee_studio/blueberry/info.json b/keyboards/toffee_studio/blueberry/info.json
index 4c5adb3b6a..fb1fb56aad 100644
--- a/keyboards/toffee_studio/blueberry/info.json
+++ b/keyboards/toffee_studio/blueberry/info.json
@@ -8,6 +8,9 @@
         "pid": "0x626C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
     "matrix_pins": {
         "cols": ["B6", "D4", "D6", "D7", "B4", "B5", "C6", "C7"],
         "rows": ["E6", "B0", "B1", "F6", "F5", "F1", "F7", "F0", "F4"]
diff --git a/keyboards/tokyokeyboard/alix40/alix40.c b/keyboards/tokyokeyboard/alix40/alix40.c
deleted file mode 100644
index af0f361199..0000000000
--- a/keyboards/tokyokeyboard/alix40/alix40.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-Copyright 2021 quadcube <james@quadcube.xyz>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "alix40.h"
diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h
index 26736637cb..fad2d49c93 100644
--- a/keyboards/tokyokeyboard/alix40/config.h
+++ b/keyboards/tokyokeyboard/alix40/config.h
@@ -14,21 +14,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D7, C6, C7, B5 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D0, D1, D2, D3, D5, D6 }
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -43,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
-#endif
 
 /* Bluetooth */
 #define BATTERY_LEVEL_PIN   B6
diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json
index 513a883d8e..d314896095 100644
--- a/keyboards/tokyokeyboard/alix40/info.json
+++ b/keyboards/tokyokeyboard/alix40/info.json
@@ -8,11 +8,19 @@
         "pid": "0x4134",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"],
+        "rows": ["D7", "C6", "C7", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B7",
         "levels": 31,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h
index 8ba921eaeb..800cb31a2f 100644
--- a/keyboards/tokyokeyboard/tokyo60/config.h
+++ b/keyboards/tokyokeyboard/tokyo60/config.h
@@ -1,23 +1,14 @@
 #pragma once
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Set power consumption to work with mobile devices */
 #define USB_MAX_POWER_CONSUMPTION 100
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B2, B5, B4, D7, D6, B3 }
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -32,4 +23,3 @@
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 12
 #define RGBLIGHT_VAL_STEP 12
-#endif
diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json
index dd16c3f4c2..49a7c08f63 100644
--- a/keyboards/tokyokeyboard/tokyo60/info.json
+++ b/keyboards/tokyokeyboard/tokyo60/info.json
@@ -8,10 +8,18 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B2", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B7",
         "levels": 6
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_hhkb"],
diff --git a/keyboards/tokyokeyboard/tokyo60/tokyo60.c b/keyboards/tokyokeyboard/tokyo60/tokyo60.c
deleted file mode 100644
index 67113700a5..0000000000
--- a/keyboards/tokyokeyboard/tokyo60/tokyo60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tokyo60.h"
diff --git a/keyboards/tominabox1/adalyn/adalyn.c b/keyboards/tominabox1/adalyn/adalyn.c
deleted file mode 100644
index 837cb9c98a..0000000000
--- a/keyboards/tominabox1/adalyn/adalyn.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright TJ Campie
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#include "adalyn.h"
diff --git a/keyboards/tominabox1/adalyn/config.h b/keyboards/tominabox1/adalyn/config.h
index 1f67073e7b..389cdb9c13 100644
--- a/keyboards/tominabox1/adalyn/config.h
+++ b/keyboards/tominabox1/adalyn/config.h
@@ -15,23 +15,6 @@
   */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C7, D6, B7, B3 }
-#define MATRIX_COL_PINS { D7, B4, B5, B6, C6, F7, F6, F5, F4, F1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/tominabox1/adalyn/info.json b/keyboards/tominabox1/adalyn/info.json
index 93b478d560..e6129d081b 100644
--- a/keyboards/tominabox1/adalyn/info.json
+++ b/keyboards/tominabox1/adalyn/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6164",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1"],
+    "rows": ["C7", "D6", "B7", "B3"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/tominabox1/bigboy/bigboy.c b/keyboards/tominabox1/bigboy/bigboy.c
deleted file mode 100755
index 6871d81a62..0000000000
--- a/keyboards/tominabox1/bigboy/bigboy.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2022 tominabox1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif /* ENCODER_ENABLE */
diff --git a/keyboards/tominabox1/bigboy/config.h b/keyboards/tominabox1/bigboy/config.h
index b758c909d2..77d49adbec 100755
--- a/keyboards/tominabox1/bigboy/config.h
+++ b/keyboards/tominabox1/bigboy/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN B5
-
-#ifdef RGB_DI_PIN
-
     #define RGBLED_NUM 5
 
     #define RGBLIGHT_HUE_STEP 8
@@ -35,5 +31,3 @@
     #define RGBLIGHT_EFFECT_RGB_TEST
     #define RGBLIGHT_EFFECT_ALTERNATING
     #define RGBLIGHT_EFFECT_TWINKLE
-
-#endif /* RGB_DI_PIN */
diff --git a/keyboards/tominabox1/bigboy/info.json b/keyboards/tominabox1/bigboy/info.json
index 9797c96f46..5d954777ba 100644
--- a/keyboards/tominabox1/bigboy/info.json
+++ b/keyboards/tominabox1/bigboy/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6262",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "C6", "pin_b": "B6", "resolution": 2}
diff --git a/keyboards/tominabox1/le_chiffre/config.h b/keyboards/tominabox1/le_chiffre/config.h
index 64b902c0d8..fb3860b0eb 100644
--- a/keyboards/tominabox1/le_chiffre/config.h
+++ b/keyboards/tominabox1/le_chiffre/config.h
@@ -15,10 +15,6 @@
  */
 #pragma once
 
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/tominabox1/le_chiffre/he/config.h b/keyboards/tominabox1/le_chiffre/he/config.h
deleted file mode 100644
index f6193c3581..0000000000
--- a/keyboards/tominabox1/le_chiffre/he/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2022 tominabox1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-/* COL2ROW, ROW2COL*/
-#undef DIODE_DIRECTION
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B3, D4, F1, C6 }
-#define MATRIX_COL_PINS { F4, F5, B0, B2, B1, B4, D7, C7, D2, F7 }
-
-/*
- * WS2812 Underglow Matrix options
- */
-#define RGB_DI_PIN F0
diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/info.json
index 8f667298f8..209bafb76c 100644
--- a/keyboards/tominabox1/le_chiffre/he/info.json
+++ b/keyboards/tominabox1/le_chiffre/he/info.json
@@ -2,11 +2,22 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "B0", "B2", "B1", "B4", "D7", "C7", "D2", "F7"],
+        "rows": ["B3", "D4", "F1", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D5", "pin_b": "D3"}
         ]
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/tominabox1/le_chiffre/he/rules.mk b/keyboards/tominabox1/le_chiffre/he/rules.mk
index 812087ff8e..53d9b0d47b 100644
--- a/keyboards/tominabox1/le_chiffre/he/rules.mk
+++ b/keyboards/tominabox1/le_chiffre/he/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/tominabox1/le_chiffre/info.json b/keyboards/tominabox1/le_chiffre/info.json
index 6a7e10fad7..fb8ce09dff 100644
--- a/keyboards/tominabox1/le_chiffre/info.json
+++ b/keyboards/tominabox1/le_chiffre/info.json
@@ -9,7 +9,7 @@
   },
   "layouts": {
       "LAYOUT": {
-          "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Rotary", "x":5, "y":0, "w":1}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0},
+          "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Rotary", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0},
             {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1},
             {"label":";", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2},
             {"label":"", "x":1.75, "y":3, "w":1.25}, {"label":"", "x":3, "y":3, "w":2}, {"label":"", "x":6, "y":3, "w":2}, {"label":"", "x":8, "y":3, "w":1.25}]
diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/config.h b/keyboards/tominabox1/le_chiffre/keymaps/default/config.h
index ce604301a3..67b668d4bb 100644
--- a/keyboards/tominabox1/le_chiffre/keymaps/default/config.h
+++ b/keyboards/tominabox1/le_chiffre/keymaps/default/config.h
@@ -15,7 +15,5 @@
  */
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods
-
 #define COMBO_COUNT 5
 #define COMBO_TERM 30
diff --git a/keyboards/tominabox1/le_chiffre/rev1/config.h b/keyboards/tominabox1/le_chiffre/rev1/config.h
deleted file mode 100644
index db5d26d665..0000000000
--- a/keyboards/tominabox1/le_chiffre/rev1/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, D4, F1, C6 }
-#define MATRIX_COL_PINS { F4, F5, B0, B2, B1, B4, D7, C7, D2, F7 }
-
-/*
- * WS2812 Underglow Matrix options
- */
-#define RGB_DI_PIN F0
diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/info.json
index ce90b22975..963a25b410 100644
--- a/keyboards/tominabox1/le_chiffre/rev1/info.json
+++ b/keyboards/tominabox1/le_chiffre/rev1/info.json
@@ -2,11 +2,22 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "B0", "B2", "B1", "B4", "D7", "C7", "D2", "F7"],
+        "rows": ["B3", "D4", "F1", "C6"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "D5", "pin_b": "D3"}
         ]
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/tominabox1/le_chiffre/rev1/rules.mk b/keyboards/tominabox1/le_chiffre/rev1/rules.mk
index c1a9ea0595..7d791dd396 100644
--- a/keyboards/tominabox1/le_chiffre/rev1/rules.mk
+++ b/keyboards/tominabox1/le_chiffre/rev1/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 
diff --git a/keyboards/tominabox1/le_chiffre/rev2/config.h b/keyboards/tominabox1/le_chiffre/rev2/config.h
deleted file mode 100644
index edde93be3e..0000000000
--- a/keyboards/tominabox1/le_chiffre/rev2/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, F6, F7, C7 }
-#define MATRIX_COL_PINS { B2, F0, F1, F4, F5, B5, B4, D7, D6, D4 }
-
-/*
- * WS2812 Underglow Matrix options
- */
-#define RGB_DI_PIN B1
diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/info.json
index 3c20e5162e..ac09c6d879 100644
--- a/keyboards/tominabox1/le_chiffre/rev2/info.json
+++ b/keyboards/tominabox1/le_chiffre/rev2/info.json
@@ -2,11 +2,22 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "F0", "F1", "F4", "F5", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B3", "F6", "F7", "C7"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B6", "pin_b": "C6"}
         ]
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/tominabox1/le_chiffre/rev2/rules.mk b/keyboards/tominabox1/le_chiffre/rev2/rules.mk
index c1a9ea0595..7d791dd396 100644
--- a/keyboards/tominabox1/le_chiffre/rev2/rules.mk
+++ b/keyboards/tominabox1/le_chiffre/rev2/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/config.h b/keyboards/tominabox1/littlefoot_lx/rev1/config.h
deleted file mode 100644
index 6793168e0d..0000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev1/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/*
-Copyright 2022 tominabox1
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D5, F4, D3, F1, F0 }
-#define MATRIX_COL_PINS { D7, D6, D4, E2, F5, F6, F7, B6, B5, B4 } // uncomment for original groupbuy
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/info.json b/keyboards/tominabox1/littlefoot_lx/rev1/info.json
index c9e9f645cd..3e48c0ea9a 100644
--- a/keyboards/tominabox1/littlefoot_lx/rev1/info.json
+++ b/keyboards/tominabox1/littlefoot_lx/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6C78",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "D6", "D4", "E2", "F5", "F6", "F7", "B6", "B5", "B4"],
+        "rows": ["D5", "F4", "D3", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/rev1.c b/keyboards/tominabox1/littlefoot_lx/rev1/rev1.c
deleted file mode 100644
index 67d6fd800d..0000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 tominabox1
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "rev1.h"
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/config.h b/keyboards/tominabox1/littlefoot_lx/rev2/config.h
deleted file mode 100644
index 2cbf387dac..0000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev2/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/*
-Copyright 2022 tominabox1
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D5, F4, D3, F1, F0 }
-#define MATRIX_COL_PINS { D7, D6, D4, C7, F5, F6, F7, B6, B5, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/info.json b/keyboards/tominabox1/littlefoot_lx/rev2/info.json
index c9e9f645cd..05c02d0451 100644
--- a/keyboards/tominabox1/littlefoot_lx/rev2/info.json
+++ b/keyboards/tominabox1/littlefoot_lx/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6C78",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "D6", "D4", "C7", "F5", "F6", "F7", "B6", "B5", "B4"],
+        "rows": ["D5", "F4", "D3", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/rev2.c b/keyboards/tominabox1/littlefoot_lx/rev2/rev2.c
deleted file mode 100644
index 759d6f506d..0000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev2/rev2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 tominabox1
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "rev2.h"
diff --git a/keyboards/tominabox1/qaz/config.h b/keyboards/tominabox1/qaz/config.h
index bedbc5a2f3..a9b9df6815 100644
--- a/keyboards/tominabox1/qaz/config.h
+++ b/keyboards/tominabox1/qaz/config.h
@@ -1,30 +1,10 @@
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, D4, C6, E6, D1, D0 }
-#define MATRIX_COL_PINS { B4, D3, D2, F5, B5, F6, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F7
-
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,4 +19,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/tominabox1/qaz/info.json b/keyboards/tominabox1/qaz/info.json
index 8e9ce395cd..5dd7f7138c 100644
--- a/keyboards/tominabox1/qaz/info.json
+++ b/keyboards/tominabox1/qaz/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F7"
+  },
+  "matrix_pins": {
+    "cols": ["B4", "D3", "D2", "F5", "B5", "F6", "D7"],
+    "rows": ["F4", "D4", "C6", "E6", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/tominabox1/qaz/qaz.c b/keyboards/tominabox1/qaz/qaz.c
deleted file mode 100644
index a9e72fa610..0000000000
--- a/keyboards/tominabox1/qaz/qaz.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "qaz.h"
diff --git a/keyboards/tominabox1/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h
index 5e66f96089..333d0a100e 100644
--- a/keyboards/tominabox1/underscore33/rev1/config.h
+++ b/keyboards/tominabox1/underscore33/rev1/config.h
@@ -15,27 +15,7 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F5, F6, C6, D0 }
-#define MATRIX_COL_PINS { B4, B5, D5, F7, B1, F4, B3, D7, B0, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* #define RGB_DI_PIN B6
-   #define RGBLED_NUM 1  */
diff --git a/keyboards/tominabox1/underscore33/rev1/info.json b/keyboards/tominabox1/underscore33/rev1/info.json
index 2d71b0a327..7c7cd4a186 100644
--- a/keyboards/tominabox1/underscore33/rev1/info.json
+++ b/keyboards/tominabox1/underscore33/rev1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x3301",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B4", "B5", "D5", "F7", "B1", "F4", "B3", "D7", "B0", "B2"],
+    "rows": ["F5", "F6", "C6", "D0"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/tominabox1/underscore33/rev1/rev1.c b/keyboards/tominabox1/underscore33/rev1/rev1.c
deleted file mode 100644
index 4f763dbb49..0000000000
--- a/keyboards/tominabox1/underscore33/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h
index 1565904cfd..eac1807676 100644
--- a/keyboards/tominabox1/underscore33/rev2/config.h
+++ b/keyboards/tominabox1/underscore33/rev2/config.h
@@ -15,31 +15,12 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { C4, B0, B1, B2 }
-#define MATRIX_COL_PINS { C5, C6, C7, B7, B6, B5, B4, B3, C2, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D6
    #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json
index d6b5b04b2a..f8c1587bb7 100644
--- a/keyboards/tominabox1/underscore33/rev2/info.json
+++ b/keyboards/tominabox1/underscore33/rev2/info.json
@@ -8,6 +8,14 @@
     "pid": "0x3302",
     "device_version": "0.0.2"
   },
+  "ws2812": {
+    "pin": "D6"
+  },
+  "matrix_pins": {
+    "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "C2", "D0"],
+    "rows": ["C4", "B0", "B1", "B2"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "layouts": {
@@ -16,7 +24,7 @@
       },
 
       "LAYOUT_33_split_space": {
-          "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3, "w":1}, {"label":"", "x":1.65, "y":3, "w":1.25}, {"label":"", "x":2.9, "y":3, "w":2.25}, {"label":"", "x":5.15, "y":3, "w":2}, {"label":"", "x":7.15, "y":3, "w":1.25}, {"label":"", "x":8.4, "y":3, "w":1}]
+          "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},{"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":";", "x":9, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":5, "y":2}, {"label":"M", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"?", "x":9, "y":2}, {"label":"", "x":0.65, "y":3}, {"label":"", "x":1.65, "y":3, "w":1.25}, {"label":"", "x":2.9, "y":3, "w":2.25}, {"label":"", "x":5.15, "y":3, "w":2}, {"label":"", "x":7.15, "y":3, "w":1.25}, {"label":"", "x":8.4, "y":3}]
       }
   }
 }
diff --git a/keyboards/tominabox1/underscore33/rev2/rev2.c b/keyboards/tominabox1/underscore33/rev2/rev2.c
deleted file mode 100644
index e89b2938f9..0000000000
--- a/keyboards/tominabox1/underscore33/rev2/rev2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev2.h"
diff --git a/keyboards/torn/bongocat.c b/keyboards/torn/bongocat.c
index 9d6d9a85f5..8ca5e512f8 100644
--- a/keyboards/torn/bongocat.c
+++ b/keyboards/torn/bongocat.c
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include QMK_KEYBOARD_H
+#include "torn.h"
 
 #ifdef OLED_ENABLE
 
diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json
index 44b2f9a5dd..c5294d14af 100644
--- a/keyboards/torn/info.json
+++ b/keyboards/torn/info.json
@@ -18,50 +18,57 @@
   "layouts": {
     "LAYOUT_split_3x6_4": {
       "layout": [
-        {"label":"SW1",  "x":0, "y":0.375},
-        {"label":"SW2",  "x":1, "y":0.375},
-        {"label":"SW3",  "x":2, "y":0.125},
-        {"label":"SW4",  "x":3, "y":0},
-        {"label":"SW5",  "x":4, "y":0.125},
-        {"label":"SW6",  "x":5, "y":0.25},
-        {"label":"SW23", "x":9, "y":0.25},
-        {"label":"SW24", "x":10, "y":0.125},
-        {"label":"SW25", "x":11, "y":0},
-        {"label":"SW26", "x":12, "y":0.125},
-        {"label":"SW27", "x":13, "y":0.375},
-        {"label":"SW28", "x":14, "y":0.375},
-        {"label":"SW7",  "x":0, "y":1.375},
-        {"label":"SW8",  "x":1, "y":1.375},
-        {"label":"SW9",  "x":2, "y":1.125},
-        {"label":"SW10", "x":3, "y":1},
-        {"label":"SW11", "x":4, "y":1.125},
-        {"label":"SW12", "x":5, "y":1.25},
-        {"label":"SW29", "x":9, "y":1.25},
-        {"label":"SW30", "x":10, "y":1.125},
-        {"label":"SW31", "x":11, "y":1},
-        {"label":"SW32", "x":12, "y":1.125},
-        {"label":"SW33", "x":13, "y":1.375},
-        {"label":"SW34", "x":14, "y":1.375},
-        {"label":"SW13", "x":0, "y":2.375},
-        {"label":"SW14", "x":1, "y":2.375},
-        {"label":"SW15", "x":2, "y":2.125},
-        {"label":"SW16", "x":3, "y":2},
-        {"label":"SW17", "x":4, "y":2.125},
-        {"label":"SW18", "x":5, "y":2.25},
-        {"label":"SW35", "x":9, "y":2.25},
-        {"label":"SW36", "x":10, "y":2.125},
-        {"label":"SW37", "x":11, "y":2},
-        {"label":"SW38", "x":12, "y":2.125},
-        {"label":"SW39", "x":13, "y":2.375},
-        {"label":"SW40", "x":14, "y":2.375},
-        {"label":"SW19", "x":3, "y":3.1},
-        {"label":"SW20", "x":4, "y":3.25},
-        {"label":"SW21", "x":5, "y":3.40},
-        {"label":"SW22", "x":6, "y":3.55},
-        {"label":"SW41", "x":8, "y":3.55},
-        {"label":"SW42", "x":9, "y":3.40},
-        {"label":"SW43", "x":10, "y":3.25},
-        {"label":"SW44", "x":11, "y":3.1}
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.375},
+        {"matrix": [0, 2], "x": 2, "y": 0.125},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.125},
+        {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+        {"matrix": [0, 6], "x": 9, "y": 0.25},
+        {"matrix": [0, 7], "x": 10, "y": 0.125},
+        {"matrix": [0, 8], "x": 11, "y": 0},
+        {"matrix": [0, 9], "x": 12, "y": 0.125},
+        {"matrix": [0, 10], "x": 13, "y": 0.375},
+        {"matrix": [0, 11], "x": 14, "y": 0.375},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.375},
+        {"matrix": [1, 2], "x": 2, "y": 1.125},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.125},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+        {"matrix": [1, 6], "x": 9, "y": 1.25},
+        {"matrix": [1, 7], "x": 10, "y": 1.125},
+        {"matrix": [1, 8], "x": 11, "y": 1},
+        {"matrix": [1, 9], "x": 12, "y": 1.125},
+        {"matrix": [1, 10], "x": 13, "y": 1.375},
+        {"matrix": [1, 11], "x": 14, "y": 1.375},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.375},
+        {"matrix": [2, 2], "x": 2, "y": 2.125},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.125},
+        {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+        {"matrix": [2, 6], "x": 9, "y": 2.25},
+        {"matrix": [2, 7], "x": 10, "y": 2.125},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2.125},
+        {"matrix": [2, 10], "x": 13, "y": 2.375},
+        {"matrix": [2, 11], "x": 14, "y": 2.375},
+
+        {"matrix": [3, 2], "x": 3, "y": 3.1},
+        {"matrix": [3, 3], "x": 4, "y": 3.25},
+        {"matrix": [3, 4], "x": 5, "y": 3.4},
+        {"matrix": [3, 5], "x": 6, "y": 3.55},
+
+        {"matrix": [3, 6], "x": 8, "y": 3.55},
+        {"matrix": [3, 7], "x": 9, "y": 3.4},
+        {"matrix": [3, 8], "x": 10, "y": 3.25},
+        {"matrix": [3, 9], "x": 11, "y": 3.1}
       ]
     }
   }
diff --git a/keyboards/torn/matrix.c b/keyboards/torn/matrix.c
index dd7fa1e2e1..b674f21d57 100644
--- a/keyboards/torn/matrix.c
+++ b/keyboards/torn/matrix.c
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
 #include "mcp23018.h"
 
 #define SPLIT_MATRIX_COLS (MATRIX_COLS / 2)
diff --git a/keyboards/torn/mcp23018.c b/keyboards/torn/mcp23018.c
index c180f1dae5..12c4f9bc7f 100644
--- a/keyboards/torn/mcp23018.c
+++ b/keyboards/torn/mcp23018.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
 #include "i2c_master.h"
 #include "mcp23018.h"
 
diff --git a/keyboards/torn/mcp23018.h b/keyboards/torn/mcp23018.h
index 17ecaa5a7c..af5dbc7b25 100644
--- a/keyboards/torn/mcp23018.h
+++ b/keyboards/torn/mcp23018.h
@@ -17,6 +17,9 @@
 
 #pragma once
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #define IODIRA 0x00
 #define IODIRB 0x01
 #define GPPUA 0x0C
diff --git a/keyboards/torn/torn.h b/keyboards/torn/torn.h
index c25b5c2a0c..0b4355e86a 100644
--- a/keyboards/torn/torn.h
+++ b/keyboards/torn/torn.h
@@ -19,22 +19,6 @@
 
 #include "quantum.h"
 
-#define ___ KC_NO
-
-// clang-format off
-#define LAYOUT_split_3x6_4( \
-	k00, k01, k02, k03, k04, k05,   k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15,   k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25,   k26, k27, k28, k29, k2a, k2b, \
-	          k32, k33, k34, k35,   k36, k37, k38, k39 \
-) { \
-	{ k00, k01, k02, k03, k04, k05,   k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15,   k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25,   k26, k27, k28, k29, k2a, k2b }, \
-	{ ___, ___, k32, k33, k34, k35,   k36, k37, k38, k39, ___, ___ } \
-}
-// clang-format on
-
 void torn_set_led(uint8_t led, bool on);
 
 void secondary_encoder_read(void);
diff --git a/keyboards/touchpad/info.json b/keyboards/touchpad/info.json
index 999f8deb61..173ca1b4d7 100644
--- a/keyboards/touchpad/info.json
+++ b/keyboards/touchpad/info.json
@@ -13,12 +13,47 @@
     "layouts": {
         "LAYOUT_ortho_6x6": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1},
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2},
-                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3},
-                {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4},
-                {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":5}, {"x":4, "y":5}, {"x":5, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 5},
+                {"matrix": [5, 4], "x": 4, "y": 5},
+                {"matrix": [5, 5], "x": 5, "y": 5}
             ]
         }
     }
diff --git a/keyboards/touchpad/touchpad.c b/keyboards/touchpad/touchpad.c
deleted file mode 100644
index fe96d56b68..0000000000
--- a/keyboards/touchpad/touchpad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "touchpad.h"
diff --git a/keyboards/touchpad/touchpad.h b/keyboards/touchpad/touchpad.h
deleted file mode 100644
index 97b59a033c..0000000000
--- a/keyboards/touchpad/touchpad.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT_ortho_6x6( \
-    K00, K01, K02, K03, K04, K05, \
-    K10, K11, K12, K13, K14, K15, \
-    K20, K21, K22, K23, K24, K25, \
-    K30, K31, K32, K33, K34, K35, \
-    K40, K41, K42, K43, K44, K45, \
-    K50, K51, K52, K53, K54, K55  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05 }, \
-    { K10, K11, K12, K13, K14, K15 }, \
-    { K20, K21, K22, K23, K24, K25 }, \
-    { K30, K31, K32, K33, K34, K35 }, \
-    { K40, K41, K42, K43, K44, K45 }, \
-    { K50, K51, K52, K53, K54, K55 }  \
-}
diff --git a/keyboards/tr60w/config.h b/keyboards/tr60w/config.h
index 39f21310ca..a6dfefb6b9 100644
--- a/keyboards/tr60w/config.h
+++ b/keyboards/tr60w/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, B1, B2, E6, B3 }
-#define MATRIX_COL_PINS { F5, F4, F1, F0, B0, D5, D3, D6, D7, B4, B5, B6, C6, D2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/tr60w/info.json b/keyboards/tr60w/info.json
index 15025926ce..01ec8b32c7 100644
--- a/keyboards/tr60w/info.json
+++ b/keyboards/tr60w/info.json
@@ -8,9 +8,17 @@
         "pid": "0x4140",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "F1", "F0", "B0", "D5", "D3", "D6", "D7", "B4", "B5", "B6", "C6", "D2"],
+        "rows": ["D0", "D1", "B1", "B2", "E6", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h
index 4889ef5c18..64c34a8008 100644
--- a/keyboards/trashman/ketch/config.h
+++ b/keyboards/trashman/ketch/config.h
@@ -22,12 +22,7 @@ SOFTWARE.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { F5, F1, F0, F7, B6, F6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
-#define RGB_DI_PIN F4
 #define RGBLED_NUM 10
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json
index 57c6289d0d..6b4ea75bb0 100644
--- a/keyboards/trashman/ketch/info.json
+++ b/keyboards/trashman/ketch/info.json
@@ -8,6 +8,14 @@
     "pid": "0x8947",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F4"
+  },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
+    "rows": ["F5", "F1", "F0", "F7", "B6", "F6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/trashman/ketch/ketch.c b/keyboards/trashman/ketch/ketch.c
deleted file mode 100644
index 5c38f47664..0000000000
--- a/keyboards/trashman/ketch/ketch.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 
-Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "ketch.h"
diff --git a/keyboards/treasure/type9/config.h b/keyboards/treasure/type9/config.h
index 35b03eebfb..d876570c80 100644
--- a/keyboards/treasure/type9/config.h
+++ b/keyboards/treasure/type9/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { E6, D7, C6 }
-#define MATRIX_COL_PINS { D1, D0, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/treasure/type9/info.json b/keyboards/treasure/type9/info.json
index c2ed86346f..cab118fc8e 100644
--- a/keyboards/treasure/type9/info.json
+++ b/keyboards/treasure/type9/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D1", "D0", "D4"],
+    "rows": ["E6", "D7", "C6"]
+  },
+  "diode_direction": "ROW2COL",
   "backlight": {
     "pin": "B5",
     "levels": 10
@@ -16,7 +21,19 @@
   "bootloader": "atmel-dfu",
   "layouts": {
       "LAYOUT": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]
+          "layout": [
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+
+              {"matrix": [1, 0], "x": 0, "y": 1},
+              {"matrix": [1, 1], "x": 1, "y": 1},
+              {"matrix": [1, 2], "x": 2, "y": 1},
+
+              {"matrix": [2, 0], "x": 0, "y": 2},
+              {"matrix": [2, 1], "x": 1, "y": 2},
+              {"matrix": [2, 2], "x": 2, "y": 2}
+          ]
       }
   }
 }
diff --git a/keyboards/treasure/type9/type9.c b/keyboards/treasure/type9/type9.c
deleted file mode 100644
index 466f294672..0000000000
--- a/keyboards/treasure/type9/type9.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "type9.h"
diff --git a/keyboards/treasure/type9/type9.h b/keyboards/treasure/type9/type9.h
deleted file mode 100644
index 6034416f16..0000000000
--- a/keyboards/treasure/type9/type9.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22 \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 } \
-}
diff --git a/keyboards/treasure/type9s2/config.h b/keyboards/treasure/type9s2/config.h
deleted file mode 100644
index f4e04317ce..0000000000
--- a/keyboards/treasure/type9s2/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Treasure
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments*/
-#define MATRIX_ROW_PINS { B4, B5, D2 }
-#define MATRIX_COL_PINS { B2, B3, C5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/treasure/type9s2/info.json b/keyboards/treasure/type9s2/info.json
index bcb719c76f..71264940d0 100644
--- a/keyboards/treasure/type9s2/info.json
+++ b/keyboards/treasure/type9s2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5492",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "C5"],
+        "rows": ["B4", "B5", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
@@ -16,15 +21,17 @@
     "layouts": {
         "LAYOUT_ortho_3x3": {
             "layout": [
-                {"label": "7", "x": 0, "y": 0},
-                {"label": "8", "x": 1, "y": 0},
-                {"label": "9", "x": 2, "y": 0},
-                {"label": "4", "x": 0, "y": 1},
-                {"label": "5", "x": 1, "y": 1},
-                {"label": "6", "x": 2, "y": 1},
-                {"label": "1", "x": 0, "y": 2},
-                {"label": "2", "x": 1, "y": 2},
-                {"label": "3", "x": 2, "y": 2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2}
             ]
         }
     }
diff --git a/keyboards/treasure/type9s2/type9s2.c b/keyboards/treasure/type9s2/type9s2.c
deleted file mode 100644
index f5c86e0006..0000000000
--- a/keyboards/treasure/type9s2/type9s2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Treasure
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "type9s2.h"
diff --git a/keyboards/treasure/type9s2/type9s2.h b/keyboards/treasure/type9s2/type9s2.h
deleted file mode 100644
index 1a18416bc1..0000000000
--- a/keyboards/treasure/type9s2/type9s2.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Treasure
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x3( \
-	K00, K01, K02, \
-	K10, K11, K12, \
-	K20, K21, K22  \
-) { \
-	{ K00,   K01,   K02 }, \
-	{ K10,   K11,   K12 }, \
-	{ K20,   K21,   K22 }  \
-}
diff --git a/keyboards/tronguylabs/m122_3270/blackpill/config.h b/keyboards/tronguylabs/m122_3270/blackpill/config.h
deleted file mode 100644
index 03d97de30e..0000000000
--- a/keyboards/tronguylabs/m122_3270/blackpill/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 James R. Maynard III <jaymaynard@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Blackpill pin assignments: reversed the rows from the Teensy version for easier PCB layout
-// DO NOT USE the following pins: A9 (has pulldown on it), A11/A12 (USB lines), B2 (external pulldown)
-// C13 has an LED, and C13/C14/C15 are best used as inputs (with DIODE_DIRECTION set to ROW2COL, the
-// rows are inputs). Note that every usable I/O pin is used.
-#define MATRIX_COL_PINS { B0, B1, B10, B12, B13, B14, B15, A8, A7, A10, A6, A5, A15, B3, B4, B5, B6, B7, B8, B9 }
-#define MATRIX_ROW_PINS { C13, C14, C15, A0, A1, A2, A3, A4 }
diff --git a/keyboards/tronguylabs/m122_3270/blackpill/info.json b/keyboards/tronguylabs/m122_3270/blackpill/info.json
index f5e8f4835d..b17554b7e0 100644
--- a/keyboards/tronguylabs/m122_3270/blackpill/info.json
+++ b/keyboards/tronguylabs/m122_3270/blackpill/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B10", "B12", "B13", "B14", "B15", "A8", "A7", "A10", "A6", "A5", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
+        "rows": ["C13", "C14", "C15", "A0", "A1", "A2", "A3", "A4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/tronguylabs/m122_3270/bluepill/config.h b/keyboards/tronguylabs/m122_3270/bluepill/config.h
deleted file mode 100644
index c8cf8523f6..0000000000
--- a/keyboards/tronguylabs/m122_3270/bluepill/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 James R. Maynard III <jaymaynard@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// place overrides below
-
-// Blackpill pin assignments: reversed the rows from the Teensy version for easier PCB layout
-// DO NOT USE the following pins: A9 (has pulldown on it), A11/A12 (USB lines), B2 (external pulldown)
-// C13 has an LED, and C13/C14/C15 are best used as inputs (with DIODE_DIRECTION set to ROW2COL, the
-// rows are inputs). Note that every usable I/O pin is used.
-#define MATRIX_COL_PINS { B1, B10, B11, B12, B13, B14, B15, A8, B0, A10, A7, A6, A15, B3, B4, B5, B6, B7, B8, B9 }
-#define MATRIX_ROW_PINS { C13, C14, C15, A1, A2, A3, A4, A5 }
diff --git a/keyboards/tronguylabs/m122_3270/bluepill/info.json b/keyboards/tronguylabs/m122_3270/bluepill/info.json
index 86af52a58d..e2f18d06e4 100644
--- a/keyboards/tronguylabs/m122_3270/bluepill/info.json
+++ b/keyboards/tronguylabs/m122_3270/bluepill/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "B0", "A10", "A7", "A6", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
+        "rows": ["C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F103",
     "bootloader": "stm32duino"
 }
diff --git a/keyboards/tronguylabs/m122_3270/config.h b/keyboards/tronguylabs/m122_3270/config.h
index e51a882c42..754e0977c4 100644
--- a/keyboards/tronguylabs/m122_3270/config.h
+++ b/keyboards/tronguylabs/m122_3270/config.h
@@ -19,6 +19,3 @@
 
 // Both controllers draw 100 mA or less
 #define USB_MAX_POWER_CONSUMPTION 100
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/tronguylabs/m122_3270/m122_3270.c b/keyboards/tronguylabs/m122_3270/m122_3270.c
deleted file mode 100644
index 397d495c23..0000000000
--- a/keyboards/tronguylabs/m122_3270/m122_3270.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 James R. Maynard III
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "m122_3270.h"
diff --git a/keyboards/tronguylabs/m122_3270/teensy/config.h b/keyboards/tronguylabs/m122_3270/teensy/config.h
deleted file mode 100644
index b105ecad52..0000000000
--- a/keyboards/tronguylabs/m122_3270/teensy/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 James R. Maynard III <jaymaynard@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Teensy pin assignments: I'm wiring things a bit more straightforwardly, and
-//    avoiding the LED on PD6
-#define MATRIX_COL_PINS { B5, B6, B7, D0, D1, D2, D3, D4, D5, D7, E0, E1, C0, C1, C2, C3, C4, C5, C6, C7 }
-#define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 }
diff --git a/keyboards/tronguylabs/m122_3270/teensy/info.json b/keyboards/tronguylabs/m122_3270/teensy/info.json
index def31867f6..7596f5fc15 100644
--- a/keyboards/tronguylabs/m122_3270/teensy/info.json
+++ b/keyboards/tronguylabs/m122_3270/teensy/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"],
+        "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "at90usb1286",
     "bootloader": "halfkay"
 }
diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h
index 36b36c81f5..4ef7a66314 100644
--- a/keyboards/tszaboo/ortho4exent/config.h
+++ b/keyboards/tszaboo/ortho4exent/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, D4, D7, B4 }
-/*                         0   1   2   3   4   5   6   7   8   9  10  11  12  13  14*/
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D6, D5, D3, D2, D1, B7, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
- #define RGB_DI_PIN B6
- #ifdef RGB_DI_PIN
    #define RGBLED_NUM 18
 
    #define RGBLIGHT_HUE_STEP 8
@@ -54,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
- #endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/info.json
index 2bc233fcee..5bd5baef9d 100644
--- a/keyboards/tszaboo/ortho4exent/info.json
+++ b/keyboards/tszaboo/ortho4exent/info.json
@@ -8,6 +8,14 @@
     	"pid": "0x7934",
     	"device_version": "0.0.1"
     },
+    "ws2812": {
+    	"pin": "B6"
+    },
+    "matrix_pins": {
+      "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D6", "D5", "D3", "D2", "D1", "B7", "B3", "B2"],
+      "rows": ["B0", "B1", "D4", "D7", "B4"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
     	"caps_lock": "E6"
     },
diff --git a/keyboards/tszaboo/ortho4exent/ortho4exent.c b/keyboards/tszaboo/ortho4exent/ortho4exent.c
deleted file mode 100644
index b6ef9fedcf..0000000000
--- a/keyboards/tszaboo/ortho4exent/ortho4exent.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 tszaboo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ortho4exent.h"
diff --git a/keyboards/tunks/ergo33/config.h b/keyboards/tunks/ergo33/config.h
index 04db2f1665..5ab6f8a347 100644
--- a/keyboards/tunks/ergo33/config.h
+++ b/keyboards/tunks/ergo33/config.h
@@ -16,19 +16,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
-*/
-#define MATRIX_ROW_PINS { F0, F1, B5, B4, D7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Underglow + top RGB configuration */
-#define RGB_DI_PIN D4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tunks/ergo33/ergo33.c b/keyboards/tunks/ergo33/ergo33.c
deleted file mode 100644
index 9426558167..0000000000
--- a/keyboards/tunks/ergo33/ergo33.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Mika Kuitunen 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */
-
-#include "ergo33.h"
diff --git a/keyboards/tunks/ergo33/info.json b/keyboards/tunks/ergo33/info.json
index 1495d5137a..afb589db13 100644
--- a/keyboards/tunks/ergo33/info.json
+++ b/keyboards/tunks/ergo33/info.json
@@ -7,6 +7,14 @@
     "pid": "0xA0A1",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D4"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6"],
+    "rows": ["F0", "F1", "B5", "B4", "D7"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "D5", "pin_b": "D3"}
diff --git a/keyboards/tw40/config.h b/keyboards/tw40/config.h
index 76ff8a3359..7c93823314 100644
--- a/keyboards/tw40/config.h
+++ b/keyboards/tw40/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, D5, D3, D2 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 15
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/tw40/info.json b/keyboards/tw40/info.json
index 86cba9bbfe..5c24e3e1b1 100644
--- a/keyboards/tw40/info.json
+++ b/keyboards/tw40/info.json
@@ -8,6 +8,14 @@
     "pid": "0x5457",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "E6"
+  },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+    "rows": ["B0", "D5", "D3", "D2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/tw40/tw40.c b/keyboards/tw40/tw40.c
deleted file mode 100644
index 0bd8425ab3..0000000000
--- a/keyboards/tw40/tw40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 KnoblesseOblige
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "tw40.h"
diff --git a/keyboards/tweetydabird/lbs4/info.json b/keyboards/tweetydabird/lbs4/info.json
index 2f194d658b..cdf016838c 100644
--- a/keyboards/tweetydabird/lbs4/info.json
+++ b/keyboards/tweetydabird/lbs4/info.json
@@ -47,7 +47,6 @@
     
     "rgblight": {
         "led_count": 6,
-        "pin": "D2",
         "hue_steps": 8,
         "saturation_steps": 17,
         "brightness_steps": 17,
@@ -59,17 +58,20 @@
             "static_gradient": true
         }
     },
+    "ws2812": {
+        "pin": "D2"
+    },
 
     "layouts": {
         "LAYOUT": {
             "layout": [
             { "label": "Play", "matrix": [0, 2], "x": 2, "y": 0, "w": 2, "h": 2 }, 
             
-            { "label": "F1", "matrix": [0, 0], "x": 0, "y": 0, "w": 1, "h": 1 }, 
-            { "label": "F2", "matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 }, 
+            { "label": "F1", "matrix": [0, 0], "x": 0, "y": 0 }, 
+            { "label": "F2", "matrix": [0, 1], "x": 1, "y": 0 }, 
             
-            { "label": "F3", "matrix": [1, 0], "x": 0, "y": 1, "w": 1, "h": 1 },
-            { "label": "F4", "matrix": [1, 1], "x": 1, "y": 1, "w": 1, "h": 1 }
+            { "label": "F3", "matrix": [1, 0], "x": 0, "y": 1 },
+            { "label": "F4", "matrix": [1, 1], "x": 1, "y": 1 }
             ]
         }
     }
diff --git a/keyboards/tweetydabird/lbs6/info.json b/keyboards/tweetydabird/lbs6/info.json
index a0612fabd6..49588adf60 100644
--- a/keyboards/tweetydabird/lbs6/info.json
+++ b/keyboards/tweetydabird/lbs6/info.json
@@ -46,7 +46,6 @@
 
     "rgblight": {
         "led_count": 8,
-        "pin": "D2",
         "hue_steps": 8,
         "saturation_steps": 17,
         "brightness_steps": 17,
@@ -58,19 +57,22 @@
             "static_gradient": true
         }
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     
     "layouts": {
         "LAYOUT": {
             "layout": [
-            { "label": "Play", "matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 }, 
+            { "label": "Play", "matrix": [0, 1], "x": 1, "y": 0 }, 
             
-            { "label": "F1", "matrix": [1, 0], "x": 0, "y": 1, "w": 1, "h": 1 }, 
-            { "label": "F2", "matrix": [1, 1], "x": 1, "y": 1, "w": 1, "h": 1 }, 
-            { "label": "F3", "matrix": [1, 2], "x": 2, "y": 1, "w": 1, "h": 1 },
+            { "label": "F1", "matrix": [1, 0], "x": 0, "y": 1 }, 
+            { "label": "F2", "matrix": [1, 1], "x": 1, "y": 1 }, 
+            { "label": "F3", "matrix": [1, 2], "x": 2, "y": 1 },
             
-            { "label": "F4", "matrix": [2, 0], "x": 0, "y": 2, "w": 1, "h": 1 },
-            { "label": "F5", "matrix": [2, 1], "x": 1, "y": 2, "w": 1, "h": 1 },
-            { "label": "F6", "matrix": [2, 2], "x": 2, "y": 2, "w": 1, "h": 1 }
+            { "label": "F4", "matrix": [2, 0], "x": 0, "y": 2 },
+            { "label": "F5", "matrix": [2, 1], "x": 1, "y": 2 },
+            { "label": "F6", "matrix": [2, 2], "x": 2, "y": 2 }
             ]
         }
     }
diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h
index e8b2abc1f6..af98f887db 100644
--- a/keyboards/tzarc/djinn/config.h
+++ b/keyboards/tzarc/djinn/config.h
@@ -1,4 +1,4 @@
-// Copyright 2018-2022 Nick Brassel (@tzarc)
+// Copyright 2018-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
@@ -16,6 +16,7 @@
 #define SPLIT_LED_STATE_ENABLE
 #define SPLIT_MODS_ENABLE
 #define SPLIT_WPM_ENABLE
+#define SPLIT_ACTIVITY_ENABLE
 
 // SPI Configuration
 #define SPI_DRIVER SPID3
@@ -40,7 +41,6 @@
 #define BACKLIGHT_PAL_MODE 1
 
 // RGB configuration
-#define RGB_DI_PIN B2
 #define WS2812_EXTERNAL_PULLUP
 #define WS2812_PWM_DRIVER PWMD20
 #define WS2812_PWM_CHANNEL 1
diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c
index 93b1ee775e..17e5833ee9 100644
--- a/keyboards/tzarc/djinn/djinn.c
+++ b/keyboards/tzarc/djinn/djinn.c
@@ -1,4 +1,4 @@
-// Copyright 2018-2022 Nick Brassel (@tzarc)
+// Copyright 2018-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include <string.h>
 #include "quantum.h"
@@ -74,7 +74,6 @@ void keyboard_post_init_kb(void) {
     qp_init(lcd, QP_ROTATION_0);
 
     // Turn on the LCD and clear the display
-    kb_state.lcd_power = 1;
     qp_power(lcd, true);
     qp_rect(lcd, 0, 0, 239, 319, HSV_BLACK, true);
 
@@ -187,18 +186,14 @@ void housekeeping_task_kb(void) {
     }
 
     // Turn on/off the LCD
-    static bool lcd_on = false;
-    if (lcd_on != (bool)kb_state.lcd_power) {
-        lcd_on = (bool)kb_state.lcd_power;
-        qp_power(lcd, lcd_on);
-    }
+    bool peripherals_on = last_input_activity_elapsed() < LCD_ACTIVITY_TIMEOUT;
 
     // Enable/disable RGB
-    if (lcd_on) {
+    if (peripherals_on) {
         // Turn on RGB
         writePinHigh(RGB_POWER_ENABLE_PIN);
         // Modify the RGB state if different to the LCD state
-        if (rgb_matrix_is_enabled() != lcd_on) {
+        if (rgb_matrix_is_enabled() != peripherals_on) {
             // Wait for a small amount of time to allow the RGB capacitors to charge, before enabling RGB output
             wait_ms(10);
             // Enable RGB
@@ -208,21 +203,21 @@ void housekeeping_task_kb(void) {
         // Turn off RGB
         writePinLow(RGB_POWER_ENABLE_PIN);
         // Disable the PWM output for the RGB
-        if (rgb_matrix_is_enabled() != lcd_on) {
+        if (rgb_matrix_is_enabled() != peripherals_on) {
             rgb_matrix_disable_noeeprom();
         }
     }
 
     // Match the backlight to the LCD state
-    if (is_keyboard_master() && is_backlight_enabled() != lcd_on) {
-        if (lcd_on)
+    if (is_keyboard_master() && is_backlight_enabled() != peripherals_on) {
+        if (peripherals_on)
             backlight_enable();
         else
             backlight_disable();
     }
 
     // Draw the UI
-    if (kb_state.lcd_power) {
+    if (peripherals_on) {
         draw_ui_user(false);
     }
 
diff --git a/keyboards/tzarc/djinn/djinn.h b/keyboards/tzarc/djinn/djinn.h
index ff6b555e8e..70aa34ff08 100644
--- a/keyboards/tzarc/djinn/djinn.h
+++ b/keyboards/tzarc/djinn/djinn.h
@@ -1,4 +1,4 @@
-// Copyright 2018-2022 Nick Brassel (@tzarc)
+// Copyright 2018-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 #include "quantum.h"
@@ -20,7 +20,6 @@ const char* usbpd_str(usbpd_allowance_t allowance);
 #pragma pack(push)
 #pragma pack(1)
 typedef struct kb_runtime_config {
-    unsigned          lcd_power : 1;
     usbpd_allowance_t current_setting : 2;
 } kb_runtime_config;
 #pragma pack(pop)
diff --git a/keyboards/tzarc/djinn/djinn_split_sync.c b/keyboards/tzarc/djinn/djinn_split_sync.c
index 3c7a58d155..8b10e88b4b 100644
--- a/keyboards/tzarc/djinn/djinn_split_sync.c
+++ b/keyboards/tzarc/djinn/djinn_split_sync.c
@@ -1,4 +1,4 @@
-// Copyright 2018-2022 Nick Brassel (@tzarc)
+// Copyright 2018-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include <string.h>
 #include "quantum.h"
@@ -13,9 +13,6 @@ void kb_state_update(void) {
     if (is_keyboard_master()) {
         // Modify allowed current limits
         usbpd_update();
-
-        // Turn off the LCD if there's been no matrix activity
-        kb_state.lcd_power = (last_input_activity_elapsed() < LCD_ACTIVITY_TIMEOUT) ? 1 : 0;
     }
 }
 
diff --git a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
index c9863f2285..f321308ac5 100644
--- a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
+++ b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
@@ -1,6 +1,5 @@
 // Copyright 2018-2022 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
 #include <hal.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json
index 19f5e52060..c1c313e9ef 100644
--- a/keyboards/tzarc/djinn/info.json
+++ b/keyboards/tzarc/djinn/info.json
@@ -33,6 +33,13 @@
     "pin": "A7",
     "levels": 4
   },
+  "ws2812": {
+    "pin": "B2",
+    "driver": "pwm"
+  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
   "split": {
     "enabled": true,
     "main": "pin",
diff --git a/keyboards/tzarc/djinn/rev1/rev1.c b/keyboards/tzarc/djinn/rev1/rev1.c
deleted file mode 100644
index 95f0e20020..0000000000
--- a/keyboards/tzarc/djinn/rev1/rev1.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2018-2022 Nick Brassel (@tzarc)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "rev1.h"
diff --git a/keyboards/tzarc/djinn/rev1/rev1.h b/keyboards/tzarc/djinn/rev1/rev1.h
deleted file mode 100644
index 1845cb8fdd..0000000000
--- a/keyboards/tzarc/djinn/rev1/rev1.h
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2018-2022 Nick Brassel (@tzarc)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
diff --git a/keyboards/tzarc/djinn/rev2/rev2.c b/keyboards/tzarc/djinn/rev2/rev2.c
deleted file mode 100644
index f55e0c224a..0000000000
--- a/keyboards/tzarc/djinn/rev2/rev2.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2018-2022 Nick Brassel (@tzarc)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "rev2.h"
diff --git a/keyboards/tzarc/djinn/rev2/rev2.h b/keyboards/tzarc/djinn/rev2/rev2.h
deleted file mode 100644
index 1845cb8fdd..0000000000
--- a/keyboards/tzarc/djinn/rev2/rev2.h
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2018-2022 Nick Brassel (@tzarc)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk
index 9b81a4bfaf..e7c32e4dc1 100644
--- a/keyboards/tzarc/djinn/rules.mk
+++ b/keyboards/tzarc/djinn/rules.mk
@@ -2,11 +2,8 @@ CUSTOM_MATRIX = lite
 
 SERIAL_DRIVER = usart
 
-WS2812_DRIVER = pwm
 CIE1931_CURVE = yes
 
-RGB_MATRIX_DRIVER = WS2812
-
 EEPROM_DRIVER = spi
 
 AUDIO_DRIVER = pwm_software
diff --git a/keyboards/tzarc/ghoul/ghoul.c b/keyboards/tzarc/ghoul/ghoul.c
index aceb24764b..a97399110c 100644
--- a/keyboards/tzarc/ghoul/ghoul.c
+++ b/keyboards/tzarc/ghoul/ghoul.c
@@ -1,6 +1,6 @@
 // Copyright 2018-2022 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-3.0-or-later
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 #include "analog.h"
 #include "spi_master.h"
 
diff --git a/keyboards/tzarc/ghoul/info.json b/keyboards/tzarc/ghoul/info.json
index 14e833c5b2..e6f3adf19c 100644
--- a/keyboards/tzarc/ghoul/info.json
+++ b/keyboards/tzarc/ghoul/info.json
@@ -15,6 +15,9 @@
     "quantum_painter": true,
     "rgb_matrix": true
   },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
   "matrix_pins": {
     "rows": ["NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN"],
     "cols": ["NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN"]
@@ -26,47 +29,47 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-        { "label": "W", "matrix": [0, 4], "w": 1, "x": 1, "y": 0 },
-        { "label": "E", "matrix": [1, 0], "w": 1, "x": 2, "y": 0 },
-        { "label": "R", "matrix": [1, 4], "w": 1, "x": 3, "y": 0 },
-        { "label": "T", "matrix": [2, 0], "w": 1, "x": 4, "y": 0 },
-        { "label": "kEC", "matrix": [5, 0], "w": 1, "x": 5.5, "y": 0 },
-        { "label": "Y", "matrix": [2, 4], "w": 1, "x": 7, "y": 0 },
-        { "label": "U", "matrix": [3, 0], "w": 1, "x": 8, "y": 0 },
-        { "label": "I", "matrix": [3, 4], "w": 1, "x": 9, "y": 0 },
-        { "label": "O", "matrix": [4, 0], "w": 1, "x": 10, "y": 0 },
-        { "label": "P", "matrix": [4, 4], "w": 1, "x": 11, "y": 0 },
-        { "label": "A", "matrix": [0, 1], "w": 1, "x": 0, "y": 1 },
-        { "label": "S", "matrix": [0, 5], "w": 1, "x": 1, "y": 1 },
-        { "label": "D", "matrix": [1, 1], "w": 1, "x": 2, "y": 1 },
-        { "label": "F", "matrix": [1, 5], "w": 1, "x": 3, "y": 1 },
-        { "label": "G", "matrix": [2, 1], "w": 1, "x": 4, "y": 1 },
-        { "label": "H", "matrix": [2, 5], "w": 1, "x": 7, "y": 1 },
-        { "label": "J", "matrix": [3, 1], "w": 1, "x": 8, "y": 1 },
-        { "label": "K", "matrix": [3, 5], "w": 1, "x": 9, "y": 1 },
-        { "label": "L", "matrix": [4, 1], "w": 1, "x": 10, "y": 1 },
-        { "label": ";", "matrix": [4, 5], "w": 1, "x": 11, "y": 1 },
-        { "label": "Z", "matrix": [0, 2], "w": 1, "x": 0, "y": 2 },
-        { "label": "X", "matrix": [0, 6], "w": 1, "x": 1, "y": 2 },
-        { "label": "C", "matrix": [1, 2], "w": 1, "x": 2, "y": 2 },
-        { "label": "V", "matrix": [1, 6], "w": 1, "x": 3, "y": 2 },
-        { "label": "B", "matrix": [2, 2], "w": 1, "x": 4, "y": 2 },
-        { "label": "N", "matrix": [2, 6], "w": 1, "x": 7, "y": 2 },
-        { "label": "M", "matrix": [3, 2], "w": 1, "x": 8, "y": 2 },
-        { "label": ",", "matrix": [3, 6], "w": 1, "x": 9, "y": 2 },
-        { "label": ".", "matrix": [4, 2], "w": 1, "x": 10, "y": 2 },
-        { "label": "/", "matrix": [4, 6], "w": 1, "x": 11, "y": 2 },
-        { "label": "Ctrl", "matrix": [0, 3], "w": 1, "x": 0, "y": 3 },
-        { "label": "Alt", "matrix": [0, 7], "w": 1, "x": 1, "y": 3 },
-        { "label": "Super", "matrix": [1, 3], "w": 1, "x": 2, "y": 3 },
-        { "label": "Lower", "matrix": [1, 7], "w": 1, "x": 3, "y": 3 },
-        { "label": "Space", "matrix": [2, 3], "w": 1, "x": 4, "y": 3 },
-        { "label": "Space", "matrix": [2, 7], "w": 1, "x": 7, "y": 3 },
-        { "label": "Raise", "matrix": [3, 3], "w": 1, "x": 8, "y": 3 },
-        { "label": "&larr;", "matrix": [3, 7], "w": 1, "x": 9, "y": 3 },
-        { "label": "&darr;", "matrix": [4, 3], "w": 1, "x": 10, "y": 3 },
-        { "label": "&uarr;", "matrix": [4, 7], "w": 1, "x": 11, "y": 3 }
+        { "label": "Q", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "W", "matrix": [0, 4], "x": 1, "y": 0 },
+        { "label": "E", "matrix": [1, 0], "x": 2, "y": 0 },
+        { "label": "R", "matrix": [1, 4], "x": 3, "y": 0 },
+        { "label": "T", "matrix": [2, 0], "x": 4, "y": 0 },
+        { "label": "kEC", "matrix": [5, 0], "x": 5.5, "y": 0 },
+        { "label": "Y", "matrix": [2, 4], "x": 7, "y": 0 },
+        { "label": "U", "matrix": [3, 0], "x": 8, "y": 0 },
+        { "label": "I", "matrix": [3, 4], "x": 9, "y": 0 },
+        { "label": "O", "matrix": [4, 0], "x": 10, "y": 0 },
+        { "label": "P", "matrix": [4, 4], "x": 11, "y": 0 },
+        { "label": "A", "matrix": [0, 1], "x": 0, "y": 1 },
+        { "label": "S", "matrix": [0, 5], "x": 1, "y": 1 },
+        { "label": "D", "matrix": [1, 1], "x": 2, "y": 1 },
+        { "label": "F", "matrix": [1, 5], "x": 3, "y": 1 },
+        { "label": "G", "matrix": [2, 1], "x": 4, "y": 1 },
+        { "label": "H", "matrix": [2, 5], "x": 7, "y": 1 },
+        { "label": "J", "matrix": [3, 1], "x": 8, "y": 1 },
+        { "label": "K", "matrix": [3, 5], "x": 9, "y": 1 },
+        { "label": "L", "matrix": [4, 1], "x": 10, "y": 1 },
+        { "label": ";", "matrix": [4, 5], "x": 11, "y": 1 },
+        { "label": "Z", "matrix": [0, 2], "x": 0, "y": 2 },
+        { "label": "X", "matrix": [0, 6], "x": 1, "y": 2 },
+        { "label": "C", "matrix": [1, 2], "x": 2, "y": 2 },
+        { "label": "V", "matrix": [1, 6], "x": 3, "y": 2 },
+        { "label": "B", "matrix": [2, 2], "x": 4, "y": 2 },
+        { "label": "N", "matrix": [2, 6], "x": 7, "y": 2 },
+        { "label": "M", "matrix": [3, 2], "x": 8, "y": 2 },
+        { "label": ",", "matrix": [3, 6], "x": 9, "y": 2 },
+        { "label": ".", "matrix": [4, 2], "x": 10, "y": 2 },
+        { "label": "/", "matrix": [4, 6], "x": 11, "y": 2 },
+        { "label": "Ctrl", "matrix": [0, 3], "x": 0, "y": 3 },
+        { "label": "Alt", "matrix": [0, 7], "x": 1, "y": 3 },
+        { "label": "Super", "matrix": [1, 3], "x": 2, "y": 3 },
+        { "label": "Lower", "matrix": [1, 7], "x": 3, "y": 3 },
+        { "label": "Space", "matrix": [2, 3], "x": 4, "y": 3 },
+        { "label": "Space", "matrix": [2, 7], "x": 7, "y": 3 },
+        { "label": "Raise", "matrix": [3, 3], "x": 8, "y": 3 },
+        { "label": "&larr;", "matrix": [3, 7], "x": 9, "y": 3 },
+        { "label": "&darr;", "matrix": [4, 3], "x": 10, "y": 3 },
+        { "label": "&uarr;", "matrix": [4, 7], "x": 11, "y": 3 }
       ]
     }
   }
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/config.h b/keyboards/tzarc/ghoul/rev1/rp2040/config.h
index 39b587bab0..616d4ab84a 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/config.h
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/config.h
@@ -22,7 +22,6 @@
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN GP2
 
 // RGB configuration
-#define RGB_DI_PIN GP13
 #define RGB_ENABLE_PIN GP6
 
 // ADC Configuration
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/info.json b/keyboards/tzarc/ghoul/rev1/rp2040/info.json
index 57b4cb772f..86856ac721 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/info.json
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/info.json
@@ -11,5 +11,9 @@
         "resolution": 2
       }
     ]
+  },
+  "ws2812": {
+    "pin": "GP13",
+    "driver": "vendor"
   }
 }
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk b/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/config.h b/keyboards/tzarc/ghoul/rev1/stm32/config.h
index 12c9f77d5e..1dbc164039 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/config.h
+++ b/keyboards/tzarc/ghoul/rev1/stm32/config.h
@@ -25,7 +25,6 @@
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN A4
 
 // RGB configuration
-#define RGB_DI_PIN C6
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/info.json b/keyboards/tzarc/ghoul/rev1/stm32/info.json
index 11dcde90c9..c77fc17dfa 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/info.json
+++ b/keyboards/tzarc/ghoul/rev1/stm32/info.json
@@ -3,6 +3,10 @@
   "processor": "STM32F405",
   "bootloader": "stm32-dfu",
   "bootloader_instructions": "Press the 5 keys on the bottom row of the left side, or hold the boot switch and tap the reset switch, or hold the top-left key when plugging in the board.",
+  "ws2812": {
+    "pin": "C6",
+    "driver": "pwm"
+  },
   "encoder": {
     "rotary": [
       {
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
index c1285e300c..e69de29bb2 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
+++ b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = pwm
diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk
index a18cf56fce..10630d80cf 100644
--- a/keyboards/tzarc/ghoul/rules.mk
+++ b/keyboards/tzarc/ghoul/rules.mk
@@ -1,6 +1,5 @@
 CUSTOM_MATRIX = lite
 EEPROM_DRIVER = spi
-RGB_MATRIX_DRIVER = WS2812
 QUANTUM_PAINTER_DRIVERS = ssd1351_spi
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
diff --git a/keyboards/ubest/vn/config.h b/keyboards/ubest/vn/config.h
index 75551832f1..3e6c6dc0e5 100644
--- a/keyboards/ubest/vn/config.h
+++ b/keyboards/ubest/vn/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B0, B7, D0, D1 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B5, B4, D7, D6, D4, D5, D3 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 8
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -49,4 +31,3 @@
 //     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json
index 348a51fc7a..fc28aa5bea 100644
--- a/keyboards/ubest/vn/info.json
+++ b/keyboards/ubest/vn/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0868",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["E6", "B0", "B7", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "B3",
         "num_lock": "B1",
diff --git a/keyboards/ubest/vn/vn.c b/keyboards/ubest/vn/vn.c
deleted file mode 100644
index 309812f675..0000000000
--- a/keyboards/ubest/vn/vn.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 water <mfkiiyd@163.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vn.h"
-
-
diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h
index 3a9e21ea60..ab971a55ad 100644
--- a/keyboards/uk78/config.h
+++ b/keyboards/uk78/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F3, F2, F1, F0, A0 }
-#define MATRIX_COL_PINS { A2, A1, F5, F4, E6, E7, E5, E4, B7, D0, D1, D2, D3, D4, D5, D6, D7, B5, E0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -32,8 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812b options */
-#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,4 +38,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/uk78/info.json b/keyboards/uk78/info.json
index fbbc15609c..5f3ccdb678 100644
--- a/keyboards/uk78/info.json
+++ b/keyboards/uk78/info.json
@@ -8,9 +8,17 @@
     "pid": "0x004E",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["A2", "A1", "F5", "F4", "E6", "E7", "E5", "E4", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "E0"],
+    "rows": ["F3", "F2", "F1", "F0", "A0"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6"
   },
+  "ws2812": {
+    "pin": "F6"
+  },
   "processor": "at90usb1286",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/uk78/uk78.c b/keyboards/uk78/uk78.c
deleted file mode 100644
index 3611427d02..0000000000
--- a/keyboards/uk78/uk78.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "uk78.h"
diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h
index dc63dc77bd..9c6459abbd 100644
--- a/keyboards/ungodly/launch_pad/config.h
+++ b/keyboards/ungodly/launch_pad/config.h
@@ -15,22 +15,11 @@
  */
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
-    { D4, D6, D7, B4, B5 }
-#define MATRIX_COL_PINS \
-    { B0, B1, B2, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Midi Slider */
 #define SLIDER_PIN F6
 #define MIDI_ADVANCED
 
 /* RGB Matrix configuration */
-#define RGB_DI_PIN F7
 #ifdef RGB_MATRIX_ENABLE
 #    define RGBLED_NUM 22
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json
index a6e12f3374..97f3d10407 100644
--- a/keyboards/ungodly/launch_pad/info.json
+++ b/keyboards/ungodly/launch_pad/info.json
@@ -8,6 +8,17 @@
     "pid": "0x4C50",
     "device_version": "99.9.9"
   },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3"],
+    "rows": ["D4", "D6", "D7", "B4", "B5"]
+  },
+  "ws2812": {
+    "pin": "F7"
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "C6", "pin_b": "B6", "resolution": 2}
@@ -18,30 +29,30 @@
   "layouts": {
     "LAYOUT_ortho_5x4": {
         "layout": [
-            {"x":0, "y":0},
-            {"x":1, "y":0},
-            {"x":2, "y":0},
-            {"x":3, "y":0},
+            {"matrix": [0, 0], "x": 0, "y": 0},
+            {"matrix": [0, 1], "x": 1, "y": 0},
+            {"matrix": [0, 2], "x": 2, "y": 0},
+            {"matrix": [0, 3], "x": 3, "y": 0},
 
-            {"x":0, "y":1},
-            {"x":1, "y":1},
-            {"x":2, "y":1},
-            {"x":3, "y":1},
+            {"matrix": [1, 0], "x": 0, "y": 1},
+            {"matrix": [1, 1], "x": 1, "y": 1},
+            {"matrix": [1, 2], "x": 2, "y": 1},
+            {"matrix": [1, 3], "x": 3, "y": 1},
 
-            {"x":0, "y":2},
-            {"x":1, "y":2},
-            {"x":2, "y":2},
-            {"x":3, "y":2},
+            {"matrix": [2, 0], "x": 0, "y": 2},
+            {"matrix": [2, 1], "x": 1, "y": 2},
+            {"matrix": [2, 2], "x": 2, "y": 2},
+            {"matrix": [2, 3], "x": 3, "y": 2},
 
-            {"x":0, "y":3},
-            {"x":1, "y":3},
-            {"x":2, "y":3},
-            {"x":3, "y":3},
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3},
+            {"matrix": [3, 3], "x": 3, "y": 3},
 
-            {"x":0, "y":4},
-            {"x":1, "y":4},
-            {"x":2, "y":4},
-            {"x":3, "y":4}
+            {"matrix": [4, 0], "x": 0, "y": 4},
+            {"matrix": [4, 1], "x": 1, "y": 4},
+            {"matrix": [4, 2], "x": 2, "y": 4},
+            {"matrix": [4, 3], "x": 3, "y": 4}
         ]
     }
   }
diff --git a/keyboards/ungodly/launch_pad/launch_pad.c b/keyboards/ungodly/launch_pad/launch_pad.c
index e5ec112f9b..9803d8674f 100644
--- a/keyboards/ungodly/launch_pad/launch_pad.c
+++ b/keyboards/ungodly/launch_pad/launch_pad.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "launch_pad.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/ungodly/launch_pad/launch_pad.h b/keyboards/ungodly/launch_pad/launch_pad.h
deleted file mode 100644
index 7a7815f34f..0000000000
--- a/keyboards/ungodly/launch_pad/launch_pad.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2020 Ungodly Design <hello@ungodly.design>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* 4x5 numpad matrix layout
-   * ,-------------------.
-   * | 00 | 01 | 02 | 03 |
-   * |----|----|----|----|
-   * | 10 | 11 | 12 | 13 |
-   * |----|----|----|----|
-   * | 20 | 21 | 22 | 23 |
-   * |----|----|----|----|
-   * | 30 | 31 | 32 | 33 |
-   * |----|----|----|----|
-   * | 40 | 41 | 42 | 43 |
-   * `-------------------'
- */
-
- /* Numpad matrix layout
-    * ,-------------------.
-    * | 00 | 01 | 02 | 03 |
-    * |----|----|----|----|
-    * | 10 | 11 | 12 | 13 |
-    * |----|----|----|----|
-    * | 20 | 21 | 22 | 23 |
-    * |----|----|----|----|
-    * | 30 | 31 | 32 |    |
-    * |----|----|----| 33 |
-    * |   41    | 42 |    |
-    * `-------------------'
-  */
-
-#define LAYOUT_ortho_5x4( \
-	k00, k01, k02, k03,  \
-	k10, k11, k12, k13,  \
-	k20, k21, k22, k23,  \
-	k30, k31, k32, k33,  \
-	k40, k41, k42, k43   \
-) \
-{ \
-	{k00, k01, k02, k03}, \
-	{k10, k11, k12, k13}, \
-	{k20, k21, k22, k23}, \
-	{k30, k31, k32, k33}, \
-	{k40, k41, k42, k43}  \
-}
diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk
index 1177444e3e..5b696a9b07 100644
--- a/keyboards/ungodly/launch_pad/rules.mk
+++ b/keyboards/ungodly/launch_pad/rules.mk
@@ -15,7 +15,6 @@ OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 SPACE_CADET_ENABLE = no
 MAGIC_ENABLE = no
 GRAVE_ESC_ENABLE = no
diff --git a/keyboards/ungodly/nines/nines.c b/keyboards/ungodly/nines/nines.c
deleted file mode 100644
index bfb3bb889d..0000000000
--- a/keyboards/ungodly/nines/nines.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 Ungodly Design <hello@ungodly.design>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- #include "quantum.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (index == 0) { /* Left encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) { /* Right encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
index 3230af6024..a8dcd9418f 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
@@ -7,2639 +7,393 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
-    "community_layouts": [
-        "fullsize_ansi",
-        "fullsize_iso"
-    ],
+    "community_layouts": ["fullsize_ansi", "fullsize_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 13,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 14,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 13.75,
-                    "y": 3.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        13
-                    ],
-                    "x": 12.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 13.25,
-                    "y": 4.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 5,
-                    "y": 5.5,
-                    "w": 4.75
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 18.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5},
+                {"matrix": [1, 8], "x": 14, "y": 1.5},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5},
+
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 3.5},
+
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 13.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5},
+
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.75, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 4], "x": 4, "y": 5.5},
+                {"matrix": [7, 13], "x": 5, "y": 5.5, "w": 4.75},
+                {"matrix": [6, 4], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 13], "x": 11, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 12], "x": 12.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+
+                {"matrix": [5, 14], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 19.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5},
+                {"matrix": [6, 14], "x": 21.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 12.75,
-                    "y": 3.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 5.75
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 8], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.75, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 13], "x": 4, "y": 5.5, "w": 5.75},
+                {"matrix": [6, 4], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 13], "x": 11, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 12], "x": 12.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+
+                {"matrix": [5, 11], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 13.75,
-                    "y": 2.5,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 5.75
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 8], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.75, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 13], "x": 4, "y": 5.5, "w": 5.75},
+                {"matrix": [6, 4], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 13], "x": 11, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 12], "x": 12.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+
+                {"matrix": [5, 11], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h
index c9a5d49447..b5ed9415d5 100644
--- a/keyboards/unikeyboard/diverge3/config.h
+++ b/keyboards/unikeyboard/diverge3/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #ifndef SELECT_SOFT_SERIAL_SPEED
 #define SELECT_SOFT_SERIAL_SPEED 3
 #endif
diff --git a/keyboards/unikeyboard/diverge3/diverge3.c b/keyboards/unikeyboard/diverge3/diverge3.c
deleted file mode 100644
index 4143b14275..0000000000
--- a/keyboards/unikeyboard/diverge3/diverge3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 IslandMan93
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "diverge3.h"
diff --git a/keyboards/unikeyboard/diverge3/diverge3.h b/keyboards/unikeyboard/diverge3/diverge3.h
index c668bb29ef..c052bcb0fc 100644
--- a/keyboards/unikeyboard/diverge3/diverge3.h
+++ b/keyboards/unikeyboard/diverge3/diverge3.h
@@ -18,14 +18,6 @@
 
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
 #define XXX KC_NO
 
 // This a shortcut to help you visually see your layout.
diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
index c2caaca881..4aac244492 100644
--- a/keyboards/unikeyboard/diverge3/info.json
+++ b/keyboards/unikeyboard/diverge3/info.json
@@ -8,6 +8,11 @@
     "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,
diff --git a/keyboards/unikeyboard/divergetm2/config.h b/keyboards/unikeyboard/divergetm2/config.h
index 7f8054f183..78d133446e 100644
--- a/keyboards/unikeyboard/divergetm2/config.h
+++ b/keyboards/unikeyboard/divergetm2/config.h
@@ -17,23 +17,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/unikeyboard/divergetm2/divergetm2.c b/keyboards/unikeyboard/divergetm2/divergetm2.c
deleted file mode 100644
index 61ea45416c..0000000000
--- a/keyboards/unikeyboard/divergetm2/divergetm2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Christon DeWan (xton)
- * Copyright 2017 IslandMan93
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "divergetm2.h"
diff --git a/keyboards/unikeyboard/divergetm2/divergetm2.h b/keyboards/unikeyboard/divergetm2/divergetm2.h
index 6de48e41c7..c3d9ab650f 100644
--- a/keyboards/unikeyboard/divergetm2/divergetm2.h
+++ b/keyboards/unikeyboard/divergetm2/divergetm2.h
@@ -19,14 +19,6 @@
 
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json
index e8a3ac1bb3..d97d10d118 100644
--- a/keyboards/unikeyboard/divergetm2/info.json
+++ b/keyboards/unikeyboard/divergetm2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1256",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h
index a3a667d632..7bc78f68d6 100644
--- a/keyboards/unikeyboard/felix/config.h
+++ b/keyboards/unikeyboard/felix/config.h
@@ -1,22 +1,5 @@
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B2, B3, B1, F7, F6 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/unikeyboard/felix/felix.c b/keyboards/unikeyboard/felix/felix.c
deleted file mode 100644
index 013360d043..0000000000
--- a/keyboards/unikeyboard/felix/felix.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "felix.h"
diff --git a/keyboards/unikeyboard/felix/felix.h b/keyboards/unikeyboard/felix/felix.h
deleted file mode 100644
index f43a586c8e..0000000000
--- a/keyboards/unikeyboard/felix/felix.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4( \
-    K000, K001, K002, K003, \
-    K100, K101, K102, K103, \
-    K200, K201, K202, K203, \
-    K300, K301, K302, K303, \
-    K400, K401, K402, K403  \
-) { \
-    { K000, K001, K002, K003 }, \
-    { K100, K101, K102, K103 }, \
-    { K200, K201, K202, K203 }, \
-    { K300, K301, K302, K303 }, \
-    { K400, K401, K402, K403 }  \
-}
-
-#define LAYOUT LAYOUT_ortho_5x4
diff --git a/keyboards/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/info.json
index ee74cb134f..7c5a013d8a 100644
--- a/keyboards/unikeyboard/felix/info.json
+++ b/keyboards/unikeyboard/felix/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B5", "B4", "E6", "D7"],
+    "rows": ["B2", "B3", "B1", "F7", "F6"]
+  },
+  "diode_direction": "ROW2COL",
   "backlight": {
     "pin": "C6",
     "levels": 5
@@ -15,29 +20,36 @@
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_5x4"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_5x4"
+  },
   "layouts": {
     "LAYOUT_ortho_5x4": {
       "layout": [
-        {"label":"K000", "x":0, "y":0},
-        {"label":"K001", "x":1, "y":0},
-        {"label":"K002", "x":2, "y":0},
-        {"label":"K003", "x":3, "y":0},
-        {"label":"K100", "x":0, "y":1},
-        {"label":"K101", "x":1, "y":1},
-        {"label":"K102", "x":2, "y":1},
-        {"label":"K103", "x":3, "y":1},
-        {"label":"K200", "x":0, "y":2},
-        {"label":"K201", "x":1, "y":2},
-        {"label":"K202", "x":2, "y":2},
-        {"label":"K203", "x":3, "y":2},
-        {"label":"K300", "x":0, "y":3},
-        {"label":"K301", "x":1, "y":3},
-        {"label":"K302", "x":2, "y":3},
-        {"label":"K303", "x":3, "y":3},
-        {"label":"K400", "x":0, "y":4},
-        {"label":"K401", "x":1, "y":4},
-        {"label":"K402", "x":2, "y":4},
-        {"label":"K403", "x":3, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4}
       ]
     }
   }
diff --git a/keyboards/unikorn/config.h b/keyboards/unikorn/config.h
index fc91f5138f..4c3789155e 100644
--- a/keyboards/unikorn/config.h
+++ b/keyboards/unikorn/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-//                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
-#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 17
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/unikorn/info.json b/keyboards/unikorn/info.json
index b894a98dac..1b4bd60751 100644
--- a/keyboards/unikorn/info.json
+++ b/keyboards/unikorn/info.json
@@ -8,9 +8,17 @@
         "pid": "0x556B",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B1", "B2", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1"
     },
diff --git a/keyboards/unikorn/rules.mk b/keyboards/unikorn/rules.mk
index 4ba2386220..88711b2127 100644
--- a/keyboards/unikorn/rules.mk
+++ b/keyboards/unikorn/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = no
-WS2812_DRIVER = i2c
diff --git a/keyboards/unikorn/unikorn.c b/keyboards/unikorn/unikorn.c
deleted file mode 100644
index d803ebf9da..0000000000
--- a/keyboards/unikorn/unikorn.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "unikorn.h"
diff --git a/keyboards/unison/keymaps/via/config.h b/keyboards/unison/keymaps/via/config.h
index 8475af2baa..48fe417a5d 100644
--- a/keyboards/unison/keymaps/via/config.h
+++ b/keyboards/unison/keymaps/via/config.h
@@ -16,10 +16,8 @@
 
 #pragma once
 
-#ifdef RGB_DI_PIN
     #undef RGBLED_NUM
     #define RGBLED_NUM 17 // Layer Indicator(2) + Rotary Encoder(5) + Optional(2) + Under(8)
 
     #undef RGBLIGHT_LED_MAP
     #define RGBLIGHT_LED_MAP {2, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16} // Left to Right to Under
-#endif
diff --git a/keyboards/unison/keymaps/via/keymap.c b/keyboards/unison/keymaps/via/keymap.c
index fe3ff4e82f..f61574ac12 100644
--- a/keyboards/unison/keymaps/via/keymap.c
+++ b/keyboards/unison/keymaps/via/keymap.c
@@ -128,10 +128,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
    Post Initialize
 ------------------------------------------------------------------------------ */
 void keyboard_post_init_user(void) {
-    #ifdef RGB_DI_PIN
     // RGB Lighting: Set effect range from just after indicator.
     rgblight_set_effect_range(1, 16);
-    #endif
     #ifdef RGBLIGHT_LAYERS
     // RGB Lighting Layers: Setup LED layers
     rgblight_layers = my_rgb_layers;
diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h
index 6e3ba625e2..1c1eaef7fd 100644
--- a/keyboards/unison/v04/config.h
+++ b/keyboards/unison/v04/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-/* NOTE: With Round-Robin matrix, set same pins for both. */
-#define MATRIX_ROW_PINS { B3, E6, F1, F5, F7, B2, F0, F4, F6, C7 }
-#define MATRIX_COL_PINS { B3, E6, F1, F5, F7, B2, F0, F4, F6, C7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Audio */
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN C6
@@ -34,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 /* RGB Lighting */
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 7 // Layer Indicator(2) + Rotary Encoder(5)
   #define RGBLIGHT_LED_MAP {1, 2, 0, 3, 4, 5, 6} // align LEDs from Left to Right
   #define RGBLIGHT_HUE_STEP 4
@@ -57,7 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // #define RGBLIGHT_EFFECT_RGB_TEST
   // #define RGBLIGHT_EFFECT_ALTERNATING
   #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json
index a772d344d2..4b911f6096 100644
--- a/keyboards/unison/v04/info.json
+++ b/keyboards/unison/v04/info.json
@@ -8,6 +8,14 @@
         "pid": "0x176A",
         "device_version": "0.4.0"
     },
+    "matrix_pins": {
+        "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"],
+        "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"]
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "B1"},
@@ -25,20 +33,176 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0.5}, {"label":"/", "x":1, "y":0.5}, {"label":"*", "x":2, "y":0.5}, {"label":"-", "x":3, "y":0.5}, {"label":"Esc", "x":4, "y":0.5}, {"label":"1", "x":5, "y":0.5}, {"label":"2", "x":6, "y":0.5}, {"label":"3", "x":7, "y":0.5}, {"label":"4", "x":8, "y":0.5}, {"label":"5", "x":9, "y":0.5}, {"label":"6", "x":10, "y":0.5}, {"label":"7", "x":11, "y":0.5}, {"label":"8", "x":12, "y":0.5}, {"label":"9", "x":13, "y":0.5}, {"label":"0", "x":14, "y":0.5}, {"label":"-", "x":15, "y":0.5}, {"label":"=", "x":16, "y":0.5},
-                {"label":"7", "x":0, "y":1.5}, {"label":"8", "x":1, "y":1.5}, {"label":"9", "x":2, "y":1.5}, {"label":"+", "x":3, "y":1.5}, {"label":"Tab", "x":4, "y":1.5, "w":1.5}, {"label":"Q", "x":5.5, "y":1.5}, {"label":"W", "x":6.5, "y":1.5}, {"label":"E", "x":7.5, "y":1.5}, {"label":"R", "x":8.5, "y":1.5}, {"label":"T", "x":9.5, "y":1.5}, {"label":"Y", "x":10.5, "y":1.5}, {"label":"U", "x":11.5, "y":1.5}, {"label":"I", "x":12.5, "y":1.5}, {"label":"O", "x":13.5, "y":1.5}, {"label":"P", "x":14.5, "y":1.5}, {"label":"Backspace", "x":15.5, "y":1.5, "w":1.5},
-                {"label":"4", "x":0, "y":2.5}, {"label":"5", "x":1, "y":2.5}, {"label":"6", "x":2, "y":2.5}, {"label":"+", "x":3, "y":2.5}, {"label":"Ctrl", "x":4, "y":2.5, "w":1.5}, {"label":"A", "x":5.5, "y":2.5}, {"label":"S", "x":6.5, "y":2.5}, {"label":"D", "x":7.5, "y":2.5}, {"label":"F", "x":8.5, "y":2.5}, {"label":"G", "x":9.5, "y":2.5}, {"label":"H", "x":10.5, "y":2.5}, {"label":"J", "x":11.5, "y":2.5}, {"label":"K", "x":12.5, "y":2.5}, {"label":"L", "x":13.5, "y":2.5}, {"label":";", "x":14.5, "y":2.5}, {"label":"Enter", "x":15.5, "y":2.5, "w":1.5},
-                {"label":"1", "x":0, "y":3.5}, {"label":"2", "x":1, "y":3.5}, {"label":"3", "x":2, "y":3.5}, {"label":"Enter", "x":3, "y":3.5}, {"label":"Sfhift", "x":4, "y":3.5}, {"label":"Shift", "x":5, "y":3.5}, {"label":"Z", "x":6, "y":3.5}, {"label":"X", "x":7, "y":3.5}, {"label":"C", "x":8, "y":3.5}, {"label":"V", "x":9, "y":3.5}, {"label":"B", "x":10, "y":3.5}, {"label":"N", "x":11, "y":3.5}, {"label":"M", "x":12, "y":3.5}, {"label":"<", "x":13, "y":3.5}, {"label":">", "x":14, "y":3.5}, {"label":"Up", "x":15, "y":3.5}, {"label":"?", "x":16, "y":3.5},
-                {"label":"0", "x":0, "y":4.5}, {"label":"00", "x":1, "y":4.5}, {"label":".", "x":2, "y":4.5}, {"label":"Enter", "x":3, "y":4.5}, {"x":4, "y":4.5}, {"x":5, "y":4.5}, {"label":"Opt", "x":6, "y":4.5}, {"label":"Cmd", "x":7, "y":4.5}, {"label":"Lower", "x":8, "y":4.5}, {"label":"Lower", "x":9, "y":4.5}, {"x":10, "y":4.5}, {"label":"Raise", "x":11, "y":4.5}, {"label":"Raise", "x":12, "y":4.5}, {"label":"Cmd", "x":13, "y":4.5}, {"label":"Left", "x":14, "y":4.5}, {"label":"Down", "x":15, "y":4.5}, {"label":"Right", "x":16, "y":4.5}
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+                {"x":16, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1, "w":1.5},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1},
+                {"x":14.5, "y":1},
+                {"x":15.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":4, "y":2, "w":1.5},
+                {"x":5.5, "y":2},
+                {"x":6.5, "y":2},
+                {"x":7.5, "y":2},
+                {"x":8.5, "y":2},
+                {"x":9.5, "y":2},
+                {"x":10.5, "y":2},
+                {"x":11.5, "y":2},
+                {"x":12.5, "y":2},
+                {"x":13.5, "y":2},
+                {"x":14.5, "y":2},
+                {"x":15.5, "y":2, "w":1.5},
+
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+                {"x":16, "y":3},
+
+                {"x":0, "y":4},
+                {"x":1, "y":4},
+                {"x":2, "y":4},
+                {"x":3, "y":4},
+                {"x":4, "y":4},
+                {"x":5, "y":4},
+                {"x":6, "y":4},
+                {"x":7, "y":4},
+                {"x":8, "y":4},
+                {"x":9, "y":4},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4},
+                {"x":16, "y":4}
             ]
         },
         "LAYOUT_music": {
             "layout": [
-                {"label":"R.E.1", "x":2, "y":0.25}, {"label":"F1", "x":4, "y":0.25}, {"label":"F2", "x":5, "y":0.25}, {"label":"F3", "x":6, "y":0.25}, {"label":"F4", "x":7, "y":0.25}, {"label":"R.E.2", "x":9, "y":0.25}, {"label":"R.E.3", "x":11, "y":0.25}, {"label":"R.E.4", "x":13, "y":0.25}, {"label":"R.E.5", "x":15, "y":0.25},
-                {"label":"7", "x":0, "y":1.5}, {"label":"8", "x":1, "y":1.5}, {"label":"9", "x":2, "y":1.5}, {"label":"/", "x":3, "y":1.5}, {"label":"Tab", "x":4, "y":1.5, "w":1.5}, {"label":"Q", "x":5.5, "y":1.5}, {"label":"W", "x":6.5, "y":1.5}, {"label":"E", "x":7.5, "y":1.5}, {"label":"R", "x":8.5, "y":1.5}, {"label":"T", "x":9.5, "y":1.5}, {"label":"Y", "x":10.5, "y":1.5}, {"label":"U", "x":11.5, "y":1.5}, {"label":"I", "x":12.5, "y":1.5}, {"label":"O", "x":13.5, "y":1.5}, {"label":"P", "x":14.5, "y":1.5}, {"label":"Backspace", "x":15.5, "y":1.5, "w":1.5},
-                {"label":"4", "x":0, "y":2.5}, {"label":"5", "x":1, "y":2.5}, {"label":"6", "x":2, "y":2.5}, {"label":"*", "x":3, "y":2.5}, {"label":"Ctrl", "x":4, "y":2.5, "w":1.5}, {"label":"A", "x":5.5, "y":2.5}, {"label":"S", "x":6.5, "y":2.5}, {"label":"D", "x":7.5, "y":2.5}, {"label":"F", "x":8.5, "y":2.5}, {"label":"G", "x":9.5, "y":2.5}, {"label":"H", "x":10.5, "y":2.5}, {"label":"J", "x":11.5, "y":2.5}, {"label":"K", "x":12.5, "y":2.5}, {"label":"L", "x":13.5, "y":2.5}, {"label":";", "x":14.5, "y":2.5}, {"label":"Enter", "x":15.5, "y":2.5, "w":1.5},
-                {"label":"1", "x":0, "y":3.5}, {"label":"2", "x":1, "y":3.5}, {"label":"3", "x":2, "y":3.5}, {"label":"-", "x":3, "y":3.5}, {"label":"Sfhift", "x":4, "y":3.5}, {"label":"Shift", "x":5, "y":3.5}, {"label":"Z", "x":6, "y":3.5}, {"label":"X", "x":7, "y":3.5}, {"label":"C", "x":8, "y":3.5}, {"label":"V", "x":9, "y":3.5}, {"label":"B", "x":10, "y":3.5}, {"label":"N", "x":11, "y":3.5}, {"label":"M", "x":12, "y":3.5}, {"label":"<", "x":13, "y":3.5}, {"label":">", "x":14, "y":3.5}, {"label":"Up", "x":15, "y":3.5}, {"label":"?", "x":16, "y":3.5},
-                {"label":"0", "x":0, "y":4.5}, {"label":".", "x":1, "y":4.5}, {"label":"Enter", "x":2, "y":4.5}, {"label":"+", "x":3, "y":4.5}, {"x":4, "y":4.5}, {"x":5, "y":4.5}, {"label":"Opt", "x":6, "y":4.5}, {"label":"Cmd", "x":7, "y":4.5}, {"label":"Lower", "x":8, "y":4.5}, {"label":"Lower", "x":9, "y":4.5}, {"x":10, "y":4.5}, {"label":"Raise", "x":11, "y":4.5}, {"label":"Raise", "x":12, "y":4.5}, {"label":"Cmd", "x":13, "y":4.5}, {"label":"Left", "x":14, "y":4.5}, {"label":"Down", "x":15, "y":4.5}, {"label":"Right", "x":16, "y":4.5}
+                {"x":2, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":9, "y":0},
+                {"x":11, "y":0},
+                {"x":13, "y":0},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25, "w":1.5},
+                {"x":5.5, "y":1.25},
+                {"x":6.5, "y":1.25},
+                {"x":7.5, "y":1.25},
+                {"x":8.5, "y":1.25},
+                {"x":9.5, "y":1.25},
+                {"x":10.5, "y":1.25},
+                {"x":11.5, "y":1.25},
+                {"x":12.5, "y":1.25},
+                {"x":13.5, "y":1.25},
+                {"x":14.5, "y":1.25},
+                {"x":15.5, "y":1.25, "w":1.5},
+
+                {"x":0, "y":2.25},
+                {"x":1, "y":2.25},
+                {"x":2, "y":2.25},
+                {"x":3, "y":2.25},
+                {"x":4, "y":2.25, "w":1.5},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25},
+                {"x":14.5, "y":2.25},
+                {"x":15.5, "y":2.25, "w":1.5},
+
+                {"x":0, "y":3.25},
+                {"x":1, "y":3.25},
+                {"x":2, "y":3.25},
+                {"x":3, "y":3.25},
+                {"x":4, "y":3.25},
+                {"x":5, "y":3.25},
+                {"x":6, "y":3.25},
+                {"x":7, "y":3.25},
+                {"x":8, "y":3.25},
+                {"x":9, "y":3.25},
+                {"x":10, "y":3.25},
+                {"x":11, "y":3.25},
+                {"x":12, "y":3.25},
+                {"x":13, "y":3.25},
+                {"x":14, "y":3.25},
+                {"x":15, "y":3.25},
+                {"x":16, "y":3.25},
+
+                {"x":0, "y":4.25},
+                {"x":1, "y":4.25},
+                {"x":2, "y":4.25},
+                {"x":3, "y":4.25},
+                {"x":4, "y":4.25},
+                {"x":5, "y":4.25},
+                {"x":6, "y":4.25},
+                {"x":7, "y":4.25},
+                {"x":8, "y":4.25},
+                {"x":9, "y":4.25},
+                {"x":10, "y":4.25},
+                {"x":11, "y":4.25},
+                {"x":12, "y":4.25},
+                {"x":13, "y":4.25},
+                {"x":14, "y":4.25},
+                {"x":15, "y":4.25},
+                {"x":16, "y":4.25}
             ]
         }
     }
diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h
index fb911ab60c..39bb20f2a8 100644
--- a/keyboards/uranuma/config.h
+++ b/keyboards/uranuma/config.h
@@ -1,22 +1,5 @@
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D2, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 // fix iPhone and iPad power adapter issue
 // iOS device need lessthan 100
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json
index d8bc5b107d..2b311ea40f 100644
--- a/keyboards/uranuma/info.json
+++ b/keyboards/uranuma/info.json
@@ -8,6 +8,11 @@
     "pid": "0x112D",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D2", "D4"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
@@ -17,8 +22,8 @@
         {"label":"k01", "x":1 , "y":0.36},
         {"label":"k02", "x":2 , "y":0},
         {"label":"k03", "x":3 , "y":0.09},
-        {"label":"k04", "x":4 , "y":0.70},
-        {"label":"k05", "x":8 , "y":0.70},
+        {"label":"k04", "x":4 , "y":0.7},
+        {"label":"k05", "x":8 , "y":0.7},
         {"label":"k06", "x":9 , "y":0.09},
         {"label":"k07", "x":10, "y":0},
         {"label":"k08", "x":11, "y":0.36},
@@ -28,8 +33,8 @@
         {"label":"k11", "x":1 , "y":1.36},
         {"label":"k12", "x":2 , "y":1},
         {"label":"k13", "x":3 , "y":1.09},
-        {"label":"k14", "x":4 , "y":1.70},
-        {"label":"k15", "x":8 , "y":1.70},
+        {"label":"k14", "x":4 , "y":1.7},
+        {"label":"k15", "x":8 , "y":1.7},
         {"label":"k16", "x":9 , "y":1.09},
         {"label":"k17", "x":10, "y":1},
         {"label":"k18", "x":11, "y":1.36},
@@ -39,8 +44,8 @@
         {"label":"k21", "x":1 , "y":2.36},
         {"label":"k22", "x":2 , "y":2},
         {"label":"k23", "x":3 , "y":2.09},
-        {"label":"k24", "x":4 , "y":2.70},
-        {"label":"k25", "x":8 , "y":2.70},
+        {"label":"k24", "x":4 , "y":2.7},
+        {"label":"k25", "x":8 , "y":2.7},
         {"label":"k26", "x":9 , "y":2.09},
         {"label":"k27", "x":10, "y":2},
         {"label":"k28", "x":11, "y":2.36},
@@ -50,19 +55,19 @@
         {"label":"k31", "x":1 , "y":3.36},
         {"label":"k32", "x":2 , "y":3},
         {"label":"k33", "x":3 , "y":3.09},
-        {"label":"k34", "x":4 , "y":3.70},
+        {"label":"k34", "x":4 , "y":3.7},
         {"label":"k44", "x":5, "y":2.44, "h":2},
         {"label":"k45", "x":7, "y":2.44, "h":2},
-        {"label":"k35", "x":8 , "y":3.70},
+        {"label":"k35", "x":8 , "y":3.7},
         {"label":"k36", "x":9 , "y":3.09},
         {"label":"k37", "x":10, "y":3},
         {"label":"k38", "x":11, "y":3.36},
         {"label":"k39", "x":12, "y":3.62},
 
-        {"label":"k40", "x":0, "y":4.70, "w":1.5},
-        {"label":"k41", "x":1.5, "y":4.70},
-        {"label":"k48", "x":10.5, "y":4.70},
-        {"label":"k49", "x":11.5, "y":4.70, "w":1.5}
+        {"label":"k40", "x":0, "y":4.7, "w":1.5},
+        {"label":"k41", "x":1.5, "y":4.7},
+        {"label":"k48", "x":10.5, "y":4.7},
+        {"label":"k49", "x":11.5, "y":4.7, "w":1.5}
       ]
     }
   }
diff --git a/keyboards/uranuma/uranuma.c b/keyboards/uranuma/uranuma.c
deleted file mode 100644
index e439177af7..0000000000
--- a/keyboards/uranuma/uranuma.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "uranuma.h"
diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h
index 9677a8e262..5d33e9e99c 100644
--- a/keyboards/utd80/config.h
+++ b/keyboards/utd80/config.h
@@ -15,23 +15,12 @@
  */
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { B4, D5, D0, B2, B3, B0 }
-#define MATRIX_COL_PINS { B1, F0, F1, F4, F5, F6, F7, C7, C6, D3, E6, D7, D6, D4, D2, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -46,4 +35,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json
index cf0b6530ad..5a7bde1da1 100644
--- a/keyboards/utd80/info.json
+++ b/keyboards/utd80/info.json
@@ -8,6 +8,11 @@
       "pid": "0x001C",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D3", "E6", "D7", "D6", "D4", "D2", "D1"],
+        "rows": ["B4", "D5", "D0", "B2", "B3", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "B7",
       "breathing": true
@@ -16,11 +21,112 @@
       "caps_lock": "B6",
       "scroll_lock": "B5"
     },
+    "ws2812": {
+      "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
       "LAYOUT_tkl_ansi_wkl": {
-        "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0},
+
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+
+          {"matrix": [0, 6], "x": 6.5, "y": 0},
+          {"matrix": [0, 7], "x": 7.5, "y": 0},
+          {"matrix": [0, 8], "x": 8.5, "y": 0},
+          {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+          {"matrix": [0, 10], "x": 11, "y": 0},
+          {"matrix": [0, 11], "x": 12, "y": 0},
+          {"matrix": [0, 12], "x": 13, "y": 0},
+          {"matrix": [0, 13], "x": 14, "y": 0},
+
+          {"matrix": [0, 1], "x": 15.25, "y": 0},
+          {"matrix": [0, 15], "x": 16.25, "y": 0},
+          {"matrix": [5, 15], "x": 17.25, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1.5},
+          {"matrix": [1, 1], "x": 1, "y": 1.5},
+          {"matrix": [1, 2], "x": 2, "y": 1.5},
+          {"matrix": [1, 3], "x": 3, "y": 1.5},
+          {"matrix": [1, 4], "x": 4, "y": 1.5},
+          {"matrix": [1, 5], "x": 5, "y": 1.5},
+          {"matrix": [1, 6], "x": 6, "y": 1.5},
+          {"matrix": [1, 7], "x": 7, "y": 1.5},
+          {"matrix": [1, 8], "x": 8, "y": 1.5},
+          {"matrix": [1, 9], "x": 9, "y": 1.5},
+          {"matrix": [1, 10], "x": 10, "y": 1.5},
+          {"matrix": [1, 11], "x": 11, "y": 1.5},
+          {"matrix": [1, 12], "x": 12, "y": 1.5},
+          {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+          {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+          {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+          {"matrix": [3, 15], "x": 17.25, "y": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+          {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+          {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+          {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+          {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+          {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+          {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+          {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+          {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+          {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+          {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+          {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+          {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+          {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+          {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+          {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+          {"matrix": [4, 15], "x": 17.25, "y": 2.5},
+
+          {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+          {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+          {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+          {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+          {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+          {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+          {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+          {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+          {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+          {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+          {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+          {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+          {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+          {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+          {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+          {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+          {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+          {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+          {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+          {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+          {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+          {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+          {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+          {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+          {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+          {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+          {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+          {"matrix": [5, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+          {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+          {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+          {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+          {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+          {"matrix": [3, 14], "x": 16.25, "y": 5.5},
+          {"matrix": [0, 14], "x": 17.25, "y": 5.5}
+        ]
       }
     }
 }
diff --git a/keyboards/utd80/utd80.c b/keyboards/utd80/utd80.c
deleted file mode 100644
index 7b1a269d7b..0000000000
--- a/keyboards/utd80/utd80.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 UTDKeyboard & Dominic Gan
- * 
- * this program is free software: you can redistribute it and/or modify 
- * it under the terms of the gnu general public license as published by 
- * the free software foundation, either version 2 of the license, or 
- * (at your option) any later version. 
- * 
- * this program is distributed in the hope that it will be useful, 
- * but without any warranty; without even the implied warranty of 
- * merchantability or fitness for a particular purpose.  see the 
- * gnu general public license for more details. 
- * 
- * you should have received a copy of the gnu general public license 
- * along with this program.  if not, see <http://www.gnu.org/licenses/>. 
- */ 
-#include "utd80.h"
diff --git a/keyboards/utd80/utd80.h b/keyboards/utd80/utd80.h
deleted file mode 100644
index 43d69ef845..0000000000
--- a/keyboards/utd80/utd80.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 UTDKeyboard & Dominic Gan
- * 
- * this program is free software: you can redistribute it and/or modify 
- * it under the terms of the gnu general public license as published by 
- * the free software foundation, either version 2 of the license, or 
- * (at your option) any later version. 
- * 
- * this program is distributed in the hope that it will be useful, 
- * but without any warranty; without even the implied warranty of 
- * merchantability or fitness for a particular purpose.  see the 
- * gnu general public license for more details. 
- * 
- * you should have received a copy of the gnu general public license 
- * along with this program.  if not, see <http://www.gnu.org/licenses/>. 
- */ 
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_tkl_ansi_wkl( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,   K0A, K0B, K0C, K0D,   K01,K0F,K5F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,     K1E,K1F,K3F, \
-     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,    K2E,K2F,K4F, \
-    K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                    \
-      K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,             K4E,     \
-     K50,          K51,               K56,               K5A,          K5D,     K5E,K3E,K0E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F}, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, K4E, K4F}, \
-    { K50, K51, XXX, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, XXX, XXX, K5D, K5E, K5F}  \
-}
-
diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h
index 241418bdb7..fdfbaa443e 100644
--- a/keyboards/uzu42/rev1/config.h
+++ b/keyboards/uzu42/rev1/config.h
@@ -18,17 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-
-// wiring of each half
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 54    // Number of LEDs
 #define RGBLED_SPLIT { 27, 27 }
 
diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json
index 1e5cda2b20..9d08cbdaeb 100644
--- a/keyboards/uzu42/rev1/info.json
+++ b/keyboards/uzu42/rev1/info.json
@@ -8,9 +8,17 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/uzu42/rev1/rev1.c b/keyboards/uzu42/rev1/rev1.c
deleted file mode 100644
index e22860d04b..0000000000
--- a/keyboards/uzu42/rev1/rev1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "uzu42.h"
diff --git a/keyboards/uzu42/rev1/rev1.h b/keyboards/uzu42/rev1/rev1.h
index e4aba8b79b..156605f87a 100644
--- a/keyboards/uzu42/rev1/rev1.h
+++ b/keyboards/uzu42/rev1/rev1.h
@@ -5,8 +5,6 @@
 
 #include "uzu42.h"
 
-#include "quantum.h"
-
 #define LAYOUT( \
   L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
   L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
diff --git a/keyboards/uzu42/uzu42.h b/keyboards/uzu42/uzu42.h
index c23baac333..8678588bc3 100644
--- a/keyboards/uzu42/uzu42.h
+++ b/keyboards/uzu42/uzu42.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include "quantum.h"
+
 #ifdef KEYBOARD_uzu42_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/v4n4g0rth0n/config.h b/keyboards/v4n4g0rth0n/config.h
deleted file mode 100644
index 39af6344ef..0000000000
--- a/keyboards/v4n4g0rth0n/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2021 jpuerto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/v4n4g0rth0n/v1/config.h b/keyboards/v4n4g0rth0n/v1/config.h
deleted file mode 100644
index effd2268db..0000000000
--- a/keyboards/v4n4g0rth0n/v1/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2021 jpuerto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, B7}
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D5, F7, F6, E6, F5, F4, F1, F0}
diff --git a/keyboards/v4n4g0rth0n/v1/info.json b/keyboards/v4n4g0rth0n/v1/info.json
index dab37baf04..769c35d8ca 100644
--- a/keyboards/v4n4g0rth0n/v1/info.json
+++ b/keyboards/v4n4g0rth0n/v1/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "F0"],
+        "rows": ["C7", "C6", "B6", "B5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/v4n4g0rth0n/v2/config.h b/keyboards/v4n4g0rth0n/v2/config.h
deleted file mode 100644
index 2299b791ef..0000000000
--- a/keyboards/v4n4g0rth0n/v2/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2021 jpuerto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, B7}
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D5, F7, F6, E6, F5, F4, F1, B0}
diff --git a/keyboards/v4n4g0rth0n/v2/info.json b/keyboards/v4n4g0rth0n/v2/info.json
index 65be217368..6959188be9 100644
--- a/keyboards/v4n4g0rth0n/v2/info.json
+++ b/keyboards/v4n4g0rth0n/v2/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"],
+        "rows": ["C7", "C6", "B6", "B5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/v4n4g0rth0n/v4n4g0rth0n.c b/keyboards/v4n4g0rth0n/v4n4g0rth0n.c
deleted file mode 100644
index 983bd78787..0000000000
--- a/keyboards/v4n4g0rth0n/v4n4g0rth0n.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 jpuerto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v4n4g0rth0n.h"
diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h
index 3c76b77bce..8eafa8d7b5 100644
--- a/keyboards/v60_type_r/config.h
+++ b/keyboards/v60_type_r/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/v60_type_r/info.json b/keyboards/v60_type_r/info.json
index e37ccc9543..f453fa1f5b 100644
--- a/keyboards/v60_type_r/info.json
+++ b/keyboards/v60_type_r/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0658",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "F7",
     "on_state": 0
diff --git a/keyboards/vagrant_10/config.h b/keyboards/vagrant_10/config.h
index e96d154b66..195f3f617c 100755
--- a/keyboards/vagrant_10/config.h
+++ b/keyboards/vagrant_10/config.h
@@ -25,13 +25,6 @@ SOFTWARE.
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F7, B1, B3, B2 }
-#define MATRIX_COL_PINS { F4, F6, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/vagrant_10/info.json b/keyboards/vagrant_10/info.json
index 6c26013f60..cdf4815504 100644
--- a/keyboards/vagrant_10/info.json
+++ b/keyboards/vagrant_10/info.json
@@ -8,11 +8,30 @@
     "pid": "0x5E99",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F6", "F5"],
+    "rows": ["F7", "B1", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"x":1, "y":0, "w":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
+      "layout": [
+        {"matrix": [0, 2], "x": 1, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/vagrant_10/vagrant_10.c b/keyboards/vagrant_10/vagrant_10.c
deleted file mode 100755
index 6c577b92c2..0000000000
--- a/keyboards/vagrant_10/vagrant_10.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
-MIT License
-
-Copyright (c) 2020 Shanduur & QMK Firmware
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "vagrant_10.h"
diff --git a/keyboards/vagrant_10/vagrant_10.h b/keyboards/vagrant_10/vagrant_10.h
deleted file mode 100755
index 1cd4d1b777..0000000000
--- a/keyboards/vagrant_10/vagrant_10.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
-MIT License
-
-Copyright (c) 2020 Shanduur & QMK Firmware
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-                K002, \
-    K100, K101, K102, \
-    K200, K201, K202, \
-    K300, K301, K302  \
-) { \
-    { KC_NO, KC_NO, K002 }, \
-    { K100,  K101,  K102 }, \
-    { K200,  K201,  K202 }, \
-    { K300,  K301,  K302 }  \
-}
diff --git a/keyboards/vertex/angler2/angler2.c b/keyboards/vertex/angler2/angler2.c
deleted file mode 100644
index a6a4d21372..0000000000
--- a/keyboards/vertex/angler2/angler2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Vertex <xiaoxuxk@yeah.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "angler2.h"
diff --git a/keyboards/vertex/angler2/angler2.h b/keyboards/vertex/angler2/angler2.h
deleted file mode 100644
index 04293a2fe6..0000000000
--- a/keyboards/vertex/angler2/angler2.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Copyright 2022 Vertex <xiaoxuxk@yeah.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- *              ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- *              │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │3E │ Standard
- *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- *              ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───� ┌───┬───┬───�
- *              │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │ │0E │0F │3E │ F13 Row
- *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───┬───�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │3F │
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤      ┌─────�
- *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │4D │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘   ┌──┴�3D  │ ISO Enter
- *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                 │3C │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───�       └───┴────┘
- * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C        │     │4F │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───�
- *              │50  │51  │52  │56                      │5A  │5B  │5C  │5D  │ │5E │5F │4E │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *              │50   │51 │52   │56                         │5B   │5C │5D   │ Tsangan/WKL
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_all( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
-) { \
-  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan( \
-  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
-) { \
-  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_tkl_iso( \
-  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
-) { \
-  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_tkl_iso_tsangan( \
-  K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
-) { \
-  { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_tkl_f13_ansi( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K4D, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                  \
-  K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-  { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_tkl_f13_iso( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-  K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,   K5E, K5F, K4E  \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }  \
-}
-
-#define LAYOUT_tkl_f13_iso_tsangan( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K3E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, K3F, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K4D, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,        K4F,      \
-  K50, K51, K52,                K56,                     K5B, K5C, K5D,   K5E, K5F, K4E  \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-  { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }  \
-}
diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h
index fc71e667b8..79cb6d6aae 100644
--- a/keyboards/vertex/angler2/config.h
+++ b/keyboards/vertex/angler2/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, B2, F0, D5, D1, D2 }
-#define MATRIX_COL_PINS { F5, F6, F7, E2, C7, C6, B6, F1, B5, B4, D7, D6, D4, D3, D0, B1 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json
index 3716ddbede..588695c8f4 100644
--- a/keyboards/vertex/angler2/info.json
+++ b/keyboards/vertex/angler2/info.json
@@ -8,11 +8,19 @@
         "pid": "0x408F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "E2", "C7", "C6", "B6", "F1", "B5", "B4", "D7", "D6", "D4", "D3", "D0", "B1"],
+        "rows": ["F4", "B2", "F0", "D5", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0",
         "scroll_lock": "B7",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": [
@@ -28,873 +36,950 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
-                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
-                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
-                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
-                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
-                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
-                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
-                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
-                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
-                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
-                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
-                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
-                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
-                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
-                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
-                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
-                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
-
-                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
-                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
-                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
-                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
-                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
-                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
-                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
-                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
-                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
-                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
-                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
-                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
-                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
-                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
-                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
-                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
-
-                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
-                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
-                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
-                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
-                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
-                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
-                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
-                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
-                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
-                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
-                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
-                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
-                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
-                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
-                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
-
-                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
-                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
-                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
-                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
-                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
-                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
-                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
-                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
-                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
-                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
-                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
-                { "label": "K3D (D5,D3)", "x": 13.75, "y": 3.5, "w": 1.25 },
-
-                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
-                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
-                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
-                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
-                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
-                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
-                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
-                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
-                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
-                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
-                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
-                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
-
-                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
-                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
-                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
-                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
-                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
-                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
-                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
-                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
-                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
-                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
-                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
-                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
-                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
-                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
-                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
-                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
-                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
-                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
-
-                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
-                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
-                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
-                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
-                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
-                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
-                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
-                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
-                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
-                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
-                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
-                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
-                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
-                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
-                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
-                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
-
-                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
-                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
-                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
-                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
-                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
-                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
-                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
-                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
-                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
-                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
-                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
-                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
-                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
-                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
-                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
-
-                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
-                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
-                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
-                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
-                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
-                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
-                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
-                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
-                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
-                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
-                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
-
-                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
-                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
-                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
-                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
-                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
-                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
-                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
-                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
-                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
-                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
-                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
-                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
-
-                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
-                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
-                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
-                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
-                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
-                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
-                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
-                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
-                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
-                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
-                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
-                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
-                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
-                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
-                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
-                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
-                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
-                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
-
-                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
-                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
-                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
-                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
-                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
-                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
-                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
-                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
-                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
-                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
-                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
-                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
-                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
-                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
-                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
-                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
-
-                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
-                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
-                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
-                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
-                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
-                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
-                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
-                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
-                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
-                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
-                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
-                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
-                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
-                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
-                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
-
-                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
-                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
-                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
-                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
-                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
-                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
-                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
-                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
-                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
-                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
-                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
-
-                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
-                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
-                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
-                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
-                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
-                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
-                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
-                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
-                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
-                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
-                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
-                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
-
-                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
-                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
-                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
-                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
-                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
-                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
-                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
-                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
-                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
-                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
-                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
-                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
-                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
-                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
-                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
-                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
-                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
-                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
-                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
-                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
-                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
-                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
-                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
-                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
-                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
-
-                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
-                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
-                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
-                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
-                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
-                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
-                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
-                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
-                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
-                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
-                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
-                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
-                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
-                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
-                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
-                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
-
-                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
-                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
-                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
-                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
-                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
-                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
-                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
-                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
-                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
-                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
-                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
-                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
-                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
-                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
-                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
-
-                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
-                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
-                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
-                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
-                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
-                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
-                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
-                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
-                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
-                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
-                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
-                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
-
-                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
-                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
-                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
-                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
-                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
-                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
-                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
-                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
-                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
-                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
-                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
-                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
-
-                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
-                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
-                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso_tsangan": {
             "layout": [
-                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
-                { "label": "K02 (F4,F7)", "x": 2, "y": 0 },
-                { "label": "K03 (F4,E2)", "x": 3, "y": 0 },
-                { "label": "K04 (F4,C7)", "x": 4, "y": 0 },
-                { "label": "K05 (F4,C6)", "x": 5, "y": 0 },
-                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
-                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
-                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
-                { "label": "K09 (F4,B4)", "x": 9.5, "y": 0 },
-                { "label": "K0A (F4,D7)", "x": 11, "y": 0 },
-                { "label": "K0B (F4,D6)", "x": 12, "y": 0 },
-                { "label": "K0C (F4,D4)", "x": 13, "y": 0 },
-                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
-                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
-                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
-                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
-
-                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
-                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
-                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
-                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
-                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
-                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
-                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
-                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
-                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
-                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
-                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
-                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
-                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
-                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
-                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
-                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
-
-                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
-                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
-                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
-                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
-                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
-                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
-                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
-                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
-                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
-                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
-                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
-                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
-                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
-                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
-                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
-
-                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
-                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
-                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
-                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
-                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
-                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
-                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
-                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
-                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
-                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
-                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
-                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
-
-                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
-                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
-                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
-                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
-                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
-                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
-                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
-                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
-                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
-                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
-                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
-                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
-
-                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
-                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
-                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
-                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
-                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
-                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
-                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
-                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
-                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
-                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
-                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
-                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
-                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
-                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
-                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
-                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
-                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
-                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
-                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
-                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
-                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
-                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
-                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
-                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
-                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
-                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
-
-                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
-                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
-                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
-                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
-                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
-                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
-                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
-                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
-                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
-                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
-                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
-                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
-                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
-                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
-                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
-                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
-
-                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
-                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
-                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
-                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
-                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
-                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
-                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
-                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
-                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
-                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
-                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
-                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
-                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
-                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
-                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
-
-                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
-                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
-                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
-                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
-                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
-                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
-                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
-                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
-                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
-                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
-                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
-
-                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
-                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
-                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
-                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
-                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
-                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
-                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
-                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
-                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
-                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
-                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
-                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
-
-                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
-                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
-                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
-                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
-                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
-                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
-                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
-                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
-                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
-                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
-                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
-                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
-                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
-                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
-                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
-                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
-                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
-                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
-                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
-
-                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
-                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
-                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
-                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
-                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
-                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
-                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
-                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
-                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
-                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
-                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
-                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
-                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
-                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
-                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
-                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
-
-                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
-                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
-                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
-                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
-                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
-                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
-                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
-                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
-                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
-                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
-                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
-                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
-                { "label": "K2D (F0,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
-                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
-                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
-
-                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
-                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
-                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
-                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
-                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
-                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
-                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
-                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
-                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
-                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
-                { "label": "K3D (D5,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
-
-                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 2.25 },
-                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
-                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
-                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
-                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
-                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
-                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
-                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
-                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
-                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
-                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
-                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
-
-                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
-                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
-                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
-                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
-                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
-                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
-                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
-                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
-                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
-                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+ 
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+ 
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+ 
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+ 
+                {"matrix": [0, 13], "x": 14, "y": 0},
+ 
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_iso": {
             "layout": [
-                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
-                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
-                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
-                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
-                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
-                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
-                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
-                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
-                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
-                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
-                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
-                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
-                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
-                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
-                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
-                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
-                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
-
-                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
-                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
-                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
-                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
-                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
-                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
-                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
-                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
-                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
-                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
-                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
-                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
-                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
-                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
-                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
-                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
-
-                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
-                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
-                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
-                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
-                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
-                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
-                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
-                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
-                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
-                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
-                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
-                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
-                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
-                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
-                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
-
-                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
-                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
-                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
-                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
-                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
-                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
-                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
-                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
-                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
-                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
-                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
-                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
-
-                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
-                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
-                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
-                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
-                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
-                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
-                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
-                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
-                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
-                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
-                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
-                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
-
-                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "K51 (D2,F6)", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "label": "K56 (D2,B6)", "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "K5A (D2,D7)", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "K5B (D2,D6)", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "K5D (D2,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
-                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
-                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_iso_tsangan": {
             "layout": [
-                { "label": "K00 (F4,F5)", "x": 0, "y": 0 },
-                { "label": "K01 (F4,F6)", "x": 1.25, "y": 0 },
-                { "label": "K02 (F4,F7)", "x": 2.25, "y": 0 },
-                { "label": "K03 (F4,E2)", "x": 3.25, "y": 0 },
-                { "label": "K04 (F4,C7)", "x": 4.25, "y": 0 },
-                { "label": "K05 (F4,C6)", "x": 5.5, "y": 0 },
-                { "label": "K06 (F4,B6)", "x": 6.5, "y": 0 },
-                { "label": "K07 (F4,F1)", "x": 7.5, "y": 0 },
-                { "label": "K08 (F4,B5)", "x": 8.5, "y": 0 },
-                { "label": "K09 (F4,B4)", "x": 9.75, "y": 0 },
-                { "label": "K0A (F4,D7)", "x": 10.75, "y": 0 },
-                { "label": "K0B (F4,D6)", "x": 11.75, "y": 0 },
-                { "label": "K0C (F4,D4)", "x": 12.75, "y": 0 },
-                { "label": "K0D (F4,B1)", "x": 14, "y": 0 },
-                { "label": "K0E (F4,D0)", "x": 15.25, "y": 0 },
-                { "label": "K0F (F4,B1)", "x": 16.25, "y": 0 },
-                { "label": "K3E (D5,D0)", "x": 17.25, "y": 0 },
-
-                { "label": "K10 (B2,F5)", "x": 0, "y": 1.5 },
-                { "label": "K11 (B2,F6)", "x": 1, "y": 1.5 },
-                { "label": "K12 (B2,F7)", "x": 2, "y": 1.5 },
-                { "label": "K13 (B2,E2)", "x": 3, "y": 1.5 },
-                { "label": "K14 (B2,C7)", "x": 4, "y": 1.5 },
-                { "label": "K15 (B2,C6)", "x": 5, "y": 1.5 },
-                { "label": "K16 (B2,B6)", "x": 6, "y": 1.5 },
-                { "label": "K17 (B2,F1)", "x": 7, "y": 1.5 },
-                { "label": "K18 (B2,B5)", "x": 8, "y": 1.5 },
-                { "label": "K19 (B2,B4)", "x": 9, "y": 1.5 },
-                { "label": "K1A (B2,D7)", "x": 10, "y": 1.5 },
-                { "label": "K1B (B2,D6)", "x": 11, "y": 1.5 },
-                { "label": "K1C (B2,D4)", "x": 12, "y": 1.5 },
-                { "label": "K1D (B2,D3)", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "K1E (B2,D0)", "x": 15.25, "y": 1.5 },
-                { "label": "K1F (B2,B1)", "x": 16.25, "y": 1.5 },
-                { "label": "K3F (D5,B1)", "x": 17.25, "y": 1.5 },
-
-                { "label": "K20 (F0,F5)", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "K21 (F0,F6)", "x": 1.5, "y": 2.5 },
-                { "label": "K22 (F0,F7)", "x": 2.5, "y": 2.5 },
-                { "label": "K23 (F0,E2)", "x": 3.5, "y": 2.5 },
-                { "label": "K24 (F0,C7)", "x": 4.5, "y": 2.5 },
-                { "label": "K25 (F0,C6)", "x": 5.5, "y": 2.5 },
-                { "label": "K26 (F0,B6)", "x": 6.5, "y": 2.5 },
-                { "label": "K27 (F0,F1)", "x": 7.5, "y": 2.5 },
-                { "label": "K28 (F0,B5)", "x": 8.5, "y": 2.5 },
-                { "label": "K29 (F0,B4)", "x": 9.5, "y": 2.5 },
-                { "label": "K2A (F0,D7)", "x": 10.5, "y": 2.5 },
-                { "label": "K2B (F0,D6)", "x": 11.5, "y": 2.5 },
-                { "label": "K2C (F0,D4)", "x": 12.5, "y": 2.5 },
-                { "label": "K2E (F0,D0)", "x": 15.25, "y": 2.5 },
-                { "label": "K2F (F0,B1)", "x": 16.25, "y": 2.5 },
-                { "label": "K4D (D1,D3)", "x": 17.25, "y": 2.5 },
-
-                { "label": "K30 (D5,F5)", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "K31 (D5,F6)", "x": 1.75, "y": 3.5 },
-                { "label": "K32 (D5,F7)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (D5,E2)", "x": 3.75, "y": 3.5 },
-                { "label": "K34 (D5,C7)", "x": 4.75, "y": 3.5 },
-                { "label": "K35 (D5,C6)", "x": 5.75, "y": 3.5 },
-                { "label": "K36 (D5,B6)", "x": 6.75, "y": 3.5 },
-                { "label": "K37 (D5,F1)", "x": 7.75, "y": 3.5 },
-                { "label": "K38 (D5,B5)", "x": 8.75, "y": 3.5 },
-                { "label": "K39 (D5,B4)", "x": 9.75, "y": 3.5 },
-                { "label": "K3A (D5,D7)", "x": 10.75, "y": 3.5 },
-                { "label": "K3B (D5,D6)", "x": 11.75, "y": 3.5 },
-                { "label": "K3C (D5,D4)", "x": 12.75, "y": 3.5 },
-                { "label": "K3D (D5,D3)", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
-
-                { "label": "K40 (D1,F5)", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "K41 (D1,F6)", "x": 1.25, "y": 4.5 },
-                { "label": "K42 (D1,F7)", "x": 2.25, "y": 4.5 },
-                { "label": "K43 (D1,E2)", "x": 3.25, "y": 4.5 },
-                { "label": "K44 (D1,C7)", "x": 4.25, "y": 4.5 },
-                { "label": "K45 (D1,C6)", "x": 5.25, "y": 4.5 },
-                { "label": "K46 (D1,B6)", "x": 6.25, "y": 4.5 },
-                { "label": "K47 (D1,F1)", "x": 7.25, "y": 4.5 },
-                { "label": "K48 (D1,B5)", "x": 8.25, "y": 4.5 },
-                { "label": "K49 (D1,B4)", "x": 9.25, "y": 4.5 },
-                { "label": "K4A (D1,D7)", "x": 10.25, "y": 4.5 },
-                { "label": "K4B (D1,D6)", "x": 11.25, "y": 4.5 },
-                { "label": "K4C (D1,D4)", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "K4F (D1,B1)", "x": 16.25, "y": 4.5 },
-
-                { "label": "K50 (D2,F5)", "x": 0, "y": 5.5, "w": 1.5 },
-                { "label": "K51 (D2,F6)", "x": 1.5, "y": 5.5 },
-                { "label": "K52 (D2,F7)", "x": 2.5, "y": 5.5, "w": 1.5 },
-                { "label": "K56 (D2,B6)", "x": 4, "y": 5.5, "w": 7 },
-                { "label": "K5B (D2,D6)", "x": 11, "y": 5.5, "w": 1.5 },
-                { "label": "K5C (D2,D4)", "x": 12.5, "y": 5.5 },
-                { "label": "K5D (D2,D3)", "x": 13.5, "y": 5.5, "w": 1.5 },
-                { "label": "K5E (D2,D0)", "x": 15.25, "y": 5.5 },
-                { "label": "K5F (D2,B1)", "x": 16.25, "y": 5.5 },
-                { "label": "K4E (D1,D0)", "x": 17.25, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/vertex/arc60/arc60.c b/keyboards/vertex/arc60/arc60.c
deleted file mode 100644
index d8fc41b794..0000000000
--- a/keyboards/vertex/arc60/arc60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2022 vertex
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "arc60.h"
diff --git a/keyboards/vertex/arc60/config.h b/keyboards/vertex/arc60/config.h
index 633843021f..ff75c3a227 100644
--- a/keyboards/vertex/arc60/config.h
+++ b/keyboards/vertex/arc60/config.h
@@ -16,10 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5 }
-#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 9
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json
index bfb8e4fc3a..6a421f4060 100644
--- a/keyboards/vertex/arc60/info.json
+++ b/keyboards/vertex/arc60/info.json
@@ -8,10 +8,18 @@
         "pid": "0x8370",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"],
+        "rows": ["B10", "B1", "B0", "A7", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C13",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "B15"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "community_layouts": [
diff --git a/keyboards/vertex/arc60h/arc60h.c b/keyboards/vertex/arc60h/arc60h.c
deleted file mode 100644
index 2ef6bb3ff4..0000000000
--- a/keyboards/vertex/arc60h/arc60h.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2022 vertex
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "arc60h.h"
diff --git a/keyboards/vertex/arc60h/config.h b/keyboards/vertex/arc60h/config.h
index 1795f9b2ee..9f9ed0cdb3 100644
--- a/keyboards/vertex/arc60h/config.h
+++ b/keyboards/vertex/arc60h/config.h
@@ -16,10 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5 }
-#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
-#define DIODE_DIRECTION COL2ROW
-
 #define LED_CAPS_LOCK_PIN C13
 #define LED_PIN_ON_STATE 0
 
@@ -33,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 9
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
diff --git a/keyboards/vertex/arc60h/info.json b/keyboards/vertex/arc60h/info.json
index 9cd38dd907..28efdcd357 100644
--- a/keyboards/vertex/arc60h/info.json
+++ b/keyboards/vertex/arc60h/info.json
@@ -8,6 +8,15 @@
         "pid": "0x9770",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"],
+        "rows": ["B10", "B1", "B0", "A7", "A6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
@@ -70,11 +79,11 @@
                 {"x": 12.25, "y": 3, "w": 1.75 },
                 {"x": 14, "y": 3 },
                 {"x": 0, "y": 4, "w": 1.5 },
-                {"x": 1.5, "y": 4, "w": 1 },
+                {"x": 1.5, "y": 4 },
                 {"x": 2.5, "y": 4, "w": 1.5 },
                 {"x": 4, "y": 4, "w": 7 },
                 {"x": 11, "y": 4, "w": 1.5 },
-                {"x": 12.5, "y": 4, "w": 1 },
+                {"x": 12.5, "y": 4 },
                 {"x": 13.5, "y": 4, "w": 1.5 }
             ]
         }
diff --git a/keyboards/vertex/arc60h/rules.mk b/keyboards/vertex/arc60h/rules.mk
index 94b0fb2aa9..8e6bc896a6 100644
--- a/keyboards/vertex/arc60h/rules.mk
+++ b/keyboards/vertex/arc60h/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h
index 3036f0ac8f..825ceabbd3 100644
--- a/keyboards/viendi8l/config.h
+++ b/keyboards/viendi8l/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-                       // C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16, C17
-#define MATRIX_COL_PINS { C6 , C7 , C8 , C9 , A8 , B3 , B4 , A10, B5 , B8 , B9 , C13, C14, C15, A0 , A1 , A2 , A3 }
-                      //  R0 , R1 , R2 , R3 , R4 , R5
-#define MATRIX_ROW_PINS { C3 , C2 , C1 , C0 , B14, A7 } 
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -42,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 4
 #define RGBLIGHT_DEFAULT_VAL 0
 
diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/info.json
index 312f97e7f1..5b599959ce 100644
--- a/keyboards/viendi8l/info.json
+++ b/keyboards/viendi8l/info.json
@@ -8,6 +8,15 @@
         "pid": "0x0877",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "C8", "C9", "A8", "B3", "B4", "A10", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
+        "rows": ["C3", "C2", "C1", "C0", "B14", "A7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B10", "pin_b": "B12", "resolution": 2}
diff --git a/keyboards/viendi8l/rules.mk b/keyboards/viendi8l/rules.mk
index 947d1bf435..dfa900c792 100644
--- a/keyboards/viendi8l/rules.mk
+++ b/keyboards/viendi8l/rules.mk
@@ -9,7 +9,6 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-WS2812_DRIVER = pwm
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 LTO_ENABLE = no
diff --git a/keyboards/viendi8l/viendi8l.c b/keyboards/viendi8l/viendi8l.c
index 6d52993342..4d0257f0dd 100644
--- a/keyboards/viendi8l/viendi8l.c
+++ b/keyboards/viendi8l/viendi8l.c
@@ -39,14 +39,3 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
     }
   return state;
 }
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if(!encoder_update_user(index, clockwise)) return false;
-    if (index == 0) {
-        if (clockwise) tap_code_delay(KC_VOLU, 10);
-        else tap_code_delay(KC_VOLD, 10);
-    }   
-    return true;
-}
-#endif
diff --git a/keyboards/viktus/at101_bh/at101_bh.c b/keyboards/viktus/at101_bh/at101_bh.c
deleted file mode 100644
index 3b519373b0..0000000000
--- a/keyboards/viktus/at101_bh/at101_bh.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "at101_bh.h"
diff --git a/keyboards/viktus/at101_bh/config.h b/keyboards/viktus/at101_bh/config.h
index 9a469e7188..ada0ff6e76 100644
--- a/keyboards/viktus/at101_bh/config.h
+++ b/keyboards/viktus/at101_bh/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F1, F4, D4, F6, F5, F7, B6, B5, D5, C7, C6 }
-#define MATRIX_COL_PINS { D1, D0, B7, B3, B2, B1, B0, E6, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/viktus/at101_bh/info.json b/keyboards/viktus/at101_bh/info.json
index aebfd08f0f..88b0c78b2d 100644
--- a/keyboards/viktus/at101_bh/info.json
+++ b/keyboards/viktus/at101_bh/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "D2", "D3"],
+    "rows": ["F0", "F1", "F4", "D4", "F6", "F5", "F7", "B6", "B5", "D5", "C7", "C6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/viktus/minne/info.json b/keyboards/viktus/minne/info.json
index 396aca8bcd..7b6245d72e 100644
--- a/keyboards/viktus/minne/info.json
+++ b/keyboards/viktus/minne/info.json
@@ -32,7 +32,6 @@
     },
     "rgblight": {
         "led_count": 14,
-        "pin": "F6",
         "max_brightness": 191,
         "animations": {
             "breathing": true,
@@ -40,6 +39,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/viktus/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h
index 9a399518a1..ada0ff6e76 100644
--- a/keyboards/viktus/omnikey_bh/config.h
+++ b/keyboards/viktus/omnikey_bh/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D4 }
-#define MATRIX_COL_PINS { C2, C3, C4, C7, C1, C0, E1, E0, D7, F7, F6, F5, F4, F3, F2, F1, F0, E6, E7, B0, B1, B2, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -16,20 +8,3 @@
 
 /* force n-key rollover*/
 #define FORCE_NKRO
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/viktus/omnikey_bh/info.json b/keyboards/viktus/omnikey_bh/info.json
index e4730b2031..0e29960d94 100644
--- a/keyboards/viktus/omnikey_bh/info.json
+++ b/keyboards/viktus/omnikey_bh/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C2", "C3", "C4", "C7", "C1", "C0", "E1", "E0", "D7", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1", "B2", "B3"],
+    "rows": ["B7", "D0", "D1", "D2", "D3", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "at90usb1286",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/viktus/omnikey_bh/omnikey_bh.c b/keyboards/viktus/omnikey_bh/omnikey_bh.c
deleted file mode 100644
index c2f52f30c3..0000000000
--- a/keyboards/viktus/omnikey_bh/omnikey_bh.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "omnikey_bh.h"
diff --git a/keyboards/viktus/osav2/info.json b/keyboards/viktus/osav2/info.json
index b2274880bc..c977d8ebec 100644
--- a/keyboards/viktus/osav2/info.json
+++ b/keyboards/viktus/osav2/info.json
@@ -33,7 +33,6 @@
     },
     "rgblight": {
         "led_count": 23,
-        "pin": "D4",
         "max_brightness": 191,
         "animations": {
             "breathing": true,
@@ -41,6 +40,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "D4"
+    },
     "backlight": {
         "levels": 6,
         "max_brightness": 191,
diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/info.json
index ed1c03c19f..306db24f83 100644
--- a/keyboards/viktus/osav2_numpad/info.json
+++ b/keyboards/viktus/osav2_numpad/info.json
@@ -27,9 +27,11 @@
         "cols": ["F5", "F0", "D3", "D5"],
         "rows": ["F1", "F4", "D4", "D7", "D6"]
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "rgblight": {
         "led_count": 9,
-        "pin": "C7",
         "max_brightness": 191,
         "animations": {
             "breathing": true,
diff --git a/keyboards/viktus/smolka/config.h b/keyboards/viktus/smolka/config.h
index a4789be9b7..bb14ae71b1 100644
--- a/keyboards/viktus/smolka/config.h
+++ b/keyboards/viktus/smolka/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7, C7, C6 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, D4, B1, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/viktus/smolka/info.json b/keyboards/viktus/smolka/info.json
index 3e38c540e6..e9727d48ff 100644
--- a/keyboards/viktus/smolka/info.json
+++ b/keyboards/viktus/smolka/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0010",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "D4", "B1", "B2"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D1"},
diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/info.json
index 1ac5d4802a..76cdbb7c03 100644
--- a/keyboards/viktus/sp111/info.json
+++ b/keyboards/viktus/sp111/info.json
@@ -16,9 +16,9 @@
                 {"label":"F13", "x":0, "y":0}, {"label":"F14", "x":1, "y":0}, {"label":"F15", "x":2, "y":0}, {"label":"F16", "x":3, "y":0}, {"label":"Esc", "x":4.5, "y":0}, {"label":"F1", "x":5.75, "y":0}, {"label":"F2", "x":6.75, "y":0}, {"label":"F3", "x":7.75, "y":0}, {"label":"F4", "x":8.75, "y":0}, {"label":"F5", "x":10, "y":0}, {"label":"F6", "x":11, "y":0}, {"label":"F7", "x":12.75, "y":0}, {"label":"F8", "x":13.75, "y":0}, {"label":"F9", "x":15, "y":0}, {"label":"F10", "x":16, "y":0}, {"label":"F11", "x":17, "y":0}, {"label":"F12", "x":18, "y":0}, {"label":"Prt Scn", "x":19.25, "y":0}, {"label":"Scl Lck", "x":20.5, "y":0}, {"label":"Pause", "x":21.5, "y":0},
                 {"label":"Num Lock", "x":0, "y":1.5}, {"label":"/", "x":1, "y":1.5}, {"label":"*", "x":2, "y":1.5}, {"label":"-", "x":3, "y":1.5}, {"label":"~", "x":4.5, "y":1.5}, {"label":"!", "x":5.5, "y":1.5}, {"label":"@", "x":6.5, "y":1.5}, {"label":"#", "x":7.5, "y":1.5}, {"label":"$", "x":8.5, "y":1.5}, {"label":"%", "x":9.5, "y":1.5}, {"label":"^", "x":10.5, "y":1.5}, {"label":"&", "x":12.25, "y":1.5}, {"label":"*", "x":13.25, "y":1.5}, {"label":"(", "x":14.25, "y":1.5}, {"label":")", "x":15.25, "y":1.5}, {"label":"_", "x":16.25, "y":1.5}, {"label":"+", "x":17.25, "y":1.5}, {"label":"Backspace", "x":18.25, "y":1.5}, {"label":"Backspace2", "x":19.25, "y":1.5}, {"label":"Home", "x":20.5, "y":1.5}, {"label":"Insert", "x":21.5, "y":1.5},
                 {"label":"7", "x":0, "y":2.5}, {"label":"8", "x":1, "y":2.5}, {"label":"9", "x":2, "y":2.5}, {"label":"+", "x":3, "y":2.5}, {"label":"Tab", "x":4.5, "y":2.5, "w":1.5}, {"label":"Q", "x":6, "y":2.5}, {"label":"W", "x":7, "y":2.5}, {"label":"E", "x":8, "y":2.5}, {"label":"R", "x":9, "y":2.5}, {"label":"T", "x":10, "y":2.5}, {"label":"Y", "x":11.75, "y":2.5}, {"label":"U", "x":12.75, "y":2.5}, {"label":"I", "x":13.75, "y":2.5}, {"label":"O", "x":14.75, "y":2.5}, {"label":"P", "x":15.75, "y":2.5}, {"label":"{", "x":16.75, "y":2.5}, {"label":"}", "x":17.75, "y":2.5}, {"label":"|", "x":18.75, "y":2.5, "w":1.5}, {"label":"End", "x":20.5, "y":2.5}, {"label":"Delete", "x":21.5, "y":2.5},
-                {"label":"4", "x":0, "y":3.5}, {"label":"5", "x":1, "y":3.5}, {"label":"6", "x":2, "y":3.5}, {"label":"=", "x":3, "y":3.5}, {"label":"Caps Lock", "x":4.5, "y":3.5, "w":1.75}, {"label":"A", "x":6.25, "y":3.5}, {"label":"S", "x":7.25, "y":3.5}, {"label":"D", "x":8.25, "y":3.5}, {"label":"F", "x":9.25, "y":3.5}, {"label":"G", "x":10.25, "y":3.5}, {"label":"H", "x":12, "y":3.5}, {"label":"J", "x":13, "y":3.5}, {"label":"K", "x":14, "y":3.5}, {"label":"L", "x":15, "y":3.5}, {"label":":", "x":16, "y":3.5}, {"label":"\"", "x":17, "y":3.5}, {"label":"#", "x":18, "y":3.5, "w":1}, {"label":"Enter", "x":19, "y":3.5, "w":1.25}, {"label":"PgUp", "x":20.5, "y":3.5}, {"label":"PgDn", "x":21.5, "y":3.5},
-                {"label":"1", "x":0, "y":4.5}, {"label":"2", "x":1, "y":4.5}, {"label":"3", "x":2, "y":4.5}, {"label":"Enter", "x":3, "y":4.5}, {"label":"Shift", "x":4.5, "y":4.5, "w":1.25}, {"label":"numbs", "x":5.75, "y":4.5, "w":1}, {"label":"Z", "x":6.75, "y":4.5}, {"label":"X", "x":7.75, "y":4.5}, {"label":"C", "x":8.75, "y":4.5}, {"label":"V", "x":9.75, "y":4.5}, {"label":"B", "x":10.75, "y":4.5}, {"label":"N", "x":12.5, "y":4.5}, {"label":"M", "x":13.5, "y":4.5}, {"label":"<", "x":14.5, "y":4.5}, {"label":">", "x":15.5, "y":4.5}, {"label":"?", "x":16.5, "y":4.5}, {"label":"Shift", "x":17.5, "y":4.5, "w":1.75}, {"label":"Fn", "x":19.25, "y":4.5}, {"label":"\u2191", "x":20.5, "y":4.75},
-                {"label":"0", "x":0, "y":5.5}, {"label":"00", "x":1, "y":5.5}, {"label":".", "x":2, "y":5.5}, {"label":"..", "x":3, "y":5.5}, {"label":"Ctrl", "x":4.5, "y":5.5, "w":1.25}, {"label":"Code", "x":5.75, "y":5.5, "w":1.25}, {"label":"Alt", "x":7, "y":5.5, "w":1.25}, {"label":"Fn", "x":8.25, "y":5.5, "w":1}, {"label":"", "x":9.25, "y":5.5, "w":2.25}, {"label":"", "x":12.25, "y":5.5, "w":2.25}, {"label":"", "x":14.5, "y":5.5, "w":1}, {"label":"Alt", "x":15.5, "y":5.5, "w":1.25}, {"label":"Code", "x":16.75, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":18, "y":5.5, "w":1.25}, {"label":"\u2190", "x":19.5, "y":5.75}, {"label":"\u2193", "x":20.5, "y":5.75}, {"label":"\u2192", "x":21.5, "y":5.75}
+                {"label":"4", "x":0, "y":3.5}, {"label":"5", "x":1, "y":3.5}, {"label":"6", "x":2, "y":3.5}, {"label":"=", "x":3, "y":3.5}, {"label":"Caps Lock", "x":4.5, "y":3.5, "w":1.75}, {"label":"A", "x":6.25, "y":3.5}, {"label":"S", "x":7.25, "y":3.5}, {"label":"D", "x":8.25, "y":3.5}, {"label":"F", "x":9.25, "y":3.5}, {"label":"G", "x":10.25, "y":3.5}, {"label":"H", "x":12, "y":3.5}, {"label":"J", "x":13, "y":3.5}, {"label":"K", "x":14, "y":3.5}, {"label":"L", "x":15, "y":3.5}, {"label":":", "x":16, "y":3.5}, {"label":"\"", "x":17, "y":3.5}, {"label":"#", "x":18, "y":3.5}, {"label":"Enter", "x":19, "y":3.5, "w":1.25}, {"label":"PgUp", "x":20.5, "y":3.5}, {"label":"PgDn", "x":21.5, "y":3.5},
+                {"label":"1", "x":0, "y":4.5}, {"label":"2", "x":1, "y":4.5}, {"label":"3", "x":2, "y":4.5}, {"label":"Enter", "x":3, "y":4.5}, {"label":"Shift", "x":4.5, "y":4.5, "w":1.25}, {"label":"numbs", "x":5.75, "y":4.5}, {"label":"Z", "x":6.75, "y":4.5}, {"label":"X", "x":7.75, "y":4.5}, {"label":"C", "x":8.75, "y":4.5}, {"label":"V", "x":9.75, "y":4.5}, {"label":"B", "x":10.75, "y":4.5}, {"label":"N", "x":12.5, "y":4.5}, {"label":"M", "x":13.5, "y":4.5}, {"label":"<", "x":14.5, "y":4.5}, {"label":">", "x":15.5, "y":4.5}, {"label":"?", "x":16.5, "y":4.5}, {"label":"Shift", "x":17.5, "y":4.5, "w":1.75}, {"label":"Fn", "x":19.25, "y":4.5}, {"label":"\u2191", "x":20.5, "y":4.75},
+                {"label":"0", "x":0, "y":5.5}, {"label":"00", "x":1, "y":5.5}, {"label":".", "x":2, "y":5.5}, {"label":"..", "x":3, "y":5.5}, {"label":"Ctrl", "x":4.5, "y":5.5, "w":1.25}, {"label":"Code", "x":5.75, "y":5.5, "w":1.25}, {"label":"Alt", "x":7, "y":5.5, "w":1.25}, {"label":"Fn", "x":8.25, "y":5.5}, {"label":"", "x":9.25, "y":5.5, "w":2.25}, {"label":"", "x":12.25, "y":5.5, "w":2.25}, {"label":"", "x":14.5, "y":5.5}, {"label":"Alt", "x":15.5, "y":5.5, "w":1.25}, {"label":"Code", "x":16.75, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":18, "y":5.5, "w":1.25}, {"label":"\u2190", "x":19.5, "y":5.75}, {"label":"\u2193", "x":20.5, "y":5.75}, {"label":"\u2192", "x":21.5, "y":5.75}
             ]
         }
     }
diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h
index 8b7c6fdc7d..bc80a8ebca 100644
--- a/keyboards/viktus/sp_mini/config.h
+++ b/keyboards/viktus/sp_mini/config.h
@@ -18,23 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F0, B5, B4, D7, D6 }
-#define MATRIX_COL_PINS { B6, C6, C7, D4, D2, D3, D5, NO_PIN } // no B7 on left hand
-#define MATRIX_ROW_PINS_RIGHT { F0, B5, B4, D7, D6 }
-#define MATRIX_COL_PINS_RIGHT { B6, C6, C7, D4, D2, D3, D5, B7 }
-
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Split Defines */
 #define SPLIT_USB_DETECT
 #define MASTER_LEFT
 #define USE_I2C
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN E6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json
index 33cc1f6dcb..4ac4e95913 100644
--- a/keyboards/viktus/sp_mini/info.json
+++ b/keyboards/viktus/sp_mini/info.json
@@ -8,11 +8,27 @@
         "pid": "0x534D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", null],
+        "rows": ["F0", "B5", "B4", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F4", "pin_b": "F1", "resolution": 8}
         ]
     },
+    "split": {
+        "matrix_pins": {
+            "right": {
+                "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", "B7"],
+                "rows": ["F0", "B5", "B4", "D7", "D6"]
+            }
+        }
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/viktus/styrka/config.h b/keyboards/viktus/styrka/config.h
index 5c8d52a18b..c0e0f2bef8 100644
--- a/keyboards/viktus/styrka/config.h
+++ b/keyboards/viktus/styrka/config.h
@@ -17,29 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {B11, B10, B2, B1, B0, A7, A6, A5, B13, B12}
-#define MATRIX_COL_PINS {A0, A1, A2, A3, A4, B14, B15, A8, A9}
-//{C13, C14, C15, A0,A2,A3,A4,A5,A6, A1,B12,B1}
-/* Unused pins, in the default layout, are:
-EncA (B6) because it is not used in the default PCB
-All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason;
-B0, which is unconnected on the PCB
-*/
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/viktus/styrka/info.json b/keyboards/viktus/styrka/info.json
index 6bad0166c0..52cf5823a0 100644
--- a/keyboards/viktus/styrka/info.json
+++ b/keyboards/viktus/styrka/info.json
@@ -8,17 +8,290 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "B14", "B15", "A8", "A9"],
+    "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B13", "B12"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F072",
   "bootloader": "stm32-dfu",
-  "layouts": {
-    "LAYOUT_default": {
-      "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
-    },
-    "LAYOUT_split_bs": {
-      "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"|", "x":15.25, "y":0}, {"label":"Delete", "x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"PgUp", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgDn", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"End", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
-    },
-    "LAYOUT_all": {
-      "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"x":15.25, "y":0}, {"label":"Back", "x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":1.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+    "layouts": {
+        "LAYOUT_default": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [0, 8], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [2, 8], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 8], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [6, 2], "x": 4.5, "y": 3},
+                {"matrix": [7, 2], "x": 5.5, "y": 3},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+                {"matrix": [7, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 4], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [8, 8], "x": 16.25, "y": 4},
+                {"matrix": [9, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [2, 8], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 8], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [6, 2], "x": 4.5, "y": 3},
+                {"matrix": [7, 2], "x": 5.5, "y": 3},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+                {"matrix": [7, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 4], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [8, 8], "x": 16.25, "y": 4},
+                {"matrix": [9, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [2, 8], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [4, 8], "x": 16, "y": 2, "w": 1.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.5, "y": 3},
+                {"matrix": [6, 2], "x": 4.5, "y": 3},
+                {"matrix": [7, 2], "x": 5.5, "y": 3},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+                {"matrix": [7, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 4], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [8, 8], "x": 16.25, "y": 4},
+                {"matrix": [9, 8], "x": 17.25, "y": 4}
+            ]
+        }
     }
 }
-}
diff --git a/keyboards/viktus/styrka/styrka.c b/keyboards/viktus/styrka/styrka.c
deleted file mode 100644
index 4bf6fef90b..0000000000
--- a/keyboards/viktus/styrka/styrka.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 jrfhoutx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "styrka.h"
diff --git a/keyboards/viktus/styrka/styrka.h b/keyboards/viktus/styrka/styrka.h
deleted file mode 100644
index 81d1a76f70..0000000000
--- a/keyboards/viktus/styrka/styrka.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2020 jrfhoutx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- *
- *
- * Use LAYOUT_all for ISO and Tsangan builds
- *
- */
-
-#define LAYOUT_default( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,      K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,      K28, K38, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,           K48, K58, \
-    K60, K70, K61,      K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67,      K68, K78, \
-    K80, K90, K81, K91, K82,                K84,                K86, K96, K87,      K88, K98  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, ___, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, ___, K38 }, \
-    { K40, K41, K42, K43, K44, K45, K46, ___, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, ___, K72, K73, K74, K75, K76, ___, K78 }, \
-    { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
-    { K90, K91, ___, ___, ___, ___, K96, ___, K98 }  \
-}
-#define LAYOUT_split_bs( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,      K28, K38, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,           K48, K58, \
-    K60, K70, K61,      K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67,      K68, K78, \
-    K80, K90, K81, K91, K82,                K84,                K86, K96,      K87, K88, K98  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, ___, K38 }, \
-    { K40, K41, K42, K43, K44, K45, K46, ___, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, ___, K72, K73, K74, K75, K76, ___, K78 }, \
-    { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
-    { K90, K91, ___, ___, ___, ___, K96, ___, K98 }  \
-}
-#define LAYOUT_all( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,      K28, K38, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47,      K48, K58, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67,      K68, K78, \
-    K80, K90, K81, K91, K82,                K84,                K86, K96,      K87, K88, K98  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, ___, K38 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, K78 }, \
-    { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
-    { K90, K91, ___, ___, ___, ___, K96, ___, K98 }  \
-}
diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h
index a3555ccd50..ada0ff6e76 100644
--- a/keyboards/viktus/z150_bh/config.h
+++ b/keyboards/viktus/z150_bh/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C3, C2, C1, C0, E1 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D7, E0, C7, C6, C5, C4, F0, F1, F2, F3, F4, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -16,20 +8,3 @@
 
 /* force n-key rollover*/
 #define FORCE_NKRO
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/viktus/z150_bh/info.json b/keyboards/viktus/z150_bh/info.json
index f1e68dedf1..f622120e9a 100644
--- a/keyboards/viktus/z150_bh/info.json
+++ b/keyboards/viktus/z150_bh/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "C7", "C6", "C5", "C4", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"],
+        "rows": ["C3", "C2", "C1", "C0", "E1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0",
         "num_lock": "E7",
diff --git a/keyboards/viktus/z150_bh/z150_bh.c b/keyboards/viktus/z150_bh/z150_bh.c
deleted file mode 100644
index b75a1ff198..0000000000
--- a/keyboards/viktus/z150_bh/z150_bh.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "z150_bh.h"
diff --git a/keyboards/vitamins_included/info.json b/keyboards/vitamins_included/info.json
index 883278d983..8199aca23a 100644
--- a/keyboards/vitamins_included/info.json
+++ b/keyboards/vitamins_included/info.json
@@ -9,9 +9,64 @@
   },
   "processor": "atmega32u4",
   "community_layouts": ["ortho_4x12"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12"
+  },
   "layouts": {
-    "LAYOUT": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "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": 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": 11, "y": 1},
+        {"matrix": [5, 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": [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": 11, "y": 2},
+        {"matrix": [6, 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": [7, 0], "x": 7, "y": 3},
+        {"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},
+        {"matrix": [7, 5], "x": 12, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h
index cea58affaa..81dd72ca9e 100644
--- a/keyboards/vitamins_included/rev1/config.h
+++ b/keyboards/vitamins_included/rev1/config.h
@@ -23,20 +23,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EE_HANDS
 
-// wiring of each half
-#define MATRIX_ROW_PINS { F5, F6, C7, F7 }
-#define MATRIX_COL_PINS { F1, F4, E2, B6, D7, D6}
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN F0
-
 #define RGBLED_NUM 16    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json
index e79f940440..f9fd3d018e 100644
--- a/keyboards/vitamins_included/rev1/info.json
+++ b/keyboards/vitamins_included/rev1/info.json
@@ -2,8 +2,16 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "E2", "B6", "D7", "D6"],
+        "rows": ["F5", "F6", "C7", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "bootloader": "caterina"
 }
diff --git a/keyboards/vitamins_included/rev1/rev1.c b/keyboards/vitamins_included/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/vitamins_included/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/vitamins_included/rev1/rev1.h b/keyboards/vitamins_included/rev1/rev1.h
deleted file mode 100644
index 53ae64a6ea..0000000000
--- a/keyboards/vitamins_included/rev1/rev1.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#pragma once
-#include QMK_KEYBOARD_H
diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h
index 40f6312b47..ce07676fee 100644
--- a/keyboards/vitamins_included/rev2/config.h
+++ b/keyboards/vitamins_included/rev2/config.h
@@ -22,15 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN B4
 
-// wiring of each half
-#define MATRIX_ROW_PINS { F5, F6, C7, F7 }
-#define MATRIX_COL_PINS { F1, F4, E2, B6, D7, D6}
-
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN F0
-
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json
index 894043ef98..9170f80a7d 100644
--- a/keyboards/vitamins_included/rev2/info.json
+++ b/keyboards/vitamins_included/rev2/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "E2", "B6", "D7", "D6"],
+        "rows": ["F5", "F6", "C7", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "F5",
         "esc_output": "F1",
@@ -11,5 +16,8 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
     "bootloader": "qmk-dfu"
 }
diff --git a/keyboards/vitamins_included/rev2/rev2.c b/keyboards/vitamins_included/rev2/rev2.c
index 15b47089e8..d34cdb4fc1 100644
--- a/keyboards/vitamins_included/rev2/rev2.c
+++ b/keyboards/vitamins_included/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "rev2.h"
+#include "quantum.h"
 
 bool is_keyboard_left(void) {
     #if defined(MASTER_LEFT)
diff --git a/keyboards/vitamins_included/rev2/rev2.h b/keyboards/vitamins_included/rev2/rev2.h
deleted file mode 100644
index 7e12888dda..0000000000
--- a/keyboards/vitamins_included/rev2/rev2.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include QMK_KEYBOARD_H
diff --git a/keyboards/vitamins_included/vitamins_included.c b/keyboards/vitamins_included/vitamins_included.c
index e83c81633c..37e8b3ab9b 100644
--- a/keyboards/vitamins_included/vitamins_included.c
+++ b/keyboards/vitamins_included/vitamins_included.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/vitamins_included/vitamins_included.h b/keyboards/vitamins_included/vitamins_included.h
deleted file mode 100644
index 5cd03cfcf8..0000000000
--- a/keyboards/vitamins_included/vitamins_included.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_vitamins_included_rev1
-    #include "rev1.h"
-#else
-    #include "rev2.h"
-#endif
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT( \
-	L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-	L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-	L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-	L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-		{ R00, R01, R02, R03, R04, R05 }, \
-		{ R10, R11, R12, R13, R14, R15 }, \
-		{ R20, R21, R22, R23, R24, R25 }, \
-		{ R30, R31, R32, R33, R34, R35 } \
-  }
-
-#define LAYOUT_ortho_4x12 LAYOUT
diff --git a/keyboards/w1_at/config.h b/keyboards/w1_at/config.h
index e272a69ec9..79fdc4275f 100644
--- a/keyboards/w1_at/config.h
+++ b/keyboards/w1_at/config.h
@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 }
-#define MATRIX_COL_PINS { B7, A0, A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14, B15, A8, A9, A10 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/w1_at/info.json b/keyboards/w1_at/info.json
index a922e0f4c9..0f7bdfb854 100644
--- a/keyboards/w1_at/info.json
+++ b/keyboards/w1_at/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5754",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "A0", "A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "num_lock": "B3",
diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h
index 028b00de10..a0d7763711 100644
--- a/keyboards/waldo/config.h
+++ b/keyboards/waldo/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { F7, D5, D3, D2, B3, B2, C7, C6, B6, B5, B4, D7, D6, D4, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -47,8 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 // RGB LED
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -64,4 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json
index 0c85e1d8d5..c371f051b1 100644
--- a/keyboards/waldo/info.json
+++ b/keyboards/waldo/info.json
@@ -7,10 +7,18 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "D5", "D3", "D2", "B3", "B2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/waldo/waldo.c b/keyboards/waldo/waldo.c
deleted file mode 100644
index 33093d4bbd..0000000000
--- a/keyboards/waldo/waldo.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "waldo.h"
\ No newline at end of file
diff --git a/keyboards/walletburner/cajal/cajal.c b/keyboards/walletburner/cajal/cajal.c
deleted file mode 100644
index 8536a10258..0000000000
--- a/keyboards/walletburner/cajal/cajal.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "cajal.h"
diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h
index 61e2d421ae..6d33342cf8 100644
--- a/keyboards/walletburner/cajal/config.h
+++ b/keyboards/walletburner/cajal/config.h
@@ -16,22 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, D5, C7, C6 }
-#define MATRIX_COL_PINS { F4, F1, F0, E6, B0, B1, B2, B3, D0, D1, D2, D3, B4, F6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -46,4 +36,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/walletburner/cajal/info.json b/keyboards/walletburner/cajal/info.json
index 7aa0563d4c..f73195f06f 100644
--- a/keyboards/walletburner/cajal/info.json
+++ b/keyboards/walletburner/cajal/info.json
@@ -8,11 +8,19 @@
         "pid": "0x6361",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "B4", "F6"],
+        "rows": ["D4", "D5", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D6", "pin_b": "D7"}
         ]
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h
index 84f3444730..2dae864ddb 100644
--- a/keyboards/walletburner/neuron/config.h
+++ b/keyboards/walletburner/neuron/config.h
@@ -1,22 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D3, F5 }
-#define MATRIX_COL_PINS { F0, F7, F6, F4, F1, E6, D6, D2, B4, D7, B6, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -31,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/walletburner/neuron/info.json b/keyboards/walletburner/neuron/info.json
index dd746f4c4b..d66824fa24 100644
--- a/keyboards/walletburner/neuron/info.json
+++ b/keyboards/walletburner/neuron/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6E75",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F7", "F6", "F4", "F1", "E6", "D6", "D2", "B4", "D7", "B6", "D5"],
+        "rows": ["D0", "D1", "D3", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/walletburner/neuron/neuron.c b/keyboards/walletburner/neuron/neuron.c
deleted file mode 100644
index b6ca44bd78..0000000000
--- a/keyboards/walletburner/neuron/neuron.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "neuron.h"
diff --git a/keyboards/waterfowl/config.h b/keyboards/waterfowl/config.h
index 62f5ba6633..40d9a4b8da 100644
--- a/keyboards/waterfowl/config.h
+++ b/keyboards/waterfowl/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-// Wiring
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-
-// COL2ROW, ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 #define OLED_DISPLAY_128X64
 #define SPLIT_MODS_ENABLE
 #define SPLIT_WPM_ENABLE
diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json
index 17f01e24e2..0ee5b095b1 100644
--- a/keyboards/waterfowl/info.json
+++ b/keyboards/waterfowl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x9CE3",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"},
diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h
index 7c189d3ad1..a88ed9ba34 100644
--- a/keyboards/wavtype/foundation/config.h
+++ b/keyboards/wavtype/foundation/config.h
@@ -3,25 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, B2, B1, F0, F1 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, D2, D1, D0, D3, D5, D4, B7, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -38,7 +19,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wavtype/foundation/foundation.c b/keyboards/wavtype/foundation/foundation.c
deleted file mode 100644
index 9ac8ba6b72..0000000000
--- a/keyboards/wavtype/foundation/foundation.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 wavtype (@wavtype)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "foundation.h"
diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json
index 36153f2bca..c03550e885 100644
--- a/keyboards/wavtype/foundation/info.json
+++ b/keyboards/wavtype/foundation/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "D2", "D1", "D0", "D3", "D5", "D4", "B7", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["B3", "B2", "B1", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [0, 1]
     },
diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h
index ad046b7fd1..c2c0a6e034 100644
--- a/keyboards/wavtype/p01_ultra/config.h
+++ b/keyboards/wavtype/p01_ultra/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, D7, D6, B5, B6, D4 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, B3, B2, B1, B0, B7, D0, D1, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 18
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/info.json
index d88ac83836..fa04ce7850 100644
--- a/keyboards/wavtype/p01_ultra/info.json
+++ b/keyboards/wavtype/p01_ultra/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5"],
+        "rows": ["B4", "D7", "D6", "B5", "B6", "D4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -18,778 +26,842 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 11], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 11], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"AltGr", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 11], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Fn", "x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"AltGr", "x":11, "y":5.25, "w":1.5},
-                {"label":"Fn", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 11], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/wavtype/p01_ultra/p01_ultra.c b/keyboards/wavtype/p01_ultra/p01_ultra.c
deleted file mode 100644
index a84eede45d..0000000000
--- a/keyboards/wavtype/p01_ultra/p01_ultra.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 wavtype
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "p01_ultra.h"
diff --git a/keyboards/wavtype/p01_ultra/p01_ultra.h b/keyboards/wavtype/p01_ultra/p01_ultra.h
deleted file mode 100644
index bc27e93373..0000000000
--- a/keyboards/wavtype/p01_ultra/p01_ultra.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/* Copyright 2021 wavtype
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-/*              ┌───�   ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───┬───� ┌───┬───┬───�
- *              │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0B │0C │0D │0E │ │0F │0G │0H │
- *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───┬───�      ┌───────�
- *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3E │ │1F │1G │1H │      │1D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
- *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2F │2G │2H │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴�3D  │ ISO Enter
- *  LShift      │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                   │2D │    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───�       ┌─┴───┴────┤
- * │40      │   │40  │4B │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4D    │4E │     │4G │       │4D        │ 2.75u RShift
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───�   └──────────┘
- *              │50  │51  │52  │56                      │59  │5A  │5C  │5E  │ │5F │5G │5H │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- *              │50   │51 │52   │56                         │5A   │5C │5E   │ Tsangan/WKL
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,           K4D,           K4G,      \
-    K50, K51, K52,                K56,           K59, K5A,      K5C,      K5E, K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, _x_, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
-
-#define LAYOUT_tkl_ansi_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0B, K0C, K0D, K0E,        K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                       \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4E,             K4G,      \
-    K50, K51, K52,                K56,                K59, K5A, K5C, K5E,        K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, K3E, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, K4E, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,           K4D,           K4G,      \
-    K50, K51, K52,                K56,                K5A,      K5C,      K5E, K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, _x_, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0B, K0C, K0D, K0E,        K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                       \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4E,             K4G,      \
-    K50, K51, K52,                K56,                     K5A, K5C, K5E,        K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, K3E, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, _x_, _x_, K4D, K4E, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                     \
-    K40, K4B, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4G,      \
-    K50, K51, K52,                K56,           K59, K5A,      K5C,      K5E, K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, _x_, K4D, _x_, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
-
-#define LAYOUT_tkl_iso_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0B, K0C, K0D, K0E,        K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D, K3D,                       \
-    K40, K4B, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4E,             K4G,      \
-    K50, K51, K52,                K56,                K59, K5A, K5C, K5E,        K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, K3E, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, _x_, K4D, K4E, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, K59, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
-
-#define LAYOUT_tkl_iso_tsangan( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K2D,                     \
-    K40, K4B, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4G,      \
-    K50, K51, K52,                K56,                K5A,      K5C,      K5E, K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, _x_, K4D, _x_, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
-
-#define LAYOUT_tkl_iso_tsangan_split_bs_rshift( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0B, K0C, K0D, K0E,        K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K2D,                       \
-    K40, K4B, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4E,             K4G,      \
-    K50, K51, K52,                K56,                     K5A, K5C, K5E,        K5F, K5G, K5H  \
-) \
-{ \
-    { K00, _x_, K02, K03, K04, K05, K06, K07, K08, K09, _x_, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, _x_, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, K3E, _x_, _x_, _x_ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, _x_, K4D, K4E, _x_, K4G, _x_ }, \
-    { K50, K51, K52, _x_, _x_, _x_, K56, _x_, _x_, _x_, K5A, _x_, K5C, _x_, K5E, K5F, K5G, K5H }  \
-}
diff --git a/keyboards/weirdo/geminate60/config.h b/keyboards/weirdo/geminate60/config.h
index f187c1b234..948bd0c7f1 100644
--- a/keyboards/weirdo/geminate60/config.h
+++ b/keyboards/weirdo/geminate60/config.h
@@ -15,11 +15,6 @@
   */ 
 #pragma once
 
-#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15}
-#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8}
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN A6
 #define RGBLED_NUM 1
 //#define RGBLIGHT_DISABLE_KEYCODES
 
diff --git a/keyboards/weirdo/geminate60/geminate60.c b/keyboards/weirdo/geminate60/geminate60.c
deleted file mode 100644
index 3f0218c890..0000000000
--- a/keyboards/weirdo/geminate60/geminate60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-  /* Copyright 2020 Weirdo
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#include "geminate60.h"
diff --git a/keyboards/weirdo/geminate60/info.json b/keyboards/weirdo/geminate60/info.json
index 890a017867..e197061d65 100644
--- a/keyboards/weirdo/geminate60/info.json
+++ b/keyboards/weirdo/geminate60/info.json
@@ -8,6 +8,14 @@
         "pid": "0x676D",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A6"
+    },
+    "matrix_pins": {
+        "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+        "rows": ["A9", "A10", "B10", "B11", "B15"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/kelowna/rgb64/config.h b/keyboards/weirdo/kelowna/rgb64/config.h
index 92fa599442..0a446abeba 100644
--- a/keyboards/weirdo/kelowna/rgb64/config.h
+++ b/keyboards/weirdo/kelowna/rgb64/config.h
@@ -15,11 +15,6 @@
   */ 
 #pragma once
 
-#define MATRIX_COL_PINS { A3, A4, A5, A7, B0, B1, B10, B15, A8, A9, A10, B7, B6, B5, B4}
-#define MATRIX_ROW_PINS { B12, B13, B14, C11, A1}
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN A6
 #define RGBLED_NUM 64
 //#define RGBLIGHT_DISABLE_KEYCODES
 
diff --git a/keyboards/weirdo/kelowna/rgb64/info.json b/keyboards/weirdo/kelowna/rgb64/info.json
index 934da67ee4..c22e666f28 100644
--- a/keyboards/weirdo/kelowna/rgb64/info.json
+++ b/keyboards/weirdo/kelowna/rgb64/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4C64",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A6"
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A5", "A7", "B0", "B1", "B10", "B15", "A8", "A9", "A10", "B7", "B6", "B5", "B4"],
+        "rows": ["B12", "B13", "B14", "C11", "A1"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/kelowna/rgb64/rgb64.c b/keyboards/weirdo/kelowna/rgb64/rgb64.c
deleted file mode 100644
index dd57616161..0000000000
--- a/keyboards/weirdo/kelowna/rgb64/rgb64.c
+++ /dev/null
@@ -1,16 +0,0 @@
-  /* Copyright 2021 Weirdo
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#include "rgb64.h"
diff --git a/keyboards/weirdo/ls_60/config.h b/keyboards/weirdo/ls_60/config.h
index 46340f7833..d2b9299c8f 100644
--- a/keyboards/weirdo/ls_60/config.h
+++ b/keyboards/weirdo/ls_60/config.h
@@ -15,11 +15,6 @@
   */ 
 #pragma once
 
-#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15}
-#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8}
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN A6
 #define RGBLED_NUM 1
 //#define RGBLIGHT_DISABLE_KEYCODES
 
diff --git a/keyboards/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/info.json
index 906a993884..94cf75c25c 100644
--- a/keyboards/weirdo/ls_60/info.json
+++ b/keyboards/weirdo/ls_60/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4C53",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A6"
+    },
+    "matrix_pins": {
+        "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+        "rows": ["A9", "A10", "B10", "B11", "B15"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h
index 8fa16298e2..2c31247277 100644
--- a/keyboards/weirdo/naiping/np64/config.h
+++ b/keyboards/weirdo/naiping/np64/config.h
@@ -15,11 +15,6 @@
   */
 #pragma once
 
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN B1
 #define RGBLED_NUM 80
 //#define RGBLIGHT_DISABLE_KEYCODES
 
diff --git a/keyboards/weirdo/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/info.json
index c188d4bb11..6e4e822b78 100644
--- a/keyboards/weirdo/naiping/np64/info.json
+++ b/keyboards/weirdo/naiping/np64/info.json
@@ -8,6 +8,14 @@
         "pid": "0x7064",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/naiping/np64/np64.c b/keyboards/weirdo/naiping/np64/np64.c
deleted file mode 100644
index ee4c08cd34..0000000000
--- a/keyboards/weirdo/naiping/np64/np64.c
+++ /dev/null
@@ -1,16 +0,0 @@
-  /* Copyright 2021 Weirdo
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#include "np64.h"
diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h
index 43b8d1c32e..0a3df009ab 100644
--- a/keyboards/weirdo/naiping/nphhkb/config.h
+++ b/keyboards/weirdo/naiping/nphhkb/config.h
@@ -15,11 +15,6 @@
   */ 
 #pragma once
 
-#define MATRIX_COL_PINS { A4, C15, C14, A5, A6,  A15, B1, B10, B12, B13, B14, B15,  B6, A8, B5}
-#define MATRIX_ROW_PINS { B7, B8, B9, C13, B4}
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN A7
 #define RGBLED_NUM 78
 //#define RGBLIGHT_DISABLE_KEYCODES
 
diff --git a/keyboards/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json
index b1b1c1f23d..fc0439a527 100644
--- a/keyboards/weirdo/naiping/nphhkb/info.json
+++ b/keyboards/weirdo/naiping/nphhkb/info.json
@@ -8,6 +8,14 @@
         "pid": "0x7068",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A7"
+    },
+    "matrix_pins": {
+        "cols": ["A4", "C15", "C14", "A5", "A6", "A15", "B1", "B10", "B12", "B13", "B14", "B15", "B6", "A8", "B5"],
+        "rows": ["B7", "B8", "B9", "C13", "B4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/naiping/nphhkb/nphhkb.c b/keyboards/weirdo/naiping/nphhkb/nphhkb.c
deleted file mode 100644
index 881522c0b3..0000000000
--- a/keyboards/weirdo/naiping/nphhkb/nphhkb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-  /* Copyright 2021 Weirdo
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#include "nphhkb.h"
diff --git a/keyboards/weirdo/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h
index 265ae2e207..782833a3af 100644
--- a/keyboards/weirdo/naiping/npminila/config.h
+++ b/keyboards/weirdo/naiping/npminila/config.h
@@ -15,11 +15,6 @@
   */ 
 #pragma once
 
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN D1
 #define RGBLED_NUM 82
 //#define RGBLIGHT_DISABLE_KEYCODES
 
diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json
index 9904ca28fc..df826600da 100644
--- a/keyboards/weirdo/naiping/npminila/info.json
+++ b/keyboards/weirdo/naiping/npminila/info.json
@@ -8,6 +8,14 @@
         "pid": "0x706D",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/naiping/npminila/npminila.c b/keyboards/weirdo/naiping/npminila/npminila.c
deleted file mode 100644
index ab9ebb45d7..0000000000
--- a/keyboards/weirdo/naiping/npminila/npminila.c
+++ /dev/null
@@ -1,16 +0,0 @@
-  /* Copyright 2021 Weirdo
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#include "npminila.h"
diff --git a/keyboards/weirdo/tiger910/config.h b/keyboards/weirdo/tiger910/config.h
index 34f2b70605..e484ffe49e 100644
--- a/keyboards/weirdo/tiger910/config.h
+++ b/keyboards/weirdo/tiger910/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, B6, B7, C0, C1, C2, C3, C4, C5, C6, C7, D0, D1, D2, D3, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/weirdo/tiger910/info.json b/keyboards/weirdo/tiger910/info.json
index 9634cc6f9a..d09e618408 100644
--- a/keyboards/weirdo/tiger910/info.json
+++ b/keyboards/weirdo/tiger910/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5447",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "D2", "D3", "D4"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/weirdo/tiger910/tiger910.c b/keyboards/weirdo/tiger910/tiger910.c
deleted file mode 100644
index d0964d9be9..0000000000
--- a/keyboards/weirdo/tiger910/tiger910.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Weirdo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "tiger910.h"
diff --git a/keyboards/wekey/polaris/config.h b/keyboards/wekey/polaris/config.h
index e43421638e..c86ead57bd 100644
--- a/keyboards/wekey/polaris/config.h
+++ b/keyboards/wekey/polaris/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F1, F0, B7, F7, D5, C6, C7, F5, F6 }
-#define MATRIX_COL_PINS { E6, B4, B5, B6, D0, D1, D2, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wekey/polaris/info.json b/keyboards/wekey/polaris/info.json
index ad7477b5fc..11a7ca9b9d 100644
--- a/keyboards/wekey/polaris/info.json
+++ b/keyboards/wekey/polaris/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B5", "B6", "D0", "D1", "D2", "D3"],
+        "rows": ["F4", "F1", "F0", "B7", "F7", "D5", "C6", "C7", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
diff --git a/keyboards/wekey/polaris/polaris.c b/keyboards/wekey/polaris/polaris.c
deleted file mode 100644
index 413c56460e..0000000000
--- a/keyboards/wekey/polaris/polaris.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 @wekey
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "polaris.h"
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
index c720fc2103..a2d6575d8e 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/config.h
@@ -17,26 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F1, D7, B4, B5, B6, F6 }
-#define MATRIX_COL_PINS { F4, F5, C7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN C6
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 27
 
diff --git a/keyboards/wekey/we27/encoder_actions.c b/keyboards/wekey/we27/encoder_actions.c
index 72970a2ffc..87a53676e6 100644
--- a/keyboards/wekey/we27/encoder_actions.c
+++ b/keyboards/wekey/we27/encoder_actions.c
@@ -29,7 +29,8 @@ void encoder_action_unregister(void) {
             keyevent_t encoder_event = (keyevent_t) {
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)
+                .time = timer_read(),
+                .type = KEY_EVENT
             };
             encoder_state[index] = 0;
             action_exec(encoder_event);
@@ -41,7 +42,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json
index 0a114ad548..5c29b5a995 100644
--- a/keyboards/wekey/we27/info.json
+++ b/keyboards/wekey/we27/info.json
@@ -8,33 +8,99 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "C7", "D6", "D4"],
+        "rows": ["F1", "D7", "B4", "B5", "B6", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
         ]
     },
+    "ws2812": {
+        "pin": "C6"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["numpad_6x5"],
     "layouts": {
         "LAYOUT_numpad_6x5": {
             "layout": [
-                {"label":"ESC", "x":0, "y":0}, {"label":"PRTSC", "x":1, "y":0}, {"label":"F5", "x":2, "y":0}, {"label":"F11", "x":3, "y":0}, {"label":"MUTE", "x":4, "y":0}, 
-                {"label":"NLCK", "x":0, "y":1.5}, {"label":"DEL", "x":1, "y":1.5}, {"label":"/", "x":2, "y":1.5}, {"label":"*", "x":3, "y":1.5}, {"label":"-", "x":4, "y":1.5}, 
-                {"label":"HOME", "x":0, "y":2.5}, {"label":"7", "x":1, "y":2.5}, {"label":"8", "x":2, "y":2.5}, {"label":"9", "x":3, "y":2.5}, 
-                {"label":"END", "x":0, "y":3.5}, {"label":"4", "x":1, "y":3.5}, {"label":"5", "x":2, "y":3.5}, {"label":"6", "x":3, "y":3.5}, {"label":"+", "x":4, "y":2.5, "h":2}, 
-                {"label":"ANY", "x":0, "y":4.5}, {"label":"1", "x":1, "y":4.5}, {"label":"2", "x":2, "y":4.5}, {"label":"3", "x":3, "y":4.5}, 
-                {"label":"FN", "x":0, "y":5.5}, {"label":"0", "x":1, "y":5.5, "w":2}, {"label":".", "x":3, "y":5.5}, {"label":"ENTER", "x":4, "y":4.5, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3.5},
+                {"matrix": [2, 4], "x": 4, "y": 2.5, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1, "y": 5.5, "w": 2},
+                {"matrix": [5, 3], "x": 3, "y": 5.5},
+                {"matrix": [4, 4], "x": 4, "y": 4.5, "h": 2}
             ]
         },
         "LAYOUT_numpad_6x5_encoder": {
             "layout": [
-                {"label":"ESC", "x":0, "y":0.75}, {"label":"PRTSC", "x":1, "y":0.75}, {"label":"F5", "x":2, "y":0.75}, {"label":"F11", "x":3, "y":0.75}, {"label":"MUTE", "x":4, "y":0.75}, {"label":"VOLD", "x":3.75, "y":0, "w":0.75, "h":0.75}, {"label":"VOLU", "x":4.5, "y":0, "w":0.75, "h":0.75}, 
-                {"label":"NLCK", "x":0, "y":2.25}, {"label":"DEL", "x":1, "y":2.25}, {"label":"/", "x":2, "y":2.25}, {"label":"*", "x":3, "y":2.25}, {"label":"-", "x":4, "y":2.25}, 
-                {"label":"HOME", "x":0, "y":3.25}, {"label":"7", "x":1, "y":3.25}, {"label":"8", "x":2, "y":3.25}, {"label":"9", "x":3, "y":3.25}, 
-                {"label":"END", "x":0, "y":4.25}, {"label":"4", "x":1, "y":4.25}, {"label":"5", "x":2, "y":4.25}, {"label":"6", "x":3, "y":4.25}, {"label":"+", "x":4, "y":3.25, "h":2}, 
-                {"label":"ANY", "x":0, "y":5.25}, {"label":"1", "x":1, "y":5.25}, {"label":"2", "x":2, "y":5.25}, {"label":"3", "x":3, "y":5.25}, 
-                {"label":"FN", "x":0, "y":6.25}, {"label":"0", "x":1, "y":6.25, "w":2}, {"label":".", "x":3, "y":6.25}, {"label":"ENTER", "x":4, "y":5.25, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.75},
+                {"matrix": [0, 3], "x": 3, "y": 0.75},
+                {"matrix": [0, 4], "x": 4, "y": 0.75},
+
+                {"matrix": [3, 4], "x": 3.75, "y": 0, "w": 0.75, "h": 0.75},
+                {"matrix": [5, 4], "x": 4.5, "y": 0, "w": 0.75, "h": 0.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2, "y": 2.25},
+                {"matrix": [1, 3], "x": 3, "y": 2.25},
+                {"matrix": [1, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2, "y": 3.25},
+                {"matrix": [2, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2, "y": 4.25},
+                {"matrix": [3, 3], "x": 3, "y": 4.25},
+                {"matrix": [2, 4], "x": 4, "y": 3.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2, "y": 5.25},
+                {"matrix": [4, 3], "x": 3, "y": 5.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 6.25},
+                {"matrix": [5, 1], "x": 1, "y": 6.25, "w": 2},
+                {"matrix": [5, 3], "x": 3, "y": 6.25},
+                {"matrix": [4, 4], "x": 4, "y": 5.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/wekey/we27/rules.mk b/keyboards/wekey/we27/rules.mk
index 3e2d707550..c76f29ff75 100644
--- a/keyboards/wekey/we27/rules.mk
+++ b/keyboards/wekey/we27/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = WS2812
 
 DEBOUNCE_TYPE	  = sym_defer_pk
 RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/wekey/we27/we27.c b/keyboards/wekey/we27/we27.c
index 2765e6f3bd..9f2b85d95f 100644
--- a/keyboards/wekey/we27/we27.c
+++ b/keyboards/wekey/we27/we27.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "we27.h"
+#include "quantum.h"
 #include "encoder_actions.h"
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/wekey/we27/we27.h b/keyboards/wekey/we27/we27.h
deleted file mode 100644
index 5542a52d2f..0000000000
--- a/keyboards/wekey/we27/we27.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2021 @wekey
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_numpad_6x5(   \
-    K00, K01, K02, K03, K04, \
-    K10, K11, K12, K13, K14, \
-    K20, K21, K22, K23,      \
-    K30, K31, K32, K33, K24, \
-    K40, K41, K42, K43,      \
-    K50, K51,      K53, K44  \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, ___ }, \
-    { K40, K41, K42, K43, K44 }, \
-    { K50, K51, ___, K53, ___ }  \
-}
-
-#define LAYOUT_numpad_6x5_encoder(      \
-    K00, K01, K02, K03, K04, K34, K54,  \
-    K10, K11, K12, K13, K14,            \
-    K20, K21, K22, K23,                 \
-    K30, K31, K32, K33, K24,            \
-    K40, K41, K42, K43,                 \
-    K50, K51,      K53, K44             \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, K34 }, \
-    { K40, K41, K42, K43, K44 }, \
-    { K50, K51, ___, K53, K54 }  \
-}
diff --git a/keyboards/westfoxtrot/aanzee/aanzee.c b/keyboards/westfoxtrot/aanzee/aanzee.c
deleted file mode 100644
index bc90dcf2db..0000000000
--- a/keyboards/westfoxtrot/aanzee/aanzee.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 westfoxtrot
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "aanzee.h"
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index 70f820c25e..a2c9c54040 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/config.h
@@ -17,17 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B4,D7,D6,D4,B3}
-#define MATRIX_COL_PINS {D2,D1,D0,D3,D5,C7,C6,B6,B5,F0,F1,F4,F5,F6,F7,B0}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 9
    #define RGBLIGHT_HUE_STEP 12
    #define RGBLIGHT_SAT_STEP 25
@@ -44,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 #define RGBW
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json
index 4c3e9bf058..0038e1f7e5 100644
--- a/keyboards/westfoxtrot/aanzee/info.json
+++ b/keyboards/westfoxtrot/aanzee/info.json
@@ -8,6 +8,11 @@
     "pid": "0xAA01",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D2", "D1", "D0", "D3", "D5", "C7", "C6", "B6", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "B0"],
+    "rows": ["B4", "D7", "D6", "D4", "B3"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "levels": 5,
@@ -17,6 +22,9 @@
     "caps_lock": "B2",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "E6"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/westfoxtrot/cyclops/config.h b/keyboards/westfoxtrot/cyclops/config.h
index 9e3dfc4911..d1de752f79 100644
--- a/keyboards/westfoxtrot/cyclops/config.h
+++ b/keyboards/westfoxtrot/cyclops/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D1, D0, D7, B4, F0 }
-#define MATRIX_COL_PINS { D3, D2, D5, D6, B6, B1, B2, B3, C6, C7, F7, F6, F4, F5, F1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/westfoxtrot/cyclops/cyclops.c b/keyboards/westfoxtrot/cyclops/cyclops.c
deleted file mode 100644
index f28d626e44..0000000000
--- a/keyboards/westfoxtrot/cyclops/cyclops.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 westfoxtrot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "cyclops.h"
diff --git a/keyboards/westfoxtrot/cyclops/info.json b/keyboards/westfoxtrot/cyclops/info.json
index 7af7031374..419a53588b 100644
--- a/keyboards/westfoxtrot/cyclops/info.json
+++ b/keyboards/westfoxtrot/cyclops/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0A66",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D5", "D6", "B6", "B1", "B2", "B3", "C6", "C7", "F7", "F6", "F4", "F5", "F1"],
+        "rows": ["D1", "D0", "D7", "B4", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/westfoxtrot/cypher/rev1/config.h b/keyboards/westfoxtrot/cypher/rev1/config.h
index a6e5ac891f..cd1f84bc1f 100644
--- a/keyboards/westfoxtrot/cypher/rev1/config.h
+++ b/keyboards/westfoxtrot/cypher/rev1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, F6, B6, B7, C6, C7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, E6, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/westfoxtrot/cypher/rev1/info.json b/keyboards/westfoxtrot/cypher/rev1/info.json
index 5089486866..217d979c41 100644
--- a/keyboards/westfoxtrot/cypher/rev1/info.json
+++ b/keyboards/westfoxtrot/cypher/rev1/info.json
@@ -6,6 +6,11 @@
     "pid": "0xAA97",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E6", "F0"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "F6", "B6", "B7", "C6", "C7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5",
     "levels": 5,
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
index 947e340c32..ddfe166509 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h
@@ -16,8 +16,7 @@
 
 #pragma once
 
-#define RGB_DI_PIN F7
-#ifdef  RGB_DI_PIN
+#define WS2812_DI_PIN F7
   #define RGBLED_NUM 15
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -28,6 +27,5 @@
   #define RGBLIGHT_EFFECT_KNIGHT
   #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
- #endif
 
 // place overrides here
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
index 065b8f5233..14cde79827 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md
@@ -31,7 +31,7 @@ RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 **config.h**
 ```
 [...]
-#define RGB_DI_PIN F7
+#define WS2812_DI_PIN F7
 #define RGBLED_NUM 15        // Change this number to the amount of LEDs on the strip you soldered
 [...]
 ```
diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h
index 61604a74a9..85da50eba8 100644
--- a/keyboards/westfoxtrot/cypher/rev5/config.h
+++ b/keyboards/westfoxtrot/cypher/rev5/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, F1, F5, F6, F7, D1, F4, D4, C6, C7 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, B7, B3, B2, B1, F0 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -44,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define GRAVE_ESC_CTRL_OVERRIDE
 
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 10
    #define RGBLIGHT_HUE_STEP 12
    #define RGBLIGHT_SAT_STEP 25
@@ -62,4 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/info.json
index 17bc326890..6bf10eedee 100644
--- a/keyboards/westfoxtrot/cypher/rev5/info.json
+++ b/keyboards/westfoxtrot/cypher/rev5/info.json
@@ -6,11 +6,19 @@
       "pid": "0xAA98",
       "device_version": "0.0.2"
     },
+    "matrix_pins": {
+      "cols": ["D6", "D7", "B4", "B5", "B6", "B7", "B3", "B2", "B1", "F0"],
+      "rows": ["B0", "F1", "F5", "F6", "F7", "D1", "F4", "D4", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "D0",
       "levels": 5,
       "breathing": true
     },
+    "ws2812": {
+      "pin": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/westfoxtrot/prophet/config.h b/keyboards/westfoxtrot/prophet/config.h
index 3206c0e56d..d7d992f50e 100644
--- a/keyboards/westfoxtrot/prophet/config.h
+++ b/keyboards/westfoxtrot/prophet/config.h
@@ -1,15 +1,5 @@
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
-*/
-#define MATRIX_ROW_PINS { C13, B2, B1, A4, A3 }
-#define MATRIX_COL_PINS { A6, A7, B0, A9, A8, A14, A15, B3, B4, B5, B8, B7, B6, B9 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/westfoxtrot/prophet/info.json b/keyboards/westfoxtrot/prophet/info.json
index ee65ab2601..94be2e52db 100644
--- a/keyboards/westfoxtrot/prophet/info.json
+++ b/keyboards/westfoxtrot/prophet/info.json
@@ -8,6 +8,11 @@
         "pid": "0xAA03",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "A9", "A8", "A14", "A15", "B3", "B4", "B5", "B8", "B7", "B6", "B9"],
+        "rows": ["C13", "B2", "B1", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h
index 68ad770787..9a425a91a8 100644
--- a/keyboards/westm/westm68/config.h
+++ b/keyboards/westm/westm68/config.h
@@ -20,10 +20,6 @@
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 }
-#define MATRIX_COL_PINS { B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/westm/westm68/info.json b/keyboards/westm/westm68/info.json
index 8ff4f8d8ce..c71d47a41d 100644
--- a/keyboards/westm/westm68/info.json
+++ b/keyboards/westm/westm68/info.json
@@ -7,83 +7,88 @@
         "vid": "0x574D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "B9", "F1", "A10", "A9"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h
index 054b47cca2..db711fcfd9 100644
--- a/keyboards/westm/westm68/rev1/config.h
+++ b/keyboards/westm/westm68/rev1/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN A8
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/westm/westm68/rev1/info.json b/keyboards/westm/westm68/rev1/info.json
index a4736b30a4..70c31e162b 100644
--- a/keyboards/westm/westm68/rev1/info.json
+++ b/keyboards/westm/westm68/rev1/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "pid": "0x0101"
+    },
+    "ws2812": {
+        "pin": "A8"
     }
 }
diff --git a/keyboards/westm/westm68/rev1/rev1.c b/keyboards/westm/westm68/rev1/rev1.c
index ea0efbee37..3b47910624 100644
--- a/keyboards/westm/westm68/rev1/rev1.c
+++ b/keyboards/westm/westm68/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "westm68.h"
+#include "quantum.h"
 
 void board_init(void) {
     rgblight_toggle(); // Fixes if LEDs were off in the first place buggy LED turns on
diff --git a/keyboards/westm/westm68/rev2/config.h b/keyboards/westm/westm68/rev2/config.h
index 054b47cca2..db711fcfd9 100644
--- a/keyboards/westm/westm68/rev2/config.h
+++ b/keyboards/westm/westm68/rev2/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN A8
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/westm/westm68/rev2/info.json b/keyboards/westm/westm68/rev2/info.json
index 0b36e6dd58..50711496d3 100644
--- a/keyboards/westm/westm68/rev2/info.json
+++ b/keyboards/westm/westm68/rev2/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "pid": "0x0102"
+    },
+    "ws2812": {
+        "pin": "A8"
     }
 }
diff --git a/keyboards/westm/westm68/westm68.c b/keyboards/westm/westm68/westm68.c
deleted file mode 100644
index e30df949a9..0000000000
--- a/keyboards/westm/westm68/westm68.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "westm68.h"
\ No newline at end of file
diff --git a/keyboards/westm/westm68/westm68.h b/keyboards/westm/westm68/westm68.h
deleted file mode 100644
index 6dda35435e..0000000000
--- a/keyboards/westm/westm68/westm68.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3B, K3C, K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2C, K2E}, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3B, K3C, K3E}, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E}  \
-}
diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h
index 51efda06a6..9a425a91a8 100644
--- a/keyboards/westm/westm9/config.h
+++ b/keyboards/westm/westm9/config.h
@@ -20,10 +20,6 @@
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define MATRIX_ROW_PINS { A14, A15, B3 }
-#define MATRIX_COL_PINS { B8, B5, B4 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json
index c9ec1e17d7..ed0b994805 100644
--- a/keyboards/westm/westm9/info.json
+++ b/keyboards/westm/westm9/info.json
@@ -7,6 +7,11 @@
         "vid": "0x574D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B8", "B5", "B4"],
+        "rows": ["A14", "A15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/westm/westm9/rev1/config.h b/keyboards/westm/westm9/rev1/config.h
index fcc9ddb99d..17de75167c 100644
--- a/keyboards/westm/westm9/rev1/config.h
+++ b/keyboards/westm/westm9/rev1/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN F1
 #define RGBLED_NUM 14
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/westm/westm9/rev1/info.json b/keyboards/westm/westm9/rev1/info.json
index 9934337227..5986e5c1c8 100644
--- a/keyboards/westm/westm9/rev1/info.json
+++ b/keyboards/westm/westm9/rev1/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "pid": "0x0301"
+    },
+    "ws2812": {
+        "pin": "F1"
     }
 }
diff --git a/keyboards/westm/westm9/rev2/config.h b/keyboards/westm/westm9/rev2/config.h
index fcc9ddb99d..17de75167c 100644
--- a/keyboards/westm/westm9/rev2/config.h
+++ b/keyboards/westm/westm9/rev2/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN F1
 #define RGBLED_NUM 14
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/westm/westm9/rev2/info.json b/keyboards/westm/westm9/rev2/info.json
index 3b2f219948..faebf5d443 100644
--- a/keyboards/westm/westm9/rev2/info.json
+++ b/keyboards/westm/westm9/rev2/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "pid": "0x0302"
+    },
+    "ws2812": {
+        "pin": "F1"
     }
 }
diff --git a/keyboards/westm/westm9/westm9.c b/keyboards/westm/westm9/westm9.c
deleted file mode 100644
index 45420db2e3..0000000000
--- a/keyboards/westm/westm9/westm9.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "westm9.h"
\ No newline at end of file
diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h
index fd10220d9f..2b64827856 100644
--- a/keyboards/westm/westmergo/config.h
+++ b/keyboards/westm/westmergo/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 }
-#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,8 +26,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN A8
 #define RGBLED_NUM 16
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
index a50da579e3..e2decedf4f 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/info.json
@@ -8,80 +8,95 @@
         "pid": "0x0201",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "matrix_pins": {
+        "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "B9", "F1", "A10", "A9"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_alice": {
             "layout": [
-                {"label":"K1E", "x":0, "y":0},
-                {"label":"K00", "x":1.5, "y":0},
-                {"label":"K01", "x":2.5, "y":0},
-                {"label":"K02", "x":3.5, "y":0},
-                {"label":"K03", "x":4.5, "y":0},
-                {"label":"K04", "x":5.5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":10.5, "y":0},
-                {"label":"K08", "x":11.5, "y":0},
-                {"label":"K09", "x":12.5, "y":0},
-                {"label":"K0A", "x":13.5, "y":0},
-                {"label":"K0B", "x":14.5, "y":0},
-                {"label":"K0C", "x":15.5, "y":0},
-                {"label":"K0D", "x":16.5, "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+                {"matrix": [0, 10], "x": 12.5, "y": 0},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1},
+                {"matrix": [1, 14], "x": 16, "y": 1},
+                {"matrix": [1, 15], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
 
-                {"label":"K2E", "x":0, "y":1},
-                {"label":"K10", "x":1.5, "y":1, "w":1.5},
-                {"label":"K11", "x":3, "y":1},
-                {"label":"K12", "x":4, "y":1},
-                {"label":"K13", "x":5, "y":1},
-                {"label":"K14", "x":6, "y":1},
-                {"label":"K15", "x":7, "y":1},
-                {"label":"K16", "x":10, "y":1},
-                {"label":"K17", "x":11, "y":1},
-                {"label":"K18", "x":12, "y":1},
-                {"label":"K19", "x":13, "y":1},
-                {"label":"K1A", "x":14, "y":1},
-                {"label":"K1B", "x":15, "y":1},
-                {"label":"K1C", "x":16, "y":1},
-                {"label":"K1D", "x":17, "y":1, "w":1.5},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2},
+                {"matrix": [2, 13], "x": 15.25, "y": 2},
+                {"matrix": [2, 15], "x": 16.25, "y": 2, "w": 2.25},
 
-                {"label":"K3E", "x":0, "y":2},
-                {"label":"K20", "x":1.5, "y":2, "w":1.75},
-                {"label":"K21", "x":3.25, "y":2},
-                {"label":"K22", "x":4.25, "y":2},
-                {"label":"K23", "x":5.25, "y":2},
-                {"label":"K24", "x":6.25, "y":2},
-                {"label":"K25", "x":7.25, "y":2},
-                {"label":"K26", "x":10.25, "y":2},
-                {"label":"K27", "x":11.25, "y":2},
-                {"label":"K28", "x":12.25, "y":2},
-                {"label":"K29", "x":13.25, "y":2},
-                {"label":"K2A", "x":14.25, "y":2},
-                {"label":"K2B", "x":15.25, "y":2},
-                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
 
-                {"label":"K30", "x":1.5, "y":3, "w":2.25},
-                {"label":"K32", "x":3.75, "y":3},
-                {"label":"K33", "x":4.75, "y":3},
-                {"label":"K34", "x":5.75, "y":3},
-                {"label":"K35", "x":6.75, "y":3},
-                {"label":"K36", "x":7.75, "y":3},
-                {"label":"K37", "x":9.75, "y":3},
-                {"label":"K38", "x":10.75, "y":3},
-                {"label":"K39", "x":11.75, "y":3},
-                {"label":"K3A", "x":12.75, "y":3},
-                {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K3D", "x":14.75, "y":3},
-                {"label":"K3C", "x":15.75, "y":3, "w":1.75},
-                {"label":"K4D", "x":17.5, "y":3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 14], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 17.5, "y": 3},
 
-                {"label":"K40", "x":1.5, "y":4, "w":1.5},
-                {"label":"K42", "x":4.5, "y":4, "w":1.25},
-                {"label":"K44", "x":5.75, "y":4, "w":2.25},
-                {"label":"K46", "x":8, "y":4, "w":1.25},
-                {"label":"K48", "x":9.75, "y":4, "w":2.75},
-                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E", "x":17, "y":4, "w":1.5}
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 15], "x": 17, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/westm/westmergo/westmergo.c b/keyboards/westm/westmergo/westmergo.c
deleted file mode 100644
index 18055d3789..0000000000
--- a/keyboards/westm/westmergo/westmergo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "westmergo.h"
\ No newline at end of file
diff --git a/keyboards/westm/westmergo/westmergo.h b/keyboards/westm/westmergo/westmergo.h
deleted file mode 100644
index 550773b5ac..0000000000
--- a/keyboards/westm/westmergo/westmergo.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_alice( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b,      k0d, k0e, k0f,\
-    k10, k11, k12, k13, k14, k15, k16,      k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
-    k20, k21, k22, k23, k24, k25, k26,      k28, k29, k2a, k2b, k2c, k2d,      k2f, \
-         k31, k32, k33, k34, k35, k36,      k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
-         k41,      k43,      k45, k46,           k49,      k4b,                k4f  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, XXX, k0d, k0e, k0f },\
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { XXX, k41, XXX, k43, XXX, k45, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f },  \
-}
diff --git a/keyboards/whale/sk/sk.c b/keyboards/whale/sk/sk.c
deleted file mode 100644
index c151f73fb6..0000000000
--- a/keyboards/whale/sk/sk.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "sk.h"
diff --git a/keyboards/whale/sk/sk.h b/keyboards/whale/sk/sk.h
deleted file mode 100644
index d9c75f15b2..0000000000
--- a/keyboards/whale/sk/sk.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_whale_sk_v3
-    #include "v3.h"
-#endif
diff --git a/keyboards/whale/sk/v3/config.h b/keyboards/whale/sk/v3/config.h
deleted file mode 100644
index c473b10dc8..0000000000
--- a/keyboards/whale/sk/v3/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Whale Mo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5, B6 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, F4, F5, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/info.json
index 0ab3b6c0a2..78967cd6e9 100644
--- a/keyboards/whale/sk/v3/info.json
+++ b/keyboards/whale/sk/v3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0495",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "F4", "F5", "F6"],
+        "rows": ["B1", "B2", "B3", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "debounce": 3,
diff --git a/keyboards/whale/sk/v3/v3.h b/keyboards/whale/sk/v3/v3.h
index 06ebc45dc9..a392705a83 100644
--- a/keyboards/whale/sk/v3/v3.h
+++ b/keyboards/whale/sk/v3/v3.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "sk.h"
-
 #include "quantum.h"
 
 #define LAYOUT_all( \
diff --git a/keyboards/wilba_tech/rama_works_kara/config.h b/keyboards/wilba_tech/rama_works_kara/config.h
index 6f8d6f9b8b..d34fd6468c 100644
--- a/keyboards/wilba_tech/rama_works_kara/config.h
+++ b/keyboards/wilba_tech/rama_works_kara/config.h
@@ -15,18 +15,10 @@
  */
 #pragma once
 
-
-// M60-A PCB default pin-out
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT 72
 
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 // Locking resynchronize hack
diff --git a/keyboards/wilba_tech/rama_works_kara/info.json b/keyboards/wilba_tech/rama_works_kara/info.json
index 18bba59fe5..3dd9ad22c2 100644
--- a/keyboards/wilba_tech/rama_works_kara/info.json
+++ b/keyboards/wilba_tech/rama_works_kara/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4B52",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_hhkb"],
diff --git a/keyboards/wilba_tech/rama_works_koyu/config.h b/keyboards/wilba_tech/rama_works_koyu/config.h
index c0b005d443..c3bb43ec6d 100644
--- a/keyboards/wilba_tech/rama_works_koyu/config.h
+++ b/keyboards/wilba_tech/rama_works_koyu/config.h
@@ -15,18 +15,10 @@
  */
 #pragma once
 
-
-// KOYU PCB pin-out
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT 72
 
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 // Locking resynchronize hack
diff --git a/keyboards/wilba_tech/rama_works_koyu/info.json b/keyboards/wilba_tech/rama_works_koyu/info.json
index 190638c001..55a180af63 100644
--- a/keyboards/wilba_tech/rama_works_koyu/info.json
+++ b/keyboards/wilba_tech/rama_works_koyu/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4B59",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m10_b/config.h b/keyboards/wilba_tech/rama_works_m10_b/config.h
index be92b36639..00ecf5f186 100644
--- a/keyboards/wilba_tech/rama_works_m10_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m10_b/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { E6 }
-#define MATRIX_COL_PINS { D7, B6, F0, D6, B5, F1, D4, B4, F4, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/rama_works_m10_b/info.json b/keyboards/wilba_tech/rama_works_m10_b/info.json
index 4b7c87be21..0d80bce8a8 100644
--- a/keyboards/wilba_tech/rama_works_m10_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m10_b/info.json
@@ -8,6 +8,11 @@
     "pid": "0x00AB",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"],
+    "rows": ["E6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "C6"
   },
@@ -16,16 +21,19 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 1, "y": 3, "w": 2.0 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [0, 3], "x": 0, "y": 1},
+        {"matrix": [0, 4], "x": 1, "y": 1},
+        {"matrix": [0, 5], "x": 2, "y": 1},
+
+        {"matrix": [0, 6], "x": 0, "y": 2},
+        {"matrix": [0, 7], "x": 1, "y": 2},
+        {"matrix": [0, 8], "x": 2, "y": 2},
+
+        {"matrix": [0, 9], "x": 1, "y": 3, "w": 2}
       ]
     }
   }
diff --git a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.c b/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.c
deleted file mode 100644
index ccff6d62c9..0000000000
--- a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h b/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h
deleted file mode 100644
index c23a4d003c..0000000000
--- a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2018 Wilba
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    k00, k01, k02, \
-    k03, k04, k05, \
-    k06, k07, k08, \
-            k09 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 } \
-}
diff --git a/keyboards/wilba_tech/rama_works_m10_c/config.h b/keyboards/wilba_tech/rama_works_m10_c/config.h
index 9f68eb4287..1cc9655b1b 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/config.h
+++ b/keyboards/wilba_tech/rama_works_m10_c/config.h
@@ -15,23 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { E6 }
-#define MATRIX_COL_PINS { D7, B6, F0, D6, B5, F1, D4, B4, F4, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/info.json
index b60dd53815..64af4a5dcf 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/info.json
+++ b/keyboards/wilba_tech/rama_works_m10_c/info.json
@@ -8,11 +8,30 @@
     "pid": "0x00AC",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"],
+    "rows": ["E6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
       "LAYOUT": {
-          "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":0, "y":1}, {"label":"0,4", "x":1, "y":1}, {"label":"0,5", "x":2, "y":1}, {"label":"0,6", "x":0, "y":2}, {"label":"0,7", "x":1, "y":2}, {"label":"0,8", "x":2, "y":2}, {"label":"0,9", "x":1, "y":3, "w":2}]
+          "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [0, 3], "x": 0, "y": 1},
+                {"matrix": [0, 4], "x": 1, "y": 1},
+                {"matrix": [0, 5], "x": 2, "y": 1},
+
+                {"matrix": [0, 6], "x": 0, "y": 2},
+                {"matrix": [0, 7], "x": 1, "y": 2},
+                {"matrix": [0, 8], "x": 2, "y": 2},
+
+                {"matrix": [0, 9], "x": 1, "y": 3, "w": 2}
+          ]
       }
   }
 }
diff --git a/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h b/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h
index 382cef1a6d..24dae9d7d0 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h
+++ b/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h
@@ -18,18 +18,3 @@
 #include "quantum.h"
 #include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
 #include "via.h"
-
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 \
-) { \
-        {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09}, \
-}
diff --git a/keyboards/wilba_tech/rama_works_m50_a/config.h b/keyboards/wilba_tech/rama_works_m50_a/config.h
index 79a1614268..ab04ab070b 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m50_a/config.h
@@ -15,23 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F5, F6 }
-#define MATRIX_COL_PINS { F4, B5, C7, C6, B6, B2, B3, B1, B4, D7, D6, D4, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/rama_works_m50_a/info.json b/keyboards/wilba_tech/rama_works_m50_a/info.json
index a53a960f0a..e26b56dd2f 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m50_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x050A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"],
+        "rows": ["F0", "F1", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m50_ax/config.h b/keyboards/wilba_tech/rama_works_m50_ax/config.h
index add6c1c779..9b6b3c7955 100644
--- a/keyboards/wilba_tech/rama_works_m50_ax/config.h
+++ b/keyboards/wilba_tech/rama_works_m50_ax/config.h
@@ -15,23 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F5, F6 }
-#define MATRIX_COL_PINS { F4, B5, C7, C6, B6, B2, B3, B1, B4, D7, D6, D4, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/rama_works_m50_ax/info.json b/keyboards/wilba_tech/rama_works_m50_ax/info.json
index 2fc265fec9..fc296c2754 100644
--- a/keyboards/wilba_tech/rama_works_m50_ax/info.json
+++ b/keyboards/wilba_tech/rama_works_m50_ax/info.json
@@ -8,6 +8,11 @@
         "pid": "0x150A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"],
+        "rows": ["F0", "F1", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c b/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c
deleted file mode 100644
index 86d93b82a1..0000000000
--- a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rama_works_m50_ax.h"
diff --git a/keyboards/wilba_tech/rama_works_m60_a/config.h b/keyboards/wilba_tech/rama_works_m60_a/config.h
index acc21edc28..c80a018496 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m60_a/config.h
@@ -15,18 +15,10 @@
  */
 #pragma once
 
-
-// M60-A PCB default pin-out
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT 72
 
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 // Locking resynchronize hack
diff --git a/keyboards/wilba_tech/rama_works_m60_a/info.json b/keyboards/wilba_tech/rama_works_m60_a/info.json
index d76b178947..8ba17a5df2 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m60_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x060A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_hhkb"],
diff --git a/keyboards/wilba_tech/rama_works_m65_b/config.h b/keyboards/wilba_tech/rama_works_m65_b/config.h
index 5b745b109d..6d3f0fb97f 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_b/config.h
@@ -15,23 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/rama_works_m65_b/info.json b/keyboards/wilba_tech/rama_works_m65_b/info.json
index 55f9f05536..a8ca36bf16 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m65_b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x065B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/config.h b/keyboards/wilba_tech/rama_works_m65_bx/config.h
index eb2b08304a..e367a7fc76 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_bx/config.h
@@ -15,23 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/info.json b/keyboards/wilba_tech/rama_works_m65_bx/info.json
index ca5bf2b21e..1e4af340db 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/info.json
+++ b/keyboards/wilba_tech/rama_works_m65_bx/info.json
@@ -8,6 +8,11 @@
         "pid": "0x165B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m6_a/config.h b/keyboards/wilba_tech/rama_works_m6_a/config.h
index 9937b3f5be..6a19f1e7e9 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m6_a/config.h
@@ -15,23 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { E6 }
-#define MATRIX_COL_PINS { D4, B5, F4, D7, C6, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/rama_works_m6_a/info.json b/keyboards/wilba_tech/rama_works_m6_a/info.json
index 67912b6ce0..73091d3036 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m6_a/info.json
@@ -8,17 +8,23 @@
     "pid": "0x006A",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
+    "rows": ["E6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [0, 3], "x": 0, "y": 1},
+        {"matrix": [0, 4], "x": 1, "y": 1},
+        {"matrix": [0, 5], "x": 2, "y": 1}
       ]
     }
   }
diff --git a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.c b/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.c
deleted file mode 100644
index fa19003600..0000000000
--- a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
diff --git a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h b/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h
deleted file mode 100644
index 0a38581450..0000000000
--- a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2018 Wilba
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    k00, k01, k02, \
-    k03, k04, k05 \
-) { \
-    { k00, k01, k02, k03, k04, k05 } \
-}
diff --git a/keyboards/wilba_tech/rama_works_m6_b/config.h b/keyboards/wilba_tech/rama_works_m6_b/config.h
index 6b6b405cd0..a117bcc2a8 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m6_b/config.h
@@ -15,23 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { E6 }
-#define MATRIX_COL_PINS { D4, B5, F4, D7, C6, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/rama_works_m6_b/info.json b/keyboards/wilba_tech/rama_works_m6_b/info.json
index 96fc84b002..4356011aae 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m6_b/info.json
@@ -8,17 +8,23 @@
     "pid": "0x006B",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
+    "rows": ["E6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [0, 3], "x": 0, "y": 1},
+        {"matrix": [0, 4], "x": 1, "y": 1},
+        {"matrix": [0, 5], "x": 2, "y": 1}
       ]
     }
   }
diff --git a/keyboards/wilba_tech/rama_works_m6_b/rama_works_m6_b.h b/keyboards/wilba_tech/rama_works_m6_b/rama_works_m6_b.h
deleted file mode 100644
index bd4158bcb1..0000000000
--- a/keyboards/wilba_tech/rama_works_m6_b/rama_works_m6_b.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT(                         \
-    K00, K01, K02, K03, K04, K05)       \
-    {                                   \
-        {K00, K01, K02, K03, K04, K05}, \
-    }
-
diff --git a/keyboards/wilba_tech/rama_works_u80_a/config.h b/keyboards/wilba_tech/rama_works_u80_a/config.h
index 8a94e15b47..cb2d88bd47 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/config.h
+++ b/keyboards/wilba_tech/rama_works_u80_a/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/rama_works_u80_a/info.json b/keyboards/wilba_tech/rama_works_u80_a/info.json
index 27a5fe7148..2ee00ae161 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/info.json
+++ b/keyboards/wilba_tech/rama_works_u80_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x080A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_u80_a/rama_works_u80_a.c b/keyboards/wilba_tech/rama_works_u80_a/rama_works_u80_a.c
deleted file mode 100644
index ccff6d62c9..0000000000
--- a/keyboards/wilba_tech/rama_works_u80_a/rama_works_u80_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/wilba_tech/wt60_a/config.h b/keyboards/wilba_tech/wt60_a/config.h
index 0179cfaa64..488eeade83 100644
--- a/keyboards/wilba_tech/wt60_a/config.h
+++ b/keyboards/wilba_tech/wt60_a/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt60_a/info.json b/keyboards/wilba_tech/wt60_a/info.json
index 85b1e2e6a1..e429b635de 100644
--- a/keyboards/wilba_tech/wt60_a/info.json
+++ b/keyboards/wilba_tech/wt60_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x060A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt60_a/wt60_a.c b/keyboards/wilba_tech/wt60_a/wt60_a.c
deleted file mode 100644
index ccff6d62c9..0000000000
--- a/keyboards/wilba_tech/wt60_a/wt60_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/wilba_tech/wt60_b/config.h b/keyboards/wilba_tech/wt60_b/config.h
index 887e11c81f..cf495a2e78 100644
--- a/keyboards/wilba_tech/wt60_b/config.h
+++ b/keyboards/wilba_tech/wt60_b/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt60_b/info.json b/keyboards/wilba_tech/wt60_b/info.json
index 6e8d463abb..1a9338a5c8 100644
--- a/keyboards/wilba_tech/wt60_b/info.json
+++ b/keyboards/wilba_tech/wt60_b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x60B0",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt60_b/wt60_b.c b/keyboards/wilba_tech/wt60_b/wt60_b.c
deleted file mode 100644
index 051cbc6d43..0000000000
--- a/keyboards/wilba_tech/wt60_b/wt60_b.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "wt60_b.h"
diff --git a/keyboards/wilba_tech/wt60_bx/config.h b/keyboards/wilba_tech/wt60_bx/config.h
index 5bc298d70e..6f89b14954 100644
--- a/keyboards/wilba_tech/wt60_bx/config.h
+++ b/keyboards/wilba_tech/wt60_bx/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt60_bx/info.json b/keyboards/wilba_tech/wt60_bx/info.json
index 8c3cf7de2a..9b63c7f8e7 100644
--- a/keyboards/wilba_tech/wt60_bx/info.json
+++ b/keyboards/wilba_tech/wt60_bx/info.json
@@ -8,6 +8,11 @@
         "pid": "0x60B1",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt60_bx/wt60_bx.c b/keyboards/wilba_tech/wt60_bx/wt60_bx.c
deleted file mode 100644
index 2a52888ca0..0000000000
--- a/keyboards/wilba_tech/wt60_bx/wt60_bx.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "wt60_bx.h"
diff --git a/keyboards/wilba_tech/wt60_c/config.h b/keyboards/wilba_tech/wt60_c/config.h
index 7b7fdaf020..776aebcf20 100644
--- a/keyboards/wilba_tech/wt60_c/config.h
+++ b/keyboards/wilba_tech/wt60_c/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt60_c/info.json b/keyboards/wilba_tech/wt60_c/info.json
index b39a2786a4..b23b639c7e 100644
--- a/keyboards/wilba_tech/wt60_c/info.json
+++ b/keyboards/wilba_tech/wt60_c/info.json
@@ -8,6 +8,11 @@
         "pid": "0x60C0",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt60_c/wt60_c.c b/keyboards/wilba_tech/wt60_c/wt60_c.c
deleted file mode 100644
index 9b1cfe46e5..0000000000
--- a/keyboards/wilba_tech/wt60_c/wt60_c.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "wt60_c.h"
diff --git a/keyboards/wilba_tech/wt60_g/config.h b/keyboards/wilba_tech/wt60_g/config.h
index 3264526694..9541b1df12 100644
--- a/keyboards/wilba_tech/wt60_g/config.h
+++ b/keyboards/wilba_tech/wt60_g/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt60_g/info.json b/keyboards/wilba_tech/wt60_g/info.json
index 5c22b6dc21..113729e250 100644
--- a/keyboards/wilba_tech/wt60_g/info.json
+++ b/keyboards/wilba_tech/wt60_g/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0021",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt60_g/wt60_g.c b/keyboards/wilba_tech/wt60_g/wt60_g.c
deleted file mode 100644
index 1c1eed8847..0000000000
--- a/keyboards/wilba_tech/wt60_g/wt60_g.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wt60_g.h"
diff --git a/keyboards/wilba_tech/wt60_g2/config.h b/keyboards/wilba_tech/wt60_g2/config.h
index c841f6365a..b7d24e1cd3 100644
--- a/keyboards/wilba_tech/wt60_g2/config.h
+++ b/keyboards/wilba_tech/wt60_g2/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt60_g2/info.json b/keyboards/wilba_tech/wt60_g2/info.json
index 33b0fd0d50..b1d34eb65d 100644
--- a/keyboards/wilba_tech/wt60_g2/info.json
+++ b/keyboards/wilba_tech/wt60_g2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x002F",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt60_g2/wt60_g2.c b/keyboards/wilba_tech/wt60_g2/wt60_g2.c
deleted file mode 100644
index ac7b7151d0..0000000000
--- a/keyboards/wilba_tech/wt60_g2/wt60_g2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wt60_g2.h"
diff --git a/keyboards/wilba_tech/wt60_h1/info.json b/keyboards/wilba_tech/wt60_h1/info.json
index d037f73761..a6b200ed7e 100644
--- a/keyboards/wilba_tech/wt60_h1/info.json
+++ b/keyboards/wilba_tech/wt60_h1/info.json
@@ -8,13 +8,13 @@
         "pid": "0x0024",
         "device_version": "0.0.1"
     },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
     "matrix_pins": {
-        "rows": ["F0", "F1", "F4", "F6", "F7"],
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"]
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
     },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi_split_bs_rshift"],
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
diff --git a/keyboards/wilba_tech/wt60_h2/config.h b/keyboards/wilba_tech/wt60_h2/config.h
index 3264526694..9541b1df12 100644
--- a/keyboards/wilba_tech/wt60_h2/config.h
+++ b/keyboards/wilba_tech/wt60_h2/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt60_h2/info.json b/keyboards/wilba_tech/wt60_h2/info.json
index e9c59d1b8c..046a8526bc 100644
--- a/keyboards/wilba_tech/wt60_h2/info.json
+++ b/keyboards/wilba_tech/wt60_h2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x002B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt60_h2/wt60_h2.c b/keyboards/wilba_tech/wt60_h2/wt60_h2.c
deleted file mode 100644
index 705535c18e..0000000000
--- a/keyboards/wilba_tech/wt60_h2/wt60_h2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wt60_h2.h"
diff --git a/keyboards/wilba_tech/wt60_h3/info.json b/keyboards/wilba_tech/wt60_h3/info.json
index 57bb26c243..167de96a03 100644
--- a/keyboards/wilba_tech/wt60_h3/info.json
+++ b/keyboards/wilba_tech/wt60_h3/info.json
@@ -8,13 +8,13 @@
         "pid": "0x002C",
         "device_version": "0.0.1"
     },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
     "matrix_pins": {
-        "rows": ["F0", "F1", "F4", "F6", "F7"],
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"]
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
     },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "community_layouts": ["60_iso_split_bs_rshift"],
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift"
diff --git a/keyboards/wilba_tech/wt60_xt/config.h b/keyboards/wilba_tech/wt60_xt/config.h
index 888197a216..ea2f490317 100644
--- a/keyboards/wilba_tech/wt60_xt/config.h
+++ b/keyboards/wilba_tech/wt60_xt/config.h
@@ -20,22 +20,6 @@
 #define AUDIO_PIN C6
 #define AUDIO_CLICKY
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt60_xt/info.json b/keyboards/wilba_tech/wt60_xt/info.json
index d31d8380b1..edbd17a5c3 100644
--- a/keyboards/wilba_tech/wt60_xt/info.json
+++ b/keyboards/wilba_tech/wt60_xt/info.json
@@ -8,6 +8,11 @@
         "pid": "0x001C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt65_a/config.h b/keyboards/wilba_tech/wt65_a/config.h
index 906887f3fa..aa75002b4f 100644
--- a/keyboards/wilba_tech/wt65_a/config.h
+++ b/keyboards/wilba_tech/wt65_a/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt65_a/info.json b/keyboards/wilba_tech/wt65_a/info.json
index 1c73d40556..1b56bd785c 100644
--- a/keyboards/wilba_tech/wt65_a/info.json
+++ b/keyboards/wilba_tech/wt65_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x065A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt65_a/wt65_a.c b/keyboards/wilba_tech/wt65_a/wt65_a.c
deleted file mode 100644
index ccff6d62c9..0000000000
--- a/keyboards/wilba_tech/wt65_a/wt65_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/wilba_tech/wt65_b/config.h b/keyboards/wilba_tech/wt65_b/config.h
index 2cec4c23d7..60cdbe4cc6 100644
--- a/keyboards/wilba_tech/wt65_b/config.h
+++ b/keyboards/wilba_tech/wt65_b/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt65_b/info.json b/keyboards/wilba_tech/wt65_b/info.json
index 17dc827d55..5ac0d81f28 100644
--- a/keyboards/wilba_tech/wt65_b/info.json
+++ b/keyboards/wilba_tech/wt65_b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x065B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt65_b/wt65_b.c b/keyboards/wilba_tech/wt65_b/wt65_b.c
deleted file mode 100644
index 365f2e8861..0000000000
--- a/keyboards/wilba_tech/wt65_b/wt65_b.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/wilba_tech/wt65_d/config.h b/keyboards/wilba_tech/wt65_d/config.h
index d383760f19..f37e4b2db6 100644
--- a/keyboards/wilba_tech/wt65_d/config.h
+++ b/keyboards/wilba_tech/wt65_d/config.h
@@ -3,11 +3,6 @@
 
 #pragma once
 
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { E6, F0, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, D3, D2, B7, B0, B3, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/wilba_tech/wt65_d/info.json b/keyboards/wilba_tech/wt65_d/info.json
index 68dc46d548..b9fd2dcf46 100644
--- a/keyboards/wilba_tech/wt65_d/info.json
+++ b/keyboards/wilba_tech/wt65_d/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0031",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "D3", "D2", "B7", "B0", "B3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["E6", "F0", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F1"
     },
@@ -16,688 +21,688 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,3", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,1", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,12", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,10", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0},
-                {"label":"2,13", "x":14, "y":0},
-                {"label":"0,14", "x":15, "y":0},
-
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
-                {"label":"1,14", "x":15, "y":1},
-
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2, "w":2.25},
-                {"label":"2,14", "x":15, "y":2},
-
-                {"label":"3,0", "x":0, "y":3, "w":1.25},
-                {"label":"3,1", "x":1.25, "y":3},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
-
-                {"label":"4,0", "x":0, "y":4, "w":1.25},
-                {"label":"4,1", "x":1.25, "y":4},
-                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
-                {"label":"4,3", "x":3.5, "y":4, "w":6},
-                {"label":"4,9", "x":9.5, "y":4, "w":1.25},
-                {"label":"4,10", "x":10.75, "y":4},
-                {"label":"4,11", "x":11.75, "y":4, "w":1.25},
-                {"label":"4,12", "x":13, "y":4},
-                {"label":"4,13", "x":14, "y":4},
-                {"label":"4,14", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 12], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 6},
+                {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 10.75, "y": 4},
+                {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,3", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,1", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,12", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,10", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0, "w":2},
-                {"label":"0,14", "x":15, "y":0},
-
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
-                {"label":"1,14", "x":15, "y":1},
-
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2, "w":2.25},
-                {"label":"2,14", "x":15, "y":2},
-
-                {"label":"3,0", "x":0, "y":3, "w":2.25},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
-
-                {"label":"4,0", "x":0, "y":4, "w":1.25},
-                {"label":"4,1", "x":1.25, "y":4},
-                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
-                {"label":"4,3", "x":3.5, "y":4, "w":6},
-                {"label":"4,9", "x":9.5, "y":4, "w":1.25},
-                {"label":"4,10", "x":10.75, "y":4},
-                {"label":"4,11", "x":11.75, "y":4, "w":1.25},
-                {"label":"4,12", "x":13, "y":4},
-                {"label":"4,13", "x":14, "y":4},
-                {"label":"4,14", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 12], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 6},
+                {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 10.75, "y": 4},
+                {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,3", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,1", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,12", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,10", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0},
-                {"label":"2,13", "x":14, "y":0},
-                {"label":"0,14", "x":15, "y":0},
-
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
-                {"label":"1,14", "x":15, "y":1},
-
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2, "w":2.25},
-                {"label":"2,14", "x":15, "y":2},
-
-                {"label":"3,0", "x":0, "y":3, "w":2.25},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
-
-                {"label":"4,0", "x":0, "y":4, "w":1.25},
-                {"label":"4,1", "x":1.25, "y":4},
-                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
-                {"label":"4,3", "x":3.5, "y":4, "w":6},
-                {"label":"4,9", "x":9.5, "y":4, "w":1.25},
-                {"label":"4,10", "x":10.75, "y":4},
-                {"label":"4,11", "x":11.75, "y":4, "w":1.25},
-                {"label":"4,12", "x":13, "y":4},
-                {"label":"4,13", "x":14, "y":4},
-                {"label":"4,14", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 12], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 6},
+                {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 10.75, "y": 4},
+                {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_wkl": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,3", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,1", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,12", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,10", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0, "w":2},
-                {"label":"0,14", "x":15, "y":0},
-
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
-                {"label":"1,14", "x":15, "y":1},
-
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2, "w":2.25},
-                {"label":"2,14", "x":15, "y":2},
-
-                {"label":"3,0", "x":0, "y":3, "w":2.25},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
-
-                {"label":"4,0", "x":0, "y":4, "w":1.5},
-                {"label":"4,2", "x":1.5, "y":4, "w":1.5},
-                {"label":"4,3", "x":3, "y":4, "w":7},
-                {"label":"4,9", "x":10, "y":4, "w":1.5},
-                {"label":"4,11", "x":11.5, "y":4, "w":1.5},
-                {"label":"4,12", "x":13, "y":4},
-                {"label":"4,13", "x":14, "y":4},
-                {"label":"4,14", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 12], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_wkl_split_bs": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,3", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,1", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,12", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,10", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0},
-                {"label":"2,13", "x":14, "y":0},
-                {"label":"0,14", "x":15, "y":0},
-
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,13", "x":13.5, "y":1, "w":1.5},
-                {"label":"1,14", "x":15, "y":1},
-
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2, "w":2.25},
-                {"label":"2,14", "x":15, "y":2},
-
-                {"label":"3,0", "x":0, "y":3, "w":2.25},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
-
-                {"label":"4,0", "x":0, "y":4, "w":1.5},
-                {"label":"4,2", "x":1.5, "y":4, "w":1.5},
-                {"label":"4,3", "x":3, "y":4, "w":7},
-                {"label":"4,9", "x":10, "y":4, "w":1.5},
-                {"label":"4,11", "x":11.5, "y":4, "w":1.5},
-                {"label":"4,12", "x":13, "y":4},
-                {"label":"4,13", "x":14, "y":4},
-                {"label":"4,14", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 12], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,3", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,1", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,12", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,10", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0, "w":2},
-                {"label":"0,14", "x":15, "y":0},
-
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,14", "x":15, "y":1},
-
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2},
-                {"label":"1,13", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"2,14", "x":15, "y":2},
-
-                {"label":"3,0", "x":0, "y":3, "w":1.25},
-                {"label":"3,1", "x":1.25, "y":3},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
-
-                {"label":"4,0", "x":0, "y":4, "w":1.25},
-                {"label":"4,1", "x":1.25, "y":4},
-                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
-                {"label":"4,3", "x":3.5, "y":4, "w":6},
-                {"label":"4,9", "x":9.5, "y":4, "w":1.25},
-                {"label":"4,10", "x":10.75, "y":4},
-                {"label":"4,11", "x":11.75, "y":4, "w":1.25},
-                {"label":"4,12", "x":13, "y":4},
-                {"label":"4,13", "x":14, "y":4},
-                {"label":"4,14", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 12], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 6},
+                {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 10.75, "y": 4},
+                {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_split_bs": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,3", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,1", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,12", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,10", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0},
-                {"label":"2,13", "x":14, "y":0},
-                {"label":"0,14", "x":15, "y":0},
-
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,14", "x":15, "y":1},
-
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2},
-                {"label":"1,13", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"2,14", "x":15, "y":2},
-
-                {"label":"3,0", "x":0, "y":3, "w":1.25},
-                {"label":"3,1", "x":1.25, "y":3},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
-
-                {"label":"4,0", "x":0, "y":4, "w":1.25},
-                {"label":"4,1", "x":1.25, "y":4},
-                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
-                {"label":"4,3", "x":3.5, "y":4, "w":6},
-                {"label":"4,9", "x":9.5, "y":4, "w":1.25},
-                {"label":"4,10", "x":10.75, "y":4},
-                {"label":"4,11", "x":11.75, "y":4, "w":1.25},
-                {"label":"4,12", "x":13, "y":4},
-                {"label":"4,13", "x":14, "y":4},
-                {"label":"4,14", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 12], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 6},
+                {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 10.75, "y": 4},
+                {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_wkl": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,3", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,1", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,12", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,10", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0, "w":2},
-                {"label":"0,14", "x":15, "y":0},
-
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,14", "x":15, "y":1},
-
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2},
-                {"label":"1,13", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"2,14", "x":15, "y":2},
-
-                {"label":"3,0", "x":0, "y":3, "w":1.25},
-                {"label":"3,1", "x":1.25, "y":3},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
-
-                {"label":"4,0", "x":0, "y":4, "w":1.5},
-                {"label":"4,2", "x":1.5, "y":4, "w":1.5},
-                {"label":"4,3", "x":3, "y":4, "w":7},
-                {"label":"4,9", "x":10, "y":4, "w":1.5},
-                {"label":"4,11", "x":11.5, "y":4, "w":1.5},
-                {"label":"4,12", "x":13, "y":4},
-                {"label":"4,13", "x":14, "y":4},
-                {"label":"4,14", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 12], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_wkl_split_bs": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,3", "x":1, "y":0},
-                {"label":"0,2", "x":2, "y":0},
-                {"label":"0,1", "x":3, "y":0},
-                {"label":"0,4", "x":4, "y":0},
-                {"label":"0,5", "x":5, "y":0},
-                {"label":"0,6", "x":6, "y":0},
-                {"label":"0,7", "x":7, "y":0},
-                {"label":"0,8", "x":8, "y":0},
-                {"label":"0,9", "x":9, "y":0},
-                {"label":"0,12", "x":10, "y":0},
-                {"label":"0,11", "x":11, "y":0},
-                {"label":"0,10", "x":12, "y":0},
-                {"label":"0,13", "x":13, "y":0},
-                {"label":"2,13", "x":14, "y":0},
-                {"label":"0,14", "x":15, "y":0},
-
-                {"label":"1,0", "x":0, "y":1, "w":1.5},
-                {"label":"1,1", "x":1.5, "y":1},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1},
-                {"label":"1,4", "x":4.5, "y":1},
-                {"label":"1,5", "x":5.5, "y":1},
-                {"label":"1,6", "x":6.5, "y":1},
-                {"label":"1,7", "x":7.5, "y":1},
-                {"label":"1,8", "x":8.5, "y":1},
-                {"label":"1,9", "x":9.5, "y":1},
-                {"label":"1,10", "x":10.5, "y":1},
-                {"label":"1,11", "x":11.5, "y":1},
-                {"label":"1,12", "x":12.5, "y":1},
-                {"label":"1,14", "x":15, "y":1},
-
-                {"label":"2,0", "x":0, "y":2, "w":1.75},
-                {"label":"2,1", "x":1.75, "y":2},
-                {"label":"2,2", "x":2.75, "y":2},
-                {"label":"2,3", "x":3.75, "y":2},
-                {"label":"2,4", "x":4.75, "y":2},
-                {"label":"2,5", "x":5.75, "y":2},
-                {"label":"2,6", "x":6.75, "y":2},
-                {"label":"2,7", "x":7.75, "y":2},
-                {"label":"2,8", "x":8.75, "y":2},
-                {"label":"2,9", "x":9.75, "y":2},
-                {"label":"2,10", "x":10.75, "y":2},
-                {"label":"2,11", "x":11.75, "y":2},
-                {"label":"2,12", "x":12.75, "y":2},
-                {"label":"1,13", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"2,14", "x":15, "y":2},
-
-                {"label":"3,0", "x":0, "y":3, "w":1.25},
-                {"label":"3,1", "x":1.25, "y":3},
-                {"label":"3,2", "x":2.25, "y":3},
-                {"label":"3,3", "x":3.25, "y":3},
-                {"label":"3,4", "x":4.25, "y":3},
-                {"label":"3,5", "x":5.25, "y":3},
-                {"label":"3,6", "x":6.25, "y":3},
-                {"label":"3,7", "x":7.25, "y":3},
-                {"label":"3,8", "x":8.25, "y":3},
-                {"label":"3,9", "x":9.25, "y":3},
-                {"label":"3,10", "x":10.25, "y":3},
-                {"label":"3,11", "x":11.25, "y":3},
-                {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-                {"label":"3,13", "x":14, "y":3},
-                {"label":"3,14", "x":15, "y":3},
-
-                {"label":"4,0", "x":0, "y":4, "w":1.5},
-                {"label":"4,2", "x":1.5, "y":4, "w":1.5},
-                {"label":"4,3", "x":3, "y":4, "w":7},
-                {"label":"4,9", "x":10, "y":4, "w":1.5},
-                {"label":"4,11", "x":11.5, "y":4, "w":1.5},
-                {"label":"4,12", "x":13, "y":4},
-                {"label":"4,13", "x":14, "y":4},
-                {"label":"4,14", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 12], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/wilba_tech/wt65_d/wt65_d.c b/keyboards/wilba_tech/wt65_d/wt65_d.c
deleted file mode 100644
index b734652c78..0000000000
--- a/keyboards/wilba_tech/wt65_d/wt65_d.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Jason Williams (@wilba)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "wt65_d.h"
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt65_d/wt65_d.h b/keyboards/wilba_tech/wt65_d/wt65_d.h
deleted file mode 100644
index 7ab39e81e7..0000000000
--- a/keyboards/wilba_tech/wt65_d/wt65_d.h
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2022 Jason Williams (@wilba)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-/*
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�    ┌───────�
- *              │000│003│002│001│004│005│006│007│008│009│012│011│010│013│213│014│    │013    │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- *              │100  │101│102│103│104│105│106│107│108│109│110│111│112│113  │114│      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴�113 │ ISO Enter
- *  LShift      │200   │201│202│203│204│205│206│207│208│209│210│211│212     │214│   │212│    │
- * ┌────────�   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
- * │300     │   │300 │301│302│303│304│305│306│307│308│309│310│311│312   │313│314│
- * └────────┘   ├────┼───┼───┴┬──┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬─┴──┬───┼───┼───┤
- *              │400 │401│402 │403                    │409 │410│411 │412│413│414│
- *              └────┴───┴────┴───────────────────────┴────┴───┴────┴───┴───┴───┘
- *              ┌─────┬─────┬───────────────────────────┬─────┬─────�
- *              │400  │402  │403                        │409  │411  │ WKL
- *              └─────┴─────┴───────────────────────────┴─────┴─────┘
- */
-
-#define LAYOUT_all( \
-    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K213, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
-    K400, K401, K402,                   K403,             K409, K410, K411,       K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, K403, ____, ____, ____, ____, ____, K409, K410, K411, K412, K413, K414 }  \
-}
-
-#define LAYOUT_65_ansi( \
-    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-    K400, K401, K402,                   K403,             K409, K410, K411, K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
-    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, K403, ____, ____, ____, ____, ____, K409, K410, K411, K412, K413, K414 }  \
-}
-
-#define LAYOUT_65_ansi_split_bs( \
-    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K213, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
-    K400, K401, K402,                   K403,             K409, K410, K411,       K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, K403, ____, ____, ____, ____, ____, K409, K410, K411, K412, K413, K414 }  \
-}
-
-#define LAYOUT_65_ansi_wkl( \
-    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-    K400,       K402,                   K403,             K409,       K411, K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
-    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, ____, K402, K403, ____, ____, ____, ____, ____, K409, ____, K411, K412, K413, K414 }  \
-}
-
-#define LAYOUT_65_ansi_wkl_split_bs( \
-    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K213, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
-    K400,       K402,                   K403,             K409,       K411,       K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, ____, K402, K403, ____, ____, ____, ____, ____, K409, ____, K411, K412, K413, K414 }  \
-}
-
-#define LAYOUT_65_iso( \
-    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K113, K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-    K400, K401, K402,                   K403,             K409, K410, K411, K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, K403, ____, ____, ____, ____, ____, K409, K410, K411, K412, K413, K414 }  \
-}
-
-#define LAYOUT_65_iso_split_bs( \
-    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K213, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,             K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K113,       K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
-    K400, K401, K402,                   K403,             K409, K410, K411,       K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, K403, ____, ____, ____, ____, ____, K409, K410, K411, K412, K413, K414 }  \
-}
-
-#define LAYOUT_65_iso_wkl( \
-    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K113, K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-    K400,       K402,                   K403,             K409,       K411, K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, ____, K402, K403, ____, ____, ____, ____, ____, K409, ____, K411, K412, K413, K414 }  \
-}
-
-#define LAYOUT_65_iso_wkl_split_bs( \
-    K000, K003, K002, K001, K004, K005, K006, K007, K008, K009, K012, K011, K010, K013, K213, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,             K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K113,       K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
-    K400,       K402,                   K403,             K409,       K411,       K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, ____, K402, K403, ____, ____, ____, ____, ____, K409, ____, K411, K412, K413, K414 }  \
-}
diff --git a/keyboards/wilba_tech/wt65_f/config.h b/keyboards/wilba_tech/wt65_f/config.h
index bf47e02d25..b7d24e1cd3 100644
--- a/keyboards/wilba_tech/wt65_f/config.h
+++ b/keyboards/wilba_tech/wt65_f/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt65_f/info.json b/keyboards/wilba_tech/wt65_f/info.json
index f5916bea1b..9cf7004132 100644
--- a/keyboards/wilba_tech/wt65_f/info.json
+++ b/keyboards/wilba_tech/wt65_f/info.json
@@ -8,6 +8,11 @@
         "pid": "0x002D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt65_f/wt65_f.c b/keyboards/wilba_tech/wt65_f/wt65_f.c
deleted file mode 100644
index 18d29a5eed..0000000000
--- a/keyboards/wilba_tech/wt65_f/wt65_f.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wt65_f.h"
diff --git a/keyboards/wilba_tech/wt65_fx/config.h b/keyboards/wilba_tech/wt65_fx/config.h
index bf47e02d25..b7d24e1cd3 100644
--- a/keyboards/wilba_tech/wt65_fx/config.h
+++ b/keyboards/wilba_tech/wt65_fx/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt65_fx/info.json b/keyboards/wilba_tech/wt65_fx/info.json
index afbc80b8c1..d9195621e2 100644
--- a/keyboards/wilba_tech/wt65_fx/info.json
+++ b/keyboards/wilba_tech/wt65_fx/info.json
@@ -8,6 +8,11 @@
         "pid": "0x002E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt65_fx/wt65_fx.c b/keyboards/wilba_tech/wt65_fx/wt65_fx.c
deleted file mode 100644
index 136adb8ba9..0000000000
--- a/keyboards/wilba_tech/wt65_fx/wt65_fx.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wt65_fx.h"
diff --git a/keyboards/wilba_tech/wt65_g/config.h b/keyboards/wilba_tech/wt65_g/config.h
index 807b7fa8ee..9541b1df12 100644
--- a/keyboards/wilba_tech/wt65_g/config.h
+++ b/keyboards/wilba_tech/wt65_g/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt65_g/info.json b/keyboards/wilba_tech/wt65_g/info.json
index bdfea960a4..1f794e5e37 100644
--- a/keyboards/wilba_tech/wt65_g/info.json
+++ b/keyboards/wilba_tech/wt65_g/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0022",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt65_g/wt65_g.c b/keyboards/wilba_tech/wt65_g/wt65_g.c
deleted file mode 100644
index 54e823cb7e..0000000000
--- a/keyboards/wilba_tech/wt65_g/wt65_g.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wt65_g.h"
diff --git a/keyboards/wilba_tech/wt65_g2/config.h b/keyboards/wilba_tech/wt65_g2/config.h
index 807b7fa8ee..9541b1df12 100644
--- a/keyboards/wilba_tech/wt65_g2/config.h
+++ b/keyboards/wilba_tech/wt65_g2/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt65_g2/info.json b/keyboards/wilba_tech/wt65_g2/info.json
index 5d8769625a..b3d8d3bdbb 100644
--- a/keyboards/wilba_tech/wt65_g2/info.json
+++ b/keyboards/wilba_tech/wt65_g2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x002A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt65_g2/wt65_g2.c b/keyboards/wilba_tech/wt65_g2/wt65_g2.c
deleted file mode 100644
index 585f579a33..0000000000
--- a/keyboards/wilba_tech/wt65_g2/wt65_g2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wt65_g2.h"
diff --git a/keyboards/wilba_tech/wt65_h1/config.h b/keyboards/wilba_tech/wt65_h1/config.h
index 807b7fa8ee..9541b1df12 100644
--- a/keyboards/wilba_tech/wt65_h1/config.h
+++ b/keyboards/wilba_tech/wt65_h1/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt65_h1/info.json b/keyboards/wilba_tech/wt65_h1/info.json
index 2ccb1d9099..8adac386de 100644
--- a/keyboards/wilba_tech/wt65_h1/info.json
+++ b/keyboards/wilba_tech/wt65_h1/info.json
@@ -8,12 +8,88 @@
         "pid": "0x0025",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker_tsangan"],
     "layouts": {
         "LAYOUT_65_ansi_blocker_tsangan": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/wilba_tech/wt65_h1/wt65_h1.c b/keyboards/wilba_tech/wt65_h1/wt65_h1.c
deleted file mode 100644
index e8e5466a98..0000000000
--- a/keyboards/wilba_tech/wt65_h1/wt65_h1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wt65_h1.h"
diff --git a/keyboards/wilba_tech/wt65_h1/wt65_h1.h b/keyboards/wilba_tech/wt65_h1/wt65_h1.h
deleted file mode 100644
index 4935bf6deb..0000000000
--- a/keyboards/wilba_tech/wt65_h1/wt65_h1.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-// This is equivalent to LAYOUT_all
-#define LAYOUT_65_ansi_blocker_tsangan( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
-    K400, K401, K402,                   K406,                         K411,       K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
-	{ K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, ____, K411, K412, K413, K414 }  \
-}
diff --git a/keyboards/wilba_tech/wt65_xt/config.h b/keyboards/wilba_tech/wt65_xt/config.h
index 525df76d1b..9541b1df12 100644
--- a/keyboards/wilba_tech/wt65_xt/config.h
+++ b/keyboards/wilba_tech/wt65_xt/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt65_xt/info.json b/keyboards/wilba_tech/wt65_xt/info.json
index 575d1c3add..98c21c8230 100644
--- a/keyboards/wilba_tech/wt65_xt/info.json
+++ b/keyboards/wilba_tech/wt65_xt/info.json
@@ -8,6 +8,11 @@
         "pid": "0x001D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt65_xt/wt65_xt.c b/keyboards/wilba_tech/wt65_xt/wt65_xt.c
deleted file mode 100644
index 62be919a06..0000000000
--- a/keyboards/wilba_tech/wt65_xt/wt65_xt.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wt65_xt.h"
diff --git a/keyboards/wilba_tech/wt65_xtx/config.h b/keyboards/wilba_tech/wt65_xtx/config.h
index c799ec8bc4..9b6b3c7955 100644
--- a/keyboards/wilba_tech/wt65_xtx/config.h
+++ b/keyboards/wilba_tech/wt65_xtx/config.h
@@ -15,23 +15,6 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt65_xtx/info.json b/keyboards/wilba_tech/wt65_xtx/info.json
index 196044185b..e9394e8a02 100644
--- a/keyboards/wilba_tech/wt65_xtx/info.json
+++ b/keyboards/wilba_tech/wt65_xtx/info.json
@@ -8,6 +8,11 @@
         "pid": "0x001E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt65_xtx/wt65_xtx.c b/keyboards/wilba_tech/wt65_xtx/wt65_xtx.c
deleted file mode 100644
index 38aa7c362d..0000000000
--- a/keyboards/wilba_tech/wt65_xtx/wt65_xtx.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wt65_xtx.h"
diff --git a/keyboards/wilba_tech/wt69_a/config.h b/keyboards/wilba_tech/wt69_a/config.h
index e893d73def..bc06d6ce9c 100644
--- a/keyboards/wilba_tech/wt69_a/config.h
+++ b/keyboards/wilba_tech/wt69_a/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt69_a/info.json b/keyboards/wilba_tech/wt69_a/info.json
index 67faf978d4..7d643b66ce 100644
--- a/keyboards/wilba_tech/wt69_a/info.json
+++ b/keyboards/wilba_tech/wt69_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x069A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h
index 0a853d659c..914d9b2763 100644
--- a/keyboards/wilba_tech/wt70_jb/config.h
+++ b/keyboards/wilba_tech/wt70_jb/config.h
@@ -15,31 +15,12 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { E6, F0, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, D3, D2, D1, D0, B7, C7, C6, B6, B5, B4, D7, D6, D4, B0, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
 // RGBLIGHT configuation
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
    #define RGBLED_NUM 2
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
@@ -54,4 +35,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/wilba_tech/wt70_jb/info.json b/keyboards/wilba_tech/wt70_jb/info.json
index a004bb43a0..b4f9f05fb0 100644
--- a/keyboards/wilba_tech/wt70_jb/info.json
+++ b/keyboards/wilba_tech/wt70_jb/info.json
@@ -8,6 +8,14 @@
         "pid": "0x001F",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B2"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "D3", "D2", "D1", "D0", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B3"],
+        "rows": ["E6", "F0", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt75_a/config.h b/keyboards/wilba_tech/wt75_a/config.h
index d678e7f0e9..4638b0fba9 100644
--- a/keyboards/wilba_tech/wt75_a/config.h
+++ b/keyboards/wilba_tech/wt75_a/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt75_a/info.json b/keyboards/wilba_tech/wt75_a/info.json
index 2434233335..a531ab8a19 100644
--- a/keyboards/wilba_tech/wt75_a/info.json
+++ b/keyboards/wilba_tech/wt75_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x075A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt75_a/wt75_a.c b/keyboards/wilba_tech/wt75_a/wt75_a.c
deleted file mode 100644
index ccff6d62c9..0000000000
--- a/keyboards/wilba_tech/wt75_a/wt75_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/wilba_tech/wt75_b/config.h b/keyboards/wilba_tech/wt75_b/config.h
index e36da68c4e..f519fe6603 100644
--- a/keyboards/wilba_tech/wt75_b/config.h
+++ b/keyboards/wilba_tech/wt75_b/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B7, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, B2, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt75_b/info.json b/keyboards/wilba_tech/wt75_b/info.json
index b2bd5a02ae..af090acd3a 100644
--- a/keyboards/wilba_tech/wt75_b/info.json
+++ b/keyboards/wilba_tech/wt75_b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x075B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B7", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "D4"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt75_b/wt75_b.c b/keyboards/wilba_tech/wt75_b/wt75_b.c
deleted file mode 100644
index ccff6d62c9..0000000000
--- a/keyboards/wilba_tech/wt75_b/wt75_b.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/wilba_tech/wt75_c/config.h b/keyboards/wilba_tech/wt75_c/config.h
index 0bd449089c..7d07822eb6 100644
--- a/keyboards/wilba_tech/wt75_c/config.h
+++ b/keyboards/wilba_tech/wt75_c/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, B7, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt75_c/info.json b/keyboards/wilba_tech/wt75_c/info.json
index 85a9987908..86ccc5df0e 100644
--- a/keyboards/wilba_tech/wt75_c/info.json
+++ b/keyboards/wilba_tech/wt75_c/info.json
@@ -8,6 +8,11 @@
         "pid": "0x075C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B7", "D4"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt75_c/wt75_c.c b/keyboards/wilba_tech/wt75_c/wt75_c.c
deleted file mode 100644
index ccff6d62c9..0000000000
--- a/keyboards/wilba_tech/wt75_c/wt75_c.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/wilba_tech/wt80_a/config.h b/keyboards/wilba_tech/wt80_a/config.h
index 8112d1f888..59cb397a00 100644
--- a/keyboards/wilba_tech/wt80_a/config.h
+++ b/keyboards/wilba_tech/wt80_a/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt80_a/info.json b/keyboards/wilba_tech/wt80_a/info.json
index 337207404a..0a814235d9 100644
--- a/keyboards/wilba_tech/wt80_a/info.json
+++ b/keyboards/wilba_tech/wt80_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x080A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt80_a/wt80_a.c b/keyboards/wilba_tech/wt80_a/wt80_a.c
deleted file mode 100644
index ccff6d62c9..0000000000
--- a/keyboards/wilba_tech/wt80_a/wt80_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/wilba_tech/wt80_bc/config.h b/keyboards/wilba_tech/wt80_bc/config.h
index aa5ba2d573..9541b1df12 100644
--- a/keyboards/wilba_tech/wt80_bc/config.h
+++ b/keyboards/wilba_tech/wt80_bc/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt80_bc/info.json b/keyboards/wilba_tech/wt80_bc/info.json
index e2858d238a..a85325525b 100644
--- a/keyboards/wilba_tech/wt80_bc/info.json
+++ b/keyboards/wilba_tech/wt80_bc/info.json
@@ -8,6 +8,11 @@
         "pid": "0x80B0",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt80_bc/wt80_bc.c b/keyboards/wilba_tech/wt80_bc/wt80_bc.c
deleted file mode 100644
index 1245a2fd0a..0000000000
--- a/keyboards/wilba_tech/wt80_bc/wt80_bc.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/wilba_tech/wt80_g/config.h b/keyboards/wilba_tech/wt80_g/config.h
index aa5ba2d573..9541b1df12 100644
--- a/keyboards/wilba_tech/wt80_g/config.h
+++ b/keyboards/wilba_tech/wt80_g/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt80_g/info.json b/keyboards/wilba_tech/wt80_g/info.json
index 1c7ff192d1..8aec5901ea 100644
--- a/keyboards/wilba_tech/wt80_g/info.json
+++ b/keyboards/wilba_tech/wt80_g/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0023",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wilba_tech/wt80_g/wt80_g.c b/keyboards/wilba_tech/wt80_g/wt80_g.c
deleted file mode 100644
index 821cffc7d3..0000000000
--- a/keyboards/wilba_tech/wt80_g/wt80_g.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wt80_g.h"
diff --git a/keyboards/wilba_tech/wt8_a/config.h b/keyboards/wilba_tech/wt8_a/config.h
index 3ef5baf588..1377a18714 100644
--- a/keyboards/wilba_tech/wt8_a/config.h
+++ b/keyboards/wilba_tech/wt8_a/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { E6 }
-#define MATRIX_COL_PINS { F4, F1, B2, B6, F6, F7, D5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/info.json
index 53cffb13ae..7de9331ffe 100644
--- a/keyboards/wilba_tech/wt8_a/info.json
+++ b/keyboards/wilba_tech/wt8_a/info.json
@@ -8,11 +8,26 @@
         "pid": "0x008A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "B2", "B6", "F6", "F7", "D5", "B4"],
+        "rows": ["E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"x", "x":0, "y":0}, {"label":"x", "x":1, "y":0}, {"label":"x", "x":2, "y":0}, {"label":"x", "x":3, "y":0}, {"label":"x", "x":0, "y":1}, {"label":"x", "x":1, "y":1}, {"label":"x", "x":2, "y":1}, {"label":"x", "x":3, "y":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": 0, "y": 1},
+                {"matrix": [0, 5], "x": 1, "y": 1},
+                {"matrix": [0, 6], "x": 2, "y": 1},
+                {"matrix": [0, 7], "x": 3, "y": 1}
+            ]
         }
     }
 }
diff --git a/keyboards/wilba_tech/wt8_a/wt8_a.c b/keyboards/wilba_tech/wt8_a/wt8_a.c
deleted file mode 100644
index ccff6d62c9..0000000000
--- a/keyboards/wilba_tech/wt8_a/wt8_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/wilba_tech/wt8_a/wt8_a.h b/keyboards/wilba_tech/wt8_a/wt8_a.h
deleted file mode 100644
index 0fb754f0ab..0000000000
--- a/keyboards/wilba_tech/wt8_a/wt8_a.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT(                                   \
-    K00, K01, K02, K03, K04, K05, K06, K07 )       \
-    {                                              \
-        {K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    }
diff --git a/keyboards/wilba_tech/zeal60/config.h b/keyboards/wilba_tech/zeal60/config.h
index 5a3ad34bf7..e57bafe20d 100644
--- a/keyboards/wilba_tech/zeal60/config.h
+++ b/keyboards/wilba_tech/zeal60/config.h
@@ -15,18 +15,10 @@
  */
 #pragma once
 
-
-// Zeal60 PCB default pin-out
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT 72
 
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 // Locking resynchronize hack
diff --git a/keyboards/wilba_tech/zeal60/info.json b/keyboards/wilba_tech/zeal60/info.json
index 5ef0875419..764b040320 100644
--- a/keyboards/wilba_tech/zeal60/info.json
+++ b/keyboards/wilba_tech/zeal60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift"],
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md b/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md
index 8688892e59..1fbd745742 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md
+++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md
@@ -36,7 +36,7 @@ You might find the [**full PCB image**](https://cdn.shopify.com/s/files/1/0490/7
 
     ```c
     // Set up RGB underglow.
-    #define RGB_DI_PIN B0          // The pin your RGB strip is wired to
+    #define WS2812_DI_PIN B0          // The pin your RGB strip is wired to
     #define RGBLED_NUM 35          // Number of LEDs
     #define RGBLIGHT_HUE_STEP 5    // How much each press of rgb_hue changes hue
     #define RGBLIGHT_SAT_STEP 10   // How much each press of rgb_sat changes sat
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h b/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h
index b106ebc181..e797f81941 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h
+++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h
@@ -20,7 +20,7 @@
 #define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
 
 // Set up RGB underglow.
-#define RGB_DI_PIN B0          // The pin your RGB strip is wired to
+#define WS2812_DI_PIN B0          // The pin your RGB strip is wired to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/wilba_tech/zeal65/config.h b/keyboards/wilba_tech/zeal65/config.h
index 1ab6b62751..4a73ed3b27 100644
--- a/keyboards/wilba_tech/zeal65/config.h
+++ b/keyboards/wilba_tech/zeal65/config.h
@@ -15,18 +15,10 @@
  */
 #pragma once
 
-
-// Zeal60 PCB default pin-out
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT 72
 
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 // Locking resynchronize hack
diff --git a/keyboards/wilba_tech/zeal65/info.json b/keyboards/wilba_tech/zeal65/info.json
index 935dc18874..f442660b45 100644
--- a/keyboards/wilba_tech/zeal65/info.json
+++ b/keyboards/wilba_tech/zeal65/info.json
@@ -8,14 +8,162 @@
         "pid": "0x0065",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_65_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Win", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":7}, {"label":"Fn2", "x":10, "y":4, "w":1.5}, {"label":"Fn1", "x":11.5, "y":4, "w":1.5}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         },
         "LAYOUT_65_normie": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Win", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":7}, {"label":"Fn2", "x":10, "y":4, "w":1.5}, {"label":"Fn1", "x":11.5, "y":4, "w":1.5}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/wilba_tech/zeal65/zeal65.h b/keyboards/wilba_tech/zeal65/zeal65.h
index 34c1294165..3966f822ee 100644
--- a/keyboards/wilba_tech/zeal65/zeal65.h
+++ b/keyboards/wilba_tech/zeal65/zeal65.h
@@ -18,33 +18,3 @@
 #include "quantum.h"
 #include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
 #include "via.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41,                          K47,           K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, XXX, K47, XXX, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_65_normie( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41,                          K47,           K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, XXX, XXX, XXX, XXX, XXX, K47, XXX, XXX, K4A, K4B, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/winkeyless/b87/b87.c b/keyboards/winkeyless/b87/b87.c
deleted file mode 100644
index 46c5ad2bf0..0000000000
--- a/keyboards/winkeyless/b87/b87.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Joah Nelson (Jels)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation,   either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// not much here
-
-#include "b87.h"
diff --git a/keyboards/winkeyless/b87/config.h b/keyboards/winkeyless/b87/config.h
index ce27a1c563..b585802fb8 100644
--- a/keyboards/winkeyless/b87/config.h
+++ b/keyboards/winkeyless/b87/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-
-/*Define Matrix Pins */
-#define MATRIX_ROW_PINS {B5, B4, B3, B2, B1, B0, B6, B7}
-#define MATRIX_COL_PINS {A0, A1, A2, A3, A4, A5, C5, C4, C3, C2, D7, C6, C7, A7, A6}
-    
 #define RGBLED_NUM 20  // Number of LEDs
 // RGB effects
 #define RGBLIGHT_EFFECT_BREATHING
@@ -33,6 +28,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/winkeyless/b87/info.json b/keyboards/winkeyless/b87/info.json
index 542cc74d27..7422d3e2ba 100644
--- a/keyboards/winkeyless/b87/info.json
+++ b/keyboards/winkeyless/b87/info.json
@@ -8,9 +8,17 @@
         "pid": "0x0B87",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "C5", "C4", "C3", "C2", "D7", "C6", "C7", "A7", "A6"],
+        "rows": ["B5", "B4", "B3", "B2", "B1", "B0", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1",
         "scroll_lock": "D6"
diff --git a/keyboards/winkeyless/b87/rules.mk b/keyboards/winkeyless/b87/rules.mk
index 44fd727471..d3a23ba0b6 100644
--- a/keyboards/winkeyless/b87/rules.mk
+++ b/keyboards/winkeyless/b87/rules.mk
@@ -9,4 +9,3 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = i2c
diff --git a/keyboards/winkeyless/bface/bface.c b/keyboards/winkeyless/bface/bface.c
deleted file mode 100644
index c1fcbe53b2..0000000000
--- a/keyboards/winkeyless/bface/bface.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bface.h"
diff --git a/keyboards/winkeyless/bface/config.h b/keyboards/winkeyless/bface/config.h
index cbb0be707d..b7529e4311 100644
--- a/keyboards/winkeyless/bface/config.h
+++ b/keyboards/winkeyless/bface/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7}
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/winkeyless/bface/info.json b/keyboards/winkeyless/bface/info.json
index f7a8c61032..7d4375f8aa 100644
--- a/keyboards/winkeyless/bface/info.json
+++ b/keyboards/winkeyless/bface/info.json
@@ -8,9 +8,17 @@
     "pid": "0x4246",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1",
     "num_lock": "D0",
diff --git a/keyboards/winkeyless/bface/rules.mk b/keyboards/winkeyless/bface/rules.mk
index 03a618b76d..166b3d3ec8 100644
--- a/keyboards/winkeyless/bface/rules.mk
+++ b/keyboards/winkeyless/bface/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/winkeyless/bmini/bmini.c b/keyboards/winkeyless/bmini/bmini.c
deleted file mode 100644
index f44fd36a8c..0000000000
--- a/keyboards/winkeyless/bmini/bmini.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "bmini.h"
diff --git a/keyboards/winkeyless/bmini/config.h b/keyboards/winkeyless/bmini/config.h
index 033807a3f5..ddc21dae30 100644
--- a/keyboards/winkeyless/bmini/config.h
+++ b/keyboards/winkeyless/bmini/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 16
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/winkeyless/bmini/info.json b/keyboards/winkeyless/bmini/info.json
index 58edbac998..7796867d08 100644
--- a/keyboards/winkeyless/bmini/info.json
+++ b/keyboards/winkeyless/bmini/info.json
@@ -8,9 +8,17 @@
     "pid": "0x424D",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1",
     "num_lock": "D0",
diff --git a/keyboards/winkeyless/bmini/rules.mk b/keyboards/winkeyless/bmini/rules.mk
index 25437c442c..6b0cec85a4 100644
--- a/keyboards/winkeyless/bmini/rules.mk
+++ b/keyboards/winkeyless/bmini/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/winkeyless/bminiex/bminiex.c b/keyboards/winkeyless/bminiex/bminiex.c
deleted file mode 100644
index db127e030d..0000000000
--- a/keyboards/winkeyless/bminiex/bminiex.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "bminiex.h"
diff --git a/keyboards/winkeyless/bminiex/config.h b/keyboards/winkeyless/bminiex/config.h
index 351de6f475..116c09d6ac 100644
--- a/keyboards/winkeyless/bminiex/config.h
+++ b/keyboards/winkeyless/bminiex/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 20
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json
index afd766f480..8b8da98045 100644
--- a/keyboards/winkeyless/bminiex/info.json
+++ b/keyboards/winkeyless/bminiex/info.json
@@ -8,10 +8,18 @@
     "pid": "0x4258",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4",
     "levels": 5
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1",
     "num_lock": "D0",
diff --git a/keyboards/winkeyless/bminiex/rules.mk b/keyboards/winkeyless/bminiex/rules.mk
index b83fe79ca6..274e41d419 100644
--- a/keyboards/winkeyless/bminiex/rules.mk
+++ b/keyboards/winkeyless/bminiex/rules.mk
@@ -9,4 +9,3 @@ DEBUG_ENABLE = no
 COMMAND_ENABLE = no
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/winkeys/mini_winni/config.h b/keyboards/winkeys/mini_winni/config.h
index 36fc5c6200..73844a7bc7 100644
--- a/keyboards/winkeys/mini_winni/config.h
+++ b/keyboards/winkeys/mini_winni/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/winkeys/mini_winni/info.json b/keyboards/winkeys/mini_winni/info.json
index 56a13deaf9..614d534fd2 100644
--- a/keyboards/winkeys/mini_winni/info.json
+++ b/keyboards/winkeys/mini_winni/info.json
@@ -15,6 +15,9 @@
             ["F6", "F7", "B6", "B5"]
         ]
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/winry/winry25tc/config.h b/keyboards/winry/winry25tc/config.h
index f67f725ef6..0e0377603b 100644
--- a/keyboards/winry/winry25tc/config.h
+++ b/keyboards/winry/winry25tc/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E6, F0, D6, D2, B6 }
-#define MATRIX_COL_PINS { F5, C7, B7, B2, B4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D5
 #define RGBLED_NUM 40
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json
index 4cbb746408..79f4100f68 100644
--- a/keyboards/winry/winry25tc/info.json
+++ b/keyboards/winry/winry25tc/info.json
@@ -8,36 +8,48 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "C7", "B7", "B2", "B4"],
+        "rows": ["E6", "F0", "D6", "D2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (E6,F5)", "x":0, "y":0},
-                {"label":"K01 (E6,C7)", "x":1, "y":0},
-                {"label":"K02 (E6,B7)", "x":2, "y":0},
-                {"label":"K03 (E6,B2)", "x":3, "y":0},
-                {"label":"K04 (E6,B4)", "x":4, "y":0},
-                {"label":"K10 (F0,F5)", "x":0, "y":1},
-                {"label":"K11 (F0,C7)", "x":1, "y":1},
-                {"label":"K12 (F0,B7)", "x":2, "y":1},
-                {"label":"K13 (F0,B2)", "x":3, "y":1},
-                {"label":"K14 (F0,B4)", "x":4, "y":1},
-                {"label":"K20 (D6,F5)", "x":0, "y":2},
-                {"label":"K21 (D6,C7)", "x":1, "y":2},
-                {"label":"K22 (D6,B7)", "x":2, "y":2},
-                {"label":"K23 (D6,B2)", "x":3, "y":2},
-                {"label":"K24 (D6,B4)", "x":4, "y":2},
-                {"label":"K30 (D2,F5)", "x":0, "y":3},
-                {"label":"K31 (D2,C7)", "x":1, "y":3},
-                {"label":"K32 (D2,B7)", "x":2, "y":3},
-                {"label":"K33 (D2,B2)", "x":3, "y":3},
-                {"label":"K34 (D2,B4)", "x":4, "y":3},
-                {"label":"K40 (B6,F5)", "x":0, "y":4},
-                {"label":"K41 (B6,C7)", "x":1, "y":4},
-                {"label":"K42 (B6,B7)", "x":2, "y":4},
-                {"label":"K43 (B6,B2)", "x":3, "y":4},
-                {"label":"K44 (B6,B4)", "x":4, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4}
             ]
         }
     }
diff --git a/keyboards/winry/winry25tc/winry25tc.c b/keyboards/winry/winry25tc/winry25tc.c
deleted file mode 100644
index 938dadaf8f..0000000000
--- a/keyboards/winry/winry25tc/winry25tc.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Andrzej Ressel (andrzej.ressel@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "winry25tc.h"
diff --git a/keyboards/winry/winry25tc/winry25tc.h b/keyboards/winry/winry25tc/winry25tc.h
deleted file mode 100644
index 5498dd8d6b..0000000000
--- a/keyboards/winry/winry25tc/winry25tc.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Andrzej Ressel (andrzej.ressel@gmail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04,   \
-    K10, K11, K12, K13, K14,   \
-    K20, K21, K22, K23, K24,   \
-    K30, K31, K32, K33, K34,   \
-    K40, K41, K42, K43, K44    \
-) { \
-    { K00,   K01,   K02,   K03,   K04   }, \
-    { K10,   K11,   K12,   K13,   K14   }, \
-    { K20,   K21,   K22,   K23,   K24   }, \
-    { K30,   K31,   K32,   K33,   K34   }, \
-    { K40,   K41,   K42,   K43,   K44   }, \
-}
diff --git a/keyboards/winry/winry315/config.h b/keyboards/winry/winry315/config.h
index 620a7f6e6b..18d47f7ec4 100644
--- a/keyboards/winry/winry315/config.h
+++ b/keyboards/winry/winry315/config.h
@@ -12,7 +12,6 @@
 // RGB LED parameters.
 // This PCB uses a single chain of WS2812-compatible addressable RGB LEDs for
 // per-key backlight and underglow.
-#define RGB_DI_PIN F7
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 150
 
diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json
index 4039d5aaf5..fcbafb86ff 100644
--- a/keyboards/winry/winry315/info.json
+++ b/keyboards/winry/winry315/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0315",
         "vid": "0xF1F1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F0"},
@@ -22,6 +25,9 @@
             ["F4", "C7", "D4", "D5", "D1", "F5", "C6", "D6", "D3", "D2", "F6", "B6", "D7", "B4", "B5", "B2", "D0", "E6", null, null, null, null, null, null]
         ]
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_top"
     },
diff --git a/keyboards/winry/winry315/keymaps/via/encoder_actions.c b/keyboards/winry/winry315/keymaps/via/encoder_actions.c
index 9a9092effd..d24d13bb26 100644
--- a/keyboards/winry/winry315/keymaps/via/encoder_actions.c
+++ b/keyboards/winry/winry315/keymaps/via/encoder_actions.c
@@ -37,7 +37,8 @@ static void exec_encoder_action(uint8_t index, bool clockwise, bool pressed) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = pressed,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     // clang-format on
     action_exec(encoder_event);
diff --git a/keyboards/winry/winry315/rules.mk b/keyboards/winry/winry315/rules.mk
index d5f501196c..0f932779f5 100644
--- a/keyboards/winry/winry315/rules.mk
+++ b/keyboards/winry/winry315/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/wolf/kuku65/config.h b/keyboards/wolf/kuku65/config.h
deleted file mode 100644
index a103afe451..0000000000
--- a/keyboards/wolf/kuku65/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, B7  }
-#define MATRIX_COL_PINS { D0, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wolf/kuku65/info.json b/keyboards/wolf/kuku65/info.json
index 39fec251a1..36022287d2 100644
--- a/keyboards/wolf/kuku65/info.json
+++ b/keyboards/wolf/kuku65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0052",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+        "rows": ["B3", "B2", "B1", "B0", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wolf/kuku65/kuku65.c b/keyboards/wolf/kuku65/kuku65.c
deleted file mode 100644
index 9c1be8cb83..0000000000
--- a/keyboards/wolf/kuku65/kuku65.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "kuku65.h"
diff --git a/keyboards/wolf/m60_b/config.h b/keyboards/wolf/m60_b/config.h
index a38b9748ce..a0d44d48e3 100644
--- a/keyboards/wolf/m60_b/config.h
+++ b/keyboards/wolf/m60_b/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 
 #define RGB_MATRIX_LED_COUNT 62
-#define RGB_DI_PIN D1
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES 
diff --git a/keyboards/wolf/m60_b/info.json b/keyboards/wolf/m60_b/info.json
index be2237354a..75e6b64b2e 100644
--- a/keyboards/wolf/m60_b/info.json
+++ b/keyboards/wolf/m60_b/info.json
@@ -14,6 +14,9 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "matrix_pins": {
         "cols": ["B7", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
         "rows": ["D5", "D3", "D2", "B0", "B2"]
diff --git a/keyboards/wolf/ryujin/config.h b/keyboards/wolf/ryujin/config.h
deleted file mode 100644
index dd9ec9803a..0000000000
--- a/keyboards/wolf/ryujin/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { D5, D3, D2, D1, D0  }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/info.json
index 5afce87aef..4a7c080606 100644
--- a/keyboards/wolf/ryujin/info.json
+++ b/keyboards/wolf/ryujin/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0200",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wolf/ryujin/ryujin.c b/keyboards/wolf/ryujin/ryujin.c
deleted file mode 100644
index a2298a546d..0000000000
--- a/keyboards/wolf/ryujin/ryujin.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "ryujin.h"
diff --git a/keyboards/wolf/sabre/config.h b/keyboards/wolf/sabre/config.h
deleted file mode 100644
index c0150fce0b..0000000000
--- a/keyboards/wolf/sabre/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { D0, D1, F1, F0, B5, B6, C7, C6, F6, F7, F4, F5 }
-#define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B2, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json
index 40ee60a6d0..526422d945 100644
--- a/keyboards/wolf/sabre/info.json
+++ b/keyboards/wolf/sabre/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0055",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B2", "B1"],
+        "rows": ["D0", "D1", "F1", "F0", "B5", "B6", "C7", "C6", "F6", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7"
     },
diff --git a/keyboards/wolf/sabre/sabre.c b/keyboards/wolf/sabre/sabre.c
deleted file mode 100644
index 84577ef867..0000000000
--- a/keyboards/wolf/sabre/sabre.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "sabre.h"
diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h
index 7664e747c7..5064157a52 100644
--- a/keyboards/wolf/ts60/config.h
+++ b/keyboards/wolf/ts60/config.h
@@ -17,27 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { D2, D3, D6, D4, F6, F7, F5, F0, F4, F1 }
-#define MATRIX_COL_PINS { D1, D5, C7, C6, B6, B5, B4, D7}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Define RGB Underglow */
-#define RGB_DI_PIN D0
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json
index 8b40cd6ff2..010ed85755 100644
--- a/keyboards/wolf/ts60/info.json
+++ b/keyboards/wolf/ts60/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0050",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D5", "C7", "C6", "B6", "B5", "B4", "D7"],
+        "rows": ["D2", "D3", "D6", "D4", "F6", "F7", "F5", "F0", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 6
     },
+    "ws2812": {
+        "pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/wolf/ts60/ts60.c b/keyboards/wolf/ts60/ts60.c
deleted file mode 100644
index 199c79c946..0000000000
--- a/keyboards/wolf/ts60/ts60.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "ts60.h"
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
index f9802c89f3..743d5df7e2 100644
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ b/keyboards/wolfmarkclub/wm1/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                         0    1    2    3    4     5   6   7    8     9   A   B  C   D   E
-#define MATRIX_ROW_PINS { C4,  A7,  A6,  A5,  A4 }
-#define MATRIX_COL_PINS { B10, B11, B12, B13, B14, B15, C6, C10, C11, C12, D2, B5, B6, B7, B8 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN A3
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 18
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -41,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json
index 3eef787a74..8d61f9ed09 100644
--- a/keyboards/wolfmarkclub/wm1/info.json
+++ b/keyboards/wolfmarkclub/wm1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x2B29",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A3"
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "C6", "C10", "C11", "C12", "D2", "B5", "B6", "B7", "B8"],
+        "rows": ["C4", "A7", "A6", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":8.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":13.25, "y":1}, {"x":14.25, "y":1}, {"x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3, "w":1.75}, {"x":16.25, "y":3.25}, {"x":0, "y":4, "w":1.5}, {"x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2}, {"x":6.5, "y":4}, {"x":8, "y":4, "w":2.75}, {"x":10.75, "y":4, "w":1.5}, {"x":13.25, "y":4, "w":1.5}, {"x":15.25, "y":4.25}, {"x":16.25, "y":4.25}, {"x":17.25, "y":4.25}]
diff --git a/keyboards/woodkeys/bigseries/1key/1key.c b/keyboards/woodkeys/bigseries/1key/1key.c
index 6036bd9991..a2ebca4fe0 100755
--- a/keyboards/woodkeys/bigseries/1key/1key.c
+++ b/keyboards/woodkeys/bigseries/1key/1key.c
@@ -14,7 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "1key.h"
+#include "quantum.h"
 
 void matrix_scan_kb(void) {
   // Looping keyboard code goes here
diff --git a/keyboards/woodkeys/bigseries/1key/1key.h b/keyboards/woodkeys/bigseries/1key/1key.h
deleted file mode 100755
index 6e5ddcc760..0000000000
--- a/keyboards/woodkeys/bigseries/1key/1key.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00 \
-) { \
-    { k00 } \
-}
diff --git a/keyboards/woodkeys/bigseries/1key/config.h b/keyboards/woodkeys/bigseries/1key/config.h
index 32263155ff..eff8d0f47a 100755
--- a/keyboards/woodkeys/bigseries/1key/config.h
+++ b/keyboards/woodkeys/bigseries/1key/config.h
@@ -17,21 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0 }
-#define MATRIX_COL_PINS { B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     false \
 )
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json
index f2f93b63ea..72ac6af4d6 100644
--- a/keyboards/woodkeys/bigseries/1key/info.json
+++ b/keyboards/woodkeys/bigseries/1key/info.json
@@ -8,13 +8,21 @@
         "pid": "0x6071",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B4"],
+        "rows": ["B0"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "debounce": 50,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 4, "h": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}
             ]
         }
     }
diff --git a/keyboards/woodkeys/bigseries/2key/2key.c b/keyboards/woodkeys/bigseries/2key/2key.c
index cffb71907e..a2ebca4fe0 100755
--- a/keyboards/woodkeys/bigseries/2key/2key.c
+++ b/keyboards/woodkeys/bigseries/2key/2key.c
@@ -14,7 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "2key.h"
+#include "quantum.h"
 
 void matrix_scan_kb(void) {
   // Looping keyboard code goes here
diff --git a/keyboards/woodkeys/bigseries/2key/2key.h b/keyboards/woodkeys/bigseries/2key/2key.h
deleted file mode 100755
index eff82fef93..0000000000
--- a/keyboards/woodkeys/bigseries/2key/2key.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01 \
-) { \
-    { k00, k01 } \
-}
diff --git a/keyboards/woodkeys/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h
index 6b40065765..a4a762b232 100755
--- a/keyboards/woodkeys/bigseries/2key/config.h
+++ b/keyboards/woodkeys/bigseries/2key/config.h
@@ -17,21 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0 }
-#define MATRIX_COL_PINS { B4, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     false \
 )
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json
index 5137f4f1d1..1e4d0fe04a 100644
--- a/keyboards/woodkeys/bigseries/2key/info.json
+++ b/keyboards/woodkeys/bigseries/2key/info.json
@@ -8,14 +8,22 @@
         "pid": "0x6071",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B3"],
+        "rows": ["B0"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "debounce": 50,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 4, "h": 4},
-                {"x": 4, "y": 0, "w": 4, "h": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4},
+                {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4}
             ]
         }
     }
diff --git a/keyboards/woodkeys/bigseries/3key/3key.c b/keyboards/woodkeys/bigseries/3key/3key.c
index 3735c10543..a2ebca4fe0 100755
--- a/keyboards/woodkeys/bigseries/3key/3key.c
+++ b/keyboards/woodkeys/bigseries/3key/3key.c
@@ -14,7 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "3key.h"
+#include "quantum.h"
 
 void matrix_scan_kb(void) {
   // Looping keyboard code goes here
diff --git a/keyboards/woodkeys/bigseries/3key/3key.h b/keyboards/woodkeys/bigseries/3key/3key.h
deleted file mode 100755
index caee1e4551..0000000000
--- a/keyboards/woodkeys/bigseries/3key/3key.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02 \
-) { \
-    { k00, k01, k02 } \
-}
diff --git a/keyboards/woodkeys/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h
index 9c81df0835..bc00538fdb 100755
--- a/keyboards/woodkeys/bigseries/3key/config.h
+++ b/keyboards/woodkeys/bigseries/3key/config.h
@@ -17,21 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0 }
-#define MATRIX_COL_PINS { B4, B3, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     false \
 )
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json
index af1c85f925..c8ee901dea 100644
--- a/keyboards/woodkeys/bigseries/3key/info.json
+++ b/keyboards/woodkeys/bigseries/3key/info.json
@@ -8,15 +8,23 @@
         "pid": "0x6073",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B3", "B5"],
+        "rows": ["B0"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 50,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 4, "h": 4},
-                {"x": 4, "y": 0, "w": 4, "h": 4},
-                {"x": 8, "y": 0, "w": 4, "h": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4},
+                {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4},
+                {"matrix": [0, 2], "x": 8, "y": 0, "w": 4, "h": 4}
             ]
         }
     }
diff --git a/keyboards/woodkeys/bigseries/4key/4key.c b/keyboards/woodkeys/bigseries/4key/4key.c
deleted file mode 100755
index fdb9a92514..0000000000
--- a/keyboards/woodkeys/bigseries/4key/4key.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "4key.h"
diff --git a/keyboards/woodkeys/bigseries/4key/4key.h b/keyboards/woodkeys/bigseries/4key/4key.h
deleted file mode 100755
index 7e9ff7a793..0000000000
--- a/keyboards/woodkeys/bigseries/4key/4key.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, \
-    k10, k11 \
-) { \
-    { k00, k01 }, \
-    { k10, k11 } \
-}
diff --git a/keyboards/woodkeys/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h
index 9b1f699ce1..0bc82865f9 100755
--- a/keyboards/woodkeys/bigseries/4key/config.h
+++ b/keyboards/woodkeys/bigseries/4key/config.h
@@ -17,21 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B5 }
-#define MATRIX_COL_PINS { B4, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     false \
 )
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json
index b6e02aa987..22ebdc7f6b 100644
--- a/keyboards/woodkeys/bigseries/4key/info.json
+++ b/keyboards/woodkeys/bigseries/4key/info.json
@@ -8,17 +8,25 @@
         "pid": "0x6074",
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B3"],
+        "rows": ["B0", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "debounce": 50,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 4, "h": 4},
-                {"x": 4, "y": 0, "w": 4, "h": 4},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4},
+                {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4},
 
-                {"x": 0, "y": 4, "w": 4, "h": 4},
-                {"x": 4, "y": 4, "w": 4, "h": 4}
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 4, "h": 4},
+                {"matrix": [1, 1], "x": 4, "y": 4, "w": 4, "h": 4}
             ]
         }
     }
diff --git a/keyboards/woodkeys/meira/config.h b/keyboards/woodkeys/meira/config.h
index f1434fdbd4..d5bdf9540c 100644
--- a/keyboards/woodkeys/meira/config.h
+++ b/keyboards/woodkeys/meira/config.h
@@ -28,7 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 15    // Number of LEDs
 #endif
diff --git a/keyboards/woodkeys/meira/featherble/featherble.c b/keyboards/woodkeys/meira/featherble/featherble.c
deleted file mode 100644
index 63ade21904..0000000000
--- a/keyboards/woodkeys/meira/featherble/featherble.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2017 Cole Markham, WoodKeys.click
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "meira.h"
diff --git a/keyboards/woodkeys/meira/featherble/featherble.h b/keyboards/woodkeys/meira/featherble/featherble.h
deleted file mode 100644
index eab7c639b9..0000000000
--- a/keyboards/woodkeys/meira/featherble/featherble.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 Cole Markham, WoodKeys.click
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "meira.h"
diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json
index 3a0ae1d190..e39df58323 100644
--- a/keyboards/woodkeys/meira/info.json
+++ b/keyboards/woodkeys/meira/info.json
@@ -12,6 +12,9 @@
         "driver": "custom",
         "levels": 10
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layout_aliases": {
@@ -21,57 +24,57 @@
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/woodkeys/meira/meira.h b/keyboards/woodkeys/meira/meira.h
index 55fccf5de5..46d9791e48 100644
--- a/keyboards/woodkeys/meira/meira.h
+++ b/keyboards/woodkeys/meira/meira.h
@@ -19,19 +19,3 @@
 #include "issi.h"
 
 void reset_keyboard_kb(void);
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }  \
-}
diff --git a/keyboards/woodkeys/meira/promicro/promicro.c b/keyboards/woodkeys/meira/promicro/promicro.c
deleted file mode 100644
index 63ade21904..0000000000
--- a/keyboards/woodkeys/meira/promicro/promicro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2017 Cole Markham, WoodKeys.click
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "meira.h"
diff --git a/keyboards/woodkeys/meira/promicro/promicro.h b/keyboards/woodkeys/meira/promicro/promicro.h
deleted file mode 100644
index eab7c639b9..0000000000
--- a/keyboards/woodkeys/meira/promicro/promicro.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 Cole Markham, WoodKeys.click
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "meira.h"
diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h
index fac7647ab8..3854dc8659 100644
--- a/keyboards/woodkeys/scarletbandana/config.h
+++ b/keyboards/woodkeys/scarletbandana/config.h
@@ -17,12 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -36,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 8    // Number of LEDs
 #endif
 
-#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5 }
-#define MATRIX_COL_PINS { B2, B3, B7, B1, F5, F4, F6, F7, B0, F0, F1, D0, D1, D2, D5, B6, C7 }
-
 #ifdef AUDIO_ENABLE
 #define AUDIO_PIN C6
 #define STARTUP_SONG SONG(PREONIC_SOUND)
diff --git a/keyboards/woodkeys/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/info.json
index 180cd46098..c2371fb5c3 100644
--- a/keyboards/woodkeys/scarletbandana/info.json
+++ b/keyboards/woodkeys/scarletbandana/info.json
@@ -8,6 +8,14 @@
         "pid": "0x6969",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B7", "B1", "F5", "F4", "F6", "F7", "B0", "F0", "F1", "D0", "D1", "D2", "D5", "B6", "C7"],
+        "rows": ["D4", "D6", "D7", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/woodkeys/scarletbandana/scarletbandana.c b/keyboards/woodkeys/scarletbandana/scarletbandana.c
deleted file mode 100644
index 6ef183c2cc..0000000000
--- a/keyboards/woodkeys/scarletbandana/scarletbandana.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019 Cole Markham, WoodKeys.click
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "scarletbandana.h"
-
-
-
-
-
-
diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index 1e17946cef..4d5bcf9dba 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { F5 }
-#define MATRIX_COL_PINS { B3, B2, B1, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 #define RGBLIGHT_DI_PIN E6
@@ -57,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_DEFAULT_MODE         RGBLIGHT_MODE_STATIC_LIGHT
 #define RGBLIGHT_DEFAULT_HUE          36
 
-#define RGB_DI_PIN F1
 #define RGB_MATRIX_LED_COUNT 9
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index df4a5c1be0..64aed890de 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -7,6 +7,14 @@
         "vid": "0x574C",
         "pid": "0x1DF9"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B1", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
+        "rows": ["F5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1"},
@@ -17,24 +25,26 @@
     "bootmagic": {
         "matrix": [0, 11]
     },
+    "ws2812": {
+        "pin": "F1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0},
-
-                {"label": "k03", "x": 3, "y": 0},
-                {"label": "k04", "x": 4, "y": 0},
-                {"label": "k05", "x": 5, "y": 0},
-                {"label": "k06", "x": 6, "y": 0},
-                {"label": "k07", "x": 7, "y": 0},
-                {"label": "k08", "x": 8, "y": 0},
-                {"label": "k09", "x": 9, "y": 0},
-                {"label": "k0a", "x": 10, "y": 0},
-                {"label": "k0b", "x": 11, "y": 0}
+                {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k0a", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k0b", "matrix": [0, 11], "x": 11, "y": 0}
             ]
         }
     }
diff --git a/keyboards/work_louder/loop/loop.h b/keyboards/work_louder/loop/loop.h
index a7376881b3..b2cb2410fc 100644
--- a/keyboards/work_louder/loop/loop.h
+++ b/keyboards/work_louder/loop/loop.h
@@ -18,17 +18,3 @@
 
 #include "quantum.h"
 #include "rgb_functions.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b    \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }  \
-}
diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk
index 7b2a49bbc2..b68ae20d14 100644
--- a/keyboards/work_louder/loop/rules.mk
+++ b/keyboards/work_louder/loop/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 
 SRC += rgb_functions.c
diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h
index bfe04592ac..f23c5a4ef1 100644
--- a/keyboards/work_louder/micro/config.h
+++ b/keyboards/work_louder/micro/config.h
@@ -10,7 +10,6 @@
  */
 #define USB_MAX_POWER_CONSUMPTION 100
 
-#define RGB_DI_PIN D1
 #define RGB_MATRIX_LED_COUNT 12
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 #define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json
index 3627122102..f6b45226a0 100644
--- a/keyboards/work_louder/micro/info.json
+++ b/keyboards/work_louder/micro/info.json
@@ -39,6 +39,12 @@
         "max_brightness": 150,
         "saturation_steps": 8
     },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "url": "https://worklouder.cc/",
     "usb": {
         "device_version": "1.0.0",
diff --git a/keyboards/work_louder/micro/matrix.c b/keyboards/work_louder/micro/matrix.c
index d2ae16ad9c..743c788662 100644
--- a/keyboards/work_louder/micro/matrix.c
+++ b/keyboards/work_louder/micro/matrix.c
@@ -4,16 +4,13 @@
 /*
  * scan matrix
  */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
+#include "matrix.h"
+#include <string.h>
+#include "atomic_util.h"
 #include "wait.h"
-#include "print.h"
 #include "debug.h"
 #include "util.h"
-#include "matrix.h"
 #include "debounce.h"
-#include QMK_KEYBOARD_H
 
 /* matrix state(1:on, 0:off) */
 extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
diff --git a/keyboards/work_louder/micro/micro.c b/keyboards/work_louder/micro/micro.c
index 42bc2db529..d845a62250 100644
--- a/keyboards/work_louder/micro/micro.c
+++ b/keyboards/work_louder/micro/micro.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "micro.h"
 
 #if defined(RGB_MATRIX_ENABLE)
 // clang-format off
diff --git a/keyboards/work_louder/micro/rules.mk b/keyboards/work_louder/micro/rules.mk
index bf0aa91911..ae0d803c0a 100644
--- a/keyboards/work_louder/micro/rules.mk
+++ b/keyboards/work_louder/micro/rules.mk
@@ -1,4 +1,2 @@
-RGB_MATRIX_DRIVER = WS2812
-
 SRC += rgb_functions.c \
         matrix.c
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index 9148cf1abf..265da302e5 100644
--- a/keyboards/work_louder/nano/config.h
+++ b/keyboards/work_louder/nano/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { F7 }
-#define MATRIX_COL_PINS \
-    { B5, B6, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION        COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 #define RGBLIGHT_DI_PIN        C7
@@ -58,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_DEFAULT_MODE         RGBLIGHT_MODE_STATIC_LIGHT
 #define RGBLIGHT_DEFAULT_HUE          170
 
-#define RGB_DI_PIN                    F6
 #define RGB_MATRIX_LED_COUNT              2
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index 3eb050b92a..70da0e4cc4 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -8,11 +8,22 @@
         "pid": "0xE6F0",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6"],
+        "rows": ["F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D7", "pin_b": "B4"}
         ]
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "bootmagic": {
         "matrix": [0, 2]
     },
@@ -21,9 +32,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0}
             ]
         }
     }
diff --git a/keyboards/work_louder/nano/nano.h b/keyboards/work_louder/nano/nano.h
index cc152b8ccc..04de456eca 100644
--- a/keyboards/work_louder/nano/nano.h
+++ b/keyboards/work_louder/nano/nano.h
@@ -18,17 +18,3 @@
 
 #include "quantum.h"
 #include "rgb_functions.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02 \
-) { \
-    { k00, k01,   k02 } \
-}
diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk
index 60c7afc95e..bcbb4bb31d 100644
--- a/keyboards/work_louder/nano/rules.mk
+++ b/keyboards/work_louder/nano/rules.mk
@@ -14,6 +14,5 @@ ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 SRC += rgb_functions.c
diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/info.json
index dbae02e573..8400e21a83 100644
--- a/keyboards/work_louder/numpad/info.json
+++ b/keyboards/work_louder/numpad/info.json
@@ -63,10 +63,12 @@
         "hue_steps": 8,
         "led_count": 8,
         "max_brightness": 120,
-        "pin": "D1",
         "saturation_steps": 8,
         "sleep": true
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
diff --git a/keyboards/work_louder/rgb_functions.c b/keyboards/work_louder/rgb_functions.c
index d0cb93ccbc..138779465e 100644
--- a/keyboards/work_louder/rgb_functions.c
+++ b/keyboards/work_louder/rgb_functions.c
@@ -14,16 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
 #include "rgb_functions.h"
 
 #ifdef RGBLIGHT_ENABLE
-#undef RGB_DI_PIN
-#define RGB_DI_PIN RGBLIGHT_DI_PIN
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN RGBLIGHT_DI_PIN
 
 #define ws2812_setleds ws2812_rgb_setleds
 
-#include "ws2812.c"
+#include "ws2812_bitbang.c"
 
 void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) {
     ws2812_setleds(start_led, num_leds);
diff --git a/keyboards/work_louder/rgb_functions.h b/keyboards/work_louder/rgb_functions.h
index 8940cddefc..9ad7cdb19c 100644
--- a/keyboards/work_louder/rgb_functions.h
+++ b/keyboards/work_louder/rgb_functions.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "quantum.h"
 
 #ifndef VIA_ENABLE
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index d9da63eb50..8f392bd050 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { F0, F1, F4, F5 }
-#define MATRIX_COL_PINS \
-    { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, E6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION        COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 #define RGBLIGHT_DI_PIN        D2
@@ -57,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_DEFAULT_MODE         RGBLIGHT_MODE_STATIC_GRADIENT + 9
 #define RGBLIGHT_DEFAULT_HUE          213
 
-#define RGB_DI_PIN                    D1
 #define RGB_MATRIX_LED_COUNT              49
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index 5e934e90e0..3e208110a8 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -7,11 +7,22 @@
       "vid": "0x574C",
       "pid": "0xDCD1"
     },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
+    "matrix_pins": {
+      "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "E6"],
+      "rows": ["F0", "F1", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "B0", "pin_b": "B1"}
       ]
     },
+    "ws2812": {
+      "pin": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/work_louder/work_board/rules.mk b/keyboards/work_louder/work_board/rules.mk
index 714b4b5d04..9f4b9a4bc5 100644
--- a/keyboards/work_louder/work_board/rules.mk
+++ b/keyboards/work_louder/work_board/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 SRC += rgb_functions.c
 
diff --git a/keyboards/work_louder/work_board/work_board.c b/keyboards/work_louder/work_board/work_board.c
index 928a8abd89..157504216d 100644
--- a/keyboards/work_louder/work_board/work_board.c
+++ b/keyboards/work_louder/work_board/work_board.c
@@ -16,20 +16,6 @@
 
 #include "work_board.h"
 
-#if defined(ENCODER_ENABLE)
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    if (clockwise) {
-        tap_code(KC_VOLD);
-    } else {
-        tap_code(KC_VOLU);
-    }
-    return true;
-}
-#endif
-
 #ifdef OLED_ENABLE
 #    ifdef RGB_MATRIX_ENABLE
 #        error Cannot run OLED and Per Key RGB at the same time due to pin conflicts
diff --git a/keyboards/wren/config.h b/keyboards/wren/config.h
index 72e110cc6b..bd4af23167 100644
--- a/keyboards/wren/config.h
+++ b/keyboards/wren/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, D2, C6, D4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D7, F0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define USE_I2C
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json
index 184ddea75b..06fa7ddf10 100644
--- a/keyboards/wren/info.json
+++ b/keyboards/wren/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D7", "F0"],
+        "rows": ["D3", "D2", "C6", "D4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "E6", "pin_b": "B4"}
diff --git a/keyboards/wsk/alpha9/alpha9.c b/keyboards/wsk/alpha9/alpha9.c
deleted file mode 100644
index 0d9f32c49a..0000000000
--- a/keyboards/wsk/alpha9/alpha9.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "alpha9.h"
diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h
index 19943cdb98..defc0a92dc 100644
--- a/keyboards/wsk/alpha9/config.h
+++ b/keyboards/wsk/alpha9/config.h
@@ -16,22 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, B4, B5 }
-#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5, D1, D0, D2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -46,4 +36,3 @@
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/alpha9/info.json b/keyboards/wsk/alpha9/info.json
index 65d1bec3f7..8ca6640542 100644
--- a/keyboards/wsk/alpha9/info.json
+++ b/keyboards/wsk/alpha9/info.json
@@ -8,10 +8,18 @@
     "pid": "0x692A",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "D1", "D0", "D2"],
+    "rows": ["D4", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "D3",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "F4"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h
index fb101db58f..a14f9dbde2 100644
--- a/keyboards/wsk/g4m3ralpha/config.h
+++ b/keyboards/wsk/g4m3ralpha/config.h
@@ -16,22 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, B4, B5, D1 }
-#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -46,4 +36,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/g4m3ralpha/info.json b/keyboards/wsk/g4m3ralpha/info.json
index a55225c0bc..9f70410b23 100644
--- a/keyboards/wsk/g4m3ralpha/info.json
+++ b/keyboards/wsk/g4m3ralpha/info.json
@@ -8,6 +8,14 @@
     "pid": "0x56D9",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F4"
+  },
+  "matrix_pins": {
+    "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"],
+    "rows": ["D4", "B4", "B5", "D1"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/wsk/gothic50/config.h b/keyboards/wsk/gothic50/config.h
index da5729ed4f..541e19bece 100644
--- a/keyboards/wsk/gothic50/config.h
+++ b/keyboards/wsk/gothic50/config.h
@@ -1,17 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-
-#define MATRIX_ROW_PINS { B5, B4, D7, D6 }
-#define MATRIX_COL_PINS { E6, F0, F1, C7, C6, B6, D4, D5, D3, D2, D1, D0, B7, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-
-#define RGB_DI_PIN F7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -26,7 +14,6 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/gothic50/gothic50.c b/keyboards/wsk/gothic50/gothic50.c
deleted file mode 100644
index 66854ba846..0000000000
--- a/keyboards/wsk/gothic50/gothic50.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "gothic50.h"
diff --git a/keyboards/wsk/gothic50/info.json b/keyboards/wsk/gothic50/info.json
index bce25f3934..a3fb3dd0e6 100644
--- a/keyboards/wsk/gothic50/info.json
+++ b/keyboards/wsk/gothic50/info.json
@@ -8,6 +8,14 @@
         "pid": "0x04EF",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "C7", "C6", "B6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B0"],
+        "rows": ["B5", "B4", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h
index 8cfb2dcab9..b6ee3e9cc8 100644
--- a/keyboards/wsk/gothic70/config.h
+++ b/keyboards/wsk/gothic70/config.h
@@ -1,16 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -25,7 +14,6 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/gothic70/gothic70.c b/keyboards/wsk/gothic70/gothic70.c
deleted file mode 100644
index dde1471174..0000000000
--- a/keyboards/wsk/gothic70/gothic70.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "gothic70.h"
diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/info.json
index f7baad64c1..34483ca2bf 100644
--- a/keyboards/wsk/gothic70/info.json
+++ b/keyboards/wsk/gothic70/info.json
@@ -8,6 +8,14 @@
         "pid": "0x63CC",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/wsk/houndstooth/config.h b/keyboards/wsk/houndstooth/config.h
index b9cc1722c3..5f36081323 100644
--- a/keyboards/wsk/houndstooth/config.h
+++ b/keyboards/wsk/houndstooth/config.h
@@ -1,17 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, F7, D7, B1, B4, B2, B5, B6 }
-#define MATRIX_COL_PINS { D1, F4, D0, F5, D4, F6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGB_DI_PIN F1
diff --git a/keyboards/wsk/houndstooth/houndstooth.c b/keyboards/wsk/houndstooth/houndstooth.c
deleted file mode 100644
index 2dcd1aa8c3..0000000000
--- a/keyboards/wsk/houndstooth/houndstooth.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "houndstooth.h"
diff --git a/keyboards/wsk/houndstooth/info.json b/keyboards/wsk/houndstooth/info.json
index 490088543c..bdcfebbdb4 100644
--- a/keyboards/wsk/houndstooth/info.json
+++ b/keyboards/wsk/houndstooth/info.json
@@ -8,6 +8,14 @@
         "pid": "0xFA9C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F1"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "F4", "D0", "F5", "D4", "F6"],
+        "rows": ["C6", "F7", "D7", "B1", "B4", "B2", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/wsk/jerkin/config.h b/keyboards/wsk/jerkin/config.h
index dcecb58d15..5f36081323 100644
--- a/keyboards/wsk/jerkin/config.h
+++ b/keyboards/wsk/jerkin/config.h
@@ -1,32 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B4, B5 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, B1, F7, F6, F5, F4, E6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-// #define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/jerkin/info.json b/keyboards/wsk/jerkin/info.json
index bc273e6c5e..19099a4f56 100644
--- a/keyboards/wsk/jerkin/info.json
+++ b/keyboards/wsk/jerkin/info.json
@@ -8,6 +8,11 @@
         "pid": "0x79AE",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "B1", "F7", "F6", "F5", "F4", "E6", "D7"],
+        "rows": ["B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/wsk/jerkin/jerkin.c b/keyboards/wsk/jerkin/jerkin.c
deleted file mode 100644
index d2ed417097..0000000000
--- a/keyboards/wsk/jerkin/jerkin.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jerkin.h"
diff --git a/keyboards/wsk/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h
index 8f965e4b09..da4d3257a6 100644
--- a/keyboards/wsk/kodachi50/config.h
+++ b/keyboards/wsk/kodachi50/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D2, B5, B6, B2, B3, B1, F7, F6 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/kodachi50/info.json b/keyboards/wsk/kodachi50/info.json
index 713c1f064f..af2112d63b 100644
--- a/keyboards/wsk/kodachi50/info.json
+++ b/keyboards/wsk/kodachi50/info.json
@@ -8,6 +8,14 @@
         "pid": "0x72D4",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"],
+        "rows": ["D2", "B5", "B6", "B2", "B3", "B1", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/wsk/kodachi50/kodachi50.c b/keyboards/wsk/kodachi50/kodachi50.c
deleted file mode 100644
index 77ee65bbc1..0000000000
--- a/keyboards/wsk/kodachi50/kodachi50.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kodachi50.h"
diff --git a/keyboards/wsk/pain27/config.h b/keyboards/wsk/pain27/config.h
index 593192dfb5..edc623d08f 100644
--- a/keyboards/wsk/pain27/config.h
+++ b/keyboards/wsk/pain27/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, D0 }
-#define MATRIX_COL_PINS { D2, B3, F6, B1, B2, B6, D4, C6, D7, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/pain27/info.json b/keyboards/wsk/pain27/info.json
index ee3d584873..c82080bad6 100644
--- a/keyboards/wsk/pain27/info.json
+++ b/keyboards/wsk/pain27/info.json
@@ -8,11 +8,50 @@
         "pid": "0x9E8C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "matrix_pins": {
+        "cols": ["D2", "B3", "F6", "B1", "B2", "B6", "D4", "C6", "D7", "E6"],
+        "rows": ["F4", "F5", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"x":3.25, "y":3, "w":6.25}]
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+
+                {"x":0.25, "y":1},
+                {"x":1.25, "y":1},
+                {"x":2.25, "y":1},
+                {"x":3.25, "y":1},
+                {"x":4.25, "y":1},
+                {"x":5.25, "y":1},
+                {"x":6.25, "y":1},
+                {"x":7.25, "y":1},
+                {"x":8.25, "y":1},
+
+                {"x":0.75, "y":2},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+
+                {"x":2.25, "y":3, "w":6.25}
+            ]
         }
     }
 }
diff --git a/keyboards/wsk/pain27/pain27.c b/keyboards/wsk/pain27/pain27.c
deleted file mode 100644
index 8fa76871f1..0000000000
--- a/keyboards/wsk/pain27/pain27.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "pain27.h"
diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h
index 2dca1b6d6d..d33de62b5f 100644
--- a/keyboards/wsk/sl40/config.h
+++ b/keyboards/wsk/sl40/config.h
@@ -16,22 +16,12 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, D2, D0 }
-#define MATRIX_COL_PINS { D3, D1, F6, F7, B6, B2, B3, B1, D4, C6, D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -46,4 +36,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/sl40/info.json b/keyboards/wsk/sl40/info.json
index f9f700e42c..73cb2445d2 100644
--- a/keyboards/wsk/sl40/info.json
+++ b/keyboards/wsk/sl40/info.json
@@ -8,6 +8,14 @@
         "pid": "0xC456",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F1"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D1", "F6", "F7", "B6", "B2", "B3", "B1", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "D2", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/wsk/sl40/sl40.c b/keyboards/wsk/sl40/sl40.c
deleted file mode 100644
index 6367367afb..0000000000
--- a/keyboards/wsk/sl40/sl40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "sl40.h"
diff --git a/keyboards/wsk/tkl30/config.h b/keyboards/wsk/tkl30/config.h
index 8b12e346b6..2dae864ddb 100644
--- a/keyboards/wsk/tkl30/config.h
+++ b/keyboards/wsk/tkl30/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D2, B5, F4 }
-#define MATRIX_COL_PINS { D3, D1, D0, D4, F7, C6, B1, D7, B3, E6, B2, B4, B6, F6, E5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/wsk/tkl30/info.json b/keyboards/wsk/tkl30/info.json
index b210528ba0..b9dfc3d58a 100644
--- a/keyboards/wsk/tkl30/info.json
+++ b/keyboards/wsk/tkl30/info.json
@@ -8,11 +8,68 @@
         "pid": "0x0B7F",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D1", "D0", "D4", "F7", "C6", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "F6", "E5"],
+        "rows": ["D2", "B5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Tab", "x":0, "y":0.25, "w":1.5}, {"label":"Q", "x":1.5, "y":0.25}, {"label":"W", "x":2.5, "y":0.25}, {"label":"E", "x":3.5, "y":0.25}, {"label":"R", "x":4.5, "y":0.25}, {"label":"T", "x":5.5, "y":0.25}, {"label":"Y", "x":6.5, "y":0.25}, {"label":"U", "x":7.5, "y":0.25}, {"label":"I", "x":8.5, "y":0.25}, {"label":"O", "x":9.5, "y":0.25}, {"label":"P", "x":10.5, "y":0.25}, {"label":"{", "x":11.5, "y":0.25}, {"label":"}", "x":12.5, "y":0.25}, {"label":"|", "x":13.5, "y":0.25, "w":1.5}, {"label":"Ctrl", "x":0, "y":1.25, "w":1.75}, {"label":"A", "x":1.75, "y":1.25}, {"label":"S", "x":2.75, "y":1.25}, {"label":"D", "x":3.75, "y":1.25}, {"label":"F", "x":4.75, "y":1.25}, {"label":"G", "x":5.75, "y":1.25}, {"label":"H", "x":6.75, "y":1.25}, {"label":"J", "x":7.75, "y":1.25}, {"label":"K", "x":8.75, "y":1.25}, {"label":"L", "x":9.75, "y":1.25}, {"label":":", "x":10.75, "y":1.25}, {"label":"\"", "x":11.75, "y":1.25}, {"label":"Enter", "x":12.75, "y":1.25, "w":2.25}, {"label":"\u2191", "x":16.25, "y":1.25}, {"label":"Shift", "x":0, "y":2.25, "w":1.25}, {"label":"Alt", "x":1.25, "y":2.25}, {"label":"Z", "x":2.25, "y":2.25}, {"label":"X", "x":3.25, "y":2.25}, {"label":"C", "x":4.25, "y":2.25}, {"label":"V", "x":5.25, "y":2.25}, {"x":6.25, "y":2.25, "w":2}, {"label":"B", "x":8.25, "y":2.25}, {"label":"N", "x":9.25, "y":2.25}, {"label":"M", "x":10.25, "y":2.25}, {"label":"<", "x":11.25, "y":2.25}, {"label":">", "x":12.25, "y":2.25}, {"label":"Fn", "x":13.25, "y":2.25, "w":1.75}, {"label":"\u2190", "x":15.25, "y":2.25}, {"label":"\u2193", "x":16.25, "y":2.25}, {"label":"\u2192", "x":17.25, "y":2.25}]
+            "layout": [
+                {"x":0, "y":0, "w":1.5},
+                {"x":1.5, "y":0},
+                {"x":2.5, "y":0},
+                {"x":3.5, "y":0},
+                {"x":4.5, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.5, "y":0},
+                {"x":10.5, "y":0},
+                {"x":11.5, "y":0},
+                {"x":12.5, "y":0},
+                {"x":13.5, "y":0, "w":1.5},
+
+                {"x":0, "y":1, "w":1.75},
+                {"x":1.75, "y":1},
+                {"x":2.75, "y":1},
+                {"x":3.75, "y":1},
+                {"x":4.75, "y":1},
+                {"x":5.75, "y":1},
+                {"x":6.75, "y":1},
+                {"x":7.75, "y":1},
+                {"x":8.75, "y":1},
+                {"x":9.75, "y":1},
+                {"x":10.75, "y":1},
+                {"x":11.75, "y":1},
+                {"x":12.75, "y":1, "w":2.25},
+
+                {"x":16.25, "y":1},
+
+                {"x":0, "y":2, "w":1.25},
+                {"x":1.25, "y":2},
+                {"x":2.25, "y":2},
+                {"x":3.25, "y":2},
+                {"x":4.25, "y":2},
+                {"x":5.25, "y":2},
+                {"x":6.25, "y":2, "w":2},
+                {"x":8.25, "y":2},
+                {"x":9.25, "y":2},
+                {"x":10.25, "y":2},
+                {"x":11.25, "y":2},
+                {"x":12.25, "y":2},
+                {"x":13.25, "y":2, "w":1.75},
+
+                {"x":15.25, "y":2},
+                {"x":16.25, "y":2},
+                {"x":17.25, "y":2}
+            ]
         }
     }
 }
diff --git a/keyboards/wsk/tkl30/tkl30.c b/keyboards/wsk/tkl30/tkl30.c
deleted file mode 100644
index b25dc56a95..0000000000
--- a/keyboards/wsk/tkl30/tkl30.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tkl30.h"
diff --git a/keyboards/wuque/creek70/config.h b/keyboards/wuque/creek70/config.h
index 4f17871ab0..61a472d2fb 100644
--- a/keyboards/wuque/creek70/config.h
+++ b/keyboards/wuque/creek70/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 7
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -34,4 +32,3 @@
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/wuque/creek70/creek70.c b/keyboards/wuque/creek70/creek70.c
deleted file mode 100644
index f6ea64ee33..0000000000
--- a/keyboards/wuque/creek70/creek70.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2023 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "creek70.h"
diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/info.json
index e03b4df35f..4760e16d6b 100644
--- a/keyboards/wuque/creek70/info.json
+++ b/keyboards/wuque/creek70/info.json
@@ -45,6 +45,9 @@
     "caps_lock": "F6",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "D0"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h
index 45f7843698..9ca2e18c52 100644
--- a/keyboards/wuque/ikki68/config.h
+++ b/keyboards/wuque/ikki68/config.h
@@ -17,20 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
-#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6,F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 8
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -48,4 +40,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/wuque/ikki68/ikki68.c b/keyboards/wuque/ikki68/ikki68.c
index 57aa7bf570..a61ddf3a56 100644
--- a/keyboards/wuque/ikki68/ikki68.c
+++ b/keyboards/wuque/ikki68/ikki68.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ikki68.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     setPinOutput(C6);
diff --git a/keyboards/wuque/ikki68/ikki68.h b/keyboards/wuque/ikki68/ikki68.h
deleted file mode 100644
index 3210748914..0000000000
--- a/keyboards/wuque/ikki68/ikki68.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 wuquestudio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_68_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E,        K0F, K0G, \
-    K10,   K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      K1F, K1G, \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,                    \
-    K31,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,            K3F,      \
-    K40,  K41,  K43,              K46,                K4A,  K4B,  K4D,      K4E, K4F, K4G  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E,   K0F,   K0G   }, \
-    { K10,   KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   KC_NO, K3F,   KC_NO }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   KC_NO, K4D,   K4E,   K4F,   K4G   }, \
-}
diff --git a/keyboards/wuque/ikki68/info.json b/keyboards/wuque/ikki68/info.json
index 4cdf46a99a..5de436ac17 100644
--- a/keyboards/wuque/ikki68/info.json
+++ b/keyboards/wuque/ikki68/info.json
@@ -8,80 +8,95 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["68_ansi"],
     "layouts": {
         "LAYOUT_68_ansi": {
             "layout": [
-                {"label":"K00 (B0,D1)", "x":0, "y":0},
-                {"label":"K01 (B0,D0)", "x":1, "y":0},
-                {"label":"K02 (B0,D2)", "x":2, "y":0},
-                {"label":"K03 (B0,D3)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,D4)", "x":5, "y":0},
-                {"label":"K06 (B0,D6)", "x":6, "y":0},
-                {"label":"K07 (B0,D7)", "x":7, "y":0},
-                {"label":"K08 (B0,B4)", "x":8, "y":0},
-                {"label":"K09 (B0,B5)", "x":9, "y":0},
-                {"label":"K0A (B0,F0)", "x":10, "y":0},
-                {"label":"K0B (B0,F1)", "x":11, "y":0},
-                {"label":"K0C (B0,B6)", "x":12, "y":0},
-                {"label":"K0E (B0,F5)", "x":13, "y":0, "w":2},
-                {"label":"K0F (B0,F6)", "x":15.5, "y":0},
-                {"label":"K0G (B0,F7)", "x":16.5, "y":0},
-                {"label":"K10 (B1,D1)", "x":0, "y":1, "w":1.5},
-                {"label":"K12 (B1,D2)", "x":1.5, "y":1},
-                {"label":"K13 (B1,D3)", "x":2.5, "y":1},
-                {"label":"K14 (B1,D5)", "x":3.5, "y":1},
-                {"label":"K15 (B1,D4)", "x":4.5, "y":1},
-                {"label":"K16 (B1,D6)", "x":5.5, "y":1},
-                {"label":"K17 (B1,D7)", "x":6.5, "y":1},
-                {"label":"K18 (B1,B4)", "x":7.5, "y":1},
-                {"label":"K19 (B1,B5)", "x":8.5, "y":1},
-                {"label":"K1A (B1,F0)", "x":9.5, "y":1},
-                {"label":"K1B (B1,F1)", "x":10.5, "y":1},
-                {"label":"K1C (B1,B6)", "x":11.5, "y":1},
-                {"label":"K1D (B1,F4)", "x":12.5, "y":1},
-                {"label":"K1E (B1,F5)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1F (B1,F6)", "x":15.5, "y":1},
-                {"label":"K1G (B1,F7)", "x":16.5, "y":1},
-                {"label":"K20 (B2,D1)", "x":0, "y":2, "w":1.75},
-                {"label":"K22 (B2,D2)", "x":1.75, "y":2},
-                {"label":"K23 (B2,D3)", "x":2.75, "y":2},
-                {"label":"K24 (B2,D5)", "x":3.75, "y":2},
-                {"label":"K25 (B2,D4)", "x":4.75, "y":2},
-                {"label":"K26 (B2,D6)", "x":5.75, "y":2},
-                {"label":"K27 (B2,D7)", "x":6.75, "y":2},
-                {"label":"K28 (B2,B4)", "x":7.75, "y":2},
-                {"label":"K29 (B2,B5)", "x":8.75, "y":2},
-                {"label":"K2A (B2,F0)", "x":9.75, "y":2},
-                {"label":"K2B (B2,F1)", "x":10.75, "y":2},
-                {"label":"K2C (B2,B6)", "x":11.75, "y":2},
-                {"label":"K2D (B2,F4)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K31 (B3,D0)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (B3,D2)", "x":2.25, "y":3},
-                {"label":"K33 (B3,D3)", "x":3.25, "y":3},
-                {"label":"K34 (B3,D5)", "x":4.25, "y":3},
-                {"label":"K35 (B3,D4)", "x":5.25, "y":3},
-                {"label":"K36 (B3,D6)", "x":6.25, "y":3},
-                {"label":"K37 (B3,D7)", "x":7.25, "y":3},
-                {"label":"K38 (B3,B4)", "x":8.25, "y":3},
-                {"label":"K39 (B3,B5)", "x":9.25, "y":3},
-                {"label":"K3A (B3,F0)", "x":10.25, "y":3},
-                {"label":"K3B (B3,F1)", "x":11.25, "y":3},
-                {"label":"K3D (B3,F4)", "x":12.25, "y":3, "w":2.75},
-                {"label":"K3F (B3,F6)", "x":15.5, "y":3},
-                {"label":"K40 (E6,D1)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (E6,D0)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K43 (E6,D3)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (E6,F0)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (E6,F1)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4D (E6,F4)", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E (E6,F5)", "x":14.5, "y":4},
-                {"label":"K4F (E6,F6)", "x":15.5, "y":4},
-                {"label":"K4G (E6,F7)", "x":16.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "x": 16.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "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": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 15], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 14.5, "y": 4},
+                {"matrix": [4, 15], "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "x": 16.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h
index 85a6ecf974..19720b3bb4 100644
--- a/keyboards/wuque/ikki68_aurora/config.h
+++ b/keyboards/wuque/ikki68_aurora/config.h
@@ -17,20 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, F0, F1, E6, B5, B4, D7, D6, D4, F4, F5, F6 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 20
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -48,4 +40,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/wuque/ikki68_aurora/ikki68_aurora.c b/keyboards/wuque/ikki68_aurora/ikki68_aurora.c
deleted file mode 100644
index 8e4e4e5889..0000000000
--- a/keyboards/wuque/ikki68_aurora/ikki68_aurora.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 wuquestudio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ikki68_aurora.h"
diff --git a/keyboards/wuque/ikki68_aurora/ikki68_aurora.h b/keyboards/wuque/ikki68_aurora/ikki68_aurora.h
deleted file mode 100644
index ad08c7b148..0000000000
--- a/keyboards/wuque/ikki68_aurora/ikki68_aurora.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* Copyright 2021 wuquestudio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-/* Standard Arrangement
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ │0e │0f │        ISO
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┤      ┌─────�
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ │1e │1f │      │1d   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┘   ┌──┴�    │
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │             │2c │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───�       └───┴────┘
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │ │3e │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴─┬─┴─┼───┼───�
- * │40  │41  │42  │44      │46  │48        │4a  │4b  │4c  │  │4d │4e │4f │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┘  └───┴───┴───┘
- */
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,   K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C,                  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,        K3E,      \
-    K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C,        K4D, K4E, K4F  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, KC_NO  }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   KC_NO  }, \
-    { K40,   K41,   K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E,   K4F    }, \
-}
-
-
-/* LAYOUT_68_ansi
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ │1e │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┘
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───�
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │ │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬──┬─┴─┼───┼───�
- * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘  └───┴───┴───┘
- */
-#define LAYOUT_68_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C,             \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,   K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C,   K4D, K4E, K4F  \
-) { \
-    { K00,   K01,    K02,   K03,    K04,    K05,   K06,   K07,   K08,    K09,   K0A,   K0B,   K0C,   K0D,    K0E,   K0F    }, \
-    { K10,   K11,    K12,   K13,    K14,    K15,   K16,   K17,   K18,    K19,   K1A,   K1B,   K1C,   K1D,    K1E,   K1F    }, \
-    { K20,   K21,    K22,   K23,    K24,    K25,   K26,   K27,   K28,    K29,   K2A,   K2B,   K2C,   KC_NO,  KC_NO, KC_NO  }, \
-    { K30,   KC_NO,  K32,   K33,    K34,    K35,   K36,   K37,   K38,    K39,   K3A,   K3B,   K3C,   KC_NO,  K3E,   KC_NO  }, \
-    { K40,   K41,    K42,   KC_NO,  KC_NO,  KC_NO, K46,   KC_NO, KC_NO,  KC_NO, K4A,   K4B,   K4C,   K4D,    K4E,   K4F    }, \
-}
-
-
-/* LAYOUT_68_ansi_split_lshift
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ │1e │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┘
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───�
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │ │3e │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬──┬─┴─┼───┼───�
- * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘  └───┴───┴───┘
- */
-#define LAYOUT_68_ansi_split_lshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C,             \
-    K30, k31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,   K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C,   K4D, K4E, K4F  \
-) { \
-    { K00,   K01,    K02,   K03,    K04,    K05,   K06,   K07,   K08,    K09,   K0A,   K0B,   K0C,   K0D,    K0E,   K0F    }, \
-    { K10,   K11,    K12,   K13,    K14,    K15,   K16,   K17,   K18,    K19,   K1A,   K1B,   K1C,   K1D,    K1E,   K1F    }, \
-    { K20,   K21,    K22,   K23,    K24,    K25,   K26,   K27,   K28,    K29,   K2A,   K2B,   K2C,   KC_NO,  KC_NO, KC_NO  }, \
-    { K30,   k31,    K32,   K33,    K34,    K35,   K36,   K37,   K38,    K39,   K3A,   K3B,   K3C,   KC_NO,  K3E,   KC_NO  }, \
-    { K40,   K41,    K42,   KC_NO,  KC_NO,  KC_NO, K46,   KC_NO, KC_NO,  KC_NO, K4A,   K4B,   K4C,   K4D,    K4E,   K4F    }, \
-}
-
-
-/* LAYOUT_68_ansi_split_rshift
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ │1e │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┘
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───�
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │ │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴─┬─┴─┼───┼───�
- * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘  └───┴───┴───┘
- */
-#define LAYOUT_68_ansi_split_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C,             \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,   K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C,   K4D, K4E, K4F  \
-) { \
-    { K00,   K01,    K02,   K03,    K04,    K05,   K06,   K07,   K08,    K09,   K0A,   K0B,   K0C,   K0D,    K0E,   K0F    }, \
-    { K10,   K11,    K12,   K13,    K14,    K15,   K16,   K17,   K18,    K19,   K1A,   K1B,   K1C,   K1D,    K1E,   K1F    }, \
-    { K20,   K21,    K22,   K23,    K24,    K25,   K26,   K27,   K28,    K29,   K2A,   K2B,   K2C,   KC_NO,  KC_NO, KC_NO  }, \
-    { K30,   KC_NO,  K32,   K33,    K34,    K35,   K36,   K37,   K38,    K39,   K3A,   K3B,   K3C,   K3D,    K3E,   KC_NO  }, \
-    { K40,   K41,    K42,   KC_NO,  KC_NO,  KC_NO, K46,   KC_NO, KC_NO,  KC_NO, K4A,   K4B,   K4C,   K4D,    K4E,   K4F    }, \
-}
-
-
-/* LAYOUT_68_ansi_split_bs
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───� ┌───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ │1e │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┘
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───�
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │ │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬──┬─┴─┼───┼───�
- * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘  └───┴───┴───┘
- */
-#define LAYOUT_68_ansi_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,   K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C,                  \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,        K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C,        K4D, K4E, K4F  \
-) { \
-    { K00,   K01,    K02,   K03,    K04,    K05,   K06,   K07,   K08,    K09,   K0A,   K0B,   K0C,   K0D,    K0E,   K0F    }, \
-    { K10,   K11,    K12,   K13,    K14,    K15,   K16,   K17,   K18,    K19,   K1A,   K1B,   K1C,   K1D,    K1E,   K1F    }, \
-    { K20,   K21,    K22,   K23,    K24,    K25,   K26,   K27,   K28,    K29,   K2A,   K2B,   K2C,   K2D,    KC_NO, KC_NO  }, \
-    { K30,   KC_NO,  K32,   K33,    K34,    K35,   K36,   K37,   K38,    K39,   K3A,   K3B,   K3C,   KC_NO,  K3E,   KC_NO  }, \
-    { K40,   K41,    K42,   KC_NO,  KC_NO,  KC_NO, K46,   KC_NO, KC_NO,  KC_NO, K4A,   K4B,   K4C,   K4D,    K4E,   K4F    }, \
-}
-
-
-/* LAYOUT_68_iso
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ │1e │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    │ └───┴───┘
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ ┌───�
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │ │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬──┬─┴─┼───┼───�
- * │40  │41  │42  │46                      │4a  │4b  │4c  │  │4d │4e │4f │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘  └───┴───┴───┘
- */
-#define LAYOUT_68_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,        K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D,             \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,   K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C,   K4D, K4E, K4F  \
-) { \
-    { K00,   K01,    K02,   K03,    K04,    K05,   K06,   K07,   K08,    K09,   K0A,   K0B,   K0C,   K0D,    K0E,   K0F    }, \
-    { K10,   K11,    K12,   K13,    K14,    K15,   K16,   K17,   K18,    K19,   K1A,   K1B,   K1C,   K1D,    K1E,   K1F    }, \
-    { K20,   K21,    K22,   K23,    K24,    K25,   K26,   K27,   K28,    K29,   K2A,   K2B,   K2C,   KC_NO,  KC_NO, KC_NO  }, \
-    { K30,   KC_NO,  K32,   K33,    K34,    K35,   K36,   K37,   K38,    K39,   K3A,   K3B,   K3C,   KC_NO,  K3E,   KC_NO  }, \
-    { K40,   K41,    K42,   KC_NO,  KC_NO,  KC_NO, K46,   KC_NO, KC_NO,  KC_NO, K4A,   K4B,   K4C,   K4D,    K4E,   K4F    }, \
-}
-
-
-/* LAYOUT_68_ansi_split_space
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────� ┌───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ │0e │0f │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │ │1e │1f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┘
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───�
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │ │3e │
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬──┬─┴─┼───┼───�
- * │40  │41  │42  │44      │46  │48        │4a  │4b  │4c  │  │4d │4e │4f │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┘  └───┴───┴───┘
- */
-#define LAYOUT_68_ansi_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C,             \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,   K3E,      \
-    K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C,   K4D, K4E, K4F  \
-) { \
-    { K00,   K01,    K02,   K03,    K04,    K05,   K06,   K07,   K08,    K09,   K0A,   K0B,   K0C,   K0D,    K0E,   K0F    }, \
-    { K10,   K11,    K12,   K13,    K14,    K15,   K16,   K17,   K18,    K19,   K1A,   K1B,   K1C,   K1D,    K1E,   K1F    }, \
-    { K20,   K21,    K22,   K23,    K24,    K25,   K26,   K27,   K28,    K29,   K2A,   K2B,   K2C,   KC_NO,  KC_NO, KC_NO  }, \
-    { K30,   KC_NO,  K32,   K33,    K34,    K35,   K36,   K37,   K38,    K39,   K3A,   K3B,   K3C,   KC_NO,  K3E,   KC_NO  }, \
-    { K40,   K41,    K42,   KC_NO,  K44,    KC_NO, K46,   KC_NO, K48,    KC_NO, K4A,   K4B,   K4C,   K4D,    K4E,   K4F    }, \
-}
diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json
index bf47f85a75..a1d965a569 100644
--- a/keyboards/wuque/ikki68_aurora/info.json
+++ b/keyboards/wuque/ikki68_aurora/info.json
@@ -8,553 +8,589 @@
         "pid": "0x0011",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0", "F0", "F1", "E6", "B5", "B4", "D7", "D6", "D4", "F4", "F5", "F6"],
+        "rows": ["B7", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F7",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_68_ansi": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 0 },
-                { "label": "PageUp", "x": 16.25, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 1 },
-                { "label": "PageDown", "x": 16.25, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "\u2191", "x": 15.25, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 4 },
-                { "label": "\u2193", "x": 15.25, "y": 4 },
-                { "label": "\u2192", "x": 16.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0 },
-                { "label": "Backspace", "x": 14, "y": 0 },
-                { "label": "Insert", "x": 15.25, "y": 0 },
-                { "label": "PageUp", "x": 16.25, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "\\", "x": 13.5,"y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 1 },
-                { "label": "PageDown", "x": 16.25, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-
-                { "label": "Shift1", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift1", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 3},
-                { "label": "\u2191", "x": 15.25, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 2.25 },
-                { "x": 6, "y": 4, "w": 1.25 },
-                { "x": 7.25, "y": 4, "w": 2.75 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 4 },
-                { "label": "\u2193", "x": 15.25, "y": 4 },
-                { "label": "\u2192", "x": 16.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_ansi_split_lshift": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 0 },
-                { "label": "PageUp", "x": 16.25, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 1 },
-                { "label": "PageDown", "x": 16.25, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-
-                { "label": "Shift1", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "\u2191", "x": 15.25, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 4 },
-                { "label": "\u2193", "x": 15.25, "y": 4 },
-                { "label": "\u2192", "x": 16.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_ansi_split_rshift": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 0 },
-                { "label": "PageUp", "x": 16.25, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 1 },
-                { "label": "PageDown", "x": 16.25, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift1", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 3},
-                { "label": "\u2191", "x": 15.25, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 4 },
-                { "label": "\u2193", "x": 15.25, "y": 4 },
-                { "label": "\u2192", "x": 16.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_ansi_split_bs": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace1", "x": 13, "y": 0},
-                { "label": "Backspace2", "x": 14, "y": 0},
-                { "label": "Insert", "x": 15.25, "y": 0 },
-                { "label": "PageUp", "x": 16.25, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 1 },
-                { "label": "PageDown", "x": 16.25, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "\u2191", "x": 15.25, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 4 },
-                { "label": "\u2193", "x": 15.25, "y": 4 },
-                { "label": "\u2192", "x": 16.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_iso": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 0 },
-                { "label": "PageUp", "x": 16.25, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "Delete", "x": 15.25, "y": 1 },
-                { "label": "PageDown", "x": 16.25, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "\\", "x": 12.75,"y": 2 },
-                { "label": "ISO", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "\u2191", "x": 15.25, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 4 },
-                { "label": "\u2193", "x": 15.25, "y": 4 },
-                { "label": "\u2192", "x": 16.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
         "LAYOUT_68_ansi_split_space": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 0 },
-                { "label": "PageUp", "x": 16.25, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 1 },
-                { "label": "PageDown", "x": 16.25, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-                { "label": "\u2191", "x": 15.25, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 2.25 },
-                { "x": 6, "y": 4, "w": 1.25 },
-                { "x": 7.25, "y": 4, "w": 2.75 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 4 },
-                { "label": "\u2193", "x": 15.25, "y": 4 },
-                { "label": "\u2192", "x": 16.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h
index 8d9a74f5aa..c35fac65d6 100644
--- a/keyboards/wuque/mammoth20x/config.h
+++ b/keyboards/wuque/mammoth20x/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D5, F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B0, B1, E6, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/wuque/mammoth20x/info.json b/keyboards/wuque/mammoth20x/info.json
index b251951bec..3c0c0e29b8 100644
--- a/keyboards/wuque/mammoth20x/info.json
+++ b/keyboards/wuque/mammoth20x/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "E6", "F7"],
+        "rows": ["D5", "F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
@@ -21,34 +26,34 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "Pause", "x": 1, "y": 0 },
-                { "label": "Delete", "x": 2, "y": 0 },
-                { "label": "LeftEncode", "x": 3, "y": 0, "w": 0.5 },
-                { "label": "EncoderClick", "x": 3.5, "y": 0 },
-                { "label": "RightEncode", "x": 4.5, "y": 0, "w" : 0.5 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [2, 3], "x": 3, "y": 0, "w": 0.5},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [4, 3], "x": 4.5, "y": 0, "w": 0.5},
 
-                { "label": "Num", "x": 0, "y": 1 },
-                { "label": "/", "x": 1, "y": 1 },
-                { "label": "*", "x": 2, "y": 1 },
-                { "label": "-", "x": 3, "y": 1 },
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                { "label": "7", "x": 0, "y": 2 },
-                { "label": "8", "x": 1, "y": 2 },
-                { "label": "9", "x": 2, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
 
-                { "label": "4", "x": 0, "y": 3 },
-                { "label": "5", "x": 1, "y": 3 },
-                { "label": "6", "x": 2, "y": 3 },
-                { "label": "+", "x": 3, "y": 2, "h": 2 },
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 2, "h": 2},
 
-                { "label": "1", "x": 0, "y": 4 },
-                { "label": "2", "x": 1, "y": 4 },
-                { "label": "3", "x": 2, "y": 4 },
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
 
-                { "label": "0", "x": 0, "y": 5, "w": 2 },
-                { "label": ".", "x": 2, "y": 5 },
-                { "label": "Enter", "x": 3, "y": 4,"h":2 }
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 4, "h": 2}
             ]
         }
     }
diff --git a/keyboards/wuque/mammoth20x/mammoth20x.c b/keyboards/wuque/mammoth20x/mammoth20x.c
index 6cc1dee21a..eeaea79c71 100644
--- a/keyboards/wuque/mammoth20x/mammoth20x.c
+++ b/keyboards/wuque/mammoth20x/mammoth20x.c
@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mammoth20x.h"
-
+#include "quantum.h"
 
 static uint8_t encoder_state[NUM_ENCODERS] = {0};
 static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
@@ -30,7 +29,9 @@ void encoder_action_unregister(void)
             keyevent_t encoder_event = (keyevent_t){
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)};
+                .time = timer_read(),
+                .type = KEY_EVENT
+            };
             encoder_state[index] = 0;
             action_exec(encoder_event);
         }
@@ -41,7 +42,9 @@ void encoder_action_register(uint8_t index, bool clockwise)
     keyevent_t encoder_event = (keyevent_t){
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)};
+        .time = timer_read(),
+        .type = KEY_EVENT
+    };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
 }
diff --git a/keyboards/wuque/mammoth20x/mammoth20x.h b/keyboards/wuque/mammoth20x/mammoth20x.h
deleted file mode 100644
index 408788bf60..0000000000
--- a/keyboards/wuque/mammoth20x/mammoth20x.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 wuquestudio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K23, K03, K43, \
-    K10, K11, K12, K13, \
-    K20, K21, K22,      \
-    K30, K31, K32, K33, \
-    K40, K41, K42,      \
-    K50,      K52, K53  \
-) { \
-    { K00,   K01,   K02,   K03   }, \
-    { K10,   K11,   K12,   K13   }, \
-    { K20,   K21,   K22,   K23   }, \
-    { K30,   K31,   K32,   K33   }, \
-    { K40,   K41,   K42,   K43   }, \
-    { K50,   KC_NO, K52,   K53   }, \
-}
diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h
index 55702e3352..6b0d17be5c 100644
--- a/keyboards/wuque/mammoth75x/config.h
+++ b/keyboards/wuque/mammoth75x/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, C7, D2, F7, D1, D0 }
-#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, E6, F0, F1, F4, F5, F6, C6, B7, B3 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/wuque/mammoth75x/info.json b/keyboards/wuque/mammoth75x/info.json
index b668948f46..ef48587375 100644
--- a/keyboards/wuque/mammoth75x/info.json
+++ b/keyboards/wuque/mammoth75x/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "E6", "F0", "F1", "F4", "F5", "F6", "C6", "B7", "B3"],
+        "rows": ["B0", "C7", "D2", "F7", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B1", "resolution": 2}
@@ -22,566 +27,584 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"EncoderRotateL", "x":15.65, "y":0.125, "w":0.6, "h":0.5},
-                {"label":"EncoderClick", "x":15.75, "y":0.625},
-                {"label":"EncoderRotateR", "x":16.25, "y":0.125, "w":0.6, "h":0.5},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-                {"label":"7", "x":7, "y":1.25},
-                {"label":"8", "x":8, "y":1.25},
-                {"label":"9", "x":9, "y":1.25},
-                {"label":"0", "x":10, "y":1.25},
-                {"label":"-", "x":11, "y":1.25},
-                {"label":"=", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25},
-                {"label":"Backspace1", "x":14, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[", "x":11.5, "y":2.25},
-                {"label":"]", "x":12.5, "y":2.25},
-                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Home", "x":15.25, "y":2.25},
-                {"label":"PageUp", "x":16.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";", "x":10.75, "y":3.25},
-                {"label":"'", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"End", "x":15.25, "y":3.25},
-                {"label":"PageDown", "x":16.25, "y":3.25},
-
-                {"label":"Shift1", "x":0, "y":4.25, "w":1.25},
-                {"label":"Shift2", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",", "x":9.25, "y":4.25},
-                {"label":".", "x":10.25, "y":4.25},
-                {"label":"/", "x":11.25, "y":4.25},
-                {"label":"Shift1", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Shift2", "x":14, "y":4.25},
-                {"label":"\u2191", "x":15.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":2.25},
-                {"label":"Space", "x":6, "y":5.25, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5.25, "w":2.75},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":14.25, "y":5.5},
-                {"label":"\u2193", "x":15.25, "y":5.5},
-                {"label":"\u2192", "x":16.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [5, 3], "x": 15.65, "y": 0.125, "w": 0.6, "h": 0.5},
+                {"matrix": [0, 14], "x": 15.75, "y": 0.625},
+                {"matrix": [5, 5], "x": 16.25, "y": 0.125, "w": 0.6, "h": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 6], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5}
             ]
         },
         "LAYOUT_75_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"EncoderClick", "x":15.75, "y":0.625},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-                {"label":"7", "x":7, "y":1.25},
-                {"label":"8", "x":8, "y":1.25},
-                {"label":"9", "x":9, "y":1.25},
-                {"label":"0", "x":10, "y":1.25},
-                {"label":"-", "x":11, "y":1.25},
-                {"label":"=", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[", "x":11.5, "y":2.25},
-                {"label":"]", "x":12.5, "y":2.25},
-                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Home", "x":15.25, "y":2.25},
-                {"label":"PageUp", "x":16.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";", "x":10.75, "y":3.25},
-                {"label":"'", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"End", "x":15.25, "y":3.25},
-                {"label":"PageDown", "x":16.25, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",", "x":9.25, "y":4.25},
-                {"label":".", "x":10.25, "y":4.25},
-                {"label":"/", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":15.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":14.25, "y":5.5},
-                {"label":"\u2193", "x":15.25, "y":5.5},
-                {"label":"\u2192", "x":16.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.75, "y": 0.625},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5}
             ]
         },
         "LAYOUT_75_ansi_split_lshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"EncoderClick", "x":15.75, "y":0.625},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-                {"label":"7", "x":7, "y":1.25},
-                {"label":"8", "x":8, "y":1.25},
-                {"label":"9", "x":9, "y":1.25},
-                {"label":"0", "x":10, "y":1.25},
-                {"label":"-", "x":11, "y":1.25},
-                {"label":"=", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[", "x":11.5, "y":2.25},
-                {"label":"]", "x":12.5, "y":2.25},
-                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Home", "x":15.25, "y":2.25},
-                {"label":"PageUp", "x":16.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";", "x":10.75, "y":3.25},
-                {"label":"'", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"End", "x":15.25, "y":3.25},
-                {"label":"PageDown", "x":16.25, "y":3.25},
-
-                {"label":"Shift1", "x":0, "y":4.25, "w":1.25},
-                {"label":"Shift2", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",", "x":9.25, "y":4.25},
-                {"label":".", "x":10.25, "y":4.25},
-                {"label":"/", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":15.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":14.25, "y":5.5},
-                {"label":"\u2193", "x":15.25, "y":5.5},
-                {"label":"\u2192", "x":16.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.75, "y": 0.625},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5}
             ]
         },
         "LAYOUT_75_ansi_split_rshift": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"EncoderClick", "x":15.75, "y":0.625},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-                {"label":"7", "x":7, "y":1.25},
-                {"label":"8", "x":8, "y":1.25},
-                {"label":"9", "x":9, "y":1.25},
-                {"label":"0", "x":10, "y":1.25},
-                {"label":"-", "x":11, "y":1.25},
-                {"label":"=", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[", "x":11.5, "y":2.25},
-                {"label":"]", "x":12.5, "y":2.25},
-                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Home", "x":15.25, "y":2.25},
-                {"label":"PageUp", "x":16.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";", "x":10.75, "y":3.25},
-                {"label":"'", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"End", "x":15.25, "y":3.25},
-                {"label":"PageDown", "x":16.25, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",", "x":9.25, "y":4.25},
-                {"label":".", "x":10.25, "y":4.25},
-                {"label":"/", "x":11.25, "y":4.25},
-                {"label":"Shift1", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Shift2", "x":14, "y":4.25},
-                {"label":"\u2191", "x":15.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":14.25, "y":5.5},
-                {"label":"\u2193", "x":15.25, "y":5.5},
-                {"label":"\u2192", "x":16.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.75, "y": 0.625},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5}
             ]
         },
         "LAYOUT_75_ansi_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"EncoderClick", "x":15.75, "y":0.625},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-                {"label":"7", "x":7, "y":1.25},
-                {"label":"8", "x":8, "y":1.25},
-                {"label":"9", "x":9, "y":1.25},
-                {"label":"0", "x":10, "y":1.25},
-                {"label":"-", "x":11, "y":1.25},
-                {"label":"=", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[", "x":11.5, "y":2.25},
-                {"label":"]", "x":12.5, "y":2.25},
-                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Home", "x":15.25, "y":2.25},
-                {"label":"PageUp", "x":16.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";", "x":10.75, "y":3.25},
-                {"label":"'", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"Backspace1", "x":14, "y":1.25},
-                {"label":"End", "x":15.25, "y":3.25},
-                {"label":"PageDown", "x":16.25, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",", "x":9.25, "y":4.25},
-                {"label":".", "x":10.25, "y":4.25},
-                {"label":"/", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":15.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":14.25, "y":5.5},
-                {"label":"\u2193", "x":15.25, "y":5.5},
-                {"label":"\u2192", "x":16.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.75, "y": 0.625},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5}
             ]
         },
         "LAYOUT_75_ansi_split_space": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-                {"label":"EncoderClick", "x":15.75, "y":0.625},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-                {"label":"7", "x":7, "y":1.25},
-                {"label":"8", "x":8, "y":1.25},
-                {"label":"9", "x":9, "y":1.25},
-                {"label":"0", "x":10, "y":1.25},
-                {"label":"-", "x":11, "y":1.25},
-                {"label":"=", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[", "x":11.5, "y":2.25},
-                {"label":"]", "x":12.5, "y":2.25},
-                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Home", "x":15.25, "y":2.25},
-                {"label":"PageUp", "x":16.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";", "x":10.75, "y":3.25},
-                {"label":"'", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"End", "x":15.25, "y":3.25},
-                {"label":"PageDown", "x":16.25, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",", "x":9.25, "y":4.25},
-                {"label":".", "x":10.25, "y":4.25},
-                {"label":"/", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":15.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":2.25},
-                {"label":"Space", "x":6, "y":5.25, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5.25, "w":2.75},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":14.25, "y":5.5},
-                {"label":"\u2193", "x":15.25, "y":5.5},
-                {"label":"\u2192", "x":16.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.75, "y": 0.625},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 6], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/wuque/mammoth75x/mammoth75x.c b/keyboards/wuque/mammoth75x/mammoth75x.c
index c2bf2bbe37..3b2d995b7e 100644
--- a/keyboards/wuque/mammoth75x/mammoth75x.c
+++ b/keyboards/wuque/mammoth75x/mammoth75x.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mammoth75x.h"
+#include "quantum.h"
 
 #ifdef VIA_ENABLE
 static uint8_t encoder_state[NUM_ENCODERS] = {0};
@@ -30,7 +30,9 @@ void encoder_action_unregister(void)
             keyevent_t encoder_event = (keyevent_t){
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)};
+                .time = timer_read(),
+                .type = KEY_EVENT
+            };
             encoder_state[index] = 0;
             action_exec(encoder_event);
         }
@@ -41,7 +43,9 @@ void encoder_action_register(uint8_t index, bool clockwise)
     keyevent_t encoder_event = (keyevent_t){
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)};
+        .time = timer_read(),
+        .type = KEY_EVENT
+    };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
 }
@@ -57,11 +61,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise)
     encoder_action_register(index, clockwise);
     return true;
 };
-#else
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-	tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, 10);
-    return true;
-}
 #endif
-
diff --git a/keyboards/wuque/mammoth75x/mammoth75x.h b/keyboards/wuque/mammoth75x/mammoth75x.h
deleted file mode 100644
index 4c419474dc..0000000000
--- a/keyboards/wuque/mammoth75x/mammoth75x.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/* Copyright 2021 wuquestudio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-/* Standard Arrangement
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�     ◯
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ┌───┬───�
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   │ │2e │2f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┤
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │ │3e │3f │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ └───┴───┘
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │ ┌───�
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┘ │4e │
- * │50  │51  │52  │54      │56  │58        │5a  │5b  │5c  │  ┌───┼───┼───�
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┘  │5d │5e │5f │
- *                                                           └───┴───┴───┘
- */
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K53, K0E, K55, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,      K3E, K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4E,      \
-    K50, K51, K52,      K54,      K56,      K58,      K5A, K5B, K5C,      K5D, K5E, K5F  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F    }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   KC_NO  }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   KC_NO, K58,   KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F    }, \
-}
-
-
-/* LAYOUT_75_ansi
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�     ◯
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ┌───┬───�
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   │ │2e │2f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┤
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │ │3e │3f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ └───┴───┘
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │ ┌───�
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘ │4e │
- * │50  │51  │52  │56                      │5a  │5b  │5c  │  ┌───┼───┼───�
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘  │5d │5e │5f │
- *                                                           └───┴───┴───┘
- */
-#define LAYOUT_75_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,    K0E,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F    }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, K4E,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F    }, \
-}
-
-
-/* LAYOUT_75_ansi_split_lshift
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�     ◯
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ┌───┬───�
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   │ │2e │2f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┤
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │ │3e │3f │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ └───┴───┘
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │ ┌───�
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘ │4e │
- * │50  │51  │52  │56                      │5a  │5b  │5c  │  ┌───┼───┼───�
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘  │5d │5e │5f │
- *                                                           └───┴───┴───┘
- */
-#define LAYOUT_75_ansi_split_lshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,    K0E,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F    }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, K4E,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F    }, \
-}
-
-
-/* LAYOUT_75_ansi_split_rshift
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�     ◯
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ┌───┬───�
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   │ │2e │2f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┤
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │ │3e │3f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ └───┴───┘
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │ ┌───�
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┘ │4e │
- * │50  │51  │52  │56                      │5a  │5b  │5c  │  ┌───┼───┼───�
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘  │5d │5e │5f │
- *                                                           └───┴───┴───┘
- */
-#define LAYOUT_75_ansi_split_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,    K0E,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F    }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F    }, \
-}
-
-
-/* LAYOUT_75_ansi_split_bs
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�     ◯
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ┌───┬───�
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   │ │2e │2f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┤
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │ │3e │3f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ └───┴───┘
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │ ┌───�
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘ │4e │
- * │50  │51  │52  │56                      │5a  │5b  │5c  │  ┌───┼───┼───�
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘  │5d │5e │5f │
- *                                                           └───┴───┴───┘
- */
-#define LAYOUT_75_ansi_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,    K0E,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F    }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, K4E,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F    }, \
-}
-
-
-/* LAYOUT_75_ansi_split_space
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�     ◯
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ┌───┬───�
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   │ │2e │2f │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┤
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │ │3e │3f │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ └───┴───┘
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │ ┌───�
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬────┘ │4e │
- * │50  │51  │52  │54      │56  │58        │5a  │5b  │5c  │  ┌───┼───┼───�
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┘  │5d │5e │5f │
- *                                                           └───┴───┴───┘
- */
-#define LAYOUT_75_ansi_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,    K0E,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E,      \
-    K50, K51, K52,      K54,      K56,      K58,      K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   KC_NO  }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, KC_NO  }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   K3F    }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, K4E,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, K54,   KC_NO, K56,   KC_NO, K58,   KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F    }, \
-}
diff --git a/keyboards/wuque/promise87/ansi/ansi.c b/keyboards/wuque/promise87/ansi/ansi.c
deleted file mode 100644
index 8e20dfb751..0000000000
--- a/keyboards/wuque/promise87/ansi/ansi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ansi.h"
diff --git a/keyboards/wuque/promise87/ansi/ansi.h b/keyboards/wuque/promise87/ansi/ansi.h
deleted file mode 100644
index 24b8d69978..0000000000
--- a/keyboards/wuque/promise87/ansi/ansi.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/* Copyright 2022 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-/* Standard Arrangement
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │        ISO
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤      ┌─────�
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │      │2d   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴�    │
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │                │3c │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�       └───┴────┘
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───�
- * │50   │51 │52   │55         │56 │57         │5b   │5c │5d   ││5e │5f │5g │
- * └─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                        \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50, K51, K52,           K55, K56, K57,                K5B, K5C, K5D,        K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   K56,   K57,   KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_tsangan
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_iso_tsangan
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    │└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_iso_tsangan( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K2D,                 \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_tsangan_split_space
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├─────┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │51 │52   │55         │56 │57         │5b   │5c │5d   ││5e │5f │5g │
- * └─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_tsangan_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50, K51, K52,           K55, K56, K57,                K5B, K5C, K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   K56,   K57,   KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_tsangan_split_bs
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_tsangan_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                   \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,             K4F,       \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,        K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_tsangan_split_lshift
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_tsangan_split_lshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_tsangan_split_rshift
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_tsangan_split_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4F,       \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───�
- * │50   │51 │52   │56                         │5b   │5c │5d   ││5e │5f │5g │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                       \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D,        K5E, K5F, K5G  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
-}
diff --git a/keyboards/wuque/promise87/ansi/config.h b/keyboards/wuque/promise87/ansi/config.h
index e609117661..c9e7fa42fb 100644
--- a/keyboards/wuque/promise87/ansi/config.h
+++ b/keyboards/wuque/promise87/ansi/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 }
-#define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 1
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -34,4 +26,3 @@
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json
index cd9b8b4d63..6bb1b38a42 100644
--- a/keyboards/wuque/promise87/ansi/info.json
+++ b/keyboards/wuque/promise87/ansi/info.json
@@ -8,10 +8,18 @@
     "pid": "0x0005",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"],
+    "rows": ["B3", "B7", "B2", "F0", "D3", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "F6",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "D2"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layout_aliases": {
@@ -29,783 +37,855 @@
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25 },
-        { "label": "Backspace1", "x": 14, "y": 1.25 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-        { "label": "Shift2", "x": 1.25, "y": 4.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-        { "label": "Shift2", "x": 14, "y": 4.25 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 3 },
-        { "label": "Space", "x": 7, "y": 5.25, "w": 1 },
-        { "label": "Space", "x": 8, "y": 5.25, "w": 3 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
-        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25},
+        {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 3},
+        {"matrix": [5, 6], "x": 7, "y": 5.25},
+        {"matrix": [5, 7], "x": 8, "y": 5.25, "w": 3},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_tsangan": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
-        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_iso_tsangan": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "\\", "x": 12.75, "y": 3.25, "w": 1 },
-        { "label": "ISO", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
-        { "label": "\\", "x": 1.25, "y": 4.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
-        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+        {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_tsangan_split_space": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 3 },
-        { "label": "Space", "x": 7, "y": 5.25, "w": 1 },
-        { "label": "Space", "x": 8, "y": 5.25, "w": 3 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
-        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 3},
+        {"matrix": [5, 6], "x": 7, "y": 5.25},
+        {"matrix": [5, 7], "x": 8, "y": 5.25, "w": 3},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_tsangan_split_bs": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25 },
-        { "label": "Backspace1", "x": 14, "y": 1.25 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
-        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25},
+        {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_tsangan_split_lshift": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-        { "label": "Shift2", "x": 1.25, "y": 4.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
-        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_tsangan_split_rshift": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-        { "label": "Shift2", "x": 14, "y": 4.25 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
-        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25 },
-        { "label": "Backspace1", "x": 14, "y": 1.25 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-        { "label": "Shift2", "x": 14, "y": 4.25 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 },
-        { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25},
+        {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     }
   }
diff --git a/keyboards/wuque/promise87/wkl/config.h b/keyboards/wuque/promise87/wkl/config.h
index e609117661..c9e7fa42fb 100644
--- a/keyboards/wuque/promise87/wkl/config.h
+++ b/keyboards/wuque/promise87/wkl/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 }
-#define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 1
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -34,4 +26,3 @@
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json
index 0a0e3b0bc5..5cb4d7a5d0 100644
--- a/keyboards/wuque/promise87/wkl/info.json
+++ b/keyboards/wuque/promise87/wkl/info.json
@@ -8,10 +8,18 @@
     "pid": "0x0006",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"],
+    "rows": ["B3", "B7", "B2", "F0", "D3", "D0"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "F6",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "D2"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layout_aliases": {
@@ -26,767 +34,839 @@
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25 },
-        { "label": "Backspace1", "x": 14, "y": 1.25 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-        { "label": "Shift2", "x": 1.25, "y": 4.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-        { "label": "Shift2", "x": 14, "y": 4.25 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 3 },
-        { "label": "Space", "x": 7, "y": 5.25, "w": 1 },
-        { "label": "Space", "x": 8, "y": 5.25, "w": 3 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25},
+        {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 3},
+        {"matrix": [5, 6], "x": 7, "y": 5.25},
+        {"matrix": [5, 7], "x": 8, "y": 5.25, "w": 3},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_wkl": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_iso_wkl": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "\\", "x": 12.75, "y": 3.25, "w": 1 },
-        { "label": "ISO", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
-        { "label": "\\", "x": 1.25, "y": 4.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+        {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_wkl_split_space": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 3 },
-        { "label": "Space", "x": 7, "y": 5.25, "w": 1 },
-        { "label": "Space", "x": 8, "y": 5.25, "w": 3 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 3},
+        {"matrix": [5, 6], "x": 7, "y": 5.25},
+        {"matrix": [5, 7], "x": 8, "y": 5.25, "w": 3},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_wkl_split_bs": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25 },
-        { "label": "Backspace1", "x": 14, "y": 1.25 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25},
+        {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_wkl_split_lshift": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-        { "label": "Shift2", "x": 1.25, "y": 4.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_wkl_split_rshift": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-        { "label": "Shift2", "x": 14, "y": 4.25 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 1.25, "y": 0 },
-        { "label": "F2", "x": 2.25, "y": 0 },
-        { "label": "F3", "x": 3.25, "y": 0 },
-        { "label": "F4", "x": 4.25, "y": 0 },
-        { "label": "F5", "x": 5.5, "y": 0 },
-        { "label": "F6", "x": 6.5, "y": 0 },
-        { "label": "F7", "x": 7.5, "y": 0 },
-        { "label": "F8", "x": 8.5, "y": 0 },
-        { "label": "F9", "x": 9.75, "y": 0 },
-        { "label": "F10", "x": 10.75, "y": 0 },
-        { "label": "F11", "x": 11.75, "y": 0 },
-        { "label": "F12", "x": 12.75, "y": 0 },
-        { "label": "F13", "x": 14, "y": 0 },
-        { "label": "Print", "x": 15.25, "y": 0 },
-        { "label": "Scroll", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-
-        { "label": "~", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25 },
-        { "label": "Backspace1", "x": 14, "y": 1.25 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PageUp", "x": 17.25, "y": 1.25 },
-
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PageDown", "x": 17.25, "y": 2.25 },
-
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-        { "label": "Shift2", "x": 14, "y": 4.25 },
-        { "label": "\u2191", "x": 16.25, "y": 4.25 },
-
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "Space", "x": 4, "y": 5.25, "w": 7 },
-        { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
-        { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
-        { "label": "\u2190", "x": 15.25, "y": 5.25 },
-        { "label": "\u2193", "x": 16.25, "y": 5.25 },
-        { "label": "\u2192", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25},
+        {"matrix": [3, 13], "x": 14, "y": 1.25},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+        {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     }
   }
diff --git a/keyboards/wuque/promise87/wkl/wkl.c b/keyboards/wuque/promise87/wkl/wkl.c
deleted file mode 100644
index 6264f7b1d6..0000000000
--- a/keyboards/wuque/promise87/wkl/wkl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "wkl.h"
diff --git a/keyboards/wuque/promise87/wkl/wkl.h b/keyboards/wuque/promise87/wkl/wkl.h
deleted file mode 100644
index fa670967d5..0000000000
--- a/keyboards/wuque/promise87/wkl/wkl.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/* Copyright 2022 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-/* LAYOUT_all
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │        ISO
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤      ┌─────�
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │      │2d   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴�    │
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │                │3c │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�       └───┴────┘
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───�
- * │50   │   │52   │55         │56 │57         │5b   │   │5d   ││5e │5f │5g │
- * └─────┘   └─────┴───────────┴───┴───────────┴─────┘   └─────┘└───┴───┴───┘
- */
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                        \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
-    K50,      K52,           K55, K56, K57,                K5B,      K5D,        K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   KC_NO, K52,   KC_NO, KC_NO, K55,   K56,   K57,   KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_wkl
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │   │52   │56                         │5b   │   │5d   ││5e │5f │5g │
- * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50,      K52,                K56,                     K5B,      K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   KC_NO, K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_iso_wkl
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�    │└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │   │52   │56                         │5b   │   │5d   ││5e │5f │5g │
- * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_iso_wkl( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K2D,                 \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50,      K52,                K56,                     K5B,      K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   KC_NO, K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_wkl_split_space
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├─────┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │   │52   │55         │56 │57         │5b   │   │5d   ││5e │5f │5g │
- * └─────┘   └─────┴───────────┴───┴───────────┴─────┘   └─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_wkl_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50,      K52,           K55, K56, K57,                K5B,      K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   KC_NO, K52,   KC_NO, KC_NO, K55,   K56,   K57,   KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_wkl_split_bs
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │   │52   │56                         │5b   │   │5d   ││5e │5f │5g │
- * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_wkl_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,   K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                        \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4C,             K4F,       \
-    K50,      K52,                K56,                     K5B,      K5D,        K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   KC_NO, K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_wkl_split_lshift
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───�
- * │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c        │    │4f │
- * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤┌───┼───┼───�
- * │50   │   │52   │56                         │5b   │   │5d   ││5e │5f │5g │
- * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_wkl_split_lshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,       \
-    K50,      K52,                K56,                     K5B,      K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO, KC_NO, K4F,   KC_NO  }, \
-    { K50,   KC_NO, K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_wkl_split_rshift
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d     ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───�
- * │50   │   │52   │56                         │5b   │   │5d   ││5e │5f │5g │
- * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_wkl_split_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4F,       \
-    K50,      K52,                K56,                     K5B,      K5D, K5E, K5F, K5G   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   KC_NO, K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
-}
-
-
-/* LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift
- * ┌───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───┬───┬───┬───�┌───�┌───┬───┬───�
- * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d ││0e │0f │0g │
- * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�┌───┬───┬───�
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d ││1e │1f │1g │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   ││2e │2f │2g │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───�
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c    │4d │    │4f │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───�
- * │50   │   │52   │56                         │5b   │   │5d   ││5e │5f │5g │
- * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘└───┴───┴───┘
- */
-#define LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,                       \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,      \
-    K50,      K52,                K56,                     K5B,      K5D,        K5E, K5F, K5G  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G    }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G    }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO  }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO  }, \
-    { K50,   KC_NO, K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G    }, \
-}
diff --git a/keyboards/wuque/serneity65/config.h b/keyboards/wuque/serneity65/config.h
index 036181772b..134605fcab 100644
--- a/keyboards/wuque/serneity65/config.h
+++ b/keyboards/wuque/serneity65/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, F0, B1, D2, D3 }
-#define MATRIX_COL_PINS { B6, B5, D5, D4, D6, B4, D7, F1, F4, F5, F6, F7, C7, E6, B7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 3, 4 } }
 #define ENCODERS_CCW_KEY { { 5, 4 } }
diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/info.json
index 744b112f70..9ebc9af843 100644
--- a/keyboards/wuque/serneity65/info.json
+++ b/keyboards/wuque/serneity65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "D5", "D4", "D6", "B4", "D7", "F1", "F4", "F5", "F6", "F7", "C7", "E6", "B7"],
+        "rows": ["B0", "F0", "B1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B3"}
@@ -22,382 +27,382 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0 },
-                { "label": "EncoderRotateL", "x": 15, "y": 0, "w": 0.5 },
-                { "label": "EncoderClick", "x": 15.5, "y": 0 },
-                { "label": "EncoderRotateR", "x": 16.5, "y": 0, "w": 0.5 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [4, 3], "x": 15, "y": 0, "w": 0.5},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [4, 5], "x": 16.5, "y": 0, "w": 0.5},
 
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Backspace", "x": 14, "y": 0 },
-                { "label": "PageUp", "x": 15, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift1", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "x": 14, "y": 3 },
-                { "label": "End", "x": 15, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 2.25 },
-                { "x": 6, "y": 4, "w": 1.25 },
-                { "x": 7.25, "y": 4, "w": 2.75 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 13, "y": 4 },
-                { "label": "\u2193", "x": 14, "y": 4 },
-                { "label": "\u2192", "x": 15, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Encode", "x": 15.5, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
 
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "PageUp", "x": 15, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "x": 14, "y": 3 },
-                { "label": "End", "x": 15, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 13, "y": 4 },
-                { "label": "\u2193", "x": 14, "y": 4 },
-                { "label": "\u2192", "x": 15, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0 },
-                { "label": "Encode", "x": 15.5, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
 
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Backspace", "x": 14, "y": 0 },
-                { "label": "PageUp", "x": 15, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "x": 14, "y": 3 },
-                { "label": "End", "x": 15, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 13, "y": 4 },
-                { "label": "\u2193", "x": 14, "y": 4 },
-                { "label": "\u2192", "x": 15, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_lshift": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Encode", "x": 15.5, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
 
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "PageUp", "x": 15, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift1", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "x": 14, "y": 3 },
-                { "label": "End", "x": 15, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 13, "y": 4 },
-                { "label": "\u2193", "x": 14, "y": 4 },
-                { "label": "\u2192", "x": 15, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_split_space": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-                { "label": "7", "x": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Encode", "x": 15.5, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
 
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "[", "x": 11.5, "y": 1 },
-                { "label": "]", "x": 12.5, "y": 1 },
-                { "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ";", "x": 10.75, "y": 2 },
-                { "label": "'", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "PageUp", "x": 15, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": ",", "x": 9.25, "y": 3 },
-                { "label": ".", "x": 10.25, "y": 3 },
-                { "label": "/", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "x": 14, "y": 3 },
-                { "label": "End", "x": 15, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 2.25 },
-                { "x": 6, "y": 4, "w": 1.25 },
-                { "x": 7.25, "y": 4, "w": 2.75 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "x": 13, "y": 4 },
-                { "label": "\u2193", "x": 14, "y": 4 },
-                { "label": "\u2192", "x": 15, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/wuque/serneity65/serneity65.c b/keyboards/wuque/serneity65/serneity65.c
index 1222722b4b..58e0663467 100644
--- a/keyboards/wuque/serneity65/serneity65.c
+++ b/keyboards/wuque/serneity65/serneity65.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "serneity65.h"
+#include "quantum.h"
 
 #ifdef VIA_ENABLE
 static uint8_t encoder_state[NUM_ENCODERS] = {0};
@@ -30,7 +30,9 @@ void encoder_action_unregister(void)
             keyevent_t encoder_event = (keyevent_t){
                 .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                 .pressed = false,
-                .time = (timer_read() | 1)};
+                .time = timer_read(),
+                .type = KEY_EVENT
+            };
             encoder_state[index] = 0;
             action_exec(encoder_event);
         }
@@ -41,7 +43,9 @@ void encoder_action_register(uint8_t index, bool clockwise)
     keyevent_t encoder_event = (keyevent_t){
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = true,
-        .time = (timer_read() | 1)};
+        .time = timer_read(),
+        .type = KEY_EVENT
+    };
     encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
     action_exec(encoder_event);
 }
@@ -57,15 +61,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise)
     encoder_action_register(index, clockwise);
     return true;
 };
-#else
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    } 
-    return true;
-}
 #endif
diff --git a/keyboards/wuque/serneity65/serneity65.h b/keyboards/wuque/serneity65/serneity65.h
deleted file mode 100644
index a0da92c99e..0000000000
--- a/keyboards/wuque/serneity65/serneity65.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Copyright 2021 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-
-/* Standard Arrangement
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───�
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │44      │46  │48        │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K43, K0E, K45, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-    K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E       \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E     }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E     }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E     }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E     }, \
-}
-
-
-/* LAYOUT_65_ansi
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───�
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E,      \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E       \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E     }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E     }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E     }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E     }, \
-}
-
-
-/* LAYOUT_65_ansi_split_bs
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───�
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,      \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E       \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E     }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E     }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E     }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E     }, \
-}
-
-
-/* LAYOUT_65_ansi_split_lshift
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───�
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │46                      │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_ansi_split_lshift( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E       \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E     }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E     }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E     }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E     }, \
-}
-
-
-/* LAYOUT_65_split_space
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────�
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │ ◯
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───�
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │2e │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │3e │
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40  │41  │42  │44      │46  │48        │4a  │4b  │ │4c │4d │4e │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
- */
-#define LAYOUT_65_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E,      \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-    K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E       \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E     }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E     }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E     }, \
-    { K40,   K41,   K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E     }, \
-}
diff --git a/keyboards/wuque/tata80/wk/config.h b/keyboards/wuque/tata80/wk/config.h
index c4890ec9b1..bbde3a6157 100644
--- a/keyboards/wuque/tata80/wk/config.h
+++ b/keyboards/wuque/tata80/wk/config.h
@@ -15,14 +15,6 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wuque/tata80/wk/info.json b/keyboards/wuque/tata80/wk/info.json
index f1b5acf12d..23146206c4 100644
--- a/keyboards/wuque/tata80/wk/info.json
+++ b/keyboards/wuque/tata80/wk/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0168",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"],
+    "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "indicators": {
diff --git a/keyboards/wuque/tata80/wk/wk.c b/keyboards/wuque/tata80/wk/wk.c
deleted file mode 100644
index 1846559718..0000000000
--- a/keyboards/wuque/tata80/wk/wk.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "wk.h"
diff --git a/keyboards/wuque/tata80/wkl/config.h b/keyboards/wuque/tata80/wkl/config.h
index c4890ec9b1..bbde3a6157 100644
--- a/keyboards/wuque/tata80/wkl/config.h
+++ b/keyboards/wuque/tata80/wkl/config.h
@@ -15,14 +15,6 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wuque/tata80/wkl/info.json b/keyboards/wuque/tata80/wkl/info.json
index 868448e0f1..166511380c 100644
--- a/keyboards/wuque/tata80/wkl/info.json
+++ b/keyboards/wuque/tata80/wkl/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0169",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"],
+    "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "indicators": {
diff --git a/keyboards/wuque/tata80/wkl/wkl.c b/keyboards/wuque/tata80/wkl/wkl.c
deleted file mode 100644
index 23811762d1..0000000000
--- a/keyboards/wuque/tata80/wkl/wkl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "wkl.h"
-
diff --git a/keyboards/x16/config.h b/keyboards/x16/config.h
index 673e71eca8..c30966d9d2 100644
--- a/keyboards/x16/config.h
+++ b/keyboards/x16/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { E6, F7, D6, B6 }
-#define MATRIX_COL_PINS { C7, C6, B4, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/x16/info.json b/keyboards/x16/info.json
index b5e457d424..7a7c8ae022 100644
--- a/keyboards/x16/info.json
+++ b/keyboards/x16/info.json
@@ -8,6 +8,11 @@
         "pid": "0x016A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B4", "D7"],
+        "rows": ["E6", "F7", "D6", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5",
         "levels": 5
@@ -17,25 +22,25 @@
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/x16/x16.c b/keyboards/x16/x16.c
deleted file mode 100644
index 82a2f65c68..0000000000
--- a/keyboards/x16/x16.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "x16.h"
diff --git a/keyboards/x16/x16.h b/keyboards/x16/x16.h
deleted file mode 100644
index cf8bab4730..0000000000
--- a/keyboards/x16/x16.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x4( \
-	K01, K02, K03, K04, \
-	K11, K12, K13, K14, \
-	K21, K22, K23, K24, \
-	K31, K32, K33, K34 \
-) \
-{ \
-  { K01, K02, K03, K04 }, \
-  { K11, K12, K13, K14 }, \
-  { K21, K22, K23, K24 }, \
-  { K31, K32, K33, K34 } \
-}
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index 7efd43d16e..0875283a78 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6 }
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/xbows/knight/info.json b/keyboards/xbows/knight/info.json
index de0bc98a75..9cce952dd7 100644
--- a/keyboards/xbows/knight/info.json
+++ b/keyboards/xbows/knight/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4B6E",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
diff --git a/keyboards/xbows/knight/rules.mk b/keyboards/xbows/knight/rules.mk
index 2c37110828..4a443969ff 100644
--- a/keyboards/xbows/knight/rules.mk
+++ b/keyboards/xbows/knight/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/xbows/knight_plus/config.h b/keyboards/xbows/knight_plus/config.h
index 709076edb8..f8ec6d273b 100644
--- a/keyboards/xbows/knight_plus/config.h
+++ b/keyboards/xbows/knight_plus/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6 }
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/xbows/knight_plus/info.json b/keyboards/xbows/knight_plus/info.json
index 107cadc3e5..837d292932 100644
--- a/keyboards/xbows/knight_plus/info.json
+++ b/keyboards/xbows/knight_plus/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4B50",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
diff --git a/keyboards/xbows/knight_plus/rules.mk b/keyboards/xbows/knight_plus/rules.mk
index 2c37110828..4a443969ff 100644
--- a/keyboards/xbows/knight_plus/rules.mk
+++ b/keyboards/xbows/knight_plus/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h
index dfcc8528d8..be7fbeaa64 100644
--- a/keyboards/xbows/nature/config.h
+++ b/keyboards/xbows/nature/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6 }
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/xbows/nature/info.json b/keyboards/xbows/nature/info.json
index e99aa151c0..fdabd72f32 100644
--- a/keyboards/xbows/nature/info.json
+++ b/keyboards/xbows/nature/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4E61",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
diff --git a/keyboards/xbows/nature/rules.mk b/keyboards/xbows/nature/rules.mk
index 2c37110828..4a443969ff 100644
--- a/keyboards/xbows/nature/rules.mk
+++ b/keyboards/xbows/nature/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index 4b63bb63ff..1276efe191 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B5, B4, C6, B6, D7, B3 }
-#define MATRIX_COL_PINS { D4, D6, B2, B1 }
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/info.json
index eaecfca7f4..34744625d8 100644
--- a/keyboards/xbows/numpad/info.json
+++ b/keyboards/xbows/numpad/info.json
@@ -8,40 +8,47 @@
         "pid": "0x4E75",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "B2", "B1"],
+        "rows": ["B5", "B4", "C6", "B6", "D7", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"label":"Esc", "x":0, "y":0},
-              {"label":"Tab", "x":1, "y":0},
-              {"label":"Backspace", "x":2, "y":0},
-              {"label":"Fn", "x":3, "y":0},
-
-              {"label":"Num Lock", "x":0, "y":1.5},
-              {"label":"/", "x":1, "y":1.5},
-              {"label":"*", "x":2, "y":1.5},
-              {"label":"=", "x":3, "y":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-              {"label":"7", "x":0, "y":2.5},
-              {"label":"8", "x":1, "y":2.5},
-              {"label":"9", "x":2, "y":2.5},
-              {"label":"-", "x":3, "y":2.5},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
 
-              {"label":"4", "x":0, "y":3.5},
-              {"label":"5", "x":1, "y":3.5},
-              {"label":"6", "x":2, "y":3.5},
-              {"label":"+", "x":3, "y":3.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
 
-              {"label":"1", "x":0, "y":4.5},
-              {"label":"2", "x":1, "y":4.5},
-              {"label":"3", "x":2, "y":4.5},
-              {"label":"Enter", "x":3, "y":4.5, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3.5},
 
-              {"label":"0", "x":0, "y":5.5, "w":2},
-              {"label":".", "x":2, "y":5.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2},
 
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/xbows/numpad/numpad.c b/keyboards/xbows/numpad/numpad.c
index 4d6c256981..da20172f34 100644
--- a/keyboards/xbows/numpad/numpad.c
+++ b/keyboards/xbows/numpad/numpad.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- #include "numpad.h"
+ #include "quantum.h"
  #ifdef RGB_MATRIX_ENABLE
  const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
diff --git a/keyboards/xbows/numpad/numpad.h b/keyboards/xbows/numpad/numpad.h
deleted file mode 100644
index c160bff757..0000000000
--- a/keyboards/xbows/numpad/numpad.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Shulin Huang <mumu@x-bows.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define LAYOUT( \
-	K000, K001, K002, K003,   \
-	K100, K101, K102, K103,   \
-	K200, K201, K202, K203,   \
-	K300, K301, K302, K303,   \
-	K400, K401, K402, K403,   \
-	K500,       K502          \
-) \
-	{ \
-    { K000, K001, K002, K003 }, \
-    { K100, K101, K102, K103 }, \
-    { K200, K201, K202, K203 }, \
-    { K300, K301, K302, K303 }, \
-    { K400, K401, K402, K403 }, \
-    { K500, KC_NO,K502, KC_NO}  \
-}
diff --git a/keyboards/xbows/numpad/rules.mk b/keyboards/xbows/numpad/rules.mk
index 2c37110828..4a443969ff 100644
--- a/keyboards/xbows/numpad/rules.mk
+++ b/keyboards/xbows/numpad/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/xbows/ranger/config.h b/keyboards/xbows/ranger/config.h
index 1a2f72aa64..68c8227da0 100644
--- a/keyboards/xbows/ranger/config.h
+++ b/keyboards/xbows/ranger/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { C7, B6, B4, C6, B5, D6 }
-#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, D7, F6, F7, D4, D5, D3 }
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/xbows/ranger/info.json b/keyboards/xbows/ranger/info.json
index 5a549300c7..ec3fcb0fb3 100644
--- a/keyboards/xbows/ranger/info.json
+++ b/keyboards/xbows/ranger/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5261",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "D7", "F6", "F7", "D4", "D5", "D3"],
+        "rows": ["C7", "B6", "B4", "C6", "B5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
@@ -17,99 +25,107 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-              {"label":"Esc", "x":0, "y":0},
-               {"label":"F1", "x":2, "y":0},
-               {"label":"F2", "x":3, "y":0},
-               {"label":"F3", "x":4, "y":0},
-               {"label":"F4", "x":5, "y":0},
-               {"label":"F5", "x":6.5, "y":0},
-               {"label":"F6", "x":7.5, "y":0},
-               {"label":"F7", "x":8.5, "y":0},
-               {"label":"F8", "x":9.5, "y":0},
-               {"label":"F9", "x":11, "y":0},
-               {"label":"F10", "x":12, "y":0},
-               {"label":"F11", "x":13, "y":0},
-               {"label":"F12", "x":14, "y":0},
-               {"label":"PrtSc", "x":15.25, "y":0},
-               {"label":"Scroll Lock", "x":16.25, "y":0},
-               {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 13], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.5},
 
-               {"label":"~", "x":0, "y":1.5},
-               {"label":"!", "x":1, "y":1.5},
-               {"label":"@", "x":2, "y":1.5},
-               {"label":"#", "x":3, "y":1.5},
-               {"label":"$", "x":4, "y":1.5},
-               {"label":"%", "x":5, "y":1.5},
-               {"label":"^", "x":6, "y":1.5},
-               {"label":"&", "x":7, "y":1.5},
-               {"label":"*", "x":8, "y":1.5},
-               {"label":"(", "x":9, "y":1.5},
-               {"label":")", "x":10, "y":1.5},
-               {"label":"_", "x":11, "y":1.5},
-               {"label":"+", "x":12, "y":1.5},
-               {"label":"Bksp", "x":13, "y":1.5, "w":2},
-               {"label":"Insert", "x":15.25, "y":1.5},
-               {"label":"Home", "x":16.25, "y":1.5},
-               {"label":"PgUp", "x":17.25, "y":1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
 
-               {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-               {"label":"Q", "x":1.5, "y":2.5},
-               {"label":"W", "x":2.5, "y":2.5},
-               {"label":"E", "x":3.5, "y":2.5},
-               {"label":"R", "x":4.5, "y":2.5},
-               {"label":"T", "x":5.5, "y":2.5},
-               {"label":"Y", "x":6.5, "y":2.5},
-               {"label":"U", "x":7.5, "y":2.5},
-               {"label":"I", "x":8.5, "y":2.5},
-               {"label":"O", "x":9.5, "y":2.5},
-               {"label":"P", "x":10.5, "y":2.5},
-               {"label":"{", "x":11.5, "y":2.5},
-               {"label":"}", "x":12.5, "y":2.5},
-               {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-               {"label":"Delete", "x":15.25, "y":2.5},
-               {"label":"End", "x":16.25, "y":2.5},
-               {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
 
-               {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-               {"label":"A", "x":1.75, "y":3.5},
-               {"label":"S", "x":2.75, "y":3.5},
-               {"label":"D", "x":3.75, "y":3.5},
-               {"label":"F", "x":4.75, "y":3.5},
-               {"label":"G", "x":5.75, "y":3.5},
-               {"label":"H", "x":6.75, "y":3.5},
-               {"label":"J", "x":7.75, "y":3.5},
-               {"label":"K", "x":8.75, "y":3.5},
-               {"label":"L", "x":9.75, "y":3.5},
-               {"label":":", "x":10.75, "y":3.5},
-               {"label":"\"", "x":11.75, "y":3.5},
-               {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
 
-               {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-               {"label":"Z", "x":2.25, "y":4.5},
-               {"label":"X", "x":3.25, "y":4.5},
-               {"label":"C", "x":4.25, "y":4.5},
-               {"label":"V", "x":5.25, "y":4.5},
-               {"label":"B", "x":6.25, "y":4.5},
-               {"label":"N", "x":7.25, "y":4.5},
-               {"label":"M", "x":8.25, "y":4.5},
-               {"label":"<", "x":9.25, "y":4.5},
-               {"label":">", "x":10.25, "y":4.5},
-               {"label":"?", "x":11.25, "y":4.5},
-               {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-               {"label":"Up", "x":16.25, "y":4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
 
-               {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-               {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-               {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-               {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-               {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-               {"label":"Fn", "x":11.25, "y":5.5, "w":1.25},
-               {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-               {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-               {"label":"Left", "x":15.25, "y":5.5},
-               {"label":"Down", "x":16.25, "y":5.5},
-               {"label":"Right", "x":17.25, "y":5.5}
-             ]
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/xbows/ranger/ranger.c b/keyboards/xbows/ranger/ranger.c
index 4c141cc5d3..4ae55e7d68 100644
--- a/keyboards/xbows/ranger/ranger.c
+++ b/keyboards/xbows/ranger/ranger.c
@@ -13,7 +13,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- #include "ranger.h"
+
+#include "quantum.h"
+
  #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
diff --git a/keyboards/xbows/ranger/ranger.h b/keyboards/xbows/ranger/ranger.h
deleted file mode 100644
index 9fd2bf7148..0000000000
--- a/keyboards/xbows/ranger/ranger.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Shulin Huang <mumu@x-bows.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define LAYOUT_tkl_ansi( \
-	K000,       K001, K002, K003, K004,    K005, K006, K007, K008,    K009, K010, K011, K012,       K013, K014, K015,  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,     K313,         K113, K114, K115,  \
-	K200,   K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,    K413,        K213, K214, K215,  \
-	K300,     K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,     K312,                              \
-	K400,       K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,        K412,                  K414,        \
-	K500, K501, K502,                      K505,                   K509,  K510,  K511,  K512,       K513, K514, K515   \
-) \
-	{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO,KC_NO}, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,KC_NO, K412, K413, K414, KC_NO}, \
-    { K500, K501, K502, KC_NO,KC_NO,K505, KC_NO,KC_NO,KC_NO,K509, K510, K511, K512, K513, K514, K515 }  \
-}
diff --git a/keyboards/xbows/ranger/rules.mk b/keyboards/xbows/ranger/rules.mk
index 2c37110828..4a443969ff 100644
--- a/keyboards/xbows/ranger/rules.mk
+++ b/keyboards/xbows/ranger/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/xbows/woody/config.h b/keyboards/xbows/woody/config.h
index 318c340336..bfdbcce8c2 100644
--- a/keyboards/xbows/woody/config.h
+++ b/keyboards/xbows/woody/config.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#define MATRIX_ROW_PINS {B3, B2, B1, B0, B5 }
-#define MATRIX_COL_PINS {B6, C6, C7, F4, F5, F6, F7, B7, D2, D3, D5, D4, D6, D7, B4 }
-#define DIODE_DIRECTION COL2ROW
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json
index 8f212f965d..add3a33014 100644
--- a/keyboards/xbows/woody/info.json
+++ b/keyboards/xbows/woody/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1224",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "F4", "F5", "F6", "F7", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B3", "B2", "B1", "B0", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
diff --git a/keyboards/xbows/woody/rules.mk b/keyboards/xbows/woody/rules.mk
index c15a80d751..90dd66d772 100644
--- a/keyboards/xbows/woody/rules.mk
+++ b/keyboards/xbows/woody/rules.mk
@@ -10,5 +10,4 @@ COMMAND_ENABLE = no                # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no
 RGB_MATRIX_ENABLE = yes            # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
 NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
diff --git a/keyboards/xelus/akis/config.h b/keyboards/xelus/akis/config.h
index b0a56cdba8..ae0e692191 100644
--- a/keyboards/xelus/akis/config.h
+++ b/keyboards/xelus/akis/config.h
@@ -16,13 +16,7 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, F4, F1, F0, E6 }
-#define MATRIX_COL_PINS { B4, D7, D6, D4, D5, D3, D2, D1, D0, F6, F7, C7, C6, B6, B5 }
-
 /* RGB Lighting */
-#define RGB_DI_PIN B0
 #define RGBLED_NUM 23
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -35,9 +29,6 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/akis/info.json b/keyboards/xelus/akis/info.json
index bc275f3509..cc3116a685 100644
--- a/keyboards/xelus/akis/info.json
+++ b/keyboards/xelus/akis/info.json
@@ -8,6 +8,14 @@
         "pid": "0xA04B",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "F6", "F7", "C7", "C6", "B6", "B5"],
+        "rows": ["F5", "F4", "F1", "F0", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/xelus/dawn60/dawn60.c b/keyboards/xelus/dawn60/dawn60.c
deleted file mode 100644
index 3e009b3bdf..0000000000
--- a/keyboards/xelus/dawn60/dawn60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "dawn60.h"
diff --git a/keyboards/xelus/dawn60/dawn60.h b/keyboards/xelus/dawn60/dawn60.h
deleted file mode 100644
index feec9b5e1d..0000000000
--- a/keyboards/xelus/dawn60/dawn60.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_xelus_dawn60_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_xelus_dawn60_rev1_qmk)
-    #include "rev1_qmk.h"
-#endif
diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h
index 2e7f49644d..d3b505447a 100644
--- a/keyboards/xelus/dawn60/rev1/config.h
+++ b/keyboards/xelus/dawn60/rev1/config.h
@@ -15,22 +15,10 @@
  */
 #pragma once
 
-
-//no underglow - prototype
-//#define MATRIX_ROW_PINS { B1, B3, B7, F6, F7 }
-//#define MATRIX_COL_PINS { B0, D5, B2, F5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-//underglow
-#define MATRIX_ROW_PINS { B1, B3, F1, F6, F7 }
-#define MATRIX_COL_PINS { B0, D5, B2, F5, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT 64
 
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 // Locking resynchronize hack
@@ -58,7 +46,6 @@
 #define RGB_BACKLIGHT_DAWN60
 
 //RGB Underglow defines
-#define RGB_DI_PIN F0
 #define WS2812_LED_TOTAL 20
 
 #define RGB_UNDERGLOW_ALPHA_TOP_START 0
diff --git a/keyboards/xelus/dawn60/rev1/info.json b/keyboards/xelus/dawn60/rev1/info.json
new file mode 100644
index 0000000000..b575f3a88e
--- /dev/null
+++ b/keyboards/xelus/dawn60/rev1/info.json
@@ -0,0 +1,10 @@
+{
+    "ws2812": {
+        "pin": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B1", "B3", "F1", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/xelus/dawn60/rev1/rules.mk b/keyboards/xelus/dawn60/rev1/rules.mk
index e641678ecb..d4e70bfbec 100644
--- a/keyboards/xelus/dawn60/rev1/rules.mk
+++ b/keyboards/xelus/dawn60/rev1/rules.mk
@@ -17,13 +17,13 @@ AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. - We have custom RGB underglow
 
 CIE1931_CURVE = yes
+WS2812_DRIVER_REQUIRED = yes
 
 
 # project specific files
 SRC +=	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
-		drivers/led/issi/is31fl3731.c \
-		ws2812.c
+		drivers/led/issi/is31fl3731.c
 
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
index b00009b44e..d84773e5fb 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/config.h
+++ b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -15,21 +15,12 @@
  */
 #pragma once
 
-
-//underglow
-#define MATRIX_ROW_PINS { B1, B3, F1, F6, F7 }
-#define MATRIX_COL_PINS { B0, D5, B2, F5, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 // Locking resynchronize hack
 #define LOCKING_RESYNC_ENABLE
 
 //RGB Underglow defines
-#define RGB_DI_PIN F0
 #define WS2812_LED_TOTAL 20
 
 //RGB Matrix defines
diff --git a/keyboards/xelus/dawn60/rev1_qmk/info.json b/keyboards/xelus/dawn60/rev1_qmk/info.json
new file mode 100644
index 0000000000..ffc050a260
--- /dev/null
+++ b/keyboards/xelus/dawn60/rev1_qmk/info.json
@@ -0,0 +1,13 @@
+{
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B1", "B3", "F1", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
index c17160a659..951c0a22ff 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
+++ b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
@@ -14,13 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <quantum.h>
-#include <i2c_master.h>
-#include <led_tables.h>
-#include <rgb_matrix.h>
+#include "rev1_qmk.h"
+
+#include "i2c_master.h"
+#include "led_tables.h"
+#include "rgb_matrix.h"
 #include "drivers/led/issi/is31fl3731.h"
 #include "ws2812.h"
-#include "rev1_qmk.h"
 
 #ifdef RGB_MATRIX_ENABLE
 LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rules.mk b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
index 2101e1cd1c..4a799710d2 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rules.mk
+++ b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
@@ -18,13 +18,12 @@ FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. - We have custom RGB underglow
 
 RGB_MATRIX_ENABLE = yes     # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = custom  # Enable RGB matrix effects.
+WS2812_DRIVER_REQUIRED = yes
 
 COMMON_VPATH += $(DRIVER_PATH)/issi
 
 # project specific files
-SRC +=  drivers/led/issi/is31fl3731.c \
-        ws2812.c
+SRC +=  drivers/led/issi/is31fl3731.c
 
 QUANTUM_LIB_SRC += i2c_master.c 
 
diff --git a/keyboards/xelus/dharma/config.h b/keyboards/xelus/dharma/config.h
index a3301f94f7..b612e1587e 100644
--- a/keyboards/xelus/dharma/config.h
+++ b/keyboards/xelus/dharma/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, B0 }
-#define MATRIX_COL_PINS { B3, B2, B1, D5, D4, E6, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/dharma/dharma.c b/keyboards/xelus/dharma/dharma.c
deleted file mode 100644
index 15493ff022..0000000000
--- a/keyboards/xelus/dharma/dharma.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
diff --git a/keyboards/xelus/dharma/info.json b/keyboards/xelus/dharma/info.json
index ffd8e500b9..2ec2fd82f9 100644
--- a/keyboards/xelus/dharma/info.json
+++ b/keyboards/xelus/dharma/info.json
@@ -8,6 +8,11 @@
         "pid": "0xDAAA",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B1", "D5", "D4", "E6", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
+        "rows": ["D0", "D1", "D2", "D3", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7",
         "num_lock": "F0"
diff --git a/keyboards/xelus/kangaroo/rev1/config.h b/keyboards/xelus/kangaroo/rev1/config.h
index 369cb76573..7f246458f5 100644
--- a/keyboards/xelus/kangaroo/rev1/config.h
+++ b/keyboards/xelus/kangaroo/rev1/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define MATRIX_COL_PINS { B10, B2, B11, A10, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { A9, A8, B15, B14, B13, B12, A4, A5, A6, A7, B0, B1 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/xelus/kangaroo/rev1/info.json b/keyboards/xelus/kangaroo/rev1/info.json
index f6e477a9ef..ca5fa293e9 100644
--- a/keyboards/xelus/kangaroo/rev1/info.json
+++ b/keyboards/xelus/kangaroo/rev1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B2", "B11", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A9", "A8", "B15", "B14", "B13", "B12", "A4", "A5", "A6", "A7", "B0", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/xelus/kangaroo/rev2/config.h b/keyboards/xelus/kangaroo/rev2/config.h
index 0711e39909..790db9b30a 100644
--- a/keyboards/xelus/kangaroo/rev2/config.h
+++ b/keyboards/xelus/kangaroo/rev2/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-#define MATRIX_COL_PINS { B10, B2, B11, A10, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { A9, A8, B15, B14, B13, B12, A4, A5, A6, A7, B0, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/xelus/kangaroo/rev2/info.json b/keyboards/xelus/kangaroo/rev2/info.json
index a2dc9694c1..196f11860b 100644
--- a/keyboards/xelus/kangaroo/rev2/info.json
+++ b/keyboards/xelus/kangaroo/rev2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B2", "B11", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A9", "A8", "B15", "B14", "B13", "B12", "A4", "A5", "A6", "A7", "B0", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32L412",
     "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
index 2dc02a7f4f..82ada2e6da 100755
--- a/keyboards/xelus/la_plus/config.h
+++ b/keyboards/xelus/la_plus/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, F0, F4, F5 }
-#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -31,8 +23,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 // RGB Matrix
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN F1
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 32
 
diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/info.json
index c37c898995..902163888a 100644
--- a/keyboards/xelus/la_plus/info.json
+++ b/keyboards/xelus/la_plus/info.json
@@ -8,6 +8,17 @@
         "pid": "0x4C50",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F1"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B1", "F0", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/xelus/la_plus/rules.mk b/keyboards/xelus/la_plus/rules.mk
index cf61932706..7f3c8075a5 100755
--- a/keyboards/xelus/la_plus/rules.mk
+++ b/keyboards/xelus/la_plus/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_CUSTOM_KB = yes
 
 LTO_ENABLE = yes
diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h
index 2e6a07df5a..42be4c4415 100644
--- a/keyboards/xelus/ninjin/config.h
+++ b/keyboards/xelus/ninjin/config.h
@@ -16,12 +16,7 @@
 
 #pragma once
 
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, B6, B5 }
-#define MATRIX_ROW_PINS { B4, B3, A15, A3, B9, B8 }
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow */
-#define RGB_DI_PIN A10
 #define RGBLED_NUM 26
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/xelus/ninjin/info.json b/keyboards/xelus/ninjin/info.json
index bbac38b051..3fc48c08f9 100644
--- a/keyboards/xelus/ninjin/info.json
+++ b/keyboards/xelus/ninjin/info.json
@@ -8,6 +8,15 @@
         "pid": "0x4E4A",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A10",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "B6", "B5"],
+        "rows": ["B4", "B3", "A15", "A3", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A2",
         "scroll_lock": "A13"
@@ -20,97 +29,105 @@
     "layouts": {
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
 
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
-                {"x":4, "y":1.25},
-                {"x":5, "y":1.25},
-                {"x":6, "y":1.25},
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.25},
-                {"x":9, "y":1.25},
-                {"x":10, "y":1.25},
-                {"x":11, "y":1.25},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1.25, "w":2},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.25, "y":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"x":0, "y":2.25, "w":1.5},
-                {"x":1.5, "y":2.25},
-                {"x":2.5, "y":2.25},
-                {"x":3.5, "y":2.25},
-                {"x":4.5, "y":2.25},
-                {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":7.5, "y":2.25},
-                {"x":8.5, "y":2.25},
-                {"x":9.5, "y":2.25},
-                {"x":10.5, "y":2.25},
-                {"x":11.5, "y":2.25},
-                {"x":12.5, "y":2.25},
-                {"x":13.5, "y":2.25, "w":1.5},
-                {"x":15.25, "y":2.25},
-                {"x":16.25, "y":2.25},
-                {"x":17.25, "y":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
 
-                {"x":0, "y":3.25, "w":1.75},
-                {"x":1.75, "y":3.25},
-                {"x":2.75, "y":3.25},
-                {"x":3.75, "y":3.25},
-                {"x":4.75, "y":3.25},
-                {"x":5.75, "y":3.25},
-                {"x":6.75, "y":3.25},
-                {"x":7.75, "y":3.25},
-                {"x":8.75, "y":3.25},
-                {"x":9.75, "y":3.25},
-                {"x":10.75, "y":3.25},
-                {"x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-                {"x":7.25, "y":4.25},
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25, "w":2.75},
-                {"x":16.25, "y":4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
 
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":1.5, "y":5.25},
-                {"x":2.5, "y":5.25, "w":1.5},
-                {"x":4, "y":5.25, "w":7},
-                {"x":11, "y":5.25, "w":1.5},
-                {"x":12.5, "y":5.25},
-                {"x":13.5, "y":5.25, "w":1.5},
-                {"x":15.25, "y":5.25},
-                {"x":16.25, "y":5.25},
-                {"x":17.25, "y":5.25}
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/xelus/ninjin/ninjin.c b/keyboards/xelus/ninjin/ninjin.c
index a474e4b406..b5a4ee83a7 100644
--- a/keyboards/xelus/ninjin/ninjin.c
+++ b/keyboards/xelus/ninjin/ninjin.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ninjin.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {  // EEPROM is getting reset!
     rgblight_enable(); // Enable RGB by default
diff --git a/keyboards/xelus/ninjin/ninjin.h b/keyboards/xelus/ninjin/ninjin.h
deleted file mode 100644
index f43c028286..0000000000
--- a/keyboards/xelus/ninjin/ninjin.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,    K014, K015, K016, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,    K114, K115, K116, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,    K214, K215, K216, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                      \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,       K412,                K415,       \
-    K500, K501, K502,             K505,                         K510,       K512, K513,    K514, K515, K516  \
-) { \
-    { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, ____, K313, ____, ____, ____ }, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, ____, K412, ____, ____, K415, ____ }, \
-    { K500, K501, K502, ____, ____, K505, ____, ____, ____, ____, K510, ____, K512, K513, K514, K515, K516 }  \
-}
diff --git a/keyboards/xelus/ninjin/rules.mk b/keyboards/xelus/ninjin/rules.mk
index 3d8c7c0af8..ead22f6c15 100644
--- a/keyboards/xelus/ninjin/rules.mk
+++ b/keyboards/xelus/ninjin/rules.mk
@@ -11,7 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-WS2812_DRIVER = pwm
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/xelus/pachi/mini_32u4/config.h b/keyboards/xelus/pachi/mini_32u4/config.h
index 8786b2ad29..651f613045 100644
--- a/keyboards/xelus/pachi/mini_32u4/config.h
+++ b/keyboards/xelus/pachi/mini_32u4/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, F0, D2, D1 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, E6, B7, D0 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/xelus/pachi/mini_32u4/info.json b/keyboards/xelus/pachi/mini_32u4/info.json
index b400fdd7a4..0d60849bc5 100644
--- a/keyboards/xelus/pachi/mini_32u4/info.json
+++ b/keyboards/xelus/pachi/mini_32u4/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5041",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "E6", "B7", "D0"],
+        "rows": ["B0", "B1", "B2", "F0", "D2", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "F1",
         "scroll_lock": "B3"
diff --git a/keyboards/xelus/pachi/mini_32u4/mini_32u4.c b/keyboards/xelus/pachi/mini_32u4/mini_32u4.c
deleted file mode 100644
index 98d2a80963..0000000000
--- a/keyboards/xelus/pachi/mini_32u4/mini_32u4.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mini_32u4.h"
-
diff --git a/keyboards/xelus/pachi/rev1/config.h b/keyboards/xelus/pachi/rev1/config.h
index e931eca992..651f613045 100644
--- a/keyboards/xelus/pachi/rev1/config.h
+++ b/keyboards/xelus/pachi/rev1/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B4, B3, A15, B15, B9, B8 }
-#define MATRIX_COL_PINS { B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A2, A1, A0, A3, B6, B5 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/xelus/pachi/rev1/info.json b/keyboards/xelus/pachi/rev1/info.json
index 44690cd7b5..cbd9fc69aa 100644
--- a/keyboards/xelus/pachi/rev1/info.json
+++ b/keyboards/xelus/pachi/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5041",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A2", "A1", "A0", "A3", "B6", "B5"],
+        "rows": ["B4", "B3", "A15", "B15", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B14",
         "scroll_lock": "A13"
diff --git a/keyboards/xelus/pachi/rev1/rev1.c b/keyboards/xelus/pachi/rev1/rev1.c
deleted file mode 100644
index 0a5ffe3723..0000000000
--- a/keyboards/xelus/pachi/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
-
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index f64c4ed2e3..af6157aa93 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B14, B13, B12, B2, A8, B15 }
-#define MATRIX_COL_PINS { C13, C14, C15, H0, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, H1, B10, B11 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/info.json
index be31e74a6c..184dc1a67b 100644
--- a/keyboards/xelus/pachi/rgb/rev1/info.json
+++ b/keyboards/xelus/pachi/rgb/rev1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5052",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["C13", "C14", "C15", "H0", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "H1", "B10", "B11"],
+        "rows": ["B14", "B13", "B12", "B2", "A8", "B15"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32L422",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
@@ -16,97 +24,105 @@
     "layouts": {
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
 
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [4, 15], "x": 16, "y": 4.25},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16, "y":4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15, "y":5.25},
-                {"label":"\u2193", "x":16, "y":5.25},
-                {"label":"\u2192", "x":17, "y":5.25}
+                {"matrix": [5, 14], "x": 15, "y": 5.25},
+                {"matrix": [5, 15], "x": 16, "y": 5.25},
+                {"matrix": [5, 16], "x": 17, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/xelus/pachi/rgb/rev1/rev1.c b/keyboards/xelus/pachi/rgb/rev1/rev1.c
index e2b342dcb5..856cdc1302 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rev1.c
+++ b/keyboards/xelus/pachi/rgb/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev1.h"
+#include "quantum.h"
 
 // tested and working
 void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
diff --git a/keyboards/xelus/pachi/rgb/rev1/rev1.h b/keyboards/xelus/pachi/rgb/rev1/rev1.h
deleted file mode 100644
index d2db5ebfc0..0000000000
--- a/keyboards/xelus/pachi/rgb/rev1/rev1.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,   K014, K015, K016, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,   K114, K115, K116, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,   K214, K215, K216, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                     \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,       K412,               K415,       \
-    K500, K501, K502,             K505,                         K510,       K512, K513,   K514, K515, K516  \
-) { \
-    { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, ____, K313, ____, ____, ____ }, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, ____, K412, ____, ____, K415, ____ }, \
-    { K500, K501, K502, ____, ____, K505, ____, ____, ____, ____, K510, ____, K512, K513, K514, K515, K516 }  \
-}
diff --git a/keyboards/xelus/pachi/rgb/rev1/rules.mk b/keyboards/xelus/pachi/rgb/rev1/rules.mk
index 904565c01e..cec6f3c13d 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rules.mk
+++ b/keyboards/xelus/pachi/rgb/rev1/rules.mk
@@ -14,7 +14,6 @@ FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 EEPROM_DRIVER = i2c
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 
 COMMON_VPATH += $(DRIVER_PATH)/issi
 SRC += drivers/led/issi/is31fl3741.c
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index 04dfd15983..a11aa27d3b 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A5, A6, B0, A7, A8, B1, B4, B5, A15, B3, A13, A14 }
-#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A10, A9}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/info.json
index e771916407..64aa3172c0 100644
--- a/keyboards/xelus/pachi/rgb/rev2/info.json
+++ b/keyboards/xelus/pachi/rgb/rev2/info.json
@@ -8,6 +8,14 @@
         "pid": "0x5053",
         "device_version": "0.0.2"
     },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A10", "A9"],
+        "rows": ["A5", "A6", "B0", "A7", "A8", "B1", "B4", "B5", "A15", "B3", "A13", "A14"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32L422",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
@@ -16,97 +24,105 @@
     "layouts": {
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
 
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [9, 7], "x": 16, "y": 4.25},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16, "y":4.25},
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 2], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [10, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":1.5, "y":5.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4, "y":5.25, "w":7},
-                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
-                {"label":"GUI", "x":12.5, "y":5.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "x":15, "y":5.25},
-                {"label":"\u2193", "x":16, "y":5.25},
-                {"label":"\u2192", "x":17, "y":5.25}
+                {"matrix": [10, 7], "x": 15, "y": 5.25},
+                {"matrix": [11, 7], "x": 16, "y": 5.25},
+                {"matrix": [10, 8], "x": 17, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/xelus/pachi/rgb/rev2/rev2.h b/keyboards/xelus/pachi/rgb/rev2/rev2.h
index d6a05b7264..fb0b8639d2 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rev2.h
+++ b/keyboards/xelus/pachi/rgb/rev2/rev2.h
@@ -70,27 +70,3 @@ void indicator_config_save ( void );
 void _set_color(HSV *color, uint8_t *data);
 void _get_color(HSV *color, uint8_t *data);
 #endif
-
-#define _____ KC_NO
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    K0000,        K0001, K0101, K0002, K0102, K0003, K0103, K0004, K0104, K0005, K0105, K0006, K0106, K0007, K0107, K0008, \
-    K0200, K0300, K0201, K0301, K0202, K0302, K0203, K0303, K0204, K0304, K0205, K0305, K0206, K0306, K0207, K0307, K0208, \
-    K0400, K0500, K0401, K0501, K0402, K0502, K0403, K0503, K0404, K0504, K0405, K0505, K0406, K0506, K0407, K0507, K0408, \
-    K0600, K0700, K0601, K0701, K0602, K0702, K0603, K0703, K0604, K0704, K0605, K0705,        K0706,                      \
-    K0800, K0900, K0801, K0901, K0802, K0902, K0803, K0903, K0804, K0904, K0805,        K0806,               K0907,        \
-    K1000, K1100, K1001,               K1102,                             K1005,        K1006, K1106, K1007, K1107, K1008  \
-) { \
-    { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008 }, \
-    { _____, K0101, K0102, K0103, K0104, K0105, K0106, K0107, _____ }, \
-    { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208 }, \
-    { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, _____ }, \
-    { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408 }, \
-    { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, _____ }, \
-    { K0600, K0601, K0602, K0603, K0604, K0605, _____, _____, _____ }, \
-    { K0700, K0701, K0702, K0703, K0704, K0705, K0706, _____, _____ }, \
-    { K0800, K0801, K0802, K0803, K0804, K0805, K0806, _____, _____ }, \
-    { K0900, K0901, K0902, K0903, K0904, _____, _____, K0907, _____ }, \
-    { K1000, K1001, _____, _____, _____, K1005, K1006, K1007, K1008 }, \
-    { K1100, _____, K1102, _____, _____, _____, K1106, K1107, _____ }  \
-}
diff --git a/keyboards/xelus/pachi/rgb/rev2/rules.mk b/keyboards/xelus/pachi/rgb/rev2/rules.mk
index 7150da0389..d5c0eee734 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rules.mk
+++ b/keyboards/xelus/pachi/rgb/rev2/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 
 COMMON_VPATH += $(DRIVER_PATH)/issi
 SRC += drivers/led/issi/is31fl3741.c
diff --git a/keyboards/xelus/pachi/rgb/rgb.c b/keyboards/xelus/pachi/rgb/rgb.c
deleted file mode 100644
index 93ca8406de..0000000000
--- a/keyboards/xelus/pachi/rgb/rgb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rgb.h"
diff --git a/keyboards/xelus/pachi/rgb/rgb.h b/keyboards/xelus/pachi/rgb/rgb.h
deleted file mode 100644
index 36ca2937a6..0000000000
--- a/keyboards/xelus/pachi/rgb/rgb.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_xelus_pachi_rgb_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_xelus_pachi_rgb_rev2)
-    #include "rev2.h"
-#endif
diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h
index 329fa6639c..5faab0f2d7 100644
--- a/keyboards/xelus/rs108/config.h
+++ b/keyboards/xelus/rs108/config.h
@@ -15,12 +15,6 @@
  */
 #pragma once
 
-#define MATRIX_ROW_PINS { B5, B6, B7, A1, A0, C13, B0, A7, A5, A4, A3, A2 }
-#define MATRIX_COL_PINS { A10, A8, B15, B14, B13, B12, B1, B10, B4, B3, A15 }
-
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/info.json
index 959da932de..d15a543e53 100644
--- a/keyboards/xelus/rs108/info.json
+++ b/keyboards/xelus/rs108/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5208",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B1", "B10", "B4", "B3", "A15"],
+        "rows": ["B5", "B6", "B7", "A1", "A0", "C13", "B0", "A7", "A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A6",
         "num_lock": "A14",
diff --git a/keyboards/xelus/rs108/rs108.c b/keyboards/xelus/rs108/rs108.c
deleted file mode 100644
index 7c23446466..0000000000
--- a/keyboards/xelus/rs108/rs108.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- #include "rs108.h"
diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h
index 78b03aa455..20970a866a 100644
--- a/keyboards/xelus/rs60/rev1/config.h
+++ b/keyboards/xelus/rs60/rev1/config.h
@@ -15,12 +15,6 @@
  */
 #pragma once
 
-#define MATRIX_ROW_PINS { B3, B7, F0, F4, F1 }
-#define MATRIX_COL_PINS { E6, D5, D3, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4}
-
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/info.json
index 5eff1d75a6..fb410ee861 100644
--- a/keyboards/xelus/rs60/rev1/info.json
+++ b/keyboards/xelus/rs60/rev1/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "D3", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B3", "B7", "F0", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0"
     },
diff --git a/keyboards/xelus/rs60/rev1/rev1.c b/keyboards/xelus/rs60/rev1/rev1.c
deleted file mode 100644
index d997ff979e..0000000000
--- a/keyboards/xelus/rs60/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- #include "rev1.h"
diff --git a/keyboards/xelus/rs60/rev2_0/config.h b/keyboards/xelus/rs60/rev2_0/config.h
index 5e8565b63b..5faab0f2d7 100644
--- a/keyboards/xelus/rs60/rev2_0/config.h
+++ b/keyboards/xelus/rs60/rev2_0/config.h
@@ -15,12 +15,6 @@
  */
 #pragma once
 
-#define MATRIX_ROW_PINS { B15, B14, B12, B1, B0 }
-#define MATRIX_COL_PINS { B13, A7, A6, A5, A4, A3, A2, B7, B6, B5, B4, B3, A15, A14 }
-
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/info.json
index e2ab965c1b..f524bd938c 100644
--- a/keyboards/xelus/rs60/rev2_0/info.json
+++ b/keyboards/xelus/rs60/rev2_0/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.2.0"
     },
+    "matrix_pins": {
+        "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B15", "B14", "B12", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A1"
     },
diff --git a/keyboards/xelus/rs60/rev2_0/rev2_0.c b/keyboards/xelus/rs60/rev2_0/rev2_0.c
deleted file mode 100644
index d2abbda521..0000000000
--- a/keyboards/xelus/rs60/rev2_0/rev2_0.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- #include "rev2_0.h"
diff --git a/keyboards/xelus/rs60/rev2_1/config.h b/keyboards/xelus/rs60/rev2_1/config.h
index 0dfcb0df72..a5910ae45c 100644
--- a/keyboards/xelus/rs60/rev2_1/config.h
+++ b/keyboards/xelus/rs60/rev2_1/config.h
@@ -15,12 +15,6 @@
  */
 #pragma once
 
-#define MATRIX_ROW_PINS { B15, B14, B12, B1, B0 }
-#define MATRIX_COL_PINS { B13, A7, A6, A5, A4, A3, A2, B7, B6, B5, B4, B3, A15, A14 }
-
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/rs60/rev2_1/info.json b/keyboards/xelus/rs60/rev2_1/info.json
index 2cb5b5ddda..5f50e949a2 100644
--- a/keyboards/xelus/rs60/rev2_1/info.json
+++ b/keyboards/xelus/rs60/rev2_1/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.2.1"
     },
+    "matrix_pins": {
+        "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B15", "B14", "B12", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A1"
     },
diff --git a/keyboards/xelus/rs60/rev2_1/rev2_1.c b/keyboards/xelus/rs60/rev2_1/rev2_1.c
deleted file mode 100644
index dc234542b5..0000000000
--- a/keyboards/xelus/rs60/rev2_1/rev2_1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- #include "rev2_1.h"
diff --git a/keyboards/xelus/rs60/rs60.c b/keyboards/xelus/rs60/rs60.c
deleted file mode 100644
index cd2fa80061..0000000000
--- a/keyboards/xelus/rs60/rs60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- #include "rs60.h"
diff --git a/keyboards/xelus/rs60/rs60.h b/keyboards/xelus/rs60/rs60.h
deleted file mode 100644
index 5a52d37a7f..0000000000
--- a/keyboards/xelus/rs60/rs60.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_xelus_rs60_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_xelus_rs60_rev2_0)
-    #include "rev2_0.h"
-#elif defined(KEYBOARD_xelus_rs60_rev2_1)
-    #include "rev2_1.h"
-#endif
diff --git a/keyboards/xelus/snap96/config.h b/keyboards/xelus/snap96/config.h
index 553c6aaddf..c6f9a6c1bf 100644
--- a/keyboards/xelus/snap96/config.h
+++ b/keyboards/xelus/snap96/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-// key matrix pins
-#define MATRIX_ROW_PINS { B2, B1, B0, C7, F6, F7, B3, D1, D2, D7, B6, C6 }
-#define MATRIX_COL_PINS { E6, D5, B7, D0, F5, D3, B4, B5, D4, D6 }
-
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
 // Locking resynchronize hack
diff --git a/keyboards/xelus/snap96/info.json b/keyboards/xelus/snap96/info.json
index 6550d46c8e..9cd82569c0 100644
--- a/keyboards/xelus/snap96/info.json
+++ b/keyboards/xelus/snap96/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5396",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B7", "D0", "F5", "D3", "B4", "B5", "D4", "D6"],
+        "rows": ["B2", "B1", "B0", "C7", "F6", "F7", "B3", "D1", "D2", "D7", "B6", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/xelus/snap96/snap96.c b/keyboards/xelus/snap96/snap96.c
deleted file mode 100644
index e7c728bb05..0000000000
--- a/keyboards/xelus/snap96/snap96.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "snap96.h"
diff --git a/keyboards/xelus/trinityxttkl/config.h b/keyboards/xelus/trinityxttkl/config.h
index 64cb061b40..651f613045 100644
--- a/keyboards/xelus/trinityxttkl/config.h
+++ b/keyboards/xelus/trinityxttkl/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A10, B9, B4 }
-#define MATRIX_ROW_PINS { A14, A15, B3, A2, B6, B5 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/xelus/trinityxttkl/info.json b/keyboards/xelus/trinityxttkl/info.json
index 787f30cf99..2fe1624712 100644
--- a/keyboards/xelus/trinityxttkl/info.json
+++ b/keyboards/xelus/trinityxttkl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5854",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A10", "B9", "B4"],
+        "rows": ["A14", "A15", "B3", "A2", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A1",
         "scroll_lock": "A13"
diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h
index 07f69540a0..187710670e 100644
--- a/keyboards/xelus/valor/rev1/config.h
+++ b/keyboards/xelus/valor/rev1/config.h
@@ -16,13 +16,7 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, B2, C7, C6, B6 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5, B4, D7, D6, D4, D5, D3, D2 }
-
 /* RGB Underglow */
-#define RGB_DI_PIN B0
 #define RGBLED_NUM 28
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -36,9 +30,6 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 200
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/valor/rev1/info.json b/keyboards/xelus/valor/rev1/info.json
index 547e50b3f8..344c9cdbdf 100644
--- a/keyboards/xelus/valor/rev1/info.json
+++ b/keyboards/xelus/valor/rev1/info.json
@@ -8,82 +8,100 @@
         "pid": "0x5652",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["B1", "B2", "C7", "C6", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":10.25, "y":0},
-                {"x":11.25, "y":0},
-                {"x":12.25, "y":0},
-                {"x":13.25, "y":0},
-                {"x":14.25, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [2, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
 
-                {"x":0, "y":1},
-                {"x":1.25, "y":1, "w":1.5},
-                {"x":2.75, "y":1},
-                {"x":3.75, "y":1},
-                {"x":4.75, "y":1},
-                {"x":5.75, "y":1},
-                {"x":6.75, "y":1},
-                {"x":9.75, "y":1},
-                {"x":10.75, "y":1},
-                {"x":11.75, "y":1},
-                {"x":12.75, "y":1},
-                {"x":13.75, "y":1},
-                {"x":14.75, "y":1},
-                {"x":15.75, "y":1},
-                {"x":16.75, "y":1, "w":1.5},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
 
-                {"x":0, "y":2},
-                {"x":1.25, "y":2, "w":1.75},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
-                {"x":15, "y":2},
-                {"x":16, "y":2, "w":2.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
 
-                {"x":1.25, "y":3, "w":2.25},
-                {"x":3.5, "y":3},
-                {"x":4.5, "y":3},
-                {"x":5.5, "y":3},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3},
-                {"x":9.5, "y":3},
-                {"x":10.5, "y":3},
-                {"x":11.5, "y":3},
-                {"x":12.5, "y":3},
-                {"x":13.5, "y":3},
-                {"x":14.5, "y":3},
-                {"x":15.5, "y":3, "w":1.75},
-                {"x":17.25, "y":3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
 
-                {"x":1.25, "y":4, "w":1.5},
-                {"x":4.25, "y":4, "w":1.5},
-                {"x":5.75, "y":4, "w":2},
-                {"x":7.75, "y":4, "w":1.25},
-                {"x":9.5, "y":4, "w":2.75},
-                {"x":12.25, "y":4, "w":1.5},
-                {"x":16.75, "y":4, "w":1.5}
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/xelus/valor/rev1/rev1.c b/keyboards/xelus/valor/rev1/rev1.c
deleted file mode 100644
index 614899aaed..0000000000
--- a/keyboards/xelus/valor/rev1/rev1.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
-
-#include "rev1.h"
\ No newline at end of file
diff --git a/keyboards/xelus/valor/rev1/rev1.h b/keyboards/xelus/valor/rev1/rev1.h
deleted file mode 100644
index 3e05ae5e22..0000000000
--- a/keyboards/xelus/valor/rev1/rev1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_alice_split_bs( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K214, \
-  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,       \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,             \
-        K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       \
-        K401,       K403,       K405, K406,       K408,       K410,             K413              \
-) { \
-  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-  { ____, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-  { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, K413, ____ }  \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index 2dba975d78..cc63e70bb4 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B11, B10, A3, A1, A2 }
-#define MATRIX_COL_PINS { B2, B1, B0, A7, A6, A5, A4, A13, B7, B6, B5, B4, B3, A15, A14 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -48,7 +40,6 @@
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
 
 /* RGB Matrix */
-#define RGB_DI_PIN A9
 #define RGBLED_NUM 28
 #define RGB_MATRIX_LED_COUNT 28
 #define NOP_FUDGE 0.4
diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
index f77f18dda3..d3f134fdf8 100644
--- a/keyboards/xelus/valor/rev2/info.json
+++ b/keyboards/xelus/valor/rev2/info.json
@@ -8,82 +8,103 @@
         "pid": "0x5653",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A9",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "A13", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B11", "B10", "A3", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32L422",
     "bootloader": "stm32-dfu",
     "community_layouts": ["alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":10.25, "y":0},
-                {"x":11.25, "y":0},
-                {"x":12.25, "y":0},
-                {"x":13.25, "y":0},
-                {"x":14.25, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [2, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
 
-                {"x":0, "y":1},
-                {"x":1.25, "y":1, "w":1.5},
-                {"x":2.75, "y":1},
-                {"x":3.75, "y":1},
-                {"x":4.75, "y":1},
-                {"x":5.75, "y":1},
-                {"x":6.75, "y":1},
-                {"x":9.75, "y":1},
-                {"x":10.75, "y":1},
-                {"x":11.75, "y":1},
-                {"x":12.75, "y":1},
-                {"x":13.75, "y":1},
-                {"x":14.75, "y":1},
-                {"x":15.75, "y":1},
-                {"x":16.75, "y":1, "w":1.5},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
 
-                {"x":0, "y":2},
-                {"x":1.25, "y":2, "w":1.75},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
-                {"x":15, "y":2},
-                {"x":16, "y":2, "w":2.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
 
-                {"x":1.25, "y":3, "w":2.25},
-                {"x":3.5, "y":3},
-                {"x":4.5, "y":3},
-                {"x":5.5, "y":3},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3},
-                {"x":9.5, "y":3},
-                {"x":10.5, "y":3},
-                {"x":11.5, "y":3},
-                {"x":12.5, "y":3},
-                {"x":13.5, "y":3},
-                {"x":14.5, "y":3},
-                {"x":15.5, "y":3, "w":1.75},
-                {"x":17.25, "y":3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
 
-                {"x":1.25, "y":4, "w":1.5},
-                {"x":4.25, "y":4, "w":1.5},
-                {"x":5.75, "y":4, "w":2},
-                {"x":7.75, "y":4, "w":1.25},
-                {"x":9.5, "y":4, "w":2.75},
-                {"x":12.25, "y":4, "w":1.5},
-                {"x":16.75, "y":4, "w":1.5}
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/xelus/valor/rev2/rev2.c b/keyboards/xelus/valor/rev2/rev2.c
index f130418794..34a32cfc61 100644
--- a/keyboards/xelus/valor/rev2/rev2.c
+++ b/keyboards/xelus/valor/rev2/rev2.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev2.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/xelus/valor/rev2/rev2.h b/keyboards/xelus/valor/rev2/rev2.h
deleted file mode 100644
index 9cf78c9412..0000000000
--- a/keyboards/xelus/valor/rev2/rev2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_alice_split_bs( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K214, \
-  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,       \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,             \
-        K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       \
-        K401,       K403,       K405, K406,       K408,       K410,             K413              \
-) { \
-  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-  { ____, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-  { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, K413, ____ }  \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/xelus/valor/rev2/rules.mk b/keyboards/xelus/valor/rev2/rules.mk
index 47560d7f15..e0caab1474 100644
--- a/keyboards/xelus/valor/rev2/rules.mk
+++ b/keyboards/xelus/valor/rev2/rules.mk
@@ -11,9 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_CUSTOM_KB = yes
-WS2812_DRIVER = pwm
 EEPROM_DRIVER = i2c
 
 OPT = 2
diff --git a/keyboards/xelus/valor_frl_tkl/rev1/config.h b/keyboards/xelus/valor_frl_tkl/rev1/config.h
index 8852d04548..a03694deaa 100644
--- a/keyboards/xelus/valor_frl_tkl/rev1/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev1/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A15, A14, A1, B3, B4 }
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, A0, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/valor_frl_tkl/rev1/info.json b/keyboards/xelus/valor_frl_tkl/rev1/info.json
index f4cc0f9659..838396caaf 100644
--- a/keyboards/xelus/valor_frl_tkl/rev1/info.json
+++ b/keyboards/xelus/valor_frl_tkl/rev1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "A0", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+        "rows": ["A15", "A14", "A1", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
index da2454b4fe..cb37aaa4cc 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A15, A14, A10, B3, B4 }
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B9, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
index 972ee4bf92..d3e2177793 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+        "rows": ["A15", "A14", "A10", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
index ad3ac93ae7..cb37aaa4cc 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A15, A14, A13, B3, B4 }
-#define MATRIX_COL_PINS { A10, A8, B15, B14, B13, B12, B9, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
index 6e76320a13..61a26ca4c9 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+        "rows": ["A15", "A14", "A13", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F401",
     "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c b/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c
deleted file mode 100644
index b5eca9abde..0000000000
--- a/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Nothing to see here, move along... ;-)
-
-#include "valor_frl_tkl.h"
diff --git a/keyboards/xelus/xs108/config.h b/keyboards/xelus/xs108/config.h
index b04e268f1e..8a6ab123c4 100644
--- a/keyboards/xelus/xs108/config.h
+++ b/keyboards/xelus/xs108/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { C14, C13, A10, A3, A1, A0 }
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, B6, B5, B4, B3, A15, A14 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/xelus/xs108/info.json b/keyboards/xelus/xs108/info.json
index c4a53a6f59..d138c3ed65 100644
--- a/keyboards/xelus/xs108/info.json
+++ b/keyboards/xelus/xs108/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0108",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["C14", "C13", "A10", "A3", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A2",
         "num_lock": "B7",
diff --git a/keyboards/xelus/xs108/xs108.c b/keyboards/xelus/xs108/xs108.c
deleted file mode 100644
index 41084d7be1..0000000000
--- a/keyboards/xelus/xs108/xs108.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "xs108.h"
diff --git a/keyboards/xelus/xs60/hotswap/config.h b/keyboards/xelus/xs60/hotswap/config.h
index 807c397aba..242560c067 100644
--- a/keyboards/xelus/xs60/hotswap/config.h
+++ b/keyboards/xelus/xs60/hotswap/config.h
@@ -38,7 +38,6 @@
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
 
 // RGBLIGHT
-#define RGB_DI_PIN A10
 #define RGBLED_NUM 8            // actually only has 1
 #define RGBLIGHT_LAYERS
 #define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/xelus/xs60/hotswap/info.json b/keyboards/xelus/xs60/hotswap/info.json
index 35c4c7bc63..24ceb992ad 100644
--- a/keyboards/xelus/xs60/hotswap/info.json
+++ b/keyboards/xelus/xs60/hotswap/info.json
@@ -8,6 +8,9 @@
         "pid": "0x5861",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A10"
+    },
     "processor": "STM32L422",
     "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
diff --git a/keyboards/xelus/xs60/hotswap/rules.mk b/keyboards/xelus/xs60/hotswap/rules.mk
index b58e18c74f..4819456d51 100644
--- a/keyboards/xelus/xs60/hotswap/rules.mk
+++ b/keyboards/xelus/xs60/hotswap/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
 
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = bitbang
 
 LTO_ENABLE = yes
 OPT = 2
diff --git a/keyboards/xelus/xs60/soldered/config.h b/keyboards/xelus/xs60/soldered/config.h
index da1468be66..cbbdc49b12 100644
--- a/keyboards/xelus/xs60/soldered/config.h
+++ b/keyboards/xelus/xs60/soldered/config.h
@@ -37,7 +37,6 @@
 // More EEPROM for layers
 
 // RGBLIGHT
-#define RGB_DI_PIN A10
 #define RGBLED_NUM 8            // actually only has 1
 #define RGBLIGHT_LAYERS
 #define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/xelus/xs60/soldered/info.json b/keyboards/xelus/xs60/soldered/info.json
index 471bedba8c..ab73494213 100644
--- a/keyboards/xelus/xs60/soldered/info.json
+++ b/keyboards/xelus/xs60/soldered/info.json
@@ -8,6 +8,9 @@
         "pid": "0x5860",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A10"
+    },
     "processor": "STM32L422",
     "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
diff --git a/keyboards/xelus/xs60/soldered/rules.mk b/keyboards/xelus/xs60/soldered/rules.mk
index b58e18c74f..4819456d51 100644
--- a/keyboards/xelus/xs60/soldered/rules.mk
+++ b/keyboards/xelus/xs60/soldered/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
 
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = bitbang
 
 LTO_ENABLE = yes
 OPT = 2
diff --git a/keyboards/xenon/config.h b/keyboards/xenon/config.h
index 61fda0e20a..4a0752d371 100644
--- a/keyboards/xenon/config.h
+++ b/keyboards/xenon/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json
index 5f74a9bbad..0e3cb5af10 100644
--- a/keyboards/xenon/info.json
+++ b/keyboards/xenon/info.json
@@ -8,6 +8,11 @@
     "pid": "0x3404",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+    "rows": ["D4", "C6", "D7", "E6", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B6", "pin_b": "B5"}
diff --git a/keyboards/xiaomi/mk02/config.h b/keyboards/xiaomi/mk02/config.h
index 405384d710..093618f2b3 100644
--- a/keyboards/xiaomi/mk02/config.h
+++ b/keyboards/xiaomi/mk02/config.h
@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE
 
-#define MATRIX_ROW_PINS { A3, A4, A5, A6, A7, B0 }
-#define MATRIX_COL_PINS { B13, B14, B15, A15, B3, B4, B5, B6, B7, B8, B9, C14, C15, B11, A1, A2, B12 }
-#define DIODE_DIRECTION ROW2COL
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/xiaomi/mk02/info.json b/keyboards/xiaomi/mk02/info.json
index 58c3f3cbc3..16cbfd1703 100644
--- a/keyboards/xiaomi/mk02/info.json
+++ b/keyboards/xiaomi/mk02/info.json
@@ -8,109 +8,114 @@
         "pid": "0x0B91",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C14", "C15", "B11", "A1", "A2", "B12"],
+        "rows": ["A3", "A4", "A5", "A6", "A7", "B0"]
+    },
+    "diode_direction": "ROW2COL",
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
 
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
 
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
 
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
 
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
 
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
 
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
 
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
 
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"x": 16.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
 
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
 
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5}
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/xiaomi/mk02/mk02.c b/keyboards/xiaomi/mk02/mk02.c
index d3ecc155f1..19d8e67e19 100644
--- a/keyboards/xiaomi/mk02/mk02.c
+++ b/keyboards/xiaomi/mk02/mk02.c
@@ -1,4 +1,4 @@
-#include "mk02.h"
+#include "quantum.h"
 
 void bootloader_jump(void) {
     uint32_t *magic_address = (void*)0x20000FFC;
diff --git a/keyboards/xiaomi/mk02/mk02.h b/keyboards/xiaomi/mk02/mk02.h
deleted file mode 100644
index 12a7c8e1ad..0000000000
--- a/keyboards/xiaomi/mk02/mk02.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_tkl_ansi( \
-	K000,       K001, K002, K003, K004,    K005, K006, K007, K008,    K009, K010, K011, K012,    K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113,    K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K213,    K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K312,                      \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,                   K412,          K414,       \
-	K500, K501, K502,                   K505,                         K509, K510, K511, K512,    K513, K514, K515  \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014, K015, K016 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, KC_NO, K412, KC_NO, K414, KC_NO, KC_NO }, \
-    { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, K512, K513, K514, K515, KC_NO } \
-}
diff --git a/keyboards/xiudi/xd002/config.h b/keyboards/xiudi/xd002/config.h
index 19f01664b2..d442ee5762 100644
--- a/keyboards/xiudi/xd002/config.h
+++ b/keyboards/xiudi/xd002/config.h
@@ -16,7 +16,6 @@
 #pragma once
 
 #define RGBLED_NUM 2
-#define RGB_DI_PIN B2
 
 // Save as much space as we can...
 #define LAYER_STATE_8BIT
diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json
index c160af5f85..c36199e06e 100644
--- a/keyboards/xiudi/xd002/info.json
+++ b/keyboards/xiudi/xd002/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0202",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B2"
+  },
   "matrix_pins": {
     "direct": [
       ["B0", "B1"]
diff --git a/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rules.mk b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rules.mk
index 69d592aa4b..07c75adb47 100644
--- a/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rules.mk
+++ b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rules.mk
@@ -1,2 +1,2 @@
-SRC += ws2812.c
+WS2812_DRIVER_REQUIRED = yes
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/xiudi/xd002/keymaps/rgb_lite/rules.mk b/keyboards/xiudi/xd002/keymaps/rgb_lite/rules.mk
index 227bbcae32..9a69649289 100644
--- a/keyboards/xiudi/xd002/keymaps/rgb_lite/rules.mk
+++ b/keyboards/xiudi/xd002/keymaps/rgb_lite/rules.mk
@@ -1 +1 @@
-SRC += ws2812.c
+WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json
index a404780eea..8be0117d40 100644
--- a/keyboards/xiudi/xd004/info.json
+++ b/keyboards/xiudi/xd004/info.json
@@ -11,6 +11,9 @@
         "pin": "D5",
         "levels": 6
     },
+    "ws2812": {
+        "pin": "C6"
+    },
     "processor": "atmega16u2",
     "bootloader": "atmel-dfu",
     "matrix_pins": {
diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h
index 1e747adeaf..823ba86358 100644
--- a/keyboards/xiudi/xd004/v1/config.h
+++ b/keyboards/xiudi/xd004/v1/config.h
@@ -28,7 +28,6 @@ This will not be used, as RGBLIGHT_ENABLE is set to 'no' in rules.mk
 We do not have enough space in the flash for this at the moment, maybe
 further optimizations can be done on that side.
 */
-#define RGB_DI_PIN C6
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #define RGBLED_NUM 2
diff --git a/keyboards/xiudi/xd60/info.json b/keyboards/xiudi/xd60/info.json
index ce4274fc24..12787a72d7 100644
--- a/keyboards/xiudi/xd60/info.json
+++ b/keyboards/xiudi/xd60/info.json
@@ -30,8 +30,8 @@
                 {"label":")", "x":10, "y":0},
                 {"label":"_", "x":11, "y":0},
                 {"label":"+", "x":12, "y":0},
-                {"label":"BS", "x":13, "y":0, "w":1},
-                {"label":"BS", "x":14, "y":0, "w":1},
+                {"label":"BS", "x":13, "y":0},
+                {"label":"BS", "x":14, "y":0},
 
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
@@ -74,7 +74,7 @@
                 {"label":">", "x":10.25, "y":3},
                 {"label":"?", "x":11.25, "y":3},
                 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"FN", "x":14, "y":3, "w":1},
+                {"label":"FN", "x":14, "y":3},
 
                 {"label":"Ctrl", "x":0, "y":4, "w":1.25},
                 {"label":"Win", "x":1.25, "y":4, "w":1.25},
@@ -106,8 +106,8 @@
                 {"label":")", "x":10, "y":0},
                 {"label":"_", "x":11, "y":0},
                 {"label":"+", "x":12, "y":0},
-                {"label":"BS", "x":13, "y":0, "w":1},
-                {"label":"BS", "x":14, "y":0, "w":1},
+                {"label":"BS", "x":13, "y":0},
+                {"label":"BS", "x":14, "y":0},
 
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
@@ -151,7 +151,7 @@
                 {"label":">", "x":10.25, "y":3},
                 {"label":"?", "x":11.25, "y":3},
                 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"FN", "x":14, "y":3, "w":1},
+                {"label":"FN", "x":14, "y":3},
 
                 {"label":"Ctrl", "x":0, "y":4, "w":1.25},
                 {"label":"GUI", "x":1.25, "y":4, "w":1.25},
diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h
index 43a56c9a92..21efad0d81 100644
--- a/keyboards/xiudi/xd60/rev2/config.h
+++ b/keyboards/xiudi/xd60/rev2/config.h
@@ -17,27 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow
- * F6 PIN for XD60v2 that has pre-soldered WS2812 LEDs
  */
-#define RGB_DI_PIN F6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json
index 1951e52dfe..c45ef7af64 100644
--- a/keyboards/xiudi/xd60/rev2/info.json
+++ b/keyboards/xiudi/xd60/rev2/info.json
@@ -3,11 +3,19 @@
     "usb": {
         "pid": "0x6060"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "F5",
         "levels": 6,
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h
index 617d77b1de..f8845d411f 100644
--- a/keyboards/xiudi/xd60/rev3/config.h
+++ b/keyboards/xiudi/xd60/rev3/config.h
@@ -17,27 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow
- * F6 PIN for XD60v3 that has pre-soldered LEDs
  */
-#define RGB_DI_PIN F6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json
index 1b03e6c6e3..68c97c0a9e 100644
--- a/keyboards/xiudi/xd60/rev3/info.json
+++ b/keyboards/xiudi/xd60/rev3/info.json
@@ -3,11 +3,19 @@
     "usb": {
         "pid": "0x6363"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "F5",
         "levels": 6,
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index 93181b668b..e62b98a12d 100644
--- a/keyboards/xiudi/xd68/config.h
+++ b/keyboards/xiudi/xd68/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -56,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 // ws2812 options
-#define RGB_DI_PIN F6 // pin the DI on the ws2812 is hooked-up to
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json
index 8b1169474c..9a2fb81c5e 100644
--- a/keyboards/xiudi/xd68/info.json
+++ b/keyboards/xiudi/xd68/info.json
@@ -8,12 +8,20 @@
         "pid": "0x6868",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F7"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "F5",
         "levels": 6,
         "breathing": true,
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "indicators": {
         "caps_lock": "B2",
         "on_state": 0
@@ -24,220 +32,310 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"Page Up", "x":15, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Down", "x":15, "y":2},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Menu", "x":10, "y":4},
-                {"label":"Ctrl", "x":11, "y":4},
-                {"label":"Fn", "x":12, "y":4},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 8], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Grave.", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
-                {"label":"Home", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"Page Up", "x":15, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Page Down", "x":15, "y":2},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Menu", "x":10, "y":4},
-                {"label":"Ctrl", "x":11, "y":4},
-                {"label":"Fn", "x":12, "y":4},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [4, 9], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 8], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Home", "x":15, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"PgUp", "x":15, "y":1},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"#", "x":12.75, "y":2},
-                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                {"label":"PgDn", "x":15, "y":2},
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"Up", "x":14, "y":3},
-                {"label":"End", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Menu", "x":10, "y":4},
-                {"label":"Ctrl", "x":11, "y":4},
-                {"label":"Fn", "x":12, "y":4},
-                {"label":"Left", "x":13, "y":4},
-                {"label":"Down", "x":14, "y":4},
-                {"label":"Right", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 8], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+
+                {"matrix": [2, 0], "x": 30, "y": 0},
+                {"matrix": [2, 1], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 13], "x": 43, "y": 0},
+                {"matrix": [2, 14], "x": 44, "y": 0},
+
+                {"matrix": [3, 0], "x": 45, "y": 0},
+                {"matrix": [3, 1], "x": 46, "y": 0},
+                {"matrix": [3, 2], "x": 47, "y": 0},
+                {"matrix": [3, 3], "x": 48, "y": 0},
+                {"matrix": [3, 4], "x": 49, "y": 0},
+                {"matrix": [3, 5], "x": 50, "y": 0},
+                {"matrix": [3, 6], "x": 51, "y": 0},
+                {"matrix": [3, 7], "x": 52, "y": 0},
+                {"matrix": [3, 8], "x": 53, "y": 0},
+                {"matrix": [3, 9], "x": 54, "y": 0},
+                {"matrix": [3, 10], "x": 55, "y": 0},
+                {"matrix": [3, 11], "x": 56, "y": 0},
+                {"matrix": [3, 12], "x": 57, "y": 0},
+                {"matrix": [3, 13], "x": 58, "y": 0},
+                {"matrix": [3, 14], "x": 59, "y": 0},
+
+                {"matrix": [4, 0], "x": 60, "y": 0},
+                {"matrix": [4, 1], "x": 61, "y": 0},
+                {"matrix": [4, 2], "x": 62, "y": 0},
+                {"matrix": [4, 5], "x": 63, "y": 0},
+                {"matrix": [4, 10], "x": 64, "y": 0},
+                {"matrix": [4, 11], "x": 65, "y": 0},
+                {"matrix": [4, 8], "x": 66, "y": 0},
+                {"matrix": [4, 12], "x": 67, "y": 0},
+                {"matrix": [4, 13], "x": 68, "y": 0},
+                {"matrix": [4, 14], "x": 69, "y": 0}
             ]
         }
     }
diff --git a/keyboards/xiudi/xd68/xd68.c b/keyboards/xiudi/xd68/xd68.c
deleted file mode 100755
index 45e8a2b958..0000000000
--- a/keyboards/xiudi/xd68/xd68.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "xd68.h"
diff --git a/keyboards/xiudi/xd68/xd68.h b/keyboards/xiudi/xd68/xd68.h
deleted file mode 100755
index c4cd20db5c..0000000000
--- a/keyboards/xiudi/xd68/xd68.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-/* XD68 ALL (VIA) layout
-   * ,----------------------------------------------------------------.
-   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
-   * |----------------------------------------------------------------|
-   * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d | 1e |
-   * |----------------------------------------------------------------|
-   * | 20    | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c| 2d| 2e |
-   * |----------------------------------------------------------------|
-   * | 30  |31| 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
-   * |----------------------------------------------------------------|
-   * | 40 | 41 | 42 |        45             | 48| 4a|  4b| 4c| 4d| 4e |
-   * `----------------------------------------------------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,            k45,               k48, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {k40, k41, k42, XXX, XXX, k45, XXX, XXX, k4b, XXX, k48, k4a, k4c, k4d, k4e}  \
-}
-
-
-/* XD68 ANSI layout
-   * ,----------------------------------------------------------------.
-   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
-   * |----------------------------------------------------------------|
-   * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d | 1e |
-   * |----------------------------------------------------------------|
-   * | 20    | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d    | 2e |
-   * |----------------------------------------------------------------|
-   * | 30     | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
-   * |----------------------------------------------------------------|
-   * | 40 | 41 | 42 |        45             | 48| 4a|  4b| 4c| 4d| 4e |
-   * `----------------------------------------------------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_65_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,            k45,               k48, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \
-    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {k40, k41, k42, XXX, XXX, k45, XXX, XXX, k4b, XXX, k48, k4a, k4c, k4d, k4e}  \
-}
-
-/* XD68 ANSI layout with split backspace
-   * ,----------------------------------------------------------------.
-   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d| 49| 0e |
-   * |----------------------------------------------------------------|
-   * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d | 1e |
-   * |----------------------------------------------------------------|
-   * | 20    | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d    | 2e |
-   * |----------------------------------------------------------------|
-   * | 30     | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
-   * |----------------------------------------------------------------|
-   * | 40 | 41 | 42 |        45             | 48| 4a|  4b| 4c| 4d| 4e |
-   * `----------------------------------------------------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_65_ansi_split_bs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k49, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,            k45,               k48, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \
-    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {k40, k41, k42, XXX, XXX, k45, XXX, XXX, k4b, k49, k48, k4a, k4c, k4d, k4e}  \
-}
-
-/* XD68 ISO layout
-   * ,----------------------------------------------------------------.
-   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
-   * |----------------------------------------------------------------|
-   * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|     | 1e |
-   * |------------------------------------------------------.    -----|
-   * | 20   | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c|  2d| 2e |
-   * |----------------------------------------------------------------|
-   * | 30 | 31| 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
-   * |----------------------------------------------------------------|
-   * | 40 | 41 | 42 |        45             | 48| 4a|  4b| 4c| 4d| 4e |
-   * `----------------------------------------------------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_65_iso( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-    k40, k41, k42,            k45,               k48, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e}, \
-    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-    {k40, k41, k42, XXX, XXX, k45, XXX, XXX, k4b, XXX, k48, k4a, k4c, k4d, k4e} \
-}
diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h
index e4a2e0139e..f8938d2d9e 100644
--- a/keyboards/xiudi/xd75/config.h
+++ b/keyboards/xiudi/xd75/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, B0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 6
 #    define RGBLIGHT_HUE_STEP 12
 #    define RGBLIGHT_SAT_STEP 25
@@ -52,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json
index 54b1dc718b..bc2e724214 100644
--- a/keyboards/xiudi/xd75/info.json
+++ b/keyboards/xiudi/xd75/info.json
@@ -8,96 +8,107 @@
         "pid": "0x7575",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "B0"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "F5",
         "levels": 6,
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x15"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x15"
+    },
     "layouts": {
         "LAYOUT_ortho_5x15": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4},
-                {"x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"x":7, "y":4},
-                {"x":8, "y":4},
-                {"x":9, "y":4},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/xiudi/xd75/keymaps/boy_314/rules.mk b/keyboards/xiudi/xd75/keymaps/boy_314/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/xiudi/xd75/keymaps/boy_314/rules.mk
+++ /dev/null
diff --git a/keyboards/xiudi/xd75/keymaps/germanized/keymap.c b/keyboards/xiudi/xd75/keymaps/germanized/keymap.c
index cbb8da838e..1dc7bc9607 100644
--- a/keyboards/xiudi/xd75/keymaps/germanized/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/germanized/keymap.c
@@ -2,13 +2,6 @@
 */
 #include QMK_KEYBOARD_H
 
-#ifndef KEYMAP_GERMAN
-#define KEYMAP_GERMAN
-
-#include "keymap.h"
-
-#endif
-
 //Tap Dance Declarations
 enum {
   TD_ESC_RUPT = 0
diff --git a/keyboards/xiudi/xd75/xd75.h b/keyboards/xiudi/xd75/xd75.h
index 33f2ec92a5..f2c1844bef 100644
--- a/keyboards/xiudi/xd75/xd75.h
+++ b/keyboards/xiudi/xd75/xd75.h
@@ -29,27 +29,3 @@ void gp100_led_on(void);
 void gp103_led_init(void);
 void gp103_led_off(void);
 void gp103_led_on(void);
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x15( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT LAYOUT_ortho_5x15
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 5908cc6d24..42cce6f1c0 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -21,23 +21,6 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-//#define MATRIX_ROW_PINS { D0, D5 }
-//#define MATRIX_COL_PINS { F1, F0, B0 }
-
-/* COL2ROW, ROW2COL */
-//#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json
index 60fed56bce..f7bfaeaebd 100644
--- a/keyboards/xiudi/xd84/info.json
+++ b/keyboards/xiudi/xd84/info.json
@@ -17,185 +17,198 @@
         "caps_lock": "B6",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi", "75_iso"],
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":15, "y":3},
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"Up", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"Left", "x":13, "y":5},
-                {"label":"Down", "x":14, "y":5},
-                {"label":"Right", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 8], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"Page Up", "x":15, "y":2},
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"Page Down", "x":15, "y":3},
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"Up", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"Left", "x":13, "y":5},
-                {"label":"Down", "x":14, "y":5},
-                {"label":"Right", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 8], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/xiudi/xd84/xd84.c b/keyboards/xiudi/xd84/xd84.c
deleted file mode 100644
index dec4ef95e2..0000000000
--- a/keyboards/xiudi/xd84/xd84.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "xd84.h"
diff --git a/keyboards/xiudi/xd84/xd84.h b/keyboards/xiudi/xd84/xd84.h
deleted file mode 100644
index d59956f691..0000000000
--- a/keyboards/xiudi/xd84/xd84.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define ____ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_75_ansi( \
-    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,       K216, \
-    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       K316, \
-    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414,       K416, \
-    K501,       K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, \
-    K601, K602, K603,                       K607,               K611, K612, K613, K614, K615, K616  \
-) { \
-    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116 }, \
-    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216 }, \
-    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316 }, \
-    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, ____, K414, K416 }, \
-    { K501, ____, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516 }, \
-    { K601, K602, K603, ____, ____, K607, K115, ____, K613, ____, K611, K612, K614, K615, K616 }  \
-}
-
-#define LAYOUT_75_iso( \
-    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,       K216, \
-    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,             K316, \
-    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, \
-    K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, \
-    K601, K602, K603,                       K607,               K611, K612, K613, K614, K615, K616  \
-) { \
-    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116 }, \
-    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216 }, \
-    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, ____, K316 }, \
-    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415, K416 }, \
-    { K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516 }, \
-    { K601, K602, K603, ____, ____, K607, K115, ____, K613, ____, K611, K612, K614, K615, K616 }  \
-}
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index 7390a6cd0a..3c5bbfbdce 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F4, D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 12
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
@@ -40,7 +32,6 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json
index 88968b933f..e905ff3e7e 100644
--- a/keyboards/xiudi/xd84pro/info.json
+++ b/keyboards/xiudi/xd84pro/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8450",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F7"],
+        "rows": ["F4", "D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "F5",
         "levels": 10,
@@ -17,276 +22,294 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi", "75_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1},
-                {"label":"Backspace", "x":14, "y":1},
-                {"label":"Home", "x":15, "y":1},
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"\\", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":3, "w":1.25},
-                {"label":"Page Down", "x":15, "y":3},
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"Shift", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"Up", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"Left", "x":13, "y":5},
-                {"label":"Down", "x":14, "y":5},
-                {"label":"Right", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [5, 9], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 8], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Page Up", "x":15, "y":2},
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Down", "x":15, "y":3},
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"Up", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"Left", "x":13, "y":5},
-                {"label":"Down", "x":14, "y":5},
-                {"label":"Right", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 8], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"Page Up", "x":15, "y":2},
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"Page Down", "x":15, "y":3},
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"Up", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"Left", "x":13, "y":5},
-                {"label":"Down", "x":14, "y":5},
-                {"label":"Right", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 8], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/xiudi/xd84pro/xd84pro.c b/keyboards/xiudi/xd84pro/xd84pro.c
deleted file mode 100644
index 0eb52fda0f..0000000000
--- a/keyboards/xiudi/xd84pro/xd84pro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "xd84pro.h"
diff --git a/keyboards/xiudi/xd84pro/xd84pro.h b/keyboards/xiudi/xd84pro/xd84pro.h
deleted file mode 100644
index eda75eac66..0000000000
--- a/keyboards/xiudi/xd84pro/xd84pro.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2020
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define ____ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
-    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       K316, \
-    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,       K416, \
-    K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, \
-    K601, K602, K603,                       K607,               K611, K612, K613, K614, K615, K616  \
-) { \
-    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116 }, \
-    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216 }, \
-    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316 }, \
-    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K416 }, \
-    { K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516 }, \
-    { K601, K602, K603, ____, ____, K607, K115, ____, K613, K215, K611, K612, K614, K615, K616 }  \
-}
-
-#define LAYOUT_75_ansi( \
-    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,       K216, \
-    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       K316, \
-    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414,       K416, \
-    K501,       K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, \
-    K601, K602, K603,                       K607,               K611, K612, K613, K614, K615, K616  \
-) { \
-    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116 }, \
-    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216 }, \
-    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316 }, \
-    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, ____, K414, K416 }, \
-    { K501, ____, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516 }, \
-    { K601, K602, K603, ____, ____, K607, K115, ____, K613, ____, K611, K612, K614, K615, K616 }  \
-}
-
-#define LAYOUT_75_iso( \
-    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,       K216, \
-    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,             K316, \
-    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, \
-    K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, \
-    K601, K602, K603,                       K607,               K611, K612, K613, K614, K615, K616  \
-) { \
-    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116 }, \
-    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216 }, \
-    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, ____, K316 }, \
-    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415, K416 }, \
-    { K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516 }, \
-    { K601, K602, K603, ____, ____, K607, K115, ____, K613, ____, K611, K612, K614, K615, K616 }  \
-}
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index 42a49372ce..d89929e9c8 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/config.h
@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-#define MATRIX_ROW_PINS { D1, B0, B1, C7, D3, D5 }
-
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5, B6, C6, D4, D6, D7, B4, B2, B3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -52,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json
index 52d010ada5..5aa56a60e9 100644
--- a/keyboards/xiudi/xd87/info.json
+++ b/keyboards/xiudi/xd87/info.json
@@ -8,6 +8,11 @@
     "pid": "0x8787",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B6", "C6", "D4", "D6", "D7", "B4", "B2", "B3", "D2"],
+    "rows": ["D1", "B0", "B1", "C7", "D3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D0",
     "on_state": 0
@@ -16,290 +21,331 @@
     "caps_lock": "E2",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "B7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["tkl_ansi", "tkl_iso"],
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        { "label": "K00", "x": 0, "y": 0 },
-        { "label": "K01", "x": 1, "y": 0 },
-        { "label": "K02", "x": 2, "y": 0 },
-        { "label": "K03", "x": 3, "y": 0 },
-        { "label": "K04", "x": 4, "y": 0 },
-        { "label": "K05", "x": 5, "y": 0 },
-        { "label": "K06", "x": 6.5, "y": 0 },
-        { "label": "K07", "x": 7.5, "y": 0 },
-        { "label": "K08", "x": 8.5, "y": 0 },
-        { "label": "K09", "x": 9.5, "y": 0 },
-        { "label": "K0A", "x": 11, "y": 0 },
-        { "label": "K0B", "x": 12, "y": 0 },
-        { "label": "K0C", "x": 13, "y": 0 },
-        { "label": "K0D", "x": 14, "y": 0 },
-        { "label": "K0E", "x": 15.25, "y": 0 },
-        { "label": "K0F", "x": 16.25, "y": 0 },
-        { "label": "K0G", "x": 17.25, "y": 0 },
-        { "label": "K10", "x": 0, "y": 1.25 },
-        { "label": "K11", "x": 1, "y": 1.25 },
-        { "label": "K12", "x": 2, "y": 1.25 },
-        { "label": "K13", "x": 3, "y": 1.25 },
-        { "label": "K14", "x": 4, "y": 1.25 },
-        { "label": "K15", "x": 5, "y": 1.25 },
-        { "label": "K16", "x": 6, "y": 1.25 },
-        { "label": "K17", "x": 7, "y": 1.25 },
-        { "label": "K18", "x": 8, "y": 1.25 },
-        { "label": "K19", "x": 9, "y": 1.25 },
-        { "label": "K1A", "x": 10, "y": 1.25 },
-        { "label": "K1B", "x": 11, "y": 1.25 },
-        { "label": "K1C", "x": 12, "y": 1.25 },
-        { "label": "K1D", "x": 13, "y": 1.25 },
-        { "label": "K3E", "x": 14, "y": 1.25 },
-        { "label": "K1E", "x": 15.25, "y": 1.25 },
-        { "label": "K1F", "x": 16.25, "y": 1.25 },
-        { "label": "K1G", "x": 17.25, "y": 1.25 },
-        { "label": "K20", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "K21", "x": 1.5, "y": 2.25 },
-        { "label": "K22", "x": 2.5, "y": 2.25 },
-        { "label": "K23", "x": 3.5, "y": 2.25 },
-        { "label": "K24", "x": 4.5, "y": 2.25 },
-        { "label": "K25", "x": 5.5, "y": 2.25 },
-        { "label": "K26", "x": 6.5, "y": 2.25 },
-        { "label": "K27", "x": 7.5, "y": 2.25 },
-        { "label": "K28", "x": 8.5, "y": 2.25 },
-        { "label": "K29", "x": 9.5, "y": 2.25 },
-        { "label": "K2A", "x": 10.5, "y": 2.25 },
-        { "label": "K2B", "x": 11.5, "y": 2.25 },
-        { "label": "K2C", "x": 12.5, "y": 2.25 },
-        { "label": "K2D", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "K2E", "x": 15.25, "y": 2.25 },
-        { "label": "K2F", "x": 16.25, "y": 2.25 },
-        { "label": "K2G", "x": 17.25, "y": 2.25 },
-        { "label": "K30", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "K31", "x": 1.75, "y": 3.25 },
-        { "label": "K32", "x": 2.75, "y": 3.25 },
-        { "label": "K33", "x": 3.75, "y": 3.25 },
-        { "label": "K34", "x": 4.75, "y": 3.25 },
-        { "label": "K35", "x": 5.75, "y": 3.25 },
-        { "label": "K36", "x": 6.75, "y": 3.25 },
-        { "label": "K37", "x": 7.75, "y": 3.25 },
-        { "label": "K38", "x": 8.75, "y": 3.25 },
-        { "label": "K39", "x": 9.75, "y": 3.25 },
-        { "label": "K3A", "x": 10.75, "y": 3.25 },
-        { "label": "K3B", "x": 11.75, "y": 3.25 },
-        { "label": "K3C", "x": 12.75, "y": 3.25 },
-        { "label": "K3D", "x": 13.75, "y": 3.25, "w": 1.25 },
-        { "label": "K40", "x": 0, "y": 4.25, "w": 1.25 },
-        { "label": "K41", "x": 1.25, "y": 4.25 },
-        { "label": "K42", "x": 2.25, "y": 4.25 },
-        { "label": "K43", "x": 3.25, "y": 4.25 },
-        { "label": "K44", "x": 4.25, "y": 4.25 },
-        { "label": "K45", "x": 5.25, "y": 4.25 },
-        { "label": "K46", "x": 6.25, "y": 4.25 },
-        { "label": "K47", "x": 7.25, "y": 4.25 },
-        { "label": "K48", "x": 8.25, "y": 4.25 },
-        { "label": "K49", "x": 9.25, "y": 4.25 },
-        { "label": "K4A", "x": 10.25, "y": 4.25 },
-        { "label": "K4B", "x": 11.25, "y": 4.25 },
-        { "label": "K4C", "x": 12.25, "y": 4.25, "w": 1.75 },
-        { "label": "K4D", "x": 14, "y": 4.25 },
-        { "label": "K4E", "x": 15.25, "y": 4.25 },
-        { "label": "K4F", "x": 16.25, "y": 4.25 },
-        { "label": "K4G", "x": 17.25, "y": 4.25 },
-        { "label": "K50", "x": 0, "y": 5.25, "w": 1.5 },
-        { "label": "K51", "x": 1.5, "y": 5.25 },
-        { "label": "K52", "x": 2.5, "y": 5.25, "w": 1.5 },
-        { "label": "K55", "x": 4, "y": 5.25, "w": 3 },
-        { "label": "K58", "x": 7, "y": 5.25, "w": 3 },
-        { "label": "K5A", "x": 10, "y": 5.25, "w": 1.25 },
-        { "label": "K5B", "x": 11.25, "y": 5.25, "w": 1.25 },
-        { "label": "K5C", "x": 12.5, "y": 5.25, "w": 1.25 },
-        { "label": "K5D", "x": 13.75, "y": 5.25, "w": 1.25 },
-        { "label": "K5E", "x": 15.25, "y": 5.25 },
-        { "label": "K5F", "x": 16.25, "y": 5.25 },
-        { "label": "K5G", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 11, "y": 0},
+        {"matrix": [0, 11], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25},
+        {"matrix": [3, 14], "x": 14, "y": 1.25},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+        {"matrix": [4, 16], "x": 17.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 3},
+        {"matrix": [5, 8], "x": 7, "y": 5.25, "w": 3},
+        {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_ansi": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 2, "y": 0 },
-        { "label": "F2", "x": 3, "y": 0 },
-        { "label": "F3", "x": 4, "y": 0 },
-        { "label": "F4", "x": 5, "y": 0 },
-        { "label": "F5", "x": 6.5, "y": 0 },
-        { "label": "F6", "x": 7.5, "y": 0 },
-        { "label": "F7", "x": 8.5, "y": 0 },
-        { "label": "F8", "x": 9.5, "y": 0 },
-        { "label": "F9", "x": 11, "y": 0 },
-        { "label": "F10", "x": 12, "y": 0 },
-        { "label": "F11", "x": 13, "y": 0 },
-        { "label": "F12", "x": 14, "y": 0 },
-        { "label": "Print Screen", "x": 15.25, "y": 0 },
-        { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-        { "label": "`", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PgUp", "x": 17.25, "y": 1.25 },
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PgDn", "x": 17.25, "y": 2.25 },
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "Up", "x": 16.25, "y": 4.25 },
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-        { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-        { "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 },
-        { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-        { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-        { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-        { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-        { "label": "Left", "x": 15.25, "y": 5.25 },
-        { "label": "Down", "x": 16.25, "y": 5.25 },
-        { "label": "Right", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 11, "y": 0},
+        {"matrix": [0, 11], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 8], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_iso": {
       "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
-        { "label": "F1", "x": 2, "y": 0 },
-        { "label": "F2", "x": 3, "y": 0 },
-        { "label": "F3", "x": 4, "y": 0 },
-        { "label": "F4", "x": 5, "y": 0 },
-        { "label": "F5", "x": 6.5, "y": 0 },
-        { "label": "F6", "x": 7.5, "y": 0 },
-        { "label": "F7", "x": 8.5, "y": 0 },
-        { "label": "F8", "x": 9.5, "y": 0 },
-        { "label": "F9", "x": 11, "y": 0 },
-        { "label": "F10", "x": 12, "y": 0 },
-        { "label": "F11", "x": 13, "y": 0 },
-        { "label": "F12", "x": 14, "y": 0 },
-        { "label": "Print Screen", "x": 15.25, "y": 0 },
-        { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-        { "label": "Pause", "x": 17.25, "y": 0 },
-        { "label": "`", "x": 0, "y": 1.25 },
-        { "label": "1", "x": 1, "y": 1.25 },
-        { "label": "2", "x": 2, "y": 1.25 },
-        { "label": "3", "x": 3, "y": 1.25 },
-        { "label": "4", "x": 4, "y": 1.25 },
-        { "label": "5", "x": 5, "y": 1.25 },
-        { "label": "6", "x": 6, "y": 1.25 },
-        { "label": "7", "x": 7, "y": 1.25 },
-        { "label": "8", "x": 8, "y": 1.25 },
-        { "label": "9", "x": 9, "y": 1.25 },
-        { "label": "0", "x": 10, "y": 1.25 },
-        { "label": "-", "x": 11, "y": 1.25 },
-        { "label": "=", "x": 12, "y": 1.25 },
-        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-        { "label": "Insert", "x": 15.25, "y": 1.25 },
-        { "label": "Home", "x": 16.25, "y": 1.25 },
-        { "label": "PgUp", "x": 17.25, "y": 1.25 },
-        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 2.25 },
-        { "label": "W", "x": 2.5, "y": 2.25 },
-        { "label": "E", "x": 3.5, "y": 2.25 },
-        { "label": "R", "x": 4.5, "y": 2.25 },
-        { "label": "T", "x": 5.5, "y": 2.25 },
-        { "label": "Y", "x": 6.5, "y": 2.25 },
-        { "label": "U", "x": 7.5, "y": 2.25 },
-        { "label": "I", "x": 8.5, "y": 2.25 },
-        { "label": "O", "x": 9.5, "y": 2.25 },
-        { "label": "P", "x": 10.5, "y": 2.25 },
-        { "label": "[", "x": 11.5, "y": 2.25 },
-        { "label": "]", "x": 12.5, "y": 2.25 },
-        { "label": "Delete", "x": 15.25, "y": 2.25 },
-        { "label": "End", "x": 16.25, "y": 2.25 },
-        { "label": "PgDn", "x": 17.25, "y": 2.25 },
-        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 3.25 },
-        { "label": "S", "x": 2.75, "y": 3.25 },
-        { "label": "D", "x": 3.75, "y": 3.25 },
-        { "label": "F", "x": 4.75, "y": 3.25 },
-        { "label": "G", "x": 5.75, "y": 3.25 },
-        { "label": "H", "x": 6.75, "y": 3.25 },
-        { "label": "J", "x": 7.75, "y": 3.25 },
-        { "label": "K", "x": 8.75, "y": 3.25 },
-        { "label": "L", "x": 9.75, "y": 3.25 },
-        { "label": ";", "x": 10.75, "y": 3.25 },
-        { "label": "'", "x": 11.75, "y": 3.25 },
-        { "label": "#", "x": 12.75, "y": 3.25 },
-        { "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 },
-        { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
-        { "label": "\\", "x": 1.25, "y": 4.25 },
-        { "label": "Z", "x": 2.25, "y": 4.25 },
-        { "label": "X", "x": 3.25, "y": 4.25 },
-        { "label": "C", "x": 4.25, "y": 4.25 },
-        { "label": "V", "x": 5.25, "y": 4.25 },
-        { "label": "B", "x": 6.25, "y": 4.25 },
-        { "label": "N", "x": 7.25, "y": 4.25 },
-        { "label": "M", "x": 8.25, "y": 4.25 },
-        { "label": ",", "x": 9.25, "y": 4.25 },
-        { "label": ".", "x": 10.25, "y": 4.25 },
-        { "label": "/", "x": 11.25, "y": 4.25 },
-        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-        { "label": "Up", "x": 16.25, "y": 4.25 },
-        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-        { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-        { "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 },
-        { "label": "AltGr", "x": 10, "y": 5.25, "w": 1.25 },
-        { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-        { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-        { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-        { "label": "Left", "x": 15.25, "y": 5.25 },
-        { "label": "Down", "x": 16.25, "y": 5.25 },
-        { "label": "Right", "x": 17.25, "y": 5.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 11, "y": 0},
+        {"matrix": [0, 11], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 8], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.25}
       ]
     }
   }
diff --git a/keyboards/xiudi/xd87/xd87.c b/keyboards/xiudi/xd87/xd87.c
deleted file mode 100644
index 1d21357e66..0000000000
--- a/keyboards/xiudi/xd87/xd87.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 Alexander Fougner <fougner89 at gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "xd87.h"
diff --git a/keyboards/xiudi/xd87/xd87.h b/keyboards/xiudi/xd87/xd87.h
deleted file mode 100644
index 2d700d7ba4..0000000000
--- a/keyboards/xiudi/xd87/xd87.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2018 Alexander Fougner <fougner89 at gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k3E, k1E, k1F, k1G, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D,      k4E, k4F, k4G, \
-    k50, k51, k52,           k55,      k58,           k5A, k5B, k5C, k5D,      k5E, k5F, k5G \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \
-    { k50, k51, k52, XXX, XXX, k55, XXX, XXX, k58, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, k1F, k1G, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,                k4F, \
-    k50, k51, k52,                k58,                k5A, k5B, k5C, k5D,      k5E, k5F, k5G \
-) { \
-    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, XXX }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, XXX, k4F, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, XXX, XXX, k58, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
-}
-
-#define LAYOUT_tkl_iso( \
-    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, k1F, k1G, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,           k2E, k2F, k2G, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,                k4F, \
-    k50, k51, k52,                k58,                k5A, k5B, k5C, k5D,      k5E, k5F, k5G \
-) { \
-    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F, k2G }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, XXX, k4F, XXX }, \
-    { k50, k51, k52, XXX, XXX, XXX, XXX, XXX, k58, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
-}
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index 5950630920..5fc09b0483 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -21,23 +21,6 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 18
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-//#define MATRIX_ROW_PINS { D0, D5 }
-//#define MATRIX_COL_PINS { F1, F0, B0 }
-
-/* COL2ROW, ROW2COL */
-//#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
index 7d60236491..03b38f39ee 100644
--- a/keyboards/xiudi/xd96/info.json
+++ b/keyboards/xiudi/xd96/info.json
@@ -17,347 +17,340 @@
     "num_lock": "C6",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "C7"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {  
     "LAYOUT_96_ansi": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"Insert", "x":13, "y":0},
-        {"label":"Delete", "x":14, "y":0},
-        {"label":"Home", "x":15, "y":0},
-        {"label":"End", "x":16, "y":0},
-        {"label":"PgUp", "x":17, "y":0},
-        {"label":"PgDn", "x":18, "y":0},
-
-        {"label":"~", "x":0, "y":1},
-        {"label":"!", "x":1, "y":1},
-        {"label":"@", "x":2, "y":1},
-        {"label":"#", "x":3, "y":1},
-        {"label":"$", "x":4, "y":1},
-        {"label":"%", "x":5, "y":1},
-        {"label":"^", "x":6, "y":1},
-        {"label":"&", "x":7, "y":1},
-        {"label":"*", "x":8, "y":1},
-        {"label":"(", "x":9, "y":1},
-        {"label":")", "x":10, "y":1},
-        {"label":"_", "x":11, "y":1},
-        {"label":"+", "x":12, "y":1},
-        {"label":"Backspace", "x":13, "y":1, "w":2},
-
-        {"label":"Num Lock", "x":15, "y":1},
-        {"label":"/", "x":16, "y":1},
-        {"label":"*", "x":17, "y":1},
-        {"label":"-", "x":18, "y":1},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [5, 6], "x": 14, "y": 0},
+        {"matrix": [0, 14], "x": 15, "y": 0},
+        {"matrix": [0, 15], "x": 16, "y": 0},
+        {"matrix": [0, 16], "x": 17, "y": 0},
+        {"matrix": [0, 17], "x": 18, "y": 0},
 
-        {"label":"Tab", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"{", "x":11.5, "y":2},
-        {"label":"}", "x":12.5, "y":2},
-        {"label":"|", "x":13.5, "y":2, "w":1.5},
-        {"label":"7", "x":15, "y":2},
-        {"label":"8", "x":16, "y":2},
-        {"label":"9", "x":17, "y":2},
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+        {"matrix": [1, 12], "x": 12, "y": 1},
+        {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+        {"matrix": [1, 14], "x": 15, "y": 1},
+        {"matrix": [1, 15], "x": 16, "y": 1},
+        {"matrix": [1, 16], "x": 17, "y": 1},
+        {"matrix": [1, 17], "x": 18, "y": 1},
 
-        {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":":", "x":10.75, "y":3},
-        {"label":"\"", "x":11.75, "y":3},
-        {"label":"Enter", "x":12.75, "y":3, "w":2.25},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+        {"matrix": [2, 11], "x": 11.5, "y": 2},
+        {"matrix": [2, 12], "x": 12.5, "y": 2},
+        {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+        {"matrix": [2, 14], "x": 15, "y": 2},
+        {"matrix": [2, 15], "x": 16, "y": 2},
+        {"matrix": [2, 16], "x": 17, "y": 2},
 
-        {"label":"4", "x":15, "y":3},
-        {"label":"5", "x":16, "y":3},
-        {"label":"6", "x":17, "y":3},
-        {"label":"+", "x":18, "y":2, "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": [3, 6], "x": 6.75, "y": 3},
+        {"matrix": [3, 7], "x": 7.75, "y": 3},
+        {"matrix": [3, 8], "x": 8.75, "y": 3},
+        {"matrix": [3, 9], "x": 9.75, "y": 3},
+        {"matrix": [3, 10], "x": 10.75, "y": 3},
+        {"matrix": [3, 11], "x": 11.75, "y": 3},
+        {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+        {"matrix": [3, 14], "x": 15, "y": 3},
+        {"matrix": [3, 15], "x": 16, "y": 3},
+        {"matrix": [3, 16], "x": 17, "y": 3},
+        {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
 
-        {"label":"Shift", "x":0, "y":4, "w":2.25},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":"<", "x":9.25, "y":4},
-        {"label":">", "x":10.25, "y":4},
-        {"label":"?", "x":11.25, "y":4},
-        {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-        {"label":"\u2191", "x":14, "y":4},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4},
+        {"matrix": [4, 3], "x": 3.25, "y": 4},
+        {"matrix": [4, 4], "x": 4.25, "y": 4},
+        {"matrix": [4, 5], "x": 5.25, "y": 4},
+        {"matrix": [4, 6], "x": 6.25, "y": 4},
+        {"matrix": [4, 7], "x": 7.25, "y": 4},
+        {"matrix": [4, 8], "x": 8.25, "y": 4},
+        {"matrix": [4, 9], "x": 9.25, "y": 4},
+        {"matrix": [4, 10], "x": 10.25, "y": 4},
+        {"matrix": [4, 11], "x": 11.25, "y": 4},
+        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4},
+        {"matrix": [4, 14], "x": 15, "y": 4},
+        {"matrix": [4, 15], "x": 16, "y": 4},
+        {"matrix": [4, 16], "x": 17, "y": 4},
 
-        {"label":"1", "x":15, "y":4},
-        {"label":"2", "x":16, "y":4},
-        {"label":"3", "x":17, "y":4},
-
-        {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-        {"label":"Win", "x":1.25, "y":5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-        {"x":3.75, "y":5, "w":6.25},
-        {"label":"Alt", "x":10, "y":5, "w":1.5},
-        {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-        {"label":"\u2190", "x":13, "y":5},
-        {"label":"\u2193", "x":14, "y":5},
-        {"label":"\u2192", "x":15, "y":5},
-
-        {"label":"0", "x":16, "y":5},
-        {"label":".", "x":17, "y":5},
-        {"label":"Enter", "x":18, "y":4, "h":2}
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+        {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+        {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+        {"matrix": [5, 12], "x": 13, "y": 5},
+        {"matrix": [5, 13], "x": 14, "y": 5},
+        {"matrix": [5, 14], "x": 15, "y": 5},
+        {"matrix": [5, 15], "x": 16, "y": 5},
+        {"matrix": [5, 16], "x": 17, "y": 5},
+        {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
       ]
     },
     "LAYOUT_96_iso": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"Insert", "x":13, "y":0},
-        {"label":"Delete", "x":14, "y":0},
-        {"label":"Home", "x":15, "y":0},
-        {"label":"End", "x":16, "y":0},
-        {"label":"PgUp", "x":17, "y":0},
-        {"label":"PgDn", "x":18, "y":0},
-
-        {"label":"~", "x":0, "y":1},
-        {"label":"!", "x":1, "y":1},
-        {"label":"\"", "x":2, "y":1},
-        {"label":"\u00a3", "x":3, "y":1},
-        {"label":"$", "x":4, "y":1},
-        {"label":"%", "x":5, "y":1},
-        {"label":"^", "x":6, "y":1},
-        {"label":"&", "x":7, "y":1},
-        {"label":"*", "x":8, "y":1},
-        {"label":"(", "x":9, "y":1},
-        {"label":")", "x":10, "y":1},
-        {"label":"_", "x":11, "y":1},
-        {"label":"+", "x":12, "y":1},
-        {"label":"Backspace", "x":13, "y":1, "w":2},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [5, 6], "x": 14, "y": 0},
+        {"matrix": [0, 14], "x": 15, "y": 0},
+        {"matrix": [0, 15], "x": 16, "y": 0},
+        {"matrix": [0, 16], "x": 17, "y": 0},
+        {"matrix": [0, 17], "x": 18, "y": 0},
 
-        {"label":"Num Lock", "x":15, "y":1},
-        {"label":"/", "x":16, "y":1},
-        {"label":"*", "x":17, "y":1},
-        {"label":"-", "x":18, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+        {"matrix": [1, 12], "x": 12, "y": 1},
+        {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+        {"matrix": [1, 14], "x": 15, "y": 1},
+        {"matrix": [1, 15], "x": 16, "y": 1},
+        {"matrix": [1, 16], "x": 17, "y": 1},
+        {"matrix": [1, 17], "x": 18, "y": 1},
 
-        {"label":"Tab", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"{", "x":11.5, "y":2},
-        {"label":"}", "x":12.5, "y":2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+        {"matrix": [2, 11], "x": 11.5, "y": 2},
+        {"matrix": [2, 12], "x": 12.5, "y": 2},
+        {"matrix": [2, 14], "x": 15, "y": 2},
+        {"matrix": [2, 15], "x": 16, "y": 2},
+        {"matrix": [2, 16], "x": 17, "y": 2},
 
-        {"label":"7", "x":15, "y":2},
-        {"label":"8", "x":16, "y":2},
-        {"label":"9", "x":17, "y":2},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+        {"matrix": [3, 6], "x": 6.75, "y": 3},
+        {"matrix": [3, 7], "x": 7.75, "y": 3},
+        {"matrix": [3, 8], "x": 8.75, "y": 3},
+        {"matrix": [3, 9], "x": 9.75, "y": 3},
+        {"matrix": [3, 10], "x": 10.75, "y": 3},
+        {"matrix": [3, 11], "x": 11.75, "y": 3},
+        {"matrix": [3, 13], "x": 12.75, "y": 3},
+        {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+        {"matrix": [3, 14], "x": 15, "y": 3},
+        {"matrix": [3, 15], "x": 16, "y": 3},
+        {"matrix": [3, 16], "x": 17, "y": 3},
+        {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
 
-        {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":":", "x":10.75, "y":3},
-        {"label":"@", "x":11.75, "y":3},
-        {"label":"~", "x":12.75, "y":3},
-        {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4},
+        {"matrix": [4, 2], "x": 2.25, "y": 4},
+        {"matrix": [4, 3], "x": 3.25, "y": 4},
+        {"matrix": [4, 4], "x": 4.25, "y": 4},
+        {"matrix": [4, 5], "x": 5.25, "y": 4},
+        {"matrix": [4, 6], "x": 6.25, "y": 4},
+        {"matrix": [4, 7], "x": 7.25, "y": 4},
+        {"matrix": [4, 8], "x": 8.25, "y": 4},
+        {"matrix": [4, 9], "x": 9.25, "y": 4},
+        {"matrix": [4, 10], "x": 10.25, "y": 4},
+        {"matrix": [4, 11], "x": 11.25, "y": 4},
+        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4},
+        {"matrix": [4, 14], "x": 15, "y": 4},
+        {"matrix": [4, 15], "x": 16, "y": 4},
+        {"matrix": [4, 16], "x": 17, "y": 4},
 
-        {"label":"4", "x":15, "y":3},
-        {"label":"5", "x":16, "y":3},
-        {"label":"6", "x":17, "y":3},
-        {"label":"+", "x":18, "y":2, "h":2},
-
-        {"label":"Shift", "x":0, "y":4, "w":1.25},
-        {"label":"|", "x":1.25, "y":4},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":"<", "x":9.25, "y":4},
-        {"label":">", "x":10.25, "y":4},
-        {"label":"?", "x":11.25, "y":4},
-        {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-        {"label":"\u2191", "x":14, "y":4},
-
-        {"label":"1", "x":15, "y":4},
-        {"label":"2", "x":16, "y":4},
-        {"label":"3", "x":17, "y":4},
-
-        {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-        {"label":"Win", "x":1.25, "y":5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-        {"x":3.75, "y":5, "w":6.25},
-        {"label":"Alt", "x":10, "y":5, "w":1.5},
-        {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-        {"label":"\u2190", "x":13, "y":5},
-        {"label":"\u2193", "x":14, "y":5},
-        {"label":"\u2192", "x":15, "y":5},
-
-        {"label":"0", "x":16, "y":5},
-        {"label":".", "x":17, "y":5},
-        {"label":"Enter", "x":18, "y":4, "h":2}
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+        {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+        {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+        {"matrix": [5, 12], "x": 13, "y": 5},
+        {"matrix": [5, 13], "x": 14, "y": 5},
+        {"matrix": [5, 14], "x": 15, "y": 5},
+        {"matrix": [5, 15], "x": 16, "y": 5},
+        {"matrix": [5, 16], "x": 17, "y": 5},
+        {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
       ]
     },
     "LAYOUT_all": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"Insert", "x":13, "y":0},
-        {"label":"Delete", "x":14, "y":0},
-        {"label":"Home", "x":15, "y":0},
-        {"label":"End", "x":16, "y":0},
-        {"label":"PgUp", "x":17, "y":0},
-        {"label":"PgDn", "x":18, "y":0},
-
-        {"label":"~", "x":0, "y":1},
-        {"label":"!", "x":1, "y":1},
-        {"label":"@", "x":2, "y":1},
-        {"label":"#", "x":3, "y":1},
-        {"label":"$", "x":4, "y":1},
-        {"label":"%", "x":5, "y":1},
-        {"label":"^", "x":6, "y":1},
-        {"label":"&", "x":7, "y":1},
-        {"label":"*", "x":8, "y":1},
-        {"label":"(", "x":9, "y":1},
-        {"label":")", "x":10, "y":1},
-        {"label":"_", "x":11, "y":1},
-        {"label":"+", "x":12, "y":1},
-        {"label":"Backspace", "x":13, "y":1},
-        {"label":"Backspace", "x":14, "y":1},
-        {"label":"Num Lock", "x":15, "y":1},
-        {"label":"/", "x":16, "y":1},
-        {"label":"*", "x":17, "y":1},
-        {"label":"-", "x":18, "y":1},
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [5, 6], "x": 14, "y": 0},
+        {"matrix": [0, 14], "x": 15, "y": 0},
+        {"matrix": [0, 15], "x": 16, "y": 0},
+        {"matrix": [0, 16], "x": 17, "y": 0},
+        {"matrix": [0, 17], "x": 18, "y": 0},
 
-        {"label":"Tab", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"{", "x":11.5, "y":2},
-        {"label":"}", "x":12.5, "y":2},
-        {"label":"|", "x":13.5, "y":2, "w":1.5},
-        {"label":"7", "x":15, "y":2},
-        {"label":"8", "x":16, "y":2},
-        {"label":"9", "x":17, "y":2},
-        {"label":"+", "x":18, "y":2},
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+        {"matrix": [1, 12], "x": 12, "y": 1},
+        {"matrix": [1, 13], "x": 13, "y": 1},
+        {"matrix": [5, 3], "x": 14, "y": 1},
+        {"matrix": [1, 14], "x": 15, "y": 1},
+        {"matrix": [1, 15], "x": 16, "y": 1},
+        {"matrix": [1, 16], "x": 17, "y": 1},
+        {"matrix": [1, 17], "x": 18, "y": 1},
 
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+        {"matrix": [2, 11], "x": 11.5, "y": 2},
+        {"matrix": [2, 12], "x": 12.5, "y": 2},
+        {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+        {"matrix": [2, 14], "x": 15, "y": 2},
+        {"matrix": [2, 15], "x": 16, "y": 2},
+        {"matrix": [2, 16], "x": 17, "y": 2},
+        {"matrix": [2, 17], "x": 18, "y": 2},
 
-        {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":":", "x":10.75, "y":3},
-        {"label":"\"", "x":11.75, "y":3},
-        {"label":"Enter", "x":12.75, "y":3},
-        {"label":"Enter", "x":13.75, "y":3, "w":1.25},
-        {"label":"4", "x":15, "y":3},
-        {"label":"5", "x":16, "y":3},
-        {"label":"6", "x":17, "y":3},
-        {"label":"+", "x":18, "y":3},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+        {"matrix": [3, 6], "x": 6.75, "y": 3},
+        {"matrix": [3, 7], "x": 7.75, "y": 3},
+        {"matrix": [3, 8], "x": 8.75, "y": 3},
+        {"matrix": [3, 9], "x": 9.75, "y": 3},
+        {"matrix": [3, 10], "x": 10.75, "y": 3},
+        {"matrix": [3, 11], "x": 11.75, "y": 3},
+        {"matrix": [3, 12], "x": 12.75, "y": 3},
+        {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+        {"matrix": [3, 14], "x": 15, "y": 3},
+        {"matrix": [3, 15], "x": 16, "y": 3},
+        {"matrix": [3, 16], "x": 17, "y": 3},
+        {"matrix": [3, 17], "x": 18, "y": 3},
 
-        {"label":"Shift", "x":0, "y":4, "w":1.25},
-        {"label":"Shift", "x":1.25, "y":4},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":"<", "x":9.25, "y":4},
-        {"label":">", "x":10.25, "y":4},
-        {"label":"?", "x":11.25, "y":4},
-        {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-        {"label":"\u2191", "x":14, "y":4},
-        {"label":"1", "x":15, "y":4},
-        {"label":"2", "x":16, "y":4},
-        {"label":"3", "x":17, "y":4},
-        {"label":"Enter", "x":18, "y":4},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4},
+        {"matrix": [4, 2], "x": 2.25, "y": 4},
+        {"matrix": [4, 3], "x": 3.25, "y": 4},
+        {"matrix": [4, 4], "x": 4.25, "y": 4},
+        {"matrix": [4, 5], "x": 5.25, "y": 4},
+        {"matrix": [4, 6], "x": 6.25, "y": 4},
+        {"matrix": [4, 7], "x": 7.25, "y": 4},
+        {"matrix": [4, 8], "x": 8.25, "y": 4},
+        {"matrix": [4, 9], "x": 9.25, "y": 4},
+        {"matrix": [4, 10], "x": 10.25, "y": 4},
+        {"matrix": [4, 11], "x": 11.25, "y": 4},
+        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4},
+        {"matrix": [4, 14], "x": 15, "y": 4},
+        {"matrix": [4, 15], "x": 16, "y": 4},
+        {"matrix": [4, 16], "x": 17, "y": 4},
+        {"matrix": [4, 17], "x": 18, "y": 4},
 
-        {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-        {"label":"Win", "x":1.25, "y":5, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-        {"x":3.75, "y":5, "w":6.25},
-        {"label":"Alt", "x":10, "y":5, "w":1.5},
-        {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-        {"label":"\u2190", "x":13, "y":5},
-        {"label":"\u2193", "x":14, "y":5},
-        {"label":"\u2192", "x":15, "y":5},
-        {"label":"0", "x":16, "y":5},
-        {"label":".", "x":17, "y":5},
-        {"label":"Enter", "x":18, "y":5}
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+        {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+        {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+        {"matrix": [5, 12], "x": 13, "y": 5},
+        {"matrix": [5, 13], "x": 14, "y": 5},
+        {"matrix": [5, 14], "x": 15, "y": 5},
+        {"matrix": [5, 15], "x": 16, "y": 5},
+        {"matrix": [5, 16], "x": 17, "y": 5},
+        {"matrix": [5, 17], "x": 18, "y": 5}
       ]
     }
   }
diff --git a/keyboards/xiudi/xd96/xd96.c b/keyboards/xiudi/xd96/xd96.c
deleted file mode 100644
index 2c67ee3d7c..0000000000
--- a/keyboards/xiudi/xd96/xd96.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "xd96.h"
diff --git a/keyboards/xiudi/xd96/xd96.h b/keyboards/xiudi/xd96/xd96.h
deleted file mode 100644
index bb855da5b4..0000000000
--- a/keyboards/xiudi/xd96/xd96.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define ____ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_96_ansi( \
-    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, \
-    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,       K216, K217, K218, K219, \
-    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       K316, K317, K318,       \
-    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414,       K416, K417, K418, K419, \
-    K501,       K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, K517, K518,       \
-    K601, K602, K603,                       K607,               K611, K612,       K614, K615, K616, K617, K618, K619  \
-) { \
-    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116, K117, K118, K119 }, \
-    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216, K217, K218, K219 }, \
-    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316, K317, K318, K419 }, \
-    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, ____, K414, K416, K417, K418, ____ }, \
-    { K501, ____, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516, K517, K518, K619 }, \
-    { K601, K602, K603, ____, ____, K607, K115, ____, K612, ____, K611, K612, K614, K615, K616, K617, K618, ____ }  \
-}
-
-#define LAYOUT_96_iso( \
-    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, \
-    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,       K216, K217, K218, K219, \
-    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,             K316, K317, K318,       \
-    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417, K418, K419, \
-    K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, K517, K518,       \
-    K601, K602, K603,                       K607,               K611, K612,       K614, K615, K616, K617, K618, K619  \
-) { \
-    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116, K117, K118, K119 }, \
-    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216, K217, K218, K219 }, \
-    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, ____, K316, K317, K318, K419 }, \
-    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415, K416, K417, K418, ____ }, \
-    { K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516, K517, K518, K619 }, \
-    { K601, K602, K603, ____, ____, K607, K115, ____, K612, ____, K611, K612, K614, K615, K616, K617, K618, ____ }  \
-}
-
-#define LAYOUT_all( \
-    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, \
-    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, \
-    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       K316, K317, K318, K319, \
-    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417, K418, K419, \
-    K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, K517, K518, K519, \
-    K601, K602, K603,                       K607,               K611, K612,       K614, K615, K616, K617, K618, K619  \
-) { \
-    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116, K117, K118, K119 }, \
-    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216, K217, K218, K219 }, \
-    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316, K317, K318, K319 }, \
-    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415, K416, K417, K418, K419 }, \
-    { K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516, K517, K518, K519 }, \
-    { K601, K602, K603, K215, ____, K607, K115, ____, K612, K215, K611, ____, K614, K615, K616, K617, K618, K619 }  \
-}
diff --git a/keyboards/xmmx/config.h b/keyboards/xmmx/config.h
index 3e437fc1b5..5f36081323 100644
--- a/keyboards/xmmx/config.h
+++ b/keyboards/xmmx/config.h
@@ -1,32 +1,7 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B3, B2, B1, E6, B7, C7, C6, D4, D6, D7, B4, D0, D1, F7, D2, D3, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/xmmx/info.json b/keyboards/xmmx/info.json
index 26e1b933b9..8cccc925ff 100644
--- a/keyboards/xmmx/info.json
+++ b/keyboards/xmmx/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6776",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B1", "E6", "B7", "C7", "C6", "D4", "D6", "D7", "B4", "D0", "D1", "F7", "D2", "D3", "D5"],
+        "rows": ["B0", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "scroll_lock": "B5",
@@ -18,462 +23,528 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"~", "x":0, "y":1.5}, 
-                {"label":"!", "x":1, "y":1.5}, 
-                {"label":"@", "x":2, "y":1.5}, 
-                {"label":"#", "x":3, "y":1.5}, 
-                {"label":"$", "x":4, "y":1.5}, 
-                {"label":"%", "x":5, "y":1.5}, 
-                {"label":"^", "x":6, "y":1.5}, 
-                {"label":"&", "x":7, "y":1.5}, 
-                {"label":"*", "x":8, "y":1.5}, 
-                {"label":"(", "x":9, "y":1.5}, 
-                {"label":")", "x":10, "y":1.5}, 
-                {"label":"_", "x":11, "y":1.5}, 
-                {"label":"+", "x":12, "y":1.5}, 
-                {"label":"Back Space", "x":13, "y":1.5}, 
-                {"label":"Back Space", "x":14, "y":1.5}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.5}, 
-                {"label":"W", "x":2.5, "y":2.5}, 
-                {"label":"E", "x":3.5, "y":2.5}, 
-                {"label":"R", "x":4.5, "y":2.5}, 
-                {"label":"T", "x":5.5, "y":2.5}, 
-                {"label":"Y", "x":6.5, "y":2.5}, 
-                {"label":"U", "x":7.5, "y":2.5}, 
-                {"label":"I", "x":8.5, "y":2.5}, 
-                {"label":"O", "x":9.5, "y":2.5}, 
-                {"label":"P", "x":10.5, "y":2.5}, 
-                {"label":"{", "x":11.5, "y":2.5}, 
-                {"label":"}", "x":12.5, "y":2.5}, 
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.5}, 
-                {"label":"End", "x":16.25, "y":2.5}, 
-                {"label":"PgDn", "x":17.25, "y":2.5}, 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.5}, 
-                {"label":"S", "x":2.75, "y":3.5}, 
-                {"label":"D", "x":3.75, "y":3.5}, 
-                {"label":"F", "x":4.75, "y":3.5}, 
-                {"label":"G", "x":5.75, "y":3.5}, 
-                {"label":"H", "x":6.75, "y":3.5}, 
-                {"label":"J", "x":7.75, "y":3.5}, 
-                {"label":"K", "x":8.75, "y":3.5}, 
-                {"label":"L", "x":9.75, "y":3.5}, 
-                {"label":":", "x":10.75, "y":3.5}, 
-                {"label":"\"", "x":11.75, "y":3.5}, 
-                {"label":"~", "x":12.75, "y":3.5}, 
-                {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, 
-                {"x":15.25, "y":3.5}, 
-                {"x":16.25, "y":3.5}, 
-                {"x":17.25, "y":3.5}, 
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":4.5}, 
-                {"label":"Z", "x":2.25, "y":4.5}, 
-                {"label":"X", "x":3.25, "y":4.5}, 
-                {"label":"C", "x":4.25, "y":4.5}, 
-                {"label":"V", "x":5.25, "y":4.5}, 
-                {"label":"B", "x":6.25, "y":4.5}, 
-                {"label":"N", "x":7.25, "y":4.5}, 
-                {"label":"M", "x":8.25, "y":4.5}, 
-                {"label":"<", "x":9.25, "y":4.5}, 
-                {"label":">", "x":10.25, "y":4.5}, 
-                {"label":"?", "x":11.25, "y":4.5}, 
-                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, 
-                {"label":"Fn", "x":14, "y":4.5}, 
-                {"x":15.25, "y":4.5}, 
-                {"label":"Up", "x":16.25, "y":4.5}, 
-                {"x":17.25, "y":4.5}, 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, 
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, 
-                {"label":"Left", "x":15.25, "y":5.5}, 
-                {"label":"Down", "x":16.25, "y":5.5}, 
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [0, 13], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.5},
+                {"matrix": [3, 15], "x": 16.25, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"~", "x":0, "y":1.5}, 
-                {"label":"!", "x":1, "y":1.5}, 
-                {"label":"@", "x":2, "y":1.5}, 
-                {"label":"#", "x":3, "y":1.5}, 
-                {"label":"$", "x":4, "y":1.5}, 
-                {"label":"%", "x":5, "y":1.5}, 
-                {"label":"^", "x":6, "y":1.5}, 
-                {"label":"&", "x":7, "y":1.5}, 
-                {"label":"*", "x":8, "y":1.5}, 
-                {"label":"(", "x":9, "y":1.5}, 
-                {"label":")", "x":10, "y":1.5}, 
-                {"label":"_", "x":11, "y":1.5}, 
-                {"label":"+", "x":12, "y":1.5}, 
-                {"label":"Backspace", "x":13, "y":1.5, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.5}, 
-                {"label":"W", "x":2.5, "y":2.5}, 
-                {"label":"E", "x":3.5, "y":2.5}, 
-                {"label":"R", "x":4.5, "y":2.5}, 
-                {"label":"T", "x":5.5, "y":2.5}, 
-                {"label":"Y", "x":6.5, "y":2.5}, 
-                {"label":"U", "x":7.5, "y":2.5}, 
-                {"label":"I", "x":8.5, "y":2.5}, 
-                {"label":"O", "x":9.5, "y":2.5}, 
-                {"label":"P", "x":10.5, "y":2.5}, 
-                {"label":"{", "x":11.5, "y":2.5}, 
-                {"label":"}", "x":12.5, "y":2.5}, 
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.5}, 
-                {"label":"End", "x":16.25, "y":2.5}, 
-                {"label":"PgDn", "x":17.25, "y":2.5}, 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.5}, 
-                {"label":"S", "x":2.75, "y":3.5}, 
-                {"label":"D", "x":3.75, "y":3.5}, 
-                {"label":"F", "x":4.75, "y":3.5}, 
-                {"label":"G", "x":5.75, "y":3.5}, 
-                {"label":"H", "x":6.75, "y":3.5}, 
-                {"label":"J", "x":7.75, "y":3.5}, 
-                {"label":"K", "x":8.75, "y":3.5}, 
-                {"label":"L", "x":9.75, "y":3.5}, 
-                {"label":":", "x":10.75, "y":3.5}, 
-                {"label":"\"", "x":11.75, "y":3.5}, 
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, 
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25}, 
-                {"label":"Z", "x":2.25, "y":4.5}, 
-                {"label":"X", "x":3.25, "y":4.5}, 
-                {"label":"C", "x":4.25, "y":4.5}, 
-                {"label":"V", "x":5.25, "y":4.5}, 
-                {"label":"B", "x":6.25, "y":4.5}, 
-                {"label":"N", "x":7.25, "y":4.5}, 
-                {"label":"M", "x":8.25, "y":4.5}, 
-                {"label":"<", "x":9.25, "y":4.5}, 
-                {"label":">", "x":10.25, "y":4.5}, 
-                {"label":"?", "x":11.25, "y":4.5}, 
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
-                {"label":"Up", "x":16.25, "y":4.5}, 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, 
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, 
-                {"label":"Left", "x":15.25, "y":5.5}, 
-                {"label":"Down", "x":16.25, "y":5.5}, 
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"~", "x":0, "y":1.5}, 
-                {"label":"!", "x":1, "y":1.5}, 
-                {"label":"@", "x":2, "y":1.5}, 
-                {"label":"#", "x":3, "y":1.5}, 
-                {"label":"$", "x":4, "y":1.5}, 
-                {"label":"%", "x":5, "y":1.5}, 
-                {"label":"^", "x":6, "y":1.5}, 
-                {"label":"&", "x":7, "y":1.5}, 
-                {"label":"*", "x":8, "y":1.5}, 
-                {"label":"(", "x":9, "y":1.5}, 
-                {"label":")", "x":10, "y":1.5}, 
-                {"label":"_", "x":11, "y":1.5}, 
-                {"label":"+", "x":12, "y":1.5}, 
-                {"label":"Backspace", "x":13, "y":1.5, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.5}, 
-                {"label":"W", "x":2.5, "y":2.5}, 
-                {"label":"E", "x":3.5, "y":2.5}, 
-                {"label":"R", "x":4.5, "y":2.5}, 
-                {"label":"T", "x":5.5, "y":2.5}, 
-                {"label":"Y", "x":6.5, "y":2.5}, 
-                {"label":"U", "x":7.5, "y":2.5}, 
-                {"label":"I", "x":8.5, "y":2.5}, 
-                {"label":"O", "x":9.5, "y":2.5}, 
-                {"label":"P", "x":10.5, "y":2.5}, 
-                {"label":"{", "x":11.5, "y":2.5}, 
-                {"label":"}", "x":12.5, "y":2.5}, 
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.5}, 
-                {"label":"End", "x":16.25, "y":2.5}, 
-                {"label":"PgDn", "x":17.25, "y":2.5}, 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.5}, 
-                {"label":"S", "x":2.75, "y":3.5}, 
-                {"label":"D", "x":3.75, "y":3.5}, 
-                {"label":"F", "x":4.75, "y":3.5}, 
-                {"label":"G", "x":5.75, "y":3.5}, 
-                {"label":"H", "x":6.75, "y":3.5}, 
-                {"label":"J", "x":7.75, "y":3.5}, 
-                {"label":"K", "x":8.75, "y":3.5}, 
-                {"label":"L", "x":9.75, "y":3.5}, 
-                {"label":":", "x":10.75, "y":3.5}, 
-                {"label":"\"", "x":11.75, "y":3.5}, 
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, 
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25}, 
-                {"label":"Z", "x":2.25, "y":4.5}, 
-                {"label":"X", "x":3.25, "y":4.5}, 
-                {"label":"C", "x":4.25, "y":4.5}, 
-                {"label":"V", "x":5.25, "y":4.5}, 
-                {"label":"B", "x":6.25, "y":4.5}, 
-                {"label":"N", "x":7.25, "y":4.5}, 
-                {"label":"M", "x":8.25, "y":4.5}, 
-                {"label":"<", "x":9.25, "y":4.5}, 
-                {"label":">", "x":10.25, "y":4.5}, 
-                {"label":"?", "x":11.25, "y":4.5}, 
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
-                {"label":"Up", "x":16.25, "y":4.5}, 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, 
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, 
-                {"label":"Space", "x":4, "y":5.5, "w":7}, 
-                {"label":"Alt", "x":11, "y":5.5, "w":1.5}, 
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, 
-                {"label":"Left", "x":15.25, "y":5.5}, 
-                {"label":"Down", "x":16.25, "y":5.5}, 
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"\u00ac", "x":0, "y":1.5}, 
-                {"label":"!", "x":1, "y":1.5}, 
-                {"label":"\"", "x":2, "y":1.5}, 
-                {"label":"\u00a3", "x":3, "y":1.5}, 
-                {"label":"$", "x":4, "y":1.5}, 
-                {"label":"%", "x":5, "y":1.5}, 
-                {"label":"^", "x":6, "y":1.5}, 
-                {"label":"&", "x":7, "y":1.5}, 
-                {"label":"*", "x":8, "y":1.5}, 
-                {"label":"(", "x":9, "y":1.5}, 
-                {"label":")", "x":10, "y":1.5}, 
-                {"label":"_", "x":11, "y":1.5}, 
-                {"label":"+", "x":12, "y":1.5}, 
-                {"label":"Backspace", "x":13, "y":1.5, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.5}, 
-                {"label":"W", "x":2.5, "y":2.5}, 
-                {"label":"E", "x":3.5, "y":2.5}, 
-                {"label":"R", "x":4.5, "y":2.5}, 
-                {"label":"T", "x":5.5, "y":2.5}, 
-                {"label":"Y", "x":6.5, "y":2.5}, 
-                {"label":"U", "x":7.5, "y":2.5}, 
-                {"label":"I", "x":8.5, "y":2.5}, 
-                {"label":"O", "x":9.5, "y":2.5}, 
-                {"label":"P", "x":10.5, "y":2.5}, 
-                {"label":"{", "x":11.5, "y":2.5}, 
-                {"label":"}", "x":12.5, "y":2.5}, 
-                {"label":"Delete", "x":15.25, "y":2.5}, 
-                {"label":"End", "x":16.25, "y":2.5}, 
-                {"label":"PgDn", "x":17.25, "y":2.5}, 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.5}, 
-                {"label":"S", "x":2.75, "y":3.5}, 
-                {"label":"D", "x":3.75, "y":3.5}, 
-                {"label":"F", "x":4.75, "y":3.5}, 
-                {"label":"G", "x":5.75, "y":3.5}, 
-                {"label":"H", "x":6.75, "y":3.5}, 
-                {"label":"J", "x":7.75, "y":3.5}, 
-                {"label":"K", "x":8.75, "y":3.5}, 
-                {"label":"L", "x":9.75, "y":3.5}, 
-                {"label":":", "x":10.75, "y":3.5}, 
-                {"label":"@", "x":11.75, "y":3.5}, 
-                {"label":"~", "x":12.75, "y":3.5}, 
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, 
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":4.5}, 
-                {"label":"Z", "x":2.25, "y":4.5}, 
-                {"label":"X", "x":3.25, "y":4.5}, 
-                {"label":"C", "x":4.25, "y":4.5}, 
-                {"label":"V", "x":5.25, "y":4.5}, 
-                {"label":"B", "x":6.25, "y":4.5}, 
-                {"label":"N", "x":7.25, "y":4.5}, 
-                {"label":"M", "x":8.25, "y":4.5}, 
-                {"label":"<", "x":9.25, "y":4.5}, 
-                {"label":">", "x":10.25, "y":4.5}, 
-                {"label":"?", "x":11.25, "y":4.5}, 
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
-                {"label":"Up", "x":16.25, "y":4.5}, 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, 
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, 
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, 
-                {"label":"Left", "x":15.25, "y":5.5}, 
-                {"label":"Down", "x":16.25, "y":5.5}, 
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":2, "y":0}, 
-                {"label":"F2", "x":3, "y":0}, 
-                {"label":"F3", "x":4, "y":0}, 
-                {"label":"F4", "x":5, "y":0}, 
-                {"label":"F5", "x":6.5, "y":0}, 
-                {"label":"F6", "x":7.5, "y":0}, 
-                {"label":"F7", "x":8.5, "y":0}, 
-                {"label":"F8", "x":9.5, "y":0}, 
-                {"label":"F9", "x":11, "y":0}, 
-                {"label":"F10", "x":12, "y":0}, 
-                {"label":"F11", "x":13, "y":0}, 
-                {"label":"F12", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"\u00ac", "x":0, "y":1.5}, 
-                {"label":"!", "x":1, "y":1.5}, 
-                {"label":"\"", "x":2, "y":1.5}, 
-                {"label":"\u00a3", "x":3, "y":1.5}, 
-                {"label":"$", "x":4, "y":1.5}, 
-                {"label":"%", "x":5, "y":1.5}, 
-                {"label":"^", "x":6, "y":1.5}, 
-                {"label":"&", "x":7, "y":1.5}, 
-                {"label":"*", "x":8, "y":1.5}, 
-                {"label":"(", "x":9, "y":1.5}, 
-                {"label":")", "x":10, "y":1.5}, 
-                {"label":"_", "x":11, "y":1.5}, 
-                {"label":"+", "x":12, "y":1.5}, 
-                {"label":"Backspace", "x":13, "y":1.5, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.5}, 
-                {"label":"W", "x":2.5, "y":2.5}, 
-                {"label":"E", "x":3.5, "y":2.5}, 
-                {"label":"R", "x":4.5, "y":2.5}, 
-                {"label":"T", "x":5.5, "y":2.5}, 
-                {"label":"Y", "x":6.5, "y":2.5}, 
-                {"label":"U", "x":7.5, "y":2.5}, 
-                {"label":"I", "x":8.5, "y":2.5}, 
-                {"label":"O", "x":9.5, "y":2.5}, 
-                {"label":"P", "x":10.5, "y":2.5}, 
-                {"label":"{", "x":11.5, "y":2.5}, 
-                {"label":"}", "x":12.5, "y":2.5}, 
-                {"label":"Delete", "x":15.25, "y":2.5}, 
-                {"label":"End", "x":16.25, "y":2.5}, 
-                {"label":"PgDn", "x":17.25, "y":2.5}, 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.5}, 
-                {"label":"S", "x":2.75, "y":3.5}, 
-                {"label":"D", "x":3.75, "y":3.5}, 
-                {"label":"F", "x":4.75, "y":3.5}, 
-                {"label":"G", "x":5.75, "y":3.5}, 
-                {"label":"H", "x":6.75, "y":3.5}, 
-                {"label":"J", "x":7.75, "y":3.5}, 
-                {"label":"K", "x":8.75, "y":3.5}, 
-                {"label":"L", "x":9.75, "y":3.5}, 
-                {"label":":", "x":10.75, "y":3.5}, 
-                {"label":"@", "x":11.75, "y":3.5}, 
-                {"label":"~", "x":12.75, "y":3.5}, 
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, 
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":4.5}, 
-                {"label":"Z", "x":2.25, "y":4.5}, 
-                {"label":"X", "x":3.25, "y":4.5}, 
-                {"label":"C", "x":4.25, "y":4.5}, 
-                {"label":"V", "x":5.25, "y":4.5}, 
-                {"label":"B", "x":6.25, "y":4.5}, 
-                {"label":"N", "x":7.25, "y":4.5}, 
-                {"label":"M", "x":8.25, "y":4.5}, 
-                {"label":"<", "x":9.25, "y":4.5}, 
-                {"label":">", "x":10.25, "y":4.5}, 
-                {"label":"?", "x":11.25, "y":4.5}, 
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
-                {"label":"Up", "x":16.25, "y":4.5}, 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, 
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, 
-                {"label":"Space", "x":4, "y":5.5, "w":7}, 
-                {"label":"AltGr", "x":11, "y":5.5, "w":1.5}, 
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, 
-                {"label":"Left", "x":15.25, "y":5.5}, 
-                {"label":"Down", "x":16.25, "y":5.5}, 
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/xmmx/xmmx.c b/keyboards/xmmx/xmmx.c
deleted file mode 100644
index 399ae4eb44..0000000000
--- a/keyboards/xmmx/xmmx.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "xmmx.h"
diff --git a/keyboards/xmmx/xmmx.h b/keyboards/xmmx/xmmx.h
deleted file mode 100644
index 82c3fb5882..0000000000
--- a/keyboards/xmmx/xmmx.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// 80% keyboard: default - all keys
-#define LAYOUT_all( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016,       \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K013, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,       \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316,       \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416,       \
-	K500, K501, K502,                         K507,             K510, K511, K512, K513, K514, K515, K516        \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316 }, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416 }, \
-	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513, K514, K515, K516 }  \
-}
-
-// 80% keyboard: ANSI Winkey
-#define LAYOUT_tkl_ansi( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                   \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,             K415,       \
-	K500, K501, K502,                         K507,             K510, K511, K512, K513, K514, K515, K516  \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO,K014, K015, K016 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO,K313, KC_NO,KC_NO,KC_NO}, \
-	{ K400, KC_NO,K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO,KC_NO,K415, KC_NO}, \
-	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513, K514, K515, K516 }  \
-}
-
-// 80% keyboard: ANSI Winkeyless
-#define LAYOUT_tkl_ansi_wkl( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                   \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,             K415,       \
-	K500,       K502,                         K507,                   K511,       K513, K514, K515, K516  \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO,K014, K015, K016 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO,K313, KC_NO,KC_NO,KC_NO}, \
-	{ K400, KC_NO,K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO,KC_NO,K415, KC_NO}, \
-	{ K500, KC_NO,K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,KC_NO,K511, KC_NO,K513, K514, K515, K516 }  \
-}
-
-// 80% keyboard: ISO Winkey
-#define LAYOUT_tkl_iso( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,                   \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,             K415,       \
-	K500, K501, K502,                         K507,             K510, K511, K512, K513, K514, K515, K516  \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO,K014, K015, K016 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO,K214, K215, K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO,KC_NO,KC_NO}, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO,KC_NO,K415, KC_NO}, \
-	{ K500, K501, K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,K510, K511, K512, K513, K514, K515, K516 }  \
-}
-
-// 80% keyboard: ISO Winkeyless
-#define LAYOUT_tkl_iso_wkl( \
-	K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,                   \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,             K415,       \
-	K500,       K502,                         K507,                   K511,       K513, K514, K515, K516  \
-) { \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO,K014, K015, K016 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO,K214, K215, K216 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO,KC_NO,KC_NO}, \
-	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO,KC_NO,K415, KC_NO}, \
-	{ K500, KC_NO,K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,KC_NO,K511, KC_NO,K513, K514, K515, K516 }  \
-}
-
diff --git a/keyboards/xw60/config.h b/keyboards/xw60/config.h
index 8b57372ca9..32516a5ec2 100644
--- a/keyboards/xw60/config.h
+++ b/keyboards/xw60/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/xw60/info.json b/keyboards/xw60/info.json
index 33cb350120..93a68a6520 100644
--- a/keyboards/xw60/info.json
+++ b/keyboards/xw60/info.json
@@ -8,6 +8,11 @@
       "pid": "0x6060",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+      "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/xw60/xw60.c b/keyboards/xw60/xw60.c
deleted file mode 100644
index 98ae6a758b..0000000000
--- a/keyboards/xw60/xw60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "xw60.h"
\ No newline at end of file
diff --git a/keyboards/yampad/config.h b/keyboards/yampad/config.h
index 00ddc347db..6327578ebf 100644
--- a/keyboards/yampad/config.h
+++ b/keyboards/yampad/config.h
@@ -17,25 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B1, B3, B2, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Underlight configuration */
-#define RGB_DI_PIN F4
 #define RGBLED_NUM 9
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/yampad/info.json b/keyboards/yampad/info.json
index 753c952b1d..54c363b28b 100644
--- a/keyboards/yampad/info.json
+++ b/keyboards/yampad/info.json
@@ -8,34 +8,42 @@
         "pid": "0x8369",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "debounce": 2,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"k10", "x":0, "y":1},
-                {"label":"k11", "x":1, "y":1},
-                {"label":"k12", "x":2, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
 
-                {"label":"k20", "x":0, "y":2},
-                {"label":"k21", "x":1, "y":2},
-                {"label":"k22", "x":2, "y":2},
-                {"label":"k13", "x":3, "y":1, "h":2},
+                {"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},
 
-                {"label":"k30", "x":0, "y":3},
-                {"label":"k31", "x":1, "y":3},
-                {"label":"k32", "x":2, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"label":"k40", "x":0, "y":4},
-                {"label":"k41", "x":1, "y":4},
-                {"label":"k42", "x":2, "y":4},
-                {"label":"k43", "x":3, "y":3, "h":2}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/yampad/yampad.c b/keyboards/yampad/yampad.c
index eab218d3b9..45b0c42484 100644
--- a/keyboards/yampad/yampad.c
+++ b/keyboards/yampad/yampad.c
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "yampad.h"
+#include "quantum.h"
 
 #if defined(OLED_ENABLE)
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/yampad/yampad.h b/keyboards/yampad/yampad.h
deleted file mode 100644
index 68ec98ffdd..0000000000
--- a/keyboards/yampad/yampad.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* COSPAD numpad matrix layout
-   * ,-------------------.
-   * | 00 | 01 | 02 | 03 |
-   * |----|----|----|----|
-   * | 10 | 11 | 12 |    |
-   * |----|----|----| 13 |
-   * | 20 | 21 | 22 |    |
-   * |----|----|----|----|
-   * | 30 | 31 | 32 |    |
-   * |----|----|----| 43 |
-   * | 40 | 41 | 42 |    |
-   * `-------------------'
- */
-#define LAYOUT( \
-	k00, k01, k02, k03,  \
-	k10, k11, k12,       \
-	k20, k21, k22, k13,  \
-	k30, k31, k32,       \
-	k40, k41, k42, k43   \
-) \
-{ \
-	{k00, k01, k02, k03}, \
-	{k10, k11, k12, k13}, \
-	{k20, k21, k22, ___}, \
-	{k30, k31, k32, ___}, \
-	{k40, k41, k42, k43}  \
-}
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h
index fe7045efad..677e41a00d 100644
--- a/keyboards/yandrstudio/buff67v3/config.h
+++ b/keyboards/yandrstudio/buff67v3/config.h
@@ -15,17 +15,8 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_COL_PINS {  B5,  B6,  B7,  B8,  B9,  C13, C14, B0,  B1,  B2,  B10, B11, B12, A15, B3 }
-#define MATRIX_ROW_PINS {  A3,  A4,  A5,  A7,  C15 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGB_DI_PIN B4
 #    define RGBLED_NUM 1
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json
index 07f7dbbe30..34702641a8 100644
--- a/keyboards/yandrstudio/buff67v3/info.json
+++ b/keyboards/yandrstudio/buff67v3/info.json
@@ -6,6 +6,15 @@
         "pid": "0xAA88",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "B4",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B7", "B8", "B9", "C13", "C14", "B0", "B1", "B2", "B10", "B11", "B12", "A15", "B3"],
+        "rows": ["A3", "A4", "A5", "A7", "C15"]
+    },
+    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/yandrstudio/buff67v3/rules.mk b/keyboards/yandrstudio/buff67v3/rules.mk
index 35a243a65d..663aac2420 100644
--- a/keyboards/yandrstudio/buff67v3/rules.mk
+++ b/keyboards/yandrstudio/buff67v3/rules.mk
@@ -13,5 +13,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGBLIGHT_DRIVER = WS2812    # RGB driver support
-WS2812_DRIVER = pwm         # WS2812 RGB Driver
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/yandrstudio/eau87/config.h b/keyboards/yandrstudio/eau87/config.h
deleted file mode 100644
index 328e3e3852..0000000000
--- a/keyboards/yandrstudio/eau87/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 JasonRen(biu)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_COL_PINS { A10, A9,  A8,  B15, B14, B13, B11, B10, B2,  B1,  B0,  A7,  A6,  A5,  A3,  A15, B3 }
-#define MATRIX_ROW_PINS { B12, B5,  B4,  A4,  B7,  B6 }
diff --git a/keyboards/yandrstudio/eau87/eau87.c b/keyboards/yandrstudio/eau87/eau87.c
deleted file mode 100644
index 6ab9edb788..0000000000
--- a/keyboards/yandrstudio/eau87/eau87.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 JasonRen(biu)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "eau87.h"
diff --git a/keyboards/yandrstudio/eau87/info.json b/keyboards/yandrstudio/eau87/info.json
index f09f55c76b..9477067805 100644
--- a/keyboards/yandrstudio/eau87/info.json
+++ b/keyboards/yandrstudio/eau87/info.json
@@ -6,6 +6,11 @@
         "pid": "0xAAEB",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "A15", "B3"],
+        "rows": ["B12", "B5", "B4", "A4", "B7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
index d1405b2bbf..110f0d096c 100644
--- a/keyboards/yandrstudio/eau_r2/config.h
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -15,15 +15,8 @@
  */
 #pragma once
 
-#define MATRIX_COL_PINS { B7,  A6,  B6, B5,  B4,  B3,  A5,  A10, B1,  B0,  A7,  A9,  B11, B10, B2,  A15, B15 }
-#define MATRIX_ROW_PINS { A3,  B9,  B8,  A4, C14, C13 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGB_DI_PIN A8
 #    define RGBLED_NUM 12
 #    define RGBLIGHT_SLEEP
 #    define RGBLIGHT_VAL_STEP 5
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
index 74f5dd6e86..bdf9be5f1e 100644
--- a/keyboards/yandrstudio/eau_r2/info.json
+++ b/keyboards/yandrstudio/eau_r2/info.json
@@ -6,6 +6,14 @@
         "pid": "0xAACD",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B7", "A6", "B6", "B5", "B4", "B3", "A5", "A10", "B1", "B0", "A7", "A9", "B11", "B10", "B2", "A15", "B15"],
+        "rows": ["A3", "B9", "B8", "A4", "C14", "C13"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "A8"
+    },
     "debounce": 8,
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
index 79f37b9bde..573fa12151 100644
--- a/keyboards/yandrstudio/nightstar75/config.h
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -15,15 +15,8 @@
  */
 #pragma once
 
-#define MATRIX_COL_PINS { C13, C14, C15, A3,   A4,  A5,  A6,  B12, B13, B14, B15,  A8,  A9, A10, B8 }
-#define MATRIX_ROW_PINS { B0,  B1,  B2,  B10,  B11, B9 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGB_DI_PIN A7
 #    define RGBLED_NUM 4
 #    define RGBLIGHT_LIMIT_VAL 180
 
diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json
index 4f8105fae8..899e4a7576 100644
--- a/keyboards/yandrstudio/nightstar75/info.json
+++ b/keyboards/yandrstudio/nightstar75/info.json
@@ -6,6 +6,15 @@
         "pid": "0xAA87",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["C13", "C14", "C15", "A3", "A4", "A5", "A6", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "B8"],
+        "rows": ["B0", "B1", "B2", "B10", "B11", "B9"]
+    },
+    "diode_direction": "ROW2COL",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/yandrstudio/nightstar75/rules.mk b/keyboards/yandrstudio/nightstar75/rules.mk
index 54e3f61af5..421ae9fce1 100644
--- a/keyboards/yandrstudio/nightstar75/rules.mk
+++ b/keyboards/yandrstudio/nightstar75/rules.mk
@@ -12,5 +12,4 @@ 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
-WS2812_DRIVER = pwm         # WS2812 RGB Driver
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h
index 06de2f5680..5e4cdaaea0 100644
--- a/keyboards/yandrstudio/nz64/config.h
+++ b/keyboards/yandrstudio/nz64/config.h
@@ -15,19 +15,11 @@
  */
 #pragma once
 
-
-#define MATRIX_COL_PINS {  A15, B3,  B4,  B6,  B7, B5,  C13, A5,  A4, B14, B15, A8, A9,  A10 }
-#define MATRIX_ROW_PINS {  C14, B13, B12, C15, A3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Fix VIA RGB_light */
 #define VIA_HAS_BROKEN_KEYCODES
 
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
-#   define RGB_DI_PIN A7
 #   define RGBLED_NUM 82
 #   define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
@@ -95,7 +87,6 @@
 
 
 #ifdef RGBLIGHT_ENABLE
-#   define RGB_DI_PIN A7
 #   define RGBLED_NUM 82
 #   define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json
index 5aa0c2ae68..105014757e 100644
--- a/keyboards/yandrstudio/nz64/info.json
+++ b/keyboards/yandrstudio/nz64/info.json
@@ -4,6 +4,18 @@
         "pid": "0xAAAF",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A15", "B3", "B4", "B6", "B7", "B5", "C13", "A5", "A4", "B14", "B15", "A8", "A9", "A10"],
+        "rows": ["C14", "B13", "B12", "C15", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/yandrstudio/nz64/rules.mk b/keyboards/yandrstudio/nz64/rules.mk
index 302cf375a3..e4a82c46db 100644
--- a/keyboards/yandrstudio/nz64/rules.mk
+++ b/keyboards/yandrstudio/nz64/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
-WS2812_DRIVER = pwm         # Driver for RGB
diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h
index a3d9bb74c5..860ee45381 100644
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -16,20 +16,11 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_COL_PINS {  B9,  A3,  A4,  A5,  A6,  A7,  B0,  B2,  B10, B11, B12, B13, B14, B15, A8 }
-#define MATRIX_ROW_PINS {  B3,  B4,  B6,  B7,  B8 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 15
 
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
 
-#    define RGB_DI_PIN B5
 #    define RGBLED_NUM 86
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json
index ed06374976..6149c998f7 100644
--- a/keyboards/yandrstudio/nz67v2/info.json
+++ b/keyboards/yandrstudio/nz67v2/info.json
@@ -6,6 +6,18 @@
         "pid": "0xAA83",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "B5",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B9", "A3", "A4", "A5", "A6", "A7", "B0", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
+        "rows": ["B3", "B4", "B6", "B7", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A9", "pin_b": "A10"}
@@ -14,233 +26,233 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"~", "x":0, "y":0.5},
-                {"label":"!", "x":1, "y":0.5},
-                {"label":"@", "x":2, "y":0.5},
-                {"label":"#", "x":3, "y":0.5},
-                {"label":"$", "x":4, "y":0.5},
-                {"label":"%", "x":5, "y":0.5},
-                {"label":"^", "x":6, "y":0.5},
-                {"label":"&", "x":7, "y":0.5},
-                {"label":"*", "x":8, "y":0.5},
-                {"label":"(", "x":9, "y":0.5},
-                {"label":")", "x":10, "y":0.5},
-                {"label":"_", "x":11, "y":0.5},
-                {"label":"+", "x":12, "y":0.5},
-                {"label":"Backspace", "x":13, "y":0.5, "w":2},
-                {"label":"EC CCW", "x":16, "y":0},
-                {"label":"Insert", "x":15, "y":0.5},
-                {"label":"EC CW", "x":16, "y":1},
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0.5},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+                {"matrix": [0, 6], "x": 6, "y": 0.5},
+                {"matrix": [0, 7], "x": 7, "y": 0.5},
+                {"matrix": [0, 8], "x": 8, "y": 0.5},
+                {"matrix": [0, 9], "x": 9, "y": 0.5},
+                {"matrix": [0, 10], "x": 10, "y": 0.5},
+                {"matrix": [0, 11], "x": 11, "y": 0.5},
+                {"matrix": [0, 12], "x": 12, "y": 0.5},
+                {"matrix": [0, 13], "x": 13, "y": 0.5, "w": 2},
+                {"matrix": [4, 4], "x": 16, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0.5},
 
-                {"label":"Tab", "x":0, "y":1.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1.5},
-                {"label":"W", "x":2.5, "y":1.5},
-                {"label":"E", "x":3.5, "y":1.5},
-                {"label":"R", "x":4.5, "y":1.5},
-                {"label":"T", "x":5.5, "y":1.5},
-                {"label":"Y", "x":6.5, "y":1.5},
-                {"label":"U", "x":7.5, "y":1.5},
-                {"label":"I", "x":8.5, "y":1.5},
-                {"label":"O", "x":9.5, "y":1.5},
-                {"label":"P", "x":10.5, "y":1.5},
-                {"label":"{", "x":11.5, "y":1.5},
-                {"label":"}", "x":12.5, "y":1.5},
-                {"label":"|", "x":13.5, "y":1.5, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1.5},
+                {"matrix": [4, 6], "x": 16, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.5, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1.5},
 
-                {"label":"Caps Lock", "x":0, "y":2.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":2.5},
-                {"label":"S", "x":2.75, "y":2.5},
-                {"label":"D", "x":3.75, "y":2.5},
-                {"label":"F", "x":4.75, "y":2.5},
-                {"label":"G", "x":5.75, "y":2.5},
-                {"label":"H", "x":6.75, "y":2.5},
-                {"label":"J", "x":7.75, "y":2.5},
-                {"label":"K", "x":8.75, "y":2.5},
-                {"label":"L", "x":9.75, "y":2.5},
-                {"label":":", "x":10.75, "y":2.5},
-                {"label":"\"", "x":11.75, "y":2.5},
-                {"label":"Enter", "x":12.75, "y":2.5, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2.5},
 
-                {"label":"Shift", "x":0, "y":3.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.5},
-                {"label":"X", "x":3.25, "y":3.5},
-                {"label":"C", "x":4.25, "y":3.5},
-                {"label":"V", "x":5.25, "y":3.5},
-                {"label":"B", "x":6.25, "y":3.5},
-                {"label":"N", "x":7.25, "y":3.5},
-                {"label":"M", "x":8.25, "y":3.5},
-                {"label":"<", "x":9.25, "y":3.5},
-                {"label":">", "x":10.25, "y":3.5},
-                {"label":"?", "x":11.25, "y":3.5},
-                {"label":"Shift", "x":12.25, "y":3.5, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3.5},
-                {"label":"Delete", "x":15, "y":3.5},
+                {"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.5},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.25, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3.5},
+                {"matrix": [3, 14], "x": 15, "y": 3.5},
 
-                {"label":"Ctrl", "x":0, "y":4.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4.5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4.5, "w":2.25},
-                {"label":"Space", "x":6, "y":4.5, "w":1.75},
-                {"label":"Space", "x":7.75, "y":4.5, "w":2.25},
-                {"label":"Alt", "x":10, "y":4.5, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4.5, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4.5},
-                {"label":"\u2193", "x":14, "y":4.5},
-                {"label":"\u2192", "x":15, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 5], "x": 6, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 9], "x": 10, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4.5},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+                {"matrix": [4, 14], "x": 15, "y": 4.5}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Delete", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_space": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Insert", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"PgUp", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 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},
 
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"PgDn", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "x":14, "y":3},
-                {"label":"Delete", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":2.25},
-                {"label":"Space", "x":6, "y":4, "w":1.75},
-                {"label":"Space", "x":7.75, "y":4, "w":2.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4},
-                {"label":"\u2192", "x":15, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.75},
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
index 3da37b5315..56a083d444 100644
--- a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
@@ -43,20 +43,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
 };
 #ifdef ENCODER_ENABLE
-keyevent_t encoder1_ccw = {.key = (keypos_t){.row = 4, .col = 4}, .pressed = false};
+keyevent_t encoder1_ccw = {.key = (keypos_t){.row = 4, .col = 4}, .pressed = false, .type = KEY_EVENT};
 
-keyevent_t encoder1_cw = {.key = (keypos_t){.row = 4, .col = 6}, .pressed = false};
+keyevent_t encoder1_cw = {.key = (keypos_t){.row = 4, .col = 6}, .pressed = false, .type = KEY_EVENT};
 
 void matrix_scan_user(void) {
-    if (IS_PRESSED(encoder1_ccw)) {
+    if (encoder1_ccw.pressed) {
         encoder1_ccw.pressed = false;
-        encoder1_ccw.time    = (timer_read() | 1);
+        encoder1_ccw.time    = timer_read();
         action_exec(encoder1_ccw);
     }
 
-    if (IS_PRESSED(encoder1_cw)) {
+    if (encoder1_cw.pressed) {
         encoder1_cw.pressed = false;
-        encoder1_cw.time    = (timer_read() | 1);
+        encoder1_cw.time    = timer_read();
         action_exec(encoder1_cw);
     }
 }
@@ -64,11 +64,11 @@ void matrix_scan_user(void) {
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (clockwise) {
         encoder1_cw.pressed = true;
-        encoder1_cw.time    = (timer_read() | 1);
+        encoder1_cw.time    = timer_read();
         action_exec(encoder1_cw);
     } else {
         encoder1_ccw.pressed = true;
-        encoder1_ccw.time    = (timer_read() | 1);
+        encoder1_ccw.time    = timer_read();
         action_exec(encoder1_ccw);
     }
     return true;
diff --git a/keyboards/yandrstudio/nz67v2/nz67v2.h b/keyboards/yandrstudio/nz67v2/nz67v2.h
index f538c624d9..eddb7ec88a 100644
--- a/keyboards/yandrstudio/nz67v2/nz67v2.h
+++ b/keyboards/yandrstudio/nz67v2/nz67v2.h
@@ -17,69 +17,6 @@
 
 #include "quantum.h"
 
-#define ____ KC_NO
-
-/*
- *                                          optional encoder (404│406)
- *                                                             \   /
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───�
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│013    │014│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │100  │101│102│103│104│105│106│107│108│109│110│111│112│113  │114│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │200   │201│202│203│204│205│206│207│208│209│210│211│213     │214│
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │300     │301│302│303│304│305│306│307│308│309│310│312   │313│314│
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┴─┬─┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │400 │401 │402 │403     │405   │407     │409 │410 │ │412│413│414│
- * └────┴────┴────┴────────┴──────┴────────┴────┴────┘ └───┴───┴───┘
- * ┌────┬────┬────┬────────────────────────┬────┬────�
- * │400 │401 │402 │405                     │409 │410 │ Standard
- * └────┴────┴────┴────────────────────────┴────┴────┘
- */
-
-#define LAYOUT_all( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,   K404, K014, K406, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
-    K300,       K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
-    K400, K401, K402,             K403, K405, K407,       K409, K410,       K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, ____, K409, K410, ____, K412, K413, K414 }  \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
-    K300,       K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
-    K400, K401, K402,                   K405,             K409, K410,       K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
-    { K400, K401, K402, ____, ____, K405, ____, ____, ____, K409, K410, ____, K412, K413, K414 }  \
-}
-
-#define LAYOUT_65_ansi_blocker_split_space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
-    K300,       K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
-    K400, K401, K402,             K403, K405, K407,       K409, K410,       K412, K413, K414  \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
-    { K400, K401, K402, K403, ____, K405, ____, K407, ____, K409, K410, ____, K412, K413, K414 }  \
-}
-
 #ifdef RGB_MATRIX_ENABLE
 #   define URGB_K KC_F24
 #else
diff --git a/keyboards/yandrstudio/nz67v2/rules.mk b/keyboards/yandrstudio/nz67v2/rules.mk
index a5923514e3..ba2d7ccbc3 100644
--- a/keyboards/yandrstudio/nz67v2/rules.mk
+++ b/keyboards/yandrstudio/nz67v2/rules.mk
@@ -14,6 +14,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
-WS2812_DRIVER = pwm         # WS2812 RGB Driver
 ENCODER_ENABLE = yes        # Rotary encoder support
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index d52452e0a2..373b5bcbf9 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -15,17 +15,9 @@
  */
 #pragma once
 
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_COL_PINS {  B2,  B10, B11, A8,  A9,  A10, B5,  A15, B3,  A2,  A3,  B4,  A4,  A5,  A6 }
-#define MATRIX_ROW_PINS {  B0,  B6,  B1,  B7,  A1 }
-
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
 
-#    define RGB_DI_PIN A7
 #    define RGBLED_NUM 69
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json
index d48809128f..0395d71ffd 100644
--- a/keyboards/yandrstudio/tg67/info.json
+++ b/keyboards/yandrstudio/tg67/info.json
@@ -6,6 +6,18 @@
         "pid": "0xAA8D",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B10", "B11", "A8", "A9", "A10", "B5", "A15", "B3", "A2", "A3", "B4", "A4", "A5", "A6"],
+        "rows": ["B0", "B6", "B1", "B7", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/yandrstudio/tg67/rules.mk b/keyboards/yandrstudio/tg67/rules.mk
index 4f60885efd..8aabb4f22e 100644
--- a/keyboards/yandrstudio/tg67/rules.mk
+++ b/keyboards/yandrstudio/tg67/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB Matrix
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
-WS2812_DRIVER = pwm         # WS2812 RGB Driver
diff --git a/keyboards/yandrstudio/wave75/wave75.c b/keyboards/yandrstudio/wave75/wave75.c
deleted file mode 100644
index 56ffa33ade..0000000000
--- a/keyboards/yandrstudio/wave75/wave75.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 JasonRen(biu)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "wave75.h"
diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
index ec02b66c19..74c8f4adce 100644
--- a/keyboards/yandrstudio/yr6095/config.h
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -15,16 +15,8 @@
  */
 #pragma once
 
-
-#define MATRIX_COL_PINS {  B6,  B15, B14, B13, B12, B11, B10, B2,  B1, B0,  A7,  A6,  A5,  A4 }
-#define MATRIX_ROW_PINS {  A1,  A3,  A8,  A9,  A10 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGB_DI_PIN B5
 #    define RGBLED_NUM 1
 
 #    define RGBLIGHT_LAYERS
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json
index 20a1e86cf4..023f71fc14 100644
--- a/keyboards/yandrstudio/yr6095/info.json
+++ b/keyboards/yandrstudio/yr6095/info.json
@@ -6,6 +6,15 @@
         "pid": "0xAA0C",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "B5",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["A1", "A3", "A8", "A9", "A10"]
+    },
+    "diode_direction": "COL2ROW",
     "layouts": {
         "LAYOUT_60_tsangan_split_rshift": {
             "layout": [
diff --git a/keyboards/yandrstudio/yr6095/rules.mk b/keyboards/yandrstudio/yr6095/rules.mk
index 43a4366a1f..421ae9fce1 100644
--- a/keyboards/yandrstudio/yr6095/rules.mk
+++ b/keyboards/yandrstudio/yr6095/rules.mk
@@ -13,4 +13,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = pwm         # WS2812 RGB Driver
diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h
index b5f122fdc8..0e8602dee9 100644
--- a/keyboards/yandrstudio/yr80/config.h
+++ b/keyboards/yandrstudio/yr80/config.h
@@ -18,7 +18,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGB_DI_PIN A7
 #    define RGBLED_NUM 1
 #    define DRIVER_LED_TOTAL RGBLED_NUM
 
diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json
index a393cb7aaf..6d15acd3be 100644
--- a/keyboards/yandrstudio/yr80/info.json
+++ b/keyboards/yandrstudio/yr80/info.json
@@ -6,6 +6,10 @@
         "pid": "0xAA0D",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
     "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["B12", "B13", "B14", "A15", "B3", "B4", "B5", "B0", "A5", "A4", "A3", "A1", "A2", "B11", "B1", "B2", "B10"],
diff --git a/keyboards/yandrstudio/yr80/rules.mk b/keyboards/yandrstudio/yr80/rules.mk
index 43a4366a1f..421ae9fce1 100644
--- a/keyboards/yandrstudio/yr80/rules.mk
+++ b/keyboards/yandrstudio/yr80/rules.mk
@@ -13,4 +13,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-WS2812_DRIVER = pwm         # WS2812 RGB Driver
diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h
index 2fa940c63a..66ec91c510 100644
--- a/keyboards/yandrstudio/zhou65/config.h
+++ b/keyboards/yandrstudio/zhou65/config.h
@@ -15,13 +15,5 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A2, A1, B8, B7, C15 }
-#define MATRIX_COL_PINS { B9, B6, B5, B4, B3, B1, B0, A7, A6, A5, A4, A3, A8, B15, B14 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* enable the nkro when using the VIA. */
 #define FORCE_NKRO
diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json
index d3c36ca852..7a4754cf29 100644
--- a/keyboards/yandrstudio/zhou65/info.json
+++ b/keyboards/yandrstudio/zhou65/info.json
@@ -4,6 +4,11 @@
         "pid": "0xAAAD",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["B9", "B6", "B5", "B4", "B3", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14"],
+        "rows": ["A2", "A1", "B8", "B7", "C15"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "A15",
         "on_state": 0
diff --git a/keyboards/yandrstudio/zhou65/zhou65.c b/keyboards/yandrstudio/zhou65/zhou65.c
deleted file mode 100644
index e527550c9d..0000000000
--- a/keyboards/yandrstudio/zhou65/zhou65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 JasonRen(biu)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "zhou65.h"
diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h
index e53141a772..8a4ce9ec49 100644
--- a/keyboards/yanghu/unicorne/config.h
+++ b/keyboards/yanghu/unicorne/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_COL_PINS \
-    { A14, A15, B13, B14, B15, A13, A0, A1, A2, A3, A6, A7 }
-#define MATRIX_ROW_PINS \
-    { B9, B8, A10, A9 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* I2C - required for custom i2c_init */
 #define I2C1_SCL_PIN B6
 #define I2C1_SDA_PIN B7
@@ -38,7 +29,6 @@
 #define AUDIO_PWM_CHANNEL 1
 
 /* RGB LED */
-#define RGB_DI_PIN B1
 #define RGBLED_NUM 8
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json
index 85b39abe9b..52a703d219 100644
--- a/keyboards/yanghu/unicorne/info.json
+++ b/keyboards/yanghu/unicorne/info.json
@@ -8,6 +8,18 @@
     "pid": "0x0204",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B1",
+    "driver": "pwm"
+  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
+  "matrix_pins": {
+    "cols": ["A14", "A15", "B13", "B14", "B15", "A13", "A0", "A1", "A2", "A3", "A6", "A7"],
+    "rows": ["B9", "B8", "A10", "A9"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B10", "pin_b": "B12"},
@@ -20,57 +32,57 @@
   "layouts": {
     "LAYOUT_split_3x6_4": {
       "layout": [
-        {"label":"Tab", "x":0, "y":0.8},
-        {"label":"Q", "x":1, "y":0.8},
-        {"label":"W", "x":2, "y":0.1},
-        {"label":"E", "x":3, "y":0},
-        {"label":"R", "x":4, "y":0.1},
-        {"label":"T", "x":5, "y":0.2},
+        {"matrix": [0, 0], "x": 0, "y": 0.8},
+        {"matrix": [0, 1], "x": 1, "y": 0.8},
+        {"matrix": [0, 2], "x": 2, "y": 0.1},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.1},
+        {"matrix": [0, 5], "x": 5, "y": 0.2},
 
-        {"label":"Y", "x":9, "y":0.2},
-        {"label":"U", "x":10, "y":0.1},
-        {"label":"I", "x":11, "y":0},
-        {"label":"O", "x":12, "y":0.1},
-        {"label":"P", "x":13, "y":0.8},
-        {"label":"Back Space", "x":14, "y":0.8},
+        {"matrix": [0, 6], "x": 9, "y": 0.2},
+        {"matrix": [0, 7], "x": 10, "y": 0.1},
+        {"matrix": [0, 8], "x": 11, "y": 0},
+        {"matrix": [0, 9], "x": 12, "y": 0.1},
+        {"matrix": [0, 10], "x": 13, "y": 0.8},
+        {"matrix": [0, 11], "x": 14, "y": 0.8},
 
-        {"label":"Ctrl / Esc", "x":0, "y":1.8},
-        {"label":"A", "x":1, "y":1.8},
-        {"label":"S", "x":2, "y":1.1},
-        {"label":"D", "x":3, "y":1},
-        {"label":"F", "x":4, "y":1.1},
-        {"label":"G", "x":5, "y":1.2},
+        {"matrix": [1, 0], "x": 0, "y": 1.8},
+        {"matrix": [1, 1], "x": 1, "y": 1.8},
+        {"matrix": [1, 2], "x": 2, "y": 1.1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.1},
+        {"matrix": [1, 5], "x": 5, "y": 1.2},
 
-        {"label":"H", "x":9, "y":1.2},
-        {"label":"J", "x":10, "y":1.1},
-        {"label":"K", "x":11, "y":1},
-        {"label":"L", "x":12, "y":1.1},
-        {"label":";", "x":13, "y":1.8},
-        {"label":"'", "x":14, "y":1.8},
+        {"matrix": [1, 6], "x": 9, "y": 1.2},
+        {"matrix": [1, 7], "x": 10, "y": 1.1},
+        {"matrix": [1, 8], "x": 11, "y": 1},
+        {"matrix": [1, 9], "x": 12, "y": 1.1},
+        {"matrix": [1, 10], "x": 13, "y": 1.8},
+        {"matrix": [1, 11], "x": 14, "y": 1.8},
 
-        {"label":"Shift", "x":0, "y":2.8},
-        {"label":"Z", "x":1, "y":2.8},
-        {"label":"X", "x":2, "y":2.1},
-        {"label":"C", "x":3, "y":2},
-        {"label":"V", "x":4, "y":2.1},
-        {"label":"B", "x":5, "y":2.2},
+        {"matrix": [2, 0], "x": 0, "y": 2.8},
+        {"matrix": [2, 1], "x": 1, "y": 2.8},
+        {"matrix": [2, 2], "x": 2, "y": 2.1},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.1},
+        {"matrix": [2, 5], "x": 5, "y": 2.2},
 
-        {"label":"N", "x":9, "y":2.2},
-        {"label":"M", "x":10, "y":2.1},
-        {"label":",", "x":11, "y":2},
-        {"label":".", "x":12, "y":2.1},
-        {"label":"/", "x":13, "y":2.8},
-        {"label":"Shift / Enter", "x":14, "y":2.8},
+        {"matrix": [2, 6], "x": 9, "y": 2.2},
+        {"matrix": [2, 7], "x": 10, "y": 2.1},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2.1},
+        {"matrix": [2, 10], "x": 13, "y": 2.8},
+        {"matrix": [2, 11], "x": 14, "y": 2.8},
 
-        {"label":"Ctrl", "x":3, "y":3.7},
-        {"label":"Alt", "x":4, "y":3.7},
-        {"label":"Lower", "x":5, "y":3.7},
-        {"label":"Enter", "x":6, "y":3.2, "h":1.5},
+        {"matrix": [3, 2], "x": 3, "y": 3.7},
+        {"matrix": [3, 3], "x": 4, "y": 3.7},
+        {"matrix": [3, 4], "x": 5, "y": 3.7},
+        {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
 
-        {"label":"Backspace", "x":8, "y":3.2, "h":1.5},
-        {"label":"Space", "x":9, "y":3.7},
-        {"label":"Raise", "x":10, "y":3.7},
-        {"label":"RGUI", "x":11, "y":3.7}
+        {"matrix": [3, 6], "x": 8, "y": 3.2, "h": 1.5},
+        {"matrix": [3, 7], "x": 9, "y": 3.7},
+        {"matrix": [3, 8], "x": 10, "y": 3.7},
+        {"matrix": [3, 9], "x": 11, "y": 3.7}
       ]
     }
   }
diff --git a/keyboards/yanghu/unicorne/rules.mk b/keyboards/yanghu/unicorne/rules.mk
index 8968fb940a..651d6bedf3 100644
--- a/keyboards/yanghu/unicorne/rules.mk
+++ b/keyboards/yanghu/unicorne/rules.mk
@@ -14,10 +14,8 @@ ENCODER_ENABLE = yes
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 
-WS2812_DRIVER = pwm
 AUDIO_DRIVER = pwm_hardware
 
 RGB_MATRIX_ENABLE = no # Do not enable with RGBLIGHT
-RGB_MATRIX_DRIVER = WS2812
 
 DEFAULT_FOLDER = yanghu/unicorne/f411
diff --git a/keyboards/yanghu/unicorne/unicorne.h b/keyboards/yanghu/unicorne/unicorne.h
index f0b5685f1d..6f89e393a7 100644
--- a/keyboards/yanghu/unicorne/unicorne.h
+++ b/keyboards/yanghu/unicorne/unicorne.h
@@ -23,28 +23,3 @@ void oled_render_capslock(bool caps_on);
 void oled_render_mods(void);
 void oled_render_keylog(void);
 #endif
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-// clang-format off
-#define LAYOUT_split_3x6_4( \
-    K00, K01, K02, K03, K04, K05,      K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A, K2B, \
-                K30, K31, K32, K33,  K34, K35, K36, K37 \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05,      K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A, K2B }, \
-    { KC_NO, KC_NO, K30, K31, K32, K33,  K34, K35, K36, K37, KC_NO, KC_NO} \
-}
-// clang-format on
-
-#define LAYOUT LAYOUT_split_3x6_4
diff --git a/keyboards/ydkb/chili/chili.c b/keyboards/ydkb/chili/chili.c
deleted file mode 100644
index f629a6d60a..0000000000
--- a/keyboards/ydkb/chili/chili.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 Mathias Andersson <wraul@dbox.se>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "chili.h"
diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h
index a3fcde472f..dd6631f545 100644
--- a/keyboards/ydkb/chili/config.h
+++ b/keyboards/ydkb/chili/config.h
@@ -17,21 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// ROWS: Top to bottom, COLS: Left to right
-/* Row pin configuration
-*/
-#define MATRIX_ROW_PINS { F5, F4, F1, F0, E6, B0, D5, D3, D2, D1, D0 }
-/* Column pin configuration
- */
-#define MATRIX_COL_PINS { D4, F6, F7, C7, C6, B6, B5, B4, D7, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Underlight configuration
  */
-#define RGB_DI_PIN B3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json
index 1ef666e69f..263eb70e8c 100644
--- a/keyboards/ydkb/chili/info.json
+++ b/keyboards/ydkb/chili/info.json
@@ -8,10 +8,18 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F5", "F4", "F1", "F0", "E6", "B0", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B3"
+    },
     "indicators": {
         "caps_lock": "B2",
         "num_lock": "B1",
diff --git a/keyboards/ydkb/grape/config.h b/keyboards/ydkb/grape/config.h
index 0b71d91e84..0d488de5d4 100644
--- a/keyboards/ydkb/grape/config.h
+++ b/keyboards/ydkb/grape/config.h
@@ -25,7 +25,6 @@
 #define SN74X138_ADDRESS_PINS { D2, D1, D0 }
 
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 4
 #endif
 
diff --git a/keyboards/ydkb/grape/grape.c b/keyboards/ydkb/grape/grape.c
deleted file mode 100644
index c0d33b064b..0000000000
--- a/keyboards/ydkb/grape/grape.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 somepin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "grape.h"
diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/info.json
index 1609ba2721..911b5cf831 100644
--- a/keyboards/ydkb/grape/info.json
+++ b/keyboards/ydkb/grape/info.json
@@ -12,6 +12,9 @@
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "indicators": {
         "caps_lock": "F0",
         "num_lock": "F1",
diff --git a/keyboards/ydkb/just60/config.h b/keyboards/ydkb/just60/config.h
index bc86dc02e5..4ec059e4b5 100644
--- a/keyboards/ydkb/just60/config.h
+++ b/keyboards/ydkb/just60/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E2, C7, B3, B2, B1 }
-#define MATRIX_COL_PINS { D6, D7, B4, B6, B5, B7, F7, F6, F5, F4, F1, F0, E6, B0 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ydkb/just60/info.json b/keyboards/ydkb/just60/info.json
index 618f0d8eac..bea9152e0b 100644
--- a/keyboards/ydkb/just60/info.json
+++ b/keyboards/ydkb/just60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1960",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B6", "B5", "B7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0"],
+        "rows": ["E2", "C7", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "E2",
         "esc_output": "D6"
diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h
index 94c922931b..9914803853 100644
--- a/keyboards/ydkb/yd68/config.h
+++ b/keyboards/ydkb/yd68/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B5, C6, C7, D7, B4 }
-#define MATRIX_COL_PINS { B6, F7, F6, F5, F4, F1, F0, E6, B0, B7, D0, D1, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -50,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/ydkb/yd68/info.json b/keyboards/ydkb/yd68/info.json
index d8f1439a3f..ee5d43fb8e 100644
--- a/keyboards/ydkb/yd68/info.json
+++ b/keyboards/ydkb/yd68/info.json
@@ -8,10 +8,18 @@
     "pid": "0x6060",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["B6", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3", "D5"],
+    "rows": ["B5", "C6", "C7", "D7", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "D4",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "B3"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/yeehaw/config.h b/keyboards/yeehaw/config.h
index 4ead2dc6f2..1445271c8e 100644
--- a/keyboards/yeehaw/config.h
+++ b/keyboards/yeehaw/config.h
@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 7
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -33,4 +31,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/yeehaw/info.json b/keyboards/yeehaw/info.json
index 6c0a2b165e..67080ad327 100644
--- a/keyboards/yeehaw/info.json
+++ b/keyboards/yeehaw/info.json
@@ -13,6 +13,9 @@
       {"pin_a": "D1", "pin_b": "D0"}
     ]
   },
+  "ws2812": {
+    "pin": "B2"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "matrix_pins": {
diff --git a/keyboards/yiancardesigns/seigaiha/info.json b/keyboards/yiancardesigns/seigaiha/info.json
index cf650067f1..fca905283e 100644
--- a/keyboards/yiancardesigns/seigaiha/info.json
+++ b/keyboards/yiancardesigns/seigaiha/info.json
@@ -17,76 +17,83 @@
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":10.25, "y":0},
-                {"x":11.25, "y":0},
-                {"x":12.25, "y":0},
-                {"x":13.25, "y":0},
-                {"x":14.25, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
+                {"matrix": [1, 0], "x": 0, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1.25, "y":1, "w":1.5},
-                {"x":2.75, "y":1},
-                {"x":3.75, "y":1},
-                {"x":4.75, "y":1},
-                {"x":5.75, "y":1},
-                {"x":6.75, "y":1},
-                {"x":9.75, "y":1},
-                {"x":10.75, "y":1},
-                {"x":11.75, "y":1},
-                {"x":12.75, "y":1},
-                {"x":13.75, "y":1},
-                {"x":14.75, "y":1},
-                {"x":15.75, "y":1},
-                {"x":16.75, "y":1, "w":1.5},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
 
-                {"x":0, "y":2},
-                {"x":1.25, "y":2, "w":1.75},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
-                {"x":15, "y":2},
-                {"x":16, "y":2, "w":2.25},
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
 
-                {"x":1.25, "y":3, "w":2.25},
-                {"x":3.5, "y":3},
-                {"x":4.5, "y":3},
-                {"x":5.5, "y":3},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3},
-                {"x":9.5, "y":3},
-                {"x":10.5, "y":3},
-                {"x":11.5, "y":3},
-                {"x":12.5, "y":3},
-                {"x":13.5, "y":3},
-                {"x":14.5, "y":3},
-                {"x":15.5, "y":3, "w":1.75},
-                {"x":17.25, "y":3},
+                {"matrix": [2, 0], "x": 0, "y": 1},
 
-                {"x":1.25, "y":4, "w":1.5},
-                {"x":4.25, "y":4, "w":1.5},
-                {"x":5.75, "y":4, "w":2},
-                {"x":7.75, "y":4, "w":1.25},
-                {"x":9.5, "y":4, "w":2.75},
-                {"x":12.25, "y":4, "w":1.5},
-                {"x":16.75, "y":4, "w":1.5}
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/yiancardesigns/seigaiha/seigaiha.c b/keyboards/yiancardesigns/seigaiha/seigaiha.c
index 02df70e2f7..7a39637b91 100644
--- a/keyboards/yiancardesigns/seigaiha/seigaiha.c
+++ b/keyboards/yiancardesigns/seigaiha/seigaiha.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "seigaiha.h"
+#include "quantum.h"
 #include "i2c_master.h"
 
 // There is no need to initialize the I/O it is done in matrix.c
diff --git a/keyboards/yiancardesigns/seigaiha/seigaiha.h b/keyboards/yiancardesigns/seigaiha/seigaiha.h
deleted file mode 100644
index e05c6f5242..0000000000
--- a/keyboards/yiancardesigns/seigaiha/seigaiha.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 Yiancar-Designs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K10, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K20, K11, K12, K13, K14, K15, K16,      K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      \
-    K30, K21, K22, K23, K24, K25, K26,      K27, K28, K29, K2A, K2B, K2C,      K2E,      \
-         K31, K32, K33, K34, K35, K36,      K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-         K41,      K43,      K45, K46,           K48,      K4A,                K4E       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E }  \
-}
diff --git a/keyboards/ymdk/bface/bface.c b/keyboards/ymdk/bface/bface.c
deleted file mode 100644
index fabc10498a..0000000000
--- a/keyboards/ymdk/bface/bface.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 
- * Copyright 2019 Ethan Durrant (emdarcher)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "quantum.h"
diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h
index 9314f26bea..08303c4b13 100644
--- a/keyboards/ymdk/bface/config.h
+++ b/keyboards/ymdk/bface/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
-#define MATRIX_ROW_PINS { B7, B6, B5, B4, B3}
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7}
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ymdk/bface/info.json b/keyboards/ymdk/bface/info.json
index 641fe31543..41e056a96a 100644
--- a/keyboards/ymdk/bface/info.json
+++ b/keyboards/ymdk/bface/info.json
@@ -8,10 +8,18 @@
     "pid": "0x4266",
     "device_version": "2.0.0"
   },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B7", "B6", "B5", "B4", "B3"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4",
     "levels": 6
   },
+  "ws2812": {
+    "driver": "i2c"
+  },
   "indicators": {
     "caps_lock": "D1"
   },
diff --git a/keyboards/ymdk/bface/rules.mk b/keyboards/ymdk/bface/rules.mk
index 03a618b76d..166b3d3ec8 100644
--- a/keyboards/ymdk/bface/rules.mk
+++ b/keyboards/ymdk/bface/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h
index 1420387adb..a62c64fb37 100644
--- a/keyboards/ymdk/melody96/config.h
+++ b/keyboards/ymdk/melody96/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json
index 074e6c0485..83c45eaa6b 100644
--- a/keyboards/ymdk/melody96/info.json
+++ b/keyboards/ymdk/melody96/info.json
@@ -8,10 +8,18 @@
         "pid": "0x4D96",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "C7",
         "num_lock": "C6",
@@ -30,875 +38,875 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0},
-                {"x": 17, "y": 0},
-                {"x": 18, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1},
-                {"x": 17, "y": 1},
-                {"x": 18, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2},
-                {"x": 17, "y": 2},
-                {"x": 18, "y": 2},
-
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3, "w": 2.25},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3},
-                {"x": 18, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 1.75},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4},
-                {"x": 16, "y": 4},
-                {"x": 17, "y": 4},
-                {"x": 18, "y": 4},
-
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 6.25},
-                {"x": 10, "y": 5},
-                {"x": 11, "y": 5},
-                {"x": 12, "y": 5},
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5},
-                {"x": 16, "y": 5},
-                {"x": 17, "y": 5},
-                {"x": 18, "y": 5}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 3], "x": 13, "y": 1},
+                {"matrix": [10, 6], "x": 14, "y": 1},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [9, 0], "x": 18, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+                {"matrix": [8, 0], "x": 18, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 4},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [7, 0], "x": 18, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5},
+                {"matrix": [6, 0], "x": 18, "y": 5}
             ]
         },
         "LAYOUT_96_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0},
-                {"x": 17, "y": 0},
-                {"x": 18, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1, "w": 2},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1},
-                {"x": 17, "y": 1},
-                {"x": 18, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2},
-                {"x": 17, "y": 2},
-                {"x": 18, "y": 2, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3, "w": 2.25},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3},
-
-                {"x": 0, "y": 4, "w": 2.25},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 1.75},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4},
-                {"x": 16, "y": 4},
-                {"x": 17, "y": 4},
-                {"x": 18, "y": 4, "h": 2},
-
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 6.25},
-                {"x": 10, "y": 5},
-                {"x": 11, "y": 5},
-                {"x": 12, "y": 5},
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5},
-                {"x": 16, "y": 5},
-                {"x": 17, "y": 5}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
             ]
         },
         "LAYOUT_96_ansi_splitbs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0},
-                {"x": 17, "y": 0},
-                {"x": 18, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1},
-                {"x": 17, "y": 1},
-                {"x": 18, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2},
-                {"x": 17, "y": 2},
-                {"x": 18, "y": 2, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3, "w": 2.25},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3},
-
-                {"x": 0, "y": 4, "w": 2.25},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 1.75},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4},
-                {"x": 16, "y": 4},
-                {"x": 17, "y": 4},
-                {"x": 18, "y": 4, "h": 2},
-
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 6.25},
-                {"x": 10, "y": 5},
-                {"x": 11, "y": 5},
-                {"x": 12, "y": 5},
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5},
-                {"x": 16, "y": 5},
-                {"x": 17, "y": 5}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 3], "x": 13, "y": 1},
+                {"matrix": [10, 6], "x": 14, "y": 1},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
             ]
         },
         "LAYOUT_96_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0},
-                {"x": 17, "y": 0},
-                {"x": 18, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1, "w": 2},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1},
-                {"x": 17, "y": 1},
-                {"x": 18, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2},
-                {"x": 17, "y": 2},
-                {"x": 18, "y": 2, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 1.75},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4},
-                {"x": 16, "y": 4},
-                {"x": 17, "y": 4},
-                {"x": 18, "y": 4, "h": 2},
-
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 6.25},
-                {"x": 10, "y": 5},
-                {"x": 11, "y": 5},
-                {"x": 12, "y": 5},
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5},
-                {"x": 16, "y": 5},
-                {"x": 17, "y": 5}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3},
+                {"matrix": [9, 3], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 4},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
             ]
         },
         "LAYOUT_96_iso_splitbs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0},
-                {"x": 17, "y": 0},
-                {"x": 18, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1},
-                {"x": 17, "y": 1},
-                {"x": 18, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2},
-                {"x": 17, "y": 2},
-                {"x": 18, "y": 2, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 1.75},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4},
-                {"x": 16, "y": 4},
-                {"x": 17, "y": 4},
-                {"x": 18, "y": 4, "h": 2},
-
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 6.25},
-                {"x": 10, "y": 5},
-                {"x": 11, "y": 5},
-                {"x": 12, "y": 5},
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5},
-                {"x": 16, "y": 5},
-                {"x": 17, "y": 5}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 3], "x": 13, "y": 1},
+                {"matrix": [10, 6], "x": 14, "y": 1},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3},
+                {"matrix": [9, 3], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 4},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
             ]
         },
         "LAYOUT_96_with60": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0},
-                {"x": 17, "y": 0},
-                {"x": 18, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1, "w": 2},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1},
-                {"x": 17, "y": 1},
-                {"x": 18, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2},
-                {"x": 17, "y": 2},
-                {"x": 18, "y": 2, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3, "w": 2.25},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3},
-
-                {"x": 0, "y": 4, "w": 2.25},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 2.75},
-                {"x": 15, "y": 4},
-                {"x": 16, "y": 4},
-                {"x": 17, "y": 4},
-                {"x": 18, "y": 4, "h": 2},
-
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 6.25},
-                {"x": 10, "y": 5, "w": 1.25},
-                {"x": 11.25, "y": 5, "w": 1.25},
-                {"x": 12.5, "y": 5, "w": 1.25},
-                {"x": 13.75, "y": 5, "w": 1.25},
-                {"x": 15, "y": 5, "w": 2},
-                {"x": 17, "y": 5}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 2.75},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [0, 7], "x": 11.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 4], "x": 12.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 3], "x": 13.75, "y": 5, "w": 1.25},
+                {"matrix": [6, 2], "x": 15, "y": 5, "w": 2},
+                {"matrix": [6, 1], "x": 17, "y": 5}
             ]
         },
         "LAYOUT_96_with60_splitbs": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0},
-                {"x": 17, "y": 0},
-                {"x": 18, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1},
-                {"x": 17, "y": 1},
-                {"x": 18, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2},
-                {"x": 17, "y": 2},
-                {"x": 18, "y": 2, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3, "w": 2.25},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3},
-
-                {"x": 0, "y": 4, "w": 2.25},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 2.75},
-                {"x": 15, "y": 4},
-                {"x": 16, "y": 4},
-                {"x": 17, "y": 4},
-                {"x": 18, "y": 4, "h": 2},
-
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 6.25},
-                {"x": 10, "y": 5, "w": 1.25},
-                {"x": 11.25, "y": 5, "w": 1.25},
-                {"x": 12.5, "y": 5, "w": 1.25},
-                {"x": 13.75, "y": 5, "w": 1.25},
-                {"x": 15, "y": 5, "w": 2},
-                {"x": 17, "y": 5}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 3], "x": 13, "y": 1},
+                {"matrix": [10, 6], "x": 14, "y": 1},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 2.75},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [0, 7], "x": 11.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 4], "x": 12.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 3], "x": 13.75, "y": 5, "w": 1.25},
+                {"matrix": [6, 2], "x": 15, "y": 5, "w": 2},
+                {"matrix": [6, 1], "x": 17, "y": 5}
             ]
         },
         "LAYOUT_96_with60_split_num0": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0},
-                {"x": 17, "y": 0},
-                {"x": 18, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1, "w": 2},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1},
-                {"x": 17, "y": 1},
-                {"x": 18, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2},
-                {"x": 17, "y": 2},
-                {"x": 18, "y": 2, "h": 2},
-
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3, "w": 2.25},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3},
-
-                {"x": 0, "y": 4, "w": 2.25},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 2.75},
-                {"x": 15, "y": 4},
-                {"x": 16, "y": 4},
-                {"x": 17, "y": 4},
-                {"x": 18, "y": 4, "h": 2},
-
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 6.25},
-                {"x": 10, "y": 5, "w": 1.25},
-                {"x": 11.25, "y": 5, "w": 1.25},
-                {"x": 12.5, "y": 5, "w": 1.25},
-                {"x": 13.75, "y": 5, "w": 1.25},
-                {"x": 15, "y": 5},
-                {"x": 16, "y": 5},
-                {"x": 17, "y": 5}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 2.75},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [0, 7], "x": 11.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 4], "x": 12.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 3], "x": 13.75, "y": 5, "w": 1.25},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
             ]
         }
     }
diff --git a/keyboards/ymdk/melody96/melody96.c b/keyboards/ymdk/melody96/melody96.c
deleted file mode 100644
index 44e813586b..0000000000
--- a/keyboards/ymdk/melody96/melody96.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "melody96.h"
diff --git a/keyboards/ymdk/melody96/melody96.h b/keyboards/ymdk/melody96/melody96.h
deleted file mode 100644
index 3d3bc6070c..0000000000
--- a/keyboards/ymdk/melody96/melody96.h
+++ /dev/null
@@ -1,233 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌────┬───�                                          ┌───┬───�
- * │10  │11 │                                          │A3 │A6 │
- * └────┴───┘                                          └───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │50 │51 │52 │53 │54 │55 │56 │57 │58 │B8 │B7 │B5 │B4 │B3 │B6 │B2 │B1 │B0 │63 │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┤
- * │40 │41 │42 │43 │44 │45 │46 │47 │48 │A8 │A7 │A5 │A4 │A6     │A2 │A1 │A0 │64 │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┼───┼───┼───┤    ┌─────� ┌───�
- * │30   │31 │32 │33 │34 │35 │36 │37 │38 │98 │97 │95 │94 │93   │96 │92 │91 │80 │    │93   │ │90 │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤   │ ┌──┴�    │ ├───┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │88 │87 │85 │84      │86 │82 │81 │   │ │84 │    │ │80 │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤ ├───┼────┘ └───┘
- * │10      │12 │13 │14 │15 │16 │17 │18 │78 │77 │75 │74    │73 │76 │72 │71 │60 │ │70 │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┴───┼───┤   │ ├───┤
- * │00  │01  │02  │06                      │08 │07 │05 │04 │03 │62     │61 │   │ │60 │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───────┴───┴───┘ └───┘
- *                                                  ┌──────────┬───┬───�
- *                                                  │74        │66 │62 │
- *                                                  └──────────┴───┴───┘
- * ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┬───�
- * │00  │01  │02  │06                      │08   │05   │04 │03 │
- * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┘
- * ┌────┬────┬────┬─────────────────────────────┬────┬────┬────�
- * │00  │01  │02  │06                      │08  │07  │04  │03  │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- * ┌─────┬─────┬───────────────────────────┬─────┬─────┬───┬───�
- * │00   │01   │06                         │08   │05   │04 │03 │
- * └─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┘
- * ┌─────┬─────┬───────────────────────────┬────┬────┬────┬────�
- * │00   │01   │06                         │08  │07  │04  │03  │
- * └─────┴─────┴───────────────────────────┴────┴────┴────┴────┘
- * ┌─────┬─────┬───────────────────────────┬───┬───┬───┬───┬───�
- * │00   │01   │06                         │08 │07 │05 │04 │03 │
- * └─────┴─────┴───────────────────────────┴───┴───┴───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────�
- * │00   │01 │02   │06                         │07   │04 │03   │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- * ┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───�
- * │00   │01 │02   │06                         │07 │05 │04 │03 │
- * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────┬─────┬─────┬───┬───�
- * │00   │01 │02   │06                     │08   │05   │04 │03 │
- * └─────┴───┴─────┴───────────────────────┴─────┴─────┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────┬───┬───┬───┬───┬───�
- * │00   │01 │02   │06                     │08 │07 │05 │04 │03 │
- * └─────┴───┴─────┴───────────────────────┴───┴───┴───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────┬────┬────┬────┬────�
- * │00   │01 │02   │06                     │08  │07  │04  │03  │
- * └─────┴───┴─────┴───────────────────────┴────┴────┴────┴────┘
- */
-
-#define LAYOUT_all( \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA3, kA6, kA2, kA1, kA0, k64, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k93, k96, k92, k91, k90, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k84, k86, k82, k81, k80, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k78, k77, k75, k74, k73, k76, k72, k71, k70, \
-    k00, k01, k02,                k06,           k08, k07, k05, k04, k03, k66, k62, k61, k60 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \
-    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98 }, \
-    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8 }, \
-    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
-}
-
-#define LAYOUT_96_ansi( \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA6, kA2, kA1, kA0, k64, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k93, k96, k92, k91, k80, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k84, k86, k82, k81, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k78, k77, k75, k74, k73, k76, k72, k71, k60, \
-    k00, k01, k02,                k06,           k08, k07, k05, k04, k03, k66, k62, k61 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
-    { XXX, k71, k72, k73, k74, k75, k76, k77, k78 }, \
-    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
-    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
-    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \
-    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
-}
-
-#define LAYOUT_96_ansi_splitbs( \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA3, kA6, kA2, kA1, kA0, k64, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k93, k96, k92, k91, k80, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k84, k86, k82, k81, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k78, k77, k75, k74, k73, k76, k72, k71, k60, \
-    k00, k01, k02,                k06,           k08, k07, k05, k04, k03, k66, k62, k61 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
-    { XXX, k71, k72, k73, k74, k75, k76, k77, k78 }, \
-    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
-    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
-    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \
-    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
-}
-
-#define LAYOUT_96_iso( \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA6, kA2, kA1, kA0, k64, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94,      k96, k92, k91, k80, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85, k84, k93, k86, k82, k81, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k78, k77, k75, k74, k73, k76, k72, k71, k60, \
-    k00, k01, k02,                k06,           k08, k07, k05, k04, k03, k66, k62, k61 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
-    { XXX, k71, k72, k73, k74, k75, k76, k77, k78 }, \
-    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
-    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
-    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \
-    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
-}
-
-#define LAYOUT_96_iso_splitbs( \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA3, kA6, kA2, kA1, kA0, k64, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94,      k96, k92, k91, k80, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85, k84, k93, k86, k82, k81, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k78, k77, k75, k74, k73, k76, k72, k71, k60, \
-    k00, k01, k02,                k06,           k08, k07, k05, k04, k03, k66, k62, k61 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
-    { XXX, k71, k72, k73, k74, k75, k76, k77, k78 }, \
-    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
-    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
-    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8 }, \
-    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
-}
-
-#define LAYOUT_96_with60( \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA6, kA2, kA1, kA0, k64, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k84, k96, k92, k91, k80, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k93, k86, k82, k81, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k78, k77, k75,      k74, k76, k72, k71, k60,\
-    k00, k01, k02,                k06,                k08, k07, k04, k03, k62,      k61 \
-) { \
-    { k00, k01, k02, k03, k04, XXX, k06, k07, k08 }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, XXX, XXX, XXX, XXX }, \
-    { XXX, k71, k72, XXX, k74, k75, k76, k77, k78 }, \
-    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
-    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
-    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \
-    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
-}
-
-#define LAYOUT_96_with60_splitbs( \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA3, kA6, kA2, kA1, kA0, k64, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k84, k96, k92, k91, k80, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k93, k86, k82, k81, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k78, k77, k75,      k74, k76, k72, k71, k60, \
-    k00, k01, k02,                k06,                k08, k07, k04, k03, k62,      k61 \
-) { \
-    { k00, k01, k02, k03, k04, XXX, k06, k07, k08 }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, XXX, XXX, XXX, XXX }, \
-    { XXX, k71, k72, XXX, k74, k75, k76, k77, k78 }, \
-    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
-    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
-    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8 }, \
-    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
-}
-
-#define LAYOUT_96_with60_split_num0( \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA6, kA2, kA1, kA0, k64, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k84, k96, k92, k91, k80,\
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k93, k86, k82, k81, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k78, k77, k75,      k74, k76, k72, k71, k60, \
-    k00, k01, k02,                k06,                k08, k07, k04, k03, k66, k62, k61 \
-) { \
-    { k00, k01, k02, k03, k04, XXX, k06, k07, k08 }, \
-    { k10, XXX, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
-    { XXX, k71, k72, XXX, k74, k75, k76, k77, k78 }, \
-    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
-    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
-    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \
-    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
-}
diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h
index ce2e688bd7..81bfa2e81a 100644
--- a/keyboards/ymdk/np21/config.h
+++ b/keyboards/ymdk/np21/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLED_NUM 5
 //#define RGBLIGHT_HUE_STEP 8
 //#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json
index 9d1e375cd9..1c4651c94c 100644
--- a/keyboards/ymdk/np21/info.json
+++ b/keyboards/ymdk/np21/info.json
@@ -7,110 +7,121 @@
         "pid": "0x5021",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5"],
+        "rows": ["B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4",
         "levels": 12,
         "breathing": true
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "num_lock": "D0"
     },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "community_layouts": ["ortho_6x4", "numpad_6x4"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x6"
+    },
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
 
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
+                {"matrix": [0, 1], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
 
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
+                {"matrix": [0, 2], "x": 0, "y": 2.25},
+                {"matrix": [1, 2], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [3, 2], "x": 3, "y": 2.25},
 
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
+                {"matrix": [0, 3], "x": 0, "y": 3.25},
+                {"matrix": [1, 3], "x": 1, "y": 3.25},
+                {"matrix": [2, 3], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
 
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
+                {"matrix": [0, 4], "x": 0, "y": 4.25},
+                {"matrix": [1, 4], "x": 1, "y": 4.25},
+                {"matrix": [2, 4], "x": 2, "y": 4.25},
+                {"matrix": [3, 4], "x": 3, "y": 4.25},
 
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 5.25}
+                {"matrix": [0, 5], "x": 0, "y": 5.25},
+                {"matrix": [1, 5], "x": 1, "y": 5.25},
+                {"matrix": [2, 5], "x": 2, "y": 5.25},
+                {"matrix": [3, 5], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_ortho_4x6": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5.25, "y": 0},
+                {"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.25, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5.25, "y": 1},
+                {"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.25, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5.25, "y": 2},
+                {"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.25, "y": 2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5.25, "y": 3}
+                {"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.25, "y": 3}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
 
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
+                {"matrix": [0, 1], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
 
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
+                {"matrix": [0, 2], "x": 0, "y": 2.25},
+                {"matrix": [1, 2], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
 
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 2.25, "h": 2},
+                {"matrix": [0, 3], "x": 0, "y": 3.25},
+                {"matrix": [1, 3], "x": 1, "y": 3.25},
+                {"matrix": [2, 3], "x": 2, "y": 3.25},
+                {"matrix": [3, 2], "x": 3, "y": 2.25, "h": 2},
 
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
+                {"matrix": [0, 4], "x": 0, "y": 4.25},
+                {"matrix": [1, 4], "x": 1, "y": 4.25},
+                {"matrix": [2, 4], "x": 2, "y": 4.25},
 
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 5], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [2, 5], "x": 2, "y": 5.25},
+                {"matrix": [3, 4], "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/ymdk/np21/np21.c b/keyboards/ymdk/np21/np21.c
deleted file mode 100644
index 824cfb0d1a..0000000000
--- a/keyboards/ymdk/np21/np21.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2018 Kenneth A. <github.com/krusli>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "np21.h"
diff --git a/keyboards/ymdk/np21/np21.h b/keyboards/ymdk/np21/np21.h
deleted file mode 100644
index 7434cf016d..0000000000
--- a/keyboards/ymdk/np21/np21.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_ortho_6x4( \
-    k00,  k10,  k20,  k30, \
-    k01,  k11,  k21,  k31, \
-    k02,  k12,  k22,  k32, \
-    k03,  k13,  k23,  k33, \
-    k04,  k14,  k24,  k34, \
-    k05,  k15,  k25,  k35 \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 } \
-}
-
-#define LAYOUT_ortho_4x6( \
-    k05, k04, k03, k02, k01, k00, \
-    k15, k14, k13, k12, k11, k10, \
-    k25, k24, k23, k22, k21, k20, \
-    k35, k34, k33, k32, k31, k30 \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 } \
-}
-
-#define LAYOUT_numpad_6x4( \
-    k00,  k10,  k20,  k30, \
-    k01,  k11,  k21,  k31, \
-    k02,  k12,  k22, \
-    k03,  k13,  k23,  k32, \
-    k04,  k14,  k24, \
-    k05,        k25,  k34 \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, XXX }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, XXX, k34, XXX } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x6
diff --git a/keyboards/ymdk/np21/rules.mk b/keyboards/ymdk/np21/rules.mk
index 674983a7ab..e9c8472d0b 100644
--- a/keyboards/ymdk/np21/rules.mk
+++ b/keyboards/ymdk/np21/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h
index 0524cfd563..0f6e31d199 100644
--- a/keyboards/ymdk/np24/u4rgb6/config.h
+++ b/keyboards/ymdk/np24/u4rgb6/config.h
@@ -15,16 +15,6 @@
  */
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B6, B2, B1, D7, B4 }
-#define MATRIX_COL_PINS { F5, F4, D3, D2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 # define RGBLED_NUM 6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -36,4 +26,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json
index dd4b532538..709f382c0a 100644
--- a/keyboards/ymdk/np24/u4rgb6/info.json
+++ b/keyboards/ymdk/np24/u4rgb6/info.json
@@ -7,10 +7,18 @@
         "pid": "0x5024",
         "device_version": "4.0.6"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "D3", "D2"],
+        "rows": ["B3", "B6", "B2", "B1", "D7", "B4"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B7",
         "levels": 31
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "num_lock": "C6",
         "on_state": 0
@@ -21,129 +29,129 @@
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_ortho_4x6_right": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0, "w": 1.5},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1, "w": 1.5},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2, "w": 1.5},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3, "w": 1.5}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [4, 0], "x": 1, "y": 0},
+                {"matrix": [3, 0], "x": 2, "y": 0},
+                {"matrix": [2, 0], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 4, "y": 0},
+                {"matrix": [0, 0], "x": 5, "y": 0, "w": 1.5},
+
+                {"matrix": [5, 1], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [3, 1], "x": 2, "y": 1},
+                {"matrix": [2, 1], "x": 3, "y": 1},
+                {"matrix": [1, 1], "x": 4, "y": 1},
+                {"matrix": [0, 1], "x": 5, "y": 1, "w": 1.5},
+
+                {"matrix": [5, 2], "x": 0, "y": 2},
+                {"matrix": [4, 2], "x": 1, "y": 2},
+                {"matrix": [3, 2], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [1, 2], "x": 4, "y": 2},
+                {"matrix": [0, 2], "x": 5, "y": 2, "w": 1.5},
+
+                {"matrix": [5, 3], "x": 0, "y": 3},
+                {"matrix": [4, 3], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 3},
+                {"matrix": [1, 3], "x": 4, "y": 3},
+                {"matrix": [0, 3], "x": 5, "y": 3, "w": 1.5}
             ]
         },
 
         "LAYOUT_ortho_4x6_left": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.5},
-                {"x": 1.5, "y": 0},
-                {"x": 2.5, "y": 0},
-                {"x": 3.5, "y": 0},
-                {"x": 4.5, "y": 0},
-                {"x": 5.5, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-
-                {"x": 0, "y": 3, "w": 1.5},
-                {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3}
+                {"matrix": [0, 3], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 0},
+                {"matrix": [2, 3], "x": 2.5, "y": 0},
+                {"matrix": [3, 3], "x": 3.5, "y": 0},
+                {"matrix": [4, 3], "x": 4.5, "y": 0},
+                {"matrix": [5, 3], "x": 5.5, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [2, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 2], "x": 3.5, "y": 1},
+                {"matrix": [4, 2], "x": 4.5, "y": 1},
+                {"matrix": [5, 2], "x": 5.5, "y": 1},
+
+                {"matrix": [0, 1], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 1], "x": 2.5, "y": 2},
+                {"matrix": [3, 1], "x": 3.5, "y": 2},
+                {"matrix": [4, 1], "x": 4.5, "y": 2},
+                {"matrix": [5, 1], "x": 5.5, "y": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 3},
+                {"matrix": [2, 0], "x": 2.5, "y": 3},
+                {"matrix": [3, 0], "x": 3.5, "y": 3},
+                {"matrix": [4, 0], "x": 4.5, "y": 3},
+                {"matrix": [5, 0], "x": 5.5, "y": 3}
             ]
         },
 
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 2.25, "h": 2},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "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.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": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/ymdk/np24/u4rgb6/u4rgb6.c b/keyboards/ymdk/np24/u4rgb6/u4rgb6.c
deleted file mode 100644
index edd0c0552d..0000000000
--- a/keyboards/ymdk/np24/u4rgb6/u4rgb6.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Simon Arlott
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "u4rgb6.h"
diff --git a/keyboards/ymdk/np24/u4rgb6/u4rgb6.h b/keyboards/ymdk/np24/u4rgb6/u4rgb6.h
deleted file mode 100644
index 7615cf2bed..0000000000
--- a/keyboards/ymdk/np24/u4rgb6/u4rgb6.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
- * Copyright 2021 Simon Arlott
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_ortho_6x4( \
-    k00,  k10,  k20,  k30, \
-    k01,  k11,  k21,  k31, \
-    k02,  k12,  k22,  k32, \
-    k03,  k13,  k23,  k33, \
-    k04,  k14,  k24,  k34, \
-    k05,  k15,  k25,  k35  \
-) { \
-    { k00, k10, k20, k30 }, \
-    { k01, k11, k21, k31 }, \
-    { k02, k12, k22, k32 }, \
-    { k03, k13, k23, k33 }, \
-    { k04, k14, k24, k34 }, \
-    { k05, k15, k25, k35 }  \
-}
-
-#define LAYOUT_ortho_4x6_right( \
-    k00, k01, k02, k03, k04, k05, \
-    k10, k11, k12, k13, k14, k15, \
-    k20, k21, k22, k23, k24, k25, \
-    k30, k31, k32, k33, k34, k35  \
-) { \
-    { k05, k15, k25, k35 }, \
-    { k04, k14, k24, k34 }, \
-    { k03, k13, k23, k33 }, \
-    { k02, k12, k22, k32 }, \
-    { k01, k11, k21, k31 }, \
-    { k00, k10, k20, k30 }  \
-}
-
-#define LAYOUT_ortho_4x6_left( \
-    k00, k01, k02, k03, k04, k05, \
-    k10, k11, k12, k13, k14, k15, \
-    k20, k21, k22, k23, k24, k25, \
-    k30, k31, k32, k33, k34, k35  \
-) { \
-    { k30, k20, k10, k00 }, \
-    { k31, k21, k11, k01 }, \
-    { k32, k22, k12, k02 }, \
-    { k33, k23, k13, k03 }, \
-    { k34, k24, k14, k04 }, \
-    { k35, k25, k15, k05 }  \
-}
-
-#define LAYOUT_numpad_6x4( \
-    k00, k10, k20, k30, \
-    k01, k11, k21, k31, \
-    k02, k12, k22,      \
-    k03, k13, k23, k33, \
-    k04, k14, k24,      \
-    k15,      k25, k35  \
-) { \
-    { k00, k10, k20, k30 }, \
-    { k01, k11, k21, k31 }, \
-    { k02, k12, k22, XXX }, \
-    { k03, k13, k23, k33 }, \
-    { k04, k14, k24, XXX }, \
-    { XXX, k15, k25, k35 }  \
-}
diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json
index 66cbbe56e5..46f533b14d 100644
--- a/keyboards/ymdk/sp64/info.json
+++ b/keyboards/ymdk/sp64/info.json
@@ -13,6 +13,9 @@
         "num_lock": "D0",
         "scroll_lock": "D6"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "layouts": {
diff --git a/keyboards/ymdk/sp64/rules.mk b/keyboards/ymdk/sp64/rules.mk
index 6cef95fd45..df9380f361 100644
--- a/keyboards/ymdk/sp64/rules.mk
+++ b/keyboards/ymdk/sp64/rules.mk
@@ -13,8 +13,5 @@ AUDIO_SUPPORTED = no
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 CUSTOM_MATRIX = yes
 
-# Needed for underglow
-WS2812_DRIVER = i2c
-
 SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h
index 3b21cea4a6..1998e88011 100644
--- a/keyboards/ymdk/wings/config.h
+++ b/keyboards/ymdk/wings/config.h
@@ -15,25 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 14
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -50,5 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-#endif
diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json
index 92f019bacb..090c8bc4d7 100644
--- a/keyboards/ymdk/wings/info.json
+++ b/keyboards/ymdk/wings/info.json
@@ -8,10 +8,18 @@
         "pid": "0x2975",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "indicators": {
         "caps_lock": "C7",
         "on_state": 0
@@ -21,79 +29,87 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"1", "x":1.75, "y":0.25},
-                {"label":"2", "x":2.75, "y":0},
-                {"label":"3", "x":3.75, "y":0.25},
-                {"label":"4", "x":4.75, "y":0.25},
-                {"label":"5", "x":5.75, "y":0.25},
-                {"label":"6", "x":6.75, "y":0.25},
-                {"label":"7", "x":10, "y":0.25},
-                {"label":"8", "x":11, "y":0.25},
-                {"label":"9", "x":12, "y":0.25},
-                {"label":"0", "x":13, "y":0.25},
-                {"label":"-", "x":14, "y":0},
-                {"label":"=", "x":15, "y":0.25},
-                {"label":"|", "x":16, "y":0.25},
-                {"label":"Grave", "x":17, "y":0.25},
-                {"label":"PgUp", "x":18.75, "y":0},
+                {"x":0.25, "y":0.25},
+                {"x":1.25, "y":0.25},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0.25},
+                {"x":4.25, "y":0.25},
+                {"x":5.25, "y":0.25},
+                {"x":6.25, "y":0.25},
+
+                {"x":9.5, "y":0.25},
+                {"x":10.5, "y":0.25},
+                {"x":11.5, "y":0.25},
+                {"x":12.5, "y":0.25},
+                {"x":13.5, "y":0},
+                {"x":14.5, "y":0.25},
+                {"x":15.5, "y":0.25},
+                {"x":16.5, "y":0.25},
+
+                {"x":18.25, "y":0},
+
+                {"x":0, "y":1.25, "w":1.5},
+                {"x":1.5, "y":1.25},
+                {"x":2.75, "y":1.25},
+                {"x":3.75, "y":1.25},
+                {"x":4.75, "y":1.25},
+                {"x":5.75, "y":1.25},
+
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13.25, "y":1.25},
+                {"x":14.25, "y":1.25},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25, "w":1.5},
+
+                {"x":18.5, "y":1},
+
+                {"x":0, "y":2.25, "w":1.75},
+                {"x":1.75, "y":2.25},
+                {"x":3, "y":2.25},
+                {"x":4, "y":2.25},
+                {"x":5, "y":2.25},
+                {"x":6, "y":2.25},
+
+                {"x":9.25, "y":2.25},
+                {"x":10.25, "y":2.25},
+                {"x":11.25, "y":2.25},
+                {"x":12.25, "y":2.25},
+                {"x":13.75, "y":2.25},
+                {"x":14.75, "y":2.25},
+                {"x":15.75, "y":2.25, "w":2.25},
+
+                {"x":18.75, "y":2},
+
+                {"x":0, "y":3.25, "w":2.25},
+                {"x":2.25, "y":3.25},
+                {"x":3.5, "y":3.25},
+                {"x":4.5, "y":3.25},
+                {"x":5.5, "y":3.25},
+                {"x":6.5, "y":3.25},
 
-               
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.25, "y":1.25},
-                {"label":"E", "x":4.25, "y":1.25},
-                {"label":"R", "x":5.25, "y":1.25},
-                {"label":"T", "x":6.25, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":13.75, "y":1.25},
-                {"label":"{", "x":14.75, "y":1.25},
-                {"label":"}", "x":15.75, "y":1.25},
-                {"label":"Backspace", "x":16.75, "y":1.25, "w":1.5},
-                {"label":"PgDn", "x":19, "y":1},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":13.5, "y":3.25},
+                {"x":14.5, "y":3.25},
+                {"x":15.5, "y":3.25, "w":1.75},
 
+                {"x":17.5, "y":3.25},
 
-                {"label":"Caps Lock", "x":0.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":2.25, "y":2.25},
-                {"label":"S", "x":3.5, "y":2.25},
-                {"label":"D", "x":4.5, "y":2.25},
-                {"label":"F", "x":5.5, "y":2.25},
-                {"label":"G", "x":6.5, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.25, "y":2.25},
-                {"label":"\"", "x":15.25, "y":2.25},
-                {"label":"Enter", "x":16.25, "y":2.25, "w":2.25},
-                {"label":"Fn", "x":19.25, "y":2},
+                {"x":0, "y":4.25, "w":1.5},
+                {"x":3.5, "y":4.25, "w":1.5},
+                {"x":5, "y":4.25, "w":2},
+                {"x":7, "y":4.25},
 
-                {"label":"Shift", "x":0.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.75, "y":3.25},
-                {"label":"X", "x":4, "y":3.25},
-                {"label":"C", "x":5, "y":3.25},
-                {"label":"V", "x":6, "y":3.25},
-                {"label":"B", "x":7, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"Up", "x":18, "y":3.25},
+                {"x":9.75, "y":4.25, "w":2.75},
+                {"x":12.5, "y":4.25, "w":1.5},
 
-                {"label":"Ctrl", "x":0.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.5},
-                {"label":"Space", "x":5.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":7.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Left", "x":17, "y":4.25},
-                {"label":"Down", "x":18, "y":4.25},
-                {"label":"Right", "x":19, "y":4.25}
+                {"x":16.5, "y":4.25},
+                {"x":17.5, "y":4.25},
+                {"x":18.5, "y":4.25}
             ]
         }
     }
diff --git a/keyboards/ymdk/wings/wings.c b/keyboards/ymdk/wings/wings.c
deleted file mode 100644
index 4e696d97b8..0000000000
--- a/keyboards/ymdk/wings/wings.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 alittlepeace
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "wings.h"
diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h
index 055c93b327..1679d16b44 100644
--- a/keyboards/ymdk/wingshs/config.h
+++ b/keyboards/ymdk/wingshs/config.h
@@ -13,25 +13,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLED_NUM 80
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -48,7 +29,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 160 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-#endif
-
-
diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json
index 8e72d4093a..ec532eff87 100644
--- a/keyboards/ymdk/wingshs/info.json
+++ b/keyboards/ymdk/wingshs/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4975",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 5
@@ -16,83 +21,92 @@
         "caps_lock": "C7",
         "on_state": 0
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"1", "x":1.75, "y":0.25},
-                {"label":"2", "x":2.75, "y":0},
-                {"label":"3", "x":3.75, "y":0.25},
-                {"label":"4", "x":4.75, "y":0.25},
-                {"label":"5", "x":5.75, "y":0.25},
-                {"label":"6", "x":6.75, "y":0.25},
-                {"label":"7", "x":10, "y":0.25},
-                {"label":"8", "x":11, "y":0.25},
-                {"label":"9", "x":12, "y":0.25},
-                {"label":"0", "x":13, "y":0.25},
-                {"label":"-", "x":14, "y":0},
-                {"label":"=", "x":15, "y":0.25},
-                {"label":"Backspace", "x":16, "y":0.25, "w":2},
-                {"label":"PgUp", "x":18.75, "y":0},
+                {"x":0.25, "y":0.25},
+                {"x":1.25, "y":0.25},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0.25},
+                {"x":4.25, "y":0.25},
+                {"x":5.25, "y":0.25},
+                {"x":6.25, "y":0.25},
+
+                {"x":9.5, "y":0.25},
+                {"x":10.5, "y":0.25},
+                {"x":11.5, "y":0.25},
+                {"x":12.5, "y":0.25},
+                {"x":13.5, "y":0},
+                {"x":14.5, "y":0.25},
+                {"x":15.5, "y":0.25, "w":2},
+
+                {"x":18.25, "y":0},
+
+                {"x":0, "y":1.25, "w":1.5},
+                {"x":1.5, "y":1.25},
+                {"x":2.75, "y":1.25},
+                {"x":3.75, "y":1.25},
+                {"x":4.75, "y":1.25},
+                {"x":5.75, "y":1.25},
+
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13.25, "y":1.25},
+                {"x":14.25, "y":1.25},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25, "w":1.5},
+
+                {"x":18.5, "y":1},
+
+                {"x":0, "y":2.25, "w":1.75},
+                {"x":1.75, "y":2.25},
+                {"x":3, "y":2.25},
+                {"x":4, "y":2.25},
+                {"x":5, "y":2.25},
+                {"x":6, "y":2.25},
+
+                {"x":9.25, "y":2.25},
+                {"x":10.25, "y":2.25},
+                {"x":11.25, "y":2.25},
+                {"x":12.25, "y":2.25},
+                {"x":13.75, "y":2.25},
+                {"x":14.75, "y":2.25},
+                {"x":15.75, "y":2.25, "w":2.25},
 
-               
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.25, "y":1.25},
-                {"label":"E", "x":4.25, "y":1.25},
-                {"label":"R", "x":5.25, "y":1.25},
-                {"label":"T", "x":6.25, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":13.75, "y":1.25},
-                {"label":"{", "x":14.75, "y":1.25},
-                {"label":"}", "x":15.75, "y":1.25},
-                {"label":"|", "x":16.75, "y":1.25, "w":1.5},
-                {"label":"PgDn", "x":19, "y":1},
+                {"x":18.75, "y":2},
 
+                {"x":0, "y":3.25, "w":2.25},
+                {"x":2.25, "y":3.25},
+                {"x":3.5, "y":3.25},
+                {"x":4.5, "y":3.25},
+                {"x":5.5, "y":3.25},
+                {"x":6.5, "y":3.25},
 
-                {"label":"Caps Lock", "x":0.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":2.25, "y":2.25},
-                {"label":"S", "x":3.5, "y":2.25},
-                {"label":"D", "x":4.5, "y":2.25},
-                {"label":"F", "x":5.5, "y":2.25},
-                {"label":"G", "x":6.5, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.25, "y":2.25},
-                {"label":"\"", "x":15.25, "y":2.25},
-                {"label":"Enter", "x":16.25, "y":2.25, "w":2.25},
-                {"label":"Fn", "x":19.25, "y":2},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":13.5, "y":3.25},
+                {"x":14.5, "y":3.25},
+                {"x":15.5, "y":3.25, "w":1.75},
+                {"x":17.5, "y":3.25},
 
-                {"label":"Shift", "x":0.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.75, "y":3.25},
-                {"label":"X", "x":4, "y":3.25},
-                {"label":"C", "x":5, "y":3.25},
-                {"label":"V", "x":6, "y":3.25},
-                {"label":"B", "x":7, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"Up", "x":18, "y":3.25},
+                {"x":0, "y":4.25, "w":1.5},
+                {"x":3.5, "y":4.25, "w":1.5},
+                {"x":5, "y":4.25, "w":2},
+                {"x":7, "y":4.25},
+                {"x":9.75, "y":4.25, "w":2.75},
+                {"x":12.5, "y":4.25, "w":1.5},
 
-                {"label":"Ctrl", "x":0.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.5},
-                {"label":"Space", "x":5.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":7.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Left", "x":17, "y":4.25},
-                {"label":"Down", "x":18, "y":4.25},
-                {"label":"Right", "x":19, "y":4.25}
+                {"x":16.5, "y":4.25},
+                {"x":17.5, "y":4.25},
+                {"x":18.5, "y":4.25}
             ]
         }
     }
diff --git a/keyboards/ymdk/wingshs/wingshs.c b/keyboards/ymdk/wingshs/wingshs.c
deleted file mode 100644
index f82fe22197..0000000000
--- a/keyboards/ymdk/wingshs/wingshs.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 alittlepeace
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "wingshs.h"
diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h
index 82d7484aa8..135548b4ff 100644
--- a/keyboards/ymdk/yd60mq/config.h
+++ b/keyboards/ymdk/yd60mq/config.h
@@ -1,19 +1,10 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* prevent stuck modifiers */
 
-#define RGB_DI_PIN E2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json
index 84b42905c7..cb10a82245 100644
--- a/keyboards/ymdk/yd60mq/info.json
+++ b/keyboards/ymdk/yd60mq/info.json
@@ -7,10 +7,18 @@
         "vid": "0x594D",
         "pid": "0x604D"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"],
diff --git a/keyboards/ymdk/ym68/config.h b/keyboards/ymdk/ym68/config.h
index d07a8917df..8d19a6eb7e 100644
--- a/keyboards/ymdk/ym68/config.h
+++ b/keyboards/ymdk/ym68/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
 #if defined(RGBLIGHT_ENABLE)
     #define RGBLED_NUM 20
     #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/info.json
index 5d4d3913f8..e7490d59dd 100644
--- a/keyboards/ymdk/ym68/info.json
+++ b/keyboards/ymdk/ym68/info.json
@@ -8,11 +8,19 @@
         "pid": "0xD896",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 5,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ymdk/ym68/ym68.c b/keyboards/ymdk/ym68/ym68.c
deleted file mode 100644
index 3ec4d97b22..0000000000
--- a/keyboards/ymdk/ym68/ym68.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ym68.h"
diff --git a/keyboards/ymdk/ymd09/config.h b/keyboards/ymdk/ymd09/config.h
index 768d93d624..b66c41ad69 100644
--- a/keyboards/ymdk/ymd09/config.h
+++ b/keyboards/ymdk/ymd09/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGB_MATRIX_LED_COUNT 9
-#define RGB_DI_PIN E2
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
diff --git a/keyboards/ymdk/ymd09/info.json b/keyboards/ymdk/ymd09/info.json
index d34cf858b4..9868188d06 100644
--- a/keyboards/ymdk/ymd09/info.json
+++ b/keyboards/ymdk/ymd09/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4409",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D2", "D1"],
+        "rows": ["F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "features": {
@@ -19,14 +24,12 @@
         "nkro": true,
         "rgb_matrix": true,
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "build": {
         "lto": true
     },
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        "cols": ["D6", "D2", "D1"],
-        "rows": ["F5", "F4", "F1"]
-    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ymdk/ymd21/v2/config.h b/keyboards/ymdk/ymd21/v2/config.h
index 36cbd93891..a88fef93fa 100644
--- a/keyboards/ymdk/ymd21/v2/config.h
+++ b/keyboards/ymdk/ymd21/v2/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B3, B6, B2, B1, D7, B4 }
-#define MATRIX_COL_PINS { F5, F4, D3, D2 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
 #if defined(RGBLIGHT_ENABLE)
     #define RGBLED_NUM 8
     #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json
index 84badccc5a..d059c82a06 100644
--- a/keyboards/ymdk/ymd21/v2/info.json
+++ b/keyboards/ymdk/ymd21/v2/info.json
@@ -8,45 +8,53 @@
         "pid": "0x0110",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "D3", "D2"],
+        "rows": ["B3", "B6", "B2", "B1", "D7", "B4"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_6x4"],
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"F3", "x":2, "y":0},
-                {"label":"F4", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"Num Lock", "x":0, "y":1.25},
-                {"label":"/", "x":1, "y":1.25},
-                {"label":"*", "x":2, "y":1.25},
-                {"label":"-", "x":3, "y":1.25},
+                {"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},
 
-                {"label":"7", "x":0, "y":2.25},
-                {"label":"8", "x":1, "y":2.25},
-                {"label":"9", "x":2, "y":2.25},
-                {"label":"=", "x":3, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
 
-                {"label":"4", "x":0, "y":3.25},
-                {"label":"5", "x":1, "y":3.25},
-                {"label":"6", "x":2, "y":3.25},
-                {"label":"+", "x":3, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
 
-                {"label":"1", "x":0, "y":4.25},
-                {"label":"2", "x":1, "y":4.25},
-                {"label":"3", "x":2, "y":4.25},
-                {"label":"Space", "x":3, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
 
-                {"label":"Fn", "x":0, "y":5.25},
-                {"label":"0", "x":1, "y":5.25},
-                {"label":".", "x":2, "y":5.25},
-                {"label":"Enter", "x":3, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/ymdk/ymd21/v2/v2.c b/keyboards/ymdk/ymd21/v2/v2.c
deleted file mode 100644
index 7d498f738d..0000000000
--- a/keyboards/ymdk/ymd21/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 QMK / James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v2.h"
diff --git a/keyboards/ymdk/ymd21/v2/v2.h b/keyboards/ymdk/ymd21/v2/v2.h
deleted file mode 100644
index a234b60508..0000000000
--- a/keyboards/ymdk/ymd21/v2/v2.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2022 QMK / James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───�
- * │00 │01 │02 │03 │
- * └───┴───┴───┴───┘
- * ┌───┬───┬───┬───�
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤   ┌───�
- * │20 │21 │22 │23 │   │   │
- * ├───┼───┼───┼───┤   │?? │ 2u Plus
- * │30 │31 │32 │33 │   │   │
- * ├───┼───┼───┼───┤   ├───┤
- * │40 │41 │42 │43 │   │   │
- * ├───┼───┼───┼───┤   │?? │ 2u Enter
- * │50 │51 │52 │53 │   │   │
- * └───┴───┴───┴───┘   └───┘
- * ┌───────�
- * │??     │ 2u 0
- * └───────┘
- */
-
-
-#define LAYOUT_ortho_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43, \
-    K50, K51, K52, K53  \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, K33 }, \
-    { K40, K41, K42, K43 }, \
-    { K50, K51, K52, K53 }, \
-}
diff --git a/keyboards/ymdk/ymd40/air40/air40.c b/keyboards/ymdk/ymd40/air40/air40.c
index 50e7ad9106..633b4943ff 100644
--- a/keyboards/ymdk/ymd40/air40/air40.c
+++ b/keyboards/ymdk/ymd40/air40/air40.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "air40.h"
+#include "quantum.h"
 
 #if defined(RGB_MATRIX_ENABLE)
 led_config_t g_led_config = {
diff --git a/keyboards/ymdk/ymd40/air40/air40.h b/keyboards/ymdk/ymd40/air40/air40.h
deleted file mode 100644
index d28f6d591a..0000000000
--- a/keyboards/ymdk/ymd40/air40/air40.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B   }, \
-}
-
-#define LAYOUT_ortho_4x12_2x2u( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   \
-    K30, K31, K32, K33,   K34,      K37,    K38, K39, K3A, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-    { K30,   K31,   K32,   K33,   K34,   KC_NO, KC_NO, K37,   K38,   K39,   K3A,   K3B   }, \
-}
-
-#define LAYOUT_ortho_4x12_1x2uR( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   \
-    K30, K31, K32, K33, K34, K35,    K37,   K38, K39, K3A, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   KC_NO, K37,   K38,   K39,   K3A,   K3B   }, \
-}
-
-#define LAYOUT_ortho_4x12_1x2uL( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   \
-    K30, K31, K32, K33,    K34,   K36, K37, K38, K39, K3A, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-    { K30,   K31,   K32,   K33,   K34,   KC_NO, K36,   K37,   K38,   K39,   K3A,   K3B   }, \
-}
-
-#define LAYOUT_ortho_4x12_1x2uC( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   \
-    K30, K31, K32, K33, K34,    K35,   K37, K38, K39, K3A, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   KC_NO, K37,   K38,   K39,   K3A,   K3B   }, \
-}
diff --git a/keyboards/ymdk/ymd40/air40/config.h b/keyboards/ymdk/ymd40/air40/config.h
index db792118da..2f64f97d93 100644
--- a/keyboards/ymdk/ymd40/air40/config.h
+++ b/keyboards/ymdk/ymd40/air40/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, B3, B2, B1 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 51
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json
index 3920ff6a29..6fd647bc93 100644
--- a/keyboards/ymdk/ymd40/air40/info.json
+++ b/keyboards/ymdk/ymd40/air40/info.json
@@ -8,277 +8,288 @@
         "pid": "0x0911",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+        "rows": ["D0", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"label":"K00 (D0,F1)", "x":0, "y":0},
-                {"label":"K01 (D0,F0)", "x":1, "y":0},
-                {"label":"K02 (D0,B0)", "x":2, "y":0},
-                {"label":"K03 (D0,C7)", "x":3, "y":0},
-                {"label":"K04 (D0,F4)", "x":4, "y":0},
-                {"label":"K05 (D0,F5)", "x":5, "y":0},
-                {"label":"K06 (D0,F6)", "x":6, "y":0},
-                {"label":"K07 (D0,F7)", "x":7, "y":0},
-                {"label":"K08 (D0,D4)", "x":8, "y":0},
-                {"label":"K09 (D0,D6)", "x":9, "y":0},
-                {"label":"K0A (D0,B4)", "x":10, "y":0},
-                {"label":"K0B (D0,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (B3,F1)", "x":0, "y":1},
-                {"label":"K11 (B3,F0)", "x":1, "y":1},
-                {"label":"K12 (B3,B0)", "x":2, "y":1},
-                {"label":"K13 (B3,C7)", "x":3, "y":1},
-                {"label":"K14 (B3,F4)", "x":4, "y":1},
-                {"label":"K15 (B3,F5)", "x":5, "y":1},
-                {"label":"K16 (B3,F6)", "x":6, "y":1},
-                {"label":"K17 (B3,F7)", "x":7, "y":1},
-                {"label":"K18 (B3,D4)", "x":8, "y":1},
-                {"label":"K19 (B3,D6)", "x":9, "y":1},
-                {"label":"K1A (B3,B4)", "x":10, "y":1},
-                {"label":"K1B (B3,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (B2,F1)", "x":0, "y":2},
-                {"label":"K21 (B2,F0)", "x":1, "y":2},
-                {"label":"K22 (B2,B0)", "x":2, "y":2},
-                {"label":"K23 (B2,C7)", "x":3, "y":2},
-                {"label":"K24 (B2,F4)", "x":4, "y":2},
-                {"label":"K25 (B2,F5)", "x":5, "y":2},
-                {"label":"K26 (B2,F6)", "x":6, "y":2},
-                {"label":"K27 (B2,F7)", "x":7, "y":2},
-                {"label":"K28 (B2,D4)", "x":8, "y":2},
-                {"label":"K29 (B2,D6)", "x":9, "y":2},
-                {"label":"K2A (B2,B4)", "x":10, "y":2},
-                {"label":"K2B (B2,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (B1,F1)", "x":0, "y":3},
-                {"label":"K31 (B1,F0)", "x":1, "y":3},
-                {"label":"K32 (B1,B0)", "x":2, "y":3},
-                {"label":"K33 (B1,C7)", "x":3, "y":3},
-                {"label":"K34 (B1,F4)", "x":4, "y":3},
-                {"label":"K35 (B1,F5)", "x":5, "y":3},
-                {"label":"K36 (B1,F6)", "x":6, "y":3},
-                {"label":"K37 (B1,F7)", "x":7, "y":3},
-                {"label":"K38 (B1,D4)", "x":8, "y":3},
-                {"label":"K39 (B1,D6)", "x":9, "y":3},
-                {"label":"K3A (B1,B4)", "x":10, "y":3},
-                {"label":"K3B (B1,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12_2x2u": {
             "layout": [
-                {"label":"K00 (D0,F1)", "x":0, "y":0},
-                {"label":"K01 (D0,F0)", "x":1, "y":0},
-                {"label":"K02 (D0,B0)", "x":2, "y":0},
-                {"label":"K03 (D0,C7)", "x":3, "y":0},
-                {"label":"K04 (D0,F4)", "x":4, "y":0},
-                {"label":"K05 (D0,F5)", "x":5, "y":0},
-                {"label":"K06 (D0,F6)", "x":6, "y":0},
-                {"label":"K07 (D0,F7)", "x":7, "y":0},
-                {"label":"K08 (D0,D4)", "x":8, "y":0},
-                {"label":"K09 (D0,D6)", "x":9, "y":0},
-                {"label":"K0A (D0,B4)", "x":10, "y":0},
-                {"label":"K0B (D0,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (B3,F1)", "x":0, "y":1},
-                {"label":"K11 (B3,F0)", "x":1, "y":1},
-                {"label":"K12 (B3,B0)", "x":2, "y":1},
-                {"label":"K13 (B3,C7)", "x":3, "y":1},
-                {"label":"K14 (B3,F4)", "x":4, "y":1},
-                {"label":"K15 (B3,F5)", "x":5, "y":1},
-                {"label":"K16 (B3,F6)", "x":6, "y":1},
-                {"label":"K17 (B3,F7)", "x":7, "y":1},
-                {"label":"K18 (B3,D4)", "x":8, "y":1},
-                {"label":"K19 (B3,D6)", "x":9, "y":1},
-                {"label":"K1A (B3,B4)", "x":10, "y":1},
-                {"label":"K1B (B3,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (B2,F1)", "x":0, "y":2},
-                {"label":"K21 (B2,F0)", "x":1, "y":2},
-                {"label":"K22 (B2,B0)", "x":2, "y":2},
-                {"label":"K23 (B2,C7)", "x":3, "y":2},
-                {"label":"K24 (B2,F4)", "x":4, "y":2},
-                {"label":"K25 (B2,F5)", "x":5, "y":2},
-                {"label":"K26 (B2,F6)", "x":6, "y":2},
-                {"label":"K27 (B2,F7)", "x":7, "y":2},
-                {"label":"K28 (B2,D4)", "x":8, "y":2},
-                {"label":"K29 (B2,D6)", "x":9, "y":2},
-                {"label":"K2A (B2,B4)", "x":10, "y":2},
-                {"label":"K2B (B2,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (B1,F1)", "x":0, "y":3},
-                {"label":"K31 (B1,F0)", "x":1, "y":3},
-                {"label":"K32 (B1,B0)", "x":2, "y":3},
-                {"label":"K33 (B1,C7)", "x":3, "y":3},
-                {"label":"K34 (B1,F4)", "x":4, "y":3, "w":2},
-                {"label":"K37 (B1,F7)", "x":6, "y":3, "w":2},
-                {"label":"K38 (B1,D4)", "x":8, "y":3},
-                {"label":"K39 (B1,D6)", "x":9, "y":3},
-                {"label":"K3A (B1,B4)", "x":10, "y":3},
-                {"label":"K3B (B1,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12_1x2uR": {
             "layout": [
-                {"label":"K00 (D0,F1)", "x":0, "y":0},
-                {"label":"K01 (D0,F0)", "x":1, "y":0},
-                {"label":"K02 (D0,B0)", "x":2, "y":0},
-                {"label":"K03 (D0,C7)", "x":3, "y":0},
-                {"label":"K04 (D0,F4)", "x":4, "y":0},
-                {"label":"K05 (D0,F5)", "x":5, "y":0},
-                {"label":"K06 (D0,F6)", "x":6, "y":0},
-                {"label":"K07 (D0,F7)", "x":7, "y":0},
-                {"label":"K08 (D0,D4)", "x":8, "y":0},
-                {"label":"K09 (D0,D6)", "x":9, "y":0},
-                {"label":"K0A (D0,B4)", "x":10, "y":0},
-                {"label":"K0B (D0,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (B3,F1)", "x":0, "y":1},
-                {"label":"K11 (B3,F0)", "x":1, "y":1},
-                {"label":"K12 (B3,B0)", "x":2, "y":1},
-                {"label":"K13 (B3,C7)", "x":3, "y":1},
-                {"label":"K14 (B3,F4)", "x":4, "y":1},
-                {"label":"K15 (B3,F5)", "x":5, "y":1},
-                {"label":"K16 (B3,F6)", "x":6, "y":1},
-                {"label":"K17 (B3,F7)", "x":7, "y":1},
-                {"label":"K18 (B3,D4)", "x":8, "y":1},
-                {"label":"K19 (B3,D6)", "x":9, "y":1},
-                {"label":"K1A (B3,B4)", "x":10, "y":1},
-                {"label":"K1B (B3,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (B2,F1)", "x":0, "y":2},
-                {"label":"K21 (B2,F0)", "x":1, "y":2},
-                {"label":"K22 (B2,B0)", "x":2, "y":2},
-                {"label":"K23 (B2,C7)", "x":3, "y":2},
-                {"label":"K24 (B2,F4)", "x":4, "y":2},
-                {"label":"K25 (B2,F5)", "x":5, "y":2},
-                {"label":"K26 (B2,F6)", "x":6, "y":2},
-                {"label":"K27 (B2,F7)", "x":7, "y":2},
-                {"label":"K28 (B2,D4)", "x":8, "y":2},
-                {"label":"K29 (B2,D6)", "x":9, "y":2},
-                {"label":"K2A (B2,B4)", "x":10, "y":2},
-                {"label":"K2B (B2,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (B1,F1)", "x":0, "y":3},
-                {"label":"K31 (B1,F0)", "x":1, "y":3},
-                {"label":"K32 (B1,B0)", "x":2, "y":3},
-                {"label":"K33 (B1,C7)", "x":3, "y":3},
-                {"label":"K34 (B1,F4)", "x":4, "y":3},
-                {"label":"K35 (B1,F5)", "x":5, "y":3},
-                {"label":"K37 (B1,F7)", "x":6, "y":3, "w":2},
-                {"label":"K38 (B1,D4)", "x":8, "y":3},
-                {"label":"K39 (B1,D6)", "x":9, "y":3},
-                {"label":"K3A (B1,B4)", "x":10, "y":3},
-                {"label":"K3B (B1,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12_1x2uL": {
             "layout": [
-                {"label":"K00 (D0,F1)", "x":0, "y":0},
-                {"label":"K01 (D0,F0)", "x":1, "y":0},
-                {"label":"K02 (D0,B0)", "x":2, "y":0},
-                {"label":"K03 (D0,C7)", "x":3, "y":0},
-                {"label":"K04 (D0,F4)", "x":4, "y":0},
-                {"label":"K05 (D0,F5)", "x":5, "y":0},
-                {"label":"K06 (D0,F6)", "x":6, "y":0},
-                {"label":"K07 (D0,F7)", "x":7, "y":0},
-                {"label":"K08 (D0,D4)", "x":8, "y":0},
-                {"label":"K09 (D0,D6)", "x":9, "y":0},
-                {"label":"K0A (D0,B4)", "x":10, "y":0},
-                {"label":"K0B (D0,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (B3,F1)", "x":0, "y":1},
-                {"label":"K11 (B3,F0)", "x":1, "y":1},
-                {"label":"K12 (B3,B0)", "x":2, "y":1},
-                {"label":"K13 (B3,C7)", "x":3, "y":1},
-                {"label":"K14 (B3,F4)", "x":4, "y":1},
-                {"label":"K15 (B3,F5)", "x":5, "y":1},
-                {"label":"K16 (B3,F6)", "x":6, "y":1},
-                {"label":"K17 (B3,F7)", "x":7, "y":1},
-                {"label":"K18 (B3,D4)", "x":8, "y":1},
-                {"label":"K19 (B3,D6)", "x":9, "y":1},
-                {"label":"K1A (B3,B4)", "x":10, "y":1},
-                {"label":"K1B (B3,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (B2,F1)", "x":0, "y":2},
-                {"label":"K21 (B2,F0)", "x":1, "y":2},
-                {"label":"K22 (B2,B0)", "x":2, "y":2},
-                {"label":"K23 (B2,C7)", "x":3, "y":2},
-                {"label":"K24 (B2,F4)", "x":4, "y":2},
-                {"label":"K25 (B2,F5)", "x":5, "y":2},
-                {"label":"K26 (B2,F6)", "x":6, "y":2},
-                {"label":"K27 (B2,F7)", "x":7, "y":2},
-                {"label":"K28 (B2,D4)", "x":8, "y":2},
-                {"label":"K29 (B2,D6)", "x":9, "y":2},
-                {"label":"K2A (B2,B4)", "x":10, "y":2},
-                {"label":"K2B (B2,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (B1,F1)", "x":0, "y":3},
-                {"label":"K31 (B1,F0)", "x":1, "y":3},
-                {"label":"K32 (B1,B0)", "x":2, "y":3},
-                {"label":"K33 (B1,C7)", "x":3, "y":3},
-                {"label":"K34 (B1,F4)", "x":4, "y":3, "w":2},
-                {"label":"K36 (B1,F6)", "x":6, "y":3},
-                {"label":"K37 (B1,F7)", "x":7, "y":3},
-                {"label":"K38 (B1,D4)", "x":8, "y":3},
-                {"label":"K39 (B1,D6)", "x":9, "y":3},
-                {"label":"K3A (B1,B4)", "x":10, "y":3},
-                {"label":"K3B (B1,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12_1x2uC": {
             "layout": [
-                {"label":"K00 (D0,F1)", "x":0, "y":0},
-                {"label":"K01 (D0,F0)", "x":1, "y":0},
-                {"label":"K02 (D0,B0)", "x":2, "y":0},
-                {"label":"K03 (D0,C7)", "x":3, "y":0},
-                {"label":"K04 (D0,F4)", "x":4, "y":0},
-                {"label":"K05 (D0,F5)", "x":5, "y":0},
-                {"label":"K06 (D0,F6)", "x":6, "y":0},
-                {"label":"K07 (D0,F7)", "x":7, "y":0},
-                {"label":"K08 (D0,D4)", "x":8, "y":0},
-                {"label":"K09 (D0,D6)", "x":9, "y":0},
-                {"label":"K0A (D0,B4)", "x":10, "y":0},
-                {"label":"K0B (D0,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (B3,F1)", "x":0, "y":1},
-                {"label":"K11 (B3,F0)", "x":1, "y":1},
-                {"label":"K12 (B3,B0)", "x":2, "y":1},
-                {"label":"K13 (B3,C7)", "x":3, "y":1},
-                {"label":"K14 (B3,F4)", "x":4, "y":1},
-                {"label":"K15 (B3,F5)", "x":5, "y":1},
-                {"label":"K16 (B3,F6)", "x":6, "y":1},
-                {"label":"K17 (B3,F7)", "x":7, "y":1},
-                {"label":"K18 (B3,D4)", "x":8, "y":1},
-                {"label":"K19 (B3,D6)", "x":9, "y":1},
-                {"label":"K1A (B3,B4)", "x":10, "y":1},
-                {"label":"K1B (B3,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (B2,F1)", "x":0, "y":2},
-                {"label":"K21 (B2,F0)", "x":1, "y":2},
-                {"label":"K22 (B2,B0)", "x":2, "y":2},
-                {"label":"K23 (B2,C7)", "x":3, "y":2},
-                {"label":"K24 (B2,F4)", "x":4, "y":2},
-                {"label":"K25 (B2,F5)", "x":5, "y":2},
-                {"label":"K26 (B2,F6)", "x":6, "y":2},
-                {"label":"K27 (B2,F7)", "x":7, "y":2},
-                {"label":"K28 (B2,D4)", "x":8, "y":2},
-                {"label":"K29 (B2,D6)", "x":9, "y":2},
-                {"label":"K2A (B2,B4)", "x":10, "y":2},
-                {"label":"K2B (B2,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (B1,F1)", "x":0, "y":3},
-                {"label":"K31 (B1,F0)", "x":1, "y":3},
-                {"label":"K32 (B1,B0)", "x":2, "y":3},
-                {"label":"K33 (B1,C7)", "x":3, "y":3},
-                {"label":"K34 (B1,F4)", "x":4, "y":3},
-                {"label":"K35 (B1,F5)", "x":5, "y":3, "w":2},
-                {"label":"K37 (B1,F7)", "x":7, "y":3},
-                {"label":"K38 (B1,D4)", "x":8, "y":3},
-                {"label":"K39 (B1,D6)", "x":9, "y":3},
-                {"label":"K3A (B1,B4)", "x":10, "y":3},
-                {"label":"K3B (B1,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
 
diff --git a/keyboards/ymdk/ymd40/air40/rules.mk b/keyboards/ymdk/ymd40/air40/rules.mk
index 3adfcf796b..f408492aa8 100644
--- a/keyboards/ymdk/ymd40/air40/rules.mk
+++ b/keyboards/ymdk/ymd40/air40/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no
 RGBLIGHT_SUPPORTED = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no           # Audio output
 AUDIO_SUPPORTED = no
 KEY_LOCK_ENABLE = no
diff --git a/keyboards/ymdk/ymd40/v2/config.h b/keyboards/ymdk/ymd40/v2/config.h
index 21a027eab4..eb16363416 100644
--- a/keyboards/ymdk/ymd40/v2/config.h
+++ b/keyboards/ymdk/ymd40/v2/config.h
@@ -16,24 +16,7 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, B3, B2, B1 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #if defined(RGBLIGHT_ENABLE)
-    #define RGB_DI_PIN E2
     #define RGBLED_NUM 8
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json
index 375f8c8480..395a9b8bfd 100644
--- a/keyboards/ymdk/ymd40/v2/info.json
+++ b/keyboards/ymdk/ymd40/v2/info.json
@@ -8,282 +8,290 @@
         "pid": "0x4440",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+        "rows": ["D0", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x12"],
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"label":"K00 (D0,F1)", "x":0, "y":0},
-                {"label":"K01 (D0,F0)", "x":1, "y":0},
-                {"label":"K02 (D0,B0)", "x":2, "y":0},
-                {"label":"K03 (D0,C7)", "x":3, "y":0},
-                {"label":"K04 (D0,F4)", "x":4, "y":0},
-                {"label":"K05 (D0,F5)", "x":5, "y":0},
-                {"label":"K06 (D0,F6)", "x":6, "y":0},
-                {"label":"K07 (D0,F7)", "x":7, "y":0},
-                {"label":"K08 (D0,D4)", "x":8, "y":0},
-                {"label":"K09 (D0,D6)", "x":9, "y":0},
-                {"label":"K0A (D0,B4)", "x":10, "y":0},
-                {"label":"K0B (D0,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (B3,F1)", "x":0, "y":1},
-                {"label":"K11 (B3,F0)", "x":1, "y":1},
-                {"label":"K12 (B3,B0)", "x":2, "y":1},
-                {"label":"K13 (B3,C7)", "x":3, "y":1},
-                {"label":"K14 (B3,F4)", "x":4, "y":1},
-                {"label":"K15 (B3,F5)", "x":5, "y":1},
-                {"label":"K16 (B3,F6)", "x":6, "y":1},
-                {"label":"K17 (B3,F7)", "x":7, "y":1},
-                {"label":"K18 (B3,D4)", "x":8, "y":1},
-                {"label":"K19 (B3,D6)", "x":9, "y":1},
-                {"label":"K1A (B3,B4)", "x":10, "y":1},
-                {"label":"K1B (B3,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (B2,F1)", "x":0, "y":2},
-                {"label":"K21 (B2,F0)", "x":1, "y":2},
-                {"label":"K22 (B2,B0)", "x":2, "y":2},
-                {"label":"K23 (B2,C7)", "x":3, "y":2},
-                {"label":"K24 (B2,F4)", "x":4, "y":2},
-                {"label":"K25 (B2,F5)", "x":5, "y":2},
-                {"label":"K26 (B2,F6)", "x":6, "y":2},
-                {"label":"K27 (B2,F7)", "x":7, "y":2},
-                {"label":"K28 (B2,D4)", "x":8, "y":2},
-                {"label":"K29 (B2,D6)", "x":9, "y":2},
-                {"label":"K2A (B2,B4)", "x":10, "y":2},
-                {"label":"K2B (B2,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (B1,F1)", "x":0, "y":3},
-                {"label":"K31 (B1,F0)", "x":1, "y":3},
-                {"label":"K32 (B1,B0)", "x":2, "y":3},
-                {"label":"K33 (B1,C7)", "x":3, "y":3},
-                {"label":"K34 (B1,F4)", "x":4, "y":3},
-                {"label":"K35 (B1,F5)", "x":5, "y":3},
-                {"label":"K36 (B1,F6)", "x":6, "y":3},
-                {"label":"K37 (B1,F7)", "x":7, "y":3},
-                {"label":"K38 (B1,D4)", "x":8, "y":3},
-                {"label":"K39 (B1,D6)", "x":9, "y":3},
-                {"label":"K3A (B1,B4)", "x":10, "y":3},
-                {"label":"K3B (B1,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12_2x2u": {
             "layout": [
-                {"label":"K00 (D0,F1)", "x":0, "y":0},
-                {"label":"K01 (D0,F0)", "x":1, "y":0},
-                {"label":"K02 (D0,B0)", "x":2, "y":0},
-                {"label":"K03 (D0,C7)", "x":3, "y":0},
-                {"label":"K04 (D0,F4)", "x":4, "y":0},
-                {"label":"K05 (D0,F5)", "x":5, "y":0},
-                {"label":"K06 (D0,F6)", "x":6, "y":0},
-                {"label":"K07 (D0,F7)", "x":7, "y":0},
-                {"label":"K08 (D0,D4)", "x":8, "y":0},
-                {"label":"K09 (D0,D6)", "x":9, "y":0},
-                {"label":"K0A (D0,B4)", "x":10, "y":0},
-                {"label":"K0B (D0,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (B3,F1)", "x":0, "y":1},
-                {"label":"K11 (B3,F0)", "x":1, "y":1},
-                {"label":"K12 (B3,B0)", "x":2, "y":1},
-                {"label":"K13 (B3,C7)", "x":3, "y":1},
-                {"label":"K14 (B3,F4)", "x":4, "y":1},
-                {"label":"K15 (B3,F5)", "x":5, "y":1},
-                {"label":"K16 (B3,F6)", "x":6, "y":1},
-                {"label":"K17 (B3,F7)", "x":7, "y":1},
-                {"label":"K18 (B3,D4)", "x":8, "y":1},
-                {"label":"K19 (B3,D6)", "x":9, "y":1},
-                {"label":"K1A (B3,B4)", "x":10, "y":1},
-                {"label":"K1B (B3,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (B2,F1)", "x":0, "y":2},
-                {"label":"K21 (B2,F0)", "x":1, "y":2},
-                {"label":"K22 (B2,B0)", "x":2, "y":2},
-                {"label":"K23 (B2,C7)", "x":3, "y":2},
-                {"label":"K24 (B2,F4)", "x":4, "y":2},
-                {"label":"K25 (B2,F5)", "x":5, "y":2},
-                {"label":"K26 (B2,F6)", "x":6, "y":2},
-                {"label":"K27 (B2,F7)", "x":7, "y":2},
-                {"label":"K28 (B2,D4)", "x":8, "y":2},
-                {"label":"K29 (B2,D6)", "x":9, "y":2},
-                {"label":"K2A (B2,B4)", "x":10, "y":2},
-                {"label":"K2B (B2,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (B1,F1)", "x":0, "y":3},
-                {"label":"K31 (B1,F0)", "x":1, "y":3},
-                {"label":"K32 (B1,B0)", "x":2, "y":3},
-                {"label":"K33 (B1,C7)", "x":3, "y":3},
-                {"label":"K34 (B1,F4)", "x":4, "y":3, "w":2},
-                {"label":"K37 (B1,F7)", "x":6, "y":3, "w":2},
-                {"label":"K38 (B1,D4)", "x":8, "y":3},
-                {"label":"K39 (B1,D6)", "x":9, "y":3},
-                {"label":"K3A (B1,B4)", "x":10, "y":3},
-                {"label":"K3B (B1,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12_1x2uR": {
             "layout": [
-                {"label":"K00 (D0,F1)", "x":0, "y":0},
-                {"label":"K01 (D0,F0)", "x":1, "y":0},
-                {"label":"K02 (D0,B0)", "x":2, "y":0},
-                {"label":"K03 (D0,C7)", "x":3, "y":0},
-                {"label":"K04 (D0,F4)", "x":4, "y":0},
-                {"label":"K05 (D0,F5)", "x":5, "y":0},
-                {"label":"K06 (D0,F6)", "x":6, "y":0},
-                {"label":"K07 (D0,F7)", "x":7, "y":0},
-                {"label":"K08 (D0,D4)", "x":8, "y":0},
-                {"label":"K09 (D0,D6)", "x":9, "y":0},
-                {"label":"K0A (D0,B4)", "x":10, "y":0},
-                {"label":"K0B (D0,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (B3,F1)", "x":0, "y":1},
-                {"label":"K11 (B3,F0)", "x":1, "y":1},
-                {"label":"K12 (B3,B0)", "x":2, "y":1},
-                {"label":"K13 (B3,C7)", "x":3, "y":1},
-                {"label":"K14 (B3,F4)", "x":4, "y":1},
-                {"label":"K15 (B3,F5)", "x":5, "y":1},
-                {"label":"K16 (B3,F6)", "x":6, "y":1},
-                {"label":"K17 (B3,F7)", "x":7, "y":1},
-                {"label":"K18 (B3,D4)", "x":8, "y":1},
-                {"label":"K19 (B3,D6)", "x":9, "y":1},
-                {"label":"K1A (B3,B4)", "x":10, "y":1},
-                {"label":"K1B (B3,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (B2,F1)", "x":0, "y":2},
-                {"label":"K21 (B2,F0)", "x":1, "y":2},
-                {"label":"K22 (B2,B0)", "x":2, "y":2},
-                {"label":"K23 (B2,C7)", "x":3, "y":2},
-                {"label":"K24 (B2,F4)", "x":4, "y":2},
-                {"label":"K25 (B2,F5)", "x":5, "y":2},
-                {"label":"K26 (B2,F6)", "x":6, "y":2},
-                {"label":"K27 (B2,F7)", "x":7, "y":2},
-                {"label":"K28 (B2,D4)", "x":8, "y":2},
-                {"label":"K29 (B2,D6)", "x":9, "y":2},
-                {"label":"K2A (B2,B4)", "x":10, "y":2},
-                {"label":"K2B (B2,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (B1,F1)", "x":0, "y":3},
-                {"label":"K31 (B1,F0)", "x":1, "y":3},
-                {"label":"K32 (B1,B0)", "x":2, "y":3},
-                {"label":"K33 (B1,C7)", "x":3, "y":3},
-                {"label":"K34 (B1,F4)", "x":4, "y":3},
-                {"label":"K35 (B1,F5)", "x":5, "y":3},
-                {"label":"K37 (B1,F7)", "x":6, "y":3, "w":2},
-                {"label":"K38 (B1,D4)", "x":8, "y":3},
-                {"label":"K39 (B1,D6)", "x":9, "y":3},
-                {"label":"K3A (B1,B4)", "x":10, "y":3},
-                {"label":"K3B (B1,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12_1x2uL": {
             "layout": [
-                {"label":"K00 (D0,F1)", "x":0, "y":0},
-                {"label":"K01 (D0,F0)", "x":1, "y":0},
-                {"label":"K02 (D0,B0)", "x":2, "y":0},
-                {"label":"K03 (D0,C7)", "x":3, "y":0},
-                {"label":"K04 (D0,F4)", "x":4, "y":0},
-                {"label":"K05 (D0,F5)", "x":5, "y":0},
-                {"label":"K06 (D0,F6)", "x":6, "y":0},
-                {"label":"K07 (D0,F7)", "x":7, "y":0},
-                {"label":"K08 (D0,D4)", "x":8, "y":0},
-                {"label":"K09 (D0,D6)", "x":9, "y":0},
-                {"label":"K0A (D0,B4)", "x":10, "y":0},
-                {"label":"K0B (D0,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (B3,F1)", "x":0, "y":1},
-                {"label":"K11 (B3,F0)", "x":1, "y":1},
-                {"label":"K12 (B3,B0)", "x":2, "y":1},
-                {"label":"K13 (B3,C7)", "x":3, "y":1},
-                {"label":"K14 (B3,F4)", "x":4, "y":1},
-                {"label":"K15 (B3,F5)", "x":5, "y":1},
-                {"label":"K16 (B3,F6)", "x":6, "y":1},
-                {"label":"K17 (B3,F7)", "x":7, "y":1},
-                {"label":"K18 (B3,D4)", "x":8, "y":1},
-                {"label":"K19 (B3,D6)", "x":9, "y":1},
-                {"label":"K1A (B3,B4)", "x":10, "y":1},
-                {"label":"K1B (B3,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (B2,F1)", "x":0, "y":2},
-                {"label":"K21 (B2,F0)", "x":1, "y":2},
-                {"label":"K22 (B2,B0)", "x":2, "y":2},
-                {"label":"K23 (B2,C7)", "x":3, "y":2},
-                {"label":"K24 (B2,F4)", "x":4, "y":2},
-                {"label":"K25 (B2,F5)", "x":5, "y":2},
-                {"label":"K26 (B2,F6)", "x":6, "y":2},
-                {"label":"K27 (B2,F7)", "x":7, "y":2},
-                {"label":"K28 (B2,D4)", "x":8, "y":2},
-                {"label":"K29 (B2,D6)", "x":9, "y":2},
-                {"label":"K2A (B2,B4)", "x":10, "y":2},
-                {"label":"K2B (B2,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (B1,F1)", "x":0, "y":3},
-                {"label":"K31 (B1,F0)", "x":1, "y":3},
-                {"label":"K32 (B1,B0)", "x":2, "y":3},
-                {"label":"K33 (B1,C7)", "x":3, "y":3},
-                {"label":"K34 (B1,F4)", "x":4, "y":3, "w":2},
-                {"label":"K36 (B1,F6)", "x":6, "y":3},
-                {"label":"K37 (B1,F7)", "x":7, "y":3},
-                {"label":"K38 (B1,D4)", "x":8, "y":3},
-                {"label":"K39 (B1,D6)", "x":9, "y":3},
-                {"label":"K3A (B1,B4)", "x":10, "y":3},
-                {"label":"K3B (B1,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12_1x2uC": {
             "layout": [
-                {"label":"K00 (D0,F1)", "x":0, "y":0},
-                {"label":"K01 (D0,F0)", "x":1, "y":0},
-                {"label":"K02 (D0,B0)", "x":2, "y":0},
-                {"label":"K03 (D0,C7)", "x":3, "y":0},
-                {"label":"K04 (D0,F4)", "x":4, "y":0},
-                {"label":"K05 (D0,F5)", "x":5, "y":0},
-                {"label":"K06 (D0,F6)", "x":6, "y":0},
-                {"label":"K07 (D0,F7)", "x":7, "y":0},
-                {"label":"K08 (D0,D4)", "x":8, "y":0},
-                {"label":"K09 (D0,D6)", "x":9, "y":0},
-                {"label":"K0A (D0,B4)", "x":10, "y":0},
-                {"label":"K0B (D0,D7)", "x":11, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label":"K10 (B3,F1)", "x":0, "y":1},
-                {"label":"K11 (B3,F0)", "x":1, "y":1},
-                {"label":"K12 (B3,B0)", "x":2, "y":1},
-                {"label":"K13 (B3,C7)", "x":3, "y":1},
-                {"label":"K14 (B3,F4)", "x":4, "y":1},
-                {"label":"K15 (B3,F5)", "x":5, "y":1},
-                {"label":"K16 (B3,F6)", "x":6, "y":1},
-                {"label":"K17 (B3,F7)", "x":7, "y":1},
-                {"label":"K18 (B3,D4)", "x":8, "y":1},
-                {"label":"K19 (B3,D6)", "x":9, "y":1},
-                {"label":"K1A (B3,B4)", "x":10, "y":1},
-                {"label":"K1B (B3,D7)", "x":11, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label":"K20 (B2,F1)", "x":0, "y":2},
-                {"label":"K21 (B2,F0)", "x":1, "y":2},
-                {"label":"K22 (B2,B0)", "x":2, "y":2},
-                {"label":"K23 (B2,C7)", "x":3, "y":2},
-                {"label":"K24 (B2,F4)", "x":4, "y":2},
-                {"label":"K25 (B2,F5)", "x":5, "y":2},
-                {"label":"K26 (B2,F6)", "x":6, "y":2},
-                {"label":"K27 (B2,F7)", "x":7, "y":2},
-                {"label":"K28 (B2,D4)", "x":8, "y":2},
-                {"label":"K29 (B2,D6)", "x":9, "y":2},
-                {"label":"K2A (B2,B4)", "x":10, "y":2},
-                {"label":"K2B (B2,D7)", "x":11, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label":"K30 (B1,F1)", "x":0, "y":3},
-                {"label":"K31 (B1,F0)", "x":1, "y":3},
-                {"label":"K32 (B1,B0)", "x":2, "y":3},
-                {"label":"K33 (B1,C7)", "x":3, "y":3},
-                {"label":"K34 (B1,F4)", "x":4, "y":3},
-                {"label":"K35 (B1,F5)", "x":5, "y":3, "w":2},
-                {"label":"K37 (B1,F7)", "x":7, "y":3},
-                {"label":"K38 (B1,D4)", "x":8, "y":3},
-                {"label":"K39 (B1,D6)", "x":9, "y":3},
-                {"label":"K3A (B1,B4)", "x":10, "y":3},
-                {"label":"K3B (B1,D7)", "x":11, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
 
diff --git a/keyboards/ymdk/ymd40/v2/v2.c b/keyboards/ymdk/ymd40/v2/v2.c
deleted file mode 100644
index 54450ccd15..0000000000
--- a/keyboards/ymdk/ymd40/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "v2.h"
diff --git a/keyboards/ymdk/ymd40/v2/v2.h b/keyboards/ymdk/ymd40/v2/v2.h
deleted file mode 100644
index d28f6d591a..0000000000
--- a/keyboards/ymdk/ymd40/v2/v2.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B   }, \
-}
-
-#define LAYOUT_ortho_4x12_2x2u( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   \
-    K30, K31, K32, K33,   K34,      K37,    K38, K39, K3A, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-    { K30,   K31,   K32,   K33,   K34,   KC_NO, KC_NO, K37,   K38,   K39,   K3A,   K3B   }, \
-}
-
-#define LAYOUT_ortho_4x12_1x2uR( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   \
-    K30, K31, K32, K33, K34, K35,    K37,   K38, K39, K3A, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   KC_NO, K37,   K38,   K39,   K3A,   K3B   }, \
-}
-
-#define LAYOUT_ortho_4x12_1x2uL( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   \
-    K30, K31, K32, K33,    K34,   K36, K37, K38, K39, K3A, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-    { K30,   K31,   K32,   K33,   K34,   KC_NO, K36,   K37,   K38,   K39,   K3A,   K3B   }, \
-}
-
-#define LAYOUT_ortho_4x12_1x2uC( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,   \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,   \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   \
-    K30, K31, K32, K33, K34,    K35,   K37, K38, K39, K3A, K3B    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   KC_NO, K37,   K38,   K39,   K3A,   K3B   }, \
-}
diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h
index 90f4ffed24..8a3612b8a5 100644
--- a/keyboards/ymdk/ymd67/config.h
+++ b/keyboards/ymdk/ymd67/config.h
@@ -1,20 +1,10 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* prevent stuck modifiers */
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -29,4 +19,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json
index f66e1533dd..cc83eb82ac 100644
--- a/keyboards/ymdk/ymd67/info.json
+++ b/keyboards/ymdk/ymd67/info.json
@@ -8,10 +8,18 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ymdk/ymd67/ymd67.c b/keyboards/ymdk/ymd67/ymd67.c
deleted file mode 100644
index f6d40ea0c3..0000000000
--- a/keyboards/ymdk/ymd67/ymd67.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ymd67.h"
diff --git a/keyboards/ymdk/ymd75/config.h b/keyboards/ymdk/ymd75/config.h
index 5807ae4d8d..32bdab2478 100644
--- a/keyboards/ymdk/ymd75/config.h
+++ b/keyboards/ymdk/ymd75/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN E2
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/ymdk/ymd75/info.json b/keyboards/ymdk/ymd75/info.json
index 3ad8d07bdf..3dc0cf87b9 100644
--- a/keyboards/ymdk/ymd75/info.json
+++ b/keyboards/ymdk/ymd75/info.json
@@ -7,6 +7,9 @@
         "vid": "0x20A0",
         "pid": "0x422D"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ymdk/ymd75/rev1/config.h b/keyboards/ymdk/ymd75/rev1/config.h
deleted file mode 100644
index d46c3bc010..0000000000
--- a/keyboards/ymdk/ymd75/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 Wayne Jones (WarmCatUK) <waynekjones@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ymdk/ymd75/rev1/info.json b/keyboards/ymdk/ymd75/rev1/info.json
index 967dd3de95..0f280a2eca 100644
--- a/keyboards/ymdk/ymd75/rev1/info.json
+++ b/keyboards/ymdk/ymd75/rev1/info.json
@@ -2,13 +2,303 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4",
         "levels": 12
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1"
     },
     "processor": "atmega32a",
-    "bootloader": "bootloadhid"
+    "bootloader": "bootloadhid",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 10], "x": 6, "y": 0},
+                {"matrix": [7, 10], "x": 7, "y": 0},
+                {"matrix": [7, 0], "x": 8, "y": 0},
+                {"matrix": [5, 11], "x": 9, "y": 0},
+                {"matrix": [5, 12], "x": 10, "y": 0},
+                {"matrix": [5, 13], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [6, 1], "x": 6, "y": 1},
+                {"matrix": [6, 11], "x": 7, "y": 1},
+                {"matrix": [7, 11], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [4, 10], "x": 10, "y": 1},
+                {"matrix": [4, 11], "x": 11, "y": 1},
+                {"matrix": [4, 12], "x": 12, "y": 1},
+                {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [0, 13], "x": 15, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 12], "x": 7.5, "y": 2},
+                {"matrix": [7, 12], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [7, 6], "x": 15, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [6, 13], "x": 7.75, "y": 3},
+                {"matrix": [7, 13], "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [7, 8], "x": 15, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 4},
+                {"matrix": [1, 2], "x": 3.25, "y": 4},
+                {"matrix": [1, 3], "x": 4.25, "y": 4},
+                {"matrix": [1, 4], "x": 5.25, "y": 4},
+                {"matrix": [1, 5], "x": 6.25, "y": 4},
+                {"matrix": [6, 4], "x": 7.25, "y": 4},
+                {"matrix": [6, 14], "x": 8.25, "y": 4},
+                {"matrix": [7, 14], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [1, 10], "x": 11.25, "y": 4},
+                {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 8], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5},
+                {"matrix": [0, 11], "x": 11, "y": 5},
+                {"matrix": [0, 12], "x": 12, "y": 5},
+                {"matrix": [6, 9], "x": 13, "y": 5},
+                {"matrix": [6, 7], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 10], "x": 6, "y": 0},
+                {"matrix": [7, 10], "x": 7, "y": 0},
+                {"matrix": [7, 0], "x": 8, "y": 0},
+                {"matrix": [5, 11], "x": 9, "y": 0},
+                {"matrix": [5, 12], "x": 10, "y": 0},
+                {"matrix": [5, 13], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [6, 1], "x": 6, "y": 1},
+                {"matrix": [6, 11], "x": 7, "y": 1},
+                {"matrix": [7, 11], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [4, 10], "x": 10, "y": 1},
+                {"matrix": [4, 11], "x": 11, "y": 1},
+                {"matrix": [4, 12], "x": 12, "y": 1},
+                {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [0, 13], "x": 15, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 12], "x": 7.5, "y": 2},
+                {"matrix": [7, 12], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [7, 6], "x": 15, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [6, 13], "x": 7.75, "y": 3},
+                {"matrix": [7, 13], "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 12], "x": 12.75, "y": 3},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [7, 8], "x": 15, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [0, 3], "x": 1.25, "y": 4},
+                {"matrix": [1, 1], "x": 2.25, "y": 4},
+                {"matrix": [1, 2], "x": 3.25, "y": 4},
+                {"matrix": [1, 3], "x": 4.25, "y": 4},
+                {"matrix": [1, 4], "x": 5.25, "y": 4},
+                {"matrix": [1, 5], "x": 6.25, "y": 4},
+                {"matrix": [6, 4], "x": 7.25, "y": 4},
+                {"matrix": [6, 14], "x": 8.25, "y": 4},
+                {"matrix": [7, 14], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [1, 10], "x": 11.25, "y": 4},
+                {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 8], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5},
+                {"matrix": [0, 11], "x": 11, "y": 5},
+                {"matrix": [0, 12], "x": 12, "y": 5},
+                {"matrix": [6, 9], "x": 13, "y": 5},
+                {"matrix": [6, 7], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_rwkl": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 10], "x": 6, "y": 0},
+                {"matrix": [7, 10], "x": 7, "y": 0},
+                {"matrix": [7, 0], "x": 8, "y": 0},
+                {"matrix": [5, 11], "x": 9, "y": 0},
+                {"matrix": [5, 12], "x": 10, "y": 0},
+                {"matrix": [5, 13], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [6, 1], "x": 6, "y": 1},
+                {"matrix": [6, 11], "x": 7, "y": 1},
+                {"matrix": [7, 11], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [4, 10], "x": 10, "y": 1},
+                {"matrix": [4, 11], "x": 11, "y": 1},
+                {"matrix": [4, 12], "x": 12, "y": 1},
+                {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [0, 13], "x": 15, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 12], "x": 7.5, "y": 2},
+                {"matrix": [7, 12], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [7, 6], "x": 15, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [6, 13], "x": 7.75, "y": 3},
+                {"matrix": [7, 13], "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 12], "x": 12.75, "y": 3},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [7, 8], "x": 15, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [0, 3], "x": 1.25, "y": 4},
+                {"matrix": [1, 1], "x": 2.25, "y": 4},
+                {"matrix": [1, 2], "x": 3.25, "y": 4},
+                {"matrix": [1, 3], "x": 4.25, "y": 4},
+                {"matrix": [1, 4], "x": 5.25, "y": 4},
+                {"matrix": [1, 5], "x": 6.25, "y": 4},
+                {"matrix": [6, 4], "x": 7.25, "y": 4},
+                {"matrix": [6, 14], "x": 8.25, "y": 4},
+                {"matrix": [7, 14], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [1, 10], "x": 11.25, "y": 4},
+                {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 8], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [0, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [6, 9], "x": 13, "y": 5},
+                {"matrix": [6, 7], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5}
+            ]
+        }
+    }
 }
diff --git a/keyboards/ymdk/ymd75/rev1/rev1.c b/keyboards/ymdk/ymd75/rev1/rev1.c
deleted file mode 100644
index c1ad021b15..0000000000
--- a/keyboards/ymdk/ymd75/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ymd75.h"
diff --git a/keyboards/ymdk/ymd75/rev1/rev1.h b/keyboards/ymdk/ymd75/rev1/rev1.h
deleted file mode 100644
index d88e8fb802..0000000000
--- a/keyboards/ymdk/ymd75/rev1/rev1.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 Wayne Jones (WarmCatUK) <waynekjones@gmail.com>
- 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-    K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, \
-    K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4,      KD0, \
-    K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3,      K67, \
-    K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KD2,           KE0, \
-    K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1,           K86, K77, \
-    K00, K10, K20,           K56,                     K57, KB0, KC0, K96, K76, K66  \
-){ \
-    { K00, K10,   K20, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB0, KC0,   KD0,   KC_NO }, \
-    { K01, K11,   K21, K31,   K41,   K51,   KC_NO, KC_NO, KC_NO, KC_NO, KA1,   KB1, KC_NO, KD1,   KE1   }, \
-    { K02, K12,   K22, K32,   K42,   K52,   KC_NO, KC_NO, KC_NO, KC_NO, KA2,   KB2, KC_NO, KD2,   KE2   }, \
-    { K03, K13,   K23, K33,   K43,   K53,   KC_NO, KC_NO, KC_NO, KC_NO, KA3,   KB3, KC3,   KD3,   KC_NO }, \
-    { K04, K14,   K24, K34,   K44,   K54,   KC_NO, KC_NO, KC_NO, KC_NO, KA4,   KB4, KC4,   KC_NO, KE4   }, \
-    { K05, KC_NO, K25, K35,   K45,   K55,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KC5,   KD5,   KE5   }, \
-    { K06, K16,   K26, K36,   K46,   K56,   K66,   K76,   K86,   K96,   KA6,   KB6, KC6,   KD6,   KE6   }, \
-    { K07, K17,   K27, K37,   K47,   K57,   K67,   K77,   KE0,   KC_NO, KA7,   KB7, KC7,   KD7,   KE7   } \
-}
-
-#define LAYOUT_75_iso( \
-    K50, K52, K53, K54, K55, K60, K6A, K7A, K70, K5B, K5C, K5D, K5E, K1D, K1E, K2E, \
-    K40, K41, K42, K43, K44, K45, K61, K6B, K7B, K71, K4A, K4B, K4C,      K4E, K0D, \
-    K30, K31, K32, K33, K34, K35, K62, K6C, K7C, K72, K3A, K3B, K3C,           K76, \
-    K20, K21, K22, K23, K24, K25, K63, K6D, K7D, K73, K2A, K2B, K2C, K2D,      K0E, \
-    K10, K03, K11, K12, K13, K14, K15, K64, K6E, K7E, K74, K1A, K1B,      K68, K77, \
-    K00, K01, K02,                K65,                K75, K0B, K0C, K69, K67, K66  \
-){ \
-    { K00, K01,   K02, K03, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0B, K0C,   K0D,   KC_NO }, \
-    { K10, K11,   K12, K13, K14,   K15,   KC_NO, KC_NO, KC_NO, KC_NO, K1A,   K1B, KC_NO, K1D,   K1E   }, \
-    { K20, K21,   K22, K23, K24,   K25,   KC_NO, KC_NO, KC_NO, KC_NO, K2A,   K2B, K2C,   K2D,   K2E   }, \
-    { K30, K31,   K32, K33, K34,   K35,   KC_NO, KC_NO, KC_NO, KC_NO, K3A,   K3B, K3C,   KC_NO, KC_NO }, \
-    { K40, K41,   K42, K43, K44,   K45,   KC_NO, KC_NO, KC_NO, KC_NO, K4A,   K4B, K4C,   KC_NO, K4E   }, \
-    { K50, KC_NO, K52, K53, K54,   K55,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K5B, K5C,   K5D,   K5E   }, \
-    { K60, K61,   K62, K63, K64,   K65,   K66,   K67,   K68,   K69,   K6A,   K6B, K6C,   K6D,   K6E   }, \
-    { K70, K71,   K72, K73, K74,   K75,   K76,   K77,   K0E,   KC_NO, K7A,   K7B, K7C,   K7D,   K7E   } \
-}
-
-#define LAYOUT_75_iso_rwkl( \
-    K50, K52, K53, K54, K55, K60, K6A, K7A, K70, K5B, K5C, K5D, K5E, K1D, K1E, K2E, \
-    K40, K41, K42, K43, K44, K45, K61, K6B, K7B, K71, K4A, K4B, K4C,      K4E, K0D, \
-    K30, K31, K32, K33, K34, K35, K62, K6C, K7C, K72, K3A, K3B, K3C,           K76, \
-    K20, K21, K22, K23, K24, K25, K63, K6D, K7D, K73, K2A, K2B, K2C, K2D,      K0E, \
-    K10, K03, K11, K12, K13, K14, K15, K64, K6E, K7E, K74, K1A, K1B,      K68, K77, \
-    K00, K01, K02,                K65,                K75,   K0C,    K69, K67, K66  \
-){ \
-    { K00, K01,   K02, K03, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0C,   K0D,   KC_NO }, \
-    { K10, K11,   K12, K13, K14,   K15,   KC_NO, KC_NO, KC_NO, KC_NO, K1A,   K1B,   KC_NO, K1D,   K1E   }, \
-    { K20, K21,   K22, K23, K24,   K25,   KC_NO, KC_NO, KC_NO, KC_NO, K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30, K31,   K32, K33, K34,   K35,   KC_NO, KC_NO, KC_NO, KC_NO, K3A,   K3B,   K3C,   KC_NO, KC_NO }, \
-    { K40, K41,   K42, K43, K44,   K45,   KC_NO, KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   KC_NO, K4E   }, \
-    { K50, KC_NO, K52, K53, K54,   K55,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D,   K5E   }, \
-    { K60, K61,   K62, K63, K64,   K65,   K66,   K67,   K68,   K69,   K6A,   K6B,   K6C,   K6D,   K6E   }, \
-    { K70, K71,   K72, K73, K74,   K75,   K76,   K77,   K0E,   KC_NO, K7A,   K7B,   K7C,   K7D,   K7E   } \
-}
diff --git a/keyboards/ymdk/ymd75/rev1/rules.mk b/keyboards/ymdk/ymd75/rev1/rules.mk
index 17cd0cd890..d9e34145c4 100644
--- a/keyboards/ymdk/ymd75/rev1/rules.mk
+++ b/keyboards/ymdk/ymd75/rev1/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
 NKRO_ENABLE = no            # Enable N-Key Rollover
 
 KEY_LOCK_ENABLE = yes
diff --git a/keyboards/ymdk/ymd75/rev2/config.h b/keyboards/ymdk/ymd75/rev2/config.h
deleted file mode 100644
index 83e075b290..0000000000
--- a/keyboards/ymdk/ymd75/rev2/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#define MATRIX_ROW_PINS { B7, B6, B5, B4, B3, B0 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ymdk/ymd75/rev2/info.json b/keyboards/ymdk/ymd75/rev2/info.json
index 56435d5b27..f51a7ed330 100644
--- a/keyboards/ymdk/ymd75/rev2/info.json
+++ b/keyboards/ymdk/ymd75/rev2/info.json
@@ -2,13 +2,303 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B7", "B6", "B5", "B4", "B3", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4",
         "levels": 12
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1"
     },
     "processor": "atmega32a",
-    "bootloader": "bootloadhid"
+    "bootloader": "bootloadhid",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [5, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [5, 13], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 6], "x": 10, "y": 5},
+                {"matrix": [5, 7], "x": 11, "y": 5},
+                {"matrix": [5, 8], "x": 12, "y": 5},
+                {"matrix": [5, 9], "x": 13, "y": 5},
+                {"matrix": [5, 10], "x": 14, "y": 5},
+                {"matrix": [5, 11], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [5, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [5, 13], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 6], "x": 10, "y": 5},
+                {"matrix": [5, 7], "x": 11, "y": 5},
+                {"matrix": [5, 8], "x": 12, "y": 5},
+                {"matrix": [5, 9], "x": 13, "y": 5},
+                {"matrix": [5, 10], "x": 14, "y": 5},
+                {"matrix": [5, 11], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [5, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [5, 13], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 6], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 9], "x": 13, "y": 5},
+                {"matrix": [5, 10], "x": 14, "y": 5},
+                {"matrix": [5, 11], "x": 15, "y": 5}
+            ]
+        }
+    }
 }
diff --git a/keyboards/ymdk/ymd75/rev2/rev2.c b/keyboards/ymdk/ymd75/rev2/rev2.c
deleted file mode 100644
index c1ad021b15..0000000000
--- a/keyboards/ymdk/ymd75/rev2/rev2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ymd75.h"
diff --git a/keyboards/ymdk/ymd75/rev2/rev2.h b/keyboards/ymdk/ymd75/rev2/rev2.h
deleted file mode 100644
index 952858382b..0000000000
--- a/keyboards/ymdk/ymd75/rev2/rev2.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K514, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K513, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,       K314, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K413, K414, \
-	K500, K501, K502,                   K505,                   K506, K507, K508, K509, K510, K511  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  K506,  K507,  K508,  K509,  K510,  K511,  KC_NO, K513,  K514 }  \
-}
-
-#define LAYOUT_75_iso( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K514, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K513, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K314, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K413, K414, \
-	K500, K501, K502,                   K505,                   K506, K507, K508, K509, K510, K511  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  K506,  K507,  K508,  K509,  K510,  K511,  KC_NO, K513,  K514 }  \
-}
-
-#define LAYOUT_75_iso_rwkl( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K514, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K513, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K314, \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K413, K414, \
-    K500, K501, K502,                   K505,                         K506, K508, K509, K510, K511  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414 }, \
-    { K500,  K501,  K502,  KC_NO, KC_NO, K505,  K506,  KC_NO, K508,  K509,  K510,  K511,  KC_NO, K513,  K514 }  \
-}
diff --git a/keyboards/ymdk/ymd75/rev2/rules.mk b/keyboards/ymdk/ymd75/rev2/rules.mk
index 17cd0cd890..d9e34145c4 100644
--- a/keyboards/ymdk/ymd75/rev2/rules.mk
+++ b/keyboards/ymdk/ymd75/rev2/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
 NKRO_ENABLE = no            # Enable N-Key Rollover
 
 KEY_LOCK_ENABLE = yes
diff --git a/keyboards/ymdk/ymd75/rev3/config.h b/keyboards/ymdk/ymd75/rev3/config.h
index e3a31b5116..968045a7c9 100644
--- a/keyboards/ymdk/ymd75/rev3/config.h
+++ b/keyboards/ymdk/ymd75/rev3/config.h
@@ -1,6 +1,3 @@
 #pragma once
 
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define DIODE_DIRECTION ROW2COL
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4
diff --git a/keyboards/ymdk/ymd75/rev3/info.json b/keyboards/ymdk/ymd75/rev3/info.json
index ce0db873cf..23922b1f68 100644
--- a/keyboards/ymdk/ymd75/rev3/info.json
+++ b/keyboards/ymdk/ymd75/rev3/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "3.0.0"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 12
@@ -10,5 +15,287 @@
         "caps_lock": "C7"
     },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3},
+                {"matrix": [9, 3], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 4},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_rwkl": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3},
+                {"matrix": [9, 3], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 4},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [0, 5], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5}
+            ]
+        }
+    }
 }
diff --git a/keyboards/ymdk/ymd75/rev3/rev3.c b/keyboards/ymdk/ymd75/rev3/rev3.c
deleted file mode 100644
index c1ad021b15..0000000000
--- a/keyboards/ymdk/ymd75/rev3/rev3.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ymd75.h"
diff --git a/keyboards/ymdk/ymd75/rev3/rev3.h b/keyboards/ymdk/ymd75/rev3/rev3.h
deleted file mode 100644
index d247797736..0000000000
--- a/keyboards/ymdk/ymd75/rev3/rev3.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-
-/* LAYOUT
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Psc│Pse│Del│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
- * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │0  │ - │ = │BckSpc │Hm │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │End│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │PgU│
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │RShift│ ↑ │PgD│
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- * │Ctrl│Sup │Alt │          Space         │Alt│Sup│Ctl│ � │ ↓ │ → │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- */
-
-#define LAYOUT( \
-    K50, K51, K52, K53, K54, K55, K56, K57, K58, KB8, KB7, KB5, KB4, KB3, KB6, KB2,   \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, KA6,      KA2,   \
-    K30,   K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K94,  K93,   K96,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84,        K86,   \
-    K10,       K12, K13, K14, K15, K16, K17, K18, K78, K77, K75, K74,     K73, K76,   \
-    K00,  K01,  K02,              K06,                K08, K07, K05, K04, K03, K66    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
-    { K10,   KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K66,   KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, K73,   K74,   K75,   K76,   K77,   K78   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K84,   K85,   K86,   K87,   K88   }, \
-    { KC_NO, KC_NO, KC_NO, K93,   K94,   K95,   K96,   K97,   K98   }, \
-    { KC_NO, KC_NO, KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8   }, \
-    { KC_NO, KC_NO, KB2,   KB3,   KB4,   KB5,   KB6,   KB7,   KB8   }, \
-}
-
-/* LAYOUT_75_iso
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Psc│Pse│Del│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
- * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │0  │ - │ = │BckSpc │Hm │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │End│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�Ent ├───┤
- * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PgU│
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │PgD│
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- * │Ctrl│Sup │Alt │          Space         │Alt│Mo │Ctl│ � │ ↓ │ → │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- */
-
-#define LAYOUT_75_iso( \
-    K50, K51, K52, K53, K54, K55, K56, K57, K58, KB8, KB7, KB5, KB4, KB3, KB6, KB2,   \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, KA6,      KA2,   \
-    K30,   K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K94,         K96,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K93,   K84, K86,   \
-    K10,  K11, K12, K13, K14, K15, K16, K17, K18, K78, K77, K75, K74,     K73, K76,   \
-    K00,  K01,  K02,              K06,                K08, K07, K05, K04, K03, K66    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K66,   KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, K73,   K74,   K75,   K76,   K77,   K78   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K93,   K85,   K86,   K87,   K88   }, \
-    { KC_NO, KC_NO, KC_NO, K84,   K94,   K95,   K96,   K97,   K98   }, \
-    { KC_NO, KC_NO, KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8   }, \
-    { KC_NO, KC_NO, KB2,   KB3,   KB4,   KB5,   KB6,   KB7,   KB8   }, \
-}
-
-/* LAYOUT_75_iso_rwkl
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───�
- * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Psc│Pse│Del│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
- * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │0  │ - │ = │BckSpc │Hm │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │End│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴�Ent ├───┤
- * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PgU│
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
- * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │PgD│
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │Ctrl│Sup │Alt │          Space         │ Alt │ Ctl │ � │ ↓ │ → │
- * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-#define LAYOUT_75_iso_rwkl( \
-    K50, K51, K52, K53, K54, K55, K56, K57, K58, KB8, KB7, KB5, KB4, KB3, KB6, KB2,   \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, KA6,      KA2,   \
-    K30,   K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K94,         K96,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K93,   K84, K86,   \
-    K10,  K11, K12, K13, K14, K15, K16, K17, K18, K78, K77, K75, K74,     K73, K76,   \
-    K00,  K01,  K02,              K06,                K08,      K05, K04, K03, K66    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO, K08   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K66,   KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, K73,   K74,   K75,   K76,   K77,   K78   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K93,   K85,   K86,   K87,   K88   }, \
-    { KC_NO, KC_NO, KC_NO, K84,   K94,   K95,   K96,   K97,   K98   }, \
-    { KC_NO, KC_NO, KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8   }, \
-    { KC_NO, KC_NO, KB2,   KB3,   KB4,   KB5,   KB6,   KB7,   KB8   }, \
-}
diff --git a/keyboards/ymdk/ymd75/ymd75.c b/keyboards/ymdk/ymd75/ymd75.c
deleted file mode 100644
index 2fca021f78..0000000000
--- a/keyboards/ymdk/ymd75/ymd75.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ymd75.h"
diff --git a/keyboards/ymdk/ymd75/ymd75.h b/keyboards/ymdk/ymd75/ymd75.h
deleted file mode 100644
index dbaf93e7db..0000000000
--- a/keyboards/ymdk/ymd75/ymd75.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_ymdk_ymd75_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_ymdk_ymd75_rev2)
-    #include "rev2.h"
-#elif defined(KEYBOARD_ymdk_ymd75_rev3)
-    #include "rev3.h"
-#endif
diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h
index f4fc0a99c3..3b6ffded66 100644
--- a/keyboards/ymdk/ymd96/config.h
+++ b/keyboards/ymdk/ymd96/config.h
@@ -19,21 +19,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TOGGLE 3
 
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* RGB underglow */
-// The RGB_DI_PIN value seems to be shared between all PS2AVRGB boards.
-// The same pin is used on the JJ40, at least.
 #define RGBLED_NUM 18
-#define RGB_DI_PIN E2 // NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json
index 7541e62019..d24d4fa4cd 100644
--- a/keyboards/ymdk/ymd96/info.json
+++ b/keyboards/ymdk/ymd96/info.json
@@ -8,11 +8,19 @@
         "pid": "0x422D",
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4",
         "levels": 12,
         "breathing": true
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "indicators": {
         "caps_lock": "D1",
         "num_lock": "D0",
@@ -22,13 +30,332 @@
     "bootloader": "bootloadhid",
     "layouts": {
         "LAYOUT_default": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Print Screen", "x":13, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15, "y":0}, {"label":"Insert", "x":16, "y":0}, {"label":"Delete", "x":17, "y":0}, {"label":"Page Up", "x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"PgDn", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"+", "x":18, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "y":3},{"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":2.75}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4, "h":2}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Fn", "x":10, "y":5}, {"label":"Win", "x":11, "y":5}, {"label":"\u2190", "x":12, "y":5}, {"label":"\u2193", "x":13, "y":5}, {"label":"\u2191", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}]
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 10], "x": 6, "y": 0},
+                {"matrix": [7, 10], "x": 7, "y": 0},
+                {"matrix": [7, 0], "x": 8, "y": 0},
+                {"matrix": [5, 11], "x": 9, "y": 0},
+                {"matrix": [5, 12], "x": 10, "y": 0},
+                {"matrix": [5, 13], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [2, 14], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [7, 6], "x": 16, "y": 0},
+                {"matrix": [7, 9], "x": 17, "y": 0},
+                {"matrix": [7, 8], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [6, 1], "x": 6, "y": 1},
+                {"matrix": [6, 11], "x": 7, "y": 1},
+                {"matrix": [7, 11], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [4, 10], "x": 10, "y": 1},
+                {"matrix": [4, 11], "x": 11, "y": 1},
+                {"matrix": [4, 12], "x": 12, "y": 1},
+                {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [4, 6], "x": 15, "y": 1},
+                {"matrix": [4, 7], "x": 16, "y": 1},
+                {"matrix": [4, 8], "x": 17, "y": 1},
+                {"matrix": [4, 9], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 12], "x": 7.5, "y": 2},
+                {"matrix": [7, 12], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 6], "x": 15, "y": 2},
+                {"matrix": [3, 7], "x": 16, "y": 2},
+                {"matrix": [3, 8], "x": 17, "y": 2},
+                {"matrix": [3, 9], "x": 18, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [6, 13], "x": 7.75, "y": 3},
+                {"matrix": [7, 13], "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [2, 6], "x": 15, "y": 3},
+                {"matrix": [2, 7], "x": 16, "y": 3},
+                {"matrix": [2, 8], "x": 17, "y": 3},
+                {"matrix": [2, 9], "x": 18, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 4},
+                {"matrix": [1, 2], "x": 3.25, "y": 4},
+                {"matrix": [1, 3], "x": 4.25, "y": 4},
+                {"matrix": [1, 4], "x": 5.25, "y": 4},
+                {"matrix": [1, 5], "x": 6.25, "y": 4},
+                {"matrix": [6, 4], "x": 7.25, "y": 4},
+                {"matrix": [6, 14], "x": 8.25, "y": 4},
+                {"matrix": [7, 14], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [1, 10], "x": 11.25, "y": 4},
+                {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 2.75},
+                {"matrix": [1, 6], "x": 15, "y": 4},
+                {"matrix": [1, 7], "x": 16, "y": 4},
+                {"matrix": [1, 8], "x": 17, "y": 4},
+                {"matrix": [0, 9], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5},
+                {"matrix": [0, 10], "x": 11, "y": 5},
+                {"matrix": [0, 11], "x": 12, "y": 5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 7], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5},
+                {"matrix": [0, 6], "x": 16, "y": 5},
+                {"matrix": [0, 8], "x": 17, "y": 5}
+            ]
         },
         "LAYOUT_custom": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Print Screen", "x":13, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15, "y":0}, {"label":"Insert", "x":16, "y":0}, {"label":"Delete", "x":17, "y":0}, {"label":"Page Up", "x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"PgDn", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"-", "x":18, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Fn", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4, "h":2}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Menu", "x":11, "y":5}, {"label":"Prnt Scr", "x":12, "y":5}, {"label":"Ctrl", "x":13, "y":5}, {"label":"Scroll Lock", "x":14, "y":5}, {"label":"0", "x":15, "y":5, "w":2}, {"label":".", "x":17, "y":5}]
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 10], "x": 6, "y": 0},
+                {"matrix": [7, 10], "x": 7, "y": 0},
+                {"matrix": [7, 0], "x": 8, "y": 0},
+                {"matrix": [5, 11], "x": 9, "y": 0},
+                {"matrix": [5, 12], "x": 10, "y": 0},
+                {"matrix": [5, 13], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [2, 14], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [7, 6], "x": 16, "y": 0},
+                {"matrix": [7, 9], "x": 17, "y": 0},
+                {"matrix": [7, 8], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [6, 1], "x": 6, "y": 1},
+                {"matrix": [6, 11], "x": 7, "y": 1},
+                {"matrix": [7, 11], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [4, 10], "x": 10, "y": 1},
+                {"matrix": [4, 11], "x": 11, "y": 1},
+                {"matrix": [4, 12], "x": 12, "y": 1},
+                {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [4, 6], "x": 15, "y": 1},
+                {"matrix": [4, 7], "x": 16, "y": 1},
+                {"matrix": [4, 8], "x": 17, "y": 1},
+                {"matrix": [4, 9], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 12], "x": 7.5, "y": 2},
+                {"matrix": [7, 12], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 6], "x": 15, "y": 2},
+                {"matrix": [3, 7], "x": 16, "y": 2},
+                {"matrix": [3, 8], "x": 17, "y": 2},
+                {"matrix": [3, 9], "x": 18, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [6, 13], "x": 7.75, "y": 3},
+                {"matrix": [7, 13], "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [2, 6], "x": 15, "y": 3},
+                {"matrix": [2, 7], "x": 16, "y": 3},
+                {"matrix": [2, 8], "x": 17, "y": 3},
+                {"matrix": [2, 9], "x": 18, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 4},
+                {"matrix": [1, 2], "x": 3.25, "y": 4},
+                {"matrix": [1, 3], "x": 4.25, "y": 4},
+                {"matrix": [1, 4], "x": 5.25, "y": 4},
+                {"matrix": [1, 5], "x": 6.25, "y": 4},
+                {"matrix": [6, 4], "x": 7.25, "y": 4},
+                {"matrix": [6, 14], "x": 8.25, "y": 4},
+                {"matrix": [7, 14], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [1, 10], "x": 11.25, "y": 4},
+                {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 8], "x": 14, "y": 4},
+                {"matrix": [1, 6], "x": 15, "y": 4},
+                {"matrix": [1, 7], "x": 16, "y": 4},
+                {"matrix": [1, 8], "x": 17, "y": 4},
+                {"matrix": [0, 9], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5},
+                {"matrix": [0, 10], "x": 11, "y": 5},
+                {"matrix": [0, 11], "x": 12, "y": 5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 7], "x": 14, "y": 5},
+                {"matrix": [0, 6], "x": 15, "y": 5, "w": 2},
+                {"matrix": [0, 8], "x": 17, "y": 5}
+            ]
         },
         "LAYOUT_iso": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15, "y":0}, {"label":"Insert", "x":16, "y":0}, {"label":"Delete", "x":17, "y":0}, {"label":"PgUp", "x":18, "y":0}, {"label":"\u00ac", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"\"", "x":2, "y":1}, {"label":"\u00a3", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"PgDn", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"-", "x":18, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"@", "x":11.75, "y":3}, {"label":"~", "x":12.75, "y":3}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"|", "x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Up", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4, "h":2}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"AltGr", "x":10, "y":5, "w":1.5}, {"label":"Win", "x":11.5, "y":5, "w":1.5}, {"label":"Left", "x":13, "y":5}, {"label":"Down", "x":14, "y":5}, {"label":"Right", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}]
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 10], "x": 6, "y": 0},
+                {"matrix": [7, 10], "x": 7, "y": 0},
+                {"matrix": [7, 0], "x": 8, "y": 0},
+                {"matrix": [5, 11], "x": 9, "y": 0},
+                {"matrix": [5, 12], "x": 10, "y": 0},
+                {"matrix": [5, 13], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [2, 14], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [7, 6], "x": 16, "y": 0},
+                {"matrix": [7, 9], "x": 17, "y": 0},
+                {"matrix": [7, 8], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [6, 1], "x": 6, "y": 1},
+                {"matrix": [6, 11], "x": 7, "y": 1},
+                {"matrix": [7, 11], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [4, 10], "x": 10, "y": 1},
+                {"matrix": [4, 11], "x": 11, "y": 1},
+                {"matrix": [4, 12], "x": 12, "y": 1},
+                {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [4, 6], "x": 15, "y": 1},
+                {"matrix": [4, 7], "x": 16, "y": 1},
+                {"matrix": [4, 8], "x": 17, "y": 1},
+                {"matrix": [4, 9], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 12], "x": 7.5, "y": 2},
+                {"matrix": [7, 12], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 6], "x": 15, "y": 2},
+                {"matrix": [3, 7], "x": 16, "y": 2},
+                {"matrix": [3, 8], "x": 17, "y": 2},
+                {"matrix": [3, 9], "x": 18, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [6, 13], "x": 7.75, "y": 3},
+                {"matrix": [7, 13], "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 12], "x": 12.75, "y": 3},
+                {"matrix": [2, 6], "x": 15, "y": 3},
+                {"matrix": [2, 7], "x": 16, "y": 3},
+                {"matrix": [2, 8], "x": 17, "y": 3},
+                {"matrix": [2, 9], "x": 18, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [0, 3], "x": 1.25, "y": 4},
+                {"matrix": [1, 1], "x": 2.25, "y": 4},
+                {"matrix": [1, 2], "x": 3.25, "y": 4},
+                {"matrix": [1, 3], "x": 4.25, "y": 4},
+                {"matrix": [1, 4], "x": 5.25, "y": 4},
+                {"matrix": [1, 5], "x": 6.25, "y": 4},
+                {"matrix": [6, 4], "x": 7.25, "y": 4},
+                {"matrix": [6, 14], "x": 8.25, "y": 4},
+                {"matrix": [7, 14], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [1, 10], "x": 11.25, "y": 4},
+                {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 8], "x": 14, "y": 4},
+                {"matrix": [1, 6], "x": 15, "y": 4},
+                {"matrix": [1, 7], "x": 16, "y": 4},
+                {"matrix": [1, 8], "x": 17, "y": 4},
+                {"matrix": [0, 9], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [0, 11], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 7], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5},
+                {"matrix": [0, 6], "x": 16, "y": 5},
+                {"matrix": [0, 8], "x": 17, "y": 5}
+            ]
         }
     }
 }
diff --git a/keyboards/ymdk/ymd96/rules.mk b/keyboards/ymdk/ymd96/rules.mk
index 4eaf6aa919..17b4d5b251 100644
--- a/keyboards/ymdk/ymd96/rules.mk
+++ b/keyboards/ymdk/ymd96/rules.mk
@@ -10,6 +10,5 @@ COMMAND_ENABLE = no
 BACKLIGHT_ENABLE = yes
 
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
 
 KEY_LOCK_ENABLE = yes
diff --git a/keyboards/ymdk/ymd96/ymd96.c b/keyboards/ymdk/ymd96/ymd96.c
deleted file mode 100644
index 0c212f4abb..0000000000
--- a/keyboards/ymdk/ymd96/ymd96.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2018 Kenneth A. <github.com/krusli>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ymd96.h"
diff --git a/keyboards/ymdk/ymd96/ymd96.h b/keyboards/ymdk/ymd96/ymd96.h
deleted file mode 100644
index c89be71686..0000000000
--- a/keyboards/ymdk/ymd96/ymd96.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 harshit goel
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-    K50, K52, K53, K54, K55, K60, K6A, K7A, K70, K5B, K5C, K5D, K5E, K1D, K2E,   K0D, K76, K79, K78, \
-    K40, K41, K42, K43, K44, K45, K61, K6B, K7B, K71, K4A, K4B, K4C,      K4E,   K46, K47, K48, K49, \
-    K30,   K31, K32, K33, K34, K35, K62, K6C, K7C, K72, K3A, K3B, K3C,    K3D,   K36, K37, K38, K39, \
-    K20,    K21, K22, K23, K24, K25, K63, K6D, K7D, K73, K2A, K2B,        K2D,   K26, K27, K28, K29, \
-    K10,      K11, K12, K13, K14, K15, K64, K6E, K7E, K74, K1A,           K1B,   K16, K17, K18, K09, \
-    K00,  K01,  K02,               K65,               K75, K0A, K0B, K66, K67,   K69, K06, K08       \
-) { \
-    {  K00,  K01,    K02,  KC_NO,  KC_NO,  KC_NO,  K06,    KC_NO,  K08,    K09,    K0A,    K0B,  KC_NO,  K0D,    KC_NO  }, \
-    {  K10,  K11,    K12,  K13,    K14,    K15,    K16,    K17,    K18,    KC_NO,  K1A,    K1B,  KC_NO,  K1D,    KC_NO  }, \
-    {  K20,  K21,    K22,  K23,    K24,    K25,    K26,    K27,    K28,    K29,    K2A,    K2B,  KC_NO,  K2D,    K2E    }, \
-    {  K30,  K31,    K32,  K33,    K34,    K35,    K36,    K37,    K38,    K39,    K3A,    K3B,  K3C,    K3D,    KC_NO  }, \
-    {  K40,  K41,    K42,  K43,    K44,    K45,    K46,    K47,    K48,    K49,    K4A,    K4B,  K4C,    KC_NO,  K4E    }, \
-    {  K50,  KC_NO,  K52,  K53,    K54,    K55,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K5B,  K5C,    K5D,    K5E    }, \
-    {  K60,  K61,    K62,  K63,    K64,    K65,    K66,    K67,    KC_NO,  K69,    K6A,    K6B,  K6C,    K6D,    K6E    }, \
-    {  K70,  K71,    K72,  K73,    K74,    K75,    K76,    KC_NO,  K78,    K79,    K7A,    K7B,  K7C,    K7D,    K7E    }  \
-}
-
-#define LAYOUT_custom( \
-    K50, K52, K53, K54, K55, K60, K6A, K7A, K70, K5B, K5C, K5D, K5E, K1D, K2E,   K0D, K76, K79, K78, \
-    K40, K41, K42, K43, K44, K45, K61, K6B, K7B, K71, K4A, K4B, K4C,      K4E,   K46, K47, K48, K49, \
-    K30,   K31, K32, K33, K34, K35, K62, K6C, K7C, K72, K3A, K3B, K3C,    K3D,   K36, K37, K38, K39, \
-    K20,    K21, K22, K23, K24, K25, K63, K6D, K7D, K73, K2A, K2B,        K2D,   K26, K27, K28, K29, \
-    K10,      K11, K12, K13, K14, K15, K64, K6E, K7E, K74, K1A,      K1B, K68,   K16, K17, K18, K09, \
-    K00,  K01,  K02,               K65,               K75, K0A, K0B, K66, K67,   K06,      K08       \
-) { \
-    {  K00,  K01,    K02,  KC_NO,  KC_NO,  KC_NO,  K06,    KC_NO,  K08,    K09,    K0A,    K0B,  KC_NO,  K0D,    KC_NO  }, \
-    {  K10,  K11,    K12,  K13,    K14,    K15,    K16,    K17,    K18,    KC_NO,  K1A,    K1B,  KC_NO,  K1D,    KC_NO  }, \
-    {  K20,  K21,    K22,  K23,    K24,    K25,    K26,    K27,    K28,    K29,    K2A,    K2B,  KC_NO,  K2D,    K2E    }, \
-    {  K30,  K31,    K32,  K33,    K34,    K35,    K36,    K37,    K38,    K39,    K3A,    K3B,  K3C,    K3D,    KC_NO  }, \
-    {  K40,  K41,    K42,  K43,    K44,    K45,    K46,    K47,    K48,    K49,    K4A,    K4B,  K4C,    KC_NO,  K4E    }, \
-    {  K50,  KC_NO,  K52,  K53,    K54,    K55,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K5B,  K5C,    K5D,    K5E    }, \
-    {  K60,  K61,    K62,  K63,    K64,    K65,    K66,    K67,    K68,    KC_NO,  K6A,    K6B,  K6C,    K6D,    K6E    }, \
-    {  K70,  K71,    K72,  K73,    K74,    K75,    K76,    KC_NO,  K78,    K79,    K7A,    K7B,  K7C,    K7D,    K7E    }  \
-}
-
-#define LAYOUT_iso( \
-    K50, K52, K53, K54, K55, K60, K6A, K7A, K70, K5B, K5C, K5D, K5E, K1D, K2E,   K0D, K76, K79, K78, \
-    K40, K41, K42, K43, K44, K45, K61, K6B, K7B, K71, K4A, K4B, K4C,      K4E,   K46, K47, K48, K49, \
-    K30,   K31, K32, K33, K34, K35, K62, K6C, K7C, K72, K3A, K3B, K3C,    K2D,   K36, K37, K38, K39, \
-    K20,    K21, K22, K23, K24, K25, K63, K6D, K7D, K73, K2A, K2B, K2C,          K26, K27, K28, K29, \
-    K10, K03, K11, K12, K13, K14, K15, K64, K6E, K7E, K74, K1A,      K1B, K68,   K16, K17, K18, K09, \
-    K00,  K01,  K02,               K65,                K75,   K0B,   K66, K67, K69,   K06, K08       \
-) { \
-    {  K00,  K01,    K02,  K03,  KC_NO,  KC_NO,  K06,    KC_NO,  K08,    K09,    KC_NO,  K0B,  KC_NO,  K0D,    KC_NO  }, \
-    {  K10,  K11,    K12,  K13,  K14,    K15,    K16,    K17,    K18,    KC_NO,  K1A,    K1B,  KC_NO,  K1D,    KC_NO  }, \
-    {  K20,  K21,    K22,  K23,  K24,    K25,    K26,    K27,    K28,    K29,    K2A,    K2B,  K2C,    K2D,    K2E    }, \
-    {  K30,  K31,    K32,  K33,  K34,    K35,    K36,    K37,    K38,    K39,    K3A,    K3B,  K3C,    KC_NO,  KC_NO  }, \
-    {  K40,  K41,    K42,  K43,  K44,    K45,    K46,    K47,    K48,    K49,    K4A,    K4B,  K4C,    KC_NO,  K4E    }, \
-    {  K50,  KC_NO,  K52,  K53,  K54,    K55,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K5B,  K5C,    K5D,    K5E    }, \
-    {  K60,  K61,    K62,  K63,  K64,    K65,    K66,    K67,    K68,    K69,    K6A,    K6B,  K6C,    K6D,    K6E    }, \
-    {  K70,  K71,    K72,  K73,  K74,    K75,    K76,    KC_NO,  K78,    K79,    K7A,    K7B,  K7C,    K7D,    K7E    }  \
-}
diff --git a/keyboards/yncognito/batpad/batpad.c b/keyboards/yncognito/batpad/batpad.c
index caafd57278..d5eef4246d 100644
--- a/keyboards/yncognito/batpad/batpad.c
+++ b/keyboards/yncognito/batpad/batpad.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "batpad.h"
+#include "quantum.h"
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/yncognito/batpad/batpad.h b/keyboards/yncognito/batpad/batpad.h
deleted file mode 100644
index e3391881bc..0000000000
--- a/keyboards/yncognito/batpad/batpad.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 Yncognito
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x4( \
-    K00, K01, K02, K03,   \
-    K10, K11, K12, K13    \
-) { \
-    { K00,   K01,   K02,   K03   }, \
-    { K10,   K11,   K12,   K13   }, \
-}
diff --git a/keyboards/yncognito/batpad/config.h b/keyboards/yncognito/batpad/config.h
index fb4155c48d..d44817cae9 100644
--- a/keyboards/yncognito/batpad/config.h
+++ b/keyboards/yncognito/batpad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, C7 }
-#define MATRIX_COL_PINS { F1, F0, D5, D3 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B5
 #define RGB_MATRIX_LED_COUNT 8
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/info.json
index 01d2032d2e..ec57403a66 100644
--- a/keyboards/yncognito/batpad/info.json
+++ b/keyboards/yncognito/batpad/info.json
@@ -8,19 +8,31 @@
         "pid": "0x6602",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "D5", "D3"],
+        "rows": ["F4", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_2x4": {
             "layout": [
-                {"label":"K00 (F4,F1)", "x":0, "y":0},
-                {"label":"K01 (F4,F0)", "x":1, "y":0},
-                {"label":"K02 (F4,D5)", "x":2, "y":0},
-                {"label":"K03 (F4,D3)", "x":3, "y":0},
-                {"label":"K10 (C7,F1)", "x":0, "y":1},
-                {"label":"K11 (C7,F0)", "x":1, "y":1},
-                {"label":"K12 (C7,D5)", "x":2, "y":1},
-                {"label":"K13 (C7,D3)", "x":3, "y":1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1}
             ]
         }
     }
diff --git a/keyboards/yncognito/batpad/rules.mk b/keyboards/yncognito/batpad/rules.mk
index 8009de294e..a72bbe128b 100644
--- a/keyboards/yncognito/batpad/rules.mk
+++ b/keyboards/yncognito/batpad/rules.mk
@@ -9,5 +9,4 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no            # Audio output
diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h
index 73de0d6c42..a0445973a5 100644
--- a/keyboards/yoichiro/lunakey_macro/config.h
+++ b/keyboards/yoichiro/lunakey_macro/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Audio support */
 #define AUDIO_PIN C6
 
@@ -47,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Layer Count */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 5
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -66,7 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/info.json
index f7d032a1d2..f892a9db7f 100644
--- a/keyboards/yoichiro/lunakey_macro/info.json
+++ b/keyboards/yoichiro/lunakey_macro/info.json
@@ -8,24 +8,32 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1"],
+        "rows": ["E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"0,0", "x":0.5, "y":0.5},
-                {"label":"0,1", "x":1.5, "y":0.175},
-                {"label":"0,2", "x":2.5, "y":0},
-                {"label":"0,3", "x":3.5, "y":0.5},
+                {"matrix": [0, 0], "x": 0.5, "y": 0.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.175},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.5},
 
-                {"label":"1,0", "x":0.5, "y":1.5},
-                {"label":"1,1", "x":1.5, "y":1.175},
-                {"label":"1,2", "x":2.5, "y":1},
-                {"label":"1,3", "x":3.5, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.175},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.5},
 
-                {"label":"2,0", "x":0, "y":3},
-                {"label":"2,1", "x":1, "y":2.75},
-                {"label":"2,2", "x":2, "y":3}
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 3}
             ]
         }
     }
diff --git a/keyboards/yoichiro/lunakey_macro/lunakey_macro.c b/keyboards/yoichiro/lunakey_macro/lunakey_macro.c
deleted file mode 100644
index 5ef38f70c7..0000000000
--- a/keyboards/yoichiro/lunakey_macro/lunakey_macro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Yoichiro Tanaka
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "lunakey_macro.h"
diff --git a/keyboards/yoichiro/lunakey_macro/lunakey_macro.h b/keyboards/yoichiro/lunakey_macro/lunakey_macro.h
deleted file mode 100644
index 487b7fe208..0000000000
--- a/keyboards/yoichiro/lunakey_macro/lunakey_macro.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 Yoichiro Tanaka
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22 \
-) { \
-    { k00, k01, k02, k03   }, \
-    { k10, k11, k12, k13   }, \
-    { k20, k21, k22, KC_NO }  \
-}
diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h
index a4ddefb53c..1e2b0af370 100644
--- a/keyboards/yoichiro/lunakey_mini/config.h
+++ b/keyboards/yoichiro/lunakey_mini/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 12
   #define RGBLIGHT_SPLIT
   #define RGBLED_SPLIT { 6, 6 }
@@ -56,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 /* Audio Support */
 #define AUDIO_PIN C6
diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json
index 4baa40bda4..1347f73cb0 100644
--- a/keyboards/yoichiro/lunakey_mini/info.json
+++ b/keyboards/yoichiro/lunakey_mini/info.json
@@ -8,58 +8,74 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_split_3x6_4": {
             "layout": [
-                {"label":"L00", "x":0, "y":1.5},
-                {"label":"L01", "x":1, "y":1.25},
-                {"label":"L02", "x":2, "y":0.5},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0.25},
-                {"label":"L05", "x":5, "y":0.5},
-                {"label":"R00", "x":8.75, "y":0.5},
-                {"label":"R01", "x":9.75, "y":0.25},
-                {"label":"R02", "x":10.75, "y":0},
-                {"label":"R03", "x":11.75, "y":0.5},
-                {"label":"R04", "x":12.75, "y":1.25},
-                {"label":"R05", "x":13.75, "y":1.5},
-                {"label":"L10", "x":0, "y":2.5},
-                {"label":"L11", "x":1, "y":2.25},
-                {"label":"L12", "x":2, "y":1.5},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1.25},
-                {"label":"L15", "x":5, "y":1.5},
-                {"label":"R10", "x":8.75, "y":1.5},
-                {"label":"R11", "x":9.75, "y":1.25},
-                {"label":"R12", "x":10.75, "y":1},
-                {"label":"R13", "x":11.75, "y":1.5},
-                {"label":"R14", "x":12.75, "y":2.25},
-                {"label":"R15", "x":13.75, "y":2.5},
-                {"label":"L20", "x":0, "y":3.5},
-                {"label":"L21", "x":1, "y":3.25},
-                {"label":"L22", "x":2, "y":2.5},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2.25},
-                {"label":"L25", "x":5, "y":2.5},
-                {"label":"R20", "x":8.75, "y":2.5},
-                {"label":"R21", "x":9.75, "y":2.25},
-                {"label":"R22", "x":10.75, "y":2},
-                {"label":"R23", "x":11.75, "y":2.5},
-                {"label":"R24", "x":12.75, "y":3.25},
-                {"label":"R25", "x":13.75, "y":3.5},
-                {"label":"L30", "x":3, "y":4},
-                {"label":"L31", "x":4, "y":3.75},
-                {"label":"L32", "x":5, "y":3.75},
-                {"label":"L33", "x":6, "y":4},
-                {"label":"R30", "x":7.75, "y":4},
-                {"label":"R31", "x":8.75, "y":3.75},
-                {"label":"R32", "x":9.75, "y":3.75},
-                {"label":"R33", "x":10.75, "y":4}]
+                {"matrix": [0, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+                {"matrix": [4, 5], "x": 8.75, "y": 0.5},
+                {"matrix": [4, 4], "x": 9.75, "y": 0.25},
+                {"matrix": [4, 3], "x": 10.75, "y": 0},
+                {"matrix": [4, 2], "x": 11.75, "y": 0.5},
+                {"matrix": [4, 1], "x": 12.75, "y": 1.25},
+                {"matrix": [4, 0], "x": 13.75, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+                {"matrix": [5, 5], "x": 8.75, "y": 1.5},
+                {"matrix": [5, 4], "x": 9.75, "y": 1.25},
+                {"matrix": [5, 3], "x": 10.75, "y": 1},
+                {"matrix": [5, 2], "x": 11.75, "y": 1.5},
+                {"matrix": [5, 1], "x": 12.75, "y": 2.25},
+                {"matrix": [5, 0], "x": 13.75, "y": 2.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.5},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+                {"matrix": [6, 5], "x": 8.75, "y": 2.5},
+                {"matrix": [6, 4], "x": 9.75, "y": 2.25},
+                {"matrix": [6, 3], "x": 10.75, "y": 2},
+                {"matrix": [6, 2], "x": 11.75, "y": 2.5},
+                {"matrix": [6, 1], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 0], "x": 13.75, "y": 3.5},
+
+                {"matrix": [3, 2], "x": 3, "y": 4},
+                {"matrix": [3, 3], "x": 4, "y": 3.75},
+                {"matrix": [3, 4], "x": 5, "y": 3.75},
+                {"matrix": [3, 5], "x": 6, "y": 4},
+
+                {"matrix": [7, 5], "x": 7.75, "y": 4},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.75},
+                {"matrix": [7, 3], "x": 9.75, "y": 3.75},
+                {"matrix": [7, 2], "x": 10.75, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/yoichiro/lunakey_mini/lunakey_mini.c b/keyboards/yoichiro/lunakey_mini/lunakey_mini.c
deleted file mode 100644
index 4114706374..0000000000
--- a/keyboards/yoichiro/lunakey_mini/lunakey_mini.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Yoichiro Tanaka
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "lunakey_mini.h"
diff --git a/keyboards/yoichiro/lunakey_mini/lunakey_mini.h b/keyboards/yoichiro/lunakey_mini/lunakey_mini.h
deleted file mode 100644
index bb649cc018..0000000000
--- a/keyboards/yoichiro/lunakey_mini/lunakey_mini.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 Yoichiro Tanaka
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x6_4( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-                 L30, L31, L32, L33, R30, R31, R32, R33 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { KC_NO, KC_NO, L30, L31, L32, L33 }, \
-    { R05, R04, R03, R02, R01, R00 }, \
-    { R15, R14, R13, R12, R11, R10 }, \
-    { R25, R24, R23, R22, R21, R20 }, \
-    { KC_NO, KC_NO, R33, R32, R31, R30 } \
-  }
diff --git a/keyboards/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/info.json
index a10d0ca58e..2b477e726c 100644
--- a/keyboards/yoichiro/lunakey_pico/info.json
+++ b/keyboards/yoichiro/lunakey_pico/info.json
@@ -26,7 +26,6 @@
     },
     "rgblight": {
         "led_count": 12,
-        "pin": "GP6",
         "sleep": true,
         "split": true,
         "split_count": [6, 6],
@@ -50,56 +49,68 @@
     "split": {
         "enabled": true
     },
+    "ws2812": {
+        "pin": "GP6",
+        "driver": "vendor"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_3x6_4"
     },
     "layouts": {
         "LAYOUT_split_3x6_4": {
             "layout": [
-                {"label":"L00", "x":0, "y":1.5},
-                {"label":"L01", "x":1, "y":1.25},
-                {"label":"L02", "x":2, "y":0.5},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0.25},
-                {"label":"L05", "x":5, "y":0.5},
-                {"label":"R00", "x":8.75, "y":0.5},
-                {"label":"R01", "x":9.75, "y":0.25},
-                {"label":"R02", "x":10.75, "y":0},
-                {"label":"R03", "x":11.75, "y":0.5},
-                {"label":"R04", "x":12.75, "y":1.25},
-                {"label":"R05", "x":13.75, "y":1.5},
-                {"label":"L10", "x":0, "y":2.5},
-                {"label":"L11", "x":1, "y":2.25},
-                {"label":"L12", "x":2, "y":1.5},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1.25},
-                {"label":"L15", "x":5, "y":1.5},
-                {"label":"R10", "x":8.75, "y":1.5},
-                {"label":"R11", "x":9.75, "y":1.25},
-                {"label":"R12", "x":10.75, "y":1},
-                {"label":"R13", "x":11.75, "y":1.5},
-                {"label":"R14", "x":12.75, "y":2.25},
-                {"label":"R15", "x":13.75, "y":2.5},
-                {"label":"L20", "x":0, "y":3.5},
-                {"label":"L21", "x":1, "y":3.25},
-                {"label":"L22", "x":2, "y":2.5},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2.25},
-                {"label":"L25", "x":5, "y":2.5},
-                {"label":"R20", "x":8.75, "y":2.5},
-                {"label":"R21", "x":9.75, "y":2.25},
-                {"label":"R22", "x":10.75, "y":2},
-                {"label":"R23", "x":11.75, "y":2.5},
-                {"label":"R24", "x":12.75, "y":3.25},
-                {"label":"R25", "x":13.75, "y":3.5},
-                {"label":"L30", "x":3, "y":4},
-                {"label":"L31", "x":4, "y":3.75},
-                {"label":"L32", "x":5, "y":3.75},
-                {"label":"L33", "x":6, "y":4},
-                {"label":"R30", "x":7.75, "y":4},
-                {"label":"R31", "x":8.75, "y":3.75},
-                {"label":"R32", "x":9.75, "y":3.75},
-                {"label":"R33", "x":10.75, "y":4}]
+                {"matrix": [0, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+                {"matrix": [4, 5], "x": 8.75, "y": 0.5},
+                {"matrix": [4, 4], "x": 9.75, "y": 0.25},
+                {"matrix": [4, 3], "x": 10.75, "y": 0},
+                {"matrix": [4, 2], "x": 11.75, "y": 0.5},
+                {"matrix": [4, 1], "x": 12.75, "y": 1.25},
+                {"matrix": [4, 0], "x": 13.75, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+                {"matrix": [5, 5], "x": 8.75, "y": 1.5},
+                {"matrix": [5, 4], "x": 9.75, "y": 1.25},
+                {"matrix": [5, 3], "x": 10.75, "y": 1},
+                {"matrix": [5, 2], "x": 11.75, "y": 1.5},
+                {"matrix": [5, 1], "x": 12.75, "y": 2.25},
+                {"matrix": [5, 0], "x": 13.75, "y": 2.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.5},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+                {"matrix": [6, 5], "x": 8.75, "y": 2.5},
+                {"matrix": [6, 4], "x": 9.75, "y": 2.25},
+                {"matrix": [6, 3], "x": 10.75, "y": 2},
+                {"matrix": [6, 2], "x": 11.75, "y": 2.5},
+                {"matrix": [6, 1], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 0], "x": 13.75, "y": 3.5},
+
+                {"matrix": [3, 2], "x": 3, "y": 4},
+                {"matrix": [3, 3], "x": 4, "y": 3.75},
+                {"matrix": [3, 4], "x": 5, "y": 3.75},
+                {"matrix": [3, 5], "x": 6, "y": 4},
+
+                {"matrix": [7, 5], "x": 7.75, "y": 4},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.75},
+                {"matrix": [7, 3], "x": 9.75, "y": 3.75},
+                {"matrix": [7, 2], "x": 10.75, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/yoichiro/lunakey_pico/lunakey_pico.c b/keyboards/yoichiro/lunakey_pico/lunakey_pico.c
deleted file mode 100644
index 3e57edad68..0000000000
--- a/keyboards/yoichiro/lunakey_pico/lunakey_pico.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Yoichiro Tanaka (@yoichiro)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "lunakey_pico.h"
diff --git a/keyboards/yoichiro/lunakey_pico/lunakey_pico.h b/keyboards/yoichiro/lunakey_pico/lunakey_pico.h
deleted file mode 100644
index 0725054f0f..0000000000
--- a/keyboards/yoichiro/lunakey_pico/lunakey_pico.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2022 Yoichiro Tanaka (@yoichiro)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_split_3x6_4( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-                 L30, L31, L32, L33, R30, R31, R32, R33 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { KC_NO, KC_NO, L30, L31, L32, L33 }, \
-    { R05, R04, R03, R02, R01, R00 }, \
-    { R15, R14, R13, R12, R11, R10 }, \
-    { R25, R24, R23, R22, R21, R20 }, \
-    { KC_NO, KC_NO, R33, R32, R31, R30 } \
-  }
diff --git a/keyboards/yoichiro/lunakey_pico/rules.mk b/keyboards/yoichiro/lunakey_pico/rules.mk
index 26c3aca886..161ec22b16 100644
--- a/keyboards/yoichiro/lunakey_pico/rules.mk
+++ b/keyboards/yoichiro/lunakey_pico/rules.mk
@@ -1,2 +1 @@
-WS2812_DRIVER = vendor
 SERIAL_DRIVER = vendor
diff --git a/keyboards/yosino58/lib/host_led_state_reader.c b/keyboards/yosino58/lib/host_led_state_reader.c
index 2a17e0a33b..abcfefffb4 100644
--- a/keyboards/yosino58/lib/host_led_state_reader.c
+++ b/keyboards/yosino58/lib/host_led_state_reader.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "yosino58.h"
 
 char host_led_state_str[24];
 
diff --git a/keyboards/yosino58/lib/keylogger.c b/keyboards/yosino58/lib/keylogger.c
index c50de94c20..dc9c21406f 100644
--- a/keyboards/yosino58/lib/keylogger.c
+++ b/keyboards/yosino58/lib/keylogger.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "yosino58.h"
 
 char keylog_str[24] = {};
 char keylogs_str[21] = {};
diff --git a/keyboards/yosino58/lib/layer_state_reader.c b/keyboards/yosino58/lib/layer_state_reader.c
index 7e5747cb75..f9cd934568 100644
--- a/keyboards/yosino58/lib/layer_state_reader.c
+++ b/keyboards/yosino58/lib/layer_state_reader.c
@@ -1,7 +1,6 @@
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 #include <stdio.h>
-#include "yosino58.h"
 
 #define L_BASE 0
 #define L_LOWER 8
diff --git a/keyboards/yosino58/lib/logo_reader.c b/keyboards/yosino58/lib/logo_reader.c
index 96c9b897ef..b340979807 100644
--- a/keyboards/yosino58/lib/logo_reader.c
+++ b/keyboards/yosino58/lib/logo_reader.c
@@ -1,5 +1,3 @@
-#include "yosino58.h"
-
 const char *read_logo(void) {
   static char logo[] = {
     0x2B,0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
diff --git a/keyboards/yosino58/lib/mode_icon_reader.c b/keyboards/yosino58/lib/mode_icon_reader.c
index 865d9537de..9dadd6ac86 100644
--- a/keyboards/yosino58/lib/mode_icon_reader.c
+++ b/keyboards/yosino58/lib/mode_icon_reader.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "yosino58.h"
 
 char mode_icon[24];
 
diff --git a/keyboards/yosino58/lib/rgb_state_reader.c b/keyboards/yosino58/lib/rgb_state_reader.c
index e0efe2e528..daa008d849 100644
--- a/keyboards/yosino58/lib/rgb_state_reader.c
+++ b/keyboards/yosino58/lib/rgb_state_reader.c
@@ -1,6 +1,6 @@
 #ifdef RGBLIGHT_ENABLE
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 #include <stdio.h>
 
 extern rgblight_config_t rgblight_config;
diff --git a/keyboards/yosino58/lib/timelogger.c b/keyboards/yosino58/lib/timelogger.c
index ce8b0c270f..db75d77fac 100644
--- a/keyboards/yosino58/lib/timelogger.c
+++ b/keyboards/yosino58/lib/timelogger.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "yosino58.h"
 
 char timelog_str[24] = {};
 int last_time = 0;
diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h
index 39c7907b48..4930c35c60 100644
--- a/keyboards/yosino58/rev1/config.h
+++ b/keyboards/yosino58/rev1/config.h
@@ -18,14 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json
index baf43c47a5..0e8431cc88 100644
--- a/keyboards/yosino58/rev1/info.json
+++ b/keyboards/yosino58/rev1/info.json
@@ -8,9 +8,17 @@
         "pid": "0x01B8",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/yosino58/rev1/rev1.c b/keyboards/yosino58/rev1/rev1.c
deleted file mode 100644
index 45534122b3..0000000000
--- a/keyboards/yosino58/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "yosino58.h"
diff --git a/keyboards/yosino58/yosino58.c b/keyboards/yosino58/yosino58.c
deleted file mode 100644
index 85545f3f44..0000000000
--- a/keyboards/yosino58/yosino58.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "yosino58.h"
\ No newline at end of file
diff --git a/keyboards/yosino58/yosino58.h b/keyboards/yosino58/yosino58.h
deleted file mode 100644
index 5414c31bd8..0000000000
--- a/keyboards/yosino58/yosino58.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_yosino58_rev1
-  #include "rev1.h"
-#endif
diff --git a/keyboards/yugo_m/model_m_101/config.h b/keyboards/yugo_m/model_m_101/config.h
index a132e577bb..2b7fc4d157 100644
--- a/keyboards/yugo_m/model_m_101/config.h
+++ b/keyboards/yugo_m/model_m_101/config.h
@@ -18,25 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 }
-
-
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* define if matrix has ghost */
 #define MATRIX_HAS_GHOST
 
diff --git a/keyboards/yugo_m/model_m_101/info.json b/keyboards/yugo_m/model_m_101/info.json
index 35162e1b71..3533bf6142 100644
--- a/keyboards/yugo_m/model_m_101/info.json
+++ b/keyboards/yugo_m/model_m_101/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8E81",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+        "rows": ["B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/yushakobo/navpad/10/10.c b/keyboards/yushakobo/navpad/10/10.c
deleted file mode 100644
index c1f6fc485d..0000000000
--- a/keyboards/yushakobo/navpad/10/10.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "10.h"
diff --git a/keyboards/yushakobo/navpad/10/10.h b/keyboards/yushakobo/navpad/10/10.h
deleted file mode 100644
index 5fd02cd073..0000000000
--- a/keyboards/yushakobo/navpad/10/10.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-#include "navpad_prefs.h"
-
-#if defined(KEYBOARD_yushakobo_navpad_10_rev0)
-#    include "rev0.h"
-#elif defined(KEYBOARD_yushakobo_navpad_10_rev1)
-#    include "rev1.h"
-#endif
diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h
index 7f1153299c..fdd7a80cc5 100644
--- a/keyboards/yushakobo/navpad/10/config.h
+++ b/keyboards/yushakobo/navpad/10/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 9
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -37,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 //#    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* disable action features */
 //#define NO_ACTION_LAYER
diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json
index a6b946367f..fc314aa10d 100644
--- a/keyboards/yushakobo/navpad/10/info.json
+++ b/keyboards/yushakobo/navpad/10/info.json
@@ -12,6 +12,9 @@
             {"pin_a": "B5", "pin_b": "B6"}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/config.h b/keyboards/yushakobo/navpad/10/keymaps/default/config.h
index b4d2122ab4..10ba897cce 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/default/config.h
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/config.h
@@ -17,9 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGB_DI_PIN
-
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_MAX_LAYERS 6
-
-#endif
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/config.h b/keyboards/yushakobo/navpad/10/keymaps/via/config.h
index b4d2122ab4..10ba897cce 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/config.h
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/config.h
@@ -17,9 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGB_DI_PIN
-
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_MAX_LAYERS 6
-
-#endif
diff --git a/keyboards/yushakobo/navpad/10/rev0/config.h b/keyboards/yushakobo/navpad/10/rev0/config.h
deleted file mode 100644
index 3e65349c87..0000000000
--- a/keyboards/yushakobo/navpad/10/rev0/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 yushakobo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, D0 }
-#define MATRIX_COL_PINS { F4, F5, F6, B2, B3, B1, F7 }
diff --git a/keyboards/yushakobo/navpad/10/rev0/info.json b/keyboards/yushakobo/navpad/10/rev0/info.json
index 5baab67dba..76b579338c 100644
--- a/keyboards/yushakobo/navpad/10/rev0/info.json
+++ b/keyboards/yushakobo/navpad/10/rev0/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.0"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "B2", "B3", "B1", "F7"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "D0"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.c b/keyboards/yushakobo/navpad/10/rev0/rev0.c
deleted file mode 100644
index c1feab87a3..0000000000
--- a/keyboards/yushakobo/navpad/10/rev0/rev0.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev0.h"
diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.h b/keyboards/yushakobo/navpad/10/rev0/rev0.h
index 97a651bc1c..7e2dbab462 100644
--- a/keyboards/yushakobo/navpad/10/rev0/rev0.h
+++ b/keyboards/yushakobo/navpad/10/rev0/rev0.h
@@ -18,6 +18,8 @@
 
 #include "quantum.h"
 
+#include "navpad_prefs.h"
+
 /* This is a shortcut to help you visually see your layout.
  *
  * The first section contains all of the arguments representing the physical
diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h
index d2e7829323..d4a4e48d77 100644
--- a/keyboards/yushakobo/navpad/10/rev1/config.h
+++ b/keyboards/yushakobo/navpad/10/rev1/config.h
@@ -17,20 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, F4 }
-#define MATRIX_COL_PINS { F5, F6, B2, B3, B1, F7 }
-
-#ifdef RGB_DI_PIN
 #    define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7 }
-#endif
diff --git a/keyboards/yushakobo/navpad/10/rev1/info.json b/keyboards/yushakobo/navpad/10/rev1/info.json
index 90ac25f360..5bf5ce1135 100644
--- a/keyboards/yushakobo/navpad/10/rev1/info.json
+++ b/keyboards/yushakobo/navpad/10/rev1/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "B2", "B3", "B1", "F7"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
+    },
+    "diode_direction": "COL2ROW"
 }
diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.c b/keyboards/yushakobo/navpad/10/rev1/rev1.c
deleted file mode 100644
index bf47612035..0000000000
--- a/keyboards/yushakobo/navpad/10/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.h b/keyboards/yushakobo/navpad/10/rev1/rev1.h
index 50fd54a026..b56b6f67cf 100644
--- a/keyboards/yushakobo/navpad/10/rev1/rev1.h
+++ b/keyboards/yushakobo/navpad/10/rev1/rev1.h
@@ -18,6 +18,8 @@
 
 #include "quantum.h"
 
+#include "navpad_prefs.h"
+
 /* This is a shortcut to help you visually see your layout.
  *
  * The first section contains all of the arguments representing the physical
diff --git a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c b/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c
deleted file mode 100644
index 8be5220d56..0000000000
--- a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "10_helix_r.h"
diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h
index 5b0e667cc9..00a59e57cb 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/config.h
@@ -17,38 +17,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS       { D4, C6, D7, E6, B4, F4 }
-#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS       { F5, F6, B2, B3, B1, F7, NO_PIN }
-#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2 }
-
 #define EE_HANDS
 
-#ifdef RGB_DI_PIN
-#    define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \//navpad side
-                                   9, 10, 11, 12, 13, 14, \//helix side
+#    define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \
+                                   9, 10, 11, 12, 13, 14, \
                                   20, 19, 18, 17, 16, 15, \
                                   21, 22, 23, 24, 25, 26, \
                               33, 32, 31, 30, 29, 28, 27, \
                               34, 35, 36, 37, 38, 39, 40 }
-#endif
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 9+32
 #    define RGBLED_SPLIT { 9, 32 }
 #    define RGBLIGHT_HUE_STEP 8
@@ -65,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #    define RGBLIGHT_EFFECT_RGB_TEST
 //#    define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* disable action features */
 //#define NO_ACTION_LAYER
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json
index 19b8c31efb..bb2a7669e0 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/info.json
+++ b/keyboards/yushakobo/navpad/10_helix_r/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0008",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B6"}
@@ -21,8 +26,17 @@
                     {"pin_a": "B6", "pin_b": "B5"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+                "rows": ["D4", "C6", "D7", "E6", "B4"]
+            }
         }
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
index b4d2122ab4..10ba897cce 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
@@ -17,9 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGB_DI_PIN
-
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_MAX_LAYERS 6
-
-#endif
diff --git a/keyboards/yushakobo/navpad/navpad_prefs.c b/keyboards/yushakobo/navpad/navpad_prefs.c
index fd2a7b0789..1ffd441674 100644
--- a/keyboards/yushakobo/navpad/navpad_prefs.c
+++ b/keyboards/yushakobo/navpad/navpad_prefs.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "navpad_prefs.h"
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     if (!process_record_user(keycode, record)) { return false; }
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h
index 3df5c25081..f5e39f3b00 100644
--- a/keyboards/yushakobo/quick17/config.h
+++ b/keyboards/yushakobo/quick17/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, B3, B6 }
-#define MATRIX_COL_PINS { F5, D4, E6, F7, C6, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
 #define RGBLED_NUM 18
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json
index 7d062aef16..15ced83d39 100644
--- a/keyboards/yushakobo/quick17/info.json
+++ b/keyboards/yushakobo/quick17/info.json
@@ -8,19 +8,47 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D4", "E6", "F7", "C6", "D7"],
+        "rows": ["F4", "B3", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"}
         ]
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},
-                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, 
-                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2}
             ]
         }
     }
diff --git a/keyboards/yushakobo/quick17/quick17.c b/keyboards/yushakobo/quick17/quick17.c
index ed9fe97097..d6fe84199b 100644
--- a/keyboards/yushakobo/quick17/quick17.c
+++ b/keyboards/yushakobo/quick17/quick17.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quick17.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
diff --git a/keyboards/yushakobo/quick17/quick17.h b/keyboards/yushakobo/quick17/quick17.h
deleted file mode 100644
index 566df71069..0000000000
--- a/keyboards/yushakobo/quick17/quick17.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, \
-    k10, k11, k12, k13, k14, k15, \
-    k20, k21, k22, k23, k24, k25 \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 } \
-}
diff --git a/keyboards/yushakobo/quick17/quick17_prefs.c b/keyboards/yushakobo/quick17/quick17_prefs.c
index 1a546f4e35..bf58f67411 100644
--- a/keyboards/yushakobo/quick17/quick17_prefs.c
+++ b/keyboards/yushakobo/quick17/quick17_prefs.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quick17_prefs.h"
 
 bool _INPUT_JP;
 
diff --git a/keyboards/yushakobo/quick17/quick17_prefs.h b/keyboards/yushakobo/quick17/quick17_prefs.h
index 4d81d163b9..25f2e1e0ae 100644
--- a/keyboards/yushakobo/quick17/quick17_prefs.h
+++ b/keyboards/yushakobo/quick17/quick17_prefs.h
@@ -14,6 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
+#include "quantum.h"
+
 enum layer_names {
     _CONTROL,
     _EDIT1,
diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk
index a73ebf1d09..70ab5e2744 100644
--- a/keyboards/yushakobo/quick17/rules.mk
+++ b/keyboards/yushakobo/quick17/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_CUSTOM_KB = yes
 
 SRC += quick17_prefs.c
diff --git a/keyboards/yushakobo/quick7/config.h b/keyboards/yushakobo/quick7/config.h
index 96656f70c8..b224f4303f 100644
--- a/keyboards/yushakobo/quick7/config.h
+++ b/keyboards/yushakobo/quick7/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-#    define RGB_DI_PIN D3
 #    define RGBLED_NUM 13
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/yushakobo/quick7/info.json b/keyboards/yushakobo/quick7/info.json
index 4413c06def..97885f55ed 100644
--- a/keyboards/yushakobo/quick7/info.json
+++ b/keyboards/yushakobo/quick7/info.json
@@ -14,6 +14,9 @@
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {
diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h
index 4ca22e9b5d..e94b19675f 100644
--- a/keyboards/yynmt/dozen0/config.h
+++ b/keyboards/yynmt/dozen0/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { F4 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, B5, B4, E6, D7, C6, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -50,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/yynmt/dozen0/dozen0.c b/keyboards/yynmt/dozen0/dozen0.c
deleted file mode 100644
index 42872a2105..0000000000
--- a/keyboards/yynmt/dozen0/dozen0.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 yynmt
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "dozen0.h"
diff --git a/keyboards/yynmt/dozen0/dozen0.h b/keyboards/yynmt/dozen0/dozen0.h
deleted file mode 100644
index e2ab35bcef..0000000000
--- a/keyboards/yynmt/dozen0/dozen0.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 yynmt
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, \
-    K06, K07, K08, K09, K10, K11  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11 }, \
-}
diff --git a/keyboards/yynmt/dozen0/info.json b/keyboards/yynmt/dozen0/info.json
index b32291b052..9a2417f039 100644
--- a/keyboards/yynmt/dozen0/info.json
+++ b/keyboards/yynmt/dozen0/info.json
@@ -8,13 +8,32 @@
     "pid": "0xEA4F",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "matrix_pins": {
+    "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "B5", "B4", "E6", "D7", "C6", "D4"],
+    "rows": ["F4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},
-        {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 6], "x": 0, "y": 1},
+        {"matrix": [0, 7], "x": 1, "y": 1},
+        {"matrix": [0, 8], "x": 2, "y": 1},
+        {"matrix": [0, 9], "x": 3, "y": 1},
+        {"matrix": [0, 10], "x": 4, "y": 1},
+        {"matrix": [0, 11], "x": 5, "y": 1}
       ]
     }
   }
diff --git a/keyboards/yynmt/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h
index 4d2fab5ace..f50a2c72c3 100644
--- a/keyboards/yynmt/kagamidget/config.h
+++ b/keyboards/yynmt/kagamidget/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D1, D0, F4, F5 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-
-#define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yynmt/kagamidget/info.json b/keyboards/yynmt/kagamidget/info.json
index 7ffbddfd25..368be6834b 100644
--- a/keyboards/yynmt/kagamidget/info.json
+++ b/keyboards/yynmt/kagamidget/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "matrix_pins": {
+    "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
+    "rows": ["D1", "D0", "F4", "F5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/yynmt/kagamidget/kagamidget.c b/keyboards/yynmt/kagamidget/kagamidget.c
deleted file mode 100644
index e682357018..0000000000
--- a/keyboards/yynmt/kagamidget/kagamidget.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 yynmt
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "kagamidget.h"
diff --git a/keyboards/z12/z12.c b/keyboards/z12/z12.c
deleted file mode 100644
index 3edc9128e4..0000000000
--- a/keyboards/z12/z12.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Sergi Meseguer <zigotica@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    return encoder_update_user(index, clockwise);
-}
-#endif
diff --git a/keyboards/z34/keymaps/zigotica/config.h b/keyboards/z34/keymaps/zigotica/config.h
index 545722ebde..9fe28b9675 100644
--- a/keyboards/z34/keymaps/zigotica/config.h
+++ b/keyboards/z34/keymaps/zigotica/config.h
@@ -22,6 +22,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // these should work better for homerow modifiers
 #define TAPPING_TERM 350
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define QUICK_TAP_TERM 0
 
diff --git a/keyboards/zfrontier/big_switch/big_switch.c b/keyboards/zfrontier/big_switch/big_switch.c
deleted file mode 100644
index 53c3e34e7f..0000000000
--- a/keyboards/zfrontier/big_switch/big_switch.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 zFrontier
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "big_switch.h"
diff --git a/keyboards/zfrontier/big_switch/big_switch.h b/keyboards/zfrontier/big_switch/big_switch.h
deleted file mode 100644
index d12184932d..0000000000
--- a/keyboards/zfrontier/big_switch/big_switch.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 zFrontier
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-	K00 \
-) \
-{ \
-	{ K00 }  \
-}
diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h
index 27ef3bfb87..eecce57fe6 100644
--- a/keyboards/zfrontier/big_switch/config.h
+++ b/keyboards/zfrontier/big_switch/config.h
@@ -17,16 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { F0 }
-#define MATRIX_COL_PINS { F1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB light config */
-#define RGB_DI_PIN B6
 #define RGBLED_NUM 4
 #define RGBLIGHT_VAL_STEP 17
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json
index aaf72f61b3..02c40f6125 100644
--- a/keyboards/zfrontier/big_switch/info.json
+++ b/keyboards/zfrontier/big_switch/info.json
@@ -8,12 +8,20 @@
         "pid": "0x0A01",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F1"],
+        "rows": ["F0"]
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 4, "h": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}
             ]
         }
     }
diff --git a/keyboards/ziggurat/config.h b/keyboards/ziggurat/config.h
deleted file mode 100644
index e532c012ba..0000000000
--- a/keyboards/ziggurat/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 kb-elmo<mail@elmo.space>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { A2, A1, A0, F7, A3 }
-#define MATRIX_COL_PINS { F6, F5, F4, F3, F2, F1, B5, B6, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ziggurat/info.json b/keyboards/ziggurat/info.json
index 0cd86b049c..c3a4a50326 100644
--- a/keyboards/ziggurat/info.json
+++ b/keyboards/ziggurat/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5258",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "F3", "F2", "F1", "B5", "B6", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"],
+        "rows": ["A2", "A1", "A0", "F7", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ziggurat/ziggurat.c b/keyboards/ziggurat/ziggurat.c
deleted file mode 100644
index 11afa56b76..0000000000
--- a/keyboards/ziggurat/ziggurat.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ziggurat.h"
diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h
index efbdb02f81..eff7fc2d49 100644
--- a/keyboards/zj68/config.h
+++ b/keyboards/zj68/config.h
@@ -17,22 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -47,4 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/zj68/info.json b/keyboards/zj68/info.json
index 0c902f2468..6d0df4a0c5 100644
--- a/keyboards/zj68/info.json
+++ b/keyboards/zj68/info.json
@@ -7,243 +7,251 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "~", "x": 0, "y": 0 },
-                { "label": "!", "x": 1, "y": 0 },
-                { "label": "@", "x": 2, "y": 0 },
-                { "label": "#", "x": 3, "y": 0 },
-                { "label": "$", "x": 4, "y": 0 },
-                { "label": "%", "x": 5, "y": 0 },
-                { "label": "^", "x": 6, "y": 0 },
-                { "label": "&", "x": 7, "y": 0 },
-                { "label": "*", "x": 8, "y": 0 },
-                { "label": "(", "x": 9, "y": 0 },
-                { "label": ")", "x": 10, "y": 0 },
-                { "label": "_", "x": 11, "y": 0 },
-                { "label": "+", "x": 12, "y": 0 },
-                { "x": 13, "y": 0 },
-                { "x": 14, "y": 0 },
-                { "x": 15, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
 
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "x": 15, "y": 1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "x": 15, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14, "y": 3 },
-                { "x": 15, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4 },
-                { "label": "Win", "x": 11, "y": 4 },
-                { "x": 12, "y": 4 },
-                { "x": 13, "y": 4 },
-                { "x": 14, "y": 4 },
-                { "x": 15, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-                { "label": "~", "x": 0, "y": 0 },
-                { "label": "!", "x": 1, "y": 0 },
-                { "label": "@", "x": 2, "y": 0 },
-                { "label": "#", "x": 3, "y": 0 },
-                { "label": "$", "x": 4, "y": 0 },
-                { "label": "%", "x": 5, "y": 0 },
-                { "label": "^", "x": 6, "y": 0 },
-                { "label": "&", "x": 7, "y": 0 },
-                { "label": "*", "x": 8, "y": 0 },
-                { "label": "(", "x": 9, "y": 0 },
-                { "label": ")", "x": 10, "y": 0 },
-                { "label": "_", "x": 11, "y": 0 },
-                { "label": "+", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-                { "label": "Delete", "x": 15, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
 
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{ ", "x": 11.5, "y": 1 },
-                { "label": " }", "x": 12.5, "y": 1 },
-                { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 15, "y": 1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ": ", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "PgDn", "x": 15, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 14, "y": 3 },
-                { "label": "Fn", "x": 15, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "GUI", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4 },
-                { "label": "Menu", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Left", "x": 13, "y": 4 },
-                { "label": "Down", "x": 14, "y": 4 },
-                { "label": "Right", "x": 15, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "!", "x": 1, "y": 0 },
-                { "label": "@", "x": 2, "y": 0 },
-                { "label": "#", "x": 3, "y": 0 },
-                { "label": "$", "x": 4, "y": 0 },
-                { "label": "%", "x": 5, "y": 0 },
-                { "label": "^", "x": 6, "y": 0 },
-                { "label": "&", "x": 7, "y": 0 },
-                { "label": "*", "x": 8, "y": 0 },
-                { "label": "(", "x": 9, "y": 0 },
-                { "label": ")", "x": 10, "y": 0 },
-                { "label": "_", "x": 11, "y": 0 },
-                { "label": "+", "x": 12, "y": 0 },
-                { "label": "|", "x": 13, "y": 0 },
-                { "label": "~", "x": 14, "y": 0 },
-                { "label": "Delete", "x": 15, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
 
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-                { "label": "Y", "x": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{ ", "x": 11.5, "y": 1 },
-                { "label": " }", "x": 12.5, "y": 1 },
-                { "label": "Backspace", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 15, "y": 1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-                { "label": "H", "x": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ": ", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "PgDn", "x": 15, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-                { "label": "N", "x": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 14, "y": 3 },
-                { "label": "Fn", "x": 15, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "GUI", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4 },
-                { "label": "Menu", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Left", "x": 13, "y": 4 },
-                { "label": "Down", "x": 14, "y": 4 },
-                { "label": "Right", "x": 15, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/zj68/zj68.c b/keyboards/zj68/zj68.c
deleted file mode 100644
index 8de12a6452..0000000000
--- a/keyboards/zj68/zj68.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Collin Diekvoss <cdiekvoss@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "zj68.h"
diff --git a/keyboards/zj68/zj68.h b/keyboards/zj68/zj68.h
deleted file mode 100644
index 5eaae26ad3..0000000000
--- a/keyboards/zj68/zj68.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2019 Collin Diekvoss <cdiekvoss@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K4E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2E, \
-    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                   K46,       K48, K49, K4A, K4B, K4C, K4D  \
-) { \
-    { K00,  K01,   K02,   K03,   K04,   K05,   K06,  K07,   K08,   K09,   K0A,   K0B,   K0C,  KC_NO, K0E }, \
-    { K10,  K11,   K12,   K13,   K14,   K15,   K16,  K17,   K18,   K19,   K1A,   K1B,   K1C,  K1D,   K1E }, \
-    { K20,  K21,   K22,   K23,   K24,   K25,   K26,  K27,   K28,   K29,   K2A,   K2B,   K2C,  KC_NO, K2E }, \
-    { K30,  KC_NO, K32,   K33,   K34,   K35,   K36,  K37,   K38,   K39,   K3A,   K3B,   K3C,  K3D,   K3E }, \
-    { K40,  K41,   K42,   KC_NO, KC_NO, KC_NO, K46,  KC_NO, K48,   K49,   K4A,   K4B,   K4C,  K4D,   K4E }  \
-}
-
-#define LAYOUT_65_ansi_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2E, \
-    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                   K46,       K48, K49, K4A, K4B, K4C, K4D  \
-) { \
-    { K00,  K01,   K02,   K03,   K04,   K05,   K06,  K07,   K08,   K09,   K0A,   K0B,   K0C,  K0D,   K0E }, \
-    { K10,  K11,   K12,   K13,   K14,   K15,   K16,  K17,   K18,   K19,   K1A,   K1B,   K1C,  K1D,   K1E }, \
-    { K20,  K21,   K22,   K23,   K24,   K25,   K26,  K27,   K28,   K29,   K2A,   K2B,   K2C,  KC_NO, K2E }, \
-    { K30,  KC_NO, K32,   K33,   K34,   K35,   K36,  K37,   K38,   K39,   K3A,   K3B,   K3C,  K3D,   K3E }, \
-    { K40,  K41,   K42,   KC_NO, KC_NO, KC_NO, K46,  KC_NO, K48,   K49,   K4A,   K4B,   K4C,  K4D,   K4E }  \
-}
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                   K46,       K48, K49, K4A, K4B, K4C, K4D  \
-) { \
-    { K00,  K01,   K02,   K03,   K04,   K05,   K06,  K07,   K08,   K09,   K0A,   K0B,   K0C,  K0D,   K0E }, \
-    { K10,  K11,   K12,   K13,   K14,   K15,   K16,  K17,   K18,   K19,   K1A,   K1B,   K1C,  K1D,   K1E }, \
-    { K20,  K21,   K22,   K23,   K24,   K25,   K26,  K27,   K28,   K29,   K2A,   K2B,   K2C,  KC_NO, K2E }, \
-    { K30,  K31,   K32,   K33,   K34,   K35,   K36,  K37,   K38,   K39,   K3A,   K3B,   K3C,  K3D,   K3E }, \
-    { K40,  K41,   K42,   KC_NO, KC_NO, KC_NO, K46,  KC_NO, K48,   K49,   K4A,   K4B,   K4C,  K4D,   K4E }  \
-}
diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h
index 231ad6d92e..8471167fcd 100755
--- a/keyboards/zlant/config.h
+++ b/keyboards/zlant/config.h
@@ -1,21 +1,11 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, D4, D5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B7, D1, D2, D3, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D6
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/zlant/info.json b/keyboards/zlant/info.json
index e69956a96d..9f01b09518 100644
--- a/keyboards/zlant/info.json
+++ b/keyboards/zlant/info.json
@@ -8,15 +8,129 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B7", "D1", "D2", "D3", "B3", "B2"],
+        "rows": ["B0", "B1", "D4", "D5"]
+    },
+    "ws2812": {
+        "pin": "D6"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x12", "planck_mit"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
     "layouts": {
         "LAYOUT_ortho_4x12": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2, "y":0}, {"label":"K003", "x":3, "y":0}, {"label":"K004", "x":4, "y":0}, {"label":"K005", "x":5, "y":0}, {"label":"K006", "x":6, "y":0}, {"label":"K007", "x":7, "y":0}, {"label":"K008", "x":8, "y":0}, {"label":"K009", "x":9, "y":0}, {"label":"K010", "x":10, "y":0}, {"label":"K011", "x":11, "y":0}, {"label":"K100", "x":0.25, "y":1}, {"label":"K101", "x":1.25, "y":1}, {"label":"K102", "x":2.25, "y":1}, {"label":"K103", "x":3.25, "y":1}, {"label":"K104", "x":4.25, "y":1}, {"label":"K105", "x":5.25, "y":1}, {"label":"K106", "x":6.25, "y":1}, {"label":"K107", "x":7.25, "y":1}, {"label":"K108", "x":8.25, "y":1}, {"label":"K109", "x":9.25, "y":1}, {"label":"K110", "x":10.25, "y":1}, {"label":"K111", "x":11.25, "y":1}, {"label":"K200", "x":0.5, "y":2}, {"label":"K201", "x":1.5, "y":2}, {"label":"K202", "x":2.5, "y":2}, {"label":"K203", "x":3.5, "y":2}, {"label":"K204", "x":4.5, "y":2}, {"label":"K205", "x":5.5, "y":2}, {"label":"K206", "x":6.5, "y":2}, {"label":"K207", "x":7.5, "y":2}, {"label":"K208", "x":8.5, "y":2}, {"label":"K209", "x":9.5, "y":2}, {"label":"K210", "x":10.5, "y":2}, {"label":"K211", "x":11.5, "y":2}, {"label":"K300", "x":0.75, "y":3}, {"label":"K301", "x":1.75, "y":3}, {"label":"K302", "x":2.75, "y":3}, {"label":"K303", "x":3.75, "y":3}, {"label":"K304", "x":4.75, "y":3}, {"label":"K305", "x":5.75, "y":3}, {"label":"K306", "x":6.75, "y":3}, {"label":"K307", "x":7.75, "y":3}, {"label":"K308", "x":8.75, "y":3}, {"label":"K309", "x":9.75, "y":3}, {"label":"K310", "x":10.75, "y":3}, {"label":"K311", "x":11.75, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
+            ]
         },
         "LAYOUT_planck_mit": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2, "y":0}, {"label":"K003", "x":3, "y":0}, {"label":"K004", "x":4, "y":0}, {"label":"K005", "x":5, "y":0}, {"label":"K006", "x":6, "y":0}, {"label":"K007", "x":7, "y":0}, {"label":"K008", "x":8, "y":0}, {"label":"K009", "x":9, "y":0}, {"label":"K010", "x":10, "y":0}, {"label":"K011", "x":11, "y":0}, {"label":"K100", "x":0.25, "y":1}, {"label":"K101", "x":1.25, "y":1}, {"label":"K102", "x":2.25, "y":1}, {"label":"K103", "x":3.25, "y":1}, {"label":"K104", "x":4.25, "y":1}, {"label":"K105", "x":5.25, "y":1}, {"label":"K106", "x":6.25, "y":1}, {"label":"K107", "x":7.25, "y":1}, {"label":"K108", "x":8.25, "y":1}, {"label":"K109", "x":9.25, "y":1}, {"label":"K110", "x":10.25, "y":1}, {"label":"K111", "x":11.25, "y":1}, {"label":"K200", "x":0.5, "y":2}, {"label":"K201", "x":1.5, "y":2}, {"label":"K202", "x":2.5, "y":2}, {"label":"K203", "x":3.5, "y":2}, {"label":"K204", "x":4.5, "y":2}, {"label":"K205", "x":5.5, "y":2}, {"label":"K206", "x":6.5, "y":2}, {"label":"K207", "x":7.5, "y":2}, {"label":"K208", "x":8.5, "y":2}, {"label":"K209", "x":9.5, "y":2}, {"label":"K210", "x":10.5, "y":2}, {"label":"K211", "x":11.5, "y":2}, {"label":"K300", "x":0.75, "y":3}, {"label":"K301", "x":1.75, "y":3}, {"label":"K302", "x":2.75, "y":3}, {"label":"K303", "x":3.75, "y":3}, {"label":"K304", "x":4.75, "y":3, "w":1.25}, {"label":"K305", "x":6, "y":3, "w":1.5}, {"label":"K307", "x":7.5, "y":3, "w":1.25}, {"label":"K308", "x":8.75, "y":3}, {"label":"K309", "x":9.75, "y":3}, {"label":"K310", "x":10.75, "y":3}, {"label":"K311", "x":11.75, "y":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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 6, "y": 3, "w": 1.5},
+                {"matrix": [3, 7], "x": 7.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/zlant/zlant.c b/keyboards/zlant/zlant.c
deleted file mode 100755
index b60e9425c7..0000000000
--- a/keyboards/zlant/zlant.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zlant.h"
diff --git a/keyboards/zlant/zlant.h b/keyboards/zlant/zlant.h
deleted file mode 100755
index 86cd9fef85..0000000000
--- a/keyboards/zlant/zlant.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B } \
-}
-
-#define LAYOUT_planck_mit( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3A, k3B } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h
index 739358f693..310b4f5756 100644
--- a/keyboards/zoo/wampus/config.h
+++ b/keyboards/zoo/wampus/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C13, C14, A5, A4, A3 }
-#define MATRIX_COL_PINS { A10, A9, A8, B12, A15, A13, A7, A2, A1, A0, F1, F0, B3, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE      1
@@ -49,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
 #define RGBLED_NUM 20
 // SPI RGB Driver
 #define WS2812_SPI SPID2
diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json
index 74bf17b603..e762ab1d48 100644
--- a/keyboards/zoo/wampus/info.json
+++ b/keyboards/zoo/wampus/info.json
@@ -8,10 +8,19 @@
         "pid": "0xE600",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B12", "A15", "A13", "A7", "A2", "A1", "A0", "F1", "F0", "B3", "B4", "B5"],
+        "rows": ["C13", "C14", "A5", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight":  {
         "pin": "A6",
         "breathing": true
     },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
     "indicators": {
         "caps_lock": "B8",
         "num_lock": "B0",
@@ -23,149 +32,162 @@
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Del", "x":17, "y":0.25},
-                {"label":"Backspace", "x":18, "y":0.25},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [1, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 7.75, "y": 0.25},
+
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14, "y": 0.25},
+                {"matrix": [0, 11], "x": 15, "y": 0},
+                {"matrix": [0, 12], "x": 16, "y": 0.25},
+                {"matrix": [0, 13], "x": 17, "y": 0.25},
+                {"matrix": [0, 14], "x": 18, "y": 0.25},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.75, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "y": 3.25},
+
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25},
+                {"matrix": [3, 13], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 10], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 14], "x": 18, "y": 4.25, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Backspace", "x":17, "y":0.25, "w":2},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [1, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 7.75, "y": 0.25},
+
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14, "y": 0.25},
+                {"matrix": [0, 11], "x": 15, "y": 0},
+                {"matrix": [0, 12], "x": 16, "y": 0.25},
+                {"matrix": [0, 13], "x": 17, "y": 0.25, "w": 2},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.75, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "y": 3.25},
+
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25},
+                {"matrix": [3, 13], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 10], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 14], "x": 18, "y": 4.25, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/zoo/wampus/rules.mk b/keyboards/zoo/wampus/rules.mk
index 81a2dca23f..34d5f258fc 100644
--- a/keyboards/zoo/wampus/rules.mk
+++ b/keyboards/zoo/wampus/rules.mk
@@ -9,7 +9,6 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-WS2812_DRIVER = spi         # RGB underglow driver configuration
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = no     # Enables the use of OLED displays
 
diff --git a/keyboards/zoo/wampus/wampus.c b/keyboards/zoo/wampus/wampus.c
index aa41c27108..4d4b4fa1fa 100644
--- a/keyboards/zoo/wampus/wampus.c
+++ b/keyboards/zoo/wampus/wampus.c
@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "wampus.h"
+#include "quantum.h"
+
 #ifdef OLED_ENABLE
 
 void board_init(void) {
diff --git a/keyboards/zoo/wampus/wampus.h b/keyboards/zoo/wampus/wampus.h
deleted file mode 100644
index f74b58b516..0000000000
--- a/keyboards/zoo/wampus/wampus.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2020 Matthew Tso (zoo)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_alice_split_bs( \
-    K100,  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-    K200,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K300,  K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K213, \
-           K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-           K401,       K403,       K405, K406, K408,             K410,                   K414  \
-) { \
-  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, }, \
-  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \
-  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, }, \
-  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \
-  { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \
-}
-
-#define LAYOUT_alice( \
-    K100,  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
-    K200,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K300,  K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
-           K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-           K401,       K403,       K405, K406, K408,             K410,                   K414  \
-) { \
-  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, }, \
-  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \
-  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, }, \
-  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \
-  { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \
-}
diff --git a/keyboards/ztboards/after/after.c b/keyboards/ztboards/after/after.c
deleted file mode 100644
index 85278d342a..0000000000
--- a/keyboards/ztboards/after/after.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2019 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "after.h"
-
diff --git a/keyboards/ztboards/after/config.h b/keyboards/ztboards/after/config.h
index 7c0453e3ae..59d91c329d 100644
--- a/keyboards/ztboards/after/config.h
+++ b/keyboards/ztboards/after/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, F6, F5, D5, B2 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D7, D6, D4, C7, C6, B6, B5, B4, F7, F0, F4, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/ztboards/after/info.json b/keyboards/ztboards/after/info.json
index 875478ec10..47ad95f96d 100644
--- a/keyboards/ztboards/after/info.json
+++ b/keyboards/ztboards/after/info.json
@@ -1,13 +1,18 @@
 {
-    "keyboard_name": "After", 
+    "keyboard_name": "After",
     "manufacturer": "ZTBoards",
     "url": "ztb.mx", 
-    "maintainer": "phlopsuh", 
+    "maintainer": "phlopsuh",
     "usb": {
         "vid": "0x0927",
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D7", "D6", "D4", "C7", "C6", "B6", "B5", "B4", "F7", "F0", "F4", "F1"],
+        "rows": ["B3", "F6", "F5", "D5", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B0"}
@@ -17,7 +22,85 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-			"layout": [{"label":"Esc", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"|", "x":13, "y":1}, {"label":"`", "x":14, "y":1}, {"label":"Rotary", "x":15.5, "y":0.5}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Del", "x":15.5, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Pg Up", "x":15.5, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Up", "x":14.25, "y":4.25}, {"label":"Pg Dn", "x":15.5, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.5}, {"label":"Alt", "x":2.25, "y":5, "w":1.5}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"Left", "x":13.25, "y":5.25}, {"label":"Down", "x":14.25, "y":5.25}, {"label":"Right", "x":15.25, "y":5.25}]
-		} 
-	}
+            "layout": [
+                {"x":0, "y":0.5},
+                {"x":1, "y":0.5},
+                {"x":2, "y":0.5},
+                {"x":3, "y":0.5},
+                {"x":4, "y":0.5},
+                {"x":5, "y":0.5},
+                {"x":6, "y":0.5},
+                {"x":7, "y":0.5},
+                {"x":8, "y":0.5},
+                {"x":9, "y":0.5},
+                {"x":10, "y":0.5},
+                {"x":11, "y":0.5},
+                {"x":12, "y":0.5},
+                {"x":13, "y":0.5},
+                {"x":14, "y":0.5},
+
+                {"x":15.5, "y":0},
+
+                {"x":0, "y":1.5, "w":1.5},
+                {"x":1.5, "y":1.5},
+                {"x":2.5, "y":1.5},
+                {"x":3.5, "y":1.5},
+                {"x":4.5, "y":1.5},
+                {"x":5.5, "y":1.5},
+                {"x":6.5, "y":1.5},
+                {"x":7.5, "y":1.5},
+                {"x":8.5, "y":1.5},
+                {"x":9.5, "y":1.5},
+                {"x":10.5, "y":1.5},
+                {"x":11.5, "y":1.5},
+                {"x":12.5, "y":1.5},
+                {"x":13.5, "y":1.5, "w":1.5},
+
+                {"x":15.5, "y":1.5},
+
+                {"x":0, "y":2.5, "w":1.75},
+                {"x":1.75, "y":2.5},
+                {"x":2.75, "y":2.5},
+                {"x":3.75, "y":2.5},
+                {"x":4.75, "y":2.5},
+                {"x":5.75, "y":2.5},
+                {"x":6.75, "y":2.5},
+                {"x":7.75, "y":2.5},
+                {"x":8.75, "y":2.5},
+                {"x":9.75, "y":2.5},
+                {"x":10.75, "y":2.5},
+                {"x":11.75, "y":2.5},
+                {"x":12.75, "y":2.5, "w":2.25},
+
+                {"x":15.5, "y":2.5},
+
+                {"x":0, "y":3.5, "w":2.25},
+                {"x":2.25, "y":3.5},
+                {"x":3.25, "y":3.5},
+                {"x":4.25, "y":3.5},
+                {"x":5.25, "y":3.5},
+                {"x":6.25, "y":3.5},
+                {"x":7.25, "y":3.5},
+                {"x":8.25, "y":3.5},
+                {"x":9.25, "y":3.5},
+                {"x":10.25, "y":3.5},
+                {"x":11.25, "y":3.5},
+                {"x":12.25, "y":3.5, "w":1.75},
+
+                {"x":14.25, "y":3.75},
+
+                {"x":15.5, "y":3.5},
+
+                {"x":0, "y":4.5, "w":1.5},
+                {"x":2.25, "y":4.5, "w":1.5},
+                {"x":3.75, "y":4.5, "w":6.25},
+                {"x":10, "y":4.5, "w":1.5},
+                {"x":11.5, "y":4.5, "w":1.5},
+
+                {"x":13.25, "y":4.75},
+                {"x":14.25, "y":4.75},
+                {"x":15.25, "y":4.75}
+            ]
+        }
+    }
 }
diff --git a/keyboards/ztboards/noon/config.h b/keyboards/ztboards/noon/config.h
index 58b8096ef8..59d91c329d 100644
--- a/keyboards/ztboards/noon/config.h
+++ b/keyboards/ztboards/noon/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, D5, D3, B1, F0 }
-#define MATRIX_COL_PINS { D2, D1, D0, D4, D6, B2, D7, B4, B6, C6, C7, F7, F6, F5, F4, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/ztboards/noon/info.json b/keyboards/ztboards/noon/info.json
index c7140de8de..9ebaedef16 100644
--- a/keyboards/ztboards/noon/info.json
+++ b/keyboards/ztboards/noon/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0", "D4", "D6", "B2", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
+        "rows": ["B5", "D5", "D3", "B1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ztboards/noon/noon.c b/keyboards/ztboards/noon/noon.c
deleted file mode 100644
index 8a60850d07..0000000000
--- a/keyboards/ztboards/noon/noon.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "noon.h"
-
-
diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h
index 2f8984f51a..3cb23cdcc5 100644
--- a/keyboards/zvecr/split_blackpill/config.h
+++ b/keyboards/zvecr/split_blackpill/config.h
@@ -15,31 +15,11 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6 }
-#define MATRIX_ROW_PINS { B15, B14, B13, B12 }
-#define MATRIX_COL_PINS_RIGHT { B12, B13, B14, B15, A8, A9 }
-#define MATRIX_ROW_PINS_RIGHT { B0, B1, B10, B11 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define MATRIX_IO_DELAY 5
 
 #define SPLIT_HAND_PIN B3
 #define SELECT_SOFT_SERIAL_SPEED 0
 
-#define RGB_DI_PIN B4
 #define RGBLED_NUM 24
 #define RGBLED_SPLIT { 12, 12 }
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json
index d8245be308..f657556db9 100644
--- a/keyboards/zvecr/split_blackpill/info.json
+++ b/keyboards/zvecr/split_blackpill/info.json
@@ -8,18 +8,85 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B1", "B0", "A7", "A6"],
+        "rows": ["B15", "B14", "B13", "B12"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "B6",
         "bootmagic": {
             "matrix": [4, 0]
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B12", "B13", "B14", "B15", "A8", "A9"],
+                "rows": ["B0", "B1", "B10", "B11"]
+            }
         }
     },
+    "ws2812": {
+        "pin": "B4",
+        "driver": "pwm"
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "community_layouts": ["ortho_4x12"],
     "layouts": {
         "LAYOUT_ortho_4x12": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [4, 5], "x": 6, "y": 0},
+                {"matrix": [4, 4], "x": 7, "y": 0},
+                {"matrix": [4, 3], "x": 8, "y": 0},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 1], "x": 10, "y": 0},
+                {"matrix": [4, 0], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 5], "x": 6, "y": 1},
+                {"matrix": [5, 4], "x": 7, "y": 1},
+                {"matrix": [5, 3], "x": 8, "y": 1},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 0], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 5], "x": 6, "y": 2},
+                {"matrix": [6, 4], "x": 7, "y": 2},
+                {"matrix": [6, 3], "x": 8, "y": 2},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2},
+                {"matrix": [6, 0], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 5], "x": 6, "y": 3},
+                {"matrix": [7, 4], "x": 7, "y": 3},
+                {"matrix": [7, 3], "x": 8, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3},
+                {"matrix": [7, 1], "x": 10, "y": 3},
+                {"matrix": [7, 0], "x": 11, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/zvecr/split_blackpill/rules.mk b/keyboards/zvecr/split_blackpill/rules.mk
index c953eea031..196b4019ca 100644
--- a/keyboards/zvecr/split_blackpill/rules.mk
+++ b/keyboards/zvecr/split_blackpill/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
 
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
diff --git a/keyboards/zvecr/split_blackpill/split_blackpill.c b/keyboards/zvecr/split_blackpill/split_blackpill.c
index 141f76e7b3..6c7db0580e 100644
--- a/keyboards/zvecr/split_blackpill/split_blackpill.c
+++ b/keyboards/zvecr/split_blackpill/split_blackpill.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "split_blackpill.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void){
     // Workaround for reversible pcb/mcu
diff --git a/keyboards/zvecr/split_blackpill/split_blackpill.h b/keyboards/zvecr/split_blackpill/split_blackpill.h
deleted file mode 100644
index 27504492ef..0000000000
--- a/keyboards/zvecr/split_blackpill/split_blackpill.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 zvecr <git@zvecr.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-	L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-	L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-	L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-	L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-		{ R05, R04, R03, R02, R01, R00 }, \
-		{ R15, R14, R13, R12, R11, R10 }, \
-		{ R25, R24, R23, R22, R21, R20 }, \
-		{ R35, R34, R33, R32, R31, R30 } \
-	}
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index 97b0393aab..9274f5101b 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/config.h
@@ -15,32 +15,12 @@
  */
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_COL_PINS { B15, B10, B0, A5, A4, A3 }
-#define MATRIX_ROW_PINS { A10, A15, B3, B4 }
-#define MATRIX_COL_PINS_RIGHT { B10, B15, A10, A15, B3, B4 }
-#define MATRIX_ROW_PINS_RIGHT { B0, A5, A4, A3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define MATRIX_IO_DELAY 5
 
 #define SPLIT_HAND_PIN B9
 //#define SELECT_SOFT_SERIAL_SPEED 0
 #define SERIAL_USART_SPEED 921600
 
-#define RGB_DI_PIN B1
 #define RGBLED_NUM 48
 #define RGBLED_SPLIT {24, 24}
 #define RGBLIGHT_LIMIT_VAL 120
diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json
index f3519b94f4..df18f9f0ed 100644
--- a/keyboards/zvecr/zv48/info.json
+++ b/keyboards/zvecr/zv48/info.json
@@ -8,21 +8,88 @@
         "pid": "0x0048",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B15", "B10", "B0", "A5", "A4", "A3"],
+        "rows": ["A10", "A15", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "A2"}
         ]
     },
+    "ws2812": {
+        "pin": "B1",
+        "driver": "pwm"
+    },
     "split": {
         "soft_serial_pin": "B6",
         "bootmagic": {
             "matrix": [4, 0]
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B10", "B15", "A10", "A15", "B3", "B4"],
+                "rows": ["B0", "A5", "A4", "A3"]
+            }
         }
     },
     "community_layouts": ["ortho_4x12"],
     "layouts": {
         "LAYOUT_ortho_4x12": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":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": [4, 5], "x": 6, "y": 0},
+                {"matrix": [4, 4], "x": 7, "y": 0},
+                {"matrix": [4, 3], "x": 8, "y": 0},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 1], "x": 10, "y": 0},
+                {"matrix": [4, 0], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 5], "x": 6, "y": 1},
+                {"matrix": [5, 4], "x": 7, "y": 1},
+                {"matrix": [5, 3], "x": 8, "y": 1},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 0], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 5], "x": 6, "y": 2},
+                {"matrix": [6, 4], "x": 7, "y": 2},
+                {"matrix": [6, 3], "x": 8, "y": 2},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2},
+                {"matrix": [6, 0], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 5], "x": 6, "y": 3},
+                {"matrix": [7, 4], "x": 7, "y": 3},
+                {"matrix": [7, 3], "x": 8, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3},
+                {"matrix": [7, 1], "x": 10, "y": 3},
+                {"matrix": [7, 0], "x": 11, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/zvecr/zv48/rules.mk b/keyboards/zvecr/zv48/rules.mk
index 0db8344a63..7b615f95fa 100644
--- a/keyboards/zvecr/zv48/rules.mk
+++ b/keyboards/zvecr/zv48/rules.mk
@@ -15,6 +15,5 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
 
 DEFAULT_FOLDER = zvecr/zv48/f401
diff --git a/keyboards/zvecr/zv48/zv48.c b/keyboards/zvecr/zv48/zv48.c
index 3c3d1ab777..2716b78080 100644
--- a/keyboards/zvecr/zv48/zv48.c
+++ b/keyboards/zvecr/zv48/zv48.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "zv48.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void){
     // Workaround for reversible pcb/mcu
diff --git a/keyboards/zvecr/zv48/zv48.h b/keyboards/zvecr/zv48/zv48.h
deleted file mode 100644
index 27504492ef..0000000000
--- a/keyboards/zvecr/zv48/zv48.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 zvecr <git@zvecr.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-	L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-	L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-	L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-	L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05 }, \
-		{ L10, L11, L12, L13, L14, L15 }, \
-		{ L20, L21, L22, L23, L24, L25 }, \
-		{ L30, L31, L32, L33, L34, L35 }, \
-		{ R05, R04, R03, R02, R01, R00 }, \
-		{ R15, R14, R13, R12, R11, R10 }, \
-		{ R25, R24, R23, R22, R21, R20 }, \
-		{ R35, R34, R33, R32, R31, R30 } \
-	}
diff --git a/keyboards/zykrah/fuyu/config.h b/keyboards/zykrah/fuyu/config.h
index 901b62ad89..92fdcaa586 100644
--- a/keyboards/zykrah/fuyu/config.h
+++ b/keyboards/zykrah/fuyu/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 /* The pin connected to the data pin of the LEDs */
-#define RGB_DI_PIN GP2
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS * 3/4
 
diff --git a/keyboards/zykrah/fuyu/info.json b/keyboards/zykrah/fuyu/info.json
index f0848787cd..c37f3b44ae 100644
--- a/keyboards/zykrah/fuyu/info.json
+++ b/keyboards/zykrah/fuyu/info.json
@@ -26,45 +26,49 @@
     "rgb_matrix": {
         "driver": "WS2812"
     },
+    "ws2812": {
+        "pin": "GP2",
+        "driver": "vendor"
+    },
     "url": "https://github.com/zykrah/fuyu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
-                { "matrix": [0, 10], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 13.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 14.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 15.25, "y": 0.0 },
-                { "matrix": [0, 15], "x": 16.25, "y": 0.0 },
-                { "matrix": [0, 16], "x": 17.25, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "matrix": [3, 13], "x": 14.0, "y": 1.25 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [0, 9], "x": 9.5, "y": 0 },
+                { "matrix": [0, 10], "x": 11, "y": 0 },
+                { "matrix": [0, 11], "x": 12, "y": 0 },
+                { "matrix": [0, 12], "x": 13, "y": 0 },
+                { "matrix": [0, 13], "x": 14, "y": 0 },
+                { "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "matrix": [0, 16], "x": 17.25, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "matrix": [3, 13], "x": 14, "y": 1.25 },
                 { "matrix": [1, 14], "x": 15.25, "y": 1.25 },
                 { "matrix": [1, 15], "x": 16.25, "y": 1.25 },
                 { "matrix": [1, 16], "x": 17.25, "y": 1.25 },
-                { "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -81,7 +85,7 @@
                 { "matrix": [2, 14], "x": 15.25, "y": 2.25 },
                 { "matrix": [2, 15], "x": 16.25, "y": 2.25 },
                 { "matrix": [2, 16], "x": 17.25, "y": 2.25 },
-                { "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "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 },
@@ -97,7 +101,7 @@
                 { "matrix": [3, 14], "x": 15.25, "y": 3.25 },
                 { "matrix": [3, 15], "x": 16.25, "y": 3.25 },
                 { "matrix": [3, 16], "x": 17.25, "y": 3.25 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "matrix": [4, 1], "x": 1.25, "y": 4.25 },
                 { "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -110,15 +114,15 @@
                 { "matrix": [4, 10], "x": 10.25, "y": 4.25 },
                 { "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25 },
-                { "matrix": [4, 13], "x": 14.0, "y": 4.25 },
+                { "matrix": [4, 13], "x": 14, "y": 4.25 },
                 { "matrix": [4, 14], "x": 15.25, "y": 4.25 },
                 { "matrix": [4, 15], "x": 16.25, "y": 4.25 },
                 { "matrix": [4, 16], "x": 17.25, "y": 4.25 },
-                { "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+                { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
                 { "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
                 { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "matrix": [5, 10], "w": 1.25, "x": 10.0, "y": 5.25 },
+                { "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
                 { "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
                 { "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
                 { "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 5.25 },
diff --git a/keyboards/zykrah/fuyu/rules.mk b/keyboards/zykrah/fuyu/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/zykrah/fuyu/rules.mk
+++ b/keyboards/zykrah/fuyu/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/zykrah/slime88/info.json b/keyboards/zykrah/slime88/info.json
index 0bbb0297fb..3f6f37576e 100644
--- a/keyboards/zykrah/slime88/info.json
+++ b/keyboards/zykrah/slime88/info.json
@@ -26,42 +26,42 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.25, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.25, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.25, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.25, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.75, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.75, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.75, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.75, "y": 0.0 },
-                { "matrix": [0, 13], "x": 14.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 15.25, "y": 0.0 },
-                { "matrix": [0, 15], "x": 16.25, "y": 0.0 },
-                { "matrix": [0, 16], "x": 17.25, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "matrix": [3, 13], "x": 14.0, "y": 1.25 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "matrix": [0, 2], "x": 2.25, "y": 0 },
+                { "matrix": [0, 3], "x": 3.25, "y": 0 },
+                { "matrix": [0, 4], "x": 4.25, "y": 0 },
+                { "matrix": [0, 5], "x": 5.5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [0, 9], "x": 9.75, "y": 0 },
+                { "matrix": [0, 10], "x": 10.75, "y": 0 },
+                { "matrix": [0, 11], "x": 11.75, "y": 0 },
+                { "matrix": [0, 12], "x": 12.75, "y": 0 },
+                { "matrix": [0, 13], "x": 14, "y": 0 },
+                { "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "matrix": [0, 16], "x": 17.25, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "matrix": [3, 13], "x": 14, "y": 1.25 },
                 { "matrix": [1, 14], "x": 15.25, "y": 1.25 },
                 { "matrix": [1, 15], "x": 16.25, "y": 1.25 },
                 { "matrix": [1, 16], "x": 17.25, "y": 1.25 },
-                { "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -78,7 +78,7 @@
                 { "matrix": [2, 14], "x": 15.25, "y": 2.25 },
                 { "matrix": [2, 15], "x": 16.25, "y": 2.25 },
                 { "matrix": [2, 16], "x": 17.25, "y": 2.25 },
-                { "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "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 },
@@ -91,7 +91,7 @@
                 { "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "matrix": [3, 12], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "matrix": [4, 1], "x": 1.25, "y": 4.25 },
                 { "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -104,13 +104,13 @@
                 { "matrix": [4, 10], "x": 10.25, "y": 4.25 },
                 { "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25 },
-                { "matrix": [4, 13], "x": 14.0, "y": 4.25 },
+                { "matrix": [4, 13], "x": 14, "y": 4.25 },
                 { "matrix": [4, 15], "x": 16.25, "y": 4.25 },
-                { "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+                { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
                 { "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
                 { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "matrix": [5, 10], "w": 1.25, "x": 10.0, "y": 5.25 },
+                { "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
                 { "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
                 { "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
                 { "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 5.25 },
diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h
index 026f20dc8f..4606bc8a6d 100644
--- a/layouts/community/60_iso/unxmaal/config.h
+++ b/layouts/community/60_iso/unxmaal/config.h
@@ -17,8 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifndef RGB_DI_PIN
-    #define RGB_DI_PIN F4
+#define WS2812_DI_PIN F4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,4 +32,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/layouts/community/60_iso/unxmaal/rules.mk b/layouts/community/60_iso/unxmaal/rules.mk
index 2ce7257d2b..c2d3c6b075 100644
--- a/layouts/community/60_iso/unxmaal/rules.mk
+++ b/layouts/community/60_iso/unxmaal/rules.mk
@@ -1,4 +1,7 @@
-# Only enable RGB on avr boards
-ifndef MCU_FAMILY
-    RGBLIGHT_ENABLE = yes          # Enable RGB Underglow
+# Only enable RGBLIGHT on avr boards
+ifeq ($(strip $(PLATFORM_KEY)),avr)
+    # ...that are at least prepared for it
+    ifdef RGBLIGHT_DRIVER
+        RGBLIGHT_ENABLE = yes          # Enable RGB Underglow
+    endif
 endif
diff --git a/layouts/community/ergodox/berfarah/config.h b/layouts/community/ergodox/berfarah/config.h
index 0acb95b85f..381b66edf1 100644
--- a/layouts/community/ergodox/berfarah/config.h
+++ b/layouts/community/ergodox/berfarah/config.h
@@ -6,4 +6,3 @@
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.4
 #define RGBLIGHT_EFFECT_BREATHE_MAX 150
 
-#undef IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ergodox/jackhumbert/config.h b/layouts/community/ergodox/jackhumbert/config.h
index 5458a236ce..0181b66605 100644
--- a/layouts/community/ergodox/jackhumbert/config.h
+++ b/layouts/community/ergodox/jackhumbert/config.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D7
+#define WS2812_DI_PIN D7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/layouts/community/ergodox/kejadlen/config.h b/layouts/community/ergodox/kejadlen/config.h
index 4e554e8a1a..4f14eff96b 100644
--- a/layouts/community/ergodox/kejadlen/config.h
+++ b/layouts/community/ergodox/kejadlen/config.h
@@ -3,4 +3,3 @@
 #define FORCE_NKRO
 
 #undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/numpad_5x6/bjohnson/config.h b/layouts/community/numpad_5x6/bjohnson/config.h
index 566365d7b6..a02b1d6df8 100644
--- a/layouts/community/numpad_5x6/bjohnson/config.h
+++ b/layouts/community/numpad_5x6/bjohnson/config.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
-#define RGB_DI_PIN B7
+#define WS2812_DI_PIN B7
 #define RGBLED_NUM 13     // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/layouts/community/numpad_5x6/drashna/config.h b/layouts/community/numpad_5x6/drashna/config.h
index 83e8766b27..51fd021c75 100644
--- a/layouts/community/numpad_5x6/drashna/config.h
+++ b/layouts/community/numpad_5x6/drashna/config.h
@@ -18,7 +18,7 @@
 
 
 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
-#    define RGB_DI_PIN B1
+#    define WS2812_DI_PIN B1
 #    define RGBLED_NUM 16  // Number of LEDs
 
 #    define RGBLIGHT_HUE_STEP 12
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index 85112d8ce4..8443ff054f 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -18,7 +18,7 @@
 
 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
 #    if defined(KEYBOARD_planck_light)
-#        define RGB_DI_PIN A0
+#        define WS2812_DI_PIN A0
 #        define RGBLED_NUM 13  // Number of LEDs
 #    endif
 #    define RGBLIGHT_HUE_STEP 12
diff --git a/layouts/community/ortho_4x12/junonum/config.h b/layouts/community/ortho_4x12/junonum/config.h
index 91be890a8b..c16d74892d 100644
--- a/layouts/community/ortho_4x12/junonum/config.h
+++ b/layouts/community/ortho_4x12/junonum/config.h
@@ -38,6 +38,3 @@
 
 // Short tap threshold
 #define TAPPING_TERM 250
-
-// For homerow mods
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h
index 44bac5bf18..1ccf427557 100644
--- a/layouts/community/ortho_4x12/xyverz/config.h
+++ b/layouts/community/ortho_4x12/xyverz/config.h
@@ -8,7 +8,7 @@
 #undef RGBLED_NUM
 #if defined(KEYBOARD_planck_rev5)
   #define RGBLED_NUM 10
-  #define RGB_DI_PIN D1
+  #define WS2812_DI_PIN D1
 #elif defined(KEYBOARD_keebio_levinson_rev2)
   #define RGBLED_NUM 12
 #elif defined(KEYBOARD_lets_split_rev2)
diff --git a/layouts/community/ortho_5x12/drashna/config.h b/layouts/community/ortho_5x12/drashna/config.h
index 61c95fed8f..0e7d1dd0db 100644
--- a/layouts/community/ortho_5x12/drashna/config.h
+++ b/layouts/community/ortho_5x12/drashna/config.h
@@ -18,7 +18,7 @@
 
 /* ws2812 RGB LED */
 #if defined(KEYBOARD_fractal)
-#    define RGB_DI_PIN D2
+#    define WS2812_DI_PIN D2
 #    undef RGBLED_NUM
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/layouts/community/ortho_5x12/xyverz/config.h b/layouts/community/ortho_5x12/xyverz/config.h
index bb444a51a5..5ee4d372ef 100644
--- a/layouts/community/ortho_5x12/xyverz/config.h
+++ b/layouts/community/ortho_5x12/xyverz/config.h
@@ -6,10 +6,10 @@
 
 /* ws2812 RGB LED */
 #ifndef RGBLIGHT_ENABLE
-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
 #endif
 #if defined(KEYBOARD_preonic_rev2)
-  #define RGB_DI_PIN B3
+  #define WS2812_DI_PIN B3
   #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/layouts/community/ortho_5x14/yet-another-developer/config.h b/layouts/community/ortho_5x14/yet-another-developer/config.h
index 66959a6d42..933f2f3ad7 100644
--- a/layouts/community/ortho_5x14/yet-another-developer/config.h
+++ b/layouts/community/ortho_5x14/yet-another-developer/config.h
@@ -2,7 +2,7 @@
 
 /* ws2812 RGB LED */
 #if defined(KEYBOARD_fractal)
-#    define RGB_DI_PIN D2
+#    define WS2812_DI_PIN D2
 #    undef RGBLED_NUM
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/layouts/community/planck_mit/guidoism/config.h b/layouts/community/planck_mit/guidoism/config.h
index e22f298035..df53dda471 100644
--- a/layouts/community/planck_mit/guidoism/config.h
+++ b/layouts/community/planck_mit/guidoism/config.h
@@ -20,5 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define USB_MAX_POWER_CONSUMPTION 50
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index e43ad5e3ac..92065e8f31 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -41,8 +41,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 #    ifdef CONVERT_TO_PROTON_C
-#        undef RGB_DI_PIN
-#        define RGB_DI_PIN A3
+#        undef WS2812_DI_PIN
+#        define WS2812_DI_PIN A3
 #    endif
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/lib/python/qmk/c_parse.py b/lib/python/qmk/c_parse.py
index b8e5f6a3c9..7dd464bd34 100644
--- a/lib/python/qmk/c_parse.py
+++ b/lib/python/qmk/c_parse.py
@@ -11,7 +11,7 @@ from milc import cli
 
 from qmk.comment_remover import comment_remover
 
-default_key_entry = {'x': -1, 'y': 0, 'w': 1}
+default_key_entry = {'x': -1, 'y': 0}
 single_comment_regex = re.compile(r'\s+/[/*].*$')
 multi_comment_regex = re.compile(r'/\*(.|\n)*?\*/', re.MULTILINE)
 layout_macro_define_regex = re.compile(r'^#\s*define')
@@ -217,10 +217,13 @@ def _coerce_led_token(_type, value):
         return value_map[value]
 
 
-def _validate_led_config(matrix, matrix_rows, matrix_indexes, position, position_raw, flags):
+def _validate_led_config(matrix, matrix_rows, matrix_cols, matrix_indexes, position, position_raw, flags):
     # TODO: Improve crude parsing/validation
     if len(matrix) != matrix_rows and len(matrix) != (matrix_rows / 2):
         raise ValueError("Unable to parse g_led_config matrix data")
+    for index, row in enumerate(matrix):
+        if len(row) != matrix_cols:
+            raise ValueError(f"Number of columns in row {index} ({len(row)}) does not match matrix ({matrix_cols})")
     if len(position) != len(flags):
         raise ValueError(f"Number of g_led_config physical positions ({len(position)}) does not match number of flags ({len(flags)})")
     if len(matrix_indexes) and (max(matrix_indexes) >= len(flags)):
@@ -234,13 +237,16 @@ def _validate_led_config(matrix, matrix_rows, matrix_indexes, position, position
 def _parse_led_config(file, matrix_cols, matrix_rows):
     """Return any 'raw' led/rgb matrix config
     """
-    matrix_raw = []
+    matrix = []
     position_raw = []
     flags = []
 
     found_led_config = False
     bracket_count = 0
     section = 0
+    current_row_index = 0
+    current_row = []
+
     for _type, value in lex(_preprocess_c_file(file), CLexer()):
         # Assume g_led_config..stuff..;
         if value == 'g_led_config':
@@ -254,12 +260,16 @@ def _parse_led_config(file, matrix_cols, matrix_rows):
                 if bracket_count == 2:
                     section += 1
             elif value == '}':
+                if section == 1 and bracket_count == 3:
+                    matrix.append(current_row)
+                    current_row = []
+                    current_row_index += 1
                 bracket_count -= 1
             else:
                 # Assume any non whitespace value here is important enough to stash
                 if _type in [Token.Literal.Number.Integer, Token.Literal.Number.Float, Token.Literal.Number.Hex, Token.Name]:
                     if section == 1 and bracket_count == 3:
-                        matrix_raw.append(_coerce_led_token(_type, value))
+                        current_row.append(_coerce_led_token(_type, value))
                     if section == 2 and bracket_count == 3:
                         position_raw.append(_coerce_led_token(_type, value))
                     if section == 3 and bracket_count == 2:
@@ -269,16 +279,15 @@ def _parse_led_config(file, matrix_cols, matrix_rows):
                     return None
 
     # Slightly better intrim format
-    matrix = list(_get_chunks(matrix_raw, matrix_cols))
     position = list(_get_chunks(position_raw, 2))
-    matrix_indexes = list(filter(lambda x: x is not None, matrix_raw))
+    matrix_indexes = list(filter(lambda x: x is not None, sum(matrix, [])))
 
     # If we have not found anything - bail with no error
     if not section:
         return None
 
     # Throw any validation errors
-    _validate_led_config(matrix, matrix_rows, matrix_indexes, position, position_raw, flags)
+    _validate_led_config(matrix, matrix_rows, matrix_cols, matrix_indexes, position, position_raw, flags)
 
     return (matrix, position, flags)
 
diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py
index 580e080eeb..61a2f9f732 100755
--- a/lib/python/qmk/cli/generate/api.py
+++ b/lib/python/qmk/cli/generate/api.py
@@ -66,6 +66,12 @@ def _filtered_copy(src, dst):
         dst.write_text(json.dumps(data, separators=(',', ':')), encoding='utf-8')
         return dst
 
+    if dst.suffix == '.jsonschema':
+        data = json_load(src)
+
+        dst.write_text(json.dumps(data), encoding='utf-8')
+        return dst
+
     return shutil.copy2(src, dst)
 
 
diff --git a/lib/python/qmk/cli/generate/keyboard_h.py b/lib/python/qmk/cli/generate/keyboard_h.py
index 152921bdce..fa4036e39a 100755
--- a/lib/python/qmk/cli/generate/keyboard_h.py
+++ b/lib/python/qmk/cli/generate/keyboard_h.py
@@ -11,12 +11,9 @@ from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.constants import COL_LETTERS, ROW_LETTERS, GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
 
 
-def _generate_layouts(keyboard):
-    """Generates the layouts.h file.
+def _generate_layouts(keyboard, kb_info_json):
+    """Generates the layouts macros.
     """
-    # Build the info.json file
-    kb_info_json = info_json(keyboard)
-
     if 'matrix_size' not in kb_info_json:
         cli.log.error(f'{keyboard}: Invalid matrix config.')
         return []
@@ -65,6 +62,32 @@ def _generate_layouts(keyboard):
     return lines
 
 
+def _generate_keycodes(kb_info_json):
+    """Generates keyboard level keycodes.
+    """
+    if 'keycodes' not in kb_info_json:
+        return []
+
+    lines = []
+    lines.append('enum keyboard_keycodes {')
+
+    for index, item in enumerate(kb_info_json.get('keycodes')):
+        key = item["key"]
+        if index == 0:
+            lines.append(f'  {key} = QK_KB_0,')
+        else:
+            lines.append(f'  {key},')
+
+    lines.append('};')
+
+    for item in kb_info_json.get('keycodes', []):
+        key = item["key"]
+        for alias in item.get("aliases", []):
+            lines.append(f'#define {alias} {key}')
+
+    return lines
+
+
 @cli.argument('-i', '--include', nargs='?', arg_only=True, help='Optional file to include')
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
@@ -73,8 +96,12 @@ def _generate_layouts(keyboard):
 def generate_keyboard_h(cli):
     """Generates the keyboard.h file.
     """
+    # Build the info.json file
+    kb_info_json = info_json(cli.args.keyboard)
+
     keyboard_h = cli.args.include
-    dd_layouts = _generate_layouts(cli.args.keyboard)
+    dd_layouts = _generate_layouts(cli.args.keyboard, kb_info_json)
+    dd_keycodes = _generate_keycodes(kb_info_json)
     valid_config = dd_layouts or keyboard_h
 
     # Build the layouts.h file.
@@ -87,6 +114,11 @@ def generate_keyboard_h(cli):
     if keyboard_h:
         keyboard_h_lines.append(f'#include "{Path(keyboard_h).name}"')
 
+    keyboard_h_lines.append('')
+    keyboard_h_lines.append('// Keycode content')
+    if dd_keycodes:
+        keyboard_h_lines.extend(dd_keycodes)
+
     # Protect against poorly configured keyboards
     if not valid_config:
         keyboard_h_lines.append('#error("<keyboard>.h is required unless your keyboard uses data-driven configuration. Please rename your keyboard\'s header file to <keyboard>.h")')
diff --git a/lib/python/qmk/cli/generate/keycodes.py b/lib/python/qmk/cli/generate/keycodes.py
index 17503bac63..3b69b17ed1 100644
--- a/lib/python/qmk/cli/generate/keycodes.py
+++ b/lib/python/qmk/cli/generate/keycodes.py
@@ -143,7 +143,7 @@ def generate_keycode_extras(cli):
     """
 
     # Build the header file.
-    keycodes_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '#include "keymap.h"', '// clang-format off']
+    keycodes_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '#include "keycodes.h"', '// clang-format off']
 
     keycodes = load_spec(cli.args.version, cli.args.lang)
 
diff --git a/lib/python/qmk/cli/git/submodule.py b/lib/python/qmk/cli/git/submodule.py
index 9f354c021e..ef116ea124 100644
--- a/lib/python/qmk/cli/git/submodule.py
+++ b/lib/python/qmk/cli/git/submodule.py
@@ -7,14 +7,21 @@ from qmk import submodules
 
 REMOVE_DIRS = [
     'lib/ugfx',
-    'lib/pico-sdk',
     'lib/chibios-contrib/ext/mcux-sdk',
-    'lib/lvgl',
+]
+
+IGNORE_DIRS = [
+    'lib/arm_atsam',
+    'lib/fnv',
+    'lib/lib8tion',
+    'lib/python',
+    'lib/usbhost',
 ]
 
 
 @cli.argument('--check', arg_only=True, action='store_true', help='Check if the submodules are dirty, and display a warning if they are.')
 @cli.argument('--sync', arg_only=True, action='store_true', help='Shallow clone any missing submodules.')
+@cli.argument('-f', '--force', action='store_true', help='Flag to remove unexpected directories')
 @cli.subcommand('Git Submodule actions.')
 def git_submodule(cli):
     """Git Submodule actions
@@ -29,7 +36,15 @@ def git_submodule(cli):
                 cli.run(['git', 'submodule', 'update', '--depth=50', '--init', name], capture_output=False)
         return True
 
-    for folder in REMOVE_DIRS:
+    # can be the default behavior with: qmk config git_submodule.force=True
+    remove_dirs = REMOVE_DIRS
+    if cli.config.git_submodule.force:
+        # Also trash everything that isnt marked as "safe"
+        for path in normpath('lib').iterdir():
+            if not any(ignore in path.as_posix() for ignore in IGNORE_DIRS):
+                remove_dirs.append(path)
+
+    for folder in map(normpath, remove_dirs):
         if normpath(folder).is_dir():
             print(f"Removing '{folder}'")
             shutil.rmtree(folder)
diff --git a/lib/python/qmk/cli/info.py b/lib/python/qmk/cli/info.py
index fa5729bcc9..839139346c 100755
--- a/lib/python/qmk/cli/info.py
+++ b/lib/python/qmk/cli/info.py
@@ -18,6 +18,29 @@ from qmk.path import is_keyboard
 UNICODE_SUPPORT = sys.stdout.encoding.lower().startswith('utf')
 
 
+def _strip_api_content(info_json):
+    # Ideally this would only be added in the API pathway.
+    info_json.pop('platform', None)
+    info_json.pop('platform_key', None)
+    info_json.pop('processor_type', None)
+    info_json.pop('protocol', None)
+    info_json.pop('config_h_features', None)
+    info_json.pop('keymaps', None)
+    info_json.pop('keyboard_folder', None)
+    info_json.pop('parse_errors', None)
+    info_json.pop('parse_warnings', None)
+
+    for layout in info_json.get('layouts', {}).values():
+        layout.pop('filename', None)
+        layout.pop('c_macro', None)
+        layout.pop('json_layout', None)
+
+    if 'matrix_pins' in info_json:
+        info_json.pop('matrix_size', None)
+
+    return info_json
+
+
 def show_keymap(kb_info_json, title_caps=True):
     """Render the keymap in ascii art.
     """
@@ -141,6 +164,7 @@ def print_parsed_rules_mk(keyboard_name):
 @cli.argument('-f', '--format', default='friendly', arg_only=True, help='Format to display the data in (friendly, text, json) (Default: friendly).')
 @cli.argument('--ascii', action='store_true', default=not UNICODE_SUPPORT, help='Render layout box drawings in ASCII only.')
 @cli.argument('-r', '--rules-mk', action='store_true', help='Render the parsed values of the keyboard\'s rules.mk file.')
+@cli.argument('-a', '--api', action='store_true', help='Show fully processed info intended for API consumption.')
 @cli.subcommand('Keyboard information.')
 @automagic_keyboard
 @automagic_keymap
@@ -171,6 +195,9 @@ def info(cli):
     else:
         kb_info_json = info_json(cli.config.info.keyboard)
 
+    if not cli.args.api:
+        kb_info_json = _strip_api_content(kb_info_json)
+
     # Output in the requested format
     if cli.args.format == 'json':
         print(json.dumps(kb_info_json, cls=InfoJSONEncoder))
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 5561a354c5..b1eac13957 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -51,6 +51,9 @@ def create_make_target(target, dry_run=False, parallel=1, **env_vars):
     for key, value in env_vars.items():
         env.append(f'{key}={value}')
 
+    if cli.config.general.verbose:
+        env.append('VERBOSE=true')
+
     return [make_cmd, *(['-n'] if dry_run else []), *get_make_parallel_args(parallel), *env, target]
 
 
@@ -175,9 +178,6 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa
     if bootloader:
         make_command.append(bootloader)
 
-    for key, value in env_vars.items():
-        make_command.append(f'{key}={value}')
-
     make_command.extend([
         f'KEYBOARD={user_keymap["keyboard"]}',
         f'KEYMAP={user_keymap["keymap"]}',
@@ -198,6 +198,9 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa
         'QMK_BIN="qmk"',
     ])
 
+    for key, value in env_vars.items():
+        make_command.append(f'{key}={value}')
+
     return make_command
 
 
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index b7ee055eef..dbd26153d8 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -50,18 +50,14 @@ def _valid_community_layout(layout):
     return (Path('layouts/default') / layout).exists()
 
 
-def _validate(keyboard, info_data):
-    """Perform various validation on the provided info.json data
-    """
-    # First validate against the jsonschema
-    try:
-        validate(info_data, 'qmk.api.keyboard.v1')
+def _get_key_left_position(key):
+    # Special case for ISO enter
+    return key['x'] - 0.25 if key.get('h', 1) == 2 and key.get('w', 1) == 1.25 else key['x']
 
-    except jsonschema.ValidationError as e:
-        json_path = '.'.join([str(p) for p in e.absolute_path])
-        cli.log.error('Invalid API data: %s: %s: %s', keyboard, json_path, e.message)
-        exit(1)
 
+def _additional_validation(keyboard, info_data):
+    """Non schema checks
+    """
     layouts = info_data.get('layouts', {})
     layout_aliases = info_data.get('layout_aliases', {})
     community_layouts = info_data.get('community_layouts', [])
@@ -73,7 +69,7 @@ def _validate(keyboard, info_data):
 
     # Warn if physical positions are offset (at least one key should be at x=0, and at least one key at y=0)
     for layout_name, layout_data in layouts.items():
-        offset_x = min([k['x'] for k in layout_data['layout']])
+        offset_x = min([_get_key_left_position(k) for k in layout_data['layout']])
         if offset_x > 0:
             _log_warning(info_data, f'Layout "{layout_name}" is offset on X axis by {offset_x}')
 
@@ -103,6 +99,27 @@ def _validate(keyboard, info_data):
         if layout_name not in layouts and layout_name not in layout_aliases:
             _log_error(info_data, 'Claims to support community layout %s but no %s() macro found' % (layout, layout_name))
 
+    # keycodes with length > 7 must have short forms for visualisation purposes
+    for decl in info_data.get('keycodes', []):
+        if len(decl["key"]) > 7:
+            if not decl.get("aliases", []):
+                _log_error(info_data, f'Keycode {decl["key"]} has no short form alias')
+
+
+def _validate(keyboard, info_data):
+    """Perform various validation on the provided info.json data
+    """
+    # First validate against the jsonschema
+    try:
+        validate(info_data, 'qmk.api.keyboard.v1')
+
+        _additional_validation(keyboard, info_data)
+
+    except jsonschema.ValidationError as e:
+        json_path = '.'.join([str(p) for p in e.absolute_path])
+        cli.log.error('Invalid API data: %s: %s: %s', keyboard, json_path, e.message)
+        exit(1)
+
 
 def info_json(keyboard):
     """Generate the info.json data for a specific keyboard.
diff --git a/lib/python/qmk/json_encoders.py b/lib/python/qmk/json_encoders.py
index f968b3dbb2..e61c63aff3 100755
--- a/lib/python/qmk/json_encoders.py
+++ b/lib/python/qmk/json_encoders.py
@@ -27,7 +27,10 @@ class QMKJSONEncoder(json.JSONEncoder):
 
         return float(obj)
 
-    def encode_list(self, obj):
+    def encode_dict_single_line(self, obj):
+        return "{" + ", ".join(f"{self.encode(key)}: {self.encode(element)}" for key, element in sorted(obj.items(), key=self.sort_layout)) + "}"
+
+    def encode_list(self, obj, key=None):
         """Encode a list-like object.
         """
         if self.primitives_only(obj):
@@ -35,22 +38,28 @@ class QMKJSONEncoder(json.JSONEncoder):
 
         else:
             self.indentation_level += 1
-            output = [self.indent_str + self.encode(element) for element in obj]
+
+            if key in ('layout', 'rotary'):
+                # These are part of a layout or led/encoder config, put them on a single line.
+                output = [self.indent_str + self.encode_dict_single_line(element) for element in obj]
+            else:
+                output = [self.indent_str + self.encode(element) for element in obj]
+
             self.indentation_level -= 1
 
             return "[\n" + ",\n".join(output) + "\n" + self.indent_str + "]"
 
-    def encode(self, obj):
+    def encode(self, obj, key=None):
         """Encode keymap.json objects for QMK.
         """
         if isinstance(obj, Decimal):
             return self.encode_decimal(obj)
 
         elif isinstance(obj, (list, tuple)):
-            return self.encode_list(obj)
+            return self.encode_list(obj, key)
 
         elif isinstance(obj, dict):
-            return self.encode_dict(obj)
+            return self.encode_dict(obj, key)
 
         else:
             return super().encode(obj)
@@ -71,22 +80,43 @@ class QMKJSONEncoder(json.JSONEncoder):
 class InfoJSONEncoder(QMKJSONEncoder):
     """Custom encoder to make info.json's a little nicer to work with.
     """
-    def encode_dict(self, obj):
+    def encode_dict(self, obj, key):
         """Encode info.json dictionaries.
         """
         if obj:
-            if set(("x", "y")).issubset(obj.keys()):
-                # These are part of a layout/led_config, put them on a single line.
-                return "{ " + ", ".join(f"{self.encode(key)}: {self.encode(element)}" for key, element in sorted(obj.items())) + " }"
-
-            else:
-                self.indentation_level += 1
-                output = [self.indent_str + f"{json.dumps(key)}: {self.encode(value)}" for key, value in sorted(obj.items(), key=self.sort_dict)]
-                self.indentation_level -= 1
-                return "{\n" + ",\n".join(output) + "\n" + self.indent_str + "}"
+            self.indentation_level += 1
+            output = [self.indent_str + f"{json.dumps(k)}: {self.encode(v, k)}" for k, v in sorted(obj.items(), key=self.sort_dict)]
+            self.indentation_level -= 1
+            return "{\n" + ",\n".join(output) + "\n" + self.indent_str + "}"
         else:
             return "{}"
 
+    def sort_layout(self, key):
+        key = key[0]
+
+        if key == 'label':
+            return '00label'
+
+        elif key == 'matrix':
+            return '01matrix'
+
+        elif key == 'x':
+            return '02x'
+
+        elif key == 'y':
+            return '03y'
+
+        elif key == 'w':
+            return '04w'
+
+        elif key == 'h':
+            return '05h'
+
+        elif key == 'flags':
+            return '06flags'
+
+        return key
+
     def sort_dict(self, key):
         """Forces layout to the back of the sort order.
         """
@@ -120,21 +150,19 @@ class InfoJSONEncoder(QMKJSONEncoder):
 class KeymapJSONEncoder(QMKJSONEncoder):
     """Custom encoder to make keymap.json's a little nicer to work with.
     """
-    def encode_dict(self, obj):
+    def encode_dict(self, obj, key):
         """Encode dictionary objects for keymap.json.
         """
         if obj:
             self.indentation_level += 1
-            output_lines = [f"{self.indent_str}{json.dumps(key)}: {self.encode(value)}" for key, value in sorted(obj.items(), key=self.sort_dict)]
-            output = ',\n'.join(output_lines)
+            output = [self.indent_str + f"{json.dumps(k)}: {self.encode(v, k)}" for k, v in sorted(obj.items(), key=self.sort_dict)]
             self.indentation_level -= 1
-
-            return f"{{\n{output}\n{self.indent_str}}}"
+            return "{\n" + ",\n".join(output) + "\n" + self.indent_str + "}"
 
         else:
             return "{}"
 
-    def encode_list(self, obj):
+    def encode_list(self, obj, k=None):
         """Encode a list-like object.
         """
         if self.indentation_level == 2:
diff --git a/lib/python/qmk/keymap.py b/lib/python/qmk/keymap.py
index dddf6449a7..8ae8a5ed19 100644
--- a/lib/python/qmk/keymap.py
+++ b/lib/python/qmk/keymap.py
@@ -25,6 +25,7 @@ __INCLUDES__
  * This file was generated by qmk json2c. You may or may not want to
  * edit it directly.
  */
+__KEYCODE_OUTPUT_GOES_HERE__
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 __KEYMAP_GOES_HERE__
@@ -123,6 +124,29 @@ def _generate_macros_function(keymap_json):
     return macro_txt
 
 
+def _generate_keycodes_function(keymap_json):
+    """Generates keymap level keycodes.
+    """
+    lines = []
+    lines.append('enum keymap_keycodes {')
+
+    for index, item in enumerate(keymap_json.get('keycodes', [])):
+        key = item["key"]
+        if index == 0:
+            lines.append(f'  {key} = QK_USER_0,')
+        else:
+            lines.append(f'  {key},')
+
+    lines.append('};')
+
+    for item in keymap_json.get('keycodes', []):
+        key = item["key"]
+        for alias in item.get("aliases", []):
+            lines.append(f'#define {alias} {key}')
+
+    return lines
+
+
 def template_json(keyboard):
     """Returns a `keymap.json` template for a keyboard.
 
@@ -317,6 +341,12 @@ def generate_c(keymap_json):
         hostlang = f'#include "keymap_{keymap_json["host_language"]}.h"\n#include "sendstring_{keymap_json["host_language"]}.h"\n'
     new_keymap = new_keymap.replace('__INCLUDES__', hostlang)
 
+    keycodes = ''
+    if 'keycodes' in keymap_json and keymap_json['keycodes'] is not None:
+        keycodes_txt = _generate_keycodes_function(keymap_json)
+        keycodes = '\n'.join(keycodes_txt)
+    new_keymap = new_keymap.replace('__KEYCODE_OUTPUT_GOES_HERE__', keycodes)
+
     return new_keymap
 
 
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index e598b281a6..28838ec368 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -291,7 +291,7 @@ def test_generate_version_h():
 def test_format_json_keyboard():
     result = check_subcommand('format-json', '--format', 'keyboard', 'lib/python/qmk/tests/minimal_info.json')
     check_returncode(result)
-    assert result.stdout == '{\n    "keyboard_name": "tester",\n    "maintainer": "qmk",\n    "layouts": {\n        "LAYOUT": {\n            "layout": [\n                { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n            ]\n        }\n    }\n}\n'
+    assert result.stdout == '{\n    "keyboard_name": "tester",\n    "maintainer": "qmk",\n    "layouts": {\n        "LAYOUT": {\n            "layout": [\n                {"label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0}\n            ]\n        }\n    }\n}\n'
 
 
 def test_format_json_keymap():
@@ -303,7 +303,7 @@ def test_format_json_keymap():
 def test_format_json_keyboard_auto():
     result = check_subcommand('format-json', '--format', 'auto', 'lib/python/qmk/tests/minimal_info.json')
     check_returncode(result)
-    assert result.stdout == '{\n    "keyboard_name": "tester",\n    "maintainer": "qmk",\n    "layouts": {\n        "LAYOUT": {\n            "layout": [\n                { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n            ]\n        }\n    }\n}\n'
+    assert result.stdout == '{\n    "keyboard_name": "tester",\n    "maintainer": "qmk",\n    "layouts": {\n        "LAYOUT": {\n            "layout": [\n                {"label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0}\n            ]\n        }\n    }\n}\n'
 
 
 def test_format_json_keymap_auto():
diff --git a/platforms/arm_atsam/eeprom_samd.c b/platforms/arm_atsam/eeprom_samd.c
index 1c1e031e5d..9c42041f2d 100644
--- a/platforms/arm_atsam/eeprom_samd.c
+++ b/platforms/arm_atsam/eeprom_samd.c
@@ -15,15 +15,12 @@
  */
 #include "eeprom.h"
 #include "debug.h"
+#include "util.h"
 #include "samd51j18a.h"
 #include "core_cm4.h"
 #include "component/nvmctrl.h"
 #include "eeprom_samd.h"
 
-#ifndef MAX
-#    define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
-#endif
-
 #ifndef BUSY_RETRIES
 #    define BUSY_RETRIES 10000
 #endif
diff --git a/platforms/avr/_wait.h b/platforms/avr/_wait.h
index c1a598a428..39cbf618d2 100644
--- a/platforms/avr/_wait.h
+++ b/platforms/avr/_wait.h
@@ -15,7 +15,11 @@
  */
 #pragma once
 
+// Need to disable GCC's "maybe-uninitialized" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #include <util/delay.h>
+#pragma GCC diagnostic pop
 
 // http://ww1.microchip.com/downloads/en/devicedoc/atmel-0856-avr-instruction-set-manual.pdf
 // page 22: Table 4-2. Arithmetic and Logic Instructions
diff --git a/platforms/avr/drivers/i2c_master.c b/platforms/avr/drivers/i2c_master.c
index 524494c99d..58939f3e00 100644
--- a/platforms/avr/drivers/i2c_master.c
+++ b/platforms/avr/drivers/i2c_master.c
@@ -23,6 +23,7 @@
 #include "i2c_master.h"
 #include "timer.h"
 #include "wait.h"
+#include "util.h"
 
 #ifndef F_SCL
 #    define F_SCL 400000UL // SCL frequency
@@ -37,8 +38,6 @@
 
 #define TWBR_val (((F_CPU / F_SCL) - 16) / 2)
 
-#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
-
 void i2c_init(void) {
     TWSR = 0; /* no prescaler */
     TWBR = (uint8_t)TWBR_val;
diff --git a/platforms/avr/drivers/ws2812.c b/platforms/avr/drivers/ws2812.c
deleted file mode 100644
index 5c0cb3b718..0000000000
--- a/platforms/avr/drivers/ws2812.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * light weight WS2812 lib V2.0b
- *
- * Controls WS2811/WS2812/WS2812B RGB-LEDs
- * Author: Tim (cpldcpu@gmail.com)
- *
- * Jan 18th, 2014  v2.0b Initial Version
- * Nov 29th, 2015  v2.3  Added SK6812RGBW support
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include <avr/interrupt.h>
-#include <avr/io.h>
-#include <util/delay.h>
-#include "ws2812.h"
-#include "pin_defs.h"
-
-#define pinmask(pin) (_BV((pin)&0xF))
-
-/*
- * Forward declare internal functions
- *
- * The functions take a byte-array and send to the data output as WS2812 bitstream.
- * The length is the number of bytes to send - three per LED.
- */
-
-static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t masklo, uint8_t maskhi);
-
-void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds) {
-    DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(RGB_DI_PIN);
-
-    uint8_t masklo = ~(pinmask(RGB_DI_PIN)) & PORTx_ADDRESS(RGB_DI_PIN);
-    uint8_t maskhi = pinmask(RGB_DI_PIN) | PORTx_ADDRESS(RGB_DI_PIN);
-
-    ws2812_sendarray_mask((uint8_t *)ledarray, number_of_leds * sizeof(LED_TYPE), masklo, maskhi);
-
-    _delay_us(WS2812_TRST_US);
-}
-
-/*
-  This routine writes an array of bytes with RGB values to the Dataout pin
-  using the fast 800kHz clockless WS2811/2812 protocol.
-*/
-
-// Fixed cycles used by the inner loop
-#define w_fixedlow 2
-#define w_fixedhigh 4
-#define w_fixedtotal 8
-
-// Insert NOPs to match the timing, if possible
-#define w_zerocycles (((F_CPU / 1000) * WS2812_T0H) / 1000000)
-#define w_onecycles (((F_CPU / 1000) * WS2812_T1H + 500000) / 1000000)
-#define w_totalcycles (((F_CPU / 1000) * WS2812_TIMING + 500000) / 1000000)
-
-// w1_nops - nops between rising edge and falling edge - low
-#if w_zerocycles >= w_fixedlow
-#    define w1_nops (w_zerocycles - w_fixedlow)
-#else
-#    define w1_nops 0
-#endif
-
-// w2_nops - nops between fe low and fe high
-#if w_onecycles >= (w_fixedhigh + w1_nops)
-#    define w2_nops (w_onecycles - w_fixedhigh - w1_nops)
-#else
-#    define w2_nops 0
-#endif
-
-// w3_nops - nops to complete loop
-#if w_totalcycles >= (w_fixedtotal + w1_nops + w2_nops)
-#    define w3_nops (w_totalcycles - w_fixedtotal - w1_nops - w2_nops)
-#else
-#    define w3_nops 0
-#endif
-
-// The only critical timing parameter is the minimum pulse length of the "0"
-// Warn or throw error if this timing can not be met with current F_CPU settings.
-#define w_lowtime ((w1_nops + w_fixedlow) * 1000000) / (F_CPU / 1000)
-#if w_lowtime > 550
-#    error "Light_ws2812: Sorry, the clock speed is too low. Did you set F_CPU correctly?"
-#elif w_lowtime > 450
-#    warning "Light_ws2812: The timing is critical and may only work on WS2812B, not on WS2812(S)."
-#    warning "Please consider a higher clockspeed, if possible"
-#endif
-
-#define w_nop1 "nop      \n\t"
-#define w_nop2 "rjmp .+0 \n\t"
-#define w_nop4 w_nop2 w_nop2
-#define w_nop8 w_nop4 w_nop4
-#define w_nop16 w_nop8 w_nop8
-
-static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t masklo, uint8_t maskhi) {
-    uint8_t curbyte, ctr, sreg_prev;
-
-    sreg_prev = SREG;
-    cli();
-
-    while (datlen--) {
-        curbyte = (*data++);
-
-        asm volatile("       ldi   %0,8  \n\t"
-                     "loop%=:            \n\t"
-                     "       out   %2,%3 \n\t" //  '1' [01] '0' [01] - re
-#if (w1_nops & 1)
-                     w_nop1
-#endif
-#if (w1_nops & 2)
-                         w_nop2
-#endif
-#if (w1_nops & 4)
-                             w_nop4
-#endif
-#if (w1_nops & 8)
-                                 w_nop8
-#endif
-#if (w1_nops & 16)
-                                     w_nop16
-#endif
-                     "       sbrs  %1,7  \n\t" //  '1' [03] '0' [02]
-                     "       out   %2,%4 \n\t" //  '1' [--] '0' [03] - fe-low
-                     "       lsl   %1    \n\t" //  '1' [04] '0' [04]
-#if (w2_nops & 1)
-                     w_nop1
-#endif
-#if (w2_nops & 2)
-                         w_nop2
-#endif
-#if (w2_nops & 4)
-                             w_nop4
-#endif
-#if (w2_nops & 8)
-                                 w_nop8
-#endif
-#if (w2_nops & 16)
-                                     w_nop16
-#endif
-                     "       out   %2,%4 \n\t" //  '1' [+1] '0' [+1] - fe-high
-#if (w3_nops & 1)
-                     w_nop1
-#endif
-#if (w3_nops & 2)
-                         w_nop2
-#endif
-#if (w3_nops & 4)
-                             w_nop4
-#endif
-#if (w3_nops & 8)
-                                 w_nop8
-#endif
-#if (w3_nops & 16)
-                                     w_nop16
-#endif
-
-                     "       dec   %0    \n\t" //  '1' [+2] '0' [+2]
-                     "       brne  loop%=\n\t" //  '1' [+3] '0' [+4]
-                     : "=&d"(ctr)
-                     : "r"(curbyte), "I"(_SFR_IO_ADDR(PORTx_ADDRESS(RGB_DI_PIN))), "r"(maskhi), "r"(masklo));
-    }
-
-    SREG = sreg_prev;
-}
diff --git a/platforms/avr/drivers/ws2812_bitbang.c b/platforms/avr/drivers/ws2812_bitbang.c
new file mode 100644
index 0000000000..aad10d86b0
--- /dev/null
+++ b/platforms/avr/drivers/ws2812_bitbang.c
@@ -0,0 +1,172 @@
+/*
+ * light weight WS2812 lib V2.0b
+ *
+ * Controls WS2811/WS2812/WS2812B RGB-LEDs
+ * Author: Tim (cpldcpu@gmail.com)
+ *
+ * Jan 18th, 2014  v2.0b Initial Version
+ * Nov 29th, 2015  v2.3  Added SK6812RGBW support
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <avr/interrupt.h>
+#include <avr/io.h>
+#include <util/delay.h>
+#include "ws2812.h"
+#include "pin_defs.h"
+
+#define pinmask(pin) (_BV((pin)&0xF))
+
+/*
+ * Forward declare internal functions
+ *
+ * The functions take a byte-array and send to the data output as WS2812 bitstream.
+ * The length is the number of bytes to send - three per LED.
+ */
+
+static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t masklo, uint8_t maskhi);
+
+void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds) {
+    DDRx_ADDRESS(WS2812_DI_PIN) |= pinmask(WS2812_DI_PIN);
+
+    uint8_t masklo = ~(pinmask(WS2812_DI_PIN)) & PORTx_ADDRESS(WS2812_DI_PIN);
+    uint8_t maskhi = pinmask(WS2812_DI_PIN) | PORTx_ADDRESS(WS2812_DI_PIN);
+
+    ws2812_sendarray_mask((uint8_t *)ledarray, number_of_leds * sizeof(LED_TYPE), masklo, maskhi);
+
+    _delay_us(WS2812_TRST_US);
+}
+
+/*
+  This routine writes an array of bytes with RGB values to the Dataout pin
+  using the fast 800kHz clockless WS2811/2812 protocol.
+*/
+
+// Fixed cycles used by the inner loop
+#define w_fixedlow 2
+#define w_fixedhigh 4
+#define w_fixedtotal 8
+
+// Insert NOPs to match the timing, if possible
+#define w_zerocycles (((F_CPU / 1000) * WS2812_T0H) / 1000000)
+#define w_onecycles (((F_CPU / 1000) * WS2812_T1H + 500000) / 1000000)
+#define w_totalcycles (((F_CPU / 1000) * WS2812_TIMING + 500000) / 1000000)
+
+// w1_nops - nops between rising edge and falling edge - low
+#if w_zerocycles >= w_fixedlow
+#    define w1_nops (w_zerocycles - w_fixedlow)
+#else
+#    define w1_nops 0
+#endif
+
+// w2_nops - nops between fe low and fe high
+#if w_onecycles >= (w_fixedhigh + w1_nops)
+#    define w2_nops (w_onecycles - w_fixedhigh - w1_nops)
+#else
+#    define w2_nops 0
+#endif
+
+// w3_nops - nops to complete loop
+#if w_totalcycles >= (w_fixedtotal + w1_nops + w2_nops)
+#    define w3_nops (w_totalcycles - w_fixedtotal - w1_nops - w2_nops)
+#else
+#    define w3_nops 0
+#endif
+
+// The only critical timing parameter is the minimum pulse length of the "0"
+// Warn or throw error if this timing can not be met with current F_CPU settings.
+#define w_lowtime ((w1_nops + w_fixedlow) * 1000000) / (F_CPU / 1000)
+#if w_lowtime > 550
+#    error "Light_ws2812: Sorry, the clock speed is too low. Did you set F_CPU correctly?"
+#elif w_lowtime > 450
+#    warning "Light_ws2812: The timing is critical and may only work on WS2812B, not on WS2812(S)."
+#    warning "Please consider a higher clockspeed, if possible"
+#endif
+
+#define w_nop1 "nop      \n\t"
+#define w_nop2 "rjmp .+0 \n\t"
+#define w_nop4 w_nop2 w_nop2
+#define w_nop8 w_nop4 w_nop4
+#define w_nop16 w_nop8 w_nop8
+
+static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t masklo, uint8_t maskhi) {
+    uint8_t curbyte, ctr, sreg_prev;
+
+    sreg_prev = SREG;
+    cli();
+
+    while (datlen--) {
+        curbyte = (*data++);
+
+        asm volatile("       ldi   %0,8  \n\t"
+                     "loop%=:            \n\t"
+                     "       out   %2,%3 \n\t" //  '1' [01] '0' [01] - re
+#if (w1_nops & 1)
+                     w_nop1
+#endif
+#if (w1_nops & 2)
+                         w_nop2
+#endif
+#if (w1_nops & 4)
+                             w_nop4
+#endif
+#if (w1_nops & 8)
+                                 w_nop8
+#endif
+#if (w1_nops & 16)
+                                     w_nop16
+#endif
+                     "       sbrs  %1,7  \n\t" //  '1' [03] '0' [02]
+                     "       out   %2,%4 \n\t" //  '1' [--] '0' [03] - fe-low
+                     "       lsl   %1    \n\t" //  '1' [04] '0' [04]
+#if (w2_nops & 1)
+                     w_nop1
+#endif
+#if (w2_nops & 2)
+                         w_nop2
+#endif
+#if (w2_nops & 4)
+                             w_nop4
+#endif
+#if (w2_nops & 8)
+                                 w_nop8
+#endif
+#if (w2_nops & 16)
+                                     w_nop16
+#endif
+                     "       out   %2,%4 \n\t" //  '1' [+1] '0' [+1] - fe-high
+#if (w3_nops & 1)
+                     w_nop1
+#endif
+#if (w3_nops & 2)
+                         w_nop2
+#endif
+#if (w3_nops & 4)
+                             w_nop4
+#endif
+#if (w3_nops & 8)
+                                 w_nop8
+#endif
+#if (w3_nops & 16)
+                                     w_nop16
+#endif
+
+                     "       dec   %0    \n\t" //  '1' [+2] '0' [+2]
+                     "       brne  loop%=\n\t" //  '1' [+3] '0' [+4]
+                     : "=&d"(ctr)
+                     : "r"(curbyte), "I"(_SFR_IO_ADDR(PORTx_ADDRESS(WS2812_DI_PIN))), "r"(maskhi), "r"(masklo));
+    }
+
+    SREG = sreg_prev;
+}
diff --git a/platforms/avr/drivers/ws2812_i2c.c b/platforms/avr/drivers/ws2812_i2c.c
index 709f382254..f4a2fbe0b3 100644
--- a/platforms/avr/drivers/ws2812_i2c.c
+++ b/platforms/avr/drivers/ws2812_i2c.c
@@ -5,12 +5,12 @@
 #    error "RGBW not supported"
 #endif
 
-#ifndef WS2812_ADDRESS
-#    define WS2812_ADDRESS 0xb0
+#ifndef WS2812_I2C_ADDRESS
+#    define WS2812_I2C_ADDRESS 0xB0
 #endif
 
-#ifndef WS2812_TIMEOUT
-#    define WS2812_TIMEOUT 100
+#ifndef WS2812_I2C_TIMEOUT
+#    define WS2812_I2C_TIMEOUT 100
 #endif
 
 void ws2812_init(void) {
@@ -25,5 +25,5 @@ void ws2812_setleds(LED_TYPE *ledarray, uint16_t leds) {
         s_init = true;
     }
 
-    i2c_transmit(WS2812_ADDRESS, (uint8_t *)ledarray, sizeof(LED_TYPE) * leds, WS2812_TIMEOUT);
+    i2c_transmit(WS2812_I2C_ADDRESS, (uint8_t *)ledarray, sizeof(LED_TYPE) * leds, WS2812_I2C_TIMEOUT);
 }
diff --git a/platforms/chibios/boards/BONSAI_C4/configs/config.h b/platforms/chibios/boards/BONSAI_C4/configs/config.h
index e412f73d3d..c5dbb25c45 100644
--- a/platforms/chibios/boards/BONSAI_C4/configs/config.h
+++ b/platforms/chibios/boards/BONSAI_C4/configs/config.h
@@ -67,8 +67,8 @@
 
 // WS2812-style LED control on pin A10
 #ifdef WS2812_DRIVER_PWM
-#    ifndef RGB_DI_PIN
-#        define RGB_DI_PIN PAL_LINE(GPIOA, 10)
+#    ifndef WS2812_DI_PIN
+#        define WS2812_DI_PIN PAL_LINE(GPIOA, 10)
 #    endif
 #    ifndef WS2812_PWM_DRIVER
 #        define WS2812_PWM_DRIVER PWMD1
diff --git a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x6_stm32duino_bootloader.ld b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x6_stm32duino.ld
index 18aaff2a23..18aaff2a23 100644
--- a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x6_stm32duino_bootloader.ld
+++ b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x6_stm32duino.ld
diff --git a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino.ld
index 465af12cab..465af12cab 100644
--- a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino_bootloader.ld
+++ b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103x8_stm32duino.ld
diff --git a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino.ld
index 3a47a33156..3a47a33156 100644
--- a/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino_bootloader.ld
+++ b/platforms/chibios/boards/STM32_F103_STM32DUINO/ld/STM32F103xB_stm32duino.ld
diff --git a/platforms/chibios/boards/common/ld/STM32F103x8_uf2boot.ld b/platforms/chibios/boards/common/ld/STM32F103x8_uf2boot.ld
new file mode 100644
index 0000000000..adf43c362a
--- /dev/null
+++ b/platforms/chibios/boards/common/ld/STM32F103x8_uf2boot.ld
@@ -0,0 +1,88 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * ST32F103x8 memory setup.
+ */
+MEMORY
+{
+    flash0 (rx) : org = 0x08000000 + 16K, len = 64k - 16K
+    flash1 (rx) : org = 0x00000000, len = 0
+    flash2 (rx) : org = 0x00000000, len = 0
+    flash3 (rx) : org = 0x00000000, len = 0
+    flash4 (rx) : org = 0x00000000, len = 0
+    flash5 (rx) : org = 0x00000000, len = 0
+    flash6 (rx) : org = 0x00000000, len = 0
+    flash7 (rx) : org = 0x00000000, len = 0
+    ram0   (wx) : org = 0x20000000, len = 20k
+    ram1   (wx) : org = 0x00000000, len = 0
+    ram2   (wx) : org = 0x00000000, len = 0
+    ram3   (wx) : org = 0x00000000, len = 0
+    ram4   (wx) : org = 0x00000000, len = 0
+    ram5   (wx) : org = 0x00000000, len = 0
+    ram6   (wx) : org = 0x00000000, len = 0
+    ram7   (wx) : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
+
+/* Bootloader reset support */
+_board_magic_reg = ORIGIN(ram0) + 16k; /* this is based off the code within backup.c */
diff --git a/platforms/chibios/bootloader.mk b/platforms/chibios/bootloader.mk
index 4812412344..fc898e7699 100644
--- a/platforms/chibios/bootloader.mk
+++ b/platforms/chibios/bootloader.mk
@@ -93,7 +93,6 @@ ifeq ($(strip $(BOOTLOADER)), kiibohd)
 endif
 ifeq ($(strip $(BOOTLOADER)), stm32duino)
     OPT_DEFS += -DBOOTLOADER_STM32DUINO
-    MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
     BOARD = STM32_F103_STM32DUINO
     BOOTLOADER_TYPE = stm32duino
 
diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index 4c8333f07b..52632a051e 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -33,26 +33,40 @@
 #    define RP2040_PWM_CHANNEL_A 1U
 #    define RP2040_PWM_CHANNEL_B 2U
 
-#    define BACKLIGHT_PAL_MODE (PAL_MODE_ALTERNATE_PWM | PAL_RP_PAD_DRIVE12 | PAL_RP_GPIO_OE)
+#    ifndef BACKLIGHT_PAL_MODE
+#        define BACKLIGHT_PAL_MODE (PAL_MODE_ALTERNATE_PWM | PAL_RP_PAD_DRIVE12 | PAL_RP_GPIO_OE)
+#    endif
 #    define BACKLIGHT_PWM_COUNTER_FREQUENCY 1000000
 #    define BACKLIGHT_PWM_PERIOD BACKLIGHT_PWM_COUNTER_FREQUENCY / 2048
 
-#    define AUDIO_PWM_PAL_MODE (PAL_MODE_ALTERNATE_PWM | PAL_RP_PAD_DRIVE12 | PAL_RP_GPIO_OE)
+#    ifndef AUDIO_PWM_PAL_MODE
+#        define AUDIO_PWM_PAL_MODE (PAL_MODE_ALTERNATE_PWM | PAL_RP_PAD_DRIVE12 | PAL_RP_GPIO_OE)
+#    endif
 #    define AUDIO_PWM_COUNTER_FREQUENCY 500000
 
 #    define usb_lld_endpoint_fields
 
-#    define I2C1_SCL_PAL_MODE (PAL_MODE_ALTERNATE_I2C | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_PUE | PAL_RP_PAD_DRIVE4)
-#    define I2C1_SDA_PAL_MODE I2C1_SCL_PAL_MODE
+#    ifndef I2C1_SCL_PAL_MODE
+#        define I2C1_SCL_PAL_MODE (PAL_MODE_ALTERNATE_I2C | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_PUE | PAL_RP_PAD_DRIVE4)
+#    endif
+#    ifndef I2C1_SDA_PAL_MODE
+#        define I2C1_SDA_PAL_MODE (PAL_MODE_ALTERNATE_I2C | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_PUE | PAL_RP_PAD_DRIVE4)
+#    endif
 
 #    define USE_I2CV1_CONTRIB
 #    if !defined(I2C1_CLOCK_SPEED)
 #        define I2C1_CLOCK_SPEED 400000
 #    endif
 
-#    define SPI_SCK_PAL_MODE (PAL_MODE_ALTERNATE_SPI | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_DRIVE4)
-#    define SPI_MOSI_PAL_MODE SPI_SCK_PAL_MODE
-#    define SPI_MISO_PAL_MODE SPI_SCK_PAL_MODE
+#    ifndef SPI_SCK_PAL_MODE
+#        define SPI_SCK_PAL_MODE (PAL_MODE_ALTERNATE_SPI | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_DRIVE4)
+#    endif
+#    ifndef SPI_MOSI_PAL_MODE
+#        define SPI_MOSI_PAL_MODE (PAL_MODE_ALTERNATE_SPI | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_DRIVE4)
+#    endif
+#    ifndef SPI_MISO_PAL_MODE
+#        define SPI_MISO_PAL_MODE (PAL_MODE_ALTERNATE_SPI | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_DRIVE4)
+#    endif
 #endif
 
 // STM32 compatibility
diff --git a/platforms/chibios/converters/elite_c_to_liatris/pre_converter.mk b/platforms/chibios/converters/elite_c_to_liatris/pre_converter.mk
new file mode 100644
index 0000000000..b38823fa5f
--- /dev/null
+++ b/platforms/chibios/converters/elite_c_to_liatris/pre_converter.mk
@@ -0,0 +1,2 @@
+CONVERTER:=platforms/chibios/converters/elite_c_to_rp2040_ce
+ACTIVE_CONVERTER:=rp2040_ce
diff --git a/platforms/chibios/converters/promicro_to_liatris/pre_converter.mk b/platforms/chibios/converters/promicro_to_liatris/pre_converter.mk
new file mode 100644
index 0000000000..7b3130a5e9
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_liatris/pre_converter.mk
@@ -0,0 +1,2 @@
+CONVERTER:=platforms/chibios/converters/promicro_to_rp2040_ce
+ACTIVE_CONVERTER:=rp2040_ce
diff --git a/platforms/chibios/drivers/audio_dac_additive.c b/platforms/chibios/drivers/audio_dac_additive.c
index 68ce13788e..d29147ca3b 100644
--- a/platforms/chibios/drivers/audio_dac_additive.c
+++ b/platforms/chibios/drivers/audio_dac_additive.c
@@ -19,6 +19,10 @@
 #include <ch.h>
 #include <hal.h>
 
+// Need to disable GCC's "tautological-compare" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`. Corresponding pop at the end of the file.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wtautological-compare"
+
 /*
   Audio Driver: DAC
 
@@ -335,3 +339,5 @@ void audio_driver_start(void) {
     active_tones_snapshot_length = 0;
     state                        = OUTPUT_SHOULD_START;
 }
+
+#pragma GCC diagnostic pop
diff --git a/platforms/chibios/drivers/audio_dac_basic.c b/platforms/chibios/drivers/audio_dac_basic.c
index 5f0cbf8f84..4ea23a2158 100644
--- a/platforms/chibios/drivers/audio_dac_basic.c
+++ b/platforms/chibios/drivers/audio_dac_basic.c
@@ -19,6 +19,10 @@
 #include "ch.h"
 #include "hal.h"
 
+// Need to disable GCC's "tautological-compare" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`. Corresponding pop at the end of the file.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wtautological-compare"
+
 /*
   Audio Driver: DAC
 
@@ -247,3 +251,5 @@ void audio_driver_start(void) {
     }
     gptStartContinuous(&AUDIO_STATE_TIMER, 2U);
 }
+
+#pragma GCC diagnostic pop
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ps2_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ps2_vendor.c
new file mode 100644
index 0000000000..937fa5de6f
--- /dev/null
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/ps2_vendor.c
@@ -0,0 +1,271 @@
+// Copyright 2022 Marek Kraus (@gamelaster)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#include "hardware/pio.h"
+#include "hardware/clocks.h"
+#include "ps2.h"
+#include "print.h"
+
+#if !defined(MCU_RP)
+#    error PIO Driver is only available for Raspberry Pi 2040 MCUs!
+#endif
+
+#if defined(PS2_ENABLE)
+#    if defined(PS2_MOUSE_ENABLE)
+#        if !defined(PS2_MOUSE_USE_REMOTE_MODE)
+#            define BUFFERED_MODE_ENABLE
+#        endif
+#    else // PS2 Keyboard
+#        define BUFFERED_MODE_ENABLE
+#    endif
+#endif
+
+#if PS2_DATA_PIN + 1 != PS2_CLOCK_PIN
+#    error PS/2 Clock pin must be followed by data pin!
+#endif
+
+static inline void pio_serve_interrupt(void);
+
+#if defined(PS2_PIO_USE_PIO1)
+static const PIO pio = pio1;
+
+OSAL_IRQ_HANDLER(RP_PIO1_IRQ_0_HANDLER) {
+    OSAL_IRQ_PROLOGUE();
+    pio_serve_interrupt();
+    OSAL_IRQ_EPILOGUE();
+}
+#else
+static const PIO pio = pio0;
+
+OSAL_IRQ_HANDLER(RP_PIO0_IRQ_0_HANDLER) {
+    OSAL_IRQ_PROLOGUE();
+    pio_serve_interrupt();
+    OSAL_IRQ_EPILOGUE();
+}
+#endif
+
+#define PS2_WRAP_TARGET 0
+#define PS2_WRAP 20
+
+// clang-format off
+static const uint16_t ps2_program_instructions[] = {
+            //     .wrap_target
+    0x00c7, //  0: jmp    pin, 7
+    0xe02a, //  1: set    x, 10
+    0x2021, //  2: wait   0 pin, 1
+    0x4001, //  3: in     pins, 1
+    0x20a1, //  4: wait   1 pin, 1
+    0x0042, //  5: jmp    x--, 2
+    0x0000, //  6: jmp    0
+    0x00e9, //  7: jmp    !osre, 9
+    0x0000, //  8: jmp    0
+    0xff81, //  9: set    pindirs, 1             [31]
+    0xe280, // 10: set    pindirs, 0             [2]
+    0xe082, // 11: set    pindirs, 2
+    0x2021, // 12: wait   0 pin, 1
+    0xe029, // 13: set    x, 9
+    0x6081, // 14: out    pindirs, 1
+    0x20a1, // 15: wait   1 pin, 1
+    0x2021, // 16: wait   0 pin, 1
+    0x004e, // 17: jmp    x--, 14
+    0xe083, // 18: set    pindirs, 3
+    0x2021, // 19: wait   0 pin, 1
+    0x20a1, // 20: wait   1 pin, 1
+            //     .wrap
+};
+// clang-format on
+
+static const struct pio_program ps2_program = {
+    .instructions = ps2_program_instructions,
+    .length       = 21,
+    .origin       = -1,
+};
+
+static int                state_machine = -1;
+static thread_reference_t tx_thread     = NULL;
+
+#define BUFFER_SIZE 32
+static input_buffers_queue_t               pio_rx_queue;
+static __attribute__((aligned(4))) uint8_t pio_rx_buffer[BQ_BUFFER_SIZE(BUFFER_SIZE, sizeof(uint32_t))];
+
+uint8_t ps2_error = PS2_ERR_NONE;
+
+void pio_serve_interrupt(void) {
+    uint32_t irqs = pio->ints0;
+
+    if (irqs & (PIO_IRQ0_INTF_SM0_RXNEMPTY_BITS << state_machine)) {
+        osalSysLockFromISR();
+        uint32_t* frame_buffer = (uint32_t*)ibqGetEmptyBufferI(&pio_rx_queue);
+        if (frame_buffer == NULL) {
+            osalSysUnlockFromISR();
+            return;
+        }
+        *frame_buffer = pio_sm_get(pio, state_machine);
+        ibqPostFullBufferI(&pio_rx_queue, sizeof(uint32_t));
+        osalSysUnlockFromISR();
+    }
+
+    if (irqs & (PIO_IRQ0_INTF_SM0_TXNFULL_BITS << state_machine)) {
+        pio_set_irq0_source_enabled(pio, pis_sm0_tx_fifo_not_full + state_machine, false);
+        osalSysLockFromISR();
+        osalThreadResumeI(&tx_thread, MSG_OK);
+        osalSysUnlockFromISR();
+    }
+}
+
+void ps2_host_init(void) {
+    ibqObjectInit(&pio_rx_queue, false, pio_rx_buffer, sizeof(uint32_t), BUFFER_SIZE, NULL, NULL);
+    uint pio_idx = pio_get_index(pio);
+
+    hal_lld_peripheral_unreset(pio_idx == 0 ? RESETS_ALLREG_PIO0 : RESETS_ALLREG_PIO1);
+
+    state_machine = pio_claim_unused_sm(pio, true);
+    if (state_machine < 0) {
+        dprintln("ERROR: Failed to acquire state machine for PS/2!");
+        ps2_error = PS2_ERR_NODATA;
+        return;
+    }
+
+    uint offset = pio_add_program(pio, &ps2_program);
+
+    pio_sm_config c = pio_get_default_sm_config();
+    sm_config_set_wrap(&c, offset + PS2_WRAP_TARGET, offset + PS2_WRAP);
+
+    // Set pindirs to input (output enable is inverted below)
+    pio_sm_set_consecutive_pindirs(pio, state_machine, PS2_DATA_PIN, 2, true);
+    sm_config_set_clkdiv(&c, (float)clock_get_hz(clk_sys) / (200.0f * KHZ));
+    sm_config_set_set_pins(&c, PS2_DATA_PIN, 2);
+    sm_config_set_out_pins(&c, PS2_DATA_PIN, 1);
+    sm_config_set_out_shift(&c, true, true, 10);
+    sm_config_set_in_shift(&c, true, true, 11);
+    sm_config_set_jmp_pin(&c, PS2_CLOCK_PIN);
+    sm_config_set_in_pins(&c, PS2_DATA_PIN);
+
+    // clang-format off
+    iomode_t pin_mode = PAL_RP_PAD_IE |
+                        PAL_RP_GPIO_OE |
+                        PAL_RP_PAD_SLEWFAST |
+                        PAL_RP_PAD_DRIVE12 |
+                        // Invert output enable so that pindirs=1 means input
+                        // and indirs=0 means output. This way, out pindirs
+                        // works correctly with the open-drain PS/2 interface.
+                        // Setting pindirs=1 effectively pulls the line high,
+                        // due to the pull-up resistor, while pindirs=0 pulls
+                        // the line low.
+                        PAL_RP_IOCTRL_OEOVER_DRVINVPERI |
+                        (pio_idx == 0 ? PAL_MODE_ALTERNATE_PIO0 : PAL_MODE_ALTERNATE_PIO1);
+    // clang-format on
+
+    palSetLineMode(PS2_DATA_PIN, pin_mode);
+    palSetLineMode(PS2_CLOCK_PIN, pin_mode);
+
+    pio_set_irq0_source_enabled(pio, pis_sm0_rx_fifo_not_empty + state_machine, true);
+    pio_sm_init(pio, state_machine, offset, &c);
+
+#if defined(PS2_PIO_USE_PIO1)
+    nvicEnableVector(RP_PIO1_IRQ_0_NUMBER, CORTEX_MAX_KERNEL_PRIORITY);
+#else
+    nvicEnableVector(RP_PIO0_IRQ_0_NUMBER, CORTEX_MAX_KERNEL_PRIORITY);
+#endif
+
+    pio_sm_set_enabled(pio, state_machine, true);
+}
+
+static int bit_parity(int x) {
+    return !__builtin_parity(x);
+}
+
+uint8_t ps2_host_send(uint8_t data) {
+    uint32_t frame = 0b1000000000;
+    frame          = frame | data;
+
+    if (bit_parity(data)) {
+        frame = frame | (1 << 8);
+    }
+
+    pio_sm_put(pio, state_machine, frame);
+
+    msg_t msg = MSG_OK;
+    osalSysLock();
+    while (pio_sm_is_tx_fifo_full(pio, state_machine)) {
+        pio_set_irq0_source_enabled(pio, pis_sm0_tx_fifo_not_full + state_machine, true);
+        msg = osalThreadSuspendTimeoutS(&tx_thread, TIME_MS2I(100));
+        if (msg < MSG_OK) {
+            pio_set_irq0_source_enabled(pio, pis_sm0_tx_fifo_not_full + state_machine, false);
+            ps2_error = PS2_ERR_NODATA;
+            osalSysUnlock();
+            return 0;
+        }
+    }
+    osalSysUnlock();
+
+    return ps2_host_recv_response();
+}
+
+static uint8_t ps2_get_data_from_frame(uint32_t frame) {
+    uint8_t  data       = (frame >> 22) & 0xFF;
+    uint32_t start_bit  = (frame & 0b00000000001000000000000000000000) ? 1 : 0;
+    uint32_t parity_bit = (frame & 0b01000000000000000000000000000000) ? 1 : 0;
+    uint32_t stop_bit   = (frame & 0b10000000001000000000000000000000) ? 1 : 0;
+
+    if (start_bit != 0) {
+        ps2_error = PS2_ERR_STARTBIT1;
+        return 0;
+    }
+
+    if (parity_bit != bit_parity(data)) {
+        ps2_error = PS2_ERR_PARITY;
+        return 0;
+    }
+
+    if (stop_bit != 1) {
+        ps2_error = PS2_ERR_STARTBIT2;
+        return 0;
+    }
+
+    return data;
+}
+
+uint8_t ps2_host_recv_response(void) {
+    uint32_t frame = 0;
+    msg_t    msg   = MSG_OK;
+
+    msg = ibqReadTimeout(&pio_rx_queue, (uint8_t*)&frame, sizeof(uint32_t), TIME_MS2I(100));
+    if (msg < MSG_OK) {
+        ps2_error = PS2_ERR_NODATA;
+        return 0;
+    }
+
+    return ps2_get_data_from_frame(frame);
+}
+
+#ifdef BUFFERED_MODE_ENABLE
+
+bool pbuf_has_data(void) {
+    osalSysLock();
+    bool has_data = !ibqIsEmptyI(&pio_rx_queue);
+    osalSysUnlock();
+    return has_data;
+}
+
+uint8_t ps2_host_recv(void) {
+    uint32_t frame = 0;
+    msg_t    msg   = MSG_OK;
+
+    uint8_t has_data = pbuf_has_data();
+    if (has_data) {
+        msg = ibqReadTimeout(&pio_rx_queue, (uint8_t*)&frame, sizeof(uint32_t), TIME_MS2I(100));
+        if (msg < MSG_OK) {
+            ps2_error = PS2_ERR_NODATA;
+            return 0;
+        }
+    } else {
+        ps2_error = PS2_ERR_NODATA;
+    }
+
+    return frame != 0 ? ps2_get_data_from_frame(frame) : 0;
+}
+
+#endif
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
index a46b099195..99a6cfaba9 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
@@ -185,7 +185,7 @@ bool ws2812_init(void) {
                             (pio_idx == 0 ? PAL_MODE_ALTERNATE_PIO0 : PAL_MODE_ALTERNATE_PIO1);
     // clang-format on
 
-    palSetLineMode(RGB_DI_PIN, rgb_pin_mode);
+    palSetLineMode(WS2812_DI_PIN, rgb_pin_mode);
 
     STATE_MACHINE = pio_claim_unused_sm(pio, true);
     if (STATE_MACHINE < 0) {
@@ -195,11 +195,11 @@ bool ws2812_init(void) {
 
     uint offset = pio_add_program(pio, &ws2812_program);
 
-    pio_sm_set_consecutive_pindirs(pio, STATE_MACHINE, RGB_DI_PIN, 1, true);
+    pio_sm_set_consecutive_pindirs(pio, STATE_MACHINE, WS2812_DI_PIN, 1, true);
 
     pio_sm_config config = pio_get_default_sm_config();
     sm_config_set_wrap(&config, offset + WS2812_WRAP_TARGET, offset + WS2812_WRAP);
-    sm_config_set_sideset_pins(&config, RGB_DI_PIN);
+    sm_config_set_sideset_pins(&config, WS2812_DI_PIN);
     sm_config_set_fifo_join(&config, PIO_FIFO_JOIN_TX);
 
 #if defined(WS2812_EXTERNAL_PULLUP)
diff --git a/platforms/chibios/drivers/ws2812.c b/platforms/chibios/drivers/ws2812.c
deleted file mode 100644
index 55ac333b1e..0000000000
--- a/platforms/chibios/drivers/ws2812.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include "quantum.h"
-#include "ws2812.h"
-#include <ch.h>
-#include <hal.h>
-
-/* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */
-
-#ifndef NOP_FUDGE
-#    if defined(STM32F0XX) || defined(STM32F1XX) || defined(GD32VF103) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
-#        define NOP_FUDGE 0.4
-#    else
-#        error("NOP_FUDGE configuration required")
-#        define NOP_FUDGE 1 // this just pleases the compile so the above error is easier to spot
-#    endif
-#endif
-
-// Push Pull or Open Drain Configuration
-// Default Push Pull
-#ifndef WS2812_EXTERNAL_PULLUP
-#    define WS2812_OUTPUT_MODE PAL_MODE_OUTPUT_PUSHPULL
-#else
-#    define WS2812_OUTPUT_MODE PAL_MODE_OUTPUT_OPENDRAIN
-#endif
-
-// The reset gap can be 6000 ns, but depending on the LED strip it may have to be increased
-// to values like 600000 ns. If it is too small, the pixels will show nothing most of the time.
-#ifndef WS2812_RES
-#    define WS2812_RES (1000 * WS2812_TRST_US) // Width of the low gap between bits to cause a frame to latch
-#endif
-
-#define NUMBER_NOPS 6
-#define CYCLES_PER_SEC (CPU_CLOCK / NUMBER_NOPS * NOP_FUDGE)
-#define NS_PER_SEC (1000000000L) // Note that this has to be SIGNED since we want to be able to check for negative values of derivatives
-#define NS_PER_CYCLE (NS_PER_SEC / CYCLES_PER_SEC)
-#define NS_TO_CYCLES(n) ((n) / NS_PER_CYCLE)
-
-#define wait_ns(x)                                  \
-    do {                                            \
-        for (int i = 0; i < NS_TO_CYCLES(x); i++) { \
-            __asm__ volatile("nop\n\t"              \
-                             "nop\n\t"              \
-                             "nop\n\t"              \
-                             "nop\n\t"              \
-                             "nop\n\t"              \
-                             "nop\n\t");            \
-        }                                           \
-    } while (0)
-
-void sendByte(uint8_t byte) {
-    // WS2812 protocol wants most significant bits first
-    for (unsigned char bit = 0; bit < 8; bit++) {
-        bool is_one = byte & (1 << (7 - bit));
-        // using something like wait_ns(is_one ? T1L : T0L) here throws off timings
-        if (is_one) {
-            // 1
-            writePinHigh(RGB_DI_PIN);
-            wait_ns(WS2812_T1H);
-            writePinLow(RGB_DI_PIN);
-            wait_ns(WS2812_T1L);
-        } else {
-            // 0
-            writePinHigh(RGB_DI_PIN);
-            wait_ns(WS2812_T0H);
-            writePinLow(RGB_DI_PIN);
-            wait_ns(WS2812_T0L);
-        }
-    }
-}
-
-void ws2812_init(void) {
-    palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE);
-}
-
-// Setleds for standard RGB
-void ws2812_setleds(LED_TYPE *ledarray, uint16_t leds) {
-    static bool s_init = false;
-    if (!s_init) {
-        ws2812_init();
-        s_init = true;
-    }
-
-    // this code is very time dependent, so we need to disable interrupts
-    chSysLock();
-
-    for (uint8_t i = 0; i < leds; i++) {
-        // WS2812 protocol dictates grb order
-#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
-        sendByte(ledarray[i].g);
-        sendByte(ledarray[i].r);
-        sendByte(ledarray[i].b);
-#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
-        sendByte(ledarray[i].r);
-        sendByte(ledarray[i].g);
-        sendByte(ledarray[i].b);
-#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_BGR)
-        sendByte(ledarray[i].b);
-        sendByte(ledarray[i].g);
-        sendByte(ledarray[i].r);
-#endif
-
-#ifdef RGBW
-        sendByte(ledarray[i].w);
-#endif
-    }
-
-    wait_ns(WS2812_RES);
-
-    chSysUnlock();
-}
diff --git a/platforms/chibios/drivers/ws2812_bitbang.c b/platforms/chibios/drivers/ws2812_bitbang.c
new file mode 100644
index 0000000000..d05deb1a50
--- /dev/null
+++ b/platforms/chibios/drivers/ws2812_bitbang.c
@@ -0,0 +1,109 @@
+#include "quantum.h"
+#include "ws2812.h"
+#include <ch.h>
+#include <hal.h>
+
+/* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */
+
+#ifndef NOP_FUDGE
+#    if defined(STM32F0XX) || defined(STM32F1XX) || defined(GD32VF103) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
+#        define NOP_FUDGE 0.4
+#    else
+#        error("NOP_FUDGE configuration required")
+#        define NOP_FUDGE 1 // this just pleases the compile so the above error is easier to spot
+#    endif
+#endif
+
+// Push Pull or Open Drain Configuration
+// Default Push Pull
+#ifndef WS2812_EXTERNAL_PULLUP
+#    define WS2812_OUTPUT_MODE PAL_MODE_OUTPUT_PUSHPULL
+#else
+#    define WS2812_OUTPUT_MODE PAL_MODE_OUTPUT_OPENDRAIN
+#endif
+
+// The reset gap can be 6000 ns, but depending on the LED strip it may have to be increased
+// to values like 600000 ns. If it is too small, the pixels will show nothing most of the time.
+#ifndef WS2812_RES
+#    define WS2812_RES (1000 * WS2812_TRST_US) // Width of the low gap between bits to cause a frame to latch
+#endif
+
+#define NUMBER_NOPS 6
+#define CYCLES_PER_SEC (CPU_CLOCK / NUMBER_NOPS * NOP_FUDGE)
+#define NS_PER_SEC (1000000000L) // Note that this has to be SIGNED since we want to be able to check for negative values of derivatives
+#define NS_PER_CYCLE (NS_PER_SEC / CYCLES_PER_SEC)
+#define NS_TO_CYCLES(n) ((n) / NS_PER_CYCLE)
+
+#define wait_ns(x)                                  \
+    do {                                            \
+        for (int i = 0; i < NS_TO_CYCLES(x); i++) { \
+            __asm__ volatile("nop\n\t"              \
+                             "nop\n\t"              \
+                             "nop\n\t"              \
+                             "nop\n\t"              \
+                             "nop\n\t"              \
+                             "nop\n\t");            \
+        }                                           \
+    } while (0)
+
+void sendByte(uint8_t byte) {
+    // WS2812 protocol wants most significant bits first
+    for (unsigned char bit = 0; bit < 8; bit++) {
+        bool is_one = byte & (1 << (7 - bit));
+        // using something like wait_ns(is_one ? T1L : T0L) here throws off timings
+        if (is_one) {
+            // 1
+            writePinHigh(WS2812_DI_PIN);
+            wait_ns(WS2812_T1H);
+            writePinLow(WS2812_DI_PIN);
+            wait_ns(WS2812_T1L);
+        } else {
+            // 0
+            writePinHigh(WS2812_DI_PIN);
+            wait_ns(WS2812_T0H);
+            writePinLow(WS2812_DI_PIN);
+            wait_ns(WS2812_T0L);
+        }
+    }
+}
+
+void ws2812_init(void) {
+    palSetLineMode(WS2812_DI_PIN, WS2812_OUTPUT_MODE);
+}
+
+// Setleds for standard RGB
+void ws2812_setleds(LED_TYPE *ledarray, uint16_t leds) {
+    static bool s_init = false;
+    if (!s_init) {
+        ws2812_init();
+        s_init = true;
+    }
+
+    // this code is very time dependent, so we need to disable interrupts
+    chSysLock();
+
+    for (uint8_t i = 0; i < leds; i++) {
+        // WS2812 protocol dictates grb order
+#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
+        sendByte(ledarray[i].g);
+        sendByte(ledarray[i].r);
+        sendByte(ledarray[i].b);
+#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
+        sendByte(ledarray[i].r);
+        sendByte(ledarray[i].g);
+        sendByte(ledarray[i].b);
+#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_BGR)
+        sendByte(ledarray[i].b);
+        sendByte(ledarray[i].g);
+        sendByte(ledarray[i].r);
+#endif
+
+#ifdef RGBW
+        sendByte(ledarray[i].w);
+#endif
+    }
+
+    wait_ns(WS2812_RES);
+
+    chSysUnlock();
+}
diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index c4a591c10b..04c8279a97 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -308,7 +308,7 @@ void ws2812_init(void) {
     for (i = 0; i < WS2812_RESET_BIT_N; i++)
         ws2812_frame_buffer[i + WS2812_COLOR_BIT_N] = 0; // All reset bits are zero
 
-    palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE);
+    palSetLineMode(WS2812_DI_PIN, WS2812_OUTPUT_MODE);
 
     // PWM Configuration
     //#pragma GCC diagnostic ignored "-Woverride-init"  // Turn off override-init warning for this struct. We use the overriding ability to set a "default" channel config
diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
index 03ffbd7f82..c28f5007f1 100644
--- a/platforms/chibios/drivers/ws2812_spi.c
+++ b/platforms/chibios/drivers/ws2812_spi.c
@@ -136,7 +136,7 @@ static void set_led_color_rgb(LED_TYPE color, int pos) {
 }
 
 void ws2812_init(void) {
-    palSetLineMode(RGB_DI_PIN, WS2812_MOSI_OUTPUT_MODE);
+    palSetLineMode(WS2812_DI_PIN, WS2812_MOSI_OUTPUT_MODE);
 
 #ifdef WS2812_SPI_SCK_PIN
     palSetLineMode(WS2812_SPI_SCK_PIN, WS2812_SCK_OUTPUT_MODE);
@@ -150,8 +150,8 @@ void ws2812_init(void) {
         WS2812_SPI_BUFFER_MODE,
 #    endif
         NULL, // end_cb
-        PAL_PORT(RGB_DI_PIN),
-        PAL_PAD(RGB_DI_PIN),
+        PAL_PORT(WS2812_DI_PIN),
+        PAL_PAD(WS2812_DI_PIN),
 #    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
         0,
         0,
@@ -170,8 +170,8 @@ void ws2812_init(void) {
 #    endif
         NULL, // data_cb
         NULL, // error_cb
-        PAL_PORT(RGB_DI_PIN),
-        PAL_PAD(RGB_DI_PIN),
+        PAL_PORT(WS2812_DI_PIN),
+        PAL_PAD(WS2812_DI_PIN),
         WS2812_SPI_DIVISOR_CR1_BR_X,
         0
 #endif
diff --git a/platforms/chibios/flash.mk b/platforms/chibios/flash.mk
index ac842e8d62..525f177f9e 100644
--- a/platforms/chibios/flash.mk
+++ b/platforms/chibios/flash.mk
@@ -42,15 +42,7 @@ dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter
 	$(call EXEC_DFU_UTIL)
 
 define EXEC_UF2_UTIL_DEPLOY
-	if ! $(UF2CONV) --deploy $(BUILD_DIR)/$(TARGET).uf2 2>/dev/null; then \
-		printf "$(MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY)" ;\
-		sleep $(BOOTLOADER_RETRY_TIME) ;\
-		while ! $(UF2CONV) --deploy $(BUILD_DIR)/$(TARGET).uf2  2>/dev/null; do \
-			printf "." ;\
-			sleep $(BOOTLOADER_RETRY_TIME) ;\
-		done ;\
-		printf "\n" ;\
-	fi
+	$(UF2CONV) --wait --deploy $(BUILD_DIR)/$(TARGET).uf2
 endef
 
 # TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS
diff --git a/platforms/chibios/mcu_selection.mk b/platforms/chibios/mcu_selection.mk
index 6b6488466b..5f7bd1d44e 100644
--- a/platforms/chibios/mcu_selection.mk
+++ b/platforms/chibios/mcu_selection.mk
@@ -273,11 +273,7 @@ ifneq ($(findstring STM32F103, $(MCU)),)
   # Linker script to use
   # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
   #   or <keyboard_dir>/ld/
-  ifeq ($(strip $(BOOTLOADER)), uf2boot)
-    MCU_LDSCRIPT ?= STM32F103xB_uf2boot
-  else
-    MCU_LDSCRIPT ?= STM32F103x8
-  endif
+  MCU_LDSCRIPT ?= STM32F103x8
 
   # Startup code to use
   #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
@@ -311,11 +307,7 @@ ifneq ($(findstring STM32F303, $(MCU)),)
   # Linker script to use
   # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
   #   or <keyboard_dir>/ld/
-  ifeq ($(strip $(BOOTLOADER)), tinyuf2)
-    MCU_LDSCRIPT ?= STM32F303xC_tinyuf2
-  else
-    MCU_LDSCRIPT ?= STM32F303xC
-  endif
+  MCU_LDSCRIPT ?= STM32F303xC
 
   # Startup code to use
   #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
@@ -352,11 +344,7 @@ ifneq ($(findstring STM32F401, $(MCU)),)
   # Linker script to use
   # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
   #   or <keyboard_dir>/ld/
-  ifeq ($(strip $(BOOTLOADER)), tinyuf2)
-    MCU_LDSCRIPT ?= STM32F401xC_tinyuf2
-  else
-    MCU_LDSCRIPT ?= STM32F401xC
-  endif
+  MCU_LDSCRIPT ?= STM32F401xC
 
   # Startup code to use
   #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
@@ -471,11 +459,7 @@ ifneq ($(findstring STM32F411, $(MCU)),)
   # Linker script to use
   # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
   #   or <keyboard_dir>/ld/
-  ifeq ($(strip $(BOOTLOADER)), tinyuf2)
-    MCU_LDSCRIPT ?= STM32F411xE_tinyuf2
-  else
-    MCU_LDSCRIPT ?= STM32F411xE
-  endif
+  MCU_LDSCRIPT ?= STM32F411xE
 
   # Startup code to use
   #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index fd4c6bd2e5..6304b42d87 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -235,6 +235,11 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld)","")
     LDSCRIPT = $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld
 else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld)","")
     LDSCRIPT = $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld
+else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld/$(MCU_LDSCRIPT)_$(BOOTLOADER).ld)","")
+    LDFLAGS += -L$(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld
+    LDSCRIPT = $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld/$(MCU_LDSCRIPT)_$(BOOTLOADER).ld
+else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/common/ld/$(MCU_LDSCRIPT)_$(BOOTLOADER).ld)","")
+    LDSCRIPT = $(TOP_DIR)/platforms/chibios/boards/common/ld/$(MCU_LDSCRIPT)_$(BOOTLOADER).ld
 else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld/$(MCU_LDSCRIPT).ld)","")
     LDFLAGS += -L$(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld
     LDSCRIPT = $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/ld/$(MCU_LDSCRIPT).ld
diff --git a/quantum/action.c b/quantum/action.c
index 7d3f40a950..9a6bbcca11 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "host.h"
 #include "keycode.h"
 #include "keyboard.h"
-#include "keymap.h"
 #include "mousekey.h"
 #include "programmable_button.h"
 #include "command.h"
@@ -30,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action.h"
 #include "wait.h"
 #include "keycode_config.h"
+#include "debug.h"
 
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
@@ -39,6 +39,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "pointing_device.h"
 #endif
 
+#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) && defined(SWAP_HANDS_ENABLE)
+#    include "encoder.h"
+#endif
+
 int tp_buttons;
 
 #if defined(RETRO_TAPPING) || defined(RETRO_TAPPING_PER_KEY) || (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT))
@@ -161,6 +165,18 @@ void set_swap_hands_state(size_t index, uint8_t *swap_state, bool on) {
     }
 }
 
+void swap_hands_on(void) {
+    swap_hands = true;
+}
+
+void swap_hands_off(void) {
+    swap_hands = false;
+}
+
+void swap_hands_toggle(void) {
+    swap_hands = !swap_hands;
+}
+
 bool is_swap_hands_on(void) {
     return swap_hands;
 }
@@ -435,39 +451,32 @@ void process_action(keyrecord_t *record, action_t action) {
                     } else {
                         if (event.pressed) {
                             if (tap_count == 0) {
+                                // Not a tap, but a hold: register the held mod
                                 ac_dprintf("MODS_TAP: Oneshot: 0\n");
-                                register_mods(mods | get_oneshot_mods());
+                                register_mods(mods);
                             } else if (tap_count == 1) {
                                 ac_dprintf("MODS_TAP: Oneshot: start\n");
-                                set_oneshot_mods(mods | get_oneshot_mods());
+                                add_oneshot_mods(mods);
 #        if defined(ONESHOT_TAP_TOGGLE) && ONESHOT_TAP_TOGGLE > 1
                             } else if (tap_count == ONESHOT_TAP_TOGGLE) {
                                 ac_dprintf("MODS_TAP: Toggling oneshot");
                                 register_mods(mods);
-                                clear_oneshot_mods();
-                                set_oneshot_locked_mods(mods | get_oneshot_locked_mods());
+                                del_oneshot_mods(mods);
+                                add_oneshot_locked_mods(mods);
 #        endif
-                            } else {
-                                register_mods(mods | get_oneshot_mods());
                             }
                         } else {
                             if (tap_count == 0) {
-                                clear_oneshot_mods();
+                                // Release hold: unregister the held mod and its variants
                                 unregister_mods(mods);
-                            } else if (tap_count == 1) {
-                                // Retain Oneshot mods
+                                del_oneshot_mods(mods);
+                                del_oneshot_locked_mods(mods);
 #        if defined(ONESHOT_TAP_TOGGLE) && ONESHOT_TAP_TOGGLE > 1
-                                if (mods & get_mods()) {
-                                    unregister_mods(mods);
-                                    clear_oneshot_mods();
-                                    set_oneshot_locked_mods(~mods & get_oneshot_locked_mods());
-                                }
-                            } else if (tap_count == ONESHOT_TAP_TOGGLE) {
-                                // Toggle Oneshot Layer
-#        endif
-                            } else {
+                            } else if (tap_count == 1 && (mods & get_mods())) {
                                 unregister_mods(mods);
-                                clear_oneshot_mods();
+                                del_oneshot_mods(mods);
+                                del_oneshot_locked_mods(mods);
+#        endif
                             }
                         }
                     }
@@ -487,7 +496,7 @@ void process_action(keyrecord_t *record, action_t action) {
                 default:
                     if (event.pressed) {
                         if (tap_count > 0) {
-#    if !defined(IGNORE_MOD_TAP_INTERRUPT) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
+#    ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
                             if (
 #        ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
                                 get_hold_on_other_key_press(get_event_keycode(record->event, false), record) &&
diff --git a/quantum/action.h b/quantum/action.h
index 8ef6db6781..2a2c294c5a 100644
--- a/quantum/action.h
+++ b/quantum/action.h
@@ -85,12 +85,25 @@ typedef uint32_t swap_state_row_t;
 #    endif
 
 /**
+ * @brief Enable swap hands
+ */
+void swap_hands_on(void);
+/**
+ * @brief Disable swap hands
+ */
+void swap_hands_off(void);
+/**
+ * @brief Toggle swap hands enable state
+ */
+void swap_hands_toggle(void);
+/**
  * @brief Get the swap hands enable state
  *
  * @return true
  * @return false
  */
 bool is_swap_hands_on(void);
+
 void process_hand_swap(keyevent_t *record);
 #endif
 
diff --git a/quantum/action_code.h b/quantum/action_code.h
index 58d929016d..d9a575b518 100644
--- a/quantum/action_code.h
+++ b/quantum/action_code.h
@@ -17,6 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include "modifiers.h"
+
 /** \brief Action codes
  *
  * 16bit code: action_kind(4bit) + action_parameter(12bit)
@@ -160,28 +162,6 @@ typedef union {
 #define ACTION_TRANSPARENT 1
 #define ACTION(kind, param) ((kind) << 12 | (param))
 
-/** \brief Key Actions
- *
- * Mod bits:    43210
- *   bit 0      ||||+- Control
- *   bit 1      |||+-- Shift
- *   bit 2      ||+--- Alt
- *   bit 3      |+---- Gui
- *   bit 4      +----- LR flag(Left:0, Right:1)
- */
-enum mods_bit {
-    MOD_LCTL = 0x01,
-    MOD_LSFT = 0x02,
-    MOD_LALT = 0x04,
-    MOD_LGUI = 0x08,
-    MOD_RCTL = 0x11,
-    MOD_RSFT = 0x12,
-    MOD_RALT = 0x14,
-    MOD_RGUI = 0x18,
-};
-#define MOD_HYPR (MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI)
-#define MOD_MEH (MOD_LCTL | MOD_LSFT | MOD_LALT)
-
 enum mods_codes {
     MODS_ONESHOT    = 0x00,
     MODS_TAP_TOGGLE = 0x01,
diff --git a/quantum/action_layer.c b/quantum/action_layer.c
index 789a7fddeb..7c09a5bd1e 100644
--- a/quantum/action_layer.c
+++ b/quantum/action_layer.c
@@ -2,8 +2,8 @@
 #include <stdint.h>
 
 #include "keyboard.h"
-#include "keymap.h"
 #include "action.h"
+#include "encoder.h"
 #include "util.h"
 #include "action_layer.h"
 
diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c
index 5a38bf96e3..362b15105c 100644
--- a/quantum/action_tapping.c
+++ b/quantum/action_tapping.c
@@ -11,20 +11,14 @@
 
 #    if defined(IGNORE_MOD_TAP_INTERRUPT_PER_KEY)
 #        error "IGNORE_MOD_TAP_INTERRUPT_PER_KEY has been removed; the code needs to be ported to use HOLD_ON_OTHER_KEY_PRESS_PER_KEY instead."
-#    elif !defined(IGNORE_MOD_TAP_INTERRUPT)
-#        if !defined(PERMISSIVE_HOLD) && !defined(PERMISSIVE_HOLD_PER_KEY) && !defined(HOLD_ON_OTHER_KEY_PRESS) && !defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
-#            pragma message "The default behavior of mod-taps will change to mimic IGNORE_MOD_TAP_INTERRUPT in the future.\nIf you wish to keep the old default behavior of mod-taps, please use HOLD_ON_OTHER_KEY_PRESS."
-#        endif
+#    elif defined(IGNORE_MOD_TAP_INTERRUPT)
+#        error "IGNORE_MOD_TAP_INTERRUPT is no longer necessary as it is now the default behavior of mod-tap keys. Please remove it from your config."
 #    endif
 
-#    define IS_TAPPING() IS_EVENT(tapping_key.event)
-#    define IS_TAPPING_PRESSED() (IS_TAPPING() && tapping_key.event.pressed)
-#    define IS_TAPPING_RELEASED() (IS_TAPPING() && !tapping_key.event.pressed)
-#    define IS_TAPPING_KEY(k) (IS_TAPPING() && KEYEQ(tapping_key.event.key, (k)))
 #    ifndef COMBO_ENABLE
-#        define IS_TAPPING_RECORD(r) (IS_TAPPING() && KEYEQ(tapping_key.event.key, (r->event.key)))
+#        define IS_TAPPING_RECORD(r) (KEYEQ(tapping_key.event.key, (r->event.key)))
 #    else
-#        define IS_TAPPING_RECORD(r) (IS_TAPPING() && KEYEQ(tapping_key.event.key, (r->event.key)) && tapping_key.keycode == r->keycode)
+#        define IS_TAPPING_RECORD(r) (KEYEQ(tapping_key.event.key, (r->event.key)) && tapping_key.keycode == r->keycode)
 #    endif
 #    define WITHIN_TAPPING_TERM(e) (TIMER_DIFF_16(e.time, tapping_key.event.time) < GET_TAPPING_TERM(get_record_keycode(&tapping_key, false), &tapping_key))
 #    define WITHIN_QUICK_TAP_TERM(e) (TIMER_DIFF_16(e.time, tapping_key.event.time) < GET_QUICK_TAP_TERM(get_record_keycode(&tapping_key, false), &tapping_key))
@@ -96,7 +90,7 @@ void action_tapping_process(keyrecord_t record) {
             ac_dprintf("OVERFLOW: CLEAR ALL STATES\n");
             clear_keyboard();
             waiting_buffer_clear();
-            tapping_key = (keyrecord_t){};
+            tapping_key = (keyrecord_t){0};
         }
     }
 
@@ -123,7 +117,7 @@ void action_tapping_process(keyrecord_t record) {
  * conditional uses of it are hidden inside macros named TAP_...
  */
 #    if (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)) || defined(PERMISSIVE_HOLD_PER_KEY) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
-#        define TAP_DEFINE_KEYCODE uint16_t tapping_keycode = get_record_keycode(&tapping_key, false)
+#        define TAP_DEFINE_KEYCODE const uint16_t tapping_keycode = get_record_keycode(&tapping_key, false)
 #    else
 #        define TAP_DEFINE_KEYCODE
 #    endif
@@ -162,12 +156,6 @@ void action_tapping_process(keyrecord_t record) {
 #        define TAP_GET_HOLD_ON_OTHER_KEY_PRESS false
 #    endif
 
-#    if defined(IGNORE_MOD_TAP_INTERRUPT)
-#        define TAP_GET_IGNORE_MOD_TAP_INTERRUPT true
-#    else
-#        define TAP_GET_IGNORE_MOD_TAP_INTERRUPT false
-#    endif
-
 /** \brief Tapping
  *
  * Rule: Tap key is typed(pressed and released) within TAPPING_TERM.
@@ -175,12 +163,37 @@ void action_tapping_process(keyrecord_t record) {
  */
 /* return true when key event is processed or consumed. */
 bool process_tapping(keyrecord_t *keyp) {
-    keyevent_t event = keyp->event;
+    const keyevent_t event = keyp->event;
+
+    // state machine is in the "reset" state, no tapping key is to be
+    // processed
+    if (IS_NOEVENT(tapping_key.event) && IS_EVENT(event)) {
+        if (event.pressed && is_tap_record(keyp)) {
+            // the currently pressed key is a tapping key, therefore transition
+            // into the "pressed" tapping key state
+            ac_dprintf("Tapping: Start(Press tap key).\n");
+            tapping_key = *keyp;
+            process_record_tap_hint(&tapping_key);
+            waiting_buffer_scan_tap();
+            debug_tapping_key();
+            return true;
+        } else {
+            // the current key is just a regular key, pass it on for regular
+            // processing
+            process_record(keyp);
+            return true;
+        }
+    }
+
     TAP_DEFINE_KEYCODE;
 
-    // if tapping
-    if (IS_TAPPING_PRESSED()) {
+    // process "pressed" tapping key state
+    if (tapping_key.event.pressed) {
         if (WITHIN_TAPPING_TERM(event) || MAYBE_RETRO_SHIFTING(event)) {
+            if (IS_NOEVENT(event)) {
+                // early return for tick events
+                return true;
+            }
             if (tapping_key.tap.count == 0) {
                 if (IS_TAPPING_RECORD(keyp) && !event.pressed) {
 #    if defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)
@@ -204,7 +217,7 @@ bool process_tapping(keyrecord_t *keyp) {
                 // clang-format off
                 else if (
                     (
-                        IS_RELEASED(event) && waiting_buffer_typed(event) &&
+                        !event.pressed && waiting_buffer_typed(event) &&
                         TAP_GET_PERMISSIVE_HOLD
                     )
                     // Causes nested taps to not wait past TAPPING_TERM/RETRO_SHIFT
@@ -217,13 +230,12 @@ bool process_tapping(keyrecord_t *keyp) {
                                 (TAP_IS_MT && TAP_GET_HOLD_ON_OTHER_KEY_PRESS)
                                 )
                             )
-                            // Makes Retro Shift ignore [IGNORE_MOD_TAP_INTERRUPT's
-                            // effects on nested taps for MTs and the default
-                            // behavior of LTs] below TAPPING_TERM or RETRO_SHIFT.
+                            // Makes Retro Shift ignore the default behavior of
+                            // MTs and LTs on nested taps below TAPPING_TERM or RETRO_SHIFT
                             || (
                                 TAP_IS_RETRO
                                 && (event.key.col != tapping_key.event.key.col || event.key.row != tapping_key.event.key.row)
-                                && IS_RELEASED(event) && waiting_buffer_typed(event)
+                                && !event.pressed && waiting_buffer_typed(event)
                             )
                         )
                     )
@@ -231,7 +243,7 @@ bool process_tapping(keyrecord_t *keyp) {
                     // clang-format on
                     ac_dprintf("Tapping: End. No tap. Interfered by typing key\n");
                     process_record(&tapping_key);
-                    tapping_key = (keyrecord_t){};
+                    tapping_key = (keyrecord_t){0};
                     debug_tapping_key();
                     // enqueue
                     return false;
@@ -240,7 +252,7 @@ bool process_tapping(keyrecord_t *keyp) {
                  * Without this unexpected repeating will occur with having fast repeating setting
                  * https://github.com/tmk/tmk_keyboard/issues/60
                  */
-                else if (IS_RELEASED(event) && !waiting_buffer_typed(event)) {
+                else if (!event.pressed && !waiting_buffer_typed(event)) {
                     // Modifier/Layer should be retained till end of this tapping.
                     action_t action = layer_switch_get_action(event.key);
                     switch (action.kind.id) {
@@ -276,7 +288,7 @@ bool process_tapping(keyrecord_t *keyp) {
                         if (TAP_GET_HOLD_ON_OTHER_KEY_PRESS) {
                             ac_dprintf("Tapping: End. No tap. Interfered by pressed key\n");
                             process_record(&tapping_key);
-                            tapping_key = (keyrecord_t){};
+                            tapping_key = (keyrecord_t){0};
                             debug_tapping_key();
                             // enqueue
                             return false;
@@ -304,6 +316,7 @@ bool process_tapping(keyrecord_t *keyp) {
                             .event.key     = tapping_key.event.key,
                             .event.time    = event.time,
                             .event.pressed = false,
+                            .event.type    = tapping_key.event.type,
 #    ifdef COMBO_ENABLE
                             .keycode = tapping_key.keycode,
 #    endif
@@ -316,9 +329,7 @@ bool process_tapping(keyrecord_t *keyp) {
                     debug_tapping_key();
                     return true;
                 } else {
-                    if (IS_EVENT(event)) {
-                        ac_dprintf("Tapping: key event while last tap(>0).\n");
-                    }
+                    ac_dprintf("Tapping: key event while last tap(>0).\n");
                     process_record(keyp);
                     return true;
                 }
@@ -331,15 +342,18 @@ bool process_tapping(keyrecord_t *keyp) {
                 debug_event(event);
                 ac_dprintf("\n");
                 process_record(&tapping_key);
-                tapping_key = (keyrecord_t){};
+                tapping_key = (keyrecord_t){0};
                 debug_tapping_key();
                 return false;
             } else {
+                if (IS_NOEVENT(event)) {
+                    return true;
+                }
                 if (IS_TAPPING_RECORD(keyp) && !event.pressed) {
                     ac_dprintf("Tapping: End. last timeout tap release(>0).");
                     keyp->tap = tapping_key.tap;
                     process_record(keyp);
-                    tapping_key = (keyrecord_t){};
+                    tapping_key = (keyrecord_t){0};
                     return true;
                 } else if (is_tap_record(keyp) && event.pressed) {
                     if (tapping_key.tap.count > 1) {
@@ -350,6 +364,7 @@ bool process_tapping(keyrecord_t *keyp) {
                             .event.key     = tapping_key.event.key,
                             .event.time    = event.time,
                             .event.pressed = false,
+                            .event.type    = tapping_key.event.type,
 #    ifdef COMBO_ENABLE
                             .keycode = tapping_key.keycode,
 #    endif
@@ -362,16 +377,20 @@ bool process_tapping(keyrecord_t *keyp) {
                     debug_tapping_key();
                     return true;
                 } else {
-                    if (IS_EVENT(event)) {
-                        ac_dprintf("Tapping: key event while last timeout tap(>0).\n");
-                    }
+                    ac_dprintf("Tapping: key event while last timeout tap(>0).\n");
                     process_record(keyp);
                     return true;
                 }
             }
         }
-    } else if (IS_TAPPING_RELEASED()) {
+    }
+    // process "released" tapping key state
+    else {
         if (WITHIN_TAPPING_TERM(event) || MAYBE_RETRO_SHIFTING(event)) {
+            if (IS_NOEVENT(event)) {
+                // early return for tick events
+                return true;
+            }
             if (event.pressed) {
                 if (IS_TAPPING_RECORD(keyp)) {
                     if (WITHIN_QUICK_TAP_TERM(event) && !tapping_key.tap.interrupted && tapping_key.tap.count > 0) {
@@ -402,35 +421,20 @@ bool process_tapping(keyrecord_t *keyp) {
                     return true;
                 }
             } else {
-                if (IS_EVENT(event)) ac_dprintf("Tapping: other key just after tap.\n");
+                ac_dprintf("Tapping: other key just after tap.\n");
                 process_record(keyp);
                 return true;
             }
         } else {
-            // FIX: process_action here?
-            // timeout. no sequential tap.
+            // Timeout - reset state machine.
             ac_dprintf("Tapping: End(Timeout after releasing last tap): ");
             debug_event(event);
             ac_dprintf("\n");
-            tapping_key = (keyrecord_t){};
+            tapping_key = (keyrecord_t){0};
             debug_tapping_key();
             return false;
         }
     }
-    // not tapping state
-    else {
-        if (event.pressed && is_tap_record(keyp)) {
-            ac_dprintf("Tapping: Start(Press tap key).\n");
-            tapping_key = *keyp;
-            process_record_tap_hint(&tapping_key);
-            waiting_buffer_scan_tap();
-            debug_tapping_key();
-            return true;
-        } else {
-            process_record(keyp);
-            return true;
-        }
-    }
 }
 
 /** \brief Waiting buffer enq
@@ -493,15 +497,18 @@ __attribute__((unused)) bool waiting_buffer_has_anykey_pressed(void) {
  * FIXME: Needs docs
  */
 void waiting_buffer_scan_tap(void) {
-    // tapping already is settled
-    if (tapping_key.tap.count > 0) return;
-    // invalid state: tapping_key released && tap.count == 0
-    if (!tapping_key.event.pressed) return;
+    // early return if:
+    // - tapping already is settled
+    // - invalid state: tapping_key released && tap.count == 0
+    if ((tapping_key.tap.count > 0) || !tapping_key.event.pressed) {
+        return;
+    }
 
     for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) {
-        if (IS_TAPPING_KEY(waiting_buffer[i].event.key) && !waiting_buffer[i].event.pressed && WITHIN_TAPPING_TERM(waiting_buffer[i].event)) {
-            tapping_key.tap.count       = 1;
-            waiting_buffer[i].tap.count = 1;
+        keyrecord_t *candidate = &waiting_buffer[i];
+        if (IS_EVENT(candidate->event) && KEYEQ(candidate->event.key, tapping_key.event.key) && !candidate->event.pressed && WITHIN_TAPPING_TERM(candidate->event)) {
+            tapping_key.tap.count = 1;
+            candidate->tap.count  = 1;
             process_record(&tapping_key);
 
             ac_dprintf("waiting_buffer_scan_tap: found at [%u]\n", i);
diff --git a/quantum/action_tapping.h b/quantum/action_tapping.h
index 6099d80d6d..6b518b8298 100644
--- a/quantum/action_tapping.h
+++ b/quantum/action_tapping.h
@@ -43,7 +43,6 @@ void     action_tapping_process(keyrecord_t record);
 uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record);
 uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record);
 bool     get_permissive_hold(uint16_t keycode, keyrecord_t *record);
-bool     get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record);
 bool     get_retro_tapping(uint16_t keycode, keyrecord_t *record);
 bool     get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record);
 
diff --git a/quantum/action_util.c b/quantum/action_util.c
index 7f7d32887b..034c2ecaae 100644
--- a/quantum/action_util.c
+++ b/quantum/action_util.c
@@ -46,6 +46,12 @@ static uint8_t oneshot_locked_mods = 0;
 uint8_t        get_oneshot_locked_mods(void) {
     return oneshot_locked_mods;
 }
+void add_oneshot_locked_mods(uint8_t mods) {
+    if ((oneshot_locked_mods & mods) != mods) {
+        oneshot_locked_mods |= mods;
+        oneshot_locked_mods_changed_kb(oneshot_locked_mods);
+    }
+}
 void set_oneshot_locked_mods(uint8_t mods) {
     if (mods != oneshot_locked_mods) {
         oneshot_locked_mods = mods;
@@ -58,6 +64,12 @@ void clear_oneshot_locked_mods(void) {
         oneshot_locked_mods_changed_kb(oneshot_locked_mods);
     }
 }
+void del_oneshot_locked_mods(uint8_t mods) {
+    if (oneshot_locked_mods & mods) {
+        oneshot_locked_mods &= ~mods;
+        oneshot_locked_mods_changed_kb(oneshot_locked_mods);
+    }
+}
 #    if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
 static uint16_t oneshot_time = 0;
 bool            has_oneshot_mods_timed_out(void) {
diff --git a/quantum/action_util.h b/quantum/action_util.h
index 6f1f09c4bd..02f6e9e6df 100644
--- a/quantum/action_util.h
+++ b/quantum/action_util.h
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include "report.h"
+#include "modifiers.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,8 +65,10 @@ void    clear_oneshot_mods(void);
 bool    has_oneshot_mods_timed_out(void);
 
 uint8_t get_oneshot_locked_mods(void);
+void    add_oneshot_locked_mods(uint8_t mods);
 void    set_oneshot_locked_mods(uint8_t mods);
 void    clear_oneshot_locked_mods(void);
+void    del_oneshot_locked_mods(uint8_t mods);
 
 typedef enum { ONESHOT_PRESSED = 0b01, ONESHOT_OTHER_KEY_PRESSED = 0b10, ONESHOT_START = 0b11, ONESHOT_TOGGLED = 0b100 } oneshot_fullfillment_t;
 void    set_oneshot_layer(uint8_t layer, uint8_t state);
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index ca78a483ad..2570ad9cd1 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -18,6 +18,7 @@
 #include "eeconfig.h"
 #include "timer.h"
 #include "wait.h"
+#include "util.h"
 
 /* audio system:
  *
@@ -112,6 +113,10 @@ static bool    audio_initialized    = false;
 static bool    audio_driver_stopped = true;
 audio_config_t audio_config;
 
+void eeconfig_update_audio_current(void) {
+    eeconfig_update_audio(audio_config.raw);
+}
+
 void audio_init(void) {
     if (audio_initialized) {
         return;
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index fe23cf3ed1..497f3dafd0 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -43,11 +43,6 @@ typedef union {
     };
 } audio_config_t;
 
-// AVR/LUFA has a MIN, arm/chibios does not
-#ifndef MIN
-#    define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#endif
-
 /*
  * a 'musical note' is represented by pitch and duration; a 'musical tone' adds intensity and timbre
  * https://en.wikipedia.org/wiki/Musical_tone
@@ -64,6 +59,11 @@ typedef struct {
 // public interface
 
 /**
+ * @brief Save the current choices to the eeprom
+ */
+void eeconfig_update_audio_current(void);
+
+/**
  * @brief one-time initialization called by quantum/quantum.c
  * @details usually done lazy, when some tones are to be played
  *
diff --git a/quantum/basic_profiling.h b/quantum/basic_profiling.h
new file mode 100644
index 0000000000..d371acd6f0
--- /dev/null
+++ b/quantum/basic_profiling.h
@@ -0,0 +1,69 @@
+// Copyright 2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+/*
+    This API allows for basic profiling information to be printed out over console.
+
+    Usage example:
+
+        #include "basic_profiling.h"
+
+        // Original code:
+        matrix_task();
+
+        // Delete the original, replace with the following (variant 1, automatic naming):
+        PROFILE_CALL(1000, matrix_task());
+
+        // Delete the original, replace with the following (variant 2, explicit naming):
+        PROFILE_CALL_NAMED(1000, "matrix_task", {
+            matrix_task();
+        });
+*/
+
+#if defined(PROTOCOL_LUFA) || defined(PROTOCOL_VUSB)
+#    define TIMESTAMP_GETTER TCNT0
+#elif defined(PROTOCOL_CHIBIOS)
+#    define TIMESTAMP_GETTER chSysGetRealtimeCounterX()
+#elif defined(PROTOCOL_ARM_ATSAM)
+#    error arm_atsam not currently supported
+#else
+#    error Unknown protocol in use
+#endif
+
+#ifndef CONSOLE_ENABLE
+// Can't do anything if we don't have console output enabled.
+#    define PROFILE_CALL_NAMED(count, name, call) \
+        do {                                      \
+        } while (0)
+#else
+#    define PROFILE_CALL_NAMED(count, name, call)                                                                         \
+        do {                                                                                                              \
+            static uint64_t inner_sum = 0;                                                                                \
+            static uint64_t outer_sum = 0;                                                                                \
+            uint32_t        start_ts;                                                                                     \
+            static uint32_t end_ts;                                                                                       \
+            static uint32_t write_location = 0;                                                                           \
+            start_ts                       = TIMESTAMP_GETTER;                                                            \
+            if (write_location > 0) {                                                                                     \
+                outer_sum += start_ts - end_ts;                                                                           \
+            }                                                                                                             \
+            do {                                                                                                          \
+                call;                                                                                                     \
+            } while (0);                                                                                                  \
+            end_ts = TIMESTAMP_GETTER;                                                                                    \
+            inner_sum += end_ts - start_ts;                                                                               \
+            ++write_location;                                                                                             \
+            if (write_location >= ((uint32_t)count)) {                                                                    \
+                uint32_t inner_avg = inner_sum / (((uint32_t)count) - 1);                                                 \
+                uint32_t outer_avg = outer_sum / (((uint32_t)count) - 1);                                                 \
+                dprintf("%s -- Percentage time spent: %d%%\n", (name), (int)(inner_avg * 100 / (inner_avg + outer_avg))); \
+                inner_sum      = 0;                                                                                       \
+                outer_sum      = 0;                                                                                       \
+                write_location = 0;                                                                                       \
+            }                                                                                                             \
+        } while (0)
+
+#endif // CONSOLE_ENABLE
+
+#define PROFILE_CALL(count, call) PROFILE_CALL_NAMED(count, #call, call)
diff --git a/quantum/bootmagic/magic.c b/quantum/bootmagic/magic.c
index f1cb11c395..d68df3fa58 100644
--- a/quantum/bootmagic/magic.c
+++ b/quantum/bootmagic/magic.c
@@ -19,7 +19,7 @@
 #include "matrix.h"
 #include "bootloader.h"
 #include "debug.h"
-#include "keymap.h"
+#include "keycode_config.h"
 #include "host.h"
 #include "action_layer.h"
 #include "eeconfig.h"
diff --git a/quantum/color.c b/quantum/color.c
index c80078dbf2..767155c9db 100644
--- a/quantum/color.c
+++ b/quantum/color.c
@@ -17,6 +17,7 @@
 #include "color.h"
 #include "led_tables.h"
 #include "progmem.h"
+#include "util.h"
 
 RGB hsv_to_rgb_impl(HSV hsv, bool use_cie) {
     RGB      rgb;
@@ -109,9 +110,6 @@ RGB hsv_to_rgb_nocie(HSV hsv) {
 }
 
 #ifdef RGBW
-#    ifndef MIN
-#        define MIN(a, b) ((a) < (b) ? (a) : (b))
-#    endif
 void convert_rgb_to_rgbw(LED_TYPE *led) {
     // Determine lowest value in all three colors, put that into
     // the white channel and then shift all colors by that amount
diff --git a/quantum/command.c b/quantum/command.c
index 84757b9b01..aa64b75064 100644
--- a/quantum/command.c
+++ b/quantum/command.c
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "wait.h"
 #include "keycode.h"
 #include "host.h"
-#include "keymap.h"
 #include "print.h"
 #include "debug.h"
 #include "util.h"
diff --git a/quantum/config_common.h b/quantum/config_common.h
deleted file mode 100644
index 6c70b00b53..0000000000
--- a/quantum/config_common.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2015-2018 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#pragma message("'config_common.h' should no longer be included!")
diff --git a/quantum/digitizer.h b/quantum/digitizer.h
index b826ba8ac8..6a9c24ed34 100644
--- a/quantum/digitizer.h
+++ b/quantum/digitizer.h
@@ -13,17 +13,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#pragma once
 
-#include "quantum.h"
+#pragma once
 
 #include <stdbool.h>
-#include <stdint.h>
 
 /**
- * \defgroup digitizer
+ * \file
  *
- * HID Digitizer
+ * defgroup digitizer HID Digitizer
  * \{
  */
 
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index c406be4585..90a0f20838 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "keymap.h" // to get keymaps[][][]
+#include "keymap_introspection.h" // to get keymaps[][][]
 #include "eeprom.h"
 #include "progmem.h" // to read default from flash
 #include "quantum.h" // for send_string()
diff --git a/quantum/encoder.c b/quantum/encoder.c
index 3aee340249..1046fe6cc3 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -77,7 +77,29 @@ __attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 
 __attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) {
-    return encoder_update_user(index, clockwise);
+    bool res = encoder_update_user(index, clockwise);
+#if !defined(ENCODER_TESTS)
+    if (res) {
+        if (clockwise) {
+#    if defined(EXTRAKEY_ENABLE)
+            tap_code_delay(KC_VOLU, 10);
+#    elif defined(MOUSEKEY_ENABLE)
+            tap_code_delay(KC_MS_WH_UP, 10);
+#    else
+            tap_code_delay(KC_PGDN, 10);
+#    endif
+        } else {
+#    if defined(EXTRAKEY_ENABLE)
+            tap_code_delay(KC_VOLD, 10);
+#    elif defined(MOUSEKEY_ENABLE)
+            tap_code_delay(KC_MS_WH_DOWN, 10);
+#    else
+            tap_code_delay(KC_PGUP, 10);
+#    endif
+        }
+    }
+#endif // ENCODER_TESTS
+    return res;
 }
 
 __attribute__((weak)) bool should_process_encoder(void) {
@@ -147,12 +169,12 @@ void encoder_init(void) {
 #ifdef ENCODER_MAP_ENABLE
 static void encoder_exec_mapping(uint8_t index, bool clockwise) {
     // The delays below cater for Windows and its wonderful requirements.
-    action_exec(clockwise ? ENCODER_CW_EVENT(index, true) : ENCODER_CCW_EVENT(index, true));
+    action_exec(clockwise ? MAKE_ENCODER_CW_EVENT(index, true) : MAKE_ENCODER_CCW_EVENT(index, true));
 #    if ENCODER_MAP_KEY_DELAY > 0
     wait_ms(ENCODER_MAP_KEY_DELAY);
 #    endif // ENCODER_MAP_KEY_DELAY > 0
 
-    action_exec(clockwise ? ENCODER_CW_EVENT(index, false) : ENCODER_CCW_EVENT(index, false));
+    action_exec(clockwise ? MAKE_ENCODER_CW_EVENT(index, false) : MAKE_ENCODER_CCW_EVENT(index, false));
 #    if ENCODER_MAP_KEY_DELAY > 0
     wait_ms(ENCODER_MAP_KEY_DELAY);
 #    endif // ENCODER_MAP_KEY_DELAY > 0
diff --git a/quantum/joystick.h b/quantum/joystick.h
index 0ac99aa590..5de4ba66c6 100644
--- a/quantum/joystick.h
+++ b/quantum/joystick.h
@@ -22,9 +22,9 @@
 #include "gpio.h"
 
 /**
- * \defgroup joystick
+ * \file
  *
- * HID Joystick
+ * \defgroup joystick HID Joystick
  * \{
  */
 
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index ec2f2e4496..90f6d6f8da 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 #include "keyboard.h"
 #include "matrix.h"
-#include "keymap.h"
+#include "keymap_introspection.h"
 #include "magic.h"
 #include "host.h"
 #include "led.h"
@@ -114,7 +114,7 @@ uint32_t        last_input_activity_time(void) {
     return last_input_modification_time;
 }
 uint32_t last_input_activity_elapsed(void) {
-    return timer_elapsed32(last_input_modification_time);
+    return sync_timer_elapsed32(last_input_modification_time);
 }
 
 static uint32_t last_matrix_modification_time = 0;
@@ -122,10 +122,10 @@ uint32_t        last_matrix_activity_time(void) {
     return last_matrix_modification_time;
 }
 uint32_t last_matrix_activity_elapsed(void) {
-    return timer_elapsed32(last_matrix_modification_time);
+    return sync_timer_elapsed32(last_matrix_modification_time);
 }
 void last_matrix_activity_trigger(void) {
-    last_matrix_modification_time = last_input_modification_time = timer_read32();
+    last_matrix_modification_time = last_input_modification_time = sync_timer_read32();
 }
 
 static uint32_t last_encoder_modification_time = 0;
@@ -133,10 +133,28 @@ uint32_t        last_encoder_activity_time(void) {
     return last_encoder_modification_time;
 }
 uint32_t last_encoder_activity_elapsed(void) {
-    return timer_elapsed32(last_encoder_modification_time);
+    return sync_timer_elapsed32(last_encoder_modification_time);
 }
 void last_encoder_activity_trigger(void) {
-    last_encoder_modification_time = last_input_modification_time = timer_read32();
+    last_encoder_modification_time = last_input_modification_time = sync_timer_read32();
+}
+
+static uint32_t last_pointing_device_modification_time = 0;
+uint32_t        last_pointing_device_activity_time(void) {
+    return last_pointing_device_modification_time;
+}
+uint32_t last_pointing_device_activity_elapsed(void) {
+    return sync_timer_elapsed32(last_pointing_device_modification_time);
+}
+void last_pointing_device_activity_trigger(void) {
+    last_pointing_device_modification_time = last_input_modification_time = sync_timer_read32();
+}
+
+void set_activity_timestamps(uint32_t matrix_timestamp, uint32_t encoder_timestamp, uint32_t pointing_device_timestamp) {
+    last_matrix_modification_time          = matrix_timestamp;
+    last_encoder_modification_time         = encoder_timestamp;
+    last_pointing_device_modification_time = pointing_device_timestamp;
+    last_input_modification_time           = MAX(matrix_timestamp, MAX(encoder_timestamp, pointing_device_timestamp));
 }
 
 // Only enable this if console is enabled to print to
@@ -444,7 +462,7 @@ static inline void generate_tick_event(void) {
     static uint16_t last_tick = 0;
     const uint16_t  now       = timer_read();
     if (TIMER_DIFF_16(now, last_tick) != 0) {
-        action_exec(TICK_EVENT);
+        action_exec(MAKE_TICK_EVENT);
         last_tick = now;
     }
 }
@@ -592,9 +610,10 @@ void quantum_task(void) {
 
 /** \brief Main task that is repeatedly called as fast as possible. */
 void keyboard_task(void) {
-    const bool matrix_changed = matrix_task();
-    if (matrix_changed) {
+    __attribute__((unused)) bool activity_has_occurred = false;
+    if (matrix_task()) {
         last_matrix_activity_trigger();
+        activity_has_occurred = true;
     }
 
     quantum_task();
@@ -621,9 +640,16 @@ void keyboard_task(void) {
 #endif
 
 #ifdef ENCODER_ENABLE
-    const bool encoders_changed = encoder_read();
-    if (encoders_changed) {
+    if (encoder_read()) {
         last_encoder_activity_trigger();
+        activity_has_occurred = true;
+    }
+#endif
+
+#ifdef POINTING_DEVICE_ENABLE
+    if (pointing_device_task()) {
+        last_pointing_device_activity_trigger();
+        activity_has_occurred = true;
     }
 #endif
 
@@ -631,11 +657,7 @@ void keyboard_task(void) {
     oled_task();
 #    if OLED_TIMEOUT > 0
     // Wake up oled if user is using those fabulous keys or spinning those encoders!
-#        ifdef ENCODER_ENABLE
-    if (matrix_changed || encoders_changed) oled_on();
-#        else
-    if (matrix_changed) oled_on();
-#        endif
+    if (activity_has_occurred) oled_on();
 #    endif
 #endif
 
@@ -643,11 +665,7 @@ void keyboard_task(void) {
     st7565_task();
 #    if ST7565_TIMEOUT > 0
     // Wake up display if user is using those fabulous keys or spinning those encoders!
-#        ifdef ENCODER_ENABLE
-    if (matrix_changed || encoders_changed) st7565_on();
-#        else
-    if (matrix_changed) st7565_on();
-#        endif
+    if (activity_has_occurred) st7565_on();
 #    endif
 #endif
 
@@ -660,10 +678,6 @@ void keyboard_task(void) {
     ps2_mouse_task();
 #endif
 
-#ifdef POINTING_DEVICE_ENABLE
-    pointing_device_task();
-#endif
-
 #ifdef MIDI_ENABLE
     midi_task();
 #endif
diff --git a/quantum/keyboard.h b/quantum/keyboard.h
index d0b52dd13a..bf1890d10b 100644
--- a/quantum/keyboard.h
+++ b/quantum/keyboard.h
@@ -30,65 +30,64 @@ typedef struct {
     uint8_t row;
 } keypos_t;
 
+typedef enum keyevent_type_t { TICK_EVENT = 0, KEY_EVENT = 1, ENCODER_CW_EVENT = 2, ENCODER_CCW_EVENT = 3, COMBO_EVENT = 4 } keyevent_type_t;
+
 /* key event */
 typedef struct {
-    keypos_t key;
-    bool     pressed;
-    uint16_t time;
+    keypos_t        key;
+    uint16_t        time;
+    keyevent_type_t type;
+    bool            pressed;
 } keyevent_t;
 
 /* equivalent test of keypos_t */
 #define KEYEQ(keya, keyb) ((keya).row == (keyb).row && (keya).col == (keyb).col)
 
 /* special keypos_t entries */
-#define KEYLOC_TICK 255
-#define KEYLOC_COMBO 254
 #define KEYLOC_ENCODER_CW 253
 #define KEYLOC_ENCODER_CCW 252
 
-/* Rules for No Event:
- * 1) (time == 0) to handle (keyevent_t){} as empty event
- * 2) Matrix(255, 255) to make TICK event available
- */
-static inline bool IS_NOEVENT(keyevent_t event) {
-    return event.time == 0 || (event.key.row == KEYLOC_TICK && event.key.col == KEYLOC_TICK);
-}
-static inline bool IS_EVENT(keyevent_t event) {
-    return !IS_NOEVENT(event);
+static inline bool IS_NOEVENT(const keyevent_t event) {
+    return event.type == TICK_EVENT;
 }
-static inline bool IS_KEYEVENT(keyevent_t event) {
-    return event.key.row < MATRIX_ROWS && event.key.col < MATRIX_COLS;
+static inline bool IS_EVENT(const keyevent_t event) {
+    return event.type != TICK_EVENT;
 }
-static inline bool IS_COMBOEVENT(keyevent_t event) {
-    return event.key.row == KEYLOC_COMBO;
+static inline bool IS_KEYEVENT(const keyevent_t event) {
+    return event.type == KEY_EVENT;
 }
-static inline bool IS_ENCODEREVENT(keyevent_t event) {
-    return event.key.row == KEYLOC_ENCODER_CW || event.key.row == KEYLOC_ENCODER_CCW;
+static inline bool IS_COMBOEVENT(const keyevent_t event) {
+    return event.type == COMBO_EVENT;
 }
-static inline bool IS_PRESSED(keyevent_t event) {
-    return IS_EVENT(event) && event.pressed;
-}
-static inline bool IS_RELEASED(keyevent_t event) {
-    return IS_EVENT(event) && !event.pressed;
+static inline bool IS_ENCODEREVENT(const keyevent_t event) {
+    return event.type == ENCODER_CW_EVENT || event.type == ENCODER_CCW_EVENT;
 }
 
-/* Common keyevent object factory */
+/* Common keypos_t object factory */
 #define MAKE_KEYPOS(row_num, col_num) ((keypos_t){.row = (row_num), .col = (col_num)})
 
+/* Common keyevent_t object factory */
+#define MAKE_EVENT(row_num, col_num, press, event_type) ((keyevent_t){.key = MAKE_KEYPOS((row_num), (col_num)), .pressed = (press), .time = timer_read(), .type = (event_type)})
+
 /**
  * @brief Constructs a key event for a pressed or released key.
  */
-#define MAKE_KEYEVENT(row_num, col_num, press) ((keyevent_t){.key = MAKE_KEYPOS((row_num), (col_num)), .pressed = (press), .time = (timer_read() | 1)})
+#define MAKE_KEYEVENT(row_num, col_num, press) MAKE_EVENT((row_num), (col_num), (press), KEY_EVENT)
+
+/**
+ * @brief Constructs a combo event.
+ */
+#define MAKE_COMBOEVENT(press) MAKE_EVENT(0, 0, (press), COMBO_EVENT)
 
 /**
  * @brief Constructs a internal tick event that is used to drive the internal QMK state machine.
  */
-#define TICK_EVENT MAKE_KEYEVENT(KEYLOC_TICK, KEYLOC_TICK, false)
+#define MAKE_TICK_EVENT MAKE_EVENT(0, 0, false, TICK_EVENT)
 
 #ifdef ENCODER_MAP_ENABLE
 /* Encoder events */
-#    define ENCODER_CW_EVENT(enc_id, press) MAKE_KEYEVENT(KEYLOC_ENCODER_CW, (enc_id), (press))
-#    define ENCODER_CCW_EVENT(enc_id, press) MAKE_KEYEVENT(KEYLOC_ENCODER_CCW, (enc_id), (press))
+#    define MAKE_ENCODER_CW_EVENT(enc_id, press) MAKE_EVENT(KEYLOC_ENCODER_CW, (enc_id), (press), ENCODER_CW_EVENT)
+#    define MAKE_ENCODER_CCW_EVENT(enc_id, press) MAKE_EVENT(KEYLOC_ENCODER_CCW, (enc_id), (press), ENCODER_CCW_EVENT)
 #endif // ENCODER_MAP_ENABLE
 
 /* it runs once at early stage of startup before keyboard_init. */
@@ -111,8 +110,8 @@ void housekeeping_task(void);      // To be executed by the main loop in each ba
 void housekeeping_task_kb(void);   // To be overridden by keyboard-level code
 void housekeeping_task_user(void); // To be overridden by user/keymap-level code
 
-uint32_t last_input_activity_time(void);    // Timestamp of the last matrix or encoder activity
-uint32_t last_input_activity_elapsed(void); // Number of milliseconds since the last matrix or encoder activity
+uint32_t last_input_activity_time(void);    // Timestamp of the last matrix or encoder or pointing device activity
+uint32_t last_input_activity_elapsed(void); // Number of milliseconds since the last matrix or encoder or pointing device activity
 
 uint32_t last_matrix_activity_time(void);    // Timestamp of the last matrix activity
 uint32_t last_matrix_activity_elapsed(void); // Number of milliseconds since the last matrix activity
@@ -120,6 +119,11 @@ uint32_t last_matrix_activity_elapsed(void); // Number of milliseconds since the
 uint32_t last_encoder_activity_time(void);    // Timestamp of the last encoder activity
 uint32_t last_encoder_activity_elapsed(void); // Number of milliseconds since the last encoder activity
 
+uint32_t last_pointing_device_activity_time(void);    // Timestamp of the last pointing device activity
+uint32_t last_pointing_device_activity_elapsed(void); // Number of milliseconds since the last  pointing device activity
+
+void set_activity_timestamps(uint32_t matrix_timestamp, uint32_t encoder_timestamp, uint32_t pointing_device_timestamp); // Set the timestamps of the last matrix and encoder activity
+
 uint32_t get_matrix_scan_rate(void);
 
 #ifdef __cplusplus
diff --git a/quantum/keycode.h b/quantum/keycode.h
index 701c078ad0..df1452d296 100644
--- a/quantum/keycode.h
+++ b/quantum/keycode.h
@@ -34,26 +34,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_MOUSEKEY_WHEEL(code) (KC_MS_WH_UP <= (code) && (code) <= KC_MS_WH_RIGHT)
 #define IS_MOUSEKEY_ACCEL(code) (KC_MS_ACCEL0 <= (code) && (code) <= KC_MS_ACCEL2)
 
-#define MOD_BIT(code) (1 << MOD_INDEX(code))
-#define MOD_INDEX(code) ((code)&0x07)
-
-#define MOD_MASK_CTRL (MOD_BIT(KC_LEFT_CTRL) | MOD_BIT(KC_RIGHT_CTRL))
-#define MOD_MASK_SHIFT (MOD_BIT(KC_LEFT_SHIFT) | MOD_BIT(KC_RIGHT_SHIFT))
-#define MOD_MASK_ALT (MOD_BIT(KC_LEFT_ALT) | MOD_BIT(KC_RIGHT_ALT))
-#define MOD_MASK_GUI (MOD_BIT(KC_LEFT_GUI) | MOD_BIT(KC_RIGHT_GUI))
-#define MOD_MASK_CS (MOD_MASK_CTRL | MOD_MASK_SHIFT)
-#define MOD_MASK_CA (MOD_MASK_CTRL | MOD_MASK_ALT)
-#define MOD_MASK_CG (MOD_MASK_CTRL | MOD_MASK_GUI)
-#define MOD_MASK_SA (MOD_MASK_SHIFT | MOD_MASK_ALT)
-#define MOD_MASK_SG (MOD_MASK_SHIFT | MOD_MASK_GUI)
-#define MOD_MASK_AG (MOD_MASK_ALT | MOD_MASK_GUI)
-#define MOD_MASK_CSA (MOD_MASK_CTRL | MOD_MASK_SHIFT | MOD_MASK_ALT)
-#define MOD_MASK_CSG (MOD_MASK_CTRL | MOD_MASK_SHIFT | MOD_MASK_GUI)
-#define MOD_MASK_CAG (MOD_MASK_CTRL | MOD_MASK_ALT | MOD_MASK_GUI)
-#define MOD_MASK_SAG (MOD_MASK_SHIFT | MOD_MASK_ALT | MOD_MASK_GUI)
-#define MOD_MASK_CSAG (MOD_MASK_CTRL | MOD_MASK_SHIFT | MOD_MASK_ALT | MOD_MASK_GUI)
+#define MOD_BIT(code) (1 << ((code)&0x07))
 
 // clang-format off
 
 // TODO: dd keycodes
 #include "keycodes.h"
+#include "modifiers.h"
diff --git a/quantum/keymap.h b/quantum/keymap.h
index 0225f53362..a067e1aa36 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -17,25 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include <stdint.h>
-#include <stdbool.h>
-#include "platform_deps.h"
-#include "action.h"
-#include "keycode.h"
-#include "report.h"
-#include "host.h"
-#include "debug.h"
-#include "keycode_config.h"
-#include "gpio.h" // for pin_t
-
-#include "quantum_keycodes.h"
-
-// translates key to keycode
-uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
-
-#ifdef ENCODER_MAP_ENABLE
-// Ensure we have a forward declaration for the encoder map
-#    include "encoder.h"
-#endif
-
-#include "keymap_introspection.h"
+#pragma message("'keymap.h' should no longer be included!")
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 6fcebc3242..0492e6fd1c 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "keymap.h"
+#include "keymap_common.h"
+#include "keymap_introspection.h"
 #include "report.h"
 #include "keycode.h"
 #include "action_layer.h"
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h
new file mode 100644
index 0000000000..fca4fc9ba3
--- /dev/null
+++ b/quantum/keymap_common.h
@@ -0,0 +1,10 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include "keyboard.h"
+
+// translates key to keycode
+uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
diff --git a/quantum/keymap_extras/keymap_belgian.h b/quantum/keymap_extras/keymap_belgian.h
index 1bf9549c5a..6851c6b4e8 100644
--- a/quantum/keymap_extras/keymap_belgian.h
+++ b/quantum/keymap_extras/keymap_belgian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_bepo.h b/quantum/keymap_extras/keymap_bepo.h
index 12026ce649..448727dece 100644
--- a/quantum/keymap_extras/keymap_bepo.h
+++ b/quantum/keymap_extras/keymap_bepo.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_brazilian_abnt2.h b/quantum/keymap_extras/keymap_brazilian_abnt2.h
index 70a09a52be..8fac7666c2 100644
--- a/quantum/keymap_extras/keymap_brazilian_abnt2.h
+++ b/quantum/keymap_extras/keymap_brazilian_abnt2.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h
index 44009f3aa2..5b9b03babb 100644
--- a/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/quantum/keymap_extras/keymap_canadian_multilingual.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_colemak.h b/quantum/keymap_extras/keymap_colemak.h
index 5cb86bf441..d63309f010 100644
--- a/quantum/keymap_extras/keymap_colemak.h
+++ b/quantum/keymap_extras/keymap_colemak.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_croatian.h b/quantum/keymap_extras/keymap_croatian.h
index 1115592e17..3e7c681ced 100644
--- a/quantum/keymap_extras/keymap_croatian.h
+++ b/quantum/keymap_extras/keymap_croatian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_czech.h b/quantum/keymap_extras/keymap_czech.h
index 02692002e3..351c51ad41 100644
--- a/quantum/keymap_extras/keymap_czech.h
+++ b/quantum/keymap_extras/keymap_czech.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_danish.h b/quantum/keymap_extras/keymap_danish.h
index 18107ccd53..cea9444896 100644
--- a/quantum/keymap_extras/keymap_danish.h
+++ b/quantum/keymap_extras/keymap_danish.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_dvorak.h b/quantum/keymap_extras/keymap_dvorak.h
index 5767530b3b..9205a72057 100644
--- a/quantum/keymap_extras/keymap_dvorak.h
+++ b/quantum/keymap_extras/keymap_dvorak.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_dvorak_fr.h b/quantum/keymap_extras/keymap_dvorak_fr.h
index 60675fbf13..b206767614 100644
--- a/quantum/keymap_extras/keymap_dvorak_fr.h
+++ b/quantum/keymap_extras/keymap_dvorak_fr.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_dvorak_programmer.h b/quantum/keymap_extras/keymap_dvorak_programmer.h
index 6e1ae17807..19187ed13b 100644
--- a/quantum/keymap_extras/keymap_dvorak_programmer.h
+++ b/quantum/keymap_extras/keymap_dvorak_programmer.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_estonian.h b/quantum/keymap_extras/keymap_estonian.h
index 462bcde429..ea9c56c12a 100644
--- a/quantum/keymap_extras/keymap_estonian.h
+++ b/quantum/keymap_extras/keymap_estonian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_finnish.h b/quantum/keymap_extras/keymap_finnish.h
index 7e94896e2e..c0dc1af81e 100644
--- a/quantum/keymap_extras/keymap_finnish.h
+++ b/quantum/keymap_extras/keymap_finnish.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h
index da9467a475..03dbb7bc40 100644
--- a/quantum/keymap_extras/keymap_french.h
+++ b/quantum/keymap_extras/keymap_french.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_french_afnor.h b/quantum/keymap_extras/keymap_french_afnor.h
index 259e0a30f4..869984c4d2 100644
--- a/quantum/keymap_extras/keymap_french_afnor.h
+++ b/quantum/keymap_extras/keymap_french_afnor.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_french_mac_iso.h b/quantum/keymap_extras/keymap_french_mac_iso.h
index 9a8ed72604..e5f7514a80 100644
--- a/quantum/keymap_extras/keymap_french_mac_iso.h
+++ b/quantum/keymap_extras/keymap_french_mac_iso.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h
index 251491fb81..38b0c685ba 100644
--- a/quantum/keymap_extras/keymap_german.h
+++ b/quantum/keymap_extras/keymap_german.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_german_mac_iso.h b/quantum/keymap_extras/keymap_german_mac_iso.h
index de7b60546b..efa9099f20 100644
--- a/quantum/keymap_extras/keymap_german_mac_iso.h
+++ b/quantum/keymap_extras/keymap_german_mac_iso.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_greek.h b/quantum/keymap_extras/keymap_greek.h
index b4f5b5c5b3..01779cf2e8 100644
--- a/quantum/keymap_extras/keymap_greek.h
+++ b/quantum/keymap_extras/keymap_greek.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_hebrew.h b/quantum/keymap_extras/keymap_hebrew.h
index 372d7f2e93..284562072d 100644
--- a/quantum/keymap_extras/keymap_hebrew.h
+++ b/quantum/keymap_extras/keymap_hebrew.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_hungarian.h b/quantum/keymap_extras/keymap_hungarian.h
index 591d71c09c..fbc31ed155 100644
--- a/quantum/keymap_extras/keymap_hungarian.h
+++ b/quantum/keymap_extras/keymap_hungarian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_icelandic.h b/quantum/keymap_extras/keymap_icelandic.h
index 800899b515..3bd71c19f2 100644
--- a/quantum/keymap_extras/keymap_icelandic.h
+++ b/quantum/keymap_extras/keymap_icelandic.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_irish.h b/quantum/keymap_extras/keymap_irish.h
index 2cd63a48e3..6e161628c8 100644
--- a/quantum/keymap_extras/keymap_irish.h
+++ b/quantum/keymap_extras/keymap_irish.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_italian.h b/quantum/keymap_extras/keymap_italian.h
index 95f3348f63..8092dc1301 100644
--- a/quantum/keymap_extras/keymap_italian.h
+++ b/quantum/keymap_extras/keymap_italian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_italian_mac_ansi.h b/quantum/keymap_extras/keymap_italian_mac_ansi.h
index 5e7e2a37e8..ae1281be26 100644
--- a/quantum/keymap_extras/keymap_italian_mac_ansi.h
+++ b/quantum/keymap_extras/keymap_italian_mac_ansi.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_italian_mac_iso.h b/quantum/keymap_extras/keymap_italian_mac_iso.h
index 1d30451376..f3f01839c3 100644
--- a/quantum/keymap_extras/keymap_italian_mac_iso.h
+++ b/quantum/keymap_extras/keymap_italian_mac_iso.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_japanese.h b/quantum/keymap_extras/keymap_japanese.h
index 286863deea..947317833e 100644
--- a/quantum/keymap_extras/keymap_japanese.h
+++ b/quantum/keymap_extras/keymap_japanese.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_korean.h b/quantum/keymap_extras/keymap_korean.h
index 073647de7f..440a6b3b4d 100644
--- a/quantum/keymap_extras/keymap_korean.h
+++ b/quantum/keymap_extras/keymap_korean.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_latvian.h b/quantum/keymap_extras/keymap_latvian.h
index e3ac1cd433..2f26b1d8af 100644
--- a/quantum/keymap_extras/keymap_latvian.h
+++ b/quantum/keymap_extras/keymap_latvian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_lithuanian_azerty.h b/quantum/keymap_extras/keymap_lithuanian_azerty.h
index 11de3ad030..f6dd94f0ca 100644
--- a/quantum/keymap_extras/keymap_lithuanian_azerty.h
+++ b/quantum/keymap_extras/keymap_lithuanian_azerty.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_lithuanian_qwerty.h b/quantum/keymap_extras/keymap_lithuanian_qwerty.h
index c27389971e..03c6b7a2af 100644
--- a/quantum/keymap_extras/keymap_lithuanian_qwerty.h
+++ b/quantum/keymap_extras/keymap_lithuanian_qwerty.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_neo2.h b/quantum/keymap_extras/keymap_neo2.h
index e8352ffa08..bc9445892f 100644
--- a/quantum/keymap_extras/keymap_neo2.h
+++ b/quantum/keymap_extras/keymap_neo2.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h
index e336916713..6464966c71 100644
--- a/quantum/keymap_extras/keymap_nordic.h
+++ b/quantum/keymap_extras/keymap_nordic.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_norman.h b/quantum/keymap_extras/keymap_norman.h
index 1f773bb410..1a3a0bc53a 100644
--- a/quantum/keymap_extras/keymap_norman.h
+++ b/quantum/keymap_extras/keymap_norman.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_norwegian.h b/quantum/keymap_extras/keymap_norwegian.h
index 33193d6a4d..af16fec8d6 100644
--- a/quantum/keymap_extras/keymap_norwegian.h
+++ b/quantum/keymap_extras/keymap_norwegian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_plover.h b/quantum/keymap_extras/keymap_plover.h
index b51e44b8bb..c0e3311e90 100644
--- a/quantum/keymap_extras/keymap_plover.h
+++ b/quantum/keymap_extras/keymap_plover.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_plover_dvorak.h b/quantum/keymap_extras/keymap_plover_dvorak.h
index f8341f8cbc..7feb52a25c 100644
--- a/quantum/keymap_extras/keymap_plover_dvorak.h
+++ b/quantum/keymap_extras/keymap_plover_dvorak.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_polish.h b/quantum/keymap_extras/keymap_polish.h
index 6b37d77a0a..40870ec237 100644
--- a/quantum/keymap_extras/keymap_polish.h
+++ b/quantum/keymap_extras/keymap_polish.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_portuguese.h b/quantum/keymap_extras/keymap_portuguese.h
index 17da9a6c11..b4570ad922 100644
--- a/quantum/keymap_extras/keymap_portuguese.h
+++ b/quantum/keymap_extras/keymap_portuguese.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_portuguese_mac_iso.h b/quantum/keymap_extras/keymap_portuguese_mac_iso.h
index 3d34a39ae5..57a27d04e9 100644
--- a/quantum/keymap_extras/keymap_portuguese_mac_iso.h
+++ b/quantum/keymap_extras/keymap_portuguese_mac_iso.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_romanian.h b/quantum/keymap_extras/keymap_romanian.h
index fb48a0fda7..cf4c17125f 100644
--- a/quantum/keymap_extras/keymap_romanian.h
+++ b/quantum/keymap_extras/keymap_romanian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_russian.h b/quantum/keymap_extras/keymap_russian.h
index 3643718444..fd3a1604c8 100644
--- a/quantum/keymap_extras/keymap_russian.h
+++ b/quantum/keymap_extras/keymap_russian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_serbian.h b/quantum/keymap_extras/keymap_serbian.h
index dd1bda7533..732e2e939d 100644
--- a/quantum/keymap_extras/keymap_serbian.h
+++ b/quantum/keymap_extras/keymap_serbian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_serbian_latin.h b/quantum/keymap_extras/keymap_serbian_latin.h
index 83495b63be..5151696a10 100644
--- a/quantum/keymap_extras/keymap_serbian_latin.h
+++ b/quantum/keymap_extras/keymap_serbian_latin.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_slovak.h b/quantum/keymap_extras/keymap_slovak.h
index 10714f1be9..81a88fa25c 100644
--- a/quantum/keymap_extras/keymap_slovak.h
+++ b/quantum/keymap_extras/keymap_slovak.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h
index 30910530e0..1e17342c27 100644
--- a/quantum/keymap_extras/keymap_slovenian.h
+++ b/quantum/keymap_extras/keymap_slovenian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h
index cac16c08a5..bcdd5af0c2 100644
--- a/quantum/keymap_extras/keymap_spanish.h
+++ b/quantum/keymap_extras/keymap_spanish.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_spanish_dvorak.h b/quantum/keymap_extras/keymap_spanish_dvorak.h
index 1feab96b8c..fb033df770 100644
--- a/quantum/keymap_extras/keymap_spanish_dvorak.h
+++ b/quantum/keymap_extras/keymap_spanish_dvorak.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_steno.h b/quantum/keymap_extras/keymap_steno.h
index 07d96b7465..852b2f7121 100644
--- a/quantum/keymap_extras/keymap_steno.h
+++ b/quantum/keymap_extras/keymap_steno.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "keymap.h"
+#include "keycodes.h"
 
 // List of keycodes for the steno keyboard. To prevent
 // errors, this must be <= 42 total entries in order to
diff --git a/quantum/keymap_extras/keymap_swedish.h b/quantum/keymap_extras/keymap_swedish.h
index 4cdf4879c3..acb49f7773 100644
--- a/quantum/keymap_extras/keymap_swedish.h
+++ b/quantum/keymap_extras/keymap_swedish.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_swedish_mac_ansi.h b/quantum/keymap_extras/keymap_swedish_mac_ansi.h
index 9649f59dd0..ef48a9e493 100644
--- a/quantum/keymap_extras/keymap_swedish_mac_ansi.h
+++ b/quantum/keymap_extras/keymap_swedish_mac_ansi.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_swedish_mac_iso.h b/quantum/keymap_extras/keymap_swedish_mac_iso.h
index 068c81b020..2eaef5e60c 100644
--- a/quantum/keymap_extras/keymap_swedish_mac_iso.h
+++ b/quantum/keymap_extras/keymap_swedish_mac_iso.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h b/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h
index c0692ababd..d33a259023 100644
--- a/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h
+++ b/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h b/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h
index e01f0a7dc3..680bd1db9e 100644
--- a/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h
+++ b/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_swiss_de.h b/quantum/keymap_extras/keymap_swiss_de.h
index 0a6e6e4918..69bba7293e 100644
--- a/quantum/keymap_extras/keymap_swiss_de.h
+++ b/quantum/keymap_extras/keymap_swiss_de.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_swiss_fr.h b/quantum/keymap_extras/keymap_swiss_fr.h
index 05a4a4c279..1e2f833db1 100644
--- a/quantum/keymap_extras/keymap_swiss_fr.h
+++ b/quantum/keymap_extras/keymap_swiss_fr.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_turkish_f.h b/quantum/keymap_extras/keymap_turkish_f.h
index 0dfc0236e8..4fdcf3f746 100644
--- a/quantum/keymap_extras/keymap_turkish_f.h
+++ b/quantum/keymap_extras/keymap_turkish_f.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_turkish_q.h b/quantum/keymap_extras/keymap_turkish_q.h
index cc64300b18..5a9362acb4 100644
--- a/quantum/keymap_extras/keymap_turkish_q.h
+++ b/quantum/keymap_extras/keymap_turkish_q.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h
index ff6f8c9c2e..71e5f38f55 100644
--- a/quantum/keymap_extras/keymap_uk.h
+++ b/quantum/keymap_extras/keymap_uk.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_ukrainian.h b/quantum/keymap_extras/keymap_ukrainian.h
index b954bb2398..3f3ec4cec2 100644
--- a/quantum/keymap_extras/keymap_ukrainian.h
+++ b/quantum/keymap_extras/keymap_ukrainian.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_us.h b/quantum/keymap_extras/keymap_us.h
index 38df8c6336..6101c8d8ba 100644
--- a/quantum/keymap_extras/keymap_us.h
+++ b/quantum/keymap_extras/keymap_us.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_us_extended.h b/quantum/keymap_extras/keymap_us_extended.h
index c4f627c30d..90da98c756 100644
--- a/quantum/keymap_extras/keymap_us_extended.h
+++ b/quantum/keymap_extras/keymap_us_extended.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_us_international.h b/quantum/keymap_extras/keymap_us_international.h
index 1f2bc33476..bd5f21ec8c 100644
--- a/quantum/keymap_extras/keymap_us_international.h
+++ b/quantum/keymap_extras/keymap_us_international.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_us_international_linux.h b/quantum/keymap_extras/keymap_us_international_linux.h
index 16d072cc5b..4551cbe29f 100644
--- a/quantum/keymap_extras/keymap_us_international_linux.h
+++ b/quantum/keymap_extras/keymap_us_international_linux.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_workman.h b/quantum/keymap_extras/keymap_workman.h
index 5fe9d36b16..808caec054 100644
--- a/quantum/keymap_extras/keymap_workman.h
+++ b/quantum/keymap_extras/keymap_workman.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_extras/keymap_workman_zxcvm.h b/quantum/keymap_extras/keymap_workman_zxcvm.h
index 757f98e912..f8645ac4cf 100644
--- a/quantum/keymap_extras/keymap_workman_zxcvm.h
+++ b/quantum/keymap_extras/keymap_workman_zxcvm.h
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 
 // Aliases
diff --git a/quantum/keymap_introspection.h b/quantum/keymap_introspection.h
index a8df3928a6..201de937cb 100644
--- a/quantum/keymap_introspection.h
+++ b/quantum/keymap_introspection.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <stdint.h>
+#include <stdbool.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Key mapping
diff --git a/quantum/leader.h b/quantum/leader.h
index 1999006c56..3177fcd196 100644
--- a/quantum/leader.h
+++ b/quantum/leader.h
@@ -5,9 +5,9 @@
 #include <stdint.h>
 
 /**
- * \defgroup leader
+ * \file
  *
- * Leader Key
+ * \defgroup leader Leader Key
  * \{
  */
 
diff --git a/quantum/midi/midi.c b/quantum/midi/midi.c
index 1ba3e73a40..1c481f2f0b 100644
--- a/quantum/midi/midi.c
+++ b/quantum/midi/midi.c
@@ -18,10 +18,7 @@
 
 #include "midi.h"
 #include <string.h> //for memcpy
-
-#ifndef MIN
-#    define MIN(x, y) (((x) < (y)) ? (x) : (y))
-#endif
+#include "util.h"
 
 #ifndef NULL
 #    define NULL 0
diff --git a/quantum/modifiers.h b/quantum/modifiers.h
new file mode 100644
index 0000000000..45bcd6508d
--- /dev/null
+++ b/quantum/modifiers.h
@@ -0,0 +1,54 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/** \brief 5-bit packed modifiers
+ *
+ * Mod bits:    43210
+ *   bit 0      ||||+- Control
+ *   bit 1      |||+-- Shift
+ *   bit 2      ||+--- Alt
+ *   bit 3      |+---- Gui
+ *   bit 4      +----- LR flag(Left:0, Right:1)
+ */
+enum mods_5bit {
+    MOD_LCTL = 0x01,
+    MOD_LSFT = 0x02,
+    MOD_LALT = 0x04,
+    MOD_LGUI = 0x08,
+    MOD_RCTL = 0x11,
+    MOD_RSFT = 0x12,
+    MOD_RALT = 0x14,
+    MOD_RGUI = 0x18,
+};
+#define MOD_HYPR (MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI)
+#define MOD_MEH (MOD_LCTL | MOD_LSFT | MOD_LALT)
+
+/** \brief 8-bit packed modifiers
+ */
+enum mods_8bit {
+    MOD_BIT_LCTRL  = 0b00000001,
+    MOD_BIT_LSHIFT = 0b00000010,
+    MOD_BIT_LALT   = 0b00000100,
+    MOD_BIT_LGUI   = 0b00001000,
+    MOD_BIT_RCTRL  = 0b00010000,
+    MOD_BIT_RSHIFT = 0b00100000,
+    MOD_BIT_RALT   = 0b01000000,
+    MOD_BIT_RGUI   = 0b10000000,
+};
+#define MOD_MASK_CTRL (MOD_BIT_LCTRL | MOD_BIT_RCTRL)
+#define MOD_MASK_SHIFT (MOD_BIT_LSHIFT | MOD_BIT_RSHIFT)
+#define MOD_MASK_ALT (MOD_BIT_LALT | MOD_BIT_RALT)
+#define MOD_MASK_GUI (MOD_BIT_LGUI | MOD_BIT_RGUI)
+#define MOD_MASK_CS (MOD_MASK_CTRL | MOD_MASK_SHIFT)
+#define MOD_MASK_CA (MOD_MASK_CTRL | MOD_MASK_ALT)
+#define MOD_MASK_CG (MOD_MASK_CTRL | MOD_MASK_GUI)
+#define MOD_MASK_SA (MOD_MASK_SHIFT | MOD_MASK_ALT)
+#define MOD_MASK_SG (MOD_MASK_SHIFT | MOD_MASK_GUI)
+#define MOD_MASK_AG (MOD_MASK_ALT | MOD_MASK_GUI)
+#define MOD_MASK_CSA (MOD_MASK_CTRL | MOD_MASK_SHIFT | MOD_MASK_ALT)
+#define MOD_MASK_CSG (MOD_MASK_CTRL | MOD_MASK_SHIFT | MOD_MASK_GUI)
+#define MOD_MASK_CAG (MOD_MASK_CTRL | MOD_MASK_ALT | MOD_MASK_GUI)
+#define MOD_MASK_SAG (MOD_MASK_SHIFT | MOD_MASK_ALT | MOD_MASK_GUI)
+#define MOD_MASK_CSAG (MOD_MASK_CTRL | MOD_MASK_SHIFT | MOD_MASK_ALT | MOD_MASK_GUI)
diff --git a/quantum/os_detection.c b/quantum/os_detection.c
index b1511afb14..e606227136 100644
--- a/quantum/os_detection.c
+++ b/quantum/os_detection.c
@@ -31,53 +31,53 @@ uint16_t usb_setups[STORED_USB_SETUPS];
 
 #ifdef OS_DETECTION_ENABLE
 struct setups_data_t {
-    uint8_t      count;
-    uint8_t      cnt_02;
-    uint8_t      cnt_04;
-    uint8_t      cnt_ff;
-    uint16_t     last_wlength;
-    os_variant_t detected_os;
+    uint8_t  count;
+    uint8_t  cnt_02;
+    uint8_t  cnt_04;
+    uint8_t  cnt_ff;
+    uint16_t last_wlength;
 };
 
 struct setups_data_t setups_data = {
-    .count       = 0,
-    .cnt_02      = 0,
-    .cnt_04      = 0,
-    .cnt_ff      = 0,
-    .detected_os = OS_UNSURE,
+    .count  = 0,
+    .cnt_02 = 0,
+    .cnt_04 = 0,
+    .cnt_ff = 0,
 };
 
+os_variant_t detected_os = OS_UNSURE;
+
 // Some collected sequences of wLength can be found in tests.
 void make_guess(void) {
     if (setups_data.count < 3) {
         return;
     }
     if (setups_data.cnt_ff >= 2 && setups_data.cnt_04 >= 1) {
-        setups_data.detected_os = OS_WINDOWS;
+        detected_os = OS_WINDOWS;
         return;
     }
     if (setups_data.count == setups_data.cnt_ff) {
         // Linux has 3 packets with 0xFF.
-        setups_data.detected_os = OS_LINUX;
+        detected_os = OS_LINUX;
         return;
     }
     if (setups_data.count == 5 && setups_data.last_wlength == 0xFF && setups_data.cnt_ff == 1 && setups_data.cnt_02 == 2) {
-        setups_data.detected_os = OS_MACOS;
+        detected_os = OS_MACOS;
         return;
     }
     if (setups_data.count == 4 && setups_data.cnt_ff == 0 && setups_data.cnt_02 == 2) {
         // iOS and iPadOS don't have the last 0xFF packet.
-        setups_data.detected_os = OS_IOS;
+        detected_os = OS_IOS;
         return;
     }
     if (setups_data.cnt_ff == 0 && setups_data.cnt_02 == 3 && setups_data.cnt_04 == 1) {
         // This is actually PS5.
-        setups_data.detected_os = OS_LINUX;
+        detected_os = OS_LINUX;
         return;
     }
     if (setups_data.cnt_ff >= 1 && setups_data.cnt_02 == 0 && setups_data.cnt_04 == 0) {
         // This is actually Quest 2 or Nintendo Switch.
-        setups_data.detected_os = OS_LINUX;
+        detected_os = OS_LINUX;
         return;
     }
 }
@@ -99,13 +99,20 @@ void process_wlength(const uint16_t w_length) {
 }
 
 os_variant_t detected_host_os(void) {
-    return setups_data.detected_os;
+    return detected_os;
 }
 
 void erase_wlength_data(void) {
     memset(&setups_data, 0, sizeof(setups_data));
+    detected_os = OS_UNSURE;
+}
+
+#    if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
+void slave_update_detected_host_os(os_variant_t os) {
+    detected_os = os;
 }
-#endif // OS_DETECTION_ENABLE
+#    endif // defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
+#endif     // OS_DETECTION_ENABLE
 
 #ifdef OS_DETECTION_DEBUG_ENABLE
 void print_stored_setups(void) {
diff --git a/quantum/os_detection.h b/quantum/os_detection.h
index e643dcd27f..3496ea0ed2 100644
--- a/quantum/os_detection.h
+++ b/quantum/os_detection.h
@@ -30,6 +30,10 @@ typedef enum {
 void         process_wlength(const uint16_t w_length);
 os_variant_t detected_host_os(void);
 void         erase_wlength_data(void);
+
+#    if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
+void slave_update_detected_host_os(os_variant_t os);
+#    endif // defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
 #endif
 
 #ifdef OS_DETECTION_DEBUG_ENABLE
diff --git a/quantum/painter/lvgl/qp_lvgl.c b/quantum/painter/lvgl/qp_lvgl.c
index c6dd08ef97..660ffb6100 100644
--- a/quantum/painter/lvgl/qp_lvgl.c
+++ b/quantum/painter/lvgl/qp_lvgl.c
@@ -60,7 +60,7 @@ bool qp_lvgl_attach(painter_device_t device) {
     qp_dprintf("qp_lvgl_start: entry\n");
     qp_lvgl_detach();
 
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_lvgl_attach: fail (validation_ok == false)\n");
         qp_lvgl_detach();
diff --git a/quantum/painter/qff.h b/quantum/painter/qff.h
index 6f1a1fd815..d1d629582f 100644
--- a/quantum/painter/qff.h
+++ b/quantum/painter/qff.h
@@ -21,7 +21,7 @@
 
 #define QFF_FONT_DESCRIPTOR_TYPEID 0x00
 
-typedef struct __attribute__((packed)) qff_font_descriptor_v1_t {
+typedef struct QP_PACKED qff_font_descriptor_v1_t {
     qgf_block_header_v1_t header;              // = { .type_id = 0x00, .neg_type_id = (~0x00), .length = 20 }
     uint32_t              magic : 24;          // constant, equal to 0x464651 ("QFF")
     uint8_t               qff_version;         // constant, equal to 0x01
@@ -50,13 +50,13 @@ _Static_assert(sizeof(qff_font_descriptor_v1_t) == (sizeof(qgf_block_header_v1_t
 #define QFF_GLYPH_OFFSET_BITS 18
 #define QFF_GLYPH_OFFSET_MASK (((1 << QFF_GLYPH_OFFSET_BITS) - 1) << QFF_GLYPH_WIDTH_BITS)
 
-typedef struct __attribute__((packed)) qff_ascii_glyph_v1_t {
+typedef struct QP_PACKED qff_ascii_glyph_v1_t {
     uint32_t value : 24; // Uses QFF_GLYPH_*_(BITS|MASK) as bitfield ordering is compiler-defined
 } qff_ascii_glyph_v1_t;
 
 _Static_assert(sizeof(qff_ascii_glyph_v1_t) == 3, "qff_ascii_glyph_v1_t must be 3 bytes in v1 of QFF");
 
-typedef struct __attribute__((packed)) qff_ascii_glyph_table_v1_t {
+typedef struct QP_PACKED qff_ascii_glyph_table_v1_t {
     qgf_block_header_v1_t header;    // = { .type_id = 0x01, .neg_type_id = (~0x01), .length = 285 }
     qff_ascii_glyph_v1_t  glyph[95]; // 95 glyphs, 0x20..0x7E
 } qff_ascii_glyph_table_v1_t;
@@ -68,14 +68,14 @@ _Static_assert(sizeof(qff_ascii_glyph_table_v1_t) == (sizeof(qgf_block_header_v1
 
 #define QFF_UNICODE_GLYPH_DESCRIPTOR_TYPEID 0x02
 
-typedef struct __attribute__((packed)) qff_unicode_glyph_v1_t {
+typedef struct QP_PACKED qff_unicode_glyph_v1_t {
     uint32_t code_point : 24;
     uint32_t value : 24; // Uses QFF_GLYPH_*_(BITS|MASK) as bitfield ordering is compiler-defined
 } qff_unicode_glyph_v1_t;
 
 _Static_assert(sizeof(qff_unicode_glyph_v1_t) == 6, "qff_unicode_glyph_v1_t must be 6 bytes in v1 of QFF");
 
-typedef struct __attribute__((packed)) qff_unicode_glyph_table_v1_t {
+typedef struct QP_PACKED qff_unicode_glyph_table_v1_t {
     qgf_block_header_v1_t  header;   // = { .type_id = 0x02, .neg_type_id = (~0x02), .length = (N * 6) }
     qff_unicode_glyph_v1_t glyph[0]; // Extent of '0' signifies that this struct is immediately followed by the glyph data
 } qff_unicode_glyph_table_v1_t;
diff --git a/quantum/painter/qp.c b/quantum/painter/qp.c
index de36dee2c1..aea9381b60 100644
--- a/quantum/painter/qp.c
+++ b/quantum/painter/qp.c
@@ -11,15 +11,15 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Internal driver validation
 
-static bool validate_driver_vtable(struct painter_driver_t *driver) {
+static bool validate_driver_vtable(painter_driver_t *driver) {
     return (driver->driver_vtable && driver->driver_vtable->init && driver->driver_vtable->power && driver->driver_vtable->clear && driver->driver_vtable->viewport && driver->driver_vtable->pixdata && driver->driver_vtable->palette_convert && driver->driver_vtable->append_pixels && driver->driver_vtable->append_pixdata) ? true : false;
 }
 
-static bool validate_comms_vtable(struct painter_driver_t *driver) {
+static bool validate_comms_vtable(painter_driver_t *driver) {
     return (driver->comms_vtable && driver->comms_vtable->comms_init && driver->comms_vtable->comms_start && driver->comms_vtable->comms_stop && driver->comms_vtable->comms_send) ? true : false;
 }
 
-static bool validate_driver_integrity(struct painter_driver_t *driver) {
+static bool validate_driver_integrity(painter_driver_t *driver) {
     return validate_driver_vtable(driver) && validate_comms_vtable(driver);
 }
 
@@ -28,7 +28,7 @@ static bool validate_driver_integrity(struct painter_driver_t *driver) {
 
 bool qp_init(painter_device_t device, painter_rotation_t rotation) {
     qp_dprintf("qp_init: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
 
     driver->validate_ok = false;
     if (!validate_driver_integrity(driver)) {
@@ -64,7 +64,7 @@ bool qp_init(painter_device_t device, painter_rotation_t rotation) {
 
 bool qp_power(painter_device_t device, bool power_on) {
     qp_dprintf("qp_power: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_power: fail (validation_ok == false)\n");
         return false;
@@ -86,7 +86,7 @@ bool qp_power(painter_device_t device, bool power_on) {
 
 bool qp_clear(painter_device_t device) {
     qp_dprintf("qp_clear: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_clear: fail (validation_ok == false)\n");
         return false;
@@ -108,7 +108,7 @@ bool qp_clear(painter_device_t device) {
 
 bool qp_flush(painter_device_t device) {
     qp_dprintf("qp_flush: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_flush: fail (validation_ok == false)\n");
         return false;
@@ -130,7 +130,7 @@ bool qp_flush(painter_device_t device) {
 
 void qp_get_geometry(painter_device_t device, uint16_t *width, uint16_t *height, painter_rotation_t *rotation, uint16_t *offset_x, uint16_t *offset_y) {
     qp_dprintf("qp_geometry: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
 
     switch (driver->rotation) {
         default:
@@ -174,7 +174,7 @@ void qp_get_geometry(painter_device_t device, uint16_t *width, uint16_t *height,
 
 void qp_set_viewport_offsets(painter_device_t device, uint16_t offset_x, uint16_t offset_y) {
     qp_dprintf("qp_set_viewport_offsets: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
 
     driver->offset_x = offset_x;
     driver->offset_y = offset_y;
@@ -187,7 +187,7 @@ void qp_set_viewport_offsets(painter_device_t device, uint16_t offset_x, uint16_
 
 bool qp_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
     qp_dprintf("qp_viewport: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_viewport: fail (validation_ok == false)\n");
         return false;
@@ -210,7 +210,7 @@ bool qp_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t
 
 bool qp_pixdata(painter_device_t device, const void *pixel_data, uint32_t native_pixel_count) {
     qp_dprintf("qp_pixdata: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_pixdata: fail (validation_ok == false)\n");
         return false;
diff --git a/quantum/painter/qp.h b/quantum/painter/qp.h
index 00f5d7931a..7222d3b413 100644
--- a/quantum/painter/qp.h
+++ b/quantum/painter/qp.h
@@ -1,4 +1,4 @@
-// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2021-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
@@ -11,6 +11,22 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Quantum Painter global configurables (add to your keyboard's config.h)
 
+#ifndef QUANTUM_PAINTER_DISPLAY_TIMEOUT
+/**
+ * @def This controls the amount of time (in milliseconds) that all displays will remain on after the last user input.
+ *      If set to 0, the display will remain on indefinitely.
+ */
+#    define QUANTUM_PAINTER_DISPLAY_TIMEOUT 30000
+#endif // QUANTUM_PAINTER_DISPLAY_TIMEOUT
+
+#ifndef QUANTUM_PAINTER_TASK_THROTTLE
+/**
+ * @def This controls the amount of time (in milliseconds) that the Quantum Painter internal task will wait between
+ *      each execution.
+ */
+#    define QUANTUM_PAINTER_TASK_THROTTLE 1
+#endif // QUANTUM_PAINTER_TASK_THROTTLE
+
 #ifndef QUANTUM_PAINTER_NUM_IMAGES
 /**
  * @def This controls the maximum number of images that Quantum Painter can load at any one time. Images can be loaded
@@ -53,7 +69,7 @@
  * @def This controls the maximum size of the pixel data buffer used for single blocks of transmission. Larger buffers
  *      means more data is processed at one time, with less frequent transmissions, at the cost of RAM.
  */
-#    define QUANTUM_PAINTER_PIXDATA_BUFFER_SIZE 32
+#    define QUANTUM_PAINTER_PIXDATA_BUFFER_SIZE 1024
 #endif
 
 #ifndef QUANTUM_PAINTER_SUPPORTS_256_PALETTE
@@ -442,34 +458,50 @@ int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, pai
 
 #ifdef QUANTUM_PAINTER_RGB565_SURFACE_ENABLE
 #    include "qp_rgb565_surface.h"
+#else // QUANTUM_PAINTER_RGB565_SURFACE_ENABLE
+#    define RGB565_SURFACE_NUM_DEVICES 0
 #endif // QUANTUM_PAINTER_RGB565_SURFACE_ENABLE
 
 #ifdef QUANTUM_PAINTER_ILI9163_ENABLE
 #    include "qp_ili9163.h"
+#else // QUANTUM_PAINTER_ILI9163_ENABLE
+#    define ILI9163_NUM_DEVICES 0
 #endif // QUANTUM_PAINTER_ILI9163_ENABLE
 
 #ifdef QUANTUM_PAINTER_ILI9341_ENABLE
 #    include "qp_ili9341.h"
+#else // QUANTUM_PAINTER_ILI9341_ENABLE
+#    define ILI9341_NUM_DEVICES 0
 #endif // QUANTUM_PAINTER_ILI9341_ENABLE
 
 #ifdef QUANTUM_PAINTER_ILI9488_ENABLE
 #    include "qp_ili9488.h"
+#else // QUANTUM_PAINTER_ILI9488_ENABLE
+#    define ILI9488_NUM_DEVICES 0
 #endif // QUANTUM_PAINTER_ILI9488_ENABLE
 
 #ifdef QUANTUM_PAINTER_ST7789_ENABLE
 #    include "qp_st7789.h"
+#else // QUANTUM_PAINTER_ST7789_ENABLE
+#    define ST7789_NUM_DEVICES 0
 #endif // QUANTUM_PAINTER_ST7789_ENABLE
 
 #ifdef QUANTUM_PAINTER_ST7735_ENABLE
 #    include "qp_st7735.h"
+#else // QUANTUM_PAINTER_ST7735_ENABLE
+#    define ST7735_NUM_DEVICES 0
 #endif // QUANTUM_PAINTER_ST7735_ENABLE
 
 #ifdef QUANTUM_PAINTER_GC9A01_ENABLE
 #    include "qp_gc9a01.h"
+#else // QUANTUM_PAINTER_GC9A01_ENABLE
+#    define GC9A01_NUM_DEVICES 0
 #endif // QUANTUM_PAINTER_GC9A01_ENABLE
 
 #ifdef QUANTUM_PAINTER_SSD1351_ENABLE
 #    include "qp_ssd1351.h"
+#else // QUANTUM_PAINTER_SSD1351_ENABLE
+#    define SSD1351_NUM_DEVICES 0
 #endif // QUANTUM_PAINTER_SSD1351_ENABLE
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/quantum/painter/qp_comms.c b/quantum/painter/qp_comms.c
index dc17b49460..bcc6de8f2e 100644
--- a/quantum/painter/qp_comms.c
+++ b/quantum/painter/qp_comms.c
@@ -7,7 +7,7 @@
 // Base comms APIs
 
 bool qp_comms_init(painter_device_t device) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_comms_init: fail (validation_ok == false)\n");
         return false;
@@ -17,7 +17,7 @@ bool qp_comms_init(painter_device_t device) {
 }
 
 bool qp_comms_start(painter_device_t device) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_comms_start: fail (validation_ok == false)\n");
         return false;
@@ -27,7 +27,7 @@ bool qp_comms_start(painter_device_t device) {
 }
 
 void qp_comms_stop(painter_device_t device) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_comms_stop: fail (validation_ok == false)\n");
         return;
@@ -37,7 +37,7 @@ void qp_comms_stop(painter_device_t device) {
 }
 
 uint32_t qp_comms_send(painter_device_t device, const void *data, uint32_t byte_count) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_comms_send: fail (validation_ok == false)\n");
         return false;
@@ -50,8 +50,8 @@ uint32_t qp_comms_send(painter_device_t device, const void *data, uint32_t byte_
 // Comms APIs that use a D/C pin
 
 void qp_comms_command(painter_device_t device, uint8_t cmd) {
-    struct painter_driver_t *                   driver       = (struct painter_driver_t *)device;
-    struct painter_comms_with_command_vtable_t *comms_vtable = (struct painter_comms_with_command_vtable_t *)driver->comms_vtable;
+    painter_driver_t *                   driver       = (painter_driver_t *)device;
+    painter_comms_with_command_vtable_t *comms_vtable = (painter_comms_with_command_vtable_t *)driver->comms_vtable;
     comms_vtable->send_command(device, cmd);
 }
 
@@ -66,7 +66,7 @@ uint32_t qp_comms_command_databuf(painter_device_t device, uint8_t cmd, const vo
 }
 
 void qp_comms_bulk_command_sequence(painter_device_t device, const uint8_t *sequence, size_t sequence_len) {
-    struct painter_driver_t *                   driver       = (struct painter_driver_t *)device;
-    struct painter_comms_with_command_vtable_t *comms_vtable = (struct painter_comms_with_command_vtable_t *)driver->comms_vtable;
+    painter_driver_t *                   driver       = (painter_driver_t *)device;
+    painter_comms_with_command_vtable_t *comms_vtable = (painter_comms_with_command_vtable_t *)driver->comms_vtable;
     comms_vtable->bulk_command_sequence(device, sequence, sequence_len);
 }
diff --git a/quantum/painter/qp_draw.h b/quantum/painter/qp_draw.h
index 84b1946ca7..3d073efe8c 100644
--- a/quantum/painter/qp_draw.h
+++ b/quantum/painter/qp_draw.h
@@ -63,7 +63,7 @@ enum qp_internal_rle_mode_t {
     NON_REPEATING_RUN,
 };
 
-struct qp_internal_byte_input_state {
+typedef struct qp_internal_byte_input_state_t {
     painter_device_t device;
     qp_stream_t*     src_stream;
     int16_t          curr;
@@ -74,22 +74,22 @@ struct qp_internal_byte_input_state {
             uint8_t                     remain; // number of bytes remaining in the current mode
         } rle;
     };
-};
+} qp_internal_byte_input_state_t;
 
-struct qp_internal_pixel_output_state {
+typedef struct qp_internal_pixel_output_state_t {
     painter_device_t device;
     uint32_t         pixel_write_pos;
     uint32_t         max_pixels;
-};
+} qp_internal_pixel_output_state_t;
 
 bool qp_internal_pixel_appender(qp_pixel_t* palette, uint8_t index, void* cb_arg);
 
-struct qp_internal_byte_output_state {
+typedef struct qp_internal_byte_output_state_t {
     painter_device_t device;
     uint32_t         byte_write_pos;
     uint32_t         max_bytes;
-};
+} qp_internal_byte_output_state_t;
 
 bool qp_internal_byte_appender(uint8_t byteval, void* cb_arg);
 
-qp_internal_byte_input_callback qp_internal_prepare_input_state(struct qp_internal_byte_input_state* input_state, painter_compression_t compression);
+qp_internal_byte_input_callback qp_internal_prepare_input_state(qp_internal_byte_input_state_t* input_state, painter_compression_t compression);
diff --git a/quantum/painter/qp_draw_circle.c b/quantum/painter/qp_draw_circle.c
index edaae35835..25517d91c5 100644
--- a/quantum/painter/qp_draw_circle.c
+++ b/quantum/painter/qp_draw_circle.c
@@ -127,7 +127,7 @@ static bool qp_circle_helper_impl(painter_device_t device, uint16_t centerx, uin
 
 bool qp_circle(painter_device_t device, uint16_t x, uint16_t y, uint16_t radius, uint8_t hue, uint8_t sat, uint8_t val, bool filled) {
     qp_dprintf("qp_circle: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_circle: fail (validation_ok == false)\n");
         return false;
diff --git a/quantum/painter/qp_draw_codec.c b/quantum/painter/qp_draw_codec.c
index 5d1cf7c52e..cee2e32e28 100644
--- a/quantum/painter/qp_draw_codec.c
+++ b/quantum/painter/qp_draw_codec.c
@@ -54,8 +54,8 @@ bool qp_internal_decode_grayscale(painter_device_t device, uint32_t pixel_count,
 }
 
 bool qp_internal_decode_recolor(painter_device_t device, uint32_t pixel_count, uint8_t bits_per_pixel, qp_internal_byte_input_callback input_callback, void* input_arg, qp_pixel_t fg_hsv888, qp_pixel_t bg_hsv888, qp_internal_pixel_output_callback output_callback, void* output_arg) {
-    struct painter_driver_t* driver = (struct painter_driver_t*)device;
-    int16_t                  steps  = 1 << bits_per_pixel; // number of items we need to interpolate
+    painter_driver_t* driver = (painter_driver_t*)device;
+    int16_t           steps  = 1 << bits_per_pixel; // number of items we need to interpolate
     if (qp_internal_interpolate_palette(fg_hsv888, bg_hsv888, steps)) {
         if (!driver->driver_vtable->palette_convert(device, steps, qp_internal_global_pixel_lookup_table)) {
             return false;
@@ -84,13 +84,13 @@ bool qp_internal_send_bytes(painter_device_t device, uint32_t byte_count, qp_int
 // Progressive pull of bytes, push of pixels
 
 static inline int16_t qp_drawimage_byte_uncompressed_decoder(void* cb_arg) {
-    struct qp_internal_byte_input_state* state = (struct qp_internal_byte_input_state*)cb_arg;
-    state->curr                                = qp_stream_get(state->src_stream);
+    qp_internal_byte_input_state_t* state = (qp_internal_byte_input_state_t*)cb_arg;
+    state->curr                           = qp_stream_get(state->src_stream);
     return state->curr;
 }
 
 static inline int16_t qp_drawimage_byte_rle_decoder(void* cb_arg) {
-    struct qp_internal_byte_input_state* state = (struct qp_internal_byte_input_state*)cb_arg;
+    qp_internal_byte_input_state_t* state = (qp_internal_byte_input_state_t*)cb_arg;
 
     // Work out if we're parsing the initial marker byte
     if (state->rle.mode == MARKER_BYTE) {
@@ -126,8 +126,8 @@ static inline int16_t qp_drawimage_byte_rle_decoder(void* cb_arg) {
 }
 
 bool qp_internal_pixel_appender(qp_pixel_t* palette, uint8_t index, void* cb_arg) {
-    struct qp_internal_pixel_output_state* state  = (struct qp_internal_pixel_output_state*)cb_arg;
-    struct painter_driver_t*               driver = (struct painter_driver_t*)state->device;
+    qp_internal_pixel_output_state_t* state  = (qp_internal_pixel_output_state_t*)cb_arg;
+    painter_driver_t*                 driver = (painter_driver_t*)state->device;
 
     if (!driver->driver_vtable->append_pixels(state->device, qp_internal_global_pixdata_buffer, palette, state->pixel_write_pos++, 1, &index)) {
         return false;
@@ -145,8 +145,8 @@ bool qp_internal_pixel_appender(qp_pixel_t* palette, uint8_t index, void* cb_arg
 }
 
 bool qp_internal_byte_appender(uint8_t byteval, void* cb_arg) {
-    struct qp_internal_byte_output_state* state  = (struct qp_internal_byte_output_state*)cb_arg;
-    struct painter_driver_t*              driver = (struct painter_driver_t*)state->device;
+    qp_internal_byte_output_state_t* state  = (qp_internal_byte_output_state_t*)cb_arg;
+    painter_driver_t*                driver = (painter_driver_t*)state->device;
 
     if (!driver->driver_vtable->append_pixdata(state->device, qp_internal_global_pixdata_buffer, state->byte_write_pos++, byteval)) {
         return false;
@@ -154,7 +154,7 @@ bool qp_internal_byte_appender(uint8_t byteval, void* cb_arg) {
 
     // If we've hit the transmit limit, send out the entire buffer and reset the write position
     if (state->byte_write_pos == state->max_bytes) {
-        struct painter_driver_t* driver = (struct painter_driver_t*)state->device;
+        painter_driver_t* driver = (painter_driver_t*)state->device;
         if (!driver->driver_vtable->pixdata(state->device, qp_internal_global_pixdata_buffer, state->byte_write_pos * 8 / driver->native_bits_per_pixel)) {
             return false;
         }
@@ -164,7 +164,7 @@ bool qp_internal_byte_appender(uint8_t byteval, void* cb_arg) {
     return true;
 }
 
-qp_internal_byte_input_callback qp_internal_prepare_input_state(struct qp_internal_byte_input_state* input_state, painter_compression_t compression) {
+qp_internal_byte_input_callback qp_internal_prepare_input_state(qp_internal_byte_input_state_t* input_state, painter_compression_t compression) {
     switch (compression) {
         case IMAGE_UNCOMPRESSED:
             return qp_drawimage_byte_uncompressed_decoder;
diff --git a/quantum/painter/qp_draw_core.c b/quantum/painter/qp_draw_core.c
index 309ef93dd0..3988aaedf8 100644
--- a/quantum/painter/qp_draw_core.c
+++ b/quantum/painter/qp_draw_core.c
@@ -37,21 +37,21 @@ __attribute__((__aligned__(4))) qp_pixel_t qp_internal_global_pixel_lookup_table
 // Helpers
 
 uint32_t qp_internal_num_pixels_in_buffer(painter_device_t device) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     return ((QUANTUM_PAINTER_PIXDATA_BUFFER_SIZE * 8) / driver->native_bits_per_pixel);
 }
 
 // qp_setpixel internal implementation, but accepts a buffer with pre-converted native pixel. Only the first pixel is used.
 bool qp_internal_setpixel_impl(painter_device_t device, uint16_t x, uint16_t y) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     return driver->driver_vtable->viewport(device, x, y, x, y) && driver->driver_vtable->pixdata(device, qp_internal_global_pixdata_buffer, 1);
 }
 
 // Fills the global native pixel buffer with equivalent pixels matching the supplied HSV
 void qp_internal_fill_pixdata(painter_device_t device, uint32_t num_pixels, uint8_t hue, uint8_t sat, uint8_t val) {
-    struct painter_driver_t *driver            = (struct painter_driver_t *)device;
-    uint32_t                 pixels_in_pixdata = qp_internal_num_pixels_in_buffer(device);
-    num_pixels                                 = QP_MIN(pixels_in_pixdata, num_pixels);
+    painter_driver_t *driver            = (painter_driver_t *)device;
+    uint32_t          pixels_in_pixdata = qp_internal_num_pixels_in_buffer(device);
+    num_pixels                          = QP_MIN(pixels_in_pixdata, num_pixels);
 
     // Convert the color to native pixel format
     qp_pixel_t color = {.hsv888 = {.h = hue, .s = sat, .v = val}};
@@ -144,7 +144,7 @@ bool qp_internal_load_qgf_palette(qp_stream_t *stream, uint8_t bpp) {
 // Quantum Painter External API: qp_setpixel
 
 bool qp_setpixel(painter_device_t device, uint16_t x, uint16_t y, uint8_t hue, uint8_t sat, uint8_t val) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_setpixel: fail (validation_ok == false)\n");
         return false;
@@ -174,7 +174,7 @@ bool qp_line(painter_device_t device, uint16_t x0, uint16_t y0, uint16_t x1, uin
     }
 
     qp_dprintf("qp_line(%d, %d, %d, %d): entry\n", (int)x0, (int)y0, (int)x1, (int)y1);
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_line: fail (validation_ok == false)\n");
         return false;
@@ -228,8 +228,8 @@ bool qp_line(painter_device_t device, uint16_t x0, uint16_t y0, uint16_t x1, uin
 // Quantum Painter External API: qp_rect
 
 bool qp_internal_fillrect_helper_impl(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
-    uint32_t                 pixels_in_pixdata = qp_internal_num_pixels_in_buffer(device);
-    struct painter_driver_t *driver            = (struct painter_driver_t *)device;
+    uint32_t          pixels_in_pixdata = qp_internal_num_pixels_in_buffer(device);
+    painter_driver_t *driver            = (painter_driver_t *)device;
 
     uint16_t l = QP_MIN(left, right);
     uint16_t r = QP_MAX(left, right);
@@ -252,7 +252,7 @@ bool qp_internal_fillrect_helper_impl(painter_device_t device, uint16_t left, ui
 
 bool qp_rect(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom, uint8_t hue, uint8_t sat, uint8_t val, bool filled) {
     qp_dprintf("qp_rect(%d, %d, %d, %d): entry\n", (int)left, (int)top, (int)right, (int)bottom);
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_rect: fail (validation_ok == false)\n");
         return false;
diff --git a/quantum/painter/qp_draw_ellipse.c b/quantum/painter/qp_draw_ellipse.c
index 7f2f4abcfd..5c7abd7a7d 100644
--- a/quantum/painter/qp_draw_ellipse.c
+++ b/quantum/painter/qp_draw_ellipse.c
@@ -61,7 +61,7 @@ static bool qp_ellipse_helper_impl(painter_device_t device, uint16_t centerx, ui
 
 bool qp_ellipse(painter_device_t device, uint16_t x, uint16_t y, uint16_t sizex, uint16_t sizey, uint8_t hue, uint8_t sat, uint8_t val, bool filled) {
     qp_dprintf("qp_ellipse: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_ellipse: fail (validation_ok == false)\n");
         return false;
diff --git a/quantum/painter/qp_draw_image.c b/quantum/painter/qp_draw_image.c
index 073f1da8eb..9f86b29f8b 100644
--- a/quantum/painter/qp_draw_image.c
+++ b/quantum/painter/qp_draw_image.c
@@ -1,4 +1,4 @@
-// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2021-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "qp_internal.h"
@@ -124,7 +124,7 @@ typedef struct qgf_frame_info_t {
 } qgf_frame_info_t;
 
 static bool qp_drawimage_prepare_frame_for_stream_read(painter_device_t device, qgf_image_handle_t *qgf_image, uint16_t frame_number, qp_pixel_t fg_hsv888, qp_pixel_t bg_hsv888, qgf_frame_info_t *info) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
 
     // Drop out if we can't actually place the data we read out anywhere
     if (!info) {
@@ -209,7 +209,7 @@ static bool qp_drawimage_prepare_frame_for_stream_read(painter_device_t device,
 
 static bool qp_drawimage_recolor_impl(painter_device_t device, uint16_t x, uint16_t y, painter_image_handle_t image, int frame_number, qgf_frame_info_t *frame_info, qp_pixel_t fg_hsv888, qp_pixel_t bg_hsv888) {
     qp_dprintf("qp_drawimage_recolor: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_drawimage_recolor: fail (validation_ok == false)\n");
         return false;
@@ -254,8 +254,8 @@ static bool qp_drawimage_recolor_impl(painter_device_t device, uint16_t x, uint1
     }
 
     // Set up the input state
-    struct qp_internal_byte_input_state input_state    = {.device = device, .src_stream = &qgf_image->stream};
-    qp_internal_byte_input_callback     input_callback = qp_internal_prepare_input_state(&input_state, frame_info->compression_scheme);
+    qp_internal_byte_input_state_t  input_state    = {.device = device, .src_stream = &qgf_image->stream};
+    qp_internal_byte_input_callback input_callback = qp_internal_prepare_input_state(&input_state, frame_info->compression_scheme);
     if (input_callback == NULL) {
         qp_dprintf("qp_drawimage_recolor: fail (invalid image compression scheme)\n");
         qp_comms_stop(device);
@@ -265,7 +265,7 @@ static bool qp_drawimage_recolor_impl(painter_device_t device, uint16_t x, uint1
     bool ret = false;
     if (frame_info->bpp <= 8) {
         // Set up the output state
-        struct qp_internal_pixel_output_state output_state = {.device = device, .pixel_write_pos = 0, .max_pixels = qp_internal_num_pixels_in_buffer(device)};
+        qp_internal_pixel_output_state_t output_state = {.device = device, .pixel_write_pos = 0, .max_pixels = qp_internal_num_pixels_in_buffer(device)};
 
         // Decode the pixel data and stream to the display
         ret = qp_internal_decode_palette(device, pixel_count, frame_info->bpp, input_callback, &input_state, qp_internal_global_pixel_lookup_table, qp_internal_pixel_appender, &output_state);
@@ -279,7 +279,7 @@ static bool qp_drawimage_recolor_impl(painter_device_t device, uint16_t x, uint1
         return false;
     } else {
         // Set up the output state
-        struct qp_internal_byte_output_state output_state = {.device = device, .byte_write_pos = 0, .max_bytes = qp_internal_num_pixels_in_buffer(device) * driver->native_bits_per_pixel / 8};
+        qp_internal_byte_output_state_t output_state = {.device = device, .byte_write_pos = 0, .max_bytes = qp_internal_num_pixels_in_buffer(device) * driver->native_bits_per_pixel / 8};
 
         // Stream the raw pixel data to the display
         uint32_t byte_count = pixel_count * frame_info->bpp / 8;
@@ -418,15 +418,3 @@ void qp_internal_animation_tick(void) {
     static uint32_t last_anim_exec = 0;
     deferred_exec_advanced_task(animation_executors, QUANTUM_PAINTER_CONCURRENT_ANIMATIONS, &last_anim_exec);
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Quantum Painter Core API: qp_internal_task
-
-void qp_internal_task(void) {
-    qp_internal_animation_tick();
-#ifdef QUANTUM_PAINTER_LVGL_INTEGRATION_ENABLE
-    // Run LVGL ticks
-    void qp_lvgl_internal_tick(void);
-    qp_lvgl_internal_tick();
-#endif
-}
diff --git a/quantum/painter/qp_draw_text.c b/quantum/painter/qp_draw_text.c
index f9fb2bf08f..ed3d373867 100644
--- a/quantum/painter/qp_draw_text.c
+++ b/quantum/painter/qp_draw_text.c
@@ -164,7 +164,7 @@ typedef bool (*code_point_handler)(qff_font_handle_t *qff_font, uint32_t code_po
 
 // Helper that sets up the palette (if required) and returns the offset in the stream that the data starts
 static inline bool qp_drawtext_prepare_font_for_render(painter_device_t device, qff_font_handle_t *qff_font, qp_pixel_t fg_hsv888, qp_pixel_t bg_hsv888, uint32_t *data_offset) {
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
 
     // Drop out if we can't actually place the data we read out anywhere
     if (!data_offset) {
@@ -319,13 +319,13 @@ static inline bool qp_iterate_code_points(qff_font_handle_t *qff_font, const cha
 // String width calculation
 
 // Callback state
-struct code_point_iter_calcwidth_state {
+typedef struct code_point_iter_calcwidth_state_t {
     int16_t width;
-};
+} code_point_iter_calcwidth_state_t;
 
 // Codepoint handler callback: width calc
 static inline bool qp_font_code_point_handler_calcwidth(qff_font_handle_t *qff_font, uint32_t code_point, uint8_t width, uint8_t height, void *cb_arg) {
-    struct code_point_iter_calcwidth_state *state = (struct code_point_iter_calcwidth_state *)cb_arg;
+    code_point_iter_calcwidth_state_t *state = (code_point_iter_calcwidth_state_t *)cb_arg;
 
     // Increment the overall width by this glyph's width
     state->width += width;
@@ -337,19 +337,19 @@ static inline bool qp_font_code_point_handler_calcwidth(qff_font_handle_t *qff_f
 // String drawing implementation
 
 // Callback state
-struct code_point_iter_drawglyph_state {
-    painter_device_t                       device;
-    int16_t                                xpos;
-    int16_t                                ypos;
-    qp_internal_byte_input_callback        input_callback;
-    struct qp_internal_byte_input_state *  input_state;
-    struct qp_internal_pixel_output_state *output_state;
-};
+typedef struct code_point_iter_drawglyph_state_t {
+    painter_device_t                  device;
+    int16_t                           xpos;
+    int16_t                           ypos;
+    qp_internal_byte_input_callback   input_callback;
+    qp_internal_byte_input_state_t *  input_state;
+    qp_internal_pixel_output_state_t *output_state;
+} code_point_iter_drawglyph_state_t;
 
 // Codepoint handler callback: drawing
 static inline bool qp_font_code_point_handler_drawglyph(qff_font_handle_t *qff_font, uint32_t code_point, uint8_t width, uint8_t height, void *cb_arg) {
-    struct code_point_iter_drawglyph_state *state  = (struct code_point_iter_drawglyph_state *)cb_arg;
-    struct painter_driver_t *               driver = (struct painter_driver_t *)state->device;
+    code_point_iter_drawglyph_state_t *state  = (code_point_iter_drawglyph_state_t *)cb_arg;
+    painter_driver_t *                 driver = (painter_driver_t *)state->device;
 
     // Reset the input state's RLE mode -- the stream should already be correctly positioned by qp_iterate_code_points()
     state->input_state->rle.mode = MARKER_BYTE; // ignored if not using RLE
@@ -386,7 +386,7 @@ int16_t qp_textwidth(painter_font_handle_t font, const char *str) {
     }
 
     // Create the codepoint iterator state
-    struct code_point_iter_calcwidth_state state = {.width = 0};
+    code_point_iter_calcwidth_state_t state = {.width = 0};
     // Iterate each codepoint, return the calculated width if successful.
     return qp_iterate_code_points(qff_font, str, qp_font_code_point_handler_calcwidth, &state) ? state.width : 0;
 }
@@ -405,7 +405,7 @@ int16_t qp_drawtext(painter_device_t device, uint16_t x, uint16_t y, painter_fon
 
 int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, painter_font_handle_t font, const char *str, uint8_t hue_fg, uint8_t sat_fg, uint8_t val_fg, uint8_t hue_bg, uint8_t sat_bg, uint8_t val_bg) {
     qp_dprintf("qp_drawtext_recolor: entry\n");
-    struct painter_driver_t *driver = (struct painter_driver_t *)device;
+    painter_driver_t *driver = (painter_driver_t *)device;
     if (!driver->validate_ok) {
         qp_dprintf("qp_drawtext_recolor: fail (validation_ok == false)\n");
         return 0;
@@ -423,8 +423,8 @@ int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, pai
     }
 
     // Set up the byte input state and input callback
-    struct qp_internal_byte_input_state input_state    = {.device = device, .src_stream = &qff_font->stream};
-    qp_internal_byte_input_callback     input_callback = qp_internal_prepare_input_state(&input_state, qff_font->compression_scheme);
+    qp_internal_byte_input_state_t  input_state    = {.device = device, .src_stream = &qff_font->stream};
+    qp_internal_byte_input_callback input_callback = qp_internal_prepare_input_state(&input_state, qff_font->compression_scheme);
     if (input_callback == NULL) {
         qp_dprintf("qp_drawtext_recolor: fail (invalid font compression scheme)\n");
         qp_comms_stop(device);
@@ -432,18 +432,18 @@ int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, pai
     }
 
     // Set up the pixel output state
-    struct qp_internal_pixel_output_state output_state = {.device = device, .pixel_write_pos = 0, .max_pixels = qp_internal_num_pixels_in_buffer(device)};
+    qp_internal_pixel_output_state_t output_state = {.device = device, .pixel_write_pos = 0, .max_pixels = qp_internal_num_pixels_in_buffer(device)};
 
     // Set up the codepoint iteration state
-    struct code_point_iter_drawglyph_state state = {// Common
-                                                    .device = device,
-                                                    .xpos   = x,
-                                                    .ypos   = y,
-                                                    // Input
-                                                    .input_callback = input_callback,
-                                                    .input_state    = &input_state,
-                                                    // Output
-                                                    .output_state = &output_state};
+    code_point_iter_drawglyph_state_t state = {// Common
+                                               .device = device,
+                                               .xpos   = x,
+                                               .ypos   = y,
+                                               // Input
+                                               .input_callback = input_callback,
+                                               .input_state    = &input_state,
+                                               // Output
+                                               .output_state = &output_state};
 
     qp_pixel_t fg_hsv888 = {.hsv888 = {.h = hue_fg, .s = sat_fg, .v = val_fg}};
     qp_pixel_t bg_hsv888 = {.hsv888 = {.h = hue_bg, .s = sat_bg, .v = val_bg}};
diff --git a/quantum/painter/qp_internal.c b/quantum/painter/qp_internal.c
new file mode 100644
index 0000000000..ea23aef7c3
--- /dev/null
+++ b/quantum/painter/qp_internal.c
@@ -0,0 +1,96 @@
+// Copyright 2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "qp_internal.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter Core API: device registration
+
+enum {
+    // Work out how many devices we're actually going to be instantiating
+    // NOTE: We intentionally do not include surfaces here, despite them conforming to the same API.
+    QP_NUM_DEVICES = (ILI9163_NUM_DEVICES)   // ILI9163
+                     + (ILI9341_NUM_DEVICES) // ILI9341
+                     + (ILI9488_NUM_DEVICES) // ILI9488
+                     + (ST7789_NUM_DEVICES)  // ST7789
+                     + (ST7735_NUM_DEVICES)  // ST7735
+                     + (GC9A01_NUM_DEVICES)  // GC9A01
+                     + (SSD1351_NUM_DEVICES) // SSD1351
+};
+
+static painter_device_t qp_devices[QP_NUM_DEVICES] = {NULL};
+
+bool qp_internal_register_device(painter_device_t driver) {
+    for (uint8_t i = 0; i < QP_NUM_DEVICES; i++) {
+        if (qp_devices[i] == NULL) {
+            qp_devices[i] = driver;
+            return true;
+        }
+    }
+
+    // We should never get here -- someone has screwed up their device counts during config
+    qp_dprintf("qp_internal_register_device: no more space for devices!\n");
+    return false;
+}
+
+#if (QUANTUM_PAINTER_DISPLAY_TIMEOUT) > 0
+static void qp_internal_display_timeout_task(void) {
+    // Handle power on/off state
+    static bool display_on                  = true;
+    bool        should_change_display_state = false;
+    bool        target_display_state        = false;
+    if (last_input_activity_elapsed() < (QUANTUM_PAINTER_DISPLAY_TIMEOUT)) {
+        should_change_display_state = display_on == false;
+        target_display_state        = true;
+    } else {
+        should_change_display_state = display_on == true;
+        target_display_state        = false;
+    }
+
+    if (should_change_display_state) {
+        for (uint8_t i = 0; i < QP_NUM_DEVICES; i++) {
+            if (qp_devices[i] != NULL) {
+                qp_power(qp_devices[i], target_display_state);
+            }
+        }
+
+        display_on = target_display_state;
+    }
+}
+#endif // (QUANTUM_PAINTER_DISPLAY_TIMEOUT) > 0
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter Core API: qp_internal_task
+
+_Static_assert((QUANTUM_PAINTER_TASK_THROTTLE) > 0 && (QUANTUM_PAINTER_TASK_THROTTLE) < 1000, "QUANTUM_PAINTER_TASK_THROTTLE must be between 1 and 999");
+
+void qp_internal_task(void) {
+    // Perform throttling of the internal processing of Quantum Painter
+    static uint32_t last_tick = 0;
+    uint32_t        now       = timer_read32();
+    if (TIMER_DIFF_32(now, last_tick) < (QUANTUM_PAINTER_TASK_THROTTLE)) {
+        return;
+    }
+    last_tick = now;
+
+#if (QUANTUM_PAINTER_DISPLAY_TIMEOUT) > 0
+    qp_internal_display_timeout_task();
+#endif // (QUANTUM_PAINTER_DISPLAY_TIMEOUT) > 0
+
+    // Handle animations
+    void qp_internal_animation_tick(void);
+    qp_internal_animation_tick();
+
+#ifdef QUANTUM_PAINTER_LVGL_INTEGRATION_ENABLE
+    // Run LVGL ticks
+    void qp_lvgl_internal_tick(void);
+    qp_lvgl_internal_tick();
+#endif
+
+    // Flush (render) dirty regions to corresponding displays
+    for (uint8_t i = 0; i < QP_NUM_DEVICES; i++) {
+        if (qp_devices[i] != NULL) {
+            qp_flush(qp_devices[i]);
+        }
+    }
+}
diff --git a/quantum/painter/qp_internal_driver.h b/quantum/painter/qp_internal_driver.h
index 82a0178a73..69da966f8c 100644
--- a/quantum/painter/qp_internal_driver.h
+++ b/quantum/painter/qp_internal_driver.h
@@ -1,4 +1,4 @@
-// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2021-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
@@ -19,7 +19,7 @@ typedef bool (*painter_driver_append_pixels)(painter_device_t device, uint8_t *t
 typedef bool (*painter_driver_append_pixdata)(painter_device_t device, uint8_t *target_buffer, uint32_t pixdata_offset, uint8_t pixdata_byte);
 
 // Driver vtable definition
-struct painter_driver_vtable_t {
+typedef struct painter_driver_vtable_t {
     painter_driver_init_func            init;
     painter_driver_power_func           power;
     painter_driver_clear_func           clear;
@@ -29,7 +29,7 @@ struct painter_driver_vtable_t {
     painter_driver_convert_palette_func palette_convert;
     painter_driver_append_pixels        append_pixels;
     painter_driver_append_pixdata       append_pixdata;
-};
+} painter_driver_vtable_t;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Comms callbacks
@@ -39,28 +39,28 @@ typedef bool (*painter_driver_comms_start_func)(painter_device_t device);
 typedef void (*painter_driver_comms_stop_func)(painter_device_t device);
 typedef uint32_t (*painter_driver_comms_send_func)(painter_device_t device, const void *data, uint32_t byte_count);
 
-struct painter_comms_vtable_t {
+typedef struct painter_comms_vtable_t {
     painter_driver_comms_init_func  comms_init;
     painter_driver_comms_start_func comms_start;
     painter_driver_comms_stop_func  comms_stop;
     painter_driver_comms_send_func  comms_send;
-};
+} painter_comms_vtable_t;
 
 typedef void (*painter_driver_comms_send_command_func)(painter_device_t device, uint8_t cmd);
 typedef void (*painter_driver_comms_bulk_command_sequence)(painter_device_t device, const uint8_t *sequence, size_t sequence_len);
 
-struct painter_comms_with_command_vtable_t {
-    struct painter_comms_vtable_t              base; // must be first, so this object can be cast from the painter_comms_vtable_t* type
+typedef struct painter_comms_with_command_vtable_t {
+    painter_comms_vtable_t                     base; // must be first, so this object can be cast from the painter_comms_vtable_t* type
     painter_driver_comms_send_command_func     send_command;
     painter_driver_comms_bulk_command_sequence bulk_command_sequence;
-};
+} painter_comms_with_command_vtable_t;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Driver base definition
 
-struct painter_driver_t {
-    const struct painter_driver_vtable_t *driver_vtable;
-    const struct painter_comms_vtable_t * comms_vtable;
+typedef struct painter_driver_t {
+    const painter_driver_vtable_t *driver_vtable;
+    const painter_comms_vtable_t * comms_vtable;
 
     // Flag signifying if validation was successful
     bool validate_ok;
@@ -81,4 +81,9 @@ struct painter_driver_t {
 
     // Comms config pointer -- needs to point to an appropriate comms config if the comms driver requires it.
     void *comms_config;
-};
+} painter_driver_t;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Device internals
+
+bool qp_internal_register_device(painter_device_t driver);
diff --git a/quantum/painter/qp_stream.h b/quantum/painter/qp_stream.h
index c0e745adc1..4f2b612e43 100644
--- a/quantum/painter/qp_stream.h
+++ b/quantum/painter/qp_stream.h
@@ -48,14 +48,14 @@ uint32_t qp_stream_write_impl(const void *input_buf, uint32_t member_size, uint3
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Stream definition
 
-struct qp_stream_t {
+typedef struct qp_stream_t {
     int16_t (*get)(qp_stream_t *stream);
     bool (*put)(qp_stream_t *stream, uint8_t c);
     int (*seek)(qp_stream_t *stream, int32_t offset, int origin);
     int32_t (*tell)(qp_stream_t *stream);
     bool (*is_eof)(qp_stream_t *stream);
     void (*close)(qp_stream_t *stream);
-};
+} qp_stream_t;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Memory streams
diff --git a/quantum/painter/rules.mk b/quantum/painter/rules.mk
index 199e406dd6..7752936cbd 100644
--- a/quantum/painter/rules.mk
+++ b/quantum/painter/rules.mk
@@ -24,6 +24,7 @@ SRC += \
     $(QUANTUM_DIR)/unicode/utf8.c \
     $(QUANTUM_DIR)/color.c \
     $(QUANTUM_DIR)/painter/qp.c \
+    $(QUANTUM_DIR)/painter/qp_internal.c \
     $(QUANTUM_DIR)/painter/qp_stream.c \
     $(QUANTUM_DIR)/painter/qgf.c \
     $(QUANTUM_DIR)/painter/qff.c \
diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index 75bb5f81fc..abb3817b5f 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -74,7 +74,8 @@ uint16_t pointing_device_get_shared_cpi(void) {
 
 #endif // defined(SPLIT_POINTING_ENABLE)
 
-static report_mouse_t local_mouse_report = {};
+static report_mouse_t local_mouse_report         = {};
+static bool           pointing_device_force_send = false;
 
 extern const pointing_device_driver_t pointing_device_driver;
 
@@ -163,11 +164,11 @@ __attribute__((weak)) void pointing_device_init(void) {
  * This sends the mouse report generated by pointing_device_task if changed since the last report. Once send zeros mouse report except buttons.
  *
  */
-__attribute__((weak)) void pointing_device_send(void) {
-    static report_mouse_t old_report = {};
+__attribute__((weak)) bool pointing_device_send(void) {
+    static report_mouse_t old_report         = {};
+    bool                  should_send_report = has_mouse_report_changed(&local_mouse_report, &old_report);
 
-    // If you need to do other things, like debugging, this is the place to do it.
-    if (has_mouse_report_changed(&local_mouse_report, &old_report)) {
+    if (should_send_report) {
         host_mouse_send(&local_mouse_report);
     }
     // send it and 0 it out except for buttons, so those stay until they are explicity over-ridden using update_pointing_device
@@ -175,6 +176,8 @@ __attribute__((weak)) void pointing_device_send(void) {
     memset(&local_mouse_report, 0, sizeof(local_mouse_report));
     local_mouse_report.buttons = buttons;
     memcpy(&old_report, &local_mouse_report, sizeof(local_mouse_report));
+
+    return should_send_report || buttons;
 }
 
 /**
@@ -220,18 +223,18 @@ report_mouse_t pointing_device_adjust_by_defines(report_mouse_t mouse_report) {
  * It applies any optional configuration e.g. rotation or axis inversion and then initiates a send.
  *
  */
-__attribute__((weak)) void pointing_device_task(void) {
+__attribute__((weak)) bool pointing_device_task(void) {
 #if defined(SPLIT_POINTING_ENABLE)
     // Don't poll the target side pointing device.
     if (!is_keyboard_master()) {
-        return;
+        return false;
     };
 #endif
 
 #if (POINTING_DEVICE_TASK_THROTTLE_MS > 0)
     static uint32_t last_exec = 0;
     if (timer_elapsed32(last_exec) < POINTING_DEVICE_TASK_THROTTLE_MS) {
-        return;
+        return false;
     }
     last_exec = timer_read32();
 #endif
@@ -286,7 +289,11 @@ __attribute__((weak)) void pointing_device_task(void) {
     report_mouse_t mousekey_report = mousekey_get_report();
     local_mouse_report.buttons     = local_mouse_report.buttons | mousekey_report.buttons;
 #endif
-    pointing_device_send();
+
+    const bool send_report     = pointing_device_send() || pointing_device_force_send;
+    pointing_device_force_send = false;
+
+    return send_report;
 }
 
 /**
@@ -304,7 +311,8 @@ report_mouse_t pointing_device_get_report(void) {
  * @param[in] mouse_report
  */
 void pointing_device_set_report(report_mouse_t mouse_report) {
-    local_mouse_report = mouse_report;
+    pointing_device_force_send = has_mouse_report_changed(&local_mouse_report, &mouse_report);
+    memcpy(&local_mouse_report, &mouse_report, sizeof(local_mouse_report));
 }
 
 /**
diff --git a/quantum/pointing_device/pointing_device.h b/quantum/pointing_device/pointing_device.h
index d430e6cfa4..afd653eaee 100644
--- a/quantum/pointing_device/pointing_device.h
+++ b/quantum/pointing_device/pointing_device.h
@@ -28,6 +28,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if defined(POINTING_DEVICE_DRIVER_adns5050)
 #    include "drivers/sensors/adns5050.h"
 #    define POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
+#elif defined(POINTING_DEVICE_DRIVER_pmw3320)
+#    include "drivers/sensors/pmw3320.h"
+#    define POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
 #elif defined(POINTING_DEVICE_DRIVER_adns9800)
 #    include "spi_master.h"
 #    include "drivers/sensors/adns9800.h"
@@ -97,8 +100,8 @@ typedef int16_t clamp_range_t;
 #endif
 
 void           pointing_device_init(void);
-void           pointing_device_task(void);
-void           pointing_device_send(void);
+bool           pointing_device_task(void);
+bool           pointing_device_send(void);
 report_mouse_t pointing_device_get_report(void);
 void           pointing_device_set_report(report_mouse_t mouse_report);
 uint16_t       pointing_device_get_cpi(void);
diff --git a/quantum/pointing_device/pointing_device_drivers.c b/quantum/pointing_device/pointing_device_drivers.c
index d6f29c062e..9a4315f76f 100644
--- a/quantum/pointing_device/pointing_device_drivers.c
+++ b/quantum/pointing_device/pointing_device_drivers.c
@@ -50,6 +50,28 @@ const pointing_device_driver_t pointing_device_driver = {
 };
 // clang-format on
 
+#elif defined(POINTING_DEVICE_DRIVER_pmw3320)
+report_mouse_t pmw3320_get_report(report_mouse_t mouse_report) {
+    report_pmw3320_t data = pmw3320_read_burst();
+
+    if (data.dx != 0 || data.dy != 0) {
+        pd_dprintf("Raw ] X: %d, Y: %d\n", data.dx, data.dy);
+        mouse_report.x = (mouse_xy_report_t)data.dx;
+        mouse_report.y = (mouse_xy_report_t)data.dy;
+    }
+
+    return mouse_report;
+}
+
+// clang-format off
+const pointing_device_driver_t pointing_device_driver = {
+    .init         = pmw3320_init,
+    .get_report   = pmw3320_get_report,
+    .set_cpi      = pmw3320_set_cpi,
+    .get_cpi      = pmw3320_get_cpi,
+};
+// clang-format on
+
 #elif defined(POINTING_DEVICE_DRIVER_adns9800)
 
 report_mouse_t adns9800_get_report_driver(report_mouse_t mouse_report) {
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index aad1a164ae..62c347ae0c 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -400,12 +400,10 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
             // If Retro Shift is disabled, possible custom actions shouldn't happen.
             // clang-format off
 #   if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
-#       if defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
+#       ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
             const bool is_hold_on_interrupt = get_hold_on_other_key_press(keycode, record);
-#       elif defined(IGNORE_MOD_TAP_INTERRUPT)
-            const bool is_hold_on_interrupt = false;
 #       else
-            const bool is_hold_on_interrupt = IS_QK_MOD_TAP(keycode);
+            const bool is_hold_on_interrupt = false;
 #       endif
 #   endif
         if (IS_RETRO(keycode)
@@ -443,12 +441,8 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
 #    endif
         ) {
             // Fixes modifiers not being applied to rolls with AUTO_SHIFT_MODIFIERS set.
-#    if !defined(IGNORE_MOD_TAP_INTERRUPT) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
-            if (autoshift_flags.in_progress
-#        ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-                && get_hold_on_other_key_press(keycode, record)
-#        endif
-            ) {
+#    ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
+            if (autoshift_flags.in_progress && get_hold_on_other_key_press(keycode, record)) {
                 autoshift_end(KC_NO, now, false, &autoshift_lastrecord);
             }
 #    endif
diff --git a/quantum/process_keycode/process_caps_word.c b/quantum/process_keycode/process_caps_word.c
index 94302b29ae..d4382680bf 100644
--- a/quantum/process_keycode/process_caps_word.c
+++ b/quantum/process_keycode/process_caps_word.c
@@ -14,6 +14,54 @@
 
 #include "process_caps_word.h"
 
+#ifdef CAPS_WORD_INVERT_ON_SHIFT
+static uint8_t held_mods = 0;
+
+static bool handle_shift(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case OSM(MOD_LSFT):
+            keycode = KC_LSFT;
+            break;
+        case OSM(MOD_RSFT):
+            keycode = KC_RSFT;
+            break;
+
+#    ifndef NO_ACTION_TAPPING
+        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+            if (record->tap.count == 0) { // Mod-tap key is held.
+                switch (QK_MOD_TAP_GET_MODS(keycode)) {
+                    case MOD_LSFT:
+                        keycode = KC_LSFT;
+                        break;
+                    case MOD_RSFT:
+                        keycode = KC_RSFT;
+                        break;
+                }
+            }
+#    endif // NO_ACTION_TAPPING
+    }
+
+    if (keycode == KC_LSFT || keycode == KC_RSFT) {
+        const uint8_t mod = MOD_BIT(keycode);
+
+        if (is_caps_word_on()) {
+            if (record->event.pressed) {
+                held_mods |= mod;
+            } else {
+                held_mods &= ~mod;
+            }
+            return false;
+        } else if ((held_mods & mod) != 0) {
+            held_mods &= ~mod;
+            del_mods(mod);
+            return record->event.pressed;
+        }
+    }
+
+    return true;
+}
+#endif // CAPS_WORD_INVERT_ON_SHIFT
+
 bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
     if (keycode == QK_CAPS_WORD_TOGGLE) {
         if (record->event.pressed) {
@@ -21,6 +69,11 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
         }
         return false;
     }
+#ifdef CAPS_WORD_INVERT_ON_SHIFT
+    if (!handle_shift(keycode, record)) {
+        return false;
+    }
+#endif // CAPS_WORD_INVERT_ON_SHIFT
 
 #ifndef NO_ACTION_ONESHOT
     const uint8_t mods = get_mods() | get_oneshot_mods();
@@ -95,6 +148,7 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
             case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
             case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
             case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:
+            case QK_TRI_LAYER_LOWER ... QK_TRI_LAYER_UPPER:
             // Ignore AltGr.
             case KC_RALT:
             case OSM(MOD_RALT):
@@ -111,12 +165,14 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
                 if (record->tap.count == 0) { // Mod-tap key is held.
                     const uint8_t mods = QK_MOD_TAP_GET_MODS(keycode);
                     switch (mods) {
+#    ifndef CAPS_WORD_INVERT_ON_SHIFT
                         case MOD_LSFT:
                             keycode = KC_LSFT;
                             break;
                         case MOD_RSFT:
                             keycode = KC_RSFT;
                             break;
+#    endif // CAPS_WORD_INVERT_ON_SHIFT
                         case MOD_RSFT | MOD_RALT:
                             keycode = RSFT(KC_RALT);
                             break;
@@ -124,6 +180,9 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
                             return true;
                         default:
                             caps_word_off();
+#    ifdef CAPS_WORD_INVERT_ON_SHIFT
+                            add_mods(held_mods);
+#    endif // CAPS_WORD_INVERT_ON_SHIFT
                             return true;
                     }
                 } else {
@@ -163,12 +222,20 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
         clear_weak_mods();
 #endif // AUTO_SHIFT_ENABLE
         if (caps_word_press_user(keycode)) {
+#ifdef CAPS_WORD_INVERT_ON_SHIFT
+            if (held_mods) {
+                set_weak_mods(get_weak_mods() ^ MOD_BIT(KC_LSFT));
+            }
+#endif // CAPS_WORD_INVERT_ON_SHIFT
             send_keyboard_report();
             return true;
         }
     }
 
     caps_word_off();
+#ifdef CAPS_WORD_INVERT_ON_SHIFT
+    add_mods(held_mods);
+#endif // CAPS_WORD_INVERT_ON_SHIFT
     return true;
 }
 
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index 8597649c92..b1b49d3019 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "keymap_common.h"
 #include "print.h"
 #include "process_combo.h"
 #include "action_tapping.h"
@@ -144,7 +145,7 @@ static queued_combo_t combo_buffer[COMBO_BUFFER_LENGTH];
 static inline void release_combo(uint16_t combo_index, combo_t *combo) {
     if (combo->keycode) {
         keyrecord_t record = {
-            .event   = MAKE_KEYEVENT(KEYLOC_COMBO, KEYLOC_COMBO, false),
+            .event   = MAKE_COMBOEVENT(false),
             .keycode = combo->keycode,
         };
 #ifndef NO_ACTION_TAPPING
@@ -232,7 +233,7 @@ static inline void dump_key_buffer(void) {
             process_record(record);
 #endif
         }
-        record->event.time = 0;
+        record->event.type = TICK_EVENT;
 
 #if defined(CAPS_WORD_ENABLE) && defined(AUTO_SHIFT_ENABLE)
         // Edge case: preserve the weak Left Shift mod if both Caps Word and
@@ -332,8 +333,8 @@ void apply_combo(uint16_t combo_index, combo_t *combo) {
         KEY_STATE_DOWN(state, key_index);
         if (ALL_COMBO_KEYS_ARE_DOWN(state, key_count)) {
             // this in the end executes the combo when the key_buffer is dumped.
-            record->keycode   = combo->keycode;
-            record->event.key = MAKE_KEYPOS(KEYLOC_COMBO, KEYLOC_COMBO);
+            record->keycode    = combo->keycode;
+            record->event.type = COMBO_EVENT;
 
             qrecord->combo_index = combo_index;
             ACTIVATE_COMBO(combo);
@@ -342,7 +343,7 @@ void apply_combo(uint16_t combo_index, combo_t *combo) {
         } else {
             // key was part of the combo but not the last one, "disable" it
             // by making it a TICK event.
-            record->event.time = 0;
+            record->event.type = TICK_EVENT;
         }
     }
     drop_combo_from_buffer(combo_index);
diff --git a/quantum/process_keycode/process_dynamic_macro.c b/quantum/process_keycode/process_dynamic_macro.c
index c2e7e7716f..bf6af566e2 100644
--- a/quantum/process_keycode/process_dynamic_macro.c
+++ b/quantum/process_keycode/process_dynamic_macro.c
@@ -29,7 +29,7 @@ void dynamic_macro_led_blink(void) {
 
 /* User hooks for Dynamic Macros */
 
-__attribute__((weak)) void dynamic_macro_record_start_user(void) {
+__attribute__((weak)) void dynamic_macro_record_start_user(int8_t direction) {
     dynamic_macro_led_blink();
 }
 
@@ -62,10 +62,10 @@ __attribute__((weak)) bool dynamic_macro_valid_key_user(uint16_t keycode, keyrec
  * @param[out] macro_pointer The new macro buffer iterator.
  * @param[in]  macro_buffer  The macro buffer used to initialize macro_pointer.
  */
-void dynamic_macro_record_start(keyrecord_t **macro_pointer, keyrecord_t *macro_buffer) {
+void dynamic_macro_record_start(keyrecord_t **macro_pointer, keyrecord_t *macro_buffer, int8_t direction) {
     dprintln("dynamic macro recording: started");
 
-    dynamic_macro_record_start_user();
+    dynamic_macro_record_start_user(direction);
 
     clear_keyboard();
     layer_clear();
@@ -213,11 +213,11 @@ bool process_dynamic_macro(uint16_t keycode, keyrecord_t *record) {
         if (!record->event.pressed) {
             switch (keycode) {
                 case QK_DYNAMIC_MACRO_RECORD_START_1:
-                    dynamic_macro_record_start(&macro_pointer, macro_buffer);
+                    dynamic_macro_record_start(&macro_pointer, macro_buffer, +1);
                     macro_id = 1;
                     return false;
                 case QK_DYNAMIC_MACRO_RECORD_START_2:
-                    dynamic_macro_record_start(&macro_pointer, r_macro_buffer);
+                    dynamic_macro_record_start(&macro_pointer, r_macro_buffer, -1);
                     macro_id = 2;
                     return false;
                 case QK_DYNAMIC_MACRO_PLAY_1:
diff --git a/quantum/process_keycode/process_dynamic_macro.h b/quantum/process_keycode/process_dynamic_macro.h
index 39036541b8..ab70726897 100644
--- a/quantum/process_keycode/process_dynamic_macro.h
+++ b/quantum/process_keycode/process_dynamic_macro.h
@@ -35,7 +35,7 @@
 
 void dynamic_macro_led_blink(void);
 bool process_dynamic_macro(uint16_t keycode, keyrecord_t *record);
-void dynamic_macro_record_start_user(void);
+void dynamic_macro_record_start_user(int8_t direction);
 void dynamic_macro_play_user(int8_t direction);
 void dynamic_macro_record_key_user(int8_t direction, keyrecord_t *record);
 void dynamic_macro_record_end_user(int8_t direction);
diff --git a/quantum/process_keycode/process_steno.c b/quantum/process_keycode/process_steno.c
index 8ba98bd4bb..d5ad61ba85 100644
--- a/quantum/process_keycode/process_steno.c
+++ b/quantum/process_keycode/process_steno.c
@@ -173,13 +173,13 @@ bool process_steno(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
 #ifdef STENO_ENABLE_ALL
         case QK_STENO_BOLT:
-            if (IS_PRESSED(record->event)) {
+            if (record->event.pressed) {
                 steno_set_mode(STENO_MODE_BOLT);
             }
             return false;
 
         case QK_STENO_GEMINI:
-            if (IS_PRESSED(record->event)) {
+            if (record->event.pressed) {
                 steno_set_mode(STENO_MODE_GEMINI);
             }
             return false;
@@ -193,7 +193,7 @@ bool process_steno(uint16_t keycode, keyrecord_t *record) {
         }
 #endif // STENO_COMBINEDMAP
         case STN__MIN ... STN__MAX:
-            if (IS_PRESSED(record->event)) {
+            if (record->event.pressed) {
                 n_pressed_keys++;
                 switch (mode) {
 #ifdef STENO_ENABLE_BOLT
diff --git a/quantum/programmable_button.h b/quantum/programmable_button.h
index e8c916d75c..4c2cd534fe 100644
--- a/quantum/programmable_button.h
+++ b/quantum/programmable_button.h
@@ -21,9 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdbool.h>
 
 /**
- * \defgroup programmable_button
+ * \file
  *
- * HID Programmable Buttons
+ * \defgroup programmable_button HID Programmable Buttons
  * \{
  */
 
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 315fa25568..38186a48a3 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -18,7 +18,7 @@
 #include "platform_deps.h"
 #include "wait.h"
 #include "matrix.h"
-#include "keymap.h"
+#include "keyboard.h"
 
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
@@ -36,6 +36,9 @@
 #    include "rgb_matrix.h"
 #endif
 
+#include "keymap_common.h"
+#include "quantum_keycodes.h"
+#include "keycode_config.h"
 #include "action_layer.h"
 #include "eeconfig.h"
 #include "bootloader.h"
@@ -44,10 +47,12 @@
 #include "sync_timer.h"
 #include "gpio.h"
 #include "atomic_util.h"
+#include "host.h"
 #include "led.h"
 #include "action_util.h"
 #include "action_tapping.h"
 #include "print.h"
+#include "debug.h"
 #include "suspend.h"
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index bbb706da69..1f3912cf7e 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -459,14 +459,7 @@ void rgb_matrix_indicators_advanced(effect_params_t *params) {
      * and not sure which would be better. Otherwise, this should be called from
      * rgb_task_render, right before the iter++ line.
      */
-#if defined(RGB_MATRIX_LED_PROCESS_LIMIT) && RGB_MATRIX_LED_PROCESS_LIMIT > 0 && RGB_MATRIX_LED_PROCESS_LIMIT < RGB_MATRIX_LED_COUNT
-    uint8_t min = RGB_MATRIX_LED_PROCESS_LIMIT * (params->iter - 1);
-    uint8_t max = min + RGB_MATRIX_LED_PROCESS_LIMIT;
-    if (max > RGB_MATRIX_LED_COUNT) max = RGB_MATRIX_LED_COUNT;
-#else
-    uint8_t min = 0;
-    uint8_t max = RGB_MATRIX_LED_COUNT;
-#endif
+    RGB_MATRIX_USE_LIMITS_ITER(min, max, params->iter - 1);
     rgb_matrix_indicators_advanced_kb(min, max);
 }
 
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index 62078f6e60..6b373d0bcd 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -52,34 +52,36 @@
 
 #if defined(RGB_MATRIX_LED_PROCESS_LIMIT) && RGB_MATRIX_LED_PROCESS_LIMIT > 0 && RGB_MATRIX_LED_PROCESS_LIMIT < RGB_MATRIX_LED_COUNT
 #    if defined(RGB_MATRIX_SPLIT)
-#        define RGB_MATRIX_USE_LIMITS(min, max)                                                   \
-            uint8_t min = RGB_MATRIX_LED_PROCESS_LIMIT * params->iter;                            \
+#        define RGB_MATRIX_USE_LIMITS_ITER(min, max, iter)                                        \
+            uint8_t min = RGB_MATRIX_LED_PROCESS_LIMIT * (iter);                                  \
             uint8_t max = min + RGB_MATRIX_LED_PROCESS_LIMIT;                                     \
             if (max > RGB_MATRIX_LED_COUNT) max = RGB_MATRIX_LED_COUNT;                           \
             uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;                                     \
             if (is_keyboard_left() && (max > k_rgb_matrix_split[0])) max = k_rgb_matrix_split[0]; \
             if (!(is_keyboard_left()) && (min < k_rgb_matrix_split[0])) min = k_rgb_matrix_split[0];
 #    else
-#        define RGB_MATRIX_USE_LIMITS(min, max)                        \
-            uint8_t min = RGB_MATRIX_LED_PROCESS_LIMIT * params->iter; \
-            uint8_t max = min + RGB_MATRIX_LED_PROCESS_LIMIT;          \
+#        define RGB_MATRIX_USE_LIMITS_ITER(min, max, iter)       \
+            uint8_t min = RGB_MATRIX_LED_PROCESS_LIMIT * (iter); \
+            uint8_t max = min + RGB_MATRIX_LED_PROCESS_LIMIT;    \
             if (max > RGB_MATRIX_LED_COUNT) max = RGB_MATRIX_LED_COUNT;
 #    endif
 #else
 #    if defined(RGB_MATRIX_SPLIT)
-#        define RGB_MATRIX_USE_LIMITS(min, max)                                                   \
+#        define RGB_MATRIX_USE_LIMITS_ITER(min, max, iter)                                        \
             uint8_t       min                   = 0;                                              \
             uint8_t       max                   = RGB_MATRIX_LED_COUNT;                           \
             const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;                               \
             if (is_keyboard_left() && (max > k_rgb_matrix_split[0])) max = k_rgb_matrix_split[0]; \
             if (!(is_keyboard_left()) && (min < k_rgb_matrix_split[0])) min = k_rgb_matrix_split[0];
 #    else
-#        define RGB_MATRIX_USE_LIMITS(min, max) \
-            uint8_t min = 0;                    \
+#        define RGB_MATRIX_USE_LIMITS_ITER(min, max, iter) \
+            uint8_t min = 0;                               \
             uint8_t max = RGB_MATRIX_LED_COUNT;
 #    endif
 #endif
 
+#define RGB_MATRIX_USE_LIMITS(min, max) RGB_MATRIX_USE_LIMITS_ITER(min, max, params->iter)
+
 #define RGB_MATRIX_INDICATOR_SET_COLOR(i, r, g, b) \
     if (i >= led_min && i < led_max) {             \
         rgb_matrix_set_color(i, r, g, b);          \
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index 5b81915845..415c66f115 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -359,7 +359,6 @@ LED_TYPE rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT];
 static void init(void) {}
 
 static void flush(void) {
-    // Assumes use of RGB_DI_PIN
     ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT);
 }
 
diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c
index 19d80e0097..02188df95b 100644
--- a/quantum/rgblight/rgblight.c
+++ b/quantum/rgblight/rgblight.c
@@ -21,6 +21,7 @@
 #include "rgblight.h"
 #include "color.h"
 #include "debug.h"
+#include "util.h"
 #include "led_tables.h"
 #include <lib/lib8tion/lib8tion.h>
 #ifdef EEPROM_ENABLE
@@ -30,13 +31,6 @@
 #    include "velocikey.h"
 #endif
 
-#ifndef MIN
-#    define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#endif
-#ifndef MAX
-#    define MAX(a, b) (((a) > (b)) ? (a) : (b))
-#endif
-
 #ifdef RGBLIGHT_SPLIT
 /* for split keyboard */
 #    define RGBLIGHT_SPLIT_SET_CHANGE_MODE rgblight_status.change_flags |= RGBLIGHT_STATUS_CHANGE_MODE
@@ -422,6 +416,10 @@ void rgblight_disable_noeeprom(void) {
     rgblight_set();
 }
 
+void rgblight_enabled_noeeprom(bool state) {
+    state ? rgblight_enable_noeeprom() : rgblight_disable_noeeprom();
+}
+
 bool rgblight_is_enabled(void) {
     return rgblight_config.enable;
 }
diff --git a/quantum/rgblight/rgblight.h b/quantum/rgblight/rgblight.h
index 7693888462..2e85541313 100644
--- a/quantum/rgblight/rgblight.h
+++ b/quantum/rgblight/rgblight.h
@@ -174,6 +174,10 @@ typedef struct {
     uint8_t val;
 } rgblight_segment_t;
 
+// rgblight_set_layer_state doesn't take effect until the next time
+// rgblight_task runs, so timers must be enabled for layers to work.
+#    define RGBLIGHT_USE_TIMER
+
 #    define RGBLIGHT_END_SEGMENT_INDEX (255)
 #    define RGBLIGHT_END_SEGMENTS \
         { RGBLIGHT_END_SEGMENT_INDEX, 0, 0, 0 }
@@ -321,6 +325,7 @@ void rgblight_enable(void);
 void rgblight_enable_noeeprom(void);
 void rgblight_disable(void);
 void rgblight_disable_noeeprom(void);
+void rgblight_enabled_noeeprom(bool state);
 
 /*   hue, sat, val change */
 void rgblight_increase_hue(void);
diff --git a/quantum/secure.h b/quantum/secure.h
index bb2ba50f31..ae9b5b9045 100644
--- a/quantum/secure.h
+++ b/quantum/secure.h
@@ -3,10 +3,15 @@
 
 #pragma once
 
-/** \file
+/**
+ * \file
  *
- * Exposes a set of functionality to act as a virtual padlock for your device
- * ... As long as that padlock is made of paper and its currently raining.
+ * \defgroup secure Secure API
+ *
+ * \brief Exposes a set of functionality to act as a virtual padlock for your device
+ * ...as long as that padlock is made of paper and it's currently raining.
+ *
+ * \{
  */
 
 #include <stdint.h>
@@ -77,3 +82,5 @@ bool secure_hook_user(secure_status_t secure_status);
 /** \brief keyboard hook called when changing secure status device
  */
 bool secure_hook_kb(secure_status_t secure_status);
+
+/** \} */
diff --git a/quantum/send_string/send_string.h b/quantum/send_string/send_string.h
index 4eb55b88dc..dbaed43ebc 100644
--- a/quantum/send_string/send_string.h
+++ b/quantum/send_string/send_string.h
@@ -15,9 +15,11 @@
  */
 
 /**
- * \defgroup send_string
+ * \file
  *
- * Send String API. These functions allow you to create macros by typing out sequences of keystrokes.
+ * \defgroup send_string Send String API
+ *
+ * \brief These functions allow you to create macros by typing out sequences of keystrokes.
  * \{
  */
 
diff --git a/quantum/split_common/transaction_id_define.h b/quantum/split_common/transaction_id_define.h
index 18d3826b83..4d4d2b9570 100644
--- a/quantum/split_common/transaction_id_define.h
+++ b/quantum/split_common/transaction_id_define.h
@@ -92,6 +92,10 @@ enum serial_transaction_id {
     PUT_HAPTIC,
 #endif // defined(HAPTIC_ENABLE) && defined(SPLIT_HAPTIC_ENABLE)
 
+#if defined(SPLIT_ACTIVITY_ENABLE)
+    PUT_ACTIVITY,
+#endif // SPLIT_ACTIVITY_ENABLE
+
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
     PUT_RPC_INFO,
     PUT_RPC_REQ_DATA,
@@ -109,6 +113,10 @@ enum serial_transaction_id {
     SPLIT_TRANSACTION_IDS_USER,
 #endif // SPLIT_TRANSACTION_IDS_USER
 
+#if defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE)
+    PUT_DETECTED_OS,
+#endif // defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE)
+
     NUM_TOTAL_TRANSACTIONS
 };
 
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 8e1961b586..b3c80f1194 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -790,6 +790,63 @@ static void haptic_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sla
 
 #endif // defined(HAPTIC_ENABLE) && defined(SPLIT_HAPTIC_ENABLE)
 
+#if defined(SPLIT_ACTIVITY_ENABLE)
+
+static bool activity_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    static uint32_t             last_update = 0;
+    split_slave_activity_sync_t activity_sync;
+    activity_sync.matrix_timestamp          = last_matrix_activity_time();
+    activity_sync.encoder_timestamp         = last_encoder_activity_time();
+    activity_sync.pointing_device_timestamp = last_pointing_device_activity_time();
+    return send_if_data_mismatch(PUT_ACTIVITY, &last_update, &activity_sync, &split_shmem->activity_sync, sizeof(activity_sync));
+}
+
+static void activity_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    set_activity_timestamps(split_shmem->activity_sync.matrix_timestamp, split_shmem->activity_sync.encoder_timestamp, split_shmem->activity_sync.pointing_device_timestamp);
+}
+
+// clang-format off
+#    define TRANSACTIONS_ACTIVITY_MASTER() TRANSACTION_HANDLER_MASTER(activity)
+#    define TRANSACTIONS_ACTIVITY_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(activity)
+#    define TRANSACTIONS_ACTIVITY_REGISTRATIONS [PUT_ACTIVITY] = trans_initiator2target_initializer(activity_sync),
+// clang-format on
+
+#else // defined(SPLIT_ACTIVITY_ENABLE)
+
+#    define TRANSACTIONS_ACTIVITY_MASTER()
+#    define TRANSACTIONS_ACTIVITY_SLAVE()
+#    define TRANSACTIONS_ACTIVITY_REGISTRATIONS
+
+#endif // defined(SPLIT_ACTIVITY_ENABLE)
+
+////////////////////////////////////////////////////
+// Detected OS
+
+#if defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE)
+
+static bool detected_os_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    static uint32_t last_detected_os_update = 0;
+    os_variant_t    detected_os             = detected_host_os();
+    bool            okay                    = send_if_condition(PUT_DETECTED_OS, &last_detected_os_update, (detected_os != split_shmem->detected_os), &detected_os, sizeof(os_variant_t));
+    return okay;
+}
+
+static void detected_os_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    slave_update_detected_host_os(split_shmem->detected_os);
+}
+
+#    define TRANSACTIONS_DETECTED_OS_MASTER() TRANSACTION_HANDLER_MASTER(detected_os)
+#    define TRANSACTIONS_DETECTED_OS_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(detected_os)
+#    define TRANSACTIONS_DETECTED_OS_REGISTRATIONS [PUT_DETECTED_OS] = trans_initiator2target_initializer(detected_os),
+
+#else // defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE)
+
+#    define TRANSACTIONS_DETECTED_OS_MASTER()
+#    define TRANSACTIONS_DETECTED_OS_SLAVE()
+#    define TRANSACTIONS_DETECTED_OS_REGISTRATIONS
+
+#endif // defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE)
+
 ////////////////////////////////////////////////////
 
 split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {
@@ -818,6 +875,8 @@ split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {
     TRANSACTIONS_POINTING_REGISTRATIONS
     TRANSACTIONS_WATCHDOG_REGISTRATIONS
     TRANSACTIONS_HAPTIC_REGISTRATIONS
+    TRANSACTIONS_ACTIVITY_REGISTRATIONS
+    TRANSACTIONS_DETECTED_OS_REGISTRATIONS
 // clang-format on
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
@@ -846,6 +905,8 @@ bool transactions_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix
     TRANSACTIONS_POINTING_MASTER();
     TRANSACTIONS_WATCHDOG_MASTER();
     TRANSACTIONS_HAPTIC_MASTER();
+    TRANSACTIONS_ACTIVITY_MASTER();
+    TRANSACTIONS_DETECTED_OS_MASTER();
     return true;
 }
 
@@ -867,6 +928,8 @@ void transactions_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[
     TRANSACTIONS_POINTING_SLAVE();
     TRANSACTIONS_WATCHDOG_SLAVE();
     TRANSACTIONS_HAPTIC_SLAVE();
+    TRANSACTIONS_ACTIVITY_SLAVE();
+    TRANSACTIONS_DETECTED_OS_SLAVE();
 }
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index adee4470d2..6f8985cb07 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -122,6 +122,15 @@ typedef struct _split_slave_haptic_sync_t {
 } split_slave_haptic_sync_t;
 #endif // defined(HAPTIC_ENABLE) && defined(SPLIT_HAPTIC_ENABLE)
 
+#if defined(SPLIT_ACTIVITY_ENABLE)
+#    include "keyboard.h"
+typedef struct _split_slave_activity_sync_t {
+    uint32_t matrix_timestamp;
+    uint32_t encoder_timestamp;
+    uint32_t pointing_device_timestamp;
+} split_slave_activity_sync_t;
+#endif // defined(SPLIT_ACTIVITY_ENABLE)
+
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 typedef struct _rpc_sync_info_t {
     uint8_t checksum;
@@ -133,6 +142,10 @@ typedef struct _rpc_sync_info_t {
 } rpc_sync_info_t;
 #endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 
+#if defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE)
+#    include "os_detection.h"
+#endif // defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE)
+
 typedef struct _split_shared_memory_t {
 #ifdef USE_I2C
     int8_t transaction_id;
@@ -204,11 +217,19 @@ typedef struct _split_shared_memory_t {
     split_slave_haptic_sync_t haptic_sync;
 #endif // defined(HAPTIC_ENABLE)
 
+#if defined(SPLIT_ACTIVITY_ENABLE)
+    split_slave_activity_sync_t activity_sync;
+#endif // defined(SPLIT_ACTIVITY_ENABLE)
+
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
     rpc_sync_info_t rpc_info;
     uint8_t         rpc_m2s_buffer[RPC_M2S_BUFFER_SIZE];
     uint8_t         rpc_s2m_buffer[RPC_S2M_BUFFER_SIZE];
 #endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+
+#if defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE)
+    os_variant_t detected_os;
+#endif // defined(OS_DETECTION_ENABLE) && defined(SPLIT_DETECTED_OS_ENABLE)
 } split_shared_memory_t;
 
 extern split_shared_memory_t *const split_shmem;
diff --git a/quantum/velocikey.c b/quantum/velocikey.c
index 58e14215bb..03e91911f6 100644
--- a/quantum/velocikey.c
+++ b/quantum/velocikey.c
@@ -2,13 +2,7 @@
 #include "timer.h"
 #include "eeconfig.h"
 #include "eeprom.h"
-
-#ifndef MIN
-#    define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#endif
-#ifndef MAX
-#    define MAX(a, b) (((a) > (b)) ? (a) : (b))
-#endif
+#include "util.h"
 
 #define TYPING_SPEED_MAX_VALUE 200
 uint8_t typing_speed = 0;
diff --git a/readme.md b/readme.md
index 5649ddfa09..c2fcda103e 100644
--- a/readme.md
+++ b/readme.md
@@ -1,3 +1,7 @@
+# THIS IS THE DEVELOP BRANCH
+
+Warning- This is the `develop` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information.
+
 # Quantum Mechanical Keyboard Firmware
 
 [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
diff --git a/tests/basic/test_one_shot_keys.cpp b/tests/basic/test_one_shot_keys.cpp
index 2401c2c837..2a3434bf16 100644
--- a/tests/basic/test_one_shot_keys.cpp
+++ b/tests/basic/test_one_shot_keys.cpp
@@ -160,6 +160,150 @@ INSTANTIATE_TEST_CASE_P(
         ));
 // clang-format on
 
+TEST_F(OneShot, OSMChainingTwoOSMs) {
+    TestDriver driver;
+    InSequence s;
+    KeymapKey  osm_key1    = KeymapKey{0, 0, 0, OSM(MOD_LSFT), KC_LSFT};
+    KeymapKey  osm_key2    = KeymapKey{0, 0, 1, OSM(MOD_LCTL), KC_LCTL};
+    KeymapKey  regular_key = KeymapKey{0, 1, 0, KC_A};
+
+    set_keymap({osm_key1, osm_key2, regular_key});
+
+    /* Press and release OSM1 */
+    EXPECT_NO_REPORT(driver);
+    osm_key1.press();
+    run_one_scan_loop();
+    osm_key1.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Press and relesea OSM2 */
+    EXPECT_NO_REPORT(driver);
+    osm_key2.press();
+    run_one_scan_loop();
+    osm_key2.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Press regular key */
+    EXPECT_REPORT(driver, (osm_key1.report_code, osm_key2.report_code, regular_key.report_code)).Times(1);
+    regular_key.press();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Release regular key */
+    EXPECT_EMPTY_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(OneShot, OSMDoubleTapNotLockingOSMs) {
+    TestDriver driver;
+    InSequence s;
+    KeymapKey  osm_key1    = KeymapKey{0, 0, 0, OSM(MOD_LSFT), KC_LSFT};
+    KeymapKey  osm_key2    = KeymapKey{0, 0, 1, OSM(MOD_LCTL), KC_LCTL};
+    KeymapKey  regular_key = KeymapKey{0, 1, 0, KC_A};
+
+    set_keymap({osm_key1, osm_key2, regular_key});
+
+    /* Press and release OSM1 */
+    EXPECT_NO_REPORT(driver);
+    osm_key1.press();
+    run_one_scan_loop();
+    osm_key1.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Press and release OSM2 twice */
+    EXPECT_NO_REPORT(driver);
+    osm_key2.press();
+    run_one_scan_loop();
+    osm_key2.release();
+    run_one_scan_loop();
+    osm_key2.press();
+    run_one_scan_loop();
+    osm_key2.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Press regular key */
+    EXPECT_REPORT(driver, (osm_key1.report_code, osm_key2.report_code, regular_key.report_code)).Times(1);
+    regular_key.press();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Release regular key */
+    EXPECT_EMPTY_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Press regular key */
+    EXPECT_REPORT(driver, (regular_key.report_code)).Times(1);
+    regular_key.press();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Release regular key */
+    EXPECT_EMPTY_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(OneShot, OSMHoldNotLockingOSMs) {
+    TestDriver driver;
+    InSequence s;
+    KeymapKey  osm_key1    = KeymapKey{0, 0, 0, OSM(MOD_LSFT), KC_LSFT};
+    KeymapKey  osm_key2    = KeymapKey{0, 0, 1, OSM(MOD_LCTL), KC_LCTL};
+    KeymapKey  regular_key = KeymapKey{0, 1, 0, KC_A};
+
+    set_keymap({osm_key1, osm_key2, regular_key});
+
+    /* Press and release OSM1 */
+    EXPECT_NO_REPORT(driver);
+    osm_key1.press();
+    run_one_scan_loop();
+    osm_key1.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Press and hold OSM2 */
+    EXPECT_REPORT(driver, (osm_key1.report_code, osm_key2.report_code)).Times(1);
+    osm_key2.press();
+    run_one_scan_loop();
+    idle_for(TAPPING_TERM);
+    VERIFY_AND_CLEAR(driver);
+
+    /* Press and release regular key */
+    EXPECT_REPORT(driver, (osm_key1.report_code, osm_key2.report_code, regular_key.report_code)).Times(1);
+    EXPECT_REPORT(driver, (osm_key2.report_code)).Times(1);
+    regular_key.press();
+    run_one_scan_loop();
+    regular_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Release OSM2 */
+    EXPECT_EMPTY_REPORT(driver);
+    osm_key2.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Press regular key */
+    EXPECT_REPORT(driver, (regular_key.report_code)).Times(1);
+    regular_key.press();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Release regular key */
+    EXPECT_EMPTY_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+}
+
 TEST_F(OneShot, OSLWithAdditionalKeypress) {
     TestDriver driver;
     InSequence s;
diff --git a/tests/caps_word/caps_word_invert_on_shift/config.h b/tests/caps_word/caps_word_invert_on_shift/config.h
new file mode 100644
index 0000000000..7a3ec846f9
--- /dev/null
+++ b/tests/caps_word/caps_word_invert_on_shift/config.h
@@ -0,0 +1,21 @@
+// Copyright 2023 Google LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+
+#include "test_common.h"
+
+#define CAPS_WORD_INVERT_ON_SHIFT
+#define PERMISSIVE_HOLD
diff --git a/tests/caps_word/caps_word_invert_on_shift/test.mk b/tests/caps_word/caps_word_invert_on_shift/test.mk
new file mode 100644
index 0000000000..319c04d67a
--- /dev/null
+++ b/tests/caps_word/caps_word_invert_on_shift/test.mk
@@ -0,0 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+CAPS_WORD_ENABLE = yes
+
diff --git a/tests/caps_word/caps_word_invert_on_shift/test_caps_word_invert_on_shift.cpp b/tests/caps_word/caps_word_invert_on_shift/test_caps_word_invert_on_shift.cpp
new file mode 100644
index 0000000000..d322448181
--- /dev/null
+++ b/tests/caps_word/caps_word_invert_on_shift/test_caps_word_invert_on_shift.cpp
@@ -0,0 +1,215 @@
+// Copyright 2023 Google LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "keyboard_report_util.hpp"
+#include "keycode.h"
+#include "test_common.hpp"
+#include "test_fixture.hpp"
+#include "test_keymap_key.hpp"
+
+using ::testing::_;
+using ::testing::AnyNumber;
+using ::testing::AnyOf;
+using ::testing::InSequence;
+using ::testing::TestParamInfo;
+
+namespace {
+
+struct ShiftKeyParams {
+    std::string name;
+    uint16_t    keycode;
+    uint16_t    report_shift_code;
+
+    static const std::string& GetName(const TestParamInfo<ShiftKeyParams>& info) {
+        return info.param.name;
+    }
+};
+
+class CapsWordInvertOnShift : public ::testing::WithParamInterface<ShiftKeyParams>, public TestFixture {
+    void SetUp() override {
+        caps_word_off();
+    }
+};
+
+// With Caps Word on, type "A, 4, Shift(A, 4, A), A, Shift(A), 4".
+TEST_P(CapsWordInvertOnShift, ShiftWithinWord) {
+    TestDriver driver;
+    KeymapKey  key_shift(0, 0, 0, GetParam().keycode);
+    KeymapKey  key_a(0, 1, 0, KC_A);
+    KeymapKey  key_4(0, 2, 0, KC_4);
+    set_keymap({key_shift, key_a, key_4});
+
+    // Allow any number of reports with no keys or only KC_LSFT.
+    // clang-format off
+    EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
+                KeyboardReport(),
+                KeyboardReport(KC_LSFT))))
+        .Times(AnyNumber());
+    // clang-format on
+
+    { // Expect: "A4a$aAa4"
+        InSequence s;
+        EXPECT_REPORT(driver, (KC_LSFT, KC_A));
+        EXPECT_REPORT(driver, (KC_4));
+        EXPECT_REPORT(driver, (KC_A));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_4));
+        EXPECT_REPORT(driver, (KC_A));
+        EXPECT_REPORT(driver, (KC_LSFT, KC_A));
+        EXPECT_REPORT(driver, (KC_A));
+        EXPECT_REPORT(driver, (KC_4));
+    }
+
+    caps_word_on();
+    tap_keys(key_a, key_4); // Type "A, 4".
+
+    key_shift.press(); // Type "Shift(A, 4, A)".
+    run_one_scan_loop();
+    tap_keys(key_a, key_4, key_a);
+    key_shift.release();
+    run_one_scan_loop();
+
+    tap_key(key_a); // Type "A".
+
+    key_shift.press(); // Type "Shift(A)".
+    run_one_scan_loop();
+    tap_key(key_a);
+    key_shift.release();
+    run_one_scan_loop();
+
+    tap_key(key_4); // Type "4".
+
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_P(CapsWordInvertOnShift, ShiftHeldAtWordEnd) {
+    TestDriver driver;
+    KeymapKey  key_shift(0, 0, 0, GetParam().keycode);
+    KeymapKey  key_a(0, 1, 0, KC_A);
+    KeymapKey  key_slsh(0, 2, 0, KC_SLSH);
+    set_keymap({key_shift, key_a, key_slsh});
+
+    // Allow any number of reports with no keys or only KC_LSFT.
+    // clang-format off
+    EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
+                KeyboardReport(),
+                KeyboardReport(KC_LSFT),
+                KeyboardReport(KC_RSFT))))
+        .Times(AnyNumber());
+    // clang-format on
+
+    { // Expect: "Aa?A"
+        InSequence s;
+        EXPECT_REPORT(driver, (KC_LSFT, KC_A));
+        EXPECT_REPORT(driver, (KC_A));
+        EXPECT_REPORT(driver, (GetParam().report_shift_code, KC_SLSH));
+        EXPECT_REPORT(driver, (GetParam().report_shift_code, KC_A));
+    }
+
+    caps_word_on();
+    tap_key(key_a);
+
+    key_shift.press(); // Press Shift.
+    run_one_scan_loop();
+
+    EXPECT_EQ(get_mods(), 0);
+
+    tap_key(key_a);
+    tap_key(key_slsh); // Tap '/' key, which is word breaking, ending Caps Word.
+
+    EXPECT_FALSE(is_caps_word_on());
+    EXPECT_EQ(get_mods(), MOD_BIT(GetParam().report_shift_code));
+
+    tap_key(key_a);
+    key_shift.release(); // Release Shift.
+    run_one_scan_loop();
+
+    EXPECT_EQ(get_mods(), 0);
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_P(CapsWordInvertOnShift, TwoShiftsHeld) {
+    TestDriver driver;
+    KeymapKey  key_shift1(0, 0, 0, GetParam().keycode);
+    KeymapKey  key_shift2(0, 1, 0, GetParam().report_shift_code);
+    KeymapKey  key_a(0, 2, 0, KC_A);
+    KeymapKey  key_slsh(0, 3, 0, KC_SLSH);
+    set_keymap({key_shift1, key_shift2, key_a, key_slsh});
+
+    // Allow any number of reports with no keys or only KC_LSFT.
+    // clang-format off
+    EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
+                KeyboardReport(),
+                KeyboardReport(KC_LSFT),
+                KeyboardReport(KC_RSFT))))
+        .Times(AnyNumber());
+    // clang-format on
+
+    { // Expect: "Aa?a"
+        InSequence s;
+        EXPECT_REPORT(driver, (KC_LSFT, KC_A));
+        EXPECT_REPORT(driver, (KC_A));
+        EXPECT_REPORT(driver, (GetParam().report_shift_code, KC_SLSH));
+        EXPECT_REPORT(driver, (KC_A));
+    }
+
+    caps_word_on();
+    tap_key(key_a);
+
+    key_shift1.press(); // Press shift1.
+    run_one_scan_loop();
+
+    EXPECT_EQ(get_mods(), 0);
+
+    tap_key(key_a);
+    tap_key(key_slsh); // Tap '/' key, which is word breaking, ending Caps Word.
+
+    EXPECT_FALSE(is_caps_word_on());
+    EXPECT_EQ(get_mods(), MOD_BIT(GetParam().report_shift_code));
+
+    key_shift2.press(); // Press shift2.
+    run_one_scan_loop();
+
+    EXPECT_EQ(get_mods(), MOD_BIT(GetParam().report_shift_code));
+
+    key_shift1.release(); // Release shift1.
+    run_one_scan_loop();
+
+    EXPECT_EQ(get_mods(), 0);
+    tap_key(key_a);
+
+    key_shift2.release(); // Release shift2.
+    run_one_scan_loop();
+
+    EXPECT_EQ(get_mods(), 0);
+    VERIFY_AND_CLEAR(driver);
+}
+
+// clang-format off
+INSTANTIATE_TEST_CASE_P(
+    Shifts,
+    CapsWordInvertOnShift,
+    ::testing::Values(
+        ShiftKeyParams{"KC_LSFT", KC_LSFT, KC_LSFT},
+        ShiftKeyParams{"KC_RSFT", KC_RSFT, KC_RSFT},
+        ShiftKeyParams{"LSFT_T", LSFT_T(KC_A), KC_LSFT},
+        ShiftKeyParams{"RSFT_T", RSFT_T(KC_A), KC_RSFT},
+        ShiftKeyParams{"OSM_LSFT", OSM(MOD_LSFT), KC_LSFT},
+        ShiftKeyParams{"OSM_RSFT", OSM(MOD_RSFT), KC_RSFT}
+      ),
+    ShiftKeyParams::GetName
+    );
+// clang-format on
+
+} // namespace
diff --git a/tests/caps_word/test_caps_word.cpp b/tests/caps_word/test_caps_word.cpp
index 6d38b383f3..802f1e960e 100644
--- a/tests/caps_word/test_caps_word.cpp
+++ b/tests/caps_word/test_caps_word.cpp
@@ -371,6 +371,11 @@ INSTANTIATE_TEST_CASE_P(
             "OSL", OSL(1), 1, KC_NO, true},
         CapsWordPressUserParams{
             "LT_held", LT_1_KC_A, TAPPING_TERM + 1, KC_NO, true},
+        // Tri-Layer keys are ignored and continue Caps Word.
+        CapsWordPressUserParams{
+            "TL_LOWR", TL_LOWR, 1, KC_NO, true},
+        CapsWordPressUserParams{
+            "TL_UPPR", TL_UPPR, 1, KC_NO, true},
         // AltGr keys are ignored and continue Caps Word.
         CapsWordPressUserParams{
             "KC_RALT", KC_RALT, 1, KC_NO, true},
diff --git a/tests/tap_hold_configurations/default_mod_tap/config.h b/tests/tap_hold_configurations/default_mod_tap/config.h
index f22448845e..6d872dd57b 100644
--- a/tests/tap_hold_configurations/default_mod_tap/config.h
+++ b/tests/tap_hold_configurations/default_mod_tap/config.h
@@ -17,5 +17,3 @@
 #pragma once
 
 #include "test_common.h"
-
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp
index 8ec6ea62a3..dda58463fb 100644
--- a/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp
+++ b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp
@@ -27,86 +27,6 @@ using testing::InSequence;
 
 class QuickTap : public TestFixture {};
 
-TEST_F(QuickTap, tap_regular_key_while_mod_tap_key_is_held) {
-    TestDriver driver;
-    InSequence s;
-    auto       mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
-    auto       regular_key = KeymapKey(0, 2, 0, KC_A);
-
-    set_keymap({mod_tap_key, regular_key});
-
-    /* Press mod-tap key. */
-    EXPECT_NO_REPORT(driver);
-    mod_tap_key.press();
-    run_one_scan_loop();
-    VERIFY_AND_CLEAR(driver);
-
-    /* Press regular key. */
-    EXPECT_NO_REPORT(driver);
-    regular_key.press();
-    run_one_scan_loop();
-    VERIFY_AND_CLEAR(driver);
-
-    /* Release regular key. */
-    EXPECT_NO_REPORT(driver);
-    regular_key.release();
-    run_one_scan_loop();
-    VERIFY_AND_CLEAR(driver);
-
-    /* Release mod-tap key. */
-    EXPECT_REPORT(driver, (KC_LSFT));
-    mod_tap_key.release();
-    run_one_scan_loop();
-    VERIFY_AND_CLEAR(driver);
-
-    /* Idle for tapping term of mod tap hold key. */
-    EXPECT_REPORT(driver, (KC_LSFT, KC_A));
-    EXPECT_REPORT(driver, (KC_LSFT));
-    EXPECT_EMPTY_REPORT(driver);
-    idle_for(TAPPING_TERM - 3);
-    VERIFY_AND_CLEAR(driver);
-}
-
-TEST_F(QuickTap, tap_mod_tap_key_while_mod_tap_key_is_held) {
-    TestDriver driver;
-    InSequence s;
-    auto       first_mod_tap_key  = KeymapKey(0, 1, 0, SFT_T(KC_P));
-    auto       second_mod_tap_key = KeymapKey(0, 2, 0, RSFT_T(KC_A));
-
-    set_keymap({first_mod_tap_key, second_mod_tap_key});
-
-    /* Press first mod-tap key */
-    EXPECT_NO_REPORT(driver);
-    first_mod_tap_key.press();
-    run_one_scan_loop();
-    VERIFY_AND_CLEAR(driver);
-
-    /* Press second mod-tap key */
-    EXPECT_NO_REPORT(driver);
-    second_mod_tap_key.press();
-    run_one_scan_loop();
-    VERIFY_AND_CLEAR(driver);
-
-    /* Release second tap-hold key */
-    EXPECT_NO_REPORT(driver);
-    second_mod_tap_key.release();
-    run_one_scan_loop();
-    VERIFY_AND_CLEAR(driver);
-
-    /* Release first mod-tap key */
-    EXPECT_REPORT(driver, (KC_LSFT));
-    first_mod_tap_key.release();
-    run_one_scan_loop();
-    VERIFY_AND_CLEAR(driver);
-
-    /* Idle for tapping term of first mod-tap key. */
-    EXPECT_REPORT(driver, (KC_LSFT, KC_A));
-    EXPECT_REPORT(driver, (KC_LSFT));
-    EXPECT_EMPTY_REPORT(driver);
-    idle_for(TAPPING_TERM - 3);
-    VERIFY_AND_CLEAR(driver);
-}
-
 TEST_F(QuickTap, tap_regular_key_while_layer_tap_key_is_held) {
     TestDriver driver;
     InSequence s;
diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index 76daa625ad..72763d0bc0 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -22,7 +22,6 @@ extern "C" {
 #include "debug.h"
 #include "eeconfig.h"
 #include "keyboard.h"
-#include "keymap.h"
 
 void set_time(uint32_t t);
 void advance_time(uint32_t ms);
diff --git a/tmk_core/protocol/usb_hid/override_wiring.c b/tmk_core/protocol/usb_hid/override_wiring.c
index adc6645f8e..40bb574d7d 100644
--- a/tmk_core/protocol/usb_hid/override_wiring.c
+++ b/tmk_core/protocol/usb_hid/override_wiring.c
@@ -2,7 +2,7 @@
  * To keep Timer0 for common/timer.c override arduino/wiring.c.
  */
 #define __DELAY_BACKWARD_COMPATIBLE__
-#include <util/delay.h>
+#include "wait.h"
 #include "platforms/timer.h"
 
 
@@ -16,11 +16,11 @@ unsigned long micros(void)
 }
 void delay(unsigned long ms)
 {
-    _delay_ms(ms);
+    wait_ms(ms);
 }
 void delayMicroseconds(unsigned int us)
 {
-    _delay_us(us);
+    wait_us(us);
 }
 void init(void)
 {
diff --git a/users/bcat/bcat.h b/users/bcat/bcat.h
index 4a88acba7d..6fc84937c4 100644
--- a/users/bcat/bcat.h
+++ b/users/bcat/bcat.h
@@ -18,7 +18,7 @@
 
 #include <stdbool.h>
 
-#include "keymap.h"
+#include "keycodes.h"
 
 /* Layer numbers shared across keymaps. */
 enum user_layer {
diff --git a/users/curry/config.h b/users/curry/config.h
index d5e1ba7bc5..94e09350cd 100644
--- a/users/curry/config.h
+++ b/users/curry/config.h
@@ -71,7 +71,6 @@
 #    define ONESHOT_TIMEOUT 3000
 #endif  // !ONESHOT_TIMEOUT
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
 
 #define FORCE_NKRO
diff --git a/users/cwebster2/config.h b/users/cwebster2/config.h
index 313e6d533f..caee7d184d 100644
--- a/users/cwebster2/config.h
+++ b/users/cwebster2/config.h
@@ -20,7 +20,6 @@
 #define TAPPING_TERM_PER_KEY
 //#define QUICK_TAP_TERM 0
 #undef PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 #define NO_ACTION_ONESHOT
 
 #ifdef AUTO_SHIFT_ENABLE
diff --git a/users/drashna/config.h b/users/drashna/config.h
index 465ea63ee2..b4aa1283eb 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -62,7 +62,6 @@
 #    define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
 #    define TAPPING_TERM_PER_KEY
 #else
-#    define IGNORE_MOD_TAP_INTERRUPT
 #    undef PERMISSIVE_HOLD
 #endif
 
diff --git a/users/dshields/config.h b/users/dshields/config.h
index 279bcf217b..a406ff9330 100644
--- a/users/dshields/config.h
+++ b/users/dshields/config.h
@@ -4,7 +4,6 @@
 #define USB_MAX_POWER_CONSUMPTION 100
 #define ONESHOT_TAP_TOGGLE        2
 #define ONESHOT_TIMEOUT           3000
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD_PER_KEY
 #define QUICK_TAP_TERM_PER_KEY
 #define TAPPING_TERM              200
diff --git a/users/ericgebhart/config.h b/users/ericgebhart/config.h
index 6cd983b37b..fe0f41327d 100644
--- a/users/ericgebhart/config.h
+++ b/users/ericgebhart/config.h
@@ -44,11 +44,9 @@
 
 #undef TAPPING_TOGGLE
 #undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
 
 #define TAPPING_TOGGLE  2
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 
 #define TAP_HOLD_TERM    200
diff --git a/users/ericgebhart/miryoku_hd_gold_config.h b/users/ericgebhart/miryoku_hd_gold_config.h
index 8b5d06da3a..9eafdd2a5a 100644
--- a/users/ericgebhart/miryoku_hd_gold_config.h
+++ b/users/ericgebhart/miryoku_hd_gold_config.h
@@ -56,11 +56,9 @@
 
 #undef TAPPING_TOGGLE
 #undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
 
 #define TAPPING_TOGGLE  2
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 
 #define TAP_HOLD_TERM    200
diff --git a/users/ibnuda/config.h b/users/ibnuda/config.h
index f9a89389b6..c4fec5bc2d 100644
--- a/users/ibnuda/config.h
+++ b/users/ibnuda/config.h
@@ -3,5 +3,4 @@
 #define COMBO_TERM  50
 #define COMBO_COUNT 50
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
\ No newline at end of file
diff --git a/users/ishtob/config.h b/users/ishtob/config.h
index 98a3a5537e..993521acc4 100755
--- a/users/ishtob/config.h
+++ b/users/ishtob/config.h
@@ -22,7 +22,7 @@
   //#define AUDIO_CLICKY_FREQ_RANDOMNESS 1.0f
 
 /* ws2812 RGB LED
-#define RGB_DI_PIN B5
+#define WS2812_DI_PIN B5
 #define RGBLED_NUM 8     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/users/jarred/config.h b/users/jarred/config.h
index e63ec4d9b7..bea1f48310 100644
--- a/users/jarred/config.h
+++ b/users/jarred/config.h
@@ -37,12 +37,10 @@
 
 #undef TAPPING_TOGGLE
 #undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
 
 #define PERMISSIVE_HOLD
 #define TAPPING_TOGGLE  1
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef AUDIO_ENABLE
     #define STARTUP_SONG SONG(PLANCK_SOUND)
diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h
index bc0fe67df8..28e41215b9 100644
--- a/users/kuchosauronad0/config.h
+++ b/users/kuchosauronad0/config.h
@@ -64,11 +64,6 @@
 #  define FORCE_NKRO
 #endif // !NKRO_ENABLE
 
-// this makes it possible to do rolling combos (zx) with keys that
-// convert to other keys on hold (z becomes ctrl when you hold it,
-// and when this option isn't enabled, z rapidly followed by x
-// actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
 //#define QUICK_TAP_TERM 0
 //#define RETRO_TAPPING
diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h
index 429e08493d..3656e9eded 100644
--- a/users/manna-harbour_miryoku/config.h
+++ b/users/manna-harbour_miryoku/config.h
@@ -11,8 +11,6 @@
 #undef TAPPING_TERM
 #define TAPPING_TERM 200
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
diff --git a/users/mattly/config.h b/users/mattly/config.h
index 0f7ce4a64b..bea04255aa 100644
--- a/users/mattly/config.h
+++ b/users/mattly/config.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 #define TAPPING_TOGGLE 2
 #define TAPPING_TERM 200
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h
index ec3b3e81e8..e5f0f397d4 100644
--- a/users/mechmerlin/config.h
+++ b/users/mechmerlin/config.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#define TAP_CODE_DELAY 10
+
 #ifdef RGBLIGHT_ENABLE
     #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/users/mechmerlin/mechmerlin.c b/users/mechmerlin/mechmerlin.c
index 23def968d4..5c8ecb9007 100644
--- a/users/mechmerlin/mechmerlin.c
+++ b/users/mechmerlin/mechmerlin.c
@@ -1,8 +1,6 @@
 #include "mechmerlin.h"
 #include "version.h"
 
-#define TAP_CODE_DELAY 10
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     static uint16_t fnx_layer_timer;
 
@@ -26,4 +24,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         break;
     }
     return true;
-}
\ No newline at end of file
+}
diff --git a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c
index 17122f4a63..12547ec508 100644
--- a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c
+++ b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c
@@ -248,9 +248,7 @@ void keyboard_post_init_user(void) {
 
 void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
-    #ifdef RGB_DI_PIN
         rgblight_setrgb(RGB_GREEN);
-    #endif
     #endif //RGB_matrix  
 }
 
diff --git a/users/muppetjones/config.h b/users/muppetjones/config.h
index 583567d4f3..cbc318d24f 100644
--- a/users/muppetjones/config.h
+++ b/users/muppetjones/config.h
@@ -30,9 +30,6 @@
 // -- used for tap dance and other tap mods
 #    define TAPPING_TERM 175
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#    define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #    define QUICK_TAP_TERM 0
 
diff --git a/users/pvinis/config.h b/users/pvinis/config.h
index 14ec0dc8f1..01bb47dde1 100644
--- a/users/pvinis/config.h
+++ b/users/pvinis/config.h
@@ -1,7 +1,5 @@
 #pragma once
 
-// allow rolling when keys have hold functionality
-#define IGNORE_MOD_TAP_INTERRUPT
 // #define TAPPING_TERM 150
 
 #if defined(MOUSE_KEYS)
diff --git a/users/ridingqwerty/config.h b/users/ridingqwerty/config.h
index 291c4877e1..2bb32a0120 100644
--- a/users/ridingqwerty/config.h
+++ b/users/ridingqwerty/config.h
@@ -8,4 +8,3 @@
 #define QUICK_TAP_TERM_PER_KEY
 // testing
 #define TAPPING_TERM_PER_KEY
-//#define IGNORE_MOD_TAP_INTERRUPT // rolling R3 "zxcv", etc...
diff --git a/users/rmeli/config.h b/users/rmeli/config.h
index 5c31462d35..c51093ab38 100644
--- a/users/rmeli/config.h
+++ b/users/rmeli/config.h
@@ -27,10 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define AUTO_SHIFT_REPEAT
 #endif
 
-#ifdef HOME_ROW_MODS_ENABLED
-#    define IGNORE_MOD_TAP_INTERRUPT
-#endif
-
 #ifdef CAPS_WORD_ENABLE
 #    define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
 //#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
diff --git a/users/snowe/snowe.h b/users/snowe/snowe.h
index 6a2fc2aba1..caba9d21bc 100644
--- a/users/snowe/snowe.h
+++ b/users/snowe/snowe.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "wrappers.h"
 #include "keycode_aliases.h"
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
 
 //#if defined(RGBLIGHT_ENABLE)
diff --git a/users/talljoe/rules.mk b/users/talljoe/rules.mk
index 9338568b97..957ce2a71a 100644
--- a/users/talljoe/rules.mk
+++ b/users/talljoe/rules.mk
@@ -1,4 +1,6 @@
-SRC += talljoe.c macros.c $(wildcard users/talljoe/tapdance/*.c)
+INTROSPECTION_KEYMAP_C = talljoe.c
+
+SRC += macros.c $(wildcard users/talljoe/tapdance/*.c)
 ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
   SRC += visualizer.c
 endif
diff --git a/users/talljoe/talljoe.c b/users/talljoe/talljoe.c
index 5e58bc9e3f..61158be760 100644
--- a/users/talljoe/talljoe.c
+++ b/users/talljoe/talljoe.c
@@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
 #ifdef ZEAL_RGB
     case BL_TOGG:
-      if (IS_PRESSED(record->event)) {
+      if (record->event.pressed) {
         if (g_config.effect) {
           last_effect = g_config.effect;
           g_config.effect = 0;
@@ -215,7 +215,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       }
       return false;
     case EFFECT...EFFECT_END:
-      if (IS_PRESSED(record->event)) {
+      if (record->event.pressed) {
         uint8_t effect = keycode - EFFECT;
         if(effect == g_config.effect)
           effect = 0; // Toggle effect on second press
diff --git a/users/toinux/keymap_qwerty_fr.h b/users/toinux/keymap_qwerty_fr.h
index 4bd50c4075..3c0195c7f0 100644
--- a/users/toinux/keymap_qwerty_fr.h
+++ b/users/toinux/keymap_qwerty_fr.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "keymap.h"
+#include "keycodes.h"
 
 // clang-format off
 
diff --git a/users/tominabox1/tominabox1.c b/users/tominabox1/tominabox1.c
index 44f4c7795c..2c3c1ac9ff 100644
--- a/users/tominabox1/tominabox1.c
+++ b/users/tominabox1/tominabox1.c
@@ -100,7 +100,6 @@ tap_dance_action_t tap_dance_actions[] = {
 };
 
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef KEYBOARD_crkbd_rev1
 
diff --git a/users/uqs/config.h b/users/uqs/config.h
index 455aae9da8..94e50d063b 100644
--- a/users/uqs/config.h
+++ b/users/uqs/config.h
@@ -16,7 +16,6 @@
 #define TAPPING_TERM 170  // ms to trigger tap
 // https://precondition.github.io/home-row-mods
 #define QUICK_TAP_TERM 0  // make tap-then-hold _not_ do key auto repeat
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD  // I don't think this works for me, hence I rolled my own implementation.
 
 #define LEADER_TIMEOUT 400
diff --git a/users/vosechu/config.h b/users/vosechu/config.h
index 81d9305d50..7f4f000c41 100644
--- a/users/vosechu/config.h
+++ b/users/vosechu/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-// this makes it possible to do rolling combos (zx) with keys that
-// convert to other keys on hold (z becomes ctrl when you hold it,
-// and when this option isn't enabled, z rapidly followed by x
-// actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
 //#define QUICK_TAP_TERM 0
 //#define RETRO_TAPPING
diff --git a/users/wanleg/config.h b/users/wanleg/config.h
index d29054694c..984bdf6194 100644
--- a/users/wanleg/config.h
+++ b/users/wanleg/config.h
@@ -40,10 +40,6 @@
 
 
 #define PERMISSIVE_HOLD
-//// Disable mod tap interrrupt
-//#ifndef IGNORE_MOD_TAP_INTERRUPT
-//#define IGNORE_MOD_TAP_INTERRUPT
-//#endif // !mod tap interrrupt
 
 //set max breathing brightness on kbd6x
 #if defined(KEYBOARD_kbdfans_kbd6x)
diff --git a/users/yet-another-developer/config.h b/users/yet-another-developer/config.h
index 030872d3dd..e783d08dc5 100644
--- a/users/yet-another-developer/config.h
+++ b/users/yet-another-developer/config.h
@@ -25,11 +25,6 @@
   #define FORCE_NKRO
 #endif // !NKRO_ENABLE
 
-// this makes it possible to do rolling combos (zx) with keys that
-// convert to other keys on hold (z becomes ctrl when you hold it,
-// and when this option isn't enabled, z rapidly followed by x
-// actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
 //#define QUICK_TAP_TERM 0
 //#define RETRO_TAPPING
diff --git a/users/zer09/config.h b/users/zer09/config.h
index 0324aaa7d3..48dd17dfc3 100644
--- a/users/zer09/config.h
+++ b/users/zer09/config.h
@@ -1,11 +1,6 @@
 #ifndef USERSPACE_CONFIG_H
 #define USERSPACE_CONFIG_H
 
-// this makes it possible to do rolling combos (zx) with keys that
-// convert to other keys on hold (z becomes ctrl when you hold it,
-// and when this option isn't enabled, z rapidly followed by x
-// actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
 #define STRICT_LAYER_RELEASE
 
diff --git a/util/docker_build.sh b/util/docker_build.sh
index 8dce387320..828b5751af 100755
--- a/util/docker_build.sh
+++ b/util/docker_build.sh
@@ -81,5 +81,5 @@ fi
 	-e ALT_GET_KEYBOARDS=true \
 	-e SKIP_GIT="$SKIP_GIT" \
 	-e MAKEFLAGS="$MAKEFLAGS" \
-	qmkfm/qmk_cli \
+	ghcr.io/qmk/qmk_cli \
 	make "$keyboard${keymap:+:$keymap}${target:+:$target}"
diff --git a/util/docker_cmd.sh b/util/docker_cmd.sh
index a179cef732..4a82890603 100755
--- a/util/docker_cmd.sh
+++ b/util/docker_cmd.sh
@@ -55,5 +55,5 @@ fi
 	$uid_arg \
 	-w /qmk_firmware \
 	-v "$dir":/qmk_firmware \
-	qmkfm/qmk_cli \
+	ghcr.io/qmk/qmk_cli \
 	"$@"
diff --git a/util/uf2conv.py b/util/uf2conv.py
index 7f5645414a..52d3861cba 100755
--- a/util/uf2conv.py
+++ b/util/uf2conv.py
@@ -8,6 +8,7 @@ import os
 import os.path
 import argparse
 import json
+from time import sleep
 
 
 UF2_MAGIC_START0 = 0x0A324655 # "UF2\n"
@@ -276,23 +277,25 @@ def main():
     parser = argparse.ArgumentParser(description='Convert to UF2 or flash directly.')
     parser.add_argument('input', metavar='INPUT', type=str, nargs='?',
                         help='input file (HEX, BIN or UF2)')
-    parser.add_argument('-b' , '--base', dest='base', type=str,
+    parser.add_argument('-b', '--base', dest='base', type=str,
                         default="0x2000",
                         help='set base address of application for BIN format (default: 0x2000)')
-    parser.add_argument('-o' , '--output', metavar="FILE", dest='output', type=str,
+    parser.add_argument('-f', '--family', dest='family', type=str,
+                        default="0x0",
+                        help='specify familyID - number or name (default: 0x0)')
+    parser.add_argument('-o', '--output', metavar="FILE", dest='output', type=str,
                         help='write output to named file; defaults to "flash.uf2" or "flash.bin" where sensible')
-    parser.add_argument('-d' , '--device', dest="device_path",
+    parser.add_argument('-d', '--device', dest="device_path",
                         help='select a device path to flash')
-    parser.add_argument('-l' , '--list', action='store_true',
+    parser.add_argument('-l', '--list', action='store_true',
                         help='list connected devices')
-    parser.add_argument('-c' , '--convert', action='store_true',
+    parser.add_argument('-c', '--convert', action='store_true',
                         help='do not flash, just convert')
-    parser.add_argument('-D' , '--deploy', action='store_true',
+    parser.add_argument('-D', '--deploy', action='store_true',
                         help='just flash, do not convert')
-    parser.add_argument('-f' , '--family', dest='family', type=str,
-                        default="0x0",
-                        help='specify familyID - number or name (default: 0x0)')
-    parser.add_argument('-C' , '--carray', action='store_true',
+    parser.add_argument('-w', '--wait', action='store_true',
+                        help='wait for device to flash')
+    parser.add_argument('-C', '--carray', action='store_true',
                         help='convert binary file to a C array, not UF2')
     parser.add_argument('-i', '--info', action='store_true',
                         help='display header information from UF2, do not convert')
@@ -337,20 +340,23 @@ def main():
             print("Converted to %s, output size: %d, start address: 0x%x" %
                   (ext, len(outbuf), appstartaddr))
         if args.convert or ext != "uf2":
-            drives = []
             if args.output == None:
                 args.output = "flash." + ext
-        else:
-            drives = get_drives()
-
         if args.output:
             write_file(args.output, outbuf)
-        else:
+        if ext == "uf2" and not args.convert and not args.info:
+            drives = get_drives()
             if len(drives) == 0:
-                error("No drive to deploy.")
-        for d in drives:
-            print("Flashing %s (%s)" % (d, board_id(d)))
-            write_file(d + "/NEW.UF2", outbuf)
+                if args.wait:
+                    print("Waiting for drive to deploy...")
+                    while len(drives) == 0:
+                        sleep(0.1)
+                        drives = get_drives()
+                elif not args.output:
+                    error("No drive to deploy.")
+            for d in drives:
+                print("Flashing %s (%s)" % (d, board_id(d)))
+                write_file(d + "/NEW.UF2", outbuf)
 
 
 if __name__ == "__main__":
diff --git a/util/uf2families.json b/util/uf2families.json
index fafae82a60..c2140fe351 100644
--- a/util/uf2families.json
+++ b/util/uf2families.json
@@ -77,7 +77,7 @@
     {
         "id": "0x57755a57",
         "short_name": "STM32F4",
-        "description": "ST STM32F401"
+        "description": "ST STM32F4xx"
     },
     {
         "id": "0x5a18069b",
@@ -188,5 +188,20 @@
         "id": "0x9af03e33",
         "short_name": "GD32VF103",
         "description": "GigaDevice GD32VF103"
+    },
+    {
+        "id": "0x4f6ace52",
+        "short_name": "CSK4",
+        "description": "LISTENAI CSK300x/400x"
+    },
+    {
+        "id": "0x6e7348a8",
+        "short_name": "CSK6",
+        "description": "LISTENAI CSK60xx"
+    },
+    {
+        "id": "0x11de784a",
+        "short_name": "M0SENSE",
+        "description": "M0SENSE BL702"
     }
-]
+]
\ No newline at end of file
diff --git a/util/vagrant/Dockerfile b/util/vagrant/Dockerfile
deleted file mode 100644
index 951d4fc40d..0000000000
--- a/util/vagrant/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM qmkfm/qmk_cli
-
-# Basic upgrades; install sudo and SSH.
-RUN apt-get update && apt-get install --no-install-recommends -y \
-        sudo \
-        openssh-server \
-    && rm -rf /var/lib/apt/lists/*
-RUN mkdir /var/run/sshd
-RUN sed -i 's/PermitRootLogin yes/PermitRootLogin no/' /etc/ssh/sshd_config
-RUN echo 'UseDNS no' >> /etc/ssh/sshd_config
-
-# Remove the policy file once we're finished installing software.
-# This allows invoke-rc.d and friends to work as expected.
-RUN rm /usr/sbin/policy-rc.d
-
-# Add the Vagrant user and necessary passwords.
-RUN groupadd vagrant
-RUN useradd -c "Vagrant" -g vagrant -d /home/vagrant -m -s /bin/bash vagrant
-RUN echo 'root:vagrant' | chpasswd
-RUN echo 'vagrant:vagrant' | chpasswd
-
-# Allow the vagrant user to use sudo without a password.
-RUN echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant
-
-# Install Vagrant's insecure public key so provisioning and 'vagrant ssh' work.
-RUN mkdir /home/vagrant/.ssh
-ADD https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub /home/vagrant/.ssh/authorized_keys
-RUN chmod 0600 /home/vagrant/.ssh/authorized_keys
-RUN chown -R vagrant:vagrant /home/vagrant/.ssh
-RUN chmod 0700 /home/vagrant/.ssh
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd", "-D"]
diff --git a/util/vagrant/readme.md b/util/vagrant/readme.md
deleted file mode 100644
index a8396007ee..0000000000
--- a/util/vagrant/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# QMK Vagrant Utilities
-
-## Dockerfile
-Vagrant-friendly `qmkfm/qmk_cli`.
-
-In order for the Docker provider and `vagrant ssh` to function the container has a few extra requirements.
-
-* vagrant user
-* ssh server
-  * configured with expected public key
-* sudo
-  * passwordless for vagrant user